Revision: 140872 https://trac.macports.org/changeset/140872 Author: devans@macports.org Date: 2015-10-04 12:21:10 -0700 (Sun, 04 Oct 2015) Log Message: ----------- eog-plugins: update to version 3.16.2. Modified Paths: -------------- trunk/dports/gnome/eog-plugins/Portfile Added Paths: ----------- trunk/dports/gnome/eog-plugins/files/patch-plugins-pythonconsole.diff trunk/dports/gnome/eog-plugins/files/patch-plugins-slideshowshuffle.diff Removed Paths: ------------- trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff Property Changed: ---------------- trunk/dports/gnome/eog-plugins/ Property changes on: trunk/dports/gnome/eog-plugins ___________________________________________________________________ Modified: svn:mergeinfo - /users/devans/GNOME-3/stable/dports/gnome/eog-plugins:113175-139676 /users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152,124221-125772,133199-134397 + /users/devans/GNOME-3/stable/dports/gnome/eog-plugins:113175-140741 /users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152,124221-125772,133199-134397,136843-140590 Modified: trunk/dports/gnome/eog-plugins/Portfile =================================================================== --- trunk/dports/gnome/eog-plugins/Portfile 2015-10-04 19:21:09 UTC (rev 140871) +++ trunk/dports/gnome/eog-plugins/Portfile 2015-10-04 19:21:10 UTC (rev 140872) @@ -4,8 +4,7 @@ PortSystem 1.0 name eog-plugins -version 3.16.1 -revision 1 +version 3.16.2 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Extra plugins for the Eye of GNOME image viewer @@ -18,8 +17,8 @@ use_xz yes -checksums rmd160 3742f4af5ad394e6ad2fd5ad324989e4d70e4254 \ - sha256 c586b6708064dcd03612f9373a6160214b2fa4797bf8c07db530b18eda4074d9 +checksums rmd160 6c86da34f05f52bf88462f638b68309e2f92ae51 \ + sha256 f33de3c78d6a7d8a89441daa9c3e49e043dcdc527b0b7d477f0bf2d3af08e534 depends_build port:pkgconfig \ port:intltool \ @@ -38,10 +37,8 @@ port:libexif \ port:gsettings-desktop-schemas -# use upstream patch to fix map image location marker icon issue -# uses "image-x-generic" rather than "gnome-mime-image" or "camera-photo-symbolic" -# https://bugzilla.gnome.org/show_bug.cgi?id=753761 -patchfiles patch-map-marker-icon.diff +patchfiles patch-plugins-pythonconsole.diff \ + patch-plugins-slideshowshuffle.diff # reconfigure using upstream autogen.sh for intltool 0.51 compatibility Deleted: trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff =================================================================== --- trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff 2015-10-04 19:21:09 UTC (rev 140871) +++ trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff 2015-10-04 19:21:10 UTC (rev 140872) @@ -1,26 +0,0 @@ -From a00f6f163a3f4fd6fe8ff2d821fae286e3a872cf Mon Sep 17 00:00:00 2001 -From: Felix Riemann <friemann@gnome.org> -Date: Mon, 24 Aug 2015 19:37:16 +0200 -Subject: map: Use a non-deprecated image icon - -"gnome-mime-image" requires the deprecated gnome-icon-theme -package. Use "image-x-generic" instead, which is part of adwaita-icon-theme. - -https://bugzilla.gnome.org/show_bug.cgi?id=753761 - -diff --git a/plugins/map/eog-map-plugin.c b/plugins/map/eog-map-plugin.c -index 4b68bbd..9f8227d 100644 ---- plugins/map/eog-map-plugin.c -+++ plugins/map/eog-map-plugin.c -@@ -67,7 +67,7 @@ update_marker_image (ChamplainLabel *marker, - thumb = gtk_clutter_texture_new (); - gtk_clutter_texture_set_from_icon_name (GTK_CLUTTER_TEXTURE (thumb), - widget, -- "gnome-mime-image", -+ "image-x-generic", - size, NULL); - /* don't need to unref widget because it is floating */ - --- -cgit v0.10.2 - Copied: trunk/dports/gnome/eog-plugins/files/patch-plugins-pythonconsole.diff (from rev 140741, users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-plugins-pythonconsole.diff) =================================================================== --- trunk/dports/gnome/eog-plugins/files/patch-plugins-pythonconsole.diff (rev 0) +++ trunk/dports/gnome/eog-plugins/files/patch-plugins-pythonconsole.diff 2015-10-04 19:21:10 UTC (rev 140872) @@ -0,0 +1,23 @@ +--- plugins/pythonconsole/__init__.py.orig 2015-03-23 15:21:26.000000000 -0700 ++++ plugins/pythonconsole/__init__.py 2015-09-28 13:38:11.000000000 -0700 +@@ -25,6 +25,11 @@ + # Copyright (C), 2005 Adam Hooper <adamh@densi.com> + # Copyrignt (C), 2005 Raphaël Slinckx + ++import gi ++ ++gi.require_version('Gtk', '3.0') ++gi.require_version('Eog', '3.0') ++gi.require_version('PeasGtk', '1.0') + from gi.repository import GObject, Gio, GLib, Gtk, Eog, PeasGtk + + from .console import PythonConsole +@@ -41,7 +46,7 @@ + PeasGtk.Configurable): + + # Override EogWindowActivatable's window property +- window = GObject.property(type=Eog.Window) ++ window = GObject.Property(type=Eog.Window) + action_group = None + + def __init__(self): Copied: trunk/dports/gnome/eog-plugins/files/patch-plugins-slideshowshuffle.diff (from rev 140741, users/devans/GNOME-3/stable/dports/gnome/eog-plugins/files/patch-plugins-slideshowshuffle.diff) =================================================================== --- trunk/dports/gnome/eog-plugins/files/patch-plugins-slideshowshuffle.diff (rev 0) +++ trunk/dports/gnome/eog-plugins/files/patch-plugins-slideshowshuffle.diff 2015-10-04 19:21:10 UTC (rev 140872) @@ -0,0 +1,22 @@ +--- plugins/slideshowshuffle/slideshowshuffle.py.orig 2015-07-18 01:31:58.000000000 -0700 ++++ plugins/slideshowshuffle/slideshowshuffle.py 2015-07-18 01:34:15.000000000 -0700 +@@ -14,14 +14,18 @@ + # You should have received a copy of the GNU General Public License + # along with this program; if not, write to the Free Software Foundation, + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++import gi + ++gi.require_version('Gtk', '3.0') ++gi.require_version('Eog', '3.0') + from gi.repository import GObject, Gtk, Eog ++ + import random + + class SlideshowShufflePlugin(GObject.Object, Eog.WindowActivatable): + + # Override EogWindowActivatable's window property +- window = GObject.property(type=Eog.Window) ++ window = GObject.Property(type=Eog.Window) + + def __init__(self): + GObject.Object.__init__(self)