Skip to content

Commit

Permalink
Release: notion 2.0.18 and enhancer 0.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jamezrin committed Dec 15, 2021
1 parent a17c0c1 commit 229b7cb
Show file tree
Hide file tree
Showing 27 changed files with 177 additions and 440 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/notion-repackaged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ jobs:
NOTION_REPACKAGED_REVISION: ${{ needs.preload-variables.outputs.notion_repackaged_revision }}
steps:
- uses: actions/checkout@v2
- name: Install moreutils
run: sudo apt-get install -y moreutils
- name: Download official Windows build
env:
NOTION_DOWNLOAD_HASH: ${{ needs.preload-variables.outputs.notion_download_hash }}
Expand All @@ -81,6 +83,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Install icnsutils and moreutils
run: sudo apt-get install -y icnsutils moreutils
- name: Retrieve saved vanilla sources
uses: actions/download-artifact@v2
with:
Expand All @@ -89,8 +93,6 @@ jobs:
- name: Unzip sources with 7z
working-directory: build
run: 7z x vanilla-src.zip
- name: Install icnsutils
run: sudo apt-get install -y icnsutils
- name: Enhance extracted sources
env:
NOTION_ENHANCER_COMMIT: ${{ needs.preload-variables.outputs.notion_enhancer_commit }}
Expand Down Expand Up @@ -157,7 +159,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NOTION_REPACKAGED_EDITION: ${{ matrix.edition }}
run: npx electron-builder --${{ matrix.target }} -c ../electron-builder.js

- name: Print packages md5 checksums
run: find ./dist/ -type f -exec md5sum {} +
cleanup:
name: Cleanup artifacts
if: always()
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
build
build
.vscode
Binary file removed assets/enhancer-icons/128x128.png
Binary file not shown.
Binary file removed assets/enhancer-icons/16x16.png
Binary file not shown.
Binary file removed assets/enhancer-icons/256x256.png
Binary file not shown.
Binary file removed assets/enhancer-icons/32x32.png
Binary file not shown.
Binary file removed assets/enhancer-icons/48x48.png
Binary file not shown.
Binary file removed assets/enhancer-icons/512x512.png
Binary file not shown.
18 changes: 16 additions & 2 deletions electron-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const combineTargetAndArch = (targets, architectures = ['x64', 'arm64']) =>
targets.map((target) => ({ target, arch: architectures }));

module.exports = {
asar: isVanilla,
asar: true,
productName: productName,
extraMetadata: {
description: productDescription,
Expand Down Expand Up @@ -61,7 +61,21 @@ module.exports = {
},
target: combineTargetAndArch(['AppImage', 'deb', 'rpm', 'pacman', 'zip']),
},
deb: { fpm: fpmOptions },
deb: {
fpm: fpmOptions,
depends: [
'libgtk-3-0',
'libnotify4',
'libnss3',
'libxss1',
'libxtst6',
'xdg-utils',
'libatspi2.0-0',
'libuuid1',
'libsecret-1-0',
/* 'libappindicator3-1', */
],
},
pacman: { fpm: fpmOptions },
rpm: { fpm: fpmOptions },
publish: ['github'],
Expand Down
14 changes: 10 additions & 4 deletions notion-repackaged.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
# To bring these variables to your shell, run "source notion-repackaged.sh"
#

export NOTION_VERSION=2.0.16
export NOTION_REPACKAGED_REVISION=5
export NOTION_DOWNLOAD_HASH=9f72284086cda3977f7f569dff3974d5
export NOTION_ENHANCER_COMMIT=b248ffa3bac393f267a4600d4e951aba8565f31e
# Version of the original Notion App installer to repackage
export NOTION_VERSION=2.0.18

# Revision of the current version
export NOTION_REPACKAGED_REVISION=1

# The md5sum hash of the downloaded .exe for the installer
export NOTION_DOWNLOAD_HASH=31bb8b9d547cb5385b9f04017214a206

# The commit of notion-enhancer/desktop to target
export NOTION_ENHANCER_DESKTOP_COMMIT=34189f6a417821343a8360f9ba7061c0bd03570c
100 changes: 0 additions & 100 deletions patches/enhancer/assets-use-notion-protocol.patch

This file was deleted.

60 changes: 0 additions & 60 deletions patches/enhancer/fix-cpu-and-alignment-emoji-sets.patch

This file was deleted.

20 changes: 0 additions & 20 deletions patches/enhancer/focus-mode-titlebar-buttons.patch

This file was deleted.

90 changes: 0 additions & 90 deletions patches/enhancer/paths.patch

This file was deleted.

11 changes: 0 additions & 11 deletions patches/enhancer/query-selector-fix.patch

This file was deleted.

Loading

0 comments on commit 229b7cb

Please sign in to comment.