[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - external/libodfgen

Tomáš Chvátal tchvatal at suse.com
Wed Mar 2 20:10:22 UTC 2016


 external/libodfgen/libodfgen-bundled-soname.patch.0 |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 434bee6e664dcd3ff6978c45b37ef8d98f29e70b
Author: Tomáš Chvátal <tchvatal at suse.com>
Date:   Wed Mar 2 17:20:23 2016 +0100

    Fix patch to apply on SLE11, just some unknown patch binary hickup
    
    Change-Id: I6cb707663e2abad8761b172773ee70f9caf4a87d
    Reviewed-on: https://gerrit.libreoffice.org/22836
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0
index 297cd303..052ba79 100644
--- a/external/libodfgen/libodfgen-bundled-soname.patch.0
+++ b/external/libodfgen/libodfgen-bundled-soname.patch.0
@@ -1,6 +1,7 @@
---- src/Makefile.in.orig	2015-08-07 11:26:16.388774624 +0200
-+++ src/Makefile.in	2015-08-07 11:27:01.428773852 +0200
-@@ -372,7 +372,7 @@
+diff -urN src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig	2016-03-02 17:17:02.812606210 +0100
++++ src/Makefile.in	2016-03-02 17:17:25.176670151 +0100
+@@ -355,7 +355,7 @@
  AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD
  libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS)
  libodfgen_ at LIBODFGEN_MAJOR_VERSION@_ at LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@


More information about the Libreoffice-commits mailing list