[gnome-builder] autotools-templates: bump flatpak manifst versions
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] autotools-templates: bump flatpak manifst versions
- Date: Fri, 10 Mar 2017 00:55:09 +0000 (UTC)
commit a239469db80692bf7a8a333e03b95f5e1a3d8fa0
Author: Christian Hergert <chergert redhat com>
Date: Thu Mar 9 16:54:41 2017 -0800
autotools-templates: bump flatpak manifst versions
This does a bit of cleanup and bumps some of the package versions to be
release-candidate versions rather than pre-release tarballs.
.../resources/FlatpakManifestTemplate.json | 54 ++++++++++++++++----
1 files changed, 44 insertions(+), 10 deletions(-)
---
diff --git a/plugins/autotools-templates/autotools_templates/resources/FlatpakManifestTemplate.json
b/plugins/autotools-templates/autotools_templates/resources/FlatpakManifestTemplate.json
index c39b72e..3f175e1 100644
--- a/plugins/autotools-templates/autotools_templates/resources/FlatpakManifestTemplate.json
+++ b/plugins/autotools-templates/autotools_templates/resources/FlatpakManifestTemplate.json
@@ -5,10 +5,14 @@
"sdk": "org.gnome.Sdk",
"command": "{{name}}",
"finish-args": [
- "--share=ipc", "--socket=x11",
+ "--share=network",
+ "--share=ipc",
+ "--socket=x11",
"--socket=wayland",
- "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
- "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+ "--filesystem=xdg-run/dconf",
+ "--filesystem=~/.config/dconf:ro",
+ "--talk-name=ca.desrt.dconf",
+ "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" : {
"cflags": "-O2 -g",
@@ -22,16 +26,45 @@
"/man", "/share/man", "/share/gtk-doc",
"/share/vala",
"*.la", "*.a"],
+ "cleanup": [
+{{if language == "c++"}}
+ "/bin/mm-common-prepare",
+ "/share/mm-common",
+{{end}}
+ "/include",
+ "/lib/pkgconfig",
+ "/man",
+ "/share/aclocal",
+ "/share/doc",
+ "/share/gtk-doc",
+ "/share/man",
+ "/share/pkgconfig",
+{{if language == "vala"}}
+ "/share/vala",
+{{end}}
+ "*.la",
+ "*.a"
+ ],
"modules": [
{{if language == "c++"}}
{
- "name": "libsigcplusplus",
+ "name": "mm-common",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/mm-common/0.9/mm-common-0.9.10.tar.xz",
+ "sha256": "16c0e2bc196b67fbc145edaecb5dbe5818386504fe5703de27002d77140fa217"
+ }
+ ]
+ },
+ {
+ "name": "sigc++",
"config-opts": [ "--disable-documentation" ],
"sources": [
{
"type": "archive",
- "url": "https://download.gnome.org/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz",
- "sha256": "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"
+ "url": "https://download.gnome.org/sources/libsigc++/2.9/libsigc++-2.9.3.tar.xz",
+ "sha256": "0bf9b301ad6198c550986c51150a646df198e8d1d235270c16486b0dda30097f"
}
]
},
@@ -41,8 +74,8 @@
"sources": [
{
"type": "archive",
- "url": "https://download.gnome.org/sources/glibmm/2.49/glibmm-2.49.7.tar.xz",
- "sha256": "571d8ecd082a66fa7248f500063409c1f478edc36f553d0eb27cf6199dee0b25"
+ "url": "https://download.gnome.org/sources/glibmm/2.50/glibmm-2.50.0.tar.xz",
+ "sha256": "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"
}
]
},
@@ -52,8 +85,8 @@
"sources": [
{
"type": "archive",
- "url": "https://download.gnome.org/sources/cairomm/1.12/cairomm-1.12.0.tar.xz",
- "sha256": "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"
+ "url": "https://www.cairographics.org/releases/cairomm-1.12.2.tar.gz",
+ "sha256": "45c47fd4d0aa77464a75cdca011143fea3ef795c4753f6e860057da5fb8bd599"
}
]
},
@@ -82,6 +115,7 @@
{
"name": "gtkmm",
"config-opts": [ "--disable-documentation" ],
+ "build-options" : { "cxxflags": "-O2 -g -std=c++11" },
"sources": [
{
"type": "archive",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]