From b2910617f2893dc608b8e9b31b1643ae1d33f794 Mon Sep 17 00:00:00 2001 From: nino Date: Sun, 11 Aug 2002 11:03:27 +0000 Subject: [PATCH] Update to 2.0.6, make library versions controllable from the Makefile. --- x11/gtk+2/Makefile | 75 +++++++++++-------- x11/gtk+2/distinfo | 6 +- .../patch-contrib_gdk-pixbuf-xlib_Makefile_in | 12 +++ x11/gtk+2/patches/patch-demos_Makefile_in | 15 ++-- .../patches/patch-gdk-pixbuf_Makefile_in | 12 +++ x11/gtk+2/patches/patch-gdk_Makefile_in | 20 +++++ x11/gtk+2/patches/patch-gtk_Makefile_in | 20 +++++ x11/gtk+2/pkg/PLIST | 4 +- x11/gtk+2/pkg/PLIST-docs | 10 +-- 9 files changed, 124 insertions(+), 50 deletions(-) create mode 100644 x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in create mode 100644 x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in create mode 100644 x11/gtk+2/patches/patch-gdk_Makefile_in create mode 100644 x11/gtk+2/patches/patch-gtk_Makefile_in diff --git a/x11/gtk+2/Makefile b/x11/gtk+2/Makefile index 3037c313113..5b3d94f90ca 100644 --- a/x11/gtk+2/Makefile +++ b/x11/gtk+2/Makefile @@ -1,50 +1,59 @@ -# $OpenBSD: Makefile,v 1.2 2002/07/26 05:16:12 nino Exp $ +# $OpenBSD: Makefile,v 1.3 2002/08/11 11:03:27 nino Exp $ -COMMENT= "multi-platform graphical toolkit" -COMMENT-docs= "gtk+-2 documentation" +COMMENT= "multi-platform graphical toolkit" +COMMENT-docs= "gtk+-2 documentation" -VERSION= 2.0.5 -DISTNAME= gtk+-${VERSION} -PKGNAME= gtk+2-${VERSION} -PKGNAME-docs= gtk+2-docs-${VERSION} -CATEGORIES= x11 devel +VERSION= 2.0.6 +DISTNAME= gtk+-${VERSION} +PKGNAME= gtk+2-${VERSION} +PKGNAME-docs= gtk+2-docs-${VERSION} +CATEGORIES= x11 devel -HOMEPAGE= http://www.gtk.org -MAINTAINER= Nils Nordman +HOMEPAGE= http://www.gtk.org +MAINTAINER= Nils Nordman # LGPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ -EXTRACT_SUFX= .tar.bz2 +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v2.0/ +EXTRACT_SUFX= .tar.bz2 -MULTI_PACKAGES= -docs +MULTI_PACKAGES= -docs SUBPACKAGE?= .if ${SUBPACKAGE} != "-docs" -LIB_DEPENDS= glib-2.0.=0,gmodule-2.0.=0,gobject-2.0.=0::devel/glib2 \ - pango-1.0.=0,pangox-1.0.=0,pangoxft-1.0.=0::devel/pango \ - atk-1.0.=0::devel/atk \ - tiff.35::graphics/tiff \ - png.3::graphics/png \ - jpeg.62::graphics/tiff -BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig -RUN_DEPENDS= ${BUILD_DEPENDS} +LIB_DEPENDS= glib-2.0.=0,gmodule-2.0.=0,gobject-2.0.=0::devel/glib2 \ + pango-1.0.=0,pangox-1.0.=0,pangoxft-1.0.=0::devel/pango \ + atk-1.0.=0::devel/atk \ + tiff.35::graphics/tiff \ + png.3::graphics/png \ + jpeg.62::graphics/tiff +BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig .endif -USE_X11= Yes -USE_GMAKE= Yes +# library versions (major:minor) +LIBGDK_X11_VERSION= 0:5 +LIBGDK_PIXBUF_VERSION= 0:5 +LIBGDK_PIXBUF_XLIB_VERSION= 0:5 +LIBGTK_X11_VERSION= 0:5 -CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} -CONFIGURE_ARGS+= --enable-static -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \ - LDFLAGS="-L${LOCALBASE}/lib" +USE_X11= Yes +USE_GMAKE= Yes +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} +CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --disable-gtk-doc +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/freetype2/ -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \ + LDFLAGS="-L${LOCALBASE}/lib" +MAKE_ENV= LIBGDK_X11_VERSION="${LIBGDK_X11_VERSION}" \ + LIBGDK_PIXBUF_VERSION="${LIBGDK_PIXBUF_VERSION}" \ + LIBGDK_PIXBUF_XLIB_VERSION="${LIBGDK_PIXBUF_XLIB_VERSION}" \ + LIBGTK_X11_VERSION="${LIBGTK_X11_VERSION}" -NO_REGRESS= Yes +NO_REGRESS= Yes post-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gtk+2/gtk-2.0; \ diff --git a/x11/gtk+2/distinfo b/x11/gtk+2/distinfo index 9e9138df2cd..d49054f9d5d 100644 --- a/x11/gtk+2/distinfo +++ b/x11/gtk+2/distinfo @@ -1,3 +1,3 @@ -MD5 (gtk+-2.0.5.tar.bz2) = dfa52595e76fd389c4d42c60412317e8 -RMD160 (gtk+-2.0.5.tar.bz2) = 191c41691e608c2065b96a0a3e794a769ad0e57e -SHA1 (gtk+-2.0.5.tar.bz2) = 99e2c76d5ff516a19dbb319277a1e33009357f7e +MD5 (gtk+-2.0.6.tar.bz2) = 5f9c1b54abea95408155045c661a5adf +RMD160 (gtk+-2.0.6.tar.bz2) = 35efcf957303f13fcf394d0c6e454070fd8c5f02 +SHA1 (gtk+-2.0.6.tar.bz2) = fcd596e54709449a945959ad75ae04e0ffefca34 diff --git a/x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in b/x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in new file mode 100644 index 00000000000..691e5add212 --- /dev/null +++ b/x11/gtk+2/patches/patch-contrib_gdk-pixbuf-xlib_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-contrib_gdk-pixbuf-xlib_Makefile_in,v 1.1 2002/08/11 11:03:27 nino Exp $ +--- contrib/gdk-pixbuf-xlib/Makefile.in.orig Sun Aug 11 11:35:45 2002 ++++ contrib/gdk-pixbuf-xlib/Makefile.in Sun Aug 11 11:36:09 2002 +@@ -191,7 +191,7 @@ LDADDS = @STRIP_BEGIN@ \ + + libgdk_pixbuf_xlib_2_0_la_LDFLAGS = \ + -export-dynamic \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++ -version-info $(LIBGDK_PIXBUF_XLIB_VERSION) + + + libgdk_pixbuf_xlib_2_0_la_SOURCES = \ diff --git a/x11/gtk+2/patches/patch-demos_Makefile_in b/x11/gtk+2/patches/patch-demos_Makefile_in index 904d10addbc..3e8ba4eeaf9 100644 --- a/x11/gtk+2/patches/patch-demos_Makefile_in +++ b/x11/gtk+2/patches/patch-demos_Makefile_in @@ -1,13 +1,12 @@ -$OpenBSD: patch-demos_Makefile_in,v 1.1.1.1 2002/07/25 09:42:35 nino Exp $ ---- demos/Makefile.in.orig Mon Jun 24 19:40:50 2002 -+++ demos/Makefile.in Mon Jun 24 19:46:52 2002 -@@ -973,7 +973,8 @@ test-inline-pixbufs.h: $(top_builddir)/g +$OpenBSD: patch-demos_Makefile_in,v 1.2 2002/08/11 11:03:27 nino Exp $ +--- demos/Makefile.in.orig Thu Aug 1 00:10:15 2002 ++++ demos/Makefile.in Sun Aug 11 11:15:08 2002 +@@ -974,7 +974,7 @@ maintainer-clean-generic clean mostlycle + test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ cd $(srcdir) && \ - GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \ -- $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \ -+ LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs \ -+ $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \ +- $(pixbuf_csource) --build-list \ ++ LD_LIBRARY_PATH=$(top_builddir)/gdk-pixbuf/.libs $(pixbuf_csource) --build-list \ apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h) $(testpixbuf_OBJECTS): test-inline-pixbufs.h diff --git a/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in b/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in new file mode 100644 index 00000000000..ab9da203a0a --- /dev/null +++ b/x11/gtk+2/patches/patch-gdk-pixbuf_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-gdk-pixbuf_Makefile_in,v 1.1 2002/08/11 11:03:27 nino Exp $ +--- gdk-pixbuf/Makefile.in.orig Sun Aug 11 11:31:16 2002 ++++ gdk-pixbuf/Makefile.in Sun Aug 11 11:33:14 2002 +@@ -409,7 +409,7 @@ libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BE + @STRIP_END@ + + libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ++ -version-info $(LIBGDK_PIXBUF_VERSION) \ + @LIBTOOL_EXPORT_OPTIONS@ \ + $(no_undefined) \ + $(gdk_pixbuf_symbols) \ diff --git a/x11/gtk+2/patches/patch-gdk_Makefile_in b/x11/gtk+2/patches/patch-gdk_Makefile_in new file mode 100644 index 00000000000..608552ed6cb --- /dev/null +++ b/x11/gtk+2/patches/patch-gdk_Makefile_in @@ -0,0 +1,20 @@ +$OpenBSD: patch-gdk_Makefile_in,v 1.1 2002/08/11 11:03:28 nino Exp $ +--- gdk/Makefile.in.orig Sun Aug 11 11:30:17 2002 ++++ gdk/Makefile.in Sun Aug 11 11:31:07 2002 +@@ -214,7 +214,6 @@ gtarget = @gdktarget@ + # since automake doesn't support conditionalized libsomething_la_LDFLAGS + # we use the general approach here + LDFLAGS = @STRIP_BEGIN@ \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ +@@ -338,7 +337,7 @@ X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libgdk_x11_2_0_la_LDFLAGS = ++libgdk_x11_2_0_la_LDFLAGS = -version-info $(LIBGDK_X11_VERSION) + libgdk_x11_2_0_la_DEPENDENCIES = x11/libgdk-x11.la + libgdk_x11_2_0_la_OBJECTS = gdk.lo gdkcolor.lo gdkcursor.lo gdkdraw.lo \ + gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkkeys.lo gdkkeyuni.lo \ diff --git a/x11/gtk+2/patches/patch-gtk_Makefile_in b/x11/gtk+2/patches/patch-gtk_Makefile_in new file mode 100644 index 00000000000..1916e7e6ee1 --- /dev/null +++ b/x11/gtk+2/patches/patch-gtk_Makefile_in @@ -0,0 +1,20 @@ +$OpenBSD: patch-gtk_Makefile_in,v 1.1 2002/08/11 11:03:28 nino Exp $ +--- gtk/Makefile.in.orig Thu Aug 1 00:10:06 2002 ++++ gtk/Makefile.in Sun Aug 11 12:15:31 2002 +@@ -213,7 +213,6 @@ gtarget = @gdktarget@ + # we use the general approach here + libgtkincludedir = $(includedir)/gtk-2.0/gtk + LDFLAGS = @STRIP_BEGIN@ \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -export-dynamic \ + -rpath $(libdir) \ + $(no_undefined) \ +@@ -686,7 +685,7 @@ X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + X_EXTRA_LIBS = @X_EXTRA_LIBS@ + X_PRE_LIBS = @X_PRE_LIBS@ +-libgtk_x11_2_0_la_LDFLAGS = ++libgtk_x11_2_0_la_LDFLAGS = -version-info $(LIBGTK_X11_VERSION) + libgtk_x11_2_0_la_LIBADD = + libgtk_x11_2_0_la_OBJECTS = gtkaccelgroup.lo gtkaccelmap.lo \ + gtkaccellabel.lo gtkaccessible.lo gtkadjustment.lo gtkalignment.lo \ diff --git a/x11/gtk+2/pkg/PLIST b/x11/gtk+2/pkg/PLIST index 5e6f3264780..b81ad4809c6 100644 --- a/x11/gtk+2/pkg/PLIST +++ b/x11/gtk+2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/07/25 09:42:35 nino Exp $ +@comment $OpenBSD: PLIST,v 1.2 2002/08/11 11:03:28 nino Exp $ bin/gdk-pixbuf-csource bin/gtk-demo bin/gtk-query-immodules-2.0 @@ -273,6 +273,7 @@ share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo +share/locale/bg/LC_MESSAGES/gtk20.mo share/locale/ca/LC_MESSAGES/gtk20.mo share/locale/cs/LC_MESSAGES/gtk20.mo share/locale/cy/LC_MESSAGES/gtk20.mo @@ -297,6 +298,7 @@ share/locale/it/LC_MESSAGES/gtk20.mo share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20.mo +share/locale/lv/LC_MESSAGES/gtk20.mo share/locale/ms/LC_MESSAGES/gtk20.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20.mo diff --git a/x11/gtk+2/pkg/PLIST-docs b/x11/gtk+2/pkg/PLIST-docs index bedf531cbdd..30bdea5de81 100644 --- a/x11/gtk+2/pkg/PLIST-docs +++ b/x11/gtk+2/pkg/PLIST-docs @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST-docs,v 1.1.1.1 2002/07/25 09:42:36 nino Exp $ -share/gtk-doc/html/gdk-pixbuf/a4093.html +@comment $OpenBSD: PLIST-docs,v 1.2 2002/08/11 11:03:28 nino Exp $ +share/gtk-doc/html/gdk-pixbuf/a4187.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-animation.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-creating.html share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-file-loading.html @@ -22,8 +22,8 @@ share/gtk-doc/html/gdk-pixbuf/index.html share/gtk-doc/html/gdk-pixbuf/index.sgml share/gtk-doc/html/gdk-pixbuf/license.html share/gtk-doc/html/gdk-pixbuf/r27.html -share/gtk-doc/html/gdk-pixbuf/x4112.html -share/gtk-doc/html/gdk-pixbuf/x4160.html +share/gtk-doc/html/gdk-pixbuf/x4206.html +share/gtk-doc/html/gdk-pixbuf/x4254.html share/gtk-doc/html/gdk/X_cursor.png share/gtk-doc/html/gdk/arrow.png share/gtk-doc/html/gdk/based_arrow_down.png @@ -130,7 +130,7 @@ share/gtk-doc/html/gdk/watch.png share/gtk-doc/html/gdk/xterm.png share/gtk-doc/html/gtk/abstractobjects.html share/gtk-doc/html/gtk/buttonwidgets.html -share/gtk-doc/html/gtk/c17377.html +share/gtk-doc/html/gtk/c17328.html share/gtk-doc/html/gtk/deprecatedobjects.html share/gtk-doc/html/gtk/displaywidgets.html share/gtk-doc/html/gtk/gtk-accelerator-maps.html