[Lunar-commits] <moonbase> libproxy: xulrunner installs jsapi.h in /usr/include/xulrunner-1.9.0.6/unstable and libproxy insists on looking in the stable path. The BUILD simply over rides the include with the correct path and compensates for any future version bumps of xulrunner.

[Dennis 'stumbles' Veatch]

commit 18c2a1ca4f21531e2c4a89fa37d5d76e1c8e3142
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Sat Mar 7 20:46:10 2009 -0500

    libproxy: xulrunner installs jsapi.h in /usr/include/xulrunner-1.9.0.6/unstable
    and libproxy insists on looking in the stable path. The BUILD simply over rides
    the include with the correct path and compensates for any future version
    bumps of xulrunner.
    
    Using the above technique I could not get libproxy to like the jsapi.h from
    firefox. It could find it, but tons of errors and warnings were thrown and
    the make finally croaks.
    
    Also adding another optional_depends for webkit. On my AMD X2 +4200, webkit
    took 44m16s to install, minus download time.... for those on slower boxes.
---
 libs/libproxy/BUILD   |    9 +++++++++
 libs/libproxy/DEPENDS |   16 +++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/libs/libproxy/BUILD b/libs/libproxy/BUILD
new file mode 100644
index 0000000..7ba3007
--- /dev/null
+++ b/libs/libproxy/BUILD
@@ -0,0 +1,9 @@
+(
+
+  if in_depends $MODULE xulrunner; then
+  CFLAGS="$CFLAGS -I/usr/include/xulrunner-$(installed_version xulrunner)/unstable"
+  fi &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/libs/libproxy/DEPENDS b/libs/libproxy/DEPENDS
index ca5c999..1d1ab0c 100644
--- a/libs/libproxy/DEPENDS
+++ b/libs/libproxy/DEPENDS
@@ -1,6 +1,6 @@
-optional_depends  "gnome2"            \
-                  "--with-gnome"      \
-                  "--without-gnome"   \
+optional_depends  "gnome2"            \                                                                              
+                  "--with-gnome"      \                                                                              
+                  "--without-gnome"   \                                                                              
                   "for GNOME support"
 
 optional_depends  "kde4"              \
@@ -18,11 +18,17 @@ optional_depends  "Python"            \
                   "--without-python"  \
                   "for the Python bindings"
 
+optional_depends  "webkit"            \
+                  "--with-webkit"     \
+                  "--without-webkit"  \
+                  "for web content engine support"
+
 #optional_depends  "%JAVA_SDK"         \
-#                  ""                  \
-#                  ""                  \
+#                  "--with-java"       \
+#                  "--without-java"    \
 #                  "for Java bindings"
 
 #optional_depends  "mono"              \
 #                  ""                  \
 #                  ""                  \
+