diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch deleted file mode 100644 index 72f9c0e509b..00000000000 --- a/srcpkgs/glade3/patches/meson-0.61.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 20 Jan 2022 14:18:09 -0500 -Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional - argument - ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index 9f244566..bfbc514c 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -2,7 +2,6 @@ desktop_conf = configuration_data() - desktop_conf.set('VERSION', glade_version) - - i18n.merge_file( -- 'desktop', - type: 'desktop', - input: configure_file( - input: 'org.gnome.Glade.desktop.in.in', -@@ -18,7 +17,6 @@ i18n.merge_file( - appdata = glade_name + '.appdata.xml' - - i18n.merge_file( -- 'appdata', - input: 'org.gnome.Glade.appdata.xml.in', - output: '@BASENAME@', - po_dir: po_dir, --- -GitLab - - -From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 20 Jan 2022 14:19:03 -0500 -Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS - ---- - help/LINGUAS | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/help/LINGUAS b/help/LINGUAS -index fc3cd4c3..d67e42c8 100644 ---- a/help/LINGUAS -+++ b/help/LINGUAS -@@ -1,6 +1,5 @@ - # please keep this list sorted alphabetically - # --da - bg - ca - cs --- -GitLab - diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index e2b93449a38..ff8d859648a 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -1,13 +1,13 @@ # Template file for 'glade3' pkgname=glade3 -version=3.38.2 -revision=4 +version=3.40.0 +revision=1 build_style=meson build_helper="gir qemu" -configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection) +configure_args="-Dgtk_doc=true -Dman=true -Dintrospection=true -Dwebkit2gtk=enabled" -hostmakedepends="glib-devel intltool itstool pkg-config - gjs-devel yelp-tools gettext-devel gtk-doc" +hostmakedepends="glib-devel itstool pkg-config + gjs-devel yelp-tools gettext gtk-doc" makedepends="gtk+3-devel python3-gobject-devel libwebkit2gtk41-devel gjs-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="User Interface Designer for GTK+3" @@ -15,15 +15,11 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://glade.gnome.org/" distfiles="${GNOME_SITE}/glade/${version%.*}/glade-${version}.tar.xz" -checksum=98fc87647d88505c97dd2f30f2db2d3e9527515b3af11694787d62a8d28fbab7 +checksum=31c9adaea849972ab9517b564e19ac19977ca97758b109edc3167008f53e3d9c lib32disabled=yes # Requires running an xserver make_check=no -# Package build options -build_options="gir" -build_options_default="gir" - libgladeui3_package() { depends="python3-gobject" short_desc="GTK+ User Interface Build core library" @@ -32,9 +28,7 @@ libgladeui3_package() { vmove usr/lib/glade/modules vmove usr/share/glade vmove usr/share/locale - if [ "$build_option_gir" ]; then - vmove usr/lib/girepository-1.0 - fi + vmove usr/lib/girepository-1.0 } } @@ -44,9 +38,7 @@ glade3-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi + vmove usr/share/gir-1.0 vmove usr/share/gtk-doc vmove "usr/lib/*.so" }