From 6a95024c0a066481870d5ee1520e25b358cf587b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 26 Dec 2014 00:43:05 -0500 Subject: gnu: gnubg: Add glu to inputs. * gnu/packages/games.scm (gnubg): Add glu to inputs. --- gnu/packages/games.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index db878b033d..900751c770 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2014 Sylvain Beucler ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Sou Bunnbu +;;; Copyright © 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +82,7 @@ ("readline" ,readline) ("gtk+" ,gtk+-2) ("mesa" ,mesa) + ("glu" ,glu) ("gtkglext" ,gtkglext) ("sqlite" ,sqlite) ("libcanberra" ,libcanberra))) -- cgit v1.2.3 From 276a8f7191b58c89dc6e9ebbed2fd0b1b20e5612 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 26 Dec 2014 00:43:47 -0500 Subject: gnu: gnubik: Add glu to inputs. * gnu/packages/games.scm (gnubik): Add glu to inputs. --- gnu/packages/games.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 900751c770..cce2e829ce 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -112,6 +112,7 @@ representation of the playing board.") (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("mesa" ,mesa) + ("glu" ,glu) ("libx11" ,libx11) ("guile" ,guile-2.0) ("gtkglext" ,gtkglext))) -- cgit v1.2.3 From 00c0930019229fb360e5f1b7eedca3ff2e52012b Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 26 Dec 2014 00:51:56 -0500 Subject: gnu: pingus: Add glu to inputs. * gnu/packages/games.scm (pingus): Add glu to inputs. --- gnu/packages/games.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cce2e829ce..2dadca620a 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -211,6 +211,7 @@ that beneath its ruins lay buried an ancient evil.") ("sdl-image" ,sdl-image) ("sdl-mixer" ,sdl-mixer) ("mesa" ,mesa) + ("glu" ,glu) ("libpng" ,libpng) ("boost" ,boost))) (arguments -- cgit v1.2.3 From 977736fc4064e6575abde12dbfe7bb79afad54be Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 26 Dec 2014 15:48:26 -0500 Subject: gnu: irrlicht: Fix build with mesa-10. * gnu/packages/patches/irrlicht-mesa-10.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/games.scm (irrlicht): Add patch. Add glu to inputs. --- gnu-system.am | 1 + gnu/packages/games.scm | 15 +++++++--- gnu/packages/patches/irrlicht-mesa-10.patch | 46 +++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/irrlicht-mesa-10.patch (limited to 'gnu/packages/games.scm') diff --git a/gnu-system.am b/gnu-system.am index 2bc688b435..5acc6f4413 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -388,6 +388,7 @@ dist_patch_DATA = \ gnu/packages/patches/icecat-CVE-2014-1592.patch \ gnu/packages/patches/icecat-CVE-2014-1593.patch \ gnu/packages/patches/icecat-CVE-2014-1594.patch \ + gnu/packages/patches/irrlicht-mesa-10.patch \ gnu/packages/patches/jbig2dec-ignore-testtest.patch \ gnu/packages/patches/kmod-module-directory.patch \ gnu/packages/patches/libarchive-CVE-2013-0211.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2dadca620a..b8696a5379 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -611,14 +611,21 @@ buffers, and audio capture.") (and (zero? (system* "unzip" source)) ;; The actual source is buried a few directories deep. (chdir "irrlicht-1.8.1/source/Irrlicht/"))) - ;; No configure script - (alist-delete 'configure %standard-phases))) + (alist-cons-after + 'unpack 'apply-patch/mesa-10-fix + (lambda* (#:key inputs #:allow-other-keys) + (zero? (system* "patch" "--force" "-p3" "-i" + (assoc-ref inputs "patch/mesa-10-fix")))) + ;; No configure script + (alist-delete 'configure %standard-phases)))) #:tests? #f ; no check target #:make-flags '("CC=gcc" "sharedlib"))) (native-inputs - `(("unzip" ,unzip))) + `(("patch/mesa-10-fix" ,(search-patch "irrlicht-mesa-10.patch")) + ("unzip" ,unzip))) (inputs - `(("mesa" ,mesa))) + `(("mesa" ,mesa) + ("glu" ,glu))) (synopsis "3D game engine written in C++") (description "The Irrlicht Engine is a high performance realtime 3D engine written in diff --git a/gnu/packages/patches/irrlicht-mesa-10.patch b/gnu/packages/patches/irrlicht-mesa-10.patch new file mode 100644 index 0000000000..b567c384a3 --- /dev/null +++ b/gnu/packages/patches/irrlicht-mesa-10.patch @@ -0,0 +1,46 @@ +Patch to work around incompatibility between irrlicht-1.8.1 and mesa-10.x. +Upstream bug (fixed in trunk): http://sourceforge.net/p/irrlicht/bugs/429/ +Upstream fix: http://sourceforge.net/p/irrlicht/code/4810 +This patch copied from: +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch?view=markup + +From 244d00280c1b082ca164f92337773e9e4e1a3898 Mon Sep 17 00:00:00 2001 +From: hiker +Date: Wed, 26 Feb 2014 11:13:03 +1100 +Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation + problems. + +--- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h ++++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h +@@ -21,6 +21,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #include "wglext.h" +@@ -35,6 +36,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) +@@ -48,6 +50,7 @@ + #define NO_SDL_GLEXT + #include + #include ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +@@ -60,6 +63,7 @@ + #include + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h + #include "glxext.h" -- cgit v1.2.3 From 07af3e5efee742b9b67a19a6df3256cd00fb18e0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 28 Dec 2014 17:57:16 +0100 Subject: gnu: Fix or update a number of 'home-page' fields. * gnu/packages/fltk.scm (fltk): Fix 'home-page'. * gnu/packages/fonts.scm (font-bitstream-vera): Likewise, and fix license URL. * gnu/packages/games.scm (gnubg, cmatrix, chess): Fix 'home-page'. * gnu/packages/kde.scm (attica): Likewise. * gnu/packages/mail.scm (fetchmail): Likewise. * gnu/packages/popt.scm (popt): Likewise. * gnu/packages/python.scm (python-mock): Likewise. * gnu/packages/stalonetray.scm (stalonetray): Likewise. --- gnu/packages/fltk.scm | 2 +- gnu/packages/fonts.scm | 6 +++--- gnu/packages/games.scm | 6 +++--- gnu/packages/kde.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/popt.scm | 4 ++-- gnu/packages/python.scm | 2 +- gnu/packages/stalonetray.scm | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 9d228927d2..6aee41d31f 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -50,7 +50,7 @@ (substitute* "makeinclude.in" (("/bin/sh") (which "sh")))) %standard-phases))) - (home-page "https://www.fltk.org") + (home-page "http://www.fltk.org") (synopsis "3D C++ GUI library") (description "FLTK is a C++ GUI toolkit providing modern GUI functionality without the bloat. It supports 3D graphics via OpenGL and its built-in GLUT diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 74cfc9dbe1..c16ab93242 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Joshua Grant ;;; Copyright © 2014 Alex Kost @@ -144,13 +144,13 @@ provide serif, sans and monospaced variants.") (native-inputs `(("source" ,source) ("tar" ,tar) ("bzip2" ,bzip2))) - (home-page "https://www-old.gnome.org/fonts/") + (home-page "http://www.gnome.org/fonts/") (synopsis "Bitstream Vera sans-serif typeface") (description "Vera is a sans-serif typeface from Bitstream, Inc. This package provides the TrueType (TTF) files.") (license (license:x11-style - "https://www-old.gnome.org/fonts/#Final_Bitstream_Vera_Fonts")))) + "http://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts")))) (define-public font-gnu-freefont-ttf (package diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index b8696a5379..066e0e6c46 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -88,7 +88,7 @@ ("libcanberra" ,libcanberra))) (native-inputs `(("python-2" ,python-2) ("pkg-config" ,pkg-config))) - (home-page "https://gnubg.org") + (home-page "http://gnubg.org") (synopsis "Backgammon game") (description "The GNU backgammon application can be used for playing, analyzing and teaching the game. It has an advanced evaluation engine based on artificial @@ -283,7 +283,7 @@ a C library, so they can easily be integrated into other programs.") (string-append "--prefix=" out))))) %standard-phases))) (inputs `(("ncurses" ,ncurses))) - (home-page "http://wwww.asty.org/cmatrix") + (home-page "http://www.asty.org/cmatrix") (synopsis "Simulate the display from \"The Matrix\"") (description "CMatrix simulates the display from \"The Matrix\" and is based on the screensaver from the movie's website. It works with terminal @@ -304,7 +304,7 @@ asynchronously and at a user-defined speed.") (base32 "1jckpg1qi1vjr3pqs0dnip3rmn0mgklx63xflrpqiv3cx2qlz8kn")))) (build-system gnu-build-system) - (home-page "http://wwww.gnu.org/software/chess") + (home-page "http://www.gnu.org/software/chess") (synopsis "Full chess implementation") (description "GNU Chess is a chess engine. It allows you to compete against the computer in a game of chess, either through the default terminal diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index e97ac277b7..52ed93e6a7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -153,7 +153,7 @@ and import their menus over DBus.") (build-system cmake-build-system) (inputs `(("qt" ,qt-4))) - (home-page "https://projects.kde.org/projects/kdesupport/attica") + (home-page "https://projects.kde.org/projects/frameworks/attica") (synopsis "Qt library for the Open Collaboration Services API") (description "Attica is a Qt library that implements the Open Collaboration Services API version 1.6. It grants easy access to the diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6051dabb29..534476f7d1 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -144,7 +144,7 @@ software.") (arguments `(#:configure-flags (list (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))))) - (home-page "http://fetchmail.berlios.de/") + (home-page "http://www.fetchmail.info/") (synopsis "Remote-mail retrieval and forwarding utility") (description "Fetchmail is a full-featured, robust, well-documented remote-mail diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index e822b5c795..9ccca5c8b5 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Ludovic Courtès +;;; Copyright © 2013, 2014 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,7 +43,7 @@ (substitute* "testit.sh" ; don't expect old libtool names (("lt-test1") "test1"))) %standard-phases))) - (home-page #f) + (home-page "http://rpm5.org/files/popt/") (synopsis "Command line option parsing library") (description "This is the popt(3) command line option parsing library. While it is diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index adb84fc5b7..162acec639 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -358,7 +358,7 @@ API for locking files.") "0kzlsbki6q0awf89rc287f3aj8x431lrajf160a70z0ikhnxsfdq")))) (build-system python-build-system) (arguments '(#:test-target "check")) - (home-page "http://code.google.com/m/mock/") + (home-page "http://code.google.com/p/mock/") (synopsis "Python mocking and patching library for testing") (description "Mock is a library for testing in Python. It allows you to replace parts diff --git a/gnu/packages/stalonetray.scm b/gnu/packages/stalonetray.scm index 762ac8c99b..e1604327ab 100644 --- a/gnu/packages/stalonetray.scm +++ b/gnu/packages/stalonetray.scm @@ -38,7 +38,7 @@ "1wp8pnlv34w7xizj1vivnc3fkwqq4qgb9dbrsg15598iw85gi8ll")))) (inputs `(("libx11" ,libx11))) (build-system gnu-build-system) - (home-page "stalonetray") + (home-page "http://stalonetray.sourceforge.net") (synopsis "Standalone freedesktop.org and KDE systray implementation") (description "Stalonetray is a stand-alone freedesktop.org and KDE system -- cgit v1.2.3