Mercurial > vanilla
changeset 464:e5970694cd9c
desktop/libwnck: switch back to autotools
author | David Demelier <markand@malikania.fr> |
---|---|
date | Sat, 06 Apr 2019 11:18:13 +0200 |
parents | df7153b14982 |
children | e0c302f2fa8c |
files | desktop/libwnck/libwnck.sh desktop/libwnck/meson.patch |
diffstat | 2 files changed, 14 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/desktop/libwnck/libwnck.sh Sat Apr 06 11:06:19 2019 +0200 +++ b/desktop/libwnck/libwnck.sh Sat Apr 06 11:18:13 2019 +0200 @@ -21,11 +21,14 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="window navigator construction kit" PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/3.31/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="dev/meson:build desktop/startup-notification dev/gobject-introspection" +PKGDEPENDS="desktop/startup-notification dev/gobject-introspection" -: ${CC:=gcc} +: ${CHOST:=$(uname -m)-linux-musl} +: ${CBUILD:=$(uname -m)-linux-musl} +: ${CC:=clang} : ${CFLAGS:=-O2} : ${LDFLAGS:=} +: ${LIBS:=} build() { @@ -33,18 +36,18 @@ tar xvaf $PKGNAME-$PKGVERSION.tar.xz pushd $PKGNAME-$PKGVERSION - patch -p0 < ../meson.patch + NOCONFIGURE=1 ./autogen.sh CC="$CC" \ CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" \ - meson \ - --prefix /usr \ - --buildtype release \ - --default-library shared \ - -D gtk_doc=false \ - . build - CC="$CC" ninja -C build - DESTDIR=$DESTDIR ninja -C build install + LIBS="$LIBS" \ + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr + make + make install DESTDIR=$DESTDIR + rm -f $DESTDIR/usr/lib/libwnck-3.la popd rm -rf $PKGNAME-$PKGVERSION
--- a/desktop/libwnck/meson.patch Sat Apr 06 11:06:19 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ ---- meson.build.orig 2019-04-01 18:48:42.112306765 +0000 -+++ meson.build 2019-04-01 18:48:56.522469768 +0000 -@@ -80,10 +80,7 @@ - pc_conf.set('VERSION', meson.project_version()) - - foreach pc: [PACKAGE_NAME, PACKAGE_NAME + '-uninstalled'] -- install_path = [] -- if not pc.contains('-uninstalled') -- install_path = join_paths(libdir, 'pkgconfig') -- endif -+ install_path = '/usr/lib/pkgconfig' - configure_file(input: pc + '.pc.in', - output: pc + '.pc', - configuration: pc_conf, ---- libwnck/meson.build.orig 2019-04-01 20:51:13.650735190 +0200 -+++ libwnck/meson.build 2019-04-01 20:51:25.410875902 +0200 -@@ -117,7 +117,7 @@ - ) - endif - --install_headers(headers, subdir: libwnck_includedir) -+install_headers(headers, install_dir: libwnck_includedir) - - progs = [ - 'wnckprop',