diff options
| -rw-r--r-- | x11/gtk2/Makefile | 5 | ||||
| -rw-r--r-- | x11/gtk2/PLIST | 5 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 10 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-af | 21 |
4 files changed, 11 insertions, 30 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 5db98fcf534..01111b54c18 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.218 2011/06/16 09:51:50 drochner Exp $ +# $NetBSD: Makefile,v 1.219 2011/07/08 17:20:05 drochner Exp $ -DISTNAME= gtk+-2.24.4 +DISTNAME= gtk+-2.24.5 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/2.24/ \ ${MASTER_SITE_GNOME:=sources/gtk+/2.24/} diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index 560d29d3f9d..09ab2cfccf9 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.76 2011/04/05 17:50:06 drochner Exp $ +@comment $NetBSD: PLIST,v 1.77 2011/07/08 17:20:05 drochner Exp $ bin/gtk-builder-convert bin/gtk-demo bin/gtk-query-immodules-2.0 @@ -350,7 +350,6 @@ share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailMisc.html share/gtk-doc/html/gail-libgail-util/gail-libgail-util-GailTextUtil.html -share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp share/gtk-doc/html/gail-libgail-util/gail-libgail-util.devhelp2 share/gtk-doc/html/gail-libgail-util/home.png share/gtk-doc/html/gail-libgail-util/index.html @@ -431,7 +430,6 @@ share/gtk-doc/html/gdk/gdk-Threads.html share/gtk-doc/html/gdk/gdk-Visuals.html share/gtk-doc/html/gdk/gdk-Windows.html share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html -share/gtk-doc/html/gdk/gdk.devhelp share/gtk-doc/html/gdk/gdk.devhelp2 share/gtk-doc/html/gdk/gobbler.png share/gtk-doc/html/gdk/gumby.png @@ -872,7 +870,6 @@ share/gtk-doc/html/gtk/gtk-update-icon-cache.html share/gtk-doc/html/gtk/gtk-windows.html share/gtk-doc/html/gtk/gtk-x11.html share/gtk-doc/html/gtk/gtk-yes.png -share/gtk-doc/html/gtk/gtk.devhelp share/gtk-doc/html/gtk/gtk.devhelp2 share/gtk-doc/html/gtk/gtk.html share/gtk-doc/html/gtk/gtkbase.html diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index e1878a04ace..f6e0ebbf388 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.135 2011/06/15 15:48:50 drochner Exp $ +$NetBSD: distinfo,v 1.136 2011/07/08 17:20:05 drochner Exp $ -SHA1 (gtk+-2.24.4.tar.bz2) = c15a25ba49eb459b2c4cdc46baedf6cecf08cbcf -RMD160 (gtk+-2.24.4.tar.bz2) = 56a6f731cfdc47686c71f8f6b4253484e08dd230 -Size (gtk+-2.24.4.tar.bz2) = 17607752 bytes +SHA1 (gtk+-2.24.5.tar.bz2) = ddae2c87f6edfae7ed944419ae7f47017af07eec +RMD160 (gtk+-2.24.5.tar.bz2) = 2eb2945a0b64b84521aa86a30255b3439875573a +Size (gtk+-2.24.5.tar.bz2) = 18153880 bytes SHA1 (patch-aa) = 9eec7fc4764b18856455a18b49f1bb101e5e6b11 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 -SHA1 (patch-af) = 169430dd9a0c8ddfd30022f0ba46dabc0093ff1f +SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af index 8eccca313e4..48d796febff 100644 --- a/x11/gtk2/patches/patch-af +++ b/x11/gtk2/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.20 2011/06/15 15:48:50 drochner Exp $ +$NetBSD: patch-af,v 1.21 2011/07/08 17:20:05 drochner Exp $ ---- configure.orig 2011-04-01 21:41:11.000000000 +0000 +--- configure.orig 2011-06-15 23:32:10.000000000 +0000 +++ configure -@@ -22773,7 +22773,7 @@ _ACEOF +@@ -22771,7 +22771,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -11,18 +11,3 @@ $NetBSD: patch-af,v 1.20 2011/06/15 15:48:50 drochner Exp $ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -24724,10 +24724,10 @@ $as_echo "$found_introspection" >&6; } - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} -+# INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+# INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} -+# INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+# INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |