Skip to Content.
Sympa Menu

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

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 (d9ac5842bb126bd716bd03863cda2b8f39a03dd0)
  • Date: Mon, 15 Dec 2025 16:14:50 +0000

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

Changes.kde6 | 1
KDE_PLASMA | 2
devel/ccache/DETAILS | 4 -
devel/ccache/HISTORY | 3 +
devel/mujs/BUILD | 6 --
devel/mujs/DETAILS | 4 -
devel/mujs/HISTORY | 7 +++
devel/mujs/INSTALL | 2
doc/mupdf/DEPENDS | 1
doc/mupdf/HISTORY | 3 +
kde-plasma/kwin/DETAILS | 1
kde-plasma/kwin/PRE_BUILD | 3 +
kde-plasma/kwin/patches/dbus.diff | 80
+++++++++++++++++++++++++++++++++++
xorg-proto/wayland-protocols/DETAILS | 2
xorg-proto/wayland-protocols/HISTORY | 3 +
15 files changed, 110 insertions(+), 12 deletions(-)

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

wayland-protocols: => 1.47

commit 313a9b50cf6080a6fc3a1f8687a05c75eeb45bd5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mujs - tweak build

commit 199b8d6aa57293b7325a9e0f9ff8855cc4d083cf
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ccache: => 4.12.2

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

mupdf - depends mujs

commit 852e27dc3d943c25fb3e7bf4fcfa2aa89ef4fe9d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mujs: => 1.3.8

commit 7f7aa6712f0b018a9954d271ece72e64281bd587
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

plasma/* => 6.5.4 (again)

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

kwin - add upstream patch

diff --git a/Changes.kde6 b/Changes.kde6
index 7e91564..d866b6c 100644
--- a/Changes.kde6
+++ b/Changes.kde6
@@ -1,5 +1,6 @@
KDE6 status

+2025-12-13 plasma/* => 6.5.4
2025-12-12 add keepsecret
kde-fw* => 6,21.0

diff --git a/KDE_PLASMA b/KDE_PLASMA
index 72dad0b..d1a179a 100644
--- a/KDE_PLASMA
+++ b/KDE_PLASMA
@@ -7,7 +7,7 @@ if [[ -z $BRANCH ]];then
BRANCH=stable
fi
if [[ -z $VERSION ]];then
- VERSION=6.5.3
+ VERSION=6.5.4
VX=$VERSION
else
VX=${VERSION%.?}
diff --git a/devel/ccache/DETAILS b/devel/ccache/DETAILS
index faf3b55..f46529f 100755
--- a/devel/ccache/DETAILS
+++ b/devel/ccache/DETAILS
@@ -1,7 +1,7 @@
source $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=ccache
- VERSION=4.12.1
-
SOURCE_HASH=sha512:f6618026b99d7352fc59d8233dd1cb307970baceb37b3c0c8f5360ca485141ca12da5bcf1e58deaa9e2c383cf40b56eb6fae70a51db90f54ae126596e841eb57
+ VERSION=4.12.2
+
SOURCE_HASH=sha512:fc6993a13c22398ba8d80a367bf2cfd2e44fd991d8a83fc829e51a48051fb8208e6a81ce7cff0ed5cd61a070fb20aaedd8e8cb69b51f5195e4973c1c2ae3033a
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://github.com/$SPELL/$SPELL/releases/download/v$VERSION/$SOURCE
diff --git a/devel/ccache/HISTORY b/devel/ccache/HISTORY
index 073860d..5fbf50e 100755
--- a/devel/ccache/HISTORY
+++ b/devel/ccache/HISTORY
@@ -1,3 +1,6 @@
+2025-12-14 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.12.2
+
2025-10-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.12.1

diff --git a/devel/mujs/BUILD b/devel/mujs/BUILD
index df26b9a..b20bcab 100755
--- a/devel/mujs/BUILD
+++ b/devel/mujs/BUILD
@@ -1,5 +1 @@
-cat <<-EOF >user.make &&
- libmujs=libmujs.so
- prefix="$INSTALL_ROOT"/usr
-EOF
-make -j "$MAKE_NJOBS" CC="$CC" $OPTS
+make prefix="$INSTALL_ROOT"/usr release
diff --git a/devel/mujs/DETAILS b/devel/mujs/DETAILS
index 19f058b..17a6aca 100755
--- a/devel/mujs/DETAILS
+++ b/devel/mujs/DETAILS
@@ -1,9 +1,9 @@
# Watch: https://mujs.com/downloads/
SPELL=mujs
- VERSION=1.3.6
+ VERSION=1.3.8
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="https://mujs.com/downloads/$SOURCE";
-
SOURCE_HASH=sha512:63df9155182a2744860a92603c492f744efd30170b0d60b860dfd75c10190123b07c04626ce2e38af9febe4b5982f09ed04ca3dd59a4b99ccb9a0e179b13acc6
+
SOURCE_HASH=sha512:8156326b7cd2734242ce91ac2e80ae7a3cae30448c8e1a6601e6a3b747db34c713eec630a3f873d5abb1d19a3e8a84845964c8ff03de595ea9acd371278f2623
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://mujs.com/";
LICENSE[0]="ISC"
diff --git a/devel/mujs/HISTORY b/devel/mujs/HISTORY
index 76dc051..4895123 100644
--- a/devel/mujs/HISTORY
+++ b/devel/mujs/HISTORY
@@ -1,3 +1,10 @@
+2025-12-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * BUILD: simplify
+
+2025-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.3.8
+ * INSTALL: fix
+
2025-02-01 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.3.6

diff --git a/devel/mujs/INSTALL b/devel/mujs/INSTALL
index 9379fad..7158a37 100755
--- a/devel/mujs/INSTALL
+++ b/devel/mujs/INSTALL
@@ -1 +1 @@
-make install-shared
+make prefix="$INSTALL_ROOT"/usr install-shared
diff --git a/doc/mupdf/DEPENDS b/doc/mupdf/DEPENDS
index 03f4a53..2dfdf04 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -3,6 +3,7 @@ depends openjpeg &&
depends freetype2 &&
depends harfbuzz &&
depends jbig2dec &&
+depends mujs 'USE_SYSTEM_MUJS=yes' &&
depends zlib &&
depends gumbo-parser &&

diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 34e8853..76ab647 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,6 @@
+2025-12-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPNDS: add mujs
+
2025-12-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.26.12

diff --git a/kde-plasma/kwin/DETAILS b/kde-plasma/kwin/DETAILS
index 10078c5..9404f64 100755
--- a/kde-plasma/kwin/DETAILS
+++ b/kde-plasma/kwin/DETAILS
@@ -1,5 +1,6 @@
SPELL=kwin
source $GRIMOIRE/KDE_PLASMA
+ PATCHLEVEL=1
LICENSE[0]=GPL
ENTERED=20140318
KEYWORDS="KDE"
diff --git a/kde-plasma/kwin/PRE_BUILD b/kde-plasma/kwin/PRE_BUILD
new file mode 100755
index 0000000..4604ffc
--- /dev/null
+++ b/kde-plasma/kwin/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde-plasma/kwin/patches/dbus.diff
b/kde-plasma/kwin/patches/dbus.diff
new file mode 100644
index 0000000..f536bf5
--- /dev/null
+++ b/kde-plasma/kwin/patches/dbus.diff
@@ -0,0 +1,80 @@
+diff --git a/src/core/session_consolekit.cpp
b/src/core/session_consolekit.cpp
+index
0200407e63d7cefffb6ab8f34a4c6f26846ac00a..c0e8449f8a2a47e3e54475fccb50f573346e0ede
100644
+--- a/src/core/session_consolekit.cpp
++++ b/src/core/session_consolekit.cpp
+@@ -239,7 +239,7 @@ FileDescriptor ConsoleKitSession::delaySleep(const
QString &reason)
+ return FileDescriptor{};
+ }
+ const QDBusUnixFileDescriptor descriptor =
reply.arguments().constFirst().value<QDBusUnixFileDescriptor>();
+- return FileDescriptor{descriptor.fileDescriptor()};
++ return FileDescriptor{fcntl(descriptor.fileDescriptor(),
F_DUPFD_CLOEXEC, 0)};
+ }
+
+ ConsoleKitSession::ConsoleKitSession(const QString &sessionPath)
+diff --git a/src/core/session_logind.cpp b/src/core/session_logind.cpp
+index
978c410cfeae8b91336f035b99ae11764faec498..5f6541c289b5fa263a3534821ec9c3b33490005b
100644
+--- a/src/core/session_logind.cpp
++++ b/src/core/session_logind.cpp
+@@ -237,7 +237,7 @@ FileDescriptor LogindSession::delaySleep(const QString
&reason)
+ return FileDescriptor{};
+ }
+ const QDBusUnixFileDescriptor descriptor =
reply.arguments().constFirst().value<QDBusUnixFileDescriptor>();
+- return FileDescriptor{descriptor.fileDescriptor()};
++ return FileDescriptor(fcntl(descriptor.fileDescriptor(),
F_DUPFD_CLOEXEC, 0));
+ }
+
+ LogindSession::LogindSession(const QString &sessionPath)
+diff --git a/src/utils/filedescriptor.cpp b/src/utils/filedescriptor.cpp
+index
d60c429e446c041a46d8c91adca20eba316fa71c..f76f07aad1ac227a96ef307c4cdab783414648fe
100644
+--- a/src/utils/filedescriptor.cpp
++++ b/src/utils/filedescriptor.cpp
+@@ -7,6 +7,7 @@
+ SPDX-License-Identifier: GPL-2.0-or-later
+ */
+ #include "filedescriptor.h"
++#include "common.h"
+
+ #include <fcntl.h>
+ #include <sys/poll.h>
+@@ -29,7 +30,12 @@ FileDescriptor::FileDescriptor(FileDescriptor &&other)
+ FileDescriptor &FileDescriptor::operator=(FileDescriptor &&other)
+ {
+ if (m_fd != -1) {
+- ::close(m_fd);
++ const int err = ::close(m_fd);
++ if (Q_UNLIKELY(err != 0)) {
++ // If this failed, we've either closed the fd somewhere else,
or we end up
++ // leaking this fd here. Either way, there's some significant
bug!
++ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
++ }
+ }
+ m_fd = std::exchange(other.m_fd, -1);
+ return *this;
+@@ -38,7 +44,12 @@ FileDescriptor &FileDescriptor::operator=(FileDescriptor
&&other)
+ FileDescriptor::~FileDescriptor()
+ {
+ if (m_fd != -1) {
+- ::close(m_fd);
++ const int err = ::close(m_fd);
++ if (Q_UNLIKELY(err != 0)) {
++ // If this failed, we've either closed the fd somewhere else,
or we end up
++ // leaking this fd here. Either way, there's some significant
bug!
++ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
++ }
+ }
+ }
+
+@@ -60,7 +71,12 @@ int FileDescriptor::take()
+ void FileDescriptor::reset()
+ {
+ if (m_fd != -1) {
+- ::close(m_fd);
++ const int err = ::close(m_fd);
++ if (Q_UNLIKELY(err != 0)) {
++ // If this failed, we've either closed the fd somewhere else,
or we end up
++ // leaking this fd here. Either way, there's some significant
bug!
++ qCCritical(KWIN_CORE, "::close() failed: %s", strerror(errno));
++ }
+ m_fd = -1;
+ }
+ }
diff --git a/xorg-proto/wayland-protocols/DETAILS
b/xorg-proto/wayland-protocols/DETAILS
index cd1b7b7..a36123e 100755
--- a/xorg-proto/wayland-protocols/DETAILS
+++ b/xorg-proto/wayland-protocols/DETAILS
@@ -1,6 +1,6 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=wayland-protocols
- VERSION=1.46
+ VERSION=1.47
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=https://wayland.freedesktop.org
diff --git a/xorg-proto/wayland-protocols/HISTORY
b/xorg-proto/wayland-protocols/HISTORY
index be80635..52cc19f 100644
--- a/xorg-proto/wayland-protocols/HISTORY
+++ b/xorg-proto/wayland-protocols/HISTORY
@@ -1,3 +1,6 @@
+2025-12-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.47
+
2025-11-24 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.46



  • [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (d9ac5842bb126bd716bd03863cda2b8f39a03dd0), Treeve Jelbert, 12/15/2025

Archive powered by MHonArc 2.6.24.

Top of Page