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

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

[-- Attachment #1: Type: text/plain, Size: 1498 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 common
[ci skip]
webkit2gtk generates unique locale files for each version so the common package is redundant.

The vmove in the common package also installed the locale files to the wrong place for some reason as well which should be fixed as well.

<!-- 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: 3039 bytes --]

From f6e47f99fc91c91bda6f0774ade6d5176c36ca8a 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 common

webkit2gtk generates unique locale files for each version so the
common package is redundant.
---
 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 <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
@@ -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
 	}
 }