[SCM] kamoso packaging branch, master, updated. debian/2.0.2-3.1-4-ge038a83
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Mon May 30 11:20:23 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kamoso.git;a=commitdiff;h=e038a83
The following commit has been merged in the master branch:
commit e038a83f4515c2edc958e345fc2d4feafda85d55
Author: Rohan Garg <rohan at garg.io>
Date: Mon May 30 13:19:27 2016 +0200
* Add libkf5purpose-dev to build-depends
* Drop all patches, irrelevant or applied upstream
---
debian/changelog | 2 +
debian/patches/about_dialog.diff | 27 ---
debian/patches/dont_build_plugin_tester.diff | 25 ---
debian/patches/fix-qt-gstreamer-1.0.diff | 49 -----
debian/patches/proper_version_kaboutdata.diff | 18 --
debian/patches/qt-gstreamer-1.0.diff | 270 --------------------------
debian/patches/series | 8 -
debian/patches/upstream_add-include.patch | 24 ---
debian/patches/upstream_libkipi-2.x.diff | 165 ----------------
debian/patches/upstream_rename-icons.diff | 18 --
10 files changed, 2 insertions(+), 604 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 506e82f..370e740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kamoso (3.1.0-0r1) UNRELEASED; urgency=medium
[ Rohan Garg ]
* Fix watch file to take into account the xz extension
+ * Add libkf5purpose-dev to build-depends
+ * Drop all patches, irrelevant or applied upstream
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Sun, 13 Dec 2015 14:33:09 +0100
diff --git a/debian/patches/about_dialog.diff b/debian/patches/about_dialog.diff
deleted file mode 100644
index b2e4704..0000000
--- a/debian/patches/about_dialog.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 990462363724a09cfbc314d7e6451a4000db548e
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Date: Fri Jul 22 20:09:22 2011 +0200
-
- Make the About dialog work.
-
-diff --git a/src/kamoso.cpp b/src/kamoso.cpp
-index ae4c048..6026bdd 100644
---- a/src/kamoso.cpp
-+++ b/src/kamoso.cpp
-@@ -670,7 +670,8 @@ void Kamoso::settingsMenu(bool )
- m.addSeparator();
- }
- m.addAction(KIcon("configure"), i18n("Settings"), this, SLOT(configuration()));
-- m.addMenu(customHelpMenu());
-+ KMenu *help = helpMenu();
-+ m.addMenu(help);
-
- m.exec(mainWidgetUi->configure->parentWidget()->mapToGlobal(mainWidgetUi->configure->geometry().bottomLeft()));
- }
-@@ -726,4 +727,4 @@ void Kamoso::updateThumbnails(const KUrl::List& urls)
-
- mainWidgetUi->thumbnailView->update(idx);
- }
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/dont_build_plugin_tester.diff b/debian/patches/dont_build_plugin_tester.diff
deleted file mode 100644
index a9da173..0000000
--- a/debian/patches/dont_build_plugin_tester.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Forwarded: no
-Description: Avoids building the plugin tester.
----
- src/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,7 +8,7 @@ if (NEPOMUK_FOUND)
- endif(NEPOMUK_FOUND)
-
- add_subdirectory(plugins)
--add_subdirectory(pluginTester)
-+#add_subdirectory(pluginTester)
-
- set(kamoso_SRCS
- burstshootmode.cpp
-@@ -58,4 +58,4 @@ endif(HAVE_NEPOMUK)
-
- install(TARGETS kamoso ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(FILES kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
--install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
-\ No newline at end of file
-+install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
diff --git a/debian/patches/fix-qt-gstreamer-1.0.diff b/debian/patches/fix-qt-gstreamer-1.0.diff
deleted file mode 100644
index 62309f9..0000000
--- a/debian/patches/fix-qt-gstreamer-1.0.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description: Make slight modifications to properly capture via the webcam.
- For some reason the upstream patch didn't quite work for me, and I
- needed to copy the following few things from my initial port to get
- it to work.
- .
- This should only be temporary as upstream has moved on to a kf5 version
- that should replace this soon.
---- a/src/webcamwidget.cpp
-+++ b/src/webcamwidget.cpp
-@@ -131,7 +131,8 @@
- QByteArray pipe = basicPipe();
-
- //Set the right colorspace to convert to QImage
-- pipe += " ! videoconvert"
-+ pipe += " ! videoconvert ! "
-+ GST_VIDEO_CAPS_MAKE("RGB")
- " ! fakesink name=fakesink";
-
- kDebug() << "================ PIPELINE ================";
-@@ -247,11 +248,12 @@
- kDebug() << "Not I420";
- }
-
-- } else if (qstrcmp(structure.data()->name().toLatin1(), "video/x-raw-rgb") == 0) {
-+ } else if (format == "RGB") {
- kDebug() << "RGB name";
- QImage::Format format = QImage::Format_Invalid;
- int bpp = structure.data()->value("bpp").get<int>();
-
-+ bpp = 24; // FIXME: HACK
- if (bpp == 24)
- format = QImage::Format_RGB888;
- else if (bpp == 32)
-@@ -399,10 +401,10 @@
- //Accepted capabilities
- pipe +=
- " ! videoconvert"
-- " ! video/x-raw, format=RGB, width=640, height=480, framerate=15/1;"
-- " video/x-raw, format=RGB, width=640, height=480, framerate=24/1;"
-- " video/x-raw, format=RGB, width=640, height=480, framerate=30/1;"
-- " video/x-raw, format=RGB, width=352, height=288, framerate=15/1"
-+ " ! video/x-raw, width=640, height=480, framerate=15/1;"
-+ " video/x-raw, width=640, height=480, framerate=24/1;"
-+ " video/x-raw, width=640, height=480, framerate=30/1;"
-+ " video/x-raw, width=352, height=288, framerate=15/1"
-
- //Basic plug-in for video controls
- " ! gamma name=gamma"
diff --git a/debian/patches/proper_version_kaboutdata.diff b/debian/patches/proper_version_kaboutdata.diff
deleted file mode 100644
index 6791e92..0000000
--- a/debian/patches/proper_version_kaboutdata.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: José Manuel Santamaría Lema <panfaust at gmail.com>
-Forwarded: no
-Description: Set the proper number version, used in the bug reporting assistant.
----
- src/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -24,7 +24,7 @@
-
- int main(int argc, char *argv[])
- {
-- KAboutData about("kamoso", 0, ki18n(("Kamoso")), "1.90", ki18n("Webcam picture retriever"),
-+ KAboutData about("kamoso", 0, ki18n(("Kamoso")), "2.0.2", ki18n("Webcam picture retriever"),
- KAboutData::License_GPL, ki18n("(C) 2008-2010 Alex Fiestas and Aleix Pol"));
- about.addAuthor( ki18n("Aleix Pol Gonzalez"), ki18n("Semaphore hacker"), "aleixpol at kde.org" );
- about.addAuthor( ki18n("Alex Fiestas"), ki18n("Coffee drinker"), "alex at eyeos.org" );
diff --git a/debian/patches/qt-gstreamer-1.0.diff b/debian/patches/qt-gstreamer-1.0.diff
deleted file mode 100644
index e447f10..0000000
--- a/debian/patches/qt-gstreamer-1.0.diff
+++ /dev/null
@@ -1,270 +0,0 @@
-Author: Andreas Cord-Landwehr <cordlandwehr at kde.org>
-Description: Porting to GStreamer-1.0 API and QtGstreamer 1.2
-Applied-Upstream: https://projects.kde.org/projects/extragear/multimedia/kamoso/repository/revisions/b85e8c187b4eabf9765bc05348f6232ba32c9493
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,8 +6,8 @@ find_package(KDE4 REQUIRED)
- find_package(Kipi REQUIRED)
- find_package(Phonon REQUIRED)
- find_package(GLIB2 REQUIRED)
--find_package(GStreamer REQUIRED)
--find_package(QtGStreamer REQUIRED)
-+find_package(GStreamer 1.0.0)
-+find_package(QtGStreamer 1.1.90 REQUIRED)
-
- macro_optional_find_package(Nepomuk)
- macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Handles all kinds of metadata on the KDE desktop to provide a semantic desktop" "http://nepomuk.kde.org/" FALSE "" "STRONGLY_RECOMMENDED: Nepomuk is used to provide metadata on objects like files, emails etc. to provide a semantic desktop.")
-@@ -15,6 +15,10 @@ macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPO
- macro_display_feature_log()
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-+include_directories(
-+ ${QTGSTREAMER_INCLUDE_DIR}
-+)
-+
- add_subdirectory(src)
- add_subdirectory(icons)
-
-Index: b/cmake/FindGStreamer.cmake
-===================================================================
---- a/cmake/FindGStreamer.cmake
-+++ b/cmake/FindGStreamer.cmake
-@@ -15,40 +15,44 @@
-
- # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc)
-
--IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY)
- # in cache already
- SET(GStreamer_FIND_QUIETLY TRUE)
--ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY)
- SET(GStreamer_FIND_QUIETLY FALSE)
--ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY)
-+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY)
-
-+SET(GSTREAMER_API_VERSION 1.0)
- IF (NOT WIN32)
- FIND_PACKAGE(PkgConfig REQUIRED)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- # don't make this check required - otherwise you can't use macro_optional_find_package on this one
-- PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-0.10)
-+ PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-${GSTREAMER_API_VERSION})
- SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
- SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
- ENDIF (NOT WIN32)
-
-+MESSAGE(STATUS "Found GStreamer package: ${PKG_GSTREAMER_VERSION}")
-+
- FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
- PATHS
- ${PKG_GSTREAMER_INCLUDE_DIRS}
-- PATH_SUFFIXES gstreamer-0.10
-+ PATH_SUFFIXES gstreamer-${GSTREAMER_API_VERSION}
- )
-
--FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10
-+FIND_PATH(GSTREAMER_ARCH_INCLUDE_DIR gst/gstconfig.h
- PATHS
-- ${PKG_GSTREAMER_LIBRARY_DIRS}
-+ ${PKG_GSTREAMER_INCLUDE_DIRS}
-+ PATH_SUFFIXES gstreamer-${GSTREAMER_API_VERSION}
- )
-
--FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10
-+FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-${GSTREAMER_API_VERSION}
- PATHS
- ${PKG_GSTREAMER_LIBRARY_DIRS}
- )
-
--FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10
-+FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-${GSTREAMER_API_VERSION}
- PATHS
- ${PKG_GSTREAMER_LIBRARY_DIRS}
- )
-@@ -63,12 +67,7 @@ ELSE (GSTREAMER_LIBRARIES)
- MESSAGE(STATUS "GStreamer: WARNING: library not found")
- ENDIF (GSTREAMER_LIBRARIES)
-
--IF (GSTREAMER_INTERFACE_LIBRARY)
--ELSE (GSTREAMER_INTERFACE_LIBRARY)
-- MESSAGE(STATUS "GStreamer: WARNING: interface library not found")
--ENDIF (GSTREAMER_INTERFACE_LIBRARY)
--
- INCLUDE(FindPackageHandleStandardArgs)
--FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY)
-
--MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY)
-+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY)
-Index: b/src/webcamwidget.cpp
-===================================================================
---- a/src/webcamwidget.cpp
-+++ b/src/webcamwidget.cpp
-@@ -55,8 +55,9 @@
- #include <QGst/Structure>
- #include <QGst/Clock>
- #include <QGst/Init>
--#include <QGst/XOverlay>
-+#include <QGst/VideoOverlay>
- #include <QGst/Message>
-+#include <QGst/Memory>
- #include <gst/gst.h>
- #include <gst/video/video.h>
- #include <QGst/Bus>
-@@ -130,8 +131,7 @@ void WebcamWidget::playFile(const Device
- QByteArray pipe = basicPipe();
-
- //Set the right colorspace to convert to QImage
-- pipe += " ! ffmpegcolorspace ! "
-- GST_VIDEO_CAPS_xRGB_HOST_ENDIAN
-+ pipe += " ! videoconvert"
- " ! fakesink name=fakesink";
-
- kDebug() << "================ PIPELINE ================";
-@@ -157,7 +157,7 @@ void WebcamWidget::playFile(const Device
- setVideoSettings();
-
- kDebug() << "================ Capabilities ================";
-- kDebug() << d->m_pipeline->getElementByName("v4l2src")->getStaticPad("src")->caps()->toString();
-+// kDebug() << d->m_pipeline->getElementByName("v4l2src")->getStaticPad("src")->currentCaps()->toString(); //commented out for now: src-pad returns null
- d->m_pipeline->setState(QGst::StatePlaying);
- }
-
-@@ -179,34 +179,51 @@ bool WebcamWidget::takePhoto(const KUrl
- }
- kDebug() << dest;
- d->destination = dest;
-+ if (!d->m_bin) {
-+ return false;
-+ }
- d->m_bin->getElementByName("fakesink")->setProperty("signal-handoffs", true);
- QGlib::connect(d->m_bin->getElementByName("fakesink"), "handoff", this, &WebcamWidget::photoGstCallback);
- return true;
- }
-
- //This code has been borrowed from the Qt Multimedia project.
--void WebcamWidget::photoGstCallback(QGst::BufferPtr buffer, QGst::PadPtr)
-+void WebcamWidget::photoGstCallback(QGst::BufferPtr buffer, QGst::PadPtr pad)
- {
- kDebug();
-
- QImage img;
-- QGst::CapsPtr caps = buffer->caps();
-+ QGst::CapsPtr caps = pad->currentCaps();
-
- const QGst::StructurePtr structure = caps->internalStructure(0);
- int width, height;
-+ QString format;
-+ format = structure.data()->value("format").get<QString>();
- width = structure.data()->value("width").get<int>();
- height = structure.data()->value("height").get<int>();
- kDebug() << "We've got a caps in here";
- kDebug() << "Size: " << width << "x" << height;
- kDebug() << "Name: " << structure.data()->name();
-+ kDebug() << "Format: " << format;
-
-- if (qstrcmp(structure.data()->name().toLatin1(), "video/x-raw-yuv") == 0) {
-+ if (format == "YUV") {
- QGst::Fourcc fourcc = structure->value("format").get<QGst::Fourcc>();
- kDebug() << "fourcc: " << fourcc.value.as_integer;
- if (fourcc.value.as_integer == QGst::Fourcc("I420").value.as_integer) {
- img = QImage(width/2, height/2, QImage::Format_RGB32);
-
-- const uchar *data = (const uchar *)buffer->data();
-+ QGst::MemoryPtr memory;
-+ QGst::MapInfo info;
-+ memory = buffer->getMemory(0);
-+ if (!memory) {
-+ kError() << "Could not get memory for buffer.";
-+ return;
-+ }
-+ if (!memory->map(info, QGst::MapRead)) {
-+ kError() << "Could not map memory buffer.";
-+ return;
-+ }
-+ const uchar *data = (const uchar *)info.data();
-
- for (int y=0; y<height; y+=2) {
- const uchar *yLine = data + y*width;
-@@ -225,6 +242,7 @@ void WebcamWidget::photoGstCallback(QGst
- img.setPixel(x/2,y/2,qRgb(r,g,b));
- }
- }
-+ memory->unmap(info);
- } else {
- kDebug() << "Not I420";
- }
-@@ -240,11 +258,23 @@ void WebcamWidget::photoGstCallback(QGst
- format = QImage::Format_RGB32;
-
- if (format != QImage::Format_Invalid) {
-- img = QImage((const uchar *)buffer->data(),
-+ QGst::MemoryPtr memory;
-+ QGst::MapInfo info;
-+ memory = buffer->getMemory(0);
-+ if (!memory) {
-+ kError() << "Could not get memory for buffer.";
-+ return;
-+ }
-+ if (!memory->map(info, QGst::MapRead)) {
-+ kError() << "Could not map memory buffer.";
-+ return;
-+ }
-+ img = QImage((const uchar *)info.data(),
- width,
- height,
- format);
- img.bits(); //detach
-+ memory->unmap(info);
- }
- }
-
-@@ -285,7 +315,7 @@ void WebcamWidget::recordVideo(bool soun
- //Get the audio from alsa
- " ! mux. autoaudiosrc "
- //Sound type and quality
-- " ! audio/x-raw-int,rate=48000,channels=2,depth=16 "
-+ " ! audio/x-raw,rate=48000,channels=2,depth=16 "
- //Encode sound as vorbis
- " ! queue ! audioconvert ! queue "
- " ! vorbisenc "
-@@ -368,11 +398,11 @@ QByteArray WebcamWidget::basicPipe()
-
- //Accepted capabilities
- pipe +=
-- " ! ffmpegcolorspace"
-- " ! video/x-raw-yuv, width=640, height=480, framerate=15/1;"
-- " video/x-raw-yuv, width=640, height=480, framerate=24/1;"
-- " video/x-raw-yuv, width=640, height=480, framerate=30/1;"
-- " video/x-raw-yuv, width=352, height=288, framerate=15/1"
-+ " ! videoconvert"
-+ " ! video/x-raw, format=RGB, width=640, height=480, framerate=15/1;"
-+ " video/x-raw, format=RGB, width=640, height=480, framerate=24/1;"
-+ " video/x-raw, format=RGB, width=640, height=480, framerate=30/1;"
-+ " video/x-raw, format=RGB, width=352, height=288, framerate=15/1"
-
- //Basic plug-in for video controls
- " ! gamma name=gamma"
-@@ -424,7 +454,7 @@ void WebcamWidget::activeAspectRatio()
- {
- QGst::BinPtr sink = d->m_bin->getElementByName("videosink").staticCast<QGst::Bin>();
-
-- QGlib::RefPointer<QGst::XOverlay> over = sink->getElementByInterface<QGst::XOverlay>();
-+ QGlib::RefPointer<QGst::VideoOverlay> over = sink->getElementByInterface<QGst::VideoOverlay>();
-
- if (over->findProperty("force-aspect-ratio")) {
- kDebug() << "Setting aspect ratio";
-Index: b/src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KIPI_INCLUDE_DIR} ${QTGSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR})
-+include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KIPI_INCLUDE_DIR} ${QTGSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR} ${GSTREAMER_ARCH_INCLUDE_DIR})
-
- add_definitions(-DGST_DISABLE_DEPRECATED)
- add_definitions(-fexceptions)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0ff2272..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,8 +0,0 @@
-about_dialog.diff
-proper_version_kaboutdata.diff
-dont_build_plugin_tester.diff
-upstream_add-include.patch
-upstream_libkipi-2.x.diff
-upstream_rename-icons.diff
-qt-gstreamer-1.0.diff
-fix-qt-gstreamer-1.0.diff
diff --git a/debian/patches/upstream_add-include.patch b/debian/patches/upstream_add-include.patch
deleted file mode 100644
index 95d0230..0000000
--- a/debian/patches/upstream_add-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d3c5946f9f48f5d7a5249995424228fc51c84b67 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol at kde.org>
-Date: Wed, 8 Feb 2012 00:39:31 +0100
-Subject: [PATCH] add include
-
----
- src/plugins/youtube/kipiplugin_youtube.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/plugins/youtube/kipiplugin_youtube.cpp b/src/plugins/youtube/kipiplugin_youtube.cpp
-index 07fe1c4..7ebabf8 100644
---- a/src/plugins/youtube/kipiplugin_youtube.cpp
-+++ b/src/plugins/youtube/kipiplugin_youtube.cpp
-@@ -36,6 +36,7 @@
- #include <kwallet.h>
- #include <KDebug>
- #include <libkipi/interface.h>
-+#include <libkipi/imagecollection.h>
-
- using KWallet::Wallet;
-
---
-1.7.10.4
-
diff --git a/debian/patches/upstream_libkipi-2.x.diff b/debian/patches/upstream_libkipi-2.x.diff
deleted file mode 100644
index 75b3a28..0000000
--- a/debian/patches/upstream_libkipi-2.x.diff
+++ /dev/null
@@ -1,165 +0,0 @@
-Author: Rex Dieter <rdieter at math.unl.edu>
-Author: Sando Mani <manisandro at gmail.com>
-Description: Support for libkipi 2.x
-Origin: upstream, commit:a0aec903b36b52bda1a9a5d2e875af1063747a86, commit:9f32257a1e930b16e64508e6fbfa9390fc0322ee
-
---- a/src/kamoso.cpp
-+++ b/src/kamoso.cpp
-@@ -45,6 +45,7 @@
- #include <solid/control/powermanager.h>
- #endif
-
-+#include <QItemSelection>
- #include <QLayout>
- #include <QPushButton>
- #include <QToolButton>
-@@ -77,6 +78,7 @@
-
- #include <libkipi/plugin.h>
- #include <libkipi/pluginloader.h>
-+#include <libkipi/version.h>
- #include <KPluginInfo>
-
- const int max_exponential_value = 50;
-@@ -189,7 +191,13 @@
- connect(mTracker, SIGNAL(urlsChanged(KUrl::List)), SLOT(updateThumbnails(KUrl::List)));
-
- QMetaObject::invokeMethod(this, "initialize");
-+#if (KIPI_VERSION >= 0x020000)
-+ mPluginLoader = new KIPI::PluginLoader();
-+ mPluginLoader->setInterface(new KIPIInterface(this));
-+ mPluginLoader->init();
-+#else
- mPluginLoader = new KIPI::PluginLoader(QStringList(), new KIPIInterface(this), "");
-+#endif
- }
-
- KUrl::List Kamoso::selectedItems()
---- a/src/kamoso.h
-+++ b/src/kamoso.h
-@@ -36,6 +36,7 @@
- class WebcamRetriever;
- class CountdownWidget;
- class KDirOperator;
-+class QItemSelection;
- class QStackedLayout;
- class QSplitter;
- class QPushButton;
---- a/src/kipiaction.cpp
-+++ b/src/kipiaction.cpp
-@@ -19,7 +19,7 @@
-
- #include "kipiaction.h"
- #include <libkipi/plugin.h>
--#include <libkipi/exportinterface.h>
-+#include "plugins/exportinterface.h"
- #include <QDebug>
- #include "kamoso.h"
- #include "kamosojobtracker.h"
-@@ -33,7 +33,7 @@
- void KipiAction::runJob()
- {
- KIPI::Plugin* p=pluginInfo->plugin();
-- KIPI::ExportInterface* ep=dynamic_cast<KIPI::ExportInterface*>(p);
-+ ExportInterface* ep=dynamic_cast<ExportInterface*>(p);
-
- KJob* job=ep->exportFiles(i18n("Kamoso"));
- mKamoso->tracker()->registerJob(job, mKamoso->selectedItems(), icon());
---- a/src/pluginTester/fakekipiaction.cpp
-+++ b/src/pluginTester/fakekipiaction.cpp
-@@ -20,10 +20,10 @@
- #include "fakekipiaction.h"
-
- #include <libkipi/plugin.h>
--#include <libkipi/exportinterface.h>
- #include <KIO/JobUiDelegate>
- #include <kjobtrackerinterface.h>
- #include <KDebug>
-+#include "../plugins/exportinterface.h"
-
- FakeKipiAction::FakeKipiAction(KIPI::PluginLoader::Info* pluginInfo, QObject* parent)
- : QAction(pluginInfo->icon(), pluginInfo->name(), parent), pluginInfo(pluginInfo)
-@@ -39,7 +39,7 @@
- void FakeKipiAction::runJob()
- {
- KIPI::Plugin* p=pluginInfo->plugin();
-- KIPI::ExportInterface* ep = dynamic_cast<KIPI::ExportInterface*>(p);
-+ ExportInterface* ep = dynamic_cast<ExportInterface*>(p);
-
- m_job = ep->exportFiles(i18n("Kamoso"));
- KIO::getJobTracker()->registerJob(m_job);
---- a/src/pluginTester/pluginTester.cpp
-+++ b/src/pluginTester/pluginTester.cpp
-@@ -26,6 +26,7 @@
- #include <KCmdLineArgs>
- #include <libkipi/plugin.h>
- #include <libkipi/pluginloader.h>
-+#include <libkipi/version.h>
-
- PluginTester::PluginTester(QObject *parent) : QObject(parent)
- {
-@@ -41,7 +42,13 @@
- kurlList.append(KUrl(args->arg(i)));
- }
-
-+#if (KIPI_VERSION >= 0x020000)
-+ m_pluginLoader = new KIPI::PluginLoader();
-+ m_pluginLoader->setInterface(new FakeKIPIInterface(kurlList));
-+ m_pluginLoader->init();
-+#else
- m_pluginLoader = new KIPI::PluginLoader(QStringList(), new FakeKIPIInterface(kurlList), "");
-+#endif
-
- bool found = false;
- Q_FOREACH(KIPI::PluginLoader::Info *pluginInfo, m_pluginLoader->pluginList()) {
-@@ -58,4 +65,4 @@
- PluginTester::~PluginTester()
- {
- delete m_action;
--}
-\ No newline at end of file
-+}
---- a/src/plugins/CMakeLists.txt
-+++ b/src/plugins/CMakeLists.txt
-@@ -30,5 +30,5 @@
- # MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs) # For Calendar (libkcal).
- # MACRO_OPTIONAL_FIND_PACKAGE(QCA2) # For Shwup.
-
--include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plugins/youtube)
-+include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/src/plugins/youtube)
- add_subdirectory(youtube)
---- /dev/null
-+++ b/src/plugins/exportinterface.h
-@@ -0,0 +1,15 @@
-+#ifndef EXPORTINTERFACE_H
-+#define EXPORTINTERFACE_H
-+
-+class KJob;
-+
-+class ExportInterface
-+{
-+public:
-+
-+ virtual ~ExportInterface() {}
-+
-+ virtual KJob* exportFiles(const QString& albumname)=0;
-+};
-+
-+#endif // EXPORTINTERFACE_H
---- a/src/plugins/youtube/kipiplugin_youtube.h
-+++ b/src/plugins/youtube/kipiplugin_youtube.h
-@@ -22,12 +22,11 @@
- #include <kwallet.h>
- #include <KIO/Job>
- #include <libkipi/plugin.h>
--#include <libkipi/exportinterface.h>
-+#include <exportinterface.h>
-
--class YoutubePlugin : public KIPI::Plugin, public KIPI::ExportInterface
-+class YoutubePlugin : public KIPI::Plugin, public ExportInterface
- {
- Q_OBJECT
-- Q_INTERFACES(KIPI::ExportInterface)
- public:
- YoutubePlugin(QObject* parent, const QVariantList& args);
- // virtual QAction* thumbnailsAction(const QList<KUrl>& url);
diff --git a/debian/patches/upstream_rename-icons.diff b/debian/patches/upstream_rename-icons.diff
deleted file mode 100644
index 5b01c0f..0000000
--- a/debian/patches/upstream_rename-icons.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Rex Dieter <rdieter at fedoraproject.org>
-Description: rename icons to avoid conflict
- .
- kamoso's youtube.* icons conflict with kdeplasma-addons' youtube krunner
- plugin. Avoid that via simple rename here for now.
-Origin: upstream, commit:b8b03322d58a920deac198c2360d65deddccd610
-
---- a/src/plugins/youtube/kipiplugin_youtube.desktop
-+++ b/src/plugins/youtube/kipiplugin_youtube.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Service
- Exec=blubb
--Icon=youtube
-+Icon=kipiplugin_youtube
- Comment=Upload videos directly to YouTube
- Comment[cs]=Nahrát videa přímo na YouTube
- Comment[da]=Upload videoer direkte til YouTube
--
kamoso packaging
More information about the pkg-kde-commits
mailing list