[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

Maximiliano Curia maxy at moszumanska.debian.org
Fri Aug 1 09:05:21 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=44718de

The following commit has been merged in the master branch:
commit 44718dee1513564e3f995ec8a1bd721ab8f60112
Author: Jonathan Riddell <jriddell at canonical.com>
Date:   Tue Oct 5 00:48:51 2010 +0000

    * New upstream release
     - kubuntu_01_fix_plasma_crash_when_editing_activity.diff
     - kubuntu_05_fix_exif_rotation.diff
     - kubuntu_06_fix_weatherlocation.diff
     - kubuntu_07_lancelot_fixes.diff
     - kubuntu_08_fix_comic_widget.diff
     - kubuntu_09_personservice_ptr.diff
---
 debian/changelog                                   |  12 ++
 ..._01_fix_plasma_crash_when_editing_activity.diff |  26 ---
 debian/patches/kubuntu_05_fix_exif_rotation.diff   |  61 -------
 debian/patches/kubuntu_06_fix_weatherlocation.diff |  16 --
 debian/patches/kubuntu_07_lancelot_fixes.diff      |  22 ---
 debian/patches/kubuntu_08_fix_comic_widget.diff    | 176 ---------------------
 debian/patches/kubuntu_09_personservice_ptr.diff   |  44 ------
 debian/patches/series                              |   6 -
 8 files changed, 12 insertions(+), 351 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 865162c..4b28cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+kdeplasma-addons (4:4.5.2-0ubuntu1) maverick; urgency=low
+
+  * New upstream release
+   - kubuntu_01_fix_plasma_crash_when_editing_activity.diff
+   - kubuntu_05_fix_exif_rotation.diff
+   - kubuntu_06_fix_weatherlocation.diff
+   - kubuntu_07_lancelot_fixes.diff
+   - kubuntu_08_fix_comic_widget.diff
+   - kubuntu_09_personservice_ptr.diff
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 05 Oct 2010 00:09:38 +0000
+
 kdeplasma-addons (4:4.5.1-0ubuntu4) maverick; urgency=low
 
   * Drop obsolete (pre-lucid) conflicts/replaces
diff --git a/debian/patches/kubuntu_01_fix_plasma_crash_when_editing_activity.diff b/debian/patches/kubuntu_01_fix_plasma_crash_when_editing_activity.diff
deleted file mode 100644
index c1dfb17..0000000
--- a/debian/patches/kubuntu_01_fix_plasma_crash_when_editing_activity.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kdeplasma-addons-4.5.1/applets/fileWatcher/fileWatcher.cpp	2010/09/12 23:26:23	1174608
-+++ kdeplasma-addons-4.5.1/applets/fileWatcher/fileWatcher.cpp	2010/09/12 23:29:23	1174609
-@@ -36,7 +36,11 @@
- #include "fileWatcherTextItem.h"
- 
- FileWatcher::FileWatcher(QObject *parent, const QVariantList &args)
--    : Plasma::Applet(parent, args)
-+    : Plasma::Applet(parent, args),
-+      file(new QFile(this)),
-+      watcher(new KDirWatch(this)),
-+      textItem(new FileWatcherTextItem(this)),
-+      textStream(0)
- {
-   setAspectRatioMode(Plasma::IgnoreAspectRatio);
-   setHasConfigurationInterface(true);
-@@ -50,10 +54,6 @@
- 
- void FileWatcher::init()
- {
--  file = new QFile(this);
--  textStream = 0;
--  watcher = new KDirWatch(this);
--  textItem = new FileWatcherTextItem(this);
-   textItem->moveBy(contentsRect().x(), contentsRect().y());
-   textItem->setSize((int) contentsRect().width(), (int) contentsRect().height());
-   textDocument = textItem->document();
diff --git a/debian/patches/kubuntu_05_fix_exif_rotation.diff b/debian/patches/kubuntu_05_fix_exif_rotation.diff
deleted file mode 100644
index 6869832..0000000
--- a/debian/patches/kubuntu_05_fix_exif_rotation.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: kdeplasma-addons-4.5.1/applets/frame/CMakeLists.txt
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/frame/CMakeLists.txt	2010-03-18 10:08:47.000000000 +0100
-+++ kdeplasma-addons-4.5.1/applets/frame/CMakeLists.txt	2010-09-15 04:39:58.388879999 +0200
-@@ -20,7 +20,7 @@
- 
- if(HAVE_KEXIV2)
-     include_directories( ${KEXIV2_INCLUDES} )
--    set_source_files_properties(picture.cpp PROPERTIES
-+    set_source_files_properties(picture.cpp imageloader.cpp PROPERTIES
-                                COMPILE_FLAGS -DHAVE_KEXIV2)
-     target_link_libraries(plasma_applet_frame ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KEXIV2_LIBRARIES} )
- else (HAVE_KEXIV2)
-Index: kdeplasma-addons-4.5.1/applets/frame/imageloader.cpp
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/frame/imageloader.cpp	2010-04-22 10:04:27.000000000 +0200
-+++ kdeplasma-addons-4.5.1/applets/frame/imageloader.cpp	2010-09-15 04:40:38.336880001 +0200
-@@ -31,7 +31,7 @@
-     m_path = path;
- }
- 
--QImage ImageLoader::correctRotation(const QImage& tempImage)
-+QImage ImageLoader::correctRotation(const QImage& tempImage, const QString &path)
- {
-     QImage image = QImage();
-     if (!tempImage.isNull()) {
-@@ -81,7 +81,7 @@
- 
- void ImageLoader::run()
- {
--    QImage img = correctRotation(QImage(m_path));
-+    QImage img = correctRotation(QImage(m_path), m_path);
-     emit loaded(img);
- }
- 
-Index: kdeplasma-addons-4.5.1/applets/frame/picture.cpp
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/frame/picture.cpp	2010-05-05 16:51:19.000000000 +0200
-+++ kdeplasma-addons-4.5.1/applets/frame/picture.cpp	2010-09-15 04:39:58.388879999 +0200
-@@ -139,7 +139,7 @@
-         setPath(path);
-     }
-     
--    emit checkImageLoaded(ImageLoader::correctRotation(image));
-+    emit checkImageLoaded(ImageLoader::correctRotation(image, path));
- }
- 
- void Picture::checkImageLoaded(QImage newImage)
-Index: kdeplasma-addons-4.5.1/applets/frame/imageloader.h
-===================================================================
---- kdeplasma-addons-4.5.1/applets/frame/imageloader.h	2010/09/09 19:15:55	1173579
-+++ kdeplasma-addons-4.5.1/applets/frame/imageloader.h	2010/09/09 19:17:29	1173580
-@@ -32,7 +32,7 @@
- 
- public:
-     ImageLoader(const QString &path);
--    static QImage correctRotation(const QImage& tempImage);
-+    static QImage correctRotation(const QImage& tempImage, const QString &path);
-     void run();
- 
- Q_SIGNALS:
diff --git a/debian/patches/kubuntu_06_fix_weatherlocation.diff b/debian/patches/kubuntu_06_fix_weatherlocation.diff
deleted file mode 100644
index a1ca665..0000000
--- a/debian/patches/kubuntu_06_fix_weatherlocation.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: a/libs/plasmaweather/weatherlocation.cpp
-===================================================================
---- a/libs/plasmaweather/weatherlocation.cpp	(revision 1169142)
-+++ b/libs/plasmaweather/weatherlocation.cpp	(revision 1170058)
-@@ -82,7 +82,10 @@
-     d->locationEngine->disconnectSource(source, this);
- 
-     QString city = data["city"].toString();
--    city.truncate(city.indexOf(',') - 1);
-+
-+    if (city.contains(","))
-+        city.truncate(city.indexOf(',') - 1);
-+
-     if (!city.isEmpty()) {
-         d->validator.validate("bbcukmet", city, true);
-         return;
diff --git a/debian/patches/kubuntu_07_lancelot_fixes.diff b/debian/patches/kubuntu_07_lancelot_fixes.diff
deleted file mode 100644
index 5dfa708..0000000
--- a/debian/patches/kubuntu_07_lancelot_fixes.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-kdesvn revisions 1169142 and 1171090
-Index: kdeplasma-addons-4.5.1/libs/lancelot-datamodels/MessagesKmail_p.h
-===================================================================
---- kdeplasma-addons-4.5.1.orig/libs/lancelot-datamodels/MessagesKmail_p.h	2010-05-16 16:05:13.000000000 -0400
-+++ kdeplasma-addons-4.5.1/libs/lancelot-datamodels/MessagesKmail_p.h	2010-09-23 00:43:22.000000000 -0400
-@@ -21,11 +21,14 @@
- #include <QHash>
- #include <KIcon>
- #include <KJob>
--#include <Akonadi/Entity>
--#include <Akonadi/Collection>
- 
- #include "config-lancelot-datamodels.h"
- 
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
-+#include <Akonadi/Entity>
-+#include <Akonadi/Collection>
-+#endif
-+
- namespace Lancelot {
- namespace Models {
- 
diff --git a/debian/patches/kubuntu_08_fix_comic_widget.diff b/debian/patches/kubuntu_08_fix_comic_widget.diff
deleted file mode 100644
index 0d97a5e..0000000
--- a/debian/patches/kubuntu_08_fix_comic_widget.diff
+++ /dev/null
@@ -1,176 +0,0 @@
-kdesvn revisions 1170580 and 1175599
-Index: kdeplasma-addons-4.5.1/dataengines/comic/comic_package.cpp
-===================================================================
---- kdeplasma-addons-4.5.1.orig/dataengines/comic/comic_package.cpp	2008-10-30 10:15:54.000000000 -0400
-+++ kdeplasma-addons-4.5.1/dataengines/comic/comic_package.cpp	2010-09-23 00:48:13.000000000 -0400
-@@ -22,7 +22,7 @@
- #include "plasma/package.h"
- 
- ComicPackage::ComicPackage( QObject *parent, QVariantList args )
--    : Plasma::PackageStructure( parent, "Comic" )
-+    : Plasma::PackageStructure( parent, "Plasma/Comic" )
- {
-     Q_UNUSED( args )
-     addDirectoryDefinition( "images", "images", i18n( "Images" ) );
-Index: kdeplasma-addons-4.5.1/applets/comic/configwidget.cpp
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/comic/configwidget.cpp	2010-07-23 17:15:20.000000000 -0400
-+++ kdeplasma-addons-4.5.1/applets/comic/configwidget.cpp	2010-09-23 00:48:13.000000000 -0400
-@@ -24,10 +24,11 @@
- #include <QtCore/QTimer>
- #include <QtGui/QSortFilterProxyModel>
- 
-+#include <KConfigDialog>
- #include <KNS3/DownloadDialog>
- 
--ConfigWidget::ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, QWidget *parent )
--    : QWidget( parent ), mEngine( engine ), mModel( model ), mUsedComics( usedComics ), mProxyModel( proxy ), mNewStuffDialog( 0 )
-+ConfigWidget::ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, KConfigDialog *parent )
-+    : QWidget( parent ), mEngine( engine ), mModel( model ), mProxyModel( proxy ), mNewStuffDialog( 0 )
- {
-     comicSettings = new QWidget( this );
-     comicUi.setupUi( comicSettings );
-@@ -49,38 +50,23 @@
-         //set the correct initial item of the comboBox if it is defined
-         const int index = comicUi.comboBox_comic->findData( usedComics.first() );
-         comicUi.comboBox_comic->setCurrentIndex( index );
--        mCurrentIndex = mProxyModel->index( index, 0 );
-     }
- 
-     comicUi.listView_comic->setModel( mProxyModel );
-     comicUi.listView_comic->resizeColumnToContents( 0 );
- 
--    connect( comicUi.comboBox_comic, SIGNAL( currentIndexChanged( int ) ), this, SLOT( slotCurrentIndexChanged( int ) ) );
-+    connect( comicUi.checkBox_useTabs, SIGNAL( clicked( bool ) ), this, SLOT( slotListChosen() ) );
-     connect( comicUi.checkBox_useTabs_2, SIGNAL( clicked( bool ) ), this, SLOT( slotComboBoxChosen() ) );
-+    connect(parent, SIGNAL(applyClicked()), this, SLOT(slotSave()));
-+    connect(parent, SIGNAL(okClicked()), this, SLOT(slotSave()));
- }
- 
- ConfigWidget::~ConfigWidget()
- {
- }
- 
--void ConfigWidget::slotComboBoxChosen()
--{
--    comicUi.comboBox_comic->setCurrentIndex( 0 );
--}
--
--void ConfigWidget::slotCurrentIndexChanged( int newIndex )
-+void ConfigWidget::checkCurrentIndex()
- {
--    if ( useTabs() || !mProxyModel->rowCount() ) {
--        return;
--    }
--
--    //decide wether to modify newIndex or not
--    const bool oldIsChecked = mCurrentIndex.isValid() && mCurrentIndex.data( Qt::CheckStateRole ) == Qt::Checked;
--    if ( !oldIsChecked ) {
--        //is not checked, i.e. comics have been added/removed, choose the first entry instead
--        newIndex = 0;
--    }
--
-     //set all items of mProxyModel to unchecked
-     for ( int i = 0; i < mProxyModel->rowCount(); ++i ) {
-         QModelIndex index = mProxyModel->index( i, 0 );
-@@ -88,14 +74,30 @@
-     }
- 
-     //check the selected index
--    mCurrentIndex = mProxyModel->index( newIndex, 0 );
--    mProxyModel->setData( mCurrentIndex, Qt::Checked, Qt::CheckStateRole );
-+    QModelIndex index = mProxyModel->index( comicUi.comboBox_comic->currentIndex(), 0 );
-+    mProxyModel->setData( index, Qt::Checked, Qt::CheckStateRole );
-+}
-+
- 
--    if ( !oldIsChecked ) {
--        comicUi.comboBox_comic->setCurrentIndex( 0 );
-+void ConfigWidget::slotSave()
-+{
-+    //useTabs() is already handled in the proxy itself
-+    if ( !useTabs() ) {
-+        checkCurrentIndex();
-     }
- }
- 
-+
-+void ConfigWidget::slotComboBoxChosen()
-+{
-+    comicUi.comboBox_comic->setCurrentIndex( 0 );
-+}
-+
-+void ConfigWidget::slotListChosen()
-+{
-+    checkCurrentIndex();
-+}
-+
- void ConfigWidget::getNewStuff()
- {
-     if (!mNewStuffDialog) {
-@@ -108,7 +110,6 @@
- void ConfigWidget::newStuffFinished()
- {
-     if ( mNewStuffDialog->changedEntries().count() ) {
--        mCurrentIndex = QModelIndex();
-         mModel->setComics( mEngine->query( "providers" ), mModel->selected() );
- 
-         comicUi.listView_comic->resizeColumnToContents( 0 );
-Index: kdeplasma-addons-4.5.1/applets/comic/configwidget.h
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/comic/configwidget.h	2010-04-07 11:18:37.000000000 -0400
-+++ kdeplasma-addons-4.5.1/applets/comic/configwidget.h	2010-09-23 00:48:13.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <QTime>
- 
- class ComicModel;
-+class KConfigDialog;
- class QCheckBox;
- class QComboBox;
- class QSortFilterProxyModel;
-@@ -45,7 +46,7 @@
- {
-         Q_OBJECT
-     public:
--        ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, QWidget *parent );
-+        ConfigWidget( Plasma::DataEngine *engine, ComicModel *model, const QStringList &usedComics, QSortFilterProxyModel *proxy, KConfigDialog *parent );
-         ~ConfigWidget();
- 
-         void setShowComicUrl( bool show );
-@@ -83,18 +84,20 @@
-         void newStuffFinished();
- 
-     private slots:
--        void slotCurrentIndexChanged( int newIndex );
-         void slotComboBoxChosen();
-+        void slotListChosen();
-+        void slotSave();
-+
-+    private:
-+        void checkCurrentIndex();
- 
-     private:
-         Ui::ComicSettings comicUi;
-         Ui::AppearanceSettings appearanceUi;
-         Plasma::DataEngine *mEngine;
-         ComicModel *mModel;
--        QStringList mUsedComics;
-         QSortFilterProxyModel *mProxyModel;
-         KNS3::DownloadDialog* mNewStuffDialog;
--        QModelIndex mCurrentIndex;
- };
- 
- #endif
-Index: kdeplasma-addons-4.5.1/applets/comic/comic.cpp
-===================================================================
---- kdeplasma-addons-4.5.1.orig/applets/comic/comic.cpp	2010-09-23 00:51:16.000000000 -0400
-+++ kdeplasma-addons-4.5.1/applets/comic/comic.cpp	2010-09-23 00:52:09.000000000 -0400
-@@ -1069,7 +1069,7 @@
- void ComicApplet::fullView()
- {
-     if ( !mFullViewWidget ) {
--        mFullViewWidget = new FullViewWidget();
-+        mFullViewWidget = new FullViewWidget;
-     }
- 
-     if ( !mFullViewWidget->isVisible() ) {
diff --git a/debian/patches/kubuntu_09_personservice_ptr.diff b/debian/patches/kubuntu_09_personservice_ptr.diff
deleted file mode 100644
index 9f1db70..0000000
--- a/debian/patches/kubuntu_09_personservice_ptr.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: a/dataengines/ocs/personservice.cpp
-===================================================================
---- a/dataengines/ocs/personservice.cpp	(revision 1175599)
-+++ b/dataengines/ocs/personservice.cpp	(revision 1176837)
-@@ -39,6 +39,10 @@
- 
- Plasma::ServiceJob* PersonService::createJob(const QString& operation, QMap<QString, QVariant>& parameters)
- {
-+    if (!m_provider) {
-+        return 0;
-+    }
-+
-     kDebug() << "operation: " << operation << "params: " << parameters;
-     if (operation == "sendMessage") {
-         Message message;
-@@ -76,6 +80,6 @@
-         kDebug() << "Set credentials: " << parameters.value("username") << parameters.value("password");
-         return job;
-     } else {
--        return new Plasma::ServiceJob("", operation, parameters);
-+        return 0;
-     }
- }
-Index: a/dataengines/ocs/ocsengine.cpp
-===================================================================
---- a/dataengines/ocs/ocsengine.cpp	(revision 1175599)
-+++ b/dataengines/ocs/ocsengine.cpp	(revision 1176837)
-@@ -70,7 +70,7 @@
-     if (request == "Person" || request == "Settings") {
-         QString id = arguments.value("id");
-         QString providerString = arguments.value("provider");
--        if (!id.isEmpty() && !providerString.isEmpty()) {
-+        if (!id.isEmpty() && !providerString.isEmpty() && m_providers.value(providerString)) {
-             return new PersonService(m_providers.value(providerString), id, m_serviceUpdates, this);
-         }
-     }
-@@ -861,7 +861,6 @@
- 
- void OcsEngine::providerAdded(const Attica::Provider& provider)
- {
--    
-     qDebug() << "providerAdded" << provider.baseUrl();
- 
-     QString baseUrl = provider.baseUrl().toString();
diff --git a/debian/patches/series b/debian/patches/series
index a753195..9ff4697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,3 @@
-kubuntu_01_fix_plasma_crash_when_editing_activity.diff
 kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
 kubuntu_04_kimpanel_disable_scim.diff
-kubuntu_05_fix_exif_rotation.diff
-kubuntu_06_fix_weatherlocation.diff
-kubuntu_07_lancelot_fixes.diff
-kubuntu_08_fix_comic_widget.diff
-kubuntu_09_personservice_ptr.diff

-- 
KDE Plasma Addons module packaging



More information about the pkg-kde-commits mailing list