Update to v0.1.5

2 files changed, 71 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aca34bb2f694..4f833cc3db69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,54 +1,49 @@
 pkgbase = caj2pdf-qt
 	pkgdesc = CAJ 转 PDF 转换器（GUI 版本）
-	pkgver = 0.1.4
-	pkgrel = 2
+	pkgver = 0.1.5
+	pkgrel = 1
 	url = https://caj2pdf-qt.sainnhe.dev
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = python
 	makedepends = cmake
-	depends = qt6-base
-	depends = gcc-libs
 	depends = glibc
-	depends = icu
-	depends = zstd
-	depends = glib2
-	depends = systemd-libs
+	depends = jbig2dec
+	depends = mupdf-tools
 	depends = zlib
-	depends = double-conversion
-	depends = libb2
-	depends = pcre2
+	depends = mupdf-tools
+	depends = qt5-base
+	depends = gcc-libs
 	depends = libglvnd
-	depends = fontconfig
-	depends = libx11
-	depends = libxkbcommon
 	depends = libpng
 	depends = harfbuzz
 	depends = md4c
+	depends = double-conversion
+	depends = icu
+	depends = pcre2
+	depends = zstd
+	depends = glib2
 	depends = freetype2
-	depends = pcre
-	depends = xz
-	depends = lz4
+	depends = graphite
 	depends = libcap
 	depends = libgcrypt
-	depends = expat
-	depends = libxcb
-	depends = dbus
-	depends = graphite
+	depends = xz
+	depends = lz4
+	depends = libx11
 	depends = bzip2
 	depends = brotli
 	depends = libgpg-error
+	depends = libxcb
 	depends = libxau
 	depends = libxdmcp
-	depends = openssl
-	depends = jbig2dec
-	depends = mupdf-tools
 	provides = caj2pdf-qt
 	conflicts = caj2pdf-qt
-	source = caj2pdf-qt::https://github.com/sainnhe/caj2pdf-qt/archive/refs/tags/v0.1.4.tar.gz
+	source = caj2pdf-qt::https://github.com/sainnhe/caj2pdf-qt/archive/refs/tags/v0.1.5.tar.gz
+	source = caj2pdf::https://github.com/caj2pdf/caj2pdf/archive/acce7c9ffd919e67b447e7baa8df2ae17b450dd4.zip
 	source = dev.sainnhe.caj2pdf-qt.desktop
-	md5sums = a8701f20d3ee0ec30d220abd7b4114f1
+	md5sums = 4034b7fab5b70649244604c75b309086
+	md5sums = 8fc97b57370fd00895049a80db37dd28
 	md5sums = 3068f1cbf4fb1d8c04a9f8afb3fb7d54
 
 pkgname = caj2pdf-qt
diff --git a/PKGBUILD b/PKGBUILD
index 66166c013ef4..3ecddb2c1a4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,76 @@
 # Maintainer: Sainnhe Park <sainnhe@gmail.com>
 pkgname=caj2pdf-qt
-pkgver=0.1.4
-pkgrel=2
+pkgver=0.1.5
+_caj2pdf_hash='acce7c9ffd919e67b447e7baa8df2ae17b450dd4'
+pkgrel=1
 pkgdesc='CAJ 转 PDF 转换器（GUI 版本）'
 arch=('x86_64')
 url='https://caj2pdf-qt.sainnhe.dev'
 license=('GPL')
-depends=('qt6-base' 'gcc-libs' 'glibc' 'icu' 'zstd' 'glib2' 'systemd-libs' 'zlib' 'double-conversion' 'libb2' 'pcre2' 'libglvnd' 'fontconfig' 'libx11' 'libxkbcommon' 'libpng' 'harfbuzz' 'md4c' 'freetype2' 'pcre' 'xz' 'lz4' 'libcap' 'libgcrypt' 'expat' 'libxcb' 'dbus' 'graphite' 'bzip2' 'brotli' 'libgpg-error' 'libxau' 'libxdmcp' 'openssl' 'jbig2dec' 'mupdf-tools')
+depends=('glibc'
+         'jbig2dec'
+         'mupdf-tools'
+         'zlib'
+         'mupdf-tools'
+         'qt5-base'
+         'gcc-libs'
+         'libglvnd'
+         'libpng'
+         'harfbuzz'
+         'md4c'
+         'double-conversion'
+         'icu'
+         'pcre2'
+         'zstd'
+         'glib2'
+         'freetype2'
+         'graphite'
+         'libcap'
+         'libgcrypt'
+         'xz'
+         'lz4'
+         'libx11'
+         'bzip2'
+         'brotli'
+         'libgpg-error'
+         'libxcb'
+         'libxau'
+         'libxdmcp')
 makedepends=('git' 'python' 'cmake')
 provides=('caj2pdf-qt')
 conflicts=('caj2pdf-qt')
 source=("${pkgname}::https://github.com/sainnhe/caj2pdf-qt/archive/refs/tags/v${pkgver}.tar.gz"
+        "caj2pdf::https://github.com/caj2pdf/caj2pdf/archive/${_caj2pdf_hash}.zip"
         'dev.sainnhe.caj2pdf-qt.desktop')
-md5sums=('a8701f20d3ee0ec30d220abd7b4114f1'
+md5sums=('4034b7fab5b70649244604c75b309086'
+         '8fc97b57370fd00895049a80db37dd28'
          '3068f1cbf4fb1d8c04a9f8afb3fb7d54')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  rmdir caj2pdf mupdf && git clone --depth=1 https://github.com/caj2pdf/caj2pdf.git
-  cd "${srcdir}/${pkgname}-${pkgver}/caj2pdf/lib"
-  gcc -Wall -fPIC -shared -o libjbigdec.so jbigdec.cc JBigDecode.cc
-  gcc -Wall -fPIC -shared -o libjbig2codec.so decode_jbig2data_x.cc
-  cd "${srcdir}/${pkgname}-${pkgver}/caj2pdf"
-  git apply ../caj2pdf.diff
-  python3 -m venv venv
-  ./venv/bin/python -m pip install pypdf2 pyinstaller
-  ./venv/bin/pyinstaller -F caj2pdf
+  rm -rf caj2pdf
+  mv "../caj2pdf-${_caj2pdf_hash}" ./caj2pdf
+  cd caj2pdf
+  git init
+  git add .
+  git config user.name "Anonymous"
+  git config user.email "noreply@localhost"
+  git commit -m "Init" || cd "."
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir build && cd build && cmake .. && make -j$(nproc)
+  ./build-unix.sh cli
+  ./build-unix.sh qt
 }
 
 package() {
-  install -Dm 644 "${srcdir}/dev.sainnhe.caj2pdf-qt.desktop" "${pkgdir}/usr/share/applications/dev.sainnhe.caj2pdf-qt.desktop"
-  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/icons/convert.png" "${pkgdir}/usr/share/${pkgname}/icon.png"
   install -Dm 755 "${srcdir}/${pkgname}-${pkgver}/build/caj2pdf" "${pkgdir}/usr/share/${pkgname}/caj2pdf"
   install -Dm 755 "${srcdir}/${pkgname}-${pkgver}/caj2pdf/dist/caj2pdf" "${pkgdir}/usr/share/${pkgname}/external/caj2pdf"
   install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/caj2pdf/lib/libjbigdec.so" "${pkgdir}/usr/share/${pkgname}/external/libjbigdec.so"
   install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/caj2pdf/lib/libjbig2codec.so" "${pkgdir}/usr/share/${pkgname}/external/libjbig2codec.so"
   ln -s /usr/bin/mutool "${pkgdir}/usr/share/${pkgname}/external/mutool"
+  install -Dm 644 "${srcdir}/dev.sainnhe.caj2pdf-qt.desktop" "${pkgdir}/usr/share/applications/dev.sainnhe.caj2pdf-qt.desktop"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/icons/convert.png" "${pkgdir}/usr/share/${pkgname}/icon.png"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.GPL3"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/README.md" "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  install -Dm 644 "${srcdir}/${pkgname}-${pkgver}/CHANGELOG.md" "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG.md"
   chmod a+w "${pkgdir}/usr/share/${pkgname}/external"
 }