Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/fuse-zip/files/
Date: Thu, 09 Feb 2017 22:38:03
Message-Id: 1486679790.e6e292dbd79a131b160bd2061c47969432529ac9.soap@gentoo
1 commit: e6e292dbd79a131b160bd2061c47969432529ac9
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 7 17:11:33 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 9 22:36:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e292db
7
8 sys-fs/fuse-zip: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3873
11
12 .../fuse-zip/files/fuse-zip-0.2.13-as-needed.patch | 11 ----------
13 sys-fs/fuse-zip/files/libzip-fix-0.10.patch | 24 ----------------------
14 2 files changed, 35 deletions(-)
15
16 diff --git a/sys-fs/fuse-zip/files/fuse-zip-0.2.13-as-needed.patch b/sys-fs/fuse-zip/files/fuse-zip-0.2.13-as-needed.patch
17 deleted file mode 100644
18 index 9394b7b36e..0000000000
19 --- a/sys-fs/fuse-zip/files/fuse-zip-0.2.13-as-needed.patch
20 +++ /dev/null
21 @@ -1,11 +0,0 @@
22 -Index: fuse-zip-0.2.13/Makefile
23 -===================================================================
24 ---- fuse-zip-0.2.13.orig/Makefile
25 -+++ fuse-zip-0.2.13/Makefile
26 -@@ -1,5 +1,5 @@
27 - DEST=fuse-zip
28 --LIBS=$(shell pkg-config fuse --libs) $(shell pkg-config libzip --libs) -Llib -lfusezip
29 -+LIBS=-lfusezip $(shell pkg-config fuse --libs) $(shell pkg-config libzip --libs) -Llib
30 - LIB=lib/libfusezip.a
31 - CXXFLAGS=-g -O2 -Wall -Wextra
32 - RELEASE_CXXFLAGS=-O2 -Wall -Wextra
33
34 diff --git a/sys-fs/fuse-zip/files/libzip-fix-0.10.patch b/sys-fs/fuse-zip/files/libzip-fix-0.10.patch
35 deleted file mode 100644
36 index f2348e5f1b..0000000000
37 --- a/sys-fs/fuse-zip/files/libzip-fix-0.10.patch
38 +++ /dev/null
39 @@ -1,24 +0,0 @@
40 -diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp
41 ---- fuse-zip-0.2.13/lib/bigBuffer.cpp 2010-12-06 12:34:32.000000000 -0500
42 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp 2011-09-28 21:40:01.294946957 -0400
43 -@@ -236,7 +236,7 @@
44 - len = offset;
45 - }
46 -
47 --ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
48 -+zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) {
49 - CallBackStruct *b = (CallBackStruct*)state;
50 - switch (cmd) {
51 - case ZIP_SOURCE_OPEN: {
52 -diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h
53 ---- fuse-zip-0.2.13/lib/bigBuffer.h 2010-12-06 12:34:32.000000000 -0500
54 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.h 2011-09-28 21:40:23.203719133 -0400
55 -@@ -52,7 +52,7 @@
56 - * never called because read() always successfull.
57 - * See zip_source_function(3) for details.
58 - */
59 -- static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd);
60 -+ static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd);
61 -
62 - /**
63 - * Return number of chunks needed to keep 'offset' bytes.