diff --git a/fix-i18n-merge-file.patch b/fix-i18n-merge-file.patch deleted file mode 100644 index c5a6b4a..0000000 --- a/fix-i18n-merge-file.patch +++ /dev/null @@ -1,19 +0,0 @@ -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-3.38.2.tar.xz b/gedit-42.2.tar.xz similarity index 59% rename from gedit-3.38.2.tar.xz rename to gedit-42.2.tar.xz index a779041..a928b4b 100644 Binary files a/gedit-3.38.2.tar.xz and b/gedit-42.2.tar.xz differ diff --git a/gedit.spec b/gedit.spec index aaa5f03..da75dd4 100644 --- a/gedit.spec +++ b/gedit.spec @@ -1,107 +1,174 @@ -%global __python %{__python3} -%global apiver 3.38 +%global glib2_version 2.64 +%global gtk3_version 3.22 +%global gtksourceview_version 4.0.2 +%global libpeas_version 1.14.1 +%global gspell_version 1.0 +%global pygo_version 3.0.0 -Name: gedit -Version: 3.38.2 -Epoch: 1 -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 +%global __provides_exclude_from ^%{_libdir}/gedit/plugins/ +%global apiver 41 + +Name: gedit +Epoch: 2 +Version: 42.2 +Release: 1 +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/%{name}/42/%{name}-%{version}.tar.xz + +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gspell-1) >= %{gspell_version} +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gtksourceview-4) >= %{gtksourceview_version} +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(libpeas-gtk-1.0) >= %{libpeas_version} +BuildRequires: pkgconfig(libsoup-3.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(pygobject-3.0) +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: gtk-doc +BuildRequires: which +BuildRequires: yelp-tools +BuildRequires: itstool +BuildRequires: meson >= 0.61.5 +BuildRequires: vala +BuildRequires: python3-devel +BuildRequires: python3-gobject >= %{pygo_version} +BuildRequires: libappstream-glib + +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: gspell%{?_isa} >= %{gspell_version} +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: gtksourceview4%{?_isa} >= %{gtksourceview_version} +Requires: libpeas-loader-python +Requires: python3-gobject >= %{pygo_version} +# the run-command plugin uses zenity +Requires: zenity +Requires: gsettings-desktop-schemas +Requires: gvfs-client + +Obsoletes: gedit-collaboration < 3.6.1-6 +Obsoletes: gedit-plugin-zeitgeist < 3.35.90 -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 >= 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 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-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, -can support syntax highlighting and automatic source code indentation, -printing and editing of multiple documents in one window. -gedit can extend the system through plug-ins, including spelling, -file comparison, and viewing CVS logs, and adjusting indentation levels. +gedit is a small, but powerful text editor designed specifically for +the GNOME desktop. It has most standard text editor functions and fully +supports international text in Unicode. Advanced features include syntax +highlighting and automatic indentation of source code, printing and editing +of multiple documents in one window. + +gedit is extensible through a plugin system, which currently includes +support for spell checking, comparing files, viewing CVS ChangeLogs, and +adjusting indentation levels. Further plugins can be found in the +gedit-plugins package. %package devel -Summary: Support for developing plugins for the gedit text editor -Requires: gedit = %{epoch}:%{version}-%{release} +Summary: Support for developing plugins for the gedit text editor +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + %description devel -gedit is a small, but powerful text editor for the GNOME desktop. Use the -package provides, developers can add new functionality to gedit. if you -want to write plugins for gedit,please install gedit-devel. +gedit is a small, but powerful text editor for the GNOME desktop. +This package allows you to develop plugins that add new functionality +to gedit. + +Install gedit-devel if you want to write plugins for gedit. %package help -Summary: documentation for user of gedit. -Requires: gedit = %{epoch}:%{version}-%{release} +Summary: documentation for user of gedit. +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description help -documentationforuserof gedit. +documentation for user of gedit. %prep -%autosetup -n gedit-%{version} -p1 +%autosetup -n %{name}-%{version} -p1 %build -#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 -Dgtk_doc=true + +# parallel make disabled to work around desktop file translations going missing +%define __ninja_common_opts -v %meson_build %install %meson_install +%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/gi/overrides +%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gedit/plugins/ -%delete_la -%find_lang gedit --with-gnome +%find_lang %{name} --with-gnome %check -appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/org.gnome.gedit.appdata.xml -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop +appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/org.gnome.gedit.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.gedit.desktop -%files -f gedit.lang -%doc README.md COPYING -%{_datadir}/gedit +%files -f %{name}.lang +%doc README.md NEWS +%license COPYING +%{_bindir}/gedit +%{_datadir}/gedit/ %{_datadir}/applications/org.gnome.gedit.desktop -%{python3_sitearch}/gi/overrides/Gedit.py* -%{python3_sitearch}/gi/overrides/__pycache__ -%{_libdir}/gedit/girepository-1.0 +%{python3_sitelib}/gi/overrides/Gedit.py* +%{python3_sitelib}/gi/overrides/__pycache__ +%{_libdir}/gedit/girepository-1.0/ %dir %{_libdir}/gedit %dir %{_libdir}/gedit/plugins %{_libdir}/gedit/libgedit-%{apiver}.so -%{_libdir}/gedit/plugins/{docinfo.plugin,libdocinfo.so,filebrowser.plugin,libfilebrowser.so,modelines.plugin} -%{_libdir}/gedit/plugins/{libmodelines.so,externaltools.plugin,externaltools,pythonconsole.plugin,pythonconsole} -%{_libdir}/gedit/plugins/{quickopen.plugin,quickopen,snippets.plugin,snippets,quickhighlight.plugin,libtime.so} -%{_libdir}/gedit/plugins/{sort.plugin,libsort.so,spell.plugin,libspell.so,time.plugin,libquickhighlight.so} -%{_bindir}/gedit -%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.gschema.xml,org.gnome.gedit.enums.xml,org.gnome.gedit.plugins.time.gschema.xml} -%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.plugins.externaltools.gschema.xml,org.gnome.gedit.plugins.time.enums.xml} -%{_datadir}/glib-2.0/schemas/{org.gnome.gedit.plugins.pythonconsole.gschema.xml,org.gnome.gedit.plugins.filebrowser.enums.xml} +%{_libdir}/gedit/plugins/docinfo.plugin +%{_libdir}/gedit/plugins/libdocinfo.so +%{_libdir}/gedit/plugins/filebrowser.plugin +%{_libdir}/gedit/plugins/libfilebrowser.so +%{_libdir}/gedit/plugins/openlinks.plugin +%{_libdir}/gedit/plugins/libopenlinks.so +%{_libdir}/gedit/plugins/modelines.plugin +%{_libdir}/gedit/plugins/libmodelines.so +%{_libdir}/gedit/plugins/externaltools.plugin +%{_libdir}/gedit/plugins/externaltools +%{_libdir}/gedit/plugins/pythonconsole.plugin +%{_libdir}/gedit/plugins/pythonconsole +%{_libdir}/gedit/plugins/quickopen.plugin +%{_libdir}/gedit/plugins/quickopen +%{_libdir}/gedit/plugins/snippets.plugin +%{_libdir}/gedit/plugins/snippets +%{_libdir}/gedit/plugins/quickhighlight.plugin +%{_libdir}/gedit/plugins/libquickhighlight.so +%{_libdir}/gedit/plugins/sort.plugin +%{_libdir}/gedit/plugins/libsort.so +%{_libdir}/gedit/plugins/spell.plugin +%{_libdir}/gedit/plugins/libspell.so +%{_libdir}/gedit/plugins/time.plugin +%{_libdir}/gedit/plugins/libtime.so +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.spell.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml %{_datadir}/dbus-1/services/org.gnome.gedit.service -%{_datadir}/icons/hicolor/scalable/apps/org.gnome.gedit.svg +%{_datadir}/icons/hicolor/*/apps/org.gnome.gedit.svg %{_datadir}/icons/hicolor/symbolic/apps/org.gnome.gedit-symbolic.svg -%{_datadir}/metainfo/org.gnome.gedit.appdata.xml +%{_metainfodir}/org.gnome.gedit.appdata.xml %files devel %{_includedir}/gedit-%{apiver}/ %{_libdir}/pkgconfig/gedit.pc -%{_datadir}/gtk-doc +%{_datadir}/gtk-doc/ %{_datadir}/vala/ %files help -%doc COPYING +%license COPYING %{_mandir}/man1/* %changelog +* Mon Sep 5 2022 zhanglin - 2:42.2-1 +- Update to 42.2 + * Mon Jun 20 2022 zhanglin - 1:3.38.2-4 - fix build when Meson >= 0.61.5 - add patch modify-meson-build-tepl6.patch diff --git a/modify-meson-build-tepl6.patch b/modify-meson-build-tepl6.patch deleted file mode 100644 index 9a8b4a4..0000000 --- a/modify-meson-build-tepl6.patch +++ /dev/null @@ -1,36 +0,0 @@ -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'), - ] - diff --git a/python3-install-path-fix.patch b/python3-install-path-fix.patch deleted file mode 100644 index c30c8de..0000000 --- a/python3-install-path-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gedit/meson.build b/gedit/meson.build -index a960e6c..47e1b8e 100644 ---- a/gedit/meson.build -+++ b/gedit/meson.build -@@ -205,6 +205,7 @@ libgedit_gir = gnome.generate_gir( - - python3.install_sources( - 'Gedit.py', -+ pure: false, - subdir: 'gi/overrides', - ) -