[PR PATCH] Marker: update to 2023.05.02.

[PR PATCH] Marker: update to 2023.05.02.

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

There is a new pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages Marker
https://github.com/void-linux/void-packages/pull/44103

Marker: update to 2023.05.02.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

A patch file from https://github.com/void-linux/void-packages/pull/44103.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Marker-44103.patch --]
[-- Type: text/x-diff, Size: 4739 bytes --]

From 9f90df98fe2f5f03667dde35ac0734b8ba42633a Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 15:56:22 +0530
Subject: [PATCH] Marker: update to 2023.05.02.

MathJax is now optional dep, Katex is used by default.
---
 srcpkgs/Marker/patches/elf_files_in_lib.patch | 19 -----------
 srcpkgs/Marker/patches/system-mathjax.patch   | 12 -------
 srcpkgs/Marker/template                       | 32 +++++++++++++------
 3 files changed, 23 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/Marker/patches/elf_files_in_lib.patch
 delete mode 100644 srcpkgs/Marker/patches/system-mathjax.patch

diff --git a/srcpkgs/Marker/patches/elf_files_in_lib.patch b/srcpkgs/Marker/patches/elf_files_in_lib.patch
deleted file mode 100644
index 63d2cc5f6969..000000000000
--- a/srcpkgs/Marker/patches/elf_files_in_lib.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ruN Marker/meson.build Marker1/meson.build
---- Marker/meson.build	2019-11-06 14:44:46.000000000 +0200
-+++ Marker1/meson.build	2019-12-06 22:39:56.434367811 +0200
-@@ -5,13 +5,14 @@
-
- PREFIX = get_option('prefix')
- DATA_DIR = join_paths(PREFIX, 'share')
-+LIBS_DIR = join_paths(PREFIX, 'lib')
- APP_DIR = join_paths(DATA_DIR, 'com.github.fabiocolacio.marker')
- ICONS_DIR = join_paths(APP_DIR, 'icons')
- STYLES_DIR = join_paths(APP_DIR, 'styles')
- COMMON_DIR = join_paths(APP_DIR, 'common')
- SCRIPTS_DIR = join_paths(APP_DIR, 'scripts')
- HIGHLIGHT_STYLES_DIR = join_paths(join_paths(SCRIPTS_DIR, 'highlight'),'styles')
--WEB_EXTENSIONS_DIRECTORY = join_paths(APP_DIR, 'extensions')
-+WEB_EXTENSIONS_DIRECTORY = join_paths(LIBS_DIR, 'Marker.extensions')
- APPDATA_DIR = join_paths(DATA_DIR, 'metainfo')
- LOCALE_DIR = join_paths(PREFIX, get_option('localedir'))
-
diff --git a/srcpkgs/Marker/patches/system-mathjax.patch b/srcpkgs/Marker/patches/system-mathjax.patch
deleted file mode 100644
index 1ef9fde3693d..000000000000
--- a/srcpkgs/Marker/patches/system-mathjax.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/marker-markdown.c
-+++ b/src/marker-markdown.c
-@@ -87,8 +87,7 @@ char* html_header(MarkerMathJSMode    ma
-       } else
-       {
-         mathjs_css = g_strdup(" ");
--        mathjs_script = g_strdup_printf("<script src=\"file://%smathjax/MathJax.js?config=TeX-AMS_HTML\"></script>",
--                                        SCRIPTS_DIR);
-+        mathjs_script = g_strdup("<script src=\"file:///usr/share/mathjax/MathJax.js?config=TeX-AMS_HTML\"></script>");
-         mathjs_auto = g_strdup(" ");
-       }
-       break;
diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index 1bc21fc39379..0bcf2f8f9f44 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -1,22 +1,36 @@
 # Template file for 'Marker'
 pkgname=Marker
-version=2020.04.04
-revision=3
+version=2023.05.02
+revision=1
+_scidown_commit=a7b7f063de4f272ef0ec12d00b98470888e8cb32
+_charter_commit=a25dee1214ea9ba5882325066555cb813efbb489
+_tinyexpr_commit=9476568b69de4c384903f1d5f255907b92592f45
+build_wrksrc="Marker-${version}"
 build_style=meson
 hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
- webkit2gtk-devel"
-depends="iso-codes mathjax2"
+ libwebkit2gtk41-devel"
+depends="iso-codes"
 short_desc="Gtk3 markdown editor"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later, ISC"
+license="GPL-3.0-or-later, ISC, Zlib"
 homepage="https://fabiocolacio.github.io/Marker/"
-distfiles="https://github.com/fabiocolacio/Marker/releases/download/${version}/marker.zip"
-checksum=ca493e7e94f171c15f7ffc9f697ce265d3b4fdb20fae157601d091d89dd6fb40
+distfiles="https://github.com/fabiocolacio/Marker/archive/refs/tags/${version}.tar.gz
+ https://github.com/Mandarancio/scidown/archive/${_scidown_commit}.tar.gz
+ https://github.com/Mandarancio/charter/archive/${_charter_commit}.tar.gz
+ https://github.com/codeplea/tinyexpr/archive/${_tinyexpr_commit}.tar.gz"
+checksum="097a6e3811f0c4c14c574b8aafee27ee62232ae3ad3084e18a35c2dc8a1e93dd
+ 31e63658e2e79b5c5b0497d568e548f177fc89cb1dd9b6d78aba7685f0506ff0
+ 60237a813383b44891e57049ba1f86cc5b89c28eee620b6ee90582a0c7ba6f8a
+ 1c0c9496d9e9b693ae364860f0b66c403b87337db1b5a78275a0c78a07495286"
 
 post_extract() {
-	# don't include bundled mathjax
-	rm -rf data/scripts/mathjax
+	rmdir "${build_wrksrc}/src/scidown"
+	mv "scidown-${_scidown_commit}" "${build_wrksrc}/src/scidown"
+	rmdir "${build_wrksrc}/src/scidown/src/charter"
+	mv "charter-${_charter_commit}" "${build_wrksrc}/src/scidown/src/charter"
+	rmdir "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
+	mv "tinyexpr-${_tinyexpr_commit}" "${build_wrksrc}/src/scidown/src/charter/src/tinyexpr"
 }
 
 post_install() {

Re: [PR PATCH] [Merged]: Marker: update to 2023.05.02.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

There's a merged pull request on the void-packages repository

Marker: update to 2023.05.02.
https://github.com/void-linux/void-packages/pull/44103

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**