[arch-commits] Commit in marker/repos/community-x86_64 (8 files)

Balló György bgyorgy at archlinux.org
Thu Jul 23 00:42:06 UTC 2020


    Date: Thursday, July 23, 2020 @ 00:42:06
  Author: bgyorgy
Revision: 664960

archrelease: copy trunk to community-x86_64

Added:
  marker/repos/community-x86_64/PKGBUILD
    (from rev 664959, marker/trunk/PKGBUILD)
  marker/repos/community-x86_64/elf_files_in_lib.patch
    (from rev 664959, marker/trunk/elf_files_in_lib.patch)
  marker/repos/community-x86_64/mathjax.patch
    (from rev 664959, marker/trunk/mathjax.patch)
  marker/repos/community-x86_64/optional-pandoc.patch
    (from rev 664959, marker/trunk/optional-pandoc.patch)
  marker/repos/community-x86_64/pdf-export.patch
    (from rev 664959, marker/trunk/pdf-export.patch)
Deleted:
  marker/repos/community-x86_64/PKGBUILD
  marker/repos/community-x86_64/elf_files_in_lib.patch
  marker/repos/community-x86_64/mathjax.patch

------------------------+
 PKGBUILD               |  142 +++++++++++++++++++++++++----------------------
 elf_files_in_lib.patch |   38 ++++++------
 mathjax.patch          |   26 ++++----
 optional-pandoc.patch  |   42 +++++++++++++
 pdf-export.patch       |   21 ++++++
 5 files changed, 171 insertions(+), 98 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-23 00:42:02 UTC (rev 664959)
+++ PKGBUILD	2020-07-23 00:42:06 UTC (rev 664960)
@@ -1,66 +0,0 @@
-# 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
-}

Copied: marker/repos/community-x86_64/PKGBUILD (from rev 664959, marker/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-23 00:42:06 UTC (rev 664960)
@@ -0,0 +1,76 @@
+# 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=3
+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
+        pdf-export.patch
+        optional-pandoc.patch)
+sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            '00bed5a7b888a2872933b25c0d12c46c38b47f641308e7b87f876ffa34542be2'
+            '09c3394f7cdcd21aa184c42ad837c2b1cacc5326772e10f92f3b3585d5b443c2'
+            '9d80931b473a7c36d8ac116999484315f3f332d39b26199e87e62cb62edc3f81'
+            'ac8ecbdd9d49e14045c7508184aeaf267a5ec24aeb05a186486c1ebac20173fb')
+
+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
+
+  # Fix PDF export
+  patch -Np1 -i ../pdf-export.patch
+
+  # Make pandoc optional
+  patch -Np1 -i ../optional-pandoc.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
+}

Deleted: elf_files_in_lib.patch
===================================================================
--- elf_files_in_lib.patch	2020-07-23 00:42:02 UTC (rev 664959)
+++ elf_files_in_lib.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -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'))
-

Copied: marker/repos/community-x86_64/elf_files_in_lib.patch (from rev 664959, marker/trunk/elf_files_in_lib.patch)
===================================================================
--- elf_files_in_lib.patch	                        (rev 0)
+++ elf_files_in_lib.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -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'))
+

Deleted: mathjax.patch
===================================================================
--- mathjax.patch	2020-07-23 00:42:02 UTC (rev 664959)
+++ mathjax.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -1,13 +0,0 @@
-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;

Copied: marker/repos/community-x86_64/mathjax.patch (from rev 664959, marker/trunk/mathjax.patch)
===================================================================
--- mathjax.patch	                        (rev 0)
+++ mathjax.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -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;

Copied: marker/repos/community-x86_64/optional-pandoc.patch (from rev 664959, marker/trunk/optional-pandoc.patch)
===================================================================
--- optional-pandoc.patch	                        (rev 0)
+++ optional-pandoc.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -0,0 +1,42 @@
+diff --git a/src/marker-exporter.c b/src/marker-exporter.c
+index a038ab8a..d07a5f7e 100644
+--- a/src/marker-exporter.c
++++ b/src/marker-exporter.c
+@@ -127,20 +127,23 @@ marker_exporter_show_export_dialog(MarkerWindow* window)
+   gtk_file_filter_add_pattern (filter, "*.pdf");
+   gtk_file_chooser_add_filter (chooser, filter);
+ 
+-  filter = gtk_file_filter_new ();
+-  gtk_file_filter_set_name (filter, "RTF");
+-  gtk_file_filter_add_pattern (filter, "*.rtf");
+-  gtk_file_chooser_add_filter (chooser, filter);
+-
+-  filter = gtk_file_filter_new ();
+-  gtk_file_filter_set_name (filter, "DOCX");
+-  gtk_file_filter_add_pattern (filter, "*.docx");
+-  gtk_file_chooser_add_filter (chooser, filter);
+-
+-  filter = gtk_file_filter_new ();
+-  gtk_file_filter_set_name (filter, "ODT");
+-  gtk_file_filter_add_pattern (filter, "*.odt");
+-  gtk_file_chooser_add_filter (chooser, filter);
++  if (g_find_program_in_path ("pandoc"))
++  {
++    filter = gtk_file_filter_new ();
++    gtk_file_filter_set_name (filter, "RTF");
++    gtk_file_filter_add_pattern (filter, "*.rtf");
++    gtk_file_chooser_add_filter (chooser, filter);
++
++    filter = gtk_file_filter_new ();
++    gtk_file_filter_set_name (filter, "DOCX");
++    gtk_file_filter_add_pattern (filter, "*.docx");
++    gtk_file_chooser_add_filter (chooser, filter);
++
++    filter = gtk_file_filter_new ();
++    gtk_file_filter_set_name (filter, "ODT");
++    gtk_file_filter_add_pattern (filter, "*.odt");
++    gtk_file_chooser_add_filter (chooser, filter);
++  }
+ 
+   filter = gtk_file_filter_new ();
+   gtk_file_filter_set_name (filter, "LATEX");

Copied: marker/repos/community-x86_64/pdf-export.patch (from rev 664959, marker/trunk/pdf-export.patch)
===================================================================
--- pdf-export.patch	                        (rev 0)
+++ pdf-export.patch	2020-07-23 00:42:06 UTC (rev 664960)
@@ -0,0 +1,21 @@
+diff --git a/src/marker-preview.c b/src/marker-preview.c
+index a7c2e2b4..2cfd153e 100644
+--- a/src/marker-preview.c
++++ b/src/marker-preview.c
+@@ -21,6 +21,7 @@
+ 
+ #include <string.h>
+ #include <stdlib.h>
++#include <libintl.h>
+ 
+ #include <glib.h>
+ #include <time.h>
+@@ -451,7 +452,7 @@ marker_preview_print_pdf(MarkerPreview*     preview,
+ 
+     gtk_print_settings_set(print_s, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT, "pdf");
+     gtk_print_settings_set(print_s, GTK_PRINT_SETTINGS_OUTPUT_URI, uri);
+-    gtk_print_settings_set(print_s, GTK_PRINT_SETTINGS_PRINTER, "Print to File");
++    gtk_print_settings_set(print_s, GTK_PRINT_SETTINGS_PRINTER, dgettext ("gtk30", "Print to File"));
+ 
+     if (orientation == GTK_PAGE_ORIENTATION_PORTRAIT) {
+       gtk_page_setup_set_paper_size(gtk_page_setup, gtk_paper_size);



More information about the arch-commits mailing list