[arch-commits] Commit in texmacs/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, November 13, 2020 @ 08:26:56
  Author: arojas
Revision: 400737

archrelease: copy trunk to extra-x86_64

Added:
  texmacs/repos/extra-x86_64/PKGBUILD
    (from rev 400736, texmacs/trunk/PKGBUILD)
Deleted:
  texmacs/repos/extra-x86_64/PKGBUILD
  texmacs/repos/extra-x86_64/texmacs-qt-5.15.patch

-----------------------+
 PKGBUILD              |   94 +++++++++++++++++++++---------------------------
 texmacs-qt-5.15.patch |   34 -----------------
 2 files changed, 43 insertions(+), 85 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-13 08:26:43 UTC (rev 400736)
+++ PKGBUILD	2020-11-13 08:26:56 UTC (rev 400737)
@@ -1,51 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993 at gmail.com>
-
-pkgname=texmacs
-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' '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'
-	    'ghostscript: rendering ps files'
-            'imagemagick: convert images'
-            'aspell: spell checking')
-makedepends=('ghostscript' 'cmake')
-source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz
-        texmacs-qt-5.15.patch)
-options=('!emptydirs')
-sha256sums=('02ad1c4b8ed0aa61501de97146300d7899605c25da827611ca4a40abbc07a9b4'
-            '0e8555ce855977858565c7eedd415a22e640eea0f1ce69adce1be0396542200d')
-
-prepare() {
-  cd TeXmacs-${pkgver}
-
-  patch -p1 -i ../texmacs-qt-5.15.patch # Fix build with Qt 5.15
-}
-
-build() {
-  cd TeXmacs-${pkgver}
-  
-  mkdir -p build
-  cd build
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DGUILECONFIG_EXECUTABLE=/usr/bin/guile-config1.8
-  make
-}
-
-package() {
-  cd TeXmacs-${pkgver}/build
-  make DESTDIR=${pkgdir} install
-
- # fix fig2ps script
- sed -i 's|${prefix}|/usr|' "${pkgdir}/usr/bin/fig2ps"
- # fix launch script
- sed -e 's|\@CONFIG_LIB_PATH\@|LD_LIBRARY_PATH|g' -i "$pkgdir"/usr/bin/texmacs
-}

Copied: texmacs/repos/extra-x86_64/PKGBUILD (from rev 400736, texmacs/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-13 08:26:56 UTC (rev 400737)
@@ -0,0 +1,43 @@
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Damir Perisa <damir.perisa at bluewin.ch> # Contributor: Christopher Reimer <c.reimer1993 at gmail.com>
+
+pkgname=texmacs
+pkgver=1.99.15
+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' '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'
+	    'ghostscript: rendering ps files'
+            'imagemagick: convert images'
+            'aspell: spell checking')
+makedepends=('ghostscript' 'cmake')
+source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
+options=('!emptydirs')
+sha256sums=('6d4f2a34cdfe8b6266376bc7d2044c472fc4e9fa27f1afeb4d718729a2472827')
+
+build() {
+  cd TeXmacs-${pkgver}-src
+  
+  mkdir -p build
+  cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DGUILECONFIG_EXECUTABLE=/usr/bin/guile-config1.8
+  make
+}
+
+package() {
+  cd TeXmacs-${pkgver}-src/build
+  make DESTDIR=${pkgdir} install
+
+ # fix fig2ps script
+ sed -i 's|${prefix}|/usr|' "${pkgdir}/usr/bin/fig2ps"
+ # fix launch script
+ sed -e 's|\@CONFIG_LIB_PATH\@|LD_LIBRARY_PATH|g' -i "$pkgdir"/usr/bin/texmacs
+}

Deleted: texmacs-qt-5.15.patch
===================================================================
--- texmacs-qt-5.15.patch	2020-11-13 08:26:43 UTC (rev 400736)
+++ texmacs-qt-5.15.patch	2020-11-13 08:26:56 UTC (rev 400737)
@@ -1,34 +0,0 @@
-From 3cf56af92326b74538f5e943928199ba6e963d0b Mon Sep 17 00:00:00 2001
-From: rezso <rezso at rezso.net>
-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>
- 
- /******************************************************************************