[DHG_packages] 01/02: threadscope: Apply patch to fix FTBFS on non-x86
Ilias Tsitsimpis
iliastsi-guest at moszumanska.debian.org
Wed Nov 8 15:29:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
iliastsi-guest pushed a commit to branch master
in repository DHG_packages.
commit a0a6b54e645d389b0e309f4b2a82459335a4b3cb
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date: Wed Nov 8 16:40:09 2017 +0200
threadscope: Apply patch to fix FTBFS on non-x86
Closes: #876525
---
p/threadscope/debian/changelog | 5 +++--
p/threadscope/debian/patches/no-windows-cconv | 24 ++++++++++++++++++++++++
p/threadscope/debian/patches/series | 1 +
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/p/threadscope/debian/changelog b/p/threadscope/debian/changelog
index 2043aa7..81b8d4d 100644
--- a/p/threadscope/debian/changelog
+++ b/p/threadscope/debian/changelog
@@ -1,12 +1,13 @@
-threadscope (0.2.9-2) UNRELEASED; urgency=medium
+threadscope (0.2.9-2) unstable; urgency=medium
* Change Priority to optional. Since Debian Policy version 4.0.1,
priority extra has been deprecated.
* Use the HTTPS form of the copyright-format URL
* Modify d/watch and Source field in d/copyright to use HTTPS
* Declare compliance with Debian policy 4.1.1
+ * Apply patch to fix FTBFS on non-x86 (Closes: #876525)
- -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 01 Nov 2017 12:15:48 +0200
+ -- Ilias Tsitsimpis <iliastsi at debian.org> Wed, 08 Nov 2017 16:38:51 +0200
threadscope (0.2.9-1) unstable; urgency=medium
diff --git a/p/threadscope/debian/patches/no-windows-cconv b/p/threadscope/debian/patches/no-windows-cconv
new file mode 100644
index 0000000..2dda3b6
--- /dev/null
+++ b/p/threadscope/debian/patches/no-windows-cconv
@@ -0,0 +1,24 @@
+Description: Do not include windows_cconv.h on non mingw32 systems
+ Do not include windows_cconv.h on non windows systems, or else build
+ fails with `#error Unknown mingw32 arch` on architectures other than
+ i386 or x86_64.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+Forwarded: https://github.com/haskell/ThreadScope/pull/79
+Bug-Debian: https://bugs.debian.org/876525
+
+Index: b/GUI/GtkExtras.hs
+===================================================================
+--- a/GUI/GtkExtras.hs
++++ b/GUI/GtkExtras.hs
+@@ -18,9 +18,10 @@ import Control.Concurrent.MVar
+ #if !(mingw32_HOST_OS || mingw32_TARGET_OS)
+ import System.Glib.GError
+ import Control.Monad
+-#endif
+
++#else
+ #include "windows_cconv.h"
++#endif
+
+ waitGUI :: IO ()
+ waitGUI = do
diff --git a/p/threadscope/debian/patches/series b/p/threadscope/debian/patches/series
new file mode 100644
index 0000000..7aa08fd
--- /dev/null
+++ b/p/threadscope/debian/patches/series
@@ -0,0 +1 @@
+no-windows-cconv
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list