summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk30
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2001-05-14 12:16:43 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2001-05-14 12:16:43 +0000
commit2a1b69718935cfe20e9151f9c47d4adc42c3b44a (patch)
tree9706790d45e2578f061270cdd82c78ff8a4fde5b /x11-toolkits/gtk30
parentUpdate to 0.16. (diff)
Update to 1.3.5.
Notes
Notes: svn path=/head/; revision=42585
Diffstat (limited to 'x11-toolkits/gtk30')
-rw-r--r--x11-toolkits/gtk30/Makefile5
-rw-r--r--x11-toolkits/gtk30/distinfo2
-rw-r--r--x11-toolkits/gtk30/files/patch-ad20
-rw-r--r--x11-toolkits/gtk30/files/patch-ag10
-rw-r--r--x11-toolkits/gtk30/files/patch-ah12
-rw-r--r--x11-toolkits/gtk30/pkg-plist21
6 files changed, 49 insertions, 21 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index c3d5dfbf4dd5..fbc0068baea1 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gtk
-PORTVERSION= 1.3.4
+PORTVERSION= 1.3.5
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
@@ -19,7 +19,8 @@ DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS= glib-1.3.4:${PORTSDIR}/devel/glib13 \
+LIB_DEPENDS= glib-1.3.5:${PORTSDIR}/devel/glib13 \
+ atk.0:${PORTSDIR}/devel/atk \
pango.0:${PORTSDIR}/x11-toolkits/pango \
png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index daff3ee96489..9ead9e2f1a95 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.3.4.tar.gz) = 95d17ee35ce43c1109296189d2546c52
+MD5 (gtk+-1.3.5.tar.gz) = 17a6f0453cfd79e5b99bcbc4ebbb45df
diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad
index 1a33f494a20d..592577b0bd6c 100644
--- a/x11-toolkits/gtk30/files/patch-ad
+++ b/x11-toolkits/gtk30/files/patch-ad
@@ -1,11 +1,23 @@
---- gtk/gtkrc.c.orig Fri Jul 14 23:18:03 2000
-+++ gtk/gtkrc.c Tue Jul 18 13:41:40 2000
-@@ -392,7 +392,7 @@
+
+$FreeBSD$
+
+--- gtk/gtkrc.c.orig Sun Apr 29 00:15:37 2001
++++ gtk/gtkrc.c Mon May 14 14:49:02 2001
+@@ -333,7 +333,7 @@
+ result = g_strdup (im_module_file);
+ else
+ #ifndef G_OS_WIN32
+- result = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
++ result = g_strdup (GTK_DATA_PREFIX G_DIR_SEPARATOR_S "etc" G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtk.immodules");
+ #else
+ result = g_strdup_printf ("%s\\gtk.immodules", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
+ #endif
+@@ -439,7 +439,7 @@
else
{
#ifndef G_OS_WIN32
- str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk-2.0" G_DIR_SEPARATOR_S "gtkrc");
+ str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtkrc");
#else
- str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());
+ str = g_strdup_printf ("%s\\gtkrc", g_win32_get_package_installation_directory (GETTEXT_PACKAGE, get_gtk_dll_name ()));
#endif
diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag
index 5ebe46b50b9a..80e8096f3e26 100644
--- a/x11-toolkits/gtk30/files/patch-ag
+++ b/x11-toolkits/gtk30/files/patch-ag
@@ -1,14 +1,14 @@
$FreeBSD$
---- gtk/Makefile.in.orig Sun Apr 29 14:57:36 2001
-+++ gtk/Makefile.in Sun Apr 29 14:59:46 2001
-@@ -166,7 +166,7 @@
+--- gtk/Makefile.in.orig Mon May 14 13:48:47 2001
++++ gtk/Makefile.in Mon May 14 13:50:45 2001
+@@ -158,7 +158,7 @@
SUBDIRS = stock-icons
--INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @PANGO_CFLAGS@ @GLIB_CFLAGS@ @more_cflags@ @STRIP_END@
+-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -DGTK_LIBDIR=\"$(libdir)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -DGTK_VERSION=\"@GTK_VERSION@\" -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\" -DG_DISABLE_CONST_RETURNS -I$(top_builddir)/gtk -I$(top_srcdir) -I../gdk -I$(top_srcdir)/gdk -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf @GTK_DEP_CFLAGS@ @STRIP_END@
gtarget = @gdktarget@
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index ff8d93004b4a..e2d0389ddd02 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,18 +1,18 @@
$FreeBSD$
---- docs/Makefile.in.orig Sun Apr 29 15:00:49 2001
-+++ docs/Makefile.in Sun Apr 29 15:01:48 2001
-@@ -124,7 +124,7 @@
+--- docs/Makefile.in.orig Mon May 14 13:52:10 2001
++++ docs/Makefile.in Mon May 14 13:52:40 2001
+@@ -130,7 +130,7 @@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
- MATH_LIB = @MATH_LIB@
MKINSTALLDIRS = @MKINSTALLDIRS@
OBJDUMP = @OBJDUMP@
-@@ -164,13 +164,13 @@
+ PACKAGE = @PACKAGE@
+@@ -156,13 +156,13 @@
SUBDIRS = tutorial faq reference
@@ -28,7 +28,7 @@ $FreeBSD$
man1dir = $(mandir)/man1
MANS = $(man_MANS)
-@@ -193,6 +193,9 @@
+@@ -185,6 +185,9 @@
gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 3d3e71a31031..95f40dd604ac 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -8,6 +8,7 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk/gdk.h
+include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcompat.h
include/gtk-2.0/gdk/gdkcursor.h
@@ -204,27 +205,41 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so.1
lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
lib/libgdk-x11-1.3.a
lib/libgdk-x11-1.3.so
-lib/libgdk-x11-1.3.so.4
+lib/libgdk-x11-1.3.so.5
lib/libgdk_pixbuf-1.3.a
lib/libgdk_pixbuf-1.3.so
-lib/libgdk_pixbuf-1.3.so.4
+lib/libgdk_pixbuf-1.3.so.5
lib/libgdk_pixbuf_xlib-1.3.a
lib/libgdk_pixbuf_xlib-1.3.so
lib/libgdk_pixbuf_xlib-1.3.so.0
lib/libgtk-x11-1.3.a
lib/libgtk-x11-1.3.so
-lib/libgtk-x11-1.3.so.4
+lib/libgtk-x11-1.3.so.5
libdata/pkgconfig/gdk-2.0.pc
libdata/pkgconfig/gdk-pixbuf-2.0.pc
libdata/pkgconfig/gdk-x11-2.0.pc
libdata/pkgconfig/gtk+-2.0.pc
libdata/pkgconfig/gtk+-x11-2.0.pc
share/aclocal/gtk-2.0.m4
+share/gtk-2.0/demo/apple-red.png
+share/gtk-2.0/demo/background.jpg
share/gtk-2.0/demo/button_box.c
+share/gtk-2.0/demo/colorsel.c
share/gtk-2.0/demo/dialog.c
+share/gtk-2.0/demo/drawingarea.c
+share/gtk-2.0/demo/gnome-applets.png
+share/gtk-2.0/demo/gnome-calendar.png
+share/gtk-2.0/demo/gnome-foot.png
+share/gtk-2.0/demo/gnome-gimp.png
+share/gtk-2.0/demo/gnome-gmush.png
+share/gtk-2.0/demo/gnome-gsame.png
+share/gtk-2.0/demo/gnu-keys.png
+share/gtk-2.0/demo/gtk-logo-rgb.gif
+share/gtk-2.0/demo/images.c
share/gtk-2.0/demo/item_factory.c
share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/panes.c
+share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/textview.c
share/locale/az/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20.mo