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

Antonio Rojas arojas at archlinux.org
Sat May 14 18:26:36 UTC 2016


    Date: Saturday, May 14, 2016 @ 20:26:35
  Author: arojas
Revision: 267995

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

Added:
  gnuplot/repos/extra-i686/PKGBUILD
    (from rev 267994, gnuplot/trunk/PKGBUILD)
  gnuplot/repos/extra-i686/gnuplot.install
    (from rev 267994, gnuplot/trunk/gnuplot.install)
  gnuplot/repos/extra-i686/lua53_compat.patch
    (from rev 267994, gnuplot/trunk/lua53_compat.patch)
  gnuplot/repos/extra-x86_64/PKGBUILD
    (from rev 267994, gnuplot/trunk/PKGBUILD)
  gnuplot/repos/extra-x86_64/gnuplot.install
    (from rev 267994, gnuplot/trunk/gnuplot.install)
  gnuplot/repos/extra-x86_64/lua53_compat.patch
    (from rev 267994, gnuplot/trunk/lua53_compat.patch)
Deleted:
  gnuplot/repos/extra-i686/PKGBUILD
  gnuplot/repos/extra-i686/gnuplot.install
  gnuplot/repos/extra-i686/lua53_compat.patch
  gnuplot/repos/extra-x86_64/PKGBUILD
  gnuplot/repos/extra-x86_64/gnuplot.install
  gnuplot/repos/extra-x86_64/lua53_compat.patch

---------------------------------+
 /PKGBUILD                       |  106 ++++++++++++++++++++++++++++++++++++++
 /gnuplot.install                |   36 ++++++++++++
 /lua53_compat.patch             |   26 +++++++++
 extra-i686/PKGBUILD             |   53 -------------------
 extra-i686/gnuplot.install      |   31 -----------
 extra-i686/lua53_compat.patch   |   13 ----
 extra-x86_64/PKGBUILD           |   53 -------------------
 extra-x86_64/gnuplot.install    |   31 -----------
 extra-x86_64/lua53_compat.patch |   13 ----
 9 files changed, 168 insertions(+), 194 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-i686/PKGBUILD	2016-05-14 18:26:35 UTC (rev 267995)
@@ -1,53 +0,0 @@
-# $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.0.3
-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' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'qt5-tools' 'gnutls') 
-makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra')
-options=('!makeflags')
-install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "lua53_compat.patch")
-sha1sums=('7ec8b4221ee5406f1beeac4f9db794acb501dc2b'
-          '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}"
-
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
-              --libexecdir=/usr/bin \
-              --with-gihdir=/usr/share/gnuplot \
-              --with-readline=gnu --enable-qt \
-              --with-bitmap-terminals
-  make pkglibexecdir=/usr/bin
-}
-
-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/extra-i686/PKGBUILD (from rev 267994, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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.0.3
+pkgrel=2
+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' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'qt5-tools' 'gnutls') 
+makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra')
+options=('!makeflags')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "lua53_compat.patch")
+sha1sums=('7ec8b4221ee5406f1beeac4f9db794acb501dc2b'
+          '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}"
+
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+              --libexecdir=/usr/bin \
+              --with-gihdir=/usr/share/gnuplot \
+              --with-readline=gnu --enable-qt \
+              --with-bitmap-terminals
+  make pkglibexecdir=/usr/bin
+}
+
+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"
+}

Deleted: extra-i686/gnuplot.install
===================================================================
--- extra-i686/gnuplot.install	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-i686/gnuplot.install	2016-05-14 18:26:35 UTC (rev 267995)
@@ -1,31 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnuplot.info)
-
-post_install() {
-  if [ -f /usr/bin/mktexlsr ]; then
-    echo "Updating TeX tree..."
-    mktexlsr
-  fi
-
-for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  if [ -f /usr/bin/mktexlsr ]; then
-    echo "Updating TeX tree..."
-    mktexlsr
-  fi
-}
-

Copied: gnuplot/repos/extra-i686/gnuplot.install (from rev 267994, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-i686/gnuplot.install	                        (rev 0)
+++ extra-i686/gnuplot.install	2016-05-14 18:26:35 UTC (rev 267995)
@@ -0,0 +1,18 @@
+post_install() {
+  if [ -f /usr/bin/mktexlsr ]; then
+    echo "Updating TeX tree..."
+    mktexlsr
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  if [ -f /usr/bin/mktexlsr ]; then
+    echo "Updating TeX tree..."
+    mktexlsr
+  fi
+}
+

Deleted: extra-i686/lua53_compat.patch
===================================================================
--- extra-i686/lua53_compat.patch	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-i686/lua53_compat.patch	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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-i686/lua53_compat.patch (from rev 267994, gnuplot/trunk/lua53_compat.patch)
===================================================================
--- extra-i686/lua53_compat.patch	                        (rev 0)
+++ extra-i686/lua53_compat.patch	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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>

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-x86_64/PKGBUILD	2016-05-14 18:26:35 UTC (rev 267995)
@@ -1,53 +0,0 @@
-# $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.0.3
-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' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'qt5-tools' 'gnutls') 
-makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra')
-options=('!makeflags')
-install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "lua53_compat.patch")
-sha1sums=('7ec8b4221ee5406f1beeac4f9db794acb501dc2b'
-          '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}"
-
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
-              --libexecdir=/usr/bin \
-              --with-gihdir=/usr/share/gnuplot \
-              --with-readline=gnu --enable-qt \
-              --with-bitmap-terminals
-  make pkglibexecdir=/usr/bin
-}
-
-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/extra-x86_64/PKGBUILD (from rev 267994, gnuplot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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.0.3
+pkgrel=2
+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' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt5-svg' 'qt5-tools' 'gnutls') 
+makedepends=('texinfo' 'texlive-core' 'emacs' 'texlive-latexextra')
+options=('!makeflags')
+install=gnuplot.install
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+        "lua53_compat.patch")
+sha1sums=('7ec8b4221ee5406f1beeac4f9db794acb501dc2b'
+          '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}"
+
+  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
+              --libexecdir=/usr/bin \
+              --with-gihdir=/usr/share/gnuplot \
+              --with-readline=gnu --enable-qt \
+              --with-bitmap-terminals
+  make pkglibexecdir=/usr/bin
+}
+
+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"
+}

Deleted: extra-x86_64/gnuplot.install
===================================================================
--- extra-x86_64/gnuplot.install	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-x86_64/gnuplot.install	2016-05-14 18:26:35 UTC (rev 267995)
@@ -1,31 +0,0 @@
-info_dir=/usr/share/info
-info_files=(gnuplot.info)
-
-post_install() {
-  if [ -f /usr/bin/mktexlsr ]; then
-    echo "Updating TeX tree..."
-    mktexlsr
-  fi
-
-for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  if [ -f /usr/bin/mktexlsr ]; then
-    echo "Updating TeX tree..."
-    mktexlsr
-  fi
-}
-

Copied: gnuplot/repos/extra-x86_64/gnuplot.install (from rev 267994, gnuplot/trunk/gnuplot.install)
===================================================================
--- extra-x86_64/gnuplot.install	                        (rev 0)
+++ extra-x86_64/gnuplot.install	2016-05-14 18:26:35 UTC (rev 267995)
@@ -0,0 +1,18 @@
+post_install() {
+  if [ -f /usr/bin/mktexlsr ]; then
+    echo "Updating TeX tree..."
+    mktexlsr
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  if [ -f /usr/bin/mktexlsr ]; then
+    echo "Updating TeX tree..."
+    mktexlsr
+  fi
+}
+

Deleted: extra-x86_64/lua53_compat.patch
===================================================================
--- extra-x86_64/lua53_compat.patch	2016-05-14 18:25:53 UTC (rev 267994)
+++ extra-x86_64/lua53_compat.patch	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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 267994, gnuplot/trunk/lua53_compat.patch)
===================================================================
--- extra-x86_64/lua53_compat.patch	                        (rev 0)
+++ extra-x86_64/lua53_compat.patch	2016-05-14 18:26:35 UTC (rev 267995)
@@ -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