Bump to 3.42.0 (#16)

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:7-${{ matrix.arch }}
       options: --privileged
 
     steps:

.github/workflows/merge.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
 
     container:
-      image: ghcr.io/elementary/flatpak-platform/runtime:6-${{ matrix.arch }}
+      image: ghcr.io/elementary/flatpak-platform/runtime:7-${{ matrix.arch }}
       options: --privileged
 
     steps:

org.gnome.FileRoller.json

@@ -1,7 +1,7 @@
 {
     "app-id": "org.gnome.FileRoller",
     "runtime": "io.elementary.Platform",
-    "runtime-version": "6.1",
+    "runtime-version": "7",
     "sdk": "io.elementary.Sdk",
     "command": "file-roller",
     "rename-icon": "org.gnome.ArchiveManager",
@@ -103,6 +103,10 @@
                     "type": "archive",
                     "url": "https://github.com/ruda/rpm2cpio/archive/2017.tar.gz",
                     "sha256": "d266a4f49e65b5d05956502549ceb1d5671f927375ff71299069e6d92363297a"
+                },
+                {
+                    "type": "patch",
+                    "path": "rpm2cpio.patch"
                 }
             ]
         },
@@ -113,19 +117,12 @@
                 "org.gnome.FileRoller.ArchiveManager1.service",
                 "org.gnome.ArchiveManager.svg"
             ],
+            "builddir": true,
             "sources": [
                 {
-                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/file-roller/3.40/file-roller-3.40.0.tar.xz",
-                    "sha256": "4a2886a3966200fb0a9cbba4e2b79f8dad9d26556498aacdaed71775590b3c0d",
-                    "x-checker-data": {
-                        "type": "gnome",
-                        "name": "file-roller"
-                    }
-                },
-                {
-                    "type": "patch",
-                    "path": "fr-application-prefers-color-scheme.patch"
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/file-roller.git",
+                    "commit": "f6f1798376cb9b64ee865d354f1c330ea3e56bcd"
                 },
                 {
                     "type": "patch",
@@ -145,6 +142,5 @@
                 "path": "."
             }]
         }
-
     ]
 }

rpm2cpio.patch

@@ -0,0 +1,37 @@
+diff --git a/rpm2cpio.py b/rpm2cpio.py
+index e8e768d..06907e4 100755
+--- a/rpm2cpio.py
++++ b/rpm2cpio.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # -*- coding: utf-8 -*-
+ #
+ # Lightweight RPM to CPIO converter.
+@@ -20,16 +20,10 @@ rpm2cpio < adjtimex-1.20-2.1.i386.rpm  | cpio -it
+ 133 blocks
+ '''
+
+-from __future__ import print_function
+-
+ import sys
+ import gzip
+ import subprocess
+-
+-try:
+-    from StringIO import StringIO
+-except ImportError:
+-    from io import StringIO
++from io import BytesIO
+
+ HAS_LZMA_MODULE = True
+ try:
+@@ -47,7 +41,7 @@ XZ_MAGIC = b'\xfd7zXZ\x00'
+
+
+ def gzip_decompress(data):
+-    gzstream = StringIO(data)
++    gzstream = BytesIO(data)
+     gzipper = gzip.GzipFile(fileobj=gzstream)
+     data = gzipper.read()
+     return data