Date: Monday, August 3, 2020 @ 07:47:49 Author: arojas Revision: 393077
Update to 1.99.13 Added: texmacs/trunk/texmacs-qt-5.15.patch Modified: texmacs/trunk/PKGBUILD -----------------------+ PKGBUILD | 21 +++++++++++---------- texmacs-qt-5.15.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-08-03 06:41:52 UTC (rev 393076) +++ PKGBUILD 2020-08-03 07:47:49 UTC (rev 393077) @@ -2,13 +2,13 @@ # Contributor: Damir Perisa <[email protected]> # Contributor: Christopher Reimer <[email protected]> pkgname=texmacs -pkgver=1.99.12 -pkgrel=2 +pkgver=1.99.13 +pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('x86_64') url="http://www.texmacs.org/"; license=('GPL') -depends=('perl' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'qt5-base') +depends=('perl' 'guile1.8' 'texlive-core' 'python' 'libxext' 'freetype2' 'qt5-base') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps' 'gawk: conversion of some files' @@ -16,19 +16,20 @@ 'imagemagick: convert images' 'aspell: spell checking') makedepends=('ghostscript' 'cmake') -source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) +source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz + texmacs-qt-5.15.patch) options=('!emptydirs') -sha256sums=('e43da849d5c3770f7d4f7ad9ac6367ab4174a1df83f37dfa41f8f00f1eb6f142') +sha256sums=('02ad1c4b8ed0aa61501de97146300d7899605c25da827611ca4a40abbc07a9b4' + '0e8555ce855977858565c7eedd415a22e640eea0f1ce69adce1be0396542200d') prepare() { - cd TeXmacs-${pkgver}-src + cd TeXmacs-${pkgver} - find -name '*.py' | xargs sed -i 's/env python/env python2/' - sed -i 's/"python"/"python2"/' plugins/python/progs/init-python.scm + patch -p1 -i ../texmacs-qt-5.15.patch # Fix build with Qt 5.15 } build() { - cd TeXmacs-${pkgver}-src + cd TeXmacs-${pkgver} mkdir -p build cd build @@ -40,7 +41,7 @@ } package() { - cd TeXmacs-${pkgver}-src/build + cd TeXmacs-${pkgver}/build make DESTDIR=${pkgdir} install # fix fig2ps script Added: texmacs-qt-5.15.patch =================================================================== --- texmacs-qt-5.15.patch (rev 0) +++ texmacs-qt-5.15.patch 2020-08-03 07:47:49 UTC (rev 393077) @@ -0,0 +1,34 @@ +From 3cf56af92326b74538f5e943928199ba6e963d0b Mon Sep 17 00:00:00 2001 +From: rezso <[email protected]> +Date: Wed, 3 Jun 2020 19:33:29 +0200 +Subject: [PATCH] Fix build with Qt 5.15 + +--- + src/Plugins/Qt/QTMStyle.cpp | 1 + + src/Plugins/Qt/qt_renderer.cpp | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Plugins/Qt/QTMStyle.cpp b/src/Plugins/Qt/QTMStyle.cpp +index e1c05ece3..2bc819fac 100644 +--- a/src/Plugins/Qt/QTMStyle.cpp ++++ b/src/Plugins/Qt/QTMStyle.cpp +@@ -18,6 +18,7 @@ + #include <QStyleOptionMenuItem> + #include <qdrawutil.h> + #include <QPainter> ++#include <QPainterPath> + #include <QMainWindow> + + int +diff --git a/src/Plugins/Qt/qt_renderer.cpp b/src/Plugins/Qt/qt_renderer.cpp +index ceba13939..776759bcf 100644 +--- a/src/Plugins/Qt/qt_renderer.cpp ++++ b/src/Plugins/Qt/qt_renderer.cpp +@@ -21,6 +21,7 @@ + #include <QObject> + #include <QWidget> + #include <QPaintDevice> ++#include <QPainterPath> + #include <QPixmap> + + /******************************************************************************
