[arch-commits] Commit in ghostwriter/trunk (PKGBUILD qt-5.15.patch)

[Balló György]

    Date: Friday, June 4, 2021 @ 19:55:22
  Author: bgyorgy
Revision: 955934

upgpkg: ghostwriter 2.0.1-1: Update to version 2.0.1

Modified:
  ghostwriter/trunk/PKGBUILD
Deleted:
  ghostwriter/trunk/qt-5.15.patch

---------------+
 PKGBUILD      |   33 ++++++++++++++-------------------
 qt-5.15.patch |   11 -----------
 2 files changed, 14 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-04 19:51:06 UTC (rev 955933)
+++ PKGBUILD	2021-06-04 19:55:22 UTC (rev 955934)
@@ -5,31 +5,26 @@
 # Contributor: Philipp 'TamCore' B. <philipp [at] tamcore [dot] eu>
 
 pkgname=ghostwriter
-pkgver=1.8.1
-pkgrel=4
-pkgdesc="Aesthetic, distraction-free Markdown editor"
-arch=(x86_64)
-url="https://wereturtle.github.io/ghostwriter/"
-license=(GPL3)
-depends=(hunspell qt5-svg qt5-webengine)
-makedepends=(qt5-tools)
+pkgver=2.0.1
+pkgrel=1
+pkgdesc='Aesthetic, distraction-free Markdown editor'
+arch=('x86_64')
+url='https://wereturtle.github.io/ghostwriter/'
+license=('GPL3')
+depends=('hunspell' 'qt5-svg' 'qt5-webengine')
+makedepends=('qt5-tools')
 optdepends=('cmark: processing and rendering CommonMark'
-            'cmark-gfm: processing and rendering GitHub Flavored Markdown'
-            'discount: processing and rendering Markdown'
             'mathjax: formula rendering in live preview'
             'pandoc: Pandoc supported Markdown flavors and export to various formats')
-source=("https://github.com/wereturtle/ghostwriter/archive/v$pkgver/$pkgname-$pkgver.tar.gz"
-        "qt-5.15.patch")
-sha256sums=('2b73fed6a95ebcd45333fe4b12acb491eb4171fca8a11eea1af9bbdc73ed4b69'
-            'f97077cb0137f034c26f30996c6bc6b6835eeeaa55f96b57155434562cb1830c')
+source=("https://github.com/wereturtle/ghostwriter/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('c0d3130a4ee97dc4e74c6b0723f1125fdf75e3e52326c9c6c7dcf7c1a6d1ea36')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../qt-5.15.patch
-  sed -i 's/typeof window.MathJax.typeset !==/typeof window.MathJax !==/' resources/gw.js
-  sed -i 's|https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js|file:///usr/share/mathjax/tex-mml-chtml.js|' src/HtmlPreview.cpp
-  sed -i 's|DATADIR/appdata|DATADIR/metainfo|
-          /INSTALLS +=/ s/ pixmap//' ghostwriter.pro
+  # Unbundle MathJax
+  sed -i 's/typeof window.MathJax !==/typeof window.MathJax.typeset !==/' resources/preview.html
+  sed -i 's|qrc:3rdparty/MathJax/bin/tex-svg-full.js|file:///usr/share/mathjax/tex-svg-full.js|' resources/preview.html
+  sed -i '/MathJax/d' resources.qrc
 }
 
 build() {

Deleted: qt-5.15.patch
===================================================================
--- qt-5.15.patch	2021-06-04 19:51:06 UTC (rev 955933)
+++ qt-5.15.patch	2021-06-04 19:55:22 UTC (rev 955934)
@@ -1,11 +0,0 @@
-diff -aur package.pristine/src/MarkdownEditor.cpp package.new/src/MarkdownEditor.cpp
---- package.pristine/src/MarkdownEditor.cpp	2020-02-23 01:49:46.000000000 +0100
-+++ package.new/src/MarkdownEditor.cpp	2020-06-09 10:45:40.380449821 +0200
-@@ -34,6 +34,7 @@
- #include <QUrl>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFileInfo>
- #include <QDir>
-