Skip to content

Commit

Permalink
community/jsoncpp: backport upstream patch to fix openxr build
Browse files Browse the repository at this point in the history
  • Loading branch information
omni committed Oct 8, 2024
1 parent 3948562 commit 04c32eb
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
7 changes: 5 additions & 2 deletions community/jsoncpp/APKBUILD
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
# Maintainer: Natanael Copa <[email protected]>
pkgname=jsoncpp
pkgver=1.9.6
pkgrel=0
pkgrel=1
pkgdesc="JSON C++ library"
url="https://github.com/open-source-parsers/jsoncpp"
arch="all"
license="Public-Domain"
makedepends="meson"
subpackages="$pkgname-static $pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz
remove-check_required_components-meson.patch
"

build() {
abuild-meson \
Expand All @@ -27,4 +29,5 @@ package() {

sha512sums="
006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08 jsoncpp-1.9.6.tar.gz
fcae084a5063891fd87c23f26df48d0a7bf66dbfb6998b1cd32fecd228a4e4c4aa512e4cbb8c7e4752057b859f45830f46ab77597e84a1d0ef0d883223a4d400 remove-check_required_components-meson.patch
"
21 changes: 21 additions & 0 deletions community/jsoncpp/remove-check_required_components-meson.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
From bd25fc5ea0e14d19e1451632205c8b99ec0b1c09 Mon Sep 17 00:00:00 2001
From: Rui Chen <[email protected]>
Date: Mon, 30 Sep 2024 18:23:00 -0400
Subject: [PATCH] fix(build): remove `check_required_components` for meson
build (#1570)

Signed-off-by: Rui Chen <[email protected]>
---
jsoncppConfig.cmake.meson.in | 2 --
1 file changed, 2 deletions(-)

diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in
index 0f4866d6d..be8852d0c 100644
--- a/jsoncppConfig.cmake.meson.in
+++ b/jsoncppConfig.cmake.meson.in
@@ -4,5 +4,3 @@
@MESON_STATIC_TARGET@

include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
-
-check_required_components(JsonCpp)

0 comments on commit 04c32eb

Please sign in to comment.