From 8d0f44c0762a52bbe5d3313382295dbc2e1fcb35 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil@nwl.cc>
Date: Tue, 15 Jun 2010 22:33:40 +0200
Subject: fonts: hack font-util so I can compile font-misc-misc

---
 package/font-misc-misc/Makefile                |  2 ++
 package/font-misc-misc/patches/patch-configure | 11 +++++++++++
 package/font-util/Makefile                     | 12 +++++++++++-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 package/font-misc-misc/patches/patch-configure

(limited to 'package')

diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index f60f867ad..2487a68c8 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -19,6 +19,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		MAPFILES_PATH=${STAGING_DIR}/usr/share/fonts/X11/util
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
 	$(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \
diff --git a/package/font-misc-misc/patches/patch-configure b/package/font-misc-misc/patches/patch-configure
new file mode 100644
index 000000000..acbc7f8ce
--- /dev/null
+++ b/package/font-misc-misc/patches/patch-configure
@@ -0,0 +1,11 @@
+--- font-misc-misc-1.1.0.orig/configure	2009-10-11 03:23:03.000000000 +0200
++++ font-misc-misc-1.1.0/configure	2010-06-15 00:35:59.189800221 +0200
+@@ -5544,7 +5544,7 @@ $as_echo "yes" >&6; }
+ fi
+ 	{ $as_echo "$as_me:$LINENO: checking for ucs2any encoding data files" >&5
+ $as_echo_n "checking for ucs2any encoding data files... " >&6; }
+-	MAPFILES_PATH=`pkg-config --variable=mapdir fontutil`
++#	MAPFILES_PATH=`pkg-config --variable=mapdir fontutil`
+ 
+ 	{ $as_echo "$as_me:$LINENO: result: ${MAPFILES_PATH}" >&5
+ $as_echo "${MAPFILES_PATH}" >&6; }
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index cdd1632b2..b3faf7f7e 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -16,7 +16,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-post-install:
+# XXX: Push the mapping files to a place where we can find them
+# again when compiling the actual fonts. This is ugly as hell,
+# especially as all font packages still need patching to avoid
+# calling pkg-config (which we don't provide) in order to
+# automatically find the mappings.
+fonts-hack:
+	${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
+	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
+		${STAGING_DIR}/usr/share/fonts/X11/util
+
+post-install: fonts-hack
 	${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
 	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
 		${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
-- 
cgit v1.2.3