[139679] users/devans/GNOME-3/unstable/dports/gnome/eog-plugins

[devans at macports.org]

Revision: 139679
          https://trac.macports.org/changeset/139679
Author:   devans at macports.org
Date:     2015-08-24 12:03:09 -0700 (Mon, 24 Aug 2015)
Log Message:
-----------
GNOME-3/unstable: eog-plugins, use upstream patch rather than ours to fix map icon issue, comments, increment revision.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff

Property Changed:
----------------
    users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/


Property changes on: users/devans/GNOME-3/unstable/dports/gnome/eog-plugins
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/eog-plugins:113657-127228
/users/devans/GNOME-3/stable/dports/gnome/eog-plugins:136767-139465
/users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152,124221-125772,133199-134397
   + /trunk/dports/gnome/eog-plugins:113657-127228
/users/devans/GNOME-3/stable/dports/gnome/eog-plugins:136767-139677
/users/devans/GNOME-3/unstable/dports/gnome/eog-plugins:116525-118152,124221-125772,133199-134397

Modified: users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/Portfile	2015-08-24 18:59:44 UTC (rev 139678)
+++ users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/Portfile	2015-08-24 19:03:09 UTC (rev 139679)
@@ -5,7 +5,7 @@
 
 name                eog-plugins
 version             3.16.1
-revision            1
+revision            2
 license             GPL-2+
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         Extra plugins for the Eye of GNOME image viewer
@@ -38,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 \
                     patch-plugins-pythonconsole.diff \
                     patch-plugins-slideshowshuffle.diff

Modified: users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff	2015-08-24 18:59:44 UTC (rev 139678)
+++ users/devans/GNOME-3/unstable/dports/gnome/eog-plugins/files/patch-map-marker-icon.diff	2015-08-24 19:03:09 UTC (rev 139679)
@@ -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 at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150824/e17d2309/attachment.html>