The following commit has been merged in the master branch:
commit c013267600a8240aaf7c117595602b83b8aa21ce
Author: Rene Engelhard <r...@debian.org>
Date: Wed Oct 5 17:53:08 2011 +0000
add check for PQconnectdbPararms in -lpq; disabling sdbc-postgresql doesn't
work without additional patch
diff --git a/changelog b/changelog
index cb3e85d..ae029db 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ 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/patches/update-sdbc-postgresql.diff: add check for
+ PQconnectdbPararms in -lpq
* debian/rules:
- use jh_classpath instead of manual MANIFEST.MF hacking for jurt.jar
@@ -10,14 +12,13 @@ libreoffice (1:3.4.3-4) UNRELEASED; urgency=low
- use internal jfreereport on squeeze-backports
- keep -g1 on squeeze-backports
- use mingw-w64 for unowinreg.dll build (closes: #642954)
- - build-dep on libpq-dev (>= 9.0~) for PQConnectdbParams and disable
- -sdbc-postgresql build on squeeze-backports
+ - build-dep on libpq-dev (>= 9.0~) for PQconnectdbParams
* merge from ubuntu-oneiric-3.4:
- hard hack to make upload happy: Pre-Depends on xz-capable dpkg
for -dbg
- -- Rene Engelhard <r...@debian.org> Wed, 05 Oct 2011 11:42:05 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 05 Oct 2011 17:48:19 +0000
libreoffice (1:3.4.3-3) unstable; urgency=low
diff --git a/patches/update-sdbc-postgresql.diff
b/patches/update-sdbc-postgresql.diff
index f80f43f..217c5f3 100644
--- a/patches/update-sdbc-postgresql.diff
+++ b/patches/update-sdbc-postgresql.diff
@@ -1523,11 +1523,11 @@ new file mode 100644
index 0000000..4c8d904
--- /dev/null
+++
libreoffice-3.4.3/libreoffice-build/patches/postgresql/sdbc-postgresql-bootstrap.diff
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,51 @@
+diff -urN configure.in configure.in
+--- configure.in 2011-09-08 11:55:02.000000000 +0200
++++ configure.in 2011-09-08 13:06:05.000000000 +0200
-+@@ -4548,6 +4548,23 @@
++@@ -4548,6 +4548,24 @@
+ AC_SUBST(HSQLDB_JAR)
+
+ dnl ===================================================================
@@ -1541,7 +1541,8 @@ index 0000000..4c8d904
++save_LIBS=$LIBS
++CFLAGS="-I`pg_config --includedir`"
++AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
-++AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
+++AC_CHECK_LIB(pq, PQconnectdbParams, [],
+++ [AC_MSG_ERROR(libpq not found or too old. Need >= 9.0)], [])
++CFLAGS=$save_CFLAGS
++LIBS=$save_LIBS
++SYSTEM_POSTGRESQL=YES # only option atm :-)
diff --git a/rules b/rules
index 6e91b4c..f74c51b 100755
--- a/rules
+++ b/rules
@@ -252,9 +252,7 @@ else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-ifneq "$(SQUEEZE_BACKPORTS)" "y"
ENABLE_SDBC_POSTGRESQL=y
-endif
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rbvvi-0000fs...@vasks.debian.org
