[Libreoffice-commits] .: 4 commits - libvisio/libvisio-0.0.8-build.patch libvisio/makefile.mk libwpg/libwpg-0.2.1-build.patch libwpg/makefile.mk libwps/libwps-0.2.3-build.patch libwps/makefile.mk

[Fridrich Strba]

 libvisio/libvisio-0.0.8-build.patch |   18 ++++++++++++++++++
 libvisio/makefile.mk                |    3 ++-
 libwpg/libwpg-0.2.1-build.patch     |   11 +++++++++++
 libwpg/makefile.mk                  |    3 +++
 libwps/libwps-0.2.3-build.patch     |   11 +++++++++++
 libwps/makefile.mk                  |    3 +++
 6 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 5154df8cb9b8dd314976cbd37afa0888513ee7fa
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 14:51:59 2011 +0200

    fix also libwps build after change in libwp* flags

diff --git a/libwps/libwps-0.2.3-build.patch b/libwps/libwps-0.2.3-build.patch
new file mode 100644
index 0000000..6a83e82
--- /dev/null
+++ b/libwps/libwps-0.2.3-build.patch
@@ -0,0 +1,11 @@
+--- misc/libwps-0.2.3/src/lib/makefile.mk	2011-09-26 15:14:28.000000000 +0200
++++ misc/build/libwps-0.2.3/src/lib/makefile.mk	2011-10-05 14:49:40.896976226 +0200
+@@ -17,7 +17,7 @@
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBWPD)" == "YES"
+-INCPRE+=$(LIBWPD_CFLAGS) -I..
++INCPRE+=$(WPD_CFLAGS) -I..
+ .ELSE
+ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+ .ENDIF
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 4ab39f8..4a7a817 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -55,6 +55,9 @@ TARFILE_MD5=9717505e864a16173afa681bda4bc910
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
+PATCH_FILES=\
+	libwps-0.2.3-build.patch
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
commit fd5b8d7f71f7a6db39f6e9bf83aeeb1970bee9d8
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 14:50:33 2011 +0200

    And also add the patches under version control, stupid

diff --git a/libvisio/libvisio-0.0.8-build.patch b/libvisio/libvisio-0.0.8-build.patch
new file mode 100644
index 0000000..fffa177
--- /dev/null
+++ b/libvisio/libvisio-0.0.8-build.patch
@@ -0,0 +1,18 @@
+--- misc/libvisio-0.0.8/src/lib/makefile.mk	2011-10-05 14:44:34.615230761 +0200
++++ misc/build/libvisio-0.0.8/src/lib/makefile.mk	2011-10-05 14:44:28.456175697 +0200
+@@ -17,13 +17,13 @@
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBWPD)" == "YES"
+-INCPRE+=$(LIBWPD_CFLAGS) -I..
++INCPRE+=$(WPD_CFLAGS) -I..
+ .ELSE
+ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBWPG)" == "YES"
+-INCPRE+=$(LIBWPG_CFLAGS) -I..
++INCPRE+=$(WPG_CFLAGS) -I..
+ .ELSE
+ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
+ .ENDIF
diff --git a/libwpg/libwpg-0.2.1-build.patch b/libwpg/libwpg-0.2.1-build.patch
new file mode 100644
index 0000000..1b9240e
--- /dev/null
+++ b/libwpg/libwpg-0.2.1-build.patch
@@ -0,0 +1,11 @@
+--- misc/libwpg-0.2.1/src/lib/makefile.mk	2011-09-12 09:04:43.000000000 +0200
++++ misc/build/libwpg-0.2.1/src/lib/makefile.mk	2011-10-05 14:47:18.028693834 +0200
+@@ -17,7 +17,7 @@
+ .ENDIF
+ 
+ .IF "$(SYSTEM_LIBWPD)" == "YES"
+-INCPRE+=$(LIBWPD_CFLAGS) -I..
++INCPRE+=$(WPD_CFLAGS) -I..
+ .ELSE
+ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
+ .ENDIF
commit b9a78f0059e8ab80868278c020b9faf0d91a7411
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 14:48:28 2011 +0200

    Fix libwpg after the libwp* flags change

diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index f37eab8..7888b55 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -55,6 +55,9 @@ TARFILE_MD5=9d283e02441d8cebdcd1e5d9df227d67
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib
 
+PATCH_FILES=\
+	libwpg-0.2.1-build.patch
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk
commit 1185f5023a19430e401778c2d4f33fe560622140
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Oct 5 14:46:23 2011 +0200

    Adapt to the change in system libwp* flags

diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 220019c..c6c7a0a 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.8
 TARFILE_MD5=3c9c6cba49387e9b8e2bced5f2eba4e3
 
 PATCH_FILES=\
-    libvisio-0.0.8.patch
+    libvisio-0.0.8.patch \
+	libvisio-0.0.8-build.patch
 
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)