Drop JSON-GLib completely

JSON-GLib was added in v2.9.0rc0-201-g511c2e166a, but is no longer
necessary since we have a home-grown JSON dumper (wsutil/json_dumper.h).
Remove the remaining traces and additionally remove GObject from
FindGLIB2.cmake since it was only added for JSON-GLib.

Change-Id: If9dfd2c60cec130f98109d100bdb6618bde06ba0
Reviewed-on: https://code.wireshark.org/review/30733
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

6 files changed, 2 insertions, 64 deletions

diff --git a/tools/bsd-setup.sh b/tools/bsd-setup.sh
index 450d5878b3..7d7bfdf989 100755
--- a/tools/bsd-setup.sh
+++ b/tools/bsd-setup.sh
@@ -129,10 +129,6 @@ echo "lz4 is unavailable"
 add_package ADDITIONAL_LIST nghttp2 ||
 echo "nghttp2 is unavailable"
 
-# json-glib: NetBSD
-add_package ADDITIONAL_LIST json-glib ||
-echo "json-glib is unavailable"
-
 # spandsp: NetBSD
 add_package ADDITIONAL_LIST spandsp ||
 echo "spandsp is unavailable"
diff --git a/tools/debian-setup.sh b/tools/debian-setup.sh
index 1ef2db1601..c3537af232 100755
--- a/tools/debian-setup.sh
+++ b/tools/debian-setup.sh
@@ -71,7 +71,6 @@ ADDITIONAL_LIST="libnl-3-dev \
 	libspandsp-dev \
 	libxml2-dev \
 	git \
-	libjson-glib-dev \
 	ninja-build \
 	doxygen \
 	xsltproc"
diff --git a/tools/macos-setup-brew.sh b/tools/macos-setup-brew.sh
index ecaed52b83..648c445e69 100755
--- a/tools/macos-setup-brew.sh
+++ b/tools/macos-setup-brew.sh
@@ -13,7 +13,7 @@
 brew update
 
 #install some libs needed by Wireshark
-brew install c-ares glib libgcrypt gnutls lua@5.1 cmake python nghttp2 snappy lz4 libxml2 json-glib ninja libmaxminddb doxygen libsmi spandsp
+brew install c-ares glib libgcrypt gnutls lua@5.1 cmake python nghttp2 snappy lz4 libxml2 ninja libmaxminddb doxygen libsmi spandsp
 
 #install Qt5
 brew install qt5
diff --git a/tools/macos-setup.sh b/tools/macos-setup.sh
index 4e7847adfc..29a1a3e3f7 100755
--- a/tools/macos-setup.sh
+++ b/tools/macos-setup.sh
@@ -87,7 +87,7 @@ NINJA_VERSION=${NINJA_VERSION-1.8.2}
 # The following libraries and tools are required even to build only TShark.
 #
 GETTEXT_VERSION=0.19.8.1
-GLIB_VERSION=2.37.6	# json-glib requires at least 2.37.6
+GLIB_VERSION=2.37.6
 PKG_CONFIG_VERSION=0.29.2
 #
 # libgpg-error is required for libgcrypt.
@@ -171,7 +171,6 @@ if [ "$SPANDSP_VERSION" ]; then
     LIBTIFF_VERSION=3.8.1
 fi
 BCG729_VERSION=1.0.2
-JSON_GLIB_VERSION=1.2.6
 PYTHON3_VERSION=3.7.1
 
 #
@@ -1651,42 +1650,6 @@ uninstall_bcg729() {
     fi
 }
 
-install_json_glib() {
-    if [ "$JSON_GLIB_VERSION" -a ! -f json_glib-$JSON_GLIB_VERSION-done ] ; then
-        echo "Downloading, building, and installing json-glib:"
-        [ -f json-glib-$JSON_GLIB_VERSION.tar.xz ] || curl -L -O https://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-$JSON_GLIB_VERSION.tar.xz || exit 1
-        $no_build && echo "Skipping installation" && return
-        xzcat json-glib-$JSON_GLIB_VERSION.tar.xz | tar xf - || exit 1
-        cd json-glib-$JSON_GLIB_VERSION
-        ./configure || exit 1
-        make $MAKE_BUILD_OPTS || exit 1
-        $DO_MAKE_INSTALL || exit 1
-        cd ..
-        touch json_glib-$JSON_GLIB_VERSION-done
-    fi
-}
-
-uninstall_json_glib() {
-    if [ ! -z "$installed_json_glib_version" ] ; then
-        echo "Uninstalling json-glib:"
-        cd json_glib-$installed_json_glib_version
-        $DO_MAKE_UNINSTALL || exit 1
-        make distclean || exit 1
-        cd ..
-        rm json_glib-$installed_json_glib_version-done
-
-        if [ "$#" -eq 1 -a "$1" = "-r" ] ; then
-            #
-            # Get rid of the previously downloaded and unpacked version.
-            #
-            rm -rf json_glib-$installed_json_glib_version
-            rm -rf json_glib-$installed_json_glib_version.tar.xz
-        fi
-
-        installed_json_glib_version=""
-    fi
-}
-
 install_python3() {
     local macver=10.9
     if [[ $DARWIN_MAJOR_VERSION -lt 13 ]]; then
@@ -1753,17 +1716,6 @@ install_all() {
         uninstall_python3 -r
     fi
 
-    if [ ! -z "$installed_json_glib_version" -a \
-              "$installed_json_glib_version" != "$JSON_GLIB_VERSION" ] ; then
-        echo "Installed json-glib version is $installed_json_glib_version"
-        if [ -z "$JSON_GLIB_VERSION" ] ; then
-            echo "json-glib is not requested"
-        else
-            echo "Requested json-glib version is $JSON_GLIB_VERSION"
-        fi
-        uninstall_json_glib -r
-    fi
-
     if [ ! -z "$installed_bcg729_version" -a \
               "$installed_bcg729_version" != "$BCG729_VERSION" ] ; then
         echo "Installed SpanDSP version is $installed_bcg729_version"
@@ -2224,8 +2176,6 @@ install_all() {
 
     install_bcg729
 
-    install_json_glib
-
     install_python3
 }
 
@@ -2245,8 +2195,6 @@ uninstall_all() {
         #
         uninstall_python3
 
-        uninstall_json_glib
-
         uninstall_bcg729
 
         uninstall_spandsp
@@ -2446,7 +2394,6 @@ then
     installed_libtiff_version=`ls tiff-*-done 2>/dev/null | sed 's/tiff-\(.*\)-done/\1/'`
     installed_spandsp_version=`ls spandsp-*-done 2>/dev/null | sed 's/spandsp-\(.*\)-done/\1/'`
     installed_bcg729_version=`ls bcg729-*-done 2>/dev/null | sed 's/bcg729-\(.*\)-done/\1/'`
-    installed_json_glib_version=`ls json_glib-*-done 2>/dev/null | sed 's/json_glib-\(.*\)-done/\1/'`
     installed_python3_version=`ls python3-*-done 2>/dev/null | sed 's/python3-\(.*\)-done/\1/'`
 
     cd $topdir
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh
index 39b5edfbd5..d04703e1ec 100755
--- a/tools/rpm-setup.sh
+++ b/tools/rpm-setup.sh
@@ -64,7 +64,6 @@ ADDITIONAL_LIST="libnl3-devel \
 	libsmi-devel \
 	snappy-devel \
 	lz4 \
-	json-glib-devel \
 	doxygen \
 	libxml2-devel \
 	spandsp-devel \
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index e3d5b64520..ca3c5e8294 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -79,7 +79,6 @@ $Win64Archives = @{
     "c-ares-1.14.0-win64ws.zip" = "91b1e1460bda513375910977a3410afd024575eebc528adecf3abea7814c0ef1";
     "gnutls-3.4.11-1.35-win64ws.zip" = "defc04f430f88e0c1217b98157e38b0e9fc8b4e7ad744c6dd0c24dd17648f9f4";
     "glib2-2.52.2-1.31-win64ws.zip" = "e19a7812db6715c632a5bbf96452ab474a4eaf0c6aaee999323ac7beb7ebe6db";
-    "json-glib-1.0.2-4.31-win64ws.zip" = "0b015b4f34384067f4b35cd04cbf745842f9122ae89185e57f8d6223f150bb44";
     "kfw-3-2-2-x64-ws.zip" = "91654ffe0b6d418b369c95bc060414a90f91627e55c19a3e753803c9deb2fe9a";
     "libgcrypt-1.8.3-win64ws.zip" = "53b1c636cb89de308ca4ea01b4990cf1deca7f6c2446189c7ff6e971137ffd76";
     "libsmi-svn-40773-win64ws.zip" = "571fcee71d741bf847c3247d4c2e1c42388ca6a9feebe08fc0d4ce053571d15d";
@@ -103,7 +102,6 @@ $Win32Archives = @{
     "c-ares-1.14.0-win32ws.zip" = "7355f3ad6d6ec05541c59e5b398b8dbd9a41bf6776b26d9656d8d54ecd58178e";
     "gnutls-3.4.11-1.36-win32ws.zip" = "10cd21d25b22cfba2566c8d6f5afbbd23d0f8faceb5bc167ccbb8fbb97d6873f";
     "glib2-2.52.2-1.34-win32ws.zip" = "28c426a7b64c1cd5b058c2f25685ddfaebca29083bd8f94fec2a8910ece6faf0";
-    "json-glib-1.0.2-4.37-win32ws.zip" = "c5120718ea04c5a966930f6d59a01cb53875a335ef4dad84b8feb411ba0c30f9";
     "kfw-3-2-2-i386-ws-vc6.zip" = "527deb2cf1c3ba0cf743f2b9b8011a22096b54f7ce62fc7ba31b520bbac0e802";
     "libgcrypt-1.8.3-win32ws.zip" = "409b72f2809019050cca91b9e670047c50a0752ff52999089178da54ef926393";
     "libsmi-svn-40773-win32ws.zip" = "44bc81edfeb8948322ca365fc632e419383907c305cc922e6b74fdbb13827958";
@@ -160,7 +158,6 @@ $CleanupItems = @(
     "glib2-2.*-win??ws"
     "gtk2"
     "gtk3"
-    "json-glib-1.0.2-*-win??ws"
     "kfw-3-2-2-final"
     "kfw-3-2-2-i386-ws-vc6"
     "kfw-3-2-2-x64-ws"