[arch-commits] Commit in lib32-harfbuzz/repos/multilib-x86_64 (4 files)

[Florian Pritz]

    Date: Thursday, March 28, 2013 @ 10:49:36
  Author: bluewind
Revision: 87154

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD
    (from rev 87153, lib32-harfbuzz/trunk/PKGBUILD)
  lib32-harfbuzz/repos/multilib-x86_64/remove-graphite.patch
    (from rev 87153, lib32-harfbuzz/trunk/remove-graphite.patch)
Deleted:
  lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD
  lib32-harfbuzz/repos/multilib-x86_64/remove-graphite.patch

-----------------------+
 PKGBUILD              |   82 ++++++++++++++++++++++++------------------------
 remove-graphite.patch |   30 ++++++++---------
 2 files changed, 57 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-28 09:49:30 UTC (rev 87153)
+++ PKGBUILD	2013-03-28 09:49:36 UTC (rev 87154)
@@ -1,40 +0,0 @@
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-
-_pkgbasename=harfbuzz
-pkgname=lib32-$_pkgbasename
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="OpenType text shaping engine. (32-bit)"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=('MIT')
-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=('3d8dd4ebbc38da011485ef181f8ff072b4b0d7e305bbda19b355f217d25169cf'
-            'bf89c8387b94638cd8f371931f8101a7c32b744023df252e1a0b67f4e82e9df4')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  patch -p0 -i "$srcdir/remove-graphite.patch"
-
-  ./autogen.sh --prefix=/usr --libdir=/usr/lib32 --disable-silent-rules
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}

Copied: lib32-harfbuzz/repos/multilib-x86_64/PKGBUILD (from rev 87153, lib32-harfbuzz/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-03-28 09:49:36 UTC (rev 87154)
@@ -0,0 +1,42 @@
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+
+_pkgbasename=harfbuzz
+pkgname=lib32-$_pkgbasename
+pkgver=0.9.14
+pkgrel=1
+pkgdesc="OpenType text shaping engine. (32-bit)"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+license=('MIT')
+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=('d07c0ffdbbbfdfbb6c65e73fe9c76466e87dbf04b094cbd0abf5fd7d571a4004'
+            'bf89c8387b94638cd8f371931f8101a7c32b744023df252e1a0b67f4e82e9df4')
+
+build() {
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  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
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}

Deleted: remove-graphite.patch
===================================================================
--- remove-graphite.patch	2013-03-28 09:49:30 UTC (rev 87153)
+++ remove-graphite.patch	2013-03-28 09:49:36 UTC (rev 87154)
@@ -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 ==========================================================================
- 

Copied: lib32-harfbuzz/repos/multilib-x86_64/remove-graphite.patch (from rev 87153, lib32-harfbuzz/trunk/remove-graphite.patch)
===================================================================
--- remove-graphite.patch	                        (rev 0)
+++ remove-graphite.patch	2013-03-28 09:49:36 UTC (rev 87154)
@@ -0,0 +1,15 @@
+--- 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 ==========================================================================
+