Skip to Content.
Sympa Menu

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

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 (ad681541c6ec83ca14d9e78abc595c3c9c14a133)
  • Date: Thu, 14 Jul 2022 00:20:53 +0000

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

gnome2-libs/at-spi2-atk/DEPENDS | 5 ++---
gnome2-libs/at-spi2-atk/HISTORY | 3 +++
gnome2-libs/at-spi2-core/CONFLICTS | 3 +++
gnome2-libs/at-spi2-core/DETAILS | 5 +++--
gnome2-libs/at-spi2-core/HISTORY | 4 ++++
gnome2-libs/atk/CONFLICTS | 4 ++++
gnome2-libs/atk/HISTORY | 4 ++++
gnome2-libs/atk/UP_TRIGGERS | 5 +++++
http/firefox-esr/DEPENDS | 7 ++++++-
http/firefox-esr/HISTORY | 3 +++
http/firefox/DEPENDS | 7 ++++++-
http/firefox/HISTORY | 3 +++
x11-toolkits/gtk+3/DEPENDS | 9 ++++++++-
x11-toolkits/gtk+3/HISTORY | 3 +++
x11-toolkits/gtk+4/DEPENDS | 7 ++++++-
x11-toolkits/gtk+4/HISTORY | 1 +
16 files changed, 64 insertions(+), 9 deletions(-)

New commits:
commit ad681541c6ec83ca14d9e78abc595c3c9c14a133
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

http/firefox-esr: only depends on atk if old at-spi2-core

commit 8e92681a649359b05a7bbe800b9934ccd0248d1a
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

http/firefox: only depends on atk if old at-spi2-core

commit 46fd0c4eff53bad1cac8b385b7152641aa15e8be
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

x11-toolkits/gtk+4: only depends on atk if old at-spi2-core

commit 5369ce885445581ee10e9b738c825d1eb3645345
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

x11-toolkits/gtk+3: only depends on atk if old at-spi2-core

commit 6a1cfa0e8d1147a3f2f496fbc63ede0a78f9569e
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

gnome2-libs/at-spi2-atk: only needs atk if old at-spi2-core

commit f2b0fd91af8282579ec7ccf101ba1404f289bee7
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

gnome2-libs/atk: self dispel if newer at-spi2-core is found

commit 33ecb99f9e70afc1090b270339340362228d1362
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

gnome2-libs/at-spi2-core: added devel version 2.45.1

diff --git a/gnome2-libs/at-spi2-atk/DEPENDS b/gnome2-libs/at-spi2-atk/DEPENDS
index f2bf559..31fe78c 100755
--- a/gnome2-libs/at-spi2-atk/DEPENDS
+++ b/gnome2-libs/at-spi2-atk/DEPENDS
@@ -1,8 +1,7 @@
. "${GRIMOIRE}/MESON_DEPENDS" &&
depends at-spi2-core &&
-if [[ "${AT_SPI2_ATK_BRANCH}" == "devel" ]]; then
- depends -sub "ATK_DEVEL" atk
-else
+if spell_ok at-spi2-core &&
+ is_version_less "$(installed_version at-spi2-core)" "2.45.1"; then
depends atk
fi &&
depends dbus &&
diff --git a/gnome2-libs/at-spi2-atk/HISTORY b/gnome2-libs/at-spi2-atk/HISTORY
index fa103dd..3ac7fc1 100644
--- a/gnome2-libs/at-spi2-atk/HISTORY
+++ b/gnome2-libs/at-spi2-atk/HISTORY
@@ -1,3 +1,6 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: only depends on atk if old at-spi2-core
+
2022-04-01 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: use grimoire-wide MESON_DEPENDS

diff --git a/gnome2-libs/at-spi2-core/CONFLICTS
b/gnome2-libs/at-spi2-core/CONFLICTS
new file mode 100755
index 0000000..65c547b
--- /dev/null
+++ b/gnome2-libs/at-spi2-core/CONFLICTS
@@ -0,0 +1,3 @@
+if [[ "${AT_SPI2_CORE_BRANCH}" == "devel" ]]; then
+ conflicts atk
+fi
diff --git a/gnome2-libs/at-spi2-core/DETAILS
b/gnome2-libs/at-spi2-core/DETAILS
index 1c0991f..8838d76 100755
--- a/gnome2-libs/at-spi2-core/DETAILS
+++ b/gnome2-libs/at-spi2-core/DETAILS
@@ -1,11 +1,12 @@
source $GRIMOIRE/MESON_FUNCTIONS
SPELL=at-spi2-core
if [[ "${AT_SPI2_CORE_BRANCH}" == "devel" ]]; then
- VERSION=2.44.1
+ VERSION=2.45.1
+
SOURCE_HASH=sha256:ba95f346e93108fbb3462c62437081d582154db279b4052dedc52a706828b192:UPSTREAM_HASH
else
VERSION=2.44.1
-fi

SOURCE_HASH=sha256:4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746:UPSTREAM_HASH
+fi
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/${VERSION%.*}/$SOURCE
diff --git a/gnome2-libs/at-spi2-core/HISTORY
b/gnome2-libs/at-spi2-core/HISTORY
index f0f8dd4..cb21a9f 100644
--- a/gnome2-libs/at-spi2-core/HISTORY
+++ b/gnome2-libs/at-spi2-core/HISTORY
@@ -1,3 +1,7 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: added devel version 2.45.1
+ * CONFLICTS: added conflict with atk if devel
+
2022-05-08 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 2.44.1

diff --git a/gnome2-libs/atk/CONFLICTS b/gnome2-libs/atk/CONFLICTS
new file mode 100755
index 0000000..b5b44d0
--- /dev/null
+++ b/gnome2-libs/atk/CONFLICTS
@@ -0,0 +1,4 @@
+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ conflicts atk y
+fi
diff --git a/gnome2-libs/atk/HISTORY b/gnome2-libs/atk/HISTORY
index fbd98b8..b778692 100644
--- a/gnome2-libs/atk/HISTORY
+++ b/gnome2-libs/atk/HISTORY
@@ -1,3 +1,7 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS, UP_TRIGGERS: added to begin deprecation process if newer
+ at-spi2-core is found
+
2022-04-01 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 2.38.0
* DEPENDS: use grimoire-wide MESON_DEPENDS
diff --git a/gnome2-libs/atk/UP_TRIGGERS b/gnome2-libs/atk/UP_TRIGGERS
new file mode 100755
index 0000000..792b99d
--- /dev/null
+++ b/gnome2-libs/atk/UP_TRIGGERS
@@ -0,0 +1,5 @@
+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ on_cast atk dispel_self &&
+ up_trigger at-spi2-core cast_self
+fi
diff --git a/http/firefox-esr/DEPENDS b/http/firefox-esr/DEPENDS
index 76192da..c7ca62d 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -9,7 +9,12 @@ depends icu "--with-system-icu"
&&

depends glib2 &&
depends gtk+3 "--enable-default-toolkit=cairo-gtk3" &&
-depends atk &&
+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ depends at-spi2-core
+else
+ depends atk
+fi &&
depends libx11 &&
depends libxext &&
depends libxrender &&
diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 7077f67..ddca42f 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,6 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: only needs atk if old at-spi2-core
+
2022-07-01 Thomas Orgis <sobukus AT orgis.org>
* */: re-freshed from firefox spell for 102.0esr
INSTALL: also avoid downloading python stuff for install
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 76192da..c7ca62d 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -9,7 +9,12 @@ depends icu "--with-system-icu"
&&

depends glib2 &&
depends gtk+3 "--enable-default-toolkit=cairo-gtk3" &&
-depends atk &&
+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ depends at-spi2-core
+else
+ depends atk
+fi &&
depends libx11 &&
depends libxext &&
depends libxrender &&
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index c18e4e8..bfe3862 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,6 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: only needs atk if old at-spi2-core
+
2022-07-05 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 102.0.1

diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
index b99517c..9a2ac19 100755
--- a/x11-toolkits/gtk+3/DEPENDS
+++ b/x11-toolkits/gtk+3/DEPENDS
@@ -10,10 +10,17 @@ optional_depends gobject-introspection \

vdepends << ! &&
gdk-pixbuf2 >= 2.30
- atk >= 2.15
pango >= 1.41
!

+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ depends at-spi2-core
+else
+ vdepends << ! &&
+ atk >= 2.15
+!
+fi &&
depends at-spi2-atk &&
depends libsm &&
depends libxext &&
diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
index cb08ad4..3c259ed 100644
--- a/x11-toolkits/gtk+3/HISTORY
+++ b/x11-toolkits/gtk+3/HISTORY
@@ -1,3 +1,6 @@
+2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
+ * DEPENDS: only depends on atk if old at-spi2-core
+
2022-05-28 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: version 3.24.34

diff --git a/x11-toolkits/gtk+4/DEPENDS b/x11-toolkits/gtk+4/DEPENDS
index 5eef8e1..f2281e9 100755
--- a/x11-toolkits/gtk+4/DEPENDS
+++ b/x11-toolkits/gtk+4/DEPENDS
@@ -1,5 +1,10 @@
. "${GRIMOIRE}/MESON_DEPENDS" &&
-depends atk &&
+if spell_ok at-spi2-core &&
+ is_version_less "2.45.1" "$(installed_version at-spi2-core)"; then
+ depends at-spi2-core
+else
+ depends atk
+fi &&
depends -sub "CAIRO_DEVEL PDF PS SVG X GOBJ" cairo &&
depends gdk-pixbuf2 &&
depends glib2 &&
diff --git a/x11-toolkits/gtk+4/HISTORY b/x11-toolkits/gtk+4/HISTORY
index 8c47683..c9c84c1 100644
--- a/x11-toolkits/gtk+4/HISTORY
+++ b/x11-toolkits/gtk+4/HISTORY
@@ -1,5 +1,6 @@
2022-07-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.7.1
+ * DEPENDS: only needs atk if old at-spi2-core

2022-05-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 4.7.0



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (ad681541c6ec83ca14d9e78abc595c3c9c14a133), Pavel Vinogradov, 07/13/2022

Archive powered by MHonArc 2.6.24.

Top of Page