From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] webkit2gtk: remove common
Date: Sat, 22 Oct 2022 22:25:06 +0200 [thread overview]
Message-ID: <20221022202506.7bGu6FW5CPjIoXwlCus2k03kOHmEOO3p10bpJsc5xlM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40103@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1724 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.
It is being built as a dummy package temporarily just to ensure people don't install it by accident. It should be able to be removed in the next update/revbump. The webkit2gtk-common package seemed to have installed files to the wrong location for some reason, so it doesn't technically conflict though. (`/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: 3114 bytes --]
From 505ab9d48eb735325efd7be1b0e0f67104301682 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.
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-common | 1 -
srcpkgs/webkit2gtk/template | 25 ++++++++++++++-----------
2 files changed, 14 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/webkit2gtk-common
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
}
}
next prev parent reply other threads:[~2022-10-22 20:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-22 12:02 [PR PATCH] " oreo639
2022-10-22 12:03 ` [PR PATCH] [Updated] " oreo639
2022-10-22 12:09 ` oreo639
2022-10-22 12:19 ` oreo639
2022-10-22 12:20 ` [PR REVIEW] " sgn
2022-10-22 12:25 ` [PR PATCH] [Updated] " oreo639
2022-10-22 12:35 ` oreo639
2022-10-22 20:20 ` oreo639
2022-10-22 20:25 ` oreo639 [this message]
2022-10-22 20:27 ` oreo639
2022-10-22 20:27 ` oreo639
2022-10-22 20:52 ` [PR PATCH] [Updated] webkit2gtk: remove common subpkg oreo639
2022-10-22 20:52 ` oreo639
2022-10-22 20:56 ` [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage oreo639
2022-10-22 20:57 ` oreo639
2022-10-22 23:21 ` oreo639
2022-10-23 3:11 ` oreo639
2022-10-26 8:47 ` [PR REVIEW] " paper42
2022-10-26 8:49 ` paper42
2022-10-26 9:12 ` oreo639
2022-10-26 9:12 ` oreo639
2022-10-26 9:14 ` [PR PATCH] [Updated] " oreo639
2022-10-26 9:17 ` [PR REVIEW] " oreo639
2022-10-26 9:17 ` oreo639
2022-10-26 9:18 ` oreo639
2022-10-26 18:35 ` paper42
2022-10-26 18:41 ` oreo639
2022-10-26 18:42 ` [PR PATCH] [Updated] " oreo639
2022-10-26 18:58 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221022202506.7bGu6FW5CPjIoXwlCus2k03kOHmEOO3p10bpJsc5xlM@z \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).