Accepting request 124174 from KDE:Distro:Factory
Update to 2.6.0, Removed/Rebased some patches (forwarded request 124135 from adra) OBS-URL: https://build.opensuse.org/request/show/124174 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=92
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
45f8425638
commit
46907e9052
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a
|
||||
size 54976375
|
||||
3
digikam-2.6.0.tar.bz2
Normal file
3
digikam-2.6.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df
|
||||
size 55362029
|
||||
@ -1,74 +0,0 @@
|
||||
commit d18ea6da2d3e2359f4113e83c3fd40c18a29ddab
|
||||
Author: Gilles Caulier <caulier.gilles@gmail.com>
|
||||
Date: Fri Jan 6 11:23:48 2012 +0100
|
||||
|
||||
Apply patch #67483 from Jeremiah Willcock to compile fine digiKam boost graph interface with libboost 1.48
|
||||
BUGS: 287772
|
||||
CCBUGS: 267777
|
||||
|
||||
diff --git a/core/libs/database/imagehistory/imagehistorygraph_boost.h b/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
index 4017c4f..76c764a 100644
|
||||
--- a/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
+++ b/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
@@ -1198,7 +1198,7 @@ protected:
|
||||
{
|
||||
boost::dag_shortest_paths(graph, v,
|
||||
// we provide a constant weight of 1
|
||||
- weight_map(boost::ref_property_map<edge_t,int>(weight)).
|
||||
+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
|
||||
// Store distance and predecessors in QMaps, wrapped to serve as property maps
|
||||
distance_map(VertexIntMapAdaptor(distances)).
|
||||
predecessor_map(VertexVertexMapAdaptor(predecessors))
|
||||
@@ -1218,7 +1218,7 @@ protected:
|
||||
{
|
||||
boost::dag_shortest_paths(graph, v,
|
||||
// we provide a constant weight of 1
|
||||
- weight_map(boost::ref_property_map<edge_t,int>(weight)).
|
||||
+ weight_map(boost::ref_property_map<typename boost::graph_traits<GraphType>::edge_descriptor,int>(weight)).
|
||||
// Invert the default compare method: With greater, we get the longest path
|
||||
distance_compare(std::greater<int>()).
|
||||
// will be returned if a node is unreachable
|
||||
@@ -1384,14 +1384,15 @@ protected:
|
||||
template <class GraphType, typename VertexLessThan>
|
||||
class lessThanMapEdgeToTarget
|
||||
{
|
||||
+ typedef typename boost::graph_traits<GraphType>::edge_descriptor edge_descriptor;
|
||||
public:
|
||||
lessThanMapEdgeToTarget(const GraphType& g, VertexLessThan vertexLessThan)
|
||||
: g(g), vertexLessThan(vertexLessThan) {}
|
||||
const GraphType& g;
|
||||
VertexLessThan vertexLessThan;
|
||||
- bool operator()(const Edge& a, const Edge& b)
|
||||
+ bool operator()(const edge_descriptor& a, const edge_descriptor& b)
|
||||
{
|
||||
- return vertexLessThan(boost::target(a.toEdge(), g), boost::target(b.toEdge(), g));
|
||||
+ return vertexLessThan(boost::target(a, g), boost::target(b, g));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1402,20 +1403,21 @@ protected:
|
||||
{
|
||||
typedef std::pair<Vertex, QList<Edge> > VertexInfo;
|
||||
|
||||
- QList<Edge> outEdges;
|
||||
+ typedef typename boost::graph_traits<IncidenceGraph>::edge_descriptor edge_descriptor;
|
||||
+ QList<edge_descriptor> outEdges;
|
||||
std::vector<VertexInfo> stack;
|
||||
|
||||
boost::put(color, u, boost::gray_color);
|
||||
vis.discover_vertex(u, g);
|
||||
|
||||
- outEdges = toEdgeList(boost::out_edges(u, g));
|
||||
+ outEdges = toList<edge_descriptor>(boost::out_edges(u, g));
|
||||
// Sort edges. The lessThan we have takes vertices, so we use a lessThan which
|
||||
// maps the given edges to their targets, and calls our vertex lessThan.
|
||||
qSort(outEdges.begin(), outEdges.end(), lessThanMapEdgeToTarget<IncidenceGraph, LessThan>(g, lessThan));
|
||||
|
||||
- foreach(const Edge& e, outEdges)
|
||||
+ foreach(const edge_descriptor& e, outEdges)
|
||||
{
|
||||
- Vertex v = boost::target(e.toEdge(), g);
|
||||
+ Vertex v = boost::target(e, g);
|
||||
vis.examine_edge(e, g);
|
||||
boost::default_color_type v_color = boost::get(color, v);
|
||||
if (v_color == boost::white_color)
|
||||
@ -1,73 +0,0 @@
|
||||
Index: digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp
|
||||
===================================================================
|
||||
--- digikam-2.5.0.orig/core/utilities/cameragui/devices/gpcamera.cpp
|
||||
+++ digikam-2.5.0/core/utilities/cameragui/devices/gpcamera.cpp
|
||||
@@ -34,6 +34,7 @@ extern "C"
|
||||
|
||||
// C++ includes
|
||||
|
||||
+#include <unistd.h>
|
||||
#include <cstdio>
|
||||
#include <iostream>
|
||||
|
||||
Index: digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||||
===================================================================
|
||||
--- digikam-2.5.0.orig/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||||
+++ digikam-2.5.0/extra/kipi-plugins/printimages/wizard/wizard.cpp
|
||||
@@ -88,7 +88,7 @@ public:
|
||||
WizardPage ( KAssistantDialog* dialog, const QString& title )
|
||||
: QWidget ( dialog )
|
||||
{
|
||||
- setupUi ( this );
|
||||
+ this->setupUi ( this );
|
||||
layout()->setMargin ( 0 );
|
||||
mPage = dialog->addPage ( this, title );
|
||||
}
|
||||
Index: digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp
|
||||
===================================================================
|
||||
--- digikam-2.5.0.orig/extra/kipi-plugins/htmlexport/wizard.cpp
|
||||
+++ digikam-2.5.0/extra/kipi-plugins/htmlexport/wizard.cpp
|
||||
@@ -78,7 +78,7 @@ class WizardPage : public QWidget, publi
|
||||
public:
|
||||
WizardPage(KAssistantDialog* dialog, const QString& title)
|
||||
: QWidget(dialog) {
|
||||
- setupUi(this);
|
||||
+ this->setupUi(this);
|
||||
layout()->setMargin(0);
|
||||
mPage = dialog->addPage(this, title);
|
||||
}
|
||||
Index: digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
===================================================================
|
||||
--- digikam-2.5.0.orig/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
+++ digikam-2.5.0/core/libs/database/imagehistory/imagehistorygraph_boost.h
|
||||
@@ -1362,7 +1362,7 @@ protected:
|
||||
template <typename VertexType, typename GraphType>
|
||||
void discover_vertex(VertexType u, const GraphType&) const
|
||||
{
|
||||
- record(u);
|
||||
+ this->record(u);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1373,7 +1373,7 @@ protected:
|
||||
template <typename VertexType, typename GraphType>
|
||||
void discover_vertex(VertexType u, const GraphType&) const
|
||||
{
|
||||
- record(u);
|
||||
+ this->record(u);
|
||||
}
|
||||
};
|
||||
|
||||
Index: digikam-2.5.0/core/digikam/album/albummanager.h
|
||||
===================================================================
|
||||
--- digikam-2.5.0.orig/core/digikam/album/albummanager.h
|
||||
+++ digikam-2.5.0/core/digikam/album/albummanager.h
|
||||
@@ -831,7 +831,7 @@ public:
|
||||
{
|
||||
foreach(T* t, list)
|
||||
{
|
||||
- append(AlbumPointer<T>(t));
|
||||
+ this->append(AlbumPointer<T>(t));
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
@ -1,3 +1,54 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 7 21:47:46 UTC 2012 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to 2.6.0:
|
||||
digikam:
|
||||
- General: Add support of Little CMS version 2.
|
||||
- General: New tool to run all maintenance process in background.
|
||||
- General: Lprof 3rd party library have been removed from core
|
||||
implementation.
|
||||
- General: Thumbs/Preview for read-only files (as RAW) can be rotated
|
||||
through a flag in thumbnails database.
|
||||
- General: Add a Progress Manager as into Kontact to drive process running
|
||||
in parallele.
|
||||
- General: KIPI JPEGLossLess tool is now disabled in digiKam. A dedicated
|
||||
solution is now implemented in digiKam core to rotate/flip image using
|
||||
multithreading, parallelization, and image versioning.
|
||||
- KipiInterface: Handle progress events from kipi tools through digiKam
|
||||
Progress Manager.
|
||||
- ImageEditor: Template Superimpose feature have been moved to
|
||||
PhotoLayoutEditor kipi-plugin.
|
||||
- ImageEditor: New film color negative inverter filter.
|
||||
- 118 fixed bugs.
|
||||
kipi-plugins:
|
||||
- RAWConverter: Add progress management support, and parallelization of
|
||||
tasks using ThreadWeaver.
|
||||
- DNGConverter: Add progress management support, and parallelization of
|
||||
tasks using ThreadWeaver.
|
||||
- RedEyesRemoval: Add progress management support, and parallelization of
|
||||
tasks using ThreadWeaver.
|
||||
- TimeAdjust: Add items listview support, progress management support,
|
||||
multithreading, and parallelization of tasks using ThreadWeaver.
|
||||
- SendImages: Dialog Layout improvements, progress management support, and
|
||||
parallelization of tasks using ThreadWeaver.
|
||||
- PhotoLayoutEditor: Add SuperImpose Template support to compose fun frame,
|
||||
post-card, etc... template file use SVG format.
|
||||
- Panorama: Bugfix for binary detection on OSes different than Linux (fixes
|
||||
the same issue with expoblending). Bugfix for the back button of the
|
||||
assistant. First steps towards a cropping for target panorama.
|
||||
Parallelization of tasks using ThreadWeaver.
|
||||
- General: New tool to export items to ImageShack web service
|
||||
(http://imageshack.us).
|
||||
- General: New tool to export items to MediaWiki web service
|
||||
(http://www.mediawiki.org).
|
||||
- General: New tool to export items to Imgur web service (http://imgur.com).
|
||||
- 49 fixed bugs.
|
||||
- Removed the following patches (fixed upstream):
|
||||
- use_correct_libkipi.patch
|
||||
- digikam-boost-1.48.patch
|
||||
- digikam-gcc47.patch
|
||||
- Rebased fix-broken-icon-reference.diff patch to apply cleanly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 24 18:27:43 UTC 2012 - dimstar@opensuse.org
|
||||
|
||||
|
||||
234
digikam.spec
234
digikam.spec
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: digikam
|
||||
Version: 2.5.0
|
||||
Version: 2.6.0
|
||||
Release: 0
|
||||
Summary: A KDE Photo Manager
|
||||
License: GPL-2.0+
|
||||
@ -26,22 +26,16 @@ Url: http://www.digikam.org/
|
||||
Source0: http://sourceforge.net/projects/digikam/files/digikam/%{version}/digikam-%{version}.tar.bz2
|
||||
# PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work
|
||||
Patch0: digikam-buildtime.patch
|
||||
# PATCH-FIX-UPSTREAM use_correct_libkipi.patch -- Only compile these classes when the latest libkipi (KDE 4.9) is used
|
||||
Patch1: use_correct_libkipi.patch
|
||||
# PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing)
|
||||
Patch2: desktop-files.diff
|
||||
Patch1: desktop-files.diff
|
||||
# PATCH-FIX-OPENSUSE non-executable-script.patch asterios.dramis@gmail.com -- Fix rpmlint warning "non-executable-script"
|
||||
Patch3: non-executable-script.patch
|
||||
Patch2: non-executable-script.patch
|
||||
# PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system
|
||||
Patch4: remove-gplv2-only.patch
|
||||
Patch3: remove-gplv2-only.patch
|
||||
# PATCH-FIX-OPENSUSE fix-broken-icon-reference.diff adrian@suse.de -- CHECK ON NEXT VERSION UPDATE: reference to missing icon
|
||||
Patch5: fix-broken-icon-reference.diff
|
||||
Patch4: fix-broken-icon-reference.diff
|
||||
# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one)
|
||||
Patch6: digikam_no_build_vkontakte.diff
|
||||
# PATCH-FIX-UPSTREAM digikam-boost-1.48.patch idoenmez@suse.de -- Compile with Boost 1.48+, upstream commit d18ea6da2d3e2359f411
|
||||
Patch7: digikam-boost-1.48.patch
|
||||
# PATCH-FIX-UPSTREAM digikam-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7
|
||||
Patch8: digikam-gcc47.patch
|
||||
Patch5: digikam_no_build_vkontakte.diff
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: doxygen
|
||||
@ -89,13 +83,13 @@ BuildRequires: gdk-pixbuf-devel
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: update-desktop-files
|
||||
%endif
|
||||
Requires: kipi-plugins >= 2.5.0
|
||||
%requires_ge libkipi8
|
||||
Requires: kipi-plugins >= %{version}
|
||||
Requires: libqt4-sql-mysql
|
||||
Requires: libqt4-sql-sqlite
|
||||
Recommends: %{name}-doc
|
||||
Recommends: %{name}-lang
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%requires_ge libkipi8
|
||||
%kde4_runtime_requires
|
||||
|
||||
%description
|
||||
@ -144,14 +138,14 @@ Supplements: packageand(kipi-plugins:marble)
|
||||
This is the Geolocation plugin from the kipi plugins package.
|
||||
|
||||
%package -n kipi-plugins
|
||||
Summary: KDE Plug-Ins for Image Manipulation
|
||||
Summary: KDE Plug-Ins for Image Manipulation
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Graphics/Other
|
||||
Recommends: ImageMagick
|
||||
Recommends: enblend-enfuse
|
||||
Recommends: hugin
|
||||
Supplements: packageand(kipi-plugins:marble)
|
||||
Recommends: kipi-plugins-lang = %{version}
|
||||
Supplements: packageand(kipi-plugins:marble)
|
||||
%kde4_runtime_requires
|
||||
|
||||
%description -n kipi-plugins
|
||||
@ -171,14 +165,15 @@ This package contains development files for libkgeomap.
|
||||
Summary: World-Map Library interface for KDE
|
||||
License: GPL-2.0+
|
||||
Group: System/Libraries
|
||||
Recommends: marble
|
||||
Recommends: libkgeomap-lang = %{version}
|
||||
Recommends: marble
|
||||
# libkgeomap was last used at openSUSE 12.1 (version 2.2.0)
|
||||
Provides: libkgeomap = %{version}
|
||||
Obsoletes: libkgeomap < %{version}
|
||||
|
||||
%description -n libkgeomap1
|
||||
Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map.
|
||||
Libkgeomap is a wrapper around different world-map components, to browse and
|
||||
arrange photos over a map.
|
||||
Currently supported map engine are:
|
||||
- Marble
|
||||
- OpenstreetMap (via Marble)
|
||||
@ -229,46 +224,25 @@ This package contains the development files for libmediawiki.
|
||||
|
||||
%lang_package
|
||||
|
||||
%package -n kipi-plugins-lang
|
||||
Summary: Translations for kipi-plugins
|
||||
License: GPL-2.0+
|
||||
Group: System/Localization
|
||||
Requires: kipi-plugins = %{version}
|
||||
BuildArch: noarch
|
||||
Supplements: packageand(kipi-plugins:bundle-lang-other)
|
||||
%lang_package -n kipi-plugins
|
||||
|
||||
%description -n kipi-plugins-lang
|
||||
Provides translations to the package kipi-plugins
|
||||
|
||||
%package -n libkgeomap-lang
|
||||
Summary: Translations for libkgeomap
|
||||
License: GPL-2.0+
|
||||
Group: System/Localization
|
||||
Requires: libkgeomap1 = %{version}
|
||||
BuildArch: noarch
|
||||
Supplements: packageand(libkgeomap1:bundle-lang-other)
|
||||
|
||||
%description -n libkgeomap-lang
|
||||
Provides translations to the package libkgeomap
|
||||
%lang_package -n libkgeomap
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
pushd extra/kipi-plugins
|
||||
%patch2
|
||||
%patch1
|
||||
popd
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6 -p0
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
|
||||
# Remove build time references so build-compare can do its work
|
||||
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/digikam/utils/version.h.cmake
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/pluginsversion.h.cmake
|
||||
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/tools/kpversion.h.cmake
|
||||
|
||||
pushd extra/kipi-plugins
|
||||
# Remove GPL-v2 only files
|
||||
@ -280,7 +254,7 @@ popd
|
||||
%if !0%{?kde_updatedapps}
|
||||
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE
|
||||
%else
|
||||
%if %suse_version < 1210
|
||||
%if 0%{?suse_version} < 1210
|
||||
%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=1 -DENABLE_INTERNALMYSQL=FALSE
|
||||
%else
|
||||
%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE
|
||||
@ -296,9 +270,8 @@ cd ..
|
||||
# Not needed, the package doesn't actually provide any shared libraries
|
||||
rm -f %{buildroot}%{_kde4_libdir}/libdigikamcore.so
|
||||
rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so
|
||||
|
||||
# Not needed, the package doesn't actually provide any shared libraries
|
||||
rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so
|
||||
|
||||
# Not needed
|
||||
rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a
|
||||
|
||||
@ -307,16 +280,9 @@ mogrify -scale 22x22 -background transparent %{buildroot}%{_kde4_iconsdir}/hicol
|
||||
mogrify -extent 64x64 -background transparent -gravity "center" %{buildroot}%{_kde4_iconsdir}/hicolor/64x64/actions/metadataedit.png
|
||||
mogrify -extent 128x128 -background transparent -gravity "south" %{buildroot}%{_kde4_iconsdir}/hicolor/128x128/actions/flash.png
|
||||
|
||||
# Make a link in hicolor icon theme to dngconverter.png from oxygen icon theme in order to fix an rpm post build error "Icon file not installed for dngconverter.desktop"
|
||||
for res in 16 22 32 48 64 128
|
||||
do
|
||||
install -dp -m 0755 %{buildroot}%{_kde4_iconsdir}/hicolor/"$res"x"$res"/apps
|
||||
ln -s %{_kde4_iconsdir}/oxygen/"$res"x"$res"/apps/dngconverter.png %{buildroot}%{_kde4_iconsdir}/hicolor/"$res"x"$res"/apps/dngconverter.png
|
||||
done
|
||||
|
||||
%if 0%{?suse_version}
|
||||
%suse_update_desktop_file -r %{name} Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -G "Photo Editor" -r showfoto Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -r showfoto Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -r dngconverter Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -r expoblending Qt KDE Graphics Photography
|
||||
%suse_update_desktop_file -r panoramagui Qt KDE Graphics Photography
|
||||
@ -342,14 +308,29 @@ done
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%post -n kipi-plugins -p /sbin/ldconfig
|
||||
|
||||
%postun -n kipi-plugins -p /sbin/ldconfig
|
||||
|
||||
%post -n libkgeomap1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libkgeomap1 -p /sbin/ldconfig
|
||||
|
||||
%post -n libkface1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libkface1 -p /sbin/ldconfig
|
||||
|
||||
%post -n libmediawiki1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libmediawiki1 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc core/AUTHORS core/COPYING core/COPYING.LIB
|
||||
%doc core/ChangeLog core/NEWS core/README core/TODO
|
||||
%doc core/TODO.FACE core/TODO.MYSQLPORT
|
||||
%doc core/{AUTHORS,COPYING,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT}
|
||||
%{_kde4_applicationsdir}/digikam.desktop
|
||||
%{_kde4_applicationsdir}/showfoto.desktop
|
||||
%{_kde4_appsdir}/digikam/
|
||||
%{_kde4_appsdir}/kconf_update/adjustlevelstool.upd
|
||||
%{_kde4_appsdir}/showfoto/
|
||||
%{_kde4_appsdir}/solid
|
||||
%{_kde4_bindir}/cleanup_digikamdb
|
||||
@ -377,7 +358,7 @@ done
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc core/COPYING.DOC
|
||||
%doc COPYING.DOC
|
||||
%doc %{_kde4_htmldir}/en/digikam/
|
||||
%doc %{_kde4_htmldir}/en/showfoto/
|
||||
%doc %{_kde4_htmldir}/en/kipi-plugins/
|
||||
@ -389,47 +370,37 @@ done
|
||||
%exclude %{_kde4_htmldir}/en/digikam
|
||||
%exclude %{_kde4_htmldir}/en/showfoto
|
||||
|
||||
%post -n kipi-plugins -p /sbin/ldconfig
|
||||
|
||||
%postun -n kipi-plugins -p /sbin/ldconfig
|
||||
|
||||
%files -n kipi-plugins
|
||||
%defattr(-,root,root,-)
|
||||
%doc extra/kipi-plugins/AUTHORS
|
||||
%doc extra/kipi-plugins/ChangeLog
|
||||
%doc extra/kipi-plugins/COPYING
|
||||
%doc extra/kipi-plugins/COPYING-ADOBE
|
||||
%doc extra/kipi-plugins/NEWS
|
||||
%doc extra/kipi-plugins/README
|
||||
%doc extra/kipi-plugins/TODO
|
||||
%doc extra/kipi-plugins/{AUTHORS,COPYING,COPYING-ADOBE,ChangeLog,NEWS,README,TODO}
|
||||
%{_kde4_applicationsdir}/*.desktop
|
||||
%exclude %{_kde4_applicationsdir}/digikam.desktop
|
||||
%exclude %{_kde4_applicationsdir}/showfoto.desktop
|
||||
%exclude %{_kde4_applicationsdir}/scangui.desktop
|
||||
%{_kde4_appsdir}/kipiplugin_*
|
||||
%{_kde4_appsdir}/photolayoutseditor
|
||||
%{_kde4_bindir}/dngconverter
|
||||
%{_kde4_bindir}/dnginfo
|
||||
%{_kde4_bindir}/expoblending
|
||||
%{_kde4_bindir}/panoramagui
|
||||
%{_kde4_bindir}/photolayoutseditor
|
||||
%{_kde4_bindir}/multithread
|
||||
%{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc
|
||||
%{_kde4_iconsdir}/hicolor/*/actions/*.*
|
||||
%exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/dngconverter.*
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.*
|
||||
%{_kde4_iconsdir}/oxygen/*/apps/dngconverter.*
|
||||
%{_kde4_iconsdir}/oxygen/*/apps/rawconverter.*
|
||||
%{_kde4_libdir}/libkipiplugins.so.*
|
||||
%{_kde4_modulesdir}/kipiplugin_*.so
|
||||
%exclude %{_kde4_modulesdir}/kipiplugin_acquireimages.so
|
||||
%exclude %{_kde4_modulesdir}/kipiplugin_gpssync.so
|
||||
%{_kde4_servicesdir}/kipiplugin_*.desktop
|
||||
%exclude %{_kde4_servicesdir}/kipiplugin_acquireimages.desktop
|
||||
%exclude %{_kde4_servicesdir}/kipiplugin_gpssync.desktop
|
||||
%{_kde4_libdir}/libkipiplugins.so.*
|
||||
%{_kde4_appsdir}/photolayoutseditor
|
||||
%{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc
|
||||
%{_kde4_servicetypesdir}/photolayoutseditorborderplugin.desktop
|
||||
%{_kde4_servicetypesdir}/photolayoutseditoreffectplugin.desktop
|
||||
%dir %{_kde4_sharedir}/templates
|
||||
%{_kde4_sharedir}/templates/kipiplugins_photolayoutseditor/
|
||||
|
||||
%files -n kipi-plugins-lang -f kipiplugin.lang
|
||||
%defattr(-,root,root,-)
|
||||
@ -451,30 +422,20 @@ done
|
||||
|
||||
%files -n libkgeomap-devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc extra/libkgeomap/AUTHORS
|
||||
%doc extra/libkgeomap/README
|
||||
%{_kde4_bindir}/libkgeomap_demo
|
||||
%doc extra/libkgeomap/{AUTHORS,README}
|
||||
%{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake
|
||||
%{_includedir}/libkgeomap/
|
||||
%{_kde4_includedir}/libkgeomap/
|
||||
%{_kde4_libdir}/pkgconfig/libkgeomap.pc
|
||||
%{_kde4_libdir}/libkgeomap.so
|
||||
|
||||
%files -n libkgeomap-lang -f libkgeomap.lang
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
%post -n libkgeomap1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libkgeomap1 -p /sbin/ldconfig
|
||||
|
||||
%files -n libkgeomap1
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_appsdir}/libkgeomap/
|
||||
%{_kde4_libdir}/libkgeomap.so.1*
|
||||
|
||||
%post -n libkface1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libkface1 -p /sbin/ldconfig
|
||||
|
||||
%files -n libkface1
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_appsdir}/libkface
|
||||
@ -484,35 +445,31 @@ done
|
||||
%defattr(-,root,root,-)
|
||||
%doc extra/libkface/{AUTHORS,COPYING,README}
|
||||
%{_kde4_libdir}/libkface.so
|
||||
%{_includedir}/libkface/
|
||||
%{_kde4_includedir}/libkface/
|
||||
%{_kde4_libdir}/pkgconfig/libkface.pc
|
||||
%{_kde4_appsdir}/cmake/modules/FindKface.cmake
|
||||
|
||||
%post -n libmediawiki1 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libmediawiki1 -p /sbin/ldconfig
|
||||
|
||||
%files -n libmediawiki1
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libmediawiki.so.1*
|
||||
%{_kde4_libdir}/libmediawiki.so.1*
|
||||
|
||||
%files -n libmediawiki-devel
|
||||
%defattr(-,root,root,-)
|
||||
%doc extra/libmediawiki/{AUTHORS,COPYING,README}
|
||||
%{_includedir}/libmediawiki/
|
||||
%{_libdir}/libmediawiki.so
|
||||
%{_libdir}/pkgconfig/libmediawiki.pc
|
||||
%{_kde4_includedir}/libmediawiki/
|
||||
%{_kde4_libdir}/libmediawiki.so
|
||||
%{_kde4_libdir}/pkgconfig/libmediawiki.pc
|
||||
%{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake
|
||||
|
||||
%if 0%{?kde_updatedapps}
|
||||
%if %suse_version < 1210
|
||||
%if 0%{?suse_version} < 1210
|
||||
%package -n libkdcraw20
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: Shared library interface around dcraw
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
%requires_ge libqt4-x11
|
||||
%requires_ge libqt4-x11
|
||||
|
||||
%description -n libkdcraw20
|
||||
Libkdcraw is a C++ interface around dcraw binary program used to decode
|
||||
@ -524,7 +481,7 @@ programs.
|
||||
|
||||
%files -n libkdcraw20
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libkdcraw.so.*
|
||||
%{_kde4_libdir}/libkdcraw.so.*
|
||||
%{_kde4_appsdir}/libkdcraw/
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.png
|
||||
|
||||
@ -533,12 +490,12 @@ programs.
|
||||
%postun -n libkdcraw20 -p /sbin/ldconfig
|
||||
|
||||
%package -n libkdcraw-devel
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: Shared library interface around dcraw
|
||||
License: LGPL-2.1+
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Requires: libkdcraw20 = %version
|
||||
Requires: libkdcraw20 = %{version}
|
||||
|
||||
%description -n libkdcraw-devel
|
||||
Libkdcraw is a C++ interface around dcraw binary program used to decode
|
||||
@ -550,26 +507,26 @@ programs.
|
||||
|
||||
%files -n libkdcraw-devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libkdcraw.so
|
||||
%{_includedir}/libkdcraw/
|
||||
%{_kde4_libdir}/libkdcraw.so
|
||||
%{_kde4_includedir}/libkdcraw/
|
||||
%{_kde4_libdir}/pkgconfig/libkdcraw.pc
|
||||
|
||||
%package -n libkipi8
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: KDE Image Plug-In Interface
|
||||
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
%requires_ge libqt4-x11
|
||||
%requires_ge libqt4-x11
|
||||
|
||||
%description -n libkipi8
|
||||
This package provides a generic KDE image plug-in interface used by
|
||||
some KDE image applications. Plug-ins for this interface are in the
|
||||
kipi-plugins package.
|
||||
|
||||
%files -n libkipi8
|
||||
%files -n libkipi8
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libkipi.so.*
|
||||
%{_kde4_libdir}/libkipi.so.*
|
||||
%{_kde4_appsdir}/kipi/
|
||||
%{_kde4_iconsdir}/hicolor/*/apps/kipi.png
|
||||
%{_kde4_servicetypesdir}/kipiplugin.desktop
|
||||
@ -579,12 +536,12 @@ kipi-plugins package.
|
||||
%postun -n libkipi8 -p /sbin/ldconfig
|
||||
|
||||
%package -n libkipi-devel
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: KDE Image Plugin Interface
|
||||
License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ ; MIT
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Requires: libkipi8 = %version
|
||||
Requires: libkipi8 = %{version}
|
||||
|
||||
%description -n libkipi-devel
|
||||
This package provides a generic KDE Image Plug-in Interface used by
|
||||
@ -593,34 +550,34 @@ kipi-plugins package.
|
||||
|
||||
%files -n libkipi-devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libkipi.so
|
||||
%{_includedir}/libkipi/
|
||||
%{_kde4_libdir}/libkipi.so
|
||||
%{_kde4_includedir}/libkipi/
|
||||
%{_kde4_libdir}/pkgconfig/libkipi.pc
|
||||
|
||||
%package -n libkexiv2-10
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: Library to manipulate picture meta data
|
||||
License: GPL-2.0+
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
|
||||
%description -n libkexiv2-10
|
||||
Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures
|
||||
metadata.
|
||||
|
||||
%files -n libkexiv2-10
|
||||
%files -n libkexiv2-10
|
||||
%defattr(-,root,root)
|
||||
%{_kde4_appsdir}/libkexiv2/
|
||||
%{_libdir}/libkexiv2.so.*
|
||||
%{_kde4_libdir}/libkexiv2.so.*
|
||||
|
||||
%package -n libkexiv2-devel
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: Library to manipulate picture meta data
|
||||
License: GPL-2.0+
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Requires: libkexiv2-10 = %version
|
||||
%requires_ge libqt4-x11
|
||||
Requires: libkexiv2-10 = %{version}
|
||||
%requires_ge libqt4-x11
|
||||
|
||||
%description -n libkexiv2-devel
|
||||
Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures
|
||||
@ -628,40 +585,40 @@ metadata.
|
||||
|
||||
%files -n libkexiv2-devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libkexiv2.so
|
||||
%{_includedir}/libkexiv2/
|
||||
%_kde4_libdir/pkgconfig/libkexiv2.pc
|
||||
%{_kde4_libdir}/libkexiv2.so
|
||||
%{_kde4_includedir}/libkexiv2/
|
||||
%{_kde4_libdir}/pkgconfig/libkexiv2.pc
|
||||
|
||||
%post -n libkexiv2-10 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libkexiv2-10 -p /sbin/ldconfig
|
||||
|
||||
%package -n libksane0
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: KDE scan library
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Graphics/Other
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
|
||||
%description -n libksane0
|
||||
This package contains a library to add scan support to KDE
|
||||
applications.
|
||||
|
||||
|
||||
%post -n libksane0 -p /sbin/ldconfig
|
||||
|
||||
%postun -n libksane0 -p /sbin/ldconfig
|
||||
|
||||
%files -n libksane0
|
||||
%files -n libksane0
|
||||
%defattr(-,root,root)
|
||||
%_kde4_libdir/libksane.so.*
|
||||
|
||||
%package -n libksane-devel
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Summary: KDE scan library - Development Files
|
||||
License: GPL-2.0+
|
||||
Group: Development/Libraries/KDE
|
||||
Version: 4.7.50
|
||||
Release: 0
|
||||
Requires: libksane0 = %version
|
||||
Requires: libksane0 = %{version}
|
||||
%if 0%{?suse_version} > 1130
|
||||
Requires: sane-backends-devel
|
||||
%else
|
||||
@ -672,13 +629,12 @@ Requires: sane-backends
|
||||
This package contains a library to add scan support to KDE
|
||||
applications.
|
||||
|
||||
|
||||
%files -n libksane-devel
|
||||
%defattr(-,root,root)
|
||||
%{_includedir}/libksane/
|
||||
%_kde4_libdir/pkgconfig/libksane.pc
|
||||
%_kde4_libdir/libksane.so
|
||||
%_kde4_libdir/cmake/KSane/
|
||||
%{_kde4_includedir}/libksane/
|
||||
%{_kde4_libdir}/pkgconfig/libksane.pc
|
||||
%{_kde4_libdir}/libksane.so
|
||||
%{_kde4_libdir}/cmake/KSane/
|
||||
|
||||
%endif
|
||||
%endif
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
--- ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2011-10-04 09:34:29.576552045 +0200
|
||||
+++ ./extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2011-10-04 09:35:16.838301132 +0200
|
||||
@@ -57,7 +57,6 @@
|
||||
Name[x-test]=xxPanoramaxx
|
||||
--- extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig 2012-06-04 23:38:54.000000000 +0300
|
||||
+++ extra/kipi-plugins/panorama/plugin/panoramagui.desktop 2012-06-07 22:02:57.473132455 +0300
|
||||
@@ -77,7 +77,6 @@
|
||||
Name[zh_CN]=Panorama
|
||||
Name[zh_TW]=Panorama
|
||||
StartupNotify=true
|
||||
-Icon=layer-visible-on
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
diff -urB digikam-2.5.0/core/utilities/setup/setupplugins.cpp new/core/utilities/setup/setupplugins.cpp
|
||||
--- digikam-2.5.0/core/utilities/setup/setupplugins.cpp 2012-01-03 01:32:01.000000000 +0100
|
||||
+++ new/core/utilities/setup/setupplugins.cpp 2012-01-04 18:37:42.654350574 +0100
|
||||
@@ -6,8 +6,8 @@
|
||||
* Date : 2004-01-02
|
||||
* Description : setup Kipi plugins tab.
|
||||
*
|
||||
- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
|
||||
+ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
|
||||
+ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
|
||||
*
|
||||
* This program is free software; you can redistribute it
|
||||
* and/or modify it under the terms of the GNU General
|
||||
@@ -100,6 +100,11 @@
|
||||
|
||||
panel->setLayout(mainLayout);
|
||||
|
||||
+#if KIPI_VERSION < 0x010400
|
||||
+ d->checkAllBtn->setVisible(false);
|
||||
+ d->clearBtn->setVisible(false);
|
||||
+#endif
|
||||
+
|
||||
initPlugins();
|
||||
|
||||
// --------------------------------------------------------
|
||||
@@ -158,14 +163,18 @@
|
||||
void SetupPlugins::slotCheckAll()
|
||||
{
|
||||
QApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
+#if KIPI_VERSION >= 0x010400
|
||||
d->kipiConfig->slotCheckAll();
|
||||
+#endif
|
||||
QApplication::restoreOverrideCursor();
|
||||
}
|
||||
|
||||
void SetupPlugins::slotClear()
|
||||
{
|
||||
QApplication::setOverrideCursor(Qt::WaitCursor);
|
||||
+#if KIPI_VERSION >= 0x010400
|
||||
d->kipiConfig->slotClear();
|
||||
+#endif
|
||||
QApplication::restoreOverrideCursor();
|
||||
}
|
||||
} // namespace Digikam
|
||||
Loading…
Reference in New Issue
Block a user