[PUSHED libreoffice-4-1] add sid auxiliary files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5294 Approvals: Christian Lohmaier: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5294 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec7caac1f2c3c4f96db69adb9ecd696f420e7e6c Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Andras Timar Gerrit-Reviewer: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#67093 Change traduction of Title for some more languages
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5038 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/38/5038/1 fdo#67093 Change traduction of Title for some more languages For those languages that had an alternative translation for the title style in ede3fe62d4b30ebe82d2e2b837bd5d8247b73438 - still languages left that have identical translations Change-Id: Ibcd7d03c9ea7608c8963d1cb9b7c2d7cbe2415d5 --- M source/as/sw/source/ui/utlui.po M source/bg/sw/source/ui/utlui.po M source/br/sw/source/ui/utlui.po M source/gl/sw/source/ui/utlui.po M source/lt/sw/source/ui/utlui.po M source/pt-BR/sw/source/ui/utlui.po M source/pt/sw/source/ui/utlui.po M source/ru/sw/source/ui/utlui.po M source/sv/sw/source/ui/utlui.po M source/te/sw/source/ui/utlui.po M source/uk/sw/source/ui/utlui.po M source/zh-CN/sw/source/ui/utlui.po M source/zh-TW/sw/source/ui/utlui.po 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/as/sw/source/ui/utlui.po b/source/as/sw/source/ui/utlui.po index e863fd5..5623812 100644 --- a/source/as/sw/source/ui/utlui.po +++ b/source/as/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "শিৰোনাম" +msgstr "শীৰ্ষক" #: poolfmt.src msgctxt "" diff --git a/source/bg/sw/source/ui/utlui.po b/source/bg/sw/source/ui/utlui.po index 2628690..2e1e2ea 100644 --- a/source/bg/sw/source/ui/utlui.po +++ b/source/bg/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заглавие" +msgstr "Заглавие на документ" #: poolfmt.src msgctxt "" diff --git a/source/br/sw/source/ui/utlui.po b/source/br/sw/source/ui/utlui.po index 0f723b2..f37d526 100644 --- a/source/br/sw/source/ui/utlui.po +++ b/source/br/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Titl" +msgstr "Titl pennañ" #: poolfmt.src msgctxt "" diff --git a/source/gl/sw/source/ui/utlui.po b/source/gl/sw/source/ui/utlui.po index 85dd133..cdbdc8b 100644 --- a/source/gl/sw/source/ui/utlui.po +++ b/source/gl/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título de documento" #: poolfmt.src msgctxt "" diff --git a/source/lt/sw/source/ui/utlui.po b/source/lt/sw/source/ui/utlui.po index cb70517..d8627d6 100644 --- a/source/lt/sw/source/ui/utlui.po +++ b/source/lt/sw/source/ui/utlui.po @@ -3142,7 +3142,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Antraštė" +msgstr "Dokumento antraštė" #: poolfmt.src msgctxt "" diff --git a/source/pt-BR/sw/source/ui/utlui.po b/source/pt-BR/sw/source/ui/utlui.po index 02906b2..87e7004 100644 --- a/source/pt-BR/sw/source/ui/utlui.po +++ b/source/pt-BR/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/pt/sw/source/ui/utlui.po b/source/pt/sw/source/ui/utlui.po index 73c1a98..41b8a07 100644 --- a/source/pt/sw/source/ui/utlui.po +++ b/source/pt/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Título" +msgstr "Título principal" #: poolfmt.src msgctxt "" diff --git a/source/ru/sw/source/ui/utlui.po b/source/ru/sw/source/ui/utlui.po index 06e319e..ccc0004 100644 --- a/source/ru/sw/source/ui/utlui.po +++ b/source/ru/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Заглавие" #: poolfmt.src msgctxt "" diff --git a/source/sv/sw/source/ui/utlui.po b/source/sv/sw/source/ui/utlui.po index f3daaf5..819944c 100644 --- a/source/sv/sw/source/ui/utlui.po +++ b/source/sv/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Rubrik" +msgstr "Titel" #: poolfmt.src msgctxt "" diff --git a/source/te/sw/source/ui/utlui.po b/source/te/sw/source/ui/utlui.po index 7a7b170..dc1ddab 100644 --- a/source/te/sw/source/ui/utlui.po +++ b/source/te/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "శీర్షిక" +msgstr "పత్ర శీర్షిక" #: poolfmt.src msgctxt "" diff --git a/source/uk/sw/source/ui/utlui.po b/source/uk/sw/source/ui/utlui.po index e441d1f..b413a45 100644 --- a/source/uk/sw/source/ui/utlui.po +++ b/source/uk/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -msgstr "Заголовок" +msgstr "Назва" #: poolfmt.src msgctxt "" diff --git a/source/zh-CN/sw/source/ui/utlui.po b/source/zh-CN/sw/source/ui/utlui.po index c3ff05d..6bf682b 100644 --- a/source/zh-CN/sw/source/ui/utlui.po +++ b/source/zh-CN/sw/source/ui/utlui.po @@ -3141,7 +3141,7 @@ "STR_POOLCOLL_DOC_TITEL\n" "string.text" msgid "Title" -
[PATCH libreoffice-4-1] fdo#66007 - spurious & causing entity warning errors
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4691 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/translations refs/changes/91/4691/1 fdo#66007 - spurious & causing entity warning errors was already fixed for mn in ad5ed8525c1f41a9ee8dd9183ac7f6ae045625f7 Change-Id: I122816833b315cc62b856a461cb3f3671dd68042 --- M source/sa-IN/sysui/desktop/share.po 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/sa-IN/sysui/desktop/share.po b/source/sa-IN/sysui/desktop/share.po index 4a6a57a..4a3b8e4 100644 --- a/source/sa-IN/sysui/desktop/share.po +++ b/source/sa-IN/sysui/desktop/share.po @@ -258,7 +258,7 @@ "ms-word-document\n" "LngText.text" msgid "Microsoft Word Document" -msgstr "&Microsoft Word लेखपत्रम्" +msgstr "Microsoft Word लेखपत्रम्" #: documents.ulf #, fuzzy @@ -267,7 +267,7 @@ "ms-word-document2\n" "LngText.text" msgid "Microsoft Word Document" -msgstr "&Microsoft Word लेखपत्रम्" +msgstr "Microsoft Word लेखपत्रम्" #: documents.ulf #, fuzzy @@ -311,7 +311,7 @@ "ms-word-document-12\n" "LngText.text" msgid "Microsoft Word Document" -msgstr "&Microsoft Word लेखपत्रम्" +msgstr "Microsoft Word लेखपत्रम्" #: documents.ulf #, fuzzy @@ -364,7 +364,7 @@ "openxmlformats-officedocument-wordprocessingml-document\n" "LngText.text" msgid "Microsoft Word Document" -msgstr "&Microsoft Word लेखपत्रम्" +msgstr "Microsoft Word लेखपत्रम्" #: documents.ulf #, fuzzy -- To view, visit https://gerrit.libreoffice.org/4691 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I122816833b315cc62b856a461cb3f3671dd68042 Gerrit-PatchSet: 1 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] disable ccache on windows/msc when building liblangtag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3760 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/3760/1 disable ccache on windows/msc when building liblangtag liblangtag uses quoted strings in defines, like -DFOO="\"value\"" and ccache (at least the one available from the windows build dependencies wiki page) gets confused and doesn't parse the arguments correctly to the actual compiler, resulting in the error "cl : Command line error D8003 : missing source filename" Change-Id: I456b98b8956a25ff9acd3ab776c0c6f149a08ac7 --- M liblangtag/ExternalProject_langtag.mk 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index 757c6775..9e344b9 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -19,6 +19,9 @@ build \ )) +# disable ccache on windows, as it doesn't cope with the quoted defines +# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar). +# Results in "cl : Command line error D8003 : missing source filename" $(call gb_ExternalProject_get_state_target,langtag,build): $(call gb_ExternalProject_run,build,\ ./configure --disable-modules --disable-test --disable-introspection --disable-shared --enable-static --with-pic \ @@ -32,6 +35,6 @@ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ - && $(MAKE) \ + && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") $(MAKE) \ ) # vim: set noet sw=4 ts=4: -- To view, visit https://gerrit.libreoffice.org/3760 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I456b98b8956a25ff9acd3ab776c0c6f149a08ac7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] don't override TMPDIR with /tmp on cygwin, cleanup TMPDIR/TM...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3701
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3701/1
don't override TMPDIR with /tmp on cygwin, cleanup TMPDIR/TMP handling
on cygwin, configure forced TMPDIR to /tmp, regardless whether it is set
or not. And while it respects an existing value of TMP, TMP is only used
in a few places. Changes the ones that explicitly check for TMP to
prefer TMPDIR, and don't duplicate configure's check in other scripts.
Change-Id: Ia8ac3f8d92e5f971c5237b85f66f7c0a58932930
---
M config_host.mk.in
M configure.ac
M solenv/bin/modules/installer/parameter.pm
M solenv/bin/modules/installer/windows/msiglobal.pm
M solenv/bin/ooinstall
5 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/config_host.mk.in b/config_host.mk.in
index 82dfd50..7354e06 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -536,7 +536,6 @@
export TELEPATHY_LIBS=$(gb_SPACE)@TELEPATHY_LIBS@
export THES_SYSTEM_DIR=@THES_SYSTEM_DIR@
export TLS=@TLS@
-@x_Cygwin@ export TMP=@TMP_DIRECTORY@
export TMPDIR=@TEMP_DIRECTORY@
export TYPO_EXTENSION_PACK=@TYPO_EXTENSION_PACK@
export UNIXWRAPPERNAME=@UNIXWRAPPERNAME@
diff --git a/configure.ac b/configure.ac
index bc20dec..aaffe36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11858,22 +11858,15 @@
PERL="$formatted_path"
AC_SUBST(PERL)
-if test "$build_os" = "cygwin"; then
-TEMP_DIRECTORY=`cygpath -m "/tmp"`
-if test -n "$TMP"; then
-TMP_DIRECTORY="$TMP"
-else
-TMP_DIRECTORY="$TEMP_DIRECTORY"
-fi
+if test -n "$TMPDIR"; then
+TEMP_DIRECTORY="$TMPDIR"
else
-if test -n "$TMPDIR"; then
-TEMP_DIRECTORY="$TMPDIR"
-else
-TEMP_DIRECTORY="/tmp"
-fi
+TEMP_DIRECTORY="/tmp"
+fi
+if test "$build_os" = "cygwin"; then
+TEMP_DIRECTORY=`cygpath -m "$TEMP_DIRECTORY"`
fi
AC_SUBST(TEMP_DIRECTORY)
-AC_SUBST(TMP_DIRECTORY)
# setup the PATH for the environment
if test -n "$LO_PATH_FOR_BUILD"; then
diff --git a/solenv/bin/modules/installer/parameter.pm
b/solenv/bin/modules/installer/parameter.pm
index deda9d3..3ca159f 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -366,11 +366,9 @@
# setting and creating the temppath
-if (( $ENV{'TMP'} ) || ( $ENV{'TEMP'} ) || ( $ENV{'TMPDIR'} ))
+if ( $ENV{'TMPDIR'} )
{
-if ( $ENV{'TMP'} ) { $installer::globals::temppath = $ENV{'TMP'}; }
-elsif ( $ENV{'TEMP'} ) { $installer::globals::temppath =
$ENV{'TEMP'}; }
-elsif ( $ENV{'TMPDIR'} ) { $installer::globals::temppath =
$ENV{'TMPDIR'}; }
+$installer::globals::temppath = $ENV{'TMPDIR'};
$installer::globals::temppath =~
s/\Q$installer::globals::separator\E\s*$//;# removing ending slashes and
backslashes
$installer::globals::temppath .= $installer::globals::separator .
'ooopackaging';
installer::systemactions::create_directory_with_privileges($installer::globals::temppath,
"777");
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6087d1d..2029f71 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -684,7 +684,6 @@
$infoline = "ERROR: We cannot create transformations yet (we cannot
use cscript.exe when cross-compiling)\n";
push( @installer::globals::logfileinfo, $infoline);
}
-my $tmpdir = $ENV{TMPDIR};# Variable %TEMP% will be set to it for
WiLangId.vbs to work
my $wilangid = $ENV{WINDOWS_SDK_HOME} .
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
my $from = cwd();
@@ -837,7 +836,7 @@
}
}
-$systemcall = "TEMP=" . $tmpdir . " " . $cscript . " " . $wilangid . " " .
$basedbname . " Package " . $templatevalue;
+$systemcall = "TEMP=$ENV{'TMPDIR'} $cscript $wilangid $basedbname Package
$templatevalue";
$returnvalue = system($systemcall);
@@ -1225,11 +1224,6 @@
$infoline = "chdir: $to \n";
push( @installer::globals::logfileinfo, $infoline);
-# changing the tmp directory, because makecab.exe generates temporary cab
files
-my $origtemppath = "";
-if ( $ENV{'TMP'} ) { $origtemppath = $ENV{'TMP'}; }
-$ENV{'TMP'} = $installer::globals::temppath;# setting TMP to the new
unique directory!
-
my $maxmakecabcalls = 3;
my $allmakecabcalls = $#{$localpackjobref} + 1;
@@ -1292,9 +1286,6 @@
}
installer::logger::include_timestamp_into_logfile("Performance Info:
Execute packaging end");
-
-# setting back to the original tmp directory
-$ENV{'TMP'} = $origtemppath;
chdir($from);
$infoline = "chdir: $from \n";
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index b9d52e5..4902dda 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -33,12 +33,8 @@
if (defined($ENV{TMPDIR})) {
[PATCH] add fallback for Merge-Modules directory (when not found in ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3680 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3680/1 add fallback for Merge-Modules directory (when not found in registry) Add "C:\Program Files (x86)\Common Files\Merge Modules" as fallback, since on Windows Server 2012, the registry entry has not been created when installing Visual Studio Express Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a --- M configure.ac 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 312998b..9f95298 100644 --- a/configure.ac +++ b/configure.ac @@ -4808,6 +4808,10 @@ fi fi done +if test -z "$msmdir"; then +AC_MSG_NOTICE([no registry entry for Merge Module directory - trying "C:\Program Files (x86)\Common Files\Merge Modules"]) +msmdir="C:\Program Files (x86)\Common Files\Merge Modules" +fi msmdir=`cygpath -d "$msmdir"` msmdir=`cygpath -u "$msmdir"` if test -z "$msmdir"; then -- To view, visit https://gerrit.libreoffice.org/3680 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I16f58b8a1d453c8628c6eb66c2cea37ab3da913a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] script to create git tree with submodule setup from bundles
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3653
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dev-tools refs/changes/53/3653/1
script to create git tree with submodule setup from bundles
the existing script doesn't do anything useful for current development
line, it is meant for the old buildsetup where there was a clone
directory and tons of symlinks.
Unfortunately using git bundles with submodules is not just unpacking
the tarballs, the git config needs to be tweaked for that. Hence this
script that downloads the bundles and does all the work.
./lo-submodules-from-bundles.sh -t my-checkout-name help dict
to setup the checkout with the helpcontent2 and dictionaries submodules.
For more details, see ./lo-submodules-from-bundles.sh -h
nice benefit over using git is that the script setups the repositories
using relative paths, so you can move/copy your checkout without git
complaining
Change-Id: Ia483039fcbafe8fc042877d6b610ee88a6097c0a
---
A lo-submodules-from-bundles.sh
1 file changed, 179 insertions(+), 0 deletions(-)
diff --git a/lo-submodules-from-bundles.sh b/lo-submodules-from-bundles.sh
new file mode 100755
index 000..758bc14
--- /dev/null
+++ b/lo-submodules-from-bundles.sh
@@ -0,0 +1,179 @@
+#!/usr/bin/env 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/.
+
+# creates a working submodule based checkout using using bundles
+function usage {
+cat << EOF
+Usage:
+$0 -h|--help|-?
+$0 [-d downloaddir] [-t targetdir] [SUBMODULES]
+$0 -a [-d downloaddir] [-t targetdir] SUBMODULES
+
+-h,--help,-? show this help
+-d download directory, defaults to working directory
+ (»$download_dir«) - tries to use existing bundle files
+ in this directory before downloading them
+ (directory must exist)
+-t target directory, defaults to »$target_dir« (directory must
+not yet exist unless used with -a, then an existing directory
+ must be specified)
+-a add submodules to an existing checkout without
+ submodules (be careful with that one)
+SUBMODULES the submodules to include.
+noneonly download the core repository (default)
+all include dictionaries, helpcontent2 and translations
+h[elpcontent2] helpcontent2 (can be combined)
+d[ictionaries] dictionaries (can be combined)
+t[ranslations] translations (can be combined)
+
+As relative paths are used when using this script, the resulting directory can
be
+moved around at will without breaking git's references.
+
+Examples:
+»$0 h d«
+Setup the repository in »$target_dir« with the helpcontent2 and dictionaries
+submodules, downloads go to the current working directory
+
+»$0 -d /path/to/directory all«
+Setup the repository in »$target_dir« with all submodules (dictionaries,
+helpcontent2, translations), downloads are looked for/stored in
+/path/to/directory
+
+»$0 -t /desired/path«
+Setup the repository in »/desired/path« with no submodules.
+
+»$0 -a -t /existing/checkout translations«
+Add the translations submodule to the existing git checkout in
/existing/checkout
+Only use this one if you didn't initialize the specified submodules with git
already.
+EOF
+exit 0
+}
+
+bundleurl="http://dev-www.libreoffice.org/bundles";
+
+#defaults
+target_dir="libo-core"
+download_dir="."
+core=true
+dictionaries=false
+help=false
+translations=false
+add_to_existing=false
+superrepo="libo"
+
+function download {
+if ${!1}; then
+cd "$download_dir"
+wget -nc "$bundleurl/libreoffice-$1.tar.bz2"
+cd "$workdir"
+fi
+}
+function checkout {
+if ${!1}; then
+reponame=$1
+repodir=${2:-$1}
+echo "extracting $1"
+tar -xjf "$download_dir/libreoffice-$reponame.tar.bz2"
+echo "checking out files"
+cd "$repodir"
+git checkout -- .
+cd "$workdir"
+fi
+}
+function submodulesetup {
+if ${!1}; then
+reponame=$1
+directory=${2:-$1}
+echo "setting up submodule for $directory"
+cd "$workdir"
+rmdir $superrepo/$directory
+mv $reponame/.git $superrepo/.git/modules/$directory
+mv $reponame $superrepo/$directory
+echo "gitdir: ../.git/modules/$directory" > $superrepo/$directory/.git
+sed -e "/logallrefupdates/a\\\tworktree = ../../../$directory" -e
's#anongit\.freedesktop\.org/libreoffice/#gerrit.libreoffice.org/#' -i
$superrepo/.git/modules/$directory/config
+cat <> $superrepo/.git/config
+[submodule "$directory"]
+ url = git://gerrit.libreoffice.org/$reponame
+EOF
+cd "$workdir"
+fi
+}
+##
+# co
[PATCH] allow out-of-srctree builds on windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3593 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/3593/1 allow out-of-srctree builds on windows config_host (config_$(gb_Side) dir was included from SRCDIR, but when runing the build in another directory, it is in BUILDDIR WinResTarget.mk was forgotten when the other references were updated in ae4e327739112ba326a2945fc0d5550739f3083d and follow-up ones. Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a --- M solenv/gbuild/WinResTarget.mk 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk index d88375e..bb59d24 100644 --- a/solenv/gbuild/WinResTarget.mk +++ b/solenv/gbuild/WinResTarget.mk @@ -16,7 +16,7 @@ define gb_WinResTarget_WinResTarget_init $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLARINC)) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE := $(call gb_WinResTarget_get_target,$(1)) : RCFILE := @@ -24,7 +24,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS) -$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side) +$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE := -include $(call gb_WinResTarget_get_dep_target,$(1)) -- To view, visit https://gerrit.libreoffice.org/3593 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c5a8edb4a17dd33abdcdb04c3af830cad44e07a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fix indentation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3265 Approvals: Christian Lohmaier: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3265 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6102b08a03349c4bdc6316f578dc2c90a4569716 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Philipp Riemer Gerrit-Reviewer: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hello LibreOffice gerrit bot, Luboš Luňák, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3192 to look at the new patch set (#5). Change subject: remove -dylib_file mappings that are not needed anymore .. remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 19 insertions(+), 134 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/5 -- To view, visit https://gerrit.libreoffice.org/3192 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hello Luboš Luňák, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3192 to look at the new rebased patch set (#4). Change subject: remove -dylib_file mappings that are not needed anymore .. remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 16 insertions(+), 131 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/4 -- To view, visit https://gerrit.libreoffice.org/3192 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hello Luboš Luňák, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3192 to look at the new patch set (#3). Change subject: remove -dylib_file mappings that are not needed anymore .. remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 16 insertions(+), 131 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/3 -- To view, visit https://gerrit.libreoffice.org/3192 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Luboš Luňák ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove -dylib_file mappings that are not needed anymore
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3192 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3192/1 remove -dylib_file mappings that are not needed anymore XCode 2.5 (i.e. Mac OSX 10.4 & 10.5) couldn't find the libraries without explicit mapping, but as baseline is now 10.6, this wrapping is no longer necessary Change-Id: I225fc47b9ea4b1fb2b13ba575605cbdebc014fd8 --- M RepositoryExternal.mk M libxmlsec/ExternalProject_xmlsec.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/DevelopersGuide/ProfUNO/CppBinding/Makefile M odk/examples/DevelopersGuide/ProfUNO/Lifetime/Makefile M odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile M odk/examples/cpp/DocumentLoader/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile M odk/examples/cpp/counter/Makefile M odk/examples/cpp/remoteclient/Makefile M odk/settings/settings.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk D solenv/bin/macosx-dylib-link-list.pl M solenv/gbuild/platform/macosx.mk 19 files changed, 14 insertions(+), 126 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 295058f..1872c37 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -911,12 +911,6 @@ rdf \ ) -ifeq ($(OS),MACOSX) - -$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,librasqal-lo.$(RASQAL_MAJOR) libraptor2-lo.$(RAPTOR_MAJOR),-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) - -endif - endef else # ANDROID @@ -2243,7 +2237,6 @@ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ - -dylib_file @loader_path/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO -framework LibreOfficePython \ ) else diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk index 70b5083..c82c5e2 100644 --- a/libxmlsec/ExternalProject_xmlsec.mk +++ b/libxmlsec/ExternalProject_xmlsec.mk @@ -59,7 +59,6 @@ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(SYSBASE),CFLAGS="-I$(SYSBASE)/usr/include" \ LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),,-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib),\ - $(if $(filter-out MACOSX,$(OS)),,LDFLAGS="-Wl$(COMMA)-dylib_file$(COMMA)@executable_path/libnssutil3.dylib:$(OUTDIR)/lib/libnssutil3.dylib")) \ && $(MAKE) \ ) diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a65f6f6..ffd2765 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -82,7 +82,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 34b6834..a681e1b 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -115,7 +115,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ - $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) $(CPPUHELPERDYLIB) $(CPPUDYLIB) $(SALDYLIB) + $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" $(INSTALL_NAME_URELIBS) $@ endif @@ -183,7 +183,7 @@ $< $(CPPUHELPERLIB) $(CPPULIB) $(SALHEL
[PATCH] get rid of two-argument compareToAscii
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2907
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/2907/1
get rid of two-argument compareToAscii
As I don't see a point in comparing a mimetype with only a
substring, it probably could be a simple compareToAscii, but
play it save and use startsWith.
Change-Id: Ic33c8089283def615999ddf80cd12f6fe219ed17
---
M vcl/aqua/source/dtrans/DataFlavorMapping.cxx
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index a1a69ff..6cfc2c9 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -526,7 +526,7 @@
for (size_t i = 0; i < SIZE_FLAVOR_MAP; i++)
{
- if (oOOFlavor.MimeType.compareToAscii(flavorMap[i].OOoFlavor,
strlen(flavorMap[i].OOoFlavor)) == 0)
+ if (oOOFlavor.MimeType.startsWith(flavorMap[i].OOoFlavor))
{
sysFlavor = flavorMap[i].SystemFlavor;
}
--
To view, visit https://gerrit.libreoffice.org/2907
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic33c8089283def615999ddf80cd12f6fe219ed17
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] lowering baseline for python used during building
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2862 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2862/1 lowering baseline for python used during building builds fine when using system python for building on Mac OSX 10.5 (comes with python 2.5 only). Note that python 2.5 is not enough for pyuno/python scripting at runtime, so for that internal python is built nevertheless. Change-Id: I51a4450cad1e09aecd12f192db1fb797313cf322 --- M configure.ac 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1492d72..9627162 100644 --- a/configure.ac +++ b/configure.ac @@ -7260,13 +7260,14 @@ AC_SUBST([MINGW_ZLIB_DLL]) # = -# Checking for a Python interpreter with version >= 2.6 needed to build LO. +# Checking for a Python interpreter with version >= 2.5 needed to build LO. +# runtime requires Python 3 compatible version (>= 2.6) # Optionally user can pass an option to configure, i. e. # ./configure PYTHON=/usr/bin/python # = if test "$build_os" != "cygwin"; then # This allows a lack of system python with no error, we use internal one in that case. -AM_PATH_PYTHON([2.6],, [:]) +AM_PATH_PYTHON([2.5],, [:]) # Clean PYTHON_VERSION checked below if cross-compiling PYTHON_VERSION="" if test "$PYTHON" != ":"; then -- To view, visit https://gerrit.libreoffice.org/2862 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51a4450cad1e09aecd12f192db1fb797313cf322 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] allow to use internal python for build-stuff on Mac
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2849 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/2849/1 allow to use internal python for build-stuff on Mac Mac builds python as framework, so bundling is quite different from other systems. Use the set_external variant to avoid adding a non-resolvable prerequisite to the targets that are built using python. Change-Id: I1c6f2b61a3ff99f8ccbc4e0b5d88145940a4a8ef --- M RepositoryExternal.mk 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a7042b1..2d1d75d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2796,14 +2796,23 @@ ifeq (,$(PYTHON_FOR_BUILD)) define gb_ExternalExecutable__register_python +ifeq ($(OS),MACOSX) + +# use set_external, to avoid having the command added as prerequisite for the +# targets that make use of it. (Otherwise make will choke as it doesn't have a +# matching rule to build that specific file) +$(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)) +# the Zip ensures that internal python has been built (cannot use the Package +# target, as that is not used on Mac) +$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework)) + +else + $(call gb_ExternalExecutable_set_internal,python) $(call gb_ExternalExecutable_set_precommand,python,$(gb_PYTHON_PRECOMMAND)) -$(call gb_ExternalExecutable_add_dependencies,python,\ - $(if $(filter MACOSX,$(OS)) \ - ,$(call gb_Zip_get_outdir_target_for_build,LibreOfficePython.framework) \ - ,$(call gb_Package_get_target_for_build,python3) \ - ) \ -) +$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3)) + +endif endef -- To view, visit https://gerrit.libreoffice.org/2849 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c6f2b61a3ff99f8ccbc4e0b5d88145940a4a8ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix makeAny calls
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2805
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/2805/1
fix makeAny calls
checks failed on Mac/PPC - setValue expects sal_Bool, not plain bool
for bool there's assignment operator. Similar for unsigned short -
there's dedicated operator to assign sal_uInt16 - no need to cast to
signed sal_Int23 that then fails to convert properly.
Change-Id: I6c67a3741cf2d7910fc543c9c71db1c6e816bea6
---
M connectivity/source/commontools/FValue.cxx
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index fef5087..e41a1a7 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -916,7 +916,7 @@
break;
case DataType::BIT:
case DataType::BOOLEAN:
-rValue.setValue( &m_aValue.m_bBool, ::getCppuBooleanType() );
+rValue <<= m_aValue.m_bBool;
break;
case DataType::TINYINT:
if ( m_bSigned )
@@ -2414,8 +2414,7 @@
{
sal_uInt16 nValue(0);
_rValue >>= nValue;
-(*this) = static_cast(nValue);
-setSigned(sal_False);
+(*this) = nValue;
break;
}
case TypeClass_LONG:
--
To view, visit https://gerrit.libreoffice.org/2805
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c67a3741cf2d7910fc543c9c71db1c6e816bea6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christian Lohmaier
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] allow openssl in the check-for-broken-make check als sha1sum...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2804 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2804/1 allow openssl in the check-for-broken-make check als sha1sum variant Mac OS X 10.5 doesn't come with a dedicated sha1sum, but has make 3.81. Allow openssl as alternative for the makefile, after all it isn't sha1 that matters. (also XCode's make is not affected by that specific bug) Change-Id: Id212fca588980f7e151120cdfe281f7b5d8ac5a4 --- M configure.ac 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 00a47f7..95f548a 100644 --- a/configure.ac +++ b/configure.ac @@ -4435,9 +4435,11 @@ dnl === dnl Search all the common names for sha1sum dnl === -AC_PATH_PROGS(SHA1SUM, sha1sum sha1 shasum) +AC_CHECK_PROGS(SHA1SUM, sha1sum sha1 shasum openssl) if test -z "$SHA1SUM"; then AC_MSG_ERROR([install the approproate SHA-1 checksumming program for this OS]) +elif test "$SHA1SUM" = "openssl"; then +SHA1SUM="openssl sha1" fi AC_MSG_CHECKING([for GNU make bug 20033]) TESTGMAKEBUG20033=`mktemp -d tmp.XX` -- To view, visit https://gerrit.libreoffice.org/2804 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id212fca588980f7e151120cdfe281f7b5d8ac5a4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WaE: control might reach end of non-void function ... being ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2803 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/2803/1 WaE: control might reach end of non-void function ... being inlined The warning is bogus, but the change is minimal Change-Id: I2bc6ec57d271e14e5abe8f152338626771458fb5 --- M sw/source/filter/ww8/writerhelper.hxx 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx index 3d45b43..4768a3e 100644 --- a/sw/source/filter/ww8/writerhelper.hxx +++ b/sw/source/filter/ww8/writerhelper.hxx @@ -182,8 +182,8 @@ return (maGrf == rOther.maGrf); else if ((!mbForBullet) && (!rOther.mbForBullet)) return (mpFlyFrm == rOther.mpFlyFrm); -else -return false; + +return false; } /** The Size of the contained element -- To view, visit https://gerrit.libreoffice.org/2803 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bc6ec57d271e14e5abe8f152338626771458fb5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] use $PIPESTATUS instead of pipefail option
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1190 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/1190/1 use $PIPESTATUS instead of pipefail option as pipefail is not supported in bash 2.x (used on Mac/PPC) Change-Id: Iaeaed7d759be700719fb941b13942e4933c5ee71 --- M Makefile.fetch 1 file changed, 2 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1190 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaeaed7d759be700719fb941b13942e4933c5ee71 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] honor USE_INTERNAL_RIGHTS from scp2
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1167 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1167/1 honor USE_INTERNAL_RIGHTS from scp2 Archive::Zip doensn't restore file permissions when unpacking, so stat'ing the extracted copy is useless. Change-Id: Ifdc586fbe76bc55af35f10c6ad9468ae69947f13 --- M solenv/bin/modules/installer/archivefiles.pm 1 file changed, 1 insertion(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1167 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdc586fbe76bc55af35f10c6ad9468ae69947f13 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gb_LinkTarget_get_preparation_target is not defined (2nd try...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1067 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/1067/1 gb_LinkTarget_get_preparation_target is not defined (2nd try) gb_ExternalProject_use_unpacked has completely different different side-effects, so use the manual way/the actually expected part of the rule Change-Id: I35edb19c3e768608bbb70314cac7ca908a426c7c --- M RepositoryExternal.mk 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1067 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35edb19c3e768608bbb70314cac7ca908a426c7c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] gb_LinkTarget_get_preparation_target is not defined
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1066 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1066/1 gb_LinkTarget_get_preparation_target is not defined and in turn build breaks because boost headers are not ready. use the suggestion by mst and use gb_LinkTarget_use_unpacked instead. Also use gb_ExternalProject_use_unpacked for consistency Change-Id: Ie52ba7cd99ae6622b11f32eca8895ca004b8ae95 --- M RepositoryExternal.mk 1 file changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1066 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie52ba7cd99ae6622b11f32eca8895ca004b8ae95 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] library definitions for lcms2 and curl are in Extarnal*Packa...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1048 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/1048/1 library definitions for lcms2 and curl are in Extarnal*Package*_foo.mk using external_project breaks a uniprocessor build since the libraries are only partially copied to solver. Change-Id: I0a83486e466e1c062a1dad89d9ea3d9e78d8c9b1 --- M RepositoryExternal.mk 1 file changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1048 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0a83486e466e1c062a1dad89d9ea3d9e78d8c9b1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] check for builtins pollutes CFLAGS and in turn breaks pthrea...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/999 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/999/1 check for builtins pollutes CFLAGS and in turn breaks pthread check since the -march=i486 is not supported on PPC, all further compile checks done in liblangtag's configure break. So moving the corresponding patch out of the windows patch in a generic one and also apply that for Mac. Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3 --- A liblangtag/liblangtag-0.4.0-configure-atomic-cflag-pollution.patch M liblangtag/liblangtag-0.4.0-windows.patch M liblangtag/makefile.mk 3 files changed, 64 insertions(+), 62 deletions(-) -- To view, visit https://gerrit.libreoffice.org/999 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I65716bc9d7ff19976e5e82ae869c7594978e93e3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
EXTMAXPROCESS is not defined in gbuild, use GMAKE_MODULE_PAR...
Christian Lohmaier has abandoned this change. Change subject: EXTMAXPROCESS is not defined in gbuild, use GMAKE_MODULE_PARALLELISM instead .. Patch Set 1: Abandoned Abandon - covered already by the to-be-reviewed/applied https://gerrit.libreoffice.org/#/c/930/ "fix parallelism variables and let's have only one from now on" -- To view, visit https://gerrit.libreoffice.org/934 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6c3b6538cbbd260f66ef952acfe8f611825854eb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] EXTMAXPROCESS is not defined in gbuild, use GMAKE_MODULE_PAR...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/934 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/934/1 EXTMAXPROCESS is not defined in gbuild, use GMAKE_MODULE_PARALLELISM instead causing make to be run with unlimited jobs, breaking the build with with "libtool: fork: Resource temporarily unavailable" or similar errors Change-Id: I6c3b6538cbbd260f66ef952acfe8f611825854eb --- M libcdr/ExternalProject_libcdr.mk M librsvg/ExternalProject_librsvg.mk M libwpd/ExternalProject_libwpd.mk M postgresql/ExternalProject_postgresql.mk 4 files changed, 4 insertions(+), 4 deletions(-) -- To view, visit https://gerrit.libreoffice.org/934 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c3b6538cbbd260f66ef952acfe8f611825854eb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove GIT_REPO_NAMES (duplicated by GIT_NEEDED_SUBMODULES)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/912 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/12/912/1 remove GIT_REPO_NAMES (duplicated by GIT_NEEDED_SUBMODULES) use plain copy instead of git-new-workdir when using --with-linked-git configure switch (point it to your master copy of the core-repo) also remove obsolete bin/create_bootstrap_links, bin/mkworkdir and bin/repo-list[.in] Change-Id: I37028badf2c46a24a3d628e80476efe4dd365d06 --- M Makefile M Makefile.top D bin/create_bootstrap_links D bin/mkworkdir D bin/repo-list.in M config_host.mk.in M configure.ac M download 8 files changed, 12 insertions(+), 146 deletions(-) -- To view, visit https://gerrit.libreoffice.org/912 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I37028badf2c46a24a3d628e80476efe4dd365d06 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] WaE: 'xChartType$D57056$_pInterface' may be used uninitializ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/911 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/911/1 WaE: 'xChartType$D57056$_pInterface' may be used uninitialized… … in this function" declaring those functions static breaks the build on MacPPC / gcc 4.0.1 Change-Id: I3a389530d51ae0ddd38418159ca4234016bf93ba --- M oox/source/export/SchXMLSeriesHelper.cxx M xmloff/source/chart/SchXMLSeriesHelper.cxx 2 files changed, 2 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/911 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a389530d51ae0ddd38418159ca4234016bf93ba Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[master]: simplify pattern-target by using a simple recursion…
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/858 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/858/1 simplify pattern-target by using a simple recursion… …instead of using eval to process the same rule multiple times Saves quoting, makes it more readable. (% always matches whole sub-paths, not only on Mac, see http://www.gnu.org/software/make/manual/html_node/Pattern-Match.html) Change-Id: I80e481d4a7e1cd62ad9916257a75c77c87d3bbdd --- M officecfg/CustomTarget_registry.mk 1 file changed, 10 insertions(+), 23 deletions(-) -- To view, visit https://gerrit.libreoffice.org/858 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I80e481d4a7e1cd62ad9916257a75c77c87d3bbdd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] old Mac linker is picky about argument order - static libs l...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/759 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/759/1 old Mac linker is picky about argument order - static libs last and also after stuff that references external symbols, as it only looks for symbols it has encountered so far in the object files. Stuff that comes after the specified library then results in symbols not found despite the lib being on the commandline earlier. (another solution than reordering the arguments would be to use -Wl,-all_load) Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0 --- M solenv/gbuild/platform/macosx.mk 1 file changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4add0d3f81b13874c1620406fa40fcbd25b7cf0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] don't pretend to be 1.4 compatible, when the baseline is 1.5
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/758 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/758/1 don't pretend to be 1.4 compatible, when the baseline is 1.5 also pass java-target-version from environment as the source version doesn't change by miracle in external modules, keep that in the build.xml (and only there) Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c --- M saxon/ExternalProject_saxon.mk M saxon/build.xml 2 files changed, 8 insertions(+), 20 deletions(-) -- To view, visit https://gerrit.libreoffice.org/758 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic09de3c7b15318677afe6d4afbe7c9f7e7f3c14c Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/757 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/757/1 $SOLARBINDIR is not defined in gbuild, replace with $OUTDIR/bin Otherwise build won't find jsr173_1.0_api.jar, breaking the build when using JDK 1.5 (i.e. Mac PPC and others) Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27 --- M saxon/ExternalProject_saxon.mk 1 file changed, 1 insertion(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/757 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8de0b42d4b14b4da5fe9216515fae94bbfc77b27 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] mark configure's warning with some color
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/643 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/643/1 mark configure's warning with some color Change-Id: I7e225fc5ce353316cb689dc3bca8f606273e8796 --- M configure.in 1 file changed, 7 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/643 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e225fc5ce353316cb689dc3bca8f606273e8796 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] be consistent with configure's default and switch wrt gtk3
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/642 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/642/1 be consistent with configure's default and switch wrt gtk3 also record the system-cairo stuff as a proper warning, so that people have a chance to see it. Change-Id: Ic59bed91edbe92a642851ccef570c9dca94672f0 --- M configure.in 1 file changed, 3 insertions(+), 2 deletions(-) -- To view, visit https://gerrit.libreoffice.org/642 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic59bed91edbe92a642851ccef570c9dca94672f0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] don't add invalid UTF-8 to _NET_WM_NAME and _NET_WM_ICON_NAM...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/633 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/633/1 don't add invalid UTF-8 to _NET_WM_NAME and _NET_WM_ICON_NAME time to get rid of workarounds for broken window managers that were introduced more than 10 years ago. Change-Id: I43b4c7aeab1b86b3d4a290a1d1d64c6fcb9a57ef --- M vcl/unx/generic/app/wmadaptor.cxx 1 file changed, 2 insertions(+), 6 deletions(-) -- To view, visit https://gerrit.libreoffice.org/633 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43b4c7aeab1b86b3d4a290a1d1d64c6fcb9a57ef Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] checksize.pl chokes on empty files created by __debug_instal...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/630 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/630/1 checksize.pl chokes on empty files created by __debug_install_post… …that is /usr/lib/rpm/mageia/find-debuginfo.sh on Mageia for example. As the desktop-integration packages don't have any binaries whose debuginfo could be extracted and put into a -debug package, there is no impact on the packages themselves. Change-Id: I99756f6a1a3de707a94f7559b9f1b5169d2e7ee1 --- M sysui/desktop/tg_rpm.mk 1 file changed, 1 insertion(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/630 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99756f6a1a3de707a94f7559b9f1b5169d2e7ee1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] allow to build with XCode 2.x
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/605 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/605/1 allow to build with XCode 2.x * XCode 2.x only comes with automake 1.6.3, and that doesn't know per-object CPPFLAGS, thus use per-object CFLAGS instead * also it is picky about redefining the SOURCES in a conditional statement, so use a variable in a condition instead and add that * Its linker also needs help locating libs that are using the relocation-placeholders, thus add -dylib_file linkerflag * aclocal insists on a space between -I and argument Change-Id: I35714a1a76a7b7823ee6b64a3296aeae96e7296a --- M libxmlsec/makefile.mk A libxmlsec/xmlsec1-1.2.14_old_automake.patch 2 files changed, 132 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/605 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I35714a1a76a7b7823ee6b64a3296aeae96e7296a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] cosmetics
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/603 Approvals: Christian Lohmaier: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/603 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b4202628f9df4ed087eee69058ced13bc2c1b1b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier Gerrit-Reviewer: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] cosmetics
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/603 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/603/1 cosmetics Change-Id: I5b4202628f9df4ed087eee69058ced13bc2c1b1b --- M libxmlsec/makefile.mk 1 file changed, 24 insertions(+), 24 deletions(-) -- To view, visit https://gerrit.libreoffice.org/603 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b4202628f9df4ed087eee69058ced13bc2c1b1b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christian Lohmaier ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
