[arch-commits] Commit in tvision/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Sat Jul 15 08:41:15 UTC 2017
Date: Saturday, July 15, 2017 @ 08:41:14
Author: arojas
Revision: 245183
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
tvision/repos/extra-i686/
tvision/repos/extra-i686/PKGBUILD
(from rev 245182, tvision/trunk/PKGBUILD)
tvision/repos/extra-i686/tvision-build-fix.patch
(from rev 245182, tvision/trunk/tvision-build-fix.patch)
tvision/repos/extra-i686/tvision-gcc7.patch
(from rev 245182, tvision/trunk/tvision-gcc7.patch)
tvision/repos/extra-x86_64/
tvision/repos/extra-x86_64/PKGBUILD
(from rev 245182, tvision/trunk/PKGBUILD)
tvision/repos/extra-x86_64/tvision-build-fix.patch
(from rev 245182, tvision/trunk/tvision-build-fix.patch)
tvision/repos/extra-x86_64/tvision-gcc7.patch
(from rev 245182, tvision/trunk/tvision-gcc7.patch)
--------------------------------------+
extra-i686/PKGBUILD | 36 ++++++++++++++++++++++
extra-i686/tvision-build-fix.patch | 13 +++++++
extra-i686/tvision-gcc7.patch | 54 +++++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 36 ++++++++++++++++++++++
extra-x86_64/tvision-build-fix.patch | 13 +++++++
extra-x86_64/tvision-gcc7.patch | 54 +++++++++++++++++++++++++++++++++
6 files changed, 206 insertions(+)
Copied: tvision/repos/extra-i686/PKGBUILD (from rev 245182, tvision/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=tvision
+pkgver=2.2.1_r1
+pkgrel=6
+pkgdesc="turbo vision library port (console interface)"
+arch=(i686 x86_64)
+url="http://tvision.sourceforge.net"
+license=("GPL")
+depends=(gpm gcc-libs libxmu)
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/tvision/UNIX/2.2.1%20CVS20100714%20Source%20and%20Debian%205.0/rhtvision_${pkgver/_r/-}.tar.gz"
+ tvision-build-fix.patch tvision-gcc7.patch)
+md5sums=('46b815d86bbbb2f9b112b11f63e2f5a6'
+ 'e24e3520bd7c6beb441716b8998b4c64'
+ '2bd22d0e30db76a098e2287596a0f430')
+
+prepare() {
+ cd $pkgname
+ patch -p1 <"$srcdir"/tvision-build-fix.patch
+ patch -p1 -i ../tvision-gcc7.patch
+}
+
+build() {
+ cd $pkgname
+ export CXXFLAGS+=' -std=gnu++98'
+ PERL_USE_UNSAFE_INC=1 ./configure --prefix=/usr --include=/usr/include
+ make
+}
+
+package() {
+ cd $pkgname
+ make prefix="$pkgdir"/usr install
+}
Copied: tvision/repos/extra-i686/tvision-build-fix.patch (from rev 245182, tvision/trunk/tvision-build-fix.patch)
===================================================================
--- extra-i686/tvision-build-fix.patch (rev 0)
+++ extra-i686/tvision-build-fix.patch 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,13 @@
+diff -wbBur tvision/classes/x11/x11src.cc tvision.q/classes/x11/x11src.cc
+--- tvision/classes/x11/x11src.cc 2009-12-29 15:52:24.000000000 +0000
++++ tvision.q/classes/x11/x11src.cc 2010-08-14 22:52:01.000000000 +0000
+@@ -40,6 +40,9 @@
+ // That's a nasty side effect: X defines Boolean!
+ #if (defined(TVOS_UNIX) || defined(TVCompf_Cygwin)) && defined(HAVE_X11)
+ #include <X11/Xmu/Atoms.h>
++ #include <sys/types.h>
++ #include <sys/stat.h>
++ #include <fcntl.h>
+ #endif
+
+ #define Uses_stdio
Copied: tvision/repos/extra-i686/tvision-gcc7.patch (from rev 245182, tvision/trunk/tvision-gcc7.patch)
===================================================================
--- extra-i686/tvision-gcc7.patch (rev 0)
+++ extra-i686/tvision-gcc7.patch 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,54 @@
+--- tvision/classes/tdesktop.cc.orig 2017-07-15 07:58:51.301675267 +0000
++++ tvision/classes/tdesktop.cc 2017-07-15 07:59:32.794966900 +0000
+@@ -144,7 +144,7 @@
+ {
+ unsigned res1 = 2;
+ unsigned res2 = i/res1;
+- while( abs( res1 - res2 ) > 1 )
++ while( abs( (int)(res1 - res2) ) > 1 )
+ {
+ res1 = (res1 + res2)/2;
+ res2 = i/res1;
+--- tvision/classes/tdisplay.cc.orig 2017-07-15 08:03:33.071392952 +0000
++++ tvision/classes/tdisplay.cc 2017-07-15 08:04:28.314670997 +0000
+@@ -381,10 +381,10 @@
+ if (firstXMatch!=-1)
+ {// Return the closest y that match x
+ i=indexMin=firstXMatch;
+- minDif=abs(res[i].y-y);
++ minDif=abs((int)(res[i].y-y));
+ while (++i<cant && res[i].x==x)
+ {
+- dif=abs(res[i].y-y);
++ dif=abs((int)(res[i].y-y));
+ if (dif<minDif)
+ {
+ minDif=dif;
+@@ -396,11 +396,11 @@
+ }
+ // No x match, looks the one with minimum differences
+ indexMin=0;
+- minDif=abs(res[0].y-y)+abs(res[0].x-x);
++ minDif=abs((int)(res[0].y-y))+abs((int)(res[0].x-x));
+ i=1;
+ while (i<cant)
+ {
+- dif=abs(res[i].y-y)+abs(res[i].x-x);
++ dif=abs((int)(res[i].y-y))+abs((int)(res[i].x-x));
+ if (dif<minDif)
+ {
+ minDif=dif;
+
+--- tvision/classes/x11/x11src.cc.orig 2017-07-15 08:34:59.072771441 +0000
++++ tvision/classes/x11/x11src.cc 2017-07-15 08:35:27.949409851 +0000
+@@ -2541,8 +2541,8 @@
+ else
+ {
+ unsigned target=fW*fH;
+- int dif1=abs(8*16-target);
+- int dif2=abs(10*20-target);
++ int dif1=abs(8*16-(int)(target));
++ int dif2=abs(10*20-(int)(target));
+ if (dif1<dif2)
+ nFont=&font8x16;
+ else
Copied: tvision/repos/extra-x86_64/PKGBUILD (from rev 245182, tvision/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=tvision
+pkgver=2.2.1_r1
+pkgrel=6
+pkgdesc="turbo vision library port (console interface)"
+arch=(i686 x86_64)
+url="http://tvision.sourceforge.net"
+license=("GPL")
+depends=(gpm gcc-libs libxmu)
+options=('!makeflags')
+source=("http://downloads.sourceforge.net/project/tvision/UNIX/2.2.1%20CVS20100714%20Source%20and%20Debian%205.0/rhtvision_${pkgver/_r/-}.tar.gz"
+ tvision-build-fix.patch tvision-gcc7.patch)
+md5sums=('46b815d86bbbb2f9b112b11f63e2f5a6'
+ 'e24e3520bd7c6beb441716b8998b4c64'
+ '2bd22d0e30db76a098e2287596a0f430')
+
+prepare() {
+ cd $pkgname
+ patch -p1 <"$srcdir"/tvision-build-fix.patch
+ patch -p1 -i ../tvision-gcc7.patch
+}
+
+build() {
+ cd $pkgname
+ export CXXFLAGS+=' -std=gnu++98'
+ PERL_USE_UNSAFE_INC=1 ./configure --prefix=/usr --include=/usr/include
+ make
+}
+
+package() {
+ cd $pkgname
+ make prefix="$pkgdir"/usr install
+}
Copied: tvision/repos/extra-x86_64/tvision-build-fix.patch (from rev 245182, tvision/trunk/tvision-build-fix.patch)
===================================================================
--- extra-x86_64/tvision-build-fix.patch (rev 0)
+++ extra-x86_64/tvision-build-fix.patch 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,13 @@
+diff -wbBur tvision/classes/x11/x11src.cc tvision.q/classes/x11/x11src.cc
+--- tvision/classes/x11/x11src.cc 2009-12-29 15:52:24.000000000 +0000
++++ tvision.q/classes/x11/x11src.cc 2010-08-14 22:52:01.000000000 +0000
+@@ -40,6 +40,9 @@
+ // That's a nasty side effect: X defines Boolean!
+ #if (defined(TVOS_UNIX) || defined(TVCompf_Cygwin)) && defined(HAVE_X11)
+ #include <X11/Xmu/Atoms.h>
++ #include <sys/types.h>
++ #include <sys/stat.h>
++ #include <fcntl.h>
+ #endif
+
+ #define Uses_stdio
Copied: tvision/repos/extra-x86_64/tvision-gcc7.patch (from rev 245182, tvision/trunk/tvision-gcc7.patch)
===================================================================
--- extra-x86_64/tvision-gcc7.patch (rev 0)
+++ extra-x86_64/tvision-gcc7.patch 2017-07-15 08:41:14 UTC (rev 245183)
@@ -0,0 +1,54 @@
+--- tvision/classes/tdesktop.cc.orig 2017-07-15 07:58:51.301675267 +0000
++++ tvision/classes/tdesktop.cc 2017-07-15 07:59:32.794966900 +0000
+@@ -144,7 +144,7 @@
+ {
+ unsigned res1 = 2;
+ unsigned res2 = i/res1;
+- while( abs( res1 - res2 ) > 1 )
++ while( abs( (int)(res1 - res2) ) > 1 )
+ {
+ res1 = (res1 + res2)/2;
+ res2 = i/res1;
+--- tvision/classes/tdisplay.cc.orig 2017-07-15 08:03:33.071392952 +0000
++++ tvision/classes/tdisplay.cc 2017-07-15 08:04:28.314670997 +0000
+@@ -381,10 +381,10 @@
+ if (firstXMatch!=-1)
+ {// Return the closest y that match x
+ i=indexMin=firstXMatch;
+- minDif=abs(res[i].y-y);
++ minDif=abs((int)(res[i].y-y));
+ while (++i<cant && res[i].x==x)
+ {
+- dif=abs(res[i].y-y);
++ dif=abs((int)(res[i].y-y));
+ if (dif<minDif)
+ {
+ minDif=dif;
+@@ -396,11 +396,11 @@
+ }
+ // No x match, looks the one with minimum differences
+ indexMin=0;
+- minDif=abs(res[0].y-y)+abs(res[0].x-x);
++ minDif=abs((int)(res[0].y-y))+abs((int)(res[0].x-x));
+ i=1;
+ while (i<cant)
+ {
+- dif=abs(res[i].y-y)+abs(res[i].x-x);
++ dif=abs((int)(res[i].y-y))+abs((int)(res[i].x-x));
+ if (dif<minDif)
+ {
+ minDif=dif;
+
+--- tvision/classes/x11/x11src.cc.orig 2017-07-15 08:34:59.072771441 +0000
++++ tvision/classes/x11/x11src.cc 2017-07-15 08:35:27.949409851 +0000
+@@ -2541,8 +2541,8 @@
+ else
+ {
+ unsigned target=fW*fH;
+- int dif1=abs(8*16-target);
+- int dif2=abs(10*20-target);
++ int dif1=abs(8*16-(int)(target));
++ int dif2=abs(10*20-(int)(target));
+ if (dif1<dif2)
+ nFont=&font8x16;
+ else
More information about the arch-commits
mailing list