tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
epsonscan2: use pinned patches, add gcc14 patch
Shawn8901
1 year ago
794d4f89
67959531
+41
-3
2 changed files
expand all
collapse all
unified
split
pkgs
by-name
ep
epsonscan2
gcc14.patch
package.nix
+37
pkgs/by-name/ep/epsonscan2/gcc14.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
diff --git a/thirdparty/zlib/gzlib.c b/thirdparty/zlib/gzlib.c
2
+
index 4105e6a..eae3a38 100644
3
+
--- a/thirdparty/zlib/gzlib.c
4
+
+++ b/thirdparty/zlib/gzlib.c
5
+
@@ -3,6 +3,7 @@
6
+
* For conditions of distribution and use, see copyright notice in zlib.h
7
+
*/
8
+
9
+
+#include <unistd.h>
10
+
#include "gzguts.h"
11
+
12
+
#if defined(_WIN32) && !defined(__BORLANDC__) && !defined(__MINGW32__)
13
+
diff --git a/thirdparty/zlib/gzread.c b/thirdparty/zlib/gzread.c
14
+
index 956b91e..66089b6 100644
15
+
--- a/thirdparty/zlib/gzread.c
16
+
+++ b/thirdparty/zlib/gzread.c
17
+
@@ -3,6 +3,7 @@
18
+
* For conditions of distribution and use, see copyright notice in zlib.h
19
+
*/
20
+
21
+
+#include <unistd.h>
22
+
#include "gzguts.h"
23
+
24
+
/* Local functions */
25
+
diff --git a/thirdparty/zlib/gzwrite.c b/thirdparty/zlib/gzwrite.c
26
+
index c7b5651..e685f3e 100644
27
+
--- a/thirdparty/zlib/gzwrite.c
28
+
+++ b/thirdparty/zlib/gzwrite.c
29
+
@@ -3,6 +3,7 @@
30
+
* For conditions of distribution and use, see copyright notice in zlib.h
31
+
*/
32
+
33
+
+#include <unistd.h>
34
+
#include "gzguts.h"
35
+
36
+
/* Local functions */
37
+
+4
-3
pkgs/by-name/ep/epsonscan2/package.nix
···
49
50
patches = [
51
./build.patch
0
52
(fetchpatch {
53
-
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0002-Fix-crash.patch";
54
hash = "sha256-rNsFnHq//CJcIZl0M6RLRkIY3YhnJZbikO8SeeC2ktg=";
55
})
56
(fetchpatch {
57
-
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch";
58
hash = "sha256-WmA8pmPSJ1xUdeBbE8Jzi6w9p96aIOm0erF3T4EQ6VA=";
59
})
60
(fetchpatch {
61
-
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/master/patches/0003-Use-XDG-open-to-open-the-directory.patch";
62
hash = "sha256-H3lle1SXkkpbBkozYEwiX0z9oTUubTpB+l91utxH03M=";
63
})
64
];
···
49
50
patches = [
51
./build.patch
52
+
./gcc14.patch
53
(fetchpatch {
54
+
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0002-Fix-crash.patch";
55
hash = "sha256-rNsFnHq//CJcIZl0M6RLRkIY3YhnJZbikO8SeeC2ktg=";
56
})
57
(fetchpatch {
58
+
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0004-Fix-a-crash-on-an-OOB-container-access.patch";
59
hash = "sha256-WmA8pmPSJ1xUdeBbE8Jzi6w9p96aIOm0erF3T4EQ6VA=";
60
})
61
(fetchpatch {
62
+
url = "https://raw.githubusercontent.com/flathub/net.epson.epsonscan2/a489ac2f8cbd03afeda86673930cc17663c31a53/patches/0003-Use-XDG-open-to-open-the-directory.patch";
63
hash = "sha256-H3lle1SXkkpbBkozYEwiX0z9oTUubTpB+l91utxH03M=";
64
})
65
];