diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-04-18 11:55:01 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-18 11:55:01 +0100 |
| commit | 7288c6e5fa05acddbf692a5187d925ef85662b46 (patch) | |
| tree | 54bfc06561e59d1ad1e6e7bdbd06b76fc4ba0d06 /sys-fs/android-file-transfer-linux | |
| parent | 5a1fb66df455454109e1de61d38b48f509dc68b8 (diff) | |
gentoo auto-resync : 18:04:2023 - 11:55:01
Diffstat (limited to 'sys-fs/android-file-transfer-linux')
4 files changed, 35 insertions, 17 deletions
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index 3825a80d329a..7add54191981 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,4 +1,5 @@ +AUX android-file-transfer-linux-4.2-gcc13.patch 641 BLAKE2B 5e3b17588a1d1822fc8eef582aa1abcc821691b3ccaefc4a2b6ef6aee46eac86846ead67614aa624a7d4f7c4a35739f40c3b28ce2507b3ae6718614e29c15aaf SHA512 066f5a7d60c7c26af3e7608111da305c60cc4029ad95e24fb27dc2fd25e9b151b077e611163f9425646acc73bb2025db45895a758f327159741a309ee062eaee DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 -EBUILD android-file-transfer-linux-4.2.ebuild 1619 BLAKE2B d8ff3ba7598645a8b4dfc4a53ebfe12d1eb4876eaca37c3bacae1a929f34828bdbd8e7c0a430e07c1d81bd4659be80fe7122413208ad0cc48cb25a56bc19205c SHA512 6ad136e3e2bd5a523df1950ee288dd1dc722ab83808ee85a8e3a7cef37792eb9d3a8f6fdecc986cb36ac1f8fe7babd7a2b97dce9fc998c929b03f01a7691f959 -EBUILD android-file-transfer-linux-9999.ebuild 1620 BLAKE2B e437ee47acb22c1deffbc13fa6dfb4e42d522f9e2310d2fa36e73783db0c002f303f3fac20b3ebdf47e1e85affdd9ba4ae94a52bfc050cff61108046183751db SHA512 f45d9d82ce88bf0efc2c0a3a308926964508d7c4e2487bdeab088b9be218e3634c3f5449be77035e23703fec7710ce5b5b9e008f317b207220325e9981d54c9b +EBUILD android-file-transfer-linux-4.2.ebuild 1577 BLAKE2B c34b9657d09b2e37654525af29a3167dcb8d7bc8394062449d3b03359f5374517912a25eb6296fb2743c69330ca1281f6004f4cba448ab08b477739d8af4432b SHA512 5a99730a6f5beef2c0d1264d92b156bdc477fababe0f8277c28935c3eef87f721968e3143e545a4f6727d2278e7e0642fed31b251347e479afa98b289c8517ef +EBUILD android-file-transfer-linux-9999.ebuild 1528 BLAKE2B 2a9cc10eb1a72f6a30eb8c08b72709db16772edfebcb4471f35397ad5cdd481c79db5d1968585d01325916c5cf515f6f8ffb0f227bca77f2dee33e03cabdeba8 SHA512 923328d98652bfc3d75f5e729b719580a908f3dc670e3a1bf3a19bf17b413ec7dcdcaf8a7c3a9e1408180ca8df18539884657c2e7b51b4bdbf08089705576b4f MISC metadata.xml 404 BLAKE2B 09a744466822e45ff378269c52b5aea8192b203bb1a6364de5e23690994ee57906ebeb28be99f8a3569f62ebfdfdc07497cdd28809cfc21014c67fb80b755e42 SHA512 7650fb9e5b3b86aa0233a2429ccc65bd144065e3e349fa1f1147570377a4f33b3663fffcc73a42416453e317bbf2c7bbd33baabc497a838cc91c705999b97497 diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index f4e8daa14678..33a9407c95aa 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 xdg @@ -54,15 +54,14 @@ BDEPEND=" qt5? ( dev-qt/linguist-tools:5 ) " +PATCHES=( + "${FILESDIR}"/${PN}-4.2-gcc13.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } -# required to override src_prepare from xdg eclass -src_prepare() { - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DBUILD_FUSE="$(usex fuse)" @@ -73,7 +72,7 @@ src_configure() { -DBUILD_TAGLIB="$(usex taglib)" # Upstream recommends to keep this off as libusb is broken -DUSB_BACKEND_LIBUSB="OFF" - $(usex qt5 '-DDESIRED_QT_VERSION=5' '') + $(usev qt5 '-DDESIRED_QT_VERSION=5') ) cmake_src_configure } diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild index 1d7bc08fa5cd..6e72c38e8220 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-single-r1 xdg @@ -58,11 +58,6 @@ pkg_setup() { use python && python-single-r1_pkg_setup } -# required to override src_prepare from xdg eclass -src_prepare() { - cmake_src_prepare -} - src_configure() { local mycmakeargs=( -DBUILD_FUSE="$(usex fuse)" @@ -73,7 +68,7 @@ src_configure() { -DBUILD_TAGLIB="$(usex taglib)" # Upstream recommends to keep this off as libusb is broken -DUSB_BACKEND_LIBUSB="OFF" - $(usex qt5 '-DDESIRED_QT_VERSION=5' '') + $(usev qt5 '-DDESIRED_QT_VERSION=5') ) cmake_src_configure } diff --git a/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch b/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch new file mode 100644 index 000000000000..d1b957cd4df8 --- /dev/null +++ b/sys-fs/android-file-transfer-linux/files/android-file-transfer-linux-4.2-gcc13.patch @@ -0,0 +1,23 @@ +https://github.com/whoozle/android-file-transfer-linux/pull/330 + +From 4e3df60538ac047d6ab2bd030d0da47e6e630a88 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 18 Apr 2023 11:00:58 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes so some +are no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. + +Bug: https://bugs.gentoo.org/894788 +--- a/mtp/types.h ++++ b/mtp/types.h +@@ -27,6 +27,7 @@ + #include <memory> + #include <mutex> + #include <exception> ++#include <stdexcept> + #include <string> + + namespace mtp |