[arch-commits] Commit in ktikz/trunk (PKGBUILD)

[Bruno Pagani]

    Date: Sunday, October 14, 2018 @ 17:13:14
  Author: archange
Revision: 393692

Add upstream patches to fix several issues

Modified:
  ktikz/trunk/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-14 16:53:58 UTC (rev 393691)
+++ PKGBUILD	2018-10-14 17:13:14 UTC (rev 393692)
@@ -3,7 +3,7 @@
 pkgbase=ktikz
 pkgname=('ktikz' 'qtikz')
 pkgver=0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)"
 arch=('x86_64')
 url="https://github.com/fhackenberger/ktikz"
@@ -11,24 +11,37 @@
 depends=('poppler-qt5')
 makedepends=('cmake' 'extra-cmake-modules' 'qt5-base' 'qt5-tools'
              'kdoctools' 'kxmlgui' 'ktexteditor' 'kparts' 'kiconthemes'
-             'poppler' 'poppler-qt5' 'kdelibs4support')
-source=(${pkgbase}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz")
-sha256sums=('ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d')
+             'poppler' 'poppler-qt5')
+source=(${pkgbase}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
+        reldir.patch::"${url}/commit/cfb52b1fe840aba8f9124d479df48edb61e943b8.patch"
+        docbook.patch::"${url}/commit/3b137b2a4f12f74a6bc68f3a6ac093994cc418a0.patch"
+        appdata.patch::"${url}/commit/bab16b2864888586c5d9044986e4891917addd08.patch"
+        icons.patch::"${url}/commit/d0ee62bf61650dafbb056ee3181ad162c2ba0894.patch")
+sha256sums=('ef15fe70f4e057eab74ed738886f8e4a53d5b1bcdf1ee329930bf06e22f56e9d'
+            'f420866c08c70119d597ffd36fac20d577700b921766a3168cd1b992ee84e2b6'
+            '6176ed492f228495256954b56c696904f6a66f8f12769801289d806dbaeb2003'
+            '0887348e7195e1c4e56b6cdcb6ae55a3928e75a0f07701472b53b8382d45ed20'
+            '3ffa029eab77bf7198e504a90c7e72d9d7922f9d83d6abcd65069f649abbfbbf')
 
 prepare() {
-    mkdir ${pkgbase}-${pkgver}/{build,buildqt}
+    mkdir build{,qt}
+    cd ${pkgbase}-${pkgver}
+    patch -p1 -i ../reldir.patch
+    patch -p1 -i ../docbook.patch
+    patch -p1 -i ../appdata.patch
+    patch -p1 -i ../icons.patch
 }
 
 build() {
     # Build ktikz
-    cd ${pkgbase}-${pkgver}/build
-    cmake .. \
+    cd build
+    cmake ../${pkgbase}-${pkgver} \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=None
     make
     # Build qtikz
     cd ../buildqt
-    qmake ../qtikz.pro
+    qmake ../${pkgbase}-${pkgver}/qtikz.pro
     make
 }
 
@@ -35,18 +48,19 @@
 package_ktikz() {
     pkgdesc+=" – KDE version"
     depends+=('kparts')
-    cd ${pkgbase}-${pkgver}/build
+    cd build
     make DESTDIR="${pkgdir}" install
 }
 
 package_qtikz() {
     pkgdesc+=" – Qt version"
-    cd ${pkgbase}-${pkgver}/buildqt
+    cd buildqt
     make INSTALL_ROOT="${pkgdir}" install
     # Fix icons path
     sed -i 's:Icon=/usr/share/qtikz/qtikz-128.png:Icon=qtikz:' "${pkgdir}"/usr/share/applications/qtikz.desktop
     rm "${pkgdir}"/usr/share/qtikz/qtikz-128.png
-    install -Dm644 ../app/icons/qtikz.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/qtikz.svg
-    install -Dm644 ../app/icons/qtikz-22.png "${pkgdir}"/usr/share/icons/hicolor/22x22/apps/qtikz.png
-    install -Dm644 ../app/icons/qtikz-128.png "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qtikz.png
+    cd ../${pkgbase}-${pkgver}/app/icons
+    install -Dm644 qtikz.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/qtikz.svg
+    install -Dm644 qtikz-22.png "${pkgdir}"/usr/share/icons/hicolor/22x22/apps/qtikz.png
+    install -Dm644 qtikz-128.png "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qtikz.png
 }