Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
O
octopi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Packages
Community
octopi
Commits
12fcfc7a
Commit
12fcfc7a
authored
Sep 11, 2018
by
Philip Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[pkg-upd] 0.9.0-5
parent
e674afa6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
5 deletions
+38
-5
PKGBUILD
PKGBUILD
+5
-5
remove-qdialog.patch
remove-qdialog.patch
+33
-0
No files found.
PKGBUILD
View file @
12fcfc7a
...
...
@@ -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
+
=(
'
https://github.com/aarnt/octopi/commit/a9d9eb3.diff
'
)
source
+
=(
'
remove-qdialog.patch
'
)
sha256sums
=(
'f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822'
'
276ac962d432e3ee07d70f54682e8f371040f719cfe6ebba0528ac8d701ea5a7
'
)
'
af8ebc8892a37c866556df391a078a50c6c56a4425e7ef31d35b27871e490229
'
)
prepare
()
{
...
...
@@ -41,12 +41,12 @@ prepare() {
# sed version
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-frameworks
sed
-i
's|#KSTATUS|KSTATUS|'
notifier-frameworks/octopi-notifier/octopi-notifier.pro
# fix network detection
patch
-Rp1
-i
$srcdir
/a9d9eb3.diff
}
build
()
{
...
...
remove-qdialog.patch
0 → 100644
View file @
12fcfc7a
--- 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;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment