From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 769FB138350 for ; Thu, 16 Jan 2020 11:31:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EE81E08BD; Thu, 16 Jan 2020 11:31:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B816E08BD for ; Thu, 16 Jan 2020 11:31:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F61834E126 for ; Thu, 16 Jan 2020 11:31:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDC349B for ; Thu, 16 Jan 2020 11:31:09 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1579174246.fd2f00eb3b1c022857d05d7e35d81072827897d9.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch x11-wm/xpra/xpra-3.0.2.ebuild X-VCS-Directories: x11-wm/xpra/ x11-wm/xpra/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: fd2f00eb3b1c022857d05d7e35d81072827897d9 X-VCS-Branch: master Date: Thu, 16 Jan 2020 11:31:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d37f88f4-f23e-4c9e-ab23-d9b2a95923a7 X-Archives-Hash: aa8a4393c2b479f4895d199e78692428 commit: fd2f00eb3b1c022857d05d7e35d81072827897d9 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Jan 16 11:30:15 2020 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Jan 16 11:30:46 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd2f00eb x11-wm/xpra: Fix bug 702310 with a sledgehammer We don't have the library that it's looking for packaged anyway, so it doesnt matter whether finding it fails. Make the ldconfig call go away. Closes: https://bugs.gentoo.org/702310 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas K. Hüttel gentoo.org> x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch | 33 +++++++++++++++++++++++++++++ x11-wm/xpra/xpra-3.0.2.ebuild | 13 +++++------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch new file mode 100644 index 00000000000..8475d47b8b3 --- /dev/null +++ b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch @@ -0,0 +1,33 @@ +diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py +--- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py 2019-09-24 15:54:02.000000000 +0200 ++++ xpra-3.0.2/xpra/x11/fakeXinerama.py 2020-01-16 12:20:22.620519078 +0100 +@@ -23,29 +23,6 @@ + + def find_libfakeXinerama(): + libname = "fakeXinerama" +- try: +- from ctypes.util import find_library +- flibname = find_library("fakeXinerama") +- if flibname: +- libname = flibname +- except Exception: +- pass +- if POSIX: +- for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep): +- lib_path = os.path.join(lib_dir, libname) +- if not os.path.exists(lib_dir): +- continue +- if os.path.exists(lib_path) and os.path.isfile(lib_path): +- return lib_path +- if LINUX: +- try: +- libpath = find_lib_ldconfig("fakeXinerama") +- if libpath: +- return libpath +- except Exception as e: +- log("find_libfakeXinerama()", exc_info=True) +- log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:") +- log.error(" %s", e) + return find_lib(libname) + + current_xinerama_config = None diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild index 97a0b1489c0..2d11aede8ca 100644 --- a/x11-wm/xpra/xpra-3.0.2.ebuild +++ b/x11-wm/xpra/xpra-3.0.2.ebuild @@ -86,8 +86,11 @@ DEPEND="${COMMON_DEPEND} RESTRICT="!test? ( test )" -PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch - "${FILESDIR}"/${PN}-2.0-suid-warning.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch + "${FILESDIR}"/${PN}-2.0-suid-warning.patch + "${FILESDIR}"/${PN}-3.0.2-ldconfig.patch +) pkg_postinst() { enewgroup ${PN} @@ -151,9 +154,3 @@ python_configure_all() { export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" } - -src_compile() { - # xpra calls `ldconfig -p` during compile to locate libraries. - addpredict /etc - distutils-r1_src_compile -}