[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-1-2-g52a90c5
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 52a90c5581905359d0ce1add4f0d05c76eb3dcda
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 12 21:29:06 2011 +0200
make gengal work again
diff --git a/changelog b/changelog
index 38ea298..7fa01b7 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,12 @@
libreoffice (1:3.4.2-2) UNRELEASED; urgency=low
+ * debian/patches/make-gengal-work-again.diff: as name says
+
* debian/rules:
- fix syntax of graphite removal from SYSTEM_STUFF (forgot s/+=/:=/)
+ - install gengal again
- -- Rene Engelhard <rene@debian.org> Fri, 12 Aug 2011 08:18:41 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 12 Aug 2011 20:56:23 +0200
libreoffice (1:3.4.2-1) experimental; urgency=low
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
new file mode 100644
index 0000000..0ea8642
--- /dev/null
+++ b/patches/make-gengal-work-again.diff
@@ -0,0 +1,165 @@
+--- /dev/null 2011-08-03 18:17:49.619073942 +0200
++++ libreoffice-3.4.2/libreoffice-build/patches/hotfixes/make-gengal-work-again.diff 2011-08-12 20:45:59.000000000 +0200
+@@ -0,0 +1,162 @@
++--- svx/source/gengal/makefile.mk-old 2011-08-12 20:08:29.000000000 +0200
+++++ svx/source/gengal/makefile.mk 2011-08-12 20:09:00.000000000 +0200
++@@ -37,7 +37,6 @@
++ # --- Settings -----------------------------------------------------
++
++ .INCLUDE : settings.mk
++-.INCLUDE : $(PRJ)$/util$/makefile.pmk
++
++ # --- Files --------------------------------------------------------
++
++@@ -45,6 +44,8 @@
++
++ OBJFILES= $(OBJ)$/gengal.obj
++
+++CFLAGS += -I$(PRJ)/inc/svx
+++
++ .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
++ APP1TARGET= $(TARGET)
++ .ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
++--- svx/source/gengal/gengal.cxx-old 2011-08-12 20:12:31.000000000 +0200
+++++ svx/source/gengal/gengal.cxx 2011-08-12 20:14:09.000000000 +0200
++@@ -101,7 +101,7 @@
++ static void createTheme( rtl::OUString aThemeName,
++ rtl::OUString aGalleryURL,
++ rtl::OUString aDestDir,
++- UINT32 nNumFrom,
+++ sal_uInt32 nNumFrom,
++ FileNameList &rFiles )
++ {
++ Gallery * pGallery( createGallery( aGalleryURL ) );
++@@ -279,10 +279,10 @@
++ bool bHelp = false;
++ rtl::OUString aPath, aDestDir;
++ rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
++- UINT32 nNumFrom = 0;
+++ sal_uInt32 nNumFrom = 0;
++ FileNameList aFiles;
++
++- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
+++ for( short i = 0; i < GetCommandLineParamCount(); i++ )
++ {
++ rtl::OUString aParam = GetCommandLineParam( i );
++
++--- /dev/null 2011-08-03 18:17:49.619073942 +0200
+++++ svx/source/gengal/gengalrc.in 2011-08-12 20:16:21.000000000 +0200
++@@ -0,0 +1,12 @@
+++OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
+++OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
+++OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
+++OOO_URE_URL=${OOO_BASIS_URL}/ure-link
+++#
+++#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
+++#BaseInstallation=${OOO_BASIS_URL}
+++BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
+++OOO_BASE_DIR=${OOO_BASIS_URL}
+++#
+++UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
+++UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
++--- /dev/null 2011-08-03 18:17:49.619073942 +0200
+++++ svx/source/gengal/gengal.sh 2011-08-12 20:16:25.000000000 +0200
++@@ -0,0 +1,101 @@
+++#!/bin/sh
+++#*************************************************************************
+++#
+++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+++#
+++# Copyright 2000, 2010 Oracle and/or its affiliates.
+++#
+++# OpenOffice.org - a multi-platform office productivity suite
+++#
+++# This file is part of OpenOffice.org.
+++#
+++# OpenOffice.org is free software: you can redistribute it and/or modify
+++# it under the terms of the GNU Lesser General Public License version 3
+++# only, as published by the Free Software Foundation.
+++#
+++# OpenOffice.org is distributed in the hope that it will be useful,
+++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+++# GNU Lesser General Public License version 3 for more details
+++# (a copy is included in the LICENSE file that accompanied this code).
+++#
+++# You should have received a copy of the GNU Lesser General Public License
+++# version 3 along with OpenOffice.org. If not, see
+++# <http://www.openoffice.org/license.html>
+++# for a copy of the LGPLv3 License.
+++#
+++#*************************************************************************
+++
+++# enable file locking
+++SAL_ENABLE_FILE_LOCKING=1
+++export SAL_ENABLE_FILE_LOCKING
+++
+++# resolve installation directory
+++sd_cwd="`pwd`"
+++if [ -h "$0" ] ; then
+++ sd_basename=`basename "$0"`
+++ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+++ cd "`dirname "$0"`"
+++ cd "`dirname "$sd_script"`"
+++else
+++ cd "`dirname "$0"`"
+++fi
+++
+++sd_prog="`pwd`"
+++
+++cd ..
+++sd_binary=`basename "$0"`".bin"
+++sd_inst="`pwd`"
+++
+++# change back directory
+++cd "$sd_cwd"
+++
+++# check if all required patches are installed
+++if [ -x "$sd_prog/sopatchlevel.sh" ]; then
+++ "$sd_prog/sopatchlevel.sh"
+++ if [ $? -eq 1 ]; then
+++ exit 0
+++ fi
+++fi
+++
+++# set search path for shared libraries
+++sd_platform=`uname -s`
+++case $sd_platform in
+++ AIX)
+++ LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}}
+++ export LIBPATH
+++ ;;
+++
+++ Darwin)
+++ DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+++ export DYLD_LIBRARY_PATH
+++ ;;
+++
+++ HP-UX)
+++ SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
+++ export SHLIB_PATH
+++ ;;
+++
+++ *)
+++ LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
+++ export LD_LIBRARY_PATH
+++ ;;
+++esac
+++
+++# misc. environment variables
+++unset XENVIRONMENT
+++
+++# set path so that other apps can be started just by name
+++PATH="$sd_prog":$PATH
+++export PATH
+++
+++OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
+++if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
+++ # Hack for vanilla OOo binaries' split install layout
+++ OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
+++fi
+++
+++export OOO_INSTALL_PREFIX
+++
+++# execute binary
+++exec "$sd_prog/$sd_binary" "$@"
diff --git a/patches/series b/patches/series
index ffb799d..4df5c64 100644
--- a/patches/series
+++ b/patches/series
@@ -18,3 +18,4 @@ libebook-1.2.so.11.diff
vbaobj-visibility-fix.diff
fix-bridges-cpp-uno-depends.diff
no-prctl-on-kfreebsd.diff
+make-gengal-work-again.diff
diff --git a/rules b/rules
index 4283a10..0f92463 100755
--- a/rules
+++ b/rules
@@ -1749,6 +1749,14 @@ endif
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
+ifeq "$(PACKAGE_SDK)" "y"
+ # build gengal...
+ cd $(SOURCE_TREE)/svx/source/gengal; \
+ . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ PATH=$(BUILD_PATH) \
+ dmake
+endif
+
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
$(CURDIR)/debian/rules test
endif
@@ -1982,18 +1990,6 @@ ifeq "$(BUILD_GTK)" "y"
$(PKGDIR)-gnome/$(OODIR)/share/registry
endif
-#ifeq "$(PACKAGE_SDK)" "y"
-# # move gengal stuff into -dev
-# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
-# $(PKGDIR)-dev/$(OODIR)/program
-# mv $(PKGDIR)-common/$(OODIR)/program/gengal \
-# $(PKGDIR)-dev/$(OODIR)/program
-#else
-# rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
-# rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
-#endif
-
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
@@ -2708,6 +2704,15 @@ endif
ln -s /var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
+ifeq "$(PACKAGE_SDK)" "y"
+ # install gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program/gengal
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@ -3152,11 +3157,6 @@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
endif
-#ifeq "$(PACKAGE_SDK)" "y"
-# # fix permission
-# chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
-#endif
-
# install extension shell lib for use by extensions not from here
install -D -m644 debian/shell-lib-extensions.sh \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/shell-lib-extensions.sh
@@ -3198,6 +3198,12 @@ endif
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
+ifeq "$(PACKAGE_SDK)" "y"
+ # install gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+ $(PKGDIR)-common/$(OODIR)/program/gengalrc
+endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
--
LibreOffice packaging repository
Reply to: