[file-roller/wip/jtojnar/7zip: 2/2] flatpak: switch to upstream 7zip




commit d7a00a7d435fca1c04647a586568959ce7ece64c
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Jul 15 13:57:49 2022 +0200

    flatpak: switch to upstream 7zip
    
    Inspired by 
https://github.com/NixOS/nixpkgs/blob/15edb27dd573a858885692fe5bd08e0030bb59d1/pkgs/tools/archivers/7zz/default.nix

 flatpak/org.gnome.FileRoller.json | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/flatpak/org.gnome.FileRoller.json b/flatpak/org.gnome.FileRoller.json
index f605fab7..e7a261b7 100644
--- a/flatpak/org.gnome.FileRoller.json
+++ b/flatpak/org.gnome.FileRoller.json
@@ -17,16 +17,18 @@
     ],
     "modules" : [
         {
-            "name": "p7zip",
-            "no-autogen": true,
-            "make-args": [
-                "7z"
+            "name": "7zip",
+            "buildsystem": "simple",
+            "build-commands": [
+                "make -f makefile.gcc DISABLE_RAR_COMPRESS=true",
+                "install -m755 b/g*/7zz /app/bin/7zz"
             ],
+            "subdir": "CPP/7zip/Bundles/Alone2",
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://github.com/jinfeihan57/p7zip/archive/refs/tags/v17.04.tar.gz";,
-                    "sha256": "ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef"
+                    "url": "https://7-zip.org/a/7z2200-src.tar.xz";,
+                    "sha256": "40969f601e86aff49aaa0ba0df5ce6fd397cf7e2683a84b591b0081e461ef675"
                 }
             ]
         },


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]