Update to GTK+ 2.8.6

2.8 series release notes here:
http://mail.gnome.org/archives/gnome-announce-list/2005-August/msg00054.html

NOTE: GTK+ now uses the Cairo vector graphic library as well as depending
on a version of Pango with it as well.  This will at a minimum require
chanes to the WANTLIBS of depending ports.
This commit is contained in:
marcm 2005-11-13 06:23:58 +00:00
parent 8dcdfda0ef
commit 2f152ca5c2
12 changed files with 81 additions and 48 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.26 2005/09/07 20:51:14 kurt Exp $
# $OpenBSD: Makefile,v 1.27 2005/11/13 06:23:58 marcm Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "multi-platform graphical toolkit"
COMMENT-docs= "gtk+-2 documentation"
VERSION= 2.6.10
VERSION= 2.8.6
DISTNAME= gtk+-${VERSION}
PKGNAME= gtk+2-${VERSION}p0
PKGNAME-docs= gtk+2-docs-${VERSION}p0
PKGNAME= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
CATEGORIES= x11 devel
HOMEPAGE= http://www.gtk.org
@ -20,18 +20,20 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.6/
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.8/ \
${MASTER_SITE_GNOME:=sources/gtk+/2.8/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -docs
SUBPACKAGE?=
.if ${SUBPACKAGE} != "-docs"
WANTLIB= X11 Xcursor Xext Xfixes Xft Xinerama Xrender c fontconfig freetype m z
WANTLIB= X11 Xcursor Xext Xfixes Xinerama Xrender \
Xrandr c cairo fontconfig freetype glitz m z
MODULES= devel/gettext
LIB_DEPENDS= glib-2.0.600.0,gmodule-2.0.600.0,gobject-2.0.600.0::devel/glib2 \
pango-1.0.800.1,pangoft2-1.0.800.1,pangox-1.0.800.1,pangoxft-1.0.800.1::devel/pango \
LIB_DEPENDS= glib-2.0.800.0,gmodule-2.0.800.0,gobject-2.0.800.0::devel/glib2 \
pango-1.0.1000.0,pangoft2-1.0.1000.0,pangocairo-1.0.1000.0::devel/pango \
atk-1.0.0.1::devel/atk \
tiff.35::graphics/tiff \
png.3::graphics/png \

View File

@ -1,4 +1,4 @@
MD5 (gtk+-2.6.10.tar.bz2) = 520090ef291e35ba93397060e20f5025
RMD160 (gtk+-2.6.10.tar.bz2) = 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff
SHA1 (gtk+-2.6.10.tar.bz2) = 9ba627683e0dc4bceb5fb900c1ee687638d95fcd
SIZE (gtk+-2.6.10.tar.bz2) = 11521380
MD5 (gtk+-2.8.6.tar.bz2) = 2bcb9e3feb62ac895101cb8ee87ca49a
RMD160 (gtk+-2.8.6.tar.bz2) = c70f0dee25bd5fe95defb2dfa492ea587fd167b3
SHA1 (gtk+-2.8.6.tar.bz2) = 7760e325ddd535fa7e606a047133a6a7cfb71ca4
SIZE (gtk+-2.8.6.tar.bz2) = 11818976

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.7 2005/08/05 17:15:09 kurt Exp $
--- demos/Makefile.in.orig Mon Aug 1 10:38:51 2005
+++ demos/Makefile.in Sun Jul 31 22:56:09 2005
@@ -791,6 +791,7 @@ uninstall-info: uninstall-info-recursive
$OpenBSD: patch-demos_Makefile_in,v 1.8 2005/11/13 06:23:58 marcm Exp $
--- demos/Makefile.in.orig Sat Aug 13 06:21:40 2005
+++ demos/Makefile.in Tue Aug 23 22:16:42 2005
@@ -786,6 +786,7 @@ uninstall-info: uninstall-info-recursive
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.7 2005/08/05 17:15:09 kurt Exp $
--- gdk-pixbuf/Makefile.in.orig Mon Aug 1 10:38:53 2005
+++ gdk-pixbuf/Makefile.in Sun Jul 31 22:56:09 2005
@@ -1609,13 +1609,6 @@ install-data-hook: install-ms-lib instal
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.8 2005/11/13 06:23:58 marcm Exp $
--- gdk-pixbuf/Makefile.in.orig Sat Aug 13 06:21:42 2005
+++ gdk-pixbuf/Makefile.in Tue Aug 23 22:16:42 2005
@@ -1604,13 +1604,6 @@ install-data-hook: install-ms-lib instal
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
$(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
@ -14,8 +14,8 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.7 2005/08/05 17:15:09 kurt Exp $
- echo "***" ; \
fi
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
@@ -1627,7 +1620,7 @@ uninstall-local: uninstall-ms-lib uninst
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -1622,7 +1615,7 @@ uninstall-local: uninstall-ms-lib uninst
@BUILD_DYNAMIC_MODULES_TRUE@ LOADERS=`echo libpixbufloader-*.la` ; \
@BUILD_DYNAMIC_MODULES_TRUE@ if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
@BUILD_DYNAMIC_MODULES_TRUE@ echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.3 2005/05/24 21:29:11 marcm Exp $
--- gdk-pixbuf/gdk-pixbuf-io.c.orig Sun Dec 5 04:43:47 2004
+++ gdk-pixbuf/gdk-pixbuf-io.c Wed Mar 30 21:27:26 2005
@@ -258,7 +258,7 @@ gdk_pixbuf_get_module_file (void)
$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.4 2005/11/13 06:23:58 marcm Exp $
--- gdk-pixbuf/gdk-pixbuf-io.c.orig Fri Jul 22 08:34:32 2005
+++ gdk-pixbuf/gdk-pixbuf-io.c Tue Aug 23 22:16:42 2005
@@ -276,7 +276,7 @@ gdk_pixbuf_get_module_file (void)
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-gtk_gtkcalendar_c,v 1.1 2005/11/13 06:23:58 marcm Exp $
--- gtk/gtkcalendar.c.orig Mon Oct 3 20:24:16 2005
+++ gtk/gtkcalendar.c Mon Oct 31 08:07:49 2005
@@ -566,6 +566,7 @@ gtk_calendar_init (GtkCalendar *calendar
GtkCalendarPrivate *priv;
gchar *year_before;
gchar *langinfo;
+ gchar *week_start;
gint week_1stday = 0;
gint first_weekday = 1;
guint week_origin;

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gtk_gtksettings_c,v 1.1 2005/09/07 20:51:14 kurt Exp $
--- gtk/gtksettings.c.orig Thu Aug 11 17:38:18 2005
+++ gtk/gtksettings.c Thu Aug 11 17:38:25 2005
@@ -326,7 +326,7 @@ gtk_settings_class_init (GtkSettingsClas
$OpenBSD: patch-gtk_gtksettings_c,v 1.2 2005/11/13 06:23:58 marcm Exp $
--- gtk/gtksettings.c.orig Sun Aug 28 21:47:20 2005
+++ gtk/gtksettings.c Sat Sep 10 21:45:33 2005
@@ -256,7 +256,7 @@ gtk_settings_class_init (GtkSettingsClas
g_param_spec_string ("gtk-key-theme-name",
P_("Key Theme Name"),
P_("Name of key theme RC file to load"),
- NULL,
+ "Emacs",
G_PARAM_READWRITE),
GTK_PARAM_READWRITE),
NULL);
g_assert (result == PROP_KEY_THEME_NAME);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_stock-icons_Makefile_in,v 1.5 2005/08/05 17:15:09 kurt Exp $
--- gtk/stock-icons/Makefile.in.orig Mon Aug 1 10:38:54 2005
+++ gtk/stock-icons/Makefile.in Sun Jul 31 22:56:10 2005
@@ -655,7 +655,7 @@ noinst_DATA = gtkstockpixbufs.h
$OpenBSD: patch-gtk_stock-icons_Makefile_in,v 1.6 2005/11/13 06:23:58 marcm Exp $
--- gtk/stock-icons/Makefile.in.orig Sat Aug 13 06:21:44 2005
+++ gtk/stock-icons/Makefile.in Tue Aug 23 22:16:42 2005
@@ -662,7 +662,7 @@ noinst_DATA = gtkstockpixbufs.h
CLEANFILES = $(noinst_DATA)
@CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.9 2005/08/05 17:15:09 kurt Exp $
--- modules/input/Makefile.in.orig Mon Aug 1 10:38:56 2005
+++ modules/input/Makefile.in Sun Jul 31 22:56:10 2005
@@ -807,19 +807,13 @@ install-data-hook:
$OpenBSD: patch-modules_input_Makefile_in,v 1.10 2005/11/13 06:23:58 marcm Exp $
--- modules/input/Makefile.in.orig Sat Aug 13 06:21:45 2005
+++ modules/input/Makefile.in Tue Aug 23 22:16:42 2005
@@ -802,19 +802,13 @@ install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
echo "$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules" ; \
$(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ; \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.15 2005/09/06 16:51:46 marcm Exp $
@comment $OpenBSD: PFRAG.shared,v 1.16 2005/11/13 06:23:58 marcm Exp $
lib/gtk-2.0/2.4.0/engines/libpixmap.so
lib/gtk-2.0/2.4.0/immodules/im-am-et.so
lib/gtk-2.0/2.4.0/immodules/im-cedilla.so
@ -24,7 +24,7 @@ lib/gtk-2.0/2.4.0/loaders/libpixbufloader-tiff.so
lib/gtk-2.0/2.4.0/loaders/libpixbufloader-wbmp.so
lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so
lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so
@lib lib/libgdk-x11-2.0.so.600.10
@lib lib/libgdk_pixbuf-2.0.so.600.10
@lib lib/libgdk_pixbuf_xlib-2.0.so.600.10
@lib lib/libgtk-x11-2.0.so.600.10
@lib lib/libgdk-x11-2.0.so.800.6
@lib lib/libgdk_pixbuf-2.0.so.800.6
@lib lib/libgdk_pixbuf_xlib-2.0.so.800.6
@lib lib/libgtk-x11-2.0.so.800.6

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2005/08/05 17:15:09 kurt Exp $
@comment $OpenBSD: PLIST,v 1.22 2005/11/13 06:23:58 marcm Exp $
bin/gdk-pixbuf-csource
bin/gdk-pixbuf-query-loaders
bin/gtk-demo
@ -17,11 +17,13 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-simple-anim.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-transform.h
include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h
include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h
include/gtk-2.0/gdk/gdk.h
include/gtk-2.0/gdk/gdkalias.h
include/gtk-2.0/gdk/gdkcairo.h
include/gtk-2.0/gdk/gdkcolor.h
include/gtk-2.0/gdk/gdkcursor.h
include/gtk-2.0/gdk/gdkdisplay.h
@ -335,6 +337,7 @@ share/gtk-2.0/demo/gnu-keys.png
share/gtk-2.0/demo/gtk-logo-rgb.gif
share/gtk-2.0/demo/hypertext.c
share/gtk-2.0/demo/iconview.c
share/gtk-2.0/demo/iconview_edit.c
share/gtk-2.0/demo/images.c
share/gtk-2.0/demo/list_store.c
share/gtk-2.0/demo/menus.c
@ -465,6 +468,10 @@ share/locale/ja/LC_MESSAGES/gtk20-properties.mo
share/locale/ja/LC_MESSAGES/gtk20.mo
share/locale/ko/LC_MESSAGES/gtk20-properties.mo
share/locale/ko/LC_MESSAGES/gtk20.mo
share/locale/ku/
share/locale/ku/LC_MESSAGES/
share/locale/ku/LC_MESSAGES/gtk20-properties.mo
share/locale/ku/LC_MESSAGES/gtk20.mo
share/locale/li/
share/locale/li/LC_MESSAGES/
share/locale/li/LC_MESSAGES/gtk20-properties.mo
@ -559,6 +566,10 @@ share/locale/ta/
share/locale/ta/LC_MESSAGES/
share/locale/ta/LC_MESSAGES/gtk20-properties.mo
share/locale/ta/LC_MESSAGES/gtk20.mo
share/locale/te/
share/locale/te/LC_MESSAGES/
share/locale/te/LC_MESSAGES/gtk20-properties.mo
share/locale/te/LC_MESSAGES/gtk20.mo
share/locale/th/
share/locale/th/LC_MESSAGES/
share/locale/th/LC_MESSAGES/gtk20-properties.mo
@ -601,13 +612,14 @@ share/locale/zh_TW/LC_MESSAGES/gtk20-properties.mo
share/locale/zh_TW/LC_MESSAGES/gtk20.mo
share/themes/
share/themes/Default/
share/themes/Default/gtk-2.0/
share/themes/Default/gtk-2.0-key/
share/themes/Default/gtk-2.0-key/gtkrc
share/themes/Default/gtk-2.0/gtkrc
share/themes/Emacs/
share/themes/Emacs/gtk-2.0-key/
share/themes/Emacs/gtk-2.0-key/gtkrc
share/themes/Raleigh/
share/themes/Raleigh/gtk-2.0/
share/themes/Raleigh/gtk-2.0/gtkrc
%%SHARED%%
@exec mkdir -p /var/db/gtk-2.0
@exec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.13 2005/08/16 18:28:56 espie Exp $
@comment $OpenBSD: PLIST-docs,v 1.14 2005/11/13 06:23:58 marcm Exp $
@conflict gtk+2-<2.4.9
share/gtk-doc/
share/gtk-doc/html/
@ -37,6 +37,7 @@ share/gtk-doc/html/gdk-pixbuf/ix02.html
share/gtk-doc/html/gdk-pixbuf/ix03.html
share/gtk-doc/html/gdk-pixbuf/ix04.html
share/gtk-doc/html/gdk-pixbuf/ix05.html
share/gtk-doc/html/gdk-pixbuf/ix06.html
share/gtk-doc/html/gdk-pixbuf/left.png
share/gtk-doc/html/gdk-pixbuf/license.html
share/gtk-doc/html/gdk-pixbuf/right.png
@ -75,6 +76,7 @@ share/gtk-doc/html/gdk/draped_box.png
share/gtk-doc/html/gdk/exchange.png
share/gtk-doc/html/gdk/fleur.png
share/gtk-doc/html/gdk/gdk-Bitmaps-and-Pixmaps.html
share/gtk-doc/html/gdk/gdk-Cairo-Interaction.html
share/gtk-doc/html/gdk/gdk-Colormaps-and-Colors.html
share/gtk-doc/html/gdk/gdk-Cursors.html
share/gtk-doc/html/gdk/gdk-Drag-and-Drop.html
@ -114,6 +116,7 @@ share/gtk-doc/html/gdk/ix02.html
share/gtk-doc/html/gdk/ix03.html
share/gtk-doc/html/gdk/ix04.html
share/gtk-doc/html/gdk/ix05.html
share/gtk-doc/html/gdk/ix06.html
share/gtk-doc/html/gdk/left.png
share/gtk-doc/html/gdk/left_ptr.png
share/gtk-doc/html/gdk/left_side.png
@ -341,6 +344,7 @@ share/gtk-doc/html/gtk/ch02.html
share/gtk-doc/html/gtk/check-button.png
share/gtk-doc/html/gtk/checklist-gdkeventexpose-region.html
share/gtk-doc/html/gtk/checklist-modifiers.html
share/gtk-doc/html/gtk/checklist-named-icons.html
share/gtk-doc/html/gtk/color-button.png
share/gtk-doc/html/gtk/colorsel.png
share/gtk-doc/html/gtk/combo-box-entry.png
@ -407,6 +411,7 @@ share/gtk-doc/html/gtk/ix02.html
share/gtk-doc/html/gtk/ix03.html
share/gtk-doc/html/gtk/ix04.html
share/gtk-doc/html/gtk/ix05.html
share/gtk-doc/html/gtk/ix06.html
share/gtk-doc/html/gtk/label.png
share/gtk-doc/html/gtk/left.png
share/gtk-doc/html/gtk/list-and-tree.png
@ -463,13 +468,16 @@ share/gtk-doc/html/gtk/stock_exit_24.png
share/gtk-doc/html/gtk/stock_file_24.png
share/gtk-doc/html/gtk/stock_first_24.png
share/gtk-doc/html/gtk/stock_font_24.png
share/gtk-doc/html/gtk/stock_fullscreen_24.png
share/gtk-doc/html/gtk/stock_harddisk_24.png
share/gtk-doc/html/gtk/stock_help_24.png
share/gtk-doc/html/gtk/stock_home_24.png
share/gtk-doc/html/gtk/stock_index_24.png
share/gtk-doc/html/gtk/stock_info_24.png
share/gtk-doc/html/gtk/stock_jump_to_24.png
share/gtk-doc/html/gtk/stock_jump_to_rtl_24.png
share/gtk-doc/html/gtk/stock_last_24.png
share/gtk-doc/html/gtk/stock_leave_fullscreen_24.png
share/gtk-doc/html/gtk/stock_left_arrow_24.png
share/gtk-doc/html/gtk/stock_media_forward_24.png
share/gtk-doc/html/gtk/stock_media_next_24.png