[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 6 May 2020 17:40:25 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c263cfdcde0402cf44be7b14841d567f00e0af11
Merge: 3b7f310 13c18af
Author: Marius Bakke <address@hidden>
AuthorDate: Wed May 6 23:37:40 2020 +0200
Merge branch 'master' into core-updates
doc/guix.texi | 4 +-
gnu/local.mk | 7 +-
gnu/packages/audio.scm | 139 +-
gnu/packages/chromium.scm | 4 +-
gnu/packages/disk.scm | 64 +-
gnu/packages/emacs-xyz.scm | 73 +
gnu/packages/emacs.scm | 12 +-
gnu/packages/game-development.scm | 81 +
gnu/packages/games.scm | 5 +-
gnu/packages/gnome-xyz.scm | 47 +
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnuzilla.scm | 18 +-
gnu/packages/javascript.scm | 4 +-
gnu/packages/libedit.scm | 22 +
gnu/packages/linux.scm | 24 +-
gnu/packages/lisp-xyz.scm | 303 +-
gnu/packages/package-management.scm | 12 +-
gnu/packages/password-utils.scm | 41 +
.../ableton-link-system-libraries-debian.patch | 29 +
.../gnome-todo-delete-esource-duplicate.patch | 10 +
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../icecat-use-older-reveal-hidden-html.patch | 70 +
.../warsow-qfusion-fix-bool-return-type.patch | 22 +
gnu/packages/patches/webkitgtk-share-store.patch | 19 +
gnu/packages/radio.scm | 65 +
gnu/packages/text-editors.scm | 33 +
gnu/packages/tmux.scm | 5 +-
gnu/packages/webkit.scm | 12 +-
gnu/services/admin.scm | 6 +-
gnu/services/sound.scm | 27 +-
guix/build/syscalls.scm | 23 +-
po/doc/guix-manual.ru.po | 18748 ++++++++++---------
32 files changed, 10696 insertions(+), 9241 deletions(-)
diff --cc gnu/local.mk
index be02f93,98bdf69..25b0dba
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1016,7 -1000,7 +1017,8 @@@ dist_patch_DATA =
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnome-shell-theme.patch \
+ %D%/packages/patches/gnome-shell-disable-test.patch \
+ %D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnupg-default-pinentry.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
diff --cc gnu/packages/game-development.scm
index 6cae5ec,05cc152..d340271
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@@ -2225,3 -2226,83 +2226,83 @@@ rigid body physics library written in C
developers providing an advanced true color console, input, and lots of other
utilities frequently used in roguelikes.")
(license license:bsd-3)))
+
+ (define-public warsow-qfusion
+ ;; As of 2020-04-09, the latest stable version 2.1.0 is deprecated.
+ ;; The 2.5 beta as published on the homepage is commit
+ ;; c4de15df559410aff0ca6643724e24cddb0ecbbd
+ (let ((commit "c4de15df559410aff0ca6643724e24cddb0ecbbd"))
+ (package
+ (name "warsow-qfusion")
+ (version (git-version "2.5" "1" commit)) ; 2.5-beta
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Warsow/qfusion/";)
+ (commit commit)
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0xv2yycr43p3xmq7lm6j6zb3cpcr6w00x7qg918faq0mw9j7v48g"))
+ ;; Issue reported here:
https://github.com/Warsow/qfusion/issues/46
+ (patches (search-patches
"warsow-qfusion-fix-bool-return-type.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; No tests.
+ #:configure-flags '("-DQFUSION_GAME=Warsow")
+ #:modules
+ ((guix build utils)
+ (guix build cmake-build-system)
+ (ice-9 match))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'change-to-build-dir
+ (lambda _
+ (chdir "source")
+ #t))
+ (add-after 'install 'really-install
+ (lambda* (#:key outputs system #:allow-other-keys)
+ (let ((arch (match system
+ ("x86_64-linux" "x86_64")
+ ("i686-linux" "i386")))
+ (out (assoc-ref outputs "out")))
+ (install-file (string-append
"../source/build/basewsw/libgame_"
+ arch ".so")
+ (string-append out "/lib/"))
+ (install-file (string-append "../source/build/libui_" arch
".so")
+ (string-append out "/lib/"))
+ (for-each
+ (lambda (file)
+ (install-file file (string-append out "/bin/")))
+ (append (find-files "../source/build" "warsow")
+ (find-files "../source/build" "wsw_server."))))
+ #t)))))
+ (inputs
+ `(("alsa-lib" ,alsa-lib)
+ ("curl" ,curl)
+ ("freetype" ,freetype)
+ ("ffmpeg" ,ffmpeg)
- ("libjpeg" ,libjpeg)
++ ("libjpeg" ,libjpeg-turbo)
+ ("libogg" ,libogg)
+ ("libpng" ,libpng)
+ ("libtheora" ,libtheora)
+ ("libvorbis" ,libvorbis)
+ ("mesa" ,mesa)
+ ("openal" ,openal)
+ ("pulseaudio" ,pulseaudio)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("sdl2" ,sdl2)
- ("uuid.h" ,util-linux)
++ ("uuid.h" ,util-linux "lib")
+ ("zlib" ,zlib)))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/Warsow/qfusion";)
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (synopsis "Warsow's fork of qfusion, the id Tech 2 derived game engine")
+ (description
+ "This package contains the game engine of Warsow, a first-person
+ shooter video game. The engine is based on qfusion, the id Tech 2 derived
+ game engine. id Tech 2 is the engine originally behind Quake 2.")
+ (license license:gpl2+))))
diff --cc gnu/packages/package-management.scm
index 9acc2ad,1fbc2ba..3b5c707
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@@ -11,8 -11,7 +11,9 @@@
;;; Copyright © 2018, 2019 Eric Bavier <address@hidden>
;;; Copyright © 2019, 2020 Efraim Flashner <address@hidden>
;;; Copyright © 2019 Jonathan Brielmaier <address@hidden>
+;;; Copyright © 2020 Mathieu Othacehe <address@hidden>
+;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2020 Giacomo Leidi <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -37,9 -36,9 +38,10 @@@
#:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base)
+ #:use-module (gnu packages bash)
#:use-module (gnu packages bdw-gc)
#:use-module (gnu packages bison)
+ #:use-module (gnu packages boost)
#:use-module (gnu packages bootstrap) ;for 'bootstrap-guile-origin'
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@@ -57,7 -56,7 +59,8 @@@
#:use-module (gnu packages gtk)
#:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz)
+ #:use-module (gnu packages hurd)
+ #:use-module (gnu packages libedit)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages man)