summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Vinogradov2021-07-19 14:31:50 -0400
committerPavel Vinogradov2021-07-19 14:35:01 -0400
commitdadcc8541ba855dfd16d8c5e9d6645efa228d9f3 (patch)
treedd600011ea44bd06955e570582a16775aa5a2b38
parent514d0dc6ccc95a6a9fa5380307795f9e242e8b2e (diff)
x11-libs/cairo: version 1.17.4, some cleanups
-rwxr-xr-xx11-libs/cairo/DETAILS6
-rw-r--r--x11-libs/cairo/HISTORY4
-rwxr-xr-xx11-libs/cairo/PRE_BUILD9
3 files changed, 9 insertions, 10 deletions
diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index 73268de31e..3067f09f86 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -8,10 +8,10 @@ if [[ "${CAIRO_BRANCH}" == "scm" ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.16.0
+ VERSION=1.17.4
+ SOURCE_HASH=sha512:843dce4f1cb5d9fb0c33240dff658ba2723bf04697045d16669e4b7674a5287ef0eb3d960a688a129902fb714230263e35d085186dc220b65307b5ad7fa09d23
SOURCE=$SPELL-$VERSION.tar.xz
- SOURCE_HASH=sha512:9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
- SOURCE_URL[0]=https://cairographics.org/releases/$SOURCE
+ 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 245333fa81..7bb9173700 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,7 @@
+2021-07-19 Pavel Vinogradov <public@sourcemage.org>
+ * DETAILS: version 1.17.4, updated SOURCE_URL[1]
+ * PRE_BUILD: apply patches only for stable branch, simplicity++
+
2020-02-05 Florian Franzmann <bwlf@bandrate.org>
* PRE_BUILD, 0001-Fix-build-against-binutils-2.34.patch: fix build
against binutils 2.34
diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD
index 18e4d7f01c..cec142a2ed 100755
--- a/x11-libs/cairo/PRE_BUILD
+++ b/x11-libs/cairo/PRE_BUILD
@@ -1,15 +1,10 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
-patch -p1 < "$SPELL_DIRECTORY/0001-Fix-build-against-binutils-2.34.patch" &&
-
if [[ "$CAIRO_BRANCH" == "scm" ]]; then
- CAIRO_AUTOGEN=y
+ NOCONFIGURE=1 ./autogen.sh
else
+ patch -p1 < "$SPELL_DIRECTORY/0001-Fix-build-against-binutils-2.34.patch" &&
# http://bugs.gentoo.org/show_bug.cgi?id=336696
patch -p1 -d "$SOURCE_DIRECTORY" < "$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch"
-fi &&
-
-if [[ "$CAIRO_AUTOGEN" == "y" ]]; then
- NOCONFIGURE=1 ./autogen.sh
fi