Fixes

aokellermann · Oct 13, 2023 · 292a33e · 292a33e
1 parent 84949bc
commit 292a33e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/electron-builder.js b/electron-builder.js
@@ -25,7 +25,7 @@ const fpmOptions = [
   `--conflicts=${conflictProductId}`,
 ];
 
-const combineTargetAndArch = (targets, architectures = ['x64', 'arm64']) =>
+const combineTargetAndArch = (targets, architectures = ['x64']) =>
   targets.map((target) => ({ target, arch: architectures }));
 
 // realistically Auto Update only works for Windows

diff --git a/patches/no-sandbox-flag.patch b/patches/no-sandbox-flag.patch
@@ -4,9 +4,7 @@
  Object.defineProperty(exports, "__esModule", { value: true });
  require("../helpers/setEnvironment");
  const electron_1 = require("electron");
-+electron_1.app.commandLine.appendSwitch("--no-sandbox");
-+electron_1.app.commandLine.appendSwitch("--enable-features=UseOzonePlatform");
-+electron_1.app.commandLine.appendSwitch("--ozone-platform=wayland");
++electron_1.app.commandLine.appendSwitch("no-sandbox");
  require("./crashReporter");
  const security_1 = require("./security");
  const autoUpdater_1 = require("./autoUpdater");
diff --git a/scripts/aio-dev-test.sh b/scripts/aio-dev-test.sh
@@ -25,15 +25,15 @@ log "Building vanilla edition..."
 
 export NOTION_REPACKAGED_EDITION=vanilla
 
-${WORKSPACE_DIR}/scripts/build-locally.sh --linux dir &
-
-if [ "${NOTION_REPACKAGED_AIO_SKIP_ENHANCED}" != true ]; then
-  log "Building enhanced edition..."
-
-  export NOTION_REPACKAGED_EDITION=enhanced 
-  
-  ${WORKSPACE_DIR}/scripts/build-locally.sh --linux dir
-fi
+${WORKSPACE_DIR}/scripts/build-locally.sh
+
+#if [ "${NOTION_REPACKAGED_AIO_SKIP_ENHANCED}" != true ]; then
+#  log "Building enhanced edition..."
+#
+#  export NOTION_REPACKAGED_EDITION=enhanced
+#
+#  ${WORKSPACE_DIR}/scripts/build-locally.sh --linux dir
+#fi
 
 fg > /dev/null 2>&1 || true
 log "All build steps have successfully finished."
diff --git a/scripts/build-locally.sh b/scripts/build-locally.sh
@@ -30,7 +30,7 @@ pushd "${NOTION_REPACKAGED_EDITION_SRCDIR}" > /dev/null
 
 patchfile="${WORKSPACE_DIR}/patches/remove-postinstall.patch"
 dos2unix "$patchfile"
-patch -p0 --binary < "$patchfile"
+patch -p0 --binary -N -r- < "$patchfile" ||:
 
 log "Installing dependencies..."
 npm install

diff --git a/scripts/enhance-src.sh b/scripts/enhance-src.sh
@@ -78,6 +78,9 @@ convert "${NOTION_ENHANCER_ICONS}/colour-x512.png" -resize 256x256 \
   -define icon:auto-resize="256,128,96,64,48,32,16" \
   icon.ico
 
+# todo: use real icon
+cp -f "${NOTION_ENHANCER_ICONS}/colour-x512.png" "../${NOTION_VANILLA_SRC_NAME}/icon.png"
+
 # todo: what is this for?
 #log "Converting icon to multi-size for Mac and Linux"
 ## https://askubuntu.com/questions/223215/how-can-i-convert-a-png-file-to-icns

diff --git a/scripts/extract-src.sh b/scripts/extract-src.sh
@@ -59,7 +59,7 @@ sed -i 's|error.message.indexOf("/opt/notion-app/app.asar") !== -1|process.platf
 # fix for issue #46 of notion-repackaged
 patchfile="${WORKSPACE_DIR}/patches/no-sandbox-flag.patch"
 dos2unix "$patchfile"
-patch -p0 --binary < "$patchfile"
+patch -p0 --binary -N -r- < "$patchfile" ||:
 
 find . -type f -name "*.js.map" -exec rm {} +