[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta1-2-8-g1d8d445
The following commit has been merged in the debian-experimental-4.1 branch:
commit 9b2bb746da7af844aa42582ecbcc94062f7d4a5a
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 2 20:39:36 2013 +0200
harfbuzz-0.9.18.diff merged upstream
diff --git a/changelog b/changelog
index 542429f..e742bc5 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta2~git20130601-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta2~git20130602-1) UNRELEASED; urgency=low
* debian/patches/harfbuzz-0.9.18.diff: fix build with harfbuzz >= 0.9.18
* debian/patches/show-the-startcenter.diff: as name says, remove
diff --git a/patches/harfbuzz-0.9.18.diff b/patches/harfbuzz-0.9.18.diff
deleted file mode 100644
index c8352a7..0000000
--- a/patches/harfbuzz-0.9.18.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9d8ee40688902c70112d8ea9d716d10897118682 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@rene-engelhard.de>
-Date: Sat, 1 Jun 2013 19:13:00 +0200
-Subject: fix build with system-harfbuzz >= 0.9.18
-
-.. as it split out the icu libs and thus we need to use harfbuzz-icu
-for pkg-config to get the needed -lharfbuzz-icu
-
-Change-Id: Ia4e1774ecdddec87876adf5bc5a93bed86c25046
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index af3100c..d018068 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8385,7 +8385,15 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
- if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
- AC_MSG_RESULT([yes])
- ENABLE_HARFBUZZ="TRUE"
-- libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
-+ if test "$with_system_harfbuzz" = "yes"; then
-+ if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 0.9.18])
-+ else
-+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
-+ fi
-+ else
-+ libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 0.9.10])
-+ fi
- else
- AC_MSG_RESULT([no])
- fi
---
-1.7.10.4
-
diff --git a/patches/series b/patches/series
index 18f1922..0ca5215 100644
--- a/patches/series
+++ b/patches/series
@@ -29,5 +29,4 @@ fix-internal-hsqldb-build.diff
disable-sw_python.diff
#uno-executables-link-to-xmlreader.diff
javadoc-optional.diff
-harfbuzz-0.9.18.diff
show-the-startcenter.diff
--
LibreOffice packaging repository
Reply to: