summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorfoutrelis <foutrelis@eb2447ed-0c53-47e4-bac8-5bc4a241df78>2019-01-13 12:45:53 +0000
committersvntogit <svntogit@nymeria.archlinux.org>2019-01-13 12:45:53 +0000
commitb21c01ce7539fdc6abdb6a07a3e26cc33f584d27 (patch)
treeacff96783779a715b0c2cbc12f810ff80a3b37b6
parent2c527a5133b468c692a26bdd0c83dafadd43889f (diff)
db-move: moved gnuplot from [testing] to [extra] (x86_64)
git-svn-id: file:///srv/repos/svn-packages/svn@343915 eb2447ed-0c53-47e4-bac8-5bc4a241df78
-rw-r--r--repos/extra-x86_64/PKGBUILD2
-rw-r--r--repos/testing-x86_64/PKGBUILD52
-rw-r--r--repos/testing-x86_64/lua53_compat.patch13
3 files changed, 1 insertions, 66 deletions
diff --git a/repos/extra-x86_64/PKGBUILD b/repos/extra-x86_64/PKGBUILD
index ec059b0..f1d26dd 100644
--- a/repos/extra-x86_64/PKGBUILD
+++ b/repos/extra-x86_64/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gnuplot
pkgver=5.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
arch=('x86_64')
url="http://www.gnuplot.info"
diff --git a/repos/testing-x86_64/PKGBUILD b/repos/testing-x86_64/PKGBUILD
deleted file mode 100644
index f1d26dd..0000000
--- a/repos/testing-x86_64/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=gnuplot
-pkgver=5.2.6
-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=('e39a58addf5d69814cd6631a2aff24c5a5206c05'
- '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"
-}
diff --git a/repos/testing-x86_64/lua53_compat.patch b/repos/testing-x86_64/lua53_compat.patch
deleted file mode 100644
index 9d3be77..0000000
--- a/repos/testing-x86_64/lua53_compat.patch
+++ /dev/null
@@ -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>