Revision: 105611 https://trac.macports.org/changeset/105611 Author: devans@macports.org Date: 2013-04-27 13:41:40 -0700 (Sat, 27 Apr 2013) Log Message: ----------- inkscape-devel: update to bzr revision 12305, bug fixes, features, code cleanup, translations. Revision Links: -------------- https://trac.macports.org/changeset/12305 Modified Paths: -------------- trunk/dports/graphics/inkscape-devel/Portfile trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff Added Paths: ----------- trunk/dports/graphics/inkscape-devel/files/patch-src-extension-dbus-wrapper-inkscape-dbus-wrapper.c.diff Modified: trunk/dports/graphics/inkscape-devel/Portfile =================================================================== --- trunk/dports/graphics/inkscape-devel/Portfile 2013-04-27 19:47:04 UTC (rev 105610) +++ trunk/dports/graphics/inkscape-devel/Portfile 2013-04-27 20:41:40 UTC (rev 105611) @@ -5,7 +5,7 @@ name inkscape-devel conflicts inkscape -set bzr_rev 12241 +set bzr_rev 12305 version 0.48.99.${bzr_rev} epoch 1 license GPL-2 LGPL-2.1 @@ -58,7 +58,8 @@ ui_msg "---> Fetching source from bzr repository: this may take a while" } -patchfiles patch-src-Makefile.am.diff +patchfiles patch-src-Makefile.am.diff \ + patch-src-extension-dbus-wrapper-inkscape-dbus-wrapper.c.diff variant python26 conflicts python27 description {Configure to use Python version 2.6} { depends_lib-append \ @@ -98,7 +99,8 @@ --enable-lcms \ --enable-poppler-cairo \ --enable-dbusapi \ - --disable-silent-rules + --disable-silent-rules \ + --disable-strict-build configure.cppflags-append \ -I${worksrcpath}/src/extension/script Modified: trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff =================================================================== --- trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff 2013-04-27 19:47:04 UTC (rev 105610) +++ trunk/dports/graphics/inkscape-devel/files/patch-src-Makefile.am.diff 2013-04-27 20:41:40 UTC (rev 105611) @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2013-03-24 11:20:42.000000000 -0700 -+++ src/Makefile.am 2013-03-24 11:29:47.000000000 -0700 -@@ -221,7 +221,7 @@ +--- src/Makefile.am.orig 2013-03-29 19:41:57.000000000 -0700 ++++ src/Makefile.am 2013-03-29 19:53:12.000000000 -0700 +@@ -223,7 +223,7 @@ # someone updates the BZR working directory. inkscape-version.cpp: $(inkscape_version_deps) VER_PREFIX="$(VERSION)";\ Added: trunk/dports/graphics/inkscape-devel/files/patch-src-extension-dbus-wrapper-inkscape-dbus-wrapper.c.diff =================================================================== --- trunk/dports/graphics/inkscape-devel/files/patch-src-extension-dbus-wrapper-inkscape-dbus-wrapper.c.diff (rev 0) +++ trunk/dports/graphics/inkscape-devel/files/patch-src-extension-dbus-wrapper-inkscape-dbus-wrapper.c.diff 2013-04-27 20:41:40 UTC (rev 105611) @@ -0,0 +1,14 @@ +--- src/extension/dbus/wrapper/inkscape-dbus-wrapper.c.orig 2013-04-22 12:42:00.000000000 -0700 ++++ src/extension/dbus/wrapper/inkscape-dbus-wrapper.c 2013-04-22 12:44:28.000000000 -0700 +@@ -95,8 +95,10 @@ + DBusGConnection *connection; + GError *error; + DBusGProxy *proxy; +- ++ ++#ifndef GLIB_VERSION_2_36 + g_type_init (); ++#endif + + error = NULL; + connection = dbus_g_bus_get (DBUS_BUS_SESSION,