[Libreoffice-commits] .: 6 commits - libwpd/libwpd-mingw.patch libwpd/makefile.mk libwpg/libwpg-mingw.patch libwpg/makefile.mk libwps/libwps-0.2.1.patch libwps/libwps-0.2.1-warnings.patch libwps/libwps-mingw.patch libwps/makefile.mk Makefile.in
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Aug 22 00:39:12 PDT 2011
Makefile.in | 20 ++++++------
libwpd/libwpd-mingw.patch | 11 ++++++
libwpd/makefile.mk | 2 -
libwpg/libwpg-mingw.patch | 11 ++++++
libwpg/makefile.mk | 2 -
libwps/libwps-0.2.1-warnings.patch | 60 -------------------------------------
libwps/libwps-0.2.1.patch | 28 -----------------
libwps/libwps-mingw.patch | 11 ++++++
libwps/makefile.mk | 2 +
9 files changed, 47 insertions(+), 100 deletions(-)
New commits:
commit 879ab8e08d0731ed52120e42f42093dce9a1dde3
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 09:30:10 2011 +0200
Re-run autogen.sh when autogen.lastrun is changed.
diff --git a/Makefile.in b/Makefile.in
index 6820372..72ef758 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,7 +92,7 @@ endif
fetch: src.downloaded
-Makefile: configure.in ooo.lst.in set_soenv.in Makefile.in
+Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in
./autogen.sh
check: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ fetch
commit a677e5a2a12069629129e81fb747744be802c7f2
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 07:58:00 2011 +0200
Fix cross-build of libwpg.
diff --git a/libwpg/libwpg-mingw.patch b/libwpg/libwpg-mingw.patch
new file mode 100644
index 0000000..45b8d68
--- /dev/null
+++ b/libwpg/libwpg-mingw.patch
@@ -0,0 +1,11 @@
+--- misc/build/libwpg-0.2.0/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
++++ misc/build/libwpg-0.2.0/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
+@@ -9,7 +9,7 @@ LIBTARGET=NO
+
+ .INCLUDE : settings.mk
+
+-.IF "$(GUI)"=="WNT"
++.IF "$(GUI)$(COM)"=="WNTMSC"
+ CFLAGS+=-GR
+ .ENDIF
+ .IF "$(COM)"=="GCC"
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 44eccce..7602102 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -52,7 +52,7 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
TARFILE_NAME=libwpg-0.2.0
TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch libwpg-mingw.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
commit 4c1a82aca5f747dd0a6ab4c76f1e6c207fd7c32f
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 07:55:25 2011 +0200
Fix cross-build of libwps.
diff --git a/libwps/libwps-0.2.1-warnings.patch b/libwps/libwps-0.2.1-warnings.patch
deleted file mode 100644
index fffffd5..0000000
--- a/libwps/libwps-0.2.1-warnings.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- misc/libwps-0.2.1/src/lib/WPS8.cpp 2011-04-05 11:25:15.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp 2011-05-03 15:02:21.107349347 +0200
-@@ -136,7 +136,7 @@
- input->seek(pos->second.offset, WPX_SEEK_SET);
- n_streams = readU32(input);
-
-- if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams));
-+ if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); }
-
- /* skip mysterious header*/
- input->seek(8, WPX_SEEK_CUR);
-@@ -155,7 +155,7 @@
- last_pos += offset;
- }
- offset = readU32(input);
-- if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n"));
-+ if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); }
-
- for (unsigned i=0; i < n_streams; i++) {
- uint16_t len;
-@@ -325,7 +325,7 @@
- *
- */
-
--void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener)
-+void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */)
- {
- #if (0)
- WPS_DEBUG_MSG(("WPS8Parser::readText()\n"));
-@@ -1356,7 +1356,7 @@
- id += 4;
- t_rem -= 4;
-
-- if (t_count < 0 && t_count > 20) break; /* obviously wrong */
-+ if (t_count > 20) break; /* obviously wrong */
- } else break; /* wrong format */
- }
-
---- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-04-04 21:56:29.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-05-03 15:02:21.837414573 +0200
-@@ -621,7 +621,7 @@
- _closeParagraph();
- }
-
--const uint16_t WPSContentListener::getSpec() const
-+uint16_t WPSContentListener::getSpec() const
- {
- return m_ps->m_spec;
- }
---- misc/libwps-0.2.1/src/lib/WPSContentListener.h 2011-04-04 21:30:56.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h 2011-05-03 15:02:23.334548336 +0200
-@@ -154,7 +154,7 @@
-
- void insertEOL();
-
-- const uint16_t getSpec() const;
-+ uint16_t getSpec() const;
- protected:
- WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface);
- virtual ~WPSContentListener();
diff --git a/libwps/libwps-0.2.1.patch b/libwps/libwps-0.2.1.patch
deleted file mode 100644
index a70812d..0000000
--- a/libwps/libwps-0.2.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-04-04 21:53:42.000000000 +0200
-+++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-05-03 14:50:56.146147538 +0200
-@@ -79,18 +79,15 @@
- {0x419,"ru-RU"}
- };
-
--static int _ltcomp(const void *k1, const void *k2)
--{
-- int r = (int)((ssize_t)k1) - ((_lange*)k2)->id;
-- return r;
--}
--
- std::string getLangFromLCID(uint32_t lcid)
- {
-- _lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table,
-- sizeof(s_lang_table)/sizeof(_lange),
-- sizeof(_lange),_ltcomp);
-- if (c) return c->name;
-+ unsigned i = 0;
-+
-+ for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++)
-+ {
-+ if (s_lang_table[i].id == lcid)
-+ return s_lang_table[i].name;
-+ }
- return "-none-";
- }
-
diff --git a/libwps/libwps-mingw.patch b/libwps/libwps-mingw.patch
new file mode 100644
index 0000000..7674800
--- /dev/null
+++ b/libwps/libwps-mingw.patch
@@ -0,0 +1,11 @@
+--- misc/build/libwps-0.2.2/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
++++ misc/build/libwps-0.2.2/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
+@@ -9,7 +9,7 @@ LIBTARGET=NO
+
+ .INCLUDE : settings.mk
+
+-.IF "$(GUI)"=="WNT"
++.IF "$(GUI)$(COM)"=="WNTMSC"
+ CFLAGS+=-GR
+ .ENDIF
+ .IF "$(COM)"=="GCC"
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index fe1792c..894e039 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -51,6 +51,8 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
TARFILE_NAME=libwps-0.2.2
TARFILE_MD5=29721a16f25967d59969d5f0ae485b4a
+
+PATCH_FILES=libwps-mingw.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
commit a80493c903fcda67e7b7fbe81ffb1e563d86efd2
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 07:36:13 2011 +0200
Always go through the cross_toolset build.
diff --git a/Makefile.in b/Makefile.in
index 1260567..6820372 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,20 +8,21 @@ else
GBUILD_OPT:=--gmake
endif
-all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset.built
+ifeq (@CROSS_COMPILING@,YES)
+CROSS_TOOLSET_RULE:=cross-build-toolset
+else
+CROSS_TOOLSET_RULE:=
+endif
+
+all: Makefile dmake/dmake at EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE)
@. ./Env.Host.sh && \
cd instsetoo_native && \
build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
-cross-build-toolset.built:
-ifeq (@CROSS_COMPILING@,YES)
+cross-build-toolset:
@. ./Env.Build.sh && \
cd cross_toolset && \
- build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@ && \
- touch $@
-else
- touch $@
-endif
+ build.pl $(GBUILD_OPT) -P at BUILD_NCPUS@ --all -- -P at BUILD_MAX_JOBS@
install:
@. ./Env.Host.sh && \
@@ -80,7 +81,6 @@ endif
dmake/dmake at EXEEXT_FOR_BUILD@:
./bootstrap
- -rm -f cross-build-toolset.built
src.downloaded: ooo.lst download
ifeq (@DO_FETCH_TARBALLS@,YES)
commit f9da6a5b76a6e499256a875fdf74f69eefd2a837
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 07:25:24 2011 +0200
Make internal libwpd build when cross-compiling.
diff --git a/libwpd/libwpd-mingw.patch b/libwpd/libwpd-mingw.patch
new file mode 100644
index 0000000..60c7fa5
--- /dev/null
+++ b/libwpd/libwpd-mingw.patch
@@ -0,0 +1,11 @@
+--- misc/build/libwpd-0.9.2/src/lib/makefile.mk.orig 2011-08-22 07:21:59.000000000 +0200
++++ misc/build/libwpd-0.9.2/src/lib/makefile.mk 2011-08-22 07:22:08.000000000 +0200
+@@ -9,7 +9,7 @@ LIBTARGET=NO
+
+ .INCLUDE : settings.mk
+
+-.IF "$(GUI)"=="WNT"
++.IF "$(GUI)$(COM)"=="WNTMSC"
+ CFLAGS+=-GR
+ .ENDIF
+ .IF "$(COM)"=="GCC"
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 8761bbb..73ef7a2 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -44,7 +44,7 @@ TARGET=wpd
TARFILE_NAME=libwpd-0.9.2
TARFILE_MD5=8d265a592619166f29c4672ea54812b7
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch libwpd-mingw.patch
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit d6fa91761f4b67be50e01ecc5fd42e2a6d215eb4
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Aug 22 07:05:07 2011 +0200
Don't complain when cross-build-toolkit.built does not exist.
diff --git a/Makefile.in b/Makefile.in
index 8090bcb..1260567 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ endif
dmake/dmake at EXEEXT_FOR_BUILD@:
./bootstrap
- -rm cross-build-toolset.built
+ -rm -f cross-build-toolset.built
src.downloaded: ooo.lst download
ifeq (@DO_FETCH_TARBALLS@,YES)
More information about the Libreoffice-commits
mailing list