[117386] trunk/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Mon Feb 24 14:17:47 PST 2014
Revision: 117386
https://trac.macports.org/changeset/117386
Author: devans at macports.org
Date: 2014-02-24 14:17:47 -0800 (Mon, 24 Feb 2014)
Log Message:
-----------
gnome-terminal: replace in-tree intltool.m4 with our version, autoreconf to correct intltool configuration, build deps.
Modified Paths:
--------------
trunk/dports/gnome/gnome-terminal/Portfile
trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- trunk/dports/gnome/gnome-terminal/Portfile 2014-02-24 20:57:01 UTC (rev 117385)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2014-02-24 22:17:47 UTC (rev 117386)
@@ -24,7 +24,9 @@
depends_build port:pkgconfig \
port:intltool \
port:itstool \
- port:libxml2
+ port:yelp-tools \
+ port:libxml2 \
+ port:gnome-common
depends_lib port:desktop-file-utils \
port:gnome-icon-theme \
@@ -44,6 +46,15 @@
patch-gschema.xml.in.diff \
no-dupfd_cloexec.patch
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+ copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.args --with-gtk=3.0 \
--disable-migration \
--disable-silent-rules \
Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-02-24 20:57:01 UTC (rev 117385)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-02-24 22:17:47 UTC (rev 117386)
@@ -34,153 +34,13 @@
#include <dconf.h>
#include "terminal-type-builtins.h"
---- configure.orig 2013-10-14 12:28:06.000000000 -0700
-+++ configure 2013-11-25 18:05:42.000000000 -0800
-@@ -13128,7 +13128,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13136,7 +13135,6 @@
+--- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
++++ configure.ac 2014-02-24 14:08:49.000000000 -0800
+@@ -82,7 +82,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13147,7 +13145,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13166,7 +13163,6 @@
- gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
- gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid
- \$PLATFORM_DEPS\""; } >&5
- ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-@@ -13174,7 +13170,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13185,7 +13180,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
-@@ -13213,7 +13207,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- else
- TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -13222,7 +13215,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
-@@ -13234,7 +13226,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS) were not met:
+ $PLATFORM_DEPS])
- $TERM_PKG_ERRORS
-@@ -13574,13 +13565,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13589,7 +13580,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13606,13 +13597,13 @@
- vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED
- dconf >= \$DCONF_REQUIRED
-- uuid\""; } >&5
-+ \""; } >&5
- ($PKG_CONFIG --exists --print-errors "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid") 2>&5
-+ ") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-@@ -13621,7 +13612,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>/dev/null`
-+ " 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
- else
- pkg_failed=yes
-@@ -13647,14 +13638,14 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- else
- MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
- gio-2.0 >= $GIO_REQUIRED
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid" 2>&1`
-+ " 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$MIGRATOR_PKG_ERRORS" >&5
-@@ -13664,7 +13655,7 @@
- vte$VTE_PC_VERSION >= $VTE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid) were not met:
-+ ) were not met:
-
- $MIGRATOR_PKG_ERRORS
-
+ # DConf broke API without changing the pkgconfig name
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140224/0ca71492/attachment-0001.html>
More information about the macports-changes
mailing list