[126730] trunk/dports/graphics/inkscape-devel

devans at macports.org devans at macports.org
Tue Oct 14 10:45:35 PDT 2014


Revision: 126730
          https://trac.macports.org/changeset/126730
Author:   devans at macports.org
Date:     2014-10-14 10:45:35 -0700 (Tue, 14 Oct 2014)
Log Message:
-----------
inkscape-devel: update to trunk bzr 13613, fixes startup crash when building +gtk3 with gtk3 version 3.14.

Modified Paths:
--------------
    trunk/dports/graphics/inkscape-devel/Portfile
    trunk/dports/graphics/inkscape-devel/files/patch-librevenge.diff

Modified: trunk/dports/graphics/inkscape-devel/Portfile
===================================================================
--- trunk/dports/graphics/inkscape-devel/Portfile	2014-10-14 17:40:28 UTC (rev 126729)
+++ trunk/dports/graphics/inkscape-devel/Portfile	2014-10-14 17:45:35 UTC (rev 126730)
@@ -5,7 +5,7 @@
 
 name            inkscape-devel
 conflicts       inkscape
-set bzr_rev     13551
+set bzr_rev     13613
 version         0.48.99.${bzr_rev}
 epoch           1
 license         GPL-2 LGPL-2.1

Modified: trunk/dports/graphics/inkscape-devel/files/patch-librevenge.diff
===================================================================
--- trunk/dports/graphics/inkscape-devel/files/patch-librevenge.diff	2014-10-14 17:40:28 UTC (rev 126729)
+++ trunk/dports/graphics/inkscape-devel/files/patch-librevenge.diff	2014-10-14 17:45:35 UTC (rev 126730)
@@ -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-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])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141014/15172b40/attachment-0001.html>


More information about the macports-changes mailing list