Fix fallback icon loading order for icons with legacy names.

[inkscape.git] / build-lx.xml

diff --git a/build-lx.xml b/build-lx.xml
index e4c02005bda98e09649d3ef6ac39fe415d42f5d6..4f81783efcfb654879a6fbdc9fc0195b4e11f910 100644 (file)
--- a/build-lx.xml
+++ b/build-lx.xml
@@ -39,7 +39,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.46+devel"/>
+  <property name="version"       value="0.48+devel"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
@@ -102,7 +102,7 @@
     <copy file="${src}/helper/sp-marshal.cpp.mingw"
           tofile="${src}/helper/sp-marshal.cpp"/>
     <makefile file="inkscape_version.h">
-        #define INKSCAPE_VERSION "${version}"
+        #define INKSCAPE_VERSION "${version}, revision ${svn.revision}"
     </makefile>
     <makefile file="config.h">
         #ifndef _CONFIG_H_
@@ -160,8 +160,8 @@
         #define WITH_PYTHON                   1
 
         /* shared whiteboard */
-        #define WITH_INKBOARD                 1
-        #define HAVE_SSL                      1
+        #undef WITH_INKBOARD
+        #undef HAVE_SSL
         
         /* use poppler for pdf import? */
         #define HAVE_POPPLER                  1
@@ -173,9 +173,6 @@
         /* Allow reading WordPerfect? */
         #define WITH_LIBWPG                   1
 
-        /* Do we support SVG Fonts? */
-        #define ENABLE_SVG_FONTS              1
-
         #endif /* _CONFIG_H_ */
     </makefile>
   </target>
@@ -188,10 +185,11 @@
   ########################################################################
   -->
   <target name="touchabout"
-      description="update the modification time of aboutdialog.cpp">
-    <!-- not good <touch file="${src}/ui/dialog/aboutdialog.cpp"/> -->
+      description="update the modification time of aboutbox.cpp">
+    <!-- not good <touch file="${src}/ui/dialog/aboutbox.cpp"/> -->
     <!-- better -->
-    <delete file="${build}/obj/ui/dialog/aboutdialog.o"/>
+    <delete file="${build}/obj/ui/dialog/aboutbox.o"/>
+    <delete file="inkscape_version.h"/>
   </target>
 
 
@@ -249,7 +247,6 @@
             <exclude name="svg/ftos.cpp"/>
             <exclude name="svg/test-svg.cpp"/>
             <exclude name="svg/test-svg-main.cpp"/>
-            <exclude name="utest/.*"/>
             <exclude name="widgets/test-widgets.cpp"/>
             <exclude name="xml/quote-test.cpp"/>
             <exclude name="xml/repr-action-test.cpp"/>
@@ -586,6 +583,7 @@
     <delete dir="${dist}"/>
     <delete file="build.dep"/>
     <delete file="config.h"/>
+    <delete file="inkscape_version.h"/>
 
   </target>