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
f0c5af5b
Commit
f0c5af5b
authored
Jul 07, 2018
by
Philip Müller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[rebuild] add another revert
parent
0db733fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
18 deletions
+8
-18
PKGBUILD
PKGBUILD
+8
-5
revert-e861352.patch
revert-e861352.patch
+0
-13
No files found.
PKGBUILD
View file @
f0c5af5b
...
...
@@ -13,7 +13,7 @@ pkgbase=octopi
pkgname
=(
'octopi'
'octopi-repoeditor'
'octopi-pacmanhelper'
'octopi-cachecleaner'
'octopi-notifier-qt5'
'octopi-notifier-frameworks'
)
pkgver
=
0.9.0
pkgrel
=
2
pkgrel
=
3
# This is the release package so the below _gitcommit variable should (usually) be commented out.
#_gitcommit=
arch
=(
'i686'
'x86_64'
)
...
...
@@ -26,13 +26,15 @@ if [ "${_gitcommit}" != "" ]; then
else
source
=(
"octopi-
${
pkgver
}
.tar.gz::https://github.com/aarnt/octopi/archive/v
${
pkgver
}
.tar.gz"
)
fi
source
+
=(
'revert-c413caa.patch'
source
+
=(
'revert-3935abc.patch'
'revert-c413caa.patch'
'revert-a9d9eb3.patch'
'revert-e861352.patch'
)
sha256sums
=(
'f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822'
'1c2a35683273639d418450d3733ede492001eb406841a9cd6b16173a1fd7ad1d'
'9f488022cfa15219d39458d8916cb1b413ef0d977f90cc283d8e63e4284cd301'
'0531aa7afe0eccc1c8c80eb5729b5998ee0b9f453037b15c496f5503684214fe'
'
26cf422b63b89b71eb093fe16efded95db79c133eefafddbb61424fe95b0586f
'
)
'
c533ce04ac3cd892533c6b01724205213fe93fc2d59d8bfdd65153f921f5ffb2
'
)
prepare
()
{
...
...
@@ -50,9 +52,10 @@ prepare() {
sed
-i
's|#KSTATUS|KSTATUS|'
notifier-frameworks/octopi-notifier/octopi-notifier.pro
# fix network detection
patch
-Rp1
-i
$srcdir
/revert-c413caa.patch
patch
-Rp1
-i
$srcdir
/revert-a9d9eb3.patch
patch
-Rp1
-i
$srcdir
/revert-e861352.patch
patch
-Rp1
-i
$srcdir
/revert-a9d9eb3.patch
patch
-Rp1
-i
$srcdir
/revert-c413caa.patch
patch
-Rp1
-i
$srcdir
/revert-3935abc.patch
}
build
()
{
...
...
revert-e861352.patch
View file @
f0c5af5b
...
...
@@ -4,7 +4,6 @@ Date: Sat, 21 Apr 2018 19:08:41 -0300
Subject: [PATCH] BugFix: Exec internet tests before some commands.
---
CHANGELOG | 1 +
src/mainwindow.h | 1 +
src/mainwindow_events.cpp | 2 ++
src/mainwindow_news.cpp | 7 +++++++
...
...
@@ -12,18 +11,6 @@ Subject: [PATCH] BugFix: Exec internet tests before some commands.
src/unixcommand.cpp | 4 ++--
6 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f178491..5a7fbbe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@
Find line edit is always focused when the program starts.
Prevent user to install partial upgrades in his system (only some of the outdated packages).
BugFix: Do not let program display an avalanche of internet related errors.
+ BugFix: Exec internet tests before some commands.
BugFix: Parser was not outputing repository errors when syncinc.
BugFix: repoeditor now runs as normal user and asks for root password on save.
BugFix: If Notifier hid Octopi and was closed, Octopi's window would stay hidden.
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c6ae4c5..66a5223 100644
--- a/src/mainwindow.h
...
...
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