midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4567 from ykgmfq/patch-1

Browse Source 
travis: update flatpak sdk to 5.12
This commit is contained in:
Weiyi Wang 2019-01-26 14:23:35 -05:00 committed by GitHub
commit 4ed9e057e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis/linux-flatpak/generate-data.sh
View File

@ -43,22 +43,17 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
{ {
"app-id": "org.citra.$REPO_NAME", "app-id": "org.citra.$REPO_NAME",
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"runtime-version": "5.11", "runtime-version": "5.12",
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"command": "citra-qt", "command": "citra-qt",
"rename-desktop-file": "citra.desktop", "rename-desktop-file": "citra.desktop",
"rename-icon": "citra", "rename-icon": "citra",
"rename-appdata-file": "org.citra.$REPO_NAME.appdata.xml", "rename-appdata-file": "org.citra.$REPO_NAME.appdata.xml",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.gcc7"
],
"build-options": { "build-options": {
"build-args": [ "build-args": [
"--share=network" "--share=network"
], ],
"env": { "env": {
"CC": "/usr/lib/sdk/gcc7/bin/gcc",
"CXX": "/usr/lib/sdk/gcc7/bin/g++",
"CI": "$CI", "CI": "$CI",
"TRAVIS": "$TRAVIS", "TRAVIS": "$TRAVIS",
"CONTINUOUS_INTEGRATION": "$CONTINUOUS_INTEGRATION", "CONTINUOUS_INTEGRATION": "$CONTINUOUS_INTEGRATION",
@ -83,18 +78,6 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
"--filesystem=host:ro" "--filesystem=host:ro"
], ],
"modules": [ "modules": [
{
"name": "cmake",
"buildsystem": "cmake-ninja",
"cleanup": ["*"],
"sources": [
{
"type": "archive",
"url": "https://cmake.org/files/v3.12/cmake-3.12.3.tar.gz",
"sha256": "acbf13af31a741794106b76e5d22448b004a66485fc99f6d7df4d22e99da164a"
}
]
},
{ {
"name": "citra", "name": "citra",
"buildsystem": "cmake-ninja", "buildsystem": "cmake-ninja",
@ -118,8 +101,7 @@ cat > /tmp/org.citra.$REPO_NAME.json <<EOF
"install -Dm644 ../dist/citra.svg /app/share/icons/hicolor/scalable/apps/citra.svg", "install -Dm644 ../dist/citra.svg /app/share/icons/hicolor/scalable/apps/citra.svg",
"install -Dm644 ../dist/icon.png /app/share/icons/hicolor/512x512/apps/citra.png", "install -Dm644 ../dist/icon.png /app/share/icons/hicolor/512x512/apps/citra.png",
"mv /app/share/mime/packages/citra.xml /app/share/mime/packages/org.citra.$REPO_NAME.xml", "mv /app/share/mime/packages/citra.xml /app/share/mime/packages/org.citra.$REPO_NAME.xml",
"sed 's/citra/org.citra.citra-nightly/g' -i /app/share/mime/packages/org.citra.$REPO_NAME.xml", "sed 's/citra/org.citra.citra-nightly/g' -i /app/share/mime/packages/org.citra.$REPO_NAME.xml"
"install -m644 --target-directory=/app/lib /usr/lib/sdk/gcc7/lib/libstdc++.so*"
], ],
"sources": [ "sources": [
{ {