diff --git a/desktop/toolkit/glade/actions.py b/desktop/toolkit/glade/actions.py index c996d4ead1..86bee2a500 100644 --- a/desktop/toolkit/glade/actions.py +++ b/desktop/toolkit/glade/actions.py @@ -6,6 +6,7 @@ from pisi.actionsapi import mesontools from pisi.actionsapi import pisitools +from pisi.actionsapi import shelltools def setup(): diff --git a/desktop/toolkit/glade/files/6da47128e8.patch b/desktop/toolkit/glade/files/6da47128e8.patch new file mode 100644 index 0000000000..0a10568bb0 --- /dev/null +++ b/desktop/toolkit/glade/files/6da47128e8.patch @@ -0,0 +1,32 @@ +From 6da47128e8da04edccccdfcbc9101940fc15fe3a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:18:09 -0500 +Subject: [PATCH] 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 + diff --git a/desktop/toolkit/glade/files/efdd5338b0.patch b/desktop/toolkit/glade/files/efdd5338b0.patch new file mode 100644 index 0000000000..df31d259e5 --- /dev/null +++ b/desktop/toolkit/glade/files/efdd5338b0.patch @@ -0,0 +1,23 @@ +From efdd5338b034a11c5d617684d92d11edc600965e Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 20 Jan 2022 14:19:03 -0500 +Subject: [PATCH] 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/desktop/toolkit/glade/pspec.xml b/desktop/toolkit/glade/pspec.xml index 7cbe3f2779..b47f9792e8 100755 --- a/desktop/toolkit/glade/pspec.xml +++ b/desktop/toolkit/glade/pspec.xml @@ -29,6 +29,8 @@ itstool + 6da47128e8.patch + efdd5338b0.patch @@ -91,6 +93,13 @@ + + 2022-06-22 + 3.38.2 + Rebuild. + Mustafa Cinasal + muscnsl@pisilinux.org + 2021-04-05 3.38.2