[packages/exiv2] - updated to 0.27.4 - updated no-xmpsdk-install patch - removed obsolete cmake,compiler_flags patche
qboosh
qboosh at pld-linux.org
Wed Aug 18 17:33:13 CEST 2021
commit 64230d0fc23955f74aed5361849747178ef0b68f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Aug 18 17:37:21 2021 +0200
- updated to 0.27.4
- updated no-xmpsdk-install patch
- removed obsolete cmake,compiler_flags patches
cmake.patch | 12 ------------
compiler_flags.patch | 31 -------------------------------
exiv2-no-xmpsdk-install.patch | 16 +++++++++-------
exiv2.spec | 10 +++-------
4 files changed, 12 insertions(+), 57 deletions(-)
---
diff --git a/exiv2.spec b/exiv2.spec
index 1c18405..c5601bc 100644
--- a/exiv2.spec
+++ b/exiv2.spec
@@ -6,16 +6,14 @@
Summary: EXIF and IPTC metadata manipulation tools
Summary(pl.UTF-8): Narzędzia do obróbki metadanych EXIF i IPTC
Name: exiv2
-Version: 0.27.3
+Version: 0.27.4
Release: 1
License: GPL v2+
Group: Applications/Graphics
#Source0Download: https://www.exiv2.org/download.html
Source0: https://www.exiv2.org/builds/%{name}-%{version}-Source.tar.gz
-# Source0-md5: 68a59595e8617284b2e1eee528ae1f77
-Patch0: cmake.patch
-Patch1: %{name}-no-xmpsdk-install.patch
-Patch2: compiler_flags.patch
+# Source0-md5: 15c24498a7d6abd171ae525574f98efb
+Patch0: %{name}-no-xmpsdk-install.patch
URL: https://www.exiv2.org/
BuildRequires: cmake >= 3.3.2
%{?with_curl:BuildRequires: curl-devel}
@@ -65,8 +63,6 @@ Pliki programistyczne biblioteki do obróbki metadanych EXIF i IPTC.
%prep
%setup -q -n %{name}-%{version}-Source
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
install -d build
diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644
index 771c3c9..0000000
--- a/cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- exiv2-0.27.1-Source/cmake/exiv2.pc.in.orig 2019-07-24 21:28:15.100120602 +0200
-+++ exiv2-0.27.1-Source/cmake/exiv2.pc.in 2019-07-24 21:29:32.043037100 +0200
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: exiv2
- Description: @PROJECT_DESCRIPTION@
diff --git a/compiler_flags.patch b/compiler_flags.patch
deleted file mode 100644
index af74c71..0000000
--- a/compiler_flags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- exiv2-0.27.3-Source/cmake/compilerFlags.cmake.orig 2020-06-30 15:33:22.000000000 +0200
-+++ exiv2-0.27.3-Source/cmake/compilerFlags.cmake 2020-11-04 00:53:19.007731270 +0100
-@@ -1,4 +1,5 @@
- # These flags applies to exiv2lib, the applications, and to the xmp code
-+include(CheckCXXCompilerFlag)
-
- if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
- if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
-@@ -25,13 +26,16 @@
-
- # This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
- if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
-- if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-- add_compile_options(-fstack-clash-protection -fcf-protection)
-+ check_cxx_compiler_flag(-fstack-clash-protection HAS_FSTACK_CLASH_PROTECTION)
-+ check_cxx_compiler_flag(-fcf-protection HAS_FCF_PROTECTION)
-+ check_cxx_compiler_flag(-fstack-protector-strong HAS_FSTACK_PROTECTOR_STRONG)
-+ if(HAS_FSTACK_CLASH_PROTECTION)
-+ add_compile_options(-fstack-clash-protection)
- endif()
--
-- if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8
-- OR (COMPILER_IS_CLANG AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 3.7) # Not in Clang 3.4.2
-- )
-+ if(HAS_FCF_PROTECTION)
-+ add_compile_options(-fcf-protection)
-+ endif()
-+ if(HAS_FSTACK_PROTECTOR_STRONG)
- add_compile_options(-fstack-protector-strong)
- endif()
- endif()
diff --git a/exiv2-no-xmpsdk-install.patch b/exiv2-no-xmpsdk-install.patch
index f86c9d1..459c68f 100644
--- a/exiv2-no-xmpsdk-install.patch
+++ b/exiv2-no-xmpsdk-install.patch
@@ -1,12 +1,14 @@
---- exiv2-0.27.1-Source/xmpsdk/CMakeLists.txt.orig 2019-07-24 21:30:12.869482590 +0200
-+++ exiv2-0.27.1-Source/xmpsdk/CMakeLists.txt 2019-07-24 21:31:52.508942797 +0200
-@@ -54,9 +54,3 @@
+We package shared, not static libexiv2 library, so libexiv2-xmp.a is useless.
+--- exiv2-0.27.4-Source/xmpsdk/CMakeLists.txt.orig 2021-08-18 17:34:28.084628433 +0200
++++ exiv2-0.27.4-Source/xmpsdk/CMakeLists.txt 2021-08-18 17:35:29.887626951 +0200
+@@ -48,10 +48,3 @@ endif()
if (BUILD_SHARED_LIBS)
set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON)
endif()
-
--# 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel)
--install(TARGETS exiv2-xmp EXPORT exiv2Config
-- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-# The private dependencies of a static library still need to be exported because they are needed to properly link the consumers of the static library.
+-install(TARGETS exiv2-xmp EXPORT exiv2Config
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/exiv2.git/commitdiff/64230d0fc23955f74aed5361849747178ef0b68f
More information about the pld-cvs-commit
mailing list