[arch-commits] Commit in lib32-harfbuzz/trunk (PKGBUILD remove-graphite.patch)

[Florian Pritz]

    Date: Friday, June 7, 2013 @ 19:52:40
  Author: bluewind
Revision: 92532

upgpkg: lib32-harfbuzz 0.9.18-1

upstream update

Modified:
  lib32-harfbuzz/trunk/PKGBUILD
Deleted:
  lib32-harfbuzz/trunk/remove-graphite.patch

-----------------------+
 PKGBUILD              |   14 +++++---------
 remove-graphite.patch |   15 ---------------
 2 files changed, 5 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-07 17:48:10 UTC (rev 92531)
+++ PKGBUILD	2013-06-07 17:52:40 UTC (rev 92532)
@@ -2,8 +2,8 @@
 
 _pkgbasename=harfbuzz
 pkgname=lib32-$_pkgbasename
-pkgver=0.9.17
-pkgrel=2
+pkgver=0.9.18
+pkgrel=1
 pkgdesc="OpenType text shaping engine. (32-bit)"
 arch=('x86_64')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -11,10 +11,8 @@
 depends=('lib32-icu' 'lib32-glib2' 'lib32-freetype2' $_pkgbasename)
 makedepends=('gcc-multilib')
 options=(!libtool)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${_pkgbasename}-${pkgver}.tar.bz2
-        remove-graphite.patch)
-sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed'
-            'bf89c8387b94638cd8f371931f8101a7c32b744023df252e1a0b67f4e82e9df4')
+source=(http://www.freedesktop.org/software/harfbuzz/release/${_pkgbasename}-${pkgver}.tar.bz2)
+sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908')
 
 build() {
   export CC="gcc -m32"
@@ -23,11 +21,9 @@
 
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  patch -p0 -i "$srcdir/remove-graphite.patch"
-
   # work around autogen.sh requiring ragel
   autoreconf --force --install --verbose
-  ./configure --prefix=/usr --libdir=/usr/lib32 --disable-silent-rules
+  ./configure --prefix=/usr --libdir=/usr/lib32 --disable-silent-rules --with-graphite2=no --without-cairo
   make
 }
 

Deleted: remove-graphite.patch
===================================================================
--- remove-graphite.patch	2013-06-07 17:48:10 UTC (rev 92531)
+++ remove-graphite.patch	2013-06-07 17:52:40 UTC (rev 92532)
@@ -1,15 +0,0 @@
---- configure_2012-11-21_104449.ac	2012-11-21 10:44:49.577069798 +0100
-+++ configure.ac	2012-11-21 10:51:47.620933574 +0100
-@@ -185,11 +185,7 @@
- 
- dnl ==========================================================================
- 
--PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false)
--if $have_graphite; then
--    AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library])
--fi
--AM_CONDITIONAL(HAVE_GRAPHITE2, $have_graphite)
-+AM_CONDITIONAL(HAVE_GRAPHITE2, 0)
- 
- dnl ==========================================================================
-