From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu: Patch libxt's default search path. Date: Sun, 04 Dec 2016 22:19:37 +0100 Message-ID: <87bmwr5r4m.fsf@gnu.org> References: <87mvginesm.fsf@gnu.org> <1480695934-679-1-git-send-email-jmd@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDeCG-0005Bq-S3 for guix-devel@gnu.org; Sun, 04 Dec 2016 16:19:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cDeCC-0006Tf-Rb for guix-devel@gnu.org; Sun, 04 Dec 2016 16:19:44 -0500 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cDeCC-0006Ta-OF for guix-devel@gnu.org; Sun, 04 Dec 2016 16:19:40 -0500 In-Reply-To: <1480695934-679-1-git-send-email-jmd@gnu.org> (John Darrington's message of "Fri, 2 Dec 2016 17:25:34 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: John Darrington Cc: guix-devel@gnu.org John Darrington skribis: > * gnu/packages/patches/libxt-guix-search-paths.patch: New file. > * gnu/packages/xorg.scm (libxt) [source]: Add patch. > --- > gnu/packages/patches/libxt-guix-search-paths.patch | 123 +++++++++++++++= ++++++ > gnu/packages/xorg.scm | 3 +- > 2 files changed, 125 insertions(+), 1 deletion(-) > create mode 100644 gnu/packages/patches/libxt-guix-search-paths.patch > > diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch b/gnu/pac= kages/patches/libxt-guix-search-paths.patch > new file mode 100644 > index 0000000..dfeea8a > --- /dev/null > +++ b/gnu/packages/patches/libxt-guix-search-paths.patch > @@ -0,0 +1,123 @@ Please add a comment here explaining what it does and why we chose this approach. > + { > +-#if defined(WIN32) > +- static char xfilesearchpath[] =3D ""; > +- > +- return xfilesearchpath; > +-#else > +- return XFILESEARCHPATHDEFAULT; > +-#endif > ++ static const char *search_path_default_stem[6] =3D { static const char *const *search_path_default_stem[] > ++ "/lib/X11/%L/%T/%N%C%S", > ++ "/lib/X11/%l/%T/%N%C%S", > ++ "/lib/X11/%T/%N%C%S", > ++ "/lib/X11/%L/%T/%N%S", > ++ "/lib/X11/%l/%T/%N%S", > ++ "/lib/X11/%T/%N%S" > ++ }; > ++ > ++#define SIZEOF_STEMS (strlen (search_path_default_stem[0]) \ > ++ + strlen (search_path_default_stem[1]) \ > ++ + strlen (search_path_default_stem[2]) \ > ++ + strlen (search_path_default_stem[3]) \ > ++ + strlen (search_path_default_stem[4]) \ > ++ + strlen (search_path_default_stem[5])) > ++ > ++ > ++ int i; > ++ const char *current_profile =3D "/run/current-system/profile"; > ++ char *home =3D getenv ("HOME"); > ++ char *guix_profile =3D getenv ("GUIX_PROFILE"); GUIX_PROFILE is not meant to be systematically defined, but maybe that=E2= =80=99s good enough. Could you build, say, xterm against this, check whether this fixes the ctrl-click issue for instance, and also run it in Valgrind to make sure? If that works, ok for core-updates or the next =E2=80=98staging=E2=80=99 si= nce =E2=80=98staging=E2=80=99 is now frozen. Thanks, Ludo=E2=80=99.