[gtranslator/bochecha/flatpak: 3/3] flatpak: Use the 3.30 Sdk



commit 7ab033f16e531314ff40f8e4774339aec08ab087
Author: Mathieu Bridon <bochecha daitauha fr>
Date:   Sat Oct 13 21:36:24 2018 +0200

    flatpak: Use the 3.30 Sdk
    
    Let's not stick with an ancient Sdk.
    
    In addition, 3.30 already contains enchant and gettext in suitable
    versions, so we can stop building them here.
    
    Finally, libgda needs a bit more help.

 .gitlab-ci.yml                               |  2 +-
 build-aux/flatpak/org.gnome.Gtranslator.json | 29 +++-------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60ca6c81..ab46c474 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ variables:
       - .flatpak-builder/cache/
 
 flatpak:
-  image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28"
+  image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
   stage: "test"
   script:
     - flatpak-builder --stop-at=${FLATPAK_MODULE} --force-clean app ${MANIFEST_PATH}
diff --git a/build-aux/flatpak/org.gnome.Gtranslator.json b/build-aux/flatpak/org.gnome.Gtranslator.json
index 850f70aa..ed765111 100644
--- a/build-aux/flatpak/org.gnome.Gtranslator.json
+++ b/build-aux/flatpak/org.gnome.Gtranslator.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "org.gnome.Gtranslator",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "3.28",
+    "runtime-version" : "3.30",
     "sdk" : "org.gnome.Sdk",
     "command" : "gtranslator",
     "tags" : [
@@ -38,20 +38,6 @@
         "*.a"
     ],
     "modules" : [
-        {
-            "name" : "enchant",
-            "cleanup" : [
-                "/bin",
-                "/share"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : 
"https://github.com/AbiWord/enchant/releases/download/v2.1.3/enchant-2.1.3.tar.gz";,
-                    "sha256" : "086f37cdecd42eacd0e1dc291f5410d9ca2c5ed2cd9cd9367729e3d2d18a8550"
-                }
-            ]
-        },
         {
             "name" : "gspell",
             "config-opts" : [
@@ -89,7 +75,8 @@
             "name": "libgda",
             "config-opts": [
                 "--enable-json=yes",
-                "--enable-system-sqlite=yes"
+                "--enable-system-sqlite=yes",
+                "--disable-gi-system-install"
             ],
             "sources": [
                 {
@@ -111,16 +98,6 @@
                 "/share/pkgconfig"
             ]
         },
-        {
-            "name" : "gettext",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.8.1.tar.xz";,
-                    "sha256": "105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4"
-                }
-            ]
-        },
         {
             "name" : "gtranslator",
             "buildsystem" : "meson",


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