diff options
Diffstat (limited to 'system/gtk-vnc')
| -rw-r--r-- | system/gtk-vnc/2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4.patch | 31 | ||||
| -rw-r--r-- | system/gtk-vnc/d2dfbe92e294870fc84189df7158a75f58fdd6e6.patch | 51 | ||||
| -rw-r--r-- | system/gtk-vnc/gtk-vnc.SlackBuild | 10 | ||||
| -rw-r--r-- | system/gtk-vnc/gtk-vnc.info | 6 |
4 files changed, 90 insertions, 8 deletions
diff --git a/system/gtk-vnc/2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4.patch b/system/gtk-vnc/2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4.patch new file mode 100644 index 0000000000..0304c7d0bd --- /dev/null +++ b/system/gtk-vnc/2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4.patch @@ -0,0 +1,31 @@ +From 2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Fri, 7 Feb 2025 11:31:26 +0000 +Subject: [PATCH] Fix compat with older glib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +g_string_free_and_steal is only available in >= 2.76 + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +--- + src/testutils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/testutils.c b/src/testutils.c +index ae110f2..30ae889 100644 +--- a/src/testutils.c ++++ b/src/testutils.c +@@ -60,7 +60,7 @@ char *bytes_to_hex(GBytes *val) + } + str->str[len*2] = '\0'; + +- return g_string_free_and_steal(str); ++ return g_string_free(str, FALSE); + } + + void test_assert_cmpbytes(const guint8 *want, size_t wantlen, +-- +GitLab + diff --git a/system/gtk-vnc/d2dfbe92e294870fc84189df7158a75f58fdd6e6.patch b/system/gtk-vnc/d2dfbe92e294870fc84189df7158a75f58fdd6e6.patch new file mode 100644 index 0000000000..427ebb9fa6 --- /dev/null +++ b/system/gtk-vnc/d2dfbe92e294870fc84189df7158a75f58fdd6e6.patch @@ -0,0 +1,51 @@ +From d2dfbe92e294870fc84189df7158a75f58fdd6e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Fri, 7 Feb 2025 11:30:44 +0000 +Subject: [PATCH] Fix compat with older gmp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The gmp_randstate_ptr typedef does not exist in 6.2.0. + +Set the min version to 6.2.0 since we don't target any distros with +older versions. + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +--- + meson.build | 2 +- + src/dhtest.c | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 61ae9ea..4c73077 100644 +--- a/meson.build ++++ b/meson.build +@@ -114,7 +114,7 @@ endif + glib_min_version = '2.56.0' + glib_min_version_symbol='GLIB_VERSION_2_56' + gdk_pixbuf_min_version = '2.36.0' +-gmp_min_version = '6.0.0' ++gmp_min_version = '6.2.0' + gnutls_min_version = '3.6.0' + zlib_min_version = '1.2.11' + libsasl_min_version = '2.1.27' +diff --git a/src/dhtest.c b/src/dhtest.c +index a18145e..a5fb994 100644 +--- a/src/dhtest.c ++++ b/src/dhtest.c +@@ -42,7 +42,11 @@ struct DHTestData { + }; + + /* Mock this to make test repeatable */ ++#if __GNU_MP_VERSION > 6 || (__GNU_MP_VERSION == 6 && __GNU_MP_VERSION_MINOR > 2) + void mpz_urandomb(mpz_ptr mpi, gmp_randstate_ptr rng G_GNUC_UNUSED, mp_bitcnt_t bits) ++#else ++void mpz_urandomb(mpz_ptr mpi, gmp_randstate_t rng G_GNUC_UNUSED, mp_bitcnt_t bits) ++#endif + { + size_t len = bits / 8; + guchar *data = g_new0(guchar, len); +-- +GitLab + diff --git a/system/gtk-vnc/gtk-vnc.SlackBuild b/system/gtk-vnc/gtk-vnc.SlackBuild index 003888f36c..8ac10faea0 100644 --- a/system/gtk-vnc/gtk-vnc.SlackBuild +++ b/system/gtk-vnc/gtk-vnc.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for gtk-vnc # Copyright 2014 Will Brokenbourgh U.S.A. -# Copyright 2014-2021 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014-2025 Willy Sudiarto Raharjo <willysr@slackbuilds.org> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=gtk-vnc -VERSION=${VERSION:-1.3.1} +VERSION=${VERSION:-1.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -86,6 +83,9 @@ find -L $PRGNAM-$VERSION \ cd $PRGNAM-$VERSION +patch -p1 < $CWD/d2dfbe92e294870fc84189df7158a75f58fdd6e6.patch +patch -p1 < $CWD/2e0ecb65123863208ee0fc4ebcc896c1eb27b0b4.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ meson \ diff --git a/system/gtk-vnc/gtk-vnc.info b/system/gtk-vnc/gtk-vnc.info index 69a9a3c182..cd97c65ca4 100644 --- a/system/gtk-vnc/gtk-vnc.info +++ b/system/gtk-vnc/gtk-vnc.info @@ -1,8 +1,8 @@ PRGNAM="gtk-vnc" -VERSION="1.3.1" +VERSION="1.5.0" HOMEPAGE="https://wiki.gnome.org/Projects/gtk-vnc" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-vnc/1.3/gtk-vnc-1.3.1.tar.xz" -MD5SUM="27f0dc7f33cbfdaa6c9eb7cf169f4866" +DOWNLOAD="https://download.gnome.org/sources/gtk-vnc/1.5/gtk-vnc-1.5.0.tar.xz" +MD5SUM="6e9815e7960636e95f626a3f164eb01d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |