diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-17 09:58:52 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-03-17 09:58:52 +0800 |
| commit | adfd2e93c54e45424860f04fdd496f80ab80c855 (patch) | |
| tree | b3f5736c89f25e2ceb1433232a709b13bb208b5c | |
| parent | 2f54638bec72b4c4d9b21db4ca445e9543fee9a5 (diff) | |
| download | marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar.gz marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar.bz2 marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar.lz marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar.xz marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.tar.zst marcuscom-ports-adfd2e93c54e45424860f04fdd496f80ab80c855.zip | |
Update to 2.4.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2101 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 7 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/distinfo | 4 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c | 16 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/pkg-plist | 8 |
4 files changed, 9 insertions, 26 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index c8ff8348b..ff1158751 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,10 +6,9 @@ # PORTNAME= gtk -PORTVERSION= 2.3.6 -PORTREVISION= 1 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.3,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ ftp://ftp.gtk.org/pub/gtk/v2.3/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -42,7 +41,7 @@ CONFIGURE_ARGS= --enable-static --with-xinput=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -PLIST_SUB= GTK_VERSION="2.2.0" +PLIST_SUB= GTK_VERSION="2.4.0" post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \ diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 4f632a03e..44f12bfe6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtk+-2.3.6.tar.bz2) = 2bb03af55fd797ec31ab60eafc29ff8a -SIZE (gnome2/gtk+-2.3.6.tar.bz2) = 8464480 +MD5 (gnome2/gtk+-2.4.0.tar.bz2) = fd16157de447c7f0a86495ad0dc67a1b +SIZE (gnome2/gtk+-2.4.0.tar.bz2) = 8476610 diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c b/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c deleted file mode 100644 index a2a281fe2..000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk/gtkfilechooserdefault.c.orig Wed Mar 10 16:11:22 2004 -+++ gtk/gtkfilechooserdefault.c Wed Mar 10 16:12:05 2004 -@@ -757,10 +757,12 @@ - GtkFileFolder *parent_folder; - GtkFileInfo *info; - -+ info = NULL; -+ - if (!gtk_file_system_get_parent (file_system, path, &parent_path, error)) - return NULL; - -- parent_folder = gtk_file_system_get_folder (file_system, parent_path, -+ parent_folder = gtk_file_system_get_folder (file_system, parent_path ? parent_path : path, - GTK_FILE_INFO_DISPLAY_NAME - #if 0 - | GTK_FILE_INFO_ICON diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index fccc47450..199f94bf9 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -240,16 +240,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.306 +lib/libgdk-x11-2.0.so.400 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.306 +lib/libgdk_pixbuf-2.0.so.400 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.306 +lib/libgdk_pixbuf_xlib-2.0.so.400 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.306 +lib/libgtk-x11-2.0.so.400 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc |