clamav_gui, bump to version 1.1.8 (#13748)

This commit is contained in:
Schrijvers Luc
2026-02-17 20:07:14 +01:00
committed by GitHub
parent 6898b68586
commit 49e2333918
2 changed files with 65 additions and 20 deletions

View File

@@ -7,9 +7,9 @@ COPYRIGHT="2015-2025 Joerg Macedo da Costa Zopes"
LICENSE="GNU GPL v3"
REVISION="1"
srcGitRev="a969341f774fe671940b9d26fdb4f3fedadad114"
SOURCE_URI="https://github.com/specialworld83/archlinux/raw/$srcGitRev/ClamAV-GUI-QT6-$portVersion.tar.gz"
CHECKSUM_SHA256="6be3484b74e978d0f49af8ef5e5630a2f057ad26bd75938b9c236e7dd9b65b24"
SOURCE_DIR="ClamAV-GUI-QT6-$portVersion"
SOURCE_URI="https://github.com/wusel1007/clamav-gui/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="1e4a85618a8b681a834097fc87af78d1ba3ef892d7e31080506d989903826d9a"
SOURCE_DIR="clamav-gui-$portVersion"
PATCHES="clamav_gui-$portVersion.patchset"
ADDITIONAL_FILES="clamav_gui.rdef.in"
@@ -18,7 +18,7 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
clamav_gui$secondaryArchSuffix = $portVersion
cmd:clamav_gui = $portVersion
cmd:ClamAV_GUI = $portVersion
"
REQUIRES="
haiku
@@ -26,6 +26,7 @@ REQUIRES="
cmd:freshclam$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Core5Compat$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
@@ -33,21 +34,25 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
qt6_tools${secondaryArchSuffix}_devel
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Core5Compat$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Network$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:cmake
cmd:gcc$secondaryArchSuffix
cmd:qmake6$secondaryArchSuffix
cmd:make
cmd:qmake6$secondaryArchSuffix
"
BUILD()
{
qmake6 .
make $jobArgs
echo LIBS+="/boot/system/lib/libQt6Core5Compat.so" >> Makefile
make #$jobArgs
}
INSTALL()

View File

@@ -1,16 +1,37 @@
From b53563e63c81821869137923e77fb15f3c389925 Mon Sep 17 00:00:00 2001
From 62ad0cd9bf01a69596f27cd229b17a8855fffc03 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 11 Mar 2025 19:20:52 +0100
Subject: Fix installation paths
Date: Sun, 30 Nov 2025 08:25:33 +0100
Subject: Fix detection for Qt6Core5Compat header
diff --git a/src/highlighter.h b/src/highlighter.h
index ec7eab9..88bad15 100644
--- a/src/highlighter.h
+++ b/src/highlighter.h
@@ -23,7 +23,7 @@
//
#include <QSyntaxHighlighter>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-#include <QRegExp>
+#include <QtCore5Compat/QRegExp>
#endif
//
class highlighter : public QSyntaxHighlighter {
--
2.52.0
From ed2dbbc1843d1919aba059e6d824f943d436f486 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 30 Nov 2025 08:37:36 +0100
Subject: Fix install paths
diff --git a/clamav-gui.pro b/clamav-gui.pro
old mode 100755
new mode 100644
index 2aee353..7954a3b
index 543a00e..2d6283a 100644
--- a/clamav-gui.pro
+++ b/clamav-gui.pro
@@ -132,7 +132,7 @@ INSTALLS += target \
@@ -134,7 +134,7 @@ INSTALLS += target \
manpages_pt \
documents
@@ -19,12 +40,8 @@ index 2aee353..7954a3b
target.files = clamav-gui
icon16.path = /$(DESTDIR)/usr/share/icons/hicolor/16x16/apps
@@ -162,34 +162,34 @@ desktopfile.files = extra/ClamAV-GUI.desktop
servicemenufile.path = /$(DESTDIR)/usr/share/kio/servicemenus
servicemenufile.files = extra/ClamAV-GUI-ServiceMenu.desktop
-translation.path = /$(DESTDIR)/usr/share/clamav-gui
+translation.path = /$(DESTDIR)/data/clamav-gui
@@ -167,31 +167,31 @@ servicemenufile.files = extra/ClamAV-GUI-ServiceMenu.desktop
translation.path = /$(DESTDIR)/usr/share/clamav-gui
translation.files = translations/clamav-gui-de_DE.qm translations/clamav-gui-en_GB.qm translations/clamav-gui-da_DK.qm translations/clamav-gui-es_ES.qm translations/clamav-gui-fr_FR.qm translations/clamav-gui-pt_PT.qm translations/clamav-gui-it_IT.qm translations/clamav-gui-uk_UA.qm
-manpages_de.path = /$(DESTDIR)/usr/share/man/de/man1
@@ -65,5 +82,28 @@ index 2aee353..7954a3b
--
2.48.1
2.52.0
From 4227cba41fd4fb43dc40ae2d717f58aee441a6eb Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 30 Nov 2025 17:21:28 +0100
Subject: Fix version strings
diff --git a/src/infodialog.cpp b/src/infodialog.cpp
index 8eeed47..bf6dd5f 100644
--- a/src/infodialog.cpp
+++ b/src/infodialog.cpp
@@ -2,7 +2,7 @@
infoDialog::infoDialog(QWidget* parent) : QWidget(parent)
{
- QString version = "1.1.7 (QT5)";
+ QString version = "1.1.8 (QT6)";
QString infoText = "<html>";
infoText += " <head/>";
--
2.52.0