Fri Aug 10 15:27:29 2012 UTC ()
update to 2.14.4
changes:
-bugfixes
-translation updates


(drochner)
diff -r1.69 -r1.70 pkgsrc/graphics/gthumb/Makefile
diff -r1.28 -r1.29 pkgsrc/graphics/gthumb/distinfo
diff -r1.7 -r1.8 pkgsrc/graphics/gthumb/patches/patch-ab
diff -r0 -r1.1 pkgsrc/graphics/gthumb/patches/patch-ah
cvs diff -r1.69 -r1.70 pkgsrc/graphics/gthumb/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gthumb/Makefile 2012/06/14 07:43:47 1.69
+++ pkgsrc/graphics/gthumb/Makefile 2012/08/10 15:27:29 1.70
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.69 2012/06/14 07:43:47 sbd Exp $ 1# $NetBSD: Makefile,v 1.70 2012/08/10 15:27:29 drochner Exp $
2 2
3DISTNAME= gthumb-2.14.2 3DISTNAME= gthumb-2.14.4
4PKGREVISION= 3 
5CATEGORIES= graphics 4CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.14/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gthumb/2.14/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://gthumb.sourceforge.net/ 9HOMEPAGE= http://gthumb.sourceforge.net/
11COMMENT= Image viewer and browser for the GNOME Desktop 10COMMENT= Image viewer and browser for the GNOME Desktop
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
@@ -27,26 +26,27 @@ GCONF_SCHEMAS+= gthumb_crop_options.sche @@ -27,26 +26,27 @@ GCONF_SCHEMAS+= gthumb_crop_options.sche
27GCONF_SCHEMAS+= gthumb_photo_importer.schemas gthumb_rename_series.schemas 26GCONF_SCHEMAS+= gthumb_photo_importer.schemas gthumb_rename_series.schemas
28GCONF_SCHEMAS+= gthumb_resize_images.schemas gthumb_resize_options.schemas 27GCONF_SCHEMAS+= gthumb_resize_images.schemas gthumb_resize_options.schemas
29GCONF_SCHEMAS+= gthumb_webalbums.schemas 28GCONF_SCHEMAS+= gthumb_webalbums.schemas
30 29
31.include "../../devel/GConf/schemas.mk" 30.include "../../devel/GConf/schemas.mk"
32.include "../../devel/gettext-lib/buildlink3.mk" 31.include "../../devel/gettext-lib/buildlink3.mk"
33.include "../../devel/glib2/buildlink3.mk" 32.include "../../devel/glib2/buildlink3.mk"
34.include "../../devel/libgphoto2/buildlink3.mk" 33.include "../../devel/libgphoto2/buildlink3.mk"
35.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 34.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
36.include "../../graphics/exiv2/buildlink3.mk" 35.include "../../graphics/exiv2/buildlink3.mk"
37.include "../../graphics/libgnomecanvas/buildlink3.mk" 36.include "../../graphics/libgnomecanvas/buildlink3.mk"
38.include "../../mk/jpeg.buildlink3.mk" 37.include "../../mk/jpeg.buildlink3.mk"
39.include "../../graphics/png/buildlink3.mk" 38.include "../../graphics/png/buildlink3.mk"
 39.include "../../devel/zlib/buildlink3.mk"
40.include "../../graphics/tiff/buildlink3.mk" 40.include "../../graphics/tiff/buildlink3.mk"
41#.include "../../net/ORBit2/buildlink3.mk" 41#.include "../../net/ORBit2/buildlink3.mk"
42.include "../../sysutils/desktop-file-utils/desktopdb.mk" 42.include "../../sysutils/desktop-file-utils/desktopdb.mk"
43.include "../../textproc/libxml2/buildlink3.mk" 43.include "../../textproc/libxml2/buildlink3.mk"
44#.include "../../mk/omf-scrollkeeper.mk" 44#.include "../../mk/omf-scrollkeeper.mk"
45.include "../../textproc/gnome-doc-utils/buildlink3.mk" 45.include "../../textproc/gnome-doc-utils/buildlink3.mk"
46.include "../../x11/gtk2/buildlink3.mk" 46.include "../../x11/gtk2/buildlink3.mk"
47.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11) 47.if !empty(PKG_BUILD_OPTIONS.gtk2:Mx11)
48.include "../../x11/libXrender/buildlink3.mk" 48.include "../../x11/libXrender/buildlink3.mk"
49.include "../../x11/libSM/buildlink3.mk" 49.include "../../x11/libSM/buildlink3.mk"
50.endif 50.endif
51.include "../../x11/libunique/buildlink3.mk" 51.include "../../x11/libunique/buildlink3.mk"
52.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/graphics/gthumb/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gthumb/distinfo 2012/02/03 15:37:54 1.28
+++ pkgsrc/graphics/gthumb/distinfo 2012/08/10 15:27:29 1.29
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.28 2012/02/03 15:37:54 drochner Exp $ 1$NetBSD: distinfo,v 1.29 2012/08/10 15:27:29 drochner Exp $
2 2
3SHA1 (gthumb-2.14.2.tar.xz) = 197e79ee38ad5652ca4b28c21c6856f096a6ea1f 3SHA1 (gthumb-2.14.4.tar.xz) = ed7fb3649303527b3704b8d28ea9d49e2e65f7ef
4RMD160 (gthumb-2.14.2.tar.xz) = 3a6970420d79379590ec8fd847616731cc08c01b 4RMD160 (gthumb-2.14.4.tar.xz) = 384b4441ed3d4022b6e5c5301b5a3c422f8b101b
5Size (gthumb-2.14.2.tar.xz) = 5714744 bytes 5Size (gthumb-2.14.4.tar.xz) = 5721384 bytes
6SHA1 (patch-ab) = 4c264e8987cbdb50f7e4ef8d5a4862ad7490f896 6SHA1 (patch-ab) = 25d44a6312d372da08c9428dff7f4ec39f0d0d30
7SHA1 (patch-ac) = 8e28e914f6d72c83069ba5577f5d51d55e321d58 7SHA1 (patch-ac) = 8e28e914f6d72c83069ba5577f5d51d55e321d58
8SHA1 (patch-ad) = 12a530d10726d5ec07bba4cd8a7a42da6cff4303 8SHA1 (patch-ad) = 12a530d10726d5ec07bba4cd8a7a42da6cff4303
9SHA1 (patch-ae) = 2ce0608493b3a261a0c0b5a67932173081837522 9SHA1 (patch-ae) = 2ce0608493b3a261a0c0b5a67932173081837522
10SHA1 (patch-af) = 55ce1101c8e06f6341934c474772d3bac7680046 10SHA1 (patch-af) = 55ce1101c8e06f6341934c474772d3bac7680046
11SHA1 (patch-ag) = cb1fe9401d9ea3a89ce797465c548b01f99db129 11SHA1 (patch-ag) = cb1fe9401d9ea3a89ce797465c548b01f99db129
 12SHA1 (patch-ah) = d6ebd939dda6459a1dd20b4e7921ada2c9f6fdd2
cvs diff -r1.7 -r1.8 pkgsrc/graphics/gthumb/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/graphics/gthumb/patches/patch-ab 2012/02/03 15:37:55 1.7
+++ pkgsrc/graphics/gthumb/patches/patch-ab 2012/08/10 15:27:29 1.8
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-ab,v 1.7 2012/02/03 15:37:55 drochner Exp $ 1$NetBSD: patch-ab,v 1.8 2012/08/10 15:27:29 drochner Exp $
2 2
3Build eggsmclient-osx.c (required on Mac OS X). 3Build eggsmclient-osx.c (required on Mac OS X).
4 4
5--- copy-n-paste/Makefile.in.orig 2012-01-23 20:00:58.000000000 +0000 5--- copy-n-paste/Makefile.in.orig 2012-03-25 18:34:06.000000000 +0000
6+++ copy-n-paste/Makefile.in 6+++ copy-n-paste/Makefile.in
7@@ -54,6 +54,7 @@ libeggsmclient_la_DEPENDENCIES = $(am__D 7@@ -54,6 +54,7 @@ libeggsmclient_la_DEPENDENCIES = $(am__D
8 $(am__DEPENDENCIES_1) 8 $(am__DEPENDENCIES_1)
9 am_libeggsmclient_la_OBJECTS = libeggsmclient_la-eggdesktopfile.lo \ 9 am_libeggsmclient_la_OBJECTS = libeggsmclient_la-eggdesktopfile.lo \
10 libeggsmclient_la-eggsmclient.lo \ 10 libeggsmclient_la-eggsmclient.lo \
11+ libeggsmclient_la-eggsmclient-osx.lo \ 11+ libeggsmclient_la-eggsmclient-osx.lo \
12 libeggsmclient_la-eggsmclient-xsmp.lo 12 libeggsmclient_la-eggsmclient-xsmp.lo
13 libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS) 13 libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS)
14 AM_V_lt = $(am__v_lt_$(V)) 14 AM_V_lt = $(am__v_lt_@AM_V@)
15@@ -305,6 +306,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi 15@@ -311,6 +312,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi
16 eggdesktopfile.c \ 16 eggdesktopfile.c \
17 eggsmclient.h \ 17 eggsmclient.h \
18 eggsmclient.c \ 18 eggsmclient.c \
19+ eggsmclient-osx.c \ 19+ eggsmclient-osx.c \
20 eggsmclient-private.h \ 20 eggsmclient-private.h \
21 eggsmclient-xsmp.c 21 eggsmclient-xsmp.c
22  22
23@@ -361,6 +363,7 @@ distclean-compile: 23@@ -367,6 +369,7 @@ distclean-compile:
24 -rm -f *.tab.c 24 -rm -f *.tab.c
25  25
26 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggdesktopfile.Plo@am__quote@ 26 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggdesktopfile.Plo@am__quote@
27+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Plo@am__quote@ 27+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Plo@am__quote@
28 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo@am__quote@ 28 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo@am__quote@
29 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient.Plo@am__quote@ 29 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient.Plo@am__quote@
30  30
31@@ -399,6 +402,13 @@ libeggsmclient_la-eggsmclient.lo: eggsmc 31@@ -405,6 +408,13 @@ libeggsmclient_la-eggsmclient.lo: eggsmc
32 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 32 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
33 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -c -o libeggsmclient_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c 33 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -c -o libeggsmclient_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c
34  34
35+libeggsmclient_la-eggsmclient-osx.lo: eggsmclient-osx.c 35+libeggsmclient_la-eggsmclient-osx.lo: eggsmclient-osx.c
36+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -MT libeggsmclient_la-eggsmclient-osc.lo -MD -MP -MF $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Tpo -c -o libeggsmclient_la-eggsmclient-osx.lo `test -f 'eggsmclient-osx.c' || echo '$(srcdir)/'`eggsmclient-osx.c 36+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -MT libeggsmclient_la-eggsmclient-osc.lo -MD -MP -MF $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Tpo -c -o libeggsmclient_la-eggsmclient-osx.lo `test -f 'eggsmclient-osx.c' || echo '$(srcdir)/'`eggsmclient-osx.c
37+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Tpo $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Plo 37+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Tpo $(DEPDIR)/libeggsmclient_la-eggsmclient-osx.Plo
38+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eggsmclient-osx.c' object='libeggsmclient_la-eggsmclient-osx.lo' libtool=yes @AMDEPBACKSLASH@ 38+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eggsmclient-osx.c' object='libeggsmclient_la-eggsmclient-osx.lo' libtool=yes @AMDEPBACKSLASH@
39+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 39+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
40+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -c -o libeggsmclient_la-eggsmclient-osx.lo `test -f 'eggsmclient-osx.c' || echo '$(srcdir)/'`eggsmclient-osx.c 40+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -c -o libeggsmclient_la-eggsmclient-osx.lo `test -f 'eggsmclient-osx.c' || echo '$(srcdir)/'`eggsmclient-osx.c
41+ 41+
42 libeggsmclient_la-eggsmclient-xsmp.lo: eggsmclient-xsmp.c 42 libeggsmclient_la-eggsmclient-xsmp.lo: eggsmclient-xsmp.c
43 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -MT libeggsmclient_la-eggsmclient-xsmp.lo -MD -MP -MF $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Tpo -c -o libeggsmclient_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c 43 @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeggsmclient_la_CFLAGS) $(CFLAGS) -MT libeggsmclient_la-eggsmclient-xsmp.lo -MD -MP -MF $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Tpo -c -o libeggsmclient_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c
44 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Tpo $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo 44 @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Tpo $(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo
File Added: pkgsrc/graphics/gthumb/patches/patch-ah
$NetBSD: patch-ah,v 1.1 2012/08/10 15:27:29 drochner Exp $

--- configure.orig	2012-03-25 18:34:17.000000000 +0000
+++ configure
@@ -17473,7 +17473,6 @@ if test -n "$GTHUMB_CFLAGS"; then
 	gtk+-2.0 		>= \$GTK_REQUIRED
 	gconf-2.0 		>= \$GCONF_REQUIRED
 	libpng
-	zlib
         ice
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
@@ -17484,7 +17483,6 @@ if test -n "$GTHUMB_CFLAGS"; then
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 ") 2>&5
   ac_status=$?
@@ -17498,7 +17496,6 @@ if test -n "$GTHUMB_CFLAGS"; then
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17520,7 +17517,6 @@ if test -n "$GTHUMB_LIBS"; then
 	gtk+-2.0 		>= \$GTK_REQUIRED
 	gconf-2.0 		>= \$GCONF_REQUIRED
 	libpng
-	zlib
         ice
 \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
@@ -17531,7 +17527,6 @@ if test -n "$GTHUMB_LIBS"; then
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 ") 2>&5
   ac_status=$?
@@ -17545,7 +17540,6 @@ if test -n "$GTHUMB_LIBS"; then
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -17576,7 +17570,6 @@ fi
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 " 2>&1`
         else
@@ -17588,7 +17581,6 @@ fi
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 " 2>&1`
         fi
@@ -17603,7 +17595,6 @@ fi
 	gtk+-2.0 		>= $GTK_REQUIRED
 	gconf-2.0 		>= $GCONF_REQUIRED
 	libpng
-	zlib
         ice
 ) were not met: