Skip to Content.
Sympa Menu

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

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 (8fc0e1d97c8e17614484f9e781792037e43c3935)
  • Date: Sun, 5 Feb 2023 17:51:20 +0000

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

x11-libs/cairo/DEPENDS |
7 --
x11-libs/cairo/DETAILS |
8 +-
x11-libs/cairo/HISTORY |
6 +
x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch |
34 ----------
4 files changed, 10 insertions(+), 45 deletions(-)

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

x11-libs/cairo: version 1.17.8

diff --git a/x11-libs/cairo/DEPENDS b/x11-libs/cairo/DEPENDS
index a891b93..9d66f73 100755
--- a/x11-libs/cairo/DEPENDS
+++ b/x11-libs/cairo/DEPENDS
@@ -71,13 +71,6 @@ optional_depends libpng \

optional_depends lzo "" "" "for LZO compression support" &&

-if [[ "${CAIRO_BRANCH}" != "scm" ]]; then
- optional_depends OPENGL \
- "gl-backend=auto" \
- "gl-backend=disabled" \
- "for OpenGL accelerated graphics"
-fi &&
-
optional_depends gtk-doc \
"gtk_doc=true" \
"gtk_doc=false" \
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 8271d26..1a266c1 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -9,10 +9,10 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.17.6
-
SOURCE_HASH=sha512:1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
- SOURCE=$SPELL-$VERSION.tar.bz2
-
SOURCE_URL[0]=https://gitlab.freedesktop.org/cairo/cairo/-/archive/${VERSION}/${SOURCE}
+ VERSION=1.17.8
+
SOURCE_HASH="sha256:5b10c8892d1b58d70d3f0ba5b47863a061262fa56b9dc7944161f8c8b783bc64:UPSTREAM_HASH"
+ SOURCE=$SPELL-$VERSION.tar.xz
+ SOURCE_URL[0]="https://cairographics.org/snapshots/${SOURCE}";
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://cairographics.org/
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 4f5afbd..f027777 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,9 @@
+2023-02-05 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.17.8, updated SOURCE_URL[0], bz2 -> xz, switched
to
+ UPSTREAM_HASH
+ * DEPENDS: dropped OPENGL completely
+ * patches-stable/0001-Fix-build-with-newer-binutils.patch: removed,
needed no more
+
2023-02-01 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: OPENGL isn't for scm branch anymore

diff --git
a/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch
b/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch
deleted file mode 100644
index 27d0e0d..0000000
--- a/x11-libs/cairo/patches-stable/0001-Fix-build-with-newer-binutils.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv AT debian.org>
-Date: Wed, 13 Jul 2022 21:26:57 +0100
-Subject: [PATCH] Fix build with newer binutils-dev installed
-
-It seems the PTR typedef (or macro?) has been removed from newer versions
-of libbfd.
-
-Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
-Signed-off-by: Simon McVittie <smcv AT debian.org>
----
- util/cairo-trace/lookup-symbol.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/util/cairo-trace/lookup-symbol.c
b/util/cairo-trace/lookup-symbol.c
-index 3934066b9..ca15688c4 100644
---- a/util/cairo-trace/lookup-symbol.c
-+++ b/util/cairo-trace/lookup-symbol.c
-@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char
*filename)
- if (! bfd_check_format_matches (symtab->bfd, bfd_object, &matching))
- goto BAIL;
-
-- symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR)
&symtab->syms, &size);
-+ symcount = bfd_read_minisymbols (symtab->bfd, false, (void **)
&symtab->syms, &size);
- if (symcount == 0) {
- symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
-- (PTR) &symtab->syms, &size);
-+ (void **) &symtab->syms, &size);
- }
- if (symcount < 0)
- goto BAIL;
---
-GitLab
-



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (8fc0e1d97c8e17614484f9e781792037e43c3935), Pavel Vinogradov, 02/05/2023

Archive powered by MHonArc 2.6.24.

Top of Page