From 4a942e8789233d357dcd6864673d0b71d2023197 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 22 Oct 2022 04:17:15 -0700
Subject: [PATCH] webkit2gtk: remove webkit2gtk-common subpackage

webkit2gtk generates unique locale files for each version so the
common package is redundant.

The locale files also got installed to the wrong location in the
common package, i.e. /usr/share/locale/locale instead of
/usr/share/locale
---
 srcpkgs/removed-packages/template |  1 +
 srcpkgs/webkit2gtk-common         |  1 -
 srcpkgs/webkit2gtk/template       | 27 ++++++++++++++++-----------
 3 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/webkit2gtk-common

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1b8e3bb7a7d2..1361f37ba070 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -492,6 +492,7 @@ replaces="
  vte290<=0.36.5_5
  vte<=0.28.2_16
  w_scan<=20170107_1
+ webkit2gtk-common<=2.38.1_1
  wicd-gtk<=1.7.4_6
  wireguard-go<=0.0.20181222_2
  wireshark-gtk<=3.0.7_1
diff --git a/srcpkgs/webkit2gtk-common b/srcpkgs/webkit2gtk-common
deleted file mode 120000
index 8ae98428991b..000000000000
--- a/srcpkgs/webkit2gtk-common
+++ /dev/null
@@ -1 +0,0 @@
-webkit2gtk
\ No newline at end of file
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 10602fae9f2d..771b61495cc3 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 <orphan@voidlinux.org>"
 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
@@ -182,14 +183,6 @@ 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/
-	}
-}
-
 libwebkit2gtk41_package() {
 	depends="${depends}"
 	short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
@@ -201,6 +194,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 +229,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
 	}
 }