| 1 |
commit: 553be092524167fadd8bd7614e9beab3fb5d7fd0 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 26 14:10:05 2017 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 26 19:10:39 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553be092 |
| 7 |
|
| 8 |
net-libs/wvstreams: Fix patches. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch | 12 ++++++------ |
| 13 |
net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch | 8 ++++---- |
| 14 |
net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch | 4 ++-- |
| 15 |
net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch | 8 ++++---- |
| 16 |
4 files changed, 16 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch |
| 19 |
index b284da8f3e7..a1ad8881793 100644 |
| 20 |
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch |
| 21 |
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-gcc47.patch |
| 22 |
@@ -5,8 +5,8 @@ See -gcc47-patch and -magic.patch in Fedora git: |
| 23 |
|
| 24 |
http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree |
| 25 |
|
| 26 |
---- include/wvtask.h |
| 27 |
-+++ include/wvtask.h |
| 28 |
+--- a/include/wvtask.h |
| 29 |
++++ b/include/wvtask.h |
| 30 |
@@ -45,7 +45,8 @@ |
| 31 |
typedef void TaskFunc(void *userdata); |
| 32 |
|
| 33 |
@@ -26,8 +26,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree |
| 34 |
static WvTaskList all_tasks, free_tasks; |
| 35 |
|
| 36 |
static void get_stack(WvTask &task, size_t size); |
| 37 |
---- include/wvuid.h |
| 38 |
-+++ include/wvuid.h |
| 39 |
+--- a/include/wvuid.h |
| 40 |
++++ b/include/wvuid.h |
| 41 |
@@ -7,6 +7,7 @@ |
| 42 |
#ifndef __WVUID_H |
| 43 |
#define __WVUID_H |
| 44 |
@@ -36,8 +36,8 @@ http://pkgs.fedoraproject.org/gitweb/?p=libwvstreams.git;a=tree |
| 45 |
#include "wvstring.h" |
| 46 |
|
| 47 |
#if WIN32 |
| 48 |
---- utils/wvtask.cc |
| 49 |
-+++ utils/wvtask.cc |
| 50 |
+--- a/utils/wvtask.cc |
| 51 |
++++ b/utils/wvtask.cc |
| 52 |
@@ -58,7 +58,8 @@ |
| 53 |
int WvTask::taskcount, WvTask::numtasks, WvTask::numrunning; |
| 54 |
|
| 55 |
|
| 56 |
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch |
| 57 |
index 473d3e83293..38218d7213a 100644 |
| 58 |
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch |
| 59 |
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-glibc212.patch |
| 60 |
@@ -1,7 +1,7 @@ |
| 61 |
http://bugs.gentoo.org/333301 |
| 62 |
|
| 63 |
---- ipstreams/wvunixdgsocket.cc |
| 64 |
-+++ ipstreams/wvunixdgsocket.cc |
| 65 |
+--- a/ipstreams/wvunixdgsocket.cc |
| 66 |
++++ b/ipstreams/wvunixdgsocket.cc |
| 67 |
@@ -1,5 +1,5 @@ |
| 68 |
#include "wvunixdgsocket.h" |
| 69 |
-#ifdef MACOS |
| 70 |
@@ -9,8 +9,8 @@ http://bugs.gentoo.org/333301 |
| 71 |
#include <sys/types.h> |
| 72 |
#include <sys/stat.h> |
| 73 |
#endif |
| 74 |
---- streams/wvatomicfile.cc |
| 75 |
-+++ streams/wvatomicfile.cc |
| 76 |
+--- a/streams/wvatomicfile.cc |
| 77 |
++++ b/streams/wvatomicfile.cc |
| 78 |
@@ -11,7 +11,8 @@ |
| 79 |
#include "wvfileutils.h" |
| 80 |
#include "wvstrutils.h" |
| 81 |
|
| 82 |
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch |
| 83 |
index c27e7233627..327e19a0c11 100644 |
| 84 |
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch |
| 85 |
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-openssl-1.0.0.patch |
| 86 |
@@ -1,7 +1,7 @@ |
| 87 |
http://bugs.gentoo.org/304283 |
| 88 |
|
| 89 |
---- crypto/wvx509.cc |
| 90 |
-+++ crypto/wvx509.cc |
| 91 |
+--- a/crypto/wvx509.cc |
| 92 |
++++ b/crypto/wvx509.cc |
| 93 |
@@ -1157,7 +1157,11 @@ |
| 94 |
|
| 95 |
if (ext) |
| 96 |
|
| 97 |
diff --git a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch |
| 98 |
index d6f7d6e7617..688178c3a1b 100644 |
| 99 |
--- a/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch |
| 100 |
+++ b/net-libs/wvstreams/files/wvstreams-4.6.1-parallel-make.patch |
| 101 |
@@ -1,5 +1,5 @@ |
| 102 |
---- Makefile |
| 103 |
-+++ Makefile |
| 104 |
+--- a/Makefile |
| 105 |
++++ b/Makefile |
| 106 |
@@ -131,12 +131,19 @@ |
| 107 |
# libwvstreams: stream/event handling library |
| 108 |
# |
| 109 |
@@ -34,8 +34,8 @@ |
| 110 |
TESTS += $(call tests_cc,dbus/tests) |
| 111 |
libwvdbus_OBJS += $(call objects,dbus) |
| 112 |
libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) |
| 113 |
---- wvrules-posix.mk |
| 114 |
-+++ wvrules-posix.mk |
| 115 |
+--- a/wvrules-posix.mk |
| 116 |
++++ b/wvrules-posix.mk |
| 117 |
@@ -85,12 +85,15 @@ |
| 118 |
$(AR) s $1 |
| 119 |
endef |
Archives