Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:11.4:Update
libreoffice-help-group2.import5253
gengal-svx.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gengal-svx.diff of Package libreoffice-help-group2.import5253
--- svx/source/gengal/gengal.sh.old 2011-08-04 14:29:39.000000000 +0200 +++ svx/source/gengal/gengal.sh 2011-08-04 20:00:34.000000000 +0200 @@ -0,0 +1,103 @@ +#!/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` +sd_prog1="$sd_prog/../basis-link/program" +sd_prog2="$sd_prog/../basis-link/ure-link/lib" +case $sd_platform in + AIX) + LIBPATH=${sd_prog1}:${sd_prog2}${LIBPATH+:${LIBPATH}} + export LIBPATH + ;; + + Darwin) + DYLD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} + export DYLD_LIBRARY_PATH + ;; + + HP-UX) + SHLIB_PATH=${sd_prog1}:${sd_prog2}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}} + export SHLIB_PATH + ;; + + *) + LD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${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" "$@" --- svx/source/gengal/gengalrc.in.old 2011-08-04 14:29:39.000000000 +0200 +++ svx/source/gengal/gengalrc.in 2011-08-04 17:16:04.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 --- svx/source/gengal/gengal.cxx.old 2011-05-19 12:27:42.000000000 +0200 +++ svx/source/gengal/gengal.cxx 2011-08-04 17:16:04.000000000 +0200 @@ -68,7 +68,7 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <galtheme.hxx> +#include <svx/galtheme.hxx> #include <svx/gallery1.hxx> using namespace ::com::sun::star::uno; @@ -101,7 +101,7 @@ void disposeGallery( Gallery* pGallery ) 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 @@ int GalApp::Main() 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( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { rtl::OUString aParam = GetCommandLineParam( i ); --- svx/Module_svx.mk.old 2011-05-19 12:27:42.000000000 +0200 +++ svx/Module_svx.mk 2011-08-04 17:38:49.000000000 +0200 @@ -37,6 +37,8 @@ $(eval $(call gb_Module_add_targets,svx, AllLangResTarget_textconversiondlgs \ Package_inc \ Package_sdi \ + Package_gengal \ + Executable_gengal.bin \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ --- svx/Executable_gengal.bin.mk.old 2011-08-04 14:29:39.000000000 +0200 +++ svx/Executable_gengal.bin.mk 2011-08-04 17:38:02.000000000 +0200 @@ -0,0 +1,78 @@ +#************************************************************************* +# +# 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 \ +)) + +$(eval $(call gb_Executable_set_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: --- svx/Package_gengal.mk.old 2011-08-04 17:36:37.000000000 +0200 +++ svx/Package_gengal.mk 2011-08-04 17:38:29.000000000 +0200 @@ -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:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
