summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-13 22:35:38 +0000
committerSam James <sam@gentoo.org>2021-04-13 22:37:41 +0000
commit5ae7f366c0862c08beecd2288b9a52d54456a82c (patch)
treec5d68e5ebd1565c245c44b409fcc2d161418f0b6 /net-analyzer
parentmedia-plugins/calf: disable broken slibtool patch for now (diff)
downloadgentoo-5ae7f366c0862c08beecd2288b9a52d54456a82c.tar.gz
gentoo-5ae7f366c0862c08beecd2288b9a52d54456a82c.tar.bz2
gentoo-5ae7f366c0862c08beecd2288b9a52d54456a82c.zip
net-analyzer/wireshark: include upstream patches for glib-2.68
Thanks-to: Andrey Volkov <volkov@ekb-info.ru> for the backporting work Closes: https://bugs.gentoo.org/777690 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/Manifest1
-rw-r--r--net-analyzer/wireshark/wireshark-3.4.4.ebuild3
2 files changed, 4 insertions, 0 deletions
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 27663064e3d..c8ec3460da7 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,2 +1,3 @@
DIST wireshark-3.4.3.tar.xz 32287304 BLAKE2B 076d681c5f980ba6a0f25076c4631a119fb72d2b59a0cd70062d3a4c997c8959162157e46a6f59b5474c07263c84e0e660f1fa33f9339cc6a1141425d394cde2 SHA512 6cfea9432cd6fcecbfc551e059ca60a0c38084074bf130b4cc5378aac2221c1233e2ddafa1ffd6bc6b76297c2303b931dadf6ec518f35595caf5229af4d93859
+DIST wireshark-3.4.4-glib-2.68-patches.tar.gz 8059 BLAKE2B d4f773be856bdf56d369b0de51e4a7458d69e08ab345e62cca55b4451be8c58f07add9156149380e1ff5707599f1363a53811eebea927b60c6debd28bed6c047 SHA512 4b5beb62f7d77d8ecfd97aff3f728a02331efe2807ac7f74e19a81f6eb547c9932b33d5f9d78c52d08e5fcbca6e7b158617a22a74cfb80b092ea75da8d43df7f
DIST wireshark-3.4.4.tar.xz 32290424 BLAKE2B 85930709ab666794ba6f4a00a895d41b25c6e61f7951a33f511b4981fac3e2ad579d8f52fee5b8f04334f9e1ef8721b1de62d0ab5b0029b0ed32b9f69ff2f5dd SHA512 388b5634894f08bb1a0052f989133c2a8457fbf6525d1bb557f3ffce73da8063fd9fe82b50b5ababc30fa36ce154bf9d2a3d91d76e03913d6516ca61b4b6b172
diff --git a/net-analyzer/wireshark/wireshark-3.4.4.ebuild b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
index 99695515797..d1606cdc102 100644
--- a/net-analyzer/wireshark/wireshark-3.4.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.4.4.ebuild
@@ -11,6 +11,7 @@ inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
DESCRIPTION="A network protocol analyzer formerly known as ethereal"
HOMEPAGE="https://www.wireshark.org/"
SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glib-2.68-patches.tar.gz"
S="${WORKDIR}/${P/_/}"
LICENSE="GPL-2"
@@ -102,6 +103,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
"${FILESDIR}"/${PN}-9999-ui-needs-wiretap.patch
"${FILESDIR}"/${P}-cmake-3.20.patch
+ # Temporary, bug #777690
+ "${WORKDIR}"/${P}-glib-2.68-patches
)
pkg_setup() {