<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c080ffe66c0ed9a0d8490a2c7190155b48d39ac5">https://github.com/macports/macports-ports/commit/c080ffe66c0ed9a0d8490a2c7190155b48d39ac5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c080ffe geany: update to 1.33, fixes
</span>c080ffe is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c080ffe66c0ed9a0d8490a2c7190155b48d39ac5
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Sun Sep 23 01:59:17 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> geany: update to 1.33, fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to version 1.33.
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix dependencies and make the +gtk3 variant default.
</span><span style='display:block; white-space:pre;color:#404040;'> * Call the old default a gtk2 variant (just in case anyone still needs it).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/57151
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56124
</span>---
devel/geany/Portfile | 42 +++++++++++++++++++-------------------
devel/geany/files/vte-sonames.diff | 22 --------------------
2 files changed, 21 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geany/Portfile b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58bb51e..20daf40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name geany
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.33
</span> license GPL-2+
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,9 @@ homepage http://www.geany.org/
</span> master_sites http://download.geany.org/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6f1f73067a0e802a7c335e23526024533b9b2249 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e38530e87c577e1e9806be3b40e08fb9ee321eb1abc6361ddacdad89c825f90d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 43c758011a5757c35ed05d8eac39e4793cfbbd61 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 66baaff43f12caebcf0efec9a5533044dc52837f799c73a1fd7312caa86099c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4106409
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +32,7 @@ depends_build port:pkgconfig \
</span> port:libtool
depends_lib port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gettext \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vte-gtk2-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext
</span>
# reconfigure using distributed autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,27 +41,28 @@ configure.cmd ./autogen.sh
</span> configure.args --disable-silent-rules \
--enable-vte
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles vte-sonames.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk2 description {Use gtk2} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vte-gtk2-compat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set update_icon_cache "gtk-update-icon-cache"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gtk3 description {Enable experimental gtk3 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vte-gtk2-compat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:vte-2.90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gtk3 description {Use gtk3} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:vte
</span> depends_run-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnome-themes-standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:adwaita-icon-theme
</span> configure.args-append \
--enable-gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset gtk3]} {
</span> set update_icon_cache "gtk-update-icon-cache-3.0"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-vte-module-path=${prefix}/lib/libvte2_90.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-vte-module-path=${prefix}/lib/libvte.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set update_icon_cache "gtk-update-icon-cache"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gtk2]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +gtk3
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geany/files/vte-sonames.diff b/devel/geany/files/vte-sonames.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 689a5cf..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geany/files/vte-sonames.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/vte.c.orig 2014-04-16 08:20:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/vte.c 2014-09-22 09:04:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,7 +234,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (module == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vte_info.have_vte = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- geany_debug("Could not load libvte.so, embedded terminal support disabled");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ geany_debug("Could not load libvte.dylib, embedded terminal support disabled");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libmain.c.orig 2014-04-16 08:20:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libmain.c 2014-09-22 09:08:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +136,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "no-session", 's', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &cl_options.load_session, N_("Don't load the previous session's files"), NULL },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_VTE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "no-terminal", 't', 0, G_OPTION_ARG_NONE, &no_vte, N_("Don't load terminal support"), NULL },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.dylib"), NULL },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose_mode, N_("Be verbose"), NULL },
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL },
</span></pre><pre style='margin:0'>
</pre>