This commit is contained in:
commit
c7f273b846
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
29
autoconf.diff
Normal file
29
autoconf.diff
Normal file
@ -0,0 +1,29 @@
|
||||
--- digikam/libs/dcraw/Makefile.am
|
||||
+++ digikam/libs/dcraw/Makefile.am
|
||||
@@ -25,14 +25,6 @@
|
||||
|
||||
bin_PROGRAMS = digikamdcraw
|
||||
|
||||
-# This line is require to prevent broken compilation with -std=iso9899:1990 gcc option.
|
||||
-# In fact, dcraw.c use lcms.h witch use the "inline" keyword witch do not exist in pure C
|
||||
-# implementation. The -Dinline option please compiler to see inline with this option.
|
||||
-# Note : using -std-c99 instead -std=iso9899:1990 is not possible because some compiler
|
||||
-# do not support it.
|
||||
-# Thanks to Andras Mantia for this tip.
|
||||
-digikamdcraw_CFLAGS = -Dinline= -w
|
||||
-
|
||||
digikamdcraw_SOURCES = dcraw.c
|
||||
|
||||
digikamdcraw_LDFLAGS = $(all_libraries) $(LIBJPEG) $(LCMS_LIBS)
|
||||
--- digikam/libs/dcraw/dcraw.c
|
||||
+++ digikam/libs/dcraw/dcraw.c
|
||||
@@ -46,7 +46,9 @@
|
||||
#include <jpeglib.h>
|
||||
#endif
|
||||
#ifndef NO_LCMS
|
||||
+#define inline __inline__
|
||||
#include <lcms.h>
|
||||
+#undef inline
|
||||
#endif
|
||||
|
||||
#ifdef __CYGWIN__
|
3
digikam-0.9.0.tar.bz2
Normal file
3
digikam-0.9.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8fff9b2277c58ca027100fa4af05dea8b955c8a98b79b6befa90b47ac34c77d2
|
||||
size 5692707
|
11
digikam-gphoto-disk.patch
Normal file
11
digikam-gphoto-disk.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- 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
Normal file
105
digikam-load.diff
Normal file
@ -0,0 +1,105 @@
|
||||
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();
|
||||
|
38
digikam-print.diff
Normal file
38
digikam-print.diff
Normal file
@ -0,0 +1,38 @@
|
||||
--- digikam/utilities/imageeditor/tools/imageprint.cpp
|
||||
+++ digikam/utilities/imageeditor/tools/imageprint.cpp
|
||||
@@ -149,18 +149,9 @@
|
||||
|
||||
int w, h; // will be set to the width and height of the printer
|
||||
// when the orientation is decided.
|
||||
- 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 )
|
||||
@@ -236,6 +227,7 @@
|
||||
// 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 );
|
||||
@@ -244,6 +236,8 @@
|
||||
{
|
||||
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 );
|
||||
}
|
428
digikam.changes
Normal file
428
digikam.changes
Normal file
@ -0,0 +1,428 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 18 22:16:20 CET 2006 - stbinner@suse.de
|
||||
|
||||
- update to final 0.9 release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 9 16:50:24 CET 2006 - dmueller@suse.de
|
||||
|
||||
- update to 0.9.0 rc2:
|
||||
* uses libexiv2 now for EXIF parsing
|
||||
* many more features and over 500 bugfixes see:
|
||||
http://www.digikam.org/?q=about/features09x
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 4 19:03:41 CET 2006 - stbinner@suse.de
|
||||
|
||||
- fix build for < 10.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 3 17:38:14 CET 2006 - llunak@suse.cz
|
||||
|
||||
- fix preview in rename dialog when downloading
|
||||
from camera (#188108)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 2 13:50:25 CET 2006 - stbinner@suse.de
|
||||
|
||||
- fix crash when right-clicking in empty main window (#216511)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 21 19:24:28 CEST 2006 - meissner@suse.de
|
||||
|
||||
- buildrequires libgphoto2-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 13 10:09:25 CEST 2006 - stbinner@suse.de
|
||||
|
||||
- fix build for 10.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 18 22:27:14 CEST 2006 - dmueller@suse.de
|
||||
|
||||
- update to 0.8.2.
|
||||
* add missing Rating info in album item file tip and image
|
||||
properties dialog
|
||||
* display JPEG that use CMYK color space
|
||||
* Rating image using keyboard shortcuts CTRL+0/1/2/3/4/5 from
|
||||
main interface
|
||||
* Buttons to set the album date to oldest, yougest of the
|
||||
images in the album
|
||||
-------------------------------------------------------------------
|
||||
Mon May 22 08:58:34 CEST 2006 - stbinner@suse.de
|
||||
|
||||
- no x-raw.desktop in STABLE, is now contained in kdelibs 3.5.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 22 09:41:02 CET 2006 - stbinner@suse.de
|
||||
|
||||
- no x-raw.desktop in PLUS, is now contained in kdelibs 3.5.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 28 11:48:14 CET 2006 - coolo@suse.de
|
||||
|
||||
- fix the print of filename (as indicated by compiler warning and
|
||||
#153544)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 13 13:20:51 CET 2006 - stbinner@suse.de
|
||||
|
||||
- add upstream patch to fix problems on ppc (KDE #121646)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 6 16:13:10 CET 2006 - stbinner@suse.de
|
||||
|
||||
- fix build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 6 14:44:17 CET 2006 - coolo@suse.de
|
||||
|
||||
- grap fix from KDE SVN to fix severe problem with search for images
|
||||
(KDE bugs 120479 and 120775)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 31 18:58:42 CET 2006 - coolo@suse.de
|
||||
|
||||
- fix gphoto2 cameras
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 26 09:48:03 CET 2006 - meissner@suse.de
|
||||
|
||||
- Upgraded to 0.8.1.
|
||||
- image rating
|
||||
- 8 bit raw support added
|
||||
- copy & paste support (between albums or between digikam + konqi)
|
||||
- new dcop interface to control opening the camera dialog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 25 21:32:52 CET 2006 - mls@suse.de
|
||||
|
||||
- converted neededforbuild to BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 23 15:14:33 CET 2006 - coolo@suse.de
|
||||
|
||||
- give digikam as option in the media popup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 21 00:37:30 CET 2005 - dmueller@suse.de
|
||||
|
||||
- fix file list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 09:48:37 CET 2005 - stbinner@suse.de
|
||||
|
||||
- update to version 0.8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 19 08:15:20 CET 2005 - stbinner@suse.de
|
||||
|
||||
- keep old xdg menu category for build on older distribution
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 17 17:51:27 CET 2005 - stbinner@suse.de
|
||||
|
||||
- fix build on 9.1 and 9.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 29 10:15:29 CEST 2005 - stbinner@suse.de
|
||||
|
||||
- fix "Photograph" to correct "Photography" xdg menu category
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 19 10:41:15 CEST 2005 - adrian@suse.de
|
||||
|
||||
- update to version 0.7.4
|
||||
* translation updates
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 19 08:14:08 CEST 2005 - coolo@suse.de
|
||||
|
||||
- fix file list for icons
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 17 12:54:32 CEST 2005 - meissner@suse.de
|
||||
|
||||
- do not overwrite ports with "usb:" everytime.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jul 23 04:56:08 CEST 2005 - dmueller@suse.de
|
||||
|
||||
- fix filelist
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 21 03:45:02 CEST 2005 - dmueller@suse.de
|
||||
|
||||
- 0.7.3 final update
|
||||
- removed -fvisibility=hidden support as it exposes a compiler bug
|
||||
on x86_64 and ppc64
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 23 17:22:53 CEST 2005 - adrian@suse.de
|
||||
|
||||
- update to version 0.7.3 beta 2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 14 09:51:43 CET 2005 - adrian@suse.de
|
||||
|
||||
- fix build for 9.2 distribution
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 5 10:25:46 CET 2005 - adrian@suse.de
|
||||
|
||||
- fix build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 3 11:53:01 CET 2005 - adrian@suse.de
|
||||
|
||||
- update to version 0.7.2 final
|
||||
- hide showfoto dialog for now, we use gwenview as default picture
|
||||
viewer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 11 10:36:58 CET 2005 - adrian@suse.de
|
||||
|
||||
- remove some debug output
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 9 14:46:03 CET 2005 - adrian@suse.de
|
||||
|
||||
- update to version 0.7.2beta1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 4 14:13:27 CET 2005 - adrian@suse.de
|
||||
|
||||
- update to version 0.7.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 29 13:10:31 CET 2004 - adrian@suse.de
|
||||
|
||||
- use sqlite2 compat packages
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 17 08:47:14 CET 2004 - adrian@suse.de
|
||||
|
||||
- use the new native digikam icon again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 15 15:34:49 CET 2004 - adrian@suse.de
|
||||
|
||||
- use internal sqlite for < SuSE 9.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 8 14:23:36 CET 2004 - adrian@suse.de
|
||||
|
||||
- update to version 0.7 final
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Oct 24 15:46:17 CEST 2004 - adrian@suse.de
|
||||
|
||||
- add libkipi-devel to nfb
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 20 10:50:49 CEST 2004 - adrian@suse.de
|
||||
|
||||
- update to version 0.7 beta 1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 27 16:29:46 CEST 2004 - adrian@suse.de
|
||||
|
||||
- add Requires: imlib2-loaders or the editor is unable to load a
|
||||
picture (#46002)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 20 21:49:06 CEST 2004 - adrian@suse.de
|
||||
|
||||
- update to current cvs
|
||||
- use the core camera icon, it does fit better to crystal icons
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 10 12:59:43 CEST 2004 - adrian@suse.de
|
||||
|
||||
- update to current cvs
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 29 18:55:55 CEST 2004 - adrian@suse.de
|
||||
|
||||
- update to current snapshot (pre-0.7 version)
|
||||
* enable kipi support
|
||||
- patch to use external sqlite lib
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 21 09:26:24 CEST 2004 - adrian@suse.de
|
||||
|
||||
- update to version 0.6.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 16 10:50:19 CEST 2004 - adrian@suse.de
|
||||
|
||||
- add requires to dcraw for > 9.1
|
||||
A plugin needs it.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 21 09:13:54 CEST 2004 - coolo@suse.de
|
||||
|
||||
- build everything without unsermake
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 17 22:09:33 CEST 2004 - coolo@suse.de
|
||||
|
||||
- return in non-void function
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 15 19:29:01 CEST 2004 - coolo@suse.de
|
||||
|
||||
- build without unsermake
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 8 00:08:07 CEST 2004 - adrian@suse.de
|
||||
|
||||
- fix path to k3b
|
||||
- remove mpeg plugin, we miss the tools anyway
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 4 17:33:58 CEST 2004 - adrian@suse.de
|
||||
|
||||
- add patch by Andi Kleen to create a "Pictures" directory,
|
||||
instead of confusing the user.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 1 18:04:21 CEST 2004 - coolo@suse.de
|
||||
|
||||
- readding icons (#37369)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 22 13:16:09 CET 2004 - adrian@suse.de
|
||||
|
||||
- fixing german translation (#36674)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 29 01:56:13 CET 2004 - ro@suse.de
|
||||
|
||||
- different approach to remove buildroot traces
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 17 09:20:20 CET 2004 - adrian@suse.de
|
||||
|
||||
- fix Categories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 10 09:01:00 CET 2004 - adrian@suse.de
|
||||
|
||||
- update to version 0.6 final
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 3 22:26:54 CET 2004 - adrian@suse.de
|
||||
|
||||
- fix build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 2 13:50:59 CET 2004 - adrian@suse.de
|
||||
|
||||
- update to version 0.6.0rc2
|
||||
- add digikamplugins to package
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 13 10:21:32 CET 2004 - coolo@suse.de
|
||||
|
||||
- fixing Makefile problems
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 30 18:40:12 CET 2003 - adrian@suse.de
|
||||
|
||||
- install default icons in crystalsvg
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 15 14:27:29 CEST 2003 - meissner@suse.de
|
||||
|
||||
- Upgraded to current 0.6.0 CVS, "all known bugs fixed" [tm]
|
||||
- Do not build as root.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 23 14:15:22 CEST 2003 - meissner@suse.de
|
||||
|
||||
- fixed crash on corrupt JPEG, #31180.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 17:06:48 CEST 2003 - varkoly@suse.de
|
||||
|
||||
- update hungarian translation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 16 11:56:51 CEST 2003 - adrian@suse.de
|
||||
|
||||
- update czech translation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 9 09:50:30 CEST 2003 - adrian@suse.de
|
||||
|
||||
- add hungarian translation from Peter Varkoly
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 8 10:51:06 CEST 2003 - adrian@suse.de
|
||||
|
||||
- use a nicer icon
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 13 14:44:05 CEST 2003 - adrian@suse.de
|
||||
|
||||
- add czech translation from Klara Cihlarova
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 28 16:02:53 CEST 2003 - adrian@suse.de
|
||||
|
||||
- add %run_ldconfig
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 28 13:38:08 CEST 2003 - adrian@suse.de
|
||||
|
||||
- Add Categories
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 12 11:25:37 CEST 2003 - coolo@suse.de
|
||||
|
||||
- use find_lang
|
||||
- package icons directories too
|
||||
- use $INSTALL_TARGET
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 2 17:09:24 CEST 2003 - meissner@suse.de
|
||||
|
||||
- Upgraded to pre 0.6, packaged the rest of the files,
|
||||
adapted neededforbuild.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 18:11:37 CEST 2002 - adrian@suse.de
|
||||
|
||||
- enable the build again and update to 0.5.1 (KDE 3 port)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 26 02:16:29 CET 2002 - ro@suse.de
|
||||
|
||||
- added libexif to neededforbuild
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 4 01:35:12 CET 2002 - ro@suse.de
|
||||
|
||||
- try forward port to current gphoto2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 19 18:39:41 CET 2002 - adrian@suse.de
|
||||
|
||||
- update to version 0.4
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 5 00:31:05 CET 2002 - adrian@suse.de
|
||||
|
||||
- update to final 0.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 2 22:39:05 CET 2002 - adrian@suse.de
|
||||
|
||||
- update to version 0.3_beta1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 29 15:28:51 CET 2001 - adrian@suse.de
|
||||
|
||||
- initial packaging
|
||||
|
306
digikam.spec
Normal file
306
digikam.spec
Normal file
@ -0,0 +1,306 @@
|
||||
#
|
||||
# spec file for package digikam (Version 0.9.0)
|
||||
#
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Name: digikam
|
||||
BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate libexiv2-devel libkipi-devel sqlite-devel sqlite2-devel
|
||||
%if %suse_version > 1010
|
||||
BuildRequires: libgphoto2-devel
|
||||
%else
|
||||
BuildRequires: libgphoto2
|
||||
%endif
|
||||
%if %suse_version < 1010
|
||||
BuildRequires: libtiff-devel
|
||||
%endif
|
||||
License: GNU General Public License (GPL)
|
||||
Group: Hardware/Other
|
||||
Summary: A KDE Photo Manager
|
||||
Version: 0.9.0
|
||||
Release: 7
|
||||
%define rversion %version
|
||||
URL: http://www.digikam.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: %{name}-%{rversion}.tar.bz2
|
||||
Source1: service.desktop
|
||||
Patch1: external-sqlite.diff
|
||||
Patch2: autoconf.diff
|
||||
Patch4: digikam-gphoto-disk.patch
|
||||
Patch5: digikam-load.diff
|
||||
Patch7: digikam-print.diff
|
||||
Patch9: renamepreview.patch
|
||||
Requires: imlib2-loaders
|
||||
|
||||
%description
|
||||
digiKam is a simple digital photo management application for KDE, which
|
||||
makes importing and organizing digital photos easy. The photos can be
|
||||
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.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Renchi Raju <renchi@green.tam.uiuc.edu>
|
||||
|
||||
%prep
|
||||
%setup -q -n %name-%rversion
|
||||
%if %suse_version > 900
|
||||
rm -rf digikam/sqlite
|
||||
%patch1
|
||||
%endif
|
||||
%patch2
|
||||
%patch4 -p1
|
||||
#%patch5 -p0
|
||||
%patch7
|
||||
%patch9
|
||||
. /etc/opt/kde3/common_options
|
||||
update_admin --no-unsermake
|
||||
|
||||
%build
|
||||
. /etc/opt/kde3/common_options
|
||||
export PKG_CONFIG_PATH=/opt/kde3/%_lib/pkgconfig
|
||||
./configure $configkde --disable-final
|
||||
make VERBOSE=1 %{?jobs:-j%jobs}
|
||||
|
||||
%install
|
||||
. /etc/opt/kde3/common_options
|
||||
make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET
|
||||
kde_post_install
|
||||
%if %suse_version > 1000
|
||||
%suse_update_desktop_file digikam Graphics Photography
|
||||
%else
|
||||
%suse_update_desktop_file digikam Graphics Photograph
|
||||
%endif
|
||||
%suse_update_desktop_file showfoto Graphics Viewer
|
||||
echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop
|
||||
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus
|
||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop
|
||||
%suse_update_desktop_file $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/servicemenus/open_in_digikam.desktop
|
||||
%find_lang %name
|
||||
|
||||
%post
|
||||
%run_ldconfig
|
||||
|
||||
%postun
|
||||
%run_ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f %name.lang
|
||||
%defattr(-,root,root)
|
||||
/opt/kde3/bin/*
|
||||
/opt/kde3/%_lib/*
|
||||
/opt/kde3/share/appl*/*/*.desktop
|
||||
/opt/kde3/share/apps/*
|
||||
/opt/kde3/share/icons/*
|
||||
/opt/kde3/include/digikam
|
||||
/opt/kde3/include/digikam_export.h
|
||||
/opt/kde3/share/services/*
|
||||
/opt/kde3/share/servicetypes/digikamimageplugin.desktop
|
||||
/usr/share/man/man1/digitaglinktree.1.gz
|
||||
%dir /opt/kde3/share/doc/HTML/en/digikam-%rversion-apidocs
|
||||
|
||||
%changelog -n digikam
|
||||
* Mon Dec 18 2006 - stbinner@suse.de
|
||||
- update to final 0.9 release
|
||||
* Sat Dec 09 2006 - dmueller@suse.de
|
||||
- update to 0.9.0 rc2:
|
||||
* uses libexiv2 now for EXIF parsing
|
||||
* many more features and over 500 bugfixes see:
|
||||
http://www.digikam.org/?q=about/features09x
|
||||
* Sat Nov 04 2006 - stbinner@suse.de
|
||||
- fix build for < 10.1
|
||||
* Fri Nov 03 2006 - llunak@suse.cz
|
||||
- fix preview in rename dialog when downloading
|
||||
from camera (#188108)
|
||||
* Thu Nov 02 2006 - stbinner@suse.de
|
||||
- fix crash when right-clicking in empty main window (#216511)
|
||||
* Sat Oct 21 2006 - meissner@suse.de
|
||||
- buildrequires libgphoto2-devel
|
||||
* Wed Sep 13 2006 - stbinner@suse.de
|
||||
- fix build for 10.0
|
||||
* Tue Jul 18 2006 - dmueller@suse.de
|
||||
- update to 0.8.2.
|
||||
* add missing Rating info in album item file tip and image
|
||||
properties dialog
|
||||
* display JPEG that use CMYK color space
|
||||
* Rating image using keyboard shortcuts CTRL+0/1/2/3/4/5 from
|
||||
main interface
|
||||
* Buttons to set the album date to oldest, yougest of the
|
||||
images in the album
|
||||
* Mon May 22 2006 - stbinner@suse.de
|
||||
- no x-raw.desktop in STABLE, is now contained in kdelibs 3.5.2
|
||||
* Wed Mar 22 2006 - stbinner@suse.de
|
||||
- no x-raw.desktop in PLUS, is now contained in kdelibs 3.5.2
|
||||
* Tue Feb 28 2006 - coolo@suse.de
|
||||
- fix the print of filename (as indicated by compiler warning and
|
||||
[#153544])
|
||||
* Mon Feb 13 2006 - stbinner@suse.de
|
||||
- add upstream patch to fix problems on ppc (KDE #121646)
|
||||
* Mon Feb 06 2006 - stbinner@suse.de
|
||||
- fix build
|
||||
* Mon Feb 06 2006 - coolo@suse.de
|
||||
- grap fix from KDE SVN to fix severe problem with search for images
|
||||
(KDE bugs 120479 and 120775)
|
||||
* Tue Jan 31 2006 - coolo@suse.de
|
||||
- fix gphoto2 cameras
|
||||
* Thu Jan 26 2006 - meissner@suse.de
|
||||
- Upgraded to 0.8.1.
|
||||
- image rating
|
||||
- 8 bit raw support added
|
||||
- copy & paste support (between albums or between digikam + konqi)
|
||||
- new dcop interface to control opening the camera dialog
|
||||
* Wed Jan 25 2006 - mls@suse.de
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Mon Jan 23 2006 - coolo@suse.de
|
||||
- give digikam as option in the media popup
|
||||
* Wed Dec 21 2005 - dmueller@suse.de
|
||||
- fix file list
|
||||
* Mon Nov 28 2005 - stbinner@suse.de
|
||||
- update to version 0.8
|
||||
* Sat Nov 19 2005 - stbinner@suse.de
|
||||
- keep old xdg menu category for build on older distribution
|
||||
* Thu Nov 17 2005 - stbinner@suse.de
|
||||
- fix build on 9.1 and 9.2
|
||||
* Thu Sep 29 2005 - stbinner@suse.de
|
||||
- fix "Photograph" to correct "Photography" xdg menu category
|
||||
* Fri Aug 19 2005 - adrian@suse.de
|
||||
- update to version 0.7.4
|
||||
* translation updates
|
||||
* Fri Aug 19 2005 - coolo@suse.de
|
||||
- fix file list for icons
|
||||
* Wed Aug 17 2005 - meissner@suse.de
|
||||
- do not overwrite ports with "usb:" everytime.
|
||||
* Sat Jul 23 2005 - dmueller@suse.de
|
||||
- fix filelist
|
||||
* Thu Jul 21 2005 - dmueller@suse.de
|
||||
- 0.7.3 final update
|
||||
- removed -fvisibility=hidden support as it exposes a compiler bug
|
||||
on x86_64 and ppc64
|
||||
* Mon May 23 2005 - adrian@suse.de
|
||||
- update to version 0.7.3 beta 2
|
||||
* Mon Mar 14 2005 - adrian@suse.de
|
||||
- fix build for 9.2 distribution
|
||||
* Sat Mar 05 2005 - adrian@suse.de
|
||||
- fix build
|
||||
* Thu Mar 03 2005 - adrian@suse.de
|
||||
- update to version 0.7.2 final
|
||||
- hide showfoto dialog for now, we use gwenview as default picture
|
||||
viewer
|
||||
* Fri Feb 11 2005 - adrian@suse.de
|
||||
- remove some debug output
|
||||
* Wed Feb 09 2005 - adrian@suse.de
|
||||
- update to version 0.7.2beta1
|
||||
* Tue Jan 04 2005 - adrian@suse.de
|
||||
- update to version 0.7.1
|
||||
* Mon Nov 29 2004 - adrian@suse.de
|
||||
- use sqlite2 compat packages
|
||||
* Wed Nov 17 2004 - adrian@suse.de
|
||||
- use the new native digikam icon again
|
||||
* Mon Nov 15 2004 - adrian@suse.de
|
||||
- use internal sqlite for < SuSE 9.1
|
||||
* Mon Nov 08 2004 - adrian@suse.de
|
||||
- update to version 0.7 final
|
||||
* Sun Oct 24 2004 - adrian@suse.de
|
||||
- add libkipi-devel to nfb
|
||||
* Wed Oct 20 2004 - adrian@suse.de
|
||||
- update to version 0.7 beta 1
|
||||
* Mon Sep 27 2004 - adrian@suse.de
|
||||
- add Requires: imlib2-loaders or the editor is unable to load a
|
||||
picture (#46002)
|
||||
* Mon Sep 20 2004 - adrian@suse.de
|
||||
- update to current cvs
|
||||
- use the core camera icon, it does fit better to crystal icons
|
||||
* Fri Sep 10 2004 - adrian@suse.de
|
||||
- update to current cvs
|
||||
* Thu Jul 29 2004 - adrian@suse.de
|
||||
- update to current snapshot (pre-0.7 version)
|
||||
* enable kipi support
|
||||
- patch to use external sqlite lib
|
||||
* Mon Jun 21 2004 - adrian@suse.de
|
||||
- update to version 0.6.2
|
||||
* Wed Jun 16 2004 - adrian@suse.de
|
||||
- add requires to dcraw for > 9.1
|
||||
A plugin needs it.
|
||||
* Wed Apr 21 2004 - coolo@suse.de
|
||||
- build everything without unsermake
|
||||
* Sat Apr 17 2004 - coolo@suse.de
|
||||
- return in non-void function
|
||||
* Thu Apr 15 2004 - coolo@suse.de
|
||||
- build without unsermake
|
||||
* Thu Apr 08 2004 - adrian@suse.de
|
||||
- fix path to k3b
|
||||
- remove mpeg plugin, we miss the tools anyway
|
||||
* Sun Apr 04 2004 - adrian@suse.de
|
||||
- add patch by Andi Kleen to create a "Pictures" directory,
|
||||
instead of confusing the user.
|
||||
* Thu Apr 01 2004 - coolo@suse.de
|
||||
- readding icons (#37369)
|
||||
* Mon Mar 22 2004 - adrian@suse.de
|
||||
- fixing german translation (#36674)
|
||||
* Sun Feb 29 2004 - ro@suse.de
|
||||
- different approach to remove buildroot traces
|
||||
* Tue Feb 17 2004 - adrian@suse.de
|
||||
- fix Categories
|
||||
* Tue Feb 10 2004 - adrian@suse.de
|
||||
- update to version 0.6 final
|
||||
* Tue Feb 03 2004 - adrian@suse.de
|
||||
- fix build
|
||||
* Mon Feb 02 2004 - adrian@suse.de
|
||||
- update to version 0.6.0rc2
|
||||
- add digikamplugins to package
|
||||
* Tue Jan 13 2004 - coolo@suse.de
|
||||
- fixing Makefile problems
|
||||
* Tue Dec 30 2003 - adrian@suse.de
|
||||
- install default icons in crystalsvg
|
||||
* Wed Oct 15 2003 - meissner@suse.de
|
||||
- Upgraded to current 0.6.0 CVS, "all known bugs fixed" [tm]
|
||||
- Do not build as root.
|
||||
* Tue Sep 23 2003 - meissner@suse.de
|
||||
- fixed crash on corrupt JPEG, #31180.
|
||||
* Thu Sep 18 2003 - varkoly@suse.de
|
||||
- update hungarian translation
|
||||
* Tue Sep 16 2003 - adrian@suse.de
|
||||
- update czech translation
|
||||
* Tue Sep 09 2003 - adrian@suse.de
|
||||
- add hungarian translation from Peter Varkoly
|
||||
* Mon Sep 08 2003 - adrian@suse.de
|
||||
- use a nicer icon
|
||||
* Wed Aug 13 2003 - adrian@suse.de
|
||||
- add czech translation from Klara Cihlarova
|
||||
* Mon Jul 28 2003 - adrian@suse.de
|
||||
- add %%run_ldconfig
|
||||
* Mon Jul 28 2003 - adrian@suse.de
|
||||
- Add Categories
|
||||
* Thu Jun 12 2003 - coolo@suse.de
|
||||
- use find_lang
|
||||
- package icons directories too
|
||||
- use $INSTALL_TARGET
|
||||
* Mon Jun 02 2003 - meissner@suse.de
|
||||
- Upgraded to pre 0.6, packaged the rest of the files,
|
||||
adapted neededforbuild.
|
||||
* Thu Sep 19 2002 - adrian@suse.de
|
||||
- enable the build again and update to 0.5.1 (KDE 3 port)
|
||||
* Tue Feb 26 2002 - ro@suse.de
|
||||
- added libexif to neededforbuild
|
||||
* Mon Feb 04 2002 - ro@suse.de
|
||||
- try forward port to current gphoto2
|
||||
* Sat Jan 19 2002 - adrian@suse.de
|
||||
- update to version 0.4
|
||||
* Sat Jan 05 2002 - adrian@suse.de
|
||||
- update to final 0.3
|
||||
* Wed Jan 02 2002 - adrian@suse.de
|
||||
- update to version 0.3_beta1
|
||||
* Sat Dec 29 2001 - adrian@suse.de
|
||||
- initial packaging
|
28
external-sqlite.diff
Normal file
28
external-sqlite.diff
Normal file
@ -0,0 +1,28 @@
|
||||
--- digikam/Makefile.am
|
||||
+++ digikam/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-SUBDIRS = sqlite libs utilities digikam kioslave imageplugins data showfoto
|
||||
+SUBDIRS = libs utilities digikam kioslave imageplugins data showfoto
|
||||
|
||||
EXTRA_DIST = Digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm
|
||||
|
||||
--- digikam/digikam/Makefile.am
|
||||
+++ digikam/digikam/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
METASOURCES = AUTO
|
||||
|
||||
-INCLUDES = -I$(top_srcdir)/digikam/sqlite \
|
||||
+INCLUDES = \
|
||||
-I$(top_srcdir)/digikam/libs/histogram \
|
||||
-I$(top_srcdir)/digikam/libs/levels \
|
||||
-I$(top_srcdir)/digikam/libs/curves \
|
||||
@@ -91,8 +91,7 @@
|
||||
upgradedb_sqlite2tosqlite3.cpp
|
||||
|
||||
libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) \
|
||||
- $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) \
|
||||
- $(top_builddir)/digikam/sqlite/libsqlite.la \
|
||||
+ $(LIBKIPI_LIBS) $(LIB_KUTILS) $(EXIV2_LIBS) -lsqlite \
|
||||
$(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
|
||||
$(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
|
||||
$(top_builddir)/digikam/libs/widgets/libwidgets.la \
|
28
renamepreview.patch
Normal file
28
renamepreview.patch
Normal file
@ -0,0 +1,28 @@
|
||||
--- digikam/utilities/cameragui/cameracontroller.cpp
|
||||
+++ digikam/utilities/cameragui/cameracontroller.cpp
|
||||
@@ -56,6 +56,7 @@
|
||||
#include <kmessagebox.h>
|
||||
#include <kio/renamedlg.h>
|
||||
#include <kstandarddirs.h>
|
||||
+#include <ktempfile.h>
|
||||
|
||||
// Local includes.
|
||||
|
||||
@@ -1141,12 +1142,16 @@
|
||||
|
||||
// FIXME : see B.K.O #126427: with Gphoto camera, the camera folder is not
|
||||
// mounted in local and camera picture cannot be display like a preview in dialog.
|
||||
+ KTempFile tmp;
|
||||
+ tmp.close();
|
||||
+ d->camera->downloadItem(folder, file, tmp.name());
|
||||
|
||||
- KIO::RenameDlg dlg(d->parent, i18n("Rename File"), folder + QString("/") + file, dest,
|
||||
+ KIO::RenameDlg dlg(d->parent, i18n("Rename File"), tmp.name(), dest,
|
||||
KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP));
|
||||
|
||||
int result = dlg.exec();
|
||||
dest = dlg.newDestURL().path();
|
||||
+ tmp.unlink();
|
||||
|
||||
switch (result)
|
||||
{
|
8
service.desktop
Normal file
8
service.desktop
Normal file
@ -0,0 +1,8 @@
|
||||
[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
|
Loading…
Reference in New Issue
Block a user