pyrox.dev
lol
1diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop
2--- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600
3+++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600
4@@ -1,9 +1,8 @@
5 [Desktop Entry]
6-Encoding=UTF-8
7 Name=Exult
8 Comment=Exult Ultima 7 Engine
9 Exec=exult
10-Icon=exult.png
11+Icon=exult
12 Terminal=false
13 Type=Application
14-Categories=Application;Game;RolePlaying;
15+Categories=Game;RolePlaying;
16diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h
17--- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500
18+++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600
19@@ -18,6 +18,7 @@
20 #define DATA_H
21
22 #include <cstdio>
23+#include <cstddef>
24 #include <cstring>
25 #include <cassert>
26 #include <fstream>
27diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h
28--- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500
29+++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600
30@@ -26,6 +26,7 @@
31 #include <string>
32 #include <vector>
33 #include <cstring>
34+#include <cstddef>
35 #include "common_types.h"
36 #include "utils.h"
37
38diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h
39--- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600
40+++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600
41@@ -319,7 +319,7 @@
42 static uintD copy(uintS src)
43 {
44 unsigned int r, g, b;
45- split_source(src,r,g,b);
46+ ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b);
47 return ManipBaseDest<color_d>::rgb(r,g,b);
48 }
49 static void copy(uintD& dest, uintS src)
50diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h
51--- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600
52+++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600
53@@ -162,19 +162,19 @@
54
55 _Myt& operator+=(const _Myt& _Right)
56 { // append _Right
57- append(_Right);
58+ this->append(_Right);
59 return (*this);
60 }
61
62 _Myt& operator+=(const _Elem *_Ptr)
63 { // append [_Ptr, <null>)
64- append(_Ptr);
65+ this->append(_Ptr);
66 return (*this);
67 }
68
69 _Myt& operator+=(_Elem _Ch)
70 { // append 1 * _Ch
71- append(static_cast<size_type>(1), _Ch);
72+ this->append(static_cast<size_type>(1), _Ch);
73 return (*this);
74 }
75
76diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc
77--- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200
78+++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300
79@@ -26,6 +26,7 @@
80 #ifdef HAVE_CONFIG_H
81 # include <config.h>
82 #endif
83+#include <string.h>
84
85 #ifdef HAVE_PNG_H
86
87@@ -79,7 +80,7 @@
88 }
89 // Allocate info. structure.
90 png_infop info = png_create_info_struct(png);
91- if (setjmp(png->jmpbuf)) // Handle errors.
92+ if (setjmp(png_jmpbuf(png))) // Handle errors.
93 {
94 png_destroy_read_struct(&png, &info, 0);
95 fclose(fp);
96@@ -208,7 +209,7 @@
97 }
98 // Allocate info. structure.
99 png_infop info = png_create_info_struct(png);
100- if (setjmp(png->jmpbuf)) // Handle errors.
101+ if (setjmp(png_jmpbuf(png))) // Handle errors.
102 {
103 png_destroy_write_struct(&png, &info);
104 fclose(fp);
105@@ -306,7 +307,7 @@
106 }
107 // Allocate info. structure.
108 png_infop info = png_create_info_struct(png);
109- if (setjmp(png->jmpbuf)) // Handle errors.
110+ if (setjmp(png_jmpbuf(png))) // Handle errors.
111 {
112 png_destroy_read_struct(&png, &info, 0);
113 fclose(fp);
114@@ -395,7 +396,7 @@
115 }
116 // Allocate info. structure.
117 png_infop info = png_create_info_struct(png);
118- if (setjmp(png->jmpbuf)) // Handle errors.
119+ if (setjmp(png_jmpbuf(png))) // Handle errors.
120 {
121 png_destroy_write_struct(&png, &info);
122 fclose(fp);
123