pool/quassel
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 600829 from KDE:Extra

Browse Source 
- Version update to 0.12.4:
  * Various small fixes
  * Fix for DOS and information leaks bsc#1090495
- Rebase patch quassel-set-required-libs-and-flags.patch
- Switch from qt5webkit to webengine

OBS-URL: https://build.opensuse.org/request/show/600829
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/quassel?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2018-04-27 14:07:48 +00:00 committed by Git OBS Bridge
commit df0a80b544
5 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quassel-0.12.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d
size 3742639

3
quassel-0.12.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2
size 3747392

14
quassel-set-required-libs-and-flags.patch
View File

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c29af4..c3a7992 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -427,6 +427,8 @@ endif()
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}")
check_cxx_source_compiles("
#include \"qglobal.h\"
if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)

9
quassel.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Apr 25 07:56:26 UTC 2018 - tchvatal@suse.com
- Version update to 0.12.4:
* Various small fixes
* Fix for DOS and information leaks bsc#1090495
- Rebase patch quassel-set-required-libs-and-flags.patch
- Switch from qt5webkit to webengine
-------------------------------------------------------------------
Thu Nov 23 13:53:34 UTC 2017 - rbrown@suse.com

40
quassel.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package quassel
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,16 +18,15 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: quassel
Version: 0.12.4
Version: 0.12.5
Release: 0
Summary: Modern, cross-platform, distributed IRC client
License: GPL-2.0 or GPL-3.0
License: GPL-2.0-only OR GPL-3.0-only
Group: Productivity/Networking/IRC
Url: http://quassel-irc.org/
URL: http://quassel-irc.org/
Source: http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2
Source1: service.%{name}core
Source2: sysconfig.%{name}core
@ -48,22 +47,21 @@ BuildRequires: knotifications-devel
BuildRequires: knotifyconfig-devel
BuildRequires: ktextwidgets-devel
BuildRequires: kxmlgui-devel
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig
BuildRequires: snorenotify-qt5-devel >= 0.7
BuildRequires: systemd
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5WebKit)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5WebEngine)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(dbusmenu-qt5)
BuildRequires: pkgconfig(phonon4qt5)
BuildRequires: pkgconfig(qca2-qt5)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(zlib)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%description
@ -182,10 +180,10 @@ 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_WEBKIT=ON -DWITH_KDE=ON
%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=ON
make %{?_smp_mflags}
cd ..
%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=OFF
%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF
make %{?_smp_mflags}
%install
@ -227,11 +225,13 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.
%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
@ -250,28 +250,24 @@ if [ $1 -eq 0 ] ; then
fi
%files mono
%defattr(-,root,root)
%doc AUTHORS ChangeLog README
%doc AUTHORS ChangeLog README.md
%{_datadir}/applications/%{name}.desktop
%{_bindir}/%{name}
%files client
%defattr(-,root,root)
%doc AUTHORS ChangeLog README
%doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}client-kde
%ghost %{_sysconfdir}/alternatives/quasselclient
%{_bindir}/%{name}client
%files client-qt5
%defattr(-,root,root)
%doc AUTHORS ChangeLog README
%doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}client-qt5
%ghost %{_sysconfdir}/alternatives/quasselclient
%{_bindir}/%{name}client
%files core
%defattr(-,root,root)
%doc AUTHORS ChangeLog README
%doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}core
%{_sbindir}/rc%{name}core
%{_unitdir}/%{name}core.service
@ -282,7 +278,7 @@ fi
%{_fillupdir}/sysconfig.%{name}core
%files base
%defattr(-,root,root)
%license COPYING
%{_datadir}/applications/%{name}client.desktop
%{_datadir}/pixmaps/%{name}.png
%dir %{_datadir}/%{name}