[epiphany] flatpak: Revert gtk4 manifest changes



commit 54858da11da3f0a95dba291280b4a2a15ba91c21
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu Mar 24 00:57:34 2022 +0400

    flatpak: Revert gtk4 manifest changes
    
    They turned out to be unnecessary, the manifest from the GTK4 branch is
    used instead.

 org.gnome.Epiphany.json | 52 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)
---
diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json
index 858a69f02..c86058338 100644
--- a/org.gnome.Epiphany.json
+++ b/org.gnome.Epiphany.json
@@ -18,8 +18,7 @@
         "--socket=pulseaudio",
         "--socket=wayland",
         "--system-talk-name=org.freedesktop.GeoClue2",
-        "--own-name=org.gnome.Epiphany.WebAppProvider",
-        "--env=WEBKIT_NICOSIA_PAINTING_THREADS=0"
+        "--own-name=org.gnome.Epiphany.WebAppProvider"
     ],
     "modules" : [
          {
@@ -45,6 +44,52 @@
                 }
             ]
         },
+        {
+            "name": "elementary-stylesheet",
+            "buildsystem": "meson",
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://github.com/elementary/stylesheet.git";
+                }
+            ],
+            "modules": [
+                {
+                    "name": "sassc",
+                    "cleanup": [ "*" ],
+                    "sources": [
+                        {
+                            "type": "git",
+                            "url": "https://github.com/sass/sassc.git";,
+                            "tag": "3.6.1"
+                        },
+                        {
+                            "type": "script",
+                            "dest-filename": "autogen.sh",
+                            "commands": [ "autoreconf -si" ]
+                        }
+                    ],
+                    "modules": [
+                        {
+                            "name": "libsass",
+                            "cleanup": [ "*" ],
+                            "sources": [
+                                {
+                                    "type": "git",
+                                    "url": "https://github.com/sass/libsass.git";,
+                                    "tag": "3.6.4"
+                                },
+                                {
+                                    "type": "script",
+                                    "dest-filename": "autogen.sh",
+                                    "commands": [ "autoreconf -si" ]
+                                }
+                            ]
+                        }
+                    ]
+                }
+            ]
+        },
         {
             "name" : "libdazzle",
             "buildsystem" : "meson",
@@ -59,7 +104,7 @@
             "name" : "libportal",
             "buildsystem" : "meson",
             "config-opts" : [
-                "-Dbackends=gtk3,gtk4",
+                "-Dbackends=gtk3",
                 "-Dintrospection=false",
                 "-Ddocs=false"
             ],
@@ -83,7 +128,6 @@
                 {
                     "type" : "git",
                     "url" : "https://gitlab.gnome.org/GNOME/epiphany.git";,
-                    "branch" : "wip/exalm/gtk4",
                     "disable-shallow-clone" : true
                 }
             ]


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