Update to 41.alpha
This commit is contained in:
Kalev Lember
parent
5368e9cbc1
commit
739564c0d9
1
.gitignore
vendored
1
.gitignore
vendored
@ -129,3 +129,4 @@ gedit-2.31.6.tar.bz2
|
||||
/gedit-3.38.1.tar.xz
|
||||
/gedit-40.0.tar.xz
|
||||
/gedit-40.1.tar.xz
|
||||
/gedit-41.alpha.tar.xz
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
28
gedit.spec
28
gedit.spec
@ -2,34 +2,25 @@
|
||||
%global gtk3_version 3.22
|
||||
%global gtksourceview_version 4.0.2
|
||||
%global libpeas_version 1.14.1
|
||||
%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 apiver 41.alpha
|
||||
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: gedit
|
||||
Epoch: 2
|
||||
Version: 40.1
|
||||
Release: 3%{?dist}
|
||||
Version: 41~alpha
|
||||
Release: 1%{?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}/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/109
|
||||
Patch4: 0001-deteplification-the-mega-commit.patch
|
||||
Source0: https://download.gnome.org/sources/%{name}/41.alpha/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||
@ -107,7 +98,7 @@ Install gedit-devel if you want to write plugins for gedit.
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
%py_byte_compile %{__python3} %{buildroot}%{python3_sitearch}/gi/overrides
|
||||
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}/gi/overrides
|
||||
%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gedit/plugins/
|
||||
|
||||
%find_lang %{name} --with-gnome
|
||||
@ -122,8 +113,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
|
||||
%{_datadir}/gedit
|
||||
%{_datadir}/applications/org.gnome.gedit.desktop
|
||||
%{_mandir}/man1/*
|
||||
%{python3_sitearch}/gi/overrides/Gedit.py*
|
||||
%{python3_sitearch}/gi/overrides/__pycache__
|
||||
%{python3_sitelib}/gi/overrides/Gedit.py*
|
||||
%{python3_sitelib}/gi/overrides/__pycache__
|
||||
%{_libdir}/gedit/girepository-1.0
|
||||
%dir %{_libdir}/gedit
|
||||
%dir %{_libdir}/gedit/plugins
|
||||
@ -132,6 +123,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
|
||||
%{_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
|
||||
@ -172,6 +165,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
|
||||
%{_datadir}/vala/
|
||||
|
||||
%changelog
|
||||
* Wed Aug 04 2021 Kalev Lember <klember@redhat.com> - 2:41~alpha-1
|
||||
- Update to 41.alpha
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:40.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
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',
|
||||
)
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
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
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gedit-40.1.tar.xz) = ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09
|
||||
SHA512 (gedit-41.alpha.tar.xz) = 0cff4d01befe6a3a4130ee37875dec28bbfaffbe4806ad76c2ade89834b9c1c98f607c45f6e89b52854bf1c7b6d0024d49fdcbd9b9c97c85424572a527d39b3c
|
||||
|
||||
Loading…
Reference in New Issue
Block a user