Revision: 118368 https://trac.macports.org/changeset/118368 Author: devans@macports.org Date: 2014-04-01 00:31:13 -0700 (Tue, 01 Apr 2014) Log Message: ----------- GNOME-3/stable: eog-plugins, add +python33 +python34 variants, apply upstream post release bug fixes, use gnome stable livecheck. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-export-to-folder-less-chatty-bz727218.diff users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-slideshowshuffle-use-python3-bz727222.diff Modified: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-04-01 07:27:58 UTC (rev 118367) +++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/Portfile 2014-04-01 07:31:13 UTC (rev 118368) @@ -34,6 +34,9 @@ port:libexif \ port:gsettings-desktop-schemas +patchfiles patch-export-to-folder-less-chatty-bz727218.diff \ + patch-slideshowshuffle-use-python3-bz727222.diff + # update m4/intltool.m4 and autoreconf pre-configure { @@ -49,17 +52,33 @@ # requires python32 or later -variant python32 description {Use python 3.2} { +variant python32 conflicts python33 python34 description {Use python 3.2} { configure.python ${prefix}/bin/python3.2 set python_framework ${frameworks_dir}/Python.framework/Versions/3.2 configure.pkg_config_path ${python_framework}/lib/pkgconfig configure.args-replace --disable-python --enable-python } -default_variants +python32 +variant python33 conflicts python32 python34 description {Use python 3.3} { + configure.python ${prefix}/bin/python3.3 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.3 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} +variant python34 conflicts python32 python33 description {Use python 3.4} { + configure.python ${prefix}/bin/python3.4 + set python_framework ${frameworks_dir}/Python.framework/Versions/3.4 + configure.pkg_config_path ${python_framework}/lib/pkgconfig + configure.args-replace --disable-python --enable-python +} + +if {![variant_isset python32] && ![variant_isset python34]} { + default_variants +python33 +} + post-activate { system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" } -livecheck.type gnome-with-unstable +livecheck.type gnome Added: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-export-to-folder-less-chatty-bz727218.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-export-to-folder-less-chatty-bz727218.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-export-to-folder-less-chatty-bz727218.diff 2014-04-01 07:31:13 UTC (rev 118368) @@ -0,0 +1,32 @@ +From e70eff0464b1943162c1cf4e707b4f8b9707172f Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse <jasper@humppa.nl> +Date: Fri, 28 Mar 2014 09:53:24 +0100 +Subject: Make the export-to-folder plugin less chatty. + +There's no need to print when it gets activated/deacticated. None of the +other plugins do so either. + +https://bugzilla.gnome.org/show_bug.cgi?id=727218 + +diff --git a/plugins/export-to-folder/export-to-folder.py b/plugins/export-to-folder/export-to-folder.py +index 5bb7924..e1a70f9 100644 +--- plugins/export-to-folder/export-to-folder.py ++++ plugins/export-to-folder/export-to-folder.py +@@ -55,7 +55,6 @@ class ExportPlugin(GObject.Object, Eog.WindowActivatable): + return target_dir + + def do_activate(self): +- print('Activating export plugin') + ui_manager = self.window.get_ui_manager() + self.action_group = Gtk.ActionGroup(name='Export') + self.action_group.add_actions([('Export', None, +@@ -64,7 +63,6 @@ class ExportPlugin(GObject.Object, Eog.WindowActivatable): + self.ui_id = ui_manager.add_ui_from_string(ui_str) + + def do_deactivate(self): +- print('Export plugin deactivated') + ui_manager = self.window.get_ui_manager().remove_ui(self.ui_id); + + def export_cb(self, action, window): +-- +cgit v0.10.1 Added: users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-slideshowshuffle-use-python3-bz727222.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-slideshowshuffle-use-python3-bz727222.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-slideshowshuffle-use-python3-bz727222.diff 2014-04-01 07:31:13 UTC (rev 118368) @@ -0,0 +1,20 @@ +From 4d024133af07ba738542e23917c31d7248b6ef2a Mon Sep 17 00:00:00 2001 +From: Jasper Lievisse Adriaanse <jasper@humppa.nl> +Date: Fri, 28 Mar 2014 10:26:24 +0100 +Subject: Switch slideshowshuffle to use the python3 loader. + +https://bugzilla.gnome.org/show_bug.cgi?id=727222 + +diff --git a/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in b/plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in +index 986de8b..ca53c60 100644 +--- plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in ++++ plugins/slideshowshuffle/slideshowshuffle.plugin.desktop.in +@@ -1,5 +1,5 @@ + [Plugin] +-Loader=python ++Loader=python3 + Module=slideshowshuffle + IAge=2 + _Name=Slideshow Shuffle +-- +cgit v0.10.1