octopi-0.9.0-4.parabola2: rebuild

2 files changed, 183 insertions, 68 deletions

diff --git a/pcr/octopi/0001-remove-qtermwidget.patch b/pcr/octopi/0001-remove-qtermwidget.patch
new file mode 100644
index 000000000..2d491b2b1
--- /dev/null
+++ b/pcr/octopi/0001-remove-qtermwidget.patch
@@ -0,0 +1,109 @@
+From 992761b6c71740729c05f6312b8f46ae036e3186 Mon Sep 17 00:00:00 2001
+From: BrLi <rainman59118@gmail.com>
+Date: Sat, 24 Feb 2018 20:45:34 +0800
+Subject: [PATCH] remove qtermwidget
+
+---
+ notifier/octopi-notifier/octopi-notifier.pro | 16 ++--------------
+ octopi.pro                                   | 16 ++--------------
+ 2 files changed, 4 insertions(+), 28 deletions(-)
+
+diff --git a/notifier/octopi-notifier/octopi-notifier.pro b/notifier/octopi-notifier/octopi-notifier.pro
+index a3902e2..c6c3a86 100644
+--- a/notifier/octopi-notifier/octopi-notifier.pro
++++ b/notifier/octopi-notifier/octopi-notifier.pro
+@@ -8,8 +8,8 @@ QT += core xml gui network dbus
+ 
+ # This controls whether octopi-notifier uses KStatusNotifier lib
+ # You SHOULD REALLY enable KSTATUS define in plasma 5 desktops!
+-DEFINES += ALPM_BACKEND QTERMWIDGET #KSTATUS
+-CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
++DEFINES += ALPM_BACKEND #KSTATUS
++CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
+ 
+ ALPM_BACKEND {
+   QMAKE_CXXFLAGS += -std=c++11
+@@ -19,10 +19,6 @@ ALPM_BACKEND {
+   QMAKE_CXXFLAGS += -std=c++11
+ }
+ 
+-QTERMWIDGET {
+-  LIBS += -lqtermwidget5
+-}
+-
+ contains(DEFINES, KSTATUS){
+   QT += KNotifications
+ }
+@@ -56,10 +52,6 @@ HEADERS  += \
+     ../../src/searchbar.h \
+     ../../src/optionsdialog.h
+ 
+-QTERMWIDGET{
+-  HEADERS += ../../src/termwidget.h
+-}
+-
+ ALPM_BACKEND{
+   HEADERS += ../../src/alpmbackend.h
+ }
+@@ -82,10 +74,6 @@ SOURCES += main.cpp \
+     ../../src/searchbar.cpp \
+     ../../src/optionsdialog.cpp
+ 
+-QTERMWIDGET{
+-  SOURCES += ../../src/termwidget.cpp
+-}
+-
+ ALPM_BACKEND{
+   SOURCES += ../../src/alpmbackend.cpp
+ }
+diff --git a/octopi.pro b/octopi.pro
+index 815ea21..f8ac381 100644
+--- a/octopi.pro
++++ b/octopi.pro
+@@ -5,8 +5,8 @@
+ #-------------------------------------------------
+ 
+ QT += core gui network xml dbus widgets
+-DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND QTERMWIDGET
+-CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
++DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND
++CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
+ 
+ ALPM_BACKEND {
+   QMAKE_CXXFLAGS += -std=c++11
+@@ -16,10 +16,6 @@ ALPM_BACKEND {
+   QMAKE_CXXFLAGS += -std=c++11
+ }
+ 
+-QTERMWIDGET {
+-  LIBS += -lqtermwidget5
+-}
+-
+ TEMPLATE = app
+ DESTDIR += bin
+ OBJECTS_DIR += build
+@@ -53,10 +49,6 @@ HEADERS += src/QtSolutions/qtsingleapplication.h \
+         src/constants.h \
+         src/optionsdialog.h
+ 
+-QTERMWIDGET{
+-  HEADERS += src/termwidget.h
+-}
+-
+ ALPM_BACKEND{
+   HEADERS += src/alpmbackend.h
+ }
+@@ -94,10 +86,6 @@ SOURCES += src/QtSolutions/qtsingleapplication.cpp \
+         src/pacmanexec.cpp \
+         src/optionsdialog.cpp
+ 
+-QTERMWIDGET{
+-  SOURCES += src/termwidget.cpp
+-}
+-
+ ALPM_BACKEND{
+   SOURCES += src/alpmbackend.cpp
+ }
+-- 
+2.16.2
+
diff --git a/pcr/octopi/PKGBUILD b/pcr/octopi/PKGBUILD
index d70241507..28104a523 100644
--- a/pcr/octopi/PKGBUILD
+++ b/pcr/octopi/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer (Arch): kikadf <kikadf.01@gmail.com>
+# Maintainer (Arch): Stephan Springer <buzo+arch@Lini.de>
+# Contributor (Arch): kikadf <kikadf.01@gmail.com>
 # Contributor (Arch): Jameson Pugh <imntreal@gmail.com>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
@@ -16,13 +17,15 @@
 # To disable, uncomment line below
 #DISABLE_QTERMWIDGET='1'
 
-
 pkgname=octopi
 pkgver=0.9.0
-pkgrel=1.parabola3
-pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs, without nonfree pacaur, pikaur, trizen, and yaourt recommendation"
+pkgrel=4
+pkgrel+=.parabola2
+pkgdesc="A powerful Pacman frontend using Qt libs"
+pkgdesc+=", without nonfree pacaur, pikaur and trizen recommendation"
 url="http://octopiproject.wordpress.com"
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 license=('GPL2')
 depends=('qtermwidget' 'pkgfile' 'alpm_octopi_utils' 'qt5-declarative' 'pacman-contrib')
 [[ ${USE_NOTIFIER} == "1" ]] && depends+=('knotifications')
@@ -38,91 +41,94 @@ conflicts=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor'
 replaces=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor'
           'octopi-git' 'octopi-kde-git')
 source=('octopi-repoeditor.desktop'
-        "https://code.chakralinux.org/packages/desktop/raw/master/octopi/0001-remove-qtermwidget.patch"
-        "icons::git+https://gitlab.com/kikadf/octopicons.git")
+        '0001-remove-qtermwidget.patch'
+        'icons::git+https://gitlab.com/kikadf/octopicons.git')
 sha256sums=('131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
             'bdf668ae3bcbac4bf908d96ce4115bac77bf8d4e58796d12fc2cd4e8ee8294e7'
             'SKIP')
 if [ "${USE_SOURCE}" = "" ]; then
-  source+=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz")
-  sha256sums+=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822')
-  _cd_path="${pkgname}-${pkgver}"
+    source+=("$pkgname.$pkgver.tar.gz::https://github.com/aarnt/$pkgname/archive/v$pkgver.tar.gz")
+    sha256sums+=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822')
+    _cd_path="${pkgname}-${pkgver}"
 else
-  source+=("${pkgname}-${USE_SOURCE}.tar.gz::https://github.com/aarnt/octopi/archive/${USE_SOURCE}.tar.gz")
-  sha256sums+=('SKIP')
-  _cd_path="${pkgname}-${USE_SOURCE}"
+    source+=("${pkgname}-${USE_SOURCE}.tar.gz::https://github.com/aarnt/octopi/archive/${USE_SOURCE}.tar.gz")
+    sha256sums+=('SKIP')
+    _cd_path="${pkgname}-${USE_SOURCE}"
 fi
 
-
 prepare() {
-  cd ${_cd_path}
+    cd "$_cd_path"
 
-  # disable lxqt qtermwidget
-  [[ ${DISABLE_QTERMWIDGET} == "1" ]] && patch -Np1 -i ../0001-remove-qtermwidget.patch && rm -rfv src/termwidget.{cpp,h}
+    # disable lxqt qtermwidget
+    [[ ${DISABLE_QTERMWIDGET} == "1" ]] && patch -Np1 -i ../0001-remove-qtermwidget.patch && rm -rfv src/termwidget.{cpp,h}
 
-  # enable the kstatus switch to build with Plasma/knotifications support
-  [[ ${USE_NOTIFIER} == "1" ]] && sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier/octopi-notifier.pro
+    # enable the kstatus switch to build with Plasma/knotifications support
+    [[ ${USE_NOTIFIER} == "1" ]] && sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier/octopi-notifier.pro
 
-  # set version
-  [[ ${USE_SOURCE} != "" ]] && sed -e "s|${pkgver}|${pkgver} (${USE_SOURCE})|g" -i src/strconstants.cpp
+    # set version
+    [[ ${USE_SOURCE} != "" ]] && sed -e "s|${pkgver}|${pkgver} (${USE_SOURCE})|g" -i src/strconstants.cpp
 
-  cp resources/images/octopi_green.png resources/images/octopi.png
+    cp resources/images/octopi_green.png resources/images/octopi.png
 }
 
 build() {
-  cd ${_cd_path}
-  [[ ${DISABLE_QTERMWIDGET} == "1" ]] && export QTERMWIDGET=off
-  msg "Building octopi..."
-  qmake-qt5 octopi.pro
-  make
-
-  cd notifier/pacmanhelper
-  msg "Building pacmanhelper..."
-  qmake-qt5 pacmanhelper.pro
-  make
-
-  cd ../octopi-notifier
-  msg "Building octopi-notifier..."
-  qmake-qt5 octopi-notifier.pro
-  make
-
-  cd ../../repoeditor
-  msg "Building octopi-repoeditor..."
-  qmake-qt5 octopi-repoeditor.pro
-  make
-
-  cd ../cachecleaner
-  msg "Building octopi-cachecleaner..."
-  qmake-qt5 octopi-cachecleaner.pro
-  make
+    cd "$_cd_path"
+    [[ ${DISABLE_QTERMWIDGET} == '1' ]] && export QTERMWIDGET=off
+    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 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" pacmanhelper.pro
+    make
+
+    cd ../octopi-notifier
+    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 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-repoeditor.pro
+    make
+
+    cd ../cachecleaner
+    msg 'Building octopi-cachecleaner…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-cachecleaner.pro
+    make
 }
 
 package() {
-  cd ${_cd_path}
-  make INSTALL_ROOT=${pkgdir} install
+    cd "$_cd_path"
+    make INSTALL_ROOT="$pkgdir" install
 
-  cd notifier/pacmanhelper
-  make INSTALL_ROOT=${pkgdir} install
-  cd ../..
+    cd notifier/pacmanhelper
+    make INSTALL_ROOT="$pkgdir" install
+    cd ../..
 
-  cd notifier/octopi-notifier
-  make INSTALL_ROOT=${pkgdir} install
-  cd ../..
+    cd notifier/octopi-notifier
+    make INSTALL_ROOT="$pkgdir" install
+    cd ../..
 
-  cd repoeditor
-  make INSTALL_ROOT=${pkgdir} install
-  install -D -m644 "${srcdir}/octopi-repoeditor.desktop" "${pkgdir}/usr/share/applications/octopi-repoeditor.desktop"
-  cd ..
+    cd repoeditor
+    make INSTALL_ROOT="$pkgdir" install
+    install -D -m644 "$srcdir"/octopi-repoeditor.desktop "$pkgdir"/usr/share/applications/octopi-repoeditor.desktop
 
-  cd cachecleaner
-  make INSTALL_ROOT=${pkgdir} install
-  cd ..
+    cd ../cachecleaner
+    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"
+    #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
 
-  # Add some icons to customize notifier
-  mkdir -p "${pkgdir}/usr/share/octopi/icons/"
-  cp ../icons/*.png "${pkgdir}/usr/share/octopi/icons/"
+    # Add some icons to customize notifier
+    mkdir -p "$pkgdir"/usr/share/octopi/icons/
+    cp ../icons/*.png "$pkgdir"/usr/share/octopi/icons/
 }