diff --git a/srcpkgs/gtk-vnc/patches/gir-disable.patch b/srcpkgs/gtk-vnc/patches/gir-disable.patch deleted file mode 100644 index ceb8191f402..00000000000 --- a/srcpkgs/gtk-vnc/patches/gir-disable.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4ec3034ed57d9baf03bf0d8cf46a0510b6c5fbbb Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Sun, 16 Aug 2020 20:53:21 +0200 -Subject: [PATCH] allow gir to be disabled - ---- - meson_options.txt | 1 + - src/meson.build | 6 +++--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git meson_options.txt meson_options.txt -index 995d8c1..4da4406 100644 ---- meson_options.txt -+++ meson_options.txt -@@ -2,3 +2,4 @@ option('enable-werror', type: 'boolean', value: false, description: 'Enable -We - option('with-coroutine', type: 'string', value: 'auto', description: 'Build with coroutine backend: [auto, ucontext, gthread]') - option('with-tls-priority', type: 'string', value: 'NORMAL', description: 'Set default TLS priority string') - option('with-vala', type: 'boolean', value: true, description: 'Enable Vala bindings') -+option('with-gir', type: 'boolean', value: true, description: 'Enable gir') -diff --git src/meson.build src/meson.build -index 956f189..e9f4261 100644 ---- src/meson.build -+++ src/meson.build -@@ -134,7 +134,7 @@ gvnc_dep = declare_dependency( - include_directories: gvnc_inc, - ) - --if host_machine.system() != 'windows' -+if get_option('with-gir') - gvnc_gir = gnome.generate_gir( - gvnc, - sources: gvnc_gir_sources, -@@ -216,7 +216,7 @@ if libpulse_dep.found() - include_directories: gvncpulse_inc, - ) - -- if host_machine.system() != 'windows' -+ if get_option('with-gir') - gvncpulse_gir = gnome.generate_gir( - gvncpulse, - sources: gvncpulse_sources, -@@ -379,7 +379,7 @@ gtk_vnc_dep = declare_dependency( - include_directories: gtk_vnc_inc, - ) - --if host_machine.system() != 'windows' -+if get_option('with-gir') - gtk_vnc_gir = gnome.generate_gir( - gtk_vnc, - sources: gtk_vnc_gir_sources, --- -2.28.0 - diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template index f07e530d23f..46a535d1e0f 100644 --- a/srcpkgs/gtk-vnc/template +++ b/srcpkgs/gtk-vnc/template @@ -1,10 +1,10 @@ # Template file for 'gtk-vnc' pkgname=gtk-vnc -version=1.0.0 +version=1.2.0 revision=1 build_helper="gir" build_style=meson -configure_args="$(vopt_bool gir with-gir) $(vopt_bool gir with-vala)" +configure_args="-Dwith-vala=$(vopt_if gir enabled disabled)" hostmakedepends="gettext gettext-devel glib-devel intltool libgcrypt-devel pkg-config $(vopt_if gir vala)" makedepends="gnutls-devel gtk+3-devel libsasl-devel $(vopt_if gir vala)" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/gtk-vnc" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a81a1f1a79ad4618027628ffac27d3391524c063d9411c7a36a5ec3380e6c080 +checksum=7aaf80040d47134a963742fb6c94e970fcb6bf52dc975d7ae542b2ef5f34b94a build_options="gir" build_options_default="gir"