jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

connman-ncurses: rebuild against json-c 0.14

Browse source
This commit is contained in:
Randy McCaskill 2020-05-31 16:40:22 -04:00 committed by Helmut Pozimski
parent 6bd35c8867
commit 13fbb93808
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
srcpkgs/connman-ncurses/patches/lowercase-boolean.patch Normal file
View file

@ -0,0 +1,39 @@
--- json_utils.c 2020-05-31 00:39:12.983378846 -0400
+++ json_utils.c 2020-05-31 00:39:26.062122347 -0400
@@ -81,7 +81,7 @@
key_is_trusted = json_object_object_get_ex(jtrusted, key,
&tmp_trusted);
- if (key_is_trusted == FALSE)
+ if (key_is_trusted == false)
return false;
res = __json_type_dispatch(val, tmp_trusted);
--- json_regex.c 2020-05-31 00:44:07.233613212 -0400
+++ json_regex.c 2020-05-31 00:48:33.307401463 -0400
@@ -22,6 +22,7 @@
#endif
#include <json.h>
+#include <stdbool.h>
#include "json_regex.h"
#include "keys.h"
@@ -62,7 +63,7 @@
json_object_object_add(jregex_agent_response, "Username", json_object_new_string("^([[:print:]]*)$"));
json_object_object_add(jregex_agent_response, "Password", json_object_new_string("^([[:print:]]*)$"));
- jregex_agent_retry_response = json_object_new_boolean(TRUE);
+ jregex_agent_retry_response = json_object_new_boolean(true);
// See commands.c __cmd_config_service for a better idea of the format.
jregex_config_service = json_object_new_object();
@@ -92,7 +93,7 @@
json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
json_object_object_add(tmp, key_serv_proxy_excludes, arr);
json_object_object_add(opt, key_serv_proxy_config, tmp);
- json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(TRUE));
+ json_object_object_add(opt, key_serv_autoconnect, json_object_new_boolean(true));
arr = json_object_new_array();
json_object_array_add(arr, json_object_new_string("^([[:print:]]*)$"));
json_object_object_add(opt, key_serv_domains_config, arr);

2
srcpkgs/connman-ncurses/template
View file

@ -1,7 +1,7 @@
# Template file for 'connman-ncurses'
pkgname=connman-ncurses
version=1.0
revision=3
revision=4
wrksrc="connman-json-client-${version}"
build_style=gnu-configure
hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel"