update to 2.14.4

changes:
-bugfixes
-translation updates

4 files changed, 91 insertions, 14 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 3c558343393..b9fa3498afe 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2012/06/14 07:43:47 sbd Exp $
+# $NetBSD: Makefile,v 1.70 2012/08/10 15:27:29 drochner Exp $
 
-DISTNAME=	gthumb-2.14.2
-PKGREVISION=	3
+DISTNAME=	gthumb-2.14.4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gthumb/2.14/}
 EXTRACT_SUFX=	.tar.xz
@@ -37,6 +36,7 @@ GCONF_SCHEMAS+=	gthumb_webalbums.schemas
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 #.include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index d7b7449474d..1236aa7eeac 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.28 2012/02/03 15:37:54 drochner Exp $
+$NetBSD: distinfo,v 1.29 2012/08/10 15:27:29 drochner Exp $
 
-SHA1 (gthumb-2.14.2.tar.xz) = 197e79ee38ad5652ca4b28c21c6856f096a6ea1f
-RMD160 (gthumb-2.14.2.tar.xz) = 3a6970420d79379590ec8fd847616731cc08c01b
-Size (gthumb-2.14.2.tar.xz) = 5714744 bytes
-SHA1 (patch-ab) = 4c264e8987cbdb50f7e4ef8d5a4862ad7490f896
+SHA1 (gthumb-2.14.4.tar.xz) = ed7fb3649303527b3704b8d28ea9d49e2e65f7ef
+RMD160 (gthumb-2.14.4.tar.xz) = 384b4441ed3d4022b6e5c5301b5a3c422f8b101b
+Size (gthumb-2.14.4.tar.xz) = 5721384 bytes
+SHA1 (patch-ab) = 25d44a6312d372da08c9428dff7f4ec39f0d0d30
 SHA1 (patch-ac) = 8e28e914f6d72c83069ba5577f5d51d55e321d58
 SHA1 (patch-ad) = 12a530d10726d5ec07bba4cd8a7a42da6cff4303
 SHA1 (patch-ae) = 2ce0608493b3a261a0c0b5a67932173081837522
 SHA1 (patch-af) = 55ce1101c8e06f6341934c474772d3bac7680046
 SHA1 (patch-ag) = cb1fe9401d9ea3a89ce797465c548b01f99db129
+SHA1 (patch-ah) = d6ebd939dda6459a1dd20b4e7921ada2c9f6fdd2
diff --git a/graphics/gthumb/patches/patch-ab b/graphics/gthumb/patches/patch-ab
index 1ad5c4aae0d..8c23a6a293e 100644
--- a/graphics/gthumb/patches/patch-ab
+++ b/graphics/gthumb/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2012/02/03 15:37:55 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2012/08/10 15:27:29 drochner Exp $
 
 Build eggsmclient-osx.c (required on Mac OS X).
 
---- copy-n-paste/Makefile.in.orig	2012-01-23 20:00:58.000000000 +0000
+--- copy-n-paste/Makefile.in.orig	2012-03-25 18:34:06.000000000 +0000
 +++ copy-n-paste/Makefile.in
 @@ -54,6 +54,7 @@ libeggsmclient_la_DEPENDENCIES = $(am__D
  	$(am__DEPENDENCIES_1)
@@ -11,8 +11,8 @@ Build eggsmclient-osx.c (required on Mac OS X).
 +	libeggsmclient_la-eggsmclient-osx.lo \
  	libeggsmclient_la-eggsmclient-xsmp.lo
  libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS)
- AM_V_lt = $(am__v_lt_$(V))
-@@ -305,6 +306,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -311,6 +312,7 @@ libeggsmclient_la_SOURCES = eggdesktopfi
  			    eggdesktopfile.c \
  			    eggsmclient.h \
  			    eggsmclient.c \
@@ -20,7 +20,7 @@ Build eggsmclient-osx.c (required on Mac OS X).
  			    eggsmclient-private.h \
  			    eggsmclient-xsmp.c
  
-@@ -361,6 +363,7 @@ distclean-compile:
+@@ -367,6 +369,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggdesktopfile.Plo@am__quote@
@@ -28,7 +28,7 @@ Build eggsmclient-osx.c (required on Mac OS X).
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient-xsmp.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeggsmclient_la-eggsmclient.Plo@am__quote@
  
-@@ -399,6 +402,13 @@ libeggsmclient_la-eggsmclient.lo: eggsmc
+@@ -405,6 +408,13 @@ libeggsmclient_la-eggsmclient.lo: eggsmc
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @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
  
diff --git a/graphics/gthumb/patches/patch-ah b/graphics/gthumb/patches/patch-ah
new file mode 100644
index 00000000000..60418d1d628
--- /dev/null
+++ b/graphics/gthumb/patches/patch-ah
@@ -0,0 +1,76 @@
+$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:
+