dtardon pushed to libreoffice (master). "update patch"

[notifications at fedoraproject.org]

>From 9ce0047b07a880ed33156f5e3fd5e42cfb90ede3 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Tue, 21 Apr 2015 10:39:14 +0200
Subject: update patch


diff --git a/0001-disable-libe-book-support.patch b/0001-disable-libe-book-support.patch
index 5f3fc7b..897cb03 100644
--- a/0001-disable-libe-book-support.patch
+++ b/0001-disable-libe-book-support.patch
@@ -1,4 +1,4 @@
-From 0571c25e9a0994f71686227257123b17b21b5c8e Mon Sep 17 00:00:00 2001
+From f3e71fdf4ff42e49a872737f4da7b69f89e3cc23 Mon Sep 17 00:00:00 2001
 From: David Tardon <dtardon at redhat.com>
 Date: Thu, 21 Aug 2014 16:10:51 +0200
 Subject: [PATCH] disable libe-book support
@@ -10,14 +10,14 @@ Change-Id: Ie915a9bd2acf7f3aeb8b0933252da33c17043bc4
  filter/Configuration_filter.mk                           | 14 --------------
  writerperfect/Library_wpftwriter.mk                      |  2 --
  writerperfect/qa/unit/WpftWriterFilterTest.cxx           |  1 -
- writerperfect/source/writer/wpftwriter_genericfilter.cxx |  4 ----
- 6 files changed, 27 deletions(-)
+ writerperfect/source/writer/wpftwriter_genericfilter.cxx |  6 ------
+ 6 files changed, 29 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2f19999..bde14a8 100644
+index 8b8cc34..22a5c3c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -7757,11 +7757,6 @@ AS_IF([test "$COM" = "MSC"],
+@@ -7573,11 +7573,6 @@ AS_IF([test "$COM" = "MSC"],
  libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1],["-I${WORKDIR}/UnpackedTarball/librevenge/inc"],["-L${librevenge_libdir} -lrevenge-0.0"])
  
  dnl ===================================================================
@@ -30,10 +30,10 @@ index 2f19999..bde14a8 100644
  dnl ===================================================================
  libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.1])
 diff --git a/external/Module_external.mk b/external/Module_external.mk
-index 7049278..0e7fd60 100644
+index 6d38fd5..25cb2d9 100644
 --- a/external/Module_external.mk
 +++ b/external/Module_external.mk
-@@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
+@@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
  	$(call gb_Helper_optional,CPPUNIT,cppunit) \
  	$(call gb_Helper_optional,CT2N,ct2n) \
  	$(call gb_Helper_optional,CURL,curl) \
@@ -42,10 +42,10 @@ index 7049278..0e7fd60 100644
  	$(call gb_Helper_optional,ETONYEK,libetonyek) \
  	$(call gb_Helper_optional,EXPAT,expat) \
 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
-index 57d6940..fe77479 100644
+index d791909..42a8245 100644
 --- a/filter/Configuration_filter.mk
 +++ b/filter/Configuration_filter.mk
-@@ -362,13 +362,6 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter
+@@ -362,13 +362,6 @@ $(eval $(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu
  	writer_OOXML \
  	writer_OOXML_Template \
  	writer_layout_dump_xml \
@@ -59,7 +59,7 @@ index 57d6940..fe77479 100644
  ))
  
  $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,filter/source/config/fragments/filters,\
-@@ -423,13 +416,6 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters.xcu,fi
+@@ -424,13 +417,6 @@ $(eval $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_writer_filters
  	OOXML_Text \
  	OOXML_Text_Template \
  	writer_layout_dump \
@@ -72,12 +72,12 @@ index 57d6940..fe77479 100644
 -	zTXT \
  ))
  
- $(eval $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
+ # fcfg_web
 diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
-index db6afdf..e6ea0f5 100644
+index b47c271..75bdc9e 100644
 --- a/writerperfect/Library_wpftwriter.mk
 +++ b/writerperfect/Library_wpftwriter.mk
-@@ -42,7 +42,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
+@@ -47,7 +47,6 @@ $(eval $(call gb_Library_use_libraries,wpftwriter,\
  $(eval $(call gb_Library_use_externals,wpftwriter,\
  	abw \
  	boost_headers \
@@ -85,7 +85,7 @@ index db6afdf..e6ea0f5 100644
  	icui18n \
  	icuuc \
  	libxml2 \
-@@ -57,7 +56,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
+@@ -62,7 +61,6 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
  
  $(eval $(call gb_Library_add_exception_objects,wpftwriter,\
  	writerperfect/source/writer/AbiWordImportFilter \
@@ -106,7 +106,7 @@ index 904daab..fb44878 100644
      doTest("com.sun.star.comp.Writer.MWAWImportFilter", "/writerperfect/qa/unit/data/writer/libmwaw/");
      doTest("com.sun.star.comp.Writer.WordPerfectImportFilter", "/writerperfect/qa/unit/data/writer/libwpd/");
 diff --git a/writerperfect/source/writer/wpftwriter_genericfilter.cxx b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
-index 05f6542..831bc38 100644
+index cd60fe2..fa2202f 100644
 --- a/writerperfect/source/writer/wpftwriter_genericfilter.cxx
 +++ b/writerperfect/source/writer/wpftwriter_genericfilter.cxx
 @@ -32,7 +32,6 @@
@@ -117,7 +117,7 @@ index 05f6542..831bc38 100644
  #include "WordPerfectImportFilter.hxx"
  #include "MSWorksImportFilter.hxx"
  #include "MWAWImportFilter.hxx"
-@@ -52,11 +51,6 @@ static cppu::ImplementationEntry const services[] = {
+@@ -62,11 +61,6 @@ static cppu::ImplementationEntry const services[] =
          &MWAWImportFilter_getSupportedServiceNames,
          &cppu::createSingleComponentFactory, 0, 0
      },
@@ -130,5 +130,5 @@ index 05f6542..831bc38 100644
  };
  
 -- 
-1.9.3
+2.3.5
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=master&id=9ce0047b07a880ed33156f5e3fd5e42cfb90ede3