[SM-Commit] GIT changes to master grimoire by George Sherwood (56d5617356808371fb09bce658ed2620649b98aa)

George Sherwood scm at sourcemage.org
Mon Nov 10 17:33:19 EST 2008


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 gnome2-libs/yelp/BUILD   |    3 +--
 gnome2-libs/yelp/HISTORY |    4 ++++
 http/xulrunner/HISTORY   |    1 +
 http/xulrunner/PRE_BUILD |    3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 56d5617356808371fb09bce658ed2620649b98aa
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    yelp: Removed un-needed flags for xulrunner and nspr.
    --without-serch is invalid option. Breaks build.

commit 91dd6d863c6666bcd8275e161f542d686a6394a9
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    xulrunner: Added nspr to libxul-embedding.pc

diff --git a/gnome2-libs/yelp/BUILD b/gnome2-libs/yelp/BUILD
index af7dc20..c23af89 100755
--- a/gnome2-libs/yelp/BUILD
+++ b/gnome2-libs/yelp/BUILD
@@ -7,7 +7,7 @@ if [ "$YELPINFO" == "y" ]; then
 fi  &&
 
 if [ "$YELPSEARCH" == "n" ]; then
-   OPTS="$OPTS --without-search"
+   OPTS="$OPTS --with-search=basic"
 fi  &&
 
 if test "$(get_spell_provider $SPELL GECKO)" = firefox; then
@@ -16,7 +16,6 @@ elif test "$(get_spell_provider $SPELL GECKO)" = seamonkey; then
    OPTS="$OPTS --with-gecko=seamonkey"
 elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
    OPTS="$OPTS --with-gecko=libxul-embedding"
-   CXXFLAGS="$CXXFLAGS -I/$INSTALL_ROOT/usr/include/nspr"
 else
    OPTS="$OPTS --with-gecko=mozilla"
 fi  &&
diff --git a/gnome2-libs/yelp/HISTORY b/gnome2-libs/yelp/HISTORY
index 5f31971..aaf469a 100644
--- a/gnome2-libs/yelp/HISTORY
+++ b/gnome2-libs/yelp/HISTORY
@@ -1,3 +1,7 @@
+2008-11-10 George Sherwood <gsherwood at sourcemage.org>
+	* BUILD: Removed adding include for nspr for xulrunner.
+	  Fixed in xulrunner. --without-search is invalid option.
+
 2007-04-09 Robin Cook <rcook at wyrms.net>
 	* DEPENDS: added xorg-libs and glib2
 	  added optional on beagle for search
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index b85d884..1a5289d 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,5 +1,6 @@
 2008-11-10 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: depends nspr, sqlite
+	* PRE_BUILD: Added nspr to libxul-embedding.pc
 	* mozconfig3: Ensure system nss is not used. disable-crashreporter
 	  fixed typo. Correct option to build with system sqlite.
 
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 85f5f8e..cc1210e 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -7,6 +7,9 @@ patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
 
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
 
+# Needed to make things using XUL find NSPR.
+echo "Requires: mozilla-nspr" >> xulrunner/installer/libxul-embedding.pc.in &&
+
 cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig &&
 
 if [[ $FIREFOX_OFFICIAL == y ]]; then



More information about the SM-Commit mailing list