From 176a1fcdf53f54c92fbc57f49f610bb7c91ec8f4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 21 Dec 2016 22:21:36 +0100 Subject: Add some bugfix patches cherry-picked upstream. --- debian/patches/020161125~ad22be4.patch | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 debian/patches/020161125~ad22be4.patch (limited to 'debian/patches/020161125~ad22be4.patch') diff --git a/debian/patches/020161125~ad22be4.patch b/debian/patches/020161125~ad22be4.patch new file mode 100644 index 0000000..46013bc --- /dev/null +++ b/debian/patches/020161125~ad22be4.patch @@ -0,0 +1,38 @@ +Description: Do not fail to build if litesql is not there +Origin: upstream, https://lab.louiz.org/louiz/biboumi/commit/ad22be4 +Author: louiz’ +Forwarded: yes +Last-Update: 2016-12-21 + +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -12,7 +12,9 @@ + + #include + #include +-#include ++#ifdef USE_DATABASE ++# include ++#endif + + // A flag set by the SIGINT signal handler. + static std::atomic stop(false); +@@ -83,11 +85,14 @@ + if (hostname.empty()) + return config_help("hostname"); + ++ ++#ifdef USE_DATABASE + try { +- open_database(); +- } catch (const litesql::DatabaseError&) { +- return 1; +- } ++ open_database(); ++ } catch (const litesql::DatabaseError&) { ++ return 1; ++ } ++#endif + + // Block the signals we want to manage. They will be unblocked only during + // the epoll_pwait or ppoll calls. This avoids some race conditions, -- cgit v1.2.3