./packages/openofficeorg/3.1/experimental r1365: add conditional for enabling graphite
------------------------------------------------------------
revno: 1365
committer: Rene Engelhard <rene@debian.org>
branch nick: 31
timestamp: Fri 2008-12-26 19:41:00 +0100
message:
add conditional for enabling graphite
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-12-26 00:09:24 +0000
+++ b/changelog 2008-12-26 18:41:00 +0000
@@ -4,7 +4,7 @@
- build without -march=armv5te for arm (closes: #501957)
- lbnames.h supports gcc 4.4 (closes: #505669)
* ooo-build:
- - back on trunk (r14926)
+ - back on trunk (r14944)
* debian/shlibs.override.icu: update for new icu
* debian/shlibs.override.xmlsec: remove, xmlsec went static
* debian/rules, debian/openoffice.org-qa-tools.{preinst,postrm}.in,
@@ -19,6 +19,8 @@
Hardcode --without-writer2latex
- use UREPACKAGEVERSION for determining UREs version (keep .shlibs at
old one to not bump shlibs unnecessarily)
+ - add conditional for enabling graphite, now that ooo-build has a surrected
+ --enable-graphite again (and upstream a cws for it)
* debian/rules, debian/startcenter.desktop: remove own startcenter.desktop;
OOo now has one upstream
=== modified file 'rules'
--- a/rules 2008-12-26 01:28:23 +0000
+++ b/rules 2008-12-26 18:41:00 +0000
@@ -200,6 +200,8 @@
# "new" source split? This is to be n when to use
# Suns tarballs.
WITH_SPLIT=y
+ENABLE_GRAPHITE=n
+USE_SYSTEM_GRAPHITE=y
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -409,6 +411,14 @@
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
endif
+ifeq "$(ENABLE_GRAPHITE)" "y"
+ CONFIGURE_FLAGS += --enable-graphite
+ ifeq "$(USE_SYSTEM_GRAPHITE)" "y"
+ BUILD_DEPS += , libgraphite-dev
+ CONFIGURE_FLAGS += --with-system-graphite
+ endif
+endif
+
ifeq "$(USE_LIBCURL4)" "y"
BUILD_DEPS += , libcurl4-openssl-dev
else
Reply to: