From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56288) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gaHfB-0007cz-Qw for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gaHf5-00010D-Mx for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:13 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:52901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gaHf3-0000wU-KN for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gaHf3-0002fq-Ex for guix-patches@gnu.org; Fri, 21 Dec 2018 05:04:05 -0500 Subject: [bug#33820] [PATCH 7/9] gnu: kinit: Use LIBRARY_PATH to search for dynamically loaded libs. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 21 Dec 2018 11:10:50 +0100 Message-Id: <20181221101052.26832-7-h.goebel@crazy-compilers.com> In-Reply-To: <20181221101052.26832-1-h.goebel@crazy-compilers.com> References: <20181221101052.26832-1-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33820@debbugs.gnu.org Transfer the NixOS "kdeinit-libpath" patch for kinit as of 2018-02-17. * gnu/packages/patches/kinit-kdeinit-libpath.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/kde-frameworks.scm (kinit)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/kde-frameworks.scm | 3 +- gnu/packages/patches/kinit-kdeinit-libpath.patch | 37 ++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/kinit-kdeinit-libpath.patch diff --git a/gnu/local.mk b/gnu/local.mk index 783a7c624..dd2a15b14 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -855,6 +855,7 @@ dist_patch_DATA = \ %D%/packages/patches/kiki-missing-includes.patch \ %D%/packages/patches/kiki-portability-64bit.patch \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ + %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kobodeluxe-paths.patch \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index edc2587a9..c269c4758 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2551,7 +2551,8 @@ in applications using the KDE Frameworks.") "1rq9b59gdgcpvwd694l8h55sqahpdaky0n7ag5psjlfn5myf1d95")) ;; Use the store paths for other packages and dynamically loaded ;; libs - (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) + (patches (search-patches "kinit-kdeinit-extra_libs.patch" + "kinit-kdeinit-libpath.patch")))) (build-system cmake-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/kinit-kdeinit-libpath.patch b/gnu/packages/patches/kinit-kdeinit-libpath.patch new file mode 100644 index 000000000..89cf1a941 --- /dev/null +++ b/gnu/packages/patches/kinit-kdeinit-libpath.patch @@ -0,0 +1,37 @@ +Search libraries in GUIX_KF5INIT_LIB_PATH. + +Based on an idea by NixOs +pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch + +=================================================================== +--- kinit-5.32.0/src/kdeinit/kinit.cpp.orig 2017-10-22 21:02:20.908765455 +0200 ++++ kinit-5.32.0/src/kdeinit/kinit.cpp 2017-10-22 21:03:25.312818248 +0200 +@@ -623,20 +623,18 @@ + if (libpath_relative) { + // NB: Because Qt makes the actual dlopen() call, the + // RUNPATH of kdeinit is *not* respected - see + // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 + // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- QString orig_libpath = libpath; +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); +- if (!l.load()) { +- libpath = orig_libpath; +- l.setFileName(libpath); +- l.load(); +- } ++ // Try to load the library relative to the active profiles. ++ QByteArrayList profiles = qgetenv("LIBRARY_PATH").split(':'); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ l.setFileName(QFile::decodeName(profile) + QStringLiteral("/") + libpath); ++ if (l.load()) break; ++ } ++ } + } else { + l.load(); + } + if (!l.isLoaded()) { + QString ltdlError(l.errorString()); -- 2.13.7