[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 8 commits - bin/pack-debug configure.ac instsetoo_native/CustomTarget_install.mk officecfg/registry scp2/source
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Wed May 13 07:54:02 UTC 2020
bin/pack-debug | 338 ++++++++++
configure.ac | 2
instsetoo_native/CustomTarget_install.mk | 2
officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs | 1
scp2/source/ooo/scpaction_ooo.scp | 18
5 files changed, 341 insertions(+), 20 deletions(-)
New commits:
commit 21a601e0a35979befe32053436bc160e130a3f26
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Jun 19 10:52:56 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] %s/6.0/6.4/g in bin/pack-debug
Change-Id: I3d8916a43fa012d4074eba2254a6d591d9c25bda
diff --git a/bin/pack-debug b/bin/pack-debug
index 577b52bd913e..e212a2cfaad4 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -37,7 +37,7 @@ echo create debug packages >$BUILD_LOG
eval $(grep ^INSTALLDIRNAME config.log)
eval $(grep ^PRODUCTVERSION config.log)
-# set package base name, eg. collaboraoffice6.0
+# set package base name, eg. collaboraoffice6.4
DEBUGSRC_PACKAGENAME=$INSTALLDIRNAME$PRODUCTVERSION
#################################
@@ -245,24 +245,24 @@ do
then
echo ================ $i ================
TARGET_NAME=$INSTALLDIRNAME"$(echo $(basename $i) | awk '
- /epm_gid_Module_Optional_Firebird.lst/{print"basis6.0-firebird"}
- /epm_gid_Module_Optional_Gnome.lst/{print"basis6.0-gnome-integration"}
- /epm_gid_Module_Optional_Grfflt.lst/{print"basis6.0-graphicfilter"}
- /epm_gid_Module_Optional_Kde.lst/{print"basis6.0-kde-integration"}
- /epm_gid_Module_Optional_OGLTrans.lst/{print"basis6.0-ogltrans"}
- /epm_gid_Module_Optional_PostgresqlSdbc.lst/{print"basis6.0-postgresql-sdbc"}
- /epm_gid_Module_Pdfimport.lst/{print"basis6.0-extension-pdf-import"}
- /epm_gid_Module_Prg_Base_Bin.lst/{print"basis6.0-base"}
- /epm_gid_Module_Prg_Calc_Bin.lst/{print"basis6.0-calc"}
- /epm_gid_Module_Prg_Impress_Bin.lst/{print"basis6.0-impress"}
- /epm_gid_Module_Prg_Math_Bin.lst/{print"basis6.0-math"}
- /epm_gid_Module_Prg_Wrt_Bin.lst/{print"basis6.0-writer"}
- /epm_gid_Module_Pyuno.lst/{print"basis6.0-pyuno"}
- /epm_gid_Module_Reportbuilder.lst/{print"basis6.0-extension-report-builder"}
- /epm_gid_Module_Root_Brand.lst/{print"6.0"}
- /epm_gid_Module_Root.lst/{print"basis6.0-core"}
- /epm_gid_Module_Root_Ure_Hidden.lst/{print"6.0-ure"}
- ' | sed s/6.0/$PRODUCTVERSION/g)"
+ /epm_gid_Module_Optional_Firebird.lst/{print"basis6.4-firebird"}
+ /epm_gid_Module_Optional_Gnome.lst/{print"basis6.4-gnome-integration"}
+ /epm_gid_Module_Optional_Grfflt.lst/{print"basis6.4-graphicfilter"}
+ /epm_gid_Module_Optional_Kde.lst/{print"basis6.4-kde-integration"}
+ /epm_gid_Module_Optional_OGLTrans.lst/{print"basis6.4-ogltrans"}
+ /epm_gid_Module_Optional_PostgresqlSdbc.lst/{print"basis6.4-postgresql-sdbc"}
+ /epm_gid_Module_Pdfimport.lst/{print"basis6.4-extension-pdf-import"}
+ /epm_gid_Module_Prg_Base_Bin.lst/{print"basis6.4-base"}
+ /epm_gid_Module_Prg_Calc_Bin.lst/{print"basis6.4-calc"}
+ /epm_gid_Module_Prg_Impress_Bin.lst/{print"basis6.4-impress"}
+ /epm_gid_Module_Prg_Math_Bin.lst/{print"basis6.4-math"}
+ /epm_gid_Module_Prg_Wrt_Bin.lst/{print"basis6.4-writer"}
+ /epm_gid_Module_Pyuno.lst/{print"basis6.4-pyuno"}
+ /epm_gid_Module_Reportbuilder.lst/{print"basis6.4-extension-report-builder"}
+ /epm_gid_Module_Root_Brand.lst/{print"6.4"}
+ /epm_gid_Module_Root.lst/{print"basis6.4-core"}
+ /epm_gid_Module_Root_Ure_Hidden.lst/{print"6.4-ure"}
+ ' | sed s/6.4/$PRODUCTVERSION/g)"
echo TARGET NAME: $TARGET_NAME
# create stripped libraries and linked debug info files
commit efa65b37525a53a444afaa4d16d48d6a7476d0d9
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Apr 30 20:27:02 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] fix debug package of firebird
Change-Id: I327c7b5eb843a0a5a3f11ef7fbc609b44c7aa16f
diff --git a/bin/pack-debug b/bin/pack-debug
index 70e9486c263b..577b52bd913e 100755
--- a/bin/pack-debug
+++ b/bin/pack-debug
@@ -245,6 +245,7 @@ do
then
echo ================ $i ================
TARGET_NAME=$INSTALLDIRNAME"$(echo $(basename $i) | awk '
+ /epm_gid_Module_Optional_Firebird.lst/{print"basis6.0-firebird"}
/epm_gid_Module_Optional_Gnome.lst/{print"basis6.0-gnome-integration"}
/epm_gid_Module_Optional_Grfflt.lst/{print"basis6.0-graphicfilter"}
/epm_gid_Module_Optional_Kde.lst/{print"basis6.0-kde-integration"}
commit 01a75348e055e5ec5ceab3ca127b41ca34d77f82
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 15 22:09:47 2018 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] bin/pack-debug
Change-Id: I3594fa38c5c114e6260047f01ceb89eb9a40e01d
diff --git a/bin/pack-debug b/bin/pack-debug
new file mode 100755
index 000000000000..70e9486c263b
--- /dev/null
+++ b/bin/pack-debug
@@ -0,0 +1,337 @@
+#!/bin/bash
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# create debuginfo and debugsource packages from LO rpm & deb files
+# (generated by using --enable-symbols)
+
+# build path
+export BUILD_PATH=$PWD
+export BUILD_LOG=$BUILD_PATH/pack-debug.log
+
+if [ $# -gt 0 ]
+then
+ for i in "$@"
+ do
+ case $i in
+--only-rpm) ONLY_RPM=1;;
+--only-deb) ONLY_DEB=1;;
+*) echo "Usage: pack-debug [--only-rpm | --only-deb]" && exit 1;;
+ esac
+ done
+fi
+
+# set install dirname and product version
+if [ ! -f config.log ]; then
+ echo "config.log not found. Run this script from build root."
+ exit 1;
+fi
+
+# create pack-debug.log file
+echo create debug packages >$BUILD_LOG
+
+eval $(grep ^INSTALLDIRNAME config.log)
+eval $(grep ^PRODUCTVERSION config.log)
+
+# set package base name, eg. collaboraoffice6.0
+DEBUGSRC_PACKAGENAME=$INSTALLDIRNAME$PRODUCTVERSION
+
+#################################
+# Function for re-build RPM files
+#################################
+function repack_rpm {
+
+# set environment based on config.log
+# for find-requires-x11.sh used by rpm __find_requires
+eval $(grep ^PLATFORMID config.log)
+export PLATFORMID
+eval $(grep ^build_cpu config.log)
+export build_cpu
+
+####################################
+echo create RPM debug source package
+####################################
+
+DEBUGSRC="$(find workdir -name ${DEBUGSRC_PACKAGENAME}.spec.log)"
+
+# create spec file, based on the spec file of the brand package
+
+cat $DEBUGSRC | awk '
+ /^Name:/ { print "Summary: Debug source for package "$2; print $0"-debugsource";next }
+ /^Group:/ { print $1" Development/Debug";next }
+ /^Brand module/ { print gensub("Brand module", "Source files", "");next }
+ /^%attr/ || /^Summary:/ { next }
+ {print}
+ END {
+ print "%defattr(-,root,root)"
+ }
+ ' > ${DEBUGSRC}-debugsource
+ buildroot=$(cat $DEBUGSRC-debugsource | awk '/^BuildRoot/{print$2}')
+ topdir=$(dirname $(dirname $buildroot))
+ mkdir -p $buildroot $topdir/RPMS/BUILD $topdir/RPMS/RPMS
+ rm -rf $buildroot
+
+ # create source file list
+
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev '/(instdir|qa|DEBS)/' |
+
+ # list all directories for complete rpm remove
+
+ awk -v home=$BUILD_PATH '
+ {
+ split($0, a, home "/")
+ n=split(a[2], b, "/")
+ c=home
+ for(i=1;i<n;i++) {
+ c=c"/"b[i]
+ if(mem[c]!=1) print "%dir "c
+ mem[c]=1
+ }
+ print $0
+ }' >> ${DEBUGSRC}-debugsource
+
+ # start rpmbuild for debug source package
+
+ ln -s / $buildroot
+
+ # debug build source package
+
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" ${DEBUGSRC}-debugsource --target $build_cpu --buildroot=$buildroot
+
+###################################################################
+echo create rpm debug info packages by processing logged spec files
+###################################################################
+
+for i in $BUILD_PATH/workdir/installation/CollaboraOffice/rpm/logging/*/*.spec.log
+do
+
+ # repackage only rpm packages with non-stripped so files
+
+ if grep -q '^%attr.*[.]\(so\|bin\)\([.].*\)\?\"' $i
+ then
+ echo ================ $i ================
+ pack=$(cat $i | awk '/^Name/{print$2}')
+ buildroot=$(cat $i | awk '/^BuildRoot/{print$2}')
+ topdir=$(dirname $(dirname $buildroot))
+ rpmdir=$(echo $topdir | sed 's/_inprogress$//')
+
+ # create empty buildroot directory
+
+ rm -rf $buildroot
+ mkdir -p $buildroot $topdir/RPMS/BUILD $topdir/RPMS/RPMS
+ cd $buildroot
+
+ echo REBUILD: $rpmdir/RPMS/${pack}-[0-9]*.rpm
+
+ # extract rpm package
+
+ rpm2cpio $rpmdir/RPMS/${pack}-[0-9]*.rpm | cpio -idmv
+
+ # create stripped libraries and linked debug info files
+
+ for j in $(cat $i | awk '/^%attr.*[.](so|bin)([.].*)?"$/{print$2}')
+ do
+ so=$(echo $j | tr -d '"')
+ cd ./$(dirname $so)
+ so=$(basename $so)
+ objcopy --only-keep-debug $so $so.dbg
+ objcopy --strip-debug $so
+ objcopy --add-gnu-debuglink=$so.dbg $so
+ cd $buildroot
+ done
+
+ # copy files for double package generation (using hard links)
+
+ cp -rl $buildroot $buildroot.copy
+
+ # stripped package
+
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" $i --target $build_cpu --buildroot=$buildroot
+ rm -rf $buildroot
+ mv $buildroot.copy $buildroot
+ mkdir -p $topdir/RPMS/BUILD $topdir/RPMS/RPMS
+
+ # create spec file for the debug info package
+
+ cat $i | awk '
+ /^Name:/ { print "Summary: Debug information for package "$2; print $0"-debuginfo";next }
+ /^Group:/ { print $1" Development/Debug";next }
+ /^%attr.*[.](so|bin)([.].*)?"$/ { print substr($0, 1, length($0) - 1)".dbg\""; next }
+ /^%attr/ || /^Summary:/ { next }
+ {print}
+ ' > ${i}-debuginfo
+
+ # create debug info package
+
+ rpmbuild -bb --define "_unpackaged_files_terminate_build 0" ${i}-debuginfo --target $build_cpu --buildroot=$buildroot
+ fi
+done
+
+echo Update RPM download tar.gz
+
+mv $topdir/RPMS/RPMS/*/*.rpm $rpmdir/RPMS/
+cd $rpmdir/..
+TARGET_RPM=$(ls *_download/*.tar.gz)
+TARGET_DEBUG=$(echo $TARGET_RPM | sed 's/.tar.gz$/-debug.tar.gz/')
+SOURCE_RPM=$(find *_rpm -type f | grep -v debug)
+SOURCE_DEBUG=$(find *_rpm -type f | grep -E '(debug|readme|README)')
+tar c $SOURCE_RPM | gzip >$TARGET_RPM
+tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+cd $BUILD_PATH
+rm -rf $topdir
+}
+
+#################################
+# Function for re-build DEB files
+#################################
+function repack_deb {
+
+####################################
+echo create DEB debug source package
+####################################
+
+DEBUGSRC=$BUILD_PATH/workdir/installation/CollaboraOffice/deb/listfile/en-US/epm_gid_Module_Root_Brand.lst
+
+echo Base spec file: $DEBUGSRC
+
+# create spec file, based on the spec file of the brand package
+
+cat $DEBUGSRC | awk '
+ /^%product/ { print gensub("Brand module", "Debug source package", "", $0) ;next }
+ /^%description/ { print gensub("Brand module", "Debug source package", "", $0) ;next }
+ /^[cdf] / { next }
+ {print}
+ ' > ${DEBUGSRC}-debugsource
+
+ # create source file list
+
+ find $BUILD_PATH -name '*[.][hc]xx' -o -name '*[.][hc]' | grep -Ev '/(instdir|qa|DEBS)/' |
+
+ # list all directories
+
+ awk -v home=$BUILD_PATH '
+ {
+ split($0, a, home "/")
+ n=split(a[2], b, "/")
+ c=home
+ for(i=1;i<n;i++) {
+ c=c"/"b[i]
+ if(mem[c]!=1) print "d 755 root root "c" -"
+ mem[c]=1
+ }
+ print "f 644 root root "$0" "$0
+ }' >> ${DEBUGSRC}-debugsource
+
+ echo Spec file of debug source package: ${DEBUGSRC}-debugsource
+
+ # debug build source package
+
+ $BUILD_PATH/workdir/UnpackedTarball/epm/epm -f deb -g ${INSTALLDIRNAME}${PRODUCTVERSION}-debugsource ${DEBUGSRC}-debugsource --output-dir DEBS -v
+
+######################################################################
+echo create DEB debug info packages by processing logged EPM lst files
+######################################################################
+
+for i in $BUILD_PATH/workdir/installation/CollaboraOffice/deb/listfile/en-US/*.lst
+do
+
+ # repackage only deb packages with non-stripped so files
+
+ if grep -q '^f .*[.]\(so\|bin\)\([.].*\)\?$' $i
+ then
+ echo ================ $i ================
+ TARGET_NAME=$INSTALLDIRNAME"$(echo $(basename $i) | awk '
+ /epm_gid_Module_Optional_Gnome.lst/{print"basis6.0-gnome-integration"}
+ /epm_gid_Module_Optional_Grfflt.lst/{print"basis6.0-graphicfilter"}
+ /epm_gid_Module_Optional_Kde.lst/{print"basis6.0-kde-integration"}
+ /epm_gid_Module_Optional_OGLTrans.lst/{print"basis6.0-ogltrans"}
+ /epm_gid_Module_Optional_PostgresqlSdbc.lst/{print"basis6.0-postgresql-sdbc"}
+ /epm_gid_Module_Pdfimport.lst/{print"basis6.0-extension-pdf-import"}
+ /epm_gid_Module_Prg_Base_Bin.lst/{print"basis6.0-base"}
+ /epm_gid_Module_Prg_Calc_Bin.lst/{print"basis6.0-calc"}
+ /epm_gid_Module_Prg_Impress_Bin.lst/{print"basis6.0-impress"}
+ /epm_gid_Module_Prg_Math_Bin.lst/{print"basis6.0-math"}
+ /epm_gid_Module_Prg_Wrt_Bin.lst/{print"basis6.0-writer"}
+ /epm_gid_Module_Pyuno.lst/{print"basis6.0-pyuno"}
+ /epm_gid_Module_Reportbuilder.lst/{print"basis6.0-extension-report-builder"}
+ /epm_gid_Module_Root_Brand.lst/{print"6.0"}
+ /epm_gid_Module_Root.lst/{print"basis6.0-core"}
+ /epm_gid_Module_Root_Ure_Hidden.lst/{print"6.0-ure"}
+ ' | sed s/6.0/$PRODUCTVERSION/g)"
+ echo TARGET NAME: $TARGET_NAME
+
+ # create stripped libraries and linked debug info files
+
+ for j in $(cat $i | awk '/^f .*[.](so|bin)([.].*)?$/{print$6}')
+ do
+ cd $(dirname $j)
+ so=$(basename $j)
+ # remove old temporary files
+ rm -f $so.copy $so.dbg
+ # keep original file
+ cp $so $so.copy
+ objcopy --only-keep-debug $so $so.dbg
+ objcopy --strip-debug $so
+ objcopy --add-gnu-debuglink=$so.dbg $so
+ cd $BUILD_PATH
+ done
+
+ # create stripped package
+
+ $BUILD_PATH/workdir/UnpackedTarball/epm/epm -f deb -g $TARGET_NAME $i --output-dir DEBS -v
+
+ # create spec file for the debug info package
+
+ cat $i | awk '
+ /^%product/ { print "%product Debug info package of "$0 ;next }
+ /^%description/ { print "%description Debug info package of "$0 ;next }
+ /^f .*[.](so|bin)([.].*)?$/ { print $1,$2,$3,$4,$5".dbg",$6".dbg"; next }
+ /^[cf] / { next }
+ {print}
+ ' > ${i}-debuginfo
+
+ # create debug info package
+ $BUILD_PATH/workdir/UnpackedTarball/epm/epm -f deb -g ${TARGET_NAME}-debuginfo $i-debuginfo --output-dir DEBS -v
+
+ # restore original non stripped library files
+
+ for j in $(cat $i | awk '/^f .*[.](so|bin)([.].*)?$/{print$6}')
+ do
+ cd $(dirname $j)
+ so=$(basename $j)
+ rm $so.dbg
+ # restore original file
+ mv -f $so.copy $so
+ cd $BUILD_PATH
+ done
+ fi
+done
+
+echo Update DEB download tar.gz
+
+debdir=$(ls -d $BUILD_PATH/workdir/installation/CollaboraOffice/deb/install/*_deb)
+mv $BUILD_PATH/DEBS/*.deb $debdir/DEBS/
+cd $debdir/..
+TARGET_DEB=$(ls *_download/*.tar.gz)
+TARGET_DEBUG=$(echo $TARGET_DEB | sed 's/.tar.gz$/-debug.tar.gz/')
+SOURCE_DEB=$(find *_deb -type f | grep -v debug)
+SOURCE_DEBUG=$(find *_deb -type f | grep -E '(debug|readme|README)')
+tar c $SOURCE_DEB | gzip >$TARGET_DEB
+tar c $SOURCE_DEBUG | gzip >$TARGET_DEBUG
+
+cd $BUILD_PATH
+rm -rf DEBS
+}
+
+# start deb re-build
+test -z "$ONLY_RPM" -a "$(find workdir/installation/CollaboraOffice/deb/listfile -name '*.lst')" != "" && repack_deb >$BUILD_LOG 2>&1 || \
+ echo 'Skip DEB debug package generation (--only-rpm or missing EPM lst files).'
+
+# start rpm re-build
+test -z "$ONLY_DEB" -a "$(find workdir -name '*spec.log')" != "" && repack_rpm >>$BUILD_LOG 2>&1 || \
+ echo 'Skip RPM debug package generation (--only-deb or missing RPM spec files).'
+
commit 6a38c7cd0cfc6c7774c5b1e5db3a2bb6f3387de9
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Apr 23 20:18:45 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] Revert "always strip non-archive type installation packages"
This reverts commit 2797c4a0efe60726467593c6f2ea93774038b683.
Without this it is not possible to make debug packages.
Change-Id: Iddbe476e853015803b2d1abcf8b366a780698add
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index ce311e0368eb..7de17d582427 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -82,7 +82,7 @@ $(call instsetoo_native_msitemplates,$(1))
$(call gb_Helper_print_on_error, \
cd $(dir $@) \
$(foreach pkgformat,$(5),\
-&& $(if $(filter-out archive,$(pkgformat)),ENABLE_STRIP=1) $(PERL) -w $< \
+&& $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p $(PRODUCTNAME_no_spaces)$(3) \
commit 80fc16b278af203dedbd0efe209739cb48f0d76a
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Mar 9 12:28:39 2017 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] don't allow space in INSTALLDIRNAME
(cherry picked from commit 2fc7778ba2ce545ecb6bd2e60a09eeb8fdb44b49)
Change-Id: I4c20ab9051b49149d4cd52339a61c98f5f62226b
diff --git a/configure.ac b/configure.ac
index 32cbef9c1719..db540e9f47fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12451,7 +12451,7 @@ else
fi
AC_SUBST(WITH_COMPAT_OOWRAPPERS)
-INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{print tolower($0)}'`
+INSTALLDIRNAME=`echo AC_PACKAGE_NAME | $AWK '{gsub(" ", "", $0);print tolower($0)}'`
AC_MSG_CHECKING([for install dirname])
if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes"; then
INSTALLDIRNAME="$with_install_dirname"
commit 829a38d40d71e900abfa61a75bfc978fc908625c
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Mar 2 11:09:50 2016 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] don't package 'install' script because it's not for end users
(cherry picked from commit 74d90488662c55fd5f31b203e02b228137b42076)
(cherry picked from commit ccf572e5e4a0a2fe1c3f5b9a166e2d5e4277c83a)
Change-Id: I64ea8d8722c9da252c6142a862e9363759d38ba3
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 718539796bd2..e09d72848dad 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -36,14 +36,6 @@ ScpAction scp_Copy_Readme_Txt
End
#endif
-#if !defined(WNT) && !defined(MACOSX) && defined(WITH_RPM)
-ScpAction scp_Copy_Install
- Copy = "scripts/install";
- Name = "install";
- UnixRights = 755;
-End
-#endif
-
#ifdef MACOSX
ScpAction scp_Copy_Dmg_Background_Image
Copy = "osxdndinstall.png";
commit 41906bda3732bfaa17ab0c3856f32eaf72f45071
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Sat Oct 31 23:34:21 2015 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] macOS: remove LibreOffice readme+license from Collabora Office DMG
(cherry picked from commit 08f328e20e85d41793413df6ed653d033b499517)
(cherry picked from commit 8988a747cb8937da96f4f2b5164b393fb988f6f5)
Change-Id: Ie62c6a98563261e3601be70ff5eff6603b625445
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index 415963480734..718539796bd2 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -18,15 +18,7 @@
#include "macros.inc"
-#ifdef MACOSX
-ScpAction scp_Copy_Thirdpartylicense_Readme_Html
- Copy = "license.html";
- Name= "license.html";
- Subdir = "LICENSEs";
-End
-#endif
-
-#ifndef WNT
+#if !defined(WNT) && !defined(MACOSX)
ScpAction scp_Copy_Readme_Txt
#ifdef UNX
README_ALL_LANG(Copy, README);
commit 8d3b4bd6eb76bb912813112f7ff7e1946f92d1de
Author: László Németh <nemeth at numbertext.org>
AuthorDate: Mon Mar 26 22:08:26 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 13 09:52:52 2020 +0200
[cp] tdf#116586 hu_AkH11 is not a default personal dictionary
Reviewed-on: https://gerrit.libreoffice.org/51921
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Jenkins <ci at libreoffice.org>
(cherry picked from commit 2d08125e2ad971ac81ba8ca7a0af616e768372e6)
Change-Id: Ib3ea432872d5bb729c9b56d66a9c338cff2bbf8b
diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 77093f0247e0..46e020f842ea 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -222,7 +222,6 @@
<it>en-GB.dic</it>
<it>sl.dic</it>
<it>technical.dic</it>
- <it>hu_AkH11.dic</it>
</value>
</prop>
<prop oor:name="IsUseDictionaryList" oor:type="xs:boolean" oor:nillable="false">
More information about the Libreoffice-commits
mailing list