Skip to content

Commit 4dc4a42

Browse files
committed
- Updated pkg extension support.
1 parent 6970678 commit 4dc4a42

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

INSTALL

+3-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
Installing Octopi is a pretty straightforward task.
22

3-
Assuming you have updated Qt4(*) libs installed in your system, all
3+
Assuming you have updated Qt5 libs installed in your system, all
44
you have to do is run:
55

66
makepkg -f
77

88
Wait for the compilation and then install the generated package (as
99
root), using:
1010

11-
pacman -U [--force] <nameOfTheGeneratedOctopiPackage.tar.xz>
11+
pacman -U <nameOfTheGeneratedOctopiPackage.tar.[xz|zst]>
1212

13-
You can also install the generated package notifier, using:
14-
15-
pacman -U [--force] <nameOfTheGeneratedOctopiNotifierPackage.tar.xz>
16-
17-
Octopi is located at the system utilities menu of your Desktop
13+
Octopi is located on the system utilities menu of your Desktop
1814
Environment.
1915

2016

2117
Enjoy!
22-
23-
(*) Octopi is also Qt5 compatible, you'll only have to adjust the
24-
"depends" section in PKGBUILD.
25-
26-
If you are compiling Octopi in a KDE centric-distro like KaOS and Chakra, you should
27-
first uncomment the "#define NO_GTK_STYLE" string located at "src/main.cpp" and
28-
"notifier/octopi-notifier/main.cpp", otherwise it won't compile at all.

src/QtSolutions/qtsingleapplication.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ void QtSingleApplication::activateWindow(const QString &message)
405405
}
406406
}
407407
}
408-
else if (actWin && message.contains("pkg.tar.xz")) {
408+
else if (actWin && (message.contains("pkg.tar.xz") || (message.contains("pkg.tar.zst")))) {
409409
actWin->setWindowState(actWin->windowState() & ~Qt::WindowMinimized);
410410
actWin->raise();
411411
if (actWin->isHidden())

src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
5252
for (int c=1; c<argc; c++)
5353
{
5454
arg = argv[c];
55-
if (arg.contains(QRegularExpression("pkg.tar.[gz|xz]")))
55+
if (arg.contains(QRegularExpression("pkg.tar.[xz|zst]")))
5656
{
5757
packagesToInstall += arg + ",";
5858
}

0 commit comments

Comments
 (0)