CVS commit: pkgsrc/graphics/exiv2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 29 07:15:18 UTC 2023

Modified Files:
        pkgsrc/graphics/exiv2: Makefile distinfo
Added Files:
        pkgsrc/graphics/exiv2: hacks.mk
        pkgsrc/graphics/exiv2/patches: patch-cmake_exiv2.pc.in

Log Message:
exiv2: Work around issues with undefined symbols when building with gcc-8.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/exiv2/hacks.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/exiv2/patches/patch-cmake_exiv2.pc.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/exiv2/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.59 pkgsrc/graphics/exiv2/Makefile:1.60
--- pkgsrc/graphics/exiv2/Makefile:1.59 Tue Jul 18 18:19:22 2023
+++ pkgsrc/graphics/exiv2/Makefile      Sat Jul 29 07:15:18 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2023/07/18 18:19:22 nia Exp $
+# $NetBSD: Makefile,v 1.60 2023/07/29 07:15:18 nia Exp $
 
 DISTNAME=      exiv2-0.28.0-Source
 PKGNAME=       ${DISTNAME:S/-Source//}
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Exiv2/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}

Index: pkgsrc/graphics/exiv2/distinfo
diff -u pkgsrc/graphics/exiv2/distinfo:1.46 pkgsrc/graphics/exiv2/distinfo:1.47
--- pkgsrc/graphics/exiv2/distinfo:1.46 Fri Jul  7 10:33:26 2023
+++ pkgsrc/graphics/exiv2/distinfo      Sat Jul 29 07:15:18 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.46 2023/07/07 10:33:26 jperkin Exp $
+$NetBSD: distinfo,v 1.47 2023/07/29 07:15:18 nia Exp $
 
 BLAKE2s (exiv2-0.28.0-Source.tar.gz) = dcb2df9e21ec4a140e6fe44025279d906f4248490671fbadaed6a0aaf94cb4ac
 SHA512 (exiv2-0.28.0-Source.tar.gz) = 5c523ee8c2156417df978048e8e5c5009f77b05eb546ca7063c00dd4f468aa89b1aa60fe4411a638bcf75adc72042bb2ecb3c023b5367f6b756f486c00776dfb
 Size (exiv2-0.28.0-Source.tar.gz) = 44893310 bytes
 SHA1 (patch-cmake_compilerFlags.cmake) = 9f56d637e5dc99d7377a8d57ca9be9aab5833a76
 SHA1 (patch-cmake_config.h.cmake) = 5e8b863c505b32619efc71de6b6086fedfe75ba6
+SHA1 (patch-cmake_exiv2.pc.in) = 4d7d751e67dbf8fe1fdc6fef6dc2ca0cb94298f4
 SHA1 (patch-src_futils.cpp) = 35065fe2802416d4d0ece79e5366649a3a256190

Added files:

Index: pkgsrc/graphics/exiv2/hacks.mk
diff -u /dev/null pkgsrc/graphics/exiv2/hacks.mk:1.1
--- /dev/null   Sat Jul 29 07:15:18 2023
+++ pkgsrc/graphics/exiv2/hacks.mk      Sat Jul 29 07:15:18 2023
@@ -0,0 +1,16 @@
+# $NetBSD: hacks.mk,v 1.1 2023/07/29 07:15:18 nia Exp $
+
+.include "../../mk/compiler.mk"
+
+.if !empty(CC_VERSION:Mgcc-8*) || \
+    !empty(CC_VERSION:Mgcc-7*)
+# It has mechanisms for adding libstdc++fs that appear broken,
+# and produces libraries with undefined symbols.
+PKG_HACKS+=            EXIV2_STDCXXFS
+LIBSTDCXXFS=           -lstdc++fs
+LDFLAGS+=              ${LIBSTDCXXFS}
+SUBST_CLASSES+=                fslib
+SUBST_STAGE.fslib=     pre-configure
+SUBST_FILES.fslib=     cmake/exiv2.pc.in
+SUBST_VARS.fslib=      LIBSTDCXXFS
+.endif

Index: pkgsrc/graphics/exiv2/patches/patch-cmake_exiv2.pc.in
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-cmake_exiv2.pc.in:1.1
--- /dev/null   Sat Jul 29 07:15:18 2023
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_exiv2.pc.in       Sat Jul 29 07:15:18 2023
@@ -0,0 +1,14 @@
+$NetBSD: patch-cmake_exiv2.pc.in,v 1.1 2023/07/29 07:15:18 nia Exp $
+
+See hacks.mk.
+
+--- cmake/exiv2.pc.in.orig     2023-05-08 16:01:13.000000000 +0000
++++ cmake/exiv2.pc.in
+@@ -8,6 +8,6 @@ Description: @PROJECT_DESCRIPTION@
+ Version: @PROJECT_VERSION@
+ URL: @PACKAGE_URL@
+ Requires.private: @requires_private_for_pc_file@
+-Libs: -L${libdir} -lexiv2
++Libs: -L${libdir} -lexiv2 @LIBSTDCXXFS@
+ Libs.private: @libs_private_for_pc_file@
+ Cflags: -I${includedir}