1 |
commit: e1f6fb8c0db41a93064519e3df910e940cc14dc3 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Sep 4 11:57:51 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 4 18:58:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1f6fb8c |
7 |
|
8 |
dev-libs/quazip: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/2234 |
11 |
|
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
|
14 |
dev-libs/quazip/files/quazip-0.4.4-zlib.patch | 27 ----------------------- |
15 |
dev-libs/quazip/files/quazip-0.5.1-zlib.patch | 31 --------------------------- |
16 |
2 files changed, 58 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/quazip/files/quazip-0.4.4-zlib.patch b/dev-libs/quazip/files/quazip-0.4.4-zlib.patch |
19 |
deleted file mode 100644 |
20 |
index a84dcab..00000000 |
21 |
--- a/dev-libs/quazip/files/quazip-0.4.4-zlib.patch |
22 |
+++ /dev/null |
23 |
@@ -1,27 +0,0 @@ |
24 |
-From f7d821a6837b4cc9defa02f271256796394fd8c3 Mon Sep 17 00:00:00 2001 |
25 |
-From: Sebastian Pipping <sebastian@×××××××.org> |
26 |
-Date: Wed, 21 Sep 2011 14:37:31 +0200 |
27 |
-Subject: [PATCH] Allow compilation with zlib-1.2.5.1-r1 |
28 |
- |
29 |
---- |
30 |
- quazip/ioapi.h | 4 ++++ |
31 |
- 1 files changed, 4 insertions(+), 0 deletions(-) |
32 |
- |
33 |
-diff --git a/quazip/ioapi.h b/quazip/ioapi.h |
34 |
-index 716dd4b..a4ac8d7 100644 |
35 |
---- a/quazip/ioapi.h |
36 |
-+++ b/quazip/ioapi.h |
37 |
-@@ -37,6 +37,10 @@ |
38 |
- extern "C" { |
39 |
- #endif |
40 |
- |
41 |
-+#ifndef OF |
42 |
-+# define OF(x) x |
43 |
-+#endif |
44 |
-+ |
45 |
- typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode)); |
46 |
- typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); |
47 |
- typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); |
48 |
--- |
49 |
-1.7.6.1 |
50 |
- |
51 |
|
52 |
diff --git a/dev-libs/quazip/files/quazip-0.5.1-zlib.patch b/dev-libs/quazip/files/quazip-0.5.1-zlib.patch |
53 |
deleted file mode 100644 |
54 |
index 690590e..00000000 |
55 |
--- a/dev-libs/quazip/files/quazip-0.5.1-zlib.patch |
56 |
+++ /dev/null |
57 |
@@ -1,31 +0,0 @@ |
58 |
-diff -up quazip-0.5.1/qztest/testquagzipfile.cpp.zl quazip-0.5.1/qztest/testquagzipfile.cpp |
59 |
---- quazip-0.5.1/qztest/testquagzipfile.cpp.zl 2012-09-05 17:24:35.000000000 +0200 |
60 |
-+++ quazip-0.5.1/qztest/testquagzipfile.cpp 2013-03-03 14:27:05.168659773 +0100 |
61 |
-@@ -8,9 +8,9 @@ void TestQuaGzipFile::read() |
62 |
- { |
63 |
- QDir curDir; |
64 |
- curDir.mkpath("tmp"); |
65 |
-- voidp gzFile = gzopen("tmp/test.gz", "wb"); |
66 |
-- gzwrite(gzFile, "test", 4); |
67 |
-- gzclose(gzFile); |
68 |
-+ gzFile File = gzopen("tmp/test.gz", "wb"); |
69 |
-+ gzwrite(File, "test", 4); |
70 |
-+ gzclose(File); |
71 |
- QuaGzipFile testFile("tmp/test.gz"); |
72 |
- QVERIFY(testFile.open(QIODevice::ReadOnly)); |
73 |
- char buf[5]; |
74 |
-@@ -32,11 +32,11 @@ void TestQuaGzipFile::write() |
75 |
- QCOMPARE(testFile.write("test", 4), static_cast<qint64>(4)); |
76 |
- testFile.close(); |
77 |
- QVERIFY(!testFile.isOpen()); |
78 |
-- voidp gzFile = gzopen("tmp/test.gz", "rb"); |
79 |
-+ gzFile File = gzopen("tmp/test.gz", "rb"); |
80 |
- char buf[5]; |
81 |
- buf[4] = '\0'; |
82 |
-- QCOMPARE(gzread(gzFile, buf, 5), 4); |
83 |
-- gzclose(gzFile); |
84 |
-+ QCOMPARE(gzread(File, buf, 5), 4); |
85 |
-+ gzclose(File); |
86 |
- QCOMPARE(static_cast<const char*>(buf), "test"); |
87 |
- curDir.remove("tmp/test.gz"); |
88 |
- curDir.rmdir("tmp"); |