1.1.1 and pkg split

1 files changed, 22 insertions, 6 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6538318c1057..c8e125c29d47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,15 @@
-pkgname=mingw-w64-harfbuzz
-pkgver=1.1.0
+pkgbase=mingw-w64-harfbuzz
+pkgname=(mingw-w64-harfbuzz mingw-w64-harfbuzz-icu)
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="OpenType text shaping engine (mingw-w64)"
 arch=(any)
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=("MIT")
 makedepends=(mingw-w64-configure mingw-w64-cairo mingw-w64-icu)
-depends=(mingw-w64-freetype2 mingw-w64-glib2)
 options=(!strip !buildflags staticlibs)
-optdepends=("mingw-w64-icu: harfbuzz-icu")
 source=("http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${pkgver}.tar.bz2")
-sha256sums=('0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b')
+sha256sums=('0c366a77276fa69d40006cf8a2f2dbcd82f3fb406f3960c3c3a0d34dd3a0f06c')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
@@ -39,12 +38,29 @@ build() {
 	done
 }
 
-package() {
+package_mingw-w64-harfbuzz() {
+	depends=(mingw-w64-freetype2 mingw-w64-glib2)
   for _arch in ${_architectures}; do
     cd "${srcdir}/harfbuzz-${pkgver}/build-${_arch}"
 		make DESTDIR="${pkgdir}" install
     find "$pkgdir/usr/${_arch}" -name '*.exe' -exec rm {} \;
     find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
     find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    
+    mkdir -p hb-icu/usr/${_arch}/{bin,include/harfbuzz,lib/pkgconfig}; cd hb-icu
+    mv "$pkgdir"/usr/${_arch}/bin/libharfbuzz-icu* ./usr/${_arch}/bin
+		mv "$pkgdir"/usr/${_arch}/lib/libharfbuzz-icu* ./usr/${_arch}/lib
+		mv "$pkgdir"/usr/${_arch}/lib/pkgconfig/harfbuzz-icu.pc ./usr/${_arch}/lib/pkgconfig
+		mv "$pkgdir"/usr/${_arch}/include/harfbuzz/hb-icu.h ./usr/${_arch}/include/harfbuzz
   done
 }
+
+package_mingw-w64-harfbuzz-icu() {
+	pkgdesc="OpenType text shaping engine (ICU integration) (mingw-w64)"
+	depends=(mingw-w64-harfbuzz mingw-w64-icu)
+	for _arch in ${_architectures}; do
+		cd "${srcdir}/harfbuzz-${pkgver}/build-${_arch}"
+		mkdir -p "$pkgdir/usr/${_arch}"
+		mv hb-icu/usr/${_arch}/* "$pkgdir/usr/${_arch}"
+	done
+}