Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (d8cf35d830f6a7cbaff9a2756d42007dc4b4092d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (d8cf35d830f6a7cbaff9a2756d42007dc4b4092d)
  • Date: Mon, 19 Aug 2024 16:00:51 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 3 +--
crypto/nss/PREPARE | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d8cf35d830f6a7cbaff9a2756d42007dc4b4092d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

missing file

commit 5922517406cfd472063be26991ddf49777a803f0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - fix qt6_build

diff --git a/ChangeLog b/ChangeLog
index 0ce33cb..dc52bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2024-08-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: fix qt6_build
+
2024-08-12 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS: add pip support for python3 build/install
* packaging: delete dead spell
diff --git a/FUNCTIONS b/FUNCTIONS
index 7f937e5..3a1169f 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -16,8 +16,7 @@ qt5_build() {
qt6_build() {
export PATH+=":$QT6DIR/bin/"
# qmake uses its own flag settings
- qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS"
QMAKE_CXXFLAGS="$CXXFLAGS"\
- PREFIX=${1-$QT6DIR} LIBDIR=$QT6DIR/lib *.pro &&
+ qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS"
QMAKE_CXXFLAGS="$CXXFLAGS" *.pro &&
make
}

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index bf7d3c9..d6f07e2 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch DEFAULT 3.70 3.71 3.72 3.73 3.74 3.75 3.76 3.77 3.78
3.79 3.80 3.81 3.82 3.83 3.84 3.85 3.86 3.87 3.88 3.89 3.90 3.91 3.92 3.93
3.94 3.95 3.96 3.97 3.98 3.99 3.100 3.101 3.102 &&
+prepare_select_branch DEFAULT 3.70 3.71 3.72 3.73 3.74 3.75 3.76 3.77 3.78
3.79 3.80 3.81 3.82 3.83 3.84 3.85 3.86 3.87 3.88 3.89 3.90 3.91 3.92 3.93
3.94 3.95 3.96 3.97 3.98 3.99 3.100 3.101 3.102 3.103 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
NSS_BRANCH=3.70


  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (d8cf35d830f6a7cbaff9a2756d42007dc4b4092d), Treeve Jelbert, 08/19/2024

Archive powered by MHonArc 2.6.24.

Top of Page