pool/digikam
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=31

Browse Source
This commit is contained in:
OBS User unknown 2009-04-20 22:00:19 +00:00 committed by Git OBS Bridge
parent 589bf5e841
commit 271ec72486
13 changed files with 199 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt.diff Normal file
View File

@ -0,0 +1,19 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -2,6 +2,14 @@ PROJECT(digikam)
OPTION(ENABLE_GPHOTO2 "Build digiKam with libgphoto2 support (default=ON)" ON)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+# search packages used by KDE
+find_package(KDE4 REQUIRED)
+include (KDE4Defaults)
+include (MacroLibrary)
+include(MacroOptionalAddSubdirectory)
+
# ==================================================================================================
# Information to update before to release this package.

3
digikam-0.10.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69dbeeba8fca87087cf845ca4581dd9197426bb1d5140d967c7b29c449523cbc
size 11194398

3
digikam-0.9.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a44790732ffd32a538473160c97fefeab92d506bd9d76b293d442319e18ceda3
size 11343390

11
digikam-gphoto-disk.patch
View File

@ -1,11 +0,0 @@
--- digikam-0.7.3/digikam/utilities/setup/gpiface.cpp.xx 2005-08-16 17:50:05.000000000 +0200
+++ digikam-0.7.3/digikam/utilities/setup/gpiface.cpp 2005-08-16 17:50:12.000000000 +0200
@@ -166,6 +166,8 @@
plist.append("serial");
if (abilities.port & GP_PORT_USB)
plist.append("usb");
+ if (abilities.port & GP_PORT_DISK)
+ plist.append("disk");
gp_context_unref( context );

105
digikam-load.diff
View File

@ -1,105 +0,0 @@
Index: digikam/digikamapp.cpp
===================================================================
--- digikam/digikam/digikamapp.cpp (Revision 502580)
+++ digikam/digikam/digikamapp.cpp (Arbeitskopie)
@@ -877,6 +877,7 @@
close();
}
+#include <dcopref.h>
QString DigikamApp::convertToLocalUrl( const QString& folder )
{
@@ -885,7 +886,36 @@
if( !url.isLocalFile() )
{
#if KDE_IS_VERSION(3,4,91)
- return KIO::NetAccess::mostLocalURL( url, 0 ).path();
+ KURL mlu = KIO::NetAccess::mostLocalURL( url, 0 );
+ if (mlu.isLocalFile())
+ return mlu.path();
+
+ kdWarning() << folder << " mlu " << mlu << endl;
+
+ QString path = mlu.path();
+
+ if ( mlu.protocol() == "system" && path.startsWith("/media") )
+ path = path.mid(7);
+ else if (mlu.protocol() == "media")
+ path = path.mid(1);
+ else
+ return folder; // nothing to see - go on
+
+ kdWarning() << "parsed import path is: " << path << endl;
+ DCOPRef ref("kded", "mediamanager");
+ DCOPReply reply = ref.call("properties", path);
+ if (reply.isValid()) {
+ QStringList slreply;
+ reply.get(slreply);
+ if ((slreply.count()>=9) && !slreply[9].isEmpty())
+ return slreply[9];
+ else
+ return slreply[6];
+ } else {
+ kdWarning() << "dcop call failed\n";
+ }
+
+ return path;
#else
#ifndef UDS_LOCAL_PATH
#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING)
Index: utilities/cameragui/cameracontroller.cpp
===================================================================
--- digikam/utilities/cameragui/cameracontroller.cpp (Revision 502580)
+++ digikam/utilities/cameragui/cameracontroller.cpp (Arbeitskopie)
@@ -29,6 +29,7 @@
#include <qdatastream.h>
#include <qfile.h>
#include <qtimer.h>
+#include <qregexp.h>
#include <klocale.h>
#include <kurl.h>
@@ -486,12 +487,37 @@
d->overwriteAll = false;
d->skipAll = false;
d->downloadTotal = 0;
+ d->camera = 0;
- if (model.lower() == "directory browse")
- d->camera = new UMSCamera(model, port, path);
- else
- d->camera = new GPCamera(model, port, path);
-
+ if (path.startsWith("camera:/"))
+ {
+ KURL url(path);
+ kdDebug() << "path " << path << " " << url << " " << url.host() << endl;
+ QString xport = url.host();
+ if (xport.startsWith("usb:"))
+ {
+ kdDebug() << "xport " << xport << endl;
+ QRegExp x = QRegExp("(usb:[0-9,]*)");
+
+ if (x.search(xport) != -1) {
+ QString usbport = x.cap(1);
+ kdDebug() << "USB " << xport << " " << usbport << endl;
+ // if ((xport == usbport) || ((count == 1) && (xport == "usb:"))) {
+ // model = xmodel;
+ d->camera = new GPCamera(url.user(), "usb:", "/");
+ // }
+ }
+ }
+ }
+
+ if ( !d->camera)
+ {
+ if ( model.lower() == "directory browse" )
+ d->camera = new UMSCamera(model, port, path);
+ else
+ d->camera = new GPCamera(model, port, path);
+ }
+
d->thread = new CameraThread(this);
d->timer = new QTimer();

40
digikam-print.diff
View File

@ -1,40 +0,0 @@
Index: digikam/utilities/imageeditor/tools/imageprint.cpp
===================================================================
--- digikam/utilities/imageeditor/tools/imageprint.cpp.orig
+++ digikam/utilities/imageeditor/tools/imageprint.cpp
@@ -156,18 +156,9 @@ bool ImagePrint::printImageWithQt()
// when the orientation is decided.
w = metrics.width();
h = metrics.height();
- int filenameOffset = 0;
QSize size = image2Print.size();
- bool printFilename = m_printer.option( "app-imageeditor-printFilename" ) != f;
- if ( printFilename )
- {
- // filename goes into one line!
- filenameOffset = fm.lineSpacing() + 14;
- h -= filenameOffset;
- }
-
if ( m_printer.option( "app-imageeditor-scaleToFit" ) != f )
{
if ( m_printer.option( "app-imageeditor-auto-rotate" ) == t )
@@ -248,6 +239,7 @@ bool ImagePrint::printImageWithQt()
// Perform the actual drawing.
p.drawImage( QRect( x, y, size.width(), size.height()), image2Print );
+ bool printFilename = m_printer.option( "app-imageeditor-printFilename" ) != f;
if ( printFilename )
{
QString fname = minimizeString( d->filename, fm, w );
@@ -256,6 +248,8 @@ bool ImagePrint::printImageWithQt()
{
int fw = fm.width( fname );
int x = (w - fw)/2;
+ // filename goes into one line!
+ int filenameOffset = fm.lineSpacing() + 14;
int y = metrics.height() - filenameOffset/2;
p.drawText( x, y, fname );
}

26
digikam.changes
View File

@ -1,8 +1,34 @@
-------------------------------------------------------------------
Mon Apr 20 17:56:08 CEST 2009 - dmueller@suse.de
- rename kde4-digikam to digikam
-------------------------------------------------------------------
Sat Apr 18 00:38:57 CEST 2009 - beineri@opensuse.org
- create -lang package
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 4 17:32:00 CEST 2009 - coolo@suse.de Sat Apr 4 17:32:00 CEST 2009 - coolo@suse.de
- refresh patches to fix build - refresh patches to fix build
-------------------------------------------------------------------
Fri Apr 3 20:38:57 CEST 2009 - coolo@suse.de
- build without hard huge Marble widget dependency unless it can
be packaged optionally
- mark showfoto.desktop unimportant
- refresh patch to build in factory
-------------------------------------------------------------------
Tue Mar 17 13:56:29 CET 2009 - wstephenson@suse.de
- update to 0.10.0
* General : Internal CImg library updated to 1.3.0.
* General : New "DarkRoom" colors theme.
* many bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 17 12:46:06 CET 2009 - wstephenson@suse.de Tue Mar 17 12:46:06 CET 2009 - wstephenson@suse.de

336
digikam.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package digikam (Version 0.9.5) # spec file for package digikam (Version 0.10.0)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -19,49 +19,30 @@
Name: digikam Name: digikam
BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate BuildRequires: graphviz-devel libgphoto2-devel libkdepimlibs4-devel libqimageblitz-devel sqlite-devel
%if %suse_version > 1100 # build without hard huge Marble widget dependency unless it can be packaged optionally
BuildRequires: libkdcraw3-devel libkexiv2-3-devel #BuildRequires: kde4-marble-devel
%else BuildRequires: libkdcraw-devel libkexiv2-devel libkipi-devel
BuildRequires: libkdcraw-devel libkexiv2-devel
%endif
BuildRequires: libkipi0-devel sqlite-devel sqlite2-devel
%if %suse_version > 1020 %if %suse_version > 1020
BuildRequires: fdupes libjasper-devel BuildRequires: imlib-devel libjasper-devel
%else %else
BuildRequires: libjasper BuildRequires: libjasper
%endif %endif
%if %suse_version > 1010 Url: http://www.digikam.org/
BuildRequires: libgphoto2-devel
%else
BuildRequires: libgphoto2
%endif
%if %suse_version < 1010
BuildRequires: libtiff-devel
%endif
License: GPL v2 or later License: GPL v2 or later
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager Summary: A KDE Photo Manager
Version: 0.9.5 Version: 0.10.0
Release: 2 Release: 1
%define rversion 0.9.5 %define tar_version 0.10.0
Url: http://www.digikam.org/ Source0: %name-%{tar_version}.tar.bz2
Patch: CMakeLists.txt.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{rversion}.tar.bz2 %kde4_runtime_requires
Source1: service.desktop Recommends: libqt4-sql-sqlite
Source2: digikamrc Requires: kde4-kipi-plugins
Source3: superimposetemplates-0.1.1.tar.bz2 Requires: oxygen-icon-theme
Patch1: external-sqlite.diff
Patch4: digikam-gphoto-disk.patch
Patch5: digikam-load.diff
Patch7: digikam-print.diff
Patch9: renamepreview.patch
Requires: imlib2-loaders
%if %suse_version > 1020
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
Provides: digikamimageplugins-lang = 0.9.1
Obsoletes: digikamimageplugins-lang <= 0.9.1
%endif
%description %description
digiKam is a simple digital photo management application for KDE, which digiKam is a simple digital photo management application for KDE, which
@ -77,33 +58,15 @@ Authors:
-------- --------
Renchi Raju <renchi@green.tam.uiuc.edu> Renchi Raju <renchi@green.tam.uiuc.edu>
%package -n libdigikam-devel %package devel
License: GPL v2 or later License: GPL v2 or later
Group: Hardware/Camera Group: Productivity/Graphics/Viewers
Summary: A KDE Photo Manager Summary: A KDE Photo Manager Build Environment
Requires: kdelibs3-devel Requires: %name = %{version}
%if %suse_version > 1100
Requires: libkdcraw3-devel libkexiv2-3-devel
%else
Requires: libkdcraw-devel libkexiv2-devel
%endif
%if %suse_version > 1020
Requires: libjasper-devel libgphoto2-devel
%else
%if %suse_version > 1010
Requires: libgphoto2
%else
Requires: libjasper
%endif
%endif
%description -n libdigikam-devel %description devel
digiKam is a simple digital photo management application for KDE, which digiKam is a simple digital photo management application for KDE. This
makes importing and organizing digital photos easy. The photos can be package contains its build environment.
organized in albums, which can be sorted chronologically, by directory
layout, or by custom collections. An easy-to-use interface is provided
that enables you to connect to your camera and preview, download, and
delete your images.
@ -111,96 +74,28 @@ Authors:
-------- --------
Renchi Raju <renchi@green.tam.uiuc.edu> Renchi Raju <renchi@green.tam.uiuc.edu>
%package -n digikamimageplugins
License: GPL v2 or later
Group: Productivity/Graphics/Viewers
Summary: Image Manipulation Plug-Ins
Recommends: digikamimageplugins-superimpose
%description -n digikamimageplugins
Various plug-ins for the image editor in Digikam:
* AdjustLevels : A plug-in adjusting the image histogram levels
manually.
* SolarizeImage : A plug-in for solarizing an image.
* Despeckle : A noise reduction filter.
* OilPaint : An oil painting effect filter.
* Emboss : An embossed image effect filter.
* Charcoal : A charcoal drawing image effect filter.
* Unsharp : An unsharped mask image filter.
* RainDrop : Adding raindrops randomly in an image.
* FilmGrain : Adding film grain in an image.
Authors:
--------
Gilles Caulier <caulier dot gilles at free.fr>
Renchi Raju <renchi at pooh.tam.uiuc.edu>
%package -n digikamimageplugins-superimpose
License: GPL v2 or later
Group: Productivity/Graphics/Viewers
Summary: Templates for Digikam's Superimpose Plugin
%description -n digikamimageplugins-superimpose
This package contains templates for the Superimpose plugin of Digikam.
Authors:
--------
Gilles Caulier <caulier dot gilles at free.fr>
Renchi Raju <renchi at pooh.tam.uiuc.edu>
%if %suse_version > 1020
%lang_package %lang_package
%endif
%prep %prep
%setup -q -n %name-%rversion %setup -q -n %name-%{tar_version}
rm -rf digikam/sqlite %patch
%patch1
#%patch4 -p1
#%patch5 -p0
%patch7
%patch9
%build %build
. /etc/opt/kde3/common_options %cmake_kde4 -d build
update_admin --no-unsermake %make_jobs
export PKG_CONFIG_PATH=/opt/kde3/%_lib/pkgconfig
./configure $configkde --disable-final --without-included-sqlite3
make VERBOSE=1 %{?jobs:-j%jobs}
%install %install
. /etc/opt/kde3/common_options cd build
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %makeinstall
%suse_update_desktop_file digikam Graphics Photography # Move the icons back to /usr/share/icons/hicolor because digikam started installing only to datadir/icons, relying on the theme.
%suse_update_desktop_file showfoto Graphics Viewer # This is wrong - only oxygen provides a digikam icon
echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/digikam.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop for i in {16,22,32,48,64,128}; do mv $RPM_BUILD_ROOT/usr/share/kde4/apps/digikam/icons/oxygen/"$i"x"$i"/apps/showfoto.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/"$i"x"$i"/apps/;done
%suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop cd ..
# %suse_update_desktop_file digikam Graphics Photography
# install superimpose templates %suse_update_desktop_file -G "Photo Editor" showfoto Graphics 2DGraphic RasterGraphics
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/digikamimageplugins/superimpose/ %find_lang %name
tar xfj %SOURCE3 -C $RPM_BUILD_ROOT/opt/kde3/share/apps/digikamimageplugins/superimpose/ %kde_post_install
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/config/
install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/opt/kde3/share/config/
%if %suse_version > 1020
%fdupes -s $RPM_BUILD_ROOT
%endif
kde_post_install
%find_lang %name
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
@ -208,59 +103,128 @@ kde_post_install
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%if %suse_version > 1020 rm -rf filelists
%files devel
%defattr(-,root,root)
/usr/include/digikam
/usr/include/digikam_export.h
%_libdir/libdigikamcore.so
%_libdir/libdigikamdatabase.so
%files lang -f %name.lang %files lang -f %name.lang
%defattr(-,root,root) %defattr(-,root,root)
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%else /usr/bin/digikam
/usr/bin/digikamthemedesigner
%files -f %name.lang /usr/bin/digitaglinktree
%defattr(-,root,root) /usr/bin/showfoto
%endif %_kde4_modules/digikamimageplugin_adjustcurves.so
/opt/kde3/bin/* %_kde4_modules/digikamimageplugin_adjustlevels.so
/opt/kde3/%_lib/*.so.* %_kde4_modules/digikamimageplugin_blurfx.so
%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.la %_kde4_modules/digikamimageplugin_border.so
%exclude /opt/kde3/%_lib/kde3/digikamimageplugin*.so %_kde4_modules/digikamimageplugin_channelmixer.so
/opt/kde3/%_lib/kde3/* %_kde4_modules/digikamimageplugin_charcoal.so
/opt/kde3/share/appl*/*/*.desktop %_kde4_modules/digikamimageplugin_colorfx.so
%exclude /opt/kde3/share/apps/digikam/digikamimageplugin_* %_kde4_modules/digikamimageplugin_core.so
%exclude /opt/kde3/share/apps/digikamimageplugins %_kde4_modules/digikamimageplugin_distortionfx.so
/opt/kde3/share/apps/* %_kde4_modules/digikamimageplugin_emboss.so
/opt/kde3/share/icons/* %_kde4_modules/digikamimageplugin_filmgrain.so
%exclude /opt/kde3/share/services/digikamimageplugin_*.desktop %_kde4_modules/digikamimageplugin_freerotation.so
/opt/kde3/share/services/* %_kde4_modules/digikamimageplugin_hotpixels.so
/opt/kde3/share/servicetypes/digikamimageplugin.desktop %_kde4_modules/digikamimageplugin_infrared.so
%_kde4_modules/digikamimageplugin_inpainting.so
%_kde4_modules/digikamimageplugin_inserttext.so
%_kde4_modules/digikamimageplugin_lenscorrection.so
%_kde4_modules/digikamimageplugin_noisereduction.so
%_kde4_modules/digikamimageplugin_oilpaint.so
%_kde4_modules/digikamimageplugin_perspective.so
%_kde4_modules/digikamimageplugin_raindrop.so
%_kde4_modules/digikamimageplugin_restoration.so
%_kde4_modules/digikamimageplugin_sheartool.so
%_kde4_modules/digikamimageplugin_superimpose.so
%_kde4_modules/digikamimageplugin_texture.so
%_kde4_modules/digikamimageplugin_whitebalance.so
%_kde4_modules/kio_digikamalbums.so
%_kde4_modules/kio_digikamdates.so
%_kde4_modules/kio_digikamsearch.so
%_kde4_modules/kio_digikamtags.so
%_libdir/libdigikamcore.so.*
%_libdir/libdigikamdatabase.so.*
/usr/share/applications/kde4/digikam.desktop
/usr/share/applications/kde4/showfoto.desktop
/usr/share/icons/hicolor/128x128/apps/digikam.png
/usr/share/icons/hicolor/128x128/apps/showfoto.png
/usr/share/icons/hicolor/16x16/apps/digikam.png
/usr/share/icons/hicolor/16x16/apps/showfoto.png
/usr/share/icons/hicolor/22x22/apps/digikam.png
/usr/share/icons/hicolor/22x22/apps/showfoto.png
/usr/share/icons/hicolor/32x32/apps/digikam.png
/usr/share/icons/hicolor/32x32/apps/showfoto.png
/usr/share/icons/hicolor/48x48/apps/digikam.png
/usr/share/icons/hicolor/48x48/apps/showfoto.png
/usr/share/icons/hicolor/64x64/apps/digikam.png
/usr/share/icons/hicolor/64x64/apps/showfoto.png
%_kde_share_dir/apps/digikam
%_kde_share_dir/apps/showfoto
%_kde_share_dir/services/digikamalbums.protocol
%_kde_share_dir/services/digikamdates.protocol
%_kde_share_dir/services/digikamimageplugin_adjustcurves.desktop
%_kde_share_dir/services/digikamimageplugin_adjustlevels.desktop
%_kde_share_dir/services/digikamimageplugin_blurfx.desktop
%_kde_share_dir/services/digikamimageplugin_border.desktop
%_kde_share_dir/services/digikamimageplugin_channelmixer.desktop
%_kde_share_dir/services/digikamimageplugin_charcoal.desktop
%_kde_share_dir/services/digikamimageplugin_colorfx.desktop
%_kde_share_dir/services/digikamimageplugin_core.desktop
%_kde_share_dir/services/digikamimageplugin_distortionfx.desktop
%_kde_share_dir/services/digikamimageplugin_emboss.desktop
%_kde_share_dir/services/digikamimageplugin_filmgrain.desktop
%_kde_share_dir/services/digikamimageplugin_freerotation.desktop
%_kde_share_dir/services/digikamimageplugin_hotpixels.desktop
%_kde_share_dir/services/digikamimageplugin_infrared.desktop
%_kde_share_dir/services/digikamimageplugin_inpainting.desktop
%_kde_share_dir/services/digikamimageplugin_inserttext.desktop
%_kde_share_dir/services/digikamimageplugin_lenscorrection.desktop
%_kde_share_dir/services/digikamimageplugin_noisereduction.desktop
%_kde_share_dir/services/digikamimageplugin_oilpaint.desktop
%_kde_share_dir/services/digikamimageplugin_perspective.desktop
%_kde_share_dir/services/digikamimageplugin_raindrop.desktop
%_kde_share_dir/services/digikamimageplugin_restoration.desktop
%_kde_share_dir/services/digikamimageplugin_sheartool.desktop
%_kde_share_dir/services/digikamimageplugin_superimpose.desktop
%_kde_share_dir/services/digikamimageplugin_texture.desktop
%_kde_share_dir/services/digikamimageplugin_whitebalance.desktop
%_kde_share_dir/services/digikamsearch.protocol
%_kde_share_dir/services/digikamtags.protocol
%_kde_share_dir/servicetypes/digikamimageplugin.desktop
%_kde_share_dir/apps/showfoto/data/logo-showfoto.png
%_kde_share_dir/apps/showfoto/data/splash-showfoto.png
%_kde_share_dir/apps/showfoto/showfotoui.rc
/usr/share/man/man1/digitaglinktree.1.gz /usr/share/man/man1/digitaglinktree.1.gz
%dir /opt/kde3/share/doc/HTML/en/digikam-%rversion-apidocs %dir /usr/share/kde4/apps/solid
%dir /usr/share/kde4/apps/solid/actions
%files -n libdigikam-devel /usr/share/kde4/apps/solid/actions/digikam-opencamera.desktop
%defattr(-,root,root)
/opt/kde3/include/digikam
/opt/kde3/include/digikam_export.h
/opt/kde3/%_lib/libdigikam.so
/opt/kde3/%_lib/libdigikam.la
%files -n digikamimageplugins
%defattr(-,root,root)
/opt/kde3/%_lib/kde3/digikamimageplugin*.la
/opt/kde3/%_lib/kde3/digikamimageplugin*.so
%exclude /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikam/digikamimageplugin_*
/opt/kde3/share/config/digikamrc
/opt/kde3/share/services/digikamimageplugin_*.desktop
%files -n digikamimageplugins-superimpose
%defattr(-,root,root)
%dir /opt/kde3/share/apps/digikamimageplugins
/opt/kde3/share/apps/digikamimageplugins/superimpose
%changelog %changelog
* Mon Apr 20 2009 dmueller@suse.de
- rename kde4-digikam to digikam
* Sat Apr 18 2009 beineri@opensuse.org
- create -lang package
* Sat Apr 04 2009 coolo@suse.de * Sat Apr 04 2009 coolo@suse.de
- refresh patches to fix build - refresh patches to fix build
* Fri Apr 03 2009 coolo@suse.de
- build without hard huge Marble widget dependency unless it can
be packaged optionally
- mark showfoto.desktop unimportant
- refresh patch to build in factory
* Tue Mar 17 2009 wstephenson@suse.de
- update to 0.10.0
* General : Internal CImg library updated to 1.3.0.
* General : New "DarkRoom" colors theme.
* many bugfixes
* Tue Mar 17 2009 wstephenson@suse.de * Tue Mar 17 2009 wstephenson@suse.de
- Update to 0.9.5 - Update to 0.9.5
* TIFF/PNG/JPEG2000 metadata can be edited or added * TIFF/PNG/JPEG2000 metadata can be edited or added

4
digikamrc
View File

@ -1,4 +0,0 @@
[Template Superimpose Tool Settings]
Templates Root URL=/opt/kde3/share/apps/digikamimageplugins/superimpose/TEMPLATES/
Templates URL=/opt/kde3/share/apps/digikamimageplugins/superimpose/TEMPLATES/

34
external-sqlite.diff
View File

@ -1,34 +0,0 @@
Index: digikam/libs/Makefile.am
===================================================================
--- digikam/libs/Makefile.am.orig
+++ digikam/libs/Makefile.am
@@ -4,6 +4,6 @@ endif
COMPILE_FIRST = sqlite2 $(SQLITE3_SUBDIR)
-SUBDIRS = sqlite2 $(SQLITE3_SUBDIR) lprof histogram levels curves whitebalance dmetadata \
+SUBDIRS = lprof histogram levels curves whitebalance dmetadata \
dimg threadimageio themeengine widgets greycstoration \
thumbbar jpegutils imageproperties dialogs
Index: digikam/digikam/Makefile.am
===================================================================
--- digikam/digikam/Makefile.am.orig
+++ digikam/digikam/Makefile.am
@@ -5,7 +5,7 @@ if with_included_sqlite3
SQLITE3_INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite3
endif
-INCLUDES = -I$(top_srcdir)/digikam/libs/sqlite2 \
+INCLUDES = \
-I$(top_srcdir)/digikam/libs/histogram \
-I$(top_srcdir)/digikam/libs/levels \
-I$(top_srcdir)/digikam/libs/curves \
@@ -117,7 +117,7 @@ libdigikam_la_LIBADD = $(LIB_SQLITE3) \
$(LIBKIPI_LIBS) \
$(LIBKEXIV2_LIBS) \
$(LIB_KUTILS) \
- $(top_builddir)/digikam/libs/sqlite2/libsqlite2.la \
+ -lsqlite \
$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
$(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
$(top_builddir)/digikam/libs/widgets/libwidgets.la \

32
renamepreview.patch
View File

@ -1,32 +0,0 @@
Index: digikam/utilities/cameragui/cameracontroller.cpp
===================================================================
--- digikam/utilities/cameragui/cameracontroller.cpp.orig
+++ digikam/utilities/cameragui/cameracontroller.cpp
@@ -54,6 +54,7 @@ extern "C"
#include <kmessagebox.h>
#include <kio/renamedlg.h>
#include <kstandarddirs.h>
+#include <ktempfile.h>
// Local includes.
@@ -938,13 +939,18 @@ void CameraController::customEvent(QCust
break;
}
+ KTempFile tmp;
+ tmp.close();
+ d->camera->downloadItem(folder, file, tmp.name());
+
KIO::RenameDlg dlg(d->parent, i18n("Rename File"),
- folder + QString("/") + file, dest,
+ tmp.name(), dest,
KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP));
int result = dlg.exec();
dest = dlg.newDestURL().path();
info = QFileInfo(dest);
+ tmp.unlink();
switch (result)
{

8
service.desktop
View File

@ -1,8 +0,0 @@
[Desktop Action OpenDigikam]
Exec=digikam --download-from %u
Icon=digikam
Name=Open in Digikam
[Desktop Entry]
Actions=OpenDigikam;
ServiceTypes=media/gphoto2camera,media/camera_mounted,media/camera_unmounted

3
superimposetemplates-0.1.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0f5a78efd445fbe4e7fe976536e82565c65c814b5f78c975bd02b1cbf6e1ae8
size 11556719