Commit 58e1a2ae authored by Jehan's avatar Jehan

build: sync nightly flatpak with recent changes on the stable one.

This includes bumping to the GNOME 3.30 runtime and removing some
dependencies which are now included at the required version in the
updated runtime.
parent 48b5f50a
......@@ -2,7 +2,7 @@
"app-id": "org.gimp.GIMP",
"branch": "master",
"runtime": "org.gnome.Platform",
"runtime-version": "3.28",
"runtime-version": "3.30",
"sdk": "org.gnome.Sdk",
"command": "gimp-2.99",
"separate-locales": false,
......@@ -16,18 +16,12 @@
"--talk-name=org.freedesktop.FileManager1"],
"tags": ["GTK+3", "nightly"],
"desktop-file-name-prefix": "(Nightly) ",
"build-options" : {
"cflags": "-O2 -g",
"cxxflags": "-O2 -g",
"env": {
"V": "1"
}
},
"cleanup": ["/include", "/lib/pkgconfig", "/share/pkgconfig",
"/share/aclocal", "/man", "/share/man", "/share/gtk-doc",
"/share/vala", "*.la", "*.a", "/bin/wmf*", "/bin/libwmf-*",
"/bin/pygtk*", "/bin/pygobject*", "/bin/pygobject-codegen-2.0"],
"modules": [
"shared-modules/python2.7/python-2.7.15.json",
{
"name": "python",
"modules": [
......@@ -89,26 +83,25 @@
"modules": [
{
"name": "exiv2",
"cleanup": [ "/bin" ],
"buildsystem": "cmake-ninja",
"builddir": true,
"cleanup": [ "/bin", "/share" ],
"sources": [
{
"type": "archive",
"url": "http://www.exiv2.org/builds/exiv2-0.26-trunk.tar.gz",
"sha256": "c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb"
},
{
"type": "shell",
"commands": [ "cp -p /usr/share/automake-*/config.{sub,guess} config/" ]
"url": "http://www.exiv2.org/builds/exiv2-0.27.0a-Source.tar.gz",
"sha256": "a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f"
}
]
}
],
"config-opts": [ "--disable-introspection" ],
"buildsystem": "meson",
"config-opts": [ "-D=introspection=false" ],
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/gexiv2/0.10/gexiv2-0.10.8.tar.xz",
"sha256": "81c528fd1e5e03577acd80fb77798223945f043fd1d4e06920c71202eea90801"
"url": "https://download.gnome.org/sources/gexiv2/0.11/gexiv2-0.11.0.tar.xz",
"sha256": "4c7ff71e1c8e37e6de5fd61e19440c600bed4953b461f4a54be3f0b7b61404ec"
}
]
},
......@@ -121,8 +114,8 @@
"sources": [
{
"type": "archive",
"url": "http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.0.tar.gz",
"sha256": "ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
"url": "http://download.savannah.nongnu.org/releases/openexr/ilmbase-2.2.1.tar.gz",
"sha256": "cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e"
},
{
"type": "shell",
......@@ -136,8 +129,8 @@
"sources": [
{
"type": "archive",
"url": "http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz",
"sha256": "36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231"
"url": "http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.1.tar.gz",
"sha256": "8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd"
},
{
"type": "shell",
......@@ -201,51 +194,6 @@
}
]
},
{
/* These are dependencies which are already in the runtime, but in
* older versions. When we need newer versions of a dep, I add it
* here so that I can easily spot the duplicate and recheck when
* updating the runtime.
*/
"name": "duplicate-dependencies",
"modules": [
{
"name": "libpng",
"cleanup": [ "/bin", "/share" ],
"sources": [
{
"type": "archive",
"url": "https://src.fedoraproject.org/repo/pkgs/rpms/libpng/libpng-1.6.34.tar.xz/sha512/89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51/libpng-1.6.34.tar.xz",
"sha256": "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"
}
]
},
{
"name": "lcms2",
"config-opts": [ "--disable-static" ],
"cleanup": [ "/bin", "/share" ],
"sources": [
{
"type": "archive",
"url": "https://src.fedoraproject.org/repo/pkgs/rpms/lcms2/lcms2-2.9.tar.gz/sha512/e30ad5a9a1ab9e7aaace9431434caa19a5ff6143db46644aba971a5ee37a265b26bf738e886d766405a7eb45a9d620d67c7ab3684ace86a107cf5a76642c04a5/lcms2-2.9.tar.gz",
"sha256": "a83cd711db57404e17bc943a4c9742d7a98560918ad3d0a4f511428f96d1ad5b"
}
]
},
{
"name": "libwebp",
"config-opts": [ "--disable-static", "--enable-libwebpmux", "--enable-libwebpdemux" ],
"cleanup": [ "/share", "/bin" ],
"sources": [
{
"type": "archive",
"url": "http://downloads.webmproject.org/releases/webp/libwebp-1.0.0.tar.gz",
"sha256": "84259c4388f18637af3c5a6361536d754a5394492f91be1abc2e981d4983225b"
}
]
}
]
},
{
"name": "aalib",
"config-opts": [ "--disable-static" ],
......@@ -281,8 +229,8 @@
"sources": [
{
"type": "archive",
"url": "https://src.fedoraproject.org/repo/pkgs/rpms/libwmf/libwmf-0.2.8.4.tar.gz/d1177739bf1ceb07f57421f0cee191e0/libwmf-0.2.8.4.tar.gz",
"sha256": "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8"
"url": "https://src.fedoraproject.org/repo/pkgs/rpms/libwmf/libwmf-0.2.9.tar.gz/sha512/202406cd0909ef70535ccf5523aaffd37618c8a6a35012d39de2e65383a020d5cff65ad4a18cd10d3e43d5d32924f6fd4264506de770a5879b07743547954990/libwmf-0.2.9.tar.gz",
"sha512": "202406cd0909ef70535ccf5523aaffd37618c8a6a35012d39de2e65383a020d5cff65ad4a18cd10d3e43d5d32924f6fd4264506de770a5879b07743547954990"
},
{
"type": "shell",
......@@ -316,6 +264,16 @@
}
]
},
{
"name": "json-c",
"sources": [
{
"type": "archive",
"url": "https://github.com/json-c/json-c/archive/json-c-0.13.1-20180305.tar.gz",
"sha256": "5d867baeb7f540abe8f3265ac18ed7a24f91fe3c5f4fd99ac3caba0708511b90"
}
]
},
{
"name": "libmypaint",
"config-opts": [ "--disable-gegl", "--disable-introspection" ],
......@@ -332,31 +290,9 @@
"sources": [
{
"type": "git",
"url": "https://github.com/Jehan/mypaint-brushes.git",
"branch": "v1.3.0",
"commit": "fce9b5f23f658f15f8168ef5cb2fee69cf90addb"
}
]
},
{
"name" : "pango",
"modules": [
{
"name" : "fribidi",
"sources" : [
{
"url" : "https://github.com/fribidi/fribidi/releases/download/0.19.7/fribidi-0.19.7.tar.bz2",
"sha256" : "08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e",
"type" : "archive"
}
]
}
],
"sources" : [
{
"url" : "https://download.gnome.org/sources/pango/1.42/pango-1.42.1.tar.xz",
"sha256" : "915a6756b298578ff27c7a6393f8c2e62e6e382f9411f2504d7af1a13c7bce32",
"type" : "archive"
"url": "https://github.com/mypaint/mypaint-brushes.git",
"branch": "v1.3.x",
"commit": "2c567a19d47c2c23a5a512c9193f4dd61168c69e"
}
]
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment