KDE Applications 17.08.80 beta

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kget?expand=0&rev=45
This commit is contained in:
Luca Beltrame 2017-03-26 07:18:59 +00:00 committed by Git OBS Bridge
parent d3aaefcbb6
commit a36706318e
6 changed files with 240 additions and 98 deletions

26
0001-QTBUG-57796.patch Normal file
View File

@ -0,0 +1,26 @@
From 3cfe31701ac8ee8444e03db2ecae527c7d1927ef Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Fri, 23 Dec 2016 21:01:43 +0100
Subject: [PATCH] QTBUG-57796
Signed-off-by: Fabian Vogt <fabian@ritter-vogt.de>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 868efe1..71f235f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,7 +217,7 @@ if (Gpgmepp_FOUND)
endif()
-set_target_properties(kgetcore PROPERTIES VERSION 5.0.0 SOVERSION 5 )
+set_target_properties(kgetcore PROPERTIES VERSION 5.0.0 SOVERSION 5 AUTOMOC_MOC_OPTIONS "-D__GNUC__=6")
install(TARGETS kgetcore ${INSTALL_TARGETS_DEFAULT_ARGS})
--
2.10.2

84
fix-qca-qt5.diff Normal file
View File

@ -0,0 +1,84 @@
commit a3cca346809f174b992123fb7a58cd62f3436aec
Author: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Tue Jan 13 11:28:16 2015 +0100
Change to use the qt5 branch of Qca
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3f458d..828761f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_P
find_package(Sqlite QUIET)
set_package_properties(SQLITE_FOUND PROPERTIES DESCRIPTION "SQLite is a Binary-Database" TYPE RECOMMENDED PURPOSE "Needed for the SQLite-Backend of the KGet-History")
-find_package(Qca 2.1.0)
+find_package(Qca-qt5 2.1.0)
set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
URL "http://delta.affinix.com/qca"
TYPE REQUIRED)
@@ -71,7 +71,7 @@ if(CMAKE_BUILD_TYPE MATCHES debugfull)
add_definitions(-DDEBUG)
endif(CMAKE_BUILD_TYPE MATCHES debugfull)
-if (Qca_FOUND)
+if (Qca-qt5_FOUND)
add_definitions(-DHAVE_QCA2)
MESSAGE(STATUS "QCA found")
endif()
@@ -181,8 +181,8 @@ if (SQLITE_FOUND)
target_link_libraries(kgetcore ${QT_QTSQL_LIBRARY})
endif (SQLITE_FOUND)
-if (Qca_FOUND)
- target_link_libraries(kgetcore qca)
+if (Qca-qt5_FOUND)
+ target_link_libraries(kgetcore qca-qt5)
endif ()
if (KF5QGpgme_FOUND)
commit 22737e6dd01abb62cd2f6ac3eb9c7ae96bc948f4
Author: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Tue Jan 13 11:53:56 2015 +0100
Fix QGpgme detection due to upstream changes
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 828761f..2c93564 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,9 +47,8 @@ set_package_properties(Qca PROPERTIES DESCRIPTION "Support for encryption"
TYPE REQUIRED)
-find_package(KF5QGpgme)
find_package(KF5Gpgmepp)
-set_package_properties(KF5QGpgme_FOUND PROPERTIES DESCRIPTION "The QGpgME library" TYPE RECOMMENDED PURPOSE "QGpgME is required to have signature verifying support in KGet.")
+set_package_properties(KF5Gpgmepp_FOUND PROPERTIES DESCRIPTION "The GpgMEPP library" TYPE RECOMMENDED PURPOSE "GpgMEPP is required to have signature verifying support in KGet.")
find_package(KTorrent QUIET)
set_package_properties(LIBKTORRENT_FOUND PROPERTIES DESCRIPTION "Backend Library of KTorrent" TYPE RECOMMENDED PURPOSE "Needed to build KGet bittorrent support.")
@@ -76,12 +75,11 @@ if (Qca-qt5_FOUND)
MESSAGE(STATUS "QCA found")
endif()
-if(KF5QGpgme_FOUND)
+if(KF5Gpgmepp_FOUND)
find_package(Boost REQUIRED)
add_definitions(-DHAVE_QGPGME)
include_directories(
${Boost_INCLUDE_DIRS}
- ${QGPGME_INCLUDE_DIR}
)
endif()
@@ -185,7 +183,7 @@ if (Qca-qt5_FOUND)
target_link_libraries(kgetcore qca-qt5)
endif ()
-if (KF5QGpgme_FOUND)
+if (KF5Gpgmepp_FOUND)
target_link_libraries(kgetcore KF5::QGpgme KF5::Gpgmepp)
kde_enable_exceptions()
endif()

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6b22b9b6851792ee35951f2153ac7326e961c8e5acbc28dfe7ad3d43359d1641
size 1082008

3
kget-17.03.80.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:233f60390e1581dce818060a3dfdfb55d0e47e50294bd845301741447360409b
size 1081924

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Mar 25 23:10:56 CET 2017 - lbeltrame@kde.org
- Update to 17.03.80
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.03.80.php
- Changes since 16.12.3:
* Fix terminology: "by KDE", not "for KDE"
-------------------------------------------------------------------
Thu Mar 9 12:45:17 CET 2017 - lbeltrame@kde.org

104
kget.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kget
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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
@ -17,76 +17,98 @@
Name: kget
Version: 16.12.3
Version: 17.03.80
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
# It can only build on the same platforms as Qt Webengine
ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64
Summary: Download Manager
License: GPL-2.0+
Group: Productivity/Networking/Other
Source0: %{name}-%{version}.tar.xz
# Patch0: fix-qca-qt5.diff
# PATCH-FIX-OPENSUSE moc-gnuc.patch fabian@ritter-vogt.de -- QTBUG-57796
Patch1: 0001-QTBUG-57796.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
%else
BuildRequires: boost-devel
%endif
BuildRequires: extra-cmake-modules
BuildRequires: gpgme-devel
BuildRequires: libkdepimlibs4-devel
BuildRequires: libkonq-devel
BuildRequires: libktorrent-devel
BuildRequires: libqca2-devel
BuildRequires: kcmutils-devel
BuildRequires: kconfig-devel
BuildRequires: kconfigwidgets-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kdbusaddons-devel
BuildRequires: kdelibs4support-devel
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kio-devel
BuildRequires: knotifications-devel
BuildRequires: knotifyconfig-devel
BuildRequires: kwallet-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: libgpgmepp-devel
BuildRequires: libqca-qt5-devel
BuildRequires: libqgpgme-devel
BuildRequires: pkgconfig
BuildRequires: solid-devel
BuildRequires: sqlite-devel
# It can only build on the same platforms as Qt Webengine
ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
Obsoletes: kget5 < %{version}
Provides: kget5 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
%description
An advanced download manager for KDE
%prep
%setup -q
# %patch0 -p1
%patch1 -p1
%build
%ifarch ppc ppc64
export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
%cmake_kde4 -d build
%cmake_kf5 -d build --
%make_jobs
%install
cd build
%kde4_makeinstall
cd ..
%suse_update_desktop_file -r kget System TrayIcon
%kde_post_install
%kf5_makeinstall -C build
%suse_update_desktop_file -r org.kde.kget System TrayIcon
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%{_kde4_bindir}/kget
%{_kde4_appsdir}/dolphinpart/
%{_kde4_servicetypesdir}/*.desktop
%{_kde4_servicesdir}/*.desktop
%{_kde4_servicesdir}/ServiceMenus/*.desktop
%{_datadir}/dbus-1/services/org.kde.kget.service
%{_kde4_configkcfgdir}/*.kcfg
%{_kde4_appsdir}/kwebkitpart/
%{_kde4_appsdir}/khtml/
%{_kde4_appsdir}/kget/
%{_kde4_iconsdir}/hicolor/*/apps/kget.*
%{_kde4_htmldir}/en/kget/
%{_kde4_modulesdir}/kcm_kget*.so
%{_kde4_modulesdir}/kget_*.so
%{_kde4_modulesdir}/krunner_*.so
%{_kde4_modulesdir}/plasma_*.so
%{_kde4_libdir}/libkgetcore.so*
%{_kde4_applicationsdir}/kget.desktop
%{_kde4_appsdir}/kconf_update/
%{_kf5_bindir}/kget
%{_kf5_sharedir}/dolphinpart/
%{_kf5_servicetypesdir}/
%{_kf5_servicesdir}/
%{_kf5_sharedir}/dbus-1/services/org.kde.kget.service
%{_kf5_configkcfgdir}/
%{_kf5_sharedir}/kwebkitpart/
%{_kf5_sharedir}/khtml/
%{_kf5_sharedir}/kget/
%{_kf5_sharedir}/kxmlgui5/
%{_kf5_notifydir}/
%{_kf5_iconsdir}/hicolor/*/apps/kget.*
%dir %{_kf5_htmldir}
%dir %{_kf5_htmldir}/en
%doc %{_kf5_htmldir}/en/kget/
%{_kf5_libdir}/libkgetcore.so*
%{_kf5_applicationsdir}/org.kde.kget.desktop
%{_kf5_sharedir}/kconf_update/
%{_kf5_plugindir}/
%changelog