Hello community,
here is the log from the commit of package digikam
checked in at Mon Dec 11 01:38:11 CET 2006.
--------
--- KDE/digikam/digikam.changes 2006-11-04 19:49:50.000000000 +0100
+++ /mounts/work_src_done/STABLE/digikam/digikam.changes 2006-12-09 16:51:09.000000000 +0100
@@ -1,0 +2,8 @@
+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
+
+-------------------------------------------------------------------
Old:
----
albumiconview.cpp.patch
digikam-0.8.2.tar.bz2
New:
----
autoconf.diff
digikam-0.9.0-rc2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.AU9YGS/_old 2006-12-11 01:37:57.000000000 +0100
+++ /var/tmp/diff_new_pack.AU9YGS/_new 2006-12-11 01:37:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package digikam (Version 0.8.2)
+# 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
@@ -11,7 +11,7 @@
# norootforbuild
Name: digikam
-BuildRequires: doxygen giflib-devel imlib2-devel kdelibs3-devel kdesdk3-translate libkexif libkipi-devel sqlite-devel sqlite2-devel
+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
@@ -20,21 +20,21 @@
%if %suse_version < 1010
BuildRequires: libtiff-devel
%endif
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: Hardware/Other
Summary: A KDE Photo Manager
-Version: 0.8.2
-Release: 27
-%define rversion %version
+Version: 0.9.0
+Release: 1
+%define rversion %version-rc2
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
-Patch8: albumiconview.cpp.patch
Patch9: renamepreview.patch
Requires: imlib2-loaders
@@ -58,10 +58,10 @@
rm -rf digikam/sqlite
%patch1
%endif
+%patch2
%patch4 -p1
-%patch5 -p0
-%patch7 -p0
-%patch8
+#%patch5 -p0
+%patch7
%patch9
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -108,9 +108,15 @@
/opt/kde3/include/digikam_export.h
/opt/kde3/share/services/*
/opt/kde3/share/servicetypes/digikamimageplugin.desktop
-%dir /opt/kde3/share/doc/HTML/en/digikam-%version-apidocs
+/usr/share/man/man1/digitaglinktree.1.gz
+%dir /opt/kde3/share/doc/HTML/en/digikam-%rversion-apidocs
%changelog -n digikam
+* 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
++++++ autoconf.diff ++++++
--- 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
#endif
#ifndef NO_LCMS
+#define inline __inline__
#include
+#undef inline
#endif
#ifdef __CYGWIN__
++++++ digikam-print.diff ++++++
--- /var/tmp/diff_new_pack.AU9YGS/_old 2006-12-11 01:37:57.000000000 +0100
+++ /var/tmp/diff_new_pack.AU9YGS/_new 2006-12-11 01:37:57.000000000 +0100
@@ -1,33 +1,33 @@
---- digikam/utilities/imageeditor/imageprint.cpp
-+++ digikam/utilities/imageeditor/imageprint.cpp
-@@ -228,18 +228,9 @@
+--- 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 = m_image.size();
+ 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;
+- h -= filenameOffset;
- }
--
+-
if ( m_printer.option( "app-imageeditor-scaleToFit" ) != f )
{
-
-@@ -318,6 +309,7 @@
+ 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()), m_image );;
+ p.drawImage( QRect( x, y, size.width(), size.height()), image2Print );
+ bool printFilename = m_printer.option( "app-imageeditor-printFilename" ) != f;
if ( printFilename )
{
- QString fname = minimizeString( m_filename, fm, w );
-@@ -326,6 +318,8 @@
+ QString fname = minimizeString( d->filename, fm, w );
+@@ -244,6 +236,8 @@
{
int fw = fm.width( fname );
int x = (w - fw)/2;
++++++ external-sqlite.diff ++++++
--- /var/tmp/diff_new_pack.AU9YGS/_old 2006-12-11 01:37:57.000000000 +0100
+++ /var/tmp/diff_new_pack.AU9YGS/_new 2006-12-11 01:37:57.000000000 +0100
@@ -1,65 +1,28 @@
--- digikam/Makefile.am
+++ digikam/Makefile.am
@@ -1,4 +1,4 @@
--SUBDIRS = sqlite libs utilities digikam kioslave imageplugins themes showfoto
-+SUBDIRS = libs utilities digikam kioslave imageplugins themes showfoto
+-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
-@@ -4,7 +4,6 @@
- bin_PROGRAMS = digikam
+@@ -1,6 +1,6 @@
+ METASOURCES = AUTO
- INCLUDES = \
-- -I$(top_srcdir)/digikam/sqlite \
- -I$(top_srcdir)/digikam/libs/histogram \
- -I$(top_srcdir)/digikam/libs/filters \
- -I$(top_srcdir)/digikam/libs/levels \
-@@ -50,8 +49,7 @@
-
-
- libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) \
-- $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KUTILS) \
-- $(top_builddir)/digikam/sqlite/libsqlite.la \
-+ $(LIBKEXIF_LIBS) $(LIBKIPI_LIBS) $(LIB_KUTILS) -lsqlite \
- $(top_builddir)/digikam/libs/histogram/libhistogram.la \
- $(top_builddir)/digikam/libs/levels/liblevels.la \
- $(top_builddir)/digikam/libs/curves/libcurves.la \
---- digikam/kioslave/Makefile.am
-+++ digikam/kioslave/Makefile.am
-@@ -30,7 +30,7 @@
-
- kio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp
-
--kio_digikamtags_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3)
-+kio_digikamtags_la_LIBADD = $(LIB_KIO) -lsqlite3
-
- kio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
-
-@@ -39,7 +39,7 @@
- kio_digikamalbums_la_SOURCES = digikamalbums.cpp sqlitedb.cpp
-
- kio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \
-- $(LIB_KIO) $(LIB_SQLITE3)
-+ $(LIB_KIO) -lsqlite3
-
- kio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
-
-@@ -47,7 +47,7 @@
-
- kio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp
-
--kio_digikamdates_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3)
-+kio_digikamdates_la_LIBADD = $(LIB_KIO) -lsqlite3
-
- kio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
-
-@@ -55,6 +55,6 @@
-
- kio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp
-
--kio_digikamsearch_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3)
-+kio_digikamsearch_la_LIBADD = $(LIB_KIO) -lsqlite3
-
- kio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN)
+-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) $(LIB_EXIV2) \
+- $(top_builddir)/digikam/sqlite/libsqlite.la \
++ $(LIBKIPI_LIBS) $(LIB_KUTILS) $(LIB_EXIV2) -lsqlite \
+ $(top_builddir)/digikam/libs/thumbbar/libthumbbar.la \
+ $(top_builddir)/digikam/libs/themeengine/libthemeengine.la \
+ $(top_builddir)/digikam/libs/widgets/libwidgets.la \
++++++ renamepreview.patch ++++++
--- /var/tmp/diff_new_pack.AU9YGS/_old 2006-12-11 01:37:57.000000000 +0100
+++ /var/tmp/diff_new_pack.AU9YGS/_new 2006-12-11 01:37:57.000000000 +0100
@@ -1,26 +1,24 @@
---- digikam/utilities/cameragui/cameracontroller.cpp.sav 2006-07-10 23:03:58.000000000 +0200
-+++ digikam/utilities/cameragui/cameracontroller.cpp 2006-11-03 16:05:51.000000000 +0100
-@@ -36,6 +36,7 @@
+--- digikam/utilities/cameragui/cameracontroller.cpp
++++ digikam/utilities/cameragui/cameracontroller.cpp
+@@ -56,6 +56,7 @@
+ #include
#include
- #include
#include
+#include
- #include <typeinfo>
- #include
-@@ -827,13 +828,18 @@ void CameraController::slotProcessNext()
- break;
- }
+ // Local includes.
-- KIO::RenameDlg dlg(d->parent, i18n("Rename File"), file, dest,
+@@ -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));
+ KIO::RenameDlg_Mode(KIO::M_MULTI | KIO::M_OVERWRITE | KIO::M_SKIP));
int result = dlg.exec();
dest = dlg.newDestURL().path();
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org