cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- major update to gtk+2-2.16.4

Browse Source 
*remove previous version before trying to compile this*

Report any failure directly to me please.

tested by landry@ on a sparc64 bulk, thanks!
ok jasper@ on a previous diff
This commit is contained in:
ajacoutot 2009-07-12 20:39:33 +00:00
parent 1d7f915015
commit 59121811e8
8 changed files with 71 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
x11/gtk+2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.78 2009/05/22 13:08:22 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.79 2009/07/12 20:39:33 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,18 +6,18 @@ COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend
VERSION= 2.14.7
VERSION= 2.16.4
DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}p0
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
PKGNAME-cups= gtk+2-cups-${VERSION}p1
PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel
SHARED_LIBS+= gdk_pixbuf-2.0 1400.1 #.1400.5
SHARED_LIBS+= gdk-x11-2.0 1400.1 #.1400.5
SHARED_LIBS+= gtk-x11-2.0 1400.1 #.1400.5
SHARED_LIBS+= gdk_pixbuf_xlib-2.0 1400.1 #.1400.5
SHARED_LIBS+= gailutil 22.0 #.18.1
SHARED_LIBS+= gdk_pixbuf-2.0 1401.0 #.1600.2
SHARED_LIBS+= gdk-x11-2.0 1401.0 #.1600.2
SHARED_LIBS+= gtk-x11-2.0 1401.0 #.1600.2
SHARED_LIBS+= gdk_pixbuf_xlib-2.0 1401.0 #.1600.2
SHARED_LIBS+= gailutil 23.0 #.18.1
HOMEPAGE= http://www.gtk.org/
@ -27,7 +27,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.14/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}/}
EXTRACT_SUFX= .tar.bz2
MULTI_PACKAGES= -main -docs -cups
@ -67,8 +67,10 @@ USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-gtk-doc \
--with-xinput=yes
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--with-xinput=yes \
--disable-papi
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"

10
x11/gtk+2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtk+-2.14.7.tar.bz2) = +xYU1LKtunsHji55m122BA==
RMD160 (gtk+-2.14.7.tar.bz2) = LtZFHT3gUOmyQj9lCdFeObpppqs=
SHA1 (gtk+-2.14.7.tar.bz2) = 9LnGXb3HjK1vybYBZAy60dOrtX8=
SHA256 (gtk+-2.14.7.tar.bz2) = 6C9HKOUtuvw1cTt1XrhjpH3BVTNJEt2gJA3D3pywfhQ=
SIZE (gtk+-2.14.7.tar.bz2) = 17475873
MD5 (gtk+-2.16.4.tar.bz2) = 1mb59aVE6dTUWATYixtcTQ==
RMD160 (gtk+-2.16.4.tar.bz2) = S0Asaqmv3yicE5wzXjuNPrhgDZM=
SHA1 (gtk+-2.16.4.tar.bz2) = 4WLyH8WH2YVrFWDEYZU7ubzsIkI=
SHA256 (gtk+-2.16.4.tar.bz2) = r83Ftnl0BUsRGkwoNkEwNkfR/6Vnf/uMTOhiHxLhf4g=
SIZE (gtk+-2.16.4.tar.bz2) = 18520645

8
x11/gtk+2/patches/patch-demos_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-demos_Makefile_in,v 1.18 2009/01/11 17:04:47 ajacoutot Exp $
--- demos/Makefile.in.orig Wed Jan 7 22:52:01 2009
+++ demos/Makefile.in Fri Jan 9 13:28:02 2009
@@ -964,6 +964,7 @@ test-report perf-report full-report: ${TEST_PROGS}
$OpenBSD: patch-demos_Makefile_in,v 1.19 2009/07/12 20:39:33 ajacoutot Exp $
--- demos/Makefile.in.orig Sun May 31 06:11:02 2009
+++ demos/Makefile.in Thu Jun 11 15:11:57 2009
@@ -972,6 +972,7 @@ test-report perf-report full-report: ${TEST_PROGS}
check-local: test
test-inline-pixbufs.h: $(pixbuf_csource_deps) apple-red.png gnome-foot.png

12
x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.21 2009/01/11 17:04:47 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Wed Jan 7 22:52:05 2009
+++ gdk-pixbuf/Makefile.in Fri Jan 9 13:28:02 2009
@@ -852,7 +852,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.22 2009/07/12 20:39:33 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Sun May 31 06:11:03 2009
+++ gdk-pixbuf/Makefile.in Thu Jun 11 15:11:57 2009
@@ -860,7 +860,7 @@ gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
@ -10,7 +10,7 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.21 2009/01/11 17:04:47 ajacoutot Exp
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
@@ -2239,13 +2239,6 @@ install-data-hook: install-ms-lib install-def-file
@@ -2247,13 +2247,6 @@ install-data-hook: install-ms-lib install-def-file
@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 ; \
@ -24,7 +24,7 @@ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.21 2009/01/11 17:04:47 ajacoutot Exp
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2257,7 +2250,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2265,7 +2258,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@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."; \

18
x11/gtk+2/patches/patch-gtk_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.12 2009/01/11 17:04:47 ajacoutot Exp $
--- gtk/Makefile.in.orig Wed Jan 7 22:52:08 2009
+++ gtk/Makefile.in Fri Jan 9 13:28:02 2009
@@ -469,7 +469,7 @@ SUBDIRS = theme-bits . tests
$OpenBSD: patch-gtk_Makefile_in,v 1.13 2009/07/12 20:39:33 ajacoutot Exp $
--- gtk/Makefile.in.orig Thu Jun 11 15:10:41 2009
+++ gtk/Makefile.in Thu Jun 11 15:11:39 2009
@@ -477,7 +477,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests
@HAVE_CUPS_FALSE@GTK_PRINT_BACKENDS = file,lpr
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
@HAVE_CUPS_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_FALSE@GTK_PRINT_BACKENDS = file,lpr
-@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups
+@HAVE_CUPS_TRUE@@HAVE_PAPI_CUPS_FALSE@GTK_PRINT_BACKENDS = file,cups,lpr
-@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups
+@HAVE_CUPS_TRUE@GTK_PRINT_BACKENDS = file,cups,lpr
@HAVE_PAPI_CUPS_TRUE@GTK_PRINT_BACKENDS = file,papi,cups
INCLUDES = \
-DG_LOG_DOMAIN=\"Gtk\" \

10
x11/gtk+2/patches/patch-modules_input_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-modules_input_Makefile_in,v 1.20 2009/01/11 17:04:47 ajacoutot Exp $
--- modules/input/Makefile.in.orig Wed Jan 7 22:52:11 2009
+++ modules/input/Makefile.in Fri Jan 9 13:28:02 2009
@@ -1336,13 +1336,6 @@ install-data-hook:
$OpenBSD: patch-modules_input_Makefile_in,v 1.21 2009/07/12 20:39:33 ajacoutot Exp $
--- modules/input/Makefile.in.orig Sun May 31 06:11:05 2009
+++ modules/input/Makefile.in Thu Jun 11 15:11:57 2009
@@ -1344,13 +1344,6 @@ 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 ; \
@ -15,7 +15,7 @@ $OpenBSD: patch-modules_input_Makefile_in,v 1.20 2009/01/11 17:04:47 ajacoutot E
fi
uninstall-local:
@@ -1351,6 +1344,7 @@ uninstall-local:
@@ -1359,6 +1352,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

21
x11/gtk+2/pkg/PLIST-docs
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.24 2008/11/25 13:14:08 jasper Exp $
@comment $OpenBSD: PLIST-docs,v 1.25 2009/07/12 20:39:33 ajacoutot Exp $
@conflict gtk+2-<2.4.9
share/gtk-doc/
share/gtk-doc/html/
@ -69,6 +69,7 @@ share/gtk-doc/html/gdk/X_cursor.png
share/gtk-doc/html/gdk/api-index-2-10.html
share/gtk-doc/html/gdk/api-index-2-12.html
share/gtk-doc/html/gdk/api-index-2-14.html
share/gtk-doc/html/gdk/api-index-2-16.html
share/gtk-doc/html/gdk/api-index-2-2.html
share/gtk-doc/html/gdk/api-index-2-4.html
share/gtk-doc/html/gdk/api-index-2-6.html
@ -202,6 +203,7 @@ share/gtk-doc/html/gtk/GtkAccelLabel.html
share/gtk-doc/html/gtk/GtkAccessible.html
share/gtk-doc/html/gtk/GtkAction.html
share/gtk-doc/html/gtk/GtkActionGroup.html
share/gtk-doc/html/gtk/GtkActivatable.html
share/gtk-doc/html/gtk/GtkAdjustment.html
share/gtk-doc/html/gtk/GtkAlignment.html
share/gtk-doc/html/gtk/GtkArrow.html
@ -258,6 +260,7 @@ share/gtk-doc/html/gtk/GtkHBox.html
share/gtk-doc/html/gtk/GtkHButtonBox.html
share/gtk-doc/html/gtk/GtkHPaned.html
share/gtk-doc/html/gtk/GtkHRuler.html
share/gtk-doc/html/gtk/GtkHSV.html
share/gtk-doc/html/gtk/GtkHScale.html
share/gtk-doc/html/gtk/GtkHScrollbar.html
share/gtk-doc/html/gtk/GtkHSeparator.html
@ -387,10 +390,12 @@ share/gtk-doc/html/gtk/TextWidgetObjects.html
share/gtk-doc/html/gtk/TreeWidget.html
share/gtk-doc/html/gtk/TreeWidgetObjects.html
share/gtk-doc/html/gtk/WindowWidgets.html
share/gtk-doc/html/gtk/aboutdialog.png
share/gtk-doc/html/gtk/accel-label.png
share/gtk-doc/html/gtk/api-index-2-10.html
share/gtk-doc/html/gtk/api-index-2-12.html
share/gtk-doc/html/gtk/api-index-2-14.html
share/gtk-doc/html/gtk/api-index-2-16.html
share/gtk-doc/html/gtk/api-index-2-2.html
share/gtk-doc/html/gtk/api-index-2-4.html
share/gtk-doc/html/gtk/api-index-2-6.html
@ -401,6 +406,7 @@ share/gtk-doc/html/gtk/assistant.png
share/gtk-doc/html/gtk/button.png
share/gtk-doc/html/gtk/ch01.html
share/gtk-doc/html/gtk/ch02.html
share/gtk-doc/html/gtk/chap-drawing-model.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
@ -411,6 +417,8 @@ share/gtk-doc/html/gtk/combo-box-entry.png
share/gtk-doc/html/gtk/combo-box.png
share/gtk-doc/html/gtk/decorating-the-assistant-pages.html
share/gtk-doc/html/gtk/entry.png
share/gtk-doc/html/gtk/figure-hierarchical-drawing.png
share/gtk-doc/html/gtk/figure-windowed-label.png
share/gtk-doc/html/gtk/file-button.png
share/gtk-doc/html/gtk/filechooser.png
share/gtk-doc/html/gtk/font-button.png
@ -430,6 +438,7 @@ share/gtk-doc/html/gtk/gtk-GtkTextIter.html
share/gtk-doc/html/gtk/gtk-GtkTreeView-drag-and-drop.html
share/gtk-doc/html/gtk/gtk-High-level-Printing-API.html
share/gtk-doc/html/gtk/gtk-Keyboard-Accelerators.html
share/gtk-doc/html/gtk/gtk-Orientable.html
share/gtk-doc/html/gtk/gtk-Resource-Files.html
share/gtk-doc/html/gtk/gtk-Selections.html
share/gtk-doc/html/gtk/gtk-Signals.html
@ -445,6 +454,7 @@ share/gtk-doc/html/gtk/gtk-bold.png
share/gtk-doc/html/gtk/gtk-builder-convert.html
share/gtk-doc/html/gtk/gtk-building.html
share/gtk-doc/html/gtk/gtk-cancel.png
share/gtk-doc/html/gtk/gtk-caps-lock-warning.png
share/gtk-doc/html/gtk/gtk-cdrom.png
share/gtk-doc/html/gtk/gtk-changes-1-2.html
share/gtk-doc/html/gtk/gtk-changes-2-0.html
@ -528,6 +538,7 @@ share/gtk-doc/html/gtk/gtk-migrating-GtkIconView.html
share/gtk-doc/html/gtk/gtk-migrating-GtkLinkButton.html
share/gtk-doc/html/gtk/gtk-migrating-GtkRecentChooser.html
share/gtk-doc/html/gtk/gtk-migrating-checklist.html
share/gtk-doc/html/gtk/gtk-migrating-entry-icons.html
share/gtk-doc/html/gtk/gtk-migrating-tooltips.html
share/gtk-doc/html/gtk/gtk-missing-image.png
share/gtk-doc/html/gtk/gtk-network.png
@ -601,6 +612,14 @@ share/gtk-doc/html/gtk/image.png
share/gtk-doc/html/gtk/index.html
share/gtk-doc/html/gtk/index.sgml
share/gtk-doc/html/gtk/label.png
share/gtk-doc/html/gtk/layout-btlr.png
share/gtk-doc/html/gtk/layout-btrl.png
share/gtk-doc/html/gtk/layout-lrbt.png
share/gtk-doc/html/gtk/layout-lrtb.png
share/gtk-doc/html/gtk/layout-rlbt.png
share/gtk-doc/html/gtk/layout-rltb.png
share/gtk-doc/html/gtk/layout-tblr.png
share/gtk-doc/html/gtk/layout-tbrl.png
share/gtk-doc/html/gtk/left.png
share/gtk-doc/html/gtk/link-button.png
share/gtk-doc/html/gtk/list-and-tree.png

16
x11/gtk+2/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.11 2009/01/11 17:04:47 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.12 2009/07/12 20:39:33 ajacoutot Exp $
@conflict gail-*
@pkgpath x11/gtk+2
@bin bin/gdk-pixbuf-csource
@ -73,6 +73,7 @@ include/gtk-2.0/gtk/gtkaccelmap.h
include/gtk-2.0/gtk/gtkaccessible.h
include/gtk-2.0/gtk/gtkaction.h
include/gtk-2.0/gtk/gtkactiongroup.h
include/gtk-2.0/gtk/gtkactivatable.h
include/gtk-2.0/gtk/gtkadjustment.h
include/gtk-2.0/gtk/gtkalignment.h
include/gtk-2.0/gtk/gtkarrow.h
@ -175,6 +176,7 @@ include/gtk-2.0/gtk/gtknotebook.h
include/gtk-2.0/gtk/gtkobject.h
include/gtk-2.0/gtk/gtkoldeditable.h
include/gtk-2.0/gtk/gtkoptionmenu.h
include/gtk-2.0/gtk/gtkorientable.h
include/gtk-2.0/gtk/gtkpagesetup.h
include/gtk-2.0/gtk/gtkpaned.h
include/gtk-2.0/gtk/gtkpapersize.h
@ -405,11 +407,6 @@ lib/pkgconfig/gdk-x11-2.0.pc
lib/pkgconfig/gtk+-2.0.pc
lib/pkgconfig/gtk+-unix-print-2.0.pc
lib/pkgconfig/gtk+-x11-2.0.pc
@man man/man1/gdk-pixbuf-csource.1
@man man/man1/gdk-pixbuf-query-loaders.1
@man man/man1/gtk-builder-convert.1
@man man/man1/gtk-query-immodules-2.0.1
@man man/man1/gtk-update-icon-cache.1
share/aclocal/gtk-2.0.m4
share/examples/gtk+2/
share/examples/gtk+2/gtk-2.0/
@ -457,6 +454,7 @@ share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c
share/gtk-2.0/demo/printing.c
share/gtk-2.0/demo/rotated_text.c
share/gtk-2.0/demo/search_entry.c
share/gtk-2.0/demo/sizegroup.c
share/gtk-2.0/demo/stock_browser.c
share/gtk-2.0/demo/textscroll.c
@ -505,10 +503,12 @@ share/locale/bs/LC_MESSAGES/gtk20-properties.mo
share/locale/bs/LC_MESSAGES/gtk20.mo
share/locale/ca/LC_MESSAGES/gtk20-properties.mo
share/locale/ca/LC_MESSAGES/gtk20.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/gtk20-properties.mo
share/locale/ca@valencia/LC_MESSAGES/gtk20.mo
share/locale/crh/
share/locale/crh/LC_MESSAGES/
share/locale/crh/LC_MESSAGES/gtk20-properties.mo
share/locale/crh/LC_MESSAGES/gtk20.mo
share/locale/cs/LC_MESSAGES/gtk20-properties.mo
share/locale/cs/LC_MESSAGES/gtk20.mo
share/locale/cy/LC_MESSAGES/gtk20-properties.mo