[122323] trunk/dports/devel/geany
devans at macports.org
devans at macports.org
Sun Jul 20 15:52:40 PDT 2014
Revision: 122323
https://trac.macports.org/changeset/122323
Author: devans at macports.org
Date: 2014-07-20 15:52:40 -0700 (Sun, 20 Jul 2014)
Log Message:
-----------
geany: depend on vte-gtk2-compat instead of vte, fix intltool configuration, increment revision to rebuild (#41428, maintainer timeout).
Modified Paths:
--------------
trunk/dports/devel/geany/Portfile
trunk/dports/devel/geany/files/patch-no-export-dynamic.diff
Modified: trunk/dports/devel/geany/Portfile
===================================================================
--- trunk/dports/devel/geany/Portfile 2014-07-20 22:32:51 UTC (rev 122322)
+++ trunk/dports/devel/geany/Portfile 2014-07-20 22:52:40 UTC (rev 122323)
@@ -5,7 +5,7 @@
name geany
version 1.22
-revision 1
+revision 2
license GPL-2+
categories devel
platforms darwin
@@ -33,10 +33,19 @@
depends_lib \
port:gettext \
port:gtk2 \
- port:vte
+ port:vte-gtk2-compat
patchfiles patch-no-export-dynamic.diff
+# 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 --disable-silent-rules
platform darwin {
Modified: trunk/dports/devel/geany/files/patch-no-export-dynamic.diff
===================================================================
--- trunk/dports/devel/geany/files/patch-no-export-dynamic.diff 2014-07-20 22:32:51 UTC (rev 122322)
+++ trunk/dports/devel/geany/files/patch-no-export-dynamic.diff 2014-07-20 22:52:40 UTC (rev 122323)
@@ -1,14 +1,4 @@
https://github.com/geany/geany/commit/d11f9a51b939bf39c3c1676ab823147d460ede75
---- src/Makefile.in.orig 2012-06-18 09:13:57.000000000 -0500
-+++ src/Makefile.in 2012-10-24 21:28:48.000000000 -0500
-@@ -468,7 +468,6 @@
- @MINGW_TRUE@ -DGTK \
- @MINGW_TRUE@ -DG_LOG_DOMAIN=\""Geany"\"
-
-- at MINGW_FALSE@geany_LDFLAGS = -Wl,--export-dynamic
- @MINGW_TRUE at geany_LDFLAGS = -mwindows -mms-bitfields
- @MINGW_TRUE at WINDRES = $(host_alias)-windres
- all: all-am
--- wscript.orig 2012-06-17 17:24:32.000000000 -0500
+++ wscript 2012-10-24 21:28:41.000000000 -0500
@@ -309,7 +309,6 @@
@@ -19,3 +9,14 @@
uselib = ['GTK', 'GLIB', 'GMODULE', 'GIO', 'GTHREAD', 'WIN32', 'SUNOS_SOCKET'],
use = ['scintilla', 'tagmanager', 'mio'])
+--- src/Makefile.am.orig 2014-07-17 21:00:18.000000000 -0700
++++ src/Makefile.am 2014-07-17 21:01:10.000000000 -0700
+@@ -126,7 +126,7 @@
+ -DGTK \
+ -DG_LOG_DOMAIN=\""Geany"\"
+
+-geany_LDFLAGS = -Wl,--export-dynamic
++geany_LDFLAGS =
+
+ clean-local:
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140720/e390e179/attachment-0001.html>
More information about the macports-changes
mailing list