Attachment 252121 Details for Bug 279895 – git patch

[patch] git patch

0001-Bugfix-for-279895.patch (text/plain), 6.87 KB, created by gatekeeper on 2024-07-17 08:32:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gatekeeper

Created: 2024-07-17 08:32:17 UTC

Size: 6.87 KB

patch

obsolete

>From ded8b3639d97561efb4afaf1aa45a126e58e58a4 Mon Sep 17 00:00:00 2001
>From: Tiago Gasiba <tiago.gasiba@gmail.com>
>Date: Tue, 16 Jul 2024 22:44:21 +0200
>Subject: [PATCH] Bugfix for 279895
>
>---
> sysutils/android-file-transfer/Makefile       | 41 +++++++++--------
> sysutils/android-file-transfer/distinfo       |  6 +--
> .../patch-mtp_backend_libusb_usb_Context.cpp  | 11 +++++
> .../patch-python_FindPythonLibsNew.cmake      | 45 +++++++++++++++++++
> 4 files changed, 79 insertions(+), 24 deletions(-)
> create mode 100644 sysutils/android-file-transfer/files/patch-mtp_backend_libusb_usb_Context.cpp
> create mode 100644 sysutils/android-file-transfer/files/patch-python_FindPythonLibsNew.cmake
>
>diff --git a/sysutils/android-file-transfer/Makefile b/sysutils/android-file-transfer/Makefile
>index fd5c896a9bdc..ef7ba9166d03 100644
>--- a/sysutils/android-file-transfer/Makefile
>+++ b/sysutils/android-file-transfer/Makefile
>@@ -1,34 +1,34 @@
> PORTNAME=	android-file-transfer
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	4.2
>-PORTREVISION?=	1
>+DISTVERSION=	4.3
> CATEGORIES=	sysutils
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	tiago.gasiba@gmail.com
> COMMENT=	Android MTP client with minimalistic UI
> WWW=		https://github.com/whoozle/android-file-transfer-linux
> 
> LICENSE=	GPLv3+
> 
>+USES=		cmake compiler:c++11-lib pkgconfig
> USE_GITHUB=	yes
> GH_ACCOUNT=	whoozle
> GH_PROJECT=	${PORTNAME}-linux
> 
>-USES=		cmake compiler:c++11-lib pkgconfig
> CMAKE_ON=	USB_BACKEND_LIBUSB
> PLIST_FILES=	"@comment lib/libmtp-ng-static.a"
> 
>-OPTIONS_DEFINE=	CLI FUSE OPENSSL PYTHON QT5 TAGLIB
>-OPTIONS_DEFAULT=CLI FUSE OPENSSL PYTHON QT5 TAGLIB
>+OPTIONS_DEFINE=		CLI FUSE OPENSSL PYTHON QT5 TAGLIB
>+OPTIONS_DEFAULT=	CLI OPENSSL TAGLIB
> OPTIONS_EXCLUDE?=	QT5 # enslaved until subpackaging
> 
>-CLI_DESC=	CLI (Command-Line Interface) support
>-CLI_USES=	readline
>-CLI_PLIST_FILES=bin/aft-mtp-cli
>+CLI_DESC=		CLI (Command-Line Interface) support
>+TAGLIB_DESC=		Reading audio metadata via taglib
>+CLI_USES=		readline
>+CLI_PLIST_FILES=	bin/aft-mtp-cli
> 
>-FUSE_USES=	fuse
>-FUSE_CMAKE_BOOL=BUILD_FUSE
>-FUSE_PLIST_FILES=bin/aft-mtp-mount
>+FUSE_USES=		fuse
>+FUSE_CMAKE_BOOL=	BUILD_FUSE
>+FUSE_PLIST_FILES=	bin/aft-mtp-mount
> 
> OPENSSL_USES=		ssl
> OPENSSL_CMAKE_BOOL=	BUILD_MTPZ
>@@ -36,18 +36,17 @@ OPENSSL_CMAKE_BOOL=	BUILD_MTPZ
> PYTHON_BUILD_DEPENDS=	pybind11>0:devel/pybind11
> PYTHON_USES=		python
> PYTHON_CMAKE_BOOL=	BUILD_PYTHON
>-PYTHON_PLIST_FILES=	%%PYTHON_SITELIBDIR%%/aftl%%PYTHON_EXT_SUFFIX%%.so
>+PYTHON_PLIST_FILES=	${PYTHON_SITELIBDIR}/aftl${PYTHON_EXT_SUFFIX}.so
> 
>-QT5_USES=	qt:5
>-QT5_USE=	QT=qmake:build,buildtools:build,linguisttools:build,core,gui,network,widgets
>-QT5_CMAKE_BOOL=	BUILD_QT_UI
>-QT5_CMAKE_ON=	-DDESIRED_QT_VERSION:STRING=5
>+QT5_USES=		qt:5
>+QT5_USE=		QT=core,gui,network,widgets,buildtools:build,linguisttools:build,qmake:build
>+QT5_CMAKE_BOOL=		BUILD_QT_UI
>+QT5_CMAKE_ON=		-DDESIRED_QT_VERSION:STRING=5
> QT5_PLIST_FILES=	bin/android-file-transfer \
>-		share/applications/android-file-transfer.desktop \
>-		share/icons/hicolor/512x512/apps/android-file-transfer.png \
>-		share/metainfo/android-file-transfer.appdata.xml
>+			share/applications/android-file-transfer.desktop \
>+			share/icons/hicolor/512x512/apps/android-file-transfer.png \
>+			share/metainfo/android-file-transfer.appdata.xml
> 
>-TAGLIB_DESC=		Reading audio metadata via taglib
> TAGLIB_LIB_DEPENDS=	libtag.so:audio/taglib
> TAGLIB_CMAKE_BOOL=	BUILD_TAGLIB
> 
>diff --git a/sysutils/android-file-transfer/distinfo b/sysutils/android-file-transfer/distinfo
>index 050eff6461ac..3b39495a69f4 100644
>--- a/sysutils/android-file-transfer/distinfo
>+++ b/sysutils/android-file-transfer/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609258228
>-SHA256 (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = cc607d68e8a18273c9b56975a70a0e68fbdf9d5b903b2727a345a605ff48a19f
>-SIZE (whoozle-android-file-transfer-linux-v4.2_GH0.tar.gz) = 823609
>+TIMESTAMP = 1721159585
>+SHA256 (whoozle-android-file-transfer-linux-v4.3_GH0.tar.gz) = 8ff658630fc820a7ca0b70025aa47d235b7fb64f5cb6a72ca76a7acbf3435128
>+SIZE (whoozle-android-file-transfer-linux-v4.3_GH0.tar.gz) = 827232
>diff --git a/sysutils/android-file-transfer/files/patch-mtp_backend_libusb_usb_Context.cpp b/sysutils/android-file-transfer/files/patch-mtp_backend_libusb_usb_Context.cpp
>new file mode 100644
>index 000000000000..15479c5cd002
>--- /dev/null
>+++ b/sysutils/android-file-transfer/files/patch-mtp_backend_libusb_usb_Context.cpp
>@@ -0,0 +1,11 @@
>+--- mtp/backend/libusb/usb/Context.cpp.orig	2024-07-16 19:25:15 UTC
>++++ mtp/backend/libusb/usb/Context.cpp
>+@@ -27,7 +27,7 @@ namespace mtp { namespace usb
>+ 	Context::Context(int debugLevel)
>+ 	{
>+ 		USB_CALL(libusb_init(&_ctx));
>+-		libusb_set_debug(_ctx, debugLevel);
>++		//libusb_set_debug(_ctx, debugLevel);
>+ 		libusb_device **devs;
>+ 		int count = libusb_get_device_list(_ctx, &devs);
>+ 		if (count < 0)
>diff --git a/sysutils/android-file-transfer/files/patch-python_FindPythonLibsNew.cmake b/sysutils/android-file-transfer/files/patch-python_FindPythonLibsNew.cmake
>new file mode 100644
>index 000000000000..a7596bdeeb45
>--- /dev/null
>+++ b/sysutils/android-file-transfer/files/patch-python_FindPythonLibsNew.cmake
>@@ -0,0 +1,45 @@
>+--- python/FindPythonLibsNew.cmake.orig	2024-07-16 20:38:32 UTC
>++++ python/FindPythonLibsNew.cmake
>+@@ -74,13 +74,28 @@ endif()
>+ #
>+ # The library suffix is from the config var LDVERSION sometimes, otherwise
>+ # VERSION. VERSION will typically be like "2.7" on unix, and "27" on windows.
>+-execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"
>+-    "from distutils import sysconfig as s;import sys;import struct;
>++execute_process(
>++  COMMAND
>++    "${Python_EXECUTABLE}" "-c" "
>++import sys;import struct;
>++import sysconfig as s
>++USE_SYSCONFIG = sys.version_info >= (3, 10)
>++if not USE_SYSCONFIG:
>++    from distutils import sysconfig as ds
>+ print('.'.join(str(v) for v in sys.version_info));
>+ print(sys.prefix);
>+-print(s.get_python_inc(plat_specific=True));
>+-print(s.get_python_lib(plat_specific=True));
>+-print(s.get_config_var('SO'));
>++if USE_SYSCONFIG:
>++    scheme = s.get_default_scheme()
>++    if scheme == 'posix_local':
>++        # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/
>++        scheme = 'posix_prefix'
>++    print(s.get_path('platinclude', scheme))
>++    print(s.get_path('platlib'))
>++    print(s.get_config_var('EXT_SUFFIX') or s.get_config_var('SO'))
>++else:
>++    print(ds.get_python_inc(plat_specific=True));
>++    print(ds.get_python_lib(plat_specific=True));
>++    print(ds.get_config_var('EXT_SUFFIX') or ds.get_config_var('SO'));
>+ print(hasattr(sys, 'gettotalrefcount')+0);
>+ print(struct.calcsize('@P'));
>+ print(s.get_config_var('LDVERSION') or s.get_config_var('VERSION'));
>+@@ -196,7 +211,7 @@ find_package_message(PYTHON
>+ 
>+ find_package_message(PYTHON
>+     "Found PythonLibs: ${PYTHON_LIBRARY}"
>+-    "${PYTHON_EXECUTABLE}${PYTHON_VERSION}")
>++    "${Python_EXECUTABLE}${PYTHON_VERSION}")
>+ 
>+ set(PYTHONLIBS_FOUND TRUE)
>+ set(PythonLibsNew_FOUND TRUE)
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 279895: 251606 | 252005 | 252112 | 252121 | 252233