[arch-commits] Commit in marker/trunk (5 files)
Balló György
bgyorgy at archlinux.org
Sat Jun 5 10:54:08 UTC 2021
Date: Saturday, June 5, 2021 @ 10:54:08
Author: bgyorgy
Revision: 955997
upgpkg: marker 2020.04.04.2-4: Fix charter support
Modified:
marker/trunk/PKGBUILD
Deleted:
marker/trunk/elf_files_in_lib.patch
marker/trunk/mathjax.patch
marker/trunk/optional-pandoc.patch
marker/trunk/pdf-export.patch
------------------------+
PKGBUILD | 37 +++++++++++++++++--------------------
elf_files_in_lib.patch | 19 -------------------
mathjax.patch | 13 -------------
optional-pandoc.patch | 42 ------------------------------------------
pdf-export.patch | 21 ---------------------
5 files changed, 17 insertions(+), 115 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-05 10:45:27 UTC (rev 955996)
+++ PKGBUILD 2021-06-05 10:54:08 UTC (rev 955997)
@@ -3,7 +3,7 @@
pkgname=marker
pkgver=2020.04.04.2
-pkgrel=3
+pkgrel=4
pkgdesc='Simple yet robust Markdown editor made with GTK'
arch=('x86_64')
url='https://fabiocolacio.github.io/Marker/'
@@ -16,19 +16,11 @@
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')
+ 'git+https://github.com/codeplea/tinyexpr.git')
sha256sums=('SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- '00bed5a7b888a2872933b25c0d12c46c38b47f641308e7b87f876ffa34542be2'
- '09c3394f7cdcd21aa184c42ad837c2b1cacc5326772e10f92f3b3585d5b443c2'
- '9d80931b473a7c36d8ac116999484315f3f332d39b26199e87e62cb62edc3f81'
- 'ac8ecbdd9d49e14045c7508184aeaf267a5ec24aeb05a186486c1ebac20173fb')
+ 'SKIP')
pkgver() {
cd Marker
@@ -37,24 +29,26 @@
prepare() {
cd Marker
+ git submodule init
+ git submodule set-url src/scidown "$srcdir/scidown"
+ git submodule update
+ # Remove optimalization as it breaks charter
+ export CFLAGS=${CFLAGS/ -O2}
+
# ELF file must be in lib
- patch -Np1 -i ../elf_files_in_lib.patch
+ git cherry-pick -n 135857107277648f9f0d762268ec687d556a67dc
# Unbundle mathjax
- rm -r data/scripts/mathjax
- patch -Np1 -i ../mathjax.patch
+ git cherry-pick -n 13bce947564a444ce825752a69110a55cf0f6774
+ sed -i 's|file:///usr/share/javascript/mathjax/MathJax.js|file:///usr/share/mathjax2/MathJax.js|' src/marker-markdown.c
# Fix PDF export
- patch -Np1 -i ../pdf-export.patch
+ git cherry-pick -n fd383f5f0596afbbb28bf5c54cfc2da37ec4379c
# Make pandoc optional
- patch -Np1 -i ../optional-pandoc.patch
+ git cherry-pick -n 9e9bf85e1ec80a3cf54aaab416f6cdbf85080c36
- 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"
@@ -64,6 +58,9 @@
git submodule init
git submodule set-url src/tinyexpr "$srcdir/tinyexpr"
git submodule update
+
+ # Fix PDF export when charter is used
+ git cherry-pick -n 958d5f06707932b48f383c06a2554da2657d6c17
}
build() {
Deleted: elf_files_in_lib.patch
===================================================================
--- elf_files_in_lib.patch 2021-06-05 10:45:27 UTC (rev 955996)
+++ elf_files_in_lib.patch 2021-06-05 10:54:08 UTC (rev 955997)
@@ -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'))
-
Deleted: mathjax.patch
===================================================================
--- mathjax.patch 2021-06-05 10:45:27 UTC (rev 955996)
+++ mathjax.patch 2021-06-05 10:54:08 UTC (rev 955997)
@@ -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;
Deleted: optional-pandoc.patch
===================================================================
--- optional-pandoc.patch 2021-06-05 10:45:27 UTC (rev 955996)
+++ optional-pandoc.patch 2021-06-05 10:54:08 UTC (rev 955997)
@@ -1,42 +0,0 @@
-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");
Deleted: pdf-export.patch
===================================================================
--- pdf-export.patch 2021-06-05 10:45:27 UTC (rev 955996)
+++ pdf-export.patch 2021-06-05 10:54:08 UTC (rev 955997)
@@ -1,21 +0,0 @@
-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