[138837] users/devans/GNOME-3/unstable/dports/gnome/gedit

[devans at macports.org]

Revision: 138837
          https://trac.macports.org/changeset/138837
Author:   devans at macports.org
Date:     2015-07-20 23:11:09 -0700 (Mon, 20 Jul 2015)
Log Message:
-----------
GNOME-3/unstable: gedit, merge recent commits from stable and update to version 3.17.2.

Modified Paths:
--------------
    users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile
    users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff

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


Property changes on: users/devans/GNOME-3/unstable/dports/gnome/gedit
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gedit:108265-127338
/users/devans/GNOME-3/stable/dports/gnome/gedit:132144-136501
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920
   + /trunk/dports/gnome/gedit:108265-127338
/users/devans/GNOME-3/stable/dports/gnome/gedit:132144-138834
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920

Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile	2015-07-21 06:07:47 UTC (rev 138836)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/Portfile	2015-07-21 06:11:09 UTC (rev 138837)
@@ -2,9 +2,10 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                gedit
-version             3.17.1
+version             3.17.2
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         GNOME editor.
@@ -17,8 +18,8 @@
 
 use_xz              yes
 
-checksums           rmd160  e07c37b4e9ff4a19d3e5cb809058e27d86b0df92 \
-                    sha256  6706a1aa2dfad0ee9ce29ec0809d75f96900dcd584c9557e876aad91c9193558
+checksums           rmd160  b42775933085ef746f47d47c3fbb4c92da228523 \
+                    sha256  d28eb5dbd530a760c5e8e531506ae3785eeea33f9eee60afb2d496439951d9b6
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -33,7 +34,6 @@
 depends_lib         port:desktop-file-utils \
                     port:gsettings-desktop-schemas \
                     port:gtk3 \
-                    port:gvfs \
                     port:gtksourceview3 \
                     port:libpeas \
                     port:libsoup \
@@ -42,8 +42,7 @@
                     port:iso-codes \
                     port:vala
 
-depends_run         port:gnome-settings-daemon \
-                    port:yelp
+depends_run         port:gnome-themes-standard
 
 patchfiles          patch-configure.ac.diff
 
@@ -72,6 +71,20 @@
     configure.args-replace    --disable-python --enable-python
 }
 
+variant quartz {}
+
+if {[variant_isset quartz]} {
+    require_active_variants gtk3 quartz
+    configure.args-append   --disable-gvfs-metadata
+    depends_lib-append      port:gtk-osx-application-gtk3
+} else {
+    require_active_variants gtk3 x11
+    configure.args-append   --enable-gvfs-metadata
+    depends_lib-append      port:gvfs
+    depends_run-append      port:gnome-settings-daemon \
+                            port:yelp
+}
+
 default_variants    +python34
 
 notes               "For extra functionality install gedit-plugins"

Modified: users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff	2015-07-21 06:07:47 UTC (rev 138836)
+++ users/devans/GNOME-3/unstable/dports/gnome/gedit/files/patch-configure.ac.diff	2015-07-21 06:11:09 UTC (rev 138837)
@@ -1,6 +1,6 @@
---- configure.ac.orig	2014-11-09 12:10:59.000000000 -0800
-+++ configure.ac	2014-11-16 15:06:49.000000000 -0800
-@@ -190,8 +190,9 @@
+--- configure.ac.orig	2015-07-20 08:37:46.000000000 -0700
++++ configure.ac	2015-07-20 21:40:49.000000000 -0700
+@@ -177,8 +177,9 @@
  
  IT_PROG_INTLTOOL([0.50.1])
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150720/a3132c77/attachment.html>