Attachment #226029 for bug #256803

Lines 1-7 Link Here

(-)b/graphics/exiv2/Makefile (-2 / +4 lines)
1	# Created by: Michael Johnson <ahze@ahze.net>	1	# Created by: Michael Johnson <ahze@ahze.net>
2		2
3	PORTNAME= exiv2	3	PORTNAME= exiv2
4	DISTVERSION= 0.27.3	4	DISTVERSION= 0.27.4
5	DISTVERSIONSUFFIX= -Source	5	DISTVERSIONSUFFIX= -Source
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= graphics	7	CATEGORIES= graphics
Lines 18-24 TEST_DEPENDS= bash:shells/bash Link Here
18	TEST_LIB_DEPENDS= libgtest.so:devel/googletest	18	TEST_LIB_DEPENDS= libgtest.so:devel/googletest
19		19
20	USES= cmake compiler:c++11-lang cpe dos2unix gettext-tools pathfix \	20	USES= cmake compiler:c++11-lang cpe dos2unix gettext-tools pathfix \
21	python:3.5+,test localbase:ldflags	21	python:3.6+,test localbase:ldflags
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23	DOS2UNIX_FILES= cmake/compilerFlags.cmake	23	DOS2UNIX_FILES= cmake/compilerFlags.cmake
24		24
Lines 51-56 LDFLAGS_mips= -lintl Link Here
51	LDFLAGS_mips64= -lintl	51	LDFLAGS_mips64= -lintl
52		52
53	post-patch:	53	post-patch:
		54	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \
		55	${WRKSRC}/CMakeLists.txt
54	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \	56	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \
55	${WRKSRC}/test/Makefile	57	${WRKSRC}/test/Makefile
56	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \	58	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \

Lines 1-3 Link Here

(-)b/graphics/exiv2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1593677376	1	TIMESTAMP = 1624257042
2	SHA256 (exiv2-0.27.3-Source.tar.gz) = a79f5613812aa21755d578a297874fb59a85101e793edc64ec2c6bd994e3e778	2	SHA256 (exiv2-0.27.4-Source.tar.gz) = 84366dba7c162af9a7603bcd6c16f40fe0e9af294ba2fd2f66ffffb9fbec904e
3	SIZE (exiv2-0.27.3-Source.tar.gz) = 26447901	3	SIZE (exiv2-0.27.4-Source.tar.gz) = 32055837




--- cmake/compilerFlags.cmake.orig	2020-07-09 11:24:28 UTC
+++ cmake/compilerFlags.cmake
@@ -26,7 +26,11 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CY
         # 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)
+		if (NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "powerpc"))
+			add_compile_options(-fstack-clash-protection -fcf-protection)
+		else()
+			add_compile_options(-fstack-clash-protection)
+		endif()
             endif()
 
             if( (COMPILER_IS_GCC   AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8




From c069e36605f05e8e58bf964e5ecbde04efb90a20 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Fri, 18 Jun 2021 18:53:46 +0200
Subject: [PATCH] Fix build with gtest 1.11

INSTANTIATE_TYPED_TEST_CASE_P requires a non-empty prefix now
---
 unitTests/test_slice.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp
index ccf80d98d..59171cfcf 100644
--- unitTests/test_slice.cpp
+++ unitTests/test_slice.cpp
@@ -440,12 +440,12 @@ REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFro
                            constMethodsPreserveConst);
 
 typedef ::testing::Types<const std::vector<int>, std::vector<int>, int*, const int*> test_types_t;
-INSTANTIATE_TYPED_TEST_CASE_P(, slice, test_types_t);
+INSTANTIATE_TYPED_TEST_CASE_P(slice, slice, test_types_t);
 
 REGISTER_TYPED_TEST_CASE_P(mutableSlice, iterators, at);
 typedef ::testing::Types<std::vector<int>, int*> mut_test_types_t;
-INSTANTIATE_TYPED_TEST_CASE_P(, mutableSlice, mut_test_types_t);
+INSTANTIATE_TYPED_TEST_CASE_P(slice, mutableSlice, mut_test_types_t);
 
 REGISTER_TYPED_TEST_CASE_P(dataBufSlice, successfulConstruction, failedConstruction);
 typedef ::testing::Types<DataBuf&, const DataBuf&> data_buf_types_t;
-INSTANTIATE_TYPED_TEST_CASE_P(, dataBufSlice, data_buf_types_t);
+INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t);

Lines 17-23 bin/exiv2 Link Here

(-)b/graphics/exiv2/pkg-plist (-2 / +2 lines)
17	%%SAMPLE%%bin/xmpsample	17	%%SAMPLE%%bin/xmpsample
18	include/exiv2/asfvideo.hpp	18	include/exiv2/asfvideo.hpp
19	include/exiv2/basicio.hpp	19	include/exiv2/basicio.hpp
20	include/exiv2/bigtiffimage.hpp	20	include/exiv2/bmffimage.hpp
21	include/exiv2/bmpimage.hpp	21	include/exiv2/bmpimage.hpp
22	include/exiv2/config.h	22	include/exiv2/config.h
23	include/exiv2/convert.hpp	23	include/exiv2/convert.hpp
Lines 69-75 lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake Link Here
69	lib/cmake/exiv2/exiv2Config.cmake	69	lib/cmake/exiv2/exiv2Config.cmake
70	lib/cmake/exiv2/exiv2ConfigVersion.cmake	70	lib/cmake/exiv2/exiv2ConfigVersion.cmake
71	lib/libexiv2.so	71	lib/libexiv2.so
72	lib/libexiv2.so.0.27.3	72	lib/libexiv2.so.0.27.4
73	lib/libexiv2.so.27	73	lib/libexiv2.so.27
74	lib/libexiv2-xmp.a	74	lib/libexiv2-xmp.a
75	libdata/pkgconfig/exiv2.pc	75	libdata/pkgconfig/exiv2.pc

Return to bug 256803

Removed Link Here

(-)a/graphics/exiv2/files/patch-cmake_compilerFlags.cmake (-15 lines)
1	--- cmake/compilerFlags.cmake.orig 2020-07-09 11:24:28 UTC
2	+++ cmake/compilerFlags.cmake
3	@@ -26,7 +26,11 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CY
4	# This fails under Fedora, MinGW GCC 8.3.0 and CYGWIN/MSYS 9.3.0
5	if (NOT (MINGW OR CMAKE_HOST_SOLARIS OR CYGWIN OR MSYS) )
6	if (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
7	- add_compile_options(-fstack-clash-protection -fcf-protection)
8	+ if (NOT (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "powerpc"))
9	+ add_compile_options(-fstack-clash-protection -fcf-protection)
10	+ else()
11	+ add_compile_options(-fstack-clash-protection)
12	+ endif()
13	endif()
14
15	if( (COMPILER_IS_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5.0) # Not in GCC 4.8

Added Link Here

(-)b/graphics/exiv2/files/patch-git-01-c069e36605f05e8e58bf964e5ecbde04efb90a20 (+30 lines)
1	From c069e36605f05e8e58bf964e5ecbde04efb90a20 Mon Sep 17 00:00:00 2001
2	From: Antonio Rojas <arojas@archlinux.org>
3	Date: Fri, 18 Jun 2021 18:53:46 +0200
4	Subject: [PATCH] Fix build with gtest 1.11
5
6	INSTANTIATE_TYPED_TEST_CASE_P requires a non-empty prefix now
7	---
8	unitTests/test_slice.cpp \| 6 +++---
9	1 file changed, 3 insertions(+), 3 deletions(-)
10
11	diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp
12	index ccf80d98d..59171cfcf 100644
13	--- unitTests/test_slice.cpp
14	+++ unitTests/test_slice.cpp
15	@@ -440,12 +440,12 @@ REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFro
16	constMethodsPreserveConst);
17
18	typedef ::testing::Types<const std::vector<int>, std::vector<int>, int, const int> test_types_t;
19	-INSTANTIATE_TYPED_TEST_CASE_P(, slice, test_types_t);
20	+INSTANTIATE_TYPED_TEST_CASE_P(slice, slice, test_types_t);
21
22	REGISTER_TYPED_TEST_CASE_P(mutableSlice, iterators, at);
23	typedef ::testing::Types<std::vector<int>, int*> mut_test_types_t;
24	-INSTANTIATE_TYPED_TEST_CASE_P(, mutableSlice, mut_test_types_t);
25	+INSTANTIATE_TYPED_TEST_CASE_P(slice, mutableSlice, mut_test_types_t);
26
27	REGISTER_TYPED_TEST_CASE_P(dataBufSlice, successfulConstruction, failedConstruction);
28	typedef ::testing::Types<DataBuf&, const DataBuf&> data_buf_types_t;
29	-INSTANTIATE_TYPED_TEST_CASE_P(, dataBufSlice, data_buf_types_t);
30	+INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t);