[123051] users/devans/dports/graphics/inkscape-experimental
devans at macports.org
devans at macports.org
Mon Aug 4 08:16:20 PDT 2014
Revision: 123051
https://trac.macports.org/changeset/123051
Author: devans at macports.org
Date: 2014-08-04 08:16:20 -0700 (Mon, 04 Aug 2014)
Log Message:
-----------
devans/dports: update inkscape-experimental to bzr 13456 for testing.
Modified Paths:
--------------
users/devans/dports/graphics/inkscape-experimental/Portfile
users/devans/dports/graphics/inkscape-experimental/files/patch-librevenge.diff
Modified: users/devans/dports/graphics/inkscape-experimental/Portfile
===================================================================
--- users/devans/dports/graphics/inkscape-experimental/Portfile 2014-08-04 14:39:57 UTC (rev 123050)
+++ users/devans/dports/graphics/inkscape-experimental/Portfile 2014-08-04 15:16:20 UTC (rev 123051)
@@ -5,7 +5,7 @@
name inkscape-experimental
conflicts inkscape inkscape-devel inkscape-0.91
-set bzr_rev 13430
+set bzr_rev 13456
version 0.48.99.${bzr_rev}
epoch 1
license GPL-2 LGPL-2.1
@@ -25,8 +25,8 @@
homepage http://www.inkscape.org/
master_sites file:///Users/devans/macports/distfiles/${name}
-checksums rmd160 8c9ab45431438ef9bb397450de878b47fdf6eedc \
- sha256 8d30870c3f755080385964378dd663fd7cd16affd875a2e88d341fe543f4f4bf
+checksums rmd160 291369169cd4cfdccc06f2913c34edad30be4bf5 \
+ sha256 4565edf91e3b5c1d056e82361c6b95d2d9adb5b2ab32a2402ed3b8e3de1c5339
worksrcdir ${name}
Modified: users/devans/dports/graphics/inkscape-experimental/files/patch-librevenge.diff
===================================================================
--- users/devans/dports/graphics/inkscape-experimental/files/patch-librevenge.diff 2014-08-04 14:39:57 UTC (rev 123050)
+++ users/devans/dports/graphics/inkscape-experimental/files/patch-librevenge.diff 2014-08-04 15:16:20 UTC (rev 123051)
@@ -1,57 +1,3 @@
-=== 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])
-
=== modified file 'src/extension/internal/cdr-input.cpp'
--- src/extension/internal/cdr-input.cpp 2013-10-27 16:33:32 +0000
+++ src/extension/internal/cdr-input.cpp 2014-06-15 09:24:33 +0000
@@ -292,3 +238,55 @@
}
+--- configure.ac.orig 2014-07-20 08:52:07.000000000 -0700
++++ configure.ac 2014-07-30 13:08:20.000000000 -0700
+@@ -528,28 +528,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 ********************************
+@@ -563,7 +549,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])
+@@ -584,7 +570,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])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140804/a78d174b/attachment-0001.html>
More information about the macports-changes
mailing list