<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/63a3f642a2ff259ca39bccddb338ec593e5d217e">https://github.com/macports/macports-ports/commit/63a3f642a2ff259ca39bccddb338ec593e5d217e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 63a3f642a2ff259ca39bccddb338ec593e5d217e
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Dec 19 22:48:44 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> alacarte: require GMenu version before importing from gi.repository
</span>---
gnome/alacarte/Portfile | 5 +++--
gnome/alacarte/files/patch-require-gmenu-3.0.diff | 22 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/alacarte/Portfile b/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0e7acd..87f813e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name alacarte
version 3.11.91
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> epoch 1
license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,8 @@ patchfiles patch-Makefile.am.diff \
</span> patch-acinclude.m4.diff \
patch-Alacarte-MainWindow.py.diff \
patch-Alacarte-MenuEditor.py.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Alacarte-ItemEditor.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Alacarte-ItemEditor.py.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-require-gmenu-3.0.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/alacarte/files/patch-require-gmenu-3.0.diff b/gnome/alacarte/files/patch-require-gmenu-3.0.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..522bcf5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/alacarte/files/patch-require-gmenu-3.0.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur Alacarte.orig/MainWindow.py Alacarte/MainWindow.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Alacarte.orig/MainWindow.py 2018-12-19 21:57:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Alacarte/MainWindow.py 2018-12-19 21:59:16.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import gi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gi.require_version('Gtk', '3.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gi.require_version('GMenu', '3.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gi.repository import Gtk, GdkPixbuf, Gdk, GMenu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import cgi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -ur Alacarte.orig/util.py Alacarte/util.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Alacarte.orig/util.py 2018-12-19 21:57:44.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Alacarte/util.py 2018-12-19 21:58:40.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import gi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gi.require_version('Gtk', '3.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++gi.require_version('GMenu', '3.0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from gi.repository import Gtk, GdkPixbuf, GMenu, GLib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESKTOP_GROUP = GLib.KEY_FILE_DESKTOP_GROUP
</span></pre><pre style='margin:0'>
</pre>