[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#862064: unblock: haskell-glut/2.7.0.10-4



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package haskell-glut, to fix a rc problem with raincat:


diff -Nru haskell-glut-2.7.0.10/debian/changelog haskell-glut-2.7.0.10/debian/changelog
--- haskell-glut-2.7.0.10/debian/changelog	2016-10-27 18:33:52.000000000 -0400
+++ haskell-glut-2.7.0.10/debian/changelog	2017-05-06 16:56:46.000000000 -0400
@@ -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@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 -Nru haskell-glut-2.7.0.10/debian/patches/series haskell-glut-2.7.0.10/debian/patches/series
--- haskell-glut-2.7.0.10/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ haskell-glut-2.7.0.10/debian/patches/series	2017-05-06 16:54:24.000000000 -0400
@@ -0,0 +1 @@
+use-extra-libraries
diff -Nru haskell-glut-2.7.0.10/debian/patches/use-extra-libraries haskell-glut-2.7.0.10/debian/patches/use-extra-libraries
--- haskell-glut-2.7.0.10/debian/patches/use-extra-libraries	1969-12-31 19:00:00.000000000 -0500
+++ haskell-glut-2.7.0.10/debian/patches/use-extra-libraries	2017-05-06 16:56:44.000000000 -0400
@@ -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
+   }
+ 

unblock haskell-glut/2.7.0.10-4

-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


Reply to: