Date: Sunday, July 19, 2020 @ 09:40:24 Author: arojas Revision: 392275
archrelease: copy trunk to extra-x86_64 Added: gnuplot/repos/extra-x86_64/PKGBUILD (from rev 392274, gnuplot/trunk/PKGBUILD) gnuplot/repos/extra-x86_64/lua53_compat.patch (from rev 392274, gnuplot/trunk/lua53_compat.patch) Deleted: gnuplot/repos/extra-x86_64/PKGBUILD gnuplot/repos/extra-x86_64/lua53_compat.patch --------------------+ PKGBUILD | 104 +++++++++++++++++++++++++-------------------------- lua53_compat.patch | 26 ++++++------ 2 files changed, 65 insertions(+), 65 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-19 09:40:11 UTC (rev 392274) +++ PKGBUILD 2020-07-19 09:40:24 UTC (rev 392275) @@ -1,52 +0,0 @@ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: damir <da...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=gnuplot -pkgver=5.2.8 -pkgrel=2 -pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" -arch=('x86_64') -url="http://www.gnuplot.info" -license=('custom') -depends=('readline' 'gd' 'wxgtk2' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'gnutls' 'libcerf') -makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra' 'qt5-tools') -source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "lua53_compat.patch") -sha1sums=('dc018b1e0a31b770d4635958badff13498babc4d' - '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1') - -prepare() { - cd ${pkgname}-${pkgver} - - # fix default source location; use the GDFONTPATH variable to modify at runtime - sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c - - sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \ - -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \ - src/variable.c - - patch -p1 < "$srcdir"/lua53_compat.patch -} - -build() { - cd ${pkgname}-${pkgver} - - MAKEINFO=/usr/bin/makeinfo WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \ - --libexecdir=/usr/bin \ - --with-gihdir=/usr/share/gnuplot \ - --with-readline=gnu \ - --with-bitmap-terminals \ - --with-wx-single-threaded \ - --with-texdir=/usr/share/texmf/tex/latex/gnuplot - make pkglibexecdir=/usr/bin -} - -package() { - cd ${pkgname}-${pkgver} - make pkglibexecdir=/usr/bin DESTDIR="${pkgdir}" install - - install -Dm644 Copyright "${pkgdir}/usr/share/licenses/$pkgname/Copyright" - - rm -f "${pkgdir}/usr/share/texmf-dist/ls-R" -} Copied: gnuplot/repos/extra-x86_64/PKGBUILD (from rev 392274, gnuplot/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-19 09:40:24 UTC (rev 392275) @@ -0,0 +1,52 @@ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <da...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=gnuplot +pkgver=5.4.0 +pkgrel=1 +pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" +arch=('x86_64') +url="http://www.gnuplot.info" +license=('custom') +depends=('readline' 'gd' 'wxgtk3' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'gnutls' 'libcerf') +makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra' 'qt5-tools') +source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "lua53_compat.patch") +sha1sums=('b4660dff7d047a453c55fd77faba11f63bb2d5ed' + '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1') + +prepare() { + cd ${pkgname}-${pkgver} + + # fix default source location; use the GDFONTPATH variable to modify at runtime + sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c + + sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \ + -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \ + src/variable.c + + patch -p1 < "$srcdir"/lua53_compat.patch +} + +build() { + cd ${pkgname}-${pkgver} + + MAKEINFO=/usr/bin/makeinfo WX_CONFIG=/usr/bin/wx-config-gtk3 ./configure --prefix=/usr \ + --libexecdir=/usr/bin \ + --with-gihdir=/usr/share/gnuplot \ + --with-readline=gnu \ + --with-bitmap-terminals \ + --with-wx-single-threaded \ + --with-texdir=/usr/share/texmf/tex/latex/gnuplot + make pkglibexecdir=/usr/bin +} + +package() { + cd ${pkgname}-${pkgver} + make pkglibexecdir=/usr/bin DESTDIR="${pkgdir}" install + + install -Dm644 Copyright "${pkgdir}/usr/share/licenses/$pkgname/Copyright" + + rm -f "${pkgdir}/usr/share/texmf-dist/ls-R" +} Deleted: lua53_compat.patch =================================================================== --- lua53_compat.patch 2020-07-19 09:40:11 UTC (rev 392274) +++ lua53_compat.patch 2020-07-19 09:40:24 UTC (rev 392275) @@ -1,13 +0,0 @@ -diff --git a/term/lua.trm b/term/lua.trm -index af63d68..474221f 100644 ---- a/term/lua.trm -+++ b/term/lua.trm -@@ -110,6 +110,8 @@ TERM_PUBLIC void LUA_boxed_text __PROTO((unsigned int, unsigned int, int)); - # define LUA_EXTERNAL_IMAGES 1 - #endif - -+ -+#define LUA_COMPAT_APIINTCASTS - #include <lua.h> - #include <lualib.h> - #include <lauxlib.h> Copied: gnuplot/repos/extra-x86_64/lua53_compat.patch (from rev 392274, gnuplot/trunk/lua53_compat.patch) =================================================================== --- lua53_compat.patch (rev 0) +++ lua53_compat.patch 2020-07-19 09:40:24 UTC (rev 392275) @@ -0,0 +1,13 @@ +diff --git a/term/lua.trm b/term/lua.trm +index af63d68..474221f 100644 +--- a/term/lua.trm ++++ b/term/lua.trm +@@ -110,6 +110,8 @@ TERM_PUBLIC void LUA_boxed_text __PROTO((unsigned int, unsigned int, int)); + # define LUA_EXTERNAL_IMAGES 1 + #endif + ++ ++#define LUA_COMPAT_APIINTCASTS + #include <lua.h> + #include <lualib.h> + #include <lauxlib.h>