[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-76-g744ca1b
The following commit has been merged in the debian-experimental-3.7 branch:
commit edcc3f770541306c97ef905461f1378604568ccd
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 10:55:31 2012 +0100
git update
- update patches
- adapt for removed saxon
- work around config_host.mk.source not working anymore
- work around .urds touched needlesslly in build-indep causing a
(almost) full rebuild...
diff --git a/changelog b/changelog
index a04878e..4a0497b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20121022-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121030-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
@@ -16,7 +16,7 @@ libreoffice (1:3.7.0~alpha0~git20121022-1) UNRELEASED; urgency=low
- use gstreamer1.0
* debian/uno-libs3.symbols: update
- -- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 18:45:37 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 30 Oct 2012 22:24:12 +0100
libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 33f97b6..3b96095 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -15,16 +15,16 @@ diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -252,7 +253,7 @@ sysui\
+@@ -249,7 +249,7 @@ stlport\
+ sysui\
xpdf\
- zlib\
-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
-@@ -549,7 +550,7 @@ findunusedcode:
+@@ -553,7 +553,7 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
@@ -32,20 +32,20 @@ index 7362bbc..ae849fb 100644
+check: unitcheck slowcheck dev-install subsequentcheck
subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 74d0f32..daa4ae0 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
-@@ -1901,7 +1901,7 @@ sub run_job {
+@@ -1902,7 +1902,7 @@ sub run_job {
return 1 if (! $path =~ /prj$/ );
mkpath("$workdir/Logs");
- my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+ my $gbuild_flags = '-j' . $ENV{PARALLELISM};
- my $gbuild_target = 'all slowcheck';
+ my $gbuild_target = 'all';
if ($registered_name =~ /tail_build\/prj$/ )
{
- $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+ $gbuild_target = $ENV{gb_TAILBUILDTARGET};
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index e5f87f0..9c2608c 100644
--- a/solenv/gbuild/Module.mk
@@ -62,3 +62,14 @@ index e5f87f0..9c2608c 100644
--
1.7.9.5
+--- a/Makefile-old 2012-10-28 16:25:49.016468687 +0100
++++ b/Makefile 2012-10-28 16:25:59.440520356 +0100
+@@ -9,7 +9,7 @@
+
+ # must not be empty so we can have a target for it
+ ifeq ($(MAKECMDGOALS),)
+-MAKECMDGOALS:=all
++MAKECMDGOALS:=build
+ endif
+
+ SHELL=/usr/bin/env bash
diff --git a/patches/config_host-fix-envvars.diff b/patches/config_host-fix-envvars.diff
new file mode 100644
index 0000000..6628c9c
--- /dev/null
+++ b/patches/config_host-fix-envvars.diff
@@ -0,0 +1,45 @@
+--- a/config_host.mk.in-old 2012-10-26 17:45:36.855715506 +0200
++++ b/config_host.mk.in 2012-10-26 17:45:57.315816943 +0200
+@@ -53,9 +53,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
+ export CDR_CFLAGS=@CDR_CFLAGS@
+ export CDR_LIBS=@CDR_LIBS@
+ export CDR_TARBALL=@CDR_TARBALL@
+-ifneq ($(strip @CFLAGS@),)
+ export CFLAGS=@CFLAGS@
+-endif
+ export CHECK_PARALLELISM=@CHECK_PARALLELISM@
+ export CLANGPLUGIN_CPPFLAGS=@CLANGPLUGIN_CPPFLAGS@
+ export CLUCENE_CFLAGS=@CLUCENE_CFLAGS@
+@@ -89,9 +92,7 @@ export CURL_LIBS=@CURL_LIBS@
+ export CXX=@CXX@
+ export CXX_FOR_BUILD=@CXX_FOR_BUILD@
+ export CXX_X64_BINARY=@CXX_X64_BINARY@
+-ifneq ($(strip @CXXFLAGS@),)
+ export CXXFLAGS=@CXXFLAGS@
+-endif
+ export DATADIR=@DATADIR@
+ export DBGHELP_DLL=@DBGHELP_DLL@
+ export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
+@@ -312,9 +315,7 @@ export LANGUAGETOOL_TARBALL=@LANGUAGETOOL_TARBALL@
+ export L10N_MODULE=@L10N_MODULE@
+ export LCMS2_CFLAGS=@LCMS2_CFLAGS@
+ export LCMS2_LIBS=@LCMS2_LIBS@
+-ifneq ($(strip @LDFLAGS@),)
+ export LDFLAGS=@LDFLAGS@
+-endif
+ export LFS_CFLAGS=@LFS_CFLAGS@
+ export LIBBASE_JAR=@LIBBASE_JAR@
+ export LIBDIR=@LIBDIR@
+@@ -442,12 +443,8 @@ export nodep=@nodep@
+ export NSS_CFLAGS=@NSS_CFLAGS@
+ export NSS_LIBS=@NSS_LIBS@
+ export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
+-ifneq ($(strip @OBJCFLAGS@),)
+ export OBJCFLAGS=@OBJCFLAGS@
+-endif
+-ifneq ($(strip @OBJCXXFLAGS@),)
+ export OBJCXXFLAGS=@OBJCXXFLAGS@
+-endif
+ export OBJDUMP=@OBJDUMP@
+ export OOOBLOGGER_EXTENSION_PACK=@OOOBLOGGER_EXTENSION_PACK@
+ export OOODMAKEMODE=YES
diff --git a/patches/debian-hardened-buildflags.diff b/patches/debian-hardened-buildflags.diff
index eb323ca..f8be3d4 100644
--- a/patches/debian-hardened-buildflags.diff
+++ b/patches/debian-hardened-buildflags.diff
@@ -1,8 +1,8 @@
--- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000
+++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000
-@@ -9671,6 +9671,17 @@
- fi
- AC_SUBST(CDEFAULTOPT)
+@@ -9681,6 +9687,17 @@ AC_SUBST(GSTREAMER_0_10_CFLAGS)
+ AC_SUBST(GSTREAMER_0_10_LIBS)
+ AC_SUBST(ENABLE_GSTREAMER_0_10)
+if test -x /usr/bin/dpkg-buildflags; then
+ HARDEN_CFLAGS=`dpkg-buildflags --get CFLAGS 2>/dev/null | sed -e s/-g// | sed -e s/-O[[0-3]]//g`
@@ -16,7 +16,7 @@
+AC_SUBST(HARDEN_LDFLAGS)
+
dnl ===================================================================
- dnl Setting up the environment.
+ dnl Check whether the OpenGL libraries are available
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200
+++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 5036d95..d29f94d 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -2,9 +2,9 @@ diff --git a/configure.ac b/configure.in
index c0b76f8..d10222f 100644
--- libreoffice-3.5.0/configure.ac
+++ libreoffice-3.5.0/configure.ac
-@@ -12203,6 +12217,13 @@ fi
- AC_MSG_RESULT([$CHECK_PARALLELISM])
- AC_SUBST(CHECK_PARALLELISM)
+@@ -12091,6 +12108,13 @@ PRODUCTVERSION=AC_PACKAGE_VERSION
+ AC_MSG_RESULT([$PRODUCTVERSION])
+ AC_SUBST(PRODUCTVERSION)
+if test -x /usr/bin/dpkg-buildflags; then
+ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
@@ -14,7 +14,7 @@ index c0b76f8..d10222f 100644
+AC_SUBST(CDEFAULTOPT)
+
dnl ===================================================================
- dnl Setting up the environment.
+ dnl Dealing with l10n options
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:08:12.755739649 +0200
+++ b/config_host.mk.in 2012-04-06 14:08:35.351739800 +0200
diff --git a/patches/dont-touch-urd.diff b/patches/dont-touch-urd.diff
new file mode 100644
index 0000000..f19ef5d
--- /dev/null
+++ b/patches/dont-touch-urd.diff
@@ -0,0 +1,80 @@
+18:43 <@_rene_> hmm. /me wonders why after a rm config.status autogen.lastrun
+ and a re-configure (and make clean for odk/scp2/scripting) LO
+ master tries to rebuild offapi/udkapi again?
+18:44 <@_rene_> this a) takes with cpp instead of ucpp and b) causes all kind
+ of stuff "down" to be rebuilt.... :(
+18:44 <@_rene_> which is extremely bad.
+18:44 <@_rene_> if it isn't solvable easily: what to touch to prevent it from
+ doing that? :-)
+18:45 < loirkerbot> LibreOffice (core) mstahl * desktop/source/app/main.c:
+ desktop: tweak xmlCleanupParser hack: disable on return
+ from main
+18:46 < mst__> _rene_, did you switch between --with-system-ucpp and without?
+ that should rebuild IDL file...
+18:47 <@_rene_> nah, first run is just --disable-help, --disable-scripting etc
+18:47 <@_rene_> and the second run does that
+18:47 <@_rene_> (first pass to "just" build what is needed for arch-specific
+ stuff)
+18:48 <@_rene_> (and I am not using ucpp at all, but cpp ;))
+18:51 < mst__> _rene_, hmm don't know why that would happen then... you could
+ try running second make with -d and redirect to a file, but
+ beware that file will be huge... then grep for "Must
+ remake.*urd" or something should give you the problem area
+18:59 -!- reisi007 [~chatzilla@cpe90-146-226-33.liwest.at] has quit [Quit:
+ ChatZilla 0.9.89 [Firefox 14.0.1/20120713134347]]
+19:00 -!- crossmanith_ [~cr@p3E9EAEF6.dip.t-dialin.net] has joined
+ #libreoffice-dev
+19:00 -!- erAck_away is now known as erAck
+19:05 -!- cbosdonnat [~cbosdo@ALyon-651-1-309-127.w90-14.abo.wanadoo.fr] has
+ quit [Quit: Leaving]
+19:07 <@_rene_> mst__: ok, starting a new build, let's see
+[...]
+10:36 <@_rene_> mst__: nothing interesting there instead of the loads of
+ touch'es...
+10:36 <@_rene_> mst__: butI just removed the touch from the UnoApiTarget and
+ let's see now :)
+10:36 -!- erAck [~erathke@f054050047.adsl.alicedsl.de] has joined
+ #libreoffice-dev
+10:36 -!- mode/#libreoffice-dev [+o erAck] by ChanServ
+10:36 <@_rene_> $(call gb_UnoApiPartTarget_get_target,%.urd) :
+10:36 <@_rene_> - touch $@
+10:36 <@_rene_> +
+[...]
+10:38 < mst__> _rene_, there must be something interesting there: preceding the
+ "Must remake.*urd" line there must be some line that says target
+ "foo" is "newer" than the .urd and therefor it will be rebuilt
+[...]
+10:40 <@_rene_> mst__: I didn't see anything there, no ".*urd*muss neu"
+10:41 < mst__> _rene_, there must be a message like that immediately preceding
+ running the touch command
+10:41 -!- pepp [~pierre-er@vaf26-6-78-248-2-61.fbx.proxad.net] has joined
+ #libreoffice-dev
+10:42 <@vmiklos> mst__: makes sense.
+10:42 -!- matus [~ubuntu@adsl-dyn17.78-98-107.t-com.sk] has joined
+ #libreoffice-dev
+10:42 <@_rene_> as said, there was done. I don't think I oversaw it
+10:43 <@_rene_> but can try again later, for now I will just keep removing the
+ touch. according to the comment this shoudln't do harm
+10:43 < mst__> _rene_, removing it will break incremental builds iirc
+10:44 <@_rene_> but only if you change idl stuff inbetween
+10:44 <@_rene_> which won't happen that often in package builds ;)
+10:44 < mst__> _rene_, exactly
+10:44 -!- Fridrich [~fridrich@71-99.199-178.cust.bluewin.ch] has joined
+ #libreoffice-dev
+10:44 -!- mode/#libreoffice-dev [+o Fridrich] by ChanServ
+10:45 <@_rene_> (when I am out of "use git", only when there's a new
+ (pre-)release"
+
+diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
+index 98734ab..b281a84 100644
+--- a/solenv/gbuild/UnoApiTarget.mk
++++ b/solenv/gbuild/UnoApiTarget.mk
+@@ -46,7 +46,7 @@ $(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+ $(call gb_UnoApiPartTarget_get_target,%.urd) :
+- touch $@
++
+
+ # TODO:
+ # - get idlc switch "-P" (generate .urd into package dir)
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 8d8a952..b3acb69 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -1,6 +1,6 @@
--- a/configure.ac-old 2012-04-07 00:05:49.607740045 +0200
+++ b/configure.ac 2012-04-07 00:06:53.899999955 +0200
-@@ -5135,7 +5135,8 @@
+@@ -6158,7 +6158,8 @@ if test "$SOLAR_JAVA" != ""; then
if test "$JDK" = "gcj"; then
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
@@ -10,8 +10,8 @@
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
AC_CHECK_HEADER(jni.h, [],
-@@ -5469,6 +5470,7 @@
- AC_SUBST(XCLASSPATH)
+@@ -6485,6 +6486,7 @@ AC_SUBST(JDK)
+ AC_SUBST(JDKLIB)
AC_SUBST(x_JAVALIB)
AC_SUBST(x_JDKLIB)
+AC_SUBST(GCJ_JNI_INCLUDE)
diff --git a/patches/py3uno-module.diff b/patches/py3uno-module.diff
index aa65752..80715d0 100644
--- a/patches/py3uno-module.diff
+++ b/patches/py3uno-module.diff
@@ -6,8 +6,8 @@
pyuno\
+py3uno\
qadevOOo\
- rdbmaker\
readlicense_oo\
+ regexp\
diff --git a/Repository.mk b/Repository.mk
index 3609d09..c0b11c2 100644
--- a/Repository.mk
diff --git a/patches/series b/patches/series
index 2018edf..da19369 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,5 @@ build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
disable-flaky-unoapi-tests.diff
ure-no-etc-opt-ure.diff
+config_host-fix-envvars.diff
+dont-touch-urd.diff
diff --git a/rules b/rules
index 6a07bcd..58a6724 100755
--- a/rules
+++ b/rules
@@ -186,11 +186,6 @@ ifeq "$(ENABLE_JAVA)" "y"
SYSTEM_STUFF += hsqldb
HSQLDB_MINVER= (>> 1.8.0.10)
HSQLDB_TOONEWVER=1.8.1
- # disabled because system-saxon breaks all kinds exports using XSLT transforms
- # (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
- # It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
- # for UOF, but still for e.g. M$.
- #SYSTEM_STUFF += saxon
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@ -818,10 +813,6 @@ export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , libreoffice$(VER)-java-common
JAVA_COMMON_DEPENDS_VERSION:= (>= $(BASE_VERSION)~)
- ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
- CONFIGURE_FLAGS += --with-system-saxon --with-saxon-jar=/usr/share/java/saxonb.jar
- BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
- endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
ifeq "$(BUILD_UNOWINREG_DLL)" "y"
@@ -1217,10 +1208,10 @@ ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
BUILD_DEPS += , make (>= 3.81-8.2)
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
- CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
+ CONFIGURE_FLAGS += --with-parallelism=$(NUM_CPUS)
endif
else
- CONFIGURE_FLAGS += --with-num-cpus=1
+ CONFIGURE_FLAGS += --with-parallelism=1
endif
@@ -1655,7 +1646,7 @@ $(STAMP_DIR)/build-indep:
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build gb_FULLDEPS= gb_Deliver_HARDLINK=T
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) -d build gb_FULLDEPS= gb_Deliver_HARDLINK=T
touch $@
@@ -2020,9 +2011,6 @@ ifeq "$(PACKAGE_BASE)" "y"
endif
: # remove problematic ones
rm -f debian/tmp/native-jars/ridl.jar
-ifneq "$(USE_SYSTEM_SAXON)" "y"
- rm -f debian/tmp/native-jars/saxon9.jar
-endif
: # compile the others
# the Debian i386 buildd, although having much ram still OOMs without
# this (at unoil.jar).
@@ -2558,12 +2546,6 @@ endif
cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
-ifeq "$(ENABLE_JAVA)" "y"
- ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
- ln -sf /usr/share/java/saxonb.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/saxon9.jar
- endif
-endif
# remove extra license files
rm -rf $(PKGDIR)-common/$(OODIR)/licenses
rm -f $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
--
LibreOffice packaging repository
Reply to: