Update to 40.1

2021-04-19 17:54:13 +02:00 · 2021-04-19 17:54:13 +02:00 · 384748cff3
commit 384748cff3
parent 8885160cf6
5 changed files with 12 additions and 61 deletions
--- a/.gitignore
+++ b/.gitignore
@ -128,3 +128,4 @@ gedit-2.31.6.tar.bz2
 /gedit-3.38.0.tar.xz
 /gedit-3.38.1.tar.xz
 /gedit-40.0.tar.xz
+/gedit-40.1.tar.xz
--- a/0001-Add-40.0-release-info-to-appdata.patch
+++ b/0001-Add-40.0-release-info-to-appdata.patch
@ -1,24 +0,0 @@
-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
-
--- a/0001-deteplification-the-mega-commit.patch
+++ b/0001-deteplification-the-mega-commit.patch
@ -283,10 +283,10 @@ unpicking all this and sticking it back together again
 create mode 100644 gedit/resources/ui/gedit-progress-info-bar.ui

 diff --git a/NEWS b/NEWS
-index d1f17abd1..fabc374cd 100644
+index e7f2c81f3..476a367a7 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,30 +1,42 @@
+@@ -1,3 +1,15 @@
 +News in [unreleased]
 +----------------------------
 +* Deteplification:
@ -299,36 +299,9 @@ index d1f17abd1..fabc374cd 100644
 +   - Unfortunatly a couple bug fixes may have been lost
 +   - Plugin API is essentially reverted to 3.36
 +
- News in 40, 2021-03-19
- ----------------------------
- * Remove all the deprecated API.
- * file-browser: drop use of confirm-trash
- * Translation updates.
- 
- Tepl-ification:
- * Use tepl_pango_font_description_to_css().
- * Use TeplLanguageChooser's.
- * Use TeplProgressInfoBar.
- * Start to use TeplBuffer and TeplFile APIs.
-   As a result the new tabs are now named "Untitled File", not
-   "Untitled Document".
- 
- News in 3.38.1, 2020-11-20
- --------------------------
- * AppData: change donation URL to Liberapay.
- * Improvements to the user manual.
- * Translation updates.
- 
- News in 3.38.0, 2020-09-11
- --------------------------
- * Translation updates.
- 
- News in 3.37.92, 2020-09-04
- ---------------------------
- * A few code refactorings.
- * CI: small update.
- * Translation updates.
- 
+ News in 40.1, 2021-04-17
+ ------------------------
+ * Use document folder when opening new files
 diff --git a/build-aux/flatpak/org.gnome.gedit.yml b/build-aux/flatpak/org.gnome.gedit.yml
 index 1438abd07..d3b535176 100644
 --- a/build-aux/flatpak/org.gnome.gedit.yml
--- a/gedit.spec
+++ b/gedit.spec
@ -15,8 +15,8 @@

 Name:		gedit
 Epoch:		2
-Version:	40.0
-Release:	4%{?dist}
+Version:	40.1
+Release:	1%{?dist}
 Summary:	Text editor for the GNOME desktop

 License:	GPLv2+ and GFDL
@ -28,8 +28,6 @@ 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

@ -176,6 +174,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.gedit.de
 %{_datadir}/vala/

 %changelog
+* Mon Apr 19 2021 Kalev Lember <klember@redhat.com> - 2:40.1-1
+- Update to 40.1
+
 * Thu Apr 15 2021 Ray Strode <rstrode@redhat.com> - 2:40.0-4
 - We don't need no tepl, let the library burn. Burn library, burn.

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (gedit-40.0.tar.xz) = b1f6fc4f4894c3ada8e85b81df2fca6870acf725074b56b2c85b1c8f04e004f193e8fad3ac0c641bd0df6a704604ec054e130c60f0480c1abf62a91cb181429e
+SHA512 (gedit-40.1.tar.xz) = ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09