diff options
| author | schnoebe <schnoebe@pkgsrc.org> | 2011-10-28 17:34:06 +0000 |
|---|---|---|
| committer | schnoebe <schnoebe@pkgsrc.org> | 2011-10-28 17:34:06 +0000 |
| commit | 31d65929513e3ac4cd7408ca3c4ae1f90096cbfd (patch) | |
| tree | 4a5ec58fe787e67fe8a80003d2335f0bf3d0d978 /chat/spectrum/patches | |
| parent | f2ea6a09935928222d59b660749593e748926288 (diff) | |
| download | pkgsrc-31d65929513e3ac4cd7408ca3c4ae1f90096cbfd.tar.gz | |
Quiet a warning from cmake;
fix an unwrapped include of ev.h.
Diffstat (limited to 'chat/spectrum/patches')
| -rw-r--r-- | chat/spectrum/patches/patch-CMakeLists.txt | 11 | ||||
| -rw-r--r-- | chat/spectrum/patches/patch-src_geventloop.h | 18 | ||||
| -rw-r--r-- | chat/spectrum/patches/patch-src_spectrum_util.cpp | 7 |
3 files changed, 32 insertions, 4 deletions
diff --git a/chat/spectrum/patches/patch-CMakeLists.txt b/chat/spectrum/patches/patch-CMakeLists.txt index b7bbc9000b4..d0c43a13e30 100644 --- a/chat/spectrum/patches/patch-CMakeLists.txt +++ b/chat/spectrum/patches/patch-CMakeLists.txt @@ -1,11 +1,20 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2011/10/28 00:27:58 schnoebe Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2011/10/28 17:34:07 schnoebe Exp $ # # change man path to be configurable to PKGSRC standards. +# silence a warning from cmake # --- CMakeLists.txt.orig 2010-07-13 17:38:39.000000000 +0000 +++ CMakeLists.txt +@@ -3,6 +3,7 @@ project(spectrum) + cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR) + if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) ++ cmake_policy(SET CMP0017 OLD) + endif(COMMAND cmake_policy) + + file(WRITE src/transport_config.h "\n") @@ -176,11 +176,11 @@ INSTALL(FILES INSTALL(FILES diff --git a/chat/spectrum/patches/patch-src_geventloop.h b/chat/spectrum/patches/patch-src_geventloop.h new file mode 100644 index 00000000000..15977d9e0a4 --- /dev/null +++ b/chat/spectrum/patches/patch-src_geventloop.h @@ -0,0 +1,18 @@ +$NetBSD: patch-src_geventloop.h,v 1.1 2011/10/28 17:34:07 schnoebe Exp $ + +# wrap the usage of ev.h in WITH_LIBEVENT (as should have been done.) +# pushed upstream as http://spectrum.im/issues/233 + +--- src/geventloop.h.orig 2011-06-11 13:17:44.000000000 +0000 ++++ src/geventloop.h +@@ -24,7 +24,9 @@ + #include <glib.h> + #include "purple.h" + #include "eventloop.h" +-#include "ev.h" ++#ifdef WITH_LIBEVENT ++# include "ev.h" ++#endif + + #define READ_COND (G_IO_IN | G_IO_HUP | G_IO_ERR) + #define WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL) diff --git a/chat/spectrum/patches/patch-src_spectrum_util.cpp b/chat/spectrum/patches/patch-src_spectrum_util.cpp index 985c556ea14..ceb3a9fa761 100644 --- a/chat/spectrum/patches/patch-src_spectrum_util.cpp +++ b/chat/spectrum/patches/patch-src_spectrum_util.cpp @@ -1,7 +1,8 @@ -$NetBSD: patch-src_spectrum_util.cpp,v 1.1 2011/10/28 00:27:58 schnoebe Exp $ +$NetBSD: patch-src_spectrum_util.cpp,v 1.2 2011/10/28 17:34:07 schnoebe Exp $ -revise the memory usage statistics handling to work only on FreeBSD -(where it was designed.) +# revise the memory usage statistics handling to work only on FreeBSD +# (where it was designed.) +# pushed upstream as http://spectrum.im/issues/232 --- src/spectrum_util.cpp.orig 2011-06-11 13:17:44.000000000 +0000 +++ src/spectrum_util.cpp |