Commit 12fcfc7a authored by Philip Müller's avatar Philip Müller
Browse files

[pkg-upd] 0.9.0-5

parent e674afa6
...@@ -26,9 +26,9 @@ if [ "${_gitcommit}" != "" ]; then ...@@ -26,9 +26,9 @@ if [ "${_gitcommit}" != "" ]; then
else else
source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz") source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
fi fi
source+=('https://github.com/aarnt/octopi/commit/a9d9eb3.diff') source+=('remove-qdialog.patch')
sha256sums=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822' sha256sums=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822'
'276ac962d432e3ee07d70f54682e8f371040f719cfe6ebba0528ac8d701ea5a7') 'af8ebc8892a37c866556df391a078a50c6c56a4425e7ef31d35b27871e490229')
prepare() { prepare() {
...@@ -41,12 +41,12 @@ prepare() { ...@@ -41,12 +41,12 @@ prepare() {
# sed version # sed version
sed -i -e "s|0.9.0|${pkgver}-${pkgrel}|g" src/strconstants.cpp sed -i -e "s|0.9.0|${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-qt5
cp -r notifier notifier-frameworks cp -r notifier notifier-frameworks
sed -i 's|#KSTATUS|KSTATUS|' notifier-frameworks/octopi-notifier/octopi-notifier.pro sed -i 's|#KSTATUS|KSTATUS|' notifier-frameworks/octopi-notifier/octopi-notifier.pro
# fix network detection
patch -Rp1 -i $srcdir/a9d9eb3.diff
} }
build() { build() {
......
--- 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