Attachment #228953 for bug #259365

View | Details | Raw Unified | Return to bug 259365
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/graphics/exiv2/Makefile (-1 / +1 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.4	4	DISTVERSION= 0.27.5
5	DISTVERSIONSUFFIX= -Source	5	DISTVERSIONSUFFIX= -Source
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= graphics	7	CATEGORIES= graphics

Lines 1-3 Link Here

(-)b/graphics/exiv2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1624257042	1	TIMESTAMP = 1634932893
2	SHA256 (exiv2-0.27.4-Source.tar.gz) = 84366dba7c162af9a7603bcd6c16f40fe0e9af294ba2fd2f66ffffb9fbec904e	2	SHA256 (exiv2-0.27.5-Source.tar.gz) = 35a58618ab236a901ca4928b0ad8b31007ebdc0386d904409d825024e45ea6e2
3	SIZE (exiv2-0.27.4-Source.tar.gz) = 32055837	3	SIZE (exiv2-0.27.5-Source.tar.gz) = 32720608




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 69-75 lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake Link Here

(-)b/graphics/exiv2/pkg-plist (-2 / +1 lines)
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.4	72	lib/libexiv2.so.0.27.5
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
76	-

Return to bug 259365

Removed Link Here

(-)a/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);