Package: freej
Version: 0.10git20090824
Severity: wishlist
Tags: patch

freej only really needs mozilla-js to build. Here is a small patch to
configure.ac (and control file) to remove the need for a xulrunner-dev
build dependency.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.30-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -ruN freej-0.10git20090824.orig/configure freej-0.10git20090824/configure
--- freej-0.10git20090824.orig/configure	2009-10-10 19:10:41.651421497 +0200
+++ freej-0.10git20090824/configure	2009-10-10 19:13:41.430379966 +0200
@@ -20401,12 +20401,12 @@
         pkg_cv_MOZJS_CFLAGS="$MOZJS_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-js libxul-embedding-unstable\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-js libxul-embedding-unstable") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-js\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-js") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MOZJS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-js libxul-embedding-unstable" 2>/dev/null`
+  pkg_cv_MOZJS_CFLAGS=`$PKG_CONFIG --cflags "mozilla-js" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20419,12 +20419,12 @@
         pkg_cv_MOZJS_LIBS="$MOZJS_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-js libxul-embedding-unstable\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "mozilla-js libxul-embedding-unstable") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mozilla-js\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "mozilla-js") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_MOZJS_LIBS=`$PKG_CONFIG --libs "mozilla-js libxul-embedding-unstable" 2>/dev/null`
+  pkg_cv_MOZJS_LIBS=`$PKG_CONFIG --libs "mozilla-js" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -20443,9 +20443,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        MOZJS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-js libxul-embedding-unstable"`
+	        MOZJS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mozilla-js"`
         else
-	        MOZJS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-js libxul-embedding-unstable"`
+	        MOZJS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mozilla-js"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$MOZJS_PKG_ERRORS" >&5
diff -ruN freej-0.10git20090824.orig/configure.ac freej-0.10git20090824/configure.ac
--- freej-0.10git20090824.orig/configure.ac	2009-10-10 19:10:41.651421497 +0200
+++ freej-0.10git20090824/configure.ac	2009-10-10 19:12:22.152204622 +0200
@@ -586,7 +586,7 @@
 dnl compile including the javascript interpreter
 dnl ==============================================================
 
-PKG_CHECK_MODULES(MOZJS, mozilla-js libxul-embedding-unstable, have_mozjs=yes, have_mozjs=no)
+PKG_CHECK_MODULES(MOZJS, mozilla-js, have_mozjs=yes, have_mozjs=no)
 if test x$have_mozjs = xno; then
 PKG_CHECK_MODULES(MOZJS, xulrunner-js, have_mozjs=yes, have_mozjs=no)
  if test x$have_mozjs = xyes; then
diff -ruN freej-0.10git20090824.orig/debian/control freej-0.10git20090824/debian/control
--- freej-0.10git20090824.orig/debian/control	2009-10-10 19:10:41.574452824 +0200
+++ freej-0.10git20090824/debian/control	2009-10-10 19:14:02.590456055 +0200
@@ -14,7 +14,7 @@
  libavformat-dev, libswscale-dev, libunicap2-dev, libcwiid1-dev, libfftw3-dev,
  libjack-dev, libasound-dev, libhtml-template-perl, python-all-dev,
  python-central (>= 0.6), swig, libmozjs-dev (>= 1.9.0.6),
- xulrunner-dev (>=1.9.0.6), libsdl-gfx1.2-dev (>= 2.0.19), libx11-dev,
+ libsdl-gfx1.2-dev (>= 2.0.19), libx11-dev,
  liblo0-dev, libsamplerate-dev, libcv-dev, libshout-dev, libsdl-ttf2.0-dev,
  libsdl-image1.2-dev, doxygen, libglu1-mesa-dev
 Standards-Version: 3.8.3

Reply via email to