[pkgsrc/trunk]: pkgsrc/x11/gtk2 update to 2.12.3

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3af47a05bda1
branches:  trunk
changeset: 536591:3af47a05bda1
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Dec 17 20:24:13 2007 +0000

description:
update to 2.12.3
changes:
-some Quartz related bugfixes
-other minor bugfixes
-translation updates
-the HTML documentation is built properly this time, so remove the pkgsrc
 hacks to load it from MASTER_SITE_LOCAL

diffstat:

 x11/gtk2/Makefile         |  19 ++-----------------
 x11/gtk2/distinfo         |  12 ++++--------
 x11/gtk2/patches/patch-ba |  15 ---------------
 3 files changed, 6 insertions(+), 40 deletions(-)

diffs (79 lines):

diff -r 3d51cc42dcaf -r 3af47a05bda1 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Mon Dec 17 20:17:42 2007 +0000
+++ b/x11/gtk2/Makefile Mon Dec 17 20:24:13 2007 +0000
@@ -1,18 +1,12 @@
-# $NetBSD: Makefile,v 1.150 2007/12/02 11:48:10 wiz Exp $
+# $NetBSD: Makefile,v 1.151 2007/12/17 20:24:13 drochner Exp $
 
-DISTNAME=              gtk+-2.12.2
+DISTNAME=              gtk+-2.12.3
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/2.12/ \
                        ${MASTER_SITE_GNOME:=sources/gtk+/2.12/}
 EXTRACT_SUFX=          .tar.bz2
 
-# temporary hack for 2.12.2: use correctly built html doc
-FIXEDDOC=      gtk+-2.12.2-gtkdoc-html.tar.bz2
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} ${FIXEDDOC}
-SITES.${FIXEDDOC}=     ${MASTER_SITE_LOCAL}
-EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
-
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.gtk.org/
 COMMENT=               GIMP Toolkit v2 - libraries for building X11 user interfaces
@@ -64,15 +58,6 @@
 SUBST_SED.pthread=     -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
 SUBST_FILES.pthread=   gdk-pixbuf/Makefile.in
 
-# XXX temporary hack, remove on update
-# The gtk-doc (html) docs are not properly packaged in 2.12.2.
-# Will hopefully fixed in the next gtk release.
-USE_TOOLS+=    bzcat tar
-post-configure:
-       ${BZCAT} <${DISTDIR}/${DIST_SUBDIR}/${FIXEDDOC} | \
-               (cd ${WRKDIR} && ${TAR} xf -)
-       (cd ${WRKSRC}/docs/reference/gtk && ${GMAKE} just-copy-images)
-
 .include "options.mk"
 
 .include "../../mk/compiler.mk"
diff -r 3d51cc42dcaf -r 3af47a05bda1 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Mon Dec 17 20:17:42 2007 +0000
+++ b/x11/gtk2/distinfo Mon Dec 17 20:24:13 2007 +0000
@@ -1,12 +1,8 @@
-$NetBSD: distinfo,v 1.94 2007/11/29 22:10:17 drochner Exp $
+$NetBSD: distinfo,v 1.95 2007/12/17 20:24:14 drochner Exp $
 
-SHA1 (gtk+-2.12.2-gtkdoc-html.tar.bz2) = db72858ca5c26bfd49a8ecaf45f0b0d7bf25dcd5
-RMD160 (gtk+-2.12.2-gtkdoc-html.tar.bz2) = e63c4f95c1ac736f517418a3620f78766158df56
-Size (gtk+-2.12.2-gtkdoc-html.tar.bz2) = 925120 bytes
-SHA1 (gtk+-2.12.2.tar.bz2) = 495ff3ef09de44cc23718239967203bd7871b4aa
-RMD160 (gtk+-2.12.2.tar.bz2) = b5cd6b7ec6abf557a6f82c707e0eafb67c813f8d
-Size (gtk+-2.12.2.tar.bz2) = 14723320 bytes
+SHA1 (gtk+-2.12.3.tar.bz2) = 5af5ab069c49189abf223b25736c254da047c712
+RMD160 (gtk+-2.12.3.tar.bz2) = 5da22ae4ac257bd2fcefbe2f374e92b6b0dbcc85
+Size (gtk+-2.12.3.tar.bz2) = 15898599 bytes
 SHA1 (patch-aa) = 507f43c8257607c3ddb194015cc67c5b166a5047
 SHA1 (patch-ad) = f38270c343961be2892d8f2b2f89a67d21f0dc15
 SHA1 (patch-ai) = a71559e7f06a0334f19e3d44288dae5fcecff131
-SHA1 (patch-ba) = 4885469eafd53424d2581d9863119e105a4fdc41
diff -r 3d51cc42dcaf -r 3af47a05bda1 x11/gtk2/patches/patch-ba
--- a/x11/gtk2/patches/patch-ba Mon Dec 17 20:17:42 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/11/29 22:10:17 drochner Exp $
-
---- docs/reference/gtk/Makefile.in.orig        2007-11-28 17:33:40.000000000 +0100
-+++ docs/reference/gtk/Makefile.in
-@@ -998,6 +998,10 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_
-       cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-       touch html-build.stamp
- 
-+# XXX temporary hack
-+just-copy-images:
-+      cd $(srcdir) && cp $(HTML_IMAGES) html
-+
- ##############
- 
- clean-local: