From 88e90b2c9771efc017edd1077500f51d19fca1af Mon Sep 17 00:00:00 2001 From: zhang__3125 <13466585422@163.com> Date: Wed, 22 Jun 2022 17:55:12 +0800 Subject: [PATCH] fix build when Meson >= 0.61.5 --- fix-i18n-merge-file.patch | 19 ++++++++++++++++++ gedit.spec | 22 +++++++++++++++------ modify-meson-build-tepl6.patch | 36 ++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 fix-i18n-merge-file.patch create mode 100644 modify-meson-build-tepl6.patch diff --git a/fix-i18n-merge-file.patch b/fix-i18n-merge-file.patch new file mode 100644 index 0000000..c5a6b4a --- /dev/null +++ b/fix-i18n-merge-file.patch @@ -0,0 +1,19 @@ +diff -up gedit-3.38.2/data/meson.build.orig gedit-3.38.2/data/meson.build +--- gedit-3.38.2/data/meson.build.orig 2022-06-22 09:23:55.368000000 +0000 ++++ gedit-3.38.2/data/meson.build 2022-06-22 09:30:36.748000000 +0000 +@@ -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/gedit.spec b/gedit.spec index b4c287f..aaa5f03 100644 --- a/gedit.spec +++ b/gedit.spec @@ -4,24 +4,27 @@ Name: gedit Version: 3.38.2 Epoch: 1 -Release: 3 +Release: 4 Summary: Text editor for the GNOME desktop License: GPLv2+ and GFDL-1.1-or-later URL: https://wiki.gnome.org/Apps/Gedit Source0: https://download.gnome.org/sources/gedit/3.38/gedit-%{version}.tar.xz Patch1: python3-install-path-fix.patch +Patch2: modify-meson-build-tepl6.patch +Patch3: fix-i18n-merge-file.patch BuildRequires: gnome-common pkgconfig(glib-2.0) >= 2.64 pkgconfig(gtk+-3.0) >= 3.22.0 BuildRequires: pkgconfig(gobject-introspection-1.0) pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gspell-1) >= 1.0 python3-devel python3-gobject >= 3.0.0 -BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2 pkgconfig(iso-codes) itstool vala meson +BuildRequires: pkgconfig(gtksourceview-4) >= 4.0.2 pkgconfig(iso-codes) itstool vala meson >= 0.61.5 BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 1.14.1 pkgconfig(libxml-2.0) intltool yelp-tools -BuildRequires: pkgconfig(pygobject-3.0) desktop-file-utils gettext which /usr/bin/appstream-util -BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(tepl-5) >= 4.99.2 gtk-doc +BuildRequires: pkgconfig(pygobject-3.0) desktop-file-utils gettext which libappstream-glib +BuildRequires: pkgconfig(libsoup-2.4) pkgconfig(tepl-6) >= 6.1.1 gtk-doc Requires: glib2 >= 2.64 gspell >= 1.0 gtk3 >= 3.22.0 gtksourceview4 >= 4.0.2 -Requires: libpeas-loader-python3 python3-gobject >= 3.0.0 zenity tepl >= 4.99.2 +Requires: libpeas-loader-python python3-gobject >= 3.0.0 zenity tepl >= 6.1.1 Requires: gsettings-desktop-schemas gvfs desktop-file-utils >= 0.22-6 Obsoletes: gedit-collaboration < 3.6.1-6 + %description gedit is a powerful small text editor dedicated to the GNOME desktop. gedit supports unicode encoding, has most standard text editor functions, @@ -48,7 +51,9 @@ documentationforuserof gedit. %autosetup -n gedit-%{version} -p1 %build -%meson -Dgtk_doc=true +#sed -i '/tepl-5/ s/5.0/6.0.0/' meson.build +#sed -i 's/tepl-5/tepl-6/' meson.build +%meson -Dgtk_doc=true %meson_build %install @@ -97,6 +102,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de %{_mandir}/man1/* %changelog +* Mon Jun 20 2022 zhanglin - 1:3.38.2-4 +- fix build when Meson >= 0.61.5 +- add patch modify-meson-build-tepl6.patch +- add patch fix-i18n-merge-file.patch + * Mon Apr 18 2022 zhanglin - 3.38.2-3 - Add GFDL Version GFDL-1.1-or-later diff --git a/modify-meson-build-tepl6.patch b/modify-meson-build-tepl6.patch new file mode 100644 index 0000000..9a8b4a4 --- /dev/null +++ b/modify-meson-build-tepl6.patch @@ -0,0 +1,36 @@ +diff -up gedit-3.38.2/build-aux/flatpak/org.gnome.gedit.yml.orig gedit-3.38.2/build-aux/flatpak/org.gnome.gedit.yml +--- gedit-3.38.2/build-aux/flatpak/org.gnome.gedit.yml.orig 2022-06-22 09:48:06.292000000 +0000 ++++ gedit-3.38.2/build-aux/flatpak/org.gnome.gedit.yml 2022-06-22 09:51:00.972000000 +0000 +@@ -70,7 +70,7 @@ modules: + sources: + - type: git + url: https://gitlab.gnome.org/GNOME/tepl.git +- branch: tepl-5-0 ++ branch: master + + - name: gedit + buildsystem: meson +diff -up gedit-3.38.2/docs/reference/meson.build.orig gedit-3.38.2/docs/reference/meson.build +--- gedit-3.38.2/docs/reference/meson.build.orig 2022-06-22 09:46:55.960000000 +0000 ++++ gedit-3.38.2/docs/reference/meson.build 2022-06-22 09:47:15.320000000 +0000 +@@ -7,7 +7,7 @@ gdk_docpath = dependency('gdk-3.0').get_ + gtk_docpath = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/gtk3' + gsv_docpath = dependency('gtksourceview-4').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/gtksourceview-4.0' + amtk_docpath = dependency('amtk-5').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/amtk-5.0' +-tepl_docpath = dependency('tepl-5').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/tepl-5' ++tepl_docpath = dependency('tepl-6').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/tepl-6' + libpeas_docpath = dependency('libpeas-1.0').get_pkgconfig_variable('prefix') / 'share/gtk-doc/html/libpeas' + + gedit_doc_dep = declare_dependency( +diff -up gedit-3.38.2/meson.build.orig gedit-3.38.2/meson.build +--- gedit-3.38.2/meson.build.orig 2022-06-22 09:46:20.616000000 +0000 ++++ gedit-3.38.2/meson.build 2022-06-22 09:46:38.328000000 +0000 +@@ -45,7 +45,7 @@ gio_dep = dependency('gio-2.0', version: + libgedit_public_deps = [ + gio_dep, + dependency('gtk+-3.0', version: '>= 3.22'), +- dependency('tepl-5', version: '>= 5.0'), ++ dependency('tepl-6', version: '>= 6.0.0'), + dependency('libpeas-gtk-1.0'), + ] +