From f51a6510aa2871dc46fea17fa85ad191d65ac914 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Thu, 25 Feb 2021 20:18:08 +0800
Subject: [PATCH] remove libnss3.so and libnssutil3.so from AppImage (#1702)

---
 .github/workflows/ci-linux.yml            |  24 ++++++++++++++++++----
 src/data/core/translations/vnote_zh_CN.qm | Bin 50175 -> 50175 bytes
 src/data/core/translations/vnote_zh_CN.ts |   6 +++---
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index 6aedb507..74458d7d 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -86,21 +86,37 @@ jobs:
           # Move the lib out to avoid duplication
           mv AppDir/usr/lib ./
           LD_LIBRARY_PATH=$PWD/lib:$LD_LIBRARY_PATH
-          # copy translations
+          # Copy translations
           mkdir -p AppDir/usr/translations
           cp $Qt5_Dir/translations/qt_zh_CN.qm AppDir/usr/translations
-          # package qt5ct (EXTRA_QT_PLUGINS seems not work)
+          # Package qt5ct (EXTRA_QT_PLUGINS seems not work)
           # EXTRA_QT_PLUGINS="platformthemes/libqt5ct.so;styles/libqt5ct-style.so"
           mkdir -p AppDir/usr/plugins/platformthemes
           mkdir -p AppDir/usr/plugins/styles
           cp $Qt5_Dir/plugins/platformthemes/* AppDir/usr/plugins/platformthemes/
           cp $Qt5_Dir/plugins/styles/* AppDir/usr/plugins/styles/
-          # package libssl.so and libcrypto.so
+          # Package libssl.so and libcrypto.so
           Qt5_Tools=$Qt5_Dir/../../Tools
           linuxdeploy-x86_64.AppImage --appdir ./AppDir --plugin qt --output appimage -l $Qt5_Tools/OpenSSL/binary/lib/libcrypto.so.1.1 -l $Qt5_Tools/OpenSSL/binary/lib/libssl.so.1.1
+          tree AppDir
+        working-directory: ${{runner.workspace}}/build
+
+      - name: Fix Package
+        run: |
+          mkdir fixpackage
+          mv VNote*.AppImage ./fixpackage
+          pushd fixpackage
+          # Extract the AppImage
+          ./VNote*.AppImage --appimage-extract
+          # Remove libnss3.so and libnssutil3.so
+          rm ./squashfs-root/usr/lib/libnss*.so
+          # Re-package
+          rm VNote*.AppImage
+          linuxdeploy-plugin-appimage-x86_64.AppImage --appdir=./squashfs-root
+          mv VNote*.AppImage ../
+          popd
           mv VNote*.AppImage vnote-linux-x64_v${{env.VNOTE_VER}}.AppImage
           cp vnote-linux-x64_v${{env.VNOTE_VER}}.AppImage vnote-linux-x64.AppImage
-          tree AppDir
         working-directory: ${{runner.workspace}}/build
 
       - name: Archive Artifacts
diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm
index a31838c8afdcc47f126de74d6392c3c774d19f95..7b059cb72f96d3d3178d4fd20e3cc464e1468704 100644
GIT binary patch
delta 36
kcmez0&iucfdBcWgmH?r+{>fXKS3wv_EwjLkO|Ad!04$&n>Hq)$

delta 36
lcmez0&iucfdBcWgmf*7?f|Iv2uYxd=T4sS6n_B<d0RTDM5R3o-

diff --git a/src/data/core/translations/vnote_zh_CN.ts b/src/data/core/translations/vnote_zh_CN.ts
index 778dac18..336772cb 100644
--- a/src/data/core/translations/vnote_zh_CN.ts
+++ b/src/data/core/translations/vnote_zh_CN.ts
@@ -1918,7 +1918,7 @@
     <message>
         <location filename="../../../widgets/notebookexplorer.cpp" line="337"/>
         <source>View By Name (Reversed)</source>
-        <translation>按名字反向查看</translation>
+        <translation>按名字倒序查看</translation>
     </message>
     <message>
         <location filename="../../../widgets/notebookexplorer.cpp" line="342"/>
@@ -1928,7 +1928,7 @@
     <message>
         <location filename="../../../widgets/notebookexplorer.cpp" line="347"/>
         <source>View By Created Time (Reversed)</source>
-        <translation>按创建时间反向查看</translation>
+        <translation>按创建时间倒序查看</translation>
     </message>
     <message>
         <location filename="../../../widgets/notebookexplorer.cpp" line="352"/>
@@ -1938,7 +1938,7 @@
     <message>
         <location filename="../../../widgets/notebookexplorer.cpp" line="357"/>
         <source>View By Modified Time (Reversed)</source>
-        <translation>按修改时间反向查看</translation>
+        <translation>按修改时间倒序查看</translation>
     </message>
 </context>
 <context>