diff options
Diffstat (limited to 'x11/gtk2')
| -rw-r--r-- | x11/gtk2/Makefile | 5 | ||||
| -rw-r--r-- | x11/gtk2/PLIST | 23 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 8 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-aa | 23 |
4 files changed, 35 insertions, 24 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 2f9492b1f09..0c2f6858fc0 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2003/07/17 22:56:30 grant Exp $ +# $NetBSD: Makefile,v 1.32 2003/08/27 10:58:17 wiz Exp $ # -DISTNAME= gtk+-2.2.2 +DISTNAME= gtk+-2.2.3 PKGNAME= ${DISTNAME:S/gtk/gtk2/} -PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.2/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \ diff --git a/x11/gtk2/PLIST b/x11/gtk2/PLIST index 82c4b083aee..b46c9ad6cc1 100644 --- a/x11/gtk2/PLIST +++ b/x11/gtk2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2003/06/27 18:10:15 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.19 2003/08/27 10:58:17 wiz Exp $ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo @@ -190,6 +190,9 @@ include/gtk-2.0/gtk/gtkwindow.h lib/gtk-2.0/2.2.0/immodules/im-am-et.a lib/gtk-2.0/2.2.0/immodules/im-am-et.la lib/gtk-2.0/2.2.0/immodules/im-am-et.so +lib/gtk-2.0/2.2.0/immodules/im-cedilla.a +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.a lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.la lib/gtk-2.0/2.2.0/immodules/im-cyrillic-translit.so @@ -261,22 +264,22 @@ lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.la lib/libgdk-x11-2.0.so lib/libgdk-x11-2.0.so.200 -lib/libgdk-x11-2.0.so.200.2 +lib/libgdk-x11-2.0.so.200.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.200 -lib/libgdk_pixbuf-2.0.so.200.2 +lib/libgdk_pixbuf-2.0.so.200.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.200 -lib/libgdk_pixbuf_xlib-2.0.so.200.2 +lib/libgdk_pixbuf_xlib-2.0.so.200.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.200 -lib/libgtk-x11-2.0.so.200.2 +lib/libgtk-x11-2.0.so.200.3 lib/pkgconfig/gdk-2.0.pc lib/pkgconfig/gdk-pixbuf-2.0.pc lib/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -310,6 +313,7 @@ share/doc/html/gdk-pixbuf/gdk-pixbuf.devhelp share/doc/html/gdk-pixbuf/home.png share/doc/html/gdk-pixbuf/index.html share/doc/html/gdk-pixbuf/index.sgml +share/doc/html/gdk-pixbuf/ix01.html share/doc/html/gdk-pixbuf/left.png share/doc/html/gdk-pixbuf/license.html share/doc/html/gdk-pixbuf/right.png @@ -380,6 +384,7 @@ share/doc/html/gdk/icon.png share/doc/html/gdk/index.html share/doc/html/gdk/index.sgml share/doc/html/gdk/iron_cross.png +share/doc/html/gdk/ix01.html share/doc/html/gdk/left.png share/doc/html/gdk/left_ptr.png share/doc/html/gdk/left_side.png @@ -602,6 +607,7 @@ share/doc/html/gtk/gtkobjects.html share/doc/html/gtk/home.png share/doc/html/gtk/index.html share/doc/html/gtk/index.sgml +share/doc/html/gtk/ix01.html share/doc/html/gtk/left.png share/doc/html/gtk/right.png share/doc/html/gtk/stock_add_24.png @@ -707,6 +713,7 @@ share/gtk-2.0/demo/stock_browser.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gtk20.mo +${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gtk20.mo @@ -731,6 +738,7 @@ ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/ia/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gtk20.mo +${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gtk20.mo @@ -740,6 +748,7 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gtk20.mo +${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gtk20.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gtk20.mo @@ -779,10 +788,10 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec ${MKDIR} %D/lib/gtk-2.0/modules 2>/dev/null || ${TRUE} @dirrm lib/gtk-2.0/modules @dirrm lib/gtk-2.0/include +@exec ${MKDIR} %D/lib/gtk-2.0/engines 2>/dev/null || ${TRUE} +@dirrm lib/gtk-2.0/engines @dirrm lib/gtk-2.0/2.2.0/loaders @dirrm lib/gtk-2.0/2.2.0/immodules -@exec ${MKDIR} %D/lib/gtk-2.0/2.2.0/engines 2>/dev/null || ${TRUE} -@dirrm lib/gtk-2.0/2.2.0/engines @dirrm lib/gtk-2.0/2.2.0 @dirrm lib/gtk-2.0 @dirrm include/gtk-2.0/gtk diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index db367791875..e4761f8c166 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2003/06/10 10:47:04 jmmv Exp $ +$NetBSD: distinfo,v 1.17 2003/08/27 10:58:17 wiz Exp $ -SHA1 (gtk+-2.2.2.tar.bz2) = 5d4ab9373e8938017f9bcdd3b0b6d95457d08812 -Size (gtk+-2.2.2.tar.bz2) = 6975953 bytes -SHA1 (patch-aa) = 1552e92d97d93a403b908bfe8436e131be9f562e +SHA1 (gtk+-2.2.3.tar.bz2) = d9d403f8b266ec2c09cbfeece6150de22146dc31 +Size (gtk+-2.2.3.tar.bz2) = 7103922 bytes +SHA1 (patch-aa) = ba7db037792ffcb8fc3441b7affa973ef89c5fc1 SHA1 (patch-ab) = 1734c8ff78460891a2c0bda4ddf0d798c99a31d3 SHA1 (patch-ac) = 68b0d7da55de5209bed53f3daea1881a634a216f SHA1 (patch-ad) = f514ec4f261a148bde25a9618694df71d7586f6a diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa index 04229a1e29f..4f2ff496393 100644 --- a/x11/gtk2/patches/patch-aa +++ b/x11/gtk2/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.7 2002/12/24 04:07:33 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2003/08/27 10:58:17 wiz Exp $ ---- configure.orig Fri Dec 20 21:55:05 2002 -+++ configure -@@ -12939,11 +12939,11 @@ echo "$as_me: error: Could not find a gd - fi - fi +--- configure.orig 2003-08-27 01:11:43.000000000 +0200 ++++ configure 2003-08-27 01:15:39.000000000 +0200 +@@ -24616,12 +24616,11 @@ + + -GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0" +GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0 gthread-2.0" @@ -12,20 +12,22 @@ $NetBSD: patch-aa,v 1.7 2002/12/24 04:07:33 wiz Exp $ GDK_PIXBUF_EXTRA_CFLAGS= GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" +- +GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS" -@@ -15635,7 +15635,7 @@ fi +@@ -27693,8 +27692,7 @@ GDK_PIXBUF_XLIB_PACKAGES= GDK_PIXBUF_XLIB_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_XLIB_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" +- +GDK_PIXBUF_XLIB_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PIXBUF_XLIB_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_PIXBUF_XLIB_EXTRA_CFLAGS" -@@ -15831,7 +15831,7 @@ LDFLAGS="$saved_ldflags" +@@ -27894,7 +27892,7 @@ GDK_PACKAGES=$PANGO_PACKAGES GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS" @@ -34,11 +36,12 @@ $NetBSD: patch-aa,v 1.7 2002/12/24 04:07:33 wiz Exp $ # # If we aren't writing explicit dependencies, then don't put the extra libraries we need -@@ -15929,7 +15929,7 @@ GTK_PACKAGES=atk +@@ -27997,8 +27995,7 @@ GTK_EXTRA_LIBS= GTK_EXTRA_CFLAGS= - GTK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" + GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" -GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" +- +GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS" |