[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:20 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=7fea3f2
The following commit has been merged in the master branch:
commit 7fea3f20ca9f6ad8ebc9de69299e508047db199d
Author: Alessandro Ghersi <alessandro-ghersi at kubuntu.org>
Date: Wed Sep 15 17:21:39 2010 +0200
* Add kubuntu_01_fix_plasma_crash_when_editing_activity.diff
(http://bugs.kde.org/show_bug.cgi?id=250935)
* Add kubuntu_05_fix_exif_rotation.diff
enable exif rotation again in frame widget
---
debian/changelog | 9 ++++
..._01_fix_plasma_crash_when_editing_activity.diff | 26 +++++++++
.../patches/kubuntu_04_kimpanel_disable_scim.diff | 10 ++--
debian/patches/kubuntu_05_fix_exif_rotation.diff | 61 ++++++++++++++++++++++
debian/patches/series | 2 +
5 files changed, 103 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7c1cbff..a3641c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.5.1-0ubuntu2) maverick; urgency=low
+
+ * Add kubuntu_01_fix_plasma_crash_when_editing_activity.diff
+ (http://bugs.kde.org/show_bug.cgi?id=250935)
+ * Add kubuntu_05_fix_exif_rotation.diff
+ enable exif rotation again in frame widget
+
+ -- Alessandro Ghersi <alessandro-ghersi at kubuntu.org> Wed, 15 Sep 2010 04:28:56 +0200
+
kdeplasma-addons (4:4.5.1-0ubuntu1) maverick; urgency=low
[ Felix Geyer ]
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
new file mode 100644
index 0000000..c1dfb17
--- /dev/null
+++ b/debian/patches/kubuntu_01_fix_plasma_crash_when_editing_activity.diff
@@ -0,0 +1,26 @@
+--- 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_04_kimpanel_disable_scim.diff b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
index f06ccca..1d5dac7 100644
--- a/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
+++ b/debian/patches/kubuntu_04_kimpanel_disable_scim.diff
@@ -1,7 +1,7 @@
-Index: kdeplasma-addons-4.4.80/applets/CMakeLists.txt
+Index: kdeplasma-addons-4.5.1/applets/CMakeLists.txt
===================================================================
---- kdeplasma-addons-4.4.80.orig/applets/CMakeLists.txt 2010-05-20 07:44:27.000000000 -0400
-+++ kdeplasma-addons-4.4.80/applets/CMakeLists.txt 2010-05-25 09:50:00.639462337 -0400
+--- kdeplasma-addons-4.5.1.orig/applets/CMakeLists.txt 2010-05-20 13:44:27.000000000 +0200
++++ kdeplasma-addons-4.5.1/applets/CMakeLists.txt 2010-09-15 04:36:35.000000000 +0200
@@ -83,11 +83,7 @@
if (Q_WS_X11)
if (X11_Xrender_FOUND)
@@ -14,9 +14,9 @@ Index: kdeplasma-addons-4.4.80/applets/CMakeLists.txt
endif (X11_Xrender_FOUND)
endif (Q_WS_X11)
-Index: kdeplasma-addons-4.4.80/applets/kimpanel/backend/CMakeLists.txt
+Index: kdeplasma-addons-4.5.1/applets/kimpanel/backend/CMakeLists.txt
===================================================================
---- kdeplasma-addons-4.4.80.orig/applets/kimpanel/backend/CMakeLists.txt 2009-11-30 19:35:52.000000000 -0500
+--- kdeplasma-addons-4.5.1.orig/applets/kimpanel/backend/CMakeLists.txt 2009-12-01 01:35:52.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-macro_optional_add_subdirectory(scim)
diff --git a/debian/patches/kubuntu_05_fix_exif_rotation.diff b/debian/patches/kubuntu_05_fix_exif_rotation.diff
new file mode 100644
index 0000000..6869832
--- /dev/null
+++ b/debian/patches/kubuntu_05_fix_exif_rotation.diff
@@ -0,0 +1,61 @@
+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/series b/debian/patches/series
index 9ff4697..de874b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+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
--
KDE Plasma Addons module packaging
More information about the pkg-kde-commits
mailing list