Date: Tuesday, January 15, 2019 @ 14:08:08 Author: anthraxx Revision: 423340
adding scons3 support (convert Options to Variables) Added: glob2/trunk/glob2-scons3.patch Modified: glob2/trunk/PKGBUILD --------------------+ PKGBUILD | 7 +++++-- glob2-scons3.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-15 13:51:03 UTC (rev 423339) +++ PKGBUILD 2019-01-15 14:08:08 UTC (rev 423340) @@ -15,11 +15,13 @@ makedepends=('scons' 'boost' 'mesa' 'patch') source=(http://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::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/") + glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/" + glob2-scons3.patch) sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a' '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba' - '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20') + '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20' + '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc') prepare() { cd "$pkgname-$pkgver" @@ -27,6 +29,7 @@ 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" } build() { Added: glob2-scons3.patch =================================================================== --- glob2-scons3.patch (rev 0) +++ glob2-scons3.patch 2019-01-15 14:08:08 UTC (rev 423340) @@ -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)