all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 91fc9e3b5882069afcb8eba29a93dac6213e4b19 3200 bytes (raw)
name: gnu/packages/patches/chromium-system-libevent.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
 
description: build using system libevent
author: Michael Gilbert <mgilbert@debian.org>

https://anonscm.debian.org/cgit/pkg-chromium/pkg-chromium.git/tree/debian/patches/system/event.patch

--- a/third_party/webrtc/base/task_queue_libevent.cc
+++ b/third_party/webrtc/base/task_queue_libevent.cc
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "base/third_party/libevent/event.h"
+#include <event.h>
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/task_queue_posix.h"
--- a/tools/gn/bootstrap/bootstrap.py
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -609,26 +609,6 @@ def write_gn_ninja(path, root_gen_dir, o
         'base/time/time_now_posix.cc',
         'base/trace_event/heap_profiler_allocation_register_posix.cc',
     ])
-    static_libraries['libevent'] = {
-        'sources': [
-            'base/third_party/libevent/buffer.c',
-            'base/third_party/libevent/evbuffer.c',
-            'base/third_party/libevent/evdns.c',
-            'base/third_party/libevent/event.c',
-            'base/third_party/libevent/event_tagging.c',
-            'base/third_party/libevent/evrpc.c',
-            'base/third_party/libevent/evutil.c',
-            'base/third_party/libevent/http.c',
-            'base/third_party/libevent/log.c',
-            'base/third_party/libevent/poll.c',
-            'base/third_party/libevent/select.c',
-            'base/third_party/libevent/signal.c',
-            'base/third_party/libevent/strlcpy.c',
-        ],
-        'tool': 'cc',
-        'include_dirs': [],
-        'cflags': cflags + ['-DHAVE_CONFIG_H'],
-    }
 
   if is_linux or is_aix:
     ldflags.extend(['-pthread'])
@@ -660,13 +640,7 @@ def write_gn_ninja(path, root_gen_dir, o
         'base/allocator/allocator_shim.cc',
         'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
       ])
-      libs.extend(['-lrt', '-latomic', '-lnspr4'])
-      static_libraries['libevent']['include_dirs'].extend([
-          os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')
-      ])
-      static_libraries['libevent']['sources'].extend([
-         'base/third_party/libevent/epoll.c',
-      ])
+      libs.extend(['-lrt', '-latomic', '-lnspr4', '-levent'])
     else:
       libs.extend(['-lrt'])
       static_libraries['base']['sources'].extend([
@@ -703,12 +677,6 @@ def write_gn_ninja(path, root_gen_dir, o
         'base/time/time_mac.cc',
         'base/threading/platform_thread_mac.mm',
     ])
-    static_libraries['libevent']['include_dirs'].extend([
-        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')
-    ])
-    static_libraries['libevent']['sources'].extend([
-        'base/third_party/libevent/kqueue.c',
-    ])
 
     libs.extend([
         '-framework', 'AppKit',
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -14,7 +14,7 @@
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "base/third_party/libevent/event.h"
+#include <event.h>
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"

debug log:

solving 91fc9e3b5 ...
found 91fc9e3b5 in https://yhetil.org/guix/87y3qvb15k.fsf@fastmail.com/

applying [1/1] https://yhetil.org/guix/87y3qvb15k.fsf@fastmail.com/
diff --git a/gnu/packages/patches/chromium-system-libevent.patch b/gnu/packages/patches/chromium-system-libevent.patch
new file mode 100644
index 000000000..91fc9e3b5

1:17: trailing whitespace.
 
1:49: trailing whitespace.
 
1:77: trailing whitespace.
 
Checking patch gnu/packages/patches/chromium-system-libevent.patch...
Applied patch gnu/packages/patches/chromium-system-libevent.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 91fc9e3b5882069afcb8eba29a93dac6213e4b19	gnu/packages/patches/chromium-system-libevent.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.