diff --git a/editors/Makefile b/editors/Makefile index 116dd89a6a4b..544161bea64e 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -1,307 +1,308 @@ COMMENT = Editors SUBDIR += 2bsd-vi SUBDIR += abiword SUBDIR += abiword-docs SUBDIR += ad SUBDIR += aee SUBDIR += aewan SUBDIR += amp SUBDIR += apel SUBDIR += beav SUBDIR += bee-host SUBDIR += biew SUBDIR += bined SUBDIR += bingrok SUBDIR += bitedit SUBDIR += bless SUBDIR += boiling-egg SUBDIR += bpatch SUBDIR += bvi SUBDIR += calligra SUBDIR += calligraplan SUBDIR += chexedit SUBDIR += consult.el SUBDIR += cooledit SUBDIR += cpeditor SUBDIR += cream SUBDIR += cudatext SUBDIR += deforaos-editor SUBDIR += dhex SUBDIR += diakonos SUBDIR += diamond SUBDIR += dkns SUBDIR += drjava SUBDIR += dte SUBDIR += dz6 SUBDIR += e3 SUBDIR += e93 SUBDIR += ecce SUBDIR += ecrire SUBDIR += editorconfig-core-c SUBDIR += elementary-code SUBDIR += emacs SUBDIR += emacs-devel SUBDIR += encryptpad SUBDIR += enter-tex SUBDIR += featherpad SUBDIR += fileobj SUBDIR += flim SUBDIR += focuswriter SUBDIR += fxite SUBDIR += gedit SUBDIR += gedit-plugins SUBDIR += ghex SUBDIR += ghostwriter SUBDIR += gmanedit SUBDIR += gnome-text-editor SUBDIR += gobby SUBDIR += gomate SUBDIR += gummi SUBDIR += helix SUBDIR += heme SUBDIR += hexcurse SUBDIR += hexedit SUBDIR += hexer SUBDIR += hexpert SUBDIR += hnb SUBDIR += hte SUBDIR += imhex SUBDIR += jed SUBDIR += jedit SUBDIR += joe SUBDIR += jove SUBDIR += jucipp SUBDIR += jupp SUBDIR += kakoune SUBDIR += kakoune-lsp SUBDIR += kate SUBDIR += kibi SUBDIR += kile SUBDIR += komodo-edit SUBDIR += languageclient-neovim SUBDIR += lapce SUBDIR += lazarus SUBDIR += lazarus-devel SUBDIR += lazarus-gtk3-devel SUBDIR += lazarus-qt5 SUBDIR += lazarus-qt5-devel SUBDIR += lazarus-qt6 SUBDIR += lazarus-qt6-devel SUBDIR += le SUBDIR += leafpad SUBDIR += libreoffice SUBDIR += libreoffice-af SUBDIR += libreoffice-am SUBDIR += libreoffice-as SUBDIR += libreoffice-ast SUBDIR += libreoffice-be SUBDIR += libreoffice-bg SUBDIR += libreoffice-bn SUBDIR += libreoffice-bn_IN SUBDIR += libreoffice-bo SUBDIR += libreoffice-br SUBDIR += libreoffice-brx SUBDIR += libreoffice-bs SUBDIR += libreoffice-ca SUBDIR += libreoffice-ca_valencia SUBDIR += libreoffice-ckb SUBDIR += libreoffice-cs SUBDIR += libreoffice-cy SUBDIR += libreoffice-da SUBDIR += libreoffice-dgo SUBDIR += libreoffice-dsb SUBDIR += libreoffice-dz SUBDIR += libreoffice-el SUBDIR += libreoffice-en_GB SUBDIR += libreoffice-en_ZA SUBDIR += libreoffice-eo SUBDIR += libreoffice-es SUBDIR += libreoffice-et SUBDIR += libreoffice-eu SUBDIR += libreoffice-fa SUBDIR += libreoffice-fi SUBDIR += libreoffice-fur SUBDIR += libreoffice-fy SUBDIR += libreoffice-ga SUBDIR += libreoffice-gd SUBDIR += libreoffice-gl SUBDIR += libreoffice-gu SUBDIR += libreoffice-gug SUBDIR += libreoffice-hi SUBDIR += libreoffice-hr SUBDIR += libreoffice-hsb SUBDIR += libreoffice-hy SUBDIR += libreoffice-i18n SUBDIR += libreoffice-id SUBDIR += libreoffice-is SUBDIR += libreoffice-it SUBDIR += libreoffice-ka SUBDIR += libreoffice-kab SUBDIR += libreoffice-kk SUBDIR += libreoffice-km SUBDIR += libreoffice-kmr_Latn SUBDIR += libreoffice-kn SUBDIR += libreoffice-kok SUBDIR += libreoffice-ks SUBDIR += libreoffice-lb SUBDIR += libreoffice-lo SUBDIR += libreoffice-lt SUBDIR += libreoffice-lv SUBDIR += libreoffice-mai SUBDIR += libreoffice-mk SUBDIR += libreoffice-ml SUBDIR += libreoffice-mn SUBDIR += libreoffice-mni SUBDIR += libreoffice-mr SUBDIR += libreoffice-my SUBDIR += libreoffice-nb SUBDIR += libreoffice-ne SUBDIR += libreoffice-nl SUBDIR += libreoffice-nn SUBDIR += libreoffice-nr SUBDIR += libreoffice-nso SUBDIR += libreoffice-oc SUBDIR += libreoffice-om SUBDIR += libreoffice-or SUBDIR += libreoffice-pa_IN SUBDIR += libreoffice-ro SUBDIR += libreoffice-rw SUBDIR += libreoffice-sa_IN SUBDIR += libreoffice-sat SUBDIR += libreoffice-sd SUBDIR += libreoffice-si SUBDIR += libreoffice-sid SUBDIR += libreoffice-sk SUBDIR += libreoffice-sl SUBDIR += libreoffice-sq SUBDIR += libreoffice-sr SUBDIR += libreoffice-sr_Latn SUBDIR += libreoffice-ss SUBDIR += libreoffice-st SUBDIR += libreoffice-sv SUBDIR += libreoffice-sw_TZ SUBDIR += libreoffice-szl SUBDIR += libreoffice-ta SUBDIR += libreoffice-te SUBDIR += libreoffice-tg SUBDIR += libreoffice-th SUBDIR += libreoffice-tn SUBDIR += libreoffice-tr SUBDIR += libreoffice-ts SUBDIR += libreoffice-tt SUBDIR += libreoffice-ug SUBDIR += libreoffice-uz SUBDIR += libreoffice-ve SUBDIR += libreoffice-vec SUBDIR += libreoffice-xh SUBDIR += libreoffice-zu SUBDIR += linux-bcompare SUBDIR += linux-r7-office SUBDIR += linux-sublime-text4 SUBDIR += linux-sublime3 SUBDIR += linux-wps-office SUBDIR += lite SUBDIR += lite-xl SUBDIR += marginalia.el SUBDIR += marker + SUBDIR += markmywords SUBDIR += mg SUBDIR += mickey SUBDIR += micro SUBDIR += microsoft-edit SUBDIR += mined SUBDIR += mle SUBDIR += mousepad SUBDIR += mp SUBDIR += nano SUBDIR += ne SUBDIR += nedit SUBDIR += neovim SUBDIR += neovim-gtk SUBDIR += neovim-qt SUBDIR += notepadnext SUBDIR += notepadnext-devel SUBDIR += novelwriter SUBDIR += nvi-m17n SUBDIR += nvi2 SUBDIR += omegaT SUBDIR += openoffice-4 SUBDIR += openoffice-devel SUBDIR += orbiton SUBDIR += orderless.el SUBDIR += ox SUBDIR += p5-Proc-InvokeEditor SUBDIR += p5-Vimana SUBDIR += paredit-mode.el SUBDIR += parinfer-rust SUBDIR += perspective.el SUBDIR += pico-alpine SUBDIR += picpas SUBDIR += pluma SUBDIR += pluma-plugins SUBDIR += poedit SUBDIR += poke SUBDIR += pragtical SUBDIR += psgml SUBDIR += puff SUBDIR += py-babi SUBDIR += py-editor SUBDIR += py-editorconfig SUBDIR += py-pynvim SUBDIR += py-vim-bridge SUBDIR += rehex SUBDIR += remarkable SUBDIR += retext SUBDIR += rubygem-neovim SUBDIR += sam SUBDIR += scite SUBDIR += sciteco SUBDIR += se SUBDIR += semi SUBDIR += setzer SUBDIR += shed SUBDIR += slime SUBDIR += sly SUBDIR += sly-asdf SUBDIR += sly-named-readtables SUBDIR += sly-quicklisp SUBDIR += sted SUBDIR += tamago SUBDIR += tea SUBDIR += teco SUBDIR += ted SUBDIR += tetradraw SUBDIR += texmacs SUBDIR += texmaker SUBDIR += texstudio SUBDIR += textadept SUBDIR += texworks SUBDIR += the SUBDIR += treeform SUBDIR += turbo SUBDIR += tweak SUBDIR += uemacs SUBDIR += uhex SUBDIR += uzap SUBDIR += ved SUBDIR += vertico.el SUBDIR += vigor SUBDIR += vile SUBDIR += vim SUBDIR += vim-colorschemes-legacy SUBDIR += vim-lsp SUBDIR += vis SUBDIR += vscode SUBDIR += web-mode SUBDIR += with-editor SUBDIR += wordgrinder SUBDIR += wxhexeditor SUBDIR += xcoral SUBDIR += xed SUBDIR += xmlcopyeditor SUBDIR += xvile SUBDIR += yudit SUBDIR += zed SUBDIR += zile .include diff --git a/editors/markmywords/Makefile b/editors/markmywords/Makefile new file mode 100644 index 000000000000..86712d76572a --- /dev/null +++ b/editors/markmywords/Makefile @@ -0,0 +1,32 @@ +PORTNAME= ${GH_PROJECT:tl} +PORTVERSION= g20200722 +CATEGORIES= editors + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Minimal WebKitGTK-based markdown editor +WWW= https://github.com/voldyman/MarkMyWords + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= valac:lang/vala +LIB_DEPENDS= libmarkdown.so:textproc/discount \ + libwebkit2gtk-4.0.so:www/webkit2-gtk@40 + +USES= cmake desktop-file-utils gnome pkgconfig +USE_GNOME= gtksourceview3 +CMAKE_OFF= GSETTINGS_COMPILE +GLIB_SCHEMAS= org.markmywords.gschema.xml + +USE_GITHUB= yes +GH_ACCOUNT= voldyman +GH_PROJECT= MarkMyWords +GH_TAGNAME= 970b459 + +post-patch: +# Set a displayable icon to something close to "document export" + @${REINPLACE_CMD} -e 's,document-export,document-revert,' \ + ${WRKSRC}/resources/headerbar.ui \ + ${WRKSRC}/resources/toolbar.ui + +.include diff --git a/editors/markmywords/distinfo b/editors/markmywords/distinfo new file mode 100644 index 000000000000..a92cf9c0ed74 --- /dev/null +++ b/editors/markmywords/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1595441430 +SHA256 (voldyman-MarkMyWords-g20200722-970b459_GH0.tar.gz) = 77dc1beefd3a3d9f8fe0c75a396ecd185b98fb9f6901dd4b2e17f0b8b85eb54f +SIZE (voldyman-MarkMyWords-g20200722-970b459_GH0.tar.gz) = 1209110 diff --git a/editors/markmywords/files/patch-CMakeLists.txt b/editors/markmywords/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f830cf4c46f6 --- /dev/null +++ b/editors/markmywords/files/patch-CMakeLists.txt @@ -0,0 +1,66 @@ +--- CMakeLists.txt.orig 2020-07-22 18:10:30 UTC ++++ CMakeLists.txt +@@ -2,26 +2,6 @@ project(MarkMyWords) + + cmake_minimum_required(VERSION 2.6) + +-# build the markdown lib +-include(ExternalProject) +-set(DISCOUNT_DEP_PATH ${CMAKE_SOURCE_DIR}/deps/discount) +-set(DISCOUNT_LIB_PATH ${CMAKE_BINARY_DIR}/libmarkdown.a) +-set(DISCOUNT_INCLUDE_PATH ${DISCOUNT_DEP_PATH}) +- +-ExternalProject_Add(discount +- PREFIX ${DISCOUNT_DEP_PATH} +- SOURCE_DIR ${DISCOUNT_DEP_PATH} +- CONFIGURE_COMMAND +- ${DISCOUNT_DEP_PATH}/configure.sh --src=${DISCOUNT_DEP_PATH} +- --prefix=${CMAKE_BINARY_DIR} +- --libdir=${CMAKE_BINARY_DIR} +- --with-fenced-code +- BUILD_COMMAND make install +- BUILD_IN_SOURCE 1 +-) +- +-include_directories(${DISCOUNT_INCLUDE_PATH}) +- + # build UI lib + list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + +@@ -39,6 +19,7 @@ pkg_check_modules(DEPS REQUIRED + gtksourceview-3.0>=3.10 + gthread-2.0 + gtk+-3.0>=3.9.10 ++ libmarkdown + ) + + add_definitions(${DEPS_CFLAGS}) +@@ -73,7 +54,7 @@ set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set (PKGDATADIR "${DATADIR}/markmywords") + set (GETTEXT_PACKAGE "markmywords") + set (RELEASE_NAME "TARS") +-set (VERSION "0.7") ++set (VERSION "2020.07.22") + set (VERSION_INFO "Release") + set (CMAKE_C_FLAGS "-ggdb") + set (PREFIX ${CMAKE_INSTALL_PREFIX}) +@@ -108,19 +89,11 @@ PACKAGES + discount + OPTIONS + --vapidir=${CMAKE_SOURCE_DIR}/vapi +- --thread + --gresources=${CMAKE_SOURCE_DIR}/resources/mark-my-words.gresource.xml + --target-glib=2.38 # FIXME check before, and target the same version + ) + + add_executable(mark-my-words ${VALA_C} ${generated_resources}) +- +-target_link_libraries(mark-my-words +- ${DISCOUNT_LIB_PATH}) +- +-add_dependencies(mark-my-words +- discount +-) + + install(TARGETS mark-my-words RUNTIME + DESTINATION bin) diff --git a/editors/markmywords/files/patch-src_Widgets_PreferencesDialog.vala b/editors/markmywords/files/patch-src_Widgets_PreferencesDialog.vala new file mode 100644 index 000000000000..6213d1d4e64b --- /dev/null +++ b/editors/markmywords/files/patch-src_Widgets_PreferencesDialog.vala @@ -0,0 +1,18 @@ +--- src/Widgets/PreferencesDialog.vala.orig 2020-07-22 18:10:30 UTC ++++ src/Widgets/PreferencesDialog.vala +@@ -197,6 +197,7 @@ public class PreferencesDialog : Gtk.Dialog { + // Dark theme + var dark_theme_label = new Gtk.Label (_("Enable dark theme")); + dark_theme_switch = new Gtk.Switch (); ++ dark_theme_switch.halign = Gtk.Align.START; + dark_theme_switch.active = prefs.prefer_dark_theme; + + layout.attach (dark_theme_label, 0, row, 1, 1); +@@ -266,6 +267,7 @@ public class PreferencesDialog : Gtk.Dialog { + var syntax_highlighting_label = new Gtk.Label (_("Enable syntax highlighting")); + + syntax_highlighting_switch = new Gtk.Switch (); ++ syntax_highlighting_switch.halign = Gtk.Align.START; + syntax_highlighting_switch.active = prefs.render_syntax_highlighting; + + /* autosave_btn.toggled.connect((b) => { diff --git a/editors/markmywords/pkg-descr b/editors/markmywords/pkg-descr new file mode 100644 index 000000000000..0ef2cbbcf6c8 --- /dev/null +++ b/editors/markmywords/pkg-descr @@ -0,0 +1 @@ +MarkMyWords is a minimal markdown editor around WebKitGTK, written in Vala. diff --git a/editors/markmywords/pkg-plist b/editors/markmywords/pkg-plist new file mode 100644 index 000000000000..5af4803bcd75 --- /dev/null +++ b/editors/markmywords/pkg-plist @@ -0,0 +1,7 @@ +bin/mark-my-words +share/applications/mark-my-words.desktop +share/icons/hicolor/scalable/apps/mark-my-words.svg +share/mark-my-words/default-view.css +share/mark-my-words/github-syntax.css +share/mark-my-words/highlight.pack.js +share/metainfo/com.github.voldyman.markmywords.appdata.xml