[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-4-16-ga8987ba
The following commit has been merged in the master branch:
commit 1ffb0a38f3a80548b299ea37b553e68e17cf137a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Oct 27 22:06:57 2011 +0200
remove more obsolete patches
diff --git a/patches/fix-sample-icc-1.3.2-patch.diff b/patches/fix-sample-icc-1.3.2-patch.diff
deleted file mode 100644
index 42cbc91..0000000
--- a/patches/fix-sample-icc-1.3.2-patch.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/home/rene/3b32204d9f900130cd1877675d8b51281b81f90d.patch b/home/rene/3b32204d9f900130cd1877675d8b51281b81f90d.patch
-new file mode 100644
-index 0000000..739f2e3
---- /dev/null
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/fix-sample-icc-1.3.2-patch.diff
-@@ -0,0 +1,20 @@
-+From 3b32204d9f900130cd1877675d8b51281b81f90d Mon Sep 17 00:00:00 2001
-+From: Lionel Elie Mamane <lionel@mamane.lu>
-+Date: Fri, 02 Sep 2011 12:39:41 +0000
-+Subject: fdo#39355: reenable "use typedefs and endianess from sal" patch hunk
-+
-+---
-+diff --git a/icc/SampleICC-1.3.2.patch b/icc/SampleICC-1.3.2.patch
-+index 3371520..cb65c42 100644
-+--- icc/SampleICC-1.3.2.patch
-++++ icc/SampleICC-1.3.2.patch
-+@@ -1389,6 +1389,7 @@
-+
-+ //Define how 64 bit integers are represented
-+ #define ICCUINT64 unsigned __int64
-++***************
-+ *** 107,126 ****
-+
-+ #else // non-PC, perhaps Mac or Linux
-+--
-+cgit v0.9.0.2-2-gbebe
diff --git a/patches/handle-NULL-display-gracefully.diff b/patches/handle-NULL-display-gracefully.diff
deleted file mode 100644
index 8479838..0000000
--- a/patches/handle-NULL-display-gracefully.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- /dev/null 2011-09-14 22:08:43.143634037 +0200
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/handle-NULL-display-gracefully.diff 2011-09-15 21:39:32.000000000 +0200
-@@ -0,0 +1,35 @@
-+From 253ff23c3a93b5ea45a2451a8bc97fca19856a75 Mon Sep 17 00:00:00 2001
-+From: David Tardon <dtardon@redhat.com>
-+Date: Tue, 24 May 2011 04:30:46 +0000
-+Subject: handle NULL display gracefully
-+
-+(cherry-picked from core 2daa098c3c1b49ce4d46306eddc45f7a66b7c021)
-+
-+Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+---
-+diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
-+index 4f5d4b2..e975733 100755
-+--- desktop/unx/source/splashx.c
-++++ desktop/unx/source/splashx.c
-+@@ -589,6 +589,9 @@ static void process_events()
-+ // Draw the progress
-+ void splash_draw_progress( int progress )
-+ {
-++ if (!display)
-++ return;
-++
-+ // sanity
-+ if ( progress < 0 )
-+ progress = 0;
-+@@ -619,7 +622,8 @@ void splash_draw_progress( int progress )
-+ // Close the window & cleanup
-+ void splash_close_window()
-+ {
-+- XCloseDisplay( display );
-++ if (display)
-++ XCloseDisplay( display );
-+ display = NULL;
-+ #ifdef USE_LIBPNG
-+ png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
-+--
-+cgit v0.9.0.2-2-gbebe
diff --git a/patches/oosplash-javaldx-path.diff b/patches/oosplash-javaldx-path.diff
deleted file mode 100644
index 2811c8c..0000000
--- a/patches/oosplash-javaldx-path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- /dev/null 2011-08-29 23:15:17.488532555 +0000
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/oosplash-javaldx-path.diff 2011-08-31 08:09:12.000000000 +0000
-@@ -0,0 +1,13 @@
-+diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
-+index 85e2e28..2a9c923 100755
-+--- desktop/unx/source/start.c
-++++ desktop/unx/source/start.c
-+@@ -845,7 +845,7 @@ exec_javaldx (Args *args)
-+ rtl_uString_newFromAscii( &pApp, "file://" );
-+ rtl_uString_newConcat( &pApp, pApp, args->pAppPath );
-+ pTmp = NULL;
-+- rtl_uString_newFromAscii( &pTmp, "/../ure/bin/javaldx" );
-++ rtl_uString_newFromAscii( &pTmp, "/../basis-link/ure-link/bin/javaldx" );
-+ rtl_uString_newConcat( &pApp, pApp, pTmp );
-+ rtl_uString_release( pTmp );
-+
diff --git a/patches/poppler-0.17.x.diff b/patches/poppler-0.17.x.diff
deleted file mode 100644
index ded38e4..0000000
--- a/patches/poppler-0.17.x.diff
+++ /dev/null
@@ -1,104 +0,0 @@
---- /dev/null 2011-09-27 10:05:06.408221032 +0200
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/poppler-0.17.x.diff 2011-09-30 01:46:25.000000000 +0200
-@@ -0,0 +1,101 @@
-+rom f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
-+From: Caolán McNamara <caolanm@redhat.com>
-+Date: Tue, 19 Jul 2011 07:54:07 +0000
-+Subject: poppler 0.17.0 changed its api for no some reason or othe
-+
-+From 91313fc05abbfe35ee1e0c2464a28dd580780f07 Mon Sep 17 00:00:00 2001
-+From: Caolán McNamara <caolanm@redhat.com>
-+Date: Fri, 02 Sep 2011 12:15:49 +0000
-+Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
-+
-+From 8861df394604fa6dd8c72181a023557d037f7235 Mon Sep 17 00:00:00 2001
-+From: Luboš Luňák <l.lunak@suse.cz>
-+Date: Wed, 21 Sep 2011 15:13:25 +0000
-+Subject: build without glib poppler bindings
-+
-+- there's not configure check for it, only for poppler itself
-+- and it's not actually used anyway
-+
-+From 0f862a7432737d16056270cf8fbc29478f988f7d Mon Sep 17 00:00:00 2001
-+From: Rene Engelhard <rene@debian.org>
-+Date: Wed, 28 Sep 2011 20:40:07 +0000
-+Subject: make configure check for cpp/poppler-version.h
-+
-+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+@@ -150,7 +150,11 @@
-+ void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
-+ {
-+ // dump JPEG file as-is
-++#if POPPLER_CHECK_VERSION(0, 17, 3)
-++ str = str->getBaseStream();
-++#else
-+ str = ((DCTStream *)str)->getRawStream();
-++#endif
-+ str->reset();
-+
-+ int c;
-+@@ -489,7 +493,11 @@
-+ printf("endPage\n");
-+ }
-+
-++#if POPPLER_CHECK_VERSION(0, 17, 0)
-++void PDFOutDev::processLink(AnnotLink *link, Catalog *)
-++#else
-+ void PDFOutDev::processLink(Link* link, Catalog*)
-++#endif
-+ {
-+ assert(link);
-+
-+unchanged:
-+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+@@ -65,7 +65,14 @@
-+ 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
-+@@ -194,8 +201,12 @@
-+ // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
-+ // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
-+
-++ #if POPPLER_CHECK_VERSION(0, 17, 0)
-++ virtual void processLink(AnnotLink *link, Catalog *catalog);
-++ #else
-+ //----- link borders
-+ virtual void processLink(Link *link, Catalog *catalog);
-++ #endif
-+
-+ //----- save/restore graphics state
-+ virtual void saveState(GfxState *state);
-+only in patch2:
-+unchanged:
-+--- configure.in
-++++ configure.in
-+@@ -7034,6 +7034,16 @@ if test "x$enable_ext_pdfimport" != "xno" -a "x$enable_extension_integration" !=
-+ 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++])
-+ else
-+ AC_MSG_RESULT([internal])
-+ SYSTEM_POPPLER=NO
diff --git a/patches/series b/patches/series
index e62f956..9579bc3 100644
--- a/patches/series
+++ b/patches/series
@@ -18,12 +18,7 @@ vbaobj-visibility-fix.diff
make-gengal-work-again.diff
fix-distro-config.diff
mipsel-jfw-plugin-arch.diff
-oosplash-javaldx-path.diff
no-deprecated-options-in-qstart-wrappers.diff
-fix-sample-icc-1.3.2-patch.diff
update-sdbc-postgresql.diff
-handle-NULL-display-gracefully.diff
jdk-1.7.0-vendorname.diff
s390x.diff
-# KEEP THIS THE LAST, NEEDED FOR SQUEEZE BACKPORTS!
-poppler-0.17.x.diff
--
LibreOffice packaging repository
Reply to: