CVS commit: pkgsrc/graphics/leptonica

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan 19 15:17:11 UTC 2024

Modified Files:
        pkgsrc/graphics/leptonica: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/leptonica/patches: patch-CMakeLists.txt

Log Message:
leptonica: use proper pkg-config filename


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/leptonica/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/leptonica/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/leptonica/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/leptonica/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/graphics/leptonica/Makefile
diff -u pkgsrc/graphics/leptonica/Makefile:1.26 pkgsrc/graphics/leptonica/Makefile:1.27
--- pkgsrc/graphics/leptonica/Makefile:1.26     Thu Jan  4 14:51:04 2024
+++ pkgsrc/graphics/leptonica/Makefile  Fri Jan 19 15:17:11 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2024/01/04 14:51:04 adam Exp $
+# $NetBSD: Makefile,v 1.27 2024/01/19 15:17:11 adam Exp $
 
 DISTNAME=      leptonica-1.84.1
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=danbloomberg/}
 GITHUB_RELEASE=        ${PKGVERSION_NOREV}

Index: pkgsrc/graphics/leptonica/PLIST
diff -u pkgsrc/graphics/leptonica/PLIST:1.9 pkgsrc/graphics/leptonica/PLIST:1.10
--- pkgsrc/graphics/leptonica/PLIST:1.9 Thu Jan  4 14:51:04 2024
+++ pkgsrc/graphics/leptonica/PLIST     Fri Jan 19 15:17:11 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2024/01/04 14:51:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/01/19 15:17:11 adam Exp $
 bin/convertfilestopdf
 bin/convertfilestops
 bin/convertformat
@@ -52,4 +52,4 @@ lib/cmake/leptonica/LeptonicaTargets.cma
 lib/libleptonica.so
 lib/libleptonica.so.6
 lib/libleptonica.so.6.0.0
-lib/pkgconfig/lept_Release.pc
+lib/pkgconfig/lept.pc

Index: pkgsrc/graphics/leptonica/distinfo
diff -u pkgsrc/graphics/leptonica/distinfo:1.23 pkgsrc/graphics/leptonica/distinfo:1.24
--- pkgsrc/graphics/leptonica/distinfo:1.23     Thu Jan  4 14:51:04 2024
+++ pkgsrc/graphics/leptonica/distinfo  Fri Jan 19 15:17:11 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.23 2024/01/04 14:51:04 adam Exp $
+$NetBSD: distinfo,v 1.24 2024/01/19 15:17:11 adam Exp $
 
 BLAKE2s (leptonica-1.84.1.tar.gz) = 28535355a46bd2dae46b26d2dbe48258f00a9559657445b33c3c5a2b0c0a8cd0
 SHA512 (leptonica-1.84.1.tar.gz) = 949be33a09e1dfc04527f5401d3d682999bd6904dca0b4950b457d12564e3290ec5b62ab4b14ef14d6f499a0fbfa0ebc37c2e8ab2966913883127b9489f47e97
 Size (leptonica-1.84.1.tar.gz) = 14102299 bytes
+SHA1 (patch-CMakeLists.txt) = 9cc561f6daa7c960a681e6b695f1e6fb2cf655d2
 SHA1 (patch-src_environ.h) = 4170fe05038704412cd100c1179397c89ab3a44b

Added files:

Index: pkgsrc/graphics/leptonica/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/leptonica/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Fri Jan 19 15:17:11 2024
+++ pkgsrc/graphics/leptonica/patches/patch-CMakeLists.txt      Fri Jan 19 15:17:11 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2024/01/19 15:17:11 adam Exp $
+
+Prefer lept.pc for pkg-config file.
+
+--- CMakeLists.txt.orig        2024-01-02 23:48:24.000000000 +0000
++++ CMakeLists.txt
+@@ -358,7 +358,7 @@ configure_file(lept.pc.cmake ${CMAKE_CUR
+ # to resolve generator expression in OUTPUT_NAME
+ file(
+   GENERATE
+-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
++  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
+   INPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in)
+ 
+ configure_file(
+@@ -368,7 +368,7 @@ configure_file(
+   ${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/LeptonicaConfig.cmake.in
+   ${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake @ONLY)
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
+         DESTINATION lib/pkgconfig)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig-version.cmake