fix build

2 files changed, 27 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84a405554235..5f130039c799 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Mar 21 07:47:53 UTC 2018
 pkgbase = fontview-git
-	pkgdesc = A simple font viewer.
-	pkgver = r211.ed212ae
+	pkgdesc = A simple font viewer
+	pkgver = r219.23a4679
 	pkgrel = 1
 	url = https://github.com/khaledhosny/fontview
 	arch = i686
@@ -13,10 +11,11 @@ pkgbase = fontview-git
 	depends = gtk3
 	depends = cairo
 	depends = freetype2
-	depends = harfbuzz
-	depends = intltool
-	source = fontview-git::git://github.com/khaledhosny/fontview.git
-	md5sums = SKIP
+	depends = pango
+	depends = fribidi
+	depends = fontconfig
+	depends = glib2
+	source = git+https://github.com/khaledhosny/fontview.git
+	sha256sums = SKIP
 
 pkgname = fontview-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 6afe1d8fe7b3..51c076bff885 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,35 @@
-# Maintainer: aksr <aksr at t-com dot me>
+# Maintainer: Funami
+# Contributor: aksr <aksr at t-com dot me>
 pkgname=fontview-git
-pkgver=r211.ed212ae
+pkgver=r219.23a4679
 pkgrel=1
-epoch=
-pkgdesc="A simple font viewer."
+pkgdesc="A simple font viewer"
 arch=('i686' 'x86_64')
 url="https://github.com/khaledhosny/fontview"
 license=('GPLv2')
-groups=()
-depends=('gtk3' 'cairo' 'freetype2' 'harfbuzz' 'intltool')
+depends=('gtk3' 'cairo' 'freetype2' 'pango' 'fribidi' 'fontconfig' 'glib2')
 makedepends=('git' 'meson')
-optdepends=()
-checkdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-changelog=
-install=
-source=("$pkgname::git://github.com/khaledhosny/fontview.git")
-noextract=()
-md5sums=('SKIP')
+source=("git+https://github.com/khaledhosny/fontview.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/$pkgname"
+  cd "${srcdir}/fontview"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/fontview"
+  sed -i '/i18n\.merge_file(/{n;d}' meson.build # fix "ERROR: Function does not take positional arguments."
+  arch-meson --buildtype=release build
+}
+
 build() {
-  cd "$srcdir/$pkgname"
-  meson --prefix /usr . build
-  ninja -C build
+  cd "${srcdir}/fontview"
+  meson compile -C build
 }
 
 package() {
-  cd "$srcdir/$pkgname"
-  DESTDIR=$pkgdir ninja -C build install
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  cd "${srcdir}/fontview"
+  meson install -C build --destdir "${pkgdir}"
+  install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-