Skip to Content.
Sympa Menu

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

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 (63826fdf402ae3a77160a7552e54922229b0109e)
  • Date: Sat, 13 Aug 2022 18:24:14 +0000

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

x11-libs/cairo/CONFIGURE | 4 ++++
x11-libs/cairo/DEPENDS | 6 +-----
x11-libs/cairo/HISTORY | 4 ++++
x11-libs/cairo/SUB_DEPENDS | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)

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

x11-libs/cairo: fixed a typo, reorganized cleanup code

diff --git a/x11-libs/cairo/CONFIGURE b/x11-libs/cairo/CONFIGURE
index 0b78b2a..3cf6765 100755
--- a/x11-libs/cairo/CONFIGURE
+++ b/x11-libs/cairo/CONFIGURE
@@ -2,6 +2,10 @@

list_remove CAIRO_OPTS "--enable-tee=yes" &&
list_remove CAIRO_OPTS "--enable-tee=no" &&
+list_remove CAIRO_OPTS "--enable-xlib-xcb" &&
+list_remove CAIRO_OPTS "--enable-xlib-xcb=yes" &&
+list_remove CAIRO_OPTS "--enable-xlib-xcb=nno" &&
+list_remove CAIRO_OPTS "--disable-xlib-xcb" &&

config_query_option CAIRO_OPTS "Enable cairo's tee surface backend feature?"
n \
"tee=enabled" "tee=disabled"
diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index 84b2f4a..5d77248 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -56,11 +56,7 @@ if is_depends_enabled $SPELL libx11; then
if is_depends_enabled ${SPELL} libxcb; then
config_query_option CAIRO_OPTS "Enable Xlib/XCB functions feature?" n \
"xlib-xcb=enabled" \
- "xlib-xcb=disabled" &&
- list_remove CAIRO_OPTS "--enable-xlib-xcb" &&
- list_remove CAIRO_OPTS "--enable-xlib-xcb=yes" &&
- list_remove CAIRO_OPTS "--enable-xlib-xcb=nno" &&
- list_remove CAIRO_OPTS "--disable-xlib-xcb"
+ "xlib-xcb=disabled"
fi
fi &&

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index f947295..714a258 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2022-08-13 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFIGURE, DEPENDS: moved cleanup code to one place
+ * SUB_DEPENDS: fixed a typo (kudos to SneakyThunder)
+
2022-08-09 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD, patches/0001-Fix-build-against-binutils-2.39.patch,
patches-stable/0001-Fix-build-with-newer-binutils.patch: fix build
diff --git a/x11-libs/cairo/SUB_DEPENDS b/x11-libs/cairo/SUB_DEPENDS
index 7d5691b..5797b0f 100755
--- a/x11-libs/cairo/SUB_DEPENDS
+++ b/x11-libs/cairo/SUB_DEPENDS
@@ -3,7 +3,7 @@ case $THIS_SUB_DEPENDS in
[[ "$CAIRO_BRANCH" == "scm" ]] ||
CAIRO_BRANCH="devel";;
PDF) return 0;;
XCB) message "Cairo with XCB support requested, forcing libxcb dependency"
&&
- depends libxcb "xcb=enbled";;
+ depends libxcb "xcb=enabled";;
GOBJ) message "Cairo with gobject functions feature requested, forcing
glib2 dependency" &&
depends glib2 "glib=enabled";;
PNG) message "Cairo with PNG support requested, forcing libpng dependency"
&&



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

Archive powered by MHonArc 2.6.24.

Top of Page