Commit 1f504c0b authored by Rene Engelhard's avatar Rene Engelhard

update from git. welcome LibreOffice. some initial adaptions (mostly build)

parent e97e9c6a
openoffice.org (1:3.3.0~ooo330m7-1) UNRELEASED; urgency=low
* OpenOffice.org 3.3.0 release branch milestone 7
* welcome, LibreOffice
includes with OpenOffice.org 3.3.0 release branch milestone 7, so:
- fixes hebrew text in sheet tabs when using system fonts
(closes: #433231)
* ooo-build:
- back to master
- use 3.2.98.1 release
- use new ooo-build build insfrastructure
* switch to new LibreOffice build infrastructure, update Homepage:. LO uses own
splash, so this indirectly closes: #529709
* debian/rules:
- add and rework target(s) for new external sources handling upstream
- updates for 3.3 and its various configuration changes
- updates for (OOo) 3.3 and its various configuration changes
- move oo-*ldap.xcd.sample to /usr/share/openoffice.org-common/examples
- unpack extensions to /usr/lib/openoffice/share/extensions instead of
shipping the oxt
......
--- /dev/null 2010-05-24 16:58:35.275686347 +0200
+++ openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
+++ openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/installer-globals-max-1-regcomp.diff 2010-06-11 00:39:33.000000000 +0200
@@ -0,0 +1,14 @@
+diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
+--- solenv/bin/modules/installer/globals.pm
......@@ -17,8 +17,8 @@
+ $fix_number_of_cab_files = 1;
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3a732ae..5f1c32a 100644
--- openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/apply
+++ openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/apply
--- openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/apply
+++ openoffice.org-3.3.0/build-3-2-99-2/patches/dev300/apply
@@ -307,6 +307,10 @@ gcc-HelpLinker.diff
# configmgr paths are not yet existing then
speed-sal-fewer-lstats.diff, i#89730, jholesov
......
This diff is collapsed.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4283ba1..6dc9d1e 100644
--- openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/apply
+++ openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/apply
@@ -2521,6 +2521,9 @@
# TODO file up-stream
lockfile-less-symbols.diff, jholesov
+# succesful -> successful
+regcomp-fix-spelling.diff, i#113958, rengelha
+
[ WWInProgress ]
sw_layout_in_table_cell_fix.diff, n#367341, flr
sw-team-pane.diff
--- /dev/null 2010-08-16 13:41:41.277183513 +0200
+++ openoffice.org-3.3.0/ooo-build-3-2-98-1/patches/dev300/regcomp-fix-spelling.diff 2010-08-18 13:36:21.000000000 +0200
@@ -0,0 +1,22 @@
+diff --git a/cpputools/source/registercomponent/registercomponent.cxx
+b/cpputools/source/registercomponent/registercomponent.cxx
+--- cpputools/source/registercomponent/registercomponent.cxx
++++ cpputools/source/registercomponent/registercomponent.cxx
+@@ -584,7 +584,7 @@
+
+ if ( ! _bSilent )
+ {
+- fprintf(stderr, "register component '%s' in registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
++ fprintf(stderr, "register component '%s' in registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
+ }
+
+ }
+@@ -613,7 +613,7 @@
+ if (bRet)
+ {
+ if ( ! _bSilent )
+- fprintf(stderr, "revoke component '%s' from registry '%s' succesful!\n", sUrl.getStr(), _sRegName.getStr());
++ fprintf(stderr, "revoke component '%s' from registry '%s' successful!\n", sUrl.getStr(), _sRegName.getStr());
+ }
+ else
+ {
installer-globals-max-1-regcomp.diff
#reduce-height-on-dialogs-for-netbooks.diff
regcomp-fix-spelling.diff
shift-translations.diff
pdf-link-export-fix.diff
#shift-translations.diff
......@@ -68,16 +68,17 @@ export QUILT_OPTIONS="-p1 -F0"
unexport LS_COLORS
MWS=OOO330
MILESTONE=m7
MILESTONE=m9
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-3-3
OOO_BUILD_VERSION=3.2.98.1
OOO_BUILD_VERSION=3.2.99.2
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=OOO_BUILD_3_2_98_1
OOO_BUILD_TREE=ooo-build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/ooo-build-$(OOO_BUILD_TARBALL_VERSION)
#OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TARBALL_VERSION=3.2.99.1
OOO_BUILD_TAG=LIBREOFFICE_3_2_99_1
OOO_BUILD_TREE=build-$(shell echo $(OOO_BUILD_VERSION) | sed -e 's/\./-/g')
SOURCE_TREE=$(OOO_BUILD_TREE)/build/libreoffice-$(OOO_BUILD_TARBALL_VERSION)
STAMP_DIR=debian/stampdir
TARFILE_LOCATION=$(CURDIR)/ext-sources
export TARFILE_LOCATION
......@@ -308,7 +309,7 @@ CONFIGURE_FLAGS= --disable-post-install-scripts \
--with-installed-ooo-dirname=$(OODIRNAME) \
--mandir=/usr/share/man \
--with-docdir=/usr/share/doc/openoffice.org \
--with-build-version="ooo-build $(OOO_BUILD_VERSION), $(DIST) package $(BINARY_VERSION)" \
--with-build-version="libreoffice-build $(OOO_BUILD_VERSION), $(DIST) package $(BINARY_VERSION)" \
--disable-strip \
--enable-lockdown \
--with-drink=coffee \
......@@ -1073,9 +1074,9 @@ ifeq "$(USE_SYSTEM_BOOST)" "y"
endif
else
ifneq "$(BOOST_VERSION)" "default"
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER)
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
else
BUILD_DEPS += , libboost-dev $(BOOST_MINVER)
BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-thread-dev, libboost-program-options-dev
endif
endif
CONFIGURE_FLAGS += --with-system-boost
......@@ -3115,7 +3116,7 @@ endif
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract libreoffice$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
rm -rf gnome locolor && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
......@@ -3143,7 +3144,7 @@ endif
# install .applications, .keys, .mime and openoffice.org.xml for
# shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/openoffice.applications \
cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
| sed -e s/\%PRODUCTNAME/OpenOffice.org/g \
> $(PKGDIR)-common/usr/share/application-registry/openoffice.applications
......@@ -3152,10 +3153,10 @@ endif
install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.mime \
$(PKGDIR)-common/usr/share/mime-info && \
rm -f $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/*.keys; do \
for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/*.keys; do \
cat $$i >> $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
done
install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org/openoffice.org.xml \
install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.org.xml \
$(PKGDIR)-common/usr/share/mime/packages
mkdir -p $(PKGDIR)-common/usr/share/applications
......@@ -3399,8 +3400,8 @@ endif
| sed -e "s,\@OOBASISDIR\@,$(OOBASISDIR)," \
> $(PKGDIR)-dtd-officedocument1.0.xmlcatalogs
# add "openoffice.org" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice openoffice.org$(VER)
# add "libreoffice" symlink
cd $(PKGDIR)-common/usr/bin && ln -s ooffice libreoffice$(VER)
ifeq "$(PACKAGE_SDK)" "y"
# add symlinks for docs and examples
......@@ -3463,7 +3464,7 @@ endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/openoffice.org >/dev/null; pwd`" ;\
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
sed -e 's,Comment=Extension,Comment=OpenOffice.org $(VER) Extension,' \
-e 's,Icon=openofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
......@@ -3881,7 +3882,7 @@ get-ooo-build:
TMPD=`mktemp -d`; \
fi && \
cd $$TMPD && pwd && \
$(CURDIR)/$(OOO_BUILD_TREE)/bin/ooo-pack-sources --force --no-ooo-pieces $(CURDIR)/$(OOO_BUILD_TREE) && \
$(CURDIR)/$(OOO_BUILD_TREE)/bin/ooo-pack-sources --force --no-lo-pieces $(CURDIR)/$(OOO_BUILD_TREE) && \
tar xfvz ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
mv ooo-build-$(OOO_BUILD_TARBALL_VERSION) $(OOO_BUILD_TREE) && \
rm ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz archive/ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
......@@ -3917,14 +3918,14 @@ get-orig-source:
--with-git --with-lang="$(BUILD_ISOS)" && \
./download && \
mkdir ../ext-sources-$(OOO_BUILD_TREE) && \
for i in biblio.tar.bz2 extras-3.tar.bz2; do \
for i in biblio.tar.bz2 extras-3.tar.bz2 ????????????????????????????????-*; do \
mv src/$$i ../ext-sources-$(OOO_BUILD_TREE); \
done && \
cd .. && \
tar cfvz $(CURDIR)/../openoffice.org_$(UPSTREAM_VERSION).orig-ext-sources-$(OOO_BUILD_TREE).tar.gz ext-sources-$(OOO_BUILD_TREE) && \
rm -rf ext-sources-$(OOO_BUILD_TREE) && \
cd $(OOO_BUILD_TREE) && \
./bin/ooo-pack-sources --force --no-ooo-build . && \
./bin/ooo-pack-sources --force --no-lo-build . && \
mv archive ../archive-$(OOO_BUILD_TREE) && \
cd ../archive-$(OOO_BUILD_TREE) && \
tar xfvj ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2 && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment