Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Marker: update to 2020.04.04.
@ 2020-04-07  9:57 mobinmob
  2020-04-07 10:37 ` [PR PATCH] [Updated] " mobinmob
                   ` (7 more replies)
  0 siblings, 8 replies; 9+ messages in thread
From: mobinmob @ 2020-04-07  9:57 UTC (permalink / raw)
  To: ml

[-- 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
+}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Updated] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
@ 2020-04-07 10:37 ` mobinmob
  2020-04-07 15:11 ` [WIP] " mobinmob
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-04-07 10:37 UTC (permalink / raw)
  To: ml

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

There is an updated 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: 2850 bytes --]

From 6e9ceae5a9a1e35ef75bfa16cabc56b6ffe89e76 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..2c57664b3c6 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
+}

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
  2020-04-07 10:37 ` [PR PATCH] [Updated] " mobinmob
@ 2020-04-07 15:11 ` mobinmob
  2020-04-07 15:13 ` mobinmob
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-04-07 15:11 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-610444639

Comment:
The programs works as an editor but it only exports to the formats supported by scidown (html/latex). Pdf (supported though gtk with GtkPrint) and rtf/docx/odt (supported though pandoc) fail...

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
  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
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-04-07 15:13 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-610444639

Comment:
The programs works as an editor but it only exports to the formats supported by scidown (html/latex). Pdf (supported through gtk with GtkPrint) and rtf/docx/odt (supported though pandoc) fail...

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
                   ` (2 preceding siblings ...)
  2020-04-07 15:13 ` mobinmob
@ 2020-07-20 22:24 ` Piraty
  2020-07-24 12:42 ` mobinmob
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2020-07-20 22:24 UTC (permalink / raw)
  To: ml

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-661382265

Comment:
Marker-2020.04.04.2 is out.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
                   ` (3 preceding siblings ...)
  2020-07-20 22:24 ` Piraty
@ 2020-07-24 12:42 ` mobinmob
  2020-07-28  8:12 ` Piraty
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-07-24 12:42 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-663519673

Comment:
@Piraty : No prepared zip and no submodules in the distribution archive == no easy way to build :(

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
                   ` (4 preceding siblings ...)
  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
  7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2020-07-28  8:12 UTC (permalink / raw)
  To: ml

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-664848925

Comment:
> No prepared zip and no submodules in the distribution archive == no easy way to build :(

you can fetch multiple distfiles and extract contents to the main wrksrc dir.

Is this still WIP?

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [WIP] Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
                   ` (5 preceding siblings ...)
  2020-07-28  8:12 ` Piraty
@ 2020-07-28  8:25 ` mobinmob
  2020-07-28 14:05 ` [PR PATCH] [Merged]: " Piraty
  7 siblings, 0 replies; 9+ messages in thread
From: mobinmob @ 2020-07-28  8:25 UTC (permalink / raw)
  To: ml

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

New comment by mobinmob on void-packages repository

https://github.com/void-linux/void-packages/pull/20727#issuecomment-664855548

Comment:
> > No prepared zip and no submodules in the distribution archive == no easy way to build :(
> 
> you can fetch multiple distfiles and extract contents to the main wrksrc dir.
> 
> Is this still WIP?

It is not WIP, it is ready. I am using it for months. There are some fixes for the pdf issue on master but I 'd rather wait for a proper release.

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PR PATCH] [Merged]: Marker: update to 2020.04.04.
  2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
                   ` (6 preceding siblings ...)
  2020-07-28  8:25 ` mobinmob
@ 2020-07-28 14:05 ` Piraty
  7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2020-07-28 14:05 UTC (permalink / raw)
  To: ml

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

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

Marker: update to 2020.04.04.
https://github.com/void-linux/void-packages/pull/20727

Description:
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.

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-07-28 14:05 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-07  9:57 [PR PATCH] Marker: update to 2020.04.04 mobinmob
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

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).