Skip to content

Commit

Permalink
updated manifest according to review
Browse files Browse the repository at this point in the history
- removed "defaul-branch"
- use flathub shared-modules for Python 2
- removed libxslt has it is in freedesktop runtime
- added `content_rating` to appdata, the flatpak test is failing without
it
- use Twisted 19.2.1 (latest one being causing trouble)
  • Loading branch information
goffi-contrib committed Aug 23, 2019
1 parent 4d3000c commit 5ec6f95
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 40 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "shared-modules"]
path = shared-modules
url = https://github.com/flathub/shared-modules.git
5 changes: 5 additions & 0 deletions org.salutatoi.Jp.appdata.xml
Expand Up @@ -51,4 +51,9 @@
<url>https://www.goffi.org/b/N29CuUQS4U4TK36JFuTQ5Q/salut-commune</url>
</release>
</releases>
<content_rating type="oars-1.1">
<content_attribute id="social-chat">intense</content_attribute>
<content_attribute id="social-audio">intense</content_attribute>
<content_attribute id="social-contacts">intense</content_attribute>
</content_rating>
</component>
46 changes: 6 additions & 40 deletions org.salutatoi.Jp.json
@@ -1,6 +1,5 @@
{
"app-id": "org.salutatoi.Jp",
"default-branch": "0.7.0",
"runtime": "org.freedesktop.Platform",
"runtime-version": "18.08",
"sdk": "org.freedesktop.Sdk",
Expand All @@ -11,40 +10,7 @@
"--filesystem=home"
],
"modules": [
{
"name": "python",
"config-opts": [
"--enable-deterministic-archives",
"--disable-static",
"--enable-shared",
"--with-ensurepip=yes",
"--with-system-expat",
"--with-system-ffi",
"--enable-loadable-sqlite-extensions",
"--with-dbmliborder=gdbm",
"--enable-unicode=ucs4"
],
"post-install": [
"chmod 644 /app/lib/libpython2.7.so.1.0"
],
"sources": [
{
"type": "archive",
"url": "https://www.python.org/ftp/python/2.7.16/Python-2.7.16.tar.xz",
"sha256": "f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7"
}
]
},
{
"name": "libxslt",
"sources": [
{
"type": "archive",
"url": "ftp://xmlsoft.org/libxml2/libxslt-1.1.33.tar.gz",
"sha256": "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8"
}
]
},
"shared-modules/python2.7/python-2.7.json",
{
"name": "setuptools",
"buildsystem": "simple",
Expand All @@ -54,8 +20,8 @@
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/68/0c/e470db6866aedbff3c4c88faf7f81b90343d8ff32cd68b62db1b65037fb4/setuptools-41.1.0.zip",
"sha256": "c519b84c299911fd94ef47e3de4fe678c254aefc5cdf8a9b12e4cdc8cc3744a8"
"url": "https://files.pythonhosted.org/packages/d9/ca/7279974e489e8b65003fe618a1a741d6350227fa2bf48d16be76c7422423/setuptools-41.2.0.zip",
"sha256": "66b86bbae7cc7ac2e867f52dc08a6bd064d938bac59dfec71b9b565dd36d6012"
}
],
"ensure-writable": [
Expand Down Expand Up @@ -840,8 +806,8 @@
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/61/31/3855dcacd1d3b2e60c0b4ccc8e727b8cd497bd7087d327d81a9f0cbb580c/Twisted-19.7.0.tar.bz2",
"sha256": "d5db93026568f60cacdc0615fcd21d46f694a6bfad0ef3ff53cde2b4bb85a39d"
"url": "https://files.pythonhosted.org/packages/79/59/035de19362320e632301ed7bbde23e4c8cd6fc5e2f1cf8d354cdba857854/Twisted-19.2.1.tar.bz2",
"sha256": "fa2c04c2d68a9be7fc3975ba4947f653a57a656776f24be58ff0fe4b9aaf3e52"
}
],
"ensure-writable": [
Expand Down Expand Up @@ -1221,7 +1187,7 @@
{
"type": "file",
"path": "org.salutatoi.Jp.appdata.xml",
"sha256": "3db8cf76477a4667e94c7d84ade91282669e2662e2efd4d06e8dd78ab325b1bf"
"sha256": "a71a5c82f76936b36cb80f3e7b132393839e964dac5412d612a096bc0347bda1"
}
]
},
Expand Down
1 change: 1 addition & 0 deletions shared-modules
Submodule shared-modules added at c0bdf7

0 comments on commit 5ec6f95

Please sign in to comment.