Accepting request 256860 from KDE:Extra
Update to 4.4.0 OBS-URL: https://build.opensuse.org/request/show/256860 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=128
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
d7453e4191
commit
915b8ac7a9
141
bug325580.patch
141
bug325580.patch
@ -1,141 +0,0 @@
|
|||||||
commit d523a9768ab8276860c76e02b9d9b598a3d607f9
|
|
||||||
Author: Gilles Caulier <caulier.gilles@gmail.com>
|
|
||||||
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();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b9d1860a28c62e4c8f524db3bf5263f038f465d9514bb75e88e589dc0ba03fe8
|
|
||||||
size 68802872
|
|
||||||
@ -1,8 +1,7 @@
|
|||||||
Index: digikam-4.1.0/core/CMakeLists.txt
|
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.1.0.orig/core/CMakeLists.txt
|
+++ digikam-4.4.0/core/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200
|
||||||
+++ digikam-4.1.0/core/CMakeLists.txt
|
@@ -115,21 +115,23 @@
|
||||||
@@ -203,21 +203,23 @@ ENDIF (NOT OpenCV_INCLUDE_DIRS)
|
|
||||||
|
|
||||||
# check the libkdcraw version
|
# check the libkdcraw version
|
||||||
|
|
||||||
@ -38,12 +37,11 @@ Index: digikam-4.1.0/core/CMakeLists.txt
|
|||||||
+# ENDIF (KDCRAW_VERSION)
|
+# ENDIF (KDCRAW_VERSION)
|
||||||
|
|
||||||
# LCMS version 1 and 2 library handling
|
# LCMS version 1 and 2 library handling
|
||||||
# See B.K.O #294105
|
# See bug #294105
|
||||||
Index: digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
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.1.0.orig/extra/kipi-plugins/CMakeLists.txt
|
+++ digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200
|
||||||
+++ digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
@@ -64,21 +64,23 @@
|
||||||
@@ -139,21 +139,23 @@ FIND_PACKAGE(Kdcraw RE
|
|
||||||
|
|
||||||
# Check the libkdcraw version
|
# Check the libkdcraw version
|
||||||
|
|
||||||
3
digikam-4.4.0.tar.bz2
Normal file
3
digikam-4.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9
|
||||||
|
size 68871203
|
||||||
@ -1,3 +1,41 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Wed Sep 24 17:47:04 UTC 2014 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
|||||||
19
digikam.spec
19
digikam.spec
@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: digikam
|
Name: digikam
|
||||||
Version: 4.3.0
|
Version: 4.4.0
|
||||||
Release: 0
|
Release: 0
|
||||||
%define rversion 4.3.0
|
%define rversion 4.4.0
|
||||||
Summary: A KDE Photo Manager
|
Summary: A KDE Photo Manager
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: Productivity/Graphics/Viewers
|
Group: Productivity/Graphics/Viewers
|
||||||
@ -31,14 +31,8 @@ Patch0: digikam-buildtime.patch
|
|||||||
Patch3: remove-gplv2-only.patch
|
Patch3: remove-gplv2-only.patch
|
||||||
# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one)
|
# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one)
|
||||||
Patch5: digikam_no_build_vkontakte.diff
|
Patch5: digikam_no_build_vkontakte.diff
|
||||||
# PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken
|
# PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken
|
||||||
Patch6: digikam-3.0.0.no-kdcraw.version-check.patch
|
Patch6: digikam-4.4.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
|
|
||||||
BuildRequires: ImageMagick-devel
|
BuildRequires: ImageMagick-devel
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
@ -244,13 +238,10 @@ This package contains the development files for libmediawiki.
|
|||||||
%patch3
|
%patch3
|
||||||
%patch5
|
%patch5
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
|
||||||
%patch8 -p1
|
|
||||||
%patch9 -p1
|
|
||||||
|
|
||||||
# Remove build time references so build-compare can do its work
|
# 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')
|
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
|
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" extra/kipi-plugins/common/libkipiplugins/tools/kpversion.h.cmake.in
|
||||||
|
|
||||||
pushd extra/kipi-plugins
|
pushd extra/kipi-plugins
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
commit 573069e8cd3b7155582e0c7be3625c0cc4879619
|
|
||||||
Author: Gilles Caulier <caulier.gilles@gmail.com>
|
|
||||||
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 <libkexiv2/kexiv2previews.h>
|
|
||||||
#include <libkexiv2/rotationmatrix.h>
|
|
||||||
+#include <libkexiv2/version.h>
|
|
||||||
|
|
||||||
// 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)
|
|
||||||
{
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
commit e2eeb730d02aad858f15c6f35f2a6b6beb38acf5
|
|
||||||
Author: Gilles Caulier <caulier.gilles@gmail.com>
|
|
||||||
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())
|
|
||||||
{
|
|
||||||
Loading…
Reference in New Issue
Block a user