Update of /cvs/debian-openoffice/oo-deb/debian
In directory gluck:/tmp/cvs-serv6041
Modified Files:
changelog rules
Log Message:
Include libfreetype shared library in Woody backport
Index: changelog
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/changelog,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- changelog 3 Nov 2003 16:17:56 -0000 1.227
+++ changelog 4 Nov 2003 15:38:22 -0000 1.228
@@ -33,6 +33,10 @@
* debian/MANIFEST.powerpc:
- Remove python-core so powerpc doesn't have to be built with
IGNORE_MANIFEST_CHANGES=1 [CH]
+ * Build and package our own internal version of libfreetype.
+ Depends: libfreetype (<< 2.1.0) can now be removed and OOo
+ is compatible with other backports that need a newer
+ libfreetype (X 4.3, Gnome 2 etc.)
-- Chris Halls <[EMAIL PROTECTED]> Mon, 3 Nov 2003 17:12:56 +0100
@@ -44,7 +48,7 @@
* Build without a JDK. (closes: #211288) [JT]
* Added patches:
- system-zlib: use system zlib (based on Mandrake's) [RE]
- - system-getopt: use the getopt from system's glibc
+ - system-getopt: use the getopt from system's glibc
(from Mandrake) [RE]
- allow-no-jdk.diff [JT]: If java is disabled with --disable-java,
don't look for a JDK, but do look for xsltproc, and set XSLTPROC
Index: rules
===================================================================
RCS file: /cvs/debian-openoffice/oo-deb/debian/rules,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- rules 30 Oct 2003 12:10:34 -0000 1.162
+++ rules 4 Nov 2003 15:38:22 -0000 1.163
@@ -128,11 +128,14 @@
endif
endif
-# Packages compiled with libfreetype on Woody do not work properly with
-# libfreetype from Sarge or Sid, so enforce that with a shlibs override
-#ifeq (libfreetype.so.6.3.0,$(shell readlink /usr/lib/libfreetype.so))
-# SHLIBS_OVERRIDE=-- -Ldebian/shlibs.woody.local
-#endif
+# Auto freetype configuration. If we detect the Woody freetype, we
+# build and include our own version instead. This is because there
+# are ABI incompatibilities between the version in Woody and newer
+# versions, and some other backports (Gnome, X4.3) require a newer
+# freetype and it all ends up in a horrible mess.
+ifeq (libfreetype.so.6.3.0,$(shell readlink /usr/lib/libfreetype.so))
+ USE_INTERNAL_FREETYPE=y
+endif
# do we have po-debconf available?
ifeq (,$(wildcard /usr/bin/po2debconf))
@@ -400,7 +403,7 @@
chmod 755 $(TOOLS_DIR)/patches/apply.pl
$(TOOLS_DIR)/patches/apply.pl $(TOOLS_DIR)/patches/$(PATCH_DIR)
$(BUILD_DIR) --distro=Debian -f
-ifeq (libfreetype.so.6.3.0,$(shell readlink /usr/lib/libfreetype.so))
+ifeq "$(USE_INTERNAL_FREETYPE)" "y"
# Woody system - unapply system-freetype patch
ftpatch="`ls
$(BUILD_DIR)/applied_patches/???-gui-ft-dynlink-system.patch`" ; \
if [ -f "$$ftpatch" ]; then \
@@ -769,6 +772,13 @@
done
endif
+ifeq "$(USE_INTERNAL_FREETYPE)" "y"
+ # Internal freetype (on Woody backport)
+ install -m755 \
+
$(SOURCE_TREE)/solver/$(BUILDNUM)/$(ARCHBUILDDIR)/lib/libfreetype.so.6.3.3 \
+ $(MAINPKGDIR)-bin/$(OPENOFFICEDIR)/program/libfreetype.so.6
+endif
+
# If building with a JDK, install the additional files
ifeq "$(USE_JAVA)" "y"
ifeq "$(LIBSUFFIX)" ""
@@ -1031,6 +1041,7 @@
@echo '$$(SHLIBS_OVERRIDE)' is "$(SHLIBS_OVERRIDE)"
@echo '$$(BUILD_ALL_LANGPACKS)' is "$(BUILD_ALL_LANGPACKS)"
@echo '$$(BUILDLANG),$$(BUILDLANG_PREFIX)' is
"$(BUILDLANG),$(BUILDLANG_PREFIX)"
+ @echo '$$(USE_INTERNAL_FREETYPE)' is "$(USE_INTERNAL_FREETYPE)"
@echo 'See debian/control for build dependencies.'
