[packages/digikam] - up to 4.5.0; don't package regular kde libs
arekm
arekm at pld-linux.org
Thu Dec 11 22:43:06 CET 2014
commit efe5eb2e2623be3b1b3d368b1c0672b99d877146
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Dec 11 22:42:59 2014 +0100
- up to 4.5.0; don't package regular kde libs
digikam-libs.patch | 45 +++++++++++++++++
digikam.spec | 21 ++++----
...exiv2-version-for-AltLangStrEdit-textEdit.patch | 59 ----------------------
3 files changed, 54 insertions(+), 71 deletions(-)
---
diff --git a/digikam.spec b/digikam.spec
index c9f954a..b4ed691 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -5,15 +5,15 @@
Summary: A KDE frontend for gphoto2
Summary(pl.UTF-8): Interfejs KDE do gphoto2
Name: digikam
-Version: 4.4.0
-Release: 6
+Version: 4.5.0
+Release: 1
License: GPL
Group: X11/Applications/Graphics
Source0: http://download.kde.org/stable/digikam/%{name}-%{version}.tar.bz2
-# Source0-md5: ffafd3d4fe7e920830fe7a7452852542
+# Source0-md5: 5fb3ab7b7c765bc7a310ca87c8e37220
Patch0: %{name}-build.patch
Patch1: sendimages-icedove.diff
-Patch2: upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
+Patch2: %{name}-libs.patch
URL: http://www.digikam.org/
BuildRequires: ImageMagick-devel
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -89,7 +89,7 @@ Interfejs KDE do gphoto2 - pliki nagłówkowe.
%patch2 -p1
# use kde one
-mv cmake/modules/FindKipi.cmake cmake/modules/FindKipi.cmake.ORIG
+rm cmake/modules/FindK{Sane,exiv2,ipi}.cmake
%build
install -d build
@@ -97,7 +97,7 @@ cd build
%cmake \
-DSERVERCMD_MYSQL=%{_sbindir}/mysqld \
-DENABLE_RAWSPEED=ON \
- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF \
+ -DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS:BOOL=ON \
../
%{__make}
@@ -144,9 +144,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libdigikamdatabase.so.*.*.*
#%attr(755,root,root) %ghost %{_libdir}/libdigikamcore.so.4
%attr(755,root,root) %{_libdir}/libkface.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkface.so.2
+%attr(755,root,root) %ghost %{_libdir}/libkface.so.3
%attr(755,root,root) %{_libdir}/libkgeomap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libkgeomap.so.1
+%attr(755,root,root) %ghost %{_libdir}/libkgeomap.so.2
%attr(755,root,root) %{_libdir}/libkipiplugins.so.*.*.*
#%attr(755,root,root) %ghost %{_libdir}/libkipiplugins.so.4
%attr(755,root,root) %{_libdir}/libmediawiki.so.*.*.*
@@ -217,10 +217,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/libkgeomap.pc
%{_pkgconfigdir}/libmediawiki.pc
%{_datadir}/apps/cmake/modules/FindKGeoMap.cmake
-%{_datadir}/apps/cmake/modules/FindKface.cmake
%{_datadir}/apps/cmake/modules/FindMediawiki.cmake
+%{_libdir}/cmake/Kface-*
%{_libdir}/cmake/LibKVkontakte
-%{_includedir}/libkface
%{_includedir}/libkvkontakte
-%{_includedir}/libkgeomap
-%{_includedir}/libmediawiki
diff --git a/digikam-libs.patch b/digikam-libs.patch
new file mode 100644
index 0000000..e722913
--- /dev/null
+++ b/digikam-libs.patch
@@ -0,0 +1,45 @@
+--- digikam-4.5.0/CMakeLists.txt~ 2014-11-12 11:50:30.000000000 +0100
++++ digikam-4.5.0/CMakeLists.txt 2014-12-11 22:20:42.154363495 +0100
+@@ -115,15 +115,6 @@
+ ENABLE_TESTING()
+ endif()
+
+-# Make sure that the FindXXX modules of the local libraries are found
+-if(ENABLE_PRIVATE_SHAREDLIBS)
+- # prepend our own FindXXX modules to CMAKE_MODULE_PATH
+- set(CMAKE_MODULE_PATH
+- ${CMAKE_SOURCE_DIR}/extra/libkdcraw/cmake/modules
+- ${CMAKE_MODULE_PATH}
+- )
+-endif()
+-
+ # prepend our own FindXXX modules to CMAKE_MODULE_PATH
+ set(CMAKE_MODULE_PATH
+ ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules
+@@ -135,11 +126,7 @@
+
+ if(ENABLE_PRIVATE_SHAREDLIBS)
+ # from kdegraphics/libs
+- 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)
+--- digikam-4.5.0/extra/CMakeLists.txt~ 2014-11-12 11:50:30.000000000 +0100
++++ digikam-4.5.0/extra/CMakeLists.txt 2014-12-11 22:24:58.557737363 +0100
+@@ -9,12 +9,7 @@
+
+ if(${ENABLE_PRIVATE_SHAREDLIBS})
+
+- # from kdegraphics/libs
+- add_subdirectory(libkipi)
+- add_subdirectory(libkexiv2)
+- add_subdirectory(libkdcraw)
+ add_subdirectory(libkface)
+- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane)
+
+ # from extragear/libs
+ add_subdirectory(libkgeomap)
diff --git a/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch b/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
deleted file mode 100644
index 0fc7784..0000000
--- a/upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f6945f23e0ed1e11f26e2c7e62b02baa8cfa640e Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at 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)
----
- core/libs/imageproperties/captionedit.cpp | 2 +-
- core/libs/imageproperties/imagedescedittab.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/core/libs/imageproperties/captionedit.cpp b/core/libs/imageproperties/captionedit.cpp
-index 88413fc..70bdb6d 100644
---- a/core/libs/imageproperties/captionedit.cpp
-+++ b/core/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/core/libs/imageproperties/imagedescedittab.cpp b/core/libs/imageproperties/imagedescedittab.cpp
-index ebfbae1..3d12777 100644
---- a/core/libs/imageproperties/imagedescedittab.cpp
-+++ b/core/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
- }
---
-2.1.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/digikam.git/commitdiff/efe5eb2e2623be3b1b3d368b1c0672b99d877146
More information about the pld-cvs-commit
mailing list