From 923eeb9821e7d5a2098574db8155c4df4b16a9c3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Dec 21 2017 19:54:36 +0000
Subject: refresh snapshot (20171102)


---

diff --git a/.gitignore b/.gitignore
index e7660be..00b1f5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /apper-0.9.3-20170226git.tar.xz
+/apper-0.9.3-20171102git.tar.xz
diff --git a/D5193.diff b/D5193.diff
deleted file mode 100644
index d467b31..0000000
--- a/D5193.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-diff --git a/PkSession/CMakeLists.txt b/PkSession/CMakeLists.txt
---- a/PkSession/CMakeLists.txt
-+++ b/PkSession/CMakeLists.txt
-@@ -44,6 +44,7 @@
-     KF5::KIOFileWidgets
-     KF5::KDELibs4Support
-     KF5::IconThemes
-+    KF5::DBusAddons
-     ${PackageKitQt5_LIBRARIES}
-     apper_private
- )
-diff --git a/PkSession/PkSession.h b/PkSession/PkSession.h
---- a/PkSession/PkSession.h
-+++ b/PkSession/PkSession.h
-@@ -21,15 +21,15 @@
- #ifndef PKSESSION_H
- #define PKSESSION_H
- 
--#include <KUniqueApplication>
-+#include <QObject>
- #include <QTimer>
- 
- class PkInterface;
--class PkSession : public KUniqueApplication
-+class PkSession : public QObject
- {
-     Q_OBJECT
- public:
--    PkSession();
-+    explicit PkSession(QObject* parent = 0);
-     virtual ~PkSession();
-     int newInstance();
- 
-diff --git a/PkSession/PkSession.cpp b/PkSession/PkSession.cpp
---- a/PkSession/PkSession.cpp
-+++ b/PkSession/PkSession.cpp
-@@ -22,6 +22,7 @@
- 
- #include "PkInterface.h"
- 
-+#include <QApplication>
- #include <QStringBuilder>
- 
- #include <KLocalizedString>
-@@ -35,8 +36,8 @@
- 
- using namespace PackageKit;
- 
--PkSession::PkSession() :
--    KUniqueApplication()
-+PkSession::PkSession(QObject* parent)
-+    : QObject(parent)
- {
-     m_pkInterface = new PkInterface(this);
-     connect(m_pkInterface, SIGNAL(close()),
-@@ -46,7 +47,7 @@
-     Daemon::global()->setHints(QLatin1String("locale=") % locale);
- 
-     // this enables not quitting when closing a transaction ui
--    setQuitOnLastWindowClosed(false);
-+    qApp->setQuitOnLastWindowClosed(false);
- 
-     // create the close timer and connect it's signal
-     m_closeT = new QTimer(this);
-@@ -83,7 +84,7 @@
-     // again just to be sure.
-     if (!isRunning()) {
-         kDebug() << "Closed by Timer";
--        quit();
-+        qApp->quit();
-     }
- }
- 
-diff --git a/PkSession/main.cpp b/PkSession/main.cpp
---- a/PkSession/main.cpp
-+++ b/PkSession/main.cpp
-@@ -21,14 +21,21 @@
- #include "PkSession.h"
- #include <config.h>
- 
--#include <KDebug>
-+#include <QApplication>
-+#include <QDebug>
-+#include <QIcon>
-+#include <QSessionManager>
-+
-+#include <KAboutData>
- #include <KConfig>
-+#include <KDBusService>
- #include <KLocalizedString>
--#include <KAboutData>
--#include <KCmdLineArgs>
- 
- int main(int argc, char **argv)
- {
-+    QApplication app(argc, argv);
-+    app.setWindowIcon(QIcon::fromTheme("system-software-install"));
-+
-     KLocalizedString::setApplicationDomain("apper");
- 
-     KAboutData aboutData("PkSession",
-@@ -41,18 +48,16 @@
-     aboutData.addAuthor(i18n("Trever Fischer"), QString(), "wm161@wm161.net", "http://wm161.net");
- 
-     aboutData.addCredit(i18n("Adrien Bustany"), i18n("libpackagekit-qt and other stuff"),"@");
--    aboutData.setProgramIconName("system-software-install");
-     KAboutData::setApplicationData(aboutData);
- 
--    //! KCmdLineArgs::init(argc, argv);
--	Q_UNUSED(argc);
--	Q_UNUSED(argv);
--
--    if (!PkSession::start()) {
--        //kDebug() << "PkSession is already running!";
--        return 0;
--    }
-+    // Let's ensure we only have one PkSession at any one time on the same session
-+    KDBusService service(KDBusService::Unique);
-+    auto disableSessionManagement = [](QSessionManager &sm) {
-+        sm.setRestartHint(QSessionManager::RestartNever);
-+    };
-+    QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
-+    QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
- 
--    PkSession app;
-+    PkSession session;
-     return app.exec();
- }
-
diff --git a/apper.spec b/apper.spec
index 87e0bbf..1b77ce9 100644
--- a/apper.spec
+++ b/apper.spec
@@ -1,12 +1,12 @@
 
-%global snap 20170226
+%global snap 20171102
 # include -updater applet subpkg or not
 #global updater 1
 
 Name:    apper
 Summary: KDE interface for PackageKit
 Version: 0.9.3
-Release: 0.10.%{snap}%{?dist}
+Release: 0.11.%{snap}%{?dist}
 
 License: GPLv2+
 %if 0%{?snap:1}
@@ -19,8 +19,6 @@ URL:     https://cgit.kde.org/apper.git
 ## upstream patches (in lookaside cache)
 
 ## upstreamable patches
-# https://phabricator.kde.org/D5193
-Patch100: https://phabricator.kde.org/file/data/dos4duccaqmjmlpc3vzo/PHID-FILE-zig6gg67s5y7fp2e4p7w/D5193.diff
 
 Obsoletes: kpackagekit < 0.7.0
 Provides:  kpackagekit = %{version}-%{release}
@@ -75,11 +73,6 @@ Requires: %{name} = %{version}-%{release}
 sed -i \
   -e 's|X-KDE-PluginInfo-EnabledByDefault=.*|X-KDE-PluginInfo-EnabledByDefault=false|g' \
   plasmoid/package/metadata.desktop
-%else
-sed -i.no_plasmoid \
-  -e 's|^add_subdirectory(plasmoid)|#add_subdirectory(plasmoid)|g' \
-  CMakeLists.txt
-mv plasmoid plasmoid.no_plasmoid
 %endif
 
 
@@ -88,7 +81,8 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} .. \
   %{?appstream:-DAPPSTREAM:BOOL=ON} \
-  -DAUTOREMOVE:BOOL=OFF
+  -DAUTOREMOVE:BOOL=OFF \
+  -DBUILD_PLASMOID=%{?updater:ON}%{?!updater:OFF}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -147,6 +141,9 @@ fi
 
 
 %changelog
+* Thu Dec 21 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.9.3-0.11.20171102
+- refresh snapshot (20171102)
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-0.10.20170226
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index 741ecc7..c9cc673 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (apper-0.9.3-20170226git.tar.xz) = d869b20a777b15fe1d98fe5ea5a8a456d57f200a1cffa2c5b40d5ffca1ba3299d795b2fdfa38ab19c45017e57b388d6ef88a58182f40b600a01930cfee3da90c
+SHA512 (apper-0.9.3-20171102git.tar.xz) = 0ab7e65f4a093da50b20023374d2f635e0b40f36b6bc8aaadba085d5e4e6773f91eb1be58babf0ae9e566776f2822527a33da0bf573f57936a81333bb4097173