Mercurial > sat_docs

changeset 151:6f8c849daf2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flatpak (build_manifest): updated org.freedesktop.Platform runtime version: manifests were using an old 1.6 version of the runtime, this patch fixes them by using the current 18.8 one. Thanks to that, the main_loop.patch which was made because of an outdated version of GLib (see https://github.com/flatpak/flatpak/issues/1899) is not needed anymore and has been removed. Some useless extensions have also been removed from default manifest.
author Goffi <goffi@goffi.org>
date Wed, 26 Jun 2019 20:49:31 +0200
parents 10adfa3f9552
children 4dc8ed9ae4de
files flatpak/build_manifest.py flatpak/main_loop.patch
diffstat 2 files changed, 1 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/flatpak/build_manifest.py	Wed Jun 26 20:46:53 2019 +0200
+++ b/flatpak/build_manifest.py	Wed Jun 26 20:49:31 2019 +0200
@@ -38,14 +38,6 @@
             "python2 setup.py install --prefix=${FLATPAK_DEST}",
         ]
     },
-    "urwid": {
-        "sources_extend": [
-            {
-                "type": "patch",
-                "path": "main_loop.patch"
-            }
-        ]
-    },
     "kivy": {
         "post-install": [
             # this file is not copied normally when installing with
@@ -68,16 +60,8 @@
 ]
 DEFAULT_MANIFEST = {
     "runtime": "org.freedesktop.Platform",
-    "runtime-version": "1.6",
+    "runtime-version": "18.08",
     "sdk": "org.freedesktop.Sdk",
-    "sdk-extensions": [
-        "org.freedesktop.Sdk.Debug",
-        "org.freedesktop.Sdk.Locale",
-        "org.freedesktop.Sdk.Docs"
-    ],
-    "platform-extensions": [
-        "org.freedesktop.Platform.Locale"
-    ],
     "command": "sat_wrapper",
     "finish-args": [
         "--socket=session-bus",
--- a/flatpak/main_loop.patch	Wed Jun 26 20:46:53 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff --git a/urwid/main_loop.py b/urwid/main_loop.py
-index 10ea5e1..59252bf 100755
---- a/urwid/main_loop.py
-+++ b/urwid/main_loop.py
-@@ -130,10 +130,11 @@ class MainLoop(object):
-             event_loop = SelectEventLoop()
-         self.event_loop = event_loop
- 
--        if hasattr(self.screen, 'signal_handler_setter'):
--            # Tell the screen what function it must use to set
--            # signal handlers
--            self.screen.signal_handler_setter = self.event_loop.set_signal_handler
-+        # disabled to work around outdated GLib version in org.freedesktop.Platform
-+        # if hasattr(self.screen, 'signal_handler_setter'):
-+        #     # Tell the screen what function it must use to set
-+        #     # signal handlers
-+        #     self.screen.signal_handler_setter = self.event_loop.set_signal_handler
- 
-         self._watch_pipes = {}
-