* [PR PATCH] webkit2gtk: remove common
@ 2022-10-22 12:02 oreo639
2022-10-22 12:03 ` [PR PATCH] [Updated] " oreo639
` (27 more replies)
0 siblings, 28 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]
There is a new 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
webkit2gtk generates unique locale files for each version so the common package is redundant.
<!-- 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: 3304 bytes --]
From fbf9425e2101db651ac6c8a2c6a0230896d041ad 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 | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 10602fae9f2d..185ae4d20e0b 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"
+
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
@@ -166,6 +167,11 @@ post_install() {
vlicense Source/WebCore/LICENSE-LGPL-2
}
+webkit2gtk-common_package() {
+ short_desc="GTK port of the WebKit2 browser engine - common files (transitional dummy package)"
+ build_style=meta
+}
+
webkit2gtk-devel_package() {
depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
@@ -182,14 +188,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 +199,10 @@ libwebkit2gtk41_package() {
vmove "usr/lib/girepository-1.0/*-4.1.typelib"
fi
vmove "usr/lib/*-4.1.so.*"
+ vmove "usr/share/locale/locale/*/LC_MESSAGES/*-4.1.*"
+ vlicense Source/WebCore/LICENSE-APPLE
+ vlicense Source/WebCore/LICENSE-LGPL-2.1
+ vlicense Source/WebCore/LICENSE-LGPL-2
}
}
@@ -230,6 +232,10 @@ libwebkit2gtk50_package() {
vmove "usr/lib/girepository-1.0/*-5.0.typelib"
fi
vmove "usr/lib/*-5.0.so.*"
+ vmove "usr/share/locale/locale/*/LC_MESSAGES/*-4.0.*"
+ vlicense Source/WebCore/LICENSE-APPLE
+ vlicense Source/WebCore/LICENSE-LGPL-2.1
+ vlicense Source/WebCore/LICENSE-LGPL-2
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
@ 2022-10-22 12:03 ` oreo639
2022-10-22 12:09 ` oreo639
` (26 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1357 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.
<!-- 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: 3421 bytes --]
From e66fd2fc68bbd260a05ad38bf47cda1897e8f821 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 | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 10602fae9f2d..9855c1d2e2db 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
+conflicts="webkit2gtk-common<=2.38.1_1"
+
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
@@ -166,6 +167,11 @@ post_install() {
vlicense Source/WebCore/LICENSE-LGPL-2
}
+webkit2gtk-common_package() {
+ short_desc="GTK port of the WebKit2 browser engine - common files (transitional dummy package)"
+ build_style=meta
+}
+
webkit2gtk-devel_package() {
depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
@@ -182,14 +188,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 +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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
2022-10-22 12:03 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-22 12:09 ` oreo639
2022-10-22 12:19 ` oreo639
` (25 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1357 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.
<!-- 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: 3408 bytes --]
From 69d4ff55cd2f644b866253b96fd1eff3e47982cc 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 | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 10602fae9f2d..2e04bfcb0b9d 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
+conflicts="webkit2gtk-common<=2.38.1_1"
+
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
@@ -166,6 +167,11 @@ post_install() {
vlicense Source/WebCore/LICENSE-LGPL-2
}
+webkit2gtk-common_package() {
+ short_desc="GTK port of the WebKit2 browser engine - (transitional dummy package)"
+ build_style=meta
+}
+
webkit2gtk-devel_package() {
depends="gtk+3-devel libsoup-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
@@ -182,14 +188,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 +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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common 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
` (24 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:19 UTC (permalink / raw)
To: ml
[-- 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: 3048 bytes --]
From 076c70a9b4d631abcc6b6a3ad52c98f6f04ecead 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..2a2cf990d24a 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
+conflicts="webkit2gtk-common<=2.38.1_1"
+
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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (2 preceding siblings ...)
2022-10-22 12:19 ` oreo639
@ 2022-10-22 12:20 ` sgn
2022-10-22 12:25 ` [PR PATCH] [Updated] " oreo639
` (23 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: sgn @ 2022-10-22 12:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1002456309
Comment:
replaces="webkit2gtk-common>0"
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (3 preceding siblings ...)
2022-10-22 12:20 ` [PR REVIEW] " sgn
@ 2022-10-22 12:25 ` oreo639
2022-10-22 12:35 ` oreo639
` (22 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:25 UTC (permalink / raw)
To: ml
[-- 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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (4 preceding siblings ...)
2022-10-22 12:25 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-22 12:35 ` oreo639
2022-10-22 20:20 ` oreo639
` (21 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 12:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1662 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 which should be fixed by this as well.
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.
<!-- 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: 3196 bytes --]
From 78701b2b3b106a326e20350da8fd190bdeac9c15 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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (5 preceding siblings ...)
2022-10-22 12:35 ` oreo639
@ 2022-10-22 20:20 ` oreo639
2022-10-22 20:25 ` oreo639
` (20 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:20 UTC (permalink / raw)
To: ml
[-- 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: 3620 bytes --]
From a5aa1e6ae9e553c0d465c97bf46856d76e042a5f 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/template | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 10602fae9f2d..8f2e807150c6 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,15 +184,13 @@ 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() {
depends="${depends}"
+ replaces="webkit2gtk-common>0"
short_desc="GTK+3 port of the WebKit2 browser engine (soup3)"
pkg_install() {
vmove usr/bin/WebKitWebDriver
@@ -201,6 +200,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
}
}
@@ -222,6 +227,7 @@ libwebkit2gtk41-devel_package() {
libwebkit2gtk50_package() {
depends="${depends}"
+ replaces="webkit2gtk-common>0"
short_desc="GTK4 port of the WebKit2 browser engine"
pkg_install() {
vmove usr/libexec/webkit2gtk-5.0
@@ -230,6 +236,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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (6 preceding siblings ...)
2022-10-22 20:20 ` oreo639
@ 2022-10-22 20:25 ` oreo639
2022-10-22 20:27 ` oreo639
` (19 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:25 UTC (permalink / raw)
To: ml
[-- 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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (7 preceding siblings ...)
2022-10-22 20:25 ` oreo639
@ 2022-10-22 20:27 ` oreo639
2022-10-22 20:27 ` oreo639
` (18 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:27 UTC (permalink / raw)
To: ml
[-- 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: 3098 bytes --]
From 74e00a0143aab0e556026c94d16fadc15f63f42a 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.
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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (8 preceding siblings ...)
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
` (17 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:27 UTC (permalink / raw)
To: ml
[-- 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: 3105 bytes --]
From ee52bedbbe05c6d391d21699c920cfebca5a8f3c 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 subpkg
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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common subpkg
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (9 preceding siblings ...)
2022-10-22 20:27 ` oreo639
@ 2022-10-22 20:52 ` oreo639
2022-10-22 20:52 ` oreo639
` (16 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1612 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 subpkg
[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: 3109 bytes --]
From df70aef8c126049e79ec4cabe82adec625346a5c 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 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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove common subpkg
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (10 preceding siblings ...)
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
` (15 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1612 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 subpkg
[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: 3120 bytes --]
From 42401a5b2ae671dec9a3c05c4f759854cd35fe3e 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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (11 preceding siblings ...)
2022-10-22 20:52 ` oreo639
@ 2022-10-22 20:56 ` oreo639
2022-10-22 20:57 ` oreo639
` (14 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:56 UTC (permalink / raw)
To: ml
[-- 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: 3120 bytes --]
From a49f08db61715bee860c62d3be3b22187dbd9e04 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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (12 preceding siblings ...)
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
` (13 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 20:57 UTC (permalink / raw)
To: ml
[-- 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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (13 preceding siblings ...)
2022-10-22 20:57 ` oreo639
@ 2022-10-22 23:21 ` oreo639
2022-10-23 3:11 ` oreo639
` (12 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-22 23:21 UTC (permalink / raw)
To: ml
[-- 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: 3950 bytes --]
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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (14 preceding siblings ...)
2022-10-22 23:21 ` oreo639
@ 2022-10-23 3:11 ` oreo639
2022-10-26 8:47 ` [PR REVIEW] " paper42
` (11 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-23 3:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1522 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.
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
<!-- 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: 3648 bytes --]
From 771ba610f1e1b04928cde9e1116dd2a614e83522 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/template | 26 ++++++++++++++++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (15 preceding siblings ...)
2022-10-23 3:11 ` oreo639
@ 2022-10-26 8:47 ` paper42
2022-10-26 8:49 ` paper42
` (10 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: paper42 @ 2022-10-26 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005396899
Comment:
Do we really need this here? On an update, the package will be replaced by webkit2gtk even without this.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (16 preceding siblings ...)
2022-10-26 8:47 ` [PR REVIEW] " paper42
@ 2022-10-26 8:49 ` paper42
2022-10-26 9:12 ` oreo639
` (9 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: paper42 @ 2022-10-26 8:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005398709
Comment:
This package installed locale files to /usr/share/locale/locale, so it won't conflict with the main package and I think we can just remove it instead of creating a dummy package.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (17 preceding siblings ...)
2022-10-26 8:49 ` paper42
@ 2022-10-26 9:12 ` oreo639
2022-10-26 9:12 ` oreo639
` (8 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005424844
Comment:
It grabs the vlicense installed by webkit2gtk and moved it to webkit2gtk-common, which will conflict with webkit2gtk. Is that an issue?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (18 preceding siblings ...)
2022-10-26 9:12 ` oreo639
@ 2022-10-26 9:12 ` oreo639
2022-10-26 9:14 ` [PR PATCH] [Updated] " oreo639
` (7 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005424844
Comment:
It grabbed the vlicense installed by webkit2gtk and moved it to webkit2gtk-common, which will conflict with webkit2gtk. Is that an issue?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (19 preceding siblings ...)
2022-10-26 9:12 ` oreo639
@ 2022-10-26 9:14 ` oreo639
2022-10-26 9:17 ` [PR REVIEW] " oreo639
` (6 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1522 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.
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
<!-- 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: 3202 bytes --]
From 28c97ed994a8a16abdf7f6be27ac7aede1025927 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/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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (20 preceding siblings ...)
2022-10-26 9:14 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-26 9:17 ` oreo639
2022-10-26 9:17 ` oreo639
` (5 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005424844
Comment:
It grabbed the vlicense installed by webkit2gtk and moved it to webkit2gtk-common, which will conflict with webkit2gtk. Is that an issue?
(Even if it doesn't matter from a user perspective since, worst case senario, they just end up with a missing license file that shouldn't be removed, I imagine it probably would matter in the CI when it checks for file conflicts)
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (21 preceding siblings ...)
2022-10-26 9:17 ` [PR REVIEW] " oreo639
@ 2022-10-26 9:17 ` oreo639
2022-10-26 9:18 ` oreo639
` (4 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 525 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005424844
Comment:
It grabbed the vlicense installed by webkit2gtk and moved it to webkit2gtk-common, which will conflict with webkit2gtk. Is that an issue?
(Even if it doesn't matter from a user perspective since, worst case senario, they just end up with a missing license file that shouldn't have been removed, I imagine it probably would matter in the CI when it checks for file conflicts)
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (22 preceding siblings ...)
2022-10-26 9:17 ` oreo639
@ 2022-10-26 9:18 ` oreo639
2022-10-26 18:35 ` paper42
` (3 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 9:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1005424844
Comment:
It grabbed the vlicense installed by webkit2gtk and moved it to webkit2gtk-common, which will conflict with webkit2gtk. Is that an issue?
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (23 preceding siblings ...)
2022-10-26 9:18 ` oreo639
@ 2022-10-26 18:35 ` paper42
2022-10-26 18:41 ` oreo639
` (2 subsequent siblings)
27 siblings, 0 replies; 29+ messages in thread
From: paper42 @ 2022-10-26 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 566 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1006053568
Comment:
It seems like they are also in the wrong directory, make sure they will now be in the correct directory and it should be fine. Also, $replaces in webkit2gtk should uninstall webkit2gtk-common, no?
```
%: xls webkit2gtk-common | grep -v locale
/usr/share/licenses/licenses/webkit2gtk/LICENSE-APPLE
/usr/share/licenses/licenses/webkit2gtk/LICENSE-LGPL-2
/usr/share/licenses/licenses/webkit2gtk/LICENSE-LGPL-2.1
```
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR REVIEW] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (24 preceding siblings ...)
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
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/40103#discussion_r1006061356
Comment:
Oh, you're right. Lol.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Updated] webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (25 preceding siblings ...)
2022-10-26 18:41 ` oreo639
@ 2022-10-26 18:42 ` oreo639
2022-10-26 18:58 ` [PR PATCH] [Merged]: " paper42
27 siblings, 0 replies; 29+ messages in thread
From: oreo639 @ 2022-10-26 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1522 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.
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
<!-- 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: 3503 bytes --]
From bb498604e91a43289746e73d7805198bdb7cb0b9 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/webkit2gtk-common | 1 -
srcpkgs/webkit2gtk/template | 27 ++++++++++++++++-----------
2 files changed, 16 insertions(+), 12 deletions(-)
delete mode 120000 srcpkgs/webkit2gtk-common
diff --git a/srcpkgs/webkit2gtk-common b/srcpkgs/webkit2gtk-common
deleted file mode 120000
index 8ae98428991bc..0000000000000
--- 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 10602fae9f2dd..771b61495cc3f 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
}
}
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PR PATCH] [Merged]: webkit2gtk: remove webkit2gtk-common subpackage
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common oreo639
` (26 preceding siblings ...)
2022-10-26 18:42 ` [PR PATCH] [Updated] " oreo639
@ 2022-10-26 18:58 ` paper42
27 siblings, 0 replies; 29+ messages in thread
From: paper42 @ 2022-10-26 18:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]
There's a merged pull request on the void-packages repository
webkit2gtk: remove webkit2gtk-common subpackage
https://github.com/void-linux/void-packages/pull/40103
Description:
[ci skip]
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
<!-- 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
-->
^ permalink raw reply [flat|nested] 29+ messages in thread
end of thread, other threads:[~2022-10-26 18:58 UTC | newest]
Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-22 12:02 [PR PATCH] webkit2gtk: remove common 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
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
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).