Skip to content

Commit

Permalink
webkit2gtk: remove webkit2gtk-common subpackage
Browse files Browse the repository at this point in the history
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
  • Loading branch information
oreo639 committed Oct 26, 2022
1 parent d24222f commit 28c97ed
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions srcpkgs/webkit2gtk/template
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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() {
Expand All @@ -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
}
}

Expand Down Expand Up @@ -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
}
}

Expand Down

0 comments on commit 28c97ed

Please sign in to comment.