[arch-commits] Commit in glob2/repos (8 files)
Evangelos Foutras
foutrelis at archlinux.org
Tue Jun 8 17:44:01 UTC 2021
Date: Tuesday, June 8, 2021 @ 17:44:01
Author: foutrelis
Revision: 959781
archrelease: copy trunk to community-staging-x86_64
Added:
glob2/repos/community-staging-x86_64/
glob2/repos/community-staging-x86_64/PKGBUILD
(from rev 959780, glob2/trunk/PKGBUILD)
glob2/repos/community-staging-x86_64/fix-ftbfs-gcc49.diff
(from rev 959780, glob2/trunk/fix-ftbfs-gcc49.diff)
glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch
(from rev 959780, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
glob2/repos/community-staging-x86_64/glob2-bool.patch
(from rev 959780, glob2/trunk/glob2-bool.patch)
glob2/repos/community-staging-x86_64/glob2-gcc6.patch
(from rev 959780, glob2/trunk/glob2-gcc6.patch)
glob2/repos/community-staging-x86_64/glob2-scons3.patch
(from rev 959780, glob2/trunk/glob2-scons3.patch)
glob2/repos/community-staging-x86_64/scons-python3.patch
(from rev 959780, glob2/trunk/scons-python3.patch)
---------------------------+
PKGBUILD | 54 +++++++++
fix-ftbfs-gcc49.diff | 14 ++
glob2-0.9.4.1-gcc44.patch | 87 +++++++++++++++
glob2-bool.patch | 13 ++
glob2-gcc6.patch | 28 +++++
glob2-scons3.patch | 26 ++++
scons-python3.patch | 243 ++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 465 insertions(+)
Copied: glob2/repos/community-staging-x86_64/PKGBUILD (from rev 959780, glob2/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,54 @@
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+
+pkgname=glob2
+pkgver=0.9.4.4
+pkgrel=42
+pkgdesc='An innovative Real-Time Strategy game which reduces micro-management by automatically assigning tasks to units'
+arch=('x86_64')
+url='https://www.globulation2.org/'
+license=('GPL3')
+depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
+ 'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme')
+makedepends=('scons' 'boost' 'mesa' 'patch')
+source=(https://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz
+ glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff
+ glob2-gcc6.patch
+ glob2-scons3.patch
+ glob2-bool.patch
+ scons-python3.patch)
+sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
+ '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
+ '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
+ 'a371eb801407a75021c1a0105ffa1e713358d7def3eba8a9bd861f528e051d9b'
+ '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
+ '81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591'
+ '6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -p0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+ patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff"
+ patch -p1 -i "$srcdir/glob2-gcc6.patch"
+ patch -p1 -i "$srcdir/glob2-scons3.patch"
+ patch -p1 -i "$srcdir/glob2-bool.patch"
+ patch -p1 -i ../scons-python3.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ scons LINKFLAGS="-lboost_system"
+}
+
+package () {
+ cd "$pkgname-$pkgver"
+
+ scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share"
+ find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \;
+ install -Dm644 "data/icons/$pkgname-icon-48x48.png" \
+ "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png"
+}
Copied: glob2/repos/community-staging-x86_64/fix-ftbfs-gcc49.diff (from rev 959780, glob2/trunk/fix-ftbfs-gcc49.diff)
===================================================================
--- community-staging-x86_64/fix-ftbfs-gcc49.diff (rev 0)
+++ community-staging-x86_64/fix-ftbfs-gcc49.diff 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,14 @@
+Index: glob2-0.9.4.4/src/Game.h
+===================================================================
+--- glob2-0.9.4.4.orig/src/Game.h 2014-07-14 10:36:36.705074927 +0800
++++ glob2-0.9.4.4/src/Game.h 2014-07-14 10:38:28.733077827 +0800
+@@ -148,7 +148,8 @@
+ TOP_TO_BOTTOM,
+ BOTTOM_TO_TOP
+ };
+-
++
++public:
+ struct BuildProject
+ {
+ int posX;
Copied: glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (from rev 959780, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
===================================================================
--- community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (rev 0)
+++ community-staging-x86_64/glob2-0.9.4.1-gcc44.patch 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,87 @@
+diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
+--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100
++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200
+@@ -43,7 +43,7 @@ namespace GAGCore
+ virtual void flush(void) = 0;
+ virtual void read(void *data, size_t size) = 0;
+ virtual void putc(int c) = 0;
+- virtual int getc(void) = 0;
++ virtual int get_c(void) = 0;
+ virtual void seekFromStart(int displacement) = 0;
+ virtual void seekFromEnd(int displacement) = 0;
+ virtual void seekRelative(int displacement) = 0;
+@@ -67,7 +67,7 @@ namespace GAGCore
+ virtual void flush(void) { assert(fp); fflush(fp); }
+ virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
+ virtual void putc(int c) { assert(fp); fputc(c, fp); }
+- virtual int getc(void) { assert(fp); return fgetc(fp); }
++ virtual int get_c(void) { assert(fp); return fgetc(fp); }
+ virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
+ virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
+ virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
+@@ -92,7 +92,7 @@ namespace GAGCore
+ virtual void flush(void);
+ virtual void read(void *data, size_t size);
+ virtual void putc(int c);
+- virtual int getc(void);
++ virtual int get_c(void);
+ virtual void seekFromStart(int displacement);
+ virtual void seekFromEnd(int displacement);
+ virtual void seekRelative(int displacement);
+@@ -117,7 +117,7 @@ namespace GAGCore
+ virtual void flush(void) { }
+ virtual void read(void *data, size_t size);
+ virtual void putc(int c);
+- virtual int getc(void);
++ virtual int get_c(void);
+ virtual void seekFromStart(int displacement);
+ virtual void seekFromEnd(int displacement);
+ virtual void seekRelative(int displacement);
+diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
+--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200
+@@ -75,9 +75,9 @@ namespace GAGCore
+ buffer->putc(c);
+ }
+
+- int ZLibStreamBackend::getc(void)
++ int ZLibStreamBackend::get_c(void)
+ {
+- return buffer->getc();
++ return buffer->get_c();
+ }
+
+ void ZLibStreamBackend::seekFromStart(int displacement)
+@@ -147,7 +147,7 @@ namespace GAGCore
+ write(&ch, 1);
+ }
+
+- int MemoryStreamBackend::getc(void)
++ int MemoryStreamBackend::get_c(void)
+ {
+ Uint8 ch;
+ read(&ch, 1);
+diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
+--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200
+@@ -60,7 +60,7 @@ namespace GAGCore
+ std::string s;
+ while (1)
+ {
+- int c = backend->getc();
++ int c = backend->get_c();
+ if(c=='\r')
+ continue;
+ if ((c >= 0) && (c != '\n'))
+diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
+--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100
++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200
+@@ -150,7 +150,7 @@ namespace GAGCore
+
+ int nextChar(void)
+ {
+- next = stream->getc();
++ next = stream->get_c();
+ if (next == '\n')
+ {
+ column = 0;
Copied: glob2/repos/community-staging-x86_64/glob2-bool.patch (from rev 959780, glob2/trunk/glob2-bool.patch)
===================================================================
--- community-staging-x86_64/glob2-bool.patch (rev 0)
+++ community-staging-x86_64/glob2-bool.patch 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,13 @@
+diff --git a/src/AIEcho.cpp b/src/AIEcho.cpp
+index 77d9f63..0e5f59e 100644
+--- a/src/AIEcho.cpp
++++ b/src/AIEcho.cpp
+@@ -4387,7 +4387,7 @@ bool enemy_building_iterator::operator!=(const enemy_building_iterator& rhs) con
+ {
+ if(is_end && rhs.is_end)
+ return false;
+- return is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site;
++ return bool {is_end!=rhs.is_end || team!=rhs.team || building_type!=rhs.building_type || level!=rhs.level || construction_site!=rhs.construction_site};
+ }
+
+
Copied: glob2/repos/community-staging-x86_64/glob2-gcc6.patch (from rev 959780, glob2/trunk/glob2-gcc6.patch)
===================================================================
--- community-staging-x86_64/glob2-gcc6.patch (rev 0)
+++ community-staging-x86_64/glob2-gcc6.patch 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,28 @@
+Description: Fix some compiler warnings
+ This fixes a FTBFS with GCC 6 where the warnings are now errors.
+Bug-Debian: https://bugs.debian.org/812167
+Origin: upstream, https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247
+Author: Leo Wandersleb <Leo.Wandersleb at gmx.de>
+Last-Update: 2011-11-03
+--- a/src/ChooseMapScreen.cpp
++++ b/src/ChooseMapScreen.cpp
+@@ -31,7 +31,7 @@
+
+ #include "Game.h"
+
+-ChooseMapScreen::ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory, const char* alternateExtension, const char* alternateRecurse)
++ChooseMapScreen::ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory, const char* alternateExtension, const bool alternateRecurse)
+ {
+ ok = new TextButton(440, 360, 180, 40, ALIGN_SCREEN_CENTERED, ALIGN_SCREEN_CENTERED, "menu", Toolkit::getStringTable()->getString("[ok]"), OK, 13);
+ addWidget(ok);
+--- a/src/ChooseMapScreen.h
++++ b/src/ChooseMapScreen.h
+@@ -43,7 +43,7 @@
+ /// Constructor. Directory is the source of the listed files.
+ /// extension is the file extension to show. If recurse is true,
+ /// subdirectoried are shown and can be opened.
+- ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory=NULL, const char* alternateExtension=NULL, const char* alternateRecurse=NULL);
++ ChooseMapScreen(const char *directory, const char *extension, bool recurse, const char* alternateDirectory=NULL, const char* alternateExtension=NULL, const bool alternateRecurse=NULL);
+ //! Destructor
+ virtual ~ChooseMapScreen();
+ virtual void onAction(Widget *source, Action action, int par1, int par2);
Copied: glob2/repos/community-staging-x86_64/glob2-scons3.patch (from rev 959780, glob2/trunk/glob2-scons3.patch)
===================================================================
--- community-staging-x86_64/glob2-scons3.patch (rev 0)
+++ community-staging-x86_64/glob2-scons3.patch 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,26 @@
+--- glob2-0.9.4.4/SConstruct.orig 2019-01-15 14:58:36.130370433 +0100
++++ glob2-0.9.4.4/SConstruct 2019-01-15 15:03:13.040240416 +0100
+@@ -13,7 +13,7 @@
+
+
+ def establish_options(env):
+- opts = Options('options_cache.py')
++ opts = Variables('options_cache.py')
+ opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g")
+ opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g")
+ if isDarwinPlatform:
+@@ -22,10 +22,10 @@
+ opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share")
+ opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin")
+ opts.Add("DATADIR", "Directory where data will be put, set to the same as INSTALLDIR", "/usr/local/share")
+- opts.Add(BoolOption("release", "Build for release", 0))
+- opts.Add(BoolOption("profile", "Build with profiling on", 0))
+- opts.Add(BoolOption("mingw", "Build with mingw enabled if not auto-detected", 0))
+- opts.Add(BoolOption("server", "Build only the YOG server, excluding the game and any GUI/sound components", 0))
++ opts.Add(BoolVariable("release", "Build for release", 0))
++ opts.Add(BoolVariable("profile", "Build with profiling on", 0))
++ opts.Add(BoolVariable("mingw", "Build with mingw enabled if not auto-detected", 0))
++ opts.Add(BoolVariable("server", "Build only the YOG server, excluding the game and any GUI/sound components", 0))
+ opts.Add("font", "Build the game using an alternative font placed in the data/font folder", "sans.ttf")
+ Help(opts.GenerateHelpText(env))
+ opts.Update(env)
Copied: glob2/repos/community-staging-x86_64/scons-python3.patch (from rev 959780, glob2/trunk/scons-python3.patch)
===================================================================
--- community-staging-x86_64/scons-python3.patch (rev 0)
+++ community-staging-x86_64/scons-python3.patch 2021-06-08 17:44:01 UTC (rev 959781)
@@ -0,0 +1,243 @@
+--- glob2-0.9.4.4/SConstruct.orig 2019-07-26 18:18:48.365048391 +0000
++++ glob2-0.9.4.4/SConstruct 2019-07-26 18:23:10.541667260 +0000
+@@ -75,31 +75,31 @@
+ env.Append(CPPDEFINES=["HAVE_CONFIG_H"])
+ #Simple checks for required libraries
+ if not conf.CheckLib("SDL") and not server_only:
+- print "Could not find libSDL"
++ print ("Could not find libSDL")
+ missing.append("SDL")
+ if not conf.CheckLib("SDL_ttf") and not server_only:
+- print "Could not find libSDL_ttf"
++ print ("Could not find libSDL_ttf")
+ missing.append("SDL_ttf")
+ if not conf.CheckLib("SDL_image") and not server_only:
+- print "Could not find libSDL_image"
++ print ("Could not find libSDL_image")
+ missing.append("SDL_image")
+ if not conf.CheckLib("SDL_net") and not server_only:
+- print "Could not find libSDL_net"
++ print ("Could not find libSDL_net")
+ missing.append("SDL_net")
+ if not conf.CheckLib("speex") or not conf.CheckCXXHeader("speex/speex.h") and not server_only:
+- print "Could not find libspeex or could not find 'speex/speex.h'"
++ print ("Could not find libspeex or could not find 'speex/speex.h'")
+ missing.append("speex")
+ if not conf.CheckLib("vorbisfile") and not server_only:
+- print "Could not find libvorbisfile"
++ print ("Could not find libvorbisfile")
+ missing.append("vorbisfile")
+ if not conf.CheckLib("vorbis") and not server_only:
+- print "Could not find libvorbis"
++ print ("Could not find libvorbis")
+ missing.append("vorbis")
+ if not conf.CheckLib("ogg") and not server_only:
+- print "Could not find libogg"
++ print ("Could not find libogg")
+ missing.append("ogg")
+ if not conf.CheckCXXHeader("zlib.h"):
+- print "Could not find zlib.h"
++ print ("Could not find zlib.h")
+ missing.append("zlib")
+ else:
+ if conf.CheckLib("z"):
+@@ -107,7 +107,7 @@
+ elif conf.CheckLib("zlib1"):
+ env.Append(LIBS="zlib1")
+ else:
+- print "Could not find libz or zlib1.dll"
++ print ("Could not find libz or zlib1.dll")
+ missing.append("zlib")
+
+ boost_thread = ''
+@@ -116,7 +116,7 @@
+ elif conf.CheckLib("boost_thread-mt") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
+ boost_thread="boost_thread-mt"
+ else:
+- print "Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp"
++ print ("Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp")
+ missing.append("libboost_thread")
+ env.Append(LIBS=[boost_thread])
+
+@@ -126,31 +126,31 @@
+ elif conf.CheckLib("boost_date_time-mt") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
+ boost_thread="boost_thread-mt"
+ else:
+- print "Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp"
++ print ("Could not find libboost_date_time or libboost_date_time-mt or boost/thread/thread.hpp")
+ missing.append("libboost_date_time")
+ env.Append(LIBS=[boost_date_time])
+
+
+ if not conf.CheckCXXHeader("boost/shared_ptr.hpp"):
+- print "Could not find boost/shared_ptr.hpp"
++ print ("Could not find boost/shared_ptr.hpp")
+ missing.append("boost/shared_ptr.hpp")
+ if not conf.CheckCXXHeader("boost/tuple/tuple.hpp"):
+- print "Could not find boost/tuple/tuple.hpp"
++ print ("Could not find boost/tuple/tuple.hpp")
+ missing.append("boost/tuple/tuple.hpp")
+ if not conf.CheckCXXHeader("boost/tuple/tuple_comparison.hpp"):
+- print "Could not find boost/tuple/tuple_comparison.hpp"
++ print ("Could not find boost/tuple/tuple_comparison.hpp")
+ missing.append("boost/tuple/tuple_comparison.hpp")
+ if not conf.CheckCXXHeader("boost/logic/tribool.hpp"):
+- print "Could not find boost/logic/tribool.hpp"
++ print ("Could not find boost/logic/tribool.hpp")
+ missing.append("boost/logic/tribool.hpp")
+ if not conf.CheckCXXHeader("boost/lexical_cast.hpp"):
+- print "Could not find boost/lexical_cast.hpp"
++ print ("Could not find boost/lexical_cast.hpp")
+ missing.append("boost/lexical_cast.hpp")
+
+ #Do checks for OpenGL, which is different on every system
+ gl_libraries = []
+ if isDarwinPlatform and not server_only:
+- print "Using Apple's OpenGL framework"
++ print ("Using Apple's OpenGL framework")
+ env.Append(FRAMEWORKS="OpenGL")
+ elif conf.CheckLib("GL") and conf.CheckCXXHeader("GL/gl.h") and not server_only:
+ gl_libraries.append("GL")
+@@ -159,12 +159,12 @@
+ elif conf.CheckLib("opengl32") and conf.CheckCXXHeader("GL/gl.h") and not server_only:
+ gl_libraries.append("opengl32")
+ elif not server_only:
+- print "Could not find libGL or opengl32, or could not find GL/gl.h or OpenGL/gl.h"
++ print ("Could not find libGL or opengl32, or could not find GL/gl.h or OpenGL/gl.h")
+ missing.append("OpenGL")
+
+ #Do checks for GLU, which is different on every system
+ if isDarwinPlatform and not server_only:
+- print "Using Apple's GLUT framework"
++ print ("Using Apple's GLUT framework")
+ env.Append(FRAMEWORKS="GLUT")
+ elif conf.CheckLib('GLU') and conf.CheckCXXHeader("GL/glu.h") and not server_only:
+ gl_libraries.append("GLU")
+@@ -173,7 +173,7 @@
+ elif conf.CheckLib('glu32') and conf.CheckCXXHeader('GL/glu.h') and not server_only:
+ gl_libraries.append("glu32")
+ elif not server_only:
+- print "Could not find libGLU or glu32, or could not find GL/glu.h or OpenGL/glu.h"
++ print ("Could not find libGLU or glu32, or could not find GL/glu.h or OpenGL/glu.h")
+ missing.append("GLU")
+
+ if gl_libraries or isDarwinPlatform:
+@@ -188,31 +188,31 @@
+ #Do checks for portaudio
+ if conf.CheckLib('portaudio') and conf.CheckCXXHeader('portaudio.h'):
+ if env['mingw'] or isWindowsPlatform:
+- print "--------"
+- print "NOTE: It appears you are compiling under Windows. At this stage, PortAudio crashes Globulation 2 when voice chat is used."
+- print "NOTE: Disabling PortAudio in this build (you will be unable to use Voice Chat ingame)."
+- print "--------"
++ print ("--------")
++ print ("NOTE: It appears you are compiling under Windows. At this stage, PortAudio crashes Globulation 2 when voice chat is used.")
++ print ("NOTE: Disabling PortAudio in this build (you will be unable to use Voice Chat ingame).")
++ print ("--------")
+ else:
+ if GetOption('portaudio'):
+- print "trying to use portaudio"
++ print ("trying to use portaudio")
+ configfile.add("HAVE_PORTAUDIO ", "Defined when Port Audio support is present and compiled")
+ env.Append(LIBS=['portaudio'])
+ else:
+- print " no portaudio"
+- print " no portaudio - although portaudio was found to be installed, you have "
+- print " no portaudio - to explicitly activate it using: "
+- print " no portaudio - $ scons --portaudio=true"
+- print " no portaudio - this may not work properly if the version of portaudio"
+- print " no portaudio - is wrong. portaudio is used to allow communicating over VOIP"
+- print " no portaudio"
+- print " no portaudio - if you know of a solution to detect portaudio version"
+- print " no portaudio - let us know at:"
+- print " no portaudio - https://savannah.nongnu.org/bugs/index.php?24668"
+- print " no portaudio"
++ print (" no portaudio")
++ print (" no portaudio - although portaudio was found to be installed, you have ")
++ print (" no portaudio - to explicitly activate it using: ")
++ print (" no portaudio - $ scons --portaudio=true")
++ print (" no portaudio - this may not work properly if the version of portaudio")
++ print (" no portaudio - is wrong. portaudio is used to allow communicating over VOIP")
++ print (" no portaudio")
++ print (" no portaudio - if you know of a solution to detect portaudio version")
++ print (" no portaudio - let us know at:")
++ print (" no portaudio - https://savannah.nongnu.org/bugs/index.php?24668")
++ print (" no portaudio")
+
+ if missing:
+ for t in missing:
+- print "Missing %s" % t
++ print ("Missing %s" % t)
+ Exit(1)
+
+ conf.Finish()
+@@ -232,7 +232,7 @@
+ env.Clone = env.Copy
+
+ if not env['CC']:
+- print "No compiler found in PATH. Please install gcc or another compiler."
++ print ("No compiler found in PATH. Please install gcc or another compiler.")
+ Exit(1)
+
+ env["VERSION"] = "0.9.4.4"
+--- glob2-0.9.4.4/scons/bundle.py.orig 2019-07-26 18:25:20.693318523 +0000
++++ glob2-0.9.4.4/scons/bundle.py 2019-07-26 18:25:50.130360077 +0000
+@@ -4,10 +4,10 @@
+ from addDependentLibsToBundle import addDependentLibsToBundle
+
+ def run(command) :
+- print "\033[32m:: ", command, "\033[0m"
++ print ("\033[32m:: ", command, "\033[0m")
+ return os.system(command)
+ def norun(command) :
+- print "\033[31mXX ", command, "\033[0m"
++ print ("\033[31mXX ", command, "\033[0m")
+
+
+
+@@ -46,7 +46,7 @@
+ return target, source
+
+ def generate(env) :
+- print "Loading Bundle tool"
++ print ("Loading Bundle tool")
+ Builder = SCons.Builder.Builder
+ Action = SCons.Action.Action
+ bundleBuilder = Builder(
+--- glob2-0.9.4.4/scons/addDependentLibsToBundle.py.orig 2019-07-26 18:27:04.774645968 +0000
++++ glob2-0.9.4.4/scons/addDependentLibsToBundle.py 2019-07-26 18:27:29.854966622 +0000
+@@ -4,10 +4,10 @@
+ import sys
+
+ def run(command) :
+- print "\033[32m:: ", command, "\033[0m"
++ print ("\033[32m:: ", command, "\033[0m")
+ return os.system(command)
+ def norun(command) :
+- print "\033[31mXX ", command, "\033[0m"
++ print ("\033[31mXX ", command, "\033[0m")
+
+
+ def needsChange(binary, blacklist) :
+--- glob2-0.9.4.4/scons/dmg.py.orig 2019-07-26 18:28:29.269060631 +0000
++++ glob2-0.9.4.4/scons/dmg.py 2019-07-26 18:28:45.099263555 +0000
+@@ -15,7 +15,7 @@
+
+ def generate(env) :
+ """Add Builders and construction variables for qt to an Environment."""
+- print "Lodading dmg tool..."
++ print ("Lodading dmg tool...")
+ env.Append( BUILDERS={'Dmg' :
+ env.Builder( action=env.Action(create_dmg, create_dmg_message ))
+ } )
+--- glob2-0.9.4.4/scons/nsis.py.orig 2019-07-26 18:29:44.103353972 +0000
++++ glob2-0.9.4.4/scons/nsis.py 2019-07-26 18:30:04.393614598 +0000
+@@ -10,7 +10,7 @@
+
+ def generate(env) :
+ """Add Builders and construction variables for qt to an Environment."""
+- print "Loading nsis tool..."
++ print ("Loading nsis tool...")
+
+ Builder = SCons.Builder.Builder
+
More information about the arch-commits
mailing list