diff --git a/fix-invalid-use-of-subprojects.patch b/fix-invalid-use-of-subprojects.patch deleted file mode 100644 index f9069d2c132fc5c124378a2f60f63c8fa9d62612..0000000000000000000000000000000000000000 --- a/fix-invalid-use-of-subprojects.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8da5e173ebdccbca60387ef2347c629be3c78dff Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 27 Jun 2022 01:36:07 -0400 -Subject: [PATCH 01/11] fix invalid use of subprojects - -The keycodemapdb Meson subproject provides a program and a source input. -Since it is a subproject, Meson wants to sandbox that and requires it to -be explicitly exported. But this never happened -- instead, we manually -poked at files using the actual string path "subprojects/......" - -This was always a Meson sandbox violation, but Meson 0.63.0 started -noticing it and erroring out. - -Instead, do the right thing. Update the subproject to a version that has -a meson.build with actually meaningful contents -- namely, a files -variable and a found program. Then use these in order to run the needed -custom_target. - -In the process, it is also necessary to correct the argument ordering -when running keymap-gen. - -diff --git a/meson.build b/meson.build -index 299113a..bf72f13 100644 ---- a/meson.build -+++ b/meson.build -@@ -133,10 +133,10 @@ gtk_vnc_version_check_flags = gvnc_version_check_flags + [ - '-DGDK_VERSION_MAX_ALLOWED=@0@'.format(gtk_min_version_symbol), - ] - --subproject('keycodemapdb') -+keycodemapdb = subproject('keycodemapdb') - --keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen') --keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv') -+keymapgen = find_program('keymap-gen') -+keymapcsv = keycodemapdb.get_variable('keymaps_csv') - - - gnome = import('gnome') -diff --git a/subprojects/keycodemapdb/meson.build b/subprojects/keycodemapdb/meson.build -index eb9416b..ea05720 100644 ---- a/subprojects/keycodemapdb/meson.build -+++ b/subprojects/keycodemapdb/meson.build -@@ -1 +1,7 @@ --project('keycodemapdb') -+project('keycodemapdb', meson_version: '>=0.46.0') -+ -+keymap_gen = find_program('tools/keymap-gen') -+meson.override_find_program('keymap-gen', keymap_gen) -+ -+keymaps_csv = files('data/keymaps.csv') -+ --- -2.36.1 - diff --git a/gtk-vnc-1.3.0.tar.xz b/gtk-vnc-1.3.0.tar.xz deleted file mode 100644 index 719d51a1777228c9adff1cdcde92b59048f284c7..0000000000000000000000000000000000000000 Binary files a/gtk-vnc-1.3.0.tar.xz and /dev/null differ diff --git a/gtk-vnc-1.3.1.tar.xz b/gtk-vnc-1.3.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..85c9fff8b2b93f6c267e12bb83c2ae23b0a47e4b Binary files /dev/null and b/gtk-vnc-1.3.1.tar.xz differ diff --git a/gtk-vnc.spec b/gtk-vnc.spec index 91f0b2299062468ec7e0afe72e637ca2a724f1ab..9a871efc1cd8fd4e9876f49a6c5f599460587af8 100644 --- a/gtk-vnc.spec +++ b/gtk-vnc.spec @@ -1,11 +1,10 @@ Summary: VNC viewer widget for GTK Name: gtk-vnc -Version: 1.3.0 -Release: 2 +Version: 1.3.1 +Release: 1 License: LGPLv2+ URL: https://gitlab.gnome.org/GNOME/gtk-vnc Source: https://download.gnome.org/sources/%{name}/1.3/%{name}-%{version}.tar.xz -Patch0: fix-invalid-use-of-subprojects.patch BuildRequires: python3 python3-devel gnutls-devel libgcrypt-devel cyrus-sasl-devel BuildRequires: zlib-devel intltool gobject-introspection-devel gtk3-devel vala @@ -93,7 +92,7 @@ Libraries, includes, etc. to compile with the gtk-vnc library %package_help %prep -%autosetup -n gtk-vnc-%{version} -p1 +%autosetup -n gtk-vnc-%{version} %build %meson -Dwith-tls-priority="@LIBVIRT,SYSTEM" @@ -180,6 +179,9 @@ chmod -x examples/*.pl examples/*.js examples/*.py %{_mandir}/man1/gvnccapture.1* %changelog +* Mon Jan 2 2023 lin zhang - 1.3.1-1 +- Update to 1.3.1 + * Mon Jan 16 2023 yangchenguang - 1.3.0-2 - fix invalid use of subprojects