From 18db426dc3dd6b909bd394559c3f8c7cf72297a8 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:54 -0300 Subject: [PATCH 01/18] bti: rebuild against libjson-c.so.4 --- srcpkgs/bti/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bti/template b/srcpkgs/bti/template index 91581b9bd83..51a77196a0a 100644 --- a/srcpkgs/bti/template +++ b/srcpkgs/bti/template @@ -1,7 +1,7 @@ # Template file for 'bti' pkgname=bti version=034 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="pcre-devel libxml2-devel libcurl-devel json-c-devel liboauth-devel" From 27c50af39e04cb9142b543b7b0d5f5a58d6c3435 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:54 -0300 Subject: [PATCH 02/18] connman-ncurses: rebuild against libjson-c.so.4 --- srcpkgs/connman-ncurses/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template index 341ad0c7dff..6c51bb7cb3c 100644 --- a/srcpkgs/connman-ncurses/template +++ b/srcpkgs/connman-ncurses/template @@ -1,7 +1,7 @@ # Template file for 'connman-ncurses' pkgname=connman-ncurses version=1.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake autoconf pkg-config json-c-devel ncurses-devel dbus-devel" makedepends="json-c-devel ncurses-devel dbus-devel" From f8c5bbd37b3827c9fb1f3e4242a29f630f1f3a26 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:54 -0300 Subject: [PATCH 03/18] cryptsetup: rebuild against libjson-c.so.4 --- srcpkgs/cryptsetup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index 4df4bc04005..ec6c3e95ca7 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,7 +1,7 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=2.0.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt" From b94de61b2435d95df0004ee5d9ac7eb6636fb1cf Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 04/18] fastd: rebuild against libjson-c.so.4 --- srcpkgs/fastd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fastd/template b/srcpkgs/fastd/template index f661f8c3722..207a14d60e6 100644 --- a/srcpkgs/fastd/template +++ b/srcpkgs/fastd/template @@ -1,7 +1,7 @@ # Template file for 'fastd' pkgname=fastd version=18 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config bison" makedepends="libuecc-devel libsodium-devel json-c-devel libcap-devel" From 1214bde6875bbcd3ed45b1fdd8fdb8c06f1eb44c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 05/18] libu2f-host: rebuild against libjson-c.so.4 --- srcpkgs/libu2f-host/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index 112948ef368..0a460a64989 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-host' pkgname=libu2f-host version=1.1.5 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d" From 1ea2dd5f53db58ec046e7d41d549665c3d8d033f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 06/18] libu2f-server: rebuild against libjson-c.so.4 --- srcpkgs/libu2f-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 835db93190f..89e24daac6c 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,7 +1,7 @@ # Template file for 'libu2f-server' pkgname=libu2f-server version=1.1.0 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config gengetopt check" From 3e6087f006e05a7eec480d6aced233c86bde7f53 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 07/18] masterpassword-cli: rebuild against libjson-c.so.4 --- srcpkgs/masterpassword-cli/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template index f919ec4fd83..e704e6fc68f 100644 --- a/srcpkgs/masterpassword-cli/template +++ b/srcpkgs/masterpassword-cli/template @@ -1,7 +1,7 @@ # Template file for 'masterpassword-cli' pkgname=masterpassword-cli version=2.6 -revision=3 +revision=4 wrksrc=MasterPassword-${version}-cli-3 build_wrksrc=platform-independent/cli-c build_style=cmake From ae173d5406a4e5852f1a41780fc09c2bbcd25c46 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 08/18] mypaint: rebuild against libjson-c.so.4 --- srcpkgs/mypaint/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mypaint/template b/srcpkgs/mypaint/template index 46753310c50..e250a97e728 100644 --- a/srcpkgs/mypaint/template +++ b/srcpkgs/mypaint/template @@ -1,7 +1,7 @@ # Template file for 'mypaint' pkgname=mypaint version=1.2.1 -revision=2 +revision=3 hostmakedepends="scons swig pkg-config" makedepends="libgomp-devel json-c-devel python-numpy libglib-devel libpng-devel lcms2-devel gtk+3-devel python-gobject-devel" From d139c8c421fd6411524730dc1b2fe862be56300c Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:55 -0300 Subject: [PATCH 09/18] ndpi: rebuild against libjson-c.so.4 --- srcpkgs/ndpi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ndpi/template b/srcpkgs/ndpi/template index ec590535716..edd3beb71c7 100644 --- a/srcpkgs/ndpi/template +++ b/srcpkgs/ndpi/template @@ -1,7 +1,7 @@ # Template file for 'ndpi' pkgname=ndpi version=2.2 -revision=2 +revision=3 wrksrc=nDPI-${version} build_style=gnu-configure hostmakedepends="libtool automake pkg-config" From de5b7c2a32b5bf9e88bc0cda1ba754b323c5f609 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:56 -0300 Subject: [PATCH 10/18] newsboat: rebuild against libjson-c.so.4 --- srcpkgs/newsboat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template index ceb9364f0dd..a9fefa2ea77 100644 --- a/srcpkgs/newsboat/template +++ b/srcpkgs/newsboat/template @@ -1,7 +1,7 @@ # Template file for 'newsboat' pkgname=newsboat version=r2.10.2 -revision=2 +revision=3 build_style=configure configure_script="./config.sh" make_install_args="prefix=/usr" From cc375ff90282f3b5a4a3db0e16f1fe83b5690cd8 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:56 -0300 Subject: [PATCH 11/18] pianobar: rebuild against libjson-c.so.4 --- srcpkgs/pianobar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template index 66dbc9877bc..30c06748cd7 100644 --- a/srcpkgs/pianobar/template +++ b/srcpkgs/pianobar/template @@ -1,7 +1,7 @@ # Template file for 'pianobar' pkgname=pianobar version=2017.08.30 -revision=2 +revision=3 hostmakedepends="pkg-config" makedepends="libcurl-devel faad2-devel libao-devel gnutls-devel libgcrypt-devel json-c-devel ffmpeg-devel" short_desc="A free/open-source, console-based client for Pandora radio" From d924f9411911751e61b35a044b627be4d9d0ee94 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:56 -0300 Subject: [PATCH 12/18] slurm-wlm: rebuild against libjson-c.so.4 --- srcpkgs/slurm-wlm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 0f31abd96e4..90e3dae99ef 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -1,7 +1,7 @@ # Template file for 'slurm-wlm' pkgname=slurm-wlm version=17.11.4.1 -revision=1 +revision=2 _distver="${version//./-}" wrksrc="slurm-slurm-${_distver}" build_style=gnu-configure From 3b817c0dae8c33bc85bddde96aeede13a8a87da2 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:56 -0300 Subject: [PATCH 13/18] sway: rebuild against libjson-c.so.4 --- srcpkgs/sway/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index 7308bc54b7a..0642c85b7c0 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -1,7 +1,7 @@ # Template file for 'sway' pkgname=sway version=0.15.1 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc" hostmakedepends="asciidoc pkg-config wayland-devel" From c619bdb7c61bea0207009e97ff66df91c0752c71 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:56 -0300 Subject: [PATCH 14/18] tracebox: rebuild against libjson-c.so.4 --- srcpkgs/tracebox/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template index 4964d2d6c7d..742e3219004 100644 --- a/srcpkgs/tracebox/template +++ b/srcpkgs/tracebox/template @@ -1,7 +1,7 @@ # Template file for 'tracebox' pkgname=tracebox version=0.4.4 -revision=2 +revision=3 _click_ver=2.0.1 _crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e _crafter_ver=0.3.3git From 4c53882538858dbfb52536fd78e5e8549aa7c5b4 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:57 -0300 Subject: [PATCH 15/18] ttyd: rebuild against libjson-c.so.4 --- srcpkgs/ttyd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template index c98df2cf91a..0dfe793b14d 100644 --- a/srcpkgs/ttyd/template +++ b/srcpkgs/ttyd/template @@ -1,7 +1,7 @@ # Template file for 'ttyd' pkgname=ttyd version=1.4.0 -revision=3 +revision=4 build_style=cmake hostmakedepends="pkg-config xxd" makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel" From 466ae7b22e895bd8852dcf9207de98ea425ab870 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:57 -0300 Subject: [PATCH 16/18] ykpers: rebuild against libjson-c.so.4 --- srcpkgs/ykpers/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ykpers/template b/srcpkgs/ykpers/template index a22ad6e8e59..d937d0eaf3d 100644 --- a/srcpkgs/ykpers/template +++ b/srcpkgs/ykpers/template @@ -1,7 +1,7 @@ # Template file for 'ykpers' pkgname=ykpers version=1.18.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-static=no --disable-rpath --with-backend=libusb" hostmakedepends="automake pkg-config libtool json-c-devel" From 32e4e73745ba9e4c1e3016775300fd9dd616cd69 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:26:57 -0300 Subject: [PATCH 17/18] zmap: rebuild against libjson-c.so.4 --- srcpkgs/zmap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zmap/template b/srcpkgs/zmap/template index 959f7bccd57..86ab5d7bedd 100644 --- a/srcpkgs/zmap/template +++ b/srcpkgs/zmap/template @@ -1,7 +1,7 @@ # Template file for 'zmap' pkgname=zmap version=2.1.1 -revision=2 +revision=3 build_style=cmake conf_files="/etc/zmap/blacklist.conf /etc/zmap/zmap.conf" hostmakedepends="flex byacc gengetopt pkg-config" From 636cad599e8bd3f5de3af25ac985d127002ee9d1 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 6 Mar 2018 09:47:01 -0300 Subject: [PATCH 18/18] json-c: update to 0.13.1. --- common/shlibs | 2 +- srcpkgs/json-c/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 35bd1adcae6..a9dc76417ee 100644 --- a/common/shlibs +++ b/common/shlibs @@ -810,7 +810,7 @@ libv4l2rds.so.0 v4l-utils-1.2.1_1 libdvbv5.so.0 v4l-utils-1.6.2_1 libmx-1.0.so.2 mx-1.4.3_1_1 libmx-gtk-1.0.so.0 mx-1.4.3_1_1 -libjson-c.so.3 json-c-0.13_1 +libjson-c.so.4 json-c-0.13.1_1 libcogl.so.20 cogl-1.18.0_1 libcogl-pango.so.20 cogl-1.18.0_1 libcogl-gst.so.20 cogl-1.18.0_1 diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template index 2a56077cc4f..19bdb17891c 100644 --- a/srcpkgs/json-c/template +++ b/srcpkgs/json-c/template @@ -1,6 +1,6 @@ # Template build file for 'json-c'. pkgname=json-c -version=0.13 +version=0.13.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="MIT" homepage="http://oss.metaparadigm.com/$pkgname" distfiles="https://s3.amazonaws.com/json-c_releases/releases/$pkgname-$version.tar.gz" -checksum=0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d +checksum=b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873 CFLAGS="-Wno-error"