[gnome-sdk-images/gnome-3-26: 1/3] Update to 3.26 tarballs



commit 2abd3584abdbc2cfd853ab1001d1cd7edc1a811d
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Sep 6 16:14:26 2017 +0200

    Update to 3.26 tarballs

 Makefile              |    2 +-
 org.gnome.Sdk.json.in |  303 +++++++++++++++++++++++++++++--------------------
 2 files changed, 179 insertions(+), 126 deletions(-)
---
diff --git a/Makefile b/Makefile
index b8c802e..a6c83b6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ REPO   ?= repo
 # SDK_BRANCH:          The version (branch) of runtime and sdk to produce
 # SDK_RUNTIME_VERSION: The org.freedesktop.BaseSdk and platform version to build against
 #
-SDK_BRANCH=3.24
+SDK_BRANCH=3.26
 SDK_RUNTIME_VERSION=1.6
 
 # Canned recipe for generating metadata
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index ae8c629..b01d4f0 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -115,14 +115,49 @@
             ]
         },
         {
+            "name": "glib2",
+            "config-opts": ["--with-pcre=system", "--with-python=python3"  ],
+            "ensure-writable": [ "/share/glib-2.0/codegen/*.pyc" ],
+            "cleanup-platform": [ "/share/glib-2.0/codegen",
+                                  "/bin/gdbus-codegen",
+                                  "/bin/glib-*",
+                                  "/bin/gobject-query",
+                                  "/bin/gresource",
+                                  "/bin/gtester*"
+                               ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/glib/2.53/glib-2.53.7.tar.xz";,
+                    "sha256": "028efbf6df4d88d7725314456524b923169f4d4f8503347194b2baf2222f3e33"
+                 }
+            ]
+        },
+        {
+            "name": "gobject-introspection",
+            "config-opts": ["--disable-static" ],
+            "ensure-writable": [ "/lib/gobject-introspection/giscanner/*.pyc",
+                                 "/lib/gobject-introspection/giscanner/*/*.pyc" ],
+            "cleanup-platform": ["/lib/gobject-introspection/giscanner",
+                                 "/share/gobject-introspection/giscanner",
+                                 "/bin"],
+            "sources": [
+                 {
+                     "type": "archive",
+                     "url": 
"https://download.gnome.org/sources/gobject-introspection/1.53/gobject-introspection-1.53.7.tar.xz";,
+                     "sha256": "0a24c9f52f22b0668780f60039ca9c3bea905d5953060d1abceb6335c18a4c88"
+                 }
+            ]
+        },
+        {
             "name": "vala",
             "cleanup-platform": [ "*" ],
             "config-opts": [ "--enable-vapigen", "--enable-unversioned" ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/vala/0.36/vala-0.36.3.tar.xz";,
-                    "sha256": "ac8a4ecd01f62d0c5f62ba50b7290d8c5a1edb308eec772a65b8e79be68f061c"
+                    "url": "https://download.gnome.org/sources/vala/0.38/vala-0.38.0.tar.xz";,
+                    "sha256": "2d88f3961ea64c17f2fe14ad61db9129dd42b4f6de41432ad6a1a29ffe05c479"
                 }
             ]
         },
@@ -143,13 +178,24 @@
             ]
         },
         {
+            "name": "glib-networking",
+            "config-opts": ["--disable-static", "--with-libproxy"],
+            "sources": [
+                 {
+                     "type": "archive",
+                     "url": 
"https://download.gnome.org/sources/glib-networking/2.53/glib-networking-2.53.90.tar.xz";,
+                     "sha256": "402c70a2e43ee5da292085e0a820084ef5f69fbda1b71d45e219634c2db0a9f3"
+                 }
+            ]
+        },
+        {
             "name": "libsoup",
             "config-opts": ["--disable-static"],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsoup/2.58/libsoup-2.58.2.tar.xz";,
-                    "sha256": "442300ca1b1bf8a3bbf2f788203287ff862542d4fc048f19a92a068a27d17b72"
+                    "url": "https://download.gnome.org/sources/libsoup/2.59/libsoup-2.59.90.1.tar.xz";,
+                    "sha256": "e0c396be890f6704bd449de3bc3b94c671a87f29063bab445fa9ceaf81e2082e"
                 }
             ]
         },
@@ -158,8 +204,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": 
"https://download.gnome.org/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz";,
-                    "sha256": "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90"
+                    "url": 
"https://download.gnome.org/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz";,
+                    "sha256": "76a3fa309f9de6074d66848987214f0b128124ba7184c958c15ac78a8ac7eea7"
                 }
             ]
         },
@@ -176,12 +222,56 @@
         },
         {
             "name": "json-glib",
-            "config-opts": [ "--disable-static" ],
+            "buildsystem": "meson",
+            "ensure-writable": [
+                "/share/locale/*/LC_MESSAGES/json-glib-1.0.mo",
+                "/share/runtime/locale/*/share/*/LC_MESSAGES/json-glib-*.mo"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/json-glib/1.3/json-glib-1.3.2.tar.xz";,
+                    "sha256": "f6a80f42e63a3267356f20408bf91a1696837aa66d864ac7de2564ecbd332a7c"
+                }
+            ]
+        },
+        {
+            "name": "pango",
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/json-glib/1.2/json-glib-1.2.8.tar.xz";,
-                    "sha256": "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
+                    "url": "https://download.gnome.org/sources/pango/1.40/pango-1.40.5.tar.xz";,
+                    "sha256": "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9"
+                }
+            ]
+        },
+        {
+            "name": "atk",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/atk/2.25/atk-2.25.90.tar.xz";,
+                    "sha256": "22d54c0ee7930c5906ab7d98e8711276edd2297c83bfd250ce471ff5e23e6094"
+                }
+            ]
+        },
+        {
+            "name": "at-spi2-core",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": 
"https://download.gnome.org/sources/at-spi2-core/2.25/at-spi2-core-2.25.92.tar.xz";,
+                    "sha256": "be0320e0f7a40d041096c243698b2ebff2d886bfc0e4063e7928b1fc5a9079d9"
+                }
+            ]
+        },
+        {
+            "name": "at-spi2-atk",
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/at-spi2-atk/2.25/at-spi2-atk-2.25.3.tar.xz";,
+                    "sha256": "b7aab1a4ee7182083fcfafb595b7b3fe4df34aa2230c775050fe6015b01f84e1"
                 }
             ]
         },
@@ -202,8 +292,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": 
"https://download.gnome.org/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz";,
-                    "sha256": "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"
+                    "url": 
"https://download.gnome.org/sources/adwaita-icon-theme/3.25/adwaita-icon-theme-3.25.91.tar.xz";,
+                    "sha256": "d64193c8f3f9e98bca0275cc384aa23d3ae493cd1a5228ac7d2016a2ee48f99b"
                 }
             ]
         },
@@ -361,8 +451,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/gvfs/1.32/gvfs-1.32.1.tar.xz";,
-                    "sha256": "d0b6c9edab09d52472355657a2f0a14831b2e6c58caba395f721ab683f836ade"
+                    "url": "https://download.gnome.org/sources/gvfs/1.33/gvfs-1.33.92.tar.xz";,
+                    "sha256": "0d22b3c989bbdc00f20dbd50214d371a542b77f3fe870bcb297b105d7ae6e886"
                 }
             ]
         },
@@ -406,77 +496,22 @@
             ]
         },
         {
-            "name": "mozjs38",
-            "build-options" : {
-                "arch" : {
-                    "i386" : {
-                        "config-opts" : [
-                            "--host=i586-unknown-linux-gnu"
-                        ]
-                    },
-                   "arm" : {
-                        "config-opts" : [
-                            "--host=arm-unknown-linux-gnueabi"
-                       ]
-                   }
-                }
-            },
+            "name": "mozjs52",
             "config-opts": [  "--enable-posix-nspr-emulation",
                               "--with-system-zlib",
-                              "--enable-system-ffi",
-                              "--with-system-icu",
-                              "--with-intl-api"],
+                              "--without-system-icu",
+                              "--with-intl-api",
+                              "AUTOCONF=autoconf"],
             "subdir": "js/src",
             "sources": [
                 {
-                    "type": "archive",
-                    "url": "https://people.mozilla.org/~sstangl/mozjs-38.2.1.rc0.tar.bz2";,
-                    "sha256": "01994c758174bc173bcf4960f05ecb4da21014f09641a63b2952bbf9eeaa8b5c"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-fix-tracelogger.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-release-number.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-shell-version.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-pkg-config-version.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-copy-headers.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-1269317.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-fix-64bit-archs.patch"
-                },
-                {
-                    "type": "patch",
-                    "path": "mozjs38-1143022.patch"
-                },
-                {
-                    "type": "shell",
-                    "commands": [
-                        /* Work around mtime issue in configure and configure.ac (see bug 778802) */
-                        "touch js/src/configure",
-                        "cp -f /usr/share/gnu-config/config.sub ./build/autoconf/",
-                        "cp -f /usr/share/gnu-config/config.guess ./build/autoconf/"
-                    ]
+                    "type": "git",
+                    "url": "https://github.com/ptomato/mozjs.git";,
+                    "commit": "bb19aaea0a0f77827369242969f0eaa243e62472"
                 }
             ],
             "post-install": [
-                "cp -p js/src/js-config.h /usr/include/mozjs-38",
+                "cp -p js/src/js-config.h /usr/include/mozjs-52",
                 "rm /usr/lib/libjs_static.ajs"
             ]
         },
@@ -486,8 +521,40 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/gjs/1.48/gjs-1.48.3.tar.xz";,
-                    "sha256": "669b7d78ad98390a762eec50d7cc637e25f196d986c0200d9f1c3a0e0cd90f33"
+                    "url": "https://download.gnome.org/sources/gjs/1.49/gjs-1.49.92.tar.xz";,
+                    "sha256": "79d56e8752e5803ced54b9111fc4fa7da382d40868479318906556e79e8bf4a2"
+                }
+            ]
+        },
+        /* VTE needs pcre2 */
+        {
+            "name": "pcre2",
+            "config-opts": ["--enable-jit",
+                            "--enable-pcre2grep-jit",
+                            "--disable-bsr-anycrlf",
+                            "--disable-coverage",
+                            "--disable-ebcdic",
+                            "--disable-never-backslash-C",
+                            "--enable-newline-is-lf",
+                            "--enable-pcre2-8",
+                            "--enable-pcre2-16",
+                            "--enable-pcre2-32",
+                            "--disable-pcre2test-libedit",
+                            "--enable-pcre2test-libreadline",
+                            "--enable-pcre2grep-callout",
+                            "--disable-pcre2grep-libbz2",
+                            "--disable-pcre2grep-libz",
+                            "--disable-rebuild-chartables",
+                            "--enable-shared",
+                            "--enable-stack-for-recursion",
+                            "--disable-static",
+                            "--enable-unicode",
+                            "--disable-valgrind"],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.22.tar.gz";,
+                    "sha256": "7627f93f2763ee6e11ac58558d8cfbf29e1070757b45571c0ba30ce9e096505c"
                 }
             ]
         },
@@ -505,15 +572,15 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/vte/0.48/vte-0.48.3.tar.xz";,
-                    "sha256": "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3"
+                    "url": "https://download.gnome.org/sources/vte/0.49/vte-0.49.1.tar.xz";,
+                    "sha256": "6d5c2b6c5a953f10167ce3e2ee0e7b3f8a56aafc7a1c2e1509d1a0afb7f4bc29"
                 }
             ]
         },
         {
             "name": "webkitgtk4",
             "cleanup-platform": [ "/libexec/webkit2gtk-4.0/MiniBrowser" ],
-            "cmake": true,
+            "buildsystem": "cmake",
             "build-options" : {
                 "cflags": "-g1",
                 "cxxflags": "-g1",
@@ -523,37 +590,37 @@
                             "-DCMAKE_SYSTEM_PROCESSOR=i586"
                         ]
                     },
-                   "arm" : {
+                    "arm" : {
                         "config-opts" : [
                             "-DCMAKE_SYSTEM_PROCESSOR=arm",
                             "-DENABLE_JIT=OFF"
-                       ]
-                   }
+                        ]
+                    }
                 }
             },
             "config-opts": [
-               "-DPORT=GTK",
-               "-DCMAKE_BUILD_TYPE=Release",
-               "-DCMAKE_C_FLAGS_RELEASE:STRING=-DNDEBUG",
-               "-DCMAKE_CXX_FLAGS_RELEASE:STRING=-DNDEBUG",
-               "-DENABLE_ACCELERATED_2D_CANVAS=OFF",
-               "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
-               "-DLIB_INSTALL_DIR:PATH=/usr/lib",
-               "-DSYSCONF_INSTALL_DIR:PATH=/usr/etc",
-               "-DSHARE_INSTALL_PREFIX:PATH=/usr/share",
-               "-DINCLUDE_INSTALL_DIR:PATH=/usr/include",
-               "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON",
-               "-DBUILD_SHARED_LIBS:BOOL=ON",
-               "-DENABLE_GTKDOC=OFF",
-               "-DENABLE_VIDEO=ON",
-               "-DENABLE_WEB_AUDIO=ON",
+                "-DPORT=GTK",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_C_FLAGS_RELEASE:STRING=-DNDEBUG",
+                "-DCMAKE_CXX_FLAGS_RELEASE:STRING=-DNDEBUG",
+                "-DENABLE_ACCELERATED_2D_CANVAS=OFF",
+                "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
+                "-DLIB_INSTALL_DIR:PATH=/usr/lib",
+                "-DSYSCONF_INSTALL_DIR:PATH=/usr/etc",
+                "-DSHARE_INSTALL_PREFIX:PATH=/usr/share",
+                "-DINCLUDE_INSTALL_DIR:PATH=/usr/include",
+                "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON",
+                "-DBUILD_SHARED_LIBS:BOOL=ON",
+                "-DENABLE_GTKDOC=OFF",
+                "-DENABLE_VIDEO=ON",
+                "-DENABLE_WEB_AUDIO=ON",
                 "-DENABLE_MINIBROWSER=ON"
-           ],
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://webkitgtk.org/releases/webkitgtk-2.16.6.tar.xz";,
-                    "sha256": "fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21"
+                    "url": "https://webkitgtk.org/releases/webkitgtk-2.17.92.tar.xz";,
+                    "sha256": "e22478a1631fdbd2b9ca1622bcd51ec296e04cbe7c5f480b482450f91cabff34"
                 },
                 {
                     "type": "patch",
@@ -582,30 +649,16 @@
                     "PYTHON": "/usr/bin/python3"
                 }
             },
+            "buildsystem": "simple",
+            "build-commands": [
+                "python3 ./setup.py build",
+                "python3 ./setup.py install"
+            ],
             "sources": [
                 {
                     "type": "archive",
-                    "url": "http://cairographics.org/releases/pycairo-1.10.0.tar.bz2";,
-                    "sha256": "9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be"
-                },
-                {
-                    "type": "shell",
-                    "commands": [ "python3 ./waf --version" ]
-                },
-                {
-                    "type": "patch",
-                    "strip-components": 0,
-                    "path": "cairo-waf-use-python-config-as-shell-script.patch"
-                },
-                {
-                    "type": "patch",
-                    "strip-components": 0,
-                    "path": "pycairo-1.10.0-pickle-python3.patch"
-                },
-                {
-                    "type": "file",
-                    "path": "waf-configure",
-                    "dest-filename": "configure"
+                    "url": 
"https://github.com/pygobject/pycairo/releases/download/v1.12.0/pycairo-1.12.0.tar.gz";,
+                    "sha256": "243c351d7abcef41ac1fa984d2c753f3d065336a0fcf4c20fafb191b23423095"
                 }
             ]
         },
@@ -620,8 +673,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://download.gnome.org/sources/pygobject/3.24/pygobject-3.24.1.tar.xz";,
-                    "sha256": "a628a95aa0909e13fb08230b1b98fc48adef10b220932f76d62f6821b3fdbffd"
+                    "url": "https://download.gnome.org/sources/pygobject/3.25/pygobject-3.25.1.tar.xz";,
+                    "sha256": "8728bb27078f7ee45c431ccbc237a58fb6d6eb1b7a0668bbe29eb107267bd736"
                 }
             ]
         },


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