tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-19 08:40:30 +02:00
Code Activity

Revert "gnu: texmacs: Update to 2.1.5."

Browse Source 
This reverts commit 3508b209ce.
This commit is contained in:
Andreas Enge
2026-03-19 22:52:08 +01:00
parent ac3a46499a
commit 18186272de
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@@ -2485,6 +2485,7 @@ 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 \

22
gnu/packages/patches/texmacs-wayland-hidpi.patch Normal file
View File

@@ -0,0 +1,22 @@
Author: Danny Milosavljevic <dannym@friendly-machines.com>
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

8
gnu/packages/text-editors.scm
View File

@@ -133,7 +133,6 @@
#: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))
@@ -1292,20 +1291,21 @@ interface with CI pipeline UIs.")
(define-public texmacs
(package
(name "texmacs")
(version "2.1.5")
(version "2.1.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/"
"source/TeXmacs-" version "-src.tar.gz"))
(sha256
(base32 "0q3k0asf31mm2jl7fi7244sk6c9lprf434cj4c5h2ycfpayjg8dk"))))
(base32 "11l1q5lmsj9g7yil1dn7n1cgsr8iikx59kg9riahpb6xw0p959l7"))
(patches
(search-patches "texmacs-wayland-hidpi.patch"))))
(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