[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-60-g47aeab5
The following commit has been merged in the debian-experimental-3.5 branch:
commit 4ed323ed73195ea9ebf9fc899c7f8f7e4268275a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 26 01:53:28 2011 +0200
build gengal again
diff --git a/changelog b/changelog
index 364b408..04e41e9 100644
--- a/changelog
+++ b/changelog
@@ -18,12 +18,11 @@ libreoffice (1:3.5.0~alpha0~git20111025-1) UNRELEASED; urgency=low
from libreoffice-builds' distro-configs
- run new "make check" instead of solenv/bin/subsequenttests and
manual smoketest
- - temporarily don't install gengal anymore
* debian/rules, debian/control.in:
- move from self-defined UPSTREAM_VERSION/ARCH etc. to use
/usr/share/dpkg/*.mk
- -- Rene Engelhard <rene@debian.org> Mon, 24 Oct 2011 18:50:49 +0000
+ -- Rene Engelhard <rene@debian.org> Tue, 25 Oct 2011 20:25:36 +0000
libreoffice (1:3.4.3-4) unstable; urgency=low
diff --git a/patches/make-gengal-work-again.diff b/patches/make-gengal-work-again.diff
index becb35c..3361f84 100644
--- a/patches/make-gengal-work-again.diff
+++ b/patches/make-gengal-work-again.diff
@@ -1,25 +1,194 @@
---- libreoffice-3.5.0/svx/source/gengal/makefile.mk-old 2011-08-12 20:08:29.000000000 +0200
-+++ libreoffice-3.5.0/svx/source/gengal/makefile.mk 2011-08-12 20:09:00.000000000 +0200
-@@ -37,7 +37,6 @@
- # --- Settings -----------------------------------------------------
+diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
+index 34ed8a9..c872244 100644
+--- a/scp2/source/ooo/file_ooo.scp
++++ b/scp2/source/ooo/file_ooo.scp
+@@ -124,6 +124,35 @@ End
+ #endif
+ #endif
- .INCLUDE : settings.mk
--.INCLUDE : $(PRJ)$/util$/makefile.pmk
++File gid_File_Bin_Gengal
++ BIN_FILE_BODY;
++ Dir = gid_Brand_Dir_Program;
++ Styles = (PACKED);
++ #ifdef UNX
++ Name = "gengal.bin";
++ #else
++ Name = "gengal.exe";
++ #endif
++End
++
++#ifdef UNX
++
++File gid_File_Script_Gengal
++ BIN_FILE_BODY;
++ Dir = gid_Brand_Dir_Program;
++ Styles = (PACKED);
++ Name = "gengal";
++End
++
++#endif
++
++File gid_File_Profile_Gengal
++ BIN_FILE_BODY;
++ Dir = gid_Brand_Dir_Program;
++ Styles = (PACKED);
++ Name = PROFILENAME(gengal);
++End
++
+ #if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
- # --- Files --------------------------------------------------------
+ File gid_File_Bin_Pluginapp
+diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
+new file mode 100644
+index 0000000..36f7752
+--- /dev/null
++++ b/svx/Executable_gengal.bin.mk
+@@ -0,0 +1,80 @@
++#*************************************************************************
++#
++# 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.
++#
++#*************************************************************************
++
++$(eval $(call gb_Executable_Executable,gengal.bin))
++
++$(eval $(call gb_Executable_set_include,gengal.bin,\
++ $$(INCLUDE) \
++ -I$(SRCDIR)/svx/inc/ \
++ -I$(SRCDIR)/svx/inc/pch \
++ -I$(OUTDIR)/inc/offuh \
++ -I$(OUTDIR)/inc/udkapi \
++ -I$(OUTDIR)/inc/offapi \
++))
++
++$(eval $(call gb_Executable_add_cxxflags,gengal.bin,\
++ $$(CXXFLAGS) \
++))
++
++$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
++ sal \
++ tl \
++ svl \
++ comphelper \
++ cppu \
++ cppuhelper \
++ vcl \
++ ucbhelper \
++ svxcore \
++))
++
++$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
++ svx/source/gengal/gengal \
++))
++
++$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
++ vclmain \
++))
++
++ifeq ($(OS),WNT)
++$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
++ kernel32 \
++ msvcrt \
++ oldnames \
++ user32 \
++ uwinapi \
++))
++endif
++
++ifeq ($(OS),LINUX)
++$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
++ dl \
++ pthread \
++))
++endif
++
++# vim: set noet sw=4 ts=4:
+diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
+index 9a3091f..43ffc52 100644
+--- a/svx/Module_svx.mk
++++ b/svx/Module_svx.mk
+@@ -38,6 +38,8 @@ $(eval $(call gb_Module_add_targets,svx,\
+ AllLangResTarget_textconversiondlgs \
+ Package_inc \
+ Package_sdi \
++ Package_gengal \
++ Executable_gengal.bin \
+ ))
-@@ -45,6 +44,8 @@
+ $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
+diff --git a/svx/Package_gengal.mk b/svx/Package_gengal.mk
+new file mode 100644
+index 0000000..d5afd59
+--- /dev/null
++++ b/svx/Package_gengal.mk
+@@ -0,0 +1,32 @@
++#*************************************************************************
++#
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# Copyright 2000, 2011 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.
++#
++#*************************************************************************
++
++$(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal))
++$(eval $(call gb_Package_add_file,svx_gengal,bin/gengalrc,gengalrc.in))
++$(eval $(call gb_Package_add_file,svx_gengal,bin/gengal,gengal.sh))
++
++# vim: set noet ts=4 sw=4:
+diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
+index 21f687a..fb6e59e8 100644
+--- a/svx/source/gengal/gengal.cxx
++++ b/svx/source/gengal/gengal.cxx
+@@ -67,7 +67,7 @@
+ #include <osl/process.h>
+ #include <rtl/bootstrap.hxx>
- OBJFILES= $(OBJ)$/gengal.obj
+-#include <galtheme.hxx>
++#include <svx/galtheme.hxx>
+ #include <svx/gallery1.hxx>
-+CFLAGS += -I$(PRJ)/inc/svx
-+
- .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
- APP1TARGET= $(TARGET)
- .ELSE # .IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
---- libreoffice-3.5.0/svx/source/gengal/gengal.cxx-old 2011-08-12 20:12:31.000000000 +0200
-+++ libreoffice-3.5.0/svx/source/gengal/gengal.cxx 2011-08-12 20:14:09.000000000 +0200
-@@ -101,7 +101,7 @@
+ using namespace ::com::sun::star::uno;
+@@ -100,7 +100,7 @@ void disposeGallery( Gallery* pGallery )
static void createTheme( rtl::OUString aThemeName,
rtl::OUString aGalleryURL,
rtl::OUString aDestDir,
@@ -28,7 +197,7 @@
FileNameList &rFiles )
{
Gallery * pGallery( createGallery( aGalleryURL ) );
-@@ -279,10 +279,10 @@
+@@ -278,10 +278,10 @@ int GalApp::Main()
bool bHelp = false;
rtl::OUString aPath, aDestDir;
rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
@@ -37,28 +206,16 @@
FileNameList aFiles;
- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
-+ for( short i = 0; i < GetCommandLineParamCount(); i++ )
++ for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
{
rtl::OUString aParam = GetCommandLineParam( i );
---- libreoffice-3.5.0//dev/null 2011-08-03 18:17:49.619073942 +0200
-+++ libreoffice-3.5.0/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
---- libreoffice-3.5.0//dev/null 2011-08-03 18:17:49.619073942 +0200
-+++ libreoffice-3.5.0/svx/source/gengal/gengal.sh 2011-08-12 20:16:25.000000000 +0200
-@@ -0,0 +1,101 @@
+diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh
+new file mode 100644
+index 0000000..5173fb4
+--- /dev/null
++++ b/svx/source/gengal/gengal.sh
+@@ -0,0 +1,103 @@
+#!/bin/sh
+#*************************************************************************
+#
@@ -121,24 +278,26 @@
+
+# set search path for shared libraries
+sd_platform=`uname -s`
++sd_prog1="$sd_prog/../basis-link/program"
++sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+case $sd_platform in
+ AIX)
-+ LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}}
++ LIBPATH=${sd_prog1}:${sd_prog2}${LIBPATH+:${LIBPATH}}
+ export LIBPATH
+ ;;
+
+ Darwin)
-+ DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
++ DYLD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+ export DYLD_LIBRARY_PATH
+ ;;
+
+ HP-UX)
-+ SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
++ SHLIB_PATH=${sd_prog1}:${sd_prog2}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
+ export SHLIB_PATH
+ ;;
+
+ *)
-+ LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
++ LD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH
+ ;;
+esac
@@ -160,3 +319,21 @@
+
+# execute binary
+exec "$sd_prog/$sd_binary" "$@"
+diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in
+new file mode 100644
+index 0000000..00ae5eb
+--- /dev/null
++++ b/svx/source/gengal/gengalrc.in
+@@ -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
diff --git a/patches/series b/patches/series
index eb07c78..dc3d47f 100644
--- a/patches/series
+++ b/patches/series
@@ -8,7 +8,7 @@ debian-debug.diff
rhino-build-optional.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.11.diff
-#make-gengal-work-again.diff
+make-gengal-work-again.diff
#add-sdbc-postgresql.diff
fix-system-lpsolve-build.diff
install-no-dependency-on-build.diff
--
LibreOffice packaging repository
Reply to: