From 1c9d49c96fb3a2375b99ceeaabb25d90181b933a Mon Sep 17 00:00:00 2001 From: nucleo Date: Nov 14 2014 11:30:59 +0000 Subject: enable libkface, libkgeomap, libmediawiki, libkvkontakte --- diff --git a/digikam-4.5.0-enable-libs.patch b/digikam-4.5.0-enable-libs.patch new file mode 100644 index 0000000..5c7ab82 --- /dev/null +++ b/digikam-4.5.0-enable-libs.patch @@ -0,0 +1,38 @@ +--- digikam-4.5.0/CMakeLists.txt 2014-11-12 12:50:30.000000000 +0200 ++++ digikam-4.5.0/CMakeLists.txt 2014-11-14 13:26:00.056758672 +0200 +@@ -138,14 +138,14 @@ if(ENABLE_PRIVATE_SHAREDLIBS) + 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) ++endif() ++ set(KFACE_LOCAL_DIR extra/libkface) + + #from extragear/libs + set(KGEOMAP_LOCAL_DIR extra/libkgeomap) + set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) + set(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +-endif() + + add_subdirectory(extra) + add_subdirectory(core) +--- digikam-4.5.0/extra/CMakeLists.txt 2014-11-12 12:50:30.000000000 +0200 ++++ digikam-4.5.0/extra/CMakeLists.txt 2014-11-14 13:25:29.063070249 +0200 +@@ -13,14 +13,14 @@ if(${ENABLE_PRIVATE_SHAREDLIBS}) + add_subdirectory(libkipi) + add_subdirectory(libkexiv2) + add_subdirectory(libkdcraw) +- add_subdirectory(libkface) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) ++endif() ++ add_subdirectory(libkface) + + # from extragear/libs + add_subdirectory(libkgeomap) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) + +-endif() + + add_subdirectory(kipi-plugins) diff --git a/digikam.spec b/digikam.spec index 182a3f7..c1a5d82 100644 --- a/digikam.spec +++ b/digikam.spec @@ -21,6 +21,10 @@ ExcludeArch: ppc64 # TODO: upstream me Source1: digikam-import.desktop +# build only libkface, libkgeomap, libmediawiki, libkvkontakte +#-DDIGIKAMSC_USE_PRIVATE_SHAREDLIBS=ON enables also libkipi, libkexiv2, libkdcraw, libksane +# https://bugs.kde.org/show_bug.cgi?id=340945 +Patch0: digikam-4.5.0-enable-libs.patch ## upstreamable patches ## upstream patches @@ -31,6 +35,8 @@ BuildRequires: doxygen BuildRequires: gettext BuildRequires: baloo-devel BuildRequires: kfilemetadata-devel +# for DLNAExport +BuildRequires: qtsoap-devel # marble integration, http://bugzilla.redhat.com/470578 BuildRequires: marble-devel >= 1:4.6.80 # updated FindKipi.cmake https://bugs.kde.org/show_bug.cgi?id=307213 @@ -232,6 +238,7 @@ BuildArch: noarch %prep %setup -q -n %{name}-%{version}%{?pre:-%{pre}} +%patch0 -p1 -b .enable-libs ## HACK to allow building with older opencv (for now), see # https://bugzilla.redhat.com/show_bug.cgi?id=1119036