From d4cc8ff2cda2e62c9bf7fa99826449c10dc60f4d Mon Sep 17 00:00:00 2001 From: marcm Date: Tue, 23 Sep 2003 06:12:41 +0000 Subject: [PATCH] Bulk update of GTK+2 and GTK+2 requirements. deve/glib2 2.2.2 -> 2.2.3 devel/pango 1.2.3 -> 1.2.5 x11/gtk+2 2.2.2 -> 2.2.4 These are minor bugfix updates to the GTK 2.2 series but are starting to be required by some GTK & Gnome apps. --- devel/glib2/Makefile | 6 +++--- devel/glib2/distinfo | 6 +++--- devel/glib2/pkg/PFRAG.shared | 10 +++++----- devel/glib2/pkg/PLIST | 10 +++++++++- devel/pango/Makefile | 6 +++--- devel/pango/distinfo | 6 +++--- .../pango/patches/patch-examples_Makefile_in | 8 ++++---- devel/pango/patches/patch-modules_Makefile_in | 10 +++++----- devel/pango/patches/patch-pango_Makefile_in | 16 ++++++++-------- devel/pango/patches/patch-pango_pc_in | 8 ++++---- devel/pango/pkg/PFRAG.shared | 10 +++++----- devel/pango/pkg/PLIST | 3 ++- x11/gtk+2/Makefile | 6 +++--- x11/gtk+2/distinfo | 6 +++--- x11/gtk+2/patches/patch-gtk_Makefile_in | 8 ++++---- .../patches/patch-gtk_stock-icons_Makefile_in | 12 ++++++++++++ .../patches/patch-modules_input_Makefile_in | 8 ++++---- x11/gtk+2/pkg/PFRAG.shared | 10 +++++----- x11/gtk+2/pkg/PLIST | 19 ++++++++++++++++++- 19 files changed, 103 insertions(+), 65 deletions(-) create mode 100644 x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 6846d1ead87..2f78409cae4 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2003/06/30 03:55:29 marcm Exp $ +# $OpenBSD: Makefile,v 1.10 2003/09/23 06:12:41 marcm Exp $ COMMENT= "general-purpose utility library" COMMENT-docs= "glib2 documentation" -VERSION= 2.2.2 +VERSION= 2.2.3 DISTNAME= glib-${VERSION} PKGNAME= glib2-${VERSION} PKGNAME-docs= glib2-docs-${VERSION} @@ -30,7 +30,7 @@ BUILD_DEPENDS= :pkgconfig->=0.14:devel/pkgconfig .endif # library versions (major:minor) -OBSD_LIB_VERSION= 0:10 +OBSD_LIB_VERSION= 0:11 USE_GMAKE= Yes SEPARATE_BUILD= simple diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 3a0513c4a3f..1db9f25b5d7 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,3 +1,3 @@ -MD5 (glib-2.2.2.tar.bz2) = 3e9a9512943c81a78cafa0536dcc8b41 -RMD160 (glib-2.2.2.tar.bz2) = bd621202b1b1d0edababdca1bc86a0b9d0af4ec2 -SHA1 (glib-2.2.2.tar.bz2) = c1bdb94432caf858a99d2805f8e1f3b140b1acbe +MD5 (glib-2.2.3.tar.bz2) = aa214a10d873b68ddd67cd9de2ccae55 +RMD160 (glib-2.2.3.tar.bz2) = 1942ee58592dcb1f2d109fa65d172b1973f48df6 +SHA1 (glib-2.2.3.tar.bz2) = 05580cbe110b94dd5020a07cf6d380190a2a13af diff --git a/devel/glib2/pkg/PFRAG.shared b/devel/glib2/pkg/PFRAG.shared index 4a79fb809f5..46741761975 100644 --- a/devel/glib2/pkg/PFRAG.shared +++ b/devel/glib2/pkg/PFRAG.shared @@ -1,6 +1,6 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2003/06/30 03:55:29 marcm Exp $ -lib/libglib-2.0.so.0.10 -lib/libgmodule-2.0.so.0.10 -lib/libgobject-2.0.so.0.10 -lib/libgthread-2.0.so.0.10 +@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $ +lib/libglib-2.0.so.0.11 +lib/libgmodule-2.0.so.0.11 +lib/libgobject-2.0.so.0.11 +lib/libgthread-2.0.so.0.11 DYNLIBDIR(%D/lib) diff --git a/devel/glib2/pkg/PLIST b/devel/glib2/pkg/PLIST index c41d4942a33..7c0130dbb52 100644 --- a/devel/glib2/pkg/PLIST +++ b/devel/glib2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2003/07/05 07:16:08 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.7 2003/09/23 06:12:41 marcm Exp $ bin/glib-genmarshal bin/glib-gettextize bin/glib-mkenums @@ -86,6 +86,8 @@ man/man1/glib-mkenums.1 share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/po/Makefile.in.in +share/gtk-doc/html/glib/ix01.html +share/gtk-doc/html/gobject/ix01.html share/locale/am/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo @@ -97,6 +99,7 @@ share/locale/cy/LC_MESSAGES/glib20.mo share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo +share/locale/eo/LC_MESSAGES/glib20.mo share/locale/es/LC_MESSAGES/glib20.mo share/locale/et/LC_MESSAGES/glib20.mo share/locale/eu/LC_MESSAGES/glib20.mo @@ -107,6 +110,7 @@ share/locale/gl/LC_MESSAGES/glib20.mo share/locale/he/LC_MESSAGES/glib20.mo share/locale/hi/LC_MESSAGES/glib20.mo share/locale/id/LC_MESSAGES/glib20.mo +share/locale/is/LC_MESSAGES/glib20.mo share/locale/it/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo @@ -198,6 +202,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @comment @dirrm share/locale/ja @comment @dirrm share/locale/it/LC_MESSAGES @comment @dirrm share/locale/it +@comment @dirrm share/locale/is/LC_MESSAGES +@comment @dirrm share/locale/is @comment @dirrm share/locale/id/LC_MESSAGES @comment @dirrm share/locale/id @comment @dirrm share/locale/hi/LC_MESSAGES @@ -218,6 +224,8 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @comment @dirrm share/locale/et @comment @dirrm share/locale/es/LC_MESSAGES @comment @dirrm share/locale/es +@comment @dirrm share/locale/eo/LC_MESSAGES +@comment @dirrm share/locale/eo @comment @dirrm share/locale/el/LC_MESSAGES @comment @dirrm share/locale/el @comment @dirrm share/locale/de/LC_MESSAGES diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 287e68a7a0f..f7a91f3db29 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.6 2003/08/13 16:57:51 marcm Exp $ +# $OpenBSD: Makefile,v 1.7 2003/09/23 06:12:41 marcm Exp $ COMMENT= "library for layout and rendering of text" -DISTNAME= pango-1.2.3 +DISTNAME= pango-1.2.5 CATEGORIES= devel x11 HOMEPAGE= http://www.gtk.org @@ -21,7 +21,7 @@ LIB_DEPENDS= glib-2.0.0.8,gmodule-2.0.0.8,gobject-2.0.0.8::devel/glib2 BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig # library versions (major:minor) -OBSD_LIB_VERSION= 0:9 +OBSD_LIB_VERSION= 0:11 SEPARATE_BUILD= concurrent USE_X11= Yes diff --git a/devel/pango/distinfo b/devel/pango/distinfo index 9d835e78302..8fad294be34 100644 --- a/devel/pango/distinfo +++ b/devel/pango/distinfo @@ -1,3 +1,3 @@ -MD5 (pango-1.2.3.tar.bz2) = 12247592ea582907cfd2de81aeb32caf -RMD160 (pango-1.2.3.tar.bz2) = 185feebfe795ae071fa7449f56ad7d5b818e72ee -SHA1 (pango-1.2.3.tar.bz2) = 44bbcec64e5e6324a24f0c4500fb468d258dbe5d +MD5 (pango-1.2.5.tar.bz2) = df00fe3e71cd297010f24f439b6c8ee6 +RMD160 (pango-1.2.5.tar.bz2) = d26336635fd3437e4c824dfb32223a9c2f356016 +SHA1 (pango-1.2.5.tar.bz2) = a4e351635895e5d53b49d3db71ac6f54cecaae89 diff --git a/devel/pango/patches/patch-examples_Makefile_in b/devel/pango/patches/patch-examples_Makefile_in index 39946cf0c16..1612f7cb28a 100644 --- a/devel/pango/patches/patch-examples_Makefile_in +++ b/devel/pango/patches/patch-examples_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-examples_Makefile_in,v 1.7 2003/08/13 16:57:51 marcm Exp $ ---- examples/Makefile.in.orig Sun Jun 8 21:41:51 2003 -+++ examples/Makefile.in Thu Jun 19 09:18:58 2003 -@@ -527,7 +527,7 @@ pango.modules: +$OpenBSD: patch-examples_Makefile_in,v 1.8 2003/09/23 06:12:41 marcm Exp $ +--- examples/Makefile.in.orig 2003-08-27 08:39:14.000000000 -0700 ++++ examples/Makefile.in 2003-09-05 11:47:52.000000000 -0700 +@@ -418,7 +418,7 @@ pango.modules: if find ../modules -name '*.so' | grep 'so' > /dev/null ; then \ echo "Writing a pango.modules file to use when running examples before installing Pango."; \ (cd ../modules && \ diff --git a/devel/pango/patches/patch-modules_Makefile_in b/devel/pango/patches/patch-modules_Makefile_in index 303e0813c42..477d480e28a 100644 --- a/devel/pango/patches/patch-modules_Makefile_in +++ b/devel/pango/patches/patch-modules_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_Makefile_in,v 1.4 2003/06/30 03:57:38 marcm Exp $ ---- modules/Makefile.in.orig Sun Jun 8 21:41:47 2003 -+++ modules/Makefile.in Thu Jun 19 09:18:58 2003 -@@ -123,6 +123,7 @@ WIN32_LIBS = @WIN32_LIBS@ +$OpenBSD: patch-modules_Makefile_in,v 1.5 2003/09/23 06:12:41 marcm Exp $ +--- modules/Makefile.in.orig 2003-08-27 08:39:02.000000000 -0700 ++++ modules/Makefile.in 2003-09-05 11:47:52.000000000 -0700 +@@ -119,6 +119,7 @@ WIN32_LIBS = @WIN32_LIBS@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ ms_librarian = @ms_librarian@ @@ -9,7 +9,7 @@ $OpenBSD: patch-modules_Makefile_in,v 1.4 2003/06/30 03:57:38 marcm Exp $ SUBDIRS = \ arabic \ -@@ -344,21 +345,11 @@ maintainer-clean-generic clean mostlycle +@@ -340,21 +341,11 @@ maintainer-clean-generic clean mostlycle install-data-local: diff --git a/devel/pango/patches/patch-pango_Makefile_in b/devel/pango/patches/patch-pango_Makefile_in index 31a222cacde..f7ff0b76e75 100644 --- a/devel/pango/patches/patch-pango_Makefile_in +++ b/devel/pango/patches/patch-pango_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-pango_Makefile_in,v 1.3 2003/06/30 03:57:38 marcm Exp $ ---- pango/Makefile.in.orig Sun Jun 8 21:41:45 2003 -+++ pango/Makefile.in Thu Jun 19 09:18:58 2003 -@@ -223,7 +223,7 @@ libpangox_1_0_la_SOURCES = \ +$OpenBSD: patch-pango_Makefile_in,v 1.4 2003/09/23 06:12:41 marcm Exp $ +--- pango/Makefile.in.orig 2003-08-27 08:38:57.000000000 -0700 ++++ pango/Makefile.in 2003-09-05 11:47:52.000000000 -0700 +@@ -217,7 +217,7 @@ libpangox_1_0_la_SOURCES = \ libpango_1_0_la_LDFLAGS = \ @@ -10,8 +10,8 @@ $OpenBSD: patch-pango_Makefile_in,v 1.3 2003/06/30 03:57:38 marcm Exp $ $(GLIB_LIBS) \ $(no_undefined) $(pango_export_symbols) -@@ -231,7 +231,7 @@ libpango_1_0_la_LDFLAGS = \ - @HAVE_FRIBIDI_FALSE@libpango_1_0_la_LIBADD = @HAVE_FRIBIDI_FALSE@mini-fribidi/libmini-fribidi.la $(pango_win32res) +@@ -225,7 +225,7 @@ libpango_1_0_la_LDFLAGS = \ + libpango_1_0_la_LIBADD = mini-fribidi/libmini-fribidi.la $(pango_win32res) libpango_1_0_la_DEPENDENCIES = $(pango_win32res) -libpangox_1_0_la_LDFLAGS = -version-info $(LT_VERSION_INFO) @@ -19,7 +19,7 @@ $OpenBSD: patch-pango_Makefile_in,v 1.3 2003/06/30 03:57:38 marcm Exp $ libpangox_1_0_la_LIBADD = libpango-$(PANGO_API_VERSION).la $(INCLUDED_X_MODULES) $(X_LIBS) $(X_EXTRA_LIBS) libpangox_1_0_la_DEPENDENCIES = $(INCLUDED_X_MODULES) libpango-$(PANGO_API_VERSION).la -@@ -258,7 +258,7 @@ libpangoxft_1_0_la_SOURCES = \ +@@ -252,7 +252,7 @@ libpangoxft_1_0_la_SOURCES = \ module-defs-xft.c @@ -28,7 +28,7 @@ $OpenBSD: patch-pango_Makefile_in,v 1.3 2003/06/30 03:57:38 marcm Exp $ libpangoxft_1_0_la_LIBADD = opentype/libpango-ot.la libpango-$(PANGO_API_VERSION).la $(INCLUDED_XFT_MODULES) $(XFT_LIBS) libpangoxft_1_0_la_DEPENDENCIES = $(INCLUDED_XFT_MODULES) libpango-$(PANGO_API_VERSION).la -@@ -270,7 +270,7 @@ libpangoft2_1_0_la_SOURCES = \ +@@ -264,7 +264,7 @@ libpangoft2_1_0_la_SOURCES = \ module-defs-ft2.c diff --git a/devel/pango/patches/patch-pango_pc_in b/devel/pango/patches/patch-pango_pc_in index 0e92f3e6b28..6e39fc2132d 100644 --- a/devel/pango/patches/patch-pango_pc_in +++ b/devel/pango/patches/patch-pango_pc_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-pango_pc_in,v 1.2 2002/08/02 06:50:05 nino Exp $ ---- pango.pc.in.orig Wed Mar 6 18:04:39 2002 -+++ pango.pc.in Fri Aug 2 07:11:44 2002 +$OpenBSD: patch-pango_pc_in,v 1.3 2003/09/23 06:12:41 marcm Exp $ +--- pango.pc.in.orig 2003-07-24 12:39:24.000000000 -0700 ++++ pango.pc.in 2003-09-05 11:51:12.000000000 -0700 @@ -9,6 +9,6 @@ Name: Pango Description: Internationalized text handling Version: @VERSION@ - Requires: @FRIBIDI_PC@glib-2.0,gobject-2.0,gmodule-2.0 + Requires: glib-2.0,gobject-2.0,gmodule-2.0 -Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ +Libs: -L${libdir} @PKGCONFIG_X_LIBS@ -lpango-@PANGO_API_VERSION@ Cflags: -I${includedir}/pango-1.0 diff --git a/devel/pango/pkg/PFRAG.shared b/devel/pango/pkg/PFRAG.shared index 7ff3e86ea97..6b9bc529cf8 100644 --- a/devel/pango/pkg/PFRAG.shared +++ b/devel/pango/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2003/06/30 03:57:38 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $ lib/pango/1.2.0/modules/pango-arabic-ft2.so lib/pango/1.2.0/modules/pango-arabic-x.so lib/pango/1.2.0/modules/pango-arabic-xft.so @@ -21,8 +21,8 @@ lib/pango/1.2.0/modules/pango-tamil-x.so lib/pango/1.2.0/modules/pango-thai-ft2.so lib/pango/1.2.0/modules/pango-thai-x.so lib/pango/1.2.0/modules/pango-thai-xft.so -lib/libpango-1.0.so.0.9 -lib/libpangoft2-1.0.so.0.9 -lib/libpangox-1.0.so.0.9 -lib/libpangoxft-1.0.so.0.9 +lib/libpango-1.0.so.0.11 +lib/libpangoft2-1.0.so.0.11 +lib/libpangox-1.0.so.0.11 +lib/libpangoxft-1.0.so.0.11 DYNLIBDIR(%D/lib) diff --git a/devel/pango/pkg/PLIST b/devel/pango/pkg/PLIST index 775b3861af8..312b71a3423 100644 --- a/devel/pango/pkg/PLIST +++ b/devel/pango/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2003/08/23 19:52:47 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.6 2003/09/23 06:12:41 marcm Exp $ bin/pango-querymodules include/pango-1.0/pango/pango-attributes.h include/pango-1.0/pango/pango-break.h @@ -85,6 +85,7 @@ share/gtk-doc/html/pango/PangoMarkupFormat.html share/gtk-doc/html/pango/home.png share/gtk-doc/html/pango/index.html share/gtk-doc/html/pango/index.sgml +share/gtk-doc/html/pango/ix01.html share/gtk-doc/html/pango/layout.gif share/gtk-doc/html/pango/left.png share/gtk-doc/html/pango/lowlevel.html diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 01b304e47a7..f768af77131 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.10 2003/08/24 20:48:55 sturm Exp $ +# $OpenBSD: Makefile,v 1.11 2003/09/23 06:12:41 marcm Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} COMMENT= "multi-platform graphical toolkit" COMMENT-docs= "gtk+-2 documentation" -VERSION= 2.2.2 +VERSION= 2.2.4 DISTNAME= gtk+-${VERSION} PKGNAME= gtk+2-${VERSION} PKGNAME-docs= gtk+2-docs-${VERSION} @@ -37,7 +37,7 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig .endif # library versions (major:minor) -OBSD_LIB_VERSION= 0:12 +OBSD_LIB_VERSION= 0:14 USE_X11= Yes USE_GMAKE= Yes diff --git a/x11/gtk+2/distinfo b/x11/gtk+2/distinfo index 7ab5491934d..d144d8cb054 100644 --- a/x11/gtk+2/distinfo +++ b/x11/gtk+2/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk+-2.2.2.tar.bz2) = 5a7c639f0f2d682bdc17e3f81c17c79c -RMD160 (gtk+-2.2.2.tar.bz2) = c7d0e4f2719b1201254f58b0fb429be9528f3a58 -SHA1 (gtk+-2.2.2.tar.bz2) = 5d4ab9373e8938017f9bcdd3b0b6d95457d08812 +MD5 (gtk+-2.2.4.tar.bz2) = 605332199533e73bc6eec481fb4f1671 +RMD160 (gtk+-2.2.4.tar.bz2) = 4e072c9b78c7efc696ff0981de891761a32182fd +SHA1 (gtk+-2.2.4.tar.bz2) = ef3d3d9c044f625d8dda25d62dfc0ac50a1024c6 diff --git a/x11/gtk+2/patches/patch-gtk_Makefile_in b/x11/gtk+2/patches/patch-gtk_Makefile_in index 39a2eb090a5..944a12e5cd8 100644 --- a/x11/gtk+2/patches/patch-gtk_Makefile_in +++ b/x11/gtk+2/patches/patch-gtk_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-gtk_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $ ---- gtk/Makefile.in.orig Mon Jun 9 14:26:09 2003 -+++ gtk/Makefile.in Thu Jun 19 09:54:26 2003 +$OpenBSD: patch-gtk_Makefile_in,v 1.5 2003/09/23 06:12:41 marcm Exp $ +--- gtk/Makefile.in.orig 2003-09-04 10:18:40.000000000 -0700 ++++ gtk/Makefile.in 2003-09-05 13:45:45.000000000 -0700 @@ -218,7 +218,6 @@ gtarget = @gdktarget@ libgtkincludedir = $(includedir)/gtk-2.0/gtk LDFLAGS = @STRIP_BEGIN@ \ @@ -9,7 +9,7 @@ $OpenBSD: patch-gtk_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $ -export-dynamic \ -rpath $(libdir) \ $(no_undefined) \ -@@ -687,7 +686,7 @@ X_CFLAGS = @X_CFLAGS@ +@@ -689,7 +688,7 @@ X_CFLAGS = @X_CFLAGS@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ diff --git a/x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in b/x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in new file mode 100644 index 00000000000..57699a232a8 --- /dev/null +++ b/x11/gtk+2/patches/patch-gtk_stock-icons_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-gtk_stock-icons_Makefile_in,v 1.1 2003/09/23 06:12:41 marcm Exp $ +--- gtk/stock-icons/Makefile.in.orig 2003-09-04 10:18:44.000000000 -0700 ++++ gtk/stock-icons/Makefile.in 2003-09-05 14:43:19.000000000 -0700 +@@ -446,7 +446,7 @@ VARIABLES6 = @STRIP_BEGIN@ \ + noinst_DATA = gtkstockpixbufs.h + CLEANFILES = $(noinst_DATA) + @CROSS_COMPILING_TRUE@pixbuf_csource = @CROSS_COMPILING_TRUE@$(GDK_PIXBUF_CSOURCE) +-@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource ++@CROSS_COMPILING_FALSE@pixbuf_csource = @CROSS_COMPILING_FALSE@LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource + @CROSS_COMPILING_TRUE@pixbuf_csource_deps = + @CROSS_COMPILING_FALSE@pixbuf_csource_deps = @CROSS_COMPILING_FALSE@$(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource $(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders + diff --git a/x11/gtk+2/patches/patch-modules_input_Makefile_in b/x11/gtk+2/patches/patch-modules_input_Makefile_in index 7b58a6e8d2d..525e5fce221 100644 --- a/x11/gtk+2/patches/patch-modules_input_Makefile_in +++ b/x11/gtk+2/patches/patch-modules_input_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_input_Makefile_in,v 1.4 2003/06/30 03:59:03 marcm Exp $ ---- modules/input/Makefile.in.orig Mon Jun 9 14:26:12 2003 -+++ modules/input/Makefile.in Thu Jun 19 09:54:26 2003 -@@ -823,7 +823,8 @@ install-data-local: +$OpenBSD: patch-modules_input_Makefile_in,v 1.5 2003/09/23 06:12:41 marcm Exp $ +--- modules/input/Makefile.in.orig 2003-09-04 10:18:53.000000000 -0700 ++++ modules/input/Makefile.in 2003-09-05 13:45:46.000000000 -0700 +@@ -856,7 +856,8 @@ install-data-local: fi gtk.immodules: Makefile.am $(module_LTLIBRARIES) diff --git a/x11/gtk+2/pkg/PFRAG.shared b/x11/gtk+2/pkg/PFRAG.shared index fe4ce92310a..b0d273348b5 100644 --- a/x11/gtk+2/pkg/PFRAG.shared +++ b/x11/gtk+2/pkg/PFRAG.shared @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.4 2003/06/30 03:59:03 marcm Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.5 2003/09/23 06:12:41 marcm Exp $ lib/gtk-2.0/2.2.0/immodules/im-am-et.so lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so lib/gtk-2.0/2.2.0/immodules/im-hangul.so @@ -22,8 +22,8 @@ lib/gtk-2.0/2.2.0/loaders/libpixbufloader-tiff.so lib/gtk-2.0/2.2.0/loaders/libpixbufloader-wbmp.so lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xbm.so lib/gtk-2.0/2.2.0/loaders/libpixbufloader-xpm.so -lib/libgdk-x11-2.0.so.0.12 -lib/libgdk_pixbuf-2.0.so.0.12 -lib/libgdk_pixbuf_xlib-2.0.so.0.12 -lib/libgtk-x11-2.0.so.0.12 +lib/libgdk-x11-2.0.so.0.14 +lib/libgdk_pixbuf-2.0.so.0.14 +lib/libgdk_pixbuf_xlib-2.0.so.0.14 +lib/libgtk-x11-2.0.so.0.14 DYNLIBDIR(%D/lib) diff --git a/x11/gtk+2/pkg/PLIST b/x11/gtk+2/pkg/PLIST index 43c9ab31dff..4659ee3a877 100644 --- a/x11/gtk+2/pkg/PLIST +++ b/x11/gtk+2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2003/08/23 19:52:47 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.11 2003/09/23 06:12:41 marcm Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo @@ -188,6 +188,8 @@ include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h lib/gtk-2.0/2.2.0/immodules/im-am-et.la +lib/gtk-2.0/2.2.0/immodules/im-cedilla.la +lib/gtk-2.0/2.2.0/immodules/im-cedilla.so lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la lib/gtk-2.0/2.2.0/immodules/im-hangul.la lib/gtk-2.0/2.2.0/immodules/im-inuktitut.la @@ -254,7 +256,11 @@ share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c +share/gtk-doc/html/gdk-pixbuf/ix01.html +share/gtk-doc/html/gdk/ix01.html +share/gtk-doc/html/gtk/ix01.html share/locale/am/LC_MESSAGES/gtk20.mo +share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20.mo @@ -279,6 +285,7 @@ share/locale/hr/LC_MESSAGES/gtk20.mo share/locale/hu/LC_MESSAGES/gtk20.mo share/locale/ia/LC_MESSAGES/gtk20.mo share/locale/id/LC_MESSAGES/gtk20.mo +share/locale/is/LC_MESSAGES/gtk20.mo share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo @@ -288,6 +295,7 @@ share/locale/mk/LC_MESSAGES/gtk20.mo share/locale/ml/LC_MESSAGES/gtk20.mo share/locale/mn/LC_MESSAGES/gtk20.mo share/locale/ms/LC_MESSAGES/gtk20.mo +share/locale/ne/LC_MESSAGES/gtk20.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20.mo share/locale/no/LC_MESSAGES/gtk20.mo @@ -298,6 +306,7 @@ share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20.mo +share/locale/sq/LC_MESSAGES/gtk20.mo share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sr@Latn/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo @@ -341,6 +350,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @comment @dirrm share/locale/sr@Latn @comment @dirrm share/locale/sr/LC_MESSAGES @comment @dirrm share/locale/sr +@comment @dirrm share/locale/sq/LC_MESSAGES +@comment @dirrm share/locale/sq @comment @dirrm share/locale/sl/LC_MESSAGES @comment @dirrm share/locale/sl @comment @dirrm share/locale/sk/LC_MESSAGES @@ -361,6 +372,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @comment @dirrm share/locale/nn @comment @dirrm share/locale/nl/LC_MESSAGES @comment @dirrm share/locale/nl +@comment @dirrm share/locale/ne/LC_MESSAGES +@comment @dirrm share/locale/ne @comment @dirrm share/locale/ms/LC_MESSAGES @comment @dirrm share/locale/ms @comment @dirrm share/locale/mn/LC_MESSAGES @@ -379,6 +392,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @comment @dirrm share/locale/ja @comment @dirrm share/locale/it/LC_MESSAGES @comment @dirrm share/locale/it +@comment @dirrm share/locale/is/LC_MESSAGES +@comment @dirrm share/locale/is @comment @dirrm share/locale/id/LC_MESSAGES @comment @dirrm share/locale/id @comment @dirrm share/locale/ia/LC_MESSAGES @@ -427,6 +442,8 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @comment @dirrm share/locale/be @comment @dirrm share/locale/az/LC_MESSAGES @comment @dirrm share/locale/az +@comment @dirrm share/locale/ar/LC_MESSAGES +@comment @dirrm share/locale/ar @comment @dirrm share/locale/am/LC_MESSAGES @comment @dirrm share/locale/am @comment @dirrm share/locale