adopt and cleanup

2 files changed, 41 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35922751c191..9c88a388282b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = octopi-kde-git
-	pkgdesc = This is Octopi, a powerful Pacman frontend using Qt libs (git version for KDE)
-	pkgver = 0.9.0.1408
+	pkgdesc = A powerful Pacman frontend using Qt libs (git version for KDE)
+	pkgver = r1410.b7fa1be
 	pkgrel = 1
 	url = https://github.com/aarnt/octopi
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index e1e19124b609..d4ccc046f800 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
-# Maintainer: kikadf <kikadf.01@gmail.com>
-
+# Maintainer: Stephan Springer <buzo+arch@Lini.de>
+# Contributor: kikadf <kikadf.01@gmail.com>
 
 pkgname=octopi-kde-git
-_pkgver=0.9.0
-pkgver=0.9.0.1408
+pkgver=r1410.b7fa1be
 pkgrel=1
-pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs (git version for KDE)"
+pkgdesc="A powerful Pacman frontend using Qt libs (git version for KDE)"
 url="https://github.com/aarnt/octopi"
 arch=('x86_64')
 license=('GPL2')
@@ -21,7 +20,7 @@ conflicts=('octopi' 'octopi-git' 'octopi-notifier-frameworks' 'octopi-notifier-q
            'octopi-notifier-noknotify' 'octopi-repoeditor' 'octopi-cachecleaner'
            'octopi-pacmanhelper')
 makedepends=('git')
-source=("${pkgname}::git+https://github.com/aarnt/octopi.git"
+source=("$pkgname::git+https://github.com/aarnt/octopi.git"
         "icons::git+https://gitlab.com/kikadf/octopicons.git"
         "https://code.chakralinux.org/packages/desktop/raw/master/octopi/0001-remove-qtermwidget.patch")
 md5sums=('SKIP'
@@ -29,12 +28,14 @@ md5sums=('SKIP'
          '5b56cd3d5d6e25a62c94055b2384aff3')
 
 pkgver() {
-    cd ${pkgname}
-    printf ${_pkgver}".%s" "$(git rev-list --count HEAD)"
+    cd "$pkgname"
+    printf "r%s.%s" \
+           "$(git rev-list --count HEAD)" \
+           "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd ${pkgname}
+    cd "$pkgname"
 
     # disable lxqt qtermwidget
     patch -Np1 -i ../0001-remove-qtermwidget.patch
@@ -43,65 +44,70 @@ prepare() {
     # enable the kstatus switch to build with Plasma/knotifications support
     sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier/octopi-notifier.pro
 
-    # set version
-    sed -e "s|0.9.0 (dev)|${_pkgver}.$(git rev-list --count HEAD)-${pkgrel} ($(git rev-parse --short HEAD))|g" -i src/strconstants.cpp
-
     cp resources/images/octopi_green.png resources/images/octopi.png
 }
 
 build() {
-    cd ${pkgname}
+    cd "$pkgname"
+    # set version
+    sed -e 's|"0.9.0"|"'$pkgver'"|g' -i src/strconstants.cpp
+
     export QTERMWIDGET=off
-    msg "Building octopi..."
-    qmake-qt5 octopi.pro
+    msg 'Building octopi…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi.pro
     make
 
     cd notifier/pacmanhelper
-    msg "Building pacmanhelper..."
-    qmake-qt5 pacmanhelper.pro
+    msg 'Building pacmanhelper…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" pacmanhelper.pro
     make
 
     cd ../octopi-notifier
-    msg "Building octopi-notifier..."
-    qmake-qt5 octopi-notifier.pro
+    msg 'Building octopi-notifier…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-notifier.pro
     make
 
     cd ../../repoeditor
-    msg "Building octopi-repoeditor..."
-    qmake-qt5 octopi-repoeditor.pro
+    msg 'Building octopi-repoeditor…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-repoeditor.pro
     make
 
     cd ../cachecleaner
-    msg "Building octopi-cachecleaner..."
-    qmake-qt5 octopi-cachecleaner.pro
+    msg 'Building octopi-cachecleaner…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-cachecleaner.pro
     make
 }
 
 package() {
-    cd ${pkgname}
-    make INSTALL_ROOT=${pkgdir} install
+    cd "$pkgname"
+    make INSTALL_ROOT="$pkgdir" install
 
     cd notifier/pacmanhelper
-    make INSTALL_ROOT=${pkgdir} install
+    make INSTALL_ROOT="$pkgdir" install
     cd ../..
 
     cd notifier/octopi-notifier
-    make INSTALL_ROOT=${pkgdir} install
+    make INSTALL_ROOT="$pkgdir" install
     cd ../..
 
     cd repoeditor
-    make INSTALL_ROOT=${pkgdir} install
+    make INSTALL_ROOT="$pkgdir" install
     cd ..
 
     cd cachecleaner
-    make INSTALL_ROOT=${pkgdir} install
+    make INSTALL_ROOT="$pkgdir" install
     cd ..
 
     #speedup files
-    install -D -m755 "speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh"
-    install -D -m644 "speedup/octopi.service" "${pkgdir}/usr/lib/systemd/system/octopi.service"
+    install -D -m755 speedup/speedup-octopi.sh "$pkgdir"/usr/bin/speedup-octopi.sh
+    install -D -m644 speedup/octopi.service "$pkgdir"/usr/lib/systemd/system/octopi.service
 
     # Add some icons to customize notifier
-    mkdir -p "${pkgdir}/usr/share/octopi/icons/"
-    cp ../icons/*.png "${pkgdir}/usr/share/octopi/icons/"
+    mkdir -p "$pkgdir"/usr/share/octopi/icons/
+    cp ../icons/*.png "$pkgdir"/usr/share/octopi/icons/
 }