Hello community,
here is the log from the commit of package plasmoid-active-window-control for
openSUSE:Factory checked in at 2018-11-20 22:44:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasmoid-active-window-control (Old)
and /work/SRC/openSUSE:Factory/.plasmoid-active-window-control.new.19453
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasmoid-active-window-control"
Tue Nov 20 22:44:10 2018 rev:6 rq:650511 version:1.7.3+git20181024.bb680e8
Changes:
--------
---
/work/SRC/openSUSE:Factory/plasmoid-active-window-control/plasmoid-active-window-control.changes
2018-09-03 10:36:43.236920291 +0200
+++
/work/SRC/openSUSE:Factory/.plasmoid-active-window-control.new.19453/plasmoid-active-window-control.changes
2018-11-20 22:45:02.574223747 +0100
@@ -1,0 +2,34 @@
+Mon Nov 19 09:40:29 UTC 2018 - Cor Blom <[email protected]>
+
+- Add fix-appmenu.patch to fix lyx menus (kde#399975)
+
+-------------------------------------------------------------------
+Sun Nov 11 21:31:25 UTC 2018 - Cor Blom <[email protected]>
+
+- Git does not have README.md and the license file is called COPYING
+
+-------------------------------------------------------------------
+Sun Nov 11 21:24:46 UTC 2018 - Cor Blom <[email protected]>
+
+- Remove reference to translations: git version does not have them
+
+-------------------------------------------------------------------
+Sun Nov 11 21:17:02 UTC 2018 - Cor Blom <[email protected]>
+
+- Update to git (released version was not working for some time without
+ patches)
+- Remove upstream patches:
+ * plasma-512.patch
+ * fix-space-title-appmenu.patch
+ * fix-activating-appmenu.patch
+ * 001-hide-emtpy-buttons.patch
+ * 002-update-libddbusmenuqt.patch
+
+-------------------------------------------------------------------
+Tue Nov 6 08:05:03 UTC 2018 - Cor Blom <[email protected]>
+
+- Add 001-hide-emtpy-buttons.patch to fix empty gtk buttons
+- Add 002-update-libddbusmenuqt.patch to update libdebusmenuqt to sync
+ with global menu plasmoid
+
+-------------------------------------------------------------------
Old:
----
fix-activating-appmenu.patch
fix-space-title-appmenu.patch
plasma-512.patch
plasma-applet-active-window-control-1.7.3.tar.gz
New:
----
_service
_servicedata
fix-appmenu.patch
plasma-applet-active-window-control-1.7.3+git20181024.bb680e8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasmoid-active-window-control.spec ++++++
--- /var/tmp/diff_new_pack.utIrMs/_old 2018-11-20 22:45:03.426223417 +0100
+++ /var/tmp/diff_new_pack.utIrMs/_new 2018-11-20 22:45:03.438223412 +0100
@@ -12,26 +12,22 @@
# 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/
#
Name: plasmoid-active-window-control
-Version: 1.7.3
+Version: 1.7.3+git20181024.bb680e8
Release: 0
Summary: Plasma 5 applet for controlling currently active window
License: GPL-2.0-only
Group: System/GUI/KDE
Url: https://github.com/kotelnik/plasma-applet-active-window-control
Source: plasma-applet-active-window-control-%{version}.tar.gz
-# FIX-UPSTREAM_PATCH: make it work with Plasma 5.11.95
-Patch0: plasma-512.patch
-# FIX-UPSTREAM_PATCH:: Fix inconsistent space between title and appmenu
-Patch1: fix-space-title-appmenu.patch
-# FIX-UPSTREAM_PATCH: Fix proper enabling & diabling appmenu
-Patch2: fix-activating-appmenu.patch
# PATCH-FIX-OPENSUSE qdbus is libqt4, use qdbus-qt5
-Patch3: use-qdbus-qt5.diff
+Patch0: use-qdbus-qt5.diff
+# PATCH-FIX-UPSTREAM: fix for lyx menus (kde#399975)
+Patch1: fix-appmenu.patch
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: kconfig-devel
@@ -60,10 +56,7 @@
%prep
%setup -q -n plasma-applet-active-window-control-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%autopatch -p1
%build
%cmake_kf5 -d build
@@ -72,12 +65,10 @@
%install
%kf5_makeinstall -C build
%fdupes -s %{buildroot}
-%find_lang plasma_applet_org.kde.activeWindowControl %{name}.lang
-%files -f %{name}.lang
+%files
%defattr(-,root,root)
-%doc README.md
-%doc LICENSE
+%license COPYING
%{_libdir}/qt5/qml
%{_kf5_plugindir}/
%{_kf5_plasmadir}/
++++++ _service ++++++
<services>
<service mode="disabled" name="tar_scm">
<param name="versionformat">1.7.3+git%cd.%h</param>
<param name="url">git://anongit.kde.org/plasma-active-window-control</param>
<param name="scm">git</param>
<param name="filename">plasma-applet-active-window-control</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
<param name="compression">gz</param>
</service>
<service mode="disabled" name="set_version"/>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param
name="url">git://anongit.kde.org/plasma-active-window-control</param>
<param
name="changesrevision">bb680e8dbfc2164b317255b22a300284fc04f365</param></service></servicedata>++++++
fix-activating-appmenu.patch -> fix-appmenu.patch ++++++
---
/work/SRC/openSUSE:Factory/plasmoid-active-window-control/fix-activating-appmenu.patch
2018-02-28 20:02:41.032068003 +0100
+++
/work/SRC/openSUSE:Factory/.plasmoid-active-window-control.new.19453/fix-appmenu.patch
2018-11-20 22:45:02.538223760 +0100
@@ -1,174 +1,14 @@
-From 933ab3d9d83124124ce3a91ffa32a506e7e6bb4e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Kostoln=C3=BD?= <[email protected]>
-Date: Sun, 28 Jan 2018 23:31:08 +0100
-Subject: [PATCH] Fix proper enabling & diabling appmenu
-
-Do not register to appmenu service on creation of the applet. Instead register
only when appmenu is actually enabled. Unregister when disabled.
----
- lib/appmenuapplet.cpp | 63 ++++++++++++++++++++++++++++++-----------
- lib/appmenuapplet.h | 13 +++++++--
- package/contents/ui/AppMenu.qml | 4 +++
- 3 files changed, 61 insertions(+), 19 deletions(-)
-
-diff --git a/lib/appmenuapplet.cpp b/lib/appmenuapplet.cpp
-index 082ead3..ca66df4 100644
---- a/lib/appmenuapplet.cpp
-+++ b/lib/appmenuapplet.cpp
-@@ -42,13 +42,6 @@ static const QString
s_viewService(QStringLiteral("org.kde.kappmenuview"));
- AppMenuApplet::AppMenuApplet(QObject *parent, const QVariantList &data)
- : Plasma::Applet(parent, data)
- {
-- ++s_refs;
-- //if we're the first, regster the service
-- if (s_refs == 1) {
--
QDBusConnection::sessionBus().interface()->registerService(s_viewService,
-- QDBusConnectionInterface::QueueService,
-- QDBusConnectionInterface::DontAllowReplacement);
-- }
- /*it registers or unregisters the service when the destroyed value of the
applet change,
- and not in the dtor, because:
- when we "delete" an applet, it just hides it for about a minute setting
its status
-@@ -58,17 +51,9 @@ AppMenuApplet::AppMenuApplet(QObject *parent, const
QVariantList &data)
- will have to be registered again*/
- connect(this, &Applet::destroyedChanged, this, [this](bool destroyed) {
- if (destroyed) {
-- //if we were the last, unregister
-- if (--s_refs == 0) {
--
QDBusConnection::sessionBus().interface()->unregisterService(s_viewService);
-- }
-+ unregisterService();
- } else {
-- //if we're the first, regster the service
-- if (++s_refs == 1) {
--
QDBusConnection::sessionBus().interface()->registerService(s_viewService,
-- QDBusConnectionInterface::QueueService,
-- QDBusConnectionInterface::DontAllowReplacement);
-- }
-+ registerService();
+diff -ur a/plugin/libdbusmenuqt/dbusmenuimporter.cpp
b/plugin/libdbusmenuqt/dbusmenuimporter.cpp
+--- a/plugin/libdbusmenuqt/dbusmenuimporter.cpp 2018-11-18
23:06:23.546073389 +0100
++++ b/plugin/libdbusmenuqt/dbusmenuimporter.cpp 2018-11-19
10:36:49.684868492 +0100
+@@ -410,7 +410,9 @@
+ for (QAction *action: menu->actions()) {
+ int id = action->property(DBUSMENU_PROPERTY_ID).toInt();
+ if (! newDBusMenuItemIds.contains(id)) {
+- menu->removeAction(action);
++ // Not calling removeAction() as QMenu will immediately close
when it becomes empty,
++ // which can happen when an application completely reloads this
menu.
++ // When the action is deleted deferred, it is removed from the
menu.
+ action->deleteLater();
+ d->m_actionForId.remove(id);
}
- });
- }
-@@ -84,6 +69,50 @@ AppMenuModel *AppMenuApplet::model() const
- return m_model;
- }
-
-+void AppMenuApplet::registerService()
-+{
-+ qDebug() << "registering appmenu service";
-+ ++s_refs;
-+ //if we're the first, regster the service
-+ if (s_refs == 1) {
-+ qDebug() << " -> connecting to DBus";
-+
QDBusConnection::sessionBus().interface()->registerService(s_viewService,
-+ QDBusConnectionInterface::QueueService,
-+ QDBusConnectionInterface::DontAllowReplacement);
-+ }
-+}
-+
-+void AppMenuApplet::unregisterService()
-+{
-+ qDebug() << "unregistering from appmenu service";
-+ //if we were the last, unregister
-+ if (--s_refs == 0) {
-+ qDebug() << " -> disconnecting from DBus";
-+
QDBusConnection::sessionBus().interface()->unregisterService(s_viewService);
-+ }
-+ if (s_refs < 0) {
-+ s_refs = 0;
-+ }
-+}
-+
-+bool AppMenuApplet::enabled() const
-+{
-+ return m_enabled;
-+}
-+
-+void AppMenuApplet::setEnabled(bool enabled)
-+{
-+ if (enabled == m_enabled) {
-+ return;
-+ }
-+ if (enabled) {
-+ registerService();
-+ } else {
-+ unregisterService();
-+ }
-+ m_enabled = enabled;
-+}
-+
- void AppMenuApplet::setModel(AppMenuModel *model)
- {
- if (m_model != model) {
-diff --git a/lib/appmenuapplet.h b/lib/appmenuapplet.h
-index 0633c32..ab0f5f2 100644
---- a/lib/appmenuapplet.h
-+++ b/lib/appmenuapplet.h
-@@ -35,6 +35,8 @@ class AppMenuApplet : public Plasma::Applet
-
- Q_PROPERTY(AppMenuModel* model READ model WRITE setModel NOTIFY
modelChanged)
-
-+ Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY
enabledChanged)
-+
- Q_PROPERTY(int view READ view WRITE setView NOTIFY viewChanged)
-
- Q_PROPERTY(int currentIndex READ currentIndex NOTIFY currentIndexChanged)
-@@ -60,11 +62,18 @@ class AppMenuApplet : public Plasma::Applet
- AppMenuModel *model() const;
- void setModel(AppMenuModel *model);
-
-+ bool enabled() const;
-+ void setEnabled(bool enabled);
-+
- int view() const;
- void setView(int type);
-
-+ void registerService();
-+ void unregisterService();
-+
- signals:
- void modelChanged();
-+ void enabledChanged();
- void viewChanged();
- void currentIndexChanged();
- void buttonGridChanged();
-@@ -74,15 +83,15 @@ public slots:
- void trigger(QQuickItem *ctx, int idx);
-
- protected:
-- bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
-+ bool eventFilter(QObject *watched, QEvent *event) override;
-
- private:
- QMenu *createMenu(int idx) const;
- void setCurrentIndex(int currentIndex);
- void onMenuAboutToHide();
-
--
- int m_currentIndex = -1;
-+ bool m_enabled = false;
- int m_viewType = FullView;
- QPointer<QMenu> m_currentMenu;
- QPointer<QQuickItem> m_buttonGrid;
-diff --git a/package/contents/ui/AppMenu.qml b/package/contents/ui/AppMenu.qml
-index 5413e1f..36a5ba5 100644
---- a/package/contents/ui/AppMenu.qml
-+++ b/package/contents/ui/AppMenu.qml
-@@ -45,6 +45,7 @@ Item {
-
- Component.onCompleted: {
- plasmoid.nativeInterface.buttonGrid = buttonGrid
-+ plasmoid.nativeInterface.enabled = appmenuEnabled
- }
-
- Connections {
-@@ -163,6 +164,9 @@ Item {
-
- onAppmenuEnabledChanged: {
- appmenu.resetAppmenuModel()
-+ if (appMenuModel !== null) {
-+ plasmoid.nativeInterface.enabled = appmenuEnabled
-+ }
- }
-
- }
-\ No newline at end of file
