[DHG_packages] 02/02: GLUT: Use extra-libraries

[Joachim Breitner]

This is an automated email from the git hooks/post-receive script.

nomeata pushed a commit to annotated tag haskell-glut_v2.7.0.10-4
in repository DHG_packages.

commit eeb1eaf9567bfb8c8e387d6151c38da2816559a8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Sat May 6 17:33:15 2017 -0400

    GLUT: Use extra-libraries
---
 p/haskell-glut/debian/changelog                   |  7 +++++++
 p/haskell-glut/debian/patches/series              |  1 +
 p/haskell-glut/debian/patches/use-extra-libraries | 25 +++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/p/haskell-glut/debian/changelog b/p/haskell-glut/debian/changelog
index 024d755..74311d3 100644
--- a/p/haskell-glut/debian/changelog
+++ b/p/haskell-glut/debian/changelog
@@ -1,3 +1,10 @@
+haskell-glut (2.7.0.10-4) unstable; urgency=medium
+
+  * Use extra-libraries: GLUT so that this properly links against libglut
+    (Closes: 861976)
+
+ -- Joachim Breitner <nomeata at debian.org>  Sat, 06 May 2017 16:56:46 -0400
+
 haskell-glut (2.7.0.10-3) unstable; urgency=medium
 
   * Upload to unstable as part of GHC 8 transition.
diff --git a/p/haskell-glut/debian/patches/series b/p/haskell-glut/debian/patches/series
new file mode 100644
index 0000000..bc5e5ed
--- /dev/null
+++ b/p/haskell-glut/debian/patches/series
@@ -0,0 +1 @@
+use-extra-libraries
diff --git a/p/haskell-glut/debian/patches/use-extra-libraries b/p/haskell-glut/debian/patches/use-extra-libraries
new file mode 100644
index 0000000..377cf70
--- /dev/null
+++ b/p/haskell-glut/debian/patches/use-extra-libraries
@@ -0,0 +1,25 @@
+Index: haskell-glut/GLUT.cabal
+===================================================================
+--- haskell-glut.orig/GLUT.cabal	2016-05-12 12:47:38.000000000 -0400
++++ haskell-glut/GLUT.cabal	2017-05-06 16:55:16.164611101 -0400
+@@ -103,6 +103,7 @@
+   else
+     cpp-options: "-DCALLCONV=ccall"
+     cc-options: "-DUSE_DLSYM"
++    extra-libraries: glut
+ 
+ executable BOGLGP01-OnYourOwn1
+   if !flag(BuildExamples)
+Index: haskell-glut/cbits/HsGLUT.c
+===================================================================
+--- haskell-glut.orig/cbits/HsGLUT.c	2016-05-12 12:47:38.000000000 -0400
++++ haskell-glut/cbits/HsGLUT.c	2017-05-06 16:56:30.898637798 -0400
+@@ -66,7 +66,7 @@
+       handle = dlopen("/System/Library/Frameworks/GLUT.framework/GLUT", RTLD_LAZY | RTLD_GLOBAL);
+     }
+ #else
+-    handle = dlopen("libglut.so", RTLD_LAZY | RTLD_GLOBAL);
++    handle = dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
+ #endif
+   }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git