[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.04.1-1-7-g26111f8

Sat Jun 18 06:47:17 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=dff62aa

The following commit has been merged in the master branch:
commit dff62aae39e8e2a91641349efdc70cec57261c4f
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 18 08:17:38 2016 +0200

    disable plasma-widget-folderview
    
    it is not useful in a Plasma5 environment:
    - drop the plasma-widget-folderview binary, and the dependency to it in
      kde-baseapps
    - make sure to not even build it; patch disable_plasma.diff
    - remove the patches kubuntu_folderview_livecd_directory.diff and
      kubuntu_folderwidget_drawing.diff, obsolete now
---
 debian/changelog                                   |  7 ++++++
 debian/control                                     | 13 -----------
 debian/patches/disable_plasma.diff                 | 22 ++++++++++++++++++
 .../kubuntu_folderview_livecd_directory.diff       | 26 ----------------------
 debian/patches/kubuntu_folderwidget_drawing.diff   | 26 ----------------------
 debian/patches/series                              |  3 +--
 debian/plasma-widget-folderview.install            |  2 --
 debian/plasma-widget-folderview.lintian-overrides  |  1 -
 8 files changed, 30 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91c9d99..02c1e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ kde-baseapps (4:16.04.2-0r1) UNRELEASED; urgency=medium
   * Remove unused and outdated installgen file.
   * Remove unused konsole.1 man page.
   * Restore headers for patches.
+  * Disable plasma-widget-folderview, since it is not useful in a Plasma5
+    environment:
+    - drop the plasma-widget-folderview binary, and the dependency to it in
+      kde-baseapps
+    - make sure to not even build it; patch disable_plasma.diff
+    - remove the patches kubuntu_folderview_livecd_directory.diff and
+      kubuntu_folderwidget_drawing.diff, obsolete now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jun 2016 08:56:59 +0200
 
diff --git a/debian/control b/debian/control
index 3899d2a..7cc2fe5 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,6 @@ Depends: dolphin,
          konqueror (>= ${source:Version}),
          konsole,
          kwrite,
-         plasma-widget-folderview (>= ${source:Version}),
          ${misc:Depends}
 Recommends: konqueror-nsplugins (>= ${source:Version})
 Breaks: kdebase-apps (<< 4:4.7.2)
@@ -284,15 +283,3 @@ Description: konqueror sidebar plugin library development files
  library.
  .
  This package is part of the KDE base applications module.
-
-Package: plasma-widget-folderview
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: plasma widget showing the content of a folder
- This package contains the Folder View Plasma widget which is capable of
- displaying and managing contents of any KDE supported location. It can be used
- as a replacement for the traditional "desktop" folder concept in the main
- Plasma shell, but it is a lot more flexible. Folder View is part of the
- initial default KDE 4 desktop configuration.
- .
- This package is part of the KDE base applications module.
diff --git a/debian/patches/disable_plasma.diff b/debian/patches/disable_plasma.diff
new file mode 100644
index 0000000..03f798d
--- /dev/null
+++ b/debian/patches/disable_plasma.diff
@@ -0,0 +1,22 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Disable the build of Plasma-related stuff
+ Do not build stuff based on Plasma 4, since they are useless in a Plasma 5
+ desktop environment.
+ .
+ This patch needs to be dropped once a Frameworks-based kde-baseapps is
+ prepared.
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2016-06-18
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_subdirectory( kdialog )
+ add_subdirectory( keditbookmarks )
+ add_subdirectory( konqueror )
+ add_subdirectory( kfind )
+-add_subdirectory( plasma )
++#add_subdirectory( plasma )
+ add_subdirectory( konq-plugins )
+ 
+ if ( Q_WS_MAC )
diff --git a/debian/patches/kubuntu_folderview_livecd_directory.diff b/debian/patches/kubuntu_folderview_livecd_directory.diff
deleted file mode 100644
index a02c9cd..0000000
--- a/debian/patches/kubuntu_folderview_livecd_directory.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Set folderview to point at Desktop folder if running from a live CD.
-Author: Jonathan Riddell <jriddell at ubuntu.com>
-Origin: vendor
-Forwaded: not-needed
-Bug-Ubuntu: https://launchpad.net/bugs/613834
---- a/plasma/applets/folderview/folderview.cpp
-+++ b/plasma/applets/folderview/folderview.cpp
-@@ -27,6 +27,7 @@
- #include <QGraphicsSceneDragDropEvent>
- #include <QImageReader>
- #include <QItemSelectionModel>
-+#include <QFile>
- 
- #include <KAction>
- #include <KAuthorized>
-@@ -431,6 +432,10 @@ void FolderView::init()
-                 path = QString("desktop:/");
-             }
-         }
-+
-+        if (QFile::exists("/usr/share/applications/kde4/oem-config-prepare-kde.desktop") || QFile::exists("/usr/share/applications/kde4/ubiquity-kdeui.desktop")) {
-+            path = QString("desktop:/");
-+        }
-         setUrl(cg.readEntry("url", KUrl(path)));
-     }
- 
diff --git a/debian/patches/kubuntu_folderwidget_drawing.diff b/debian/patches/kubuntu_folderwidget_drawing.diff
deleted file mode 100644
index 1419168..0000000
--- a/debian/patches/kubuntu_folderwidget_drawing.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/plasma/applets/folderview/iconview.cpp
-+++ b/plasma/applets/folderview/iconview.cpp
-@@ -2588,22 +2588,16 @@ void IconView::startDrag(const QPointF &
-     pixmap.fill(Qt::transparent);
- 
-     QStyleOptionViewItemV4 option = viewOptions();
--    // ### We can't draw the items as selected or hovered since Qt doesn't
--    //     use an ARGB window for the drag pixmap.
--    //option.state |= QStyle::State_Selected;
--    option.state &= ~(QStyle::State_Selected | QStyle::State_MouseOver);
-+    option.state |= QStyle::State_Selected;
- 
-     QPainter p(&pixmap);
-     foreach (const QModelIndex &index, indexes)
-     {
-         option.rect = visualRect(index).translated(-boundingRect.topLeft());
--#if 0
--        // ### Reenable this code when Qt uses an ARGB window for the drag pixmap
-         if (index == m_hoveredIndex)
-             option.state |= QStyle::State_MouseOver;
-         else
-             option.state &= ~QStyle::State_MouseOver;
--#endif
-         paintItem(&p, option, index);
-     }
-     p.end();
diff --git a/debian/patches/series b/debian/patches/series
index 64d66b8..fa12a8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 enable_debianabimanager.diff
 enable_dlrestrictions.diff
-kubuntu_folderview_livecd_directory.diff
-kubuntu_folderwidget_drawing.diff
 kubuntu_disable-failing-test.diff
 kubuntu_ignore-tests.diff
+disable_plasma.diff
diff --git a/debian/plasma-widget-folderview.install b/debian/plasma-widget-folderview.install
deleted file mode 100644
index 1723b89..0000000
--- a/debian/plasma-widget-folderview.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/kde4/plasma_applet_folderview.so
-usr/share/kde4/services/plasma-applet-folderview.desktop
diff --git a/debian/plasma-widget-folderview.lintian-overrides b/debian/plasma-widget-folderview.lintian-overrides
deleted file mode 100644
index 567241d..0000000
--- a/debian/plasma-widget-folderview.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-plasma-widget-folderview: hardening-no-fortify-functions usr/lib/kde4/plasma_applet_folderview.so

-- 
KDE Base Applications module packaging

