Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ae7d83762aaf5b975853a9fe6f0ab0e5a6dfc53)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ae7d83762aaf5b975853a9fe6f0ab0e5a6dfc53)
  • Date: Wed, 19 Oct 2022 18:41:17 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 5 +++++
qt5-cmake/qca/BUILD | 3 +++
qt5-cmake/qca/DEPENDS | 4 +---
qt5-cmake/qca/DETAILS | 2 +-
qt5-cmake/qca/HISTORY | 7 ++++++-
qt6/FUNCTIONS | 8 +++++++-
smgl/systemd/DETAILS | 6 +++---
smgl/systemd/HISTORY | 3 +++
xorg-app/weston/DEPENDS | 3 +--
xorg-app/weston/HISTORY | 3 +++
xorg/xserver/DEPENDS | 9 +++++----
xorg/xserver/HISTORY | 3 +++
12 files changed, 41 insertions(+), 15 deletions(-)

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

qt6 - fix builds for non haswell systems

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

qca: => 2.3.5

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

systemd: => 251.6

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

xserver - adjust depends

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

weston - use LOGIN-DAEMON

diff --git a/ChangeLog b/ChangeLog
index c5086ee..887a744 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * qt6/FUNCTIONS: fix build for some AMD cpus
+ fixes at le t6{base, declarative.svg}
+ assume that cpu has haswell feature; not true for AMD A10
+
2022-10-18 Treeve Jelbert <treeve AT sourcemage.org>
* freedesktop.gpg: update "Alan Coopersmith
<alan.coopersmith AT oracle.com>"

diff --git a/qt5-cmake/qca/BUILD b/qt5-cmake/qca/BUILD
index 458d10b..1a38692 100755
--- a/qt5-cmake/qca/BUILD
+++ b/qt5-cmake/qca/BUILD
@@ -1,3 +1,6 @@
+if is_depends_enabled $SPELL qt6base; then
+ OPTS+=' QT6=1'
+fi &&
CXXFLAGS+=" -Wno-cpp -fpermissive"
OPTS+=' -DBUILD_TESTS=0'
default_build
diff --git a/qt5-cmake/qca/DEPENDS b/qt5-cmake/qca/DEPENDS
index f98c993..aeb518c 100755
--- a/qt5-cmake/qca/DEPENDS
+++ b/qt5-cmake/qca/DEPENDS
@@ -1,6 +1,4 @@
-depends -sub CXX gcc &&
-depends cmake &&
-depends qtbase '-DQCA_SUFFIX=qt5' &&
+source $GRIMOIRE/QT_DEPENDS &&
optional_depends SSL '' '' 'OpenSSL plugin' &&
optional_depends LIBSASL '' '' 'Sasl2 plugin' &&
optional_depends botan '' '' 'Botan plugin' &&
diff --git a/qt5-cmake/qca/DETAILS b/qt5-cmake/qca/DETAILS
index 5e3391b..a97c1f5 100755
--- a/qt5-cmake/qca/DETAILS
+++ b/qt5-cmake/qca/DETAILS
@@ -1,5 +1,5 @@
SPELL=qca
- VERSION=2.3.4
+ VERSION=2.3.5
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://download.kde.org/stable/$SPELL/$VERSION/$SOURCE
diff --git a/qt5-cmake/qca/HISTORY b/qt5-cmake/qca/HISTORY
index e6aec58..130f9da 100644
--- a/qt5-cmake/qca/HISTORY
+++ b/qt5-cmake/qca/HISTORY
@@ -1,4 +1,9 @@
-2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+2022-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: veersion 2.3.5
+ * DEPENDS: use QT_DEPENDS
+ * BUILD: support qt5/6
+
+2022-06-09 Treeve Jelbet <treeve AT sourcemage.org>
* DETAILS: rename spell
* CONFLICTS: updated

diff --git a/qt6/FUNCTIONS b/qt6/FUNCTIONS
index 5843004..6cc4909 100755
--- a/qt6/FUNCTIONS
+++ b/qt6/FUNCTIONS
@@ -1,10 +1,16 @@
QT6DIR=$INSTALL_ROOT/opt/qt6
#QT6DIR="$INSTALL_ROOT/usr"
-
function default_build() {
# OPTS+=" -DINSTALL_BINDIR=$QT6DIR/lib/qt6/bin"
# OPTS+=" -DINSTALL_PUBLICBINDIR=$QT6DIR/bin"
#echo opts= $OPTS
+# check for AMD A10-5800K APU
+ if `lscpu|grep -q 'AMD A10-5800K' > /dev/null`;then
+ # qsimd wrongly thinksthis that this is haswell
+ export CXXFLAGS=${CXXFLAGS/-march=native/} &&
+ export CXXFLAGS=${CXXFLAGS/-tune=native/}
+ fi &&
+ echo CXX=$CXXFLAGS
cmake_build $QT6DIR
}

diff --git a/smgl/systemd/DETAILS b/smgl/systemd/DETAILS
index 789e345..6a90727 100755
--- a/smgl/systemd/DETAILS
+++ b/smgl/systemd/DETAILS
@@ -1,13 +1,13 @@
. "${GRIMOIRE}"/MESON_FUNCTIONS

SPELL=systemd
- VERSION=251.4
+ VERSION=251.6
PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
+
SOURCE_HASH=sha512:2da41ac7e939a893ada3ce682a6fe7dd326e8e0132221589da3d2b1d994e1a879118e0c6025f03351dac6567d754223a5f5401d64a5ca9256ab95512800370f8

SOURCE_URL[0]=https://github.com/systemd/systemd-stable/archive/refs/tags/v${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-stable-$VERSION
- WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
+ WEB_SITE=https://www.freedesktop.org/wiki/Software/systemd
ENTERED=20110406
LICENSE[0]=GPL
SHORT="systemd is a system and service manager for Linux"
diff --git a/smgl/systemd/HISTORY b/smgl/systemd/HISTORY
index 74b9ffb..6451d0f 100644
--- a/smgl/systemd/HISTORY
+++ b/smgl/systemd/HISTORY
@@ -1,3 +1,6 @@
+2022-10-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 251.6
+
2022-09-24 Florian Franzmann <bwlf AT bandrate.org>
* BUILD: install static versions of libraries
* DETAILS: PATCHLEVEL++
diff --git a/xorg-app/weston/DEPENDS b/xorg-app/weston/DEPENDS
index a408851..cac4e31 100755
--- a/xorg-app/weston/DEPENDS
+++ b/xorg-app/weston/DEPENDS
@@ -4,14 +4,13 @@ depends python3 &&
depends PKG-CONFIG &&
depends libpng &&
depends mesa &&
-depends eudev &&
depends cairo &&
depends libinput &&
depends libevdev &&
depends libxkbcommon &&
depends pixman &&
depends wayland-protocols &&
-optional_depends systemd launcher-logind=true '' 'login support' &&
+optional_depends LOGIN-DAEMON launcher-logind=true '' 'login support' &&
optional_depends seatd launcher-libseat=true '' 'seat support' &&

optional_depends libdrm backend-drm=true '' 'Build the DRM compositor'
&&
diff --git a/xorg-app/weston/HISTORY b/xorg-app/weston/HISTORY
index 47c7f98..27bffb9 100644
--- a/xorg-app/weston/HISTORY
+++ b/xorg-app/weston/HISTORY
@@ -1,3 +1,6 @@
+2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: use LOGIN-DAEMON
+
2022-09-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 11.0.0
* DEPENDS: allow systemd
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
index 7a5d30e..aa68f41 100755
--- a/xorg/xserver/DEPENDS
+++ b/xorg/xserver/DEPENDS
@@ -49,7 +49,6 @@ if [[ "$XSERVER_WAYLAND" == true ]];then
depends wayland-protocols
fi &&

-#optional_depends elogind '' '' ''

optional_depends libbsd '' '' 'BSD type features' &&

@@ -61,10 +60,12 @@ if is_depends_enabled $SPELL libxv;then
optional_depends libxvmc 'xvmc=true' 'xvmc=false' 'XvMC extension'
fi &&

-optional_depends systemd \
+
+if ! is_depends_enabled "$SPELL" systemd; then
+ optional_depends systemd \
'systemd_logind=true' 'systemd_logind=false' \
- 'for systemd-logind integration' &&
-if is_depends_enabled "$SPELL" systemd; then
+ 'for systemd-logind integration'
+else
depends dbus
fi &&

diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 0dc262d..c2b0f6f 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2022-10-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust systemd usage
+
2022-07-20 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD: removed old meson hacks



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8ae7d83762aaf5b975853a9fe6f0ab0e5a6dfc53), Treeve Jelbert, 10/19/2022

Archive powered by MHonArc 2.6.24.

Top of Page