wok diff wayland/receipt @ rev 25463

Up expat (2.4.9) fixes CVE-2022-40674
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Sep 29 20:05:23 2022 +0000 (20 months ago)
parents bd7510903310
children
line diff
     1.1 --- a/wayland/receipt	Sun May 01 08:42:44 2022 +0000
     1.2 +++ b/wayland/receipt	Thu Sep 29 20:05:23 2022 +0000
     1.3 @@ -1,20 +1,22 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="wayland"
     1.7 -VERSION="1.4.0"
     1.8 +VERSION="1.21.0"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Wayland simpler X display server protocol."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="MIT"
    1.13 +WEB_SITE="https://wayland.freedesktop.org/"
    1.14 +
    1.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.16 -WEB_SITE="http://www.slitaz.org/"
    1.17 -WGET_URL="https://wayland.freedesktop.org/releases/$TARBALL"
    1.18 -HOST_ARCH="i486 arm"
    1.19 +WGET_URL="https://gitlab.freedesktop.org/$PACKAGE/$PACKAGE/-/releases/$VERSION/downloads/$TARBALL"
    1.20  
    1.21  # WARNING: wayland must be installed in chroot since build host 
    1.22  # wayland-scanner is used for cross compilation to ARM
    1.23 -DEPENDS="libffi expat"
    1.24 -BUILD_DEPENDS="libffi-dev expat-dev"
    1.25 +DEPENDS="expat gcc83-lib-base libffi"
    1.26 +BUILD_DEPENDS="expat-dev gcc83 libffi-dev meson"
    1.27 +
    1.28 +HOST_ARCH="i486 arm"
    1.29  
    1.30  # Handle cross compilation
    1.31  case "$ARCH" in
    1.32 @@ -31,18 +33,23 @@
    1.33  # Rules to configure and make the package.
    1.34  compile_rules()
    1.35  {
    1.36 -	./configure \
    1.37 -		--prefix=/usr \
    1.38 -		--disable-documentation \
    1.39 -		${CONFIGURE_ARGS} ${ARCH_ARGS} &&
    1.40 -	make && make install
    1.41 +	export	CC=gcc-83
    1.42 +
    1.43 +	meson	_build			\
    1.44 +		-D documentation=false	\
    1.45 +		--prefix=/usr &&
    1.46 +	ninja	-C _build &&
    1.47 +	ninja	-C _build install
    1.48  }
    1.49  
    1.50  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.51  genpkg_rules()
    1.52  {
    1.53 -	mkdir -p $fs/usr/lib $fs/usr/share
    1.54 -	[ -d "$install/usr/bin" ] && cp -a $install/usr/bin $fs/usr
    1.55 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.56 -	cp -a $install/usr/share/wayland $fs/usr/share
    1.57 +	mkdir -p $fs/usr/lib
    1.58 +	mkdir -p $fs/usr/share
    1.59 +
    1.60 +	[ -d "$install/usr/bin" ] &&
    1.61 +	cp -a $install/usr/bin			$fs/usr
    1.62 +	cp -a $install/usr/lib/*.so*		$fs/usr/lib
    1.63 +	cp -a $install/usr/share/wayland	$fs/usr/share
    1.64  }