From 78701b2b3b106a326e20350da8fd190bdeac9c15 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 22 Oct 2022 04:17:15 -0700 Subject: [PATCH] webkit2gtk: remove common webkit2gtk generates unique locale files for each version so the common package is redundant. It is being built as a dummy package temporarily to ensure that no one installs it by accident. It should be able to be removed in the next update/revbump. --- srcpkgs/webkit2gtk/template | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 10602fae9f2d..02e2cc214a51 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,7 +1,7 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk version=2.38.1 -revision=1 +revision=2 wrksrc="webkitgtk-${version}" build_style=cmake build_helper="gir" @@ -31,7 +31,6 @@ makedepends="at-spi2-core-devel libjpeg-turbo-devel libpng-devel qt5-devel libmanette-devel libwpe-devel wpebackend-fdo-devel libgcrypt-devel libnuspell-devel libpsl-devel $(vopt_if x11 libXt-devel) $(vopt_if wayland 'MesaLib-devel libxkbcommon-devel wayland-devel wayland-protocols')" -depends="webkit2gtk-common" short_desc="GTK+3 port of the WebKit2 browser engine" maintainer="Orphaned " license="LGPL-2.1-or-later, BSD-2-Clause" @@ -40,6 +39,8 @@ distfiles="https://webkitgtk.org/releases/webkitgtk-${version}.tar.xz" checksum=02e195b3fb9e057743b3364ee7f1eec13f71614226849544c07c32a73b8f1848 make_check=no +replaces="webkit2gtk-common>0" + build_options="gir wayland x11 bubblewrap jit sampling_profiler minibrowser clang lto gtk_doc" build_options_default="gir wayland x11 bubblewrap minibrowser" @@ -67,7 +68,7 @@ fi if [ "$build_option_bubblewrap" ]; then hostmakedepends+=" bubblewrap xdg-dbus-proxy" makedepends+=" libseccomp-devel" - depends+=" bubblewrap xdg-dbus-proxy" + depends="bubblewrap xdg-dbus-proxy" fi if [ "$build_option_lto" -a -z "$build_option_clang" ]; then @@ -183,11 +184,8 @@ webkit2gtk-devel_package() { } webkit2gtk-common_package() { - short_desc="GTK port of the WebKit2 browser engine - common files" - pkg_install() { - vmove usr/share/locale/ - vmove usr/share/licenses/ - } + short_desc="GTK port of the WebKit2 browser engine - (transitional dummy package)" + build_style=meta } libwebkit2gtk41_package() { @@ -201,6 +199,12 @@ libwebkit2gtk41_package() { vmove "usr/lib/girepository-1.0/*-4.1.typelib" fi vmove "usr/lib/*-4.1.so.*" + for file in $(find ${DESTDIR}/usr/share/locale -name "*-4.1.mo"); do + vmove ${file/$DESTDIR/} + done + vlicense Source/WebCore/LICENSE-APPLE + vlicense Source/WebCore/LICENSE-LGPL-2.1 + vlicense Source/WebCore/LICENSE-LGPL-2 } } @@ -230,6 +234,12 @@ libwebkit2gtk50_package() { vmove "usr/lib/girepository-1.0/*-5.0.typelib" fi vmove "usr/lib/*-5.0.so.*" + for file in $(find ${DESTDIR}/usr/share/locale -name "*-5.0.mo"); do + vmove ${file/$DESTDIR/} + done + vlicense Source/WebCore/LICENSE-APPLE + vlicense Source/WebCore/LICENSE-LGPL-2.1 + vlicense Source/WebCore/LICENSE-LGPL-2 } }