The package rpms/kvirc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kvirc.git/commit/?id=005a672d4f96....
Change:
+%ifarch %{?qt6_qtwebengine_arches}
Thanks.
Full change:
============
commit 2b5da4ba8e30cd7c73cdfa12e2d7780696261b1d
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Mon Jan 22 13:24:38 2024 +0200
bump release
diff --git a/kvirc.spec b/kvirc.spec
index 211e1b6..1e27473 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -6,7 +6,7 @@
Name: kvirc
Version: 5.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Free portable IRC client
License: GPLv2+ with exceptions
URL:
https://www.kvirc.net/
commit 005a672d4f96f92acc56e9d7607789a8fef74068
Author: nucleo <nucleo(a)fedoraproject.org>
Date: Mon Jan 22 13:17:49 2024 +0200
Require Qt6WebEngineWidgets for qt6_qtwebengine_arches
diff --git a/kvirc.spec b/kvirc.spec
index 9d7b4c1..211e1b6 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -53,13 +53,18 @@ BuildRequires: cmake(Qt%{qt_ver}Network)
BuildRequires: cmake(Qt%{qt_ver}PrintSupport)
BuildRequires: cmake(Qt%{qt_ver}Sql)
BuildRequires: cmake(Qt%{qt_ver}Svg)
-BuildRequires: cmake(Qt%{qt_ver}WebEngineWidgets)
BuildRequires: cmake(Qt%{qt_ver}Widgets)
BuildRequires: cmake(Qt%{qt_ver}Xml)
%if %{qt_ver} < 6
BuildRequires: cmake(Qt5X11Extras)
+%ifarch %{?qt5_qtwebengine_arches}
+BuildRequires: cmake(Qt5WebEngineWidgets)
+%endif
%else
BuildRequires: cmake(Qt6Core5Compat)
+%ifarch %{?qt6_qtwebengine_arches}
+BuildRequires: cmake(Qt6WebEngineWidgets)
+%endif
%endif
%description
@@ -139,6 +144,9 @@ rm %{buildroot}%{_libdir}/libkvilib.so
%lang(uk) %{_mandir}/uk/man1/%{name}.1.gz
%changelog
+* Mon Jan 22 2024 Alexey Kurov <nucleo(a)fedoraproject.org> - 5.2.0-2
+- Require Qt6WebEngineWidgets for qt6_qtwebengine_arches
+
* Sun Jan 21 2024 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 5.2.0-1
- Update to 5.2.0
- Build with Qt6/KF6 on f40
commit 5c8a9853d6aa3c01aea50fd792612c642c0b5979
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Sun Jan 21 14:29:08 2024 -0800
Build with Qt6/KF6 on f40
Use cmake() for Qt and KF dependencies
diff --git a/kvirc.spec b/kvirc.spec
index 7a2376c..9d7b4c1 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -1,3 +1,9 @@
+%if 0%{?fedora} >= 40
+%global qt_ver 6
+%else
+%global qt_ver 5
+%endif
+
Name: kvirc
Version: 5.2.0
Release: 1%{?dist}
@@ -27,18 +33,34 @@ BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
-BuildRequires: qt5-qtwebengine-devel
-BuildRequires: qt5-qtsvg-devel
-BuildRequires: qt5-qtmultimedia-devel
-BuildRequires: qt5-qtx11extras-devel
-BuildRequires: phonon-qt5-devel
-BuildRequires: kf5-ki18n-devel
-BuildRequires: kf5-kio-devel
-BuildRequires: kf5-kparts-devel
-BuildRequires: kf5-kxmlgui-devel
-BuildRequires: kf5-kwindowsystem-devel
-BuildRequires: kf5-knotifications-devel
-BuildRequires: kf5-kservice-devel
+BuildRequires: cmake(KF%{qt_ver}CoreAddons)
+BuildRequires: cmake(KF%{qt_ver}I18n)
+BuildRequires: cmake(KF%{qt_ver}KIO)
+BuildRequires: cmake(KF%{qt_ver}Notifications)
+BuildRequires: cmake(KF%{qt_ver}Parts)
+BuildRequires: cmake(KF%{qt_ver}Service)
+%if %{qt_ver} >= 6
+BuildRequires: cmake(KF%{qt_ver}StatusNotifierItem)
+%endif
+BuildRequires: cmake(KF%{qt_ver}WindowSystem)
+BuildRequires: cmake(KF%{qt_ver}XmlGui)
+BuildRequires: cmake(Phonon4Qt%{qt_ver})
+BuildRequires: cmake(Qt%{qt_ver}Concurrent)
+BuildRequires: cmake(Qt%{qt_ver}Core)
+BuildRequires: cmake(Qt%{qt_ver}DBus)
+BuildRequires: cmake(Qt%{qt_ver}Multimedia)
+BuildRequires: cmake(Qt%{qt_ver}Network)
+BuildRequires: cmake(Qt%{qt_ver}PrintSupport)
+BuildRequires: cmake(Qt%{qt_ver}Sql)
+BuildRequires: cmake(Qt%{qt_ver}Svg)
+BuildRequires: cmake(Qt%{qt_ver}WebEngineWidgets)
+BuildRequires: cmake(Qt%{qt_ver}Widgets)
+BuildRequires: cmake(Qt%{qt_ver}Xml)
+%if %{qt_ver} < 6
+BuildRequires: cmake(Qt5X11Extras)
+%else
+BuildRequires: cmake(Qt6Core5Compat)
+%endif
%description
KVIrc is a free portable IRC client based on the excellent
@@ -53,7 +75,7 @@ many IRC addicted developers around the world.
%{cmake3} \
-GNinja \
-DCMAKE_SKIP_RPATH=ON \
--DQT_VERSION_MAJOR=5 \
+-DQT_VERSION_MAJOR=%{qt_ver} \
-DWANT_ENV_FLAGS=ON \
-DWANT_DCC_VIDEO=OFF \
-DWANT_OGG_THEORA=ON \
@@ -119,6 +141,8 @@ rm %{buildroot}%{_libdir}/libkvilib.so
%changelog
* Sun Jan 21 2024 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 5.2.0-1
- Update to 5.2.0
+- Build with Qt6/KF6 on f40
+- Use cmake() for Qt and KF dependencies
* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.0-23
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit d1de27899d06d8e8a15e24c1b3d0cae23c415574
Author: Aleksei Bavshin <alebastr(a)fedoraproject.org>
Date: Tue Jan 16 01:28:24 2024 -0800
Update to 5.2.0
diff --git a/.gitignore b/.gitignore
index af629ce..33b35fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/kvirc-*.tar.bz2
/kvirc-*.rpm
/KVIrc-5.0.0.tar.bz2
+/kvirc-5.2.0.tar.gz
diff --git a/kvirc-5.0.0_enforce_system_crypto.patch
b/kvirc-5.0.0_enforce_system_crypto.patch
index 3d9e9f3..9324e07 100644
--- a/kvirc-5.0.0_enforce_system_crypto.patch
+++ b/kvirc-5.0.0_enforce_system_crypto.patch
@@ -1,12 +1,13 @@
+diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp
+index 70a58aeb2..d8bb209b4 100644
--- a/src/kvilib/net/KviSSL.cpp
+++ b/src/kvilib/net/KviSSL.cpp
-@@ -376,7 +376,7 @@
- // ADH are moved to the end since they are less secure, but they don't need a
certificate
- // (so we can use secure dcc without a cert)
- // NOTE: see bug ticket #155
-- SSL_CTX_set_cipher_list(m_pSSLCtx, "ALL:!eNULL:!EXP:!SSLv2:+ADH@STRENGTH");
+@@ -394,7 +394,7 @@ bool KviSSL::initContext(Method m)
+ #endif
+ );
+ // we want all ciphers to be available here, except insecure ones, orderer by
strength;
+- SSL_CTX_set_cipher_list(m_pSSLCtx,
"ALL:!eNULL:!LOW:!EXP:!SSLv2:!SSLv3:!TLSv1:@STRENGTH");
+ SSL_CTX_set_cipher_list(m_pSSLCtx, "PROFILE=SYSTEM");
- SSL_CTX_set_tmp_dh_callback(m_pSSLCtx, my_ugly_dh_callback);
- return true;
- }
-
+ #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+ SSL_CTX_set_dh_auto(m_pSSLCtx, 1);
+ #else
diff --git a/kvirc-5.0.0_qt_5.15_fix.patch b/kvirc-5.0.0_qt_5.15_fix.patch
deleted file mode 100644
index a4dfc12..0000000
--- a/kvirc-5.0.0_qt_5.15_fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 7f837a786b48497680f9c7462284366d310e52b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor(a)gmail.com>
-Date: Thu, 4 Jun 2020 13:42:30 +0200
-Subject: [PATCH] Fix build with Qt 5.15+
-
----
- src/modules/iograph/libkviiograph.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/modules/iograph/libkviiograph.cpp
b/src/modules/iograph/libkviiograph.cpp
-index 8e08bb427..265376231 100644
---- a/src/modules/iograph/libkviiograph.cpp
-+++ b/src/modules/iograph/libkviiograph.cpp
-@@ -35,6 +35,7 @@
-
- #include <QPainter>
- #include <QPaintEvent>
-+#include <QPainterPath>
-
- #ifdef COMPILE_PSEUDO_TRANSPARENCY
- extern KVIRC_API QPixmap * g_pShadedChildGlobalDesktopBackground;
diff --git a/kvirc-5.2.0-Fix-ability-to-select-Qt5-vs-Qt6.patch
b/kvirc-5.2.0-Fix-ability-to-select-Qt5-vs-Qt6.patch
new file mode 100644
index 0000000..9f3700e
--- /dev/null
+++ b/kvirc-5.2.0-Fix-ability-to-select-Qt5-vs-Qt6.patch
@@ -0,0 +1,25 @@
+From a301aa4998c4f0040d093cd2950b7b2f4ec4dcdc Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov(a)google.com>
+Date: Sun, 21 Jan 2024 21:07:37 +0000
+Subject: [PATCH] Fix ability to select Qt5 vs Qt6
+
+https://bugs.gentoo.org/922636
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aabc0988b..9368e81c9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,7 +389,9 @@ endif()
+ ############################################################################
+
+ # first check if Qt6 or Qt5 has to be used
+-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++if(NOT DEFINED QT_VERSION_MAJOR)
++ find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
++endif()
+ # second, detect available modules for the specific Qt version
+ find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
+ if(Qt${QT_VERSION_MAJOR}Widgets_FOUND)
diff --git a/kvirc.spec b/kvirc.spec
index 096d185..7a2376c 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -1,22 +1,21 @@
Name: kvirc
-Version: 5.0.0
-Release: 23%{?dist}
+Version: 5.2.0
+Release: 1%{?dist}
Summary: Free portable IRC client
License: GPLv2+ with exceptions
-URL:
http://kvirc.net/
-Source0:
ftp://ftp.kvirc.net/pub/kvirc/%{version}/source/KVIrc-%{version}.tar.bz2
+URL:
https://www.kvirc.net/
+%global forgeurl
https://github.com/kvirc/KVIrc
+Source: %{forgeurl}/archive/refs/tags/%{version}/%{name}-%{version}.tar.gz
#
https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-Patch0: kvirc-5.0.0_enforce_system_crypto.patch
-Patch1: kvirc-5.0.0_qt_5.15_fix.patch
-#
https://github.com/kvirc/KVIrc/commit/c8a6812fc26d6c240d7b99b517835e7cb96...
-Patch2: upstream-wayland-fixes.patch
+Patch: kvirc-5.0.0_enforce_system_crypto.patch
+Patch:
%{forgeurl}/commit/a301aa4.patch#/kvirc-5.2.0-Fix-ability-to-select-Qt5-vs-Qt6.patch
BuildRequires: enchant2-devel
BuildRequires: audiofile-devel
BuildRequires: glib2-devel
BuildRequires: perl-devel
BuildRequires: perl-ExtUtils-Embed
-BuildRequires: dbus-devel
+BuildRequires: python3-devel
BuildRequires: cmake3
BuildRequires: ninja-build
BuildRequires: extra-cmake-modules
@@ -28,12 +27,14 @@ BuildRequires: libtheora-devel
BuildRequires: libvorbis-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
-BuildRequires: qt5-qtwebkit-devel
+BuildRequires: qt5-qtwebengine-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: phonon-qt5-devel
BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kparts-devel
BuildRequires: kf5-kxmlgui-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: kf5-knotifications-devel
@@ -52,8 +53,9 @@ many IRC addicted developers around the world.
%{cmake3} \
-GNinja \
-DCMAKE_SKIP_RPATH=ON \
+-DQT_VERSION_MAJOR=5 \
-DWANT_ENV_FLAGS=ON \
--DWANT_DCC_VIDEO=ON \
+-DWANT_DCC_VIDEO=OFF \
-DWANT_OGG_THEORA=ON \
-DWANT_GTKSTYLE=ON \
-DADDITIONAL_LINK_FLAGS='-Wl,--as-needed' \
@@ -65,14 +67,13 @@ many IRC addicted developers around the world.
%install
%cmake_install
-desktop-file-install \
- --dir %{buildroot}%{_datadir}/applications/ \
- %{buildroot}%{_datadir}/applications/%{name}.desktop
+desktop-file-validate \
+ %{buildroot}%{_datadir}/applications/net.kvirc.KVIrc5.desktop
-ln -sf ../../%{name}/5.0/license/COPYING COPYING
+ln -sf ../../%{name}/5.2/license/COPYING COPYING
# Delete zero length file
-rm %{buildroot}%{_datadir}/kvirc/5.0/help/en/_db_widget.idx
+rm %{buildroot}%{_datadir}/kvirc/5.2/help/en/_db_widget.idx
rm %{buildroot}%{_bindir}/kvirc-config
rm %{buildroot}%{_libdir}/libkvilib.so
@@ -86,20 +87,20 @@ rm %{buildroot}%{_libdir}/libkvilib.so
%doc RELEASES
%{_bindir}/%{name}
%{_libdir}/libkvilib.so.5*
-%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/net.kvirc.KVIrc5.desktop
%{_libdir}/%{name}/
%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/5.0
-%dir %{_datadir}/%{name}/5.0/locale
-%{_datadir}/%{name}/5.0/audio/
-%{_datadir}/%{name}/5.0/config/
-%{_datadir}/%{name}/5.0/defscript/
-%{_datadir}/%{name}/5.0/help/
-%{_datadir}/%{name}/5.0/modules/
-%{_datadir}/%{name}/5.0/msgcolors/
-%{_datadir}/%{name}/5.0/pics/
-%{_datadir}/%{name}/5.0/themes/
-%{_datadir}/%{name}/5.0/license/
+%dir %{_datadir}/%{name}/5.2
+%dir %{_datadir}/%{name}/5.2/locale
+%{_datadir}/%{name}/5.2/audio/
+%{_datadir}/%{name}/5.2/config/
+%{_datadir}/%{name}/5.2/defscript/
+%{_datadir}/%{name}/5.2/help/
+%{_datadir}/%{name}/5.2/modules/
+%{_datadir}/%{name}/5.2/msgcolors/
+%{_datadir}/%{name}/5.2/pics/
+%{_datadir}/%{name}/5.2/themes/
+%{_datadir}/%{name}/5.2/license/
%{_datadir}/icons/hicolor/*/apps/kvirc.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-kva.*
%{_datadir}/icons/hicolor/*/mimetypes/application-x-kvt.*
@@ -116,6 +117,9 @@ rm %{buildroot}%{_libdir}/libkvilib.so
%lang(uk) %{_mandir}/uk/man1/%{name}.1.gz
%changelog
+* Sun Jan 21 2024 Aleksei Bavshin <alebastr(a)fedoraproject.org> - 5.2.0-1
+- Update to 5.2.0
+
* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.0-23
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index d669899..4b59929 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (KVIrc-5.0.0.tar.bz2) =
9621954ff3c7de698b61cd3cb7bfec96e12befab5b07259df71aa8b6d6651d64068bf2c1cc097a654da60a2ace02bc889dffb5cc343a36c9b662665ecac9d631
+SHA512 (kvirc-5.2.0.tar.gz) =
01a183ae283b774dc096ec4bf81509ad79acf10fb3c82e06f66b7360736d32c1514856849ef562e2fc2b4ef3019e0842d17de8a762c7858dbac34f85de125079
diff --git a/upstream-wayland-fixes.patch b/upstream-wayland-fixes.patch
deleted file mode 100644
index 493cb2f..0000000
--- a/upstream-wayland-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Fix a crash and set the window icon on Wayland.
-Origin: backport,
https://github.com/kvirc/KVIrc/commit/c8a6812fc26d6c240d7b99b517835e7cb96...
-Bug:
https://github.com/kvirc/KVIrc/issues/2479
-Bug-Debian:
https://bugs.debian.org/935726
-Last-Update: 2021-07-10
-
-diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
-index bfa60e6..df5f0e3 100644
---- a/src/kvirc/kernel/KviIpcSentinel.cpp
-+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
-@@ -172,6 +172,12 @@ bool kvi_sendIpcMessage(const char * message)
- }
- #elif defined(COMPILE_X11_SUPPORT) && defined(COMPILE_QX11INFO_SUPPORT)
-
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-+ if (!QX11Info::isPlatformX11()) {
-+ return false;
-+ }
-+#endif
-+
- kvi_ipcLoadAtoms();
-
- Window sentinel = kvi_x11_findIpcSentinel(kvi_ipc_get_xrootwin());
-@@ -196,6 +202,12 @@ KviIpcSentinel::KviIpcSentinel() : QWidget(nullptr)
- setWindowFlags(Qt::FramelessWindowHint);
- setWindowTitle("kvirc4_ipc_sentinel");
- #elif defined(COMPILE_X11_SUPPORT) && defined(COMPILE_QX11INFO_SUPPORT)
-+
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)
-+ if (!QX11Info::isPlatformX11()) {
-+ return;
-+ }
-+#endif
- kvi_ipcLoadAtoms();
-
- XChangeProperty(kvi_ipc_get_xdisplay(), winId(), kvi_atom_ipc_sentinel_window,
XA_STRING, 8,
-diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
-index a3c6c50..c1b9391 100644
---- a/src/kvirc/ui/KviMainWindow.cpp
-+++ b/src/kvirc/ui/KviMainWindow.cpp
-@@ -105,7 +105,10 @@ KviMainWindow::KviMainWindow(QWidget * pParent)
- // We try to avois this as much as possible, since it forces the use of the low-res
16x16 icon
- setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::KVIrc)));
- #endif
--
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
-+ // set name of the app desktop file; used by wayland to load the window icon
-+ QGuiApplication::setDesktopFileName("kvirc");
-+#endif
- setWindowTitle(KVI_DEFAULT_FRAME_CAPTION);
-
- m_pActiveContext = nullptr;
commit 9ec556dbc3724fb654ca9dca5fd1c6dd57d15fa0
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sun Jan 21 03:07:17 2024 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/kvirc.spec b/kvirc.spec
index a76ab81..096d185 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -1,6 +1,6 @@
Name: kvirc
Version: 5.0.0
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Free portable IRC client
License: GPLv2+ with exceptions
URL:
http://kvirc.net/
@@ -116,6 +116,9 @@ rm %{buildroot}%{_libdir}/libkvilib.so
%lang(uk) %{_mandir}/uk/man1/%{name}.1.gz
%changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.0-23
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
* Mon Nov 20 2023 Leigh Scott <leigh123linux(a)gmail.com> - 5.0.0-22
- Fix crash on startup when running wayland (rhbz#2250579)