rpm/quassel
SHA256
1
0
Fork 0
forked from pool/quassel
Code Pull Requests Activity

- Rebase patch quassel-set-required-libs-and-flags.patch

Browse Source 
- Switch from qt5webkit to webengine

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=55
This commit is contained in:
Tomáš Chvátal 2018-04-25 08:21:39 +00:00 committed by Git OBS Bridge
parent bebbbe9db3
commit 97791969a1
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt Index: quassel-0.12.5/CMakeLists.txt
index 2c29af4..c3a7992 100644 ===================================================================
--- a/CMakeLists.txt --- quassel-0.12.5.orig/CMakeLists.txt
+++ b/CMakeLists.txt +++ quassel-0.12.5/CMakeLists.txt
@@ -427,6 +427,8 @@ endif() @@ -465,6 +465,8 @@ endif()
# a small test program checking the defines. This works for both Qt4 and Qt5. # a small test program checking the defines. This works for both Qt4 and Qt5.
cmake_push_check_state(RESET) cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) +set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS})
+set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES}) +set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") 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)

2
quassel.changes
View File

@ -4,6 +4,8 @@ Wed Apr 25 07:56:26 UTC 2018 - tchvatal@suse.com
- Version update to 0.12.4: - Version update to 0.12.4:
* Various small fixes * Various small fixes
* Fix for DOS and information leaks bsc#1090495 * 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 Thu Nov 23 13:53:34 UTC 2017 - rbrown@suse.com

21
quassel.spec
View File

@ -47,21 +47,20 @@ BuildRequires: knotifications-devel
BuildRequires: knotifyconfig-devel BuildRequires: knotifyconfig-devel
BuildRequires: ktextwidgets-devel BuildRequires: ktextwidgets-devel
BuildRequires: kxmlgui-devel BuildRequires: kxmlgui-devel
BuildRequires: phonon4qt5-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: snorenotify-qt5-devel >= 0.7 BuildRequires: snorenotify-qt5-devel >= 0.7
BuildRequires: systemd
BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebEngine)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(dbusmenu-qt5)
BuildRequires: pkgconfig(phonon4qt5)
BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(qca2-qt5)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%{?systemd_requires} %{?systemd_requires}
@ -181,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') FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/quassel.cpp 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_build %make_build
cd .. 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_build %make_build
%install %install
@ -226,11 +225,13 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.
%postun core %postun core
%service_del_postun quasselcore.service %service_del_postun quasselcore.service
%if 0%{?suse_version} < 1500
%post base %post base
%icon_theme_cache_post %icon_theme_cache_post
%postun base %postun base
%icon_theme_cache_postun %icon_theme_cache_postun
%endif
%post client %post client
update-alternatives --install %{_bindir}/quasselclient quasselclient %{_bindir}/quasselclient-kde 20 update-alternatives --install %{_bindir}/quasselclient quasselclient %{_bindir}/quasselclient-kde 20
@ -249,24 +250,24 @@ if [ $1 -eq 0 ] ; then
fi fi
%files mono %files mono
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README.md
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_bindir}/%{name} %{_bindir}/%{name}
%files client %files client
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}client-kde %{_bindir}/%{name}client-kde
%ghost %{_sysconfdir}/alternatives/quasselclient %ghost %{_sysconfdir}/alternatives/quasselclient
%{_bindir}/%{name}client %{_bindir}/%{name}client
%files client-qt5 %files client-qt5
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}client-qt5 %{_bindir}/%{name}client-qt5
%ghost %{_sysconfdir}/alternatives/quasselclient %ghost %{_sysconfdir}/alternatives/quasselclient
%{_bindir}/%{name}client %{_bindir}/%{name}client
%files core %files core
%doc AUTHORS ChangeLog README %doc AUTHORS ChangeLog README.md
%{_bindir}/%{name}core %{_bindir}/%{name}core
%{_sbindir}/rc%{name}core %{_sbindir}/rc%{name}core
%{_unitdir}/%{name}core.service %{_unitdir}/%{name}core.service