Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage

[oreo639 <oreo639@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]

There is an updated pull request by oreo639 against master on the void-packages repository

https://github.com/oreo639/void-packages webkit2gtk
https://github.com/void-linux/void-packages/pull/40103

webkit2gtk: remove webkit2gtk-common subpackage
[ci skip]
webkit2gtk generates unique locale files for each version so the common package is redundant.

he webkit2gtk-common package seemed to have installed files to the wrong location for some reason. The only files that conflict are the license files. (The locale files got installed to `/usr/share/locale/locale` instead of `/usr/share/locale`)

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40103.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-webkit2gtk-40103.patch --]
[-- Type: text/x-diff, Size: 3571 bytes --]

From 7bfb7c7141d913cde5b0dd1be02999886fa61da6 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       | 25 ++++++++++++++-----------
 3 files changed, 15 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..85b7ac2373dd 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"
@@ -67,7 +66,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 +181,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 +192,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 +227,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
 	}
 }