diff --git a/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 6a1ec7a..0000000 --- a/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 7860b9699b6a20fdf6e61d89df28e86b1e9a4dc4 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -Add a unit test that ensures that enum serialization honors the width -of the underlying type. - -(original patch trimmed) ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb..c4b9f36 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList MsgIdList; - typedef QList BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast(v); - return in; - } -+#endif - - // Exceptions - --- -2.24.1 - diff --git a/logrotate.quasselcore b/logrotate.quasselcore index 9c1f38f..ca00584 100644 --- a/logrotate.quasselcore +++ b/logrotate.quasselcore @@ -8,6 +8,6 @@ missingok copytruncate postrotate - chmod 644 /var/log/quasselcore + su quasselcore quasselcore endscript } diff --git a/quassel-0.13.1.tar.bz2 b/quassel-0.13.1.tar.bz2 deleted file mode 100644 index 6d4ef27..0000000 --- a/quassel-0.13.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855 -size 4289663 diff --git a/quassel-0.14.0.tar.bz2 b/quassel-0.14.0.tar.bz2 new file mode 100644 index 0000000..41318f2 --- /dev/null +++ b/quassel-0.14.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbd46ca429c1518480904c9e2b0ab3a0412fe197f3ce4879974e06ed3a0093a3 +size 4774297 diff --git a/quassel-rpmlintrc b/quassel-rpmlintrc index f9ce312..3c2aa7f 100644 --- a/quassel-rpmlintrc +++ b/quassel-rpmlintrc @@ -1,5 +1,2 @@ -addFilter("incoherent-init-script-name quasselcore") addFilter("incoherent-logrotate-file /etc/logrotate.d/quasselcore") -addFilter("explicit-lib-dependency libqt5_sql_backend") -addFilter("non-standard-uid /var/log/quassel quasslecore") -addFilter("non-standard-uid /var/lib/quasselcore quasslecore") +addFilter("explicit-lib-dependency libqt5_sql_backend") \ No newline at end of file diff --git a/quassel-set-required-libs-and-flags.patch b/quassel-set-required-libs-and-flags.patch deleted file mode 100644 index c950b94..0000000 --- a/quassel-set-required-libs-and-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: quassel-0.12.5/CMakeLists.txt -=================================================================== ---- quassel-0.12.5.orig/CMakeLists.txt -+++ quassel-0.12.5/CMakeLists.txt -@@ -465,6 +465,8 @@ endif() - # a small test program checking the defines. This works for both Qt4 and Qt5. - cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) -+set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) -+set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - - if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE) diff --git a/quassel.changes b/quassel.changes index cc2e18a..49a046b 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue Apr 12 11:09:50 UTC 2022 - Cronfox + +- Update to 0.14.0 + * Database schema format change, no downgrade possible! + * Don't silently fall back to unencrypted client/core communication if certificate cannot be loaded + * Properly escape LDAP usernames to prevent injection or bypassing authentication + * Strip format codes in ignore list rules (this might affect pre-existing rules) + * Support many more features of IRCv3 + * Improve window handling under Wayland + * Support the HAProxy protocol + * Provide a daemon providing Prometheus metrics + * Deprecate local highlight settings (prefer synced ones instead) + * Improve configuration of SASL PLAIN and EXTERNAL + * Add button for strike-through format + * Allow choosing the account to connect to via command-line option + * Make database schema migration more robust + * Make backlog fetch more efficient, allow for fetch-on-demand + * Make syncing and other aspects of the core/client protocol more efficient + * Many smaller fixes + * Improve log output, documentation and UI help + * Update translations, bundled iconsets and application icons +- Added new BuildRequires boost-devel: New build dependency. +- Added new Require update-alternatives: Fixing missing in post/pre. +- Change logrotate config: Fix permission problem. +- Dropped patches: + * 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch: Upstream support Qt 5.15. + * quassel-set-required-libs-and-flags.patch: Remove Qt4 support. +------------------------------------------------------------------- +Mon Nov 23 09:05:32 UTC 2020 - Christophe Giboudeaux + +- Spec cleanup + ------------------------------------------------------------------- Wed Aug 26 06:30:00 UTC 2020 - Antonio Larrosa diff --git a/quassel.spec b/quassel.spec index c4c70a4..56543f8 100644 --- a/quassel.spec +++ b/quassel.spec @@ -1,7 +1,7 @@ # # spec file for package quassel # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,13 @@ # -%define realver 0.13.1 +%define realver 0.14.0 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: quassel -Version: 0.13.1 +Version: 0.14.0 Release: 0 Summary: Distributed IRC client License: GPL-2.0-only OR GPL-3.0-only @@ -33,36 +33,31 @@ Source1: service.%{name}core Source2: sysconfig.%{name}core Source3: logrotate.%{name}core Source5: quassel-rpmlintrc -# PATCH-FIX-SUSE: Set the correct libraries and compiler flags in order to use qglobal.h in check_cxx_source_compiles function -Patch0: quassel-set-required-libs-and-flags.patch -# PATCH-FIX-UPSTREAM: Fix build with Qt 5.14 -Patch1: 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch -BuildRequires: cmake >= 2.8.10 -BuildRequires: extra-cmake-modules +BuildRequires: boost-devel BuildRequires: fdupes BuildRequires: git BuildRequires: hicolor-icon-theme -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel BuildRequires: kf5-filesystem -BuildRequires: knotifications-devel -BuildRequires: knotifyconfig-devel -BuildRequires: ktextwidgets-devel -BuildRequires: kxmlgui-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig -BuildRequires: snorenotify-qt5-devel >= 0.7 +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(LibsnoreQt5) >= 0.7 +BuildRequires: cmake(Qca-qt5) +BuildRequires: cmake(Qt5Core) >= 5.5.0 +BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5WebEngine) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(dbusmenu-qt5) -BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5WebEngine) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(dbusmenu-qt5) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) %{?systemd_requires} @@ -95,6 +90,8 @@ This is the quassel standalone client. Summary: KDE client for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}-base = %{version} +Requires: update-alternatives +Requires(post): update-alternatives Provides: %{name}_ui = %{version} %description client @@ -109,6 +106,8 @@ This is the quassel KDE client only. Summary: Qt5 client for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}-base = %{version} +Requires: update-alternatives +Requires(post): update-alternatives Provides: %{name}_ui = %{version} %description client-qt5 @@ -150,8 +149,7 @@ such as WeeChat, but graphical. This contains common parts shared by %{name} and %{name}-client. %prep -%setup -q -n %{name}-%{realver} -%autopatch -p1 +%autosetup -p1 -n %{name}-%{realver} %build FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -159,11 +157,11 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/quassel.cpp FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/quassel.cpp -%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=ON -make %{?_smp_mflags} +%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=ON -DENABLE_SHARED=OFF +%cmake_build cd .. -%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF -make %{?_smp_mflags} +%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF -DENABLE_SHARED=OFF +%cmake_build %install %kf5_makeinstall -C build @@ -187,6 +185,11 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.quasselcore install -d -m 751 %{buildroot}%{_localstatedir}/log/%{name} install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}core +# actions svg icon dir is named incorrectly as 'action' +if [ -d %{buildroot}%{_datadir}/icons/hicolor/scalable/action ]; then + mv %{buildroot}%{_datadir}/icons/hicolor/scalable/action %{buildroot}%{_datadir}/icons/hicolor/scalable/actions +fi + # rewrite env shebang on scripts to normal shebang sed -i '1{ s,^#!%{_bindir}/env *bash *$,#!/bin/bash, @@ -209,14 +212,6 @@ sed -i '1{ %postun core %service_del_postun quasselcore.service -%if 0%{?suse_version} < 1500 -%post base -%icon_theme_cache_post - -%postun base -%icon_theme_cache_postun -%endif - %post client update-alternatives --install %{_bindir}/quasselclient quasselclient %{_bindir}/quasselclient-kde 20 @@ -262,10 +257,8 @@ fi %files base %license COPYING -%{_datadir}/applications/%{name}client.desktop -%{_datadir}/pixmaps/%{name}.png -%dir %{_datadir}/%{name} %{_datadir}/%{name} +%{_datadir}/applications/%{name}client.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/knotifications5/%{name}.notifyrc