<!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>[126727] users/devans/dports/graphics/inkscape-devel</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/126727">126727</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-10-14 10:02:55 -0700 (Tue, 14 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devans/dports: inkscape-devel, update to trunk bzr 13613, fixes +gtk3 build with gtk3 version 3.14.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansdportsgraphicsinkscapedevelPortfile">users/devans/dports/graphics/inkscape-devel/Portfile</a></li>
<li><a href="#usersdevansdportsgraphicsinkscapedevelfilespatchlibrevengediff">users/devans/dports/graphics/inkscape-devel/files/patch-librevenge.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansdportsgraphicsinkscapedevelPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/dports/graphics/inkscape-devel/Portfile (126726 => 126727)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/dports/graphics/inkscape-devel/Portfile 2014-10-14 16:55:23 UTC (rev 126726)
+++ users/devans/dports/graphics/inkscape-devel/Portfile 2014-10-14 17:02:55 UTC (rev 126727)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name inkscape-devel
</span><span class="cx"> conflicts inkscape inkscape-experimental inkscape-prerelease
</span><del>-set bzr_rev 13577
</del><ins>+set bzr_rev 13613
</ins><span class="cx"> version 0.48.99.${bzr_rev}
</span><span class="cx"> epoch 1
</span><span class="cx"> license GPL-2 LGPL-2.1
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> homepage http://www.inkscape.org/
</span><span class="cx"> master_sites file:///Users/devans/macports/distfiles/${name}
</span><span class="cx">
</span><del>-checksums rmd160 707ecaf4b2ab376c30ff91495c9af7dc03b37f4a \
- sha256 4e0f547a247215d9b4767b0f32b1854832108d1b1eb4d6dfb941c720f21010ae
</del><ins>+checksums rmd160 a890ba2fda2062f1147e0c15e9d3c07ccb78ef5a \
+ sha256 de4ebf97db985f60977c56aa218f2275e030ebd09611b50d92d1ba4ad78b95da
</ins><span class="cx">
</span><span class="cx"> worksrcdir inkscape
</span><span class="cx">
</span></span></pre></div>
<a id="usersdevansdportsgraphicsinkscapedevelfilespatchlibrevengediff"></a>
<div class="modfile"><h4>Modified: users/devans/dports/graphics/inkscape-devel/files/patch-librevenge.diff (126726 => 126727)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/dports/graphics/inkscape-devel/files/patch-librevenge.diff 2014-10-14 16:55:23 UTC (rev 126726)
+++ users/devans/dports/graphics/inkscape-devel/files/patch-librevenge.diff 2014-10-14 17:02:55 UTC (rev 126727)
</span><span class="lines">@@ -1,57 +1,3 @@
</span><del>-=== modified file 'configure.ac'
---- configure.ac 2014-06-03 15:38:31 +0000
-+++ configure.ac 2014-06-15 09:24:33 +0000
-@@ -531,28 +531,14 @@
- with_libwpg=no
-
- if test "x$enable_wpg" = "xyes"; then
-- PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
-- if test "x$with_libwpg01" = "xyes"; then
-- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
-- with_libwpg=yes
-- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
-- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
-- fi
--
-- PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
-- if test "x$with_libwpg02" = "xyes"; then
-- AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x])
-- with_libwpg=yes
-- AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS)
-- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS)
-- fi
-+ PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no)
-
- if test "x$with_libwpg" = "xyes"; then
- AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
- fi
- fi
--AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
--AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes")
-+AC_SUBST(LIBWPG_LIBS)
-+AC_SUBST(LIBWPG_CFLAGS)
- AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
-
- dnl ********************************
-@@ -566,7 +552,7 @@
- with_libvisio=no
-
- if test "x$enable_visio" = "xyes"; then
-- PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no)
-+ PKG_CHECK_MODULES(LIBVISIO, libvisio-0.1 librevenge-0.0 librevenge-stream-0.0, with_libvisio=yes, with_libvisio=no)
-
- if test "x$with_libvisio" = "xyes"; then
- AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio])
-@@ -587,7 +573,7 @@
- with_libcdr=no
-
- if test "x$enable_cdr" = "xyes"; then
-- PKG_CHECK_MODULES(LIBCDR, libcdr-0.0 >= 0.0.3 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr=yes, with_libcdr=no)
-+ PKG_CHECK_MODULES(LIBCDR, libcdr-0.1 librevenge-0.0 librevenge-stream-0.0, with_libcdr=yes, with_libcdr=no)
-
- if test "x$with_libcdr" = "xyes"; then
- AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr])
-
</del><span class="cx"> === modified file 'src/extension/internal/cdr-input.cpp'
</span><span class="cx"> --- src/extension/internal/cdr-input.cpp 2013-10-27 16:33:32 +0000
</span><span class="cx"> +++ src/extension/internal/cdr-input.cpp 2014-06-15 09:24:33 +0000
</span><span class="lines">@@ -292,3 +238,55 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+--- configure.ac.orig 2014-09-10 14:08:05.000000000 -0700
++++ configure.ac 2014-10-07 12:51:40.000000000 -0700
+@@ -532,28 +532,14 @@
+ with_libwpg=no
+
+ if test "x$enable_wpg" = "xyes"; then
+- PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
+- if test "x$with_libwpg01" = "xyes"; then
+- AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
+- with_libwpg=yes
+- AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
+- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
+- fi
+-
+- PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
+- if test "x$with_libwpg02" = "xyes"; then
+- AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x])
+- with_libwpg=yes
+- AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS)
+- AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS)
+- fi
++ PKG_CHECK_MODULES(LIBWPG, libwpg-0.3 librevenge-0.0 librevenge-stream-0.0, with_libwpg=yes, with_libwpg=no)
+
+ if test "x$with_libwpg" = "xyes"; then
+ AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
+ fi
+ fi
+-AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
+-AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes")
++AC_SUBST(LIBWPG_LIBS)
++AC_SUBST(LIBWPG_CFLAGS)
+ AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
+
+ dnl ********************************
+@@ -567,7 +553,7 @@
+ with_libvisio=no
+
+ if test "x$enable_visio" = "xyes"; then
+- PKG_CHECK_MODULES(LIBVISIO, libvisio-0.0 >= 0.0.20 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libvisio=yes, with_libvisio=no)
++ PKG_CHECK_MODULES(LIBVISIO, libvisio-0.1 librevenge-0.0 librevenge-stream-0.0, with_libvisio=yes, with_libvisio=no)
+
+ if test "x$with_libvisio" = "xyes"; then
+ AC_DEFINE(WITH_LIBVISIO,1,[Build in libvisio])
+@@ -588,7 +574,7 @@
+ with_libcdr=no
+
+ if test "x$enable_cdr" = "xyes"; then
+- PKG_CHECK_MODULES(LIBCDR, libcdr-0.0 >= 0.0.3 libwpd-0.9 libwpd-stream-0.9 libwpg-0.2, with_libcdr=yes, with_libcdr=no)
++ PKG_CHECK_MODULES(LIBCDR, libcdr-0.1 librevenge-0.0 librevenge-stream-0.0, with_libcdr=yes, with_libcdr=no)
+
+ if test "x$with_libcdr" = "xyes"; then
+ AC_DEFINE(WITH_LIBCDR,1,[Build in libcdr])
</ins></span></pre>
</div>
</div>
</body>
</html>