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

[Antonio Rojas]

    Date: Saturday, August 18, 2018 @ 07:07:20
  Author: arojas
Revision: 332211

archrelease: copy trunk to extra-x86_64

Added:
  glpk/repos/extra-x86_64/PKGBUILD
    (from rev 332210, glpk/trunk/PKGBUILD)
  glpk/repos/extra-x86_64/glpk-remove-warnings.patch
    (from rev 332210, glpk/trunk/glpk-remove-warnings.patch)
Deleted:
  glpk/repos/extra-x86_64/PKGBUILD

----------------------------+
 PKGBUILD                   |   68 +++++++++++++++++++++++--------------------
 glpk-remove-warnings.patch |   19 ++++++++++++
 2 files changed, 56 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 07:06:12 UTC (rev 332210)
+++ PKGBUILD	2018-08-18 07:07:20 UTC (rev 332211)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: bzklrm <bzklrm at gmail.com>
-# Additional contributors Senjin, Xavier, dundee
-
-pkgname=glpk
-pkgver=4.65
-pkgrel=1
-pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
-arch=('x86_64')
-url="http://www.gnu.org/software/glpk/glpk.html"
-license=('GPL')
-depends=('gmp')
-source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig})
-sha1sums=('d9b607a9cf3a25b754a0cd9a842ea5043f8604db'
-          'SKIP')
-validpgpkeys=('A2B56CCB42220C06481335BAD17BF2305981E818') # Andrew Makhorin
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --with-gmp
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 doc/glpk.pdf "${pkgdir}/usr/share/doc/glpk/glpk.pdf"
-  install -Dm644 doc/gmpl.pdf "${pkgdir}/usr/share/doc/glpk/gmpl.pdf"
-}

Copied: glpk/repos/extra-x86_64/PKGBUILD (from rev 332210, glpk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-08-18 07:07:20 UTC (rev 332211)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: bzklrm <bzklrm at gmail.com>
+# Additional contributors Senjin, Xavier, dundee
+
+pkgname=glpk
+pkgver=4.65
+pkgrel=2
+pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
+arch=('x86_64')
+url="http://www.gnu.org/software/glpk/glpk.html"
+license=('GPL')
+depends=('gmp')
+source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig} glpk-remove-warnings.patch)
+sha1sums=('d9b607a9cf3a25b754a0cd9a842ea5043f8604db'
+          'SKIP'
+          '6f4e904c5dc88a8b43391e030496644d77e39163')
+validpgpkeys=('A2B56CCB42220C06481335BAD17BF2305981E818') # Andrew Makhorin
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../glpk-remove-warnings.patch # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891465
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --with-gmp
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 doc/glpk.pdf "${pkgdir}/usr/share/doc/glpk/glpk.pdf"
+  install -Dm644 doc/gmpl.pdf "${pkgdir}/usr/share/doc/glpk/gmpl.pdf"
+}

Copied: glpk/repos/extra-x86_64/glpk-remove-warnings.patch (from rev 332210, glpk/trunk/glpk-remove-warnings.patch)
===================================================================
--- glpk-remove-warnings.patch	                        (rev 0)
+++ glpk-remove-warnings.patch	2018-08-18 07:07:20 UTC (rev 332211)
@@ -0,0 +1,19 @@
+--- glpk-4.65/src/draft/glpios03.c.orig	2018-08-18 07:02:32.165492793 +0000
++++ glpk-4.65/src/draft/glpios03.c	2018-08-18 07:03:47.775715038 +0000
+@@ -920,13 +920,10 @@
+ #if 0
+       ((glp_iocp *)T->parm)->msg_lev = GLP_MSG_DBG;
+ #endif
+-#if 1 /* 16/III-2016 */
++#if 1 /* 01/III-2018 */
+       if (((glp_iocp *)T->parm)->flip)
+-#if 0 /* 20/I-2018 */
+-         xprintf("WARNING: LONG-STEP DUAL SIMPLEX WILL BE USED\n");
+-#else
+-         xprintf("Long-step dual simplex will be used\n");
+-#endif
++         if (T->parm->msg_lev >= GLP_MSG_ALL)
++            xprintf("Long-step dual simplex will be used\n");
+ #endif
+       /* on entry to the B&B driver it is assumed that the active list
+          contains the only active (i.e. root) subproblem, which is the