[shotwell] flatpak: Let builder reformat the manifest
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] flatpak: Let builder reformat the manifest
- Date: Mon, 8 Oct 2018 13:15:18 +0000 (UTC)
commit 668bc241b5f3b31fac5baaa500fbcbdb74ca264d
Author: Jens Georg <mail jensge org>
Date: Mon Oct 8 15:13:54 2018 +0200
flatpak: Let builder reformat the manifest
This will hopefully minimize further changes
flatpak/org.gnome.Shotwell.json | 192 +++++++++++++++++++++++++---------------
1 file changed, 121 insertions(+), 71 deletions(-)
---
diff --git a/flatpak/org.gnome.Shotwell.json b/flatpak/org.gnome.Shotwell.json
index 21d588d5..3c74e067 100644
--- a/flatpak/org.gnome.Shotwell.json
+++ b/flatpak/org.gnome.Shotwell.json
@@ -1,12 +1,14 @@
{
- "app-id": "org.gnome.Shotwell",
- "runtime": "org.gnome.Platform",
- "runtime-version": "3.30",
- "sdk": "org.gnome.Sdk",
+ "app-id" : "org.gnome.Shotwell",
+ "runtime" : "org.gnome.Platform",
+ "runtime-version" : "3.30",
+ "sdk" : "org.gnome.Sdk",
"command" : "shotwell",
- "tags": [ "nightly" ],
- "desktop-file-name-prefix": "(Nightly) ",
- "finish-args": [
+ "tags" : [
+ "nightly"
+ ],
+ "desktop-file-name-prefix" : "(Nightly) ",
+ "finish-args" : [
"--env=DCONF_USER_CONFIG_DIR=.config/dconf",
"--filesystem=~/.config/dconf:ro",
"--filesystem=xdg-download",
@@ -36,7 +38,7 @@
],
"modules" : [
{
- "name": "libgee",
+ "name" : "libgee",
"sources" : [
{
"type" : "archive",
@@ -44,22 +46,31 @@
"sha256" : "bb2802d29a518e8c6d2992884691f06ccfcc25792a5686178575c7111fea4630"
}
],
- "config-opts" : ["--disable-introspection", "--disable-docs"]
+ "config-opts" : [
+ "--disable-introspection",
+ "--disable-docs"
+ ]
},
{
- "name": "libusb",
+ "name" : "libusb",
"sources" : [
{
- "type" : "archive",
- "url" : "https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2",
- "sha256" : "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
+ "type" : "archive",
+ "url" :
"https://github.com/libusb/libusb/releases/download/v1.0.22/libusb-1.0.22.tar.bz2",
+ "sha256" : "75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157"
}
],
- "config-opts" : ["--disable-udev"]
+ "config-opts" : [
+ "--disable-udev"
+ ]
},
{
- "name": "libghoto2",
- "cleanup" : ["/bin", "/lib/udev", "/share/doc"],
+ "name" : "libghoto2",
+ "cleanup" : [
+ "/bin",
+ "/lib/udev",
+ "/share/doc"
+ ],
"sources" : [
{
"type" : "archive",
@@ -67,104 +78,143 @@
"sha256" : "62523e52e3b8542301e072635b518387f2bd0948347775cf10cb2da9a6612c63"
}
],
- "config-opts" : ["--disable-introspection", "--disable-docs"]
+ "config-opts" : [
+ "--disable-introspection",
+ "--disable-docs"
+ ]
},
{
"name" : "liboauth",
- "config-opts" : [ "--enable-nss" ],
+ "config-opts" : [
+ "--enable-nss"
+ ],
"sources" : [
{
- "type": "archive",
- "url": "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz",
- "sha256": "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
+ "type" : "archive",
+ "url" : "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz",
+ "sha256" : "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
}
]
},
{
- "name": "libgdata",
- "cleanup": ["/share/gtk-doc"],
- "config-opts": [ "--disable-always-build-tests",
+ "name" : "libgdata",
+ "cleanup" : [
+ "/share/gtk-doc"
+ ],
+ "config-opts" : [
+ "--disable-always-build-tests",
"--disable-introspection",
"--disable-Werror",
"--disable-static",
- "--disable-goa" ],
- "sources": [
- {
- "type": "archive",
- "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.9.tar.xz",
- "sha256": "85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a"
- }
- ]
+ "--disable-goa"
+ ],
+ "sources" : [
+ {
+ "type" : "archive",
+ "url" : "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.9.tar.xz",
+ "sha256" : "85c4f7674c0098ffaf060ae01b6b832cb277b3673d54ace3bdedaad6b127453a"
+ }
+ ]
},
{
- "name": "exiv2",
- "cleanup": [ "/bin" ],
- "buildsystem": "cmake",
- "config-opts" : ["-DCMAKE_INSTALL_LIBDIR=lib"],
- "sources": [
+ "name" : "exiv2",
+ "cleanup" : [
+ "/bin"
+ ],
+ "buildsystem" : "cmake",
+ "config-opts" : [
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ],
+ "sources" : [
{
- "type": "git",
- "url": "https://github.com/Exiv2/exiv2/",
+ "type" : "git",
+ "url" : "https://github.com/Exiv2/exiv2/",
"commit" : "e7ffd83af29187190da7f98dcbca8a4d70e19582"
}
]
},
{
- "name": "gexiv2",
- "cleanup" : ["/lib/girepository-1.0", "/share/gir-1.0"],
- "config-opts" : ["--without-python2-girdir", "--without-python3-girdir"],
+ "name" : "gexiv2",
+ "cleanup" : [
+ "/lib/girepository-1.0",
+ "/share/gir-1.0"
+ ],
+ "config-opts" : [
+ "--without-python2-girdir",
+ "--without-python3-girdir"
+ ],
"build-options" : {
- "env": {
- "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR": "/app/share/gir-1.0",
- "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR": "/app/lib/girepository-1.0"
+ "env" : {
+ "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR" : "/app/share/gir-1.0",
+ "PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR" : "/app/lib/girepository-1.0"
}
},
- "sources": [
+ "sources" : [
{
- "type": "git",
- "url": "https://gitlab.gnome.org/GNOME/gexiv2.git/"
+ "type" : "git",
+ "url" : "https://gitlab.gnome.org/GNOME/gexiv2.git/"
}
]
},
-
{
- "name": "libraw",
- "config-opts": [ "--disable-examples", "--disable-static" ],
- "cleanup": [ "/share/doc" ],
- "sources": [
+ "name" : "libraw",
+ "config-opts" : [
+ "--disable-examples",
+ "--disable-static"
+ ],
+ "cleanup" : [
+ "/share/doc"
+ ],
+ "sources" : [
{
- "type": "archive",
- "url": "https://www.libraw.org/data/LibRaw-0.19.0.tar.gz",
- "sha256": "e83f51e83b19f9ba6b8bd144475fc12edf2d7b3b930d8d280bdebd8a8f3ed259"
+ "type" : "archive",
+ "url" : "https://www.libraw.org/data/LibRaw-0.19.0.tar.gz",
+ "sha256" : "e83f51e83b19f9ba6b8bd144475fc12edf2d7b3b930d8d280bdebd8a8f3ed259"
},
{
- "type": "patch",
- "path": "patches/libraw-pkgconfig.patch"
+ "type" : "patch",
+ "path" : "patches/libraw-pkgconfig.patch"
}
]
},
{
- "name": "opencv",
- "buildsystem": "cmake",
- "builddir": true,
- "cleanup" : ["/share/OpenCV/*.cmake", "/share/OpenCV/*.supp"],
- "config-opts" : ["-DBUILD_TESTS=OFF", "-DBUILD_EXAMPLES=OFF", "-DBUILD_PERF_TESTS=OFF",
"-DWITH_FFMPEG=OFF", "-DWITH_GTK=OFF", "-DWITH_GSTREAMER=OFF", "-DBUILD_opencv_apps=OFF",
"-DCMAKE_INSTALL_LIBDIR=lib"],
- "sources": [
+ "name" : "opencv",
+ "buildsystem" : "cmake",
+ "builddir" : true,
+ "cleanup" : [
+ "/share/OpenCV/*.cmake",
+ "/share/OpenCV/*.supp"
+ ],
+ "config-opts" : [
+ "-DBUILD_TESTS=OFF",
+ "-DBUILD_EXAMPLES=OFF",
+ "-DBUILD_PERF_TESTS=OFF",
+ "-DWITH_FFMPEG=OFF",
+ "-DWITH_GTK=OFF",
+ "-DWITH_GSTREAMER=OFF",
+ "-DBUILD_opencv_apps=OFF",
+ "-DCMAKE_INSTALL_LIBDIR=lib"
+ ],
+ "sources" : [
{
- "type": "git",
- "tag": "3.4.1",
+ "type" : "git",
+ "tag" : "3.4.1",
"commit" : "6ffc48769ac60d53c4bd1913eac15117c9b1c9f7",
- "url": "https://github.com/opencv/opencv"
+ "url" : "https://github.com/opencv/opencv"
}
]
},
{
- "name": "shotwell",
- "buildsystem": "meson",
- "config-opts" : ["-Dudev=false", "-Dinstall-apport-hook=false", "-Dface-detection=true"],
+ "name" : "shotwell",
+ "buildsystem" : "meson",
+ "config-opts" : [
+ "-Dudev=false",
+ "-Dinstall-apport-hook=false",
+ "-Dface-detection=true"
+ ],
"sources" : [
{
- "type": "git",
+ "type" : "git",
"url" : "https://gitlab.gnome.org/GNOME/shotwell.git/",
"branch" : "master"
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]