Skip to content

Commit

Permalink
enhance(main/json-glib): Build binaries, man page and disable tests
Browse files Browse the repository at this point in the history
  • Loading branch information
termux-pacman-bot committed Jul 8, 2024
1 parent 7514f36 commit e519332
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 10 deletions.
16 changes: 6 additions & 10 deletions packages/json-glib/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Projects/JsonGlib
TERMUX_PKG_DESCRIPTION="GLib JSON manipulation library"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.8.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/json-glib/${TERMUX_PKG_VERSION%.*}/json-glib-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=97ef5eb92ca811039ad50a65f06633f1aae64792789307be7170795d8b319454
TERMUX_PKG_VERSION="1.9.2"
TERMUX_PKG_SRCURL=https://download.gnome.org/sources/json-glib/${TERMUX_PKG_VERSION%.*}/json-glib-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=8f9f04e0045bda82affd464ee575796600fe29014b817392a3b72ceb2d10c595
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="glib"
TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner"
TERMUX_PKG_BREAKS="json-glib-dev"
TERMUX_PKG_REPLACES="json-glib-dev"
TERMUX_PKG_DISABLE_GIR=false
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-Ddocumentation=disabled
-Dintrospection=enabled
-Dgtk_doc=disabled
"
TERMUX_PKG_RM_AFTER_INSTALL="
share/installed-tests
libexec/installed-tests
bin/
-Dman=true
-Dtests=false
"

termux_step_pre_configure() {
Expand Down
4 changes: 4 additions & 0 deletions packages/json-glib/gir/Json-1.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
</interface>
<class name="JsonParser" get-type="json_parser_get_type" parents="GObject">
<property name="immutable" type="gboolean" flags="11" default-value="FALSE"/>
<property name="strict" type="gboolean" flags="1073741827" default-value="FALSE"/>
<signal name="parse-start" return="void" when="last">
</signal>
<signal name="parse-end" return="void" when="last">
Expand Down Expand Up @@ -56,6 +57,9 @@
<member name="JSON_PARSER_ERROR_EMPTY_MEMBER_NAME" nick="empty-member-name" value="5"/>
<member name="JSON_PARSER_ERROR_INVALID_DATA" nick="invalid-data" value="6"/>
<member name="JSON_PARSER_ERROR_UNKNOWN" nick="unknown" value="7"/>
<member name="JSON_PARSER_ERROR_NESTING" nick="nesting" value="8"/>
<member name="JSON_PARSER_ERROR_INVALID_STRUCTURE" nick="invalid-structure" value="9"/>
<member name="JSON_PARSER_ERROR_INVALID_ASSIGNMENT" nick="invalid-assignment" value="10"/>
</enum> <enum name="JsonPathError" get-type="json_path_error_get_type">
<member name="JSON_PATH_ERROR_INVALID_QUERY" nick="query" value="0"/>
</enum> <enum name="JsonReaderError" get-type="json_reader_error_get_type">
Expand Down
23 changes: 23 additions & 0 deletions packages/json-glib/json-glib-json-scanner.c.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
clang 17 error.
clang 18 warning: label followed by a declaration is a C23 extension [-Wc23-extensions]
Modified in https://gitlab.gnome.org/GNOME/json-glib/-/commit/3ae0b3588096218bf7287ec15ae80abeb23ef04b

--- a/json-glib/json-scanner.c
+++ b/json-glib/json-scanner.c
@@ -808,6 +808,7 @@

switch (ch)
{
+ guint fchar;
case 0:
token = JSON_TOKEN_EOF;
(*position_p)++;
@@ -889,7 +890,7 @@
break;

case 'u':
- guint fchar = json_scanner_peek_next_char (scanner);
+ fchar = json_scanner_peek_next_char (scanner);
if (is_hex_digit (fchar))
{
gunichar ucs;

0 comments on commit e519332

Please sign in to comment.