From 24585233a8385ca952c9635f35494c723f3d7a1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Tue, 7 Jul 2015 11:17:30 +0200 Subject: [PATCH] Fixed FTBFS due to parenthesization (Closes: #791544) --- .../default-soundsystem_parentheses.patch | 20 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 21 insertions(+) create mode 100644 debian/patches/default-soundsystem_parentheses.patch create mode 100644 debian/patches/series diff --git a/debian/patches/default-soundsystem_parentheses.patch b/debian/patches/default-soundsystem_parentheses.patch new file mode 100644 index 0000000..e68b28b --- /dev/null +++ b/debian/patches/default-soundsystem_parentheses.patch @@ -0,0 +1,20 @@ +Description: proper parentheses around bitwise operations + the original "(!soundSystem & (SYS_API_ANY))" is + a) wrong + b) FTBFS on g++5 +Author: IOhannes m zmölnig +Forwarded: https://github.com/monocasual/giada/pull/50 +Last-Update: 2015-07-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- giada.orig/src/conf.cpp ++++ giada/src/conf.cpp +@@ -207,7 +207,7 @@ + logMode = atoi(getValue("logMode").c_str()); + + soundSystem = atoi(getValue("soundSystem").c_str()); +- if (!soundSystem & (SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS; ++ if (!(soundSystem & SYS_API_ANY)) soundSystem = DEFAULT_SOUNDSYS; + + soundDeviceOut = atoi(getValue("soundDeviceOut").c_str()); + if (soundDeviceOut < 0) soundDeviceOut = DEFAULT_SOUNDDEV_OUT; diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..69ca90a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +default-soundsystem_parentheses.patch -- 2.30.2