diff --git a/digikam-0.9.2-final.tar.bz2 b/digikam-0.9.2-final.tar.bz2 deleted file mode 100644 index 927972f..0000000 --- a/digikam-0.9.2-final.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5d63335e3de5154d05f46b211aba13ae740dc4c1620b2023460c477e0dc7b310 -size 10466947 diff --git a/digikam-0.9.3-rc1.tar.bz2 b/digikam-0.9.3-rc1.tar.bz2 new file mode 100644 index 0000000..9d0683c --- /dev/null +++ b/digikam-0.9.3-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c11fe5f5f02cedf212f5dada8e8746c918cca18283a335b698464f1d8290b5e +size 8290604 diff --git a/digikam-gphoto-codeset.patch b/digikam-gphoto-codeset.patch deleted file mode 100644 index cca6110..0000000 --- a/digikam-gphoto-codeset.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- digikam/utilities/cameragui/gpcamera.cpp -+++ digikam/utilities/cameragui/gpcamera.cpp -@@ -361,7 +361,7 @@ - return false; - } - -- subFolderList.append(QString(subFolder)); -+ subFolderList.append(QFile::decodeName(subFolder)); - } - - gp_list_unref(clist); -@@ -408,7 +408,7 @@ - return false; - } - -- itemsList.append(cname); -+ itemsList.append(QFile::decodeName(cname)); - } - - gp_list_unref(clist); -@@ -461,7 +461,7 @@ - - GPItemInfo itemInfo; - -- itemInfo.name = cname; -+ itemInfo.name = QFile::decodeName(cname); - itemInfo.folder = folder; - - CameraFileInfo info; diff --git a/digikam.changes b/digikam.changes index ccbc727..13cfe20 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Dec 10 10:18:45 CET 2007 - stbinner@suse.de + +- update to 0.9.3-rc1: + * In the Albums/Tags/Searches/TagsFilter sidebars the is a live + filter at the bottom that lets you search for a string in + Albums/Tags/Searches/TagsFilter hierarchy + * The main window has yet another live filter: The new string + search filters the current view (album/collection, date, tags, + search) on substrings within file name, caption, and tags. + * Several usability improvements in the Light Table + * A green tint has been added to the b&w conversion plugin + * Quick filters have been added to the status bar of main window + * A new navigation feature: whenever a thumbnail is selected in + the main window you can immediately jump (Go To) to any other + of the views where this image is a member of. + * New features of the camera interface: + - Interface is now used to import new images into collections. + - New options to download pictures and delete them from the + camera at the same time. + - Support of Drag & Drop to download files from camera window + to album window. + - A progress bar has been added to indicate the available + space in the Album Library Path + ------------------------------------------------------------------- Sat Nov 3 00:11:23 CET 2007 - dmueller@suse.de diff --git a/digikam.spec b/digikam.spec index f46bd47..4838346 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,5 +1,5 @@ # -# spec file for package digikam (Version 0.9.2) +# spec file for package digikam (Version 0.9.3rc1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,9 +29,9 @@ BuildRequires: libtiff-devel License: GPL v2 or later Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager -Version: 0.9.2 -Release: 69 -%define rversion %version-final +Version: 0.9.3rc1 +Release: 1 +%define rversion 0.9.3-rc1 Url: http://www.digikam.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{rversion}.tar.bz2 @@ -43,8 +43,6 @@ Patch4: digikam-gphoto-disk.patch Patch5: digikam-load.diff Patch7: digikam-print.diff Patch9: renamepreview.patch -Patch10: digikam-gphoto-codeset.patch -Patch11: r703199.diff Requires: imlib2-loaders %if %suse_version > 1020 Requires: %{name}-lang = %{version} @@ -147,16 +145,15 @@ Authors: %if %suse_version > 1020 %lang_package %endif + %prep %setup -q -n %name-%rversion rm -rf digikam/sqlite %patch1 -%patch4 -p1 +#%patch4 -p1 #%patch5 -p0 %patch7 %patch9 -%patch10 -%patch11 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -171,14 +168,11 @@ make VERBOSE=1 %{?jobs:-j%jobs} make DESTDIR=$RPM_BUILD_ROOT $INSTALL_TARGET %if %suse_version > 1000 %suse_update_desktop_file digikam Graphics Photography -%suse_update_desktop_file digikamthemedesigner Graphics Photography %else %suse_update_desktop_file digikam Graphics Photograph -%suse_update_desktop_file digikamthemedesigner Graphics Photograph %endif %suse_update_desktop_file showfoto Graphics Viewer echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/showfoto.desktop -echo "NoDisplay=true" >> $RPM_BUILD_ROOT/opt/kde3/share/applications/kde/digikamthemedesigner.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 @@ -249,7 +243,30 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /opt/kde3/share/apps/digikamimageplugins /opt/kde3/share/apps/digikamimageplugins/superimpose + %changelog +* Mon Dec 10 2007 - stbinner@suse.de +- update to 0.9.3-rc1: + * In the Albums/Tags/Searches/TagsFilter sidebars the is a live + filter at the bottom that lets you search for a string in + Albums/Tags/Searches/TagsFilter hierarchy + * The main window has yet another live filter: The new string + search filters the current view (album/collection, date, tags, + search) on substrings within file name, caption, and tags. + * Several usability improvements in the Light Table + * A green tint has been added to the b&w conversion plugin + * Quick filters have been added to the status bar of main window + * A new navigation feature: whenever a thumbnail is selected in + the main window you can immediately jump (Go To) to any other + of the views where this image is a member of. + * New features of the camera interface: + - Interface is now used to import new images into collections. + - New options to download pictures and delete them from the + camera at the same time. + - Support of Drag & Drop to download files from camera window + to album window. + - A progress bar has been added to indicate the available + space in the Album Library Path * Sat Nov 03 2007 - dmueller@suse.de - fix build against lcms 1.17 * Wed Aug 22 2007 - meissner@suse.de diff --git a/external-sqlite.diff b/external-sqlite.diff index 90185a3..0c63a0a 100644 --- a/external-sqlite.diff +++ b/external-sqlite.diff @@ -1,30 +1,28 @@ ---- digikam/Makefile.am 2007/06/18 12:41:27 1.1 -+++ digikam/Makefile.am 2007/06/18 12:42:24 -@@ -1,6 +1,6 @@ - COMPILE_FIRST = sqlite +--- digikam/libs/Makefile.am 2007/12/10 09:07:01 1.1 ++++ digikam/libs/Makefile.am 2007/12/10 09:07:10 +@@ -1,5 +1,5 @@ + COMPILE_FIRST = sqlite2 --SUBDIRS = sqlite libs utilities digikam showfoto data kioslave imageplugins themedesigner -+SUBDIRS = libs utilities digikam showfoto data kioslave imageplugins themedesigner - - EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm - ---- digikam/digikam/Makefile.am 2007/06/18 12:41:27 1.1 -+++ digikam/digikam/Makefile.am 2007/06/18 12:43:25 +-SUBDIRS = sqlite2 lprof histogram levels curves whitebalance dmetadata \ ++SUBDIRS = lprof histogram levels curves whitebalance dmetadata \ + dimg threadimageio themeengine widgets greycstoration \ + thumbbar jpegutils imageproperties dialogs +--- digikam/digikam/Makefile.am 2007/12/10 09:06:53 1.1 ++++ digikam/digikam/Makefile.am 2007/12/10 09:08:41 @@ -1,6 +1,6 @@ METASOURCES = AUTO --INCLUDES = -I$(top_srcdir)/digikam/sqlite \ +-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 \ -@@ -96,8 +96,7 @@ - welcomepageview.cpp - - libdigikam_la_LIBADD = $(LIB_KIO) $(LIB_SQLITE3) $(LIB_KABC) $(LIB_KHTML) \ -- $(LIBKIPI_LIBS) $(LIB_KUTILS) \ -- $(top_builddir)/digikam/sqlite/libsqlite.la \ -+ $(LIBKIPI_LIBS) $(LIB_KUTILS) -lsqlite\ +@@ -102,7 +102,7 @@ + $(LIB_KHTML) \ + $(LIBKIPI_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 \ diff --git a/r703199.diff b/r703199.diff deleted file mode 100644 index 03c234d..0000000 --- a/r703199.diff +++ /dev/null @@ -1,22 +0,0 @@ ------------------------------------------------------------------------- -r703199 | cgilles | 2007-08-22 09:03:07 +0200 (Wed, 22 Aug 2007) | 3 lines - -digiKam from KDE3 branch : patch from Angelo Naselli about to compile digiKam with lcms 1.17. Tested under Mandriva 2007.1 and 2008.0 (cooker) -BUG: 148930 - ------------------------------------------------------------------------- -Index: digikam/libs/lprof/lcmsprf.h -=================================================================== ---- digikam/libs/lprof/lcmsprf.h (revision 703198) -+++ digikam/libs/lprof/lcmsprf.h (revision 703199) -@@ -69,6 +69,10 @@ typedef struct { - - } MATN,FAR* LPMATN; - -+// See B.K.O #148930: compile with lcms v.1.17 -+#if (LCMS_VERSION > 116) -+typedef LCMSBOOL BOOL; -+#endif - - LPMATN cdecl MATNalloc(int Rows, int Cols); - void cdecl MATNfree (LPMATN mat); diff --git a/renamepreview.patch b/renamepreview.patch index 7c22e17..ce69866 100644 --- a/renamepreview.patch +++ b/renamepreview.patch @@ -1,28 +1,29 @@ ---- digikam/utilities/cameragui/cameracontroller.cpp -+++ digikam/utilities/cameragui/cameracontroller.cpp +--- digikam/utilities/cameragui/cameracontroller.cpp 2007/12/10 09:13:29 1.1 ++++ digikam/utilities/cameragui/cameracontroller.cpp 2007/12/10 09:16:08 @@ -58,6 +58,7 @@ #include #include #include +#include - + // Local includes. + +@@ -925,12 +925,17 @@ + break; + } -@@ -1143,12 +1144,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) - { ++ 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(); ++ tmp.unlink(); + + switch (result) + {