[debbugs-tracker] bug#33951: closed ([PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR.)

[GNU bug Tracking System]

Your message dated Fri, 4 Jan 2019 10:27:46 +0100
with message-id <address@hidden>
and subject line Re: [bug#33955] [PATCH 0/6] KDE: Enable more tests.
has caused the debbugs.gnu.org bug report #33951,
regarding [PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR.
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden)


-- 
33951: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33951
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR.
>
>
>
>
> Date: 
>
> Wed, 02 Jan 2019 17:58:57 +0800
>
>
>
>
> Hi,
>
> This patch fixes the regular expression for QTPLUGINDIR.
>
> The source code of "kde-modules/KDEInstallDirs.cmake" has been changed
> by upstream in recent releases.  This regular expression bug caused
> dependent packages install qt plugins into a wrong directory.
>
> >From a242fed166b0939365a6e6f3259c65471dc01db7 Mon Sep 17 00:00:00 2001
> From: Meiyo Peng <address@hidden>
> Date: Sat, 29 Dec 2018 00:06:00 +0800
> Subject: [PATCH] gnu: cmake-extra-modules: Fix QTPLUGINDIR.
>
> * gnu/packages/kde-frameworks.scm (cmake-extra-modules)[arguments]: Fix
>   QTPLUGINDIR.
> ---
>  gnu/packages/kde-frameworks.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 6c1854379..5c21a7fb7 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -5,6 +5,7 @@
>  ;;; Copyright © 2016 David Craven <address@hidden>
>  ;;; Copyright © 2017 Thomas Danckaert <address@hidden>
>  ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
> +;;; Copyright © 2018 Meiyo Peng <address@hidden>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -98,7 +99,7 @@
>                 (("\"lib64\"") "\"lib\"")
>                 ;; TODO: Base the following on values taken from Qt
>                 ;; Install plugins into lib/qt5/plugins
> -               (("_define_relative\\(QTPLUGINDIR LIBDIR \"plugins\"")
> +               (("_define_relative\\(QTPLUGINDIR 
> \"\\$\\{_pluginsDirParent\\}\" \"plugins\"")
>                  "_define_relative(QTPLUGINDIR LIBDIR \"qt5/plugins\"")
>                 ;; Install imports into lib/qt5/imports
>                 (("_define_relative\\(QTQUICKIMPORTSDIR QTPLUGINDIR 
> \"imports\"")
> -- 
> 2.20.1
>
> --
> Meiyo Peng
> https://www.pengmeiyu.com/
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#33955] [PATCH 0/6] KDE: Enable more tests.
>
>
>
>
> Date: 
>
> Fri, 4 Jan 2019 10:27:46 +0100
>
>
>
>
> User-agent: 
>
> Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0
>
>
>
>
> Am 04.01.19 um 02:16 schrieb Meiyo Peng:
>
> > You are doing a great job.
>
> Thanks :-)
>
> > I agree to keep #33812 and drop #33951.
>
> I applied #33812 as b824dbec5d331e79a50734fb543bbe064eb7fc17.
>
>
> -- 
> Regards
> Hartmut Goebel
>
> | Hartmut Goebel          | address@hidden               |
> | www.crazy-compilers.com | compilers which you thought are impossible |
>
>
>
> --- End Message ---