Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d5c396966a3aee01980d9d1a5aac0f5ebd00429a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d5c396966a3aee01980d9d1a5aac0f5ebd00429a)
  • Date: Tue, 10 Jan 2023 00:02:12 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

gnome2-libs/glib2/DETAILS | 5 +++++
gnome2-libs/glib2/HISTORY | 4 ++++
gnome2-libs/glib2/PREPARE | 2 ++
gnome2-libs/glib2/PRE_SUB_DEPENDS | 3 ++-
gnome2-libs/glib2/REPAIR^all^PRE_SUB_DEPENDS | 8 ++++++++
gnome2-libs/glib2/SUB_DEPENDS | 2 ++
6 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit d5c396966a3aee01980d9d1a5aac0f5ebd00429a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

gnome2-libs/glib2: added stable branch + sub_depends

diff --git a/gnome2-libs/glib2/DETAILS b/gnome2-libs/glib2/DETAILS
index 07d5b08..04c3cec 100755
--- a/gnome2-libs/glib2/DETAILS
+++ b/gnome2-libs/glib2/DETAILS
@@ -1,7 +1,12 @@
. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=glib2
+if [[ "${GLIB2_BRANCH}" == "devel" ]]; then
VERSION=2.75.2

SOURCE_HASH="sha256:360d6fb75202c0eb0d07f0ab812b19b526f1c05ccc0a8ed7e5d2c988616d343a:UPSTREAM_HASH"
+else
+ VERSION=2.74.4
+
SOURCE_HASH="sha256:0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172:UPSTREAM_HASH"
+fi
SECURITY_PATCH=2
SOURCE=glib-$VERSION.tar.xz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/glib-$VERSION"
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index ee9b1b8..1e0b47d 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,7 @@
+2023-01-09 Pavel Vinpgradov <public AT sourcemage.org>
+ * DETAILS, PREPARE, *SUB_DEPENDS: added stable branch +
sub_dependencies on
+ each branch
+
2023-01-06 Pavel Vinpgradov <public AT sourcemage.org>
* DETAILS: version 2.75.2

diff --git a/gnome2-libs/glib2/PREPARE b/gnome2-libs/glib2/PREPARE
new file mode 100755
index 0000000..5e35c15
--- /dev/null
+++ b/gnome2-libs/glib2/PREPARE
@@ -0,0 +1,2 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+prepare_select_branch stable devel
diff --git a/gnome2-libs/glib2/PRE_SUB_DEPENDS
b/gnome2-libs/glib2/PRE_SUB_DEPENDS
index ebf2f40..de71a68 100755
--- a/gnome2-libs/glib2/PRE_SUB_DEPENDS
+++ b/gnome2-libs/glib2/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
- GLIB_DEVEL) ;;
+ DEVEL) if [[ "$GLIB2_BRANCH" == "devel" ]]; then return 0; fi ;;
+ STABLE) if [[ "$GLIB2_BRANCH" == "stable" ]]; then return 0; fi ;;
PYTHON) if is_depends_enabled $SPELL python; then return 0;
elif is_depends_enabled $SPELL python3; then return 0;
fi ;;
diff --git a/gnome2-libs/glib2/REPAIR^all^PRE_SUB_DEPENDS
b/gnome2-libs/glib2/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..de71a68
--- /dev/null
+++ b/gnome2-libs/glib2/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,8 @@
+case $THIS_SUB_DEPENDS in
+ DEVEL) if [[ "$GLIB2_BRANCH" == "devel" ]]; then return 0; fi ;;
+ STABLE) if [[ "$GLIB2_BRANCH" == "stable" ]]; then return 0; fi ;;
+ PYTHON) if is_depends_enabled $SPELL python; then return 0;
+ elif is_depends_enabled $SPELL python3; then return 0;
+ fi ;;
+esac
+return 1
diff --git a/gnome2-libs/glib2/SUB_DEPENDS b/gnome2-libs/glib2/SUB_DEPENDS
index a543af4..2aaaf94 100755
--- a/gnome2-libs/glib2/SUB_DEPENDS
+++ b/gnome2-libs/glib2/SUB_DEPENDS
@@ -1,4 +1,6 @@
case $THIS_SUB_DEPENDS in
PYTHON) depends PYTHON ;;
+ DEVEL) if [[ "$GLIB2_BRANCH" != "devel" ]]; then GLIB2_BRANCH="devel" &&
return 0; fi ;;
+ STABLE) if [[ "$GLIB2_BRANCH" != "stable" ]]; then GLIB2_BRANCH="stable"
&& return 0; fi ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d5c396966a3aee01980d9d1a5aac0f5ebd00429a), Pavel Vinogradov, 01/09/2023

Archive powered by MHonArc 2.6.24.

Top of Page