forked from mirrors/nixpkgs
Merge pull request #89364 from patrl/update-exult
exult: 1.4.9rc1 -> 1.6
This commit is contained in:
Lassulus
GitHub
commit
ee80c91555
|
|
@ -1,123 +0,0 @@
|
|||
diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop
|
||||
--- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600
|
||||
+++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600
|
||||
@@ -1,9 +1,8 @@
|
||||
[Desktop Entry]
|
||||
-Encoding=UTF-8
|
||||
Name=Exult
|
||||
Comment=Exult Ultima 7 Engine
|
||||
Exec=exult
|
||||
-Icon=exult.png
|
||||
+Icon=exult
|
||||
Terminal=false
|
||||
Type=Application
|
||||
-Categories=Application;Game;RolePlaying;
|
||||
+Categories=Game;RolePlaying;
|
||||
diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h
|
||||
--- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500
|
||||
+++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600
|
||||
@@ -18,6 +18,7 @@
|
||||
#define DATA_H
|
||||
|
||||
#include <cstdio>
|
||||
+#include <cstddef>
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
#include <fstream>
|
||||
diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h
|
||||
--- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500
|
||||
+++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <cstring>
|
||||
+#include <cstddef>
|
||||
#include "common_types.h"
|
||||
#include "utils.h"
|
||||
|
||||
diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h
|
||||
--- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600
|
||||
+++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600
|
||||
@@ -319,7 +319,7 @@
|
||||
static uintD copy(uintS src)
|
||||
{
|
||||
unsigned int r, g, b;
|
||||
- split_source(src,r,g,b);
|
||||
+ ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b);
|
||||
return ManipBaseDest<color_d>::rgb(r,g,b);
|
||||
}
|
||||
static void copy(uintD& dest, uintS src)
|
||||
diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h
|
||||
--- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600
|
||||
+++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600
|
||||
@@ -162,19 +162,19 @@
|
||||
|
||||
_Myt& operator+=(const _Myt& _Right)
|
||||
{ // append _Right
|
||||
- append(_Right);
|
||||
+ this->append(_Right);
|
||||
return (*this);
|
||||
}
|
||||
|
||||
_Myt& operator+=(const _Elem *_Ptr)
|
||||
{ // append [_Ptr, <null>)
|
||||
- append(_Ptr);
|
||||
+ this->append(_Ptr);
|
||||
return (*this);
|
||||
}
|
||||
|
||||
_Myt& operator+=(_Elem _Ch)
|
||||
{ // append 1 * _Ch
|
||||
- append(static_cast<size_type>(1), _Ch);
|
||||
+ this->append(static_cast<size_type>(1), _Ch);
|
||||
return (*this);
|
||||
}
|
||||
|
||||
diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc
|
||||
--- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200
|
||||
+++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300
|
||||
@@ -26,6 +26,7 @@
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
#endif
|
||||
+#include <string.h>
|
||||
|
||||
#ifdef HAVE_PNG_H
|
||||
|
||||
@@ -79,7 +80,7 @@
|
||||
}
|
||||
// Allocate info. structure.
|
||||
png_infop info = png_create_info_struct(png);
|
||||
- if (setjmp(png->jmpbuf)) // Handle errors.
|
||||
+ if (setjmp(png_jmpbuf(png))) // Handle errors.
|
||||
{
|
||||
png_destroy_read_struct(&png, &info, 0);
|
||||
fclose(fp);
|
||||
@@ -208,7 +209,7 @@
|
||||
}
|
||||
// Allocate info. structure.
|
||||
png_infop info = png_create_info_struct(png);
|
||||
- if (setjmp(png->jmpbuf)) // Handle errors.
|
||||
+ if (setjmp(png_jmpbuf(png))) // Handle errors.
|
||||
{
|
||||
png_destroy_write_struct(&png, &info);
|
||||
fclose(fp);
|
||||
@@ -306,7 +307,7 @@
|
||||
}
|
||||
// Allocate info. structure.
|
||||
png_infop info = png_create_info_struct(png);
|
||||
- if (setjmp(png->jmpbuf)) // Handle errors.
|
||||
+ if (setjmp(png_jmpbuf(png))) // Handle errors.
|
||||
{
|
||||
png_destroy_read_struct(&png, &info, 0);
|
||||
fclose(fp);
|
||||
@@ -395,7 +396,7 @@
|
||||
}
|
||||
// Allocate info. structure.
|
||||
png_infop info = png_create_info_struct(png);
|
||||
- if (setjmp(png->jmpbuf)) // Handle errors.
|
||||
+ if (setjmp(png_jmpbuf(png))) // Handle errors.
|
||||
{
|
||||
png_destroy_write_struct(&png, &info);
|
||||
fclose(fp);
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, pkgconfig, SDL, libogg, libvorbis, zlib, unzip }:
|
||||
{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }:
|
||||
|
||||
let
|
||||
|
||||
|
|
@ -12,27 +12,20 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "exult-1.4.9rc1";
|
||||
name = "exult-1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/exult/${name}.tar.gz";
|
||||
sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd";
|
||||
sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-tools" ];
|
||||
|
||||
patches =
|
||||
[ # Arch Linux patch set.
|
||||
./arch.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ SDL libogg libvorbis zlib unzip ];
|
||||
buildInputs = [ SDL2 libogg libvorbis zlib unzip ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
makeFlags = [ "DESTDIR=$(out)" ];
|
||||
|
||||
NIX_LDFLAGS = "-lX11";
|
||||
|
||||
postInstall =
|
||||
|
|
|
|||
Loading…
Reference in a new issue