SHARED_LIBS and update to the latest 2.8 version since I've had it for

some time :).

"looks alright" pval@
This commit is contained in:
marcm 2006-01-03 07:33:36 +00:00
parent 9e54b690c1
commit 18a16ff171
8 changed files with 84 additions and 15 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.29 2005/12/01 15:42:04 bernd Exp $ # $OpenBSD: Makefile,v 1.30 2006/01/03 07:33:36 marcm Exp $
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
COMMENT= "multi-platform graphical toolkit" COMMENT= "multi-platform graphical toolkit"
COMMENT-docs= "gtk+-2 documentation" COMMENT-docs= "gtk+-2 documentation"
VERSION= 2.8.8 VERSION= 2.8.9
DISTNAME= gtk+-${VERSION} DISTNAME= gtk+-${VERSION}
PKGNAME= gtk+2-${VERSION} PKGNAME= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION} PKGNAME-docs= gtk+2-docs-${VERSION}
@ -14,6 +14,11 @@ CATEGORIES= x11 devel
HOMEPAGE= http://www.gtk.org HOMEPAGE= http://www.gtk.org
MAINTAINER= Marc Matteo <marcm@openbsd.org> MAINTAINER= Marc Matteo <marcm@openbsd.org>
SHARED_LIBS= gdk-x11-2.0 800.9 \
gdk_pixbuf-2.0 800.9 \
gdk_pixbuf_xlib-2.0 800.9 \
gtk-x11-2.0 800.9
# LGPL # LGPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes

View File

@ -1,4 +1,4 @@
MD5 (gtk+-2.8.8.tar.bz2) = a048757bbe37f74d0de065aa0ac29c52 MD5 (gtk+-2.8.9.tar.bz2) = e7a94132ae6353106c80cd4a1106a368
RMD160 (gtk+-2.8.8.tar.bz2) = 7775dfe502f6b478b5e5764917cfc7668d574065 RMD160 (gtk+-2.8.9.tar.bz2) = 3c458a11d22c7d658fcc65b969bf61d875a7559b
SHA1 (gtk+-2.8.8.tar.bz2) = 69160c9b844abe4c92847effdde69510fbca5dca SHA1 (gtk+-2.8.9.tar.bz2) = 8560c2ac2275bca7b9fd7d00c41555f95c638b82
SIZE (gtk+-2.8.8.tar.bz2) = 11902480 SIZE (gtk+-2.8.9.tar.bz2) = 11949090

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-contrib_gdk-pixbuf-xlib_Makefile_in,v 1.6 2006/01/03 07:33:37 marcm Exp $
--- contrib/gdk-pixbuf-xlib/Makefile.in.orig Fri Dec 30 22:59:46 2005
+++ contrib/gdk-pixbuf-xlib/Makefile.in Fri Dec 30 23:00:28 2005
@@ -293,7 +293,7 @@ INCLUDES = \
libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \
-export-dynamic \
- -version-info $(LT_VERSION_INFO)
+ $(LIBgdk_pixbuf_xlib-2.0_LTVERSION)
libgdk_pixbuf_xlib_2_0_la_LIBADD = \

View File

@ -1,6 +1,15 @@
$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.8 2005/11/13 06:23:58 marcm Exp $ $OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.9 2006/01/03 07:33:37 marcm Exp $
--- gdk-pixbuf/Makefile.in.orig Sat Aug 13 06:21:42 2005 --- gdk-pixbuf/Makefile.in.orig Fri Dec 9 10:28:12 2005
+++ gdk-pixbuf/Makefile.in Tue Aug 23 22:16:42 2005 +++ gdk-pixbuf/Makefile.in Fri Dec 30 22:57:56 2005
@@ -550,7 +550,7 @@ libgdk_pixbuf_2_0_la_SOURCES = \
libgdk_pixbuf_2_0_la_LDFLAGS = \
$(gdk_pixbuf_win32_res_ldflag) \
- -version-info $(LT_VERSION_INFO) \
+ $(LIBgdk_pixbuf-2.0_LTVERSION) \
$(LIBTOOL_EXPORT_OPTIONS) \
$(no_undefined) \
$(gdk_pixbuf_symbols)
@@ -1604,13 +1604,6 @@ install-data-hook: install-ms-lib instal @@ -1604,13 +1604,6 @@ install-data-hook: install-ms-lib instal
@if $(RUN_QUERY_LOADER_TEST) ; then \ @if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-gdk_Makefile_in,v 1.6 2006/01/03 07:33:37 marcm Exp $
--- gdk/Makefile.in.orig Fri Dec 30 22:53:40 2005
+++ gdk/Makefile.in Fri Dec 30 22:54:33 2005
@@ -322,7 +322,6 @@ gtarget = $(gdktarget)
# since automake doesn't support conditionalized libsomething_la_LDFLAGS
# we use the general approach here
LDADD = \
- -version-info $(LT_VERSION_INFO) \
-export-dynamic \
-rpath $(libdir) \
$(no_undefined) \
@@ -425,7 +424,7 @@ libgdk_x11_2_0_la_SOURCES = $(common_sou
libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
+libgdk_x11_2_0_la_LDFLAGS = $(LDADD) $(LIBgdk-x11-2.0_LTVERSION)
libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-gtk_Makefile_in,v 1.7 2006/01/03 07:33:37 marcm Exp $
--- gtk/Makefile.in.orig Fri Dec 30 22:54:45 2005
+++ gtk/Makefile.in Fri Dec 30 22:55:33 2005
@@ -347,7 +347,6 @@ $(am__append_2)
# common options for the various packages.
libtool_opts = \
- -version-info $(LT_VERSION_INFO) \
-export-dynamic $(no_undefined) $(LIBTOOL_EXPORT_OPTIONS) \
-rpath $(libdir) $(libgtk_target_ldflags)
@@ -868,7 +867,7 @@ libgtk_x11_2_0_la_SOURCES = $(gtk_c_sour
libgtk_linux_fb_2_0_la_SOURCES = $(gtk_c_sources)
libgtk_win32_2_0_la_SOURCES = $(gtk_c_sources)
-libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
+libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts) $(LIBgtk-x11-2.0_LTVERSION)
libgtk_linux_fb_2_0_la_LDFLAGS = $(libtool_opts)
libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.18 2005/12/01 15:42:04 bernd Exp $ @comment $OpenBSD: PFRAG.shared,v 1.19 2006/01/03 07:33:37 marcm Exp $
lib/gtk-2.0/2.4.0/engines/libpixmap.so 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-am-et.so
lib/gtk-2.0/2.4.0/immodules/im-cedilla.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-wbmp.so
lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xbm.so
lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so lib/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so
@lib lib/libgdk-x11-2.0.so.800.8 @lib lib/libgdk-x11-2.0.so.${LIBgdk-x11-2.0_VERSION}
@lib lib/libgdk_pixbuf-2.0.so.800.8 @lib lib/libgdk_pixbuf-2.0.so.${LIBgdk_pixbuf-2.0_VERSION}
@lib lib/libgdk_pixbuf_xlib-2.0.so.800.8 @lib lib/libgdk_pixbuf_xlib-2.0.so.${LIBgdk_pixbuf_xlib-2.0_VERSION}
@lib lib/libgtk-x11-2.0.so.800.8 @lib lib/libgtk-x11-2.0.so.${LIBgtk-x11-2.0_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-docs,v 1.14 2005/11/13 06:23:58 marcm Exp $ @comment $OpenBSD: PLIST-docs,v 1.15 2006/01/03 07:33:37 marcm Exp $
@conflict gtk+2-<2.4.9 @conflict gtk+2-<2.4.9
share/gtk-doc/ share/gtk-doc/
share/gtk-doc/html/ share/gtk-doc/html/
@ -29,6 +29,7 @@ share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-refcounting.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-scaling.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-util.html
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp
share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf.devhelp2
share/gtk-doc/html/gdk-pixbuf/home.png share/gtk-doc/html/gdk-pixbuf/home.png
share/gtk-doc/html/gdk-pixbuf/index.html share/gtk-doc/html/gdk-pixbuf/index.html
share/gtk-doc/html/gdk-pixbuf/index.sgml share/gtk-doc/html/gdk-pixbuf/index.sgml
@ -101,6 +102,7 @@ share/gtk-doc/html/gdk/gdk-Visuals.html
share/gtk-doc/html/gdk/gdk-Windows.html share/gtk-doc/html/gdk/gdk-Windows.html
share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html share/gtk-doc/html/gdk/gdk-X-Window-System-Interaction.html
share/gtk-doc/html/gdk/gdk.devhelp share/gtk-doc/html/gdk/gdk.devhelp
share/gtk-doc/html/gdk/gdk.devhelp2
share/gtk-doc/html/gdk/gobbler.png share/gtk-doc/html/gdk/gobbler.png
share/gtk-doc/html/gdk/gumby.png share/gtk-doc/html/gdk/gumby.png
share/gtk-doc/html/gdk/hand1.png share/gtk-doc/html/gdk/hand1.png
@ -394,6 +396,7 @@ share/gtk-doc/html/gtk/gtk-update-icon-cache.html
share/gtk-doc/html/gtk/gtk-windows.html share/gtk-doc/html/gtk/gtk-windows.html
share/gtk-doc/html/gtk/gtk-x11.html share/gtk-doc/html/gtk/gtk-x11.html
share/gtk-doc/html/gtk/gtk.devhelp share/gtk-doc/html/gtk/gtk.devhelp
share/gtk-doc/html/gtk/gtk.devhelp2
share/gtk-doc/html/gtk/gtk.html share/gtk-doc/html/gtk/gtk.html
share/gtk-doc/html/gtk/gtkbase.html share/gtk-doc/html/gtk/gtkbase.html
share/gtk-doc/html/gtk/gtkfilechooser-installing-extra-widgets.html share/gtk-doc/html/gtk/gtkfilechooser-installing-extra-widgets.html