Commit 5753c1a4 authored by Dan Johansen's avatar Dan Johansen

updated to 0.9.0-6

parent a0dc88ae
......@@ -13,10 +13,10 @@ pkgbase=octopi
pkgname=('octopi' 'octopi-repoeditor' 'octopi-pacmanhelper' 'octopi-cachecleaner'
'octopi-notifier-qt5' 'octopi-notifier-frameworks')
pkgver=0.9.0
pkgrel=5
pkgrel=6
# This is the release package so the below _gitcommit variable should (usually) be commented out.
#_gitcommit=
arch=('i686' 'x86_64' 'armv7h' 'aarch64')
_gitcommit=359584ba93ebe95df63cbc6d680f74b9e20345c6
arch=('i686' 'x86_64' 'aarch64')
url="http://octopiproject.wordpress.com"
license=('GPL2')
makedepends=('qt5-declarative' 'knotifications' 'libnotify' 'alpm-octopi-utils' 'clang' 'qtermwidget')
......@@ -26,34 +26,34 @@ if [ "${_gitcommit}" != "" ]; then
else
source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
fi
source+=('https://github.com/aarnt/octopi/commit/a9d9eb3.diff')
sha256sums=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822'
'276ac962d432e3ee07d70f54682e8f371040f719cfe6ebba0528ac8d701ea5a7')
source+=('remove-qdialog.patch')
sha256sums=('acb94b8a5d99e62717dff7af314430355a01602719337090393ddfc7502e4c17'
'5b88db452cc44cf411738f15edf1d9756d8f72632d316a5e12c276271f0ed544')
prepare() {
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
fi
# sed version
sed -i -e "s|0.9.0|${pkgver}-${pkgrel}|g" src/strconstants.cpp
sed -i -e "s|0.9.1 (dev)|${pkgver}-${pkgrel}|g" src/strconstants.cpp
# fix network detection
patch -p1 -i $srcdir/remove-qdialog.patch
cp -r notifier notifier-qt5
cp -r notifier notifier-frameworks
sed -i 's|#KSTATUS|KSTATUS|' notifier-frameworks/octopi-notifier/octopi-notifier.pro
# fix network detection
patch -Rp1 -i $srcdir/a9d9eb3.diff
}
build() {
cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
jc=$((${cpucount:-1}))
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -107,7 +107,7 @@ package_octopi() {
'pacmanlogviewer: to view pacman log files')
replaces=('octopi-qt5')
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -128,7 +128,7 @@ package_octopi-pacmanhelper() {
pkgdesc="Pacman helper for Octopi notifier"
depends=('qt5-base')
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -145,7 +145,7 @@ package_octopi-repoeditor() {
pkgdesc="Repoeditor for Octopi"
depends=('qt5-base')
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -158,7 +158,7 @@ package_octopi-cachecleaner() {
pkgdesc="Cachecleaner for Octopi"
depends=('qt5-base')
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -177,7 +177,7 @@ package_octopi-notifier-qt5() {
provides=("octopi-notifier=${pkgver}")
replaces=('octopi-qt5-notifier' 'octopi-notifier-qt4')
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......@@ -195,7 +195,7 @@ package_octopi-notifier-frameworks() {
conflicts=('octopi-notifier')
provides=("octopi-notifier=${pkgver}")
if [ "${_gitcommit}" != "" ]; then
if [ ! -z ${_gitcommit} ]; then
cd "${srcdir}/${pkgbase}-${_gitcommit}"
else
cd "${srcdir}/${pkgbase}-${pkgver}"
......
--- octopi-0.9.0/src/mainwindow_transaction.cpp.orig 2018-09-11 23:06:30.372366097 +0200
+++ octopi-0.9.0/src/mainwindow_transaction.cpp 2018-09-11 23:29:18.611088943 +0200
@@ -685,7 +685,6 @@ bool MainWindow::isInternetAvailable()
//Test if Internet access exists
if (!UnixCommand::hasInternetConnection())
{
- QMessageBox::critical(this, StrConstants::getError(), StrConstants::getInternetUnavailableError());
res=false;
}
--- octopi-0.9.0/notifier/octopi-notifier/mainwindow.cpp.orig 2018-09-11 23:06:30.322364559 +0200
+++ octopi-0.9.0/notifier/octopi-notifier/mainwindow.cpp 2018-09-11 23:14:31.120490388 +0200
@@ -630,20 +630,10 @@ bool MainWindow::isInternetAvailable()
{
bool res=true;
- //First we create a fake window to act as about dialog's parent
- //Otherwise the dialog appears at a random screen point!
- QMainWindow *fake = new QMainWindow();
- fake->setWindowIcon(m_icon);
- fake->setVisible(false);
- QScreen *sc = QGuiApplication::primaryScreen();
- fake->setGeometry(sc->geometry());
-
//Test if Internet access exists
if (!UnixCommand::hasInternetConnection())
{
- QMessageBox::critical(fake, StrConstants::getError(), StrConstants::getInternetUnavailableError());
res=false;
- delete fake;
}
return res;
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