diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-26 19:00:11 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-12-26 19:00:11 +0800 |
commit | c3c94e9a53872c5d3de50958e82a1a993f3efc8e (patch) | |
tree | 83ae9df9069c04f72b29db1e27b382bb5655e01a /x11-toolkits/gtk20 | |
parent | 112b75d697c8e21f48e6380c0537cef103db0d52 (diff) | |
download | marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar.gz marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar.bz2 marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar.lz marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar.xz marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.tar.zst marcuscom-ports-c3c94e9a53872c5d3de50958e82a1a993f3efc8e.zip |
Update to 2.19.2.
Disable introspection for now. Configure patch doesn't look correct yet,
atleast gtk builds now.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13306 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/gtk20')
-rw-r--r-- | x11-toolkits/gtk20/Makefile | 7 | ||||
-rw-r--r-- | x11-toolkits/gtk20/distinfo | 6 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-ah | 8 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-configure | 26 | ||||
-rw-r--r-- | x11-toolkits/gtk20/files/patch-gtk_Makefile.in | 18 |
5 files changed, 47 insertions, 18 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 77453616e..fcdc46cef 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,11 +3,11 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.176 2009/12/08 19:16:21 kwm Exp $ # PORTNAME= gtk -PORTVERSION= 2.19.1 +PORTVERSION= 2.19.2 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ @@ -44,7 +44,8 @@ USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite -CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper +CONFIGURE_ARGS= --enable-static --with-xinput=yes --with-libjasper \ + --enable-introspection=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 329ec47e4..592611f87 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gtk+-2.19.1.tar.bz2) = d11e2044aedc49e155832c54dc9ac548 -SHA256 (gnome2/gtk+-2.19.1.tar.bz2) = 82a408aec01fa415257550693a8c1f957de24aa764744c0349e55b6254de343a -SIZE (gnome2/gtk+-2.19.1.tar.bz2) = 18170902 +MD5 (gnome2/gtk+-2.19.2.tar.bz2) = c7b4997a13f644a45349a6a22a21e577 +SHA256 (gnome2/gtk+-2.19.2.tar.bz2) = 36727abfe7cef80c67d07f64eae38bc57deb980571999ab2ba7ff9d73d8b0a1f +SIZE (gnome2/gtk+-2.19.2.tar.bz2) = 18706954 diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah index 416fbb3f0..b6a6a7172 100644 --- a/x11-toolkits/gtk20/files/patch-ah +++ b/x11-toolkits/gtk20/files/patch-ah @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig 2009-09-05 11:12:17.000000000 +0200 -+++ docs/Makefile.in 2009-09-05 11:16:52.000000000 +0200 -@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@ +--- docs/Makefile.in.orig 2009-12-25 20:26:59.000000000 +0100 ++++ docs/Makefile.in 2009-12-25 20:27:35.000000000 +0100 +@@ -241,7 +241,7 @@ LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@ LT_VERSION_INFO = @LT_VERSION_INFO@ MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split + MATH_LIB = @MATH_LIB@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ diff --git a/x11-toolkits/gtk20/files/patch-configure b/x11-toolkits/gtk20/files/patch-configure new file mode 100644 index 000000000..d0585868d --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-configure @@ -0,0 +1,26 @@ +--- configure.orig 2009-12-25 21:13:23.000000000 +0100 ++++ configure 2009-12-25 21:15:59.000000000 +0100 +@@ -33884,9 +33884,9 @@ + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} ++ INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$datadir|\$(datadir)|"` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} ++ INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$libdir|\$(libdir)|"` + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +@@ -33913,9 +33913,9 @@ + + # Hack around introspection installing into an absolute path breaking distcheck + tmp=`pkg-config --variable=datadir gobject-introspection-1.0` +-INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$tmp/\$(datadir)} ++INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|$tmp|\$(datadir)|"` + tmp=`pkg-config --variable=libdir gobject-introspection-1.0` +-INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$tmp/\$(libdir)} ++INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|$tmp|\$(libdir)|"` + + ################################################## + # Checks for gtk-doc and docbook-tools diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in index 8037cf952..25056ecf7 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -1,14 +1,16 @@ ---- gtk/Makefile.in.orig 2009-09-05 11:21:40.000000000 +0200 -+++ gtk/Makefile.in 2009-09-05 11:22:57.000000000 +0200 -@@ -1310,9 +1310,9 @@ LDADDS = \ - - bin_SCRIPTS = gtk-builder-convert +--- gtk/Makefile.in.orig 2009-12-25 20:27:57.000000000 +0100 ++++ gtk/Makefile.in 2009-12-25 20:29:14.000000000 +0100 +@@ -1377,11 +1377,11 @@ bin_SCRIPTS = gtk-builder-convert $(am__ + # gtk-update-icon-cache.exe doesn't require any special privileges. + @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) gtk_query_immodules_2_0_SOURCES = queryimmodules.c --gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la -+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS) + gtk_update_icon_cache_LDADD = \ + $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ +- $(GDK_PIXBUF_DEP_LIBS) ++ $(GDK_PIXBUF_DEP_LIBS) $(GLIB_LIBS) + gtk_update_icon_cache_SOURCES = \ updateiconcache.c - |