[kamoso] 2.0.2-8
Rex Dieter
rdieter at fedoraproject.org
Fri Dec 21 16:35:22 UTC 2012
commit 8437be876c8a74dc640b2e67534213ee195533bf
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Fri Dec 21 10:35:43 2012 -0600
2.0.2-8
- Kamoso has a missing icon for the pictures button (848079)
- pull in upstream fix for broken about dialog
0005-Make-the-About-dialog-work.patch | 34 +++++++++++++
0021-add-include.patch | 24 +++++++++
...nstall-kamoso.desktop-with-755-permission.patch | 31 ++++++++++++
...-camera-web-icon-instead-of-webcamreceive.patch | 29 +++++++++++
kamoso-2.0.2-libkipi-4.8.80.patch | 10 ----
kamoso-2.0.2-libkipi-4.9.50.patch | 51 ++++++++++----------
kamoso.spec | 21 +++++++--
7 files changed, 160 insertions(+), 40 deletions(-)
---
diff --git a/0005-Make-the-About-dialog-work.patch b/0005-Make-the-About-dialog-work.patch
new file mode 100644
index 0000000..612edf2
--- /dev/null
+++ b/0005-Make-the-About-dialog-work.patch
@@ -0,0 +1,34 @@
+From 990462363724a09cfbc314d7e6451a4000db548e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Santamar=C3=ADa=20Lema?=
+ <panfaust at gmail.com>
+Date: Fri, 22 Jul 2011 20:09:22 +0200
+Subject: [PATCH 05/32] Make the About dialog work.
+
+---
+ src/kamoso.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+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
++}
+--
+1.8.0.2
+
diff --git a/0021-add-include.patch b/0021-add-include.patch
new file mode 100644
index 0000000..2369149
--- /dev/null
+++ b/0021-add-include.patch
@@ -0,0 +1,24 @@
+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 21/32] 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.8.0.2
+
diff --git a/0031-Store-and-install-kamoso.desktop-with-755-permission.patch b/0031-Store-and-install-kamoso.desktop-with-755-permission.patch
new file mode 100644
index 0000000..3563c8a
--- /dev/null
+++ b/0031-Store-and-install-kamoso.desktop-with-755-permission.patch
@@ -0,0 +1,31 @@
+From 3102d5424539f8f27ce8989c3e18abe319b3e82c Mon Sep 17 00:00:00 2001
+From: Jekyll Wu <adaptee at gmail.com>
+Date: Mon, 10 Dec 2012 19:21:56 +0800
+Subject: [PATCH 31/32] Store and install kamoso.desktop with 755 permission
+
+See https://bugs.kde.org/show_bug.cgi?id=304569#c3
+---
+ src/CMakeLists.txt | 4 ++--
+ src/kamoso.desktop | 0
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ mode change 100644 => 100755 src/kamoso.desktop
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3ed93c7..2166b7d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -57,5 +57,5 @@ if(HAVE_NEPOMUK)
+ 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(PROGRAMS kamoso.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install(FILES kamosoplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+diff --git a/src/kamoso.desktop b/src/kamoso.desktop
+old mode 100644
+new mode 100755
+--
+1.8.0.2
+
diff --git a/0032-use-camera-web-icon-instead-of-webcamreceive.patch b/0032-use-camera-web-icon-instead-of-webcamreceive.patch
new file mode 100644
index 0000000..82d2448
--- /dev/null
+++ b/0032-use-camera-web-icon-instead-of-webcamreceive.patch
@@ -0,0 +1,29 @@
+From a89b0042f5d7017f747c466679d63c29b9f3b01c Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 21 Dec 2012 09:51:38 -0600
+Subject: [PATCH 32/32] use camera-web icon instead of webcamreceive
+
+BUG: 312039
+
+webcamreceive is (only?) provided by kopete, so we can't assume it
+is present at runtime, so use camera-web instead.
+---
+ src/photoshootmode.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/photoshootmode.cpp b/src/photoshootmode.cpp
+index c98f6c4..713b67a 100644
+--- a/src/photoshootmode.cpp
++++ b/src/photoshootmode.cpp
+@@ -73,7 +73,7 @@ void PhotoShootMode::shootClicked(bool pressed)
+
+ QIcon PhotoShootMode::icon() const
+ {
+- return KIcon("webcamreceive");
++ return KIcon("camera-web");
+ }
+
+ QString PhotoShootMode::name() const
+--
+1.8.0.2
+
diff --git a/kamoso-2.0.2-libkipi-4.9.50.patch b/kamoso-2.0.2-libkipi-4.9.50.patch
index 4ef829c..a59b511 100644
--- a/kamoso-2.0.2-libkipi-4.9.50.patch
+++ b/kamoso-2.0.2-libkipi-4.9.50.patch
@@ -1,6 +1,6 @@
-diff -rupN kamoso-2.0.2/src/kamoso.cpp kamoso-2.0.2-new/src/kamoso.cpp
---- kamoso-2.0.2/src/kamoso.cpp 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/kamoso.cpp 2012-09-30 14:38:17.271806497 +0200
+diff -up kamoso-2.0.2/src/kamoso.cpp.libkipi_4.9.50 kamoso-2.0.2/src/kamoso.cpp
+--- kamoso-2.0.2/src/kamoso.cpp.libkipi_4.9.50 2012-12-21 10:06:53.014802536 -0600
++++ kamoso-2.0.2/src/kamoso.cpp 2012-12-21 10:06:53.026802398 -0600
@@ -45,6 +45,7 @@
#include <solid/control/powermanager.h>
#endif
@@ -20,9 +20,9 @@ diff -rupN kamoso-2.0.2/src/kamoso.cpp kamoso-2.0.2-new/src/kamoso.cpp
}
KUrl::List Kamoso::selectedItems()
-diff -rupN kamoso-2.0.2/src/kamoso.h kamoso-2.0.2-new/src/kamoso.h
---- kamoso-2.0.2/src/kamoso.h 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/kamoso.h 2012-09-30 13:50:07.370380902 +0200
+diff -up kamoso-2.0.2/src/kamoso.h.libkipi_4.9.50 kamoso-2.0.2/src/kamoso.h
+--- kamoso-2.0.2/src/kamoso.h.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/kamoso.h 2012-12-21 10:06:53.026802398 -0600
@@ -36,6 +36,7 @@ class WebcamWidget;
class WebcamRetriever;
class CountdownWidget;
@@ -31,9 +31,9 @@ diff -rupN kamoso-2.0.2/src/kamoso.h kamoso-2.0.2-new/src/kamoso.h
class QStackedLayout;
class QSplitter;
class QPushButton;
-diff -rupN kamoso-2.0.2/src/kipiaction.cpp kamoso-2.0.2-new/src/kipiaction.cpp
---- kamoso-2.0.2/src/kipiaction.cpp 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/kipiaction.cpp 2012-09-30 14:36:06.804328749 +0200
+diff -up kamoso-2.0.2/src/kipiaction.cpp.libkipi_4.9.50 kamoso-2.0.2/src/kipiaction.cpp
+--- kamoso-2.0.2/src/kipiaction.cpp.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/kipiaction.cpp 2012-12-21 10:06:53.026802398 -0600
@@ -19,7 +19,7 @@
#include "kipiaction.h"
@@ -52,9 +52,9 @@ diff -rupN kamoso-2.0.2/src/kipiaction.cpp kamoso-2.0.2-new/src/kipiaction.cpp
KJob* job=ep->exportFiles(i18n("Kamoso"));
mKamoso->tracker()->registerJob(job, mKamoso->selectedItems(), icon());
-diff -rupN kamoso-2.0.2/src/plugins/CMakeLists.txt kamoso-2.0.2-new/src/plugins/CMakeLists.txt
---- kamoso-2.0.2/src/plugins/CMakeLists.txt 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/plugins/CMakeLists.txt 2012-09-30 14:25:52.093628727 +0200
+diff -up kamoso-2.0.2/src/plugins/CMakeLists.txt.libkipi_4.9.50 kamoso-2.0.2/src/plugins/CMakeLists.txt
+--- kamoso-2.0.2/src/plugins/CMakeLists.txt.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/plugins/CMakeLists.txt 2012-12-21 10:06:53.026802398 -0600
@@ -30,5 +30,5 @@ FIND_PACKAGE(Kipi REQUIRED)
# MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs) # For Calendar (libkcal).
# MACRO_OPTIONAL_FIND_PACKAGE(QCA2) # For Shwup.
@@ -62,9 +62,9 @@ diff -rupN kamoso-2.0.2/src/plugins/CMakeLists.txt kamoso-2.0.2-new/src/plugins/
-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)
-diff -rupN kamoso-2.0.2/src/plugins/exportinterface.h kamoso-2.0.2-new/src/plugins/exportinterface.h
---- kamoso-2.0.2/src/plugins/exportinterface.h 1970-01-01 01:00:00.000000000 +0100
-+++ kamoso-2.0.2-new/src/plugins/exportinterface.h 2012-09-30 14:31:30.010581312 +0200
+diff -up kamoso-2.0.2/src/plugins/exportinterface.h.libkipi_4.9.50 kamoso-2.0.2/src/plugins/exportinterface.h
+--- kamoso-2.0.2/src/plugins/exportinterface.h.libkipi_4.9.50 2012-12-21 10:06:53.027802387 -0600
++++ kamoso-2.0.2/src/plugins/exportinterface.h 2012-12-21 10:06:53.027802387 -0600
@@ -0,0 +1,15 @@
+#ifndef EXPORTINTERFACE_H
+#define EXPORTINTERFACE_H
@@ -81,15 +81,14 @@ diff -rupN kamoso-2.0.2/src/plugins/exportinterface.h kamoso-2.0.2-new/src/plugi
+};
+
+#endif // EXPORTINTERFACE_H
-diff -rupN kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h kamoso-2.0.2-new/src/plugins/youtube/kipiplugin_youtube.h
---- kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h 2012-09-30 13:25:53.996834375 +0200
-+++ kamoso-2.0.2-new/src/plugins/youtube/kipiplugin_youtube.h 2012-09-30 14:26:40.278044046 +0200
-@@ -22,13 +22,12 @@
+diff -up kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h.libkipi_4.9.50 kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h
+--- kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h 2012-12-21 10:16:58.425454927 -0600
+@@ -22,12 +22,11 @@
#include <kwallet.h>
#include <KIO/Job>
#include <libkipi/plugin.h>
-#include <libkipi/exportinterface.h>
- #include <libkipi/imagecollection.h>
+#include <exportinterface.h>
-class YoutubePlugin : public KIPI::Plugin, public KIPI::ExportInterface
@@ -100,9 +99,9 @@ diff -rupN kamoso-2.0.2/src/plugins/youtube/kipiplugin_youtube.h kamoso-2.0.2-ne
public:
YoutubePlugin(QObject* parent, const QVariantList& args);
// virtual QAction* thumbnailsAction(const QList<KUrl>& url);
-diff -rupN kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp kamoso-2.0.2-new/src/pluginTester/fakekipiaction.cpp
---- kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/pluginTester/fakekipiaction.cpp 2012-09-30 14:33:31.489158150 +0200
+diff -up kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp.libkipi_4.9.50 kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp
+--- kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp 2012-12-21 10:06:53.027802387 -0600
@@ -20,10 +20,10 @@
#include "fakekipiaction.h"
@@ -124,9 +123,9 @@ diff -rupN kamoso-2.0.2/src/pluginTester/fakekipiaction.cpp kamoso-2.0.2-new/src
m_job = ep->exportFiles(i18n("Kamoso"));
KIO::getJobTracker()->registerJob(m_job);
-diff -rupN kamoso-2.0.2/src/pluginTester/pluginTester.cpp kamoso-2.0.2-new/src/pluginTester/pluginTester.cpp
---- kamoso-2.0.2/src/pluginTester/pluginTester.cpp 2011-05-25 00:34:42.000000000 +0200
-+++ kamoso-2.0.2-new/src/pluginTester/pluginTester.cpp 2012-09-30 13:35:38.245802267 +0200
+diff -up kamoso-2.0.2/src/pluginTester/pluginTester.cpp.libkipi_4.9.50 kamoso-2.0.2/src/pluginTester/pluginTester.cpp
+--- kamoso-2.0.2/src/pluginTester/pluginTester.cpp.libkipi_4.9.50 2011-05-24 17:34:42.000000000 -0500
++++ kamoso-2.0.2/src/pluginTester/pluginTester.cpp 2012-12-21 10:06:53.028802376 -0600
@@ -41,7 +41,9 @@ PluginTester::PluginTester(QObject *pare
kurlList.append(KUrl(args->arg(i)));
}
diff --git a/kamoso.spec b/kamoso.spec
index 0bbe473..ecb68d8 100644
--- a/kamoso.spec
+++ b/kamoso.spec
@@ -1,6 +1,6 @@
Name: kamoso
Version: 2.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Application for taking pictures and videos from a webcam
Group: Applications/Multimedia
@@ -9,11 +9,15 @@ URL: https://projects.kde.org/projects/extragear/multimedia/kamoso/
Source0: http://download.kde.org/stable/kamoso/%{version}/src/%{name}-%{version}.tar.bz2
## upstreamable patches
-# https://bugs.kde.org/show_bug.cgi?id=300823
-Patch50: kamoso-2.0.2-libkipi-4.8.80.patch
# https://bugs.kde.org/show_bug.cgi?id=307147
patch51: kamoso-2.0.2-libkipi-4.9.50.patch
+## upstream patches
+Patch105: 0005-Make-the-About-dialog-work.patch
+Patch121: 0021-add-include.patch
+Patch131: 0031-Store-and-install-kamoso.desktop-with-755-permission.patch
+Patch132: 0032-use-camera-web-icon-instead-of-webcamreceive.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -29,7 +33,12 @@ Kamoso is an application to take pictures and videos out of your webcam.
%prep
%setup -q
-%patch50 -p1 -b .libkipi_4.8.80
+
+%patch105 -p1 -b .0005
+%patch121 -p1 -b .0021
+%patch131 -p1 -b .0031
+%patch132 -p1 -b .0032
+
%patch51 -p1 -b .libkipi_4.9.50
# rename some icons that conflict with kdeplasma-addons
@@ -94,6 +103,10 @@ rm -rf %{buildroot}
%changelog
+* Fri Dec 21 2012 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-8
+- Kamoso has a missing icon for the pictures button (848079)
+- pull in upstream fix for broken about dialog
+
* Wed Nov 21 2012 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-7
- fix build against libkipi-4.9.50+ (kde#307147)
More information about the scm-commits
mailing list