From 5961d105e9702e103f4588e12764597f285ca342 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Wed, 25 Jul 2012 08:17:28 +0000 Subject: [PATCH] added patch to make it compile without debug --- net-im/jabberd2/Manifest | 3 +- .../files/jabberd2-2.2.16-no_debug.patch | 51 +++++++++++++++++++ net-im/jabberd2/jabberd2-2.2.16.ebuild | 6 +++ 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index d0037df..93a1923 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,5 +1,6 @@ AUX jabberd2-2.2.1.init 1625 RMD160 eb56ebb821ca11bdd09ddf07ba0899f75273e022 SHA1 d7116a599165535d8adf64da89e31f5342309291 SHA256 23c37f789d84575824a3cd8d009c88e7035ca1222cdb24e0c8437e1a6e55bec1 AUX jabberd2-2.2.1.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b +AUX jabberd2-2.2.16-no_debug.patch 1597 RMD160 bcd1b4de0efe21ffcd5d86bc26972f5576aa4f23 SHA1 56d46f737d55ee9ca26f86f18303260114f2fcff SHA256 705e041cd90a25c33628cc398c6c62ada46142d70c21315f5fb0d52d5ea02bc0 AUX jabberd2-2.2.16.init 1626 RMD160 6fd32051a2ce16adbf1bbcbadb652bf4cd878a06 SHA1 48a7ba6e38b89fdbd41353e4c68ac43174d4e992 SHA256 fb014b0b11e499fd67ce7918939320cc97acecd3a1e055dde554e569a3d48843 AUX jabberd2-2.2.16.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b AUX jabberd2-2.2.4.init 1625 RMD160 ef5c466dd5976cfa7aac5abb797b103befc52e60 SHA1 5a66d45559bae3d946e92ff517e7a3c0eabb9f11 SHA256 f01a66b3303f1ac366492e913a82952996b75619335ae210357e43e4fbed37a7 @@ -9,4 +10,4 @@ AUX jabberd2-2.2.5.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 AUX jabberd2-2.2.8.init 1625 RMD160 6c0f847a6b220f379244e2d47b1c0ae59615803c SHA1 fc1cf432b2a12ef924eb4707d9804c3e1d58d0e7 SHA256 38e08cc155b9a7f7781a3255f7a1bbb885fed9eb22d72a37349b5f7790cf1689 AUX jabberd2-2.2.8.pamd 158 RMD160 3143cb1689fbebb51c0d72fa4c6b79ee9c015185 SHA1 5a95607d50b470107e9a0556fb4591688faff02c SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b DIST jabberd-2.2.16.tar.gz 2818476 RMD160 c778babd0a883506f874dff56f879f800533e73c SHA1 d39f7475ec676a127e948f2c5f73d7605ec5a7f9 SHA256 112844e0319dc31faf9225930fe10f811b9faefe2e4e30b73d8e3ab965a7d4bf -EBUILD jabberd2-2.2.16.ebuild 2972 RMD160 b958560468ea4d92e23d11e8cab6c278f006b014 SHA1 08ce785a7239b5eb999b5e67f16780583b54ff0e SHA256 8410de448e3b84b0c35982cbb23976375d4d813a20bfc0c4fed4d467227f16c9 +EBUILD jabberd2-2.2.16.ebuild 3059 RMD160 65d24116253a40a5c03395ac58d27a4e3d8900e1 SHA1 5891b534caf2ba7bc89064e6eb2a78a5341b1ac7 SHA256 05c75d8cb1ca31a661e60b3dbdff03aa8d66a3bc161571d315b172a8c30a6b5e diff --git a/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch b/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch new file mode 100644 index 0000000..e48ad9e --- /dev/null +++ b/net-im/jabberd2/files/jabberd2-2.2.16-no_debug.patch @@ -0,0 +1,51 @@ +diff -ur jabberd-2.2.16/util/log.c jabberd-2.2.16_patched/util/log.c +--- jabberd-2.2.16/util/log.c 2012-05-04 14:51:08.000000000 +0000 ++++ jabberd-2.2.16_patched/util/log.c 2012-07-25 08:10:49.004560934 +0000 +@@ -223,12 +223,12 @@ + debug_flag = v; + } + +-int set_debug_log_from_config(config_t c) ++void set_debug_log_from_config(config_t c) + { + return set_debug_file(config_get_one(c, "log.debug", 0)); +-}; ++} + +-JABBERD2_API int set_debug_file(const char *filename) ++JABBERD2_API void set_debug_file(const char *filename) + { + // Close debug output file but not stderr + if (debug_log_target != 0 && +@@ -255,7 +255,7 @@ + // set stderr + debug_log_target = stderr; + } +-}; ++} + + #else /* DEBUG */ + void debug_log(const char *file, int line, const char *msgfmt, ...) +@@ -263,4 +263,7 @@ + + void set_debug_flag(int v) + { } ++ ++void set_debug_log_from_config(config_t c) ++{ } + #endif +diff -ur jabberd-2.2.16/util/util.h jabberd-2.2.16_patched/util/util.h +--- jabberd-2.2.16/util/util.h 2012-05-04 14:51:08.000000000 +0000 ++++ jabberd-2.2.16_patched/util/util.h 2012-07-25 08:11:19.612564607 +0000 +@@ -414,9 +414,9 @@ + JABBERD2_API int get_debug_flag(void); + JABBERD2_API void set_debug_flag(int v); + JABBERD2_API void debug_log(const char *file, int line, const char *msgfmt, ...); +-JABBERD2_API int set_debug_file(const char *filename); ++JABBERD2_API void set_debug_file(const char *filename); + +-JABBERD2_API int set_debug_log_from_config(config_t c); ++JABBERD2_API void set_debug_log_from_config(config_t c); + + #define ZONE __FILE__,__LINE__ + #define MAX_DEBUG 8192 diff --git a/net-im/jabberd2/jabberd2-2.2.16.ebuild b/net-im/jabberd2/jabberd2-2.2.16.ebuild index 7bf7fc1..6c57072 100644 --- a/net-im/jabberd2/jabberd2-2.2.16.ebuild +++ b/net-im/jabberd2/jabberd2-2.2.16.ebuild @@ -32,6 +32,12 @@ RDEPEND="${DEPEND} S="${WORKDIR}/jabberd-${PV}" +src_prepare() { + if use -debug; then + epatch "${FILESDIR}"/${P}-no_debug.patch + fi +} + src_compile() { # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3