commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2020-08-18 13:58:22
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.3399 (New)
Package is "kjots"
Tue Aug 18 13:58:22 2020 rev:9 rq:826430 version:5.0.2
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2020-04-22
20:59:32.340167340 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new.3399/kjots.changes2020-08-18
13:59:26.310221284 +0200
@@ -1,0 +2,6 @@
+Thu Jul 23 11:09:08 UTC 2020 - wba...@tmo.at
+
+- Add Install-the-kontact-plugin-into-kontact5.patch to fix build
+ with kontactinterface 20.08
+
+---
New:
Install-the-kontact-plugin-into-kontact5.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.wBD0PZ/_old 2020-08-18 13:59:26.958221550 +0200
+++ /var/tmp/diff_new_pack.wBD0PZ/_new 2020-08-18 13:59:26.962221551 +0200
@@ -26,6 +26,8 @@
Source0:
http://download.kde.org/stable/kjots/%{version}/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM
Patch0: Fix-bookmarks-actions.patch
+# PATCH-FIX-UPSTREAM
+Patch1: Install-the-kontact-plugin-into-kontact5.patch
BuildRequires: akonadi-server-devel
BuildRequires: extra-cmake-modules
BuildRequires: grantlee5-devel
@@ -86,7 +88,8 @@
%_kf5_sharedir/kjots/
%_kf5_iconsdir/hicolor/*/apps/kjots.*
%_kf5_iconsdir/oxygen/*/actions/edit-delete-page.*
-%{_kf5_plugindir}/kontact_kjotsplugin.so
+%dir %{_kf5_plugindir}/kontact5/
+%{_kf5_plugindir}/kontact5/kontact_kjotsplugin.so
%{_datadir}/kontact/
%{_kf5_servicesdir}/kontact/
++ Install-the-kontact-plugin-into-kontact5.patch ++
>From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
From: David Faure
Date: Fri, 24 Apr 2020 01:25:43 +0200
Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
Summary: This will allow kontact to use KPluginLoader one day.
It also fixes compilation with current kontactinterface API.
Test Plan:
rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
kontact still finds the zanshin plugin
The same steps (other than old-kontact-interface compatibility) were already
pushed to all other kontact plugins.
This commit is very similar to https://phabricator.kde.org/D28847
and its predecessor commit, in zanshin.
---
src/kontact_plugin/CMakeLists.txt | 11 -
src/kontact_plugin/kjots_plugin.cpp| 34 --
src/kontact_plugin/kjots_plugin.h | 5
src/kontact_plugin/kjotsplugin.desktop | 2 +-
4 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/src/kontact_plugin/CMakeLists.txt
b/src/kontact_plugin/CMakeLists.txt
index 8a6b5e1..dec4b8b 100644
--- a/src/kontact_plugin/CMakeLists.txt
+++ b/src/kontact_plugin/CMakeLists.txt
@@ -1,13 +1,22 @@
include_directories(${kjots_SOURCE_DIR}/src)
+# TODO: remove once kontactinterface 5.14.42 is required
+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
+ # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know
about other macros.
+ # 3.10+ lets us provide more macro names that require automoc.
+ # KF5 >= 5.42 takes care itself of adding its macros in its cmake config
files
+ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
+endif()
+
set(kontact_kjots_PART_SRCS
kjots_plugin.cpp
)
add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
+kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
-install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(TARGETS kontact_kjotsplugin DESTINATION
${KDE_INSTALL_PLUGINDIR}/kontact5)
install(FILES kjotsplugin.desktop DESTINATION
${KDE_INSTALL_KSERVICES5DIR}/kontact)
install(FILES kjots.setdlg DESTINATION
${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
diff --git a/src/kontact_plugin/kjots_plugin.cpp
b/src/kontact_plugin/kjots_plugin.cpp
index 66e7ed5..b74d601 100644
--- a/src/kontact_plugin/kjots_plugin.cpp
+++ b/src/kontact_plugin/kjots_plugin.cpp
@@ -33,7 +33,25 @@
#include
#include
-EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots)
+#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
+/**
+ Exports Kontact plugin.
+ @param pluginclass the class to instanciate (must derive from
KontactInterface::Plugin
+ @param jsonFile filename of the JSON file, generated from a .desktop file
+ */
+#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
+class Instance \
+{\
+
commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2020-04-22 20:59:29
Comparing /work/SRC/openSUSE:Factory/kjots (Old)
and /work/SRC/openSUSE:Factory/.kjots.new.2738 (New)
Package is "kjots"
Wed Apr 22 20:59:29 2020 rev:8 rq:796312 version:5.0.2
Changes:
--- /work/SRC/openSUSE:Factory/kjots/kjots.changes 2016-12-26
21:43:42.613978143 +0100
+++ /work/SRC/openSUSE:Factory/.kjots.new.2738/kjots.changes2020-04-22
20:59:32.340167340 +0200
@@ -1,0 +2,6 @@
+Mon Apr 20 11:08:57 UTC 2020 - wba...@tmo.at
+
+- Add Fix-bookmarks-actions.patch to fix "Ambiguous shortcuts"
+ warning and a possible crash on start (kde#384000)
+
+---
New:
Fix-bookmarks-actions.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.488i4y/_old 2020-04-22 20:59:33.644169936 +0200
+++ /var/tmp/diff_new_pack.488i4y/_new 2020-04-22 20:59:33.648169944 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kjots
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -20,10 +20,12 @@
Version:5.0.2
Release:0
Summary:A note taking application for KDE using Akonadi
-License:GPL-2.0 and LGPL-2.1+
+License:GPL-2.0-only AND LGPL-2.1-or-later
Group: System/GUI/KDE
-Url:http://www.kde.org
+URL:http://www.kde.org
Source0:
http://download.kde.org/stable/kjots/%{version}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM
+Patch0: Fix-bookmarks-actions.patch
BuildRequires: akonadi-server-devel
BuildRequires: extra-cmake-modules
BuildRequires: grantlee5-devel
@@ -53,6 +55,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%cmake_kf5 -d build
++ Fix-bookmarks-actions.patch ++
>From ca6f4b963e83ed91cc7314e1b60fe6607b61b53e Mon Sep 17 00:00:00 2001
From: Igor Poboiko
Date: Sun, 12 Apr 2020 17:55:24 +0300
Subject: [KJots] Fix bookmarks actions
Summary:
This patch ports KJots from deprecated `KBookmarksMenu` API (see {D25660}).
On my machine, it also fixes a crash (`bm_action` was null for some reason,
I did not investigate it though).
It also fixes the shortcuts collision (`action->setShortcut` was not enough,
one also needs to run `actionCollection->setDefaultShortcut`).
BUG: 384000
Test Plan:
1) Start KJots
2) It don't crash, and `Ambiguous shortcuts` dialog does not appear)
3) Open `Bookmarks` menu, the shortcut is `Ctrl+Shift+B`.
Reviewers: dvratil
Reviewed By: dvratil
Subscribers: winterz, kde-pim
Tags: #kde_pim
Differential Revision: https://phabricator.kde.org/D28775
---
src/kjotswidget.cpp | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
index 865129b..e343bbd 100644
--- a/src/kjotswidget.cpp
+++ b/src/kjotswidget.cpp
@@ -353,17 +353,20 @@ KJotsWidget::KJotsWidget(QWidget *parent, KXMLGUIClient
*xmlGuiClient, Qt::Windo
bookmarkMenu =
actionCollection->add(QLatin1String("bookmarks"));
bookmarkMenu->setText(i18n(""));
KJotsBookmarks *bookmarks = new KJotsBookmarks(treeview);
-/*KBookmarkMenu *bmm =*/ new KBookmarkMenu(
+KBookmarkMenu *bmm = new KBookmarkMenu(
KBookmarkManager::managerForFile(
QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).first() +
QStringLiteral("/kjots/bookmarks.xml"),
QStringLiteral("kjots")),
-bookmarks, bookmarkMenu->menu(), actionCollection);
+bookmarks, bookmarkMenu->menu());
// "Add bookmark" and "make text bold" actions have conflicting shortcuts
(ctrl + b)
// Make add_bookmark use ctrl+shift+b to resolve that.
-QAction *bm_action = qobject_cast(actionCollection->action(QLatin1String("add_bookmark")));
-Q_ASSERT(bm_action);
-bm_action->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B);
+QAction *bm_action = bmm->addBookmarkAction();
+actionCollection->addAction(QStringLiteral("add_bookmark"), bm_action);
+actionCollection->setDefaultShortcut(bm_action, Qt::CTRL | Qt::SHIFT |
Qt::Key_B);
+actionCollection->addAction(QStringLiteral("edit_bookmark"),
bmm->editBookmarksAction());
+
commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2016-09-14 23:18:05
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-29
14:53:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-09-14
23:18:09.0 +0200
@@ -1,0 +2,14 @@
+Sat Sep 10 13:37:49 UTC 2016 - tittiatc...@gmail.com
+
+- Add fix-appstream.diff patch from upstream instead of moving
+ files around after build
+
+- Add add-kontact-plugin.diff (bko#359380). Now Kjots also shows up
+ in kontact
+
+- Add enable-image-insert.patch from upstream so that images can be
+ included in the created notes
+
+- Add fix-icons.diff to fix build with newer Frameworks.
+
+---
New:
add-kontact-plugin.diff
enable-image-insert.patch
fix-appstream.diff
fix-icons.diff
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.hD9GCH/_old 2016-09-14 23:18:11.0 +0200
+++ /var/tmp/diff_new_pack.hD9GCH/_new 2016-09-14 23:18:11.0 +0200
@@ -28,11 +28,19 @@
Patch0: fix-desktop-file.patch
# PATCH-FIX-UPSTREAM fix-build.patch -- Fix build with KDE Applications 16.08
Patch1: fix-build.patch
+# PATCH-FIX-UPSTREAM fix-icons.diff -- Fix build by moving KDE4_ADD_APP_ICON
to ecm_add_app_icon
+Patch2: fix-icons.diff
+# PATCH-FIX-UPSTREAM fix-appstream.diff -- Fix the appdata filename
+Patch3: fix-appstream.diff
+# PATCH-FEATURE-UPSTREAM add-kontact-plugin.diff -- Add a plugin so that kjots
shows up in kontact
+Patch4: add-kontact-plugin.diff
+# PATCH-FEATURE-UPSTREAM enable-image-insert.patch -- Allow an image to be
inserted in the notes
+Patch5: enable-image-insert.patch
+BuildRequires: akonadi-server-devel
BuildRequires: extra-cmake-modules
BuildRequires: grantlee5-devel
BuildRequires: libxslt-tools
BuildRequires: update-desktop-files
-BuildRequires: cmake(KF5Akonadi)
BuildRequires: cmake(KF5AkonadiNotes)
BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Config)
@@ -45,7 +53,8 @@
BuildRequires: cmake(KF5PimTextEdit)
BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5XmlGui)
-Requires: akonadi_resources
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5PrintSupport)
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,6 +67,10 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch5 -p1
+%patch4 -p1
%build
%cmake_kf5 -d build
@@ -67,13 +80,6 @@
%install
%kf5_makeinstall -C build
%suse_update_desktop_file -C "Note Taker" org.kde.kjotsUtility
DesktopUtility
-# Fixup the .appdata file: it needs to:
-# * have the same basename as the .desktop file
-# * reference the name of the .desktop file correctly
-sed "s|Kjots.desktop|org.kde.kjots.desktop|" \
- %{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
@@ -95,6 +101,9 @@
%_kf5_sharedir/kjots/
%_kf5_iconsdir/hicolor/*/apps/kjots.*
%_kf5_iconsdir/oxygen/*/actions/edit-delete-page.*
+%{_kf5_plugindir}/kontact_kjotsplugin.so
+%{_datadir}/kontact/
+%{_kf5_servicesdir}/kontact/
%files lang -f kjots.lang
%defattr(-,root,root)
++ add-kontact-plugin.diff ++
>From b79b87feb090eb50a2831552c27b67366792f6fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?=
Date: Tue, 2 Aug 2016 21:06:51 +0200
Subject: Add Kontact plugin for KJots
BUG: 359380
FIXED-IN: 5.1.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9a03097..b1e8bcf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,8 @@ add_subdirectory(noteshared)
# it that were used by KJots. We could eventually move this to Akonadi Note
add_subdirectory(akonadi_next)
+add_subdirectory(kontact_plugin)
+
add_definitions(-DTRANSLATION_DOMAIN=\"kjots\")
configure_file(kjots-version.h.in
diff --git a/src/kjotspart.cpp b/src/kjotspart.cpp
index fd1e815..606c69a 100644
--- a/src/kjotspart.cpp
+++ b/src/kjotspart.cpp
@@ -66,7 +66,8 @@ KJotsPart::KJotsPart(QWidget *parentWidget, QObject *parent,
const QVariantList
initAction();
// set our XML-UI resource file
-setXMLFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
QLatin1String("kjots/kjotspartui.rc")));
+setComponentName(QStringLiteral("kjots"), QStringLiteral("kjots"));
+
commit kjots for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-08-29
14:53:18.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 8 22:33:56 UTC 2016 - wba...@tmo.at
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.KvkDsL/_new 2016-08-29 14:53:19.0 +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|Kjots.desktop|org.kde.kjots.desktop|" \
- %{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
Date: Wed, 18 May 2016 13:42:29 +
Subject: Fix build
X-Git-Url:
http://quickgit.kde.org/?p=kjots.git=commitdiff=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
commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2016-08-08 13:57:35
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-06-29
15:02:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-08-08
13:57:38.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 24 17:23:47 UTC 2016 - wba...@tmo.at
+
+- Remove boost-devel build requirement, it's not needed
+
+---
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.bEEC4B/_old 2016-08-08 13:57:38.0 +0200
+++ /var/tmp/diff_new_pack.bEEC4B/_new 2016-08-08 13:57:38.0 +0200
@@ -26,7 +26,6 @@
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
-BuildRequires: boost-devel
BuildRequires: extra-cmake-modules
BuildRequires: grantlee5-devel
BuildRequires: libxslt-tools
commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2016-06-29 15:02:20
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-05-20
11:55:45.0 +0200
+++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-06-29
15:02:22.0 +0200
@@ -1,0 +2,8 @@
+Sat Jun 18 20:27:38 UTC 2016 - asterios.dra...@gmail.com
+
+- Update to version 5.0.1:
+ * Make it compile with Applications/15.12.
+ * Add COPYING files.
+- Removed make-it-build.diff (fixed upstream).
+
+---
Old:
kjots-5.0.0.tar.xz
make-it-build.diff
New:
kjots-5.0.1.tar.xz
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.xIUu2R/_old 2016-06-29 15:02:23.0 +0200
+++ /var/tmp/diff_new_pack.xIUu2R/_new 2016-06-29 15:02:23.0 +0200
@@ -17,16 +17,15 @@
Name: kjots
-Version:5.0.0
+Version:5.0.1
Release:0
Summary:A note taking application for KDE using Akonadi
License:GPL-2.0 and LGPL-2.1+
Group: System/GUI/KDE
Url:http://www.kde.org
-Source0:%{name}-%{version}.tar.xz
-Patch1: make-it-build.diff
+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
-Patch2: fix-desktop-file.patch
+Patch0: fix-desktop-file.patch
BuildRequires: boost-devel
BuildRequires: extra-cmake-modules
BuildRequires: grantlee5-devel
@@ -55,8 +54,7 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
%build
%cmake_kf5 -d build
@@ -81,17 +79,17 @@
%files
%defattr(-,root,root)
-%doc COPYING COPYING.LIB
-%_datadir/kjots/
+%doc ANNOUNCE CHANGES COPYING COPYING.LIB README
%_datadir/appdata/
%_kf5_applicationsdir/org.kde.kjots.desktop
-%_bindir/kjots
-%_kf5_configkcfgdir/
+%_kf5_bindir/kjots
+%_kf5_configkcfgdir/kjots.kcfg
%_kf5_kxmlguidir/kjots/
%_kf5_servicesdir/kjotspart.desktop
%_kf5_plugindir/kjotspart.so
%_kf5_plugindir/kcm_kjots.so
%_kf5_servicesdir/kjots_config_misc.desktop
+%_kf5_sharedir/kjots/
%_kf5_iconsdir/hicolor/*/apps/kjots.*
%_kf5_iconsdir/oxygen/*/actions/edit-delete-page.*
++ kjots-5.0.0.tar.xz -> kjots-5.0.1.tar.xz ++
2061 lines of diff (skipped)
commit kjots for openSUSE:Factory
Hello community,
here is the log from the commit of package kjots for openSUSE:Factory checked
in at 2016-05-20 11:55:43
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-02-22
10:12:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.kjots.new/kjots.changes 2016-05-20
11:55:45.0 +0200
@@ -1,0 +2,14 @@
+Thu May 12 13:15:47 UTC 2016 - dims...@opensuse.org
+
+- Fix name of appdata.xml file and content to be aligned with the
+ .desktop file that has been renamed.
+- Add a comment to the .desktop file.
+
+---
+Sun Feb 14 09:00:49 UTC 2016 - tittiatc...@gmail.com
+
+- Add patch fix-desktop-file.patch to make the installed
+ desktop file work again. Thanks to Christian Trippe to
+ detect the error.
+
+---
New:
fix-desktop-file.patch
Other differences:
--
++ kjots.spec ++
--- /var/tmp/diff_new_pack.UtqqoJ/_old 2016-05-20 11:55:46.0 +0200
+++ /var/tmp/diff_new_pack.UtqqoJ/_new 2016-05-20 11:55:46.0 +0200
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: kjots
Version:5.0.0
Release:0
@@ -24,23 +25,25 @@
Url:http://www.kde.org
Source0:%{name}-%{version}.tar.xz
Patch1: make-it-build.diff
-BuildRequires: extra-cmake-modules
+# PATCH-FIX-UPSTREAM fix-desktop-file.patch -- Make sure that the desktop file
is Qt5/Plasma5 compatible
+Patch2: fix-desktop-file.patch
BuildRequires: boost-devel
-BuildRequires: cmake(KF5KCMUtils)
-BuildRequires: cmake(KF5KIO)
+BuildRequires: extra-cmake-modules
+BuildRequires: grantlee5-devel
+BuildRequires: libxslt-tools
+BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5AkonadiNotes)
+BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF5ConfigWidgets)
-BuildRequires: cmake(KF5Parts)
-BuildRequires: cmake(KF5Bookmarks)
-BuildRequires: cmake(KF5XmlGui)
-BuildRequires: cmake(KF5Akonadi)
+BuildRequires: cmake(KF5KCMUtils)
+BuildRequires: cmake(KF5KIO)
+BuildRequires: cmake(KF5KontactInterface)
BuildRequires: cmake(KF5Mime)
-BuildRequires: cmake(KF5AkonadiNotes)
+BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF5PimTextEdit)
-BuildRequires: cmake(KF5KontactInterface)
-BuildRequires: grantlee5-devel
-BuildRequires: libxslt-tools
-BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5XmlGui)
Requires: akonadi_resources
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,6 +56,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%build
%cmake_kf5 -d build
@@ -61,7 +65,14 @@
%install
%kf5_makeinstall -C build
-%suse_update_desktop_file org.kde.kjots Utility DesktopUtility
+%suse_update_desktop_file -C "Note Taker" org.kde.kjotsUtility
DesktopUtility
+# Fixup the .appdata file: it needs to:
+# * have the same basename as the .desktop file
+# * reference the name of the .desktop file correctly
+sed "s|Kjots.desktop|org.kde.kjots.desktop|" \
+ %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml > \
+ %{buildroot}%{_datadir}/appdata/org.kde.kjots.appdata.xml
+rm %{buildroot}%{_datadir}/appdata/Kjots.appdata.xml
%find_lang %{name}
%post -p /sbin/ldconfig
++ fix-desktop-file.patch ++
>From d536dbdf606d18baa437d03a9852fa6bb7289953 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 31 Jan 2016 00:09:17 +0100
Subject: Fix Exec in desktop file
thx to dvratil for the correct solution.
diff --git a/data/org.kde.kjots.desktop b/data/org.kde.kjots.desktop
index cd40af1..f7e3533 100755
--- a/data/org.kde.kjots.desktop
+++ b/data/org.kde.kjots.desktop
@@ -36,7 +36,7 @@ GenericName[uk]=Записна книжка
GenericName[x-test]=xxNote Takerxx
GenericName[zh_CN]=笔记记录工具
Icon=kjots
-Exec=kjots -caption %c
+Exec=kjots -qwindowtitle %c
Type=Application
Terminal=false
X-KDE-StartupNotify=true
