From 3aff926889497fc0281cc88ad5a89da269569623 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Tue, 10 Mar 2026 07:25:53 +0100 Subject: [PATCH] clamav_gui, bump to version 1.2.2 (#13804) --- ...i-1.1.8.recipe => clamav_gui-1.2.2.recipe} | 14 ++- .../patches/clamav_gui-1.1.8.patchset | 109 ------------------ .../patches/clamav_gui-1.2.2.patchset | 36 ++++++ 3 files changed, 44 insertions(+), 115 deletions(-) rename app-antivirus/clamav-gui/{clamav_gui-1.1.8.recipe => clamav_gui-1.2.2.recipe} (88%) delete mode 100644 app-antivirus/clamav-gui/patches/clamav_gui-1.1.8.patchset create mode 100644 app-antivirus/clamav-gui/patches/clamav_gui-1.2.2.patchset diff --git a/app-antivirus/clamav-gui/clamav_gui-1.1.8.recipe b/app-antivirus/clamav-gui/clamav_gui-1.2.2.recipe similarity index 88% rename from app-antivirus/clamav-gui/clamav_gui-1.1.8.recipe rename to app-antivirus/clamav-gui/clamav_gui-1.2.2.recipe index 25fb49f0e..a0f225252 100644 --- a/app-antivirus/clamav-gui/clamav_gui-1.1.8.recipe +++ b/app-antivirus/clamav-gui/clamav_gui-1.2.2.recipe @@ -3,12 +3,12 @@ DESCRIPTION="A tool that simplifies virus scanning on Linux \ This application provides a graphical user interface for clamav and freshclam with an integrated \ service menu for Konqueror/Dolphin to scan files directly from your file manager." HOMEPAGE="https://github.com/wusel1007/ClamAV-GUI/" -COPYRIGHT="2015-2025 Joerg Macedo da Costa Zopes" +COPYRIGHT="2015-2026 Joerg Macedo da Costa Zopes" LICENSE="GNU GPL v3" REVISION="1" srcGitRev="a969341f774fe671940b9d26fdb4f3fedadad114" SOURCE_URI="https://github.com/wusel1007/clamav-gui/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="1e4a85618a8b681a834097fc87af78d1ba3ef892d7e31080506d989903826d9a" +CHECKSUM_SHA256="43423259a7625b0890ad4ee87fc607973d7460adcaf7fabd73655b8272e1b6cb" SOURCE_DIR="clamav-gui-$portVersion" PATCHES="clamav_gui-$portVersion.patchset" ADDITIONAL_FILES="clamav_gui.rdef.in" @@ -50,14 +50,16 @@ BUILD_PREREQUIRES=" BUILD() { - qmake6 . - echo LIBS+="/boot/system/lib/libQt6Core5Compat.so" >> Makefile - make #$jobArgs + cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -DCMAKE_INSTALL_BINDIR=$prefix/bin + + make -C build $jobArgs } INSTALL() { - make install INSTALL_ROOT=$prefix + make -C build install # cleanup rm -rf $prefix/usr diff --git a/app-antivirus/clamav-gui/patches/clamav_gui-1.1.8.patchset b/app-antivirus/clamav-gui/patches/clamav_gui-1.1.8.patchset deleted file mode 100644 index 576e44c5b..000000000 --- a/app-antivirus/clamav-gui/patches/clamav_gui-1.1.8.patchset +++ /dev/null @@ -1,109 +0,0 @@ -From 62ad0cd9bf01a69596f27cd229b17a8855fffc03 Mon Sep 17 00:00:00 2001 -From: Luc Schrijvers -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 - #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) --#include -+#include - #endif - // - class highlighter : public QSyntaxHighlighter { --- -2.52.0 - - -From ed2dbbc1843d1919aba059e6d824f943d436f486 Mon Sep 17 00:00:00 2001 -From: Luc Schrijvers -Date: Sun, 30 Nov 2025 08:37:36 +0100 -Subject: Fix install paths - - -diff --git a/clamav-gui.pro b/clamav-gui.pro -index 543a00e..2d6283a 100644 ---- a/clamav-gui.pro -+++ b/clamav-gui.pro -@@ -134,7 +134,7 @@ INSTALLS += target \ - manpages_pt \ - documents - --target.path = /$(DESTDIR)/usr/bin -+target.path = /$(DESTDIR)/bin - target.files = clamav-gui - - icon16.path = /$(DESTDIR)/usr/share/icons/hicolor/16x16/apps -@@ -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 -+manpages_de.path = /$(DESTDIR)/documentation/man/de/man1 - manpages_de.files = man/de/clamav-gui.1.gz - --manpages_en.path = /$(DESTDIR)/usr/share/man/en/man1 -+manpages_en.path = /$(DESTDIR)/documentation/man/en/man1 - manpages_en.files = man/en/clamav-gui.1.gz - --manpages_dk.path = /$(DESTDIR)/usr/share/man/da_DK/man1 -+manpages_dk.path = /$(DESTDIR)/documentation/man/da_DK/man1 - manpages_dk.files = man/da_DK/clamav-gui.1.gz - --manpages_uk.path = /$(DESTDIR)/usr/share/man/uk/man1 -+manpages_uk.path = /$(DESTDIR)/documentation/man/uk/man1 - manpages_uk.files = man/uk/clamav-gui.1.gz - --manpages_es.path = /$(DESTDIR)/usr/share/man/es/man1 -+manpages_es.path = /$(DESTDIR)/documentation/man/es/man1 - manpages_es.files = man/es/clamav-gui.1.gz - --manpages_fr.path = /$(DESTDIR)/usr/share/man/fr/man1 -+manpages_fr.path = /$(DESTDIR)/documentation/man/fr/man1 - manpages_fr.files = man/fr/clamav-gui.1.gz - --manpages_it.path = /$(DESTDIR)/usr/share/man/it/man1 -+manpages_it.path = /$(DESTDIR)/documentation/man/it/man1 - manpages_it.files = man/it/clamav-gui.1.gz - --manpages_pt.path = /$(DESTDIR)/usr/share/man/pt/man1 -+manpages_pt.path = /$(DESTDIR)/documentation/man/pt/man1 - manpages_pt.files = man/pt/clamav-gui.1.gz - --documents.path = /$(DESTDIR)/usr/share/doc/ClamAV-GUI -+documents.path = /$(DESTDIR)/documentation/packages/ClamAV-GUI - documents.files = README CHANGES - - --- -2.52.0 - - -From 4227cba41fd4fb43dc40ae2d717f58aee441a6eb Mon Sep 17 00:00:00 2001 -From: Luc Schrijvers -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 = ""; - infoText += " "; --- -2.52.0 - diff --git a/app-antivirus/clamav-gui/patches/clamav_gui-1.2.2.patchset b/app-antivirus/clamav-gui/patches/clamav_gui-1.2.2.patchset new file mode 100644 index 000000000..65b3855fe --- /dev/null +++ b/app-antivirus/clamav-gui/patches/clamav_gui-1.2.2.patchset @@ -0,0 +1,36 @@ +From 9575a0b9e62d6631924422f76bcc0b341d3afe35 Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Mon, 9 Mar 2026 18:27:22 +0100 +Subject: fix install paths + + +diff --git a/install.cmake b/install.cmake +index b83561a..de944a0 100644 +--- a/install.cmake ++++ b/install.cmake +@@ -1,5 +1,5 @@ + install(TARGETS clamav-gui +- RUNTIME DESTINATION usr/bin/ ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + + install(FILES extra/icon16/clamav-gui.png +@@ -31,7 +31,7 @@ install(FILES extra/icon256/clamav-gui.png + ) + + install(DIRECTORY man +- DESTINATION usr/share/ ++ DESTINATION documentation + ) + + install(FILES CHANGES README +@@ -60,5 +60,5 @@ install(FILES ${CMAKE_BINARY_DIR}/clamav-gui-uk_UA.qm + ${CMAKE_BINARY_DIR}/clamav-uk_UA.qm + ${CMAKE_BINARY_DIR}/clamav-zh_CN.qm + ${CMAKE_BINARY_DIR}/clamav-de_DE.qm +- DESTINATION usr/share/clamav-gui/ ++ DESTINATION ${CMAKE_INSTALL_DATADIR}/clamav-gui/ + ) +-- +2.52.0 +