[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac README.Solaris solenv/bin

[David Tardon]

 README.Solaris   |2 -
 configure.ac |6 ---
 solenv/bin/packimages.pl |   85 ++-
 3 files changed, 49 insertions(+), 44 deletions(-)

New commits:
commit 0f0cf78408fbb79c989de9780aa3590b3336aac6
Author: David Tardon 
Date:   Fri Jun 3 17:09:14 2016 +0200

remove use of Archive::Zip

For -5-0, also use old tempdir function.

Cherry-picked from 4e3dc8c141c2efd037c1f214b5edff071812b6a8

Change-Id: Ie0abe09f8696ce3f00be87c819280cf061a818f4
Reviewed-on: https://gerrit.libreoffice.org/31637
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 
Reviewed-by: Michael Meeks 
Reviewed-by: Katarina Behrens 

diff --git a/README.Solaris b/README.Solaris
index 3b005a0..40f7f52 100644
--- a/README.Solaris
+++ b/README.Solaris
@@ -20,8 +20,6 @@ sudo -s
 
 pkg install git make gcc-45 autoconf autogen automake-110 gnu-m4
 
-perl -MCPAN -e 'install Archive::Zip::Archive'
-
 pkg install pkg:/system/header@0.5.11-0.175.0.0.0.2.1
 pkg install pkg:/developer/gperf@3.0.3-0.175.0.0.0.2.537
 pkg install pkg:/developer/parser/bison@2.3-0.175.0.0.0.2.537
diff --git a/configure.ac b/configure.ac
index 1c175c0..d1d82ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5009,15 +5009,11 @@ dnl Testing for required Perl modules
 dnl ===
 
 AC_MSG_CHECKING([for required Perl modules])
-if `$PERL -e 'use Archive::Zip; use Cwd; use Digest::MD5'>/dev/null 2>&1`; then
+if `$PERL -e 'use Cwd; use Digest::MD5'>/dev/null 2>&1`; then
 AC_MSG_RESULT([all modules found])
 else
 AC_MSG_RESULT([failed to find some modules])
 # Find out which modules are missing.
-missing_perl_modules=
-if ! `$PERL -e 'use Archive::Zip;'>/dev/null 2>&1`; then
-missing_perl_modules=Archive::Zip
-fi
 if ! `$PERL -e 'use Cwd;'>/dev/null 2>&1`; then
 missing_perl_modules="$missing_perl_modules Cwd"
 fi
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 0e98566..434dffe 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -27,9 +27,10 @@ use strict;
 use Getopt::Long;
 use File::Find;
 use File::Basename;
+use File::Copy qw(copy);
+use File::Path qw(mkpath);
 require File::Temp;
-use File::Temp ();
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
+use File::Temp qw(tempdir);
 
  globals 
 
@@ -91,7 +92,8 @@ remove_links_from_zip_list($zip_hash_ref, \%links);
 
 $do_rebuild = is_file_newer($zip_hash_ref) if $do_rebuild == 0;
 if ( $do_rebuild == 1 ) {
-create_zip_archive($zip_hash_ref, \%links);
+my $tmpdir = copy_images($zip_hash_ref);
+create_zip_archive($zip_hash_ref, \%links, $tmpdir);
 replace_file($tmp_out_file, $out_file);
 print_message("packing  $out_file finished.") if $verbose;
 } else {
@@ -354,40 +356,50 @@ sub optimize_zip_layout($)
 return @sorted;
 }
 
-sub create_zip_archive
+sub copy_images($)
 {
-my $zip_hash_ref = shift;
-my $links_hash_ref = shift;
+my ($zip_hash_ref) = @_;
+my $dir = tempdir( CLEANUP => 1);
+foreach (keys %$zip_hash_ref) {
+my $path = $zip_hash_ref->{$_} . "/$_";
+my $outpath = $dir . "/$_";
+print_message("copying '$path' to '$outpath' ...") if $extra_verbose;
+if ( -e $path) {
+my $dirname = dirname($outpath);
+if (!-d $dirname) {
+mkpath($dirname);
+}
+copy($path, $outpath)
+or print_error("can't add file '$path' to image dir: $!", 5);
+}
+}
+return $dir;
+}
+
+sub create_zip_archive($$$)
+{
+my ($zip_hash_ref, $links_hash_ref, $image_dir_ref) = @_;
 
 print_message("creating image archive ...") if $verbose;
-my $zip = Archive::Zip->new();
 
-my $linktmp;
+chdir $image_dir_ref;
+
 if (keys %{$links_hash_ref}) {
-$linktmp = write_links($links_hash_ref);
-my $member = $zip->addFile($linktmp->filename, "links.txt", 
COMPRESSION_DEFLATED);
-if (!$member) {
-print_error("failed to add links file: $!", 5);
-}
+write_links($links_hash_ref, $image_dir_ref);
+system "zip $tmp_out_file links.txt";
+# print_error("failed to add links file: $!", 5);
 }
 
-# FIXME: test - $member = addfile ... $member->desiredCompressionMethod( 
COMPRESSION_STORED );
-# any measurable performance win/loss ?
-foreach ( optimize_zip_layout($zip_hash_ref) ) {
-my $path = $zip_hash_ref->{$_} . "/$_";
-print_message("zipping '$path' ...") if $extra_verbose;
-if ( -e $path) {
-my $member = $zip->addFile($path, $_, COMPRESSION_STORED);
-if ( !$member ) {
-print_error("can't add file '$path' to image zip archive: $!", 
5);
-}

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e0d800c6e09e261d469e44fe4199a54c3ebcea0d
Author: Christian Lohmaier 
Date:   Wed Apr 13 13:58:21 2016 +0200

bump product version to 5.0.7.0.0+

Change-Id: I186ef5b438f5ff28e0f860104d388b59fa7f2ec2

diff --git a/configure.ac b/configure.ac
index bf3d55b..1c175c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.7.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2f6e3fbf54795af75cb3733d3e82dda48fc760f3
Author: Christian Lohmaier 
Date:   Wed Jan 20 01:26:40 2016 +0100

bump product version to 5.0.6.0.0+

Change-Id: I04b67426055fc067403c8f5ee7fb6b5598faf43d

diff --git a/configure.ac b/configure.ac
index 6ce1e51..bf3d55b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.6.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48b341bc42f9ecbbc3bf5dab4018c9b179cab69f
Author: Christian Lohmaier 
Date:   Fri Nov 27 23:55:21 2015 +0100

bump product version to 5.0.5.0.0+

Change-Id: Id33d9aacdf647b4b1eb414970089b1e157f1a86a

diff --git a/configure.ac b/configure.ac
index 23e921b..6ce1e51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.5.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23c217590e903f243e206e2a4372448c9eeaff0c
Author: Christian Lohmaier 
Date:   Wed Oct 7 22:30:37 2015 +0200

bump product version to 5.0.4.0.0+

Change-Id: Ia1d361c5528507d5683b2bafed677f71752b78ea

diff --git a/configure.ac b/configure.ac
index afd48d64..23e921b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.4.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Tomáš Chvátal]

 configure.ac |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit eea951d8de4ababb6e81d28221501e7bc3060b57
Author: Tomáš Chvátal 
Date:   Tue Sep 15 11:43:45 2015 +0200

KDE4Filedialog check should include cstdlib

Otherwise this would needlessly fail on some compilers.

Change-Id: I4e46e9e452de0703b6556cd55e4606b02be5c41c
Reviewed-on: https://gerrit.libreoffice.org/18584
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index c6f7b8d..afd48d64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11318,6 +11318,7 @@ int main(int argc, char **argv) {
 
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #define SAL_OVERRIDE
+#include 
 #include "tst_exclude_socket_notifiers.moc"
 
 int main(int argc, char *argv[])
@@ -11351,6 +11352,7 @@ int main(int argc, char *argv[])
 
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #define SAL_OVERRIDE
+#include 
 #include "tst_exclude_posted_events.moc"
 
 int main(int argc, char *argv[])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Robinson Tryon]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5df1bf2555afae2ce933d305850f3248b5ae9a8e
Author: Robinson Tryon 
Date:   Thu Sep 3 12:42:52 2015 -0500

bump product version to 5.0.3.0.0+

Change-Id: Icd1b3aa4931853c2b3fdc20101fa60d7fedd4b27

diff --git a/configure.ac b/configure.ac
index 13cfa08..c6f7b8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Rene Engelhard]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8d5fda8e7bb043c762b3f9c7169b90c3ee8b6832
Author: Rene Engelhard r...@debian.org
Date:   Fri Aug 28 13:55:53 2015 +0200

bump gtk check to gtk+-3.0 = 3.8

Needed since 2ce903c7b2d67a46c2fe2755cfaa66d98f2eddf2

Conflicts:
configure.ac

Change-Id: I589e782baae0bd4d5906b97c371cad587aaf5c94

diff --git a/configure.ac b/configure.ac
index 0d9a8c3..13cfa08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9904,7 +9904,7 @@ if test x$enable_gtk3 = xyes; then
 AC_MSG_ERROR([System cairo required for gtk3 support, do not combine 
--enable-gtk3 with --without-system-cairo])
 fi
 : ${with_system_cairo:=yes}
-PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.2 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
+PKG_CHECK_MODULES(GTK3, gtk+-3.0 = 3.8 gtk+-unix-print-3.0 
gmodule-no-export-2.0 cairo, ENABLE_GTK3=TRUE, ENABLE_GTK3=)
 if test x$ENABLE_GTK3 = xTRUE; then
 R=gtk3
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Tor Lillqvist]

 configure.ac |   17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit d61d755debafc8157a317b308c7a2d47b7fd5b4d
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Jun 9 00:33:38 2015 +0300

Accept also OS X 10.11

Change-Id: Ieedf4810f1e726bf11f0d0b1a203e560a0b16550

diff --git a/configure.ac b/configure.ac
index 989f386..0d9a8c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2764,7 +2764,7 @@ if test $_os = Darwin; then
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
 
-for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10; do
+for _macosx_sdk in $with_macosx_sdk 10.8 10.9 10.10 10.11; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2 
/dev/null`
 if test -d $MACOSX_SDK_PATH; then
 with_macosx_sdk=${_macosx_sdk}
@@ -2792,8 +2792,11 @@ if test $_os = Darwin; then
 10.10)
 MACOSX_SDK_VERSION=101000
 ;;
+10.11)
+MACOSX_SDK_VERSION=101100
+;;
 *)
-AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--10])
+AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.8--11])
 ;;
 esac
 
@@ -2822,8 +2825,11 @@ if test $_os = Darwin; then
 10.10)
 MAC_OS_X_VERSION_MIN_REQUIRED=101000
 ;;
+10.11)
+MAC_OS_X_VERSION_MIN_REQUIRED=101100
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--10])
+AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.8--11])
 ;;
 esac
 
@@ -2856,8 +2862,11 @@ if test $_os = Darwin; then
 10.10)
 MAC_OS_X_VERSION_MAX_ALLOWED=101000
 ;;
+10.11)
+MAC_OS_X_VERSION_MAX_ALLOWED=101100
+;;
 *)
-AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--10])
+AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.8--11])
 ;;
 esac
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c3661fe3583146e703b54a4325848b303d5509c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Fri Aug 7 19:21:09 2015 +0200

bump product version to 5.0.2.0.0+

Change-Id: Ibdc0596181711e748e4b1f59ffc27629c5423e66

diff --git a/configure.ac b/configure.ac
index 601a3cf..989f386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.2.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Michael Stahl]

 configure.ac |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d4d394731f23dfdde2d37f7ed6effae67df2e2bd
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jul 27 14:15:15 2015 +0200

configure: make --enable-selective-debuginfo less errorprone

Change-Id: I6b7379323a86242b42a8a5137807c535bf1d7c46
(cherry picked from commit 6be72cc21cd59e6cb3c4dcda9416d1ab362f0a14)
Reviewed-on: https://gerrit.libreoffice.org/17374
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/configure.ac b/configure.ac
index cf63d27..601a3cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3847,6 +3847,9 @@ ENABLE_DEBUGINFO_FOR=
 if test -n $ENABLE_DEBUG; then
 AC_MSG_CHECKING([whether to use selective debuginfo])
 if test -n $enable_selective_debuginfo -a $enable_selective_debuginfo 
!= no; then
+if test $enable_selective_debuginfo = yes; then
+AC_MSG_ERROR([--enable-selective-debuginfo requires a parameter])
+fi
 ENABLE_DEBUGINFO_FOR=$enable_selective_debuginfo
 AC_MSG_RESULT([for $enable_selective_debuginfo])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Andrzej Hunt]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c0ace56528cfd469d55c17a6e9b32c33e715ec0
Author: Andrzej Hunt andr...@ahunt.org
Date:   Thu Jun 4 14:02:05 2015 +0100

Fix using /opt/lo/bin/nasm on windows/cygwin

Change-Id: Ib3755598bfccffc2efd67816ae5fa5dc8903553e
Reviewed-on: https://gerrit.libreoffice.org/16083
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com
(cherry picked from commit a3afa22ba4069212213009fc7304adc3c339b68b)
Reviewed-on: https://gerrit.libreoffice.org/17124
Reviewed-by: David Ostrovsky da...@ostrovsky.org
Tested-by: Katarina Behrens katarina.behr...@cib.de

diff --git a/configure.ac b/configure.ac
index 90b13c8..cf63d27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7459,7 +7459,7 @@ else
 if test -z $NASM -a $build_os = cygwin; then
 if test -n $LODE_HOME -a -x $LODE_HOME/opt/bin/nasm; then
 NASM=$LODE_HOME/opt/bin/nasm
-elif -x /opt/lo/bin/nasm; then
+elif test -x /opt/lo/bin/nasm; then
 NASM=/opt/lo/bin/nasm
 fi
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Stephan Bergmann]

 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c2b8500e5418e267c612862e944247bed7ea3b08
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Jun 10 17:53:45 2015 +0200

syntax errors, still

(cherry picked from commit bee2423eff85ebc5f0255596bcf7bec2596307a9)

syntax errors, still

(i.e., parentheses do need to be quoted in BERs, but do not forget to escape
brakets in configure.ac m4)

(cherry picked from commit d0b7be0fa509394dca054246b00b62ea7df77934)

Change-Id: I0f78d99d80252874006b51fff4e8089df8d08f1d
Reviewed-on: https://gerrit.libreoffice.org/16828
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/configure.ac b/configure.ac
index 25fc69d..275974f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11290,8 +11290,8 @@ int main(int argc, char **argv) {
 #   ^~~
 #   vptr for 'QObjectPrivate'
 save_CXX=$CXX
-CXX=$(printf %s $CXX
-| sed -e s/-fno-sanitize-recover\(=[0-9A-Za-z,_-]*\)*//)
+CXX=$(printf %s $CXX \
+| sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
 save_CXXFLAGS=$CXXFLAGS
 CXXFLAGS=$CXXFLAGS $KDE4_CFLAGS
 save_LIBS=$LIBS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36b9a717ad96913d4c89135c82794cd611707f8c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Sat Jun 27 03:27:35 2015 +0200

bump product version to 5.0.0.2.0+

Change-Id: Ifb5756d693e73072b735dba257a762728dfffca8

diff --git a/configure.ac b/configure.ac
index 20b2d67..25fc69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4d9824ad5fdab3a61552c4fa305617b123703d27
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Sat Jun 20 11:51:28 2015 +0200

bump product version to 5.0.0.1.0+

Change-Id: Ib5b546c9e6256a0ac547d17f7a6a27bcd3e6df80

diff --git a/configure.ac b/configure.ac
index eccb2e5..20b2d67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.0.0.beta3+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53c8039154623d39d9bdeab73694ee9203f4f4ac
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Tue Jun 9 21:14:05 2015 +0200

bump product version to 5.0.0.0.beta3+

Change-Id: If2b25caf779830fdb34a7de6a33784a246d12531

diff --git a/configure.ac b/configure.ac
index 789e791..eccb2e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.0.beta3+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Christian Lohmaier]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5207e63e83c32b5b81d580ad0e8dd554aa3a9ff9
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Mon Jun 8 17:01:09 2015 +0200

bump product version to 5.0.0.0.beta2+

Change-Id: Ifad26c1d89031b0e746ac3b9a4c0738660be9e97

diff --git a/configure.ac b/configure.ac
index b1aa254..789e791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.0.0.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.0.beta2+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

[Thorsten Behrens]

 RepositoryExternal.mk|   
55 
 configure.ac |
2 
 download.lst |
2 
 external/liborcus/0001-fix-dllexport-decls.patch |  
101 
 external/liborcus/0001-mark-more-symbols-as-public.patch |   
52 
 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch |   
36 
 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |   
45 
 external/liborcus/ExternalPackage_liborcus.mk|   
22 
 external/liborcus/ExternalProject_liborcus.mk|
7 
 external/liborcus/Library_orcus-parser.mk|   
55 
 external/liborcus/Library_orcus.mk   |  
104 
 external/liborcus/Module_liborcus.mk |   
17 
 external/liborcus/UnpackedTarball_liborcus.mk|   
25 
 external/liborcus/liborcus_0.1.0-configure.patch |   
20 
 external/liborcus/liborcus_0.1.0-dllimport.patch |   
24 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0  | 
1800 ++
 external/liborcus/visibility.patch   |   
11 
 sc/source/filter/html/htmlpars.cxx   |   
30 
 sc/source/filter/inc/orcusinterface.hxx  |   
10 
 sc/source/filter/orcus/interface.cxx |   
48 
 20 files changed, 1891 insertions(+), 575 deletions(-)

New commits:
commit 6da08dcfcf9335b19ab31db732688c5665544eb5
Author: Thorsten Behrens thorsten.behr...@cib.de
Date:   Fri Jun 5 15:28:51 2015 +0200

Revert update to liborcus 0.9.1

This reverts commit 2f437f5a1003d9593b7e1d35fb31c2bd34c58151,
e0e989ef5b24fbe8222aa676aa6491eebce68974 and
81ae40bfe35fd55db789d75d1698f186f13402dd.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 726ef75..47e4d17 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3209,78 +3209,35 @@ endef
 
 else # !SYSTEM_LIBORCUS
 
-ifeq ($(COM),MSC)
-
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
-   orcus \
-   orcus-parser \
-))
-
-define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
-   $$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-   orcus \
-)
-
-endef
-
-define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_set_include,$(1),\
-   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
-   $$(INCLUDE) \
-)
-
-$(call gb_LinkTarget_use_libraries,$(1),\
-   orcus-parser \
-)
-
-endef
-
-else # !MSC
-
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
-   liborcus \
-))
-
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_package,$(1),liborcus)
-
+$(call gb_LinkTarget_use_external_project,$(1),liborcus)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
-
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.10 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 $(if $(SYSTEM_BOOST), \
-   $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
-   $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
+$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
+$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
 )
 
 endef
 
 define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_use_package,$(1),liborcus)
-
+$(call gb_LinkTarget_use_external_project,$(1),liborcus)
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
-
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.10 \
+   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
 )
 
 endef
 
-endif # MSC
-
 endif # SYSTEM_LIBORCUS
 
 else # ENABLE_ORCUS != TRUE
diff --git a/configure.ac b/configure.ac
index dfd0ba0..b1aa254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9013,7 +9013,7 @@ if test -z $enable_orcus -o $enable_orcus != no; then
 ENABLE_ORCUS=TRUE
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 = 0.9.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 = 0.7.0])
 if test $with_system_orcus != yes; then
 if test $SYSTEM_BOOST = TRUE; then
 # ===

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Alexander Werner]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb73713934b79509c6c51057333760e9cb3792ca
Author: Alexander Werner a...@documentfoundation.org
Date:   Wed May 20 15:00:38 2015 +0200

bump product version to 5.0.0.0.beta1+

Change-Id: Iffb884ef487c3a15d55a14d74e0d3c9b42673ebf

diff --git a/configure.ac b/configure.ac
index a71b565..0207704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[5.0.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.0.0.0.beta1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits