Revision: 139677 https://trac.macports.org/changeset/139677 Author: devans@macports.org Date: 2015-08-24 11:55:18 -0700 (Mon, 24 Aug 2015) Log Message: ----------- eog-plugins: use upstream patch rather than ours to fix map icon issue, comments, increment revision. Modified Paths: -------------- trunk/dports/gnome/eog-plugins/Portfile 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-139456 /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-139676 /users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152,124221-125772,133199-134397 Modified: trunk/dports/gnome/eog-plugins/Portfile =================================================================== --- trunk/dports/gnome/eog-plugins/Portfile 2015-08-24 18:50:51 UTC (rev 139676) +++ trunk/dports/gnome/eog-plugins/Portfile 2015-08-24 18:55:18 UTC (rev 139677) @@ -5,6 +5,7 @@ name eog-plugins version 3.16.1 +revision 1 license GPL-2+ set branch [join [lrange [split ${version} .] 0 1] .] description Extra plugins for the Eye of GNOME image viewer @@ -37,6 +38,9 @@ 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 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility Modified: trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff =================================================================== --- trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff 2015-08-24 18:50:51 UTC (rev 139676) +++ trunk/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff 2015-08-24 18:55:18 UTC (rev 139677) @@ -1,11 +1,26 @@ ---- plugins/map/eog-map-plugin.c.orig 2015-07-08 02:00:15.000000000 -0700 -+++ plugins/map/eog-map-plugin.c 2015-07-08 02:02:50.000000000 -0700 -@@ -67,7 +67,7 @@ +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", -+ "camera-photo-symbolic", ++ "image-x-generic", size, NULL); /* don't need to unref widget because it is floating */ +-- +cgit v0.10.2 +