Skip to content

Instantly share code, notes, and snippets.

@nytpu
Created May 4, 2020 06:02
Show Gist options
  • Select an option

  • Save nytpu/3c7a2d4cd5582dea85e8307f22e7f214 to your computer and use it in GitHub Desktop.

Select an option

Save nytpu/3c7a2d4cd5582dea85e8307f22e7f214 to your computer and use it in GitHub Desktop.
Patch to Aether to allow it to compile under Linux
diff --git a/aether-core/aether/client/src/app/components/a-breadcrumbs.vue b/aether-core/aether/client/src/app/components/a-breadcrumbs.vue
index f89b94e..cebfba5 100644
--- a/aether-core/aether/client/src/app/components/a-breadcrumbs.vue
+++ b/aether-core/aether/client/src/app/components/a-breadcrumbs.vue
@@ -3,7 +3,7 @@
<router-link class="breadcrumb root" to="/" title="Home">
<img
class="root-img"
- src="../ext_dep/images/logo-sm-h.png"
+ src="../ext_dep/images/Logo-sm-h.png"
alt=""
:class="{ 'at-home': isAtHome }"
/>
diff --git a/aether-core/aether/client/src/app/scss/typefaces.scss b/aether-core/aether/client/src/app/scss/typefaces.scss
index 1b66ec4..34fb920 100644
--- a/aether-core/aether/client/src/app/scss/typefaces.scss
+++ b/aether-core/aether/client/src/app/scss/typefaces.scss
@@ -30,14 +30,14 @@
@font-face {
font-family: 'SSP Semibold';
- src: url('../ext_dep/typefaces/Source_Sans_Pro/SourceSansPro-Semibold.ttf');
+ src: url('../ext_dep/typefaces/Source_Sans_Pro/SourceSansPro-SemiBold.ttf');
font-weight: 500;
font-variant: normal;
}
@font-face {
font-family: 'SSP Semibold Italic';
- src: url('../ext_dep/typefaces/Source_Sans_Pro/SourceSansPro-SemiboldItalic.ttf');
+ src: url('../ext_dep/typefaces/Source_Sans_Pro/SourceSansPro-SemiBoldItalic.ttf');
font-weight: 500;
font-variant: italic;
}
diff --git a/aether-core/aether/makefile b/aether-core/aether/makefile
index 39e7c80..2de4669 100644
--- a/aether-core/aether/makefile
+++ b/aether-core/aether/makefile
@@ -132,7 +132,7 @@ ARM64=GOARCH=arm64
ARM32=GOARCH=arm
# Cross-compile flags
-CCFLAGS_LINUX_X64=CC=x86_64-linux-musl-gcc CXX=x86_64-linux-musl-g++
+CCFLAGS_LINUX_X64=CC=gcc CXX=g++
CCFLAGS_LINUX_X86=CC=i486-linux-musl-gcc CXX=i486-linux-musl-g++
CCFLAGS_LINUX_ARM64=CC=aarch64-linux-musl-gcc CXX=aarch64-linux-musl-g++
CCFLAGS_LINUX_ARM32=CC=arm-linux-musleabi-gcc CXX=arm-linux-musleabi-g++
@@ -173,7 +173,7 @@ LINUX_ARM32_NAME=-linux-arm32
## Desktop
compile-mac: compile-mac-x64 move-mac-x64-be move-mac-x64-fe
compile-win: compile-win-x64 compile-win-x86 move-win-x64-be move-win-x64-fe move-win-x86-be move-win-x86-fe
-compile-linux: compile-linux-x64 compile-linux-x86 compile-linux-arm64 compile-linux-arm32 move-linux-x64-be move-linux-x64-fe move-linux-x86-be move-linux-x86-fe move-linux-arm64-be move-linux-arm64-fe move-linux-arm32-be move-linux-arm32-fe
+compile-linux: compile-linux-x64 move-linux-x64-be move-linux-x64-fe
## Server
# compile-linux-extv-server: compile-linux-x64-extverify-be move-linux-x64-extverify-be compress-linux-x64-extverify-be version-linux-x64-extverify-be
diff --git a/aether-core/aether/client/package.json b/aether-core/aether/client/package.json
index d074c4a..28e5925 100644
--- a/aether-core/aether/client/package.json
+++ b/aether-core/aether/client/package.json
@@ -1,6 +1,6 @@
{
"name": "Aether",
- "version": "2.0.0-dev.14+1909201134.9d812c5",
+ "version": "2.0.0-dev.14+2005032233.e6f4750.d",
"description": "Aether",
"readme": "https://getaether.net",
"main": "src/app/mainmain.js",
@@ -14,7 +14,7 @@
"wpwatch": "webpack --watch",
"dist-mac": "npm run update-version-string && electron-builder --mac -c.extraMetadata.version=$(node ./buildresources/get-version-from-git.js print)",
"dist-win": "npm run update-version-string && electron-builder --win -c.extraMetadata.version=$(node ./buildresources/get-version-from-git.js print)",
- "dist-linux-docker-trigger": "apt-get install libxkbfile-dev -y && electron-builder --linux -c.extraMetadata.version=$BVERSION",
+ "dist-linux-docker-trigger": "apt-get install libxkbfile-dev -y && npm install && electron-builder --linux -c.extraMetadata.version=$BVERSION",
"dist-linux-docker-install-deps": "docker run --rm -ti --env ELECTRON_CACHE=\"/root/.cache/electron\" --env ELECTRON_BUILDER_CACHE=\"/root/.cache/electron-builder\" -v ${PWD}:/project -v ${PWD}/../../../BundledReleases:/BundledReleases -v ${PWD##*/}-node-modules:/project/node_modules -v ~/.cache/electron:/root/.cache/electron -v ~/.cache/electron-builder:/root/.cache/electron-builder electronuserland/builder:10 npm install",
"dist-linux": "npm run update-version-string && docker run --rm -ti --env ELECTRON_CACHE=\"/root/.cache/electron\" --env ELECTRON_BUILDER_CACHE=\"/root/.cache/electron-builder\" -v ${PWD}:/project -v ${PWD}/../../../BundledReleases:/BundledReleases -v ${PWD}/../../../ReleaseArchive:/ReleaseArchive -v ${PWD##*/}-node-modules:/project/node_modules -v ${PWD}/../../../.git:/project/.git -v ~/.cache/electron:/root/.cache/electron -v ~/.cache/electron-builder:/root/.cache/electron-builder -e BVERSION=$(node ./buildresources/get-version-from-git.js print) electronuserland/builder:10 npm run dist-linux-docker-trigger",
"dist-linux-server": "VERSIONATSTART=$(node ./buildresources/get-version-from-git.js print) && mv ./MAKE_BINARIES/aether-backend-linux-x64 ./MAKE_BINARIES/aether-backend-linux-x64-$VERSIONATSTART 2> /dev/null || true && node ./buildresources/aftercompile.js run && mv ./MAKE_BINARIES/aether-backend-linux-x64-extverify ./MAKE_BINARIES/aether-backend-linux-x64-extverify-$VERSIONATSTART 2> /dev/null || true && node ./buildresources/aftercompile.js run",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment