From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 01:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26618@debbugs.gnu.org Cc: ng0 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149291127716987 (code B ref -1); Sun, 23 Apr 2017 01:35:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 01:34:37 +0000 Received: from localhost ([127.0.0.1]:34991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Q8-0004Pv-TR for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Q7-0004Ph-2x for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d26Q0-00066r-RB for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d26Q0-00066n-Nc for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d26Pz-0005Or-Dh for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d26Pw-000659-BW for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:27 -0400 Received: from mail.lassieur.org ([83.152.10.219]:36378) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d26Pv-00063t-VV for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:24 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 77861ddd (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 01:34:21 +0000 (UTC) User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Sun, 23 Apr 2017 03:34:20 +0200 Message-ID: <87mvb7vrdv.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Theses patches add 0ad and mozjs-38 (a dependency). I worked in cooperation with ng0. 0ad needs a window manager that supports 'Extended Window Manager Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints for a list. I did not try multiplayer mode. I ran it with Awesome WM, so I did not test the icons and desktop things: I'm not sure about it. Please let me know if you see anything wrong :) From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: [PATCH 1/2] gnu: Add mozjs-38 (Mozilla SpiderMonkey 38). References: <87mvb7vrdv.fsf@lassieur.org> In-Reply-To: <87mvb7vrdv.fsf@lassieur.org> Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 01:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26618@debbugs.gnu.org Received: via spool by 26618-submit@debbugs.gnu.org id=B26618.149291138917184 (code B ref 26618); Sun, 23 Apr 2017 01:37:02 +0000 Received: (at 26618) by debbugs.gnu.org; 23 Apr 2017 01:36:29 +0000 Received: from localhost ([127.0.0.1]:34997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Rm-0004Sv-9M for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:36:28 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Rg-0004SX-NY for 26618@debbugs.gnu.org; Sat, 22 Apr 2017 21:36:16 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 072113a3 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for <26618@debbugs.gnu.org>; Sun, 23 Apr 2017 01:36:11 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Sun, 23 Apr 2017 03:35:53 +0200 Message-Id: <20170423013554.4534-1-clement@lassieur.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/gnuzilla.scm (mozjs-38): New variable. * gnu/packages/patches/mozjs38-pkg-config-version.patch, gnu/packages/patches/mozjs38-shell-version.patch, gnu/packages/patches/mozjs38-tracelogger.patch, gnu/packages/patches/mozjs38-version-detection.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. Co-authored-by: ng0 --- gnu/local.mk | 4 + gnu/packages/gnuzilla.scm | 90 ++- .../patches/mozjs38-pkg-config-version.patch | 24 + gnu/packages/patches/mozjs38-shell-version.patch | 67 +++ gnu/packages/patches/mozjs38-tracelogger.patch | 608 +++++++++++++++++++++ .../patches/mozjs38-version-detection.patch | 180 ++++++ 6 files changed, 972 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mozjs38-pkg-config-version.patch create mode 100644 gnu/packages/patches/mozjs38-shell-version.patch create mode 100644 gnu/packages/patches/mozjs38-tracelogger.patch create mode 100644 gnu/packages/patches/mozjs38-version-detection.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1fe46bfb5..1c6d722dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -788,6 +788,10 @@ dist_patch_DATA = \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/mozjs17-aarch64-support.patch \ %D%/packages/patches/mozjs24-aarch64-support.patch \ + %D%/packages/patches/mozjs38-pkg-config-version.patch \ + %D%/packages/patches/mozjs38-shell-version.patch \ + %D%/packages/patches/mozjs38-tracelogger.patch \ + %D%/packages/patches/mozjs38-version-detection.patch \ %D%/packages/patches/multiqc-fix-git-subprocess-error.patch \ %D%/packages/patches/mumps-build-parallelism.patch \ %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index efe63adb4..a3154c363 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017 ng0 ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages video) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages zip)) + #:use-module (gnu packages zip) + #:use-module (gnu packages readline)) (define-public mozjs (package @@ -159,6 +161,92 @@ in C/C++.") `(("libffi" ,libffi) ("zlib" ,zlib))))) +(define-public mozjs-38 + (package + (inherit mozjs) + (name "mozjs") + (version "38.2.1.rc0") + (source (origin + (method url-fetch) + (uri (string-append + "https://people.mozilla.org/~sstangl/" + name "-" version ".tar.bz2")) + (sha256 + (base32 + "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681")) + (patches + (search-patches + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1269317 for + ;; GCC 6 compatibility. + + "mozjs38-version-detection.patch" ; for 0ad + "mozjs38-tracelogger.patch" + + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1339931. + "mozjs38-pkg-config-version.patch" + "mozjs38-shell-version.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix incompatibility with sed 4.4. + (substitute* "js/src/configure" + (("\\^\\[:space:\\]") "^[[:space:]]")) + + ;; The headers are symlinks to files that are in /tmp, so they + ;; end up broken. Copy them instead. + (substitute* + "python/mozbuild/mozbuild/backend/recursivemake.py" + (("\\['dist_include'\\].add_symlink") + "['dist_include'].add_copy")) + + ;; Remove bundled libraries. + (for-each delete-file-recursively + '("intl" + "js/src/ctypes/libffi" + "js/src/ctypes/libffi-patches" + "modules/zlib")) + #t)))) + (arguments + `(;; XXX: parallel build fails, lacking: + ;; mkdir -p "system_wrapper_js/" + #:parallel-build? #f + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1008470. + #:tests? #f + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (chdir "js/src") + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (zero? (system* "./configure" + (string-append "--prefix=" out) + "--enable-ctypes" + "--enable-gcgenerational" + "--enable-optimize" + "--enable-pie" + "--enable-readline" + "--enable-shared-js" + "--enable-system-ffi" + "--enable-threadsafe" + "--enable-xterm-updates" + "--with-system-icu" + "--with-system-nspr" + "--with-system-zlib" + + ;; Intl API requires bundled ICU. + "--without-intl-api")))))))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2))) + (inputs + `(("libffi" ,libffi) + ("readline" ,readline) + ("icu4c" ,icu4c) + ("zlib" ,zlib))))) + (define-public nspr (package (name "nspr") diff --git a/gnu/packages/patches/mozjs38-pkg-config-version.patch b/gnu/packages/patches/mozjs38-pkg-config-version.patch new file mode 100644 index 000000000..49ff6f6f8 --- /dev/null +++ b/gnu/packages/patches/mozjs38-pkg-config-version.patch @@ -0,0 +1,24 @@ +Taken from https://bug1339931.bmoattachments.org/attachment.cgi?id=8837770. + +Add major version to pkg-config filename. +Author: Rico Tzschichholz +Forwarded: no +Last-Update: 2015-05-04 + +Index: b/js/src/Makefile.in +=================================================================== +--- a/js/src/Makefile.in ++++ b/js/src/Makefile.in +@@ -214,10 +214,10 @@ + $(JS_CONFIG_NAME): js-config + cp $^ $@ + +-$(LIBRARY_NAME).pc: js.pc ++$(JS_LIBRARY_NAME).pc: js.pc + cp $^ $@ + +-install:: $(LIBRARY_NAME).pc ++install:: $(JS_LIBRARY_NAME).pc + $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig + + install:: js-config.h diff --git a/gnu/packages/patches/mozjs38-shell-version.patch b/gnu/packages/patches/mozjs38-shell-version.patch new file mode 100644 index 000000000..e7d3d19c8 --- /dev/null +++ b/gnu/packages/patches/mozjs38-shell-version.patch @@ -0,0 +1,67 @@ +Taken from https://bug1339931.bmoattachments.org/attachment.cgi?id=8837771. + +# HG changeset patch +# Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a +Add major version to shell and js-config filenames. +Author: Rico Tzschichholz +Forwarded: no +Last-Update: 2014-10-29 + +--- +diff --git a/js/src/configure b/js/src/configure +--- a/js/src/configure ++++ b/js/src/configure +@@ -1696,8 +1696,13 @@ + MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` + IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` + ++if test -n "$JS_STANDALONE"; then ++JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION ++JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config ++else + JS_SHELL_NAME=js + JS_CONFIG_NAME=js-config ++fi + + + if test -n "$IS_ALPHA"; then + +diff --git a/js/src/configure.in b/js/src/configure.in +--- a/js/src/configure.in ++++ b/js/src/configure.in +@@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI + MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` + IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` + +-dnl XXX in a temporary bid to avoid developer anger at renaming files +-dnl XXX before "js" symlinks exist, don't change names. +-dnl +-dnl if test -n "$JS_STANDALONE"; then +-dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +-dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +-dnl else ++if test -n "$JS_STANDALONE"; then ++JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION ++JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config ++else + JS_SHELL_NAME=js + JS_CONFIG_NAME=js-config +-dnl fi ++fi + + changequote([,]) + if test -n "$IS_ALPHA"; then + +diff -r 80a9e64d75f5 js/src/Makefile.in +--- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 ++++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 +@@ -273,6 +273,9 @@ + SCRIPTS = $(JS_CONFIG_NAME) + SDK_BINARY = $(JS_CONFIG_NAME) + ++$(JS_CONFIG_NAME): js-config ++ cp $^ $@ ++ + $(JS_LIBRARY_NAME).pc: js.pc + cp $^ $@ + diff --git a/gnu/packages/patches/mozjs38-tracelogger.patch b/gnu/packages/patches/mozjs38-tracelogger.patch new file mode 100644 index 000000000..0375ec36c --- /dev/null +++ b/gnu/packages/patches/mozjs38-tracelogger.patch @@ -0,0 +1,608 @@ +Squashed version of several commits to fix the tracelogger. + +Taken from +https://github.com/GNOME/jhbuild/blob/master/patches/mozjs38-fix-tracelogger.patch. + +# === Fix the SM38 tracelogger === +# This patch is a squashed version of several patches that were adapted +# to fix failing hunks. +# +# Applied in the following order, they are: +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223767 +# Assertion failure: i < size_, at js/src/vm/TraceLoggingTypes.h:210 +# Also fix stop-information to make reduce.py work correctly. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227914 +# Limit the memory tracelogger can take. +# This causes tracelogger to flush data to the disk regularly and prevents out of +# memory issues if a lot of data gets logged. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1155618 +# Fix tracelogger destructor that touches possibly uninitialised hash table. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1223636 +# Don't treat extraTextId as containing only extra ids. +# This fixes an assertion failure: id == nextTextId at js/src/vm/TraceLoggingGraph.cpp +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1227028 +# Fix when to keep the payload of a TraceLogger event. +# This fixes an assertion failure: textId < uint32_t(1 << 31) at js/src/vm/TraceLoggingGraph.h +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1266649 +# Handle failing to add to pointermap gracefully. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1280648 +# Don't cache based on pointers to movable GC things. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1224123 +# Fix the use of LastEntryId in tracelogger.h. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1231170 +# Use size in debugger instead of the current id to track last logged item. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1221844 +# Move TraceLogger_Invalidation to LOG_ITEM. +# Add some debug checks to logTimestamp. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1255766 +# Also mark resizing of memory. +# * https://bugzilla.mozilla.org/show_bug.cgi?id=1259403 +# Only increase capacity by multiples of 2. +# Always make sure there are 3 free slots for events. +# === + +diff --git a/js/src/jit-test/tests/tracelogger/bug1231170.js b/js/src/jit-test/tests/tracelogger/bug1231170.js +new file mode 100644 +index 0000000..023e93e +--- /dev/null ++++ b/js/src/jit-test/tests/tracelogger/bug1231170.js +@@ -0,0 +1,3 @@ ++var du = new Debugger(); ++if (typeof du.drainTraceLogger === "function") ++ du.drainTraceLogger(); +diff --git a/js/src/jit-test/tests/tracelogger/bug1266649.js b/js/src/jit-test/tests/tracelogger/bug1266649.js +new file mode 100644 +index 0000000..81ae7ad +--- /dev/null ++++ b/js/src/jit-test/tests/tracelogger/bug1266649.js +@@ -0,0 +1,10 @@ ++ ++var du = new Debugger(); ++if (typeof du.setupTraceLogger === "function" && ++ typeof oomTest === 'function') ++{ ++ du.setupTraceLogger({ ++ Scripts: true ++ }) ++ oomTest(() => function(){}); ++} +diff --git a/js/src/jit/Ion.cpp b/js/src/jit/Ion.cpp +index 93e2fda..09049d6 100644 +--- a/js/src/jit/Ion.cpp ++++ b/js/src/jit/Ion.cpp +@@ -1055,6 +1055,8 @@ IonScript::Destroy(FreeOp* fop, IonScript* script) + + script->destroyCaches(); + script->unlinkFromRuntime(fop); ++ // Frees the potential event we have set. ++ script->traceLoggerScriptEvent_ = TraceLoggerEvent(); + fop->free_(script); + } + +diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp +index 26262fd..af7f313 100644 +--- a/js/src/vm/Debugger.cpp ++++ b/js/src/vm/Debugger.cpp +@@ -369,10 +369,10 @@ Debugger::Debugger(JSContext* cx, NativeObject* dbg) + objects(cx), + environments(cx), + #ifdef NIGHTLY_BUILD +- traceLoggerLastDrainedId(0), ++ traceLoggerLastDrainedSize(0), + traceLoggerLastDrainedIteration(0), + #endif +- traceLoggerScriptedCallsLastDrainedId(0), ++ traceLoggerScriptedCallsLastDrainedSize(0), + traceLoggerScriptedCallsLastDrainedIteration(0) + { + assertSameCompartment(cx, dbg); +@@ -3907,9 +3907,9 @@ Debugger::drainTraceLogger(JSContext* cx, unsigned argc, Value* vp) + size_t num; + TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime()); + bool lostEvents = logger->lostEvents(dbg->traceLoggerLastDrainedIteration, +- dbg->traceLoggerLastDrainedId); ++ dbg->traceLoggerLastDrainedSize); + EventEntry* events = logger->getEventsStartingAt(&dbg->traceLoggerLastDrainedIteration, +- &dbg->traceLoggerLastDrainedId, ++ &dbg->traceLoggerLastDrainedSize, + &num); + + RootedObject array(cx, NewDenseEmptyArray(cx)); +@@ -4002,10 +4002,10 @@ Debugger::drainTraceLoggerScriptCalls(JSContext* cx, unsigned argc, Value* vp) + size_t num; + TraceLoggerThread* logger = TraceLoggerForMainThread(cx->runtime()); + bool lostEvents = logger->lostEvents(dbg->traceLoggerScriptedCallsLastDrainedIteration, +- dbg->traceLoggerScriptedCallsLastDrainedId); ++ dbg->traceLoggerScriptedCallsLastDrainedSize); + EventEntry* events = logger->getEventsStartingAt( + &dbg->traceLoggerScriptedCallsLastDrainedIteration, +- &dbg->traceLoggerScriptedCallsLastDrainedId, ++ &dbg->traceLoggerScriptedCallsLastDrainedSize, + &num); + + RootedObject array(cx, NewDenseEmptyArray(cx)); +diff --git a/js/src/vm/Debugger.h b/js/src/vm/Debugger.h +index 8cac36a..c92d685 100644 +--- a/js/src/vm/Debugger.h ++++ b/js/src/vm/Debugger.h +@@ -314,10 +314,10 @@ class Debugger : private mozilla::LinkedListElement + * lost events. + */ + #ifdef NIGHTLY_BUILD +- uint32_t traceLoggerLastDrainedId; ++ uint32_t traceLoggerLastDrainedSize; + uint32_t traceLoggerLastDrainedIteration; + #endif +- uint32_t traceLoggerScriptedCallsLastDrainedId; ++ uint32_t traceLoggerScriptedCallsLastDrainedSize; + uint32_t traceLoggerScriptedCallsLastDrainedIteration; + + class FrameRange; +diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp +index 6715b36..9766a6f 100644 +--- a/js/src/vm/TraceLogging.cpp ++++ b/js/src/vm/TraceLogging.cpp +@@ -131,7 +131,7 @@ TraceLoggerThread::init() + { + if (!pointerMap.init()) + return false; +- if (!extraTextId.init()) ++ if (!textIdPayloads.init()) + return false; + if (!events.init()) + return false; +@@ -185,10 +185,10 @@ TraceLoggerThread::~TraceLoggerThread() + graph = nullptr; + } + +- for (TextIdHashMap::Range r = extraTextId.all(); !r.empty(); r.popFront()) +- js_delete(r.front().value()); +- extraTextId.finish(); +- pointerMap.finish(); ++ if (textIdPayloads.initialized()) { ++ for (TextIdHashMap::Range r = textIdPayloads.all(); !r.empty(); r.popFront()) ++ js_delete(r.front().value()); ++ } + } + + bool +@@ -287,7 +287,7 @@ TraceLoggerThread::eventText(uint32_t id) + if (id < TraceLogger_Last) + return TLTextIdString(static_cast(id)); + +- TextIdHashMap::Ptr p = extraTextId.lookup(id); ++ TextIdHashMap::Ptr p = textIdPayloads.lookup(id); + MOZ_ASSERT(p); + + return p->value()->string(); +@@ -341,13 +341,15 @@ TraceLoggerThread::extractScriptDetails(uint32_t textId, const char** filename, + TraceLoggerEventPayload* + TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId textId) + { +- TextIdHashMap::AddPtr p = extraTextId.lookupForAdd(textId); +- if (p) ++ TextIdHashMap::AddPtr p = textIdPayloads.lookupForAdd(textId); ++ if (p) { ++ MOZ_ASSERT(p->value()->textId() == textId); // Sanity check. + return p->value(); ++ } + + TraceLoggerEventPayload* payload = js_new(textId, (char*)nullptr); + +- if (!extraTextId.add(p, textId, payload)) ++ if (!textIdPayloads.add(p, textId, payload)) + return nullptr; + + return payload; +@@ -357,8 +359,10 @@ TraceLoggerEventPayload* + TraceLoggerThread::getOrCreateEventPayload(const char* text) + { + PointerHashMap::AddPtr p = pointerMap.lookupForAdd((const void*)text); +- if (p) ++ if (p) { ++ MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check. + return p->value(); ++ } + + size_t len = strlen(text); + char* str = js_pod_malloc(len + 1); +@@ -369,7 +373,7 @@ TraceLoggerThread::getOrCreateEventPayload(const char* text) + MOZ_ASSERT(ret == len); + MOZ_ASSERT(strlen(str) == len); + +- uint32_t textId = extraTextId.count() + TraceLogger_Last; ++ uint32_t textId = nextTextId; + + TraceLoggerEventPayload* payload = js_new(textId, str); + if (!payload) { +@@ -377,17 +381,19 @@ TraceLoggerThread::getOrCreateEventPayload(const char* text) + return nullptr; + } + +- if (!extraTextId.putNew(textId, payload)) { ++ if (!textIdPayloads.putNew(textId, payload)) { + js_delete(payload); + return nullptr; + } + +- if (!pointerMap.add(p, text, payload)) +- return nullptr; +- + if (graph.get()) + graph->addTextId(textId, str); + ++ nextTextId++; ++ ++ if (!pointerMap.add(p, text, payload)) ++ return nullptr; ++ + return payload; + } + +@@ -407,9 +413,14 @@ TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, const char* f + if (!traceLoggerState->isTextIdEnabled(type)) + return getOrCreateEventPayload(type); + +- PointerHashMap::AddPtr p = pointerMap.lookupForAdd(ptr); +- if (p) +- return p->value(); ++ PointerHashMap::AddPtr p; ++ if (ptr) { ++ p = pointerMap.lookupForAdd(ptr); ++ if (p) { ++ MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check. ++ return p->value(); ++ } ++ } + + // Compute the length of the string to create. + size_t lenFilename = strlen(filename); +@@ -428,24 +439,28 @@ TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, const char* f + MOZ_ASSERT(ret == len); + MOZ_ASSERT(strlen(str) == len); + +- uint32_t textId = extraTextId.count() + TraceLogger_Last; ++ uint32_t textId = nextTextId; + TraceLoggerEventPayload* payload = js_new(textId, str); + if (!payload) { + js_free(str); + return nullptr; + } + +- if (!extraTextId.putNew(textId, payload)) { ++ if (!textIdPayloads.putNew(textId, payload)) { + js_delete(payload); + return nullptr; + } + +- if (!pointerMap.add(p, ptr, payload)) +- return nullptr; +- + if (graph.get()) + graph->addTextId(textId, str); + ++ nextTextId++; ++ ++ if (ptr) { ++ if (!pointerMap.add(p, ptr, payload)) ++ return nullptr; ++ } ++ + return payload; + } + +@@ -453,14 +468,14 @@ TraceLoggerEventPayload* + TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, JSScript* script) + { + return getOrCreateEventPayload(type, script->filename(), script->lineno(), script->column(), +- script); ++ nullptr); + } + + TraceLoggerEventPayload* + TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, + const JS::ReadOnlyCompileOptions& script) + { +- return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, &script); ++ return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, nullptr); + } + + void +@@ -485,7 +500,7 @@ TraceLoggerThread::startEvent(uint32_t id) + if (!traceLoggerState->isTextIdEnabled(id)) + return; + +- logTimestamp(id); ++ log(id); + } + + void +@@ -510,7 +525,7 @@ TraceLoggerThread::stopEvent(uint32_t id) + if (!traceLoggerState->isTextIdEnabled(id)) + return; + +- logTimestamp(TraceLogger_Stop); ++ log(TraceLogger_Stop); + } + + void +@@ -522,23 +537,57 @@ TraceLoggerThread::logTimestamp(TraceLoggerTextId id) + void + TraceLoggerThread::logTimestamp(uint32_t id) + { ++ MOZ_ASSERT(id > TraceLogger_LastTreeItem && id < TraceLogger_Last); ++ log(id); ++} ++ ++void ++TraceLoggerThread::log(uint32_t id) ++{ + if (enabled == 0) + return; + + MOZ_ASSERT(traceLoggerState); +- if (!events.ensureSpaceBeforeAdd()) { ++ ++ // We request for 3 items to add, since if we don't have enough room ++ // we record the time it took to make more place. To log this information ++ // we need 2 extra free entries. ++ if (!events.hasSpaceForAdd(3)) { + uint64_t start = rdtsc() - traceLoggerState->startupTime; + +- if (graph.get()) +- graph->log(events); ++ if (!events.ensureSpaceBeforeAdd(3)) { ++ if (graph.get()) ++ graph->log(events); ++ ++ iteration_++; ++ events.clear(); ++ ++ // Remove the item in the pointerMap for which the payloads ++ // have no uses anymore ++ for (PointerHashMap::Enum e(pointerMap); !e.empty(); e.popFront()) { ++ if (e.front().value()->uses() != 0) ++ continue; ++ ++ TextIdHashMap::Ptr p = textIdPayloads.lookup(e.front().value()->textId()); ++ MOZ_ASSERT(p); ++ textIdPayloads.remove(p); ++ ++ e.removeFront(); ++ } + +- iteration_++; +- events.clear(); ++ // Free all payloads that have no uses anymore. ++ for (TextIdHashMap::Enum e(textIdPayloads); !e.empty(); e.popFront()) { ++ if (e.front().value()->uses() == 0) { ++ js_delete(e.front().value()); ++ e.removeFront(); ++ } ++ } ++ } + + // Log the time it took to flush the events as being from the + // Tracelogger. + if (graph.get()) { +- MOZ_ASSERT(events.capacity() > 2); ++ MOZ_ASSERT(events.hasSpaceForAdd(2)); + EventEntry& entryStart = events.pushUninitialized(); + entryStart.time = start; + entryStart.textId = TraceLogger_Internal; +@@ -548,13 +597,6 @@ TraceLoggerThread::logTimestamp(uint32_t id) + entryStop.textId = TraceLogger_Stop; + } + +- // Free all TextEvents that have no uses anymore. +- for (TextIdHashMap::Enum e(extraTextId); !e.empty(); e.popFront()) { +- if (e.front().value()->uses() == 0) { +- js_delete(e.front().value()); +- e.removeFront(); +- } +- } + } + + uint64_t time = rdtsc() - traceLoggerState->startupTime; +@@ -956,3 +998,16 @@ TraceLoggerEvent::~TraceLoggerEvent() + if (payload_) + payload_->release(); + } ++ ++TraceLoggerEvent& ++TraceLoggerEvent::operator=(const TraceLoggerEvent& other) ++{ ++ if (hasPayload()) ++ payload()->release(); ++ if (other.hasPayload()) ++ other.payload()->use(); ++ ++ payload_ = other.payload_; ++ ++ return *this; ++} +diff --git a/js/src/vm/TraceLogging.h b/js/src/vm/TraceLogging.h +index a124dcb..91a1eb0 100644 +--- a/js/src/vm/TraceLogging.h ++++ b/js/src/vm/TraceLogging.h +@@ -110,6 +110,9 @@ class TraceLoggerEvent { + bool hasPayload() const { + return !!payload_; + } ++ ++ TraceLoggerEvent& operator=(const TraceLoggerEvent& other); ++ TraceLoggerEvent(const TraceLoggerEvent& event) = delete; + }; + + /** +@@ -130,6 +133,10 @@ class TraceLoggerEventPayload { + uses_(0) + { } + ++ ~TraceLoggerEventPayload() { ++ MOZ_ASSERT(uses_ == 0); ++ } ++ + uint32_t textId() { + return textId_; + } +@@ -166,7 +173,8 @@ class TraceLoggerThread + mozilla::UniquePtr graph; + + PointerHashMap pointerMap; +- TextIdHashMap extraTextId; ++ TextIdHashMap textIdPayloads; ++ uint32_t nextTextId; + + ContinuousSpace events; + +@@ -181,6 +189,7 @@ class TraceLoggerThread + : enabled(0), + failed(false), + graph(), ++ nextTextId(TraceLogger_Last), + iteration_(0), + top(nullptr) + { } +@@ -195,22 +204,22 @@ class TraceLoggerThread + bool enable(JSContext* cx); + bool disable(); + +- // Given the previous iteration and lastEntryId, return an array of events ++ // Given the previous iteration and size, return an array of events + // (there could be lost events). At the same time update the iteration and +- // lastEntry and gives back how many events there are. +- EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastEntryId, size_t* num) { ++ // size and gives back how many events there are. ++ EventEntry* getEventsStartingAt(uint32_t* lastIteration, uint32_t* lastSize, size_t* num) { + EventEntry* start; + if (iteration_ == *lastIteration) { +- MOZ_ASSERT(events.lastEntryId() >= *lastEntryId); +- *num = events.lastEntryId() - *lastEntryId; +- start = events.data() + *lastEntryId + 1; ++ MOZ_ASSERT(*lastSize <= events.size()); ++ *num = events.size() - *lastSize; ++ start = events.data() + *lastSize; + } else { +- *num = events.lastEntryId() + 1; ++ *num = events.size(); + start = events.data(); + } + + *lastIteration = iteration_; +- *lastEntryId = events.lastEntryId(); ++ *lastSize = events.size(); + return start; + } + +@@ -220,16 +229,16 @@ class TraceLoggerThread + const char** lineno, size_t* lineno_len, const char** colno, + size_t* colno_len); + +- bool lostEvents(uint32_t lastIteration, uint32_t lastEntryId) { ++ bool lostEvents(uint32_t lastIteration, uint32_t lastSize) { + // If still logging in the same iteration, there are no lost events. + if (lastIteration == iteration_) { +- MOZ_ASSERT(lastEntryId <= events.lastEntryId()); ++ MOZ_ASSERT(lastSize <= events.size()); + return false; + } + +- // When proceeded to the next iteration and lastEntryId points to +- // the maximum capacity there are no logs that are lost. +- if (lastIteration + 1 == iteration_ && lastEntryId == events.capacity()) ++ // If we are in a consecutive iteration we are only sure we didn't lose any events, ++ // when the lastSize equals the maximum size 'events' can get. ++ if (lastIteration == iteration_ - 1 && lastSize == events.maxSize()) + return false; + + return true; +@@ -268,6 +277,7 @@ class TraceLoggerThread + void stopEvent(uint32_t id); + private: + void stopEvent(); ++ void log(uint32_t id); + + public: + static unsigned offsetOfEnabled() { +diff --git a/js/src/vm/TraceLoggingGraph.cpp b/js/src/vm/TraceLoggingGraph.cpp +index d1b7f2e..a4eb273 100644 +--- a/js/src/vm/TraceLoggingGraph.cpp ++++ b/js/src/vm/TraceLoggingGraph.cpp +@@ -276,7 +276,7 @@ TraceLoggerGraph::flush() + if (bytesWritten < tree.size()) + return false; + +- treeOffset += tree.lastEntryId(); ++ treeOffset += tree.size(); + tree.clear(); + } + +@@ -359,7 +359,7 @@ TraceLoggerGraph::startEventInternal(uint32_t id, uint64_t timestamp) + + if (parent.lastChildId() == 0) { + MOZ_ASSERT(!entry.hasChildren()); +- MOZ_ASSERT(parent.treeId() == tree.lastEntryId() + treeOffset); ++ MOZ_ASSERT(parent.treeId() == treeOffset + tree.size() - 1); + + if (!updateHasChildren(parent.treeId())) + return false; +diff --git a/js/src/vm/TraceLoggingTypes.h b/js/src/vm/TraceLoggingTypes.h +index f1c9d0c..10b76d6 100644 +--- a/js/src/vm/TraceLoggingTypes.h ++++ b/js/src/vm/TraceLoggingTypes.h +@@ -21,7 +21,6 @@ + _(Internal) \ + _(Interpreter) \ + _(InlinedScripts) \ +- _(Invalidation) \ + _(IonCompilation) \ + _(IonCompilationPaused) \ + _(IonLinking) \ +@@ -60,6 +59,7 @@ + + #define TRACELOGGER_LOG_ITEMS(_) \ + _(Bailout) \ ++ _(Invalidation) \ + _(Disable) \ + _(Enable) \ + _(Stop) +@@ -130,6 +130,9 @@ class ContinuousSpace { + uint32_t size_; + uint32_t capacity_; + ++ // The maximum amount of ram memory a continuous space structure can take (in bytes). ++ static const uint32_t LIMIT = 200 * 1024 * 1024; ++ + public: + ContinuousSpace () + : data_(nullptr) +@@ -151,6 +154,10 @@ class ContinuousSpace { + data_ = nullptr; + } + ++ static uint32_t maxSize() { ++ return LIMIT / sizeof(T); ++ } ++ + T* data() { + return data_; + } +@@ -187,11 +194,14 @@ class ContinuousSpace { + if (hasSpaceForAdd(count)) + return true; + ++ // Limit the size of a continuous buffer. ++ if (size_ + count > maxSize()) ++ return false; ++ + uint32_t nCapacity = capacity_ * 2; +- if (size_ + count > nCapacity) +- nCapacity = size_ + count; +- T* entries = (T*) js_realloc(data_, nCapacity * sizeof(T)); ++ nCapacity = (nCapacity < maxSize()) ? nCapacity : maxSize(); + ++ T* entries = (T*) js_realloc(data_, nCapacity * sizeof(T)); + if (!entries) + return false; + diff --git a/gnu/packages/patches/mozjs38-version-detection.patch b/gnu/packages/patches/mozjs38-version-detection.patch new file mode 100644 index 000000000..ec2d264cc --- /dev/null +++ b/gnu/packages/patches/mozjs38-version-detection.patch @@ -0,0 +1,180 @@ +Taken from +https://trac.wildfiregames.com/export/18656/ps/trunk/libraries/source/spidermonkey/FixVersionDetectionConfigure.diff. + +Fixes a version detection issue in 0ad. See +https://lists.gnu.org/archive/html/guix-devel/2017-01/msg00625.html. + +diff --git a/js/src/configure b/js/src/configure +--- a/js/src/configure ++++ b/js/src/configure +@@ -1662,70 +1662,6 @@ esac + + fi + +-MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir` +-MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion` +-MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion` +- +-cat >> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> confdefs.pytmp <> confdefs.h <> $CONFIG_STATUS <> $CONFIG_STATUS < Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 01:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26618@debbugs.gnu.org Received: via spool by 26618-submit@debbugs.gnu.org id=B26618.149291138917191 (code B ref 26618); Sun, 23 Apr 2017 01:37:02 +0000 Received: (at 26618) by debbugs.gnu.org; 23 Apr 2017 01:36:29 +0000 Received: from localhost ([127.0.0.1]:34999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Rw-0004T7-UM for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:36:29 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58034) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Rk-0004SX-Vw for 26618@debbugs.gnu.org; Sat, 22 Apr 2017 21:36:17 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 2f468605 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for <26618@debbugs.gnu.org>; Sun, 23 Apr 2017 01:36:11 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Sun, 23 Apr 2017 03:35:54 +0200 Message-Id: <20170423013554.4534-2-clement@lassieur.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170423013554.4534-1-clement@lassieur.org> References: <20170423013554.4534-1-clement@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/games.scm (0ad, 0ad-data): New variables. Co-authored-by: ng0 --- gnu/packages/games.scm | 186 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index f6b4e3f0b..c0e0f7823 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 nee +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -119,6 +121,10 @@ #:use-module (gnu packages wxwidgets) #:use-module (gnu packages bison) #:use-module (gnu packages flex) + #:use-module (gnu packages cmake) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages icu4c) + #:use-module (gnu packages networking) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3881,3 +3887,183 @@ fabulous Orb of Zot.") license:expat license:zlib license:asl2.0)))) + +(define-public 0ad-data + (package + (name "0ad-data") + (version "0.0.21-alpha") + (source + (origin + (method url-fetch) + (uri (string-append + "http://releases.wildfiregames.com/0ad-" + version "-unix-data.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (name) + (let* ((dir (string-append "binaries/data/mods/" name)) + (file (string-append dir "/" name ".zip")) + (unzip #$(file-append unzip "/bin/unzip"))) + (system* unzip "-d" dir file) + (delete-file file))) + '("mod" "public")) + #t)))) + (build-system trivial-build-system) + (native-inputs `(("tar" ,tar) + ("xz" ,xz))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((out (assoc-ref %outputs "out")) + (source (assoc-ref %build-inputs "source")) + (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar")) + (xz-path (string-append (assoc-ref %build-inputs "xz") "/bin"))) + (setenv "PATH" xz-path) + (mkdir out) + (zero? (system* tar "xvf" source "-C" out "--strip=3")))))) + (synopsis "Data files for 0ad") + (description "This package provides the data files for 0ad.") + (home-page "https://play0ad.com") + (license (list license:arev + license:bitstream-vera + license:cc-by-sa3.0 + license:expat + license:gfl1.0 + license:gpl2+ + license:gpl3+)))) + +(define-public 0ad + (package + (name "0ad") + (version "0.0.21-alpha") + (source + (origin + (method url-fetch) + (uri (string-append + "http://releases.wildfiregames.com/0ad-" + version "-unix-build.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln")) + ;; A snippet here would cause a build failure, probably because of + ;; timestamps reset or file sorting. + )) + (inputs + `(("0ad-data" ,0ad-data) + ("curl" ,curl) + ("enet" ,enet) + ("gloox" ,gloox) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("libxcursor" ,libxcursor) + ("libxml2" ,libxml2) + ("miniupnpc" ,miniupnpc) + ("mozjs-38" ,mozjs-38) + ("openal" ,openal) + ("sdl2" ,sdl2) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib))) + (native-inputs + `(("boost" ,boost) + ("cmake" ,cmake) + ("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-bundles + (lambda _ + (delete-file-recursively "libraries/source/spidermonkey") + #t)) + (add-after 'unpack 'fix-x11-includes + (lambda _ + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((jobs (number->string (parallel-job-count))) + (out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (data (string-append out "/share/0ad"))) + (setenv "JOBS" (string-append "-j" jobs)) + (setenv "CC" "gcc") + (with-directory-excursion "build/workspaces" + (zero? (system* "./update-workspaces.sh" + (string-append "--libdir=" lib) + (string-append "--datadir=" data) + "--minimal-flags" + ;; TODO: "--with-system-nvtt" + "--with-system-mozjs38")))))) + (add-before 'build 'chdir + (lambda _ + (chdir "build/workspaces/gcc") + #t)) + (delete 'check) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (chdir "../../../binaries") + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (data (string-append out "/share/0ad")) + (applications (string-append out "/share/applications")) + (pixmaps (string-append out "/share/pixmaps")) + (0ad-data (assoc-ref inputs "0ad-data"))) + ;; data + (copy-recursively "data" data) + (for-each (lambda (file) + (symlink (string-append 0ad-data "/" file) + (string-append data "/" file))) + '("config" "mods/mod" "mods/public" "tools")) + ;; libraries + (for-each (lambda (file) + (install-file file lib)) + (find-files "system" "\\.so$")) + ;; binaries + (install-file "system/pyrogenesis" bin) + (with-directory-excursion bin + (symlink "pyrogenesis" "0ad")) + ;; resources + (with-directory-excursion "../build/resources" + (install-file "0ad.desktop" applications) + (install-file "0ad.png" pixmaps)) + #t))) + (add-after 'install 'check + (lambda _ + (with-directory-excursion "system" + (zero? (system* "./test")))))))) + (home-page "https://play0ad.com") + (synopsis "3D, historically-based RTS game of ancient warfare") + (description "0 A.D. is a real-time strategy (RTS) game of ancient +warfare. It's a historically-based war/economy game that allows players to +relive or rewrite the history of twelve ancient civilizations, each depicted +at their peak of economic growth and military prowess. + +0ad needs a window manager that supports 'Extended Window Manager Hints'.") + (license (list license:bsd-2 + license:bsd-3 + license:expat + license:gpl2+ + license:ibmpl1.0 + license:isc + license:lgpl2.1 + license:lgpl3 + license:mpl2.0 + license:zlib)))) -- 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 22 21:45:37 2017 Received: (at control) by debbugs.gnu.org; 23 Apr 2017 01:45:37 +0000 Received: from localhost ([127.0.0.1]:35004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26an-0004g5-2G for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:45:37 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58036) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26al-0004fx-7l for control@debbugs.gnu.org; Sat, 22 Apr 2017 21:45:35 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id fdd6046c (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sun, 23 Apr 2017 01:45:34 +0000 (UTC) Date: Sun, 23 Apr 2017 03:45:33 +0200 Message-Id: <87lgqrvqv6.fsf@lassieur.org> To: control@debbugs.gnu.org From: clement@lassieur.org (=?utf-8?Q?Cl=C3=A9ment?= Lassieur) Subject: control message for bug #26618 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) block 26618 by 26588 From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: ng0 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 12:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: contact.ng0@cryptolab.net, 26618@debbugs.gnu.org X-Debbugs-Original-Cc: ng0 , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149294928822169 (code B ref -1); Sun, 23 Apr 2017 12:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 12:08:08 +0000 Received: from localhost ([127.0.0.1]:35155 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2GJD-0005lV-KE for submit@debbugs.gnu.org; Sun, 23 Apr 2017 08:08:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:52571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2GJC-0005l8-Dx for submit@debbugs.gnu.org; Sun, 23 Apr 2017 08:08:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2GJ6-0003YZ-Kz for submit@debbugs.gnu.org; Sun, 23 Apr 2017 08:08:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:58578) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2GJ6-0003YB-I9 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 08:08:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2GJ5-0005OF-17 for guix-patches@gnu.org; Sun, 23 Apr 2017 08:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2GJ2-0003Wu-0M for guix-patches@gnu.org; Sun, 23 Apr 2017 08:07:59 -0400 Received: from perdizione.investici.org ([94.23.50.208]:47493) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2GJ1-0003Wk-Pw for guix-patches@gnu.org; Sun, 23 Apr 2017 08:07:55 -0400 Received: from [94.23.50.208] (perdizione [94.23.50.208]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id C712512011C; Sun, 23 Apr 2017 12:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1492949274; bh=S0+M+kZ8YZ7kKP0dyRutPBWujm1CjPTtoPKSc8VUhxQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=r8IIJG+M5wZzi4dur8oz5cCMzPbpAHviuT+VJ9xUMkZ4VRSNbgzBPpEKScgY61I2m jS6w17yRfvc8n6hbIbDl5z2ZH6Fv+px8aW7F/2tub8Zp859IMrguNA0XWxCR66+tKr /kxwc01Nk1ErKXg6otmuPDR4OM7zKTn8fiBg+mwQ= Date: Sun, 23 Apr 2017 12:07:51 +0000 From: ng0 Message-ID: <20170423120751.3xm4fpbxtx2jk3fr@abyayala> Mail-Followup-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org References: <87mvb7vrdv.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87mvb7vrdv.fsf@lassieur.org> Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Cl=C3=A9ment Lassieur transcribed 0.4K bytes: > Theses patches add 0ad and mozjs-38 (a dependency). I worked in > cooperation with ng0. >=20 > 0ad needs a window manager that supports 'Extended Window Manager > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hint= s > for a list. >=20 > I did not try multiplayer mode. I ran it with Awesome WM, so I did not > test the icons and desktop things: I'm not sure about it. >=20 > Please let me know if you see anything wrong :) Wow, it's finally finished :) Games are the worst. Either they are small and take a short time to package, or they take almost a year. I think I started with this in August, in parallel to many other packages. So cool, thanks for finishing this! I will review this on monday or tuesday if no one else picks it up. --=20 PGP and more: https://people.pragmatique.xyz/ng0/ From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 26618@debbugs.gnu.org Cc: ng0 , Mathieu Othacehe X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149297829116692 (code B ref -1); Sun, 23 Apr 2017 20:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 20:11:31 +0000 Received: from localhost ([127.0.0.1]:36797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Nr0-0004LA-TP for submit@debbugs.gnu.org; Sun, 23 Apr 2017 16:11:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Nqy-0004Kw-Hc for submit@debbugs.gnu.org; Sun, 23 Apr 2017 16:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Nqs-0005LX-Dc for submit@debbugs.gnu.org; Sun, 23 Apr 2017 16:11:23 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Nqs-0005LT-AO for submit@debbugs.gnu.org; Sun, 23 Apr 2017 16:11:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Nqr-0000mc-Bd for guix-patches@gnu.org; Sun, 23 Apr 2017 16:11:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Nqo-0005LC-8F for guix-patches@gnu.org; Sun, 23 Apr 2017 16:11:21 -0400 Received: from mail.lassieur.org ([83.152.10.219]:36404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Nqn-0005Kr-QC for guix-patches@gnu.org; Sun, 23 Apr 2017 16:11:18 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 83da04e1 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 20:11:15 +0000 (UTC) References: <87mvb7vrdv.fsf@lassieur.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <87mvb7vrdv.fsf@lassieur.org> Date: Sun, 23 Apr 2017 22:11:14 +0200 Message-ID: <87vapurijh.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Clément Lassieur writes: > I did not try multiplayer mode. I just played a game with Mathieu, it works perfectly :) From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 21:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: ng0@pragmatique.xyz Cc: 26618@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149298153121651 (code B ref -1); Sun, 23 Apr 2017 21:06:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 21:05:31 +0000 Received: from localhost ([127.0.0.1]:36835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2OhH-0005d8-6t for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:05:31 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2OhF-0005cv-Nr for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:05:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Oh9-0001R8-LT for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:05:24 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Oh9-0001R4-HR for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:05:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Oh7-0001M9-S8 for guix-patches@gnu.org; Sun, 23 Apr 2017 17:05:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Oh2-0001Qs-VY for guix-patches@gnu.org; Sun, 23 Apr 2017 17:05:21 -0400 Received: from mail.lassieur.org ([83.152.10.219]:36412) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Oh2-0001Q5-Mq for guix-patches@gnu.org; Sun, 23 Apr 2017 17:05:16 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 330ba413 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 21:05:10 +0000 (UTC) References: <87mvb7vrdv.fsf@lassieur.org> <20170423120751.3xm4fpbxtx2jk3fr@abyayala> <20170423205410.y2to2njp4qyzmvia@abyayala> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <20170423205410.y2to2njp4qyzmvia@abyayala> Date: Sun, 23 Apr 2017 23:05:10 +0200 Message-ID: <87tw5erg1l.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) ng0@pragmatique.xyz writes: > ng0 transcribed 0.8K bytes: >> Clément Lassieur transcribed 0.4K bytes: >> > Theses patches add 0ad and mozjs-38 (a dependency). I worked in >> > cooperation with ng0. >> > >> > 0ad needs a window manager that supports 'Extended Window Manager >> > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints >> > for a list. >> > >> > I did not try multiplayer mode. I ran it with Awesome WM, so I did not >> > test the icons and desktop things: I'm not sure about it. >> > >> > Please let me know if you see anything wrong :) >> >> Wow, it's finally finished :) Games are the worst. Either they are small >> and take a short time to package, or they take almost a year. I think I >> started with this in August, in parallel to many other packages. >> >> So cool, thanks for finishing this! >> >> I will review this on monday or tuesday if no one else picks it up. >> -- >> PGP and more: https://people.pragmatique.xyz/ng0/ > > I get this error message: > > [user@abyayala ~/src/guix/review/guix]$ make; ./pre-inst-env guix package -i 0ad > make all-recursive > make[1]: Entering directory '/home/user/src/guix/review/guix' > Making all in po/guix > make[2]: Entering directory '/home/user/src/guix/review/guix/po/guix' > make[2]: Leaving directory '/home/user/src/guix/review/guix/po/guix' > Making all in po/packages > make[2]: Entering directory '/home/user/src/guix/review/guix/po/packages' > make[2]: Leaving directory '/home/user/src/guix/review/guix/po/packages' > make[2]: Entering directory '/home/user/src/guix/review/guix' > Compiling Scheme modules... > LOAD (gnu packages games) > ;;; note: source file ./gnu/packages/games.scm > ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/games.go > ;;; note: source file ./gnu/packages/gnuzilla.scm > ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/gnuzilla.go > Backtrace: > 14 (primitive-load "/home/user/src/guix/review/guix/./buil…") > In ice-9/eval.scm: > 619:8 13 (_ #(#(#(#(#(# …) …) …) …) …)) > In ice-9/boot-9.scm: > 268:13 12 (for-each # ("gnu/pa…" …)) > 2792:17 11 (resolve-interface (gnu packages games) #:select _ # _ # …) > 2718:10 10 (_ (gnu packages games) _ _ #:ensure _) > 2986:16 9 (try-module-autoload _ _) > 2316:4 8 (save-module-excursion _) > 3006:22 7 (_) > In unknown file: > 6 (primitive-load-path "gnu/packages/games" #) > In ice-9/eval.scm: > 619:8 5 (_ #f) > 626:19 4 (_ #) > 293:34 3 (_ #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) > 173:39 2 (_ #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) > 223:20 1 (proc #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) > In unknown file: > 0 (%resolve-variable (7 . license:arev) #) > > ERROR: In procedure %resolve-variable: > ERROR: Unbound variable: license:arev > make[2]: *** [Makefile:5075: make-go] Error 1 > make[2]: Leaving directory '/home/user/src/guix/review/guix' > make[1]: *** [Makefile:4202: all-recursive] Error 1 > make[1]: Leaving directory '/home/user/src/guix/review/guix' > make: *** [Makefile:2792: all] Error 2 > ;;; WARNING: loading compiled file /run/current-system/profile/lib/guile/2.0/site-ccache/gnutls.go failed: > ;;; ERROR: In procedure load-thunk-from-memory: No such file or directory > ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/gnuzilla.scm > ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/gnuzilla.go > ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/gnuzilla.scm > ;;; newer than compiled /run/current-system/profile/lib/guile/2.0/site-ccache/gnu/packages/gnuzilla.go > ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/games.scm > ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/games.go > ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/games.scm > ;;; newer than compiled /run/current-system/profile/lib/guile/2.0/site-ccache/gnu/packages/games.go > guix package: warning: failed to load '(gnu packages games)': > ERROR: Unbound variable: license:arev > guix package: error: 0ad: unknown package It depends on another bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26588 Sorry, I should have said it. I did tell debbugs that one patch was blocking the other though. From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: ng0@pragmatique.xyz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 21:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: clement@lassieur.org, 26618@debbugs.gnu.org X-Debbugs-Original-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149298223522673 (code B ref -1); Sun, 23 Apr 2017 21:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 21:17:15 +0000 Received: from localhost ([127.0.0.1]:36842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Osd-0005td-Fd for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:17:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Osc-0005tQ-0r for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2OsV-0004CT-S9 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:17:08 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2OsV-0004CN-Oo for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:17:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2OsU-0002Bi-AM for guix-patches@gnu.org; Sun, 23 Apr 2017 17:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2OsR-00049R-4p for guix-patches@gnu.org; Sun, 23 Apr 2017 17:17:06 -0400 Received: from 93-95-228-241.1984.is ([93.95.228.241]:54520 helo=sharknado9001.pragmatique.xyz) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2OsQ-00047A-PH for guix-patches@gnu.org; Sun, 23 Apr 2017 17:17:03 -0400 Received: by sharknado9001.pragmatique.xyz (OpenSMTPD) with ESMTPSA id 97ddec1f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 20:50:12 +0000 (UTC) Date: Sun, 23 Apr 2017 20:50:16 +0000 From: ng0@pragmatique.xyz Message-ID: <20170423205016.duueglirgtgqyi5d@abyayala> Mail-Followup-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org References: <87mvb7vrdv.fsf@lassieur.org> <20170423120751.3xm4fpbxtx2jk3fr@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170423120751.3xm4fpbxtx2jk3fr@abyayala> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) ng0 transcribed 0.8K bytes: > Clément Lassieur transcribed 0.4K bytes: > > Theses patches add 0ad and mozjs-38 (a dependency). I worked in > > cooperation with ng0. > > > > 0ad needs a window manager that supports 'Extended Window Manager > > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints > > for a list. > > > > I did not try multiplayer mode. I ran it with Awesome WM, so I did not > > test the icons and desktop things: I'm not sure about it. > > > > Please let me know if you see anything wrong :) > > Wow, it's finally finished :) Games are the worst. Either they are small > and take a short time to package, or they take almost a year. I think I > started with this in August, in parallel to many other packages. > > So cool, thanks for finishing this! > > I will review this on monday or tuesday if no one else picks it up. > -- > PGP and more: https://people.pragmatique.xyz/ng0/ A bit unfortunate, but debbugs ruins patches. I've tried to apply this and I have to reconstruct the patches since at least the licenses one went to garbage thanks to debbugs. -- PGP and more: https://people.pragmatique.xyz/ng0/ From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: ng0@pragmatique.xyz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 21:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: clement@lassieur.org, 26618@debbugs.gnu.org X-Debbugs-Original-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149298246923035 (code B ref -1); Sun, 23 Apr 2017 21:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 21:21:09 +0000 Received: from localhost ([127.0.0.1]:36849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2OwP-0005zT-0w for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:21:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2OwM-0005yy-Ny for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2OwG-00050W-1Y for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:21:01 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35312) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2OwF-00050L-RU for submit@debbugs.gnu.org; Sun, 23 Apr 2017 17:20:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2OwE-0002WD-96 for guix-patches@gnu.org; Sun, 23 Apr 2017 17:20:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2OwA-0004zh-VM for guix-patches@gnu.org; Sun, 23 Apr 2017 17:20:58 -0400 Received: from 93-95-228-241.1984.is ([93.95.228.241]:54522 helo=sharknado9001.pragmatique.xyz) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2OwA-0004zR-Dv for guix-patches@gnu.org; Sun, 23 Apr 2017 17:20:54 -0400 Received: by sharknado9001.pragmatique.xyz (OpenSMTPD) with ESMTPSA id b5cbbe8f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 20:54:03 +0000 (UTC) Date: Sun, 23 Apr 2017 20:54:10 +0000 From: ng0@pragmatique.xyz Message-ID: <20170423205410.y2to2njp4qyzmvia@abyayala> Mail-Followup-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org References: <87mvb7vrdv.fsf@lassieur.org> <20170423120751.3xm4fpbxtx2jk3fr@abyayala> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170423120751.3xm4fpbxtx2jk3fr@abyayala> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) ng0 transcribed 0.8K bytes: > Clément Lassieur transcribed 0.4K bytes: > > Theses patches add 0ad and mozjs-38 (a dependency). I worked in > > cooperation with ng0. > > > > 0ad needs a window manager that supports 'Extended Window Manager > > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints > > for a list. > > > > I did not try multiplayer mode. I ran it with Awesome WM, so I did not > > test the icons and desktop things: I'm not sure about it. > > > > Please let me know if you see anything wrong :) > > Wow, it's finally finished :) Games are the worst. Either they are small > and take a short time to package, or they take almost a year. I think I > started with this in August, in parallel to many other packages. > > So cool, thanks for finishing this! > > I will review this on monday or tuesday if no one else picks it up. > -- > PGP and more: https://people.pragmatique.xyz/ng0/ I get this error message: [user@abyayala ~/src/guix/review/guix]$ make; ./pre-inst-env guix package -i 0ad make all-recursive make[1]: Entering directory '/home/user/src/guix/review/guix' Making all in po/guix make[2]: Entering directory '/home/user/src/guix/review/guix/po/guix' make[2]: Leaving directory '/home/user/src/guix/review/guix/po/guix' Making all in po/packages make[2]: Entering directory '/home/user/src/guix/review/guix/po/packages' make[2]: Leaving directory '/home/user/src/guix/review/guix/po/packages' make[2]: Entering directory '/home/user/src/guix/review/guix' Compiling Scheme modules... LOAD (gnu packages games) ;;; note: source file ./gnu/packages/games.scm ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/games.go ;;; note: source file ./gnu/packages/gnuzilla.scm ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/gnuzilla.go Backtrace: 14 (primitive-load "/home/user/src/guix/review/guix/./buil…") In ice-9/eval.scm: 619:8 13 (_ #(#(#(#(#(# …) …) …) …) …)) In ice-9/boot-9.scm: 268:13 12 (for-each # ("gnu/pa…" …)) 2792:17 11 (resolve-interface (gnu packages games) #:select _ # _ # …) 2718:10 10 (_ (gnu packages games) _ _ #:ensure _) 2986:16 9 (try-module-autoload _ _) 2316:4 8 (save-module-excursion _) 3006:22 7 (_) In unknown file: 6 (primitive-load-path "gnu/packages/games" #) In ice-9/eval.scm: 619:8 5 (_ #f) 626:19 4 (_ #) 293:34 3 (_ #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) 173:39 2 (_ #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) 223:20 1 (proc #(#(#(#(#(#(#(#(#(# …) …) …) …) …) …) …) …) …)) In unknown file: 0 (%resolve-variable (7 . license:arev) #) ERROR: In procedure %resolve-variable: ERROR: Unbound variable: license:arev make[2]: *** [Makefile:5075: make-go] Error 1 make[2]: Leaving directory '/home/user/src/guix/review/guix' make[1]: *** [Makefile:4202: all-recursive] Error 1 make[1]: Leaving directory '/home/user/src/guix/review/guix' make: *** [Makefile:2792: all] Error 2 ;;; WARNING: loading compiled file /run/current-system/profile/lib/guile/2.0/site-ccache/gnutls.go failed: ;;; ERROR: In procedure load-thunk-from-memory: No such file or directory ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/gnuzilla.scm ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/gnuzilla.go ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/gnuzilla.scm ;;; newer than compiled /run/current-system/profile/lib/guile/2.0/site-ccache/gnu/packages/gnuzilla.go ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/games.scm ;;; newer than compiled /home/user/src/guix/review/guix/gnu/packages/games.go ;;; note: source file /home/user/src/guix/review/guix/gnu/packages/games.scm ;;; newer than compiled /run/current-system/profile/lib/guile/2.0/site-ccache/gnu/packages/games.go guix package: warning: failed to load '(gnu packages games)': ERROR: Unbound variable: license:arev guix package: error: 0ad: unknown package -- PGP and more: https://people.pragmatique.xyz/ng0/ From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: ng0@pragmatique.xyz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Apr 2017 22:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 26618@debbugs.gnu.org X-Debbugs-Original-Cc: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149298566329590 (code B ref -1); Sun, 23 Apr 2017 22:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 22:14:23 +0000 Received: from localhost ([127.0.0.1]:36875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Plu-0007h9-Q1 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 18:14:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2Plt-0007gm-Ce for submit@debbugs.gnu.org; Sun, 23 Apr 2017 18:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Pln-0008He-E8 for submit@debbugs.gnu.org; Sun, 23 Apr 2017 18:14:16 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:55985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Pln-0008Ha-BD for submit@debbugs.gnu.org; Sun, 23 Apr 2017 18:14:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d2Plm-000454-4s for guix-patches@gnu.org; Sun, 23 Apr 2017 18:14:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d2Pli-0008El-W4 for guix-patches@gnu.org; Sun, 23 Apr 2017 18:14:14 -0400 Received: from 93-95-228-241.1984.is ([93.95.228.241]:54526 helo=sharknado9001.pragmatique.xyz) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d2Pli-0008Dr-Ij for guix-patches@gnu.org; Sun, 23 Apr 2017 18:14:10 -0400 Received: by sharknado9001.pragmatique.xyz (OpenSMTPD) with ESMTPSA id 3f7c8f75 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 22:13:58 +0000 (UTC) Date: Sun, 23 Apr 2017 22:14:04 +0000 From: ng0@pragmatique.xyz Message-ID: <20170423221404.cypcj7y6ipslsyaa@abyayala> Mail-Followup-To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur , guix-patches@gnu.org References: <87mvb7vrdv.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87mvb7vrdv.fsf@lassieur.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Clément Lassieur transcribed 0.4K bytes: > Theses patches add 0ad and mozjs-38 (a dependency). I worked in > cooperation with ng0. > > 0ad needs a window manager that supports 'Extended Window Manager > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints > for a list. > > I did not try multiplayer mode. I ran it with Awesome WM, so I did not > test the icons and desktop things: I'm not sure about it. > > Please let me know if you see anything wrong :) Wow: [user@abyayala ~/src/guix/review/guix]$ ./pre-inst-env guix size $(./pre-inst-env guix build 0ad) store item total self /gnu/store/z49x8r9ffiva7i77mrhzm1bwwi44c6jl-0ad-0.0.21-alpha 2551.8 14.6 0.6% /gnu/store/im4n3sbrn27rmsd5wpy2v0kn01pql15y-0ad-data-0.0.21-alpha 1546.5 1546.5 60.6% … are we able to keep nars for this around for 3 architectures? -- PGP and more: https://people.pragmatique.xyz/ng0/ From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 25 05:19:28 2017 Received: (at control) by debbugs.gnu.org; 25 Apr 2017 09:19:28 +0000 Received: from localhost ([127.0.0.1]:38819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2wd6-0004ql-CX for submit@debbugs.gnu.org; Tue, 25 Apr 2017 05:19:28 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d2wd4-0004qc-So for control@debbugs.gnu.org; Tue, 25 Apr 2017 05:19:27 -0400 Received: from newt (46.218.109.88 [46.218.109.88]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 513e3a31 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Tue, 25 Apr 2017 09:19:25 +0000 (UTC) Date: Tue, 25 Apr 2017 11:19:24 +0200 Message-Id: <8737cwkfoj.fsf@lassieur.org> To: control@debbugs.gnu.org From: clement@lassieur.org (=?utf-8?Q?Cl=C3=A9ment?= Lassieur) Subject: control message for bug #26618 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) tags 26618 patch From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: Add 0ad Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 11:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26618@debbugs.gnu.org Cc: Marius Bakke , ng0 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149363677429310 (code B ref -1); Mon, 01 May 2017 11:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 May 2017 11:06:14 +0000 Received: from localhost ([127.0.0.1]:48560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d599i-0007cg-80 for submit@debbugs.gnu.org; Mon, 01 May 2017 07:06:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d599g-0007cU-Hd for submit@debbugs.gnu.org; Mon, 01 May 2017 07:06:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d599a-0001BX-K9 for submit@debbugs.gnu.org; Mon, 01 May 2017 07:06:07 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:52538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d599a-0001BR-GS for submit@debbugs.gnu.org; Mon, 01 May 2017 07:06:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d599W-0003Jk-GB for guix-patches@gnu.org; Mon, 01 May 2017 07:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d599S-00016Q-1N for guix-patches@gnu.org; Mon, 01 May 2017 07:06:02 -0400 Received: from mail.lassieur.org ([83.152.10.219]:36646) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d599R-00013o-QZ for guix-patches@gnu.org; Mon, 01 May 2017 07:05:57 -0400 Received: from rodion (192.168.0.254 [192.168.0.254]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id f5b41267 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 1 May 2017 11:05:55 +0000 (UTC) References: <87mvb7vrdv.fsf@lassieur.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <87mvb7vrdv.fsf@lassieur.org> Date: Mon, 01 May 2017 13:05:55 +0200 Message-ID: <877f20degc.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Clément Lassieur writes: > Theses patches add 0ad and mozjs-38 (a dependency). I worked in > cooperation with ng0. > > 0ad needs a window manager that supports 'Extended Window Manager > Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints > for a list. > > I did not try multiplayer mode. I ran it with Awesome WM, so I did not > test the icons and desktop things: I'm not sure about it. > > Please let me know if you see anything wrong :) This is a new patch with a license change suggested by Marius. From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: [PATCH] gnu: Add 0ad. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 11:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26618@debbugs.gnu.org Received: via spool by 26618-submit@debbugs.gnu.org id=B26618.149363702529681 (code B ref 26618); Mon, 01 May 2017 11:11:02 +0000 Received: (at 26618) by debbugs.gnu.org; 1 May 2017 11:10:25 +0000 Received: from localhost ([127.0.0.1]:48565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d59De-0007iZ-Pr for submit@debbugs.gnu.org; Mon, 01 May 2017 07:10:25 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d59DX-0007iM-TT for 26618@debbugs.gnu.org; Mon, 01 May 2017 07:10:16 -0400 Received: from localhost.localdomain (192.168.0.254 [192.168.0.254]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 0f21bf1b (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for <26618@debbugs.gnu.org>; Mon, 1 May 2017 11:10:11 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Mon, 1 May 2017 13:09:45 +0200 Message-Id: <20170501110945.32428-1-clement@lassieur.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <877f20degc.fsf@lassieur.org> References: <877f20degc.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * gnu/packages/games.scm (0ad, 0ad-data): New variables. Co-authored-by: ng0 --- gnu/packages/games.scm | 189 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b31bb93db..c42569b48 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 nee +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) @@ -120,6 +122,10 @@ #:use-module (gnu packages wxwidgets) #:use-module (gnu packages bison) #:use-module (gnu packages flex) + #:use-module (gnu packages cmake) + #:use-module (gnu packages gnuzilla) + #:use-module (gnu packages icu4c) + #:use-module (gnu packages networking) #:use-module (guix build-system gnu) #:use-module (guix build-system haskell) #:use-module (guix build-system python) @@ -3941,3 +3947,186 @@ fabulous Orb of Zot.") license:expat license:zlib license:asl2.0)))) + +(define-public 0ad-data + (package + (name "0ad-data") + (version "0.0.21-alpha") + (source + (origin + (method url-fetch) + (uri (string-append + "http://releases.wildfiregames.com/0ad-" + version "-unix-data.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "15xadyrpvq27lm9p1ny7bcmmv56m16h3xadbkdx69gfkzxc3razk")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (name) + (let* ((dir (string-append "binaries/data/mods/" name)) + (file (string-append dir "/" name ".zip")) + (unzip #$(file-append unzip "/bin/unzip"))) + (system* unzip "-d" dir file) + (delete-file file))) + '("mod" "public")) + #t)))) + (build-system trivial-build-system) + (native-inputs `(("tar" ,tar) + ("xz" ,xz))) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let ((out (assoc-ref %outputs "out")) + (source (assoc-ref %build-inputs "source")) + (tar (string-append (assoc-ref %build-inputs "tar") "/bin/tar")) + (xz-path (string-append (assoc-ref %build-inputs "xz") "/bin"))) + (setenv "PATH" xz-path) + (mkdir out) + (zero? (system* tar "xvf" source "-C" out "--strip=3")))))) + (synopsis "Data files for 0ad") + (description "This package provides the data files for 0ad.") + (home-page "https://play0ad.com") + (license (list (license:fsdg-compatible + "http://tavmjong.free.fr/FONTS/ArevCopyright.txt" + (license:license-comment + (package-license font-bitstream-vera))) + (package-license font-bitstream-vera) + license:cc-by-sa3.0 + license:expat + license:gfl1.0 + license:gpl2+ + license:gpl3+)))) + +(define-public 0ad + (package + (name "0ad") + (version "0.0.21-alpha") + (source + (origin + (method url-fetch) + (uri (string-append + "http://releases.wildfiregames.com/0ad-" + version "-unix-build.tar.xz")) + (file-name (string-append name "-" version ".tar.xz")) + (sha256 + (base32 + "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln")) + ;; A snippet here would cause a build failure, probably because of + ;; timestamps reset or file sorting. + )) + (inputs + `(("0ad-data" ,0ad-data) + ("curl" ,curl) + ("enet" ,enet) + ("gloox" ,gloox) + ("icu4c" ,icu4c) + ("libpng" ,libpng) + ("libvorbis" ,libvorbis) + ("libxcursor" ,libxcursor) + ("libxml2" ,libxml2) + ("miniupnpc" ,miniupnpc) + ("mozjs-38" ,mozjs-38) + ("openal" ,openal) + ("sdl2" ,sdl2) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib))) + (native-inputs + `(("boost" ,boost) + ("cmake" ,cmake) + ("mesa" ,mesa) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'delete-bundles + (lambda _ + (delete-file-recursively "libraries/source/spidermonkey") + #t)) + (add-after 'unpack 'fix-x11-includes + (lambda _ + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + (substitute* "source/lib/sysdep/os/unix/x/x.cpp" + (("") "")) + #t)) + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((jobs (number->string (parallel-job-count))) + (out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (data (string-append out "/share/0ad"))) + (setenv "JOBS" (string-append "-j" jobs)) + (setenv "CC" "gcc") + (with-directory-excursion "build/workspaces" + (zero? (system* "./update-workspaces.sh" + (string-append "--libdir=" lib) + (string-append "--datadir=" data) + "--minimal-flags" + ;; TODO: "--with-system-nvtt" + "--with-system-mozjs38")))))) + (add-before 'build 'chdir + (lambda _ + (chdir "build/workspaces/gcc") + #t)) + (delete 'check) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (chdir "../../../binaries") + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib")) + (data (string-append out "/share/0ad")) + (applications (string-append out "/share/applications")) + (pixmaps (string-append out "/share/pixmaps")) + (0ad-data (assoc-ref inputs "0ad-data"))) + ;; data + (copy-recursively "data" data) + (for-each (lambda (file) + (symlink (string-append 0ad-data "/" file) + (string-append data "/" file))) + '("config" "mods/mod" "mods/public" "tools")) + ;; libraries + (for-each (lambda (file) + (install-file file lib)) + (find-files "system" "\\.so$")) + ;; binaries + (install-file "system/pyrogenesis" bin) + (with-directory-excursion bin + (symlink "pyrogenesis" "0ad")) + ;; resources + (with-directory-excursion "../build/resources" + (install-file "0ad.desktop" applications) + (install-file "0ad.png" pixmaps)) + #t))) + (add-after 'install 'check + (lambda _ + (with-directory-excursion "system" + (zero? (system* "./test")))))))) + (home-page "https://play0ad.com") + (synopsis "3D, historically-based RTS game of ancient warfare") + (description "0 A.D. is a real-time strategy (RTS) game of ancient +warfare. It's a historically-based war/economy game that allows players to +relive or rewrite the history of twelve ancient civilizations, each depicted +at their peak of economic growth and military prowess. + +0ad needs a window manager that supports 'Extended Window Manager Hints'.") + (license (list license:bsd-2 + license:bsd-3 + license:expat + license:gpl2+ + license:ibmpl1.0 + license:isc + license:lgpl2.1 + license:lgpl3 + license:mpl2.0 + license:zlib)))) -- 2.12.2 From unknown Sun Aug 17 01:52:04 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26618: [PATCH] gnu: Add 0ad. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 May 2017 14:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26618 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26618@debbugs.gnu.org Received: via spool by 26618-submit@debbugs.gnu.org id=B26618.149364738720855 (code B ref 26618); Mon, 01 May 2017 14:04:01 +0000 Received: (at 26618) by debbugs.gnu.org; 1 May 2017 14:03:07 +0000 Received: from localhost ([127.0.0.1]:49676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5But-0005QI-7o for submit@debbugs.gnu.org; Mon, 01 May 2017 10:03:07 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5Buq-0005Q9-S6 for 26618@debbugs.gnu.org; Mon, 01 May 2017 10:03:05 -0400 Received: from rodion (80.12.38.192 [80.12.38.192]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 43de52d8 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <26618@debbugs.gnu.org>; Mon, 1 May 2017 14:03:03 +0000 (UTC) References: <877f20degc.fsf@lassieur.org> <20170501110945.32428-1-clement@lassieur.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <20170501110945.32428-1-clement@lassieur.org> Date: Mon, 01 May 2017 16:03:02 +0200 Message-ID: <8737cod695.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Clément Lassieur writes: > +(define-public 0ad > + (package > + (name "0ad") > + (version "0.0.21-alpha") > + (source > + (origin > + (method url-fetch) > + (uri (string-append > + "http://releases.wildfiregames.com/0ad-" > + version "-unix-build.tar.xz")) > + (file-name (string-append name "-" version ".tar.xz")) > + (sha256 > + (base32 > + "1kw3hqnr737ipx4f03khz3hvsh3ha7r8iy9njppk2faa53j27gln")) > + ;; A snippet here would cause a build failure, probably because of > + ;; timestamps reset or file sorting. I'll remove "file sorting" and add a link to https://bugs.gnu.org/26734. From unknown Sun Aug 17 01:52:04 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Subject: bug#26618: closed (Re: bug#26618: Add 0ad) Message-ID: References: <87a86ntdrh.fsf@lassieur.org> <87mvb7vrdv.fsf@lassieur.org> X-Gnu-PR-Message: they-closed 26618 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26618@debbugs.gnu.org Date: Mon, 08 May 2017 18:17:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1494267423-3464-1" This is a multi-part message in MIME format... ------------=_1494267423-3464-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26618: Add 0ad which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26618@debbugs.gnu.org. --=20 26618: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26618 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494267423-3464-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26618-done) by debbugs.gnu.org; 8 May 2017 18:16:54 +0000 Received: from localhost ([127.0.0.1]:60008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7nDK-0000tT-I6 for submit@debbugs.gnu.org; Mon, 08 May 2017 14:16:54 -0400 Received: from mail.lassieur.org ([83.152.10.219]:58586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7nDI-0000tK-H4 for 26618-done@debbugs.gnu.org; Mon, 08 May 2017 14:16:53 -0400 Received: from rodion (192.168.0.254 [192.168.0.254]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 55b60878 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 8 May 2017 18:16:50 +0000 (UTC) References: <87mvb7vrdv.fsf@lassieur.org> <20170423120751.3xm4fpbxtx2jk3fr@abyayala> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: ng0 Subject: Re: bug#26618: Add 0ad In-reply-to: <20170423120751.3xm4fpbxtx2jk3fr@abyayala> Date: Mon, 08 May 2017 20:16:50 +0200 Message-ID: <87a86ntdrh.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26618-done Cc: 26618-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) ng0 writes: > Clément Lassieur transcribed 0.4K bytes: >> Theses patches add 0ad and mozjs-38 (a dependency). I worked in >> cooperation with ng0. >> >> 0ad needs a window manager that supports 'Extended Window Manager >> Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints >> for a list. >> >> I did not try multiplayer mode. I ran it with Awesome WM, so I did not >> test the icons and desktop things: I'm not sure about it. >> >> Please let me know if you see anything wrong :) > > Wow, it's finally finished :) Games are the worst. Either they are small > and take a short time to package, or they take almost a year. I think I > started with this in August, in parallel to many other packages. > > So cool, thanks for finishing this! Thanks to you :-) Pushed! ------------=_1494267423-3464-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 23 Apr 2017 01:34:37 +0000 Received: from localhost ([127.0.0.1]:34991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Q8-0004Pv-TR for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:37 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d26Q7-0004Ph-2x for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d26Q0-00066r-RB for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:29 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d26Q0-00066n-Nc for submit@debbugs.gnu.org; Sat, 22 Apr 2017 21:34:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50743) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d26Pz-0005Or-Dh for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d26Pw-000659-BW for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:27 -0400 Received: from mail.lassieur.org ([83.152.10.219]:36378) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d26Pv-00063t-VV for guix-patches@gnu.org; Sat, 22 Apr 2017 21:34:24 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 77861ddd (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 23 Apr 2017 01:34:21 +0000 (UTC) User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: guix-patches@gnu.org Subject: Add 0ad Date: Sun, 23 Apr 2017 03:34:20 +0200 Message-ID: <87mvb7vrdv.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.1 (----) X-Debbugs-Envelope-To: submit Cc: ng0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.1 (----) Theses patches add 0ad and mozjs-38 (a dependency). I worked in cooperation with ng0. 0ad needs a window manager that supports 'Extended Window Manager Hints'. See https://en.wikipedia.org/wiki/Extended_Window_Manager_Hints for a list. I did not try multiplayer mode. I ran it with Awesome WM, so I did not test the icons and desktop things: I'm not sure about it. Please let me know if you see anything wrong :) ------------=_1494267423-3464-1--