From 3508b209ce955371f1d622e308500a8878f79be8 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Tue, 17 Mar 2026 22:25:54 -0700 Subject: [PATCH] gnu: texmacs: Update to 2.1.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (texmacs): Update to 2.1.5. [inputs]: Add gnutls. [patches]: Remove texmacs-wayland-hidpi.patch. * gnu/packages/patches/texmacs-wayland-hidpi.patch: Remove the file. * gnu/local.mk (dist_patch_DATA): … and deregister it. Change-Id: I626e35e91c9977374d24809f1b58c3a35576cdca Signed-off-by: Andreas Enge --- gnu/local.mk | 1 - .../patches/texmacs-wayland-hidpi.patch | 22 ------------------- gnu/packages/text-editors.scm | 8 +++---- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/texmacs-wayland-hidpi.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8b6ebc51f4..ddbdca6dc4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2484,7 +2484,6 @@ dist_patch_DATA = \ %D%/packages/patches/tensile-copy-if-not-exist.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ - %D%/packages/patches/texmacs-wayland-hidpi.patch \ %D%/packages/patches/tflite-micro_disable_download.patch \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/thefuck-remove-broken-tests.patch \ diff --git a/gnu/packages/patches/texmacs-wayland-hidpi.patch b/gnu/packages/patches/texmacs-wayland-hidpi.patch deleted file mode 100644 index decf500125..0000000000 --- a/gnu/packages/patches/texmacs-wayland-hidpi.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: Danny Milosavljevic -Date: 2024-12-11 18:30:00 CET 2024 -License: gpl3+ - -diff -ru orig/qsbrdssq407hsajf74z60vp3rhgafjsl-mogan-1.1.1-checkout/src/Texmacs/Texmacs/texmacs.cpp qsbrdssq407hsajf74z60vp3rhgafjsl-mogan-1.1.1-checkout/src/Texmacs/Texmacs/texmacs.cpp ---- orig/qsbrdssq407hsajf74z60vp3rhgafjsl-mogan-1.1.1-checkout/src/Texmacs/Texmacs/texmacs.cpp 2024-05-10 01:51:55.312256939 +0200 -+++ qsbrdssq407hsajf74z60vp3rhgafjsl-mogan-1.1.1-checkout/src/Texmacs/Texmacs/texmacs.cpp 2024-05-10 01:52:43.659909394 +0200 -@@ -685,8 +685,12 @@ - #ifndef OS_MINGW - set_env ("LC_NUMERIC", "POSIX"); - #ifndef OS_MACOS -- set_env ("QT_QPA_PLATFORM", "xcb"); -- set_env ("XDG_SESSION_TYPE", "x11"); -+ if (get_env ("XDG_SESSION_TYPE") == "wayland") { -+ set_env ("QT_QPA_PLATFORM", "wayland"); QGuiApplication::setAttribute(Qt::AA_DisableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+ } else { -+ set_env ("QT_QPA_PLATFORM", "xcb"); -+ set_env ("XDG_SESSION_TYPE", "x11"); -+ } - #endif - #endif - #ifdef MACOSX_EXTENSIONS diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 723671e7c8..f18dc12417 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -133,6 +133,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -1291,21 +1292,20 @@ interface with CI pipeline UIs.") (define-public texmacs (package (name "texmacs") - (version "2.1.4") + (version "2.1.5") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "11l1q5lmsj9g7yil1dn7n1cgsr8iikx59kg9riahpb6xw0p959l7")) - (patches - (search-patches "texmacs-wayland-hidpi.patch")))) + (base32 "0q3k0asf31mm2jl7fi7244sk6c9lprf434cj4c5h2ycfpayjg8dk")))) (build-system qt-build-system) (native-inputs (list pkg-config xdg-utils)) ;for xdg-icon-resource (inputs (list freetype + gnutls guile-1.8 libjpeg-turbo libxcrypt