[libreoffice] fix rhel-6 patches

[David Tardon]

commit 1ed7cb0251a77b0a53fceafc02304082d697220a
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Jan 24 18:08:38 2014 +0100

    fix rhel-6 patches

 libreoffice-rhel6gcj.patch     |    8 +++-----
 libreoffice-rhel6glib.patch    |   12 ++++++------
 libreoffice-rhel6poppler.patch |   37 ++++++++++++++++---------------------
 3 files changed, 25 insertions(+), 32 deletions(-)
---
diff --git a/libreoffice-rhel6gcj.patch b/libreoffice-rhel6gcj.patch
index 429778c..4ea674e 100644
--- a/libreoffice-rhel6gcj.patch
+++ b/libreoffice-rhel6gcj.patch
@@ -11,8 +11,8 @@
 --- a/odk/CustomTarget_javadoc.mk
 +++ b/odk/CustomTarget_javadoc.mk
 @@ -40,7 +40,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : $(call g
- 		-linkoffline ../../common/reg $(SRCDIR)/odk/pack/gendocu/uno \
- 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/pack/gendocu/java \
+ 		-linkoffline ../../common/reg $(SRCDIR)/odk/docs/java-uno \
+ 		-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
  		$(odk_JAVAPACKAGES) \
 -		$(if $(JAVADOCISGJDOC),,-notimestamp) \
  		> $@
@@ -20,16 +20,14 @@
  # vim: set noet sw=4 ts=4:
 --- a/odk/Package_javadoc.mk
 +++ b/odk/Package_javadoc.mk
-@@ -20,12 +20,6 @@
+@@ -20,10 +20,5 @@
  	com/sun/star/comp/helper/ComponentContextEntry.html \
  	com/sun/star/comp/helper/SharedLibraryLoader.html \
- 	com/sun/star/comp/helper/UnoInfo.html \
 -	com/sun/star/comp/helper/class-use/Bootstrap.html \
 -	com/sun/star/comp/helper/class-use/BootstrapException.html \
 -	com/sun/star/comp/helper/class-use/ComponentContext.html \
 -	com/sun/star/comp/helper/class-use/ComponentContextEntry.html \
 -	com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \
--	com/sun/star/comp/helper/class-use/UnoInfo.html \
  	com/sun/star/comp/helper/package-frame.html \
  	com/sun/star/comp/helper/package-summary.html \
  	com/sun/star/comp/helper/package-tree.html \
diff --git a/libreoffice-rhel6glib.patch b/libreoffice-rhel6glib.patch
index c335d5e..a0458d9 100644
--- a/libreoffice-rhel6glib.patch
+++ b/libreoffice-rhel6glib.patch
@@ -20,12 +20,12 @@ index d0de1d8..526fea3 100644
 --- a/Repository.mk
 +++ b/Repository.mk
 @@ -229,7 +229,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GNOME, \
-     $(if $(ENABLE_GTK3),vclplug_gtk3) \
-     $(if $(ENABLE_GCONF),gconfbe1) \
-     $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
--    $(if $(ENABLE_GIO),losessioninstall) \
-     $(if $(ENABLE_GIO),ucpgio1) \
-     $(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
+ 	$(if $(ENABLE_GTK3),vclplug_gtk3) \
+ 	$(if $(ENABLE_GCONF),gconfbe1) \
+ 	$(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
+-	$(if $(ENABLE_GIO),losessioninstall) \
+ 	$(if $(ENABLE_GIO),ucpgio1) \
+ 	$(if $(ENABLE_GNOMEVFS),ucpgvfs1) \
  ))
 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
 index 936aac2..7d26eb4 100644
diff --git a/libreoffice-rhel6poppler.patch b/libreoffice-rhel6poppler.patch
index 899dd1b..47cc372 100644
--- a/libreoffice-rhel6poppler.patch
+++ b/libreoffice-rhel6poppler.patch
@@ -1,38 +1,33 @@
 --- a/configure.ac	2011-11-10 13:22:02.062474990 +0000
 +++ b/configure.ac	2011-11-10 13:22:35.072472880 +0000
 @@ -9659,16 +9659,6 @@ if test "$_os" != Android -a "$_os" != iOS -a "$ENABLE_PDFIMPORT" != FALSE; then
-       AC_MSG_RESULT([external])
-       SYSTEM_POPPLER=YES
-       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
--      AC_LANG_PUSH([C++])
--      save_CXXFLAGS=$CXXFLAGS
--      save_CPPFLAGS=$CPPFLAGS
--      CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
--      CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
--      AC_CHECK_HEADER([cpp/poppler-version.h], [],
+         AC_MSG_RESULT([external])
+         SYSTEM_POPPLER=YES
+         PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
+-        AC_LANG_PUSH([C++])
+-        save_CXXFLAGS=$CXXFLAGS
+-        save_CPPFLAGS=$CPPFLAGS
+-        CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
+-        CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+-        AC_CHECK_HEADER([cpp/poppler-version.h], [],
 -                   [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
--      CXXFLAGS=$save_CXXFLAGS
--      CPPFLAGS=$save_CPPFLAGS
--      AC_LANG_POP([C++])
-       libo_MINGW_CHECK_DLL([libpoppler])
-   else
-       AC_MSG_RESULT([internal])
+-        CXXFLAGS=$save_CXXFLAGS
+-        CPPFLAGS=$save_CPPFLAGS
+-        AC_LANG_POP([C++])
+         libo_MINGW_CHECK_DLL([libpoppler])
+         POPPLER_CFLAGS=$(printf '%s' "$POPPLER_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
+     else
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-11-10 13:22:11.949473646 +0000
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2011-11-10 13:23:24.889473889 +0000
-@@ -64,16 +64,7 @@
+@@ -64,11 +64,6 @@
  class GfxPath;
  class GfxFont;
  class PDFDoc;
--#ifndef SYSTEM_POPPLER
- #define POPPLER_CHECK_VERSION(major,minor,micro) (0)
--typedef GString GooString;
--#else
 -#include <cpp/poppler-version.h>
 -#define POPPLER_CHECK_VERSION(major,minor,micro) \
 -  (POPPLER_VERSION_MAJOR > (major) || \
 -   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
 -   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
--#endif
  
  namespace pdfi
  {