[pkgsrc/trunk]: pkgsrc/x11/gtk2 Update to 2.4.3. While here, rework the way ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/gtk2 Update to 2.4.3. While here, rework the way ...
From: jmmv <jmmv%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:13:41 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8b01be01e38
branches:  trunk
changeset: 476782:c8b01be01e38
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sun Jun 20 20:12:20 2004 +0000

description:
Update to 2.4.3.  While here, rework the way the libdata/ files are handled
by creating/deleting them from the (de)install scripts (and not registered
in the PLIST).  This allows pkg_tarup to work properly and also avoids some
warnings during 'make replace'.

Changes since 2.4.2:
* GtkButton
 - Give extra space to children of !CAN_FOCUS buttons [Matthias Clasen]
* GtkFileChooser
 - Make DND work when the dialog is modal [Federico Mena Quintero]
* GtkToolbar
 - Don't show empty overflow menu [Soeren Sandmann]
 - Don't show initial separator in overflow menu [Soeren]
 - Handle dynamic changes to overflow menu [Soeren]
* Documentation improvements [Bastien Nocera, Matthias]
* Other bug fixes [Matthias, Soeren, Sven Neumann]
* Updated translations (hu,ne)

diffstat:

 x11/gtk2/Makefile             |   9 +++++++--
 x11/gtk2/PLIST                |  16 ++++++++--------
 x11/gtk2/distinfo             |   6 +++---
 x11/gtk2/files/immodules.tmpl |  11 +++++++++--
 x11/gtk2/files/loaders.tmpl   |  11 +++++++++--
 x11/gtk2/modules.mk           |  12 ++++++++++--
 6 files changed, 46 insertions(+), 19 deletions(-)

diffs (208 lines):

diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/Makefile Sun Jun 20 20:12:20 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2004/06/04 17:55:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.56 2004/06/20 20:12:20 jmmv Exp $
 #
 
-DISTNAME=              gtk+-2.4.2
+DISTNAME=              gtk+-2.4.3
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=            x11
 MASTER_SITES=          ftp://ftp.gtk.org/pub/gtk/v2.4/ \
@@ -40,6 +40,8 @@
 PKGCONFIG_OVERRIDE+=   gdk-pixbuf-2.0.pc.in
 PKGCONFIG_OVERRIDE+=   contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
 
+MAKE_DIRS+=            ${PREFIX}/libdata/gtk-2.0
+
 BUILD_DIRS=            ${WRKSRC} ${WRKSRC}/demos/gtk-demo
 
 PRINT_PLIST_AWK+=      /^@dirrm share\/themes\/Default$$/ \
@@ -63,6 +65,9 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.4.0/engines
        ${INSTALL_DATA_DIR} ${PREFIX}/lib/gtk-2.0/2.4.0/filesystems
 
+_BUILDING_GTK2=        yes
+.include "modules.mk"
+
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/PLIST
--- a/x11/gtk2/PLIST    Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/PLIST    Sun Jun 20 20:12:20 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2004/06/04 17:55:01 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.28 2004/06/20 20:12:20 jmmv Exp $
 bin/gdk-pixbuf-csource
 bin/gdk-pixbuf-query-loaders
 bin/gtk-demo
@@ -289,30 +289,28 @@
 lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.400
-lib/libgdk-x11-2.0.so.400.2
+lib/libgdk-x11-2.0.so.400.3
 lib/libgdk_pixbuf-2.0.a
 lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.400
-lib/libgdk_pixbuf-2.0.so.400.2
+lib/libgdk_pixbuf-2.0.so.400.3
 lib/libgdk_pixbuf_xlib-2.0.a
 lib/libgdk_pixbuf_xlib-2.0.la
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.400
-lib/libgdk_pixbuf_xlib-2.0.so.400.2
+lib/libgdk_pixbuf_xlib-2.0.so.400.3
 lib/libgtk-x11-2.0.a
 lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.400
-lib/libgtk-x11-2.0.so.400.2
+lib/libgtk-x11-2.0.so.400.3
 lib/pkgconfig/gdk-2.0.pc
 lib/pkgconfig/gdk-pixbuf-2.0.pc
 lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc
 lib/pkgconfig/gdk-x11-2.0.pc
 lib/pkgconfig/gtk+-2.0.pc
 lib/pkgconfig/gtk+-x11-2.0.pc
-libdata/gtk-2.0/gdk-pixbuf.loaders
-libdata/gtk-2.0/gtk.immodules
 man/man1/gdk-pixbuf-csource.1
 man/man1/gdk-pixbuf-query-loaders.1
 man/man1/gtk-query-immodules-2.0.1
@@ -350,6 +348,7 @@
 share/doc/gdk-pixbuf/right.png
 share/doc/gdk-pixbuf/rn01.html
 share/doc/gdk-pixbuf/rn02.html
+share/doc/gdk-pixbuf/style.css
 share/doc/gdk-pixbuf/up.png
 share/doc/gdk/GdkDisplay.html
 share/doc/gdk/GdkDisplayManager.html
@@ -451,6 +450,7 @@
 share/doc/gdk/spider.png
 share/doc/gdk/spraycan.png
 share/doc/gdk/star.png
+share/doc/gdk/style.css
 share/doc/gdk/target.png
 share/doc/gdk/tcross.png
 share/doc/gdk/top_left_arrow.png
@@ -758,6 +758,7 @@
 share/doc/gtk/stock_zoom_fit_24.png
 share/doc/gtk/stock_zoom_in_24.png
 share/doc/gtk/stock_zoom_out_24.png
+share/doc/gtk/style.css
 share/doc/gtk/ui-manager.html
 share/doc/gtk/up.png
 share/gtk-2.0/demo/alphatest.png
@@ -952,7 +953,6 @@
 @dirrm share/doc/gtk
 @dirrm share/doc/gdk-pixbuf
 @dirrm share/doc/gdk
-@dirrm libdata/gtk-2.0
 @exec ${MKDIR} %D/lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0/modules
 @dirrm lib/gtk-2.0/include
diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/distinfo Sun Jun 20 20:12:20 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2004/06/04 17:55:01 jmmv Exp $
+$NetBSD: distinfo,v 1.27 2004/06/20 20:12:20 jmmv Exp $
 
-SHA1 (gtk+-2.4.2.tar.bz2) = b01d890122b5b9061658c41860e9156faf5fca15
-Size (gtk+-2.4.2.tar.bz2) = 9020171 bytes
+SHA1 (gtk+-2.4.3.tar.bz2) = 9712df22a4409e0225aceae884768ba1ae5c4ed4
+Size (gtk+-2.4.3.tar.bz2) = 9256514 bytes
 SHA1 (patch-aa) = 05be7ab51f2e9297f68e4b51a0086ff64ace970b
 SHA1 (patch-ab) = 00ffc4436c64bd45042232a0a376d8a69de35d40
 SHA1 (patch-ac) = 42dff743263b141029a814d7dec9fdc5637a3cff
diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/files/immodules.tmpl
--- a/x11/gtk2/files/immodules.tmpl     Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/files/immodules.tmpl     Sun Jun 20 20:12:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: immodules.tmpl,v 1.1 2004/01/22 12:38:47 jmmv Exp $
+# $NetBSD: immodules.tmpl,v 1.2 2004/06/20 20:12:20 jmmv Exp $
 #
 # Rebuild the GTK2 immodules database.
 #
@@ -7,9 +7,16 @@
 GTK_QUERY_IMMODULES="@GTK_QUERY_IMMODULES@"
 
 case ${STAGE} in
-POST-INSTALL|POST-DEINSTALL)
+POST-INSTALL)
        ${GTK_QUERY_IMMODULES} > ${GTK_IMMODULES_DB}
        ;;
+DEINSTALL)
+       [ "${PKGBASE}" = "gtk2+" ] && ${RM} -f ${GTK_IMMODULES_DB}
+       ;;
+POST-DEINSTALL)
+       [ "${PKGBASE}" != "gtk2+" ] && \
+               ${GTK_QUERY_IMMODULES} > ${GTK_IMMODULES_DB}
+       ;;
 *)
        ;;
 esac
diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/files/loaders.tmpl
--- a/x11/gtk2/files/loaders.tmpl       Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/files/loaders.tmpl       Sun Jun 20 20:12:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: loaders.tmpl,v 1.1 2004/01/22 12:38:47 jmmv Exp $
+# $NetBSD: loaders.tmpl,v 1.2 2004/06/20 20:12:20 jmmv Exp $
 #
 # Rebuild the GTK2 gdk-pixbuf database.
 #
@@ -7,9 +7,16 @@
 GDK_PIXBUF_QUERY_LOADERS="@GDK_PIXBUF_QUERY_LOADERS@"
 
 case ${STAGE} in
-POST-INSTALL|POST-DEINSTALL)
+POST-INSTALL)
        ${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
        ;;
+DEINSTALL)
+       [ "${PKGBASE}" = "gtk2+" ] && ${RM} -f ${GDK_PIXBUF_LOADERS_DB}
+       ;;
+POST-DEINSTALL)
+       [ "${PKGBASE}" != "gtk2+" ] && \
+               ${GDK_PIXBUF_QUERY_LOADERS} > ${GDK_PIXBUF_LOADERS_DB}
+       ;;
 *)
        ;;
 esac
diff -r 123da4290c7a -r c8b01be01e38 x11/gtk2/modules.mk
--- a/x11/gtk2/modules.mk       Sun Jun 20 20:07:03 2004 +0000
+++ b/x11/gtk2/modules.mk       Sun Jun 20 20:12:20 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.8 2004/04/27 22:43:29 snj Exp $
+# $NetBSD: modules.mk,v 1.9 2004/06/20 20:12:20 jmmv Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GTK2 modules.  It takes care of rebuilding the corresponding databases at
@@ -15,6 +15,12 @@
 GTK_QUERY_IMMODULES=   ${BUILDLINK_PREFIX.gtk2}/bin/gtk-query-immodules-2.0
 GDK_PIXBUF_QUERY_LOADERS=      ${BUILDLINK_PREFIX.gtk2}/bin/gdk-pixbuf-query-loaders
 
+.if defined(_BUILDING_GTK2)
+BUILDLINK_PREFIX.gtk2= ${PREFIX}
+GTK2_IMMODULES=                YES
+GTK2_LOADERS=          YES
+.endif
+
 .if defined(GTK2_IMMODULES) && !empty(GTK2_IMMODULES:M[Yy][Ee][Ss])
 FILES_SUBST+=          GTK_IMMODULES_DB="${GTK_IMMODULES_DB}"
 FILES_SUBST+=          GTK_QUERY_IMMODULES="${GTK_QUERY_IMMODULES}"
@@ -36,6 +42,8 @@
 PRINT_PLIST_AWK+=      /^libdata\/gtk-2.0/ { next; }
 PRINT_PLIST_AWK+=      /^@dirrm libdata\/gtk-2.0/ { next; }
 
-.include "../../x11/gtk2/buildlink3.mk"
+.if !defined(_BUILDING_GTK2)
+.  include "../../x11/gtk2/buildlink3.mk"
+.endif
 
 .endif                 # GTK2_MODULES_MK
Prev by Date: [pkgsrc/trunk]: pkgsrc/comms Per announcement to tech-pkg, ifcico-cm is now h...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/epiphany Update to 1.2.6:
Previous by Thread: [pkgsrc/trunk]: pkgsrc/comms Per announcement to tech-pkg, ifcico-cm is now h...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/epiphany Update to 1.2.6:
Indexes:
Home | Main Index | Thread Index | Old Index