Minor fix

3 files changed, 87 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06eaad01215d..e966099b35b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = mingw-w64-harfbuzz
 	pkgdesc = OpenType text shaping engine (mingw-w64)
 	pkgver = 1.7.6
 	pkgrel = 1
-	url = http://www.freedesktop.org/wiki/Software/HarfBuzz
+	url = https://www.freedesktop.org/wiki/Software/HarfBuzz
 	arch = any
 	license = MIT
 	makedepends = mingw-w64-configure
@@ -10,11 +10,14 @@ pkgbase = mingw-w64-harfbuzz
 	makedepends = mingw-w64-icu
 	makedepends = mingw-w64-graphite
 	makedepends = mingw-w64-freetype2
+	makedepends = python
+	makedepends = gtk-doc
 	makedepends = ragel
 	makedepends = git
+	depends = mingw-w64-crt
 	options = !strip
-	options = !buildflags
 	options = staticlibs
+	options = !buildflags
 	source = git+https://anongit.freedesktop.org/git/harfbuzz#commit=ff2f81432bb0484a019a678058595e10217df51d
 	sha256sums = SKIP
 
@@ -24,7 +27,7 @@ pkgname = mingw-w64-harfbuzz
 	depends = mingw-w64-graphite
 
 pkgname = mingw-w64-harfbuzz-icu
-	pkgdesc = OpenType text shaping engine (ICU integration) (mingw-w64)
+	pkgdesc = OpenType text shaping engine (ICU integration, mingw-w64)
 	depends = mingw-w64-harfbuzz
 	depends = mingw-w64-icu
 
diff --git a/.gitignore b/.gitignore
index c61dfc114ebf..97589fb4de69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-harfbuzz/
-pkg/
-src/
-*.bz2
-*.log
-*.tar
-*.xz
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.diff
diff --git a/PKGBUILD b/PKGBUILD
index a89e25ac1282..2a65552f7bfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,31 @@
+# Maintainer: pingplug <pingplug@foxmail.com>
+# Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
+
+_commit=ff2f81432bb0484a019a678058595e10217df51d  # tags/1.7.6^0
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 pkgbase=mingw-w64-harfbuzz
-pkgname=(mingw-w64-harfbuzz mingw-w64-harfbuzz-icu)
+pkgname=('mingw-w64-harfbuzz' 'mingw-w64-harfbuzz-icu')
 pkgver=1.7.6
 pkgrel=1
-_commit=ff2f81432bb0484a019a678058595e10217df51d  # tags/1.7.6^0
 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 mingw-w64-graphite mingw-w64-freetype2 ragel git)
-options=(!strip !buildflags staticlibs)
-source=("git+https://anongit.freedesktop.org/git/harfbuzz#commit=$_commit")
+arch=('any')
+url="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+license=('MIT')
+depends=('mingw-w64-crt')
+makedepends=('mingw-w64-configure'
+             'mingw-w64-cairo'
+             'mingw-w64-icu'
+             'mingw-w64-graphite'
+             'mingw-w64-freetype2'
+             'python'
+             'gtk-doc'
+             'ragel'
+             'git')
+options=('!strip' 'staticlibs' '!buildflags')
+source=("git+https://anongit.freedesktop.org/git/harfbuzz#commit=${_commit}")
 sha256sums=('SKIP')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
 pkgver() {
   cd harfbuzz
   git describe --tags | sed 's/-/+/g'
@@ -26,68 +38,71 @@ prepare() {
   NOCONFIGURE=1 ./autogen.sh
 }
 
-
 build() {
-	cd harfbuzz
-	unset LDFLAGS
-	for _arch in ${_architectures}; do
-		# Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC
-    # manually when building static version
+  cd harfbuzz
+  for _arch in ${_architectures}; do
+  # Build static and shared libs separately due to necessity of defining DGRAPHITE2_STATIC
+  # manually when building static version
 
-    # static build
-    mkdir -p build-${_arch}-static && pushd build-${_arch}-static
-    CFLAGS=-DGRAPHITE2_STATIC CXXFLAGS=-DGRAPHITE2_STATIC ${_arch}-configure \
-      --with-glib \
-      --with-freetype \
-      --with-cairo \
-      --with-icu \
-      --with-gobject \
-      --with-graphite2 \
-      --enable-static=yes \
-      --enable-shared=no
-    make
-    popd
-    # shared build
-    mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
-    ${_arch}-configure \
-      --with-glib \
-      --with-freetype \
-      --with-cairo \
-      --with-icu \
-      --with-gobject \
-      --with-graphite2 \
-      --enable-static=no \
-      --enable-shared=yes
-    make
-    popd
-	done
+  # static build
+  mkdir -p build-${_arch}-static && pushd build-${_arch}-static
+  CFLAGS=-DGRAPHITE2_STATIC CXXFLAGS=-DGRAPHITE2_STATIC ${_arch}-configure \
+    --with-glib \
+    --with-freetype \
+    --with-cairo \
+    --with-icu \
+    --with-gobject \
+    --with-graphite2 \
+    --enable-static=yes \
+    --enable-shared=no
+  make
+  popd
+  # shared build
+  mkdir -p build-${_arch}-shared && pushd build-${_arch}-shared
+  ${_arch}-configure \
+    --with-glib \
+    --with-freetype \
+    --with-cairo \
+    --with-icu \
+    --with-gobject \
+    --with-graphite2 \
+    --enable-static=no \
+    --enable-shared=yes
+  make
+  popd
+  done
 }
 
 package_mingw-w64-harfbuzz() {
-	depends=(mingw-w64-freetype2 mingw-w64-glib2 mingw-w64-graphite)
+  depends=('mingw-w64-freetype2'
+           'mingw-w64-glib2'
+           'mingw-w64-graphite')
   for _arch in ${_architectures}; do
     cd "${srcdir}/harfbuzz/build-${_arch}-static"
     make DESTDIR="${pkgdir}" install
     cd "${srcdir}/harfbuzz/build-${_arch}-shared"
     make DESTDIR="${pkgdir}" install
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
-    
+    find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
+    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
+    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/build-${_arch}-shared"
-		mkdir -p "$pkgdir/usr/${_arch}"
-		mv hb-icu/usr/${_arch}/* "$pkgdir/usr/${_arch}"
-	done
+  pkgdesc="OpenType text shaping engine (ICU integration, mingw-w64)"
+  depends=('mingw-w64-harfbuzz'
+           'mingw-w64-icu')
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/harfbuzz/build-${_arch}-shared"
+    mkdir -p "${pkgdir}/usr/${_arch}"
+    mv hb-icu/usr/${_arch}/* "${pkgdir}/usr/${_arch}"
+  done
 }
+
+# vim:set ts=2 sw=2 et: