[117824] users/devans/GNOME-3/stable/dports/gnome
devans at macports.org
devans at macports.org
Thu Mar 13 22:21:03 PDT 2014
Revision: 117824
https://trac.macports.org/changeset/117824
Author: devans at macports.org
Date: 2014-03-13 22:21:03 -0700 (Thu, 13 Mar 2014)
Log Message:
-----------
GNOME-3/stable: alacarte, anjuta, eog-plugins, sync with trunk, intltool fixes.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile
users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff
users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff
users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff
users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff
users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff
users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff
users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.diff
users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff
users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/alacarte/
users/devans/GNOME-3/stable/dports/gnome/anjuta/
users/devans/GNOME-3/stable/dports/gnome/eog-plugins/
Property changes on: users/devans/GNOME-3/stable/dports/gnome/alacarte
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/gnome/alacarte:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/alacarte:108271-117721
/users/rmstonecipher/gnome/alacarte:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/Portfile 2014-03-14 05:21:03 UTC (rev 117824)
@@ -36,10 +36,16 @@
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles patch-Makefile.in.diff \
- patch-configure.diff \
+patchfiles patch-Makefile.am.diff \
+ patch-configure.ac.diff \
+ patch-acinclude.m4.diff \
patch-Alacarte-MenuEditor.py.diff
+# reconfigure with our intltool.m4
+
+use_autoreconf yes
+autoreconf.args -fvi
+
post-destroot {
move ${destroot}${prefix}/bin/alacarte.py ${destroot}${prefix}/bin/alacarte
}
Copied: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff (from rev 117721, trunk/dports/gnome/alacarte/files/patch-Makefile.am.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.am.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -0,0 +1,23 @@
+--- Makefile.am.orig 2014-03-09 09:04:17.000000000 -0700
++++ Makefile.am 2014-03-09 09:06:24.000000000 -0700
+@@ -4,16 +4,16 @@
+
+ CLEANFILES=
+
+-bin_SCRIPTS = alacarte
+-CLEANFILES += alacarte
++bin_SCRIPTS = alacarte.py
++CLEANFILES += alacarte.py
+
+ DISTCLEANFILES = ChangeLog
+
+-alacarte: alacarte.in
++alacarte.py: alacarte.in
+ $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
+ -e s!\@PYOPTIONS\@!-OOt! \
+ < $< > $@
+-alacarte: Makefile
++alacarte.py: Makefile
+
+ EXTRA_DIST = \
+ alacarte.in \
Deleted: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-Makefile.in.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -1,27 +0,0 @@
---- Makefile.in.orig 2013-09-24 10:08:35.000000000 -0700
-+++ Makefile.in 2013-11-06 16:10:24.000000000 -0800
-@@ -356,8 +356,8 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = data po Alacarte
--CLEANFILES = alacarte
--bin_SCRIPTS = alacarte
-+CLEANFILES = alacarte.py
-+bin_SCRIPTS = alacarte.py
- DISTCLEANFILES = ChangeLog
- EXTRA_DIST = \
- alacarte.in \
-@@ -867,11 +867,11 @@
- tags-am uninstall uninstall-am uninstall-binSCRIPTS
-
-
--alacarte: alacarte.in
-+alacarte.py: alacarte.in
- $(AM_V_GEN)sed -e s!\@PYTHON\@!@PYTHON@! \
- -e s!\@PYOPTIONS\@!-OOt! \
- < $< > $@
--alacarte: Makefile
-+alacarte.py: Makefile
-
- ChangeLog:
- @echo Creating $@
Copied: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff (from rev 117721, trunk/dports/gnome/alacarte/files/patch-acinclude.m4.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-acinclude.m4.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -0,0 +1,13 @@
+--- acinclude.m4.orig 2014-03-09 09:22:23.000000000 -0700
++++ acinclude.m4 2014-03-09 09:23:17.000000000 -0700
+@@ -79,8 +79,8 @@
+ dnl distinct variables so they can be overridden if need be. However,
+ dnl general consensus is that you shouldn't need this ability.
+
+- AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+- AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
++ AC_SUBST([PYTHON_PREFIX], [`$PYTHON -c 'import sys; print(sys.prefix);'`])
++ AC_SUBST([PYTHON_EXEC_PREFIX], [`$PYTHON -c 'import sys; print(sys.exec_prefix);'`])
+
+ dnl At times (like when building shared libraries) you may want
+ dnl to know which OS platform Python thinks this is.
Copied: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff (from rev 117721, trunk/dports/gnome/alacarte/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.ac.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2014-03-09 08:56:46.000000000 -0700
++++ configure.ac 2014-03-09 09:02:22.000000000 -0700
+@@ -1,7 +1,7 @@
+ dnl -*- Mode: autoconf -*-
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.53)
+-AC_INIT(alacarte, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
++AC_INIT(alacarte.py, 3.10.0, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte)
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+ AC_CONFIG_SRCDIR(alacarte.in)
+ AC_CONFIG_HEADERS([config.h])
Deleted: users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/alacarte/files/patch-configure.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -1,50 +0,0 @@
---- configure.orig 2013-09-24 10:08:36.000000000 -0700
-+++ configure 2013-11-06 16:10:24.000000000 -0800
-@@ -5861,9 +5861,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -5936,9 +5936,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -6011,9 +6011,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
-@@ -6086,9 +6086,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
Property changes on: users/devans/GNOME-3/stable/dports/gnome/anjuta
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/anjuta:108265-116177
/users/rmstonecipher/gnome/anjuta:102363-103172
+ /branches/mld-qt-481/dports/gnome/anjuta:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/anjuta:108265-117820
/users/devans/dports/gnome/anjuta:117797-117811
/users/rmstonecipher/gnome/anjuta:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/Portfile 2014-03-14 05:21:03 UTC (rev 117824)
@@ -24,13 +24,20 @@
depends_build port:pkgconfig \
port:intltool \
- port:itstool
+ port:itstool \
+ port:yelp-tools \
+ port:gtk-doc \
+ port:gnome-common \
+ port:autoconf \
+ port:automake \
+ port:libtool
depends_lib port:desktop-file-utils \
port:autogen \
port:shared-mime-info \
port:gtk3 \
port:gdl3 \
+ port:gjs \
port:gobject-introspection \
port:gtksourceview3 \
port:libgda5 \
@@ -42,10 +49,14 @@
port:yelp \
port:xdg-utils
-patchfiles patch-configure.diff \
+patchfiles patch-configure.ac.diff \
patch-ltmain.sh.diff \
- patch-plugins-language-support-vala-Makefile.in.diff
+ patch-plugins-language-support-vala-Makefile.am.diff
+#reconfigure with our intltool.m4 using autogen.sh
+
+configure.cmd ./autogen.sh
+
configure.cflags-append \
-std=gnu89 -Wno-format-nonliteral
Copied: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff (from rev 117820, trunk/dports/gnome/anjuta/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.ac.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2014-03-11 14:12:24.000000000 -0700
++++ configure.ac 2014-03-11 14:12:52.000000000 -0700
+@@ -101,7 +101,7 @@
+ AC_SUBST(AM_CXXFLAGS)
+
+ ANJUTA_LDFLAGS="-no-undefined"
+-ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version -no-undefined"
++ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version"
+ AC_SUBST(ANJUTA_LDFLAGS)
+ AC_SUBST(ANJUTA_PLUGIN_LDFLAGS)
+
Deleted: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.diff 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-configure.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -1,23 +0,0 @@
---- configure.orig 2013-11-14 13:21:08.000000000 -0800
-+++ configure 2013-11-25 20:46:49.000000000 -0800
-@@ -5538,7 +5538,7 @@
-
-
- ANJUTA_LDFLAGS="-no-undefined"
--ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version -no-undefined"
-+ANJUTA_PLUGIN_LDFLAGS="-module -avoid-version"
-
-
-
-@@ -18120,9 +18120,9 @@
-
-
-
-- PYTHON_PREFIX='${prefix}'
-+ PYTHON_PREFIX=`$PYTHON -c 'import sys; print(sys.prefix);'`
-
-- PYTHON_EXEC_PREFIX='${exec_prefix}'
-+ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print(sys.exec_prefix);'`
-
-
-
Copied: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff (from rev 117820, trunk/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.am.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -0,0 +1,12 @@
+--- plugins/language-support-vala/Makefile.am.orig 2014-03-12 22:11:19.000000000 -0700
++++ plugins/language-support-vala/Makefile.am 2014-03-12 22:11:54.000000000 -0700
+@@ -40,8 +40,7 @@
+ $(LIBANJUTA_CFLAGS) \
+ $(VALA_CFLAGS) \
+ -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
+- -DG_LOG_DOMAIN=\"language-support-vala\" \
+- --no-warn
++ -DG_LOG_DOMAIN=\"language-support-vala\"
+
+ # The plugin
+ plugindir = $(anjuta_plugin_dir)
Deleted: users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/anjuta/files/patch-plugins-language-support-vala-Makefile.in.diff 2014-03-14 05:21:03 UTC (rev 117824)
@@ -1,12 +0,0 @@
---- plugins/language-support-vala/Makefile.in.orig 2013-11-14 13:21:14.000000000 -0800
-+++ plugins/language-support-vala/Makefile.in 2013-11-25 20:46:49.000000000 -0800
-@@ -509,8 +509,7 @@
- @ENABLE_VALA_TRUE@ $(LIBANJUTA_CFLAGS) \
- @ENABLE_VALA_TRUE@ $(VALA_CFLAGS) \
- @ENABLE_VALA_TRUE@ -DPACKAGE_SRC_DIR=\"$(srcdir)\" \
-- at ENABLE_VALA_TRUE@ -DG_LOG_DOMAIN=\"language-support-vala\" \
-- at ENABLE_VALA_TRUE@ --no-warn
-+ at ENABLE_VALA_TRUE@ -DG_LOG_DOMAIN=\"language-support-vala\"
-
-
- # The plugin
Property changes on: users/devans/GNOME-3/stable/dports/gnome/eog-plugins
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/dports/gnome/eog-plugins:113657-117823
Modified: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-14 05:08:50 UTC (rev 117823)
+++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-03-14 05:21:03 UTC (rev 117824)
@@ -35,8 +35,11 @@
port:libexif \
port:gsettings-desktop-schemas
-patchfiles patch-configure.diff
+# reconfigure with our intltool.m4
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.args --disable-python \
--disable-schemas-compile \
--disable-silent-rules
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140313/07f64a84/attachment-0001.html>
More information about the macports-changes
mailing list