Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06c6e892245a9972e2f45f54a106fc88ad945ac7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06c6e892245a9972e2f45f54a106fc88ad945ac7)
  • Date: Fri, 1 Jul 2022 10:15:51 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

http/firefox/BUILD | 3 +--
http/firefox/CONFLICTS | 10 +++++++++-
http/firefox/HISTORY | 7 +++++++
http/firefox/INSTALL | 4 ++--
http/firefox/firefox | 16 ----------------
5 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit 06c6e892245a9972e2f45f54a106fc88ad945ac7
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

firefox: merge back changes from firefox-esr

This unifies the code more between the two silbling spells, also
gets rid of the stale firefox wrapper script.

diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 4ee0218..525b1f3 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -61,5 +61,4 @@ for option in $OPTS; do
done &&

echo "mk_add_options MOZ_MAKE_FLAGS=\"-j${MAKE_NJOBS:-1}\"" >> .mozconfig &&
-export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none &&
-./mach build
+MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach build
diff --git a/http/firefox/CONFLICTS b/http/firefox/CONFLICTS
index 62bf054..005c1da 100755
--- a/http/firefox/CONFLICTS
+++ b/http/firefox/CONFLICTS
@@ -1 +1,9 @@
-conflicts firefox-esr
+# File should work unmodified for both firefox and firefox-esr.
+case "$SPELL" in
+ firefox)
+ conflicts firefox-esr
+ ;;
+ firefox-esr)
+ conflicts firefox
+ ;;
+esac
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index dd8dd18..7d5c185 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2022-07-01 Thomas Orgis <sobukus AT sourcemage.org>
+ * firefox: dead bits since ages, removed
+ * BUILD, INSTALL: avoid python downloads both in BUILD and INSTALL,
+ as oneline-setting where needed
+ * INSTALL, CONfLICTS: rephrase a bit to work for both firefox and
firefox-esr
+ without modification
+
2022-06-30 Pavel Vinogradov <public AT sourcemage.org>
* BUILD: fixed (once again) the system python instruction to not check
installed python packages
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 35a5a5a..320ebb0 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -6,12 +6,12 @@ if spell_ok Firebird; then
dispel Firebird
fi &&

-./mach install &&
+MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach install &&

#
# Script to set MOZILLA_FIVE_HOME
#
-cp -v $SPELL_DIRECTORY/$SPELL.sh $INSTALL_ROOT/etc/profile.d &&
+cp -v $SPELL_DIRECTORY/${SPELL/-esr/}.sh $INSTALL_ROOT/etc/profile.d &&

#
# Create symlink to mozilla for hardwired applications
diff --git a/http/firefox/firefox b/http/firefox/firefox
deleted file mode 100644
index dd837b9..0000000
--- a/http/firefox/firefox
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# Created by Eric Sandall 2004-12-09
-#
-# This script is here to set the correct LD_LIBRARY_PATH for firefox 1.0+
-# based on the information from this thread:
-# http://lists.freebsd.org/pipermail/freebsd-gnome/2004-October/008443.html
-#
-export LD_LIBRARY_PATH=/usr/lib/firefox
-
-if [ $USE_AOSS_WRAPPER ] &&
- [ -x /usr/bin/aoss ]; then
- /usr/bin/aoss /usr/lib/firefox/firefox-bin "$@"
-else
- /usr/lib/firefox/firefox-bin "$@"
-fi



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06c6e892245a9972e2f45f54a106fc88ad945ac7), Thomas Orgis, 07/01/2022

Archive powered by MHonArc 2.6.24.

Top of Page