commit 15c9ac7fde63722b33073ab0675462285026b97b
Author: Adam Osuchowski <[email protected]>
Date: Fri Mar 1 13:04:33 2019 +0100
- exiv2 version #define's moved to other file
kde4-kdelibs-exiv2.patch | 15 +++++++++++++++
kde4-kdelibs.spec | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
---
diff --git a/kde4-kdelibs.spec b/kde4-kdelibs.spec
index 78bbcc4..35bf87e 100644
--- a/kde4-kdelibs.spec
+++ b/kde4-kdelibs.spec
@@ -17,7 +17,7 @@ Summary(ru.UTF-8): K Desktop Environment - Библиотеки
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kde4-kdelibs
Version: 4.14.37
-Release: 1
+Release: 2
License: LGPL
Group: X11/Libraries
Source0:
http://download.kde.org/%{_state}/applications/17.08.2/src/%{orgname}-%{version}.tar.xz
@@ -32,6 +32,7 @@ Patch4: %{name}-devicemanager_remove.patch
Patch5: kde4-kdelibs-sync.patch
Patch6: kde4-kdelibs-pld-flags.patch
Patch7: strigi-64bit.patch
+Patch8: %{name}-exiv2.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.2.2
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -248,6 +249,7 @@ Цей пакет містить хедери, необхідні для ком
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%if "%{pld_release}" == "ti"
sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
diff --git a/kde4-kdelibs-exiv2.patch b/kde4-kdelibs-exiv2.patch
new file mode 100644
index 0000000..f5985c1
--- /dev/null
+++ b/kde4-kdelibs-exiv2.patch
@@ -0,0 +1,15 @@
+diff -ruNp kdelibs-4.14.37.orig/cmake/modules/FindExiv2.cmake
kdelibs-4.14.37/cmake/modules/FindExiv2.cmake
+--- kdelibs-4.14.37.orig/cmake/modules/FindExiv2.cmake 2017-10-08
04:44:24.000000000 +0200
++++ kdelibs-4.14.37/cmake/modules/FindExiv2.cmake 2019-03-01
12:53:02.325928576 +0100
+@@ -55,9 +55,9 @@ find_library(EXIV2_LIBRARY NAMES exiv2 l
+ )
+
+
+-# Get the version number from exiv2/version.hpp and store it in the cache:
++# Get the version number from exiv2/exv_conf.h and store it in the cache:
+ if(EXIV2_INCLUDE_DIR AND NOT EXIV2_VERSION)
+- file(READ ${EXIV2_INCLUDE_DIR}/exiv2/version.hpp EXIV2_VERSION_CONTENT)
++ file(READ ${EXIV2_INCLUDE_DIR}/exiv2/exv_conf.h EXIV2_VERSION_CONTENT)
+ string(REGEX MATCH "#define EXIV2_MAJOR_VERSION +\\( *([0-9]+) *\\)"
_dummy "${EXIV2_VERSION_CONTENT}")
+ set(EXIV2_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdelibs.git/commitdiff/15c9ac7fde63722b33073ab0675462285026b97b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
