[arch-commits] Commit in (5 files)

Balló György bgyorgy at archlinux.org
Wed Jul 22 12:06:08 UTC 2020


    Date: Wednesday, July 22, 2020 @ 12:06:07
  Author: bgyorgy
Revision: 664828

Move marker from AUR with 11 votes

Added:
  marker/
  marker/trunk/
  marker/trunk/PKGBUILD
  marker/trunk/elf_files_in_lib.patch
  marker/trunk/mathjax.patch

------------------------+
 PKGBUILD               |   66 +++++++++++++++++++++++++++++++++++++++++++++++
 elf_files_in_lib.patch |   19 +++++++++++++
 mathjax.patch          |   13 +++++++++
 3 files changed, 98 insertions(+)

Added: marker/trunk/PKGBUILD
===================================================================
--- marker/trunk/PKGBUILD	                        (rev 0)
+++ marker/trunk/PKGBUILD	2020-07-22 12:06:07 UTC (rev 664828)
@@ -0,0 +1,66 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+
+pkgname=marker
+pkgver=2020.04.04.2
+pkgrel=2
+pkgdesc='Simple yet robust Markdown editor made with GTK'
+arch=(x86_64)
+url='https://fabiocolacio.github.io/Marker/'
+license=(GPL3)
+depends=(gtksourceview3 gtkspell3 webkit2gtk)
+makedepends=(git meson)
+optdepends=('mathjax2: alternative backend for rendering formulas'
+            'pandoc: export to RTF, ODT, DOCX')
+_commit=90f2667611a5017840dced736fd1ea801930a45f  # tags/2020.04.04.2^0
+source=(git+https://github.com/fabiocolacio/Marker.git#commit=$_commit
+        git+https://github.com/Mandarancio/scidown.git
+        git+https://github.com/Mandarancio/charter.git
+        git+https://github.com/codeplea/tinyexpr.git
+        mathjax.patch
+        elf_files_in_lib.patch)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '00bed5a7b888a2872933b25c0d12c46c38b47f641308e7b87f876ffa34542be2'
+            '09c3394f7cdcd21aa184c42ad837c2b1cacc5326772e10f92f3b3585d5b443c2')
+
+pkgver() {
+  cd Marker
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd Marker
+
+  # ELF file must be in lib
+  patch -Np1 -i ../elf_files_in_lib.patch
+
+  # Unbundle mathjax
+  rm -r data/scripts/mathjax
+  patch -Np1 -i ../mathjax.patch
+
+  git submodule init
+  git submodule set-url src/scidown "$srcdir/scidown"
+  git submodule update
+
+  cd src/scidown
+  git submodule init
+  git submodule set-url src/charter "$srcdir/charter"
+  git submodule update
+
+  cd src/charter
+  git submodule init
+  git submodule set-url src/tinyexpr "$srcdir/tinyexpr"
+  git submodule update
+}
+
+build() {
+  arch-meson Marker build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}

Added: marker/trunk/elf_files_in_lib.patch
===================================================================
--- marker/trunk/elf_files_in_lib.patch	                        (rev 0)
+++ marker/trunk/elf_files_in_lib.patch	2020-07-22 12:06:07 UTC (rev 664828)
@@ -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'))
+

Added: marker/trunk/mathjax.patch
===================================================================
--- marker/trunk/mathjax.patch	                        (rev 0)
+++ marker/trunk/mathjax.patch	2020-07-22 12:06:07 UTC (rev 664828)
@@ -0,0 +1,13 @@
+diff -Naur Marker-2020.04.04.orig/src/marker-markdown.c Marker-2020.04.04/src/marker-markdown.c
+--- Marker-2020.04.04.orig/src/marker-markdown.c	2020-04-05 00:31:59.000000000 +0200
++++ Marker-2020.04.04/src/marker-markdown.c	2020-07-22 12:48:35.666097636 +0200
+@@ -87,8 +87,7 @@
+       } 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_printf("<script src=\"file:///usr/share/mathjax2/MathJax.js?config=TeX-AMS_HTML\"></script>");
+         mathjs_auto = g_strdup(" ");
+       }
+       break;



More information about the arch-commits mailing list