[epiphany/mcatanzaro/tech-preview-gtk4] Switch Tech Preview to use GTK 4 branch




commit 963f7287954fa09c3306d9262d016a4c5dd6a24c
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Wed Mar 23 09:45:30 2022 -0500

    Switch Tech Preview to use GTK 4 branch
    
    This will allow some extra testing for the GTK 4 branch before we pull
    the trigger to merge it into master. It's a lot easier to revert this
    commit than it is to revert such a merge.
    
    Note this also temporarily removes elementary OS support. It will be
    welcome back once it's ready for GTK 4.
    
    Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1100>

 .gitlab-ci.yml          |  8 ++++++++
 org.gnome.Epiphany.json | 48 ++----------------------------------------------
 2 files changed, 10 insertions(+), 46 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe603bb35..3d5db62bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,9 +43,17 @@ flatpak stable:
   only:
     - gnome-*
 
+flatpak master gtk3:
+  extends: '.flatpak'
+  variables:
+    CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true'
+  only:
+    - master
+
 flatpak master:
   extends: '.flatpak'
   variables:
+    BRANCH: 'wip/exalm/gtk4'
     CONFIG_OPTS: '-Dtech_preview=true -Dprofile=Devel -Dunit_tests=enabled -Dgsb_api_key=${GSB_API_KEY} 
-Denable_gsb=true'
   only:
     - master
diff --git a/org.gnome.Epiphany.json b/org.gnome.Epiphany.json
index c86058338..6386a2615 100644
--- a/org.gnome.Epiphany.json
+++ b/org.gnome.Epiphany.json
@@ -44,52 +44,6 @@
                 }
             ]
         },
-        {
-            "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",
@@ -105,6 +59,7 @@
             "buildsystem" : "meson",
             "config-opts" : [
                 "-Dbackends=gtk3",
+                "-Dbackends=gtk4",
                 "-Dintrospection=false",
                 "-Ddocs=false"
             ],
@@ -128,6 +83,7 @@
                 {
                     "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]