Source Mage code commit list

[George Sherwood <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by George Sherwood <chat AT sourcemage.org>:

 http/firefox/HISTORY              |    4 +++
 http/firefox/INSTALL              |    2 +
 http/firefox/firefox-config.patch |   46 
++++++++++++++++++++++++++++++++++++++
 video/vlc/BUILD                   |    2 -
 video/vlc/HISTORY                 |    4 +++
 5 files changed, 57 insertions(+), 1 deletion(-)

New commits:
commit 3455ed33e161e257f76a7db487d95372bdab55ba
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

    vlc: Updated OPTS for using firefox plugin.  Matches the directories for 
our install. Bug 13552.

commit 0951f36aab9501aa45bb6022fee6abbe65689f01
Author: George Sherwood <chat AT sourcemage.org>
Commit: George Sherwood <chat AT sourcemage.org>

    firefox:  Fix the installed firefox-config file to match the installed 
configuration.  This is part of the fix for Bug 13552

diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 02dabbf..991fbbd 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2007-02-25 George Sherwood <george AT beernabeer.com>
+       * INSTALL: Added patch for firefox-config to match how we install.
+       * firefox-config.patch: Added patch to get paths correct.
+
 2007-02-24 George Sherwood <george AT beernabeer.com>
        * INSTALL: change fix for *.pc files from 2.0.0.1 to 2.0.0.2
 
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index c44593d..453322b 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -3,6 +3,8 @@ FIREFOX_HOME=$INSTALL_ROOT/usr/lib/firef
 if  spell_ok  Firebird;  then
   dispel Firebird
 fi  &&
+#fix firefox-config file to match installed configuration
+patch -p0 < $SCRIPT_DIRECTORY/firefox-config.patch &&
 
 # Not recommended by http://www.mozilla.org/build to use
 # make install.  Manually install the files.
diff --git a/http/firefox/firefox-config.patch 
b/http/firefox/firefox-config.patch
new file mode 100644
index 0000000..3ef7fc8
--- /dev/null
+++ b/http/firefox/firefox-config.patch
@@ -0,0 +1,46 @@
+--- build/unix/firefox-config.orig     2007-02-25 11:06:08.000000000 +0400
++++ build/unix/firefox-config  2007-02-25 13:26:14.000000000 +0400
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+-prefix=/usr/local
+-exec_prefix=/usr/local
++prefix=/usr
++exec_prefix=/usr
+ exec_prefix_set=no
+ 
+ usage()
+@@ -60,8 +60,8 @@
+       exit 0
+       ;;
+     --cflags)
+-      if test "/usr/local/include/firefox-2.0.0.2" != /usr/include ; then
+-        includes="-I/usr/local/include/firefox-2.0.0.2"
++      if test "/usr/include/firefox" != /usr/include ; then
++        includes="-I/usr/include/firefox"
+       fi
+       echo_cflags=yes
+       ;;
+@@ -105,13 +105,13 @@
+ if test "$echo_cflags" = "yes"; then
+     nspr_cflags="-I/usr/include/nspr"
+     for n in $echo_components; do
+-      component_includes="$component_includes 
-I/usr/local/include/firefox-2.0.0.2/$n"
++      component_includes="$component_includes -I/usr/include/firefox/$n"
+     done
+     echo $component_includes $includes $nspr_cflags
+ fi
+ 
+ if test "$echo_idlflags" = "yes"; then
+-    echo "-I/usr/local/share/idl/firefox-2.0.0.2"
++    echo "-I/usr/share/idl/firefox"
+ fi
+ 
+ _nspr_libs="-L/usr/lib -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+@@ -138,5 +138,5 @@
+           ;;
+         esac
+     done
+-    echo -L/usr/local/lib/firefox-2.0.0.2 $libs
++    echo -L/usr/lib $libs
+ fi
diff --git a/video/vlc/BUILD b/video/vlc/BUILD
index 99af222..14b1d2b 100755
--- a/video/vlc/BUILD
+++ b/video/vlc/BUILD
@@ -8,7 +8,7 @@ fi  &&
 export OPTS="$OPTS --disable-dependency-tracking --enable-release"  &&
 
 if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
-  OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/firefox-config 
XPIDL=/usr/lib/firefox/xpidl XPIDL_INCL=-I/usr/share/idl/firefox"  &&
+  OPTS="$OPTS MOZILLA_CONFIG=/usr/lib/firefox/firefox-config 
XPIDL=/usr/lib/firefox/ XPIDL_INCL=-I/usr/share/idl/firefox"  &&
   CPPFLAGS="$CPPFLAGS -I/usr/include/nspr"
 elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
   OPTS="$OPTS MOZILLA_CONFIG=/usr/bin/seamonkey-config 
XPIDL=/usr/lib/seamonkey/xpidl XPIDL_INCL=-I/usr/share/idl/seamonkey"  &&
diff --git a/video/vlc/HISTORY b/video/vlc/HISTORY
index 98f9cd3..8097ebf 100644
--- a/video/vlc/HISTORY
+++ b/video/vlc/HISTORY
@@ -1,3 +1,7 @@
+2007-02-25 George Sherwood <george AT beernabeer.com>
+       * BUILD: Updated OPTS for firefox plugin to match our install.
+         Bug 13352.
+
 2007-02-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * TRIGGERS: added check_self in case a provider of LIBAVCODEC is
          cast.