patch build.sh

2 files changed, 11 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f00f8ce85cfc..a34af51443c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by makepkg 4.2.1
-# Sun Apr 19 15:14:12 UTC 2015
 pkgbase = llpp-git
 	pkgdesc = Fast, featureful PDF viewer based on MuPDF.
-	pkgver = 21.r61.gdf146ab
+	pkgver = 22
 	pkgrel = 1
 	url = http://repo.or.cz/w/llpp.git
 	install = llpp.install
diff --git a/PKGBUILD b/PKGBUILD
index 5fb74db323c7..42b1bdda6616 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: Flu
 
 pkgname=llpp-git
-pkgver=21.r61.gdf146ab
+pkgver=22
 pkgrel=1
 pkgdesc='Fast, featureful PDF viewer based on MuPDF.'
 arch=('i686' 'x86_64')
@@ -42,24 +42,21 @@ pkgver() {
   git describe --tags | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
-prepare() {
-  cd llpp
-  patch -p1 < ../fix-libs.patch
-}
-
 build() {
   cd llpp
-  sh configure.sh -n .
-  ninja "$srcdir"/llpp/build/llpp.custom
-  make -C misc/completions
+
+  sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I /usr/include/freetype2+' build.sh
+  sed -i -e 's+-lopenjpeg+-lopenjp2+' build.sh
+  sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
+
+  sh build.sh build
 }
 
 package() {
   cd llpp
-  install -Dm755 build/llpp.custom "$pkgdir"/usr/bin/llpp
-  install -Dm755 misc/llppac "$pkgdir"/usr/bin/llppac
-  install -Dm755 misc/gc.py "$pkgdir"/usr/lib/llpp/gc
+  install -Dm755 build/llpp "$pkgdir"/usr/bin/llpp
+
   install -Dm644 misc/llpp.desktop "$pkgdir"/usr/share/applications/llpp.desktop
   install -Dm644 README "$pkgdir"/usr/share/licenses/llpp/README
-  make -C misc/completions DESTDIR="$pkgdir" PREFIX=/usr install
+  #make -C misc/completions DESTDIR="$pkgdir" PREFIX=/usr install
 }