diff --git a/bug325580.patch b/bug325580.patch deleted file mode 100644 index 4c61c82..0000000 --- a/bug325580.patch +++ /dev/null @@ -1,141 +0,0 @@ -commit d523a9768ab8276860c76e02b9d9b598a3d607f9 -Author: Gilles Caulier -Date: Thu Sep 11 19:40:30 2014 +0200 - - Fix job reset when it's done : do not return directly is an error appera with a job, without to reset job. - Fix broken signal/slot connection. - BUGS: 325580 - FIXED-IN: 4.4.0 - -diff --git a/digikam/album/albumlabelstreeview.cpp b/digikam/album/albumlabelstreeview.cpp -index 2e1ff30..2047cdf 100644 ---- a/core/digikam/album/albumlabelstreeview.cpp -+++ b/core/digikam/album/albumlabelstreeview.cpp -@@ -934,7 +934,6 @@ void AlbumLabelsSearchHandler::slotResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - DigikamApp::instance(), DigikamApp::instance()->windowTitle()); -- return; - } - } - -diff --git a/digikam/album/albummanager.cpp b/digikam/album/albummanager.cpp -index bd05e27..02452b0 100644 ---- a/core/digikam/album/albummanager.cpp -+++ b/core/digikam/album/albummanager.cpp -@@ -2969,7 +2969,6 @@ void AlbumManager::slotAlbumsJobResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - 0, i18n("digiKam")); -- return; - } - } - -@@ -3000,7 +2999,6 @@ void AlbumManager::slotPeopleJobResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - 0, i18n("digiKam")); -- return; - } - } - -@@ -3044,7 +3042,6 @@ void AlbumManager::slotTagsJobResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - 0, i18n("digiKam")); -- return; - } - } - -@@ -3075,7 +3072,6 @@ void AlbumManager::slotDatesJobResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - 0, i18n("digiKam")); -- return; - } - - emit signalAllDAlbumsLoaded(); -diff --git a/libs/models/imagealbummodel.cpp b/libs/models/imagealbummodel.cpp -index 7681fa3..5486b55 100644 ---- a/core/libs/models/imagealbummodel.cpp -+++ b/core/libs/models/imagealbummodel.cpp -@@ -346,7 +346,6 @@ void ImageAlbumModel::slotResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), job->errorString(), - DigikamApp::instance(), DigikamApp::instance()->windowTitle()); -- return; - } - } - -diff --git a/showfoto/main/showfoto.cpp b/showfoto/main/showfoto.cpp -index 4d8ff09..9d407f7 100644 ---- a/core/showfoto/main/showfoto.cpp -+++ b/core/showfoto/main/showfoto.cpp -@@ -912,7 +912,7 @@ void ShowFoto::saveAsIsComplete() - - // Pop-up a message to bring user when save is done. - Digikam::DNotificationWrapper("editorsavefilecompleted", i18n("Image saved successfully"), -- this, windowTitle()); -+ this, windowTitle()); - */ - } - -diff --git a/utilities/maintenance/duplicatesfinder.cpp b/utilities/maintenance/duplicatesfinder.cpp -index 2636d7d..9ed2f9e 100644 ---- a/core/utilities/maintenance/duplicatesfinder.cpp -+++ b/core/utilities/maintenance/duplicatesfinder.cpp -@@ -110,7 +110,7 @@ void DuplicatesFinder::slotStart() - d->job->addMetaData("threshold", QString::number(thresh)); - - connect(d->job, SIGNAL(result(KJob*)), -- this, SLOT(slotDone(KJob*))); -+ this, SLOT(slotDone())); - - connect(d->job, SIGNAL(totalAmount(KJob*,KJob::Unit,qulonglong)), - this, SLOT(slotDuplicatesSearchTotalAmount(KJob*,KJob::Unit,qulonglong))); -@@ -139,10 +139,9 @@ void DuplicatesFinder::slotDone() - // Pop-up a message about the error. - DNotificationWrapper(QString(), d->job->errorString(), - DigikamApp::instance(), DigikamApp::instance()->windowTitle()); -- return; - } - -- d->job = NULL; -+ d->job = 0; - MaintenanceTool::slotDone(); - } - -@@ -151,7 +150,7 @@ void DuplicatesFinder::slotCancel() - if (d->job) - { - d->job->kill(); -- d->job = NULL; -+ d->job = 0; - } - - MaintenanceTool::slotCancel(); -diff --git a/utilities/maintenance/imageinfojob.cpp b/utilities/maintenance/imageinfojob.cpp -index 397601e..9efe80e 100644 ---- a/core/utilities/maintenance/imageinfojob.cpp -+++ b/core/utilities/maintenance/imageinfojob.cpp -@@ -110,6 +110,8 @@ bool ImageInfoJob::isRunning() const - - void ImageInfoJob::slotResult(KJob* job) - { -+ d->job = 0; -+ - if (job->error()) - { - kWarning() << "Failed to list url: " << job->errorString(); -@@ -117,11 +119,8 @@ void ImageInfoJob::slotResult(KJob* job) - // Pop-up a message about the error. - DNotificationWrapper(QString(), d->job->errorString(), - DigikamApp::instance(), DigikamApp::instance()->windowTitle()); -- return; - } - -- d->job = 0; -- - emit signalCompleted(); - } - diff --git a/digikam-4.3.0.tar.bz2 b/digikam-4.3.0.tar.bz2 deleted file mode 100644 index 79b1218..0000000 --- a/digikam-4.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9d1860a28c62e4c8f524db3bf5263f038f465d9514bb75e88e589dc0ba03fe8 -size 68802872 diff --git a/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch b/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch new file mode 100644 index 0000000..d61cca4 --- /dev/null +++ b/digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch @@ -0,0 +1,59 @@ +From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 14 Oct 2014 22:26:19 +0200 +Subject: [PATCH] fix libkexiv2 version for AltLangStrEdit::textEdit() + +it is part of current libkexiv2/master only (i.e. post 4.14.x, which +is 2.3.x) +--- + libs/imageproperties/captionedit.cpp | 2 +- + libs/imageproperties/imagedescedittab.cpp | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libs/imageproperties/captionedit.cpp b/libs/imageproperties/captionedit.cpp +index 88413fc..70bdb6d 100644 +--- a/libs/imageproperties/captionedit.cpp ++++ b/libs/imageproperties/captionedit.cpp +@@ -202,7 +202,7 @@ void CaptionEdit::slotAuthorChanged(const QString& text) + + MsgTextEdit* CaptionEdit::textEdit() const + { +-#if KEXIV2_VERSION >= 0x020302 ++#if KEXIV2_VERSION >= 0x020400 + return d->altLangStrEdit->textEdit(); + #else + return 0; +diff --git a/libs/imageproperties/imagedescedittab.cpp b/libs/imageproperties/imagedescedittab.cpp +index ebfbae1..3d12777 100644 +--- a/libs/imageproperties/imagedescedittab.cpp ++++ b/libs/imageproperties/imagedescedittab.cpp +@@ -429,7 +429,7 @@ ImageDescEditTab::ImageDescEditTab(QWidget* const parent) + + // Initialize --------------------------------------------- + +-#if KEXIV2_VERSION >= 0x020302 ++#if KEXIV2_VERSION >= 0x020400 + d->titleEdit->textEdit()->installEventFilter(this); + d->captionsEdit->textEdit()->installEventFilter(this); + #endif +@@ -532,7 +532,7 @@ void ImageDescEditTab::setFocusToNewTagEdit() + void ImageDescEditTab::setFocusToTitlesEdit() + { + d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); +-#if KEXIV2_VERSION >= 0x020302 ++#if KEXIV2_VERSION >= 0x020400 + d->titleEdit->textEdit()->setFocus(); + #endif + } +@@ -540,7 +540,7 @@ void ImageDescEditTab::setFocusToTitlesEdit() + void ImageDescEditTab::setFocusToCommentsEdit() + { + d->tabWidget->setCurrentIndex(Private::DESCRIPTIONS); +-#if KEXIV2_VERSION >= 0x020302 ++#if KEXIV2_VERSION >= 0x020400 + d->captionsEdit->textEdit()->setFocus(); + #endif + } +-- +1.8.4.5 + diff --git a/digikam-3.0.0.no-kdcraw.version-check.patch b/digikam-4.4.0.no-kdcraw.version-check.patch similarity index 80% rename from digikam-3.0.0.no-kdcraw.version-check.patch rename to digikam-4.4.0.no-kdcraw.version-check.patch index 3ceab0e..a9a3c4f 100644 --- a/digikam-3.0.0.no-kdcraw.version-check.patch +++ b/digikam-4.4.0.no-kdcraw.version-check.patch @@ -1,8 +1,7 @@ -Index: digikam-4.1.0/core/CMakeLists.txt -=================================================================== ---- digikam-4.1.0.orig/core/CMakeLists.txt -+++ digikam-4.1.0/core/CMakeLists.txt -@@ -203,21 +203,23 @@ ENDIF (NOT OpenCV_INCLUDE_DIRS) +diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/core/CMakeLists.txt digikam-4.4.0/core/CMakeLists.txt +--- digikam-4.4.0.orig/core/CMakeLists.txt 2014-10-08 14:32:43.000000000 +0200 ++++ digikam-4.4.0/core/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200 +@@ -115,21 +115,23 @@ # check the libkdcraw version @@ -38,12 +37,11 @@ Index: digikam-4.1.0/core/CMakeLists.txt +# ENDIF (KDCRAW_VERSION) # LCMS version 1 and 2 library handling - # See B.K.O #294105 -Index: digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt -=================================================================== ---- digikam-4.1.0.orig/extra/kipi-plugins/CMakeLists.txt -+++ digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt -@@ -139,21 +139,23 @@ FIND_PACKAGE(Kdcraw RE + # See bug #294105 +diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt +--- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-10-08 14:33:05.000000000 +0200 ++++ digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200 +@@ -64,21 +64,23 @@ # Check the libkdcraw version diff --git a/digikam-4.4.0.tar.bz2 b/digikam-4.4.0.tar.bz2 new file mode 100644 index 0000000..09f8f25 --- /dev/null +++ b/digikam-4.4.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 +size 68871203 diff --git a/digikam.changes b/digikam.changes index 758bd98..1461fa5 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Mon Nov 3 13:47:10 UTC 2014 - hrvoje.senjan@gmail.com + +- Added kde#89156.patch: avoid deadlocks with external MySQL/MariaDB, + kde#89156 + +------------------------------------------------------------------- +Thu Oct 16 16:24:52 UTC 2014 - nico.kruber@gmail.com + +- add digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch + (fixes builds with KDE 4.14.x) + +------------------------------------------------------------------- +Sun Oct 12 12:53:18 UTC 2014 - nico.kruber@gmail.com + +- Update to 4.4.0 + digikam: + - General : Navigate between pictures using PageUp/PageDown is now + possible while editing properties through captions/tags + sidebar. + - General : New keyboard shortcuts to improve usability while photo + review (as to switch focus on text edit widget, or to + toogle tags view). + - General : New keyboard shortcut to switch on/off color managed + view for thumbnails and preview. + - AlbumGUI : Album preview can be displayed in tooltip. + - SlideShow : Labels and Tags keyboard shortcuts can be used while + slideshow. + - SlideShow : Support multi-monitors computer. + - 50 fixed bugs + (kde#147175, kde#282900, kde#303179, kde#229930, kde#322053, kde#137320, + kde#110658, kde#224806, kde#309557, kde#201698, kde#211622, kde#131632, + kde#291695, kde#290928, kde#320304, kde#325580, kde#338485, kde#275381, + kde#144168, kde#268284, kde#152948, kde#313947, kde#282506, kde#309558, + kde#338509, kde#275077, kde#229680, kde#206546, kde#339074, kde#324287, + kde#313857, kde#312043, kde#242119, kde#339051, kde#163941, kde#339140, + kde#339144, kde#339210, kde#339341, kde#338629, kde#336333, kde#339173, + kde#339052, kde#171199, kde#257313, kde#338783, kde#337507, kde#339440, + kde#313855, kde#339227) + kipi-plugins: + - PiwigoExport : Allow to upload videos (OGG, MP4 and WEBM) if the Piwigo + server accept them. + - PiwigoExport : Remove the support of old Piwigo API (version < 2.4). + - 1 fixed bug (kde#337943) +- swap digikam-3.0.0.no-kdcraw.version-check.patch for + digikam-4.4.0.no-kdcraw.version-check.patch +- remove bug325580.patch (fixed upstream) +- remove handle_right_libkexiv2_version.diff and + handle_right_libkexiv2_version2.diff (fixed upstream) + ------------------------------------------------------------------- Wed Sep 24 17:47:04 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index 6a5474d..c640c7f 100644 --- a/digikam.spec +++ b/digikam.spec @@ -17,9 +17,9 @@ Name: digikam -Version: 4.3.0 +Version: 4.4.0 Release: 0 -%define rversion 4.3.0 +%define rversion 4.4.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers @@ -31,14 +31,12 @@ Patch0: digikam-buildtime.patch Patch3: remove-gplv2-only.patch # PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one) Patch5: digikam_no_build_vkontakte.diff -# PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken -Patch6: digikam-3.0.0.no-kdcraw.version-check.patch -# PATCH-FIX-UPSTREAM bug325580.patch -- Fix job reset when it's done : do not return directly is an error appera with a job, without to reset job. -Patch7: bug325580.patch -# PATCH-FIX-UPSTREAM handle_right_libkexiv2_version.diff -Patch8: handle_right_libkexiv2_version.diff -# PATCH-FIX-UPSTREAM handle_right_libkexiv2_version2.diff -Patch9: handle_right_libkexiv2_version2.diff +# PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken +Patch6: digikam-4.4.0.no-kdcraw.version-check.patch +# PATCH-FIX-UPSTREAM digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -- fix libkexiv2 version for AltLangStrEdit::textEdit() +Patch7: digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch +# PATCH-FIX-UPSTREAM kde#89156.patch -- avoid deadlocks with external MySQL/MariaDB, kde#89156 +Patch8: kde#89156.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -244,13 +242,12 @@ This package contains the development files for libmediawiki. %patch3 %patch5 %patch6 -p1 -%patch7 -p1 +%patch7 -d core -p1 %patch8 -p1 -%patch9 -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.in +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/app/utils/version.h.cmake.in sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/tools/kpversion.h.cmake.in pushd extra/kipi-plugins diff --git a/handle_right_libkexiv2_version.diff b/handle_right_libkexiv2_version.diff deleted file mode 100644 index 2684af9..0000000 --- a/handle_right_libkexiv2_version.diff +++ /dev/null @@ -1,39 +0,0 @@ -commit 573069e8cd3b7155582e0c7be3625c0cc4879619 -Author: Gilles Caulier -Date: Tue Sep 23 09:49:20 2014 +0200 - - Handle right libkexiv2 version to extract preview and prevent crash in Exiv2 preview extractor. - CCBUGS: 339144 - -diff --git a/core/libs/threadimageio/thumbnailcreator.cpp b/core/libs/threadimageio/thumbnailcreator.cpp -index ed07d0d..9f238a4 100644 ---- a/core/libs/threadimageio/thumbnailcreator.cpp -+++ b/core/libs/threadimageio/thumbnailcreator.cpp -@@ -62,6 +62,7 @@ - - #include - #include -+#include - - // Local includes - -@@ -519,6 +520,9 @@ ThumbnailImage ThumbnailCreator::createT - KDcraw::loadHalfPreview(qimage, path); - } - -+ // See bug #339144 : only handle preview if right libkexiv2 version is used. -+#if KEXIV2_VERSION >= 0x020302 -+ - // Special case with DNG file. See B.K.O #338081 - if (qimage.isNull()) - { -@@ -528,6 +532,9 @@ ThumbnailImage ThumbnailCreator::createT - qimage = preview.image(); - } - -+ -+#endif -+ - // DImg-dependent loading methods: TIFF, PNG, everything supported by QImage - if (qimage.isNull() && !failedAtDImg) - { diff --git a/handle_right_libkexiv2_version2.diff b/handle_right_libkexiv2_version2.diff deleted file mode 100644 index 6682456..0000000 --- a/handle_right_libkexiv2_version2.diff +++ /dev/null @@ -1,23 +0,0 @@ -commit e2eeb730d02aad858f15c6f35f2a6b6beb38acf5 -Author: Gilles Caulier -Date: Tue Sep 23 10:28:39 2014 +0200 - - Another place where we need to handle right libkexiv2 version to extract preview and prevent crash in Exiv2 preview extractor. - CCBUGS: 339144 - -diff --git a/core/libs/threadimageio/previewtask.cpp b/core/libs/threadimageio/previewtask.cpp -index 3c3b72a..99bb4d6 100644 ---- a/core/libs/threadimageio/previewtask.cpp -+++ b/core/libs/threadimageio/previewtask.cpp -@@ -254,7 +254,11 @@ void PreviewLoadingTask::execute() - // require at least half preview size - if (qMax(previews.width(), previews.height()) >= sizeLimit) - { -+ -+ // See bug #339144 : only handle preview if right libkexiv2 version is used. -+#if KEXIV2_VERSION >= 0x020302 - qimage = previews.image(); -+#endif - - if (!qimage.isNull()) - { diff --git a/kde#89156.patch b/kde#89156.patch new file mode 100644 index 0000000..36bb63a --- /dev/null +++ b/kde#89156.patch @@ -0,0 +1,86 @@ +From: Gilles Caulier +Date: Tue, 28 Oct 2014 14:58:55 +0000 +Subject: apply patch #89156 +X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=f0400ec7e518e753e0c4ccab4eb2b8b022f91767 +--- +apply patch #89156 +BUGS: 337737 +FIXED-IN: 4.5.0 +--- + + +--- a/core/libs/widgets/common/databasewidget.cpp ++++ b/core/libs/widgets/common/databasewidget.cpp +@@ -172,30 +172,21 @@ + "

MySQL backend is a more robust solution especially for remote and shared database storage. " + "It is also more efficient to manage huge collection sizes. " + "Be careful: this one it is still in experimental stage.

")); ++ + setDatabaseInputFields(DatabaseParameters::SQLiteDatabaseType()); + + // -------------------------------------------------------- +- +- adjustSize(); +- +- // -------------------------------------------------------- +- +- connect(databasePathEdit, SIGNAL(urlSelected(KUrl)), +- this, SLOT(slotChangeDatabasePath(KUrl))); +- +- connect(databasePathEdit, SIGNAL(textChanged(QString)), +- this, SLOT(slotDatabasePathEditedDelayed())); + + connect(databaseType, SIGNAL(currentIndexChanged(int)), + this, SLOT(slotHandleDBTypeIndexChanged(int))); + ++ connect(checkDatabaseConnectionButton, SIGNAL(clicked()), ++ this, SLOT(checkDatabaseConnection())); ++ + #ifdef HAVE_INTERNALMYSQL + connect(internalServer, SIGNAL(stateChanged(int)), + this, SLOT(slotHandleInternalServerCheckbox(int))); + #endif // HAVE_INTERNALMYSQL +- +- connect(checkDatabaseConnectionButton, SIGNAL(clicked()), +- this, SLOT(checkDatabaseConnection())); + } + + QString DatabaseWidget::currentDatabaseType() const +@@ -261,12 +252,24 @@ + d->databasePathLabel->setVisible(true); + databasePathEdit->setVisible(true); + d->expertSettings->setVisible(false); ++ ++ connect(databasePathEdit, SIGNAL(urlSelected(KUrl)), ++ this, SLOT(slotChangeDatabasePath(KUrl))); ++ ++ connect(databasePathEdit, SIGNAL(textChanged(QString)), ++ this, SLOT(slotDatabasePathEditedDelayed())); + } + else + { + d->databasePathLabel->setVisible(false); + databasePathEdit->setVisible(false); + d->expertSettings->setVisible(true); ++ ++ disconnect(databasePathEdit, SIGNAL(urlSelected(KUrl)), ++ this, SLOT(slotChangeDatabasePath(KUrl))); ++ ++ disconnect(databasePathEdit, SIGNAL(textChanged(QString)), ++ this, SLOT(slotDatabasePathEditedDelayed())); + } + + adjustSize(); +@@ -355,9 +358,9 @@ + + password->setText(settings->getDatabasePassword()); + +- /* Now set the type according the database type from the settings. +- * If no item is found, ignore the setting. +- */ ++ // Now set the type according the database type from the settings. ++ // If no item is found, ignore the setting. ++ + for (int i=0; icount(); ++i) + { + //kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << databaseType->itemData(i)