[Pkg-haskell-commits] darcs: haskell-hipmunk: Add system-chipmunk patch

[Joachim Breitner]

Thu Oct 13 18:58:39 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Add system-chipmunk patch
  Ignore-this: 2a43254abc5bb56773b425bd566fb2e

    A ./patches/
    A ./patches/series
    A ./patches/system-lib-chipmunk
    M ./rules +2

Thu Oct 13 18:58:39 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Add system-chipmunk patch
  Ignore-this: 2a43254abc5bb56773b425bd566fb2e
diff -rN -u old-haskell-hipmunk//patches/series new-haskell-hipmunk//patches/series
--- old-haskell-hipmunk//patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hipmunk//patches/series	2011-10-13 18:58:46.999344646 +0000
@@ -0,0 +1 @@
+system-lib-chipmunk
diff -rN -u old-haskell-hipmunk//patches/system-lib-chipmunk new-haskell-hipmunk//patches/system-lib-chipmunk
--- old-haskell-hipmunk//patches/system-lib-chipmunk	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hipmunk//patches/system-lib-chipmunk	2011-10-13 18:58:46.999344646 +0000
@@ -0,0 +1,94 @@
+Thu Oct 13 20:51:01 CEST 2011  Joachim Breitner <mail at joachim-breitner.de>
+  * Introduce a Cabal flag to build against a system installation of chipmunk
+Index: haskell-hipmunk-5.2.0.3/Hipmunk.cabal
+===================================================================
+--- haskell-hipmunk-5.2.0.3.orig/Hipmunk.cabal	2011-09-06 13:31:38.000000000 +0200
++++ haskell-hipmunk-5.2.0.3/Hipmunk.cabal	2011-10-13 20:57:25.000000000 +0200
+@@ -115,6 +115,9 @@
+   Description: Enable debugging.
+   Default: False
+ 
++Flag system-chipmunk
++  Description: Use the system-wide installed chipmunk library
++  Default: False
+ 
+ Library
+   Exposed-Modules:
+@@ -129,38 +132,47 @@
+   Other-Modules:
+       Physics.Hipmunk.Internal
+   Include-Dirs:
+-      Physics/Hipmunk,
+-      Chipmunk-5.3.5/include/chipmunk
++      Physics/Hipmunk
+   Includes:
+       wrapper.h
+-  C-Sources:
+-      Chipmunk-5.3.5/src/chipmunk.c,
+-      Chipmunk-5.3.5/src/constraints/cpConstraint.c,
+-      Chipmunk-5.3.5/src/constraints/cpDampedRotarySpring.c,
+-      Chipmunk-5.3.5/src/constraints/cpDampedSpring.c,
+-      Chipmunk-5.3.5/src/constraints/cpGearJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpGrooveJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpPinJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpPivotJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpRatchetJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpRotaryLimitJoint.c,
+-      Chipmunk-5.3.5/src/constraints/cpSimpleMotor.c,
+-      Chipmunk-5.3.5/src/constraints/cpSlideJoint.c,
+-      Chipmunk-5.3.5/src/cpArbiter.c,
+-      Chipmunk-5.3.5/src/cpArray.c,
+-      Chipmunk-5.3.5/src/cpBB.c,
+-      Chipmunk-5.3.5/src/cpBody.c,
+-      Chipmunk-5.3.5/src/cpCollision.c,
+-      Chipmunk-5.3.5/src/cpHashSet.c,
+-      Chipmunk-5.3.5/src/cpPolyShape.c,
+-      Chipmunk-5.3.5/src/cpShape.c,
+-      Chipmunk-5.3.5/src/cpSpace.c,
+-      Chipmunk-5.3.5/src/cpSpaceComponent.c,
+-      Chipmunk-5.3.5/src/cpSpaceHash.c,
+-      Chipmunk-5.3.5/src/cpSpaceQuery.c,
+-      Chipmunk-5.3.5/src/cpSpaceStep.c,
+-      Chipmunk-5.3.5/src/cpVect.c,
+-      Physics/Hipmunk/wrapper.c
++
++  if flag(system-chipmunk)
++    Include-Dirs:
++        /usr/include/chipmunk
++     Extra-libraries:
++        chipmunk
++  else
++    Include-Dirs:
++        Chipmunk-5.3.5/include/chipmunk
++    C-Sources:
++        Chipmunk-5.3.5/src/chipmunk.c,
++        Chipmunk-5.3.5/src/constraints/cpConstraint.c,
++        Chipmunk-5.3.5/src/constraints/cpDampedRotarySpring.c,
++        Chipmunk-5.3.5/src/constraints/cpDampedSpring.c,
++        Chipmunk-5.3.5/src/constraints/cpGearJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpGrooveJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpPinJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpPivotJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpRatchetJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpRotaryLimitJoint.c,
++        Chipmunk-5.3.5/src/constraints/cpSimpleMotor.c,
++        Chipmunk-5.3.5/src/constraints/cpSlideJoint.c,
++        Chipmunk-5.3.5/src/cpArbiter.c,
++        Chipmunk-5.3.5/src/cpArray.c,
++        Chipmunk-5.3.5/src/cpBB.c,
++        Chipmunk-5.3.5/src/cpBody.c,
++        Chipmunk-5.3.5/src/cpCollision.c,
++        Chipmunk-5.3.5/src/cpHashSet.c,
++        Chipmunk-5.3.5/src/cpPolyShape.c,
++        Chipmunk-5.3.5/src/cpShape.c,
++        Chipmunk-5.3.5/src/cpSpace.c,
++        Chipmunk-5.3.5/src/cpSpaceComponent.c,
++        Chipmunk-5.3.5/src/cpSpaceHash.c,
++        Chipmunk-5.3.5/src/cpSpaceQuery.c,
++        Chipmunk-5.3.5/src/cpSpaceStep.c,
++        Chipmunk-5.3.5/src/cpVect.c,
++        Physics/Hipmunk/wrapper.c
++
+   if flag(small_base)
+     Build-Depends: base >= 3 && < 5,
+                    array >= 0.1 && < 0.4,
diff -rN -u old-haskell-hipmunk//rules new-haskell-hipmunk//rules
--- old-haskell-hipmunk//rules	2011-10-13 18:58:46.995336685 +0000
+++ new-haskell-hipmunk//rules	2011-10-13 18:58:47.003334317 +0000
@@ -1,4 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_SETUP_GHC_CONFIGURE_ARGS=-fsystem-chipmunk
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk