Dominique Leuenberger 2022-02-16 23:31:08 +00:00 committed by Git OBS Bridge
commit be85338e0d
5 changed files with 13 additions and 272 deletions

265
27.patch
View File

@ -1,265 +0,0 @@
From 70c8ba4a1393ebd160139981c7b9127369aa5b66 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Tue, 25 Jan 2022 12:10:06 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
plugins/bookmarks/meson.build:43:0: ERROR: Function does not take positional arguments.
plugins/bracketcompletion/meson.build:32:0: ERROR: Function does not take positional arguments.
plugins/charmap/meson.build:28:0: ERROR: Function does not take positional arguments.
plugins/codecomment/meson.build:32:0: ERROR: Function does not take positional arguments.
plugins/colorpicker/meson.build:32:0: ERROR: Function does not take positional arguments.
plugins/colorschemer/meson.build:41:0: ERROR: Function does not take positional arguments.
plugins/commander/meson.build:37:0: ERROR: Function does not take positional arguments.
plugins/drawspaces/meson.build:58:0: ERROR: Function does not take positional arguments.
plugins/findinfiles/meson.build:64:0: ERROR: Function does not take positional arguments.
plugins/git/meson.build:28:0: ERROR: Function does not take positional arguments.
plugins/joinlines/meson.build:32:0: ERROR: Function does not take positional arguments.
plugins/multiedit/meson.build:28:0: ERROR: Function does not take positional arguments.
plugins/smartspaces/meson.build:36:0: ERROR: Function does not take positional arguments.
plugins/synctex/meson.build:28:0: ERROR: Function does not take positional arguments.
plugins/terminal/meson.build:40:0: ERROR: Function does not take positional arguments.
plugins/textsize/meson.build:28:0: ERROR: Function does not take positional arguments.
plugins/translate/meson.build:49:0: ERROR: Function does not take positional arguments.
plugins/wordcompletion/meson.build:57:0: ERROR: Function does not take positional arguments.
---
plugins/bookmarks/meson.build | 1 -
plugins/bracketcompletion/meson.build | 1 -
plugins/charmap/meson.build | 1 -
plugins/codecomment/meson.build | 1 -
plugins/colorpicker/meson.build | 1 -
plugins/colorschemer/meson.build | 1 -
plugins/commander/meson.build | 1 -
plugins/drawspaces/meson.build | 1 -
plugins/findinfiles/meson.build | 1 -
plugins/git/meson.build | 1 -
plugins/joinlines/meson.build | 1 -
plugins/multiedit/meson.build | 1 -
plugins/smartspaces/meson.build | 1 -
plugins/synctex/meson.build | 1 -
plugins/terminal/meson.build | 1 -
plugins/textsize/meson.build | 1 -
plugins/translate/meson.build | 1 -
plugins/wordcompletion/meson.build | 1 -
18 files changed, 18 deletions(-)
diff --git a/plugins/bookmarks/meson.build b/plugins/bookmarks/meson.build
index 4e09d60..ed051c6 100644
--- a/plugins/bookmarks/meson.build
+++ b/plugins/bookmarks/meson.build
@@ -41,7 +41,6 @@ bookmarks_plugin = custom_target(
)
bookmarks_metainfo = i18n.merge_file(
- 'gedit-bookmarks.metainfo.xml',
input: 'gedit-bookmarks.metainfo.xml.in',
output: 'gedit-bookmarks.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/bracketcompletion/meson.build b/plugins/bracketcompletion/meson.build
index 4d2ff4d..5f3e653 100644
--- a/plugins/bracketcompletion/meson.build
+++ b/plugins/bracketcompletion/meson.build
@@ -30,7 +30,6 @@ bracketcompletion_plugin = custom_target(
)
bracketcompletion_metainfo = i18n.merge_file(
- 'gedit-bracketcompletion.metainfo.xml',
input: 'gedit-bracketcompletion.metainfo.xml.in',
output: 'gedit-bracketcompletion.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/charmap/meson.build b/plugins/charmap/meson.build
index b7d1115..1cf02b4 100644
--- a/plugins/charmap/meson.build
+++ b/plugins/charmap/meson.build
@@ -26,7 +26,6 @@ charmap_plugin = custom_target(
)
charmap_metainfo = i18n.merge_file(
- 'gedit-charmap.metainfo.xml',
input: 'gedit-charmap.metainfo.xml.in',
output: 'gedit-charmap.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/codecomment/meson.build b/plugins/codecomment/meson.build
index 49594dd..dd053b3 100644
--- a/plugins/codecomment/meson.build
+++ b/plugins/codecomment/meson.build
@@ -30,7 +30,6 @@ codecomment_plugin = custom_target(
)
codecomment_metainfo = i18n.merge_file(
- 'gedit-codecomment.metainfo.xml',
input: 'gedit-codecomment.metainfo.xml.in',
output: 'gedit-codecomment.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/colorpicker/meson.build b/plugins/colorpicker/meson.build
index 889c9ce..c617d59 100644
--- a/plugins/colorpicker/meson.build
+++ b/plugins/colorpicker/meson.build
@@ -30,7 +30,6 @@ colorpicker_plugin = custom_target(
)
colorpicker_metainfo = i18n.merge_file(
- 'gedit-colorpicker.metainfo.xml',
input: 'gedit-colorpicker.metainfo.xml.in',
output: 'gedit-colorpicker.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/colorschemer/meson.build b/plugins/colorschemer/meson.build
index fcb904e..0b1a483 100644
--- a/plugins/colorschemer/meson.build
+++ b/plugins/colorschemer/meson.build
@@ -39,7 +39,6 @@ colorschemer_plugin = custom_target(
)
colorschemer_metainfo = i18n.merge_file(
- 'gedit-colorschemer.metainfo.xml',
input: 'gedit-colorschemer.metainfo.xml.in',
output: 'gedit-colorschemer.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/commander/meson.build b/plugins/commander/meson.build
index 2fedf80..d9bbb32 100644
--- a/plugins/commander/meson.build
+++ b/plugins/commander/meson.build
@@ -35,7 +35,6 @@ commander_plugin = custom_target(
)
commander_metainfo = i18n.merge_file(
- 'gedit-commander.metainfo.xml',
input: 'gedit-commander.metainfo.xml.in',
output: 'gedit-commander.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/drawspaces/meson.build b/plugins/drawspaces/meson.build
index 75610cb..30d27aa 100644
--- a/plugins/drawspaces/meson.build
+++ b/plugins/drawspaces/meson.build
@@ -56,7 +56,6 @@ install_data(
)
drawspaces_metainfo = i18n.merge_file(
- 'gedit-drawspaces.metainfo.xml',
input: 'gedit-drawspaces.metainfo.xml.in',
output: 'gedit-drawspaces.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/findinfiles/meson.build b/plugins/findinfiles/meson.build
index d900159..16c6885 100644
--- a/plugins/findinfiles/meson.build
+++ b/plugins/findinfiles/meson.build
@@ -62,7 +62,6 @@ findinfiles_plugin = custom_target(
)
findinfiles_metainfo = i18n.merge_file(
- 'gedit-findinfiles.metainfo.xml',
input: 'gedit-findinfiles.metainfo.xml.in',
output: 'gedit-findinfiles.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/git/meson.build b/plugins/git/meson.build
index f6f2b0b..cfd3b65 100644
--- a/plugins/git/meson.build
+++ b/plugins/git/meson.build
@@ -26,7 +26,6 @@ git_plugin = custom_target(
)
git_metainfo = i18n.merge_file(
- 'gedit-git.metainfo.xml',
input: 'gedit-git.metainfo.xml.in',
output: 'gedit-git.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/joinlines/meson.build b/plugins/joinlines/meson.build
index 12f081e..abf9673 100644
--- a/plugins/joinlines/meson.build
+++ b/plugins/joinlines/meson.build
@@ -30,7 +30,6 @@ joinlines_plugin = custom_target(
)
joinlines_metainfo = i18n.merge_file(
- 'gedit-joinlines.metainfo.xml',
input: 'gedit-joinlines.metainfo.xml.in',
output: 'gedit-joinlines.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/multiedit/meson.build b/plugins/multiedit/meson.build
index 855e8ca..bd676a7 100644
--- a/plugins/multiedit/meson.build
+++ b/plugins/multiedit/meson.build
@@ -26,7 +26,6 @@ multiedit_plugin = custom_target(
)
multiedit_metainfo = i18n.merge_file(
- 'gedit-multiedit.metainfo.xml',
input: 'gedit-multiedit.metainfo.xml.in',
output: 'gedit-multiedit.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/smartspaces/meson.build b/plugins/smartspaces/meson.build
index e2e682a..7a814c3 100644
--- a/plugins/smartspaces/meson.build
+++ b/plugins/smartspaces/meson.build
@@ -34,7 +34,6 @@ smartspaces_plugin = custom_target(
)
smartspaces_metainfo = i18n.merge_file(
- 'gedit-smartspaces.metainfo.xml',
input: 'gedit-smartspaces.metainfo.xml.in',
output: 'gedit-smartspaces.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/synctex/meson.build b/plugins/synctex/meson.build
index c6be01d..68bad3f 100644
--- a/plugins/synctex/meson.build
+++ b/plugins/synctex/meson.build
@@ -26,7 +26,6 @@ synctex_plugin = custom_target(
)
synctex_metainfo = i18n.merge_file(
- 'gedit-synctex.metainfo.xml',
input: 'gedit-synctex.metainfo.xml.in',
output: 'gedit-synctex.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/terminal/meson.build b/plugins/terminal/meson.build
index 4f56418..9dcdc6f 100644
--- a/plugins/terminal/meson.build
+++ b/plugins/terminal/meson.build
@@ -38,7 +38,6 @@ install_data(
)
terminal_metainfo = i18n.merge_file(
- 'gedit-terminal.metainfo.xml',
input: 'gedit-terminal.metainfo.xml.in',
output: 'gedit-terminal.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/textsize/meson.build b/plugins/textsize/meson.build
index c7baa86..e1a4a78 100644
--- a/plugins/textsize/meson.build
+++ b/plugins/textsize/meson.build
@@ -26,7 +26,6 @@ textsize_plugin = custom_target(
)
textsize_metainfo = i18n.merge_file(
- 'gedit-textsize.metainfo.xml',
input: 'gedit-textsize.metainfo.xml.in',
output: 'gedit-textsize.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/translate/meson.build b/plugins/translate/meson.build
index e87001e..ddb7ba3 100644
--- a/plugins/translate/meson.build
+++ b/plugins/translate/meson.build
@@ -47,7 +47,6 @@ install_data(
)
translate_metainfo = i18n.merge_file(
- 'gedit-translate.metainfo.xml',
input: 'gedit-translate.metainfo.xml.in',
output: 'gedit-translate.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
diff --git a/plugins/wordcompletion/meson.build b/plugins/wordcompletion/meson.build
index 8a5f34b..e3a1b6d 100644
--- a/plugins/wordcompletion/meson.build
+++ b/plugins/wordcompletion/meson.build
@@ -55,7 +55,6 @@ install_data(
)
wordcompletion_metainfo = i18n.merge_file(
- 'gedit-wordcompletion.metainfo.xml',
input: 'gedit-wordcompletion.metainfo.xml.in',
output: 'gedit-wordcompletion.metainfo.xml',
po_dir: join_paths(srcdir, 'po'),
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfb7989507a5745cb17c42fb1472207167a387197354f64254118e4a9437c196
size 951024

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a38f949460914f054063671bf0bb8e8a5184e6210be89f64bb304652d4520e87
size 948364

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Feb 16 15:09:13 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 41.0:
+ Fix build with latest meson.
+ Updated translations.
- Drop 27.patch: Fixed upstream.
-------------------------------------------------------------------
Wed Feb 2 10:32:41 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -18,18 +18,16 @@
Name: gedit-plugins
Version: 40.1
Version: 41.0
Release: 0
Summary: A collection of plugins for gedit
License: GPL-2.0-or-later
Group: Productivity/Text/Editors
URL: https://wiki.gnome.org/Apps/Gedit/PluginsLists
Source0: https://download.gnome.org/sources/gedit-plugins/40/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gedit-plugins/41/%{name}-%{version}.tar.xz
Source1: gedit-plugins.SUSE
# PATCH-FIX-UPSTREAM bracketcompletion-use-key-release-event-to-work-wi.patch boo#1027448 bgo#778737 hillwood@opensuse.org -- Switch to use key release event for ibus pinyin input method
Patch0: bracketcompletion-use-key-release-event-to-work-wi.patch
# PATCH-FIX-UPSTREAM 27.patch -- Fix build with meson 0.61.0 and newer
Patch1: https://gitlab.gnome.org/GNOME/gedit-plugins/-/merge_requests/27.patch
BuildRequires: fdupes
BuildRequires: meson >= 0.50.0