[139065] users/devans/GNOME-3/stable/dports/gnome/goffice
devans at macports.org
devans at macports.org
Thu Jul 30 18:18:52 PDT 2015
Revision: 139065
https://trac.macports.org/changeset/139065
Author: devans at macports.org
Date: 2015-07-30 18:18:52 -0700 (Thu, 30 Jul 2015)
Log Message:
-----------
GNOME-3/stable: goffice, update to version 0.10.23, add +quartz variant using gtk-osx-application-gtk3, patch to fix +quartz configuration.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-configure.ac.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile 2015-07-30 22:44:51 UTC (rev 139064)
+++ users/devans/GNOME-3/stable/dports/gnome/goffice/Portfile 2015-07-31 01:18:52 UTC (rev 139065)
@@ -28,13 +28,12 @@
if {${name} eq ${subport}} {
epoch 1
- version 0.10.22
- revision 1
+ version 0.10.23
license {GPL-2 GPL-3}
- checksums rmd160 e4d0e4758f7ff6c9c21907960c8244c54a48072d \
- sha256 0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28
+ checksums rmd160 a93dec3b10cd9c4f9501029e3d510957bcf69d30 \
+ sha256 1325fc38f2476977bd8d71588ccb2a57aa418260406b7c28a20098b6b4e33f9f
depends_lib port:gtk3 \
port:libgsf \
@@ -54,12 +53,21 @@
configure.cmd ./autogen.sh
- patchfiles-append patch_quartz-goffice-goffice.c.diff \
- patch-goffice-math-go-quad.diff
+ patchfiles-append patch-configure.ac.diff \
+ patch_quartz-goffice-goffice.c.diff
configure.args-append \
--enable-compile-warnings=minimum
+ variant quartz {}
+
+ if {[variant_isset quartz]} {
+ require_active_variants gtk3 quartz x11
+ depends_lib-append port:gtk-osx-application-gtk3
+ } else {
+ require_active_variants gtk3 x11 quartz
+ }
+
livecheck.type gnome
} else {
livecheck.type none
Added: users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-configure.ac.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-configure.ac.diff 2015-07-31 01:18:52 UTC (rev 139065)
@@ -0,0 +1,19 @@
+--- configure.ac.orig 2015-05-17 16:32:52.000000000 -0700
++++ configure.ac 2015-07-30 17:02:42.000000000 -0700
+@@ -291,14 +291,14 @@
+ if test "x$platform_osx" = xyes; then
+ AC_DEFINE([OS_OSX],[1],[Defined if system is Mac OS X])
+ dnl check for native osx
+- gdk_windowing=`$PKG_CONFIG --variable=target gdk-2.0`
++ gdk_windowing=`$PKG_CONFIG --variable=targets gdk-3.0`
+ AC_MSG_CHECKING([for GDK-Quartz])
+
+ if test "x$gdk_windowing" = xquartz; then
+ platform=darwin/quartz
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(GDK_QUARTZ,[1],[Using GDK Quartz (not X11)])
+- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration, [os_osx=yes], [os_osx=no])
++ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3, [os_osx=yes], [os_osx=no])
+ dnl AC_MSG_RESULT(${os_osx})
+ if test "x$os_osx" = xyes; then
+ AC_DEFINE([GTKOSXAPPLICATION],[1],[Defined if app is GtkOSXApplication])
Deleted: users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff 2015-07-30 22:44:51 UTC (rev 139064)
+++ users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff 2015-07-31 01:18:52 UTC (rev 139065)
@@ -1,42 +0,0 @@
---- goffice/math/go-quad.h.orig 2014-09-21 15:03:01.000000000 -0700
-+++ goffice/math/go-quad.h 2014-10-11 07:50:04.000000000 -0700
-@@ -46,12 +46,12 @@
-
- GO_VAR_DECL const GOQuad go_quad_zero;
- GO_VAR_DECL const GOQuad go_quad_one;
--GO_VAR_DECL const GOQuad go_quad_pi;
--GO_VAR_DECL const GOQuad go_quad_2pi;
--GO_VAR_DECL const GOQuad go_quad_e;
--GO_VAR_DECL const GOQuad go_quad_ln2;
--GO_VAR_DECL const GOQuad go_quad_sqrt2;
--GO_VAR_DECL const GOQuad go_quad_euler;
-+GO_VAR_DECL GOQuad go_quad_pi;
-+GO_VAR_DECL GOQuad go_quad_2pi;
-+GO_VAR_DECL GOQuad go_quad_e;
-+GO_VAR_DECL GOQuad go_quad_ln2;
-+GO_VAR_DECL GOQuad go_quad_sqrt2;
-+GO_VAR_DECL GOQuad go_quad_euler;
-
- #ifdef GOFFICE_WITH_LONG_DOUBLE
- struct GOQuadl_ {
---- goffice/math/go-quad.c.orig 2014-10-11 07:57:10.000000000 -0700
-+++ goffice/math/go-quad.c 2014-10-11 07:57:32.000000000 -0700
-@@ -273,12 +273,12 @@
-
- const QUAD SUFFIX(go_quad_zero) = { 0, 0 };
- const QUAD SUFFIX(go_quad_one) = { 1, 0 };
--const QUAD SUFFIX(go_quad_pi);
--const QUAD SUFFIX(go_quad_2pi);
--const QUAD SUFFIX(go_quad_e);
--const QUAD SUFFIX(go_quad_ln2);
--const QUAD SUFFIX(go_quad_sqrt2);
--const QUAD SUFFIX(go_quad_euler);
-+QUAD SUFFIX(go_quad_pi);
-+QUAD SUFFIX(go_quad_2pi);
-+QUAD SUFFIX(go_quad_e);
-+QUAD SUFFIX(go_quad_ln2);
-+QUAD SUFFIX(go_quad_sqrt2);
-+QUAD SUFFIX(go_quad_euler);
-
- /**
- * go_quad_init: (skip)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150730/182847dd/attachment.html>
More information about the macports-changes
mailing list