Hello community, here is the log from the commit of package kjots for openSUSE:Factory checked in at 2016-08-29 14:53:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjots (Old) and /work/SRC/openSUSE:Factory/.kjots.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjots" Changes: -------- --- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2016-08-08 13:57:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-08-29 14:53:18.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 8 22:33:56 UTC 2016 - [email protected] + +- Add fix-build.patch to fix build with KDE Applications 16.08 + +------------------------------------------------------------------- New: ---- fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjots.spec ++++++ --- /var/tmp/diff_new_pack.KvkDsL/_old 2016-08-29 14:53:19.000000000 +0200 +++ /var/tmp/diff_new_pack.KvkDsL/_new 2016-08-29 14:53:19.000000000 +0200 @@ -26,6 +26,8 @@ Source0: http://download.kde.org/stable/kjots/%{version}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM fix-desktop-file.patch -- Make sure that the desktop file is Qt5/Plasma5 compatible Patch0: fix-desktop-file.patch +# PATCH-FIX-UPSTREAM fix-build.patch -- Fix build with KDE Applications 16.08 +Patch1: fix-build.patch BuildRequires: extra-cmake-modules BuildRequires: grantlee5-devel BuildRequires: libxslt-tools @@ -41,6 +43,7 @@ BuildRequires: cmake(KF5Mime) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5PimTextEdit) +BuildRequires: cmake(KF5TextWidgets) BuildRequires: cmake(KF5XmlGui) Requires: akonadi_resources Recommends: %{name}-lang = %{version} @@ -54,6 +57,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build @@ -67,9 +71,9 @@ # * have the same basename as the .desktop file # * reference the name of the .desktop file correctly sed "s|<id>Kjots.desktop</id>|<id>org.kde.kjots.desktop</id>|" \ - %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml > \ - %{buildroot}%{_datadir}/appdata/org.kde.kjots.appdata.xml -rm %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml + %{buildroot}%{_kf5_appstreamdir}/Kjots.appdata.xml > \ + %{buildroot}%{_kf5_appstreamdir}/org.kde.kjots.appdata.xml +rm %{buildroot}%{_kf5_appstreamdir}/Kjots.appdata.xml %find_lang %{name} %post -p /sbin/ldconfig @@ -79,7 +83,7 @@ %files %defattr(-,root,root) %doc ANNOUNCE CHANGES COPYING COPYING.LIB README -%_datadir/appdata/ +%_kf5_appstreamdir/ %_kf5_applicationsdir/org.kde.kjots.desktop %_kf5_bindir/kjots %_kf5_configkcfgdir/kjots.kcfg ++++++ fix-build.patch ++++++ From: Raymond Wooninck <[email protected]> Date: Wed, 18 May 2016 13:42:29 +0000 Subject: Fix build X-Git-Url: http://quickgit.kde.org/?p=kjots.git&a=commitdiff&h=01fc847ef4baefddbaade39cfb97f9e7d59b0cc8 --- Fix build --- --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Bookmarks ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED) # PIM packages find_package(KF5Akonadi ${KDEPIMLIBS_LIB_VERSION} CONFIG REQUIRED) --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,6 +51,7 @@ KF5::KCMUtils KF5::Bookmarks KF5::ConfigWidgets + KF5::TextWidgets KF5::Mime KF5::AkonadiCore KF5::AkonadiWidgets
