summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/quazip/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/quazip/files')
-rw-r--r--dev-libs/quazip/files/quazip-0.4.4-zlib.patch27
-rw-r--r--dev-libs/quazip/files/quazip-0.5.1-prll.patch11
-rw-r--r--dev-libs/quazip/files/quazip-0.5.1-zlib.patch31
3 files changed, 69 insertions, 0 deletions
diff --git a/dev-libs/quazip/files/quazip-0.4.4-zlib.patch b/dev-libs/quazip/files/quazip-0.4.4-zlib.patch
new file mode 100644
index 000000000000..a84dcab8c376
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.4.4-zlib.patch
@@ -0,0 +1,27 @@
+From f7d821a6837b4cc9defa02f271256796394fd8c3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 21 Sep 2011 14:37:31 +0200
+Subject: [PATCH] Allow compilation with zlib-1.2.5.1-r1
+
+---
+ quazip/ioapi.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/quazip/ioapi.h b/quazip/ioapi.h
+index 716dd4b..a4ac8d7 100644
+--- a/quazip/ioapi.h
++++ b/quazip/ioapi.h
+@@ -37,6 +37,10 @@
+ extern "C" {
+ #endif
+
++#ifndef OF
++# define OF(x) x
++#endif
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, voidpf file, int mode));
+ typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+--
+1.7.6.1
+
diff --git a/dev-libs/quazip/files/quazip-0.5.1-prll.patch b/dev-libs/quazip/files/quazip-0.5.1-prll.patch
new file mode 100644
index 000000000000..48c55023838a
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.5.1-prll.patch
@@ -0,0 +1,11 @@
+ quazip.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/quazip.pro b/quazip.pro
+index 28aa9ab..62a22bd 100644
+--- a/quazip.pro
++++ b/quazip.pro
+@@ -1,2 +1,3 @@
+ TEMPLATE=subdirs
+ SUBDIRS=quazip qztest
++qztest.depends=quazip
diff --git a/dev-libs/quazip/files/quazip-0.5.1-zlib.patch b/dev-libs/quazip/files/quazip-0.5.1-zlib.patch
new file mode 100644
index 000000000000..690590e765b5
--- /dev/null
+++ b/dev-libs/quazip/files/quazip-0.5.1-zlib.patch
@@ -0,0 +1,31 @@
+diff -up quazip-0.5.1/qztest/testquagzipfile.cpp.zl quazip-0.5.1/qztest/testquagzipfile.cpp
+--- quazip-0.5.1/qztest/testquagzipfile.cpp.zl 2012-09-05 17:24:35.000000000 +0200
++++ quazip-0.5.1/qztest/testquagzipfile.cpp 2013-03-03 14:27:05.168659773 +0100
+@@ -8,9 +8,9 @@ void TestQuaGzipFile::read()
+ {
+ QDir curDir;
+ curDir.mkpath("tmp");
+- voidp gzFile = gzopen("tmp/test.gz", "wb");
+- gzwrite(gzFile, "test", 4);
+- gzclose(gzFile);
++ gzFile File = gzopen("tmp/test.gz", "wb");
++ gzwrite(File, "test", 4);
++ gzclose(File);
+ QuaGzipFile testFile("tmp/test.gz");
+ QVERIFY(testFile.open(QIODevice::ReadOnly));
+ char buf[5];
+@@ -32,11 +32,11 @@ void TestQuaGzipFile::write()
+ QCOMPARE(testFile.write("test", 4), static_cast<qint64>(4));
+ testFile.close();
+ QVERIFY(!testFile.isOpen());
+- voidp gzFile = gzopen("tmp/test.gz", "rb");
++ gzFile File = gzopen("tmp/test.gz", "rb");
+ char buf[5];
+ buf[4] = '\0';
+- QCOMPARE(gzread(gzFile, buf, 5), 4);
+- gzclose(gzFile);
++ QCOMPARE(gzread(File, buf, 5), 4);
++ gzclose(File);
+ QCOMPARE(static_cast<const char*>(buf), "test");
+ curDir.remove("tmp/test.gz");
+ curDir.rmdir("tmp");