diff options
| -rw-r--r-- | graphics/geeqie/Makefile | 9 | ||||
| -rw-r--r-- | graphics/geeqie/PLIST | 14 | ||||
| -rw-r--r-- | graphics/geeqie/distinfo | 13 | ||||
| -rw-r--r-- | graphics/geeqie/patches/patch-aa | 32 | ||||
| -rw-r--r-- | graphics/geeqie/patches/patch-ab | 14 | ||||
| -rw-r--r-- | graphics/geeqie/patches/patch-ac | 15 |
6 files changed, 73 insertions, 24 deletions
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile index 918790fe4c4..16094625a1a 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,18 +1,21 @@ -# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:31 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2009/07/23 23:08:37 wiz Exp $ # -DISTNAME= geeqie-1.0alpha3 +DISTNAME= geeqie-1.0beta2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=geeqie/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://geeqie.sourceforge.net/ COMMENT= Image viewer +LICENSE= gnu-gpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ -USE_TOOLS= pkg-config gmake msgfmt +USE_TOOLS= gmake intltool msgfmt pkg-config .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST index 1b741e2ad63..61b6cba2e96 100644 --- a/graphics/geeqie/PLIST +++ b/graphics/geeqie/PLIST @@ -1,5 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:13 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2009/07/23 23:08:37 wiz Exp $ bin/geeqie +lib/geeqie/geeqie-import +lib/geeqie/geeqie-rotate +lib/geeqie/geeqie-symlink +lib/geeqie/geeqie-ufraw man/man1/geeqie.1 share/applications/geeqie.desktop share/doc/${PKGNAME}/COPYING @@ -56,6 +60,14 @@ share/doc/${PKGNAME}/html/sidebars_exif.html share/doc/${PKGNAME}/html/sidebars_keywords.html share/doc/${PKGNAME}/html/sidebars_sort_manager.html share/doc/${PKGNAME}/html/style.css +share/geeqie/applications/geeqie-import-geeqie.desktop +share/geeqie/applications/geeqie-import-gqview.desktop +share/geeqie/applications/geeqie-ufraw-id.desktop +share/geeqie/applications/geeqie-ufraw-recursive.desktop +share/geeqie/applications/geeqie-ufraw.desktop +share/geeqie/applications/rotate.desktop +share/geeqie/applications/symlink.desktop +share/geeqie/template.desktop share/locale/ar/LC_MESSAGES/geeqie.mo share/locale/be/LC_MESSAGES/geeqie.mo share/locale/bg/LC_MESSAGES/geeqie.mo diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo index 395334e3257..d83dfe25030 100644 --- a/graphics/geeqie/distinfo +++ b/graphics/geeqie/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $ +$NetBSD: distinfo,v 1.2 2009/07/23 23:08:37 wiz Exp $ -SHA1 (geeqie-1.0alpha3.tar.gz) = 1b2b0bdc72abecbe3169a01150a4e80312add366 -RMD160 (geeqie-1.0alpha3.tar.gz) = df63dc777f7f922b137c296594f024204b0f03f4 -Size (geeqie-1.0alpha3.tar.gz) = 2067890 bytes -SHA1 (patch-aa) = 3231333775de3560840cbfbcf31d241061e7afee -SHA1 (patch-ab) = 797696787c781a735bc43daccdaabe9c657edac6 +SHA1 (geeqie-1.0beta2.tar.gz) = 2f26de077d90cad5a0499bfd5e8e3908947773de +RMD160 (geeqie-1.0beta2.tar.gz) = 7cb29da6495eec48660102b105e0516375936737 +Size (geeqie-1.0beta2.tar.gz) = 1912367 bytes +SHA1 (patch-aa) = 7991cc161efcc2ac0ac7d477019ed7e3092d9d1b +SHA1 (patch-ab) = fd686d122a3e7766823a5670e22448c5c8ad54cc +SHA1 (patch-ac) = eae6e5843473fd49aa07ca7d988deb24a16087f9 diff --git a/graphics/geeqie/patches/patch-aa b/graphics/geeqie/patches/patch-aa index 8a2d1d2de9b..8cf72659180 100644 --- a/graphics/geeqie/patches/patch-aa +++ b/graphics/geeqie/patches/patch-aa @@ -1,13 +1,31 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2009/07/23 23:08:37 wiz Exp $ ---- configure.orig 2009-01-25 19:54:13.000000000 +0100 +--- configure.orig 2009-07-02 17:46:06.000000000 +0000 +++ configure -@@ -2398,7 +2398,7 @@ if test "x${enable_debug_flags}" != "xno +@@ -4612,7 +4612,7 @@ fi + + if test "x${enable_debug_flags}" != "xno" then - CXXFLAGS="${CXXFLAGS} -g -O0 -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wextra -Wno-unused-parameter" - CFLAGS="${CFLAGS} -g -O0 -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wimplicit-int -Werror-implicit-function-declaration -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wextra -Wno-unused-parameter" - if test "x${enable_developer}" == "xyes" + if test "x${enable_developer}" = "xyes" then - CXXFLAGS="${CXXFLAGS} -Wall" - CFLAGS="${CFLAGS} -Wstrict-prototypes -Wall" + CXXFLAGS="${CXXFLAGS} -Wall" + CFLAGS="${CFLAGS} -Wstrict-prototypes -Wall" +@@ -11852,7 +11852,7 @@ else + fi + + +-if test "x${libgps}" == "xyes"; then ++if test "x${libgps}" = "xyes"; then + + pkg_failed=no + { $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN" >&5 +@@ -11939,7 +11939,7 @@ else + HAVE_LIBCHAMPLAIN=disabled + fi + +-if test "x${libgps}" == "xyes"; then ++if test "x${libgps}" = "xyes"; then + + pkg_failed=no + { $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN_GTK" >&5 diff --git a/graphics/geeqie/patches/patch-ab b/graphics/geeqie/patches/patch-ab index 455af98aa01..ec97614c18f 100644 --- a/graphics/geeqie/patches/patch-ab +++ b/graphics/geeqie/patches/patch-ab @@ -1,12 +1,12 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $ +$NetBSD: patch-ab,v 1.2 2009/07/23 23:08:37 wiz Exp $ ---- po/Makefile.in.in.orig 2008-07-30 22:02:12.000000000 +0200 +--- po/Makefile.in.in.orig 2009-07-02 17:46:02.000000000 +0000 +++ po/Makefile.in.in -@@ -21,6 +21,7 @@ SHELL = /bin/sh +@@ -21,6 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ + PACKAGE = @PACKAGE@ + VERSION = @VERSION@ - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ +top_builddir = .. - VPATH = @srcdir@ + SHELL = @SHELL@ - prefix = @prefix@ + srcdir = @srcdir@ diff --git a/graphics/geeqie/patches/patch-ac b/graphics/geeqie/patches/patch-ac new file mode 100644 index 00000000000..0418e66c81c --- /dev/null +++ b/graphics/geeqie/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2009/07/23 23:08:37 wiz Exp $ + +--- src/main.c.orig 2009-07-02 17:45:20.000000000 +0000 ++++ src/main.c +@@ -698,6 +698,10 @@ void exit_program(void) + */ + /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */ + ++#ifndef MAP_ANONYMOUS ++#define MAP_ANONYMOUS 0 ++#endif ++ + #ifdef SIGBUS + static void sigbus_handler_cb(int signum, siginfo_t *info, void *context) + { |