Skip to Content.
Sympa Menu

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

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
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dab79389252be8fbd4d4588c95d9f341e869b8d2)
  • Date: Thu, 9 Jun 2022 12:18:32 +0000

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

ChangeLog | 4 ++++
KDE5_DEPENDS | 9 +--------
QT_DEPENDS | 8 ++++++++
qt5-cmake/rosegarden/DEPENDS | 4 +---
qt5-cmake/rosegarden/DETAILS | 21 +++------------------
qt5-cmake/rosegarden/HISTORY | 5 +++++
qt5-cmake/rosegarden/PREPARE | 6 ------
7 files changed, 22 insertions(+), 35 deletions(-)

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

add QT_DEPENDS

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

rosegarden: => 22.06

diff --git a/ChangeLog b/ChangeLog
index 9a3d5c7..eee09be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * KDE5_DEPENDS: updated
+ * QT_DEPENDS: added
+
2022-06-05 Florian Franzmann <bwlf AT bandrate.org>
* libs/pyogg: move to python-pypi
* python-pypi/python-brotlicffi: new spell, python bindings for brotli
diff --git a/KDE5_DEPENDS b/KDE5_DEPENDS
index d0863be..c7c0187 100755
--- a/KDE5_DEPENDS
+++ b/KDE5_DEPENDS
@@ -1,9 +1,2 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
-depends -sub CXX gcc &&
-if [[ -f /etc/KDE_USE_QT6 ]];then
- depends qt6base
-else
- depends -sub ACCESS qtbase &&
- depends qtx11extras
-fi &&
+source $GRIMOIRE/QT_DEPENDS &&
depends extra-cmake-modules
diff --git a/QT_DEPENDS b/QT_DEPENDS
new file mode 100755
index 0000000..d09d198
--- /dev/null
+++ b/QT_DEPENDS
@@ -0,0 +1,8 @@
+source $GRIMOIRE/CMAKE_DEPENDS &&
+depends -sub CXX gcc &&
+if [[ -f /etc/KDE_USE_QT6 ]];then
+ depends qt6base
+else
+ depends -sub ACCESS qtbase &&
+ depends qtx11extras
+fi
diff --git a/qt5-cmake/rosegarden/DEPENDS b/qt5-cmake/rosegarden/DEPENDS
index 3733ab4..e9a0025 100755
--- a/qt5-cmake/rosegarden/DEPENDS
+++ b/qt5-cmake/rosegarden/DEPENDS
@@ -1,6 +1,4 @@
-source $GRIMOIRE/CMAKE_DEPENDS &&
-depends -sub CXX gcc &&
-depends qtbase &&
+source $GRIMOIRE/QT_DEPENDS &&
depends FFTW &&
depends libxt &&
depends alsa-lib &&
diff --git a/qt5-cmake/rosegarden/DETAILS b/qt5-cmake/rosegarden/DETAILS
index 2e6775f..ff6a480 100755
--- a/qt5-cmake/rosegarden/DETAILS
+++ b/qt5-cmake/rosegarden/DETAILS
@@ -1,24 +1,9 @@
SPELL=rosegarden
-if [[ $RG_VCS == y ]]
-then
- if [[ $RG_VCS_AUTOUPDATE == y ]]
- then
- VERSION=$(date +%Y%m%d)
- else
- VERSION=svn
- fi
- SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-
SOURCE_URL[0]=svn_http://$SPELL.svn.sourceforge.net/svnroot/$SPELL/trunk/$SPELL:$SPELL-svn
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-else
- VERSION=21.12
-
SOURCE_HASH=sha512:d11756f57e4f364993af67e4aa10c25ef6a7f5fd4baddd127df50c84c29d31aa1e4a42485c8503e9fca31a8cf8e50c3c5b3bad2a08ac945a3fc8cd1a5874d4be
+ VERSION=22.06
+
SOURCE_HASH=sha512:42ce03a65f9c9401cb3f641c0ae80a827e18d6f47420add382f63273f4644eac5997befe70cac972380441a43d74153a4e37a276fc3dc8d9889eb8671759ab5a
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-
SOURCE_URL[0]=https://sourceforge.net/projects/rosegarden/files/rosegarden/${VERSION%.?}/$SOURCE
-fi
+
SOURCE_URL[0]=https://sourceforge.net/projects/rosegarden/files/rosegarden/${VERSION%.?}/$SOURCE/download
WEB_SITE=https://www.rosegardenmusic.com/
ENTERED=20020514
LICENSE[0]=GPL
diff --git a/qt5-cmake/rosegarden/HISTORY b/qt5-cmake/rosegarden/HISTORY
index 1eddae5..d4a78a1 100644
--- a/qt5-cmake/rosegarden/HISTORY
+++ b/qt5-cmake/rosegarden/HISTORY
@@ -1,3 +1,8 @@
+2022-06-09 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 22.06; drop svn support
+ * DEPENDS: use QT_DEPENDS, for qt5/6
+ * PREPARE: deleted
+
2022-01-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 21.12

diff --git a/qt5-cmake/rosegarden/PREPARE b/qt5-cmake/rosegarden/PREPARE
deleted file mode 100755
index 2e83397..0000000
--- a/qt5-cmake/rosegarden/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-config_query RG_VCS "Build latest version from development tree?" n &&
-
-if [[ $RG_VCS == y ]]; then
- config_query RG_VCS_AUTOUPDATE \
- "Update automatically on every system update?" n
-fi



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (dab79389252be8fbd4d4588c95d9f341e869b8d2), Treeve Jelbert, 06/09/2022

Archive powered by MHonArc 2.6.24.

Top of Page