[110210] trunk/dports/gnome/goffice

[ryandesign at macports.org]

Revision: 110210
          https://trac.macports.org/changeset/110210
Author:   ryandesign at macports.org
Date:     2013-08-28 08:35:57 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
goffice: update to 0.10.6 (#40263) and add quartz variant (#40045); fix port to not leak directives into goffice08 subport

Modified Paths:
--------------
    trunk/dports/gnome/goffice/Portfile

Added Paths:
-----------
    trunk/dports/gnome/goffice/files/patch_quartz-goffice-goffice.c.diff

Modified: trunk/dports/gnome/goffice/Portfile
===================================================================
--- trunk/dports/gnome/goffice/Portfile	2013-08-28 15:33:31 UTC (rev 110209)
+++ trunk/dports/gnome/goffice/Portfile	2013-08-28 15:35:57 UTC (rev 110210)
@@ -2,13 +2,9 @@
 # $Id$
 
 PortSystem              1.0
+PortGroup               active_variants 1.1
 
 name                    goffice
-epoch                   1
-version                 0.10.4
-revision                1
-
-set branch              [join [lrange [split ${version} .] 0 1] .]
 description             GOffice is a library of document-centric objects and utilities.
 long_description        GOffice is a library of document-centric objects \
                         and utilities building on top of GLib and Gtk+ and \
@@ -16,36 +12,53 @@
 maintainers             nomaintainer
 categories              gnome devel
 platforms               darwin
-license                 {GPL-2 GPL-3}
 
 homepage                http://freecode.com/projects/goffice
-master_sites            gnome:sources/${name}/${branch}/
 use_xz                  yes
 
-checksums               rmd160  c81ab86f437f7c959e8d94583884c2cd579cc799 \
-                        sha256  30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba
-
 depends_build           port:intltool \
                         port:pkgconfig
 
-depends_lib             port:gtk3 \
+if {${name} eq ${subport}} {
+    epoch               1
+    version             0.10.6
+
+    license             {GPL-2 GPL-3}
+
+    checksums           rmd160  8992dee40632cbe814265f7b54a13682d830864b \
+                        sha256  a72e65018c0670ed2c52d00361ea874625575cdde7cf091e89914cfd8128cf07
+
+    depends_lib         port:gtk3 \
                         port:libgsf \
                         port:librsvg \
                         path:lib/pkgconfig/glib-2.0.pc:glib2
 
-configure.args-append   --enable-introspection
+    configure.args-append   --enable-introspection
 
-livecheck.type          gnome
+    variant quartz description {Build with gtk-osx-application} {
+        depends_lib-append  port:gtk-osx-application
 
+        patchfiles-append   patch_quartz-goffice-goffice.c.diff
+    }
 
+    if {[variant_isset quartz]} {
+        require_active_variants gtk3 quartz
+        require_active_variants gtk-osx-application gtk3
+    }
+
+    livecheck.type      gnome
+} else {
+    livecheck.type      none
+}
+
 # Snapshot of goffice @0.8.17 for gnucash.
 # Can be removed once gnucash no longer needs this version.
 
 subport goffice08 {
+    epoch               1
     version             0.8.17
+    revision            1
 
-    master_sites        gnome:sources/${name}/0.8/
-    
     checksums           sha256  165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 \
                         rmd160  91d1df371c8164c8c5c9860c7c9c87b9fb69f6c3
 
@@ -67,3 +80,6 @@
         }
     }
 }
+
+set branch              [join [lrange [split ${version} .] 0 1] .]
+master_sites            gnome:sources/${name}/${branch}/

Added: trunk/dports/gnome/goffice/files/patch_quartz-goffice-goffice.c.diff
===================================================================
--- trunk/dports/gnome/goffice/files/patch_quartz-goffice-goffice.c.diff	                        (rev 0)
+++ trunk/dports/gnome/goffice/files/patch_quartz-goffice-goffice.c.diff	2013-08-28 15:35:57 UTC (rev 110210)
@@ -0,0 +1,16 @@
+--- goffice/goffice-orig.c	2013-05-22 18:37:12.000000000 -0700
++++ goffice/goffice.c	2013-08-08 21:59:46.000000000 -0700
+@@ -177,11 +177,11 @@
+ 	}
+ #else
+ #ifdef GTKOSXAPPLICATION
+-    if (quartz_application_get_bundle_id ())
++    if (gtkosx_application_get_bundle_id ())
+     {
+         gchar *dir;
+ 
+-        dir = quartz_application_get_resource_path ();
++        dir = gtkosx_application_get_resource_path ();
+ 	libgoffice_data_dir = g_build_filename (dir,
+ 		"share", "goffice", GOFFICE_VERSION, NULL);
+ 	libgoffice_icon_dir = g_build_filename (dir,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/0b2aa257/attachment.html>