<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[139068] trunk/dports/gnome/goffice</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/139068">139068</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-07-30 18:48:29 -0700 (Thu, 30 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>goffice: update to version 0.10.23, add +quartz variant using gtk-osx-application-gtk3, patch to fix +quartz configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegofficePortfile">trunk/dports/gnome/goffice/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegofficefilespatchconfigureacdiff">trunk/dports/gnome/goffice/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegofficefilespatchgofficemathgoquaddiff">trunk/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegoffice">trunk/dports/gnome/goffice/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegoffice"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/goffice</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/goffice:126043-139066
</span><a id="trunkdportsgnomegofficePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/goffice/Portfile (139067 => 139068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/Portfile 2015-07-31 01:47:08 UTC (rev 139067)
+++ trunk/dports/gnome/goffice/Portfile 2015-07-31 01:48:29 UTC (rev 139068)
</span><span class="lines">@@ -28,13 +28,12 @@
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> epoch 1
</span><del>- version 0.10.22
- revision 1
</del><ins>+ version 0.10.23
</ins><span class="cx">
</span><span class="cx"> license {GPL-2 GPL-3}
</span><span class="cx">
</span><del>- checksums rmd160 e4d0e4758f7ff6c9c21907960c8244c54a48072d \
- sha256 0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28
</del><ins>+ checksums rmd160 a93dec3b10cd9c4f9501029e3d510957bcf69d30 \
+ sha256 1325fc38f2476977bd8d71588ccb2a57aa418260406b7c28a20098b6b4e33f9f
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:libgsf \
</span><span class="lines">@@ -54,12 +53,21 @@
</span><span class="cx">
</span><span class="cx"> configure.cmd ./autogen.sh
</span><span class="cx">
</span><del>- patchfiles-append patch_quartz-goffice-goffice.c.diff \
- patch-goffice-math-go-quad.diff
</del><ins>+ patchfiles-append patch-configure.ac.diff \
+ patch_quartz-goffice-goffice.c.diff
</ins><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --enable-compile-warnings=minimum
</span><span class="cx">
</span><ins>+ 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
+ }
+
</ins><span class="cx"> livecheck.type gnome
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.type none
</span></span></pre></div>
<a id="trunkdportsgnomegofficefilespatchconfigureacdifffromrev139066usersdevansGNOME3stabledportsgnomegofficefilespatchconfigureacdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/goffice/files/patch-configure.ac.diff (from rev 139066, users/devans/GNOME-3/stable/dports/gnome/goffice/files/patch-configure.ac.diff) (0 => 139068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/gnome/goffice/files/patch-configure.ac.diff 2015-07-31 01:48:29 UTC (rev 139068)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+--- 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])
</ins></span></pre></div>
<a id="trunkdportsgnomegofficefilespatchgofficemathgoquaddiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff (139067 => 139068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff 2015-07-31 01:47:08 UTC (rev 139067)
+++ trunk/dports/gnome/goffice/files/patch-goffice-math-go-quad.diff 2015-07-31 01:48:29 UTC (rev 139068)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>---- 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)
</del></span></pre>
</div>
</div>
</body>
</html>