Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
jsoncpp
Commits:
a1fb4563 by Antonio Rojas at 2024-09-14T18:45:31+02:00
upgpkg: 1.9.6-3: Remove broken cmake config
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − fix-cmake.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = jsoncpp
pkgdesc = C++ library for interacting with JSON
pkgver = 1.9.6
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/open-source-parsers/jsoncpp
arch = x86_64
license = MIT
@@ -13,11 +13,8 @@ pkgbase = jsoncpp
makedepends = meson
options = staticlibs
source =
https://github.com/open-source-parsers/jsoncpp/archive/1.9.6/jsoncpp-1.9.6.tar.gz
- source = fix-cmake.patch
sha512sums =
006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
- sha512sums =
dc82dc6f2fa92f53d7140c1a9063939ba96ee7769cf87290cc5de47ee91fd3e5afbd00971e3895efb44fbb058ed96fe51cb9eefb23161ee34cec654452405e20
b2sums =
efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe
- b2sums =
3cc7e491736f640b71f17f9c5b7134ff4355509a49a3c3cefa4f78f6f7dd9ac66f49893c91d5da3678a816642b30d0b85e2fa331d7aa234bb29c7bb434845c42
pkgname = jsoncpp
depends = gcc-libs
=====================================
PKGBUILD
=====================================
@@ -6,24 +6,20 @@
pkgbase=jsoncpp
pkgname=('jsoncpp' 'jsoncpp-doc')
pkgver=1.9.6
-pkgrel=2
+pkgrel=3
pkgdesc='C++ library for interacting with JSON'
url='https://github.com/open-source-parsers/jsoncpp'
arch=('x86_64')
license=('MIT' 'custom:Public_Domain')
makedepends=('gcc-libs' 'doxygen' 'graphviz' 'python' 'meson')
options=('staticlibs')
-source=(https://github.com/open-source-parsers/${pkgbase}/archive/${pkgver}/${pkgbase}-${pkgver}.tar.gz
- fix-cmake.patch)
-sha512sums=('006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08'
-
'dc82dc6f2fa92f53d7140c1a9063939ba96ee7769cf87290cc5de47ee91fd3e5afbd00971e3895efb44fbb058ed96fe51cb9eefb23161ee34cec654452405e20')
-b2sums=('efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe'
-
'3cc7e491736f640b71f17f9c5b7134ff4355509a49a3c3cefa4f78f6f7dd9ac66f49893c91d5da3678a816642b30d0b85e2fa331d7aa234bb29c7bb434845c42')
+source=(https://github.com/open-source-parsers/${pkgbase}/archive/${pkgver}/${pkgbase}-${pkgver}.tar.gz)
+sha512sums=('006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08')
+b2sums=('efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe')
prepare() {
cd ${pkgbase}-${pkgver}
echo "${pkgver}" > version
- patch -p1 -i ../fix-cmake.patch # Fix cmake config
}
build() {
@@ -61,6 +57,9 @@ package_jsoncpp() {
DESTDIR="${pkgdir}" ninja -C build-static install
install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
+
+# Remove broken cmake config
https://github.com/open-source-parsers/jsoncpp/issues/1568
+ rm -r "$pkgdir"/usr/lib/cmake
}
package_jsoncpp-doc() {
=====================================
fix-cmake.patch deleted
=====================================
@@ -1,22 +0,0 @@
-diff --git a/jsoncppConfig.cmake.in b/jsoncppConfig.cmake.in
-index fdd9fea..81005e7 100644
---- a/jsoncppConfig.cmake.in
-+++ b/jsoncppConfig.cmake.in
-@@ -6,6 +6,7 @@ cmake_policy(VERSION 3.0...3.26)
- include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-targets.cmake" )
- include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
-
-+include (CMakePackageConfigHelpers)
- check_required_components(JsonCpp)
-
- cmake_policy(POP)
-diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in
-index 0f4866d..1425250 100644
---- a/jsoncppConfig.cmake.meson.in
-+++ b/jsoncppConfig.cmake.meson.in
-@@ -5,4 +5,5 @@
-
- include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
-
-+include (CMakePackageConfigHelpers)
- check_required_components(JsonCpp)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/jsoncpp/-/commit/a1fb456329ed2866f02aa5142ff281406c1e9683
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/jsoncpp/-/commit/a1fb456329ed2866f02aa5142ff281406c1e9683
You're receiving this email because of your account on gitlab.archlinux.org.
