Synchronize AppImage action and Qt patch with generic one (#34)

kotatogram · May 1, 2020 · 065e29a · 065e29a
1 parent 00011ab
commit 065e29a
Show file tree

Hide file tree

Showing 2 changed files with 87 additions and 0 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -641,6 +641,18 @@ jobs:
           cd ..
           rm -rf nimf
 
+      - name: Material Decoration.
+        run: |
+          cd $LibrariesPath
+
+          git clone --depth=1 $GIT/desktop-app/materialdecoration.git
+          cd materialdecoration
+          qmake
+          make -j$(nproc)
+          sudo make install
+          cd ..
+          rm -rf materialdecoration
+
       - name: LibDBusMenu Qt.
         if: env.ONLY_CACHE == 'false'
         run: |

diff --git a/Telegram/Patches/qtbase_5_12_8_appimage.diff b/Telegram/Patches/qtbase_5_12_8_appimage.diff
@@ -457,6 +457,81 @@ index f3f0caa379..081c5f03c0 100644
      }
 
      return oldPos;
+diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+index 9e6e5d88c7..4f43ee7bab 100644
+--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
++++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase.cpp
+@@ -1694,50 +1694,50 @@ HFONT QWindowsFontDatabase::systemFont()
+
+ static const char *other_tryFonts[] = {
+     "Arial",
+-    "MS UI Gothic",
+-    "Gulim",
+-    "SimSun",
+-    "PMingLiU",
++    "Yu Gothic UI",
++    "맑은 고딕",
++    "Microsoft YaHei",
++    "Microsoft JhengHei UI",
+     "Arial Unicode MS",
+     0
+ };
+
+ static const char *jp_tryFonts [] = {
+-    "MS UI Gothic",
++    "Yu Gothic UI",
+     "Arial",
+-    "Gulim",
+-    "SimSun",
+-    "PMingLiU",
++    "맑은 고딕",
++    "Microsoft YaHei",
++    "Microsoft JhengHei UI",
+     "Arial Unicode MS",
+     0
+ };
+
+ static const char *ch_CN_tryFonts [] = {
+-    "SimSun",
++    "Microsoft YaHei",
+     "Arial",
+-    "PMingLiU",
+-    "Gulim",
+-    "MS UI Gothic",
++    "Microsoft JhengHei UI",
++    "맑은 고딕",
++    "Yu Gothic UI",
+     "Arial Unicode MS",
+     0
+ };
+
+ static const char *ch_TW_tryFonts [] = {
+-    "PMingLiU",
++    "Microsoft JhengHei UI",
+     "Arial",
+-    "SimSun",
+-    "Gulim",
+-    "MS UI Gothic",
++    "Microsoft YaHei",
++    "맑은 고딕",
++    "Yu Gothic UI",
+     "Arial Unicode MS",
+     0
+ };
+
+ static const char *kr_tryFonts[] = {
+-    "Gulim",
++    "맑은 고딕",
+     "Arial",
+-    "PMingLiU",
+-    "SimSun",
+-    "MS UI Gothic",
++    "Microsoft JhengHei UI",
++    "Microsoft YaHei",
++    "Yu Gothic UI",
+     "Arial Unicode MS",
+     0
+ };
 diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
 index fce2919e73..4a7d0f7d92 100644
 --- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp