Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0a955205e21bf24bd7f6c178c475a02c3dac3273)

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 (0a955205e21bf24bd7f6c178c475a02c3dac3273)
  • Date: Mon, 31 May 2021 09:54:58 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

CMAKE_CONFIGURE | 12 +-----------
CMAKE_DEPENDS | 5 +----
ChangeLog | 3 +++
FUNCTIONS | 8 --------
KDE5_DEPENDS | 6 +-----
disk/mtools/DETAILS | 2 +-
disk/mtools/HISTORY | 3 +++
libs/libdrm/DETAILS | 2 +-
libs/libdrm/HISTORY | 3 +++
qt5-qmake/dooble/DETAILS | 6 +++---
qt5-qmake/dooble/HISTORY | 4 ++++
shell-term-fm/bash/DETAILS | 10 +++++-----
shell-term-fm/bash/HISTORY | 3 +++
13 files changed, 29 insertions(+), 38 deletions(-)

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

bash: => 5.1.8

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

libdrm: => 2.4.106

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

mtools: => 4.0.28

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

simplify cmake settings

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

dooble: => 2021.02.20

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
index ae19da8..f03d7d4 100755
--- a/CMAKE_CONFIGURE
+++ b/CMAKE_CONFIGURE
@@ -2,14 +2,4 @@ config_query_list CM_BUILD_TYPE 'which build type?'
Release Debug RelWithDebIn
#if is_depends_enabled $SPELL extra-cmake-modules;then
config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
#fi
-
-# Default to Ninja cmake generator if it's installed, otherwise the standard
Unix way
-if spell_ok ninja-build-system; then
- message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using ${SPELL_COLOR}ninja${DEFAULT_COLOR}${MESSAGE_COLOR} for CMAKE
GENERATOR." &&
- CMAKE_GEN='Ninja'
-else
- message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using \"Unix Makefiles\" for CMAKE GENERATOR." &&
- CMAKE_GEN='Unix Makefiles'
-fi &&
-
-persistent_add CMAKE_GEN
+persistent_remove CMAKE_GEN
diff --git a/CMAKE_DEPENDS b/CMAKE_DEPENDS
index 8840cf4..90b3ead 100755
--- a/CMAKE_DEPENDS
+++ b/CMAKE_DEPENDS
@@ -1,5 +1,2 @@
depends cmake &&
-
-if [[ $CMAKE_GEN == Ninja ]];then
- depends ninja-build-system
-fi
+optional_depends ninja-build-system ' -G Ninja' '' 'faster builds'
diff --git a/ChangeLog b/ChangeLog
index e078d94..1d54b7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2021-05-30 Ismael Luceno <ismael AT sourcemage.org>
* net/ifupdown-ng: new spell, flexible ifup/ifdown implementation

+2021-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * CMAKE_CONFIGURE CMAKE_DEPENDS FUNCTIONS KDE5_DEPENDS: simplify
cmake settings
+
2021-05-28 Ismael Luceno <ismael AT sourcemage.org>
* video/simplescreenrecorder: new spell, SimpleScreenRecorder

diff --git a/FUNCTIONS b/FUNCTIONS
index bb4d185..e0613ea 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -677,9 +677,6 @@ cmake_build() {
mkdir -p build &&
cd build &&
prepare_cmake_flags &&
- if [[ $CMAKE_GEN == Ninja ]];then
- OPTS+=" -G Ninja"
- fi &&

if [[ -z $1 ]];then
CMAKE_INSTALL_PREFIX="$INSTALL_ROOT/usr"
@@ -694,11 +691,6 @@ cmake_build() {
fi &&

cmake -DCMAKE_INSTALL_PREFIX=$CMAKE_INSTALL_PREFIX \
- -DCMAKE_INSTALL_DATADIR=share \
- -DCMAKE_INSTALL_DOCDIR=share/doc \
- -DCMAKE_INSTALL_INCLUDEDIR=include \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_INSTALL_MANDIR=share/man \
-DCMAKE_INSTALL_SYSCONFDIR=$INSTALL_ROOT/etc \
-DCMAKE_BUILD_TYPE=$CM_BUILD_TYPE \
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \
diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS
index 8a7a3c8..f6ae7be 100755
--- a/KDE5_DEPENDS
+++ b/KDE5_DEPENDS
@@ -1,7 +1,3 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-depends cmake &&
-depends extra-cmake-modules &&
-if [[ $CMAKE_GEN == Ninja ]];then
- depends ninja-build-system
-fi &&
depends -sub ACCESS qtbase
diff --git a/disk/mtools/DETAILS b/disk/mtools/DETAILS
index 32afa61..ee561a7 100755
--- a/disk/mtools/DETAILS
+++ b/disk/mtools/DETAILS
@@ -1,5 +1,5 @@
SPELL=mtools
- VERSION=4.0.27
+ VERSION=4.0.28
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/disk/mtools/HISTORY b/disk/mtools/HISTORY
index f1a8b27..242b980 100644
--- a/disk/mtools/HISTORY
+++ b/disk/mtools/HISTORY
@@ -1,3 +1,6 @@
+2021-05-30 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 4.0.28
+
2021-04-17 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.27

diff --git a/libs/libdrm/DETAILS b/libs/libdrm/DETAILS
index d198673..2a02f83 100755
--- a/libs/libdrm/DETAILS
+++ b/libs/libdrm/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/drm-git"
SOURCE_IGNORE=volatile
FORCE_DOWNLOAD=1
else
- VERSION=2.4.105
+ VERSION=2.4.106
SOURCE=${SPELL}-${VERSION}.tar.xz
SOURCE_URL[0]=https://dri.freedesktop.org/${SPELL}/${SOURCE}
SOURCE2=$SOURCE.sig
diff --git a/libs/libdrm/HISTORY b/libs/libdrm/HISTORY
index d9d9932..af538b1 100644
--- a/libs/libdrm/HISTORY
+++ b/libs/libdrm/HISTORY
@@ -1,3 +1,6 @@
+2021-05-31 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.4.106
+
2021-04-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.105
* drm.gpg: add "Leo Liu <leo.liu AT amd.com>"
diff --git a/qt5-qmake/dooble/DETAILS b/qt5-qmake/dooble/DETAILS
index 3c6708b..12a2bb0 100755
--- a/qt5-qmake/dooble/DETAILS
+++ b/qt5-qmake/dooble/DETAILS
@@ -1,12 +1,12 @@
SPELL=dooble
- VERSION=2020.10.10
+ VERSION=2021.02.20
VX=${VERSION/+/-}
VX=${VX/v1/1}
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:ba70232f01a2447fd77b50dc6df98a47c52a33cae42015ef0e7d47bce404fdd499379f69e128d44ed62ec807f45647371c14e88ccd131ecb14c5163785ea58bd
+
SOURCE_HASH=sha512:48fa6bc498a362023867c9c45e03b884b344eb52412944439791d9aafb70a27a901c6eef6e0b6ddbeb765a9366e7eab75b08b6df893d33e096aab3224c5d78ac

SOURCE_URL=https://github.com/textbrowser/dooble/archive/$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VX
- WEB_SITE=https://github.com/textbrowser/dooble
+ WEB_SITE=https://textbrowser.github.io/dooble/
ENTERED=20151108
LICENSE[0]=GPL
KEYWORDS=
diff --git a/qt5-qmake/dooble/HISTORY b/qt5-qmake/dooble/HISTORY
index cc5f9a6..2ae92b0 100644
--- a/qt5-qmake/dooble/HISTORY
+++ b/qt5-qmake/dooble/HISTORY
@@ -1,3 +1,7 @@
+2021-05-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2021.02.20
+ new WEB_SITE
+
2020-11-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2020.10.10
* PRE_BUILD BUILD INSTALL: fix
diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index 6da08bc..ff1d134 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -1,11 +1,11 @@
SPELL=bash
- VERSION=5.1
+ VERSION=5.1.8
PATCHLEVEL=2
-# XVERSION=${VERSION%.*}
- XVERSION=${VERSION} # only for 5.1
+ XVERSION=${VERSION%.*}
+# XVERSION=${VERSION} # only for 5.1
SECURITY_PATCH=8
-# BASH_PATCHLEVEL=${VERSION##*.}
- BASH_PATCHLEVEL=004 # only for 5.1
+ BASH_PATCHLEVEL=${VERSION##*.}
+# BASH_PATCHLEVEL=004 # only for 5.1
SOURCE=$SPELL-$XVERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE3=$SPELL-doc-3.2.tar.gz
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index c68e47f..c7c3bc5 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,6 @@
+2021-05-32 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.1.8
+
2021-01-02 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: apply patches 001-004, PATCHLEVEL++



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0a955205e21bf24bd7f6c178c475a02c3dac3273), Treeve Jelbert, 05/31/2021

Archive powered by MHonArc 2.6.24.

Top of Page