From: mobinmob <mobinmob@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Marker: update to 2020.04.04.
Date: Tue, 07 Apr 2020 11:57:42 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20727@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages Markerupd
https://github.com/void-linux/void-packages/pull/20727
Marker: update to 2020.04.04.
Third update attempt (https://github.com/void-linux/void-packages/pull/17168 , https://github.com/void-linux/void-packages/pull/20181).
Built and tested on x86_64. Removing mathjax seems indeed to have no effect, so Ι followed what @Piraty did. I do not know what the binary plugin does, so I relocated it under /lib.
A patch file from https://github.com/void-linux/void-packages/pull/20727.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Markerupd-20727.patch --]
[-- Type: text/x-diff, Size: 2849 bytes --]
From 8afefff0607c916534058479cef30f5ee4675466 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 7 Apr 2020 12:31:34 +0300
Subject: [PATCH] Marker: update to 2020.04.04.
---
srcpkgs/Marker/patches/elf_files_in_lib.patch | 19 ++++++++++++++++
srcpkgs/Marker/template | 22 ++++++++++++++-----
2 files changed, 35 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/Marker/patches/elf_files_in_lib.patch
diff --git a/srcpkgs/Marker/patches/elf_files_in_lib.patch b/srcpkgs/Marker/patches/elf_files_in_lib.patch
new file mode 100644
index 00000000000..63d2cc5f696
--- /dev/null
+++ b/srcpkgs/Marker/patches/elf_files_in_lib.patch
@@ -0,0 +1,19 @@
+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/template b/srcpkgs/Marker/template
index 20360623fda..ccb5e50c3d6 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -1,16 +1,26 @@
# Template file for 'Marker'
pkgname=Marker
-version=2018.07.03
+version=2020.04.04
revision=1
wrksrc=marker
build_style=meson
-hostmakedepends="glib-devel pkg-config unzip"
+hostmakedepends="glib-devel pkg-config"
makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
webkit2gtk-devel"
-short_desc="A gtk3 markdown editor"
+depends="iso-codes"
+short_desc="Gtk3 markdown editor"
maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
+license="GPL-3.0-or-later ISC"
homepage="https://fabiocolacio.github.io/Marker/"
distfiles="https://github.com/fabiocolacio/Marker/releases/download/${version}/marker.zip"
-checksum=9038a2f8b976e6bfb199d14dbf60e7281b66e5ee94a6333ca48e89e63e6096ef
-broken="fails lint (ELF in /usr/share/com.github.fabiocolacio.marker/extensions/libscroll-extension.so)"
+checksum=ca493e7e94f171c15f7ffc9f697ce265d3b4fdb20fae157601d091d89dd6fb40
+patch_args="-Np1"
+
+post_extract() {
+ # don't include bundled mathjax
+ rm -rf data/scripts/mathjax
+}
+
+post_install() {
+ vlicense src/scidown/LICENSE scidown.LICENSE
+}
next reply other threads:[~2020-04-07 9:57 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 9:57 mobinmob [this message]
2020-04-07 10:37 ` [PR PATCH] [Updated] " mobinmob
2020-04-07 15:11 ` [WIP] " mobinmob
2020-04-07 15:13 ` mobinmob
2020-07-20 22:24 ` Piraty
2020-07-24 12:42 ` mobinmob
2020-07-28 8:12 ` Piraty
2020-07-28 8:25 ` mobinmob
2020-07-28 14:05 ` [PR PATCH] [Merged]: " Piraty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20727@inbox.vuxu.org \
--to=mobinmob@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).