default inkboard to off for the remainder of the freeze

sob, sob.

diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index f36b6fd8173f1a0352f83445037ed3f271102f2b..25fe5f35835b79a49762ee4fb392b7a52047ca7f 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
@@ -148,7 +148,7 @@ CFLAGS = -g -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \
 
 ####### Inkboard abilities.
 ####### You must 'make -f Makefile.mingw clean' when turning this on or off
-CFLAGS += -DWITH_INKBOARD
+#CFLAGS += -DWITH_INKBOARD
 
 ####### IMPLICIT RULES
 .cpp.o:

diff --git a/packaging/autopackage/default.apspec.in b/packaging/autopackage/default.apspec.in
index 913d0d53a6eb5a0f2312ba9f8ef8674596d715fb..5fe2884a6735db1418251cda6923f3e56b7acc1f 100644 (file)
--- a/packaging/autopackage/default.apspec.in
+++ b/packaging/autopackage/default.apspec.in
@@ -20,7 +20,7 @@ gradients, node editing, svg-to-png export, grouping, and more.
 if [ ! -x configure ]; then
     ./autogen.sh
 fi
-export APBUILD_STATIC="popt gc gccpp gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 glibmm-2.4 sigc-2.0 loudmouth-1 Xrender lcms"
+export APBUILD_STATIC="popt gc gccpp gtkmm-2.4 gdkmm-2.4 atkmm-1.6 pangomm-1.4 glibmm-2.4 sigc-2.0 Xrender lcms"
 export APBUILD_PROJECTNAME=inkscape
 
 PATH=/usr/local/src/inkscape/extra/static/bin:$PATH
@@ -28,7 +28,7 @@ PKG_CONFIG_PATH=/usr/local/src/inkscape/extra/static/lib/pkgconfig:/usr/local/li
 CPPFLAGS="-I/usr/local/src/inkscape/extra/static/include"
 LDFLAGS="-L/usr/local/src/inkscape/extra/static/lib"
 export PATH PKG_CONFIG_PATH CPPFLAGS LDFLAGS
-prepareBuild --enable-binreloc --with-gnome-vfs=no --enable-inkboard --enable-lcms
+prepareBuild --enable-binreloc --with-gnome-vfs=no --enable-lcms
 
 [BuildUnprepare]
 unprepareBuild