Compare commits

...

No commits in common. "c8s" and "c9" have entirely different histories.
c8s ... c9

7 changed files with 20486 additions and 65 deletions

View File

@ -1 +1 @@
77c37a1910e9268b2fa9cc740d4c952fe8f8cee6 SOURCES/gedit-3.28.1.tar.xz
8bd1e4e6b5f4d8761bdbb90ea13bc5d1e26c625e SOURCES/gedit-40.0.tar.xz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/gedit-3.28.1.tar.xz
SOURCES/gedit-40.0.tar.xz

View File

@ -0,0 +1,24 @@
From a03d70b6fb886e7c7e44775562826377fe073c27 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 2 Apr 2021 13:45:37 +0200
Subject: [PATCH] Add 40.0 release info to appdata
---
data/org.gnome.gedit.appdata.xml.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/org.gnome.gedit.appdata.xml.in b/data/org.gnome.gedit.appdata.xml.in
index 5bf14503c..c5d3bdc94 100644
--- a/data/org.gnome.gedit.appdata.xml.in
+++ b/data/org.gnome.gedit.appdata.xml.in
@@ -36,6 +36,7 @@
<translation type="gettext">gedit</translation>
<content_rating type="oars-1.1" />
<releases>
+ <release version="40.0" date="2021-03-19" />
<release version="3.38.0" date="2020-09-11" />
<release version="3.37.92" date="2020-09-04" />
<release version="3.37.3" date="2020-07-03" />
--
2.30.2

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,11 @@
diff -ru ../gedit-3.37.2.orig/gedit/meson.build ./gedit/meson.build
--- ../gedit-3.37.2.orig/gedit/meson.build 2020-05-29 07:52:21.783929300 -0500
+++ ./gedit/meson.build 2020-08-05 13:16:53.212282203 -0500
@@ -199,6 +199,7 @@
python3.install_sources(
'Gedit.py',
+ pure: false,
subdir: 'gi/overrides',
)

View File

@ -0,0 +1,26 @@
From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Fri, 20 Mar 2020 11:32:59 -0500
Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the
GtkScrolledWindow"
This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453.
---
gedit/resources/ui/gedit-view-frame.ui | 1 -
1 file changed, 1 deletion(-)
diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
index ebf70b013..4c783c711 100644
--- a/gedit/resources/ui/gedit-view-frame.ui
+++ b/gedit/resources/ui/gedit-view-frame.ui
@@ -11,7 +11,6 @@
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="overlay_scrolling">False</property>
<child>
<object class="GeditView" id="view">
<property name="visible">True</property>
--
2.25.1

View File

@ -1,76 +1,80 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")
%if 0%{?fedora} > 12 || 0%{?rhel} > 7
%global with_python3 1
%else
%global with_python3 0
%endif
%if %{with_python3}
%global __python %{__python3}
%endif
%global glib2_version 2.44
%global gtk3_version 3.22.0
%global gtksourceview_version 3.22.0
%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 0.2.5
%global tepl_version 5.99.0
%global gspell_version 1.0
%global pygo_version 3.0.0
# Filter provides for plugin .so files
%global __provides_exclude_from ^%{_libdir}/gedit/plugins/
%global apiver 40.0
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gedit
Epoch: 2
Version: 3.28.1
Release: 3%{?dist}
Version: 40.0
Release: 6%{?dist}
Summary: Text editor for the GNOME desktop
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Gedit
Source0: https://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/40/%{name}-%{tarball_version}.tar.xz
# https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/252#note_742198
Patch1: restore-overlay-scrollbars.patch
# Override meson default change so Gedit.py installs to %%{python3_sitearch}
# as expected (instead of %%{python3_sitelib})
Patch2: python3-install-path-fix.patch
# https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/108
Patch3: 0001-Add-40.0-release-info-to-appdata.patch
# https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/109
Patch4: 0001-deteplification-the-mega-commit.patch
BuildRequires: gnome-common
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-3.0) >= %{gtksourceview_version}
BuildRequires: pkgconfig(gtksourceview-4) >= %{gtksourceview_version}
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libpeas-gtk-1.0) >= %{libpeas_version}
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gtk-doc
BuildRequires: which
BuildRequires: intltool
BuildRequires: yelp-tools
BuildRequires: itstool
BuildRequires: meson
BuildRequires: vala
%if %{with_python3}
BuildRequires: python3-devel
BuildRequires: python3-gobject >= %{pygo_version}
%else
BuildRequires: python-devel
%endif
BuildRequires: /usr/bin/appstream-util
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gspell%{?_isa} >= %{gspell_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: gtksourceview3%{?_isa} >= %{gtksourceview_version}
%if %{with_python3}
Requires: gtksourceview4%{?_isa} >= %{gtksourceview_version}
Requires: libpeas-loader-python3%{?_isa}
Requires: python3-gobject >= %{pygo_version}
%endif
# the run-command plugin uses zenity
Requires: zenity
Requires: gsettings-desktop-schemas
%if ! 0%{?flatpak}
Requires: gvfs
%endif
# for file triggers
Requires: glib2 >= 2.45.4-2
Requires: desktop-file-utils >= 0.22-6
Obsoletes: gedit-collaboration < 3.6.1-6
Obsoletes: gedit-plugin-zeitgeist < 3.35.90
%description
gedit is a small, but powerful text editor designed specifically for
@ -96,27 +100,19 @@ to gedit.
Install gedit-devel if you want to write plugins for gedit.
%prep
%setup -q
%autosetup -p1 -n %{name}-%{tarball_version}
%build
%configure \
--disable-static \
--disable-gtk-doc \
--enable-introspection=yes \
%if %{with_python3}
PYTHON=%{__python3} \
--enable-python=yes \
%else
--enable-python=no \
%endif
--disable-updater \
--enable-gvfs-metadata
make %{_smp_mflags}
%meson -Dgtk_doc=true
# parallel make disabled to work around desktop file translations going missing
%define __ninja_common_opts -v
%meson_build
%install
%make_install
find $RPM_BUILD_ROOT -name '*.la' -delete
%meson_install
%py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/gi/overrides
%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gedit/plugins/
%find_lang %{name} --with-gnome
@ -125,27 +121,23 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT/%{_datadir}/metainfo/org.g
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.desktop
%files -f %{name}.lang
%doc README AUTHORS
%doc README.md
%license COPYING
%{_datadir}/gedit
%{_datadir}/applications/org.gnome.gedit.desktop
%{_mandir}/man1/*
%if %{with_python3}
%{python3_sitearch}/gi/overrides/Gedit.py*
%{python3_sitearch}/gi/overrides/__pycache__
%endif
%{_libexecdir}/gedit
%{_libdir}/gedit/girepository-1.0
%dir %{_libdir}/gedit
%dir %{_libdir}/gedit/plugins
%{_libdir}/gedit/libgedit.so
%{_libdir}/gedit/libgedit-%{apiver}.so
%{_libdir}/gedit/plugins/docinfo.plugin
%{_libdir}/gedit/plugins/libdocinfo.so
%{_libdir}/gedit/plugins/filebrowser.plugin
%{_libdir}/gedit/plugins/libfilebrowser.so
%{_libdir}/gedit/plugins/modelines.plugin
%{_libdir}/gedit/plugins/libmodelines.so
%if %{with_python3}
%{_libdir}/gedit/plugins/externaltools.plugin
%{_libdir}/gedit/plugins/externaltools
%{_libdir}/gedit/plugins/pythonconsole.plugin
@ -154,7 +146,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_libdir}/gedit/plugins/quickopen
%{_libdir}/gedit/plugins/snippets.plugin
%{_libdir}/gedit/plugins/snippets
%endif
%{_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
@ -162,34 +155,168 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
%{_libdir}/gedit/plugins/time.plugin
%{_libdir}/gedit/plugins/libtime.so
%{_bindir}/*
%{_datadir}/GConf/gsettings
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
%if %{with_python3}
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.externaltools.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.pythonconsole.gschema.xml
%endif
%{_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/*/apps/gedit.png
%{_datadir}/icons/hicolor/symbolic/apps/gedit-symbolic.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
%files devel
%{_includedir}/gedit-3.14
%{_includedir}/gedit-%{apiver}/
%{_libdir}/pkgconfig/gedit.pc
%{_datadir}/gtk-doc
%{_datadir}/vala/
%changelog
* Wed Aug 01 2018 Charalampos Stratakis <cstratak@redhat.com> - 2:3.28.1-3
- Fix python shebangs
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2:40.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Jun 26 2018 Charalampos Stratakis <cstratak@redhat.com> - 2:3.28.1-2
- Enable python3 on RHEL8
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2:40.0-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Apr 15 2021 Ray Strode <rstrode@redhat.com> - 2:40.0-4
- Drop tepl dependency
Related: #1948446
* Fri Apr 02 2021 Kalev Lember <klember@redhat.com> - 2:40.0-3
- Add 40.0 release info to appdata
* Wed Mar 24 2021 Kalev Lember <klember@redhat.com> - 2:40.0-2
- Filter provides for plugin .so files
* Wed Mar 24 2021 Kalev Lember <klember@redhat.com> - 2:40.0-1
- Update to 40.0
* Sat Feb 20 2021 Kalev Lember <klember@redhat.com> - 2:3.38.1-3
- Don't use gsettings key that was removed from nautilus 40 (#1931020)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.38.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 2:3.38.1-1
- Update to 3.38.1
* Fri Sep 11 2020 Kalev Lember <klember@redhat.com> - 2:3.38.0-1
- Update to 3.38.0
* Fri Sep 04 2020 Kalev Lember <klember@redhat.com> - 2:3.37.92-2
- Byte-compile all plugin python files, not just the snippets plugin
* Fri Sep 04 2020 Kalev Lember <klember@redhat.com> - 2:3.37.92-1
- Update to 3.37.92
* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 2:3.37.3-1
- Update to 3.37.3
* Wed Aug 05 2020 Merlin Mathesius <mmathesi@redhat.com> - 2:3.37.2-3
- FTBFS fixes for Rawhide and ELN
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.37.2-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.37.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri May 29 2020 Kalev Lember <klember@redhat.com> - 2:3.37.2-1
- Update to 3.37.2
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 2:3.36.2-2
- Rebuilt for Python 3.9
* Sat Apr 25 2020 Kalev Lember <klember@redhat.com> - 2:3.36.2-1
- Update to 3.36.2
* Fri Mar 27 2020 Kalev Lember <klember@redhat.com> - 2:3.36.1-1
- Update to 3.36.1
* Fri Mar 20 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2:3.36.0-3
- Restore overlay scrollbars
* Thu Mar 19 2020 Adam Williamson <awilliam@redhat.com> - 2:3.36.0-2
- Backport fix for snippet plugin (#272)
* Fri Mar 06 2020 Kalev Lember <klember@redhat.com> - 2:3.36.0-1
- Update to 3.36.0
* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 2:3.35.90-2
- Obsolete gedit-plugin-zeitgeist
* Sun Feb 02 2020 Kalev Lember <klember@redhat.com> - 2:3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.35.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Kalev Lember <klember@redhat.com> - 2:3.35.1-1
- Update to 3.35.1
* Wed Nov 27 2019 Kalev Lember <klember@redhat.com> - 2:3.34.1-1
- Update to 3.34.1
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 2:3.34.0-1
- Update to 3.34.0
* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 2:3.33.92-1
- Update to 3.33.92
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 2:3.33.90-2
- Rebuilt for Python 3.8
* Thu Aug 08 2019 Phil Wyett <philwyett@kathenas.org> - 3.33.90-1
- Update to 3.33.90.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.32.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed May 15 2019 Kalev Lember <klember@redhat.com> - 2:3.32.2-1
- Update to 3.32.2
* Mon Mar 11 2019 Kalev Lember <klember@redhat.com> - 2:3.32.0-1
- Update to 3.32.0
* Mon Mar 04 2019 Kalev Lember <klember@redhat.com> - 2:3.31.92-1
- Update to 3.31.92
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 2:3.31.90-1
- Update to 3.31.90
- Switch to the meson build system
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.30.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Oct 22 2018 Kalev Lember <klember@redhat.com> - 2:3.30.2-1
- Update to 3.30.2
* Mon Oct 01 2018 Kalev Lember <klember@redhat.com> - 2:3.30.1-2
- Disable parallel make to work around missing desktop file translations
* Wed Sep 26 2018 Kalev Lember <klember@redhat.com> - 2:3.30.1-1
- Update to 3.30.1
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2:3.30.0-2
- Rebuilt against fixed atk (#1626575)
* Thu Sep 06 2018 Kalev Lember <klember@redhat.com> - 2:3.30.0-1
- Update to 3.30.0
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 2:3.29.90-1
- Update to 3.29.90
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.28.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2:3.28.1-2
- Rebuilt for Python 3.7
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 2:3.28.1-1
- Update to 3.28.1