sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (02f9cc7fd244555d3526c539d96d5e377b78cebb)

From: Juuso Alasuutari <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (02f9cc7fd244555d3526c539d96d5e377b78cebb)
Date: Wed, 26 Dec 2007 06:14:50 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

http/icecat/CONFIGURE | 40 +++++++++++++++++-----------
http/icecat/HISTORY | 3 ++
http/iceweasel/BUILD | 35 ------------------------
http/iceweasel/CONFIGURE | 38 ---------------------------
http/iceweasel/CONFLICTS | 1
http/iceweasel/EXPORTS | 7 ++++
http/iceweasel/HISTORY | 14 +++++++++
http/iceweasel/INSTALL | 52
-------------------------------------
http/iceweasel/PRE_BUILD | 13 ---------
http/iceweasel/PROVIDES | 8 ++---
http/iceweasel/REPAIR^none^EXPORTS | 7 ++++
11 files changed, 63 insertions(+), 155 deletions(-)

New commits:
commit 84cbd90026de700ec731d5c30bd8fe61336d47b9
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

icecat: Import query defaults from deprecated iceweasel.

commit f581a0bb3586fb1dd60020a504c05ad7aa4b790d
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

iceweasel: Don't export ICEWEASEL_RENDER, it can't be re-used as default
in icecat because of how config_query_list works.

commit f539f7d2772a8de95e6d26ac597145789adfe9cd
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

iceweasel: Corrected deprecation handling

diff --git a/http/icecat/CONFIGURE b/http/icecat/CONFIGURE
index e793ad1..b0a9687 100755
--- a/http/icecat/CONFIGURE
+++ b/http/icecat/CONFIGURE
@@ -1,38 +1,46 @@
-config_query_option ICECAT_MAILNEWS \
+# Import query defaults from deprecated iceweasel
+persistent_read iceweasel ICEWEASEL_MAILNEWS ICEWEASEL_MAILNEWS &&
+persistent_read iceweasel ICEWEASEL_CALENDAR ICEWEASEL_CALENDAR &&
+persistent_read iceweasel ICEWEASEL_CHAT ICEWEASEL_CHAT &&
+persistent_read iceweasel ICEWEASEL_COMPOSER ICEWEASEL_COMPOSER &&
+persistent_read iceweasel ICEWEASEL_MATHML ICEWEASEL_MATHML &&
+persistent_read iceweasel ICEWEASEL_JS ICEWEASEL_JS &&
+persistent_read iceweasel ICEWEASEL_NULLPLUGIN ICEWEASEL_NULLPLUGIN &&
+
+config_query_option ICECAT_MAILNEWS \
'Build Mail/News client?' \
- y \
+ ${ICEWEASEL_MAILNEWS:-y} \
'--enable-mailnews' \
'--disable-mailnews' &&
-config_query_option ICECAT_CALENDAR \
+config_query_option ICECAT_CALENDAR \
'Build Calendar component?' \
- y \
+ ${ICEWEASEL_CALENDAR:-y} \
'--enable-calendar' \
'--disable-calendar' &&
-config_query_option ICECAT_CHAT \
+config_query_option ICECAT_CHAT \
'Build ChatZilla component?' \
- y \
+ ${ICEWEASEL_CHAT:-y} \
'--enable-chatzilla' \
'--disable-chatzilla' &&
-config_query_option ICECAT_COMPOSER \
+config_query_option ICECAT_COMPOSER \
'Build Composer component?' \
- y \
+ ${ICEWEASEL_COMPOSER:-y} \
'--enable-composer' \
'--disable-composer' &&
-config_query_option ICECAT_MATHML \
+config_query_option ICECAT_MATHML \
'Enable MathML?' \
- y \
+ ${ICEWEASEL_MATHML:-y} \
'--enable-mathml' \
'--disable-mathml' &&
-config_query_option ICECAT_JS \
+config_query_option ICECAT_JS \
'Build JavaScript profile tool?' \
- n \
+ ${ICEWEASEL_JS:-n} \
'--enable-xpctools' \
'--disable-xpctools' &&
-config_query_list ICECAT_RENDER \
+config_query_list ICECAT_RENDER \
'Possible SVG renderers:' \
'cairo' 'libart' 'none' &&

-config_query ICECAT_NULLPLUGIN \
+config_query ICECAT_NULLPLUGIN \
"Do you want nullplugin installed (to enable auto search and install of
other plugins)" \
- y
-
+ ${ICEWEASEL_NULLPLUGIN:-y}
diff --git a/http/icecat/HISTORY b/http/icecat/HISTORY
index 2d82b08..acb79f3 100644
--- a/http/icecat/HISTORY
+++ b/http/icecat/HISTORY
@@ -1,3 +1,6 @@
+2007-12-26 Juuso Alasuutari <iuso AT sourcemage.org>
+ * CONFIGURE: Import query defaults from deprecated iceweasel.
+
2007-12-20 Pol Vinogradov <vin.public AT gmail.com>
* BUILD, cairo-fixes.patch, CONFIGURE, CONFLICTS, DEPENDS,
desktop/icecat.desktop, DETAILS, icecat, icecat.sh,
diff --git a/http/iceweasel/BUILD b/http/iceweasel/BUILD
index e893d3d..27ba77d 100755
--- a/http/iceweasel/BUILD
+++ b/http/iceweasel/BUILD
@@ -1,34 +1 @@
-# local ICEWEASEL_HOME=${INSTALL_ROOT}/usr/lib/${SPELL} &&
-# export MOZ_PHOENIX=1 &&
-
-# export CFLAGS="${CFLAGS//-O3/-O2}" &&
-# export CXXFLAGS="${CXXFLAGS//-O3/-O2}" &&
-
-# OPTS="$ICEWEASEL_MAILNEWS $ICEWEASEL_CALENDAR $ICEWEASEL_CHAT
$ICEWEASEL_COMPOSER \
-# $ICEWEASEL_MATHML $ICEWEASEL_JS $OPTS" &&
-
-# if [[ "$ICEWEASEL_RENDER" != "none" ]]
-# then
-# OPTS="--enable-svg-renderer=$ICEWEASEL_RENDER $OPTS"
-# fi &&
-
-# ./configure \
-# --prefix=${INSTALL_ROOT}/usr \
-# --with-user-appdir=.${SPELL} \
-# --with-pthreads \
-# --enable-application=browser \
-# --enable-reorder \
-# --enable-cpp-rtti \
-# --enable-strip \
-# --enable-optimize="$CFLAGS" \
-# --with-default-mozilla-five-home=$ICEWEASEL_HOME \
-# --disable-debug \
-# --disable-tests \
-# --disable-installer \
-# --disable-pedantic \
-# --enable-single-profile \
-# --enable-extensions=default,typeaheadfind \
-# --enable-canvas \
-# $OPTS &&
-
-# make
+true
diff --git a/http/iceweasel/CONFIGURE b/http/iceweasel/CONFIGURE
deleted file mode 100755
index 8fc12b2..0000000
--- a/http/iceweasel/CONFIGURE
+++ /dev/null
@@ -1,38 +0,0 @@
-# config_query_option ICEWEASEL_MAILNEWS \
-# 'Build Mail/News client?' \
-# y \
-# '--enable-mailnews' \
-# '--disable-mailnews' &&
-# config_query_option ICEWEASEL_CALENDAR \
-# 'Build Calendar component?' \
-# y \
-# '--enable-calendar' \
-# '--disable-calendar' &&
-# config_query_option ICEWEASEL_CHAT \
-# 'Build ChatZilla component?' \
-# y \
-# '--enable-chatzilla' \
-# '--disable-chatzilla' &&
-# config_query_option ICEWEASEL_COMPOSER \
-# 'Build Composer component?' \
-# y \
-# '--enable-composer' \
-# '--disable-composer' &&
-# config_query_option ICEWEASEL_MATHML \
-# 'Enable MathML?' \
-# y \
-# '--enable-mathml' \
-# '--disable-mathml' &&
-# config_query_option ICEWEASEL_JS \
-# 'Build JavaScript profile tool?' \
-# n \
-# '--enable-xpctools' \
-# '--disable-xpctools' &&
-# config_query_list ICEWEASEL_RENDER \
-# 'Possible SVG renderers:' \
-# 'cairo' 'libart' 'none' &&
-
-# config_query ICEWEASEL_NULLPLUGIN \
-# "Do you want nullplugin installed (to enable auto search and install of
other plugins)" \
-# y
-
diff --git a/http/iceweasel/CONFLICTS b/http/iceweasel/CONFLICTS
new file mode 100755
index 0000000..c34510b
--- /dev/null
+++ b/http/iceweasel/CONFLICTS
@@ -0,0 +1 @@
+conflicts iceweasel y
diff --git a/http/iceweasel/EXPORTS b/http/iceweasel/EXPORTS
new file mode 100755
index 0000000..9f55b64
--- /dev/null
+++ b/http/iceweasel/EXPORTS
@@ -0,0 +1,7 @@
+ICEWEASEL_MAILNEWS
+ICEWEASEL_CALENDAR
+ICEWEASEL_CHAT
+ICEWEASEL_COMPOSER
+ICEWEASEL_MATHML
+ICEWEASEL_JS
+ICEWEASEL_NULLPLUGIN
diff --git a/http/iceweasel/HISTORY b/http/iceweasel/HISTORY
index a4738ad..fd672db 100644
--- a/http/iceweasel/HISTORY
+++ b/http/iceweasel/HISTORY
@@ -1,3 +1,17 @@
+2007-12-26 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD, BUILD, INSTALL: Replaced commented-out lines with 'true'
+ as dictated by the spell deprecation procedure.
+ * CONFIGURE: Deleted, not needed in a deprecated spell.
+ * PROVIDES: Removed comment characters. Commenting out lines in
+ PROVIDES doesn't work because it's not a bash script; instead
+ provides.index will claim that the spell provides '#'. Letting a
+ deprecated spell keep its providers is probably the best thing to do
+ to avoid forcing an unwanted recompile upon users.
+ * CONFLICTS: Added with 'conflicts iceweasel y' according to the spell
+ deprecation procedure.
+ * EXPORTS, REPAIR^none^EXPORTS: Added, export variables for use in
+ icecat's CONFIGURE.
+
2007-12-20 Pol Vinogradov <vin.public AT gmail.com>
* Deprecated in favour of icecat

diff --git a/http/iceweasel/INSTALL b/http/iceweasel/INSTALL
index 816a170..27ba77d 100755
--- a/http/iceweasel/INSTALL
+++ b/http/iceweasel/INSTALL
@@ -1,51 +1 @@
-# make_normal &&
-
-# MOZILLA_HOME=$INSTALL_ROOT/usr/lib/iceweasel &&
-
-# #
-# # everything coming into /usr/lib/iceweasel-${VERSION/rc*}/
-# # must actually go to /usr/lib/iceweasel/
-# #
-# mkdir -p $MOZILLA_HOME &&
-# ln -fns $MOZILLA_HOME $MOZILLA_HOME-${VERSION/rc*} &&
-# mkdir -p $INSTALL_ROOT/usr/share/idl/iceweasel &&
-# ln -fns $TRACK_ROOT/usr/share/idl/iceweasel \
-# $INSTALL_ROOT/usr/share/idl/iceweasel-${VERSION/rc*} &&
-
-# make install &&
-
-# #
-# # Script to set MOZILLA_FIVE_HOME
-# #
-# cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
-
-# #
-# # Create symlink from NSS Root CA store, if it exists. NSS requires this
-# # to be in the same directory as the current application binary. See:
-# # http://www.mozilla.org/projects/security/pki/nss/loadable_certs.html
-# # https://bugzilla.mozilla.org/show_bug.cgi?id=128290
-# # Only create if $MOZILLA_HOME/libnssckbi.so does not exist or is already a
-# # symlink.
-# #
-# if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
-# if ! test -f $MOZILLA_HOME/libnssckbi.so ||
-# test -h $MOZILLA_HOME/libnssckbi.so; then
-# ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $MOZILLA_HOME/libnssckbi.so
-# fi
-# fi &&
-# if [[ "$ICEWEASEL_NULLPLUGIN" == "n" ]]
-# then
-# rm $MOZILLA_HOME/plugins/libnullplugin.so
-# fi &&
-
-# # make the pkgconfig files reference the nspr from the standalone nspr
spell
-# sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-js.pc &&
-# sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-nss.pc &&
-# sedit 's/nspr/mozilla-nspr/'
${INSTALL_ROOT}/usr/lib/pkgconfig/iceweasel-xpcom.pc &&
-
-# #
-# # install iceweasel script so it loads properly even if MOZILLA_FIVE_HOME
is
-# # not set or set to a different mozilla/firefox directory
-# #
-# install -m 755 -o root -g root $SCRIPT_DIRECTORY/iceweasel \
-# $INSTALL_ROOT/usr/bin
+true
diff --git a/http/iceweasel/PRE_BUILD b/http/iceweasel/PRE_BUILD
index 6b7e7ff..27ba77d 100755
--- a/http/iceweasel/PRE_BUILD
+++ b/http/iceweasel/PRE_BUILD
@@ -1,12 +1 @@
-# default_pre_build &&
-
-# remove /root/.mozconfig, it causes too much trouble
-# if [ -f /root/.mozconfig ]; then
-# rm -f /root/.mozconfig
-# fi &&
-
-# remove broken .mozconfig shipped with 1.0b
-# rm -f $SOURCE_DIRECTORY/.mozconfig &&
-
-# cd $SOURCE_DIRECTORY &&
-# patch -p1 < $SCRIPT_DIRECTORY/cairo-fixes.patch
+true
diff --git a/http/iceweasel/PROVIDES b/http/iceweasel/PROVIDES
index 16c6e20..e0c99a2 100755
--- a/http/iceweasel/PROVIDES
+++ b/http/iceweasel/PROVIDES
@@ -1,4 +1,4 @@
-# WEB-BROWSER
-# GRAPHICAL-WEB-BROWSER
-# GECKO
-# NS-PLUGIN-COMPATIBLE
+WEB-BROWSER
+GRAPHICAL-WEB-BROWSER
+GECKO
+NS-PLUGIN-COMPATIBLE
diff --git a/http/iceweasel/REPAIR^none^EXPORTS
b/http/iceweasel/REPAIR^none^EXPORTS
new file mode 100755
index 0000000..9f55b64
--- /dev/null
+++ b/http/iceweasel/REPAIR^none^EXPORTS
@@ -0,0 +1,7 @@
+ICEWEASEL_MAILNEWS
+ICEWEASEL_CALENDAR
+ICEWEASEL_CHAT
+ICEWEASEL_COMPOSER
+ICEWEASEL_MATHML
+ICEWEASEL_JS
+ICEWEASEL_NULLPLUGIN

[SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (02f9cc7fd244555d3526c539d96d5e377b78cebb), Juuso Alasuutari, 12/26/2007