Accepting request 239137 from KDE:Extra
Forward request 239002: version update OBS-URL: https://build.opensuse.org/request/show/239137 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=123
This commit is contained in:
commit
65dd7e61ac
@ -1,7 +1,8 @@
|
|||||||
diff -U3 -dHrN digikam-3.0.0/core/CMakeLists.txt digikam-3.0.0.no-kdcraw.version-check/core/CMakeLists.txt
|
Index: digikam-4.1.0/core/CMakeLists.txt
|
||||||
--- digikam-3.0.0/core/CMakeLists.txt 2013-02-07 00:51:27.000000000 +0100
|
===================================================================
|
||||||
+++ digikam-3.0.0.no-kdcraw.version-check/core/CMakeLists.txt 2013-02-11 22:33:47.088164540 +0100
|
--- digikam-4.1.0.orig/core/CMakeLists.txt
|
||||||
@@ -199,21 +199,23 @@
|
+++ digikam-4.1.0/core/CMakeLists.txt
|
||||||
|
@@ -203,21 +203,23 @@ ENDIF (NOT OpenCV_INCLUDE_DIRS)
|
||||||
|
|
||||||
# check the libkdcraw version
|
# check the libkdcraw version
|
||||||
|
|
||||||
@ -38,10 +39,11 @@ diff -U3 -dHrN digikam-3.0.0/core/CMakeLists.txt digikam-3.0.0.no-kdcraw.version
|
|||||||
|
|
||||||
# LCMS version 1 and 2 library handling
|
# LCMS version 1 and 2 library handling
|
||||||
# See B.K.O #294105
|
# See B.K.O #294105
|
||||||
diff -U3 -dHrN digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt digikam-3.0.0.no-kdcraw.version-check/extra/kipi-plugins/CMakeLists.txt
|
Index: digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
||||||
--- digikam-3.0.0/extra/kipi-plugins/CMakeLists.txt 2013-02-07 00:52:03.000000000 +0100
|
===================================================================
|
||||||
+++ digikam-3.0.0.no-kdcraw.version-check/extra/kipi-plugins/CMakeLists.txt 2013-02-11 22:33:47.104155757 +0100
|
--- digikam-4.1.0.orig/extra/kipi-plugins/CMakeLists.txt
|
||||||
@@ -131,21 +131,23 @@
|
+++ digikam-4.1.0/extra/kipi-plugins/CMakeLists.txt
|
||||||
|
@@ -139,21 +139,23 @@ FIND_PACKAGE(Kdcraw RE
|
||||||
|
|
||||||
# Check the libkdcraw version
|
# Check the libkdcraw version
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae
|
|
||||||
size 68931371
|
|
3
digikam-4.1.0.tar.bz2
Normal file
3
digikam-4.1.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f9318439eb03dd8c972fef570f56aa7f4b7b424db244299eb4f59e46593782de
|
||||||
|
size 68921092
|
@ -1,7 +1,7 @@
|
|||||||
Index: core/libs/3rdparty/cimg/CImg.h
|
Index: core/libs/3rdparty/cimg/CImg.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- core/libs/3rdparty/cimg/CImg.h.orig 2011-12-04 22:40:13.000000000 +0100
|
--- core/libs/3rdparty/cimg/CImg.h.orig
|
||||||
+++ core/libs/3rdparty/cimg/CImg.h 2011-12-12 10:45:04.129281874 +0100
|
+++ core/libs/3rdparty/cimg/CImg.h
|
||||||
@@ -5673,7 +5673,7 @@ namespace cimg_library {
|
@@ -5673,7 +5673,7 @@ namespace cimg_library {
|
||||||
if (usage) {
|
if (usage) {
|
||||||
cimg_std::fprintf(cimg_stdout,"\n %s%s%s",cimg::t_red,cimg::basename(argv[0]),cimg::t_normal);
|
cimg_std::fprintf(cimg_stdout,"\n %s%s%s",cimg::t_red,cimg::basename(argv[0]),cimg::t_normal);
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 30 18:24:44 UTC 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
- Update to 4.1.0
|
||||||
|
* Add Gelocation indicator over thumbnails when image has GPS coordinateds.
|
||||||
|
* Thumbnails from icon-view now support large resolution monitor (WQHD or 4K). Thumbs size can be set until 512x512 px instead 256x256 px.
|
||||||
|
* many many bugfixes, see NEWS file for more details
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue May 20 12:32:42 UTC 2014 - hrvoje.senjan@gmail.com
|
Tue May 20 12:32:42 UTC 2014 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: digikam
|
Name: digikam
|
||||||
Version: 4.0.0
|
Version: 4.1.0
|
||||||
Release: 0
|
Release: 0
|
||||||
%define rversion 4.0.0
|
%define rversion 4.1.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
|
||||||
@ -330,7 +330,7 @@ popd
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,README.FACE,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW}
|
%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW}
|
||||||
%{_kde4_applicationsdir}/digikam.desktop
|
%{_kde4_applicationsdir}/digikam.desktop
|
||||||
%{_kde4_applicationsdir}/showfoto.desktop
|
%{_kde4_applicationsdir}/showfoto.desktop
|
||||||
%{_kde4_appsdir}/digikam/
|
%{_kde4_appsdir}/digikam/
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
--- CMakeLists.txt 2012-01-03 01:42:09.000000000 +0100
|
Index: CMakeLists.txt
|
||||||
+++ CMakeLists.txt 2012-01-05 13:49:28.920827859 +0100
|
===================================================================
|
||||||
|
--- CMakeLists.txt.orig
|
||||||
|
+++ CMakeLists.txt
|
||||||
@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH
|
@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH
|
||||||
${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
|
${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
|
||||||
${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
|
${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
|
||||||
@ -16,8 +18,10 @@
|
|||||||
|
|
||||||
ADD_SUBDIRECTORY(extra)
|
ADD_SUBDIRECTORY(extra)
|
||||||
ADD_SUBDIRECTORY(core)
|
ADD_SUBDIRECTORY(core)
|
||||||
--- extra/CMakeLists.txt 2012-01-03 01:31:52.000000000 +0100
|
Index: extra/CMakeLists.txt
|
||||||
+++ extra/CMakeLists.txt 2012-01-05 13:49:38.665828606 +0100
|
===================================================================
|
||||||
|
--- extra/CMakeLists.txt.orig
|
||||||
|
+++ extra/CMakeLists.txt
|
||||||
@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS})
|
@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS})
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Index: extra/kipi-plugins/gpssync/CMakeLists.txt
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig
|
--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig
|
||||||
+++ extra/kipi-plugins/gpssync/CMakeLists.txt
|
+++ extra/kipi-plugins/gpssync/CMakeLists.txt
|
||||||
@@ -32,10 +32,8 @@ SET(kipiplugin_gpssync_PART_SRCS
|
@@ -34,10 +34,8 @@ SET(kipiplugin_gpssync_PART_SRCS
|
||||||
|
|
||||||
IF(KDE4_BUILD_TESTS)
|
IF(KDE4_BUILD_TESTS)
|
||||||
INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed")
|
INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed")
|
||||||
|
Loading…
Reference in New Issue
Block a user