[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/

[Andreas Sturmlechner]

commit:     d58b8e32c931d401e6097c4d0650240d828785bd
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 22:28:33 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 22:28:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58b8e32

dev-libs/quazip: Fix typo

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
index ee389da9d4e..c8dc5b6e3ad 100644
--- a/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
+++ b/dev-libs/quazip/files/quazip-0.9.1-gnuinstalldirs.patch
@@ -84,7 +84,7 @@ index 84607f6..74e02fe 100644
 -install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
 -install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
 +install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION $${CMAKE_INSTALL_LIBDIR})
++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -- 
 2.27.0
 

[gentoo-commits] repo/gentoo:master commit in: dev-libs/quazip/files/

[David Seifert]

commit:     e1f6fb8c0db41a93064519e3df910e940cc14dc3
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep  4 11:57:51 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 18:58:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1f6fb8c

dev-libs/quazip: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/2234

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/quazip/files/quazip-0.4.4-zlib.patch | 27 -----------------------
 dev-libs/quazip/files/quazip-0.5.1-zlib.patch | 31 ---------------------------
 2 files changed, 58 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
deleted file mode 100644
index a84dcab..00000000
--- a/dev-libs/quazip/files/quazip-0.4.4-zlib.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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-zlib.patch b/dev-libs/quazip/files/quazip-0.5.1-zlib.patch
deleted file mode 100644
index 690590e..00000000
--- a/dev-libs/quazip/files/quazip-0.5.1-zlib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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");