[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-3-2-g79098b1
The following commit has been merged in the master branch:
commit 79098b11c9d5a76425cf7a13ea211b99de3f5f2a
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 30 02:00:04 2011 +0200
make pdfimport build with poppler 0.17.x
diff --git a/changelog b/changelog
index 4e2e9f0..547f9c5 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,13 @@
libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
+ * debian/patches/poppler-0.17.x.diff: backport patches from master to
+ make pdfimport build with poppler 0.17.x
+
* debian/rules:
- use jh_manifest instead of manual MANIFEST.MF hacking for jurt.jar
+ - build-depend on libpoppler-cpp-dev
- -- Rene Engelhard <rene@debian.org> Fri, 30 Sep 2011 01:23:27 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 29 Sep 2011 23:50:56 +0000
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/control b/control
index e09ff27..2320674 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf i386 mips mipsel po
werpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebs
d-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8),
libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf
i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java [!armel], libsac-java [!armel], libxml-java (>= 1.1.6) [!armel], libflute-java (>= 1.1.6) [!armel], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!armel], liblayout-java (>= 0.2.10) [!armel], libloader-java (>= 1.1.6) [!armel], libformula-java (>= 1.1.7) [!armel], librepository-java (>= 1.1.6) [!armel], libfonts-java (>= 1.1.6) [!armel], libserializer-java (>= 1.1.6) [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.37~), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd
64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libpq-dev, libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, libr
df0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge, translate-toolkit (>= 1.9)
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/patches/poppler-0.17.x.diff b/patches/poppler-0.17.x.diff
new file mode 100644
index 0000000..ded38e4
--- /dev/null
+++ b/patches/poppler-0.17.x.diff
@@ -0,0 +1,104 @@
+--- /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 acf6845..af47104 100644
--- a/patches/series
+++ b/patches/series
@@ -27,3 +27,5 @@ jdk-1.7.0-vendorname.diff
s390x.diff
fdo39510.diff
lp852819.diff
+# KEEP THIS THE LAST, NEEDED FOR SQUEEZE BACKPORTS!
+poppler-0.17.x.diff
diff --git a/rules b/rules
index 20dafb8..c308074 100755
--- a/rules
+++ b/rules
@@ -511,6 +511,9 @@ endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
CONFIGURE_FLAGS += --enable-ext-pdfimport
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
+ ifneq "$(SQUEEZE_BACKPORT)" "y"
+ BUILD_DEPS += , libpoppler-cpp-dev
+ endif
endif
# fails their tests
@@ -1735,6 +1738,10 @@ endif
touch $(OOO_BUILD_TREE)/distro-configs/Win32.conf.in
touch $(OOO_BUILD_TREE)/distro-configs/Solaris.conf.in
+ifeq "$(SQUEEZE_BACKPORT)" "y"
+ quilt pop `tail -n 3 debian/patches/series | head -n 1`
+endif
+
cd $(OOO_BUILD_TREE) ; \
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ../$(OOO_BUILD_TREE)/configure $(CONFIGURE_FLAGS)
--
LibreOffice packaging repository
Reply to: