Mercurial > vanilla

changeset 753:cb3df02aede3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
www/webkitgtk: fix some options
author David Demelier <markand@malikania.fr>
date Wed, 07 Aug 2019 21:50:49 +0200
parents b6404b1d0656
children f7b260b91a3d
files www/webkitgtk/webkitgtk.sh
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/www/webkitgtk/webkitgtk.sh	Wed Aug 07 20:40:00 2019 +0200
+++ b/www/webkitgtk/webkitgtk.sh	Wed Aug 07 21:50:49 2019 +0200
@@ -23,6 +23,7 @@
 PKGDOWNLOAD="https://webkitgtk.org/releases/$PKGNAME-$PKGVERSION.tar.xz"
 PKGDEPENDS="accessibility/atk
             dev/cmake:build
+            dev/ninja:build
             fonts/fontconfig
             fonts/freetype
             fonts/harfbuzz
@@ -56,9 +57,9 @@
 : ${CXX:=clang++}
 : ${CXXFLAGS:=-O2}
 : ${GEOLOCATION:=no}    # TODO: set to on once geoclue is there.
-: ${GSTREAMER:=no}      # TODO: set to on once gst-plugins-base is there.
+: ${GSTREAMER:=yes}
 : ${HYPHEN:=no}         # TODO: set to on once hyphen is there.
-: ${INTROSPECTION:=no}  # BROKEN: does not build if enabled
+: ${INTROSPECTION:=yes}
 : ${JPEG:=no}           # TODO: set to on once openjpeg is there.
 : ${NOTIFICATIONS:=yes}
 : ${LIBSECRET:=yes}
@@ -104,9 +105,9 @@
 
 if [ "$NOTIFICATIONS" = "yes" ]; then
 	PKGDEPENDS="desktop/notifications $PKGDEPENDS"
-	with_notifications="-DUSE_NOTIFICATIONS=On"
+	with_notifications="-DUSE_LIBNOTIFY=On"
 else
-	with_notifications="-DUSE_NOTIFICATIONS=Off"
+	with_notifications="-DUSE_LIBNOTIFY=Off"
 fi
 
 if [ "$LIBSECRET" = "yes" ]; then
@@ -165,6 +166,7 @@
 	patch -p1 < ../patch-isystem.patch
 	mkdir build && cd build
 	cmake .. \
+		-GNinja \
 		-DBUILD_SHARED_LIBS=On \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_CXX_COMPILER="$CXX" \
@@ -187,8 +189,8 @@
 		$with_wayland \
 		$with_woff2 \
 		$with_x
-	make -j3
-	make install DESTDIR=$DESTDIR
+	CC="$CC" CXX="$CXX" ninja
+	DESTDIR=$DESTDIR ninja install
 	cd ..
 
 	cd ..