summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-17 14:31:02 -0500
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-17 14:31:02 -0500
commitd3f353a5fe69c67f0b89971a4d84bec59c63d399 (patch)
tree80b16fef9c3541ff8eed8fdb5e8b32e26ec97180 /media-libs
parentdev-libs/gdl: moved to gx86 (diff)
downloadgnome-d3f353a5fe69c67f0b89971a4d84bec59c63d399.tar.gz
gnome-d3f353a5fe69c67f0b89971a4d84bec59c63d399.tar.bz2
gnome-d3f353a5fe69c67f0b89971a4d84bec59c63d399.zip
media-libs/harfbuzz: now in gx86
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/harfbuzz/Manifest11
-rw-r--r--media-libs/harfbuzz/files/0001-Out-of-tree-build-fixes.patch57
-rw-r--r--media-libs/harfbuzz/files/0002-Add-build-configuration-summary.patch32
-rw-r--r--media-libs/harfbuzz/files/0003-Make-icu-support-optional.patch44
-rw-r--r--media-libs/harfbuzz/files/0004-Fix-API-tests.patch39
-rw-r--r--media-libs/harfbuzz/harfbuzz-0.9.5.ebuild50
-rw-r--r--media-libs/harfbuzz/metadata.xml5
7 files changed, 0 insertions, 238 deletions
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
deleted file mode 100644
index 87d3ca84..00000000
--- a/media-libs/harfbuzz/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST harfbuzz-0.9.5.tar.bz2 856867 SHA256 57aa645606b7220fa202871b2acd9062243a5c212a2b55ab6493eeaaca1c6a7a SHA512 778d68998f652f37fc5295c09683a294ab50f9ab5c4c0937c89ee4838d5ff042ab9f9d30eeabf5e48f755af2fa78bca03d79d777fb1e014c1592a583cf2fd1cc WHIRLPOOL b344869302f45c23496b91630b6b362ebcc4903f46541c29f760aad52ab1d71b6bd146c7c257990cf7eb52da561510c2ebed8f954d1c197d8b7622da8ce56680
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCNtiUACgkQ1fmVwcYIWAby2QCfe7yB5Zxbn1XPTHRrKc9VkLPw
-ohIAn3G6be2Lj+uu2qqZXXviGq1VKAdD
-=zpuP
------END PGP SIGNATURE-----
diff --git a/media-libs/harfbuzz/files/0001-Out-of-tree-build-fixes.patch b/media-libs/harfbuzz/files/0001-Out-of-tree-build-fixes.patch
deleted file mode 100644
index 623cad6d..00000000
--- a/media-libs/harfbuzz/files/0001-Out-of-tree-build-fixes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 65736d8de622a793fc1201d71d2bfc25f6b2400b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 29 Oct 2012 00:42:38 +0100
-Subject: [PATCH 1/4] Out-of-tree build fixes
-
----
- src/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9f7c7f8..387defa 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -165,7 +165,7 @@ endif
- if HAVE_HB_OLD
- SUBDIRS += hb-old
- HBCFLAGS += -I$(srcdir)/hb-old
--HBLIBS += hb-old/libhb-old.la
-+HBLIBS += $(builddir)/hb-old/libhb-old.la
- HBSOURCES += hb-old.cc
- endif
- DIST_SUBDIRS += hb-old
-@@ -173,7 +173,7 @@ DIST_SUBDIRS += hb-old
- if HAVE_ICU_LE
- SUBDIRS += hb-icu-le
- HBCFLAGS += -I$(srcdir)/hb-icu-le
--HBLIBS += hb-icu-le/libhb-icu-le.la
-+HBLIBS += $(builddir)/hb-icu-le/libhb-icu-le.la
- HBSOURCES += hb-icu-le.cc
- endif
- DIST_SUBDIRS += hb-icu-le
-@@ -181,7 +181,7 @@ DIST_SUBDIRS += hb-icu-le
- if HAVE_UCDN
- SUBDIRS += hb-ucdn
- HBCFLAGS += -I$(srcdir)/hb-ucdn
--HBLIBS += hb-ucdn/libhb-ucdn.la
-+HBLIBS += $(builddir)/hb-ucdn/libhb-ucdn.la
- HBSOURCES += hb-ucdn.cc
- endif
- DIST_SUBDIRS += hb-ucdn
-@@ -251,11 +251,11 @@ bin_PROGRAMS =
-
- main_SOURCES = main.cc
- main_CPPFLAGS = $(HBCFLAGS)
--main_LDADD = libharfbuzz.la $(HBLIBS)
-+main_LDADD = $(builddir)/libharfbuzz.la $(HBLIBS)
-
- test_would_substitute_SOURCES = test-would-substitute.cc
- test_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS)
--test_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS)
-+test_would_substitute_LDADD = $(builddir)/libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS)
-
- dist_check_SCRIPTS = \
- check-c-linkage-decls.sh \
---
-1.7.12.4
-
diff --git a/media-libs/harfbuzz/files/0002-Add-build-configuration-summary.patch b/media-libs/harfbuzz/files/0002-Add-build-configuration-summary.patch
deleted file mode 100644
index 00746e8f..00000000
--- a/media-libs/harfbuzz/files/0002-Add-build-configuration-summary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2005d1c41f82f4a9508ef6218da94bb208a4e57d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 29 Oct 2012 22:04:30 +0100
-Subject: [PATCH 2/4] Add build configuration summary
-
----
- configure.ac | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 93b659b..ae462ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -263,3 +263,15 @@ test/shaping/Makefile
- ])
-
- AC_OUTPUT
-+
-+AC_MSG_NOTICE([
-+
-+Build configuration:
-+ glib: ${have_glib}
-+ cairo: ${have_cairo}
-+ icu: ${HAVE_ICU}
-+ graphite: ${have_graphite}
-+ freetype: ${have_freetype}
-+ Core text: ${have_coretext}
-+
-+])
---
-1.7.12.4
-
diff --git a/media-libs/harfbuzz/files/0003-Make-icu-support-optional.patch b/media-libs/harfbuzz/files/0003-Make-icu-support-optional.patch
deleted file mode 100644
index f28fd796..00000000
--- a/media-libs/harfbuzz/files/0003-Make-icu-support-optional.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 26fe8720c9699d37757cc92064a4975b9ac021cf Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 29 Oct 2012 22:04:46 +0100
-Subject: [PATCH 3/4] Make icu support optional
-
----
- configure.ac | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ae462ad..bcd3991 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -169,19 +169,23 @@ AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft)
-
- dnl ==========================================================================
-
-+AC_ARG_ENABLE([icu],
-+ AS_HELP_STRING([--disable-icu], [Disable icu support]),
-+ ,[enable_icu=yes])
-+
- PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false)
--if $have_icu; then
-+if test $enable_icu = "yes" && $have_icu; then
- AC_DEFINE(HAVE_ICU, 1, [Have ICU library])
- fi
--AM_CONDITIONAL(HAVE_ICU, $have_icu)
-+AM_CONDITIONAL(HAVE_ICU, test $enable_icu = "yes" && $have_icu)
-
- dnl ==========================================================================
-
- PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false)
--if $have_icu_le; then
-+if test $enable_icu = "yes" && $have_icu_le; then
- AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library])
- fi
--AM_CONDITIONAL(HAVE_ICU_LE, $have_icu_le)
-+AM_CONDITIONAL(HAVE_ICU_LE, test $enable_icu = "yes" && $have_icu_le)
-
- dnl ==========================================================================
-
---
-1.7.12.4
-
diff --git a/media-libs/harfbuzz/files/0004-Fix-API-tests.patch b/media-libs/harfbuzz/files/0004-Fix-API-tests.patch
deleted file mode 100644
index 664b84e8..00000000
--- a/media-libs/harfbuzz/files/0004-Fix-API-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c1bf3c22a0fccabd1646c7ed556880511e3fec8e Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 29 Oct 2012 22:32:11 +0100
-Subject: [PATCH 4/4] Fix API tests
-
----
- src/check-exported-symbols.sh | 2 +-
- src/check-internal-symbols.sh | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/check-exported-symbols.sh b/src/check-exported-symbols.sh
-index a7d6f9b..a8625ed 100755
---- a/src/check-exported-symbols.sh
-+++ b/src/check-exported-symbols.sh
-@@ -24,7 +24,7 @@ for def in $defs; do
- echo "Checking that $so has the same symbol list as $def"
- {
- echo EXPORTS
-- nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>' | cut -d' ' -f3
-+ nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v -E '( T _(fini|init)| D _edata| B _(end|_bss_start))' | cut -d' ' -f3
- stat=1
- # cheat: copy the last line from the def file!
- tail -n1 "$def"
-diff --git a/src/check-internal-symbols.sh b/src/check-internal-symbols.sh
-index f48d144..9dfe7c9 100755
---- a/src/check-internal-symbols.sh
-+++ b/src/check-internal-symbols.sh
-@@ -19,7 +19,7 @@ for suffix in .so; do
- so=`echo .libs/libharfbuzz$suffix`
- if test -f "$so"; then
- echo "Checking that we are not exposing internal symbols"
-- if nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' T _fini\>\| T _init\>\| T hb_'; then
-+ if nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v -E '( T _(fini|init)| D _edata| B _(end|_bss_start)| T hb_)'; then
- echo "Ouch, internal symbols exposed"
- stat=1
- fi
---
-1.7.12.4
-
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.5.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.5.ebuild
deleted file mode 100644
index 7ddfef0b..00000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.7.0_pre20110904.ebuild,v 1.4 2012/05/05 08:02:40 jdhore Exp $
-
-EAPI="5"
-
-inherit autotools eutils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="icu"
-
-RDEPEND="
- dev-libs/glib:2
- icu? ( dev-libs/icu )
- media-gfx/graphite2
- media-libs/freetype:2
- >=x11-libs/cairo-1.8[X]
-"
-DEPEND="${RDEPEND}
- dev-util/ragel
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/0001-Out-of-tree-build-fixes.patch \
- "${FILESDIR}"/0002-Add-build-configuration-summary.patch \
- "${FILESDIR}"/0003-Make-icu-support-optional.patch \
- "${FILESDIR}"/0004-Fix-API-tests.patch
- eautoreconf
-}
-
-src_configure() {
- # this packge needs build system update because
- # all the deps are automagic
- econf \
- --disable-static \
- $(use_enable icu)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
deleted file mode 100644
index 5d462030..00000000
--- a/media-libs/harfbuzz/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>openoffice</herd>
-</pkgmetadata>