Commit 921f915b authored by Philip Müller's avatar Philip Müller

[pkg-upd] 0.9.0-8

- try to fix octopi somehow
parent 16310b06
......@@ -10,12 +10,12 @@
## https://classicforum.manjaro.org/index.php?topic=17673.msg171500#msg171500
pkgbase=octopi
pkgname=('octopi' 'octopi-repoeditor' 'octopi-pacmanhelper' 'octopi-cachecleaner'
'octopi-notifier-qt5' 'octopi-notifier-frameworks')
pkgname=('octopi' 'octopi-notifier-qt5' 'octopi-notifier-frameworks') #'octopi-repoeditor' 'octopi-cachecleaner'
pkgver=0.9.0
pkgrel=7
pkgrel=8
# This is the release package so the below _gitcommit variable should (usually) be commented out.
_gitcommit=f94ee1a04b0ca623fb0cae921b5f880692f78608
#_gitcommit=f94ee1a04b0ca623fb0cae921b5f880692f78608
_gitcommit=359584ba93ebe95df63cbc6d680f74b9e20345c6
arch=('i686' 'x86_64')
url="http://octopiproject.wordpress.com"
license=('GPL2')
......@@ -26,9 +26,9 @@ if [ "${_gitcommit}" != "" ]; then
else
source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
fi
source+=('remove-qdialog.patch')
sha256sums=('aafd3f0386ffeaf54754d60855c5a4d7004c4b6675a9a4b02073ba90fc2385dc'
'af8ebc8892a37c866556df391a078a50c6c56a4425e7ef31d35b27871e490229')
#source+=('remove-qdialog.patch')
sha256sums=('acb94b8a5d99e62717dff7af314430355a01602719337090393ddfc7502e4c17')
# 'af8ebc8892a37c866556df391a078a50c6c56a4425e7ef31d35b27871e490229')
prepare() {
......@@ -42,11 +42,16 @@ prepare() {
sed -i -e "s|0.9.1 (dev)|${pkgver}-${pkgrel}|g" src/strconstants.cpp
# fix network detection
patch -p1 -i $srcdir/remove-qdialog.patch
# patch -p1 -i $srcdir/remove-qdialog.patch
# fix gksu-polkit
sed -i '/u root -m/d' src/wmhelper.cpp
cp -r notifier notifier-qt5
cp -r notifier notifier-frameworks
sed -i 's|#KSTATUS|KSTATUS|' notifier-frameworks/octopi-notifier/octopi-notifier.pro
cp resources/images/octopi_green.png resources/images/octopi.png
}
build() {
......@@ -60,32 +65,31 @@ build() {
fi
msg "Starting build..."
qmake-qt5 -makefile octopi.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro -spec linux-clang
make -j $jc
cd notifier/pacmanhelper
msg "Building pacmanhelper..."
qmake-qt5 -makefile pacmanhelper.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" pacmanhelper.pro -spec linux-clang
make -j $jc
cd ../../notifier-qt5/octopi-notifier
msg "Building octopi-notifier-qt5..."
qmake-qt5 -makefile octopi-notifier.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-notifier.pro -spec linux-clang
make -j $jc
cd ../../notifier-frameworks/octopi-notifier
msg "Building octopi-notifier-frameworks..."
qmake-qt5 -makefile octopi-notifier.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-notifier.pro -spec linux-clang
make -j $jc
cd ../../repoeditor
msg "Building octopi-repoeditor..."
qmake-qt5 -makefile octopi-repoeditor.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-repoeditor.pro -spec linux-clang
make -j $jc
cd ../cachecleaner
msg "Building octopi-cachecleaner..."
qmake-qt5 -makefile octopi-cachecleaner.pro -spec linux-clang
qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-cachecleaner.pro -spec linux-clang
make -j $jc
}
......@@ -93,19 +97,20 @@ package_octopi() {
pkgdesc="A powerful Pacman frontend using Qt5 libs"
depends=('qt5-base' 'qt5-declarative' 'xterm' 'pacman' 'alpm-octopi-utils>=1.0.0-2' 'qtermwidget')
optdepends=('kdesu: for KDE'
'gksu: for XFCE, Gnome, LXDE, Cinnamon'
'gksu-polkit: for XFCE, Gnome, LXDE, Cinnamon'
'lxqt-sudo: for LXQT'
'gnome-keyring: for password management'
'gist: for SysInfo report'
'pacaur: for AUR support'
'trizen: for AUR support'
'yaourt: for AUR support'
'octopi-repoeditor: for editing functions'
'octopi-cachecleaner: for cleaning functions'
#'yay: for AUR support'
#'octopi-repoeditor: for editing functions'
#'octopi-cachecleaner: for cleaning functions'
'octopi-notifier-qt5: for notifications'
'octopi-notifier-frameworks: for notifications with Knotifications support'
'pacmanlogviewer: to view pacman log files')
replaces=('octopi-qt5')
replaces=('octopi-qt5' 'octopi-pacmanhelper' 'octopi-repoeditor' 'octopi-cachecleaner')
conflicts=('octopi-qt5' 'octopi-pacmanhelper' 'octopi-repoeditor' 'octopi-cachecleaner')
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
......@@ -113,95 +118,72 @@ package_octopi() {
cd "${srcdir}/${pkgbase}-${pkgver}"
fi
install -Dm755 "bin/octopi" "${pkgdir}/usr/bin/octopi"
install -Dm644 "octopi.desktop" "${pkgdir}/usr/share/applications/octopi.desktop"
install -Dm644 "resources/images/octopi_green.png" "${pkgdir}/usr/share/icons/octopi.png"
install -Dm644 "resources/images/octopi_green.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/octopi.png"
install -Dm644 "resources/images/octopi_red.png" "${pkgdir}/usr/share/icons/octopi_red.png"
install -Dm644 "resources/images/octopi_yellow.png" "${pkgdir}/usr/share/icons/octopi_yellow.png"
make INSTALL_ROOT="${pkgdir}" install
install -D -m755 speedup/speedup-octopi.sh ${pkgdir}/usr/bin/speedup-octopi.sh
install -D -m644 speedup/octopi.service ${pkgdir}/etc/systemd/system/octopi.service
}
package_octopi-pacmanhelper() {
pkgdesc="Pacman helper for Octopi notifier"
depends=('qt5-base')
cd notifier/pacmanhelper
make INSTALL_ROOT="${pkgdir}" install
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
fi
cd ../../repoeditor
make INSTALL_ROOT="${pkgdir}" install
install -Dm755 "notifier/bin/pacmanhelper" "${pkgdir}/usr/lib/octopi/pacmanhelper"
install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy"
install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf"
install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.xml" "${pkgdir}/usr/share/dbus-1/interfaces/org.octopi.pacmanhelper.xml"
install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.service" "${pkgdir}/usr/share/dbus-1/system-services/org.octopi.pacmanhelper.service"
cd ../cachecleaner
make INSTALL_ROOT="${pkgdir}" install
}
package_octopi-repoeditor() {
pkgdesc="Repoeditor for Octopi"
depends=('qt5-base')
depends=('octopi')
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
cd "${srcdir}/${pkgbase}-${_gitcommit}/repoeditor"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor"
fi
install -D -m755 "repoeditor/bin/octopi-repoeditor" "${pkgdir}/usr/bin/octopi-repoeditor"
make INSTALL_ROOT="${pkgdir}" install
}
package_octopi-cachecleaner() {
pkgdesc="Cachecleaner for Octopi"
depends=('qt5-base')
depends=('octopi')
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
cd "${srcdir}/${pkgbase}-${_gitcommit}/cachecleaner"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner"
fi
install -D -m755 "cachecleaner/bin/octopi-cachecleaner" "${pkgdir}/usr/bin/octopi-cachecleaner"
install -D -m644 "cachecleaner/octopi-cachecleaner.desktop" "${pkgdir}/usr/share/applications/octopi-cachecleaner.desktop"
make INSTALL_ROOT="${pkgdir}" install
}
package_octopi-notifier-qt5() {
pkgdesc="Notifier for Octopi using Qt5 libs"
depends=('octopi-pacmanhelper' 'libnotify' 'qt5-base' 'alpm-octopi-utils>=1.0.0-2')
optdepends=('octopi: launch graphical package manager from tray'
'xfce4-notifyd: for notifications in XFCE')
depends=('octopi' 'libnotify')
optdepends=('xfce4-notifyd: for notifications in XFCE')
conflicts=('octopi-notifier')
provides=("octopi-notifier=${pkgver}")
replaces=('octopi-qt5-notifier' 'octopi-notifier-qt4')
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
cd "${srcdir}/${pkgbase}-${_gitcommit}/notifier-qt5/octopi-notifier"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
cd "${srcdir}/${pkgbase}-${pkgver}/notifier-qt5/octopi-notifier"
fi
# Octopi-notifier-qt5 files
install -Dm755 "notifier-qt5/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
install -Dm644 "notifier-qt5/octopi-notifier/octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/octopi-notifier.desktop"
make INSTALL_ROOT="${pkgdir}" install
}
package_octopi-notifier-frameworks() {
pkgdesc="Notifier for Octopi with Knotifications support"
depends=('octopi-pacmanhelper' 'knotifications' 'qt5-base' 'alpm-octopi-utils>=1.0.0-2')
optdepends=('octopi: launch graphical package manager from tray')
depends=('octopi' 'knotifications')
conflicts=('octopi-notifier')
provides=("octopi-notifier=${pkgver}")
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
cd "${srcdir}/${pkgbase}-${_gitcommit}/notifier-frameworks/octopi-notifier"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
cd "${srcdir}/${pkgbase}-${pkgver}/notifier-frameworks/octopi-notifier"
fi
# Octopi-notifier-frameworks files
install -Dm755 "notifier-frameworks/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
install -Dm644 "notifier-frameworks/octopi-notifier/octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/octopi-notifier.desktop"
make INSTALL_ROOT="${pkgdir}" install
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment