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

Update to version 2.18.1.

Browse Source 
committing early so that we can work with the latest at upcoming p2k9.
any fallout, please let me know directly.
ok landry@
This commit is contained in:
ajacoutot 2009-10-04 18:17:57 +00:00
parent 394379e18e
commit 4638ff3003
10 changed files with 57 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/gtk+2/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.85 2009/09/18 20:47:11 martynas Exp $
# $OpenBSD: Makefile,v 1.86 2009/10/04 18:17:57 ajacoutot Exp $
SHARED_ONLY= Yes
@ -6,20 +6,20 @@ COMMENT-main= multi-platform graphical toolkit
COMMENT-docs= gtk+2 documentation
COMMENT-cups= gtk+2 CUPS print backend
VERSION= 2.16.6
VERSION= 2.18.1
DISTNAME= gtk+-${VERSION}
PKGNAME-main= gtk+2-${VERSION}p1
PKGNAME-main= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
PKGNAME-cups= gtk+2-cups-${VERSION}p0
PKGNAME-cups= gtk+2-cups-${VERSION}
CATEGORIES= x11 devel
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
SHARED_LIBS+= gdk_pixbuf-2.0 1402.0 # .1800.1
SHARED_LIBS+= gdk-x11-2.0 1402.0 # .1800.1
SHARED_LIBS+= gtk-x11-2.0 1402.0 # .1800.1
SHARED_LIBS+= gdk_pixbuf_xlib-2.0 1402.0 # .1800.1
SHARED_LIBS+= gailutil 24.0 # .18.1
HOMEPAGE= http://www.gtk.org/
@ -50,7 +50,6 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
atk-1.0.>=1809.0::devel/atk \
tiff.>=35::graphics/tiff \
png.>=3::graphics/png \
jasper::graphics/jasper \
jpeg.>=62::graphics/jpeg
WANTLIB-main= ${WANTLIB} c pthread

10
x11/gtk+2/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gtk+-2.16.6.tar.bz2) = QWQSszbZ87a3jKiHOV0XJg==
RMD160 (gtk+-2.16.6.tar.bz2) = EEhwQEL/u6vg3mAnj0n4t3APLR8=
SHA1 (gtk+-2.16.6.tar.bz2) = 9py0gxHWBmS6x89oNRwXXHohSuY=
SHA256 (gtk+-2.16.6.tar.bz2) = GOD5eSAo5sxRCER2ePF9OW+aLN/sHmq13KmMuET5VK8=
SIZE (gtk+-2.16.6.tar.bz2) = 18518781
MD5 (gtk+-2.18.1.tar.bz2) = 1uD5gqhNOTzRHi6pCp43dQ==
RMD160 (gtk+-2.18.1.tar.bz2) = fD8yj30zn8aeEyK/k4GBBHqSv3w=
SHA1 (gtk+-2.18.1.tar.bz2) = xIdMdhc+ubZZHM4fTJTkApDxNzI=
SHA256 (gtk+-2.18.1.tar.bz2) = x4ORnseWf8NuxED8aHHLzzsmJugXUw4eLwo/y9rjHrw=
SIZE (gtk+-2.18.1.tar.bz2) = 19050508

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

@ -1,7 +1,7 @@
$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}
$OpenBSD: patch-demos_Makefile_in,v 1.20 2009/10/04 18:17:57 ajacoutot Exp $
--- demos/Makefile.in.orig Wed Sep 23 04:22:46 2009
+++ demos/Makefile.in Tue Sep 29 06:59:19 2009
@@ -935,6 +935,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

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

@ -1,16 +1,16 @@
$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
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.23 2009/10/04 18:17:57 ajacoutot Exp $
--- gdk-pixbuf/Makefile.in.orig Tue Sep 29 09:17:04 2009
+++ gdk-pixbuf/Makefile.in Tue Sep 29 09:18:08 2009
@@ -1324,7 +1324,7 @@ test_gdk_pixbuf_LDADD = $(LDADDS)
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
gdk_pixbuf_csource_LDADD = $(LDADDS)
gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_LDADD = $(LDADDS) -pthread
gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
@@ -2247,13 +2247,6 @@ install-data-hook: install-ms-lib install-def-file
#
@@ -2331,13 +2331,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.22 2009/07/12 20:39:33 ajacoutot Exp
fi
uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2265,7 +2258,7 @@ uninstall-local: uninstall-ms-lib uninstall-def-file
@@ -2349,7 +2342,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."; \

8
x11/gtk+2/patches/patch-gdk-pixbuf_gdk-pixbuf-io_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.10 2009/04/21 13:01:18 ajacoutot Exp $
--- gdk-pixbuf/gdk-pixbuf-io.c.orig Mon Nov 24 07:35:45 2008
+++ gdk-pixbuf/gdk-pixbuf-io.c Sat Dec 20 17:32:11 2008
@@ -298,7 +298,7 @@ gdk_pixbuf_get_module_file (void)
$OpenBSD: patch-gdk-pixbuf_gdk-pixbuf-io_c,v 1.11 2009/10/04 18:17:57 ajacoutot Exp $
--- gdk-pixbuf/gdk-pixbuf-io.c.orig Sat Sep 12 04:58:36 2009
+++ gdk-pixbuf/gdk-pixbuf-io.c Tue Sep 29 06:59:19 2009
@@ -305,7 +305,7 @@ gdk_pixbuf_get_module_file (void)
gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
if (!result)

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

@ -1,12 +1,12 @@
$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
$OpenBSD: patch-gtk_Makefile_in,v 1.14 2009/10/04 18:17:57 ajacoutot Exp $
--- gtk/Makefile.in.orig Tue Sep 29 06:53:28 2009
+++ gtk/Makefile.in Tue Sep 29 06:54:19 2009
@@ -932,7 +932,7 @@ SUBDIRS = theme-bits . tests
DIST_SUBDIRS = theme-bits tests
@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_FALSE@@HAVE_PAPI_CUPS_FALSE@@HAVE_PAPI_TRUE@GTK_PRINT_BACKENDS = file,papi
-@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_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.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:
$OpenBSD: patch-modules_input_Makefile_in,v 1.22 2009/10/04 18:17:57 ajacoutot Exp $
--- modules/input/Makefile.in.orig Wed Sep 23 04:22:51 2009
+++ modules/input/Makefile.in Tue Sep 29 06:59:20 2009
@@ -1239,13 +1239,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.21 2009/07/12 20:39:33 ajacoutot E
fi
uninstall-local:
@@ -1359,6 +1352,7 @@ uninstall-local:
@@ -1254,6 +1247,7 @@ uninstall-local:
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)

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

@ -1,18 +0,0 @@
$OpenBSD: patch-modules_printbackends_lpr_gtkprintbackendlpr_c,v 1.1 2009/09/16 12:58:44 jasper Exp $
Fix for #503776, git f6ed1487bd2c5c2315a07ff2f9f4426102524743
Prevents an application from crashing when printing to a non-existant printer.
--- modules/printbackends/lpr/gtkprintbackendlpr.c.orig Wed Sep 16 14:21:48 2009
+++ modules/printbackends/lpr/gtkprintbackendlpr.c Wed Sep 16 14:22:28 2009
@@ -281,7 +281,9 @@ lpr_write (GIOChannel *source,
{
gsize bytes_written;
- g_io_channel_write_chars (ps->in,
+ signal (SIGPIPE, SIG_IGN);
+
+ g_io_channel_write_chars (ps->in,
buf,
bytes_read,
&bytes_written,

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.25 2009/07/12 20:39:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-docs,v 1.26 2009/10/04 18:17:57 ajacoutot Exp $
@conflict gtk+2-<2.4.9
share/gtk-doc/
share/gtk-doc/html/
@ -70,6 +70,7 @@ 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-18.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
@ -242,6 +243,7 @@ share/gtk-doc/html/gtk/GtkDialog.html
share/gtk-doc/html/gtk/GtkDrawingArea.html
share/gtk-doc/html/gtk/GtkEditable.html
share/gtk-doc/html/gtk/GtkEntry.html
share/gtk-doc/html/gtk/GtkEntryBuffer.html
share/gtk-doc/html/gtk/GtkEntryCompletion.html
share/gtk-doc/html/gtk/GtkEventBox.html
share/gtk-doc/html/gtk/GtkExpander.html
@ -272,6 +274,7 @@ share/gtk-doc/html/gtk/GtkIconTheme.html
share/gtk-doc/html/gtk/GtkIconView.html
share/gtk-doc/html/gtk/GtkImage.html
share/gtk-doc/html/gtk/GtkImageMenuItem.html
share/gtk-doc/html/gtk/GtkInfoBar.html
share/gtk-doc/html/gtk/GtkInputDialog.html
share/gtk-doc/html/gtk/GtkInvisible.html
share/gtk-doc/html/gtk/GtkItem.html
@ -396,6 +399,7 @@ 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-18.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
@ -527,6 +531,7 @@ share/gtk-doc/html/gtk/gtk-media-record.png
share/gtk-doc/html/gtk/gtk-media-rewind-ltr.png
share/gtk-doc/html/gtk/gtk-media-rewind-rtl.png
share/gtk-doc/html/gtk/gtk-media-stop.png
share/gtk-doc/html/gtk/gtk-migrating-ClientSideWindows.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAboutDialog.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAction.html
share/gtk-doc/html/gtk/gtk-migrating-GtkAssistant.html
@ -539,6 +544,7 @@ 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-label-links.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

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.13 2009/09/18 20:47:11 martynas Exp $
@comment $OpenBSD: PLIST-main,v 1.14 2009/10/04 18:17:57 ajacoutot Exp $
@conflict gail-*
@pkgpath x11/gtk+2
@bin bin/gdk-pixbuf-csource
@ -117,6 +117,7 @@ include/gtk-2.0/gtk/gtkdnd.h
include/gtk-2.0/gtk/gtkdrawingarea.h
include/gtk-2.0/gtk/gtkeditable.h
include/gtk-2.0/gtk/gtkentry.h
include/gtk-2.0/gtk/gtkentrybuffer.h
include/gtk-2.0/gtk/gtkentrycompletion.h
include/gtk-2.0/gtk/gtkenums.h
include/gtk-2.0/gtk/gtkeventbox.h
@ -151,6 +152,7 @@ include/gtk-2.0/gtk/gtkimcontext.h
include/gtk-2.0/gtk/gtkimcontextsimple.h
include/gtk-2.0/gtk/gtkimmodule.h
include/gtk-2.0/gtk/gtkimmulticontext.h
include/gtk-2.0/gtk/gtkinfobar.h
include/gtk-2.0/gtk/gtkinputdialog.h
include/gtk-2.0/gtk/gtkinvisible.h
include/gtk-2.0/gtk/gtkitem.h
@ -335,9 +337,6 @@ lib/gtk-2.0/2.10.0/loaders/libpixbufloader-icns.so
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.a
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.a
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jasper.so
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.a
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
@ -430,6 +429,7 @@ share/gtk-2.0/demo/demo.ui
share/gtk-2.0/demo/dialog.c
share/gtk-2.0/demo/drawingarea.c
share/gtk-2.0/demo/editable_cells.c
share/gtk-2.0/demo/entry_buffer.c
share/gtk-2.0/demo/entry_completion.c
share/gtk-2.0/demo/expander.c
share/gtk-2.0/demo/floppybuddy.gif
@ -447,8 +447,12 @@ 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/infobar.c
share/gtk-2.0/demo/links.c
share/gtk-2.0/demo/list_store.c
share/gtk-2.0/demo/menus.c
share/gtk-2.0/demo/offscreen_window.c
share/gtk-2.0/demo/offscreen_window2.c
share/gtk-2.0/demo/panes.c
share/gtk-2.0/demo/pickers.c
share/gtk-2.0/demo/pixbufs.c