[138237] trunk/dports/gnome/gedit

[devans at macports.org]

Revision: 138237
          https://trac.macports.org/changeset/138237
Author:   devans at macports.org
Date:     2015-07-02 14:05:54 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
gedit: add +quartz variant using gtk-osx-application-gtk3, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/gedit/Portfile
    trunk/dports/gnome/gedit/files/patch-configure.ac.diff

Property Changed:
----------------
    trunk/dports/gnome/gedit/


Property changes on: trunk/dports/gnome/gedit
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/devans/GNOME-3/stable/dports/gnome/gedit:108269-136410
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920,132275-134596
   + /users/devans/GNOME-3/stable/dports/gnome/gedit:108269-138205
/users/devans/GNOME-3/unstable/dports/gnome/gedit:114069-118152,120511-125920,132275-134596

Modified: trunk/dports/gnome/gedit/Portfile
===================================================================
--- trunk/dports/gnome/gedit/Portfile	2015-07-02 21:02:51 UTC (rev 138236)
+++ trunk/dports/gnome/gedit/Portfile	2015-07-02 21:05:54 UTC (rev 138237)
@@ -2,9 +2,11 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           active_variants 1.1
 
 name                gedit
 version             3.16.2
+revision            1
 license             GPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         GNOME editor.
@@ -33,7 +35,6 @@
 depends_lib         port:desktop-file-utils \
                     port:gsettings-desktop-schemas \
                     port:gtk3 \
-                    port:gvfs \
                     port:gtksourceview3 \
                     port:libpeas \
                     port:libsoup \
@@ -42,8 +43,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 +72,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: trunk/dports/gnome/gedit/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/gedit/files/patch-configure.ac.diff	2015-07-02 21:02:51 UTC (rev 138236)
+++ trunk/dports/gnome/gedit/files/patch-configure.ac.diff	2015-07-02 21:05:54 UTC (rev 138237)
@@ -1,5 +1,14 @@
---- configure.ac.orig	2014-11-09 12:10:59.000000000 -0800
-+++ configure.ac	2014-11-16 15:06:49.000000000 -0800
+--- configure.ac.orig	2015-05-15 08:33:11.000000000 -0700
++++ configure.ac	2015-06-26 19:33:02.000000000 -0700
+@@ -157,7 +157,7 @@
+ if test "$os_osx" = "yes"; then
+ 	AC_DEFINE([OS_OSX],[1],[Defined if os is Mac OSX])
+ 
+-	PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration)
++	PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+ 
+ 	AC_SUBST(GTK_MAC_CFLAGS)
+ 	AC_SUBST(GTK_MAC_LIBS)
 @@ -190,8 +190,9 @@
  
  IT_PROG_INTLTOOL([0.50.1])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150702/607b65e0/attachment.html>