diff options
| author | Thomas Orgis | 2020-09-30 15:46:12 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2020-09-30 15:46:12 +0200 |
| commit | be6a872225340df9e846a41c457036a1b6d28a05 (patch) | |
| tree | 6e71ae0328d17dd3e17396aed73a509a371e1e4e /xorg-lib | |
| parent | 650d524370b2ae71a1b10710ed71d35f17046450 (diff) | |
pixman: handle vanished .la files, avoid fatal gtk dep
Diffstat (limited to 'xorg-lib')
| -rwxr-xr-x | xorg-lib/pixman/DEPENDS | 10 | ||||
| -rwxr-xr-x | xorg-lib/pixman/DETAILS | 1 | ||||
| -rw-r--r-- | xorg-lib/pixman/HISTORY | 5 | ||||
| -rwxr-xr-x | xorg-lib/pixman/UP_TRIGGERS | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/xorg-lib/pixman/DEPENDS b/xorg-lib/pixman/DEPENDS index f8d692aeb5..e6048b09e5 100755 --- a/xorg-lib/pixman/DEPENDS +++ b/xorg-lib/pixman/DEPENDS @@ -1,11 +1,9 @@ depends meson && depends ninja-build-system && - -optional_depends gtk+2 \ - "gtk=enabled" \ - "gtk=disabled" \ - "To build demos - can cause circular dep build issues" && - +# This is just too dangerous, enables itself if gtk is found and triggers +# nasty build failures. If you want pixman demos, build it manually +# someplace. +OPTS+=" gkt=disabled" && optional_depends libpng \ "libpng=enabled" \ "libpng=disabled" \ diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS index 9d7c205b69..aa8e4f8241 100755 --- a/xorg-lib/pixman/DETAILS +++ b/xorg-lib/pixman/DETAILS @@ -1,6 +1,7 @@ source $GRIMOIRE/MESON_FUNCTIONS SPELL=pixman VERSION=0.40.0 + PATCHLEVEL=1 SOURCE_HASH=sha512:8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_URL[0]=https://cairographics.org/releases/$SOURCE diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY index a6b01d1152..3ed9308790 100644 --- a/xorg-lib/pixman/HISTORY +++ b/xorg-lib/pixman/HISTORY @@ -1,3 +1,8 @@ +2020-09-18 Thomas Orgis <sobukus@sourcemage.org> + * DEPENDS: end that gtk2 dependency madness + * UP_TRIGGERS: trigger dependents for vanished .la + * DETAILS: ++PATCHLEVEL + 2020-04-20 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 0.40.0 diff --git a/xorg-lib/pixman/UP_TRIGGERS b/xorg-lib/pixman/UP_TRIGGERS new file mode 100755 index 0000000000..da6fa3147a --- /dev/null +++ b/xorg-lib/pixman/UP_TRIGGERS @@ -0,0 +1,6 @@ +# Pixman 0.40 silently removes the .la file, apparently. +if [[ "$INSTALL_ROOT/usr/lib/libpixman-1.la" ]]; then + . $GRIMOIRE/la_remove_up_trigger.function + la_remove_up_trigger 0 +fi + |