Skip to content

Commit

Permalink
emacs-26.3
Browse files Browse the repository at this point in the history
Two extra patches became necessary. One to add content-rating
information, and another one simply to correct the stated dimentions
of the screenshot so that they match the real screenshot.
  • Loading branch information
Joonas Sarajärvi authored and muep committed Nov 22, 2019
1 parent e007ac8 commit ab8edcf
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 8 deletions.
31 changes: 31 additions & 0 deletions appdata-content-rating.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 8112654a4731ded26b05ec5a716fef893674d358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= <muep@iki.fi>
Date: Thu, 21 Nov 2019 23:19:09 +0200
Subject: [PATCH] Add content_rating to appdata.xml

---
etc/emacs.appdata.xml | 10 ++++++++++
1 file changed, 10 insertions(+)

diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml
index abd545f85d..0794ce9ab6 100644
--- a/etc/emacs.appdata.xml
+++ b/etc/emacs.appdata.xml
@@ -37,4 +37,14 @@
<release date="2019-04-12" version="26.2"/>
<release date="2018-05-28" version="26.1"/>
</releases>
+ <content_rating type="oars-1.0">
+ <content_attribute id="drugs-alcohol">mild</content_attribute>
+ <content_attribute id="drugs-narcotics">mild</content_attribute>
+ <content_attribute id="drugs-tobacco">mild</content_attribute>
+ <content_attribute id="sex-themes">mild</content_attribute>
+ <content_attribute id="language-profanity">mild</content_attribute>
+ <content_attribute id="language-humor">moderate</content_attribute>
+ <content_attribute id="social-chat">intense</content_attribute>
+ <content_attribute id="social-contacts">intense</content_attribute>
+ </content_rating>
</component>
--
2.21.0

13 changes: 7 additions & 6 deletions appdata-releases.patch
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
From b8e845d75f264faf33e595426ddba07b73496ccb Mon Sep 17 00:00:00 2001
From 96799084d91d7c62b44717f9a66444f39d7e84cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= <muep@iki.fi>
Date: Tue, 17 Apr 2018 21:58:19 +0300
Subject: [PATCH] Add releases element to appdata.xml

---
etc/emacs.appdata.xml | 3 +++
1 file changed, 3 insertions(+)
etc/emacs.appdata.xml | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml
index c39668c635..ac63add275 100644
index 6898de3a0c..abd545f85d 100644
--- a/etc/emacs.appdata.xml
+++ b/etc/emacs.appdata.xml
@@ -32,4 +32,8 @@
@@ -32,4 +32,9 @@
<url type="homepage">https://www.gnu.org/software/emacs</url>
<update_contact>emacs-devel_AT_gnu.org</update_contact>
<project_group>GNU</project_group>
+ <releases>
+ <release date="2019-08-28" version="26.3"/>
+ <release date="2019-04-12" version="26.2"/>
+ <release date="2018-05-28" version="26.1"/>
+ </releases>
</component>
--
2.14.3
2.21.0

25 changes: 25 additions & 0 deletions appdata-screenshot-size.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 088c747dcc75dfedef08c05f80ce036adabaceec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= <muep@iki.fi>
Date: Thu, 21 Nov 2019 23:28:06 +0200
Subject: [PATCH] Fix size attributes of the screenshot

---
etc/emacs.appdata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/emacs.appdata.xml b/etc/emacs.appdata.xml
index 0794ce9ab6..e12a5b4c07 100644
--- a/etc/emacs.appdata.xml
+++ b/etc/emacs.appdata.xml
@@ -25,7 +25,7 @@
</description>
<screenshots>
<screenshot type="default">
- <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image>
+ <image type="source" width="1024" height="576">https://www.gnu.org/software/emacs/images/appdata-26.png</image>
</screenshot>
</screenshots>
<launchable type="desktop-id">emacs</launchable>
--
2.21.0

12 changes: 10 additions & 2 deletions org.gnu.emacs.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"sources": [
{
"type": "archive",
"url": "http://ftp.gnu.org/gnu/emacs/emacs-26.2.tar.xz",
"sha256": "151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58e"
"url": "http://ftp.gnu.org/gnu/emacs/emacs-26.3.tar.xz",
"sha256": "4d90e6751ad8967822c6e092db07466b9d383ef1653feb2f95c93e7de66d3485"
},
{
"type": "patch",
Expand All @@ -33,6 +33,14 @@
{
"type": "patch",
"path": "appdata-launchable.patch"
},
{
"type": "patch",
"path": "appdata-content-rating.patch"
},
{
"type": "patch",
"path": "appdata-screenshot-size.patch"
}
],
"cleanup": [
Expand Down

0 comments on commit ab8edcf

Please sign in to comment.