Skip to content

Commit

Permalink
Merge pull request msys2#6753 from Adsun701/json-c-0.15
Browse files Browse the repository at this point in the history
json-c: update to 0.15
  • Loading branch information
lazka committed Aug 3, 2020
2 parents 786ec7d + c22e57f commit 60e1f7e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
13 changes: 7 additions & 6 deletions mingw-w64-json-c/002-library-version.patch
@@ -1,20 +1,21 @@
--- json-c-json-c-0.14/CMakeLists.txt.orig 2020-04-27 16:22:14.788180700 +0300
+++ json-c-json-c-0.14/CMakeLists.txt 2020-04-27 16:25:33.974302700 +0300
@@ -380,10 +380,16 @@
--- a/CMakeLists.txt 2020-08-03 08:55:10.090125184 -0400
+++ b/CMakeLists.txt 2020-08-03 08:57:21.002463125 -0400
@@ -416,9 +416,17 @@
${JSON_C_SOURCES}
${JSON_C_HEADERS}
)
+
+set(JSON_C_SOVERSION 5)
set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION 5.0.0
VERSION 5.1.0
- SOVERSION 5)
+ SOVERSION ${JSON_C_SOVERSION})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+ OUTPUT_NAME ${PROJECT_NAME}
+ RUNTIME_OUTPUT_NAME ${PROJECT_NAME}-${JSON_C_SOVERSION}
+ ARCHIVE_OUTPUT_NAME ${PROJECT_NAME})
+
list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
# If json-c is used as subroject it set to target correct interface -I flags and allow
# to build external target without extra include_directories(...)
target_include_directories(${PROJECT_NAME}
6 changes: 3 additions & 3 deletions mingw-w64-json-c/PKGBUILD
Expand Up @@ -4,7 +4,7 @@
_realname=json-c
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.14
pkgver=0.15
pkgrel=1
arch=('any')
pkgdesc="A JSON implementation in C (mingw-w64)"
Expand All @@ -18,9 +18,9 @@ license=('MIT')
source=(https://github.com/json-c/json-c/archive/${_realname}-${pkgver//_/-}.tar.gz
001-install-private-header.patch
002-library-version.patch)
sha256sums=('7eccf1f949ce7ebc2187d316d73407baa991f1c7cc7a3eea14d92b2d98e987e5'
sha256sums=('74985882e39467b34722e584ab836ed2abd47061888f318125fd4b167002afd5'
'197e33a56fc3d655e058d6936e92698c8aa65b7297cb218345b8ad51350c4ecf'
'01070781c13c7c5732d5d6779443381079be22d7d5612d0be1936e9cb9c95b7e')
'2288c0ad1c0f98f2b43a8e4bdd09a6cf91710c7c8b1e7bf7a2b516ed21e81705')
noextract=(${_realname}-${pkgver//_/-}.tar.gz)

prepare() {
Expand Down

0 comments on commit 60e1f7e

Please sign in to comment.