sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (d6e1819288a9ddb960b85aac5f8cf1aeac19f902)
- From: Ismael Luceno <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 Ismael Luceno (d6e1819288a9ddb960b85aac5f8cf1aeac19f902)
- Date: Thu, 27 Nov 2025 02:39:19 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
qt6/qt6base/CONFLICTS | 2 --
qt6/qt6base/HISTORY | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit d6e1819288a9ddb960b85aac5f8cf1aeac19f902
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
qt6base: Fixup CONFLICTS
diff --git a/qt6/qt6base/CONFLICTS b/qt6/qt6base/CONFLICTS
index 0213172..e24d9ab 100755
--- a/qt6/qt6base/CONFLICTS
+++ b/qt6/qt6base/CONFLICTS
@@ -2,8 +2,6 @@
if spell_ok qt6wayland;then
QTW=`installed_version qt6wayland`
if [[ ${VERSION%.*} != ${QTW%.*} ]];then
- message "${MESSAGE_COLOR}qt-6.10 moves some qt6wayland files to qt6base"
conflicts qt6wayland y
-# cleanse --nofix_quick qt6wayland
fi
fi
diff --git a/qt6/qt6base/HISTORY b/qt6/qt6base/HISTORY
index 1cef360..19d1092 100644
--- a/qt6/qt6base/HISTORY
+++ b/qt6/qt6base/HISTORY
@@ -1,3 +1,6 @@
+2025-11-26 Ismael Luceno <ismael AT sourcemage.org>
+ * CONFLICTS: remove messages, only "conflicts" cmd output is allowed
+
2025-10-07 Treeve Jelbert <treeve AT sourcemage.org>
* 0001-Fix-build-against-LibreSSL.patch: deleted bad patch
* FINAL CONFLICTS: move qt6wayand logic to conflicts
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (d6e1819288a9ddb960b85aac5f8cf1aeac19f902), Ismael Luceno, 11/26/2025
Archive powered by MHonArc 2.6.24.