revision

2 files changed, 30 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5cd9b9a5dda6..13701b850333 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sioyek-git
 	pkgdesc = PDF viewer for research papers and technical books.
-	pkgver = 1.4.0.r4.gd65898a
-	pkgrel = 1
+	pkgver = 1.4.0.r12.gbadd7ee
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/ahrm/sioyek
 	arch = x86_64
@@ -10,18 +10,17 @@ pkgbase = sioyek-git
 	makedepends = qt5-3d
 	makedepends = libmupdf
 	makedepends = mujs
+	makedepends = gumbo-parser
+	makedepends = openjpeg2
+	makedepends = jbig2dec
+	makedepends = glu
 	depends = qt5-base
 	depends = harfbuzz
-	depends = gumbo-parser
-	depends = openjpeg2
-	depends = jbig2dec
 	provides = sioyek
 	conflicts = sioyek
 	source = git+https://github.com/ahrm/sioyek.git
-	source = git+https://github.com/ArtifexSoftware/mupdf.git
-	source = git+https://github.com/madler/zlib.git
-	sha256sums = SKIP
-	sha256sums = SKIP
+	source = https://mupdf.com/downloads/archive/mupdf-1.19.1-source.tar.xz
 	sha256sums = SKIP
+	sha256sums = b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
 
 pkgname = sioyek-git
diff --git a/PKGBUILD b/PKGBUILD
index 7e621ce3ab13..eccf327df8a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,52 +2,47 @@
 # Contributor: Philipp Kühn <p dot kuehn at posteo dot de>
 
 pkgname=sioyek-git
-pkgver=1.4.0.r4.gd65898a
-pkgrel=1
+pkgver=1.4.0.r12.gbadd7ee
+pkgrel=2
 epoch=1
 pkgdesc="PDF viewer for research papers and technical books."
 arch=(x86_64)
 license=(GPL3)
 url="https://github.com/ahrm/sioyek"
-depends=(qt5-base harfbuzz gumbo-parser openjpeg2 jbig2dec)
-makedepends=(git qt5-3d libmupdf mujs)
+depends=(qt5-base harfbuzz)
+makedepends=(git qt5-3d libmupdf mujs gumbo-parser openjpeg2 jbig2dec glu)
 provides=(sioyek)
 conflicts=(sioyek)
+_mupdf=1.19.1
 source=("git+https://github.com/ahrm/sioyek.git"
-        "git+https://github.com/ArtifexSoftware/mupdf.git"
-        "git+https://github.com/madler/zlib.git")
+        "https://mupdf.com/downloads/archive/mupdf-${_mupdf}-source.tar.xz")
 sha256sums=('SKIP'
-            'SKIP'
-            'SKIP')
+            'b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e')
 
 pkgver() {
-	cd "sioyek"
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "sioyek"
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-	cd "sioyek"
-	git submodule init
-    git config submodule.mupdf.url "${srcdir}/mupdf"
-    git config submodule.zlib.url "${srcdir}/zlib"
-	git submodule update
+  cp -r mupdf-${_mupdf}-source/* sioyek/mupdf
 }
 
 build() {
-	#cd "sioyek/mupdf"
-    #make USE_SYSTEM_HARFBUZZ=yes
-    #cd ..
-	cd "sioyek"
+  cd "sioyek/mupdf"
+  #rm -rf thirdparty/{freeglut,freetype,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
+  #USE_SYSTEM_LIBS='yes'
+  #export USE_SYSTEM_LIBS
 
-    sed -i 's/-lmupdf-third -lmupdf-threads -lharfbuzz/-lmupdf-third -lharfbuzz -lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg/' pdf_viewer_build_config.pro
-    qmake-qt5 pdf_viewer_build_config.pro DEFINES+="LINUX_STANDARD_PATHS"
-    make
+  cd ..
+  sed -i 's/\/\/#define LINUX_STANDARD_PATHS/#define LINUX_STANDARD_PATHS/' pdf_viewer/main.cpp
+  ./build_linux.sh
 }
 
 package() {
-	cd "sioyek"
-    make INSTALL_ROOT="${pkgdir}/" install
-    install -D tutorial.pdf -t "${pkgdir}/usr/share/sioyek"
-    install -d "${pkgdir}/usr/share/sioyek/shaders"
-    cp -r pdf_viewer/shaders/* "${pkgdir}/usr/share/sioyek/shaders"
+  cd "sioyek"
+  make INSTALL_ROOT="${pkgdir}/" install
+  install -D tutorial.pdf -t "${pkgdir}/usr/share/sioyek"
+  install -d "${pkgdir}/usr/share/sioyek/shaders"
+  cp -r pdf_viewer/shaders/* "${pkgdir}/usr/share/sioyek/shaders"
 }