Updating link to change in openSUSE:Factory/digikam revision 131.0
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/digikam?expand=0&rev=558b63974ff3ad3bca8cd79e644824e2
This commit is contained in:
OBS User buildservice-autocommit
Git OBS Bridge
parent
0404602c81
commit
65744d0213
@ -1,59 +0,0 @@
|
|||||||
From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Pino Toscano <pino@kde.org>
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,80 +1,50 @@
|
|||||||
diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/core/CMakeLists.txt digikam-4.4.0/core/CMakeLists.txt
|
Index: digikam-4.5.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
|
--- digikam-4.5.0.orig/core/CMakeLists.txt
|
||||||
@@ -115,21 +115,23 @@
|
+++ digikam-4.5.0/core/CMakeLists.txt
|
||||||
|
@@ -125,20 +125,6 @@ DETECT_OPENCV(${OPENCV_MIN_VERSION} cor
|
||||||
|
|
||||||
# check the libkdcraw version
|
set(KDCRAW_MIN_VERSION "2.2.0")
|
||||||
|
|
||||||
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
-if(KDCRAW_VERSION)
|
||||||
+# TODO: find a proper fix
|
-
|
||||||
SET(KDCRAW_MIN_VERSION "2.2.0")
|
- message(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
||||||
|
- if(${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
||||||
|
- set(KDCRAW_FOUND FALSE)
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
-else()
|
||||||
|
-
|
||||||
|
- message(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
||||||
|
- set(KDCRAW_FOUND FALSE)
|
||||||
|
-
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
# -- check the libkgeomap version -----------------------------------------------------------------
|
||||||
|
|
||||||
-IF (KDCRAW_VERSION)
|
set(KGEOMAP_MIN_VERSION "3.0.0")
|
||||||
-
|
Index: digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt
|
||||||
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
===================================================================
|
||||||
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
--- digikam-4.5.0.orig/extra/kipi-plugins/CMakeLists.txt
|
||||||
- SET(KDCRAW_FOUND FALSE)
|
+++ digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt
|
||||||
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
@@ -75,20 +75,6 @@ if(KIPI_FOUND)
|
||||||
-
|
|
||||||
-ELSE (KDCRAW_VERSION)
|
|
||||||
-
|
|
||||||
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
||||||
- SET(KDCRAW_FOUND FALSE)
|
|
||||||
-
|
|
||||||
-ENDIF (KDCRAW_VERSION)
|
|
||||||
+# IF (KDCRAW_VERSION)
|
|
||||||
+#
|
|
||||||
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
||||||
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
+# SET(KDCRAW_FOUND FALSE)
|
|
||||||
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
+#
|
|
||||||
+# ELSE (KDCRAW_VERSION)
|
|
||||||
+#
|
|
||||||
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
||||||
+# SET(KDCRAW_FOUND FALSE)
|
|
||||||
+#
|
|
||||||
+# ENDIF (KDCRAW_VERSION)
|
|
||||||
|
|
||||||
# LCMS version 1 and 2 library handling
|
set(KDCRAW_MIN_VERSION "2.2.0")
|
||||||
# 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
|
- if(KDCRAW_VERSION)
|
||||||
|
-
|
||||||
|
- message(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
||||||
|
- if (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
||||||
|
- set(KDCRAW_FOUND FALSE)
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- else()
|
||||||
|
-
|
||||||
|
- message(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
||||||
|
- set(KDCRAW_FOUND FALSE)
|
||||||
|
-
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
# -- Optional dependencies detection required by some plugins -------------------------------------
|
||||||
|
|
||||||
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.
|
||||||
+# TODO: find a proper fix
|
|
||||||
SET(KDCRAW_MIN_VERSION "2.2.0")
|
|
||||||
|
|
||||||
-IF (KDCRAW_VERSION)
|
|
||||||
-
|
|
||||||
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
||||||
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
- SET(KDCRAW_FOUND FALSE)
|
|
||||||
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
-
|
|
||||||
-ELSE (KDCRAW_VERSION)
|
|
||||||
-
|
|
||||||
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
||||||
- SET(KDCRAW_FOUND FALSE)
|
|
||||||
-
|
|
||||||
-ENDIF (KDCRAW_VERSION)
|
|
||||||
+# IF (KDCRAW_VERSION)
|
|
||||||
+#
|
|
||||||
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
||||||
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
+# SET(KDCRAW_FOUND FALSE)
|
|
||||||
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
||||||
+#
|
|
||||||
+# ELSE (KDCRAW_VERSION)
|
|
||||||
+#
|
|
||||||
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
||||||
+# SET(KDCRAW_FOUND FALSE)
|
|
||||||
+#
|
|
||||||
+# ENDIF (KDCRAW_VERSION)
|
|
||||||
|
|
||||||
# Optional dependencies detection required by some plugins
|
|
||||||
MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.
|
|
||||||
|
|||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9
|
|
||||||
size 68871203
|
|
||||||
41
digikam-4.5.0-reenable-libs.patch
Normal file
41
digikam-4.5.0-reenable-libs.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
diff -U 3 -H -d -r -N -- digikam-4.5.0/CMakeLists.txt digikam-4.5.0.reenable-libs/CMakeLists.txt
|
||||||
|
--- digikam-4.5.0/CMakeLists.txt 2014-11-22 02:32:49.000000000 +0100
|
||||||
|
+++ digikam-4.5.0.reenable-libs/CMakeLists.txt 2014-11-22 02:35:30.463073062 +0100
|
||||||
|
@@ -137,13 +137,13 @@
|
||||||
|
set(KIPI_LOCAL_DIR extra/libkipi)
|
||||||
|
set(KEXIV2_LOCAL_DIR extra/libkexiv2)
|
||||||
|
set(KDCRAW_LOCAL_DIR extra/libkdcraw)
|
||||||
|
- set(KFACE_LOCAL_DIR extra/libkface)
|
||||||
|
set(KSANE_LOCAL_DIR extra/libksane)
|
||||||
|
|
||||||
|
#from extragear/libs
|
||||||
|
- set(KGEOMAP_LOCAL_DIR extra/libkgeomap)
|
||||||
|
- set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
|
||||||
|
endif()
|
||||||
|
+set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
|
||||||
|
+set(KGEOMAP_LOCAL_DIR extra/libkgeomap)
|
||||||
|
+set(KFACE_LOCAL_DIR extra/libkface)
|
||||||
|
|
||||||
|
add_subdirectory(extra)
|
||||||
|
add_subdirectory(core)
|
||||||
|
diff -U 3 -H -d -r -N -- digikam-4.5.0/extra/CMakeLists.txt digikam-4.5.0.reenable-libs/extra/CMakeLists.txt
|
||||||
|
--- digikam-4.5.0/extra/CMakeLists.txt 2014-11-22 02:35:41.679078762 +0100
|
||||||
|
+++ digikam-4.5.0.reenable-libs/extra/CMakeLists.txt 2014-11-22 02:36:00.840088484 +0100
|
||||||
|
@@ -13,13 +13,14 @@
|
||||||
|
add_subdirectory(libkipi)
|
||||||
|
add_subdirectory(libkexiv2)
|
||||||
|
add_subdirectory(libkdcraw)
|
||||||
|
- add_subdirectory(libkface)
|
||||||
|
MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane)
|
||||||
|
|
||||||
|
# from extragear/libs
|
||||||
|
- add_subdirectory(libkgeomap)
|
||||||
|
- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki)
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
+MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki)
|
||||||
|
+
|
||||||
|
+add_subdirectory(libkgeomap)
|
||||||
|
+add_subdirectory(libkface)
|
||||||
|
add_subdirectory(kipi-plugins)
|
||||||
3
digikam-4.5.0.tar.bz2
Normal file
3
digikam-4.5.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f27645dc7d7d9f1e73284fbc46120a7ae182c05e58e7cbfa6e6b44a541209e28
|
||||||
|
size 69330967
|
||||||
@ -1,3 +1,47 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 26 10:44:01 UTC 2014 - nico.kruber@gmail.com
|
||||||
|
|
||||||
|
- add obsoletes for libkface2 and libkgeomap1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Nov 22 01:41:03 UTC 2014 - nico.kruber@gmail.com
|
||||||
|
|
||||||
|
- add digikam-4.5.0-reenable-libs.patch to use some internal
|
||||||
|
libraries not yet available as extra packages
|
||||||
|
(libkface, libkgeomap, libmediawiki)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Nov 19 19:38:13 UTC 2014 - adrian@suse.de
|
||||||
|
|
||||||
|
- update to 4.5.0
|
||||||
|
kde#172295 digiKam has a hard dependency on Jasper library
|
||||||
|
kde#267789 Make face detection (kface) and geo tagging (kmap) optional features
|
||||||
|
kde#306767 ICONVIEW : thumb focus is lost after renaming
|
||||||
|
kde#315574 CORE : bad performance when Tag-related Sidebars (Tag management / Filter) are open
|
||||||
|
kde#326718 Clear text button on file rename does nothing
|
||||||
|
kde#326945 When build digikam from git and package libpgf is installed, no way to use internal digikam libpgf
|
||||||
|
kde#337422 EXIF thumbnail date information not updated when writing metadata to image
|
||||||
|
kde#337737 MYSQL : settings and installation windows freeze when valid mariadb/mysql db connection is available
|
||||||
|
kde#338407 Import not showing image thumbnails for certain Canon cameras
|
||||||
|
kde#339154 digiKam goes into infinite loop when working with tags/captions information tab templates
|
||||||
|
kde#339180 cmake and/or compiler pick up libkgeomap header files from previous version
|
||||||
|
kde#339524 Identity class miss d private container to improve binary compatibility
|
||||||
|
kde#339806 Compiler error: ambiguous reference to ratio variable
|
||||||
|
kde#339903 Select 'recent' albums containing MOV or .xcf(Gimp) files. Immediate crash occurs.
|
||||||
|
kde#340030 KIPI-plugins can not be deactivated on non-English locales
|
||||||
|
kde#340141 White Balance: Unable to specify exposure compensation > x.5
|
||||||
|
kde#340186 GROUP : Wallet icon for grouped photos is conceptually confusing
|
||||||
|
kde#340295 make fails on imagedescedittab.cpp has no member named 'textEdit'
|
||||||
|
kde#340439 No auto-rotation/flip Images after download
|
||||||
|
kde#340443 Advanced slideshow shows not all pictures under certain conditions
|
||||||
|
kde#340487 Add Album Category as a search criteria
|
||||||
|
kde#340581 Ratings with rating == 0 cannot be selected on the left sidebar
|
||||||
|
kde#340476 Floating Cards brings digiKam with non-English locales to crash and missing parameter text
|
||||||
|
kde#340811 Wrap album caption
|
||||||
|
- remove upstream patches:
|
||||||
|
- kde#89156.patch
|
||||||
|
- digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Nov 3 13:47:10 UTC 2014 - hrvoje.senjan@gmail.com
|
Mon Nov 3 13:47:10 UTC 2014 - hrvoje.senjan@gmail.com
|
||||||
|
|
||||||
|
|||||||
52
digikam.spec
52
digikam.spec
@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: digikam
|
Name: digikam
|
||||||
Version: 4.4.0
|
Version: 4.5.0
|
||||||
Release: 0
|
Release: 0
|
||||||
%define rversion 4.4.0
|
%define rversion 4.5.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
|
||||||
@ -33,10 +33,8 @@ Patch3: remove-gplv2-only.patch
|
|||||||
Patch5: digikam_no_build_vkontakte.diff
|
Patch5: digikam_no_build_vkontakte.diff
|
||||||
# PATCH-FIX-UPSTREAM digikam-4.4.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-4.4.0.no-kdcraw.version-check.patch
|
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()
|
# PATCH-FIX-OPENSUSE digikam-4.5.0-reenable-libs.patch nkruber@gmail.com -- use some of the internal libraries (libkface, libkgeomap, libmediawiki)
|
||||||
Patch7: digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
|
Patch7: digikam-4.5.0-reenable-libs.patch
|
||||||
# PATCH-FIX-UPSTREAM kde#89156.patch -- avoid deadlocks with external MySQL/MariaDB, kde#89156
|
|
||||||
Patch8: kde#89156.patch
|
|
||||||
BuildRequires: ImageMagick-devel
|
BuildRequires: ImageMagick-devel
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: boost-devel
|
BuildRequires: boost-devel
|
||||||
@ -164,12 +162,12 @@ applications.
|
|||||||
Summary: Development files for libkgeomap
|
Summary: Development files for libkgeomap
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: Development/Libraries/KDE
|
Group: Development/Libraries/KDE
|
||||||
Requires: libkgeomap1 = %{version}
|
Requires: libkgeomap2 = %{version}
|
||||||
|
|
||||||
%description -n libkgeomap-devel
|
%description -n libkgeomap-devel
|
||||||
This package contains development files for libkgeomap.
|
This package contains development files for libkgeomap.
|
||||||
|
|
||||||
%package -n libkgeomap1
|
%package -n libkgeomap2
|
||||||
Summary: World-Map Library interface for KDE
|
Summary: World-Map Library interface for KDE
|
||||||
License: GPL-2.0+
|
License: GPL-2.0+
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
@ -178,8 +176,10 @@ Recommends: marble
|
|||||||
# libkgeomap was last used at openSUSE 12.1 (version 2.2.0)
|
# libkgeomap was last used at openSUSE 12.1 (version 2.2.0)
|
||||||
Provides: libkgeomap = %{version}
|
Provides: libkgeomap = %{version}
|
||||||
Obsoletes: libkgeomap < %{version}
|
Obsoletes: libkgeomap < %{version}
|
||||||
|
# libkgeomap1 was last used at openSUSE 13.2 (version 4.4.0)
|
||||||
|
Obsoletes: libkgeomap1
|
||||||
|
|
||||||
%description -n libkgeomap1
|
%description -n libkgeomap2
|
||||||
Libkgeomap is a wrapper around different world-map components, to browse and
|
Libkgeomap is a wrapper around different world-map components, to browse and
|
||||||
arrange photos over a map.
|
arrange photos over a map.
|
||||||
Currently supported map engine are:
|
Currently supported map engine are:
|
||||||
@ -192,17 +192,19 @@ This library is used by kipi-plugins, digiKam and other kipi host programs.
|
|||||||
Summary: Development files for libkface
|
Summary: Development files for libkface
|
||||||
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||||
Group: Development/Libraries/KDE
|
Group: Development/Libraries/KDE
|
||||||
Requires: libkface2 = %{version}
|
Requires: libkface3 = %{version}
|
||||||
|
|
||||||
%description -n libkface-devel
|
%description -n libkface-devel
|
||||||
This package contains development files for libkface.
|
This package contains development files for libkface.
|
||||||
|
|
||||||
%package -n libkface2
|
%package -n libkface3
|
||||||
Summary: Wrapper around LibFace to perform face recognition and detection over pictures
|
Summary: Wrapper around LibFace to perform face recognition and detection over pictures
|
||||||
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
|
# libkface2 was last used at openSUSE 13.2 (version 4.4.0)
|
||||||
|
Obsoletes: libkface2
|
||||||
|
|
||||||
%description -n libkface2
|
%description -n libkface3
|
||||||
Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and
|
Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and
|
||||||
detection over pictures.
|
detection over pictures.
|
||||||
|
|
||||||
@ -242,8 +244,7 @@ This package contains the development files for libmediawiki.
|
|||||||
%patch3
|
%patch3
|
||||||
%patch5
|
%patch5
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -d core -p1
|
%patch7 -p1
|
||||||
%patch8 -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')
|
||||||
@ -326,13 +327,13 @@ popd
|
|||||||
|
|
||||||
%postun -n kipi-plugins -p /sbin/ldconfig
|
%postun -n kipi-plugins -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libkgeomap1 -p /sbin/ldconfig
|
%post -n libkgeomap2 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libkgeomap1 -p /sbin/ldconfig
|
%postun -n libkgeomap2 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libkface2 -p /sbin/ldconfig
|
%post -n libkface3 -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -n libkface2 -p /sbin/ldconfig
|
%postun -n libkface3 -p /sbin/ldconfig
|
||||||
|
|
||||||
%post -n libmediawiki1 -p /sbin/ldconfig
|
%post -n libmediawiki1 -p /sbin/ldconfig
|
||||||
|
|
||||||
@ -340,7 +341,7 @@ popd
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW}
|
%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README}
|
||||||
%{_kde4_applicationsdir}/digikam.desktop
|
%{_kde4_applicationsdir}/digikam.desktop
|
||||||
%{_kde4_applicationsdir}/showfoto.desktop
|
%{_kde4_applicationsdir}/showfoto.desktop
|
||||||
%{_kde4_appsdir}/digikam/
|
%{_kde4_appsdir}/digikam/
|
||||||
@ -438,7 +439,7 @@ popd
|
|||||||
|
|
||||||
%files -n libkgeomap-devel
|
%files -n libkgeomap-devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO,kmap2kgeomap-TODO.txt}
|
%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO}
|
||||||
%{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake
|
%{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake
|
||||||
%{_kde4_includedir}/libkgeomap/
|
%{_kde4_includedir}/libkgeomap/
|
||||||
%{_kde4_libdir}/pkgconfig/libkgeomap.pc
|
%{_kde4_libdir}/pkgconfig/libkgeomap.pc
|
||||||
@ -447,15 +448,15 @@ popd
|
|||||||
%files -n libkgeomap-lang -f libkgeomap.lang
|
%files -n libkgeomap-lang -f libkgeomap.lang
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
%files -n libkgeomap1
|
%files -n libkgeomap2
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_kde4_appsdir}/libkgeomap/
|
%{_kde4_appsdir}/libkgeomap/
|
||||||
%{_kde4_libdir}/libkgeomap.so.1*
|
%{_kde4_libdir}/libkgeomap.so.2*
|
||||||
|
|
||||||
%files -n libkface2
|
%files -n libkface3
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_kde4_appsdir}/libkface
|
%{_kde4_appsdir}/libkface
|
||||||
%{_kde4_libdir}/libkface.so.2*
|
%{_kde4_libdir}/libkface.so.3*
|
||||||
|
|
||||||
%files -n libkface-devel
|
%files -n libkface-devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
@ -463,7 +464,8 @@ popd
|
|||||||
%{_kde4_libdir}/libkface.so
|
%{_kde4_libdir}/libkface.so
|
||||||
%{_kde4_includedir}/libkface/
|
%{_kde4_includedir}/libkface/
|
||||||
%{_kde4_libdir}/pkgconfig/libkface.pc
|
%{_kde4_libdir}/pkgconfig/libkface.pc
|
||||||
%{_kde4_appsdir}/cmake/modules/FindKface.cmake
|
%dir %{_kde4_libdir}/cmake/Kface-3.5.0/
|
||||||
|
%{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake
|
||||||
|
|
||||||
%files -n libmediawiki1
|
%files -n libmediawiki1
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
|||||||
@ -2,31 +2,31 @@ Index: CMakeLists.txt
|
|||||||
===================================================================
|
===================================================================
|
||||||
--- CMakeLists.txt.orig
|
--- CMakeLists.txt.orig
|
||||||
+++ CMakeLists.txt
|
+++ CMakeLists.txt
|
||||||
@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH
|
@@ -128,7 +128,6 @@ endif()
|
||||||
${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
|
set(CMAKE_MODULE_PATH
|
||||||
${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
|
${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
|
||||||
${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules
|
${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules
|
||||||
- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules
|
- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules
|
||||||
${CMAKE_SOURCE_DIR}/cmake/modules
|
${CMAKE_SOURCE_DIR}/cmake/modules
|
||||||
${CMAKE_MODULE_PATH}
|
${CMAKE_MODULE_PATH}
|
||||||
)
|
)
|
||||||
@@ -149,7 +148,6 @@ ENDIF()
|
@@ -144,7 +143,6 @@ if(ENABLE_PRIVATE_SHAREDLIBS)
|
||||||
SET(KFACE_LOCAL_DIR extra/libkface)
|
#from extragear/libs
|
||||||
SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
|
set(KGEOMAP_LOCAL_DIR extra/libkgeomap)
|
||||||
SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
|
set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
|
||||||
-SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
|
- set(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
|
||||||
|
endif()
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(extra)
|
add_subdirectory(extra)
|
||||||
ADD_SUBDIRECTORY(core)
|
|
||||||
Index: extra/CMakeLists.txt
|
Index: extra/CMakeLists.txt
|
||||||
===================================================================
|
===================================================================
|
||||||
--- extra/CMakeLists.txt.orig
|
--- extra/CMakeLists.txt.orig
|
||||||
+++ extra/CMakeLists.txt
|
+++ extra/CMakeLists.txt
|
||||||
@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS})
|
@@ -19,7 +19,6 @@ if(${ENABLE_PRIVATE_SHAREDLIBS})
|
||||||
ENDIF()
|
# from extragear/libs
|
||||||
|
add_subdirectory(libkgeomap)
|
||||||
|
MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki)
|
||||||
|
- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte)
|
||||||
|
|
||||||
MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki)
|
endif()
|
||||||
-MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte)
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(libkgeomap)
|
|
||||||
ADD_SUBDIRECTORY(libkface)
|
|
||||||
|
|||||||
@ -1,86 +0,0 @@
|
|||||||
From: Gilles Caulier <caulier.gilles@gmail.com>
|
|
||||||
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 @@
|
|
||||||
"<p><b>MySQL</b> 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.</p>"));
|
|
||||||
+
|
|
||||||
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; i<databaseType->count(); ++i)
|
|
||||||
{
|
|
||||||
//kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << databaseType->itemData(i)
|
|
||||||
@ -1,10 +1,12 @@
|
|||||||
--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig 2014-08-05 16:19:57.369791501 +0200
|
Index: extra/kipi-plugins/gpssync/CMakeLists.txt
|
||||||
+++ extra/kipi-plugins/gpssync/CMakeLists.txt 2014-08-05 16:20:37.535336329 +0200
|
===================================================================
|
||||||
@@ -37,7 +37,6 @@
|
--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig
|
||||||
#ADD_DEFINITIONS(-DGPSSYNC_MODELTEST)
|
+++ extra/kipi-plugins/gpssync/CMakeLists.txt
|
||||||
SET(kipiplugin_gpssync_PART_SRCS
|
@@ -43,7 +43,6 @@ if(KDE4_BUILD_TESTS)
|
||||||
|
#add_definitions(-DGPSSYNC_MODELTEST)
|
||||||
|
set(kipiplugin_gpssync_PART_SRCS
|
||||||
${kipiplugin_gpssync_PART_SRCS}
|
${kipiplugin_gpssync_PART_SRCS}
|
||||||
- ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp
|
- ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp
|
||||||
)
|
)
|
||||||
ENDIF(KDE4_BUILD_TESTS)
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user