From 8918d9485c55c5025c1e488bdd087a542189f7fa Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 21 Feb 2022 21:19:58 +0800 Subject: gedit: upgrade 40.1 -> 41.0 0001-Remove-incorrect-args-for-i18n.merge_file.patch removed since it's included in 41.0 Changelog: ========= * Fix some crashes, one when opening files, another when deleting the open folder with the file browser plugin active * Fix buttons in the color scheme selector dialog * Build fixes * Improve symbolic icon coloring * Improve Save As behavior when saving error infobar is showing * Translation updates * Note that gnome-text-editor will be GNOME's recommended text editor beginning with the GNOME 42 release next month Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...Remove-incorrect-args-for-i18n.merge_file.patch | 34 ---------------- meta-gnome/recipes-gnome/gedit/gedit_40.1.bb | 47 ---------------------- meta-gnome/recipes-gnome/gedit/gedit_41.0.bb | 46 +++++++++++++++++++++ 3 files changed, 46 insertions(+), 81 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch delete mode 100644 meta-gnome/recipes-gnome/gedit/gedit_40.1.bb create mode 100644 meta-gnome/recipes-gnome/gedit/gedit_41.0.bb diff --git a/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch deleted file mode 100644 index 66df3c269d..0000000000 --- a/meta-gnome/recipes-gnome/gedit/gedit/0001-Remove-incorrect-args-for-i18n.merge_file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ea9a15afb76c093aea37f6c56c559b61afd9a9f2 Mon Sep 17 00:00:00 2001 -From: rvalue -Date: Wed, 15 Dec 2021 07:02:09 +0000 -Subject: [PATCH] Remove incorrect args for i18n.merge_file - -The positional argument has been silently ignored for a time. And it causes failure -with "ERROR: Function does not take positional arguments" since meson 0.60.0 - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124] -Signed-off-by: Alexander Kanavin ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index bb61387..28d72a1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -4,7 +4,6 @@ install_man('gedit.1') - - appdata = 'org.gnome.gedit.appdata.xml' - appdata_file = i18n.merge_file( -- appdata, - input: appdata + '.in', - output: appdata, - po_dir: '../po/', -@@ -23,7 +22,6 @@ endif - - desktop_file = 'org.gnome.gedit.desktop' - desktop_output_file = i18n.merge_file( -- desktop_file, - type: 'desktop', - input: desktop_file + '.in', - output: desktop_file, diff --git a/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb b/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb deleted file mode 100644 index df8ab620c7..0000000000 --- a/meta-gnome/recipes-gnome/gedit/gedit_40.1.bb +++ /dev/null @@ -1,47 +0,0 @@ -SUMMARY = "GNOME editor" -SECTION = "x11/gnome" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" - -GNOMEBASEBUILDCLASS = "meson" - -DEPENDS = " \ - gdk-pixbuf-native \ - gtk+3 \ - gsettings-desktop-schemas \ - libpeas \ - libsoup-2.4 \ - gspell \ - gtksourceview4 \ - tepl \ -" - -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig - -def gnome_verdir(v): - return oe.utils.trim_version(v, 1) - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://0001-Remove-incorrect-args-for-i18n.merge_file.patch" -SRC_URI[archive.sha256sum] = "55e394a82cb65678b1ab49526cf5bd43f00d8fba21476a4849051a8e137d3691" - -# gobject-introspection is mandatory and cannot be configured -REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -GIR_MESON_OPTION = "" - -GTKDOC_MESON_OPTION = "gtk_doc" - -PACKAGES += "${PN}-python" - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/metainfo \ -" - -FILES:${PN}-python += " \ - ${PYTHON_SITEPACKAGES_DIR} \ -" - -RDEPENDS:${PN} += "gsettings-desktop-schemas" -RRECOMMENDS:${PN} += "source-code-pro-fonts" diff --git a/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb b/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb new file mode 100644 index 0000000000..8c11fb52e0 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/gedit_41.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "GNOME editor" +SECTION = "x11/gnome" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" + +GNOMEBASEBUILDCLASS = "meson" + +DEPENDS = " \ + gdk-pixbuf-native \ + gtk+3 \ + gsettings-desktop-schemas \ + libpeas \ + libsoup-2.4 \ + gspell \ + gtksourceview4 \ + tepl \ +" + +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig + +def gnome_verdir(v): + return oe.utils.trim_version(v, 1) + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "7a9b18b158808d1892989165f3706c4f1a282979079ab7458a79d3c24ad4deb5" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" +GIR_MESON_OPTION = "" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGES += "${PN}-python" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" + +FILES:${PN}-python += " \ + ${PYTHON_SITEPACKAGES_DIR} \ +" + +RDEPENDS:${PN} += "gsettings-desktop-schemas" +RRECOMMENDS:${PN} += "source-code-pro-fonts" -- cgit v1.2.3-54-g00ecf