[arch-commits] Commit in gnuplot/repos (6 files)

Antonio Rojas arojas at archlinux.org
Tue Sep 5 15:42:24 UTC 2017


    Date: Tuesday, September 5, 2017 @ 15:42:23
  Author: arojas
Revision: 304696

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  gnuplot/repos/testing-i686/
  gnuplot/repos/testing-i686/PKGBUILD
    (from rev 304695, gnuplot/trunk/PKGBUILD)
  gnuplot/repos/testing-i686/lua53_compat.patch
    (from rev 304695, gnuplot/trunk/lua53_compat.patch)
  gnuplot/repos/testing-x86_64/
  gnuplot/repos/testing-x86_64/PKGBUILD
    (from rev 304695, gnuplot/trunk/PKGBUILD)
  gnuplot/repos/testing-x86_64/lua53_compat.patch
    (from rev 304695, gnuplot/trunk/lua53_compat.patch)

-----------------------------------+
 testing-i686/PKGBUILD             |   53 ++++++++++++++++++++++++++++++++++++
 testing-i686/lua53_compat.patch   |   13 ++++++++
 testing-x86_64/PKGBUILD           |   53 ++++++++++++++++++++++++++++++++++++
 testing-x86_64/lua53_compat.patch |   13 ++++++++
 4 files changed, 132 insertions(+)

Copied: gnuplot/repos/testing-i686/PKGBUILD (from rev 304695, gnuplot/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-09-05 15:42:23 UTC (rev 304696)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=gnuplot
+pkgver=5.2.0
+pkgrel=1
+pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
+arch=('i686' 'x86_64') 
+url="http://www.gnuplot.info" 
+license=('custom') 
+depends=('readline' 'gd' 'wxgtk2' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'gnutls') 
+makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra' 'qt5-tools')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "lua53_compat.patch")
+sha1sums=('360fbd0e0ac84cc0e9ece374f463fca244980c3c'
+          '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1')
+
+prepare() {
+  cd "${srcdir}/${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 "${srcdir}/${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
+  make pkglibexecdir=/usr/bin
+#  make info https://sourceforge.net/p/gnuplot/bugs/1963/
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make pkglibexecdir=/usr/bin DESTDIR="${pkgdir}" install # install-info
+
+  install -Dm644 Copyright "${pkgdir}/usr/share/licenses/$pkgname/Copyright"
+
+  rm -f "${pkgdir}/usr/share/texmf-dist/ls-R"
+}

Copied: gnuplot/repos/testing-i686/lua53_compat.patch (from rev 304695, gnuplot/trunk/lua53_compat.patch)
===================================================================
--- testing-i686/lua53_compat.patch	                        (rev 0)
+++ testing-i686/lua53_compat.patch	2017-09-05 15:42:23 UTC (rev 304696)
@@ -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>

Copied: gnuplot/repos/testing-x86_64/PKGBUILD (from rev 304695, gnuplot/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-09-05 15:42:23 UTC (rev 304696)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=gnuplot
+pkgver=5.2.0
+pkgrel=1
+pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
+arch=('i686' 'x86_64') 
+url="http://www.gnuplot.info" 
+license=('custom') 
+depends=('readline' 'gd' 'wxgtk2' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'gnutls') 
+makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra' 'qt5-tools')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "lua53_compat.patch")
+sha1sums=('360fbd0e0ac84cc0e9ece374f463fca244980c3c'
+          '9005fa9e4da91ceedb8ccd1d761866e7b064f8b1')
+
+prepare() {
+  cd "${srcdir}/${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 "${srcdir}/${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
+  make pkglibexecdir=/usr/bin
+#  make info https://sourceforge.net/p/gnuplot/bugs/1963/
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make pkglibexecdir=/usr/bin DESTDIR="${pkgdir}" install # install-info
+
+  install -Dm644 Copyright "${pkgdir}/usr/share/licenses/$pkgname/Copyright"
+
+  rm -f "${pkgdir}/usr/share/texmf-dist/ls-R"
+}

Copied: gnuplot/repos/testing-x86_64/lua53_compat.patch (from rev 304695, gnuplot/trunk/lua53_compat.patch)
===================================================================
--- testing-x86_64/lua53_compat.patch	                        (rev 0)
+++ testing-x86_64/lua53_compat.patch	2017-09-05 15:42:23 UTC (rev 304696)
@@ -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>



More information about the arch-commits mailing list