From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id iHoCI+sdR2DWawAA0tVLHw (envelope-from ) for ; Tue, 09 Mar 2021 07:04:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kK23HusdR2AtWwAAbx9fmQ (envelope-from ) for ; Tue, 09 Mar 2021 07:04:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4108A1BF28 for ; Tue, 9 Mar 2021 08:04:11 +0100 (CET) Received: from localhost ([::1]:59826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJWPa-000835-6C for larch@yhetil.org; Tue, 09 Mar 2021 02:04:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJWPS-00081S-Jm for guix-patches@gnu.org; Tue, 09 Mar 2021 02:04:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJWPS-00011K-CG for guix-patches@gnu.org; Tue, 09 Mar 2021 02:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJWPS-0007UC-8V for guix-patches@gnu.org; Tue, 09 Mar 2021 02:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45889] Nextcloud Client (v15) Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Mar 2021 07:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45889 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Raghav Gururajan , 45889@debbugs.gnu.org Received: via spool by 45889-submit@debbugs.gnu.org id=B45889.161527339528722 (code B ref 45889); Tue, 09 Mar 2021 07:04:02 +0000 Received: (at 45889) by debbugs.gnu.org; 9 Mar 2021 07:03:15 +0000 Received: from localhost ([127.0.0.1]:45479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJWOh-0007TC-0l for submit@debbugs.gnu.org; Tue, 09 Mar 2021 02:03:15 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:27166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJWOe-0007T1-Pc for 45889@debbugs.gnu.org; Tue, 09 Mar 2021 02:03:13 -0500 Received: from nijino.local (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DvmPn49dcz1LLyL; Tue, 9 Mar 2021 08:03:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DvmPn49dcz1LLyL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1615273389; bh=UievUwLwDL9REDXB47FD/HRFPKpEm7Yi1mb99hIrOto=; h=Subject:From:To:Date:In-Reply-To:References:From; b=ijQZG9zASz68V9rLrS/H3vhh3HiYvAjvkhlKkbP5AcVUOTPWxUFkn6P/KXSI/DRlF mV+NSUxkmqu3MtXGrqfsCaXhwPH2wKLUhUzOPKbDiSfdbBZsbGJW54CoTnEal5sRJ3 iLp125fVSLyPae2ZHJNlXsgYIAuB4b17GMKXda2w= Message-ID: <31701971d849e72506ed4105c92b2ad85d3aa6be.camel@student.tugraz.at> From: Leo Prikler Date: Tue, 09 Mar 2021 08:03:08 +0100 In-Reply-To: References: <609483b4-c583-cbf0-4b2a-4daf6c4feb98@raghavgururajan.name> <73f0495c29ee82c2a16a96cc2825f19bd88b4ab4.camel@student.tugraz.at> <8f88bef4-cf4d-5bcc-e0bb-979dc0ce1efd@raghavgururajan.name> <67f2ff73-c6e0-743f-d873-0a488fa05e31@raghavgururajan.name> <29553b60ceb47530cd0bda7f84badb80b8daab74.camel@student.tugraz.at> <7d1a2db6-5da9-80f6-d160-128d2200935b@raghavgururajan.name> <1c216cbfd761c8ce77b2402cf9a88ad8772b2331.camel@student.tugraz.at> <15559ce0-8f6b-1ff7-e5d1-7c3f3f5292f9@raghavgururajan.name> <95a467cd-e1b8-9f68-588e-163a6105e891@raghavgururajan.name> <12599035-d671-b417-d70c-89d694f3ccd9@raghavgururajan.name> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 4108A1BF28 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: LqOO9A6Dcsu8 Hi Raghav, > Subject: [PATCH 2/3] gnu: Add qtsolutions. > + (version > + (git-version "0" revision commit)) > + (file-name > + (git-file-name name version)) > + (("qt5") > + "qt") > + (("-head") > + "") > + (("SUBDIRS\\+=examples") > + "")) Try not to arbitrarily use too many new lines. If you break Scheme code in such a manner for no good reason, it will look odd. > + (("toAscii") > + "toLatin1")) Why not to UTF-8? Is the input already UTF-8 and we want to convert it to a single-byte character set? > + (("\\$\\$PWD") > + (assoc-ref outputs "out"))) You should install the shared libraries in the install phase. > + (list > + "qtlockedfile" > + "qtpropertybrowser" > + "qtservice" > + "qtsingleapplication" > + "qtsoap") Use '(...) for fixed input. > Subject: [PATCH 3/3] gnu: Add nextcloud-client. > + (commit > + (string-append "v" version))) > + ((" \\.\\./3rdparty/qtlockedfile/?.*") > + "") > + ((" \\.\\./3rdparty/qtsingleapplication/?.*") > + "") > + ((" \\.\\./3rdparty/kmessagewidget/?.*") > + "") > + ((" list\\(APPEND 3rdparty_SRC > \\.\\./3rdparty/?.*\\)") > + "") I'm starting to grow a little suspicious about matching the leading spaces. You probably want to lead this (and similar stuff in 0001) with [ \t]*. > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedf > ile") > + (string-append (assoc-ref inputs "qtsolutions") > + "/include/qtlockedfile/")) > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsinglea > pplication") > + (string-append (assoc-ref inputs "qtsolutions") > + "/include/qtsingleapplication/")) > + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagew > idget") > + (string-append (assoc-ref inputs "kwidgetsaddons") > + "/include/KF5/KWidgetsAddons/")) LGTM, but probably deserves a comment. Also, you might skip the stuff leading up to /3rdparty, i.e. have ".*/3rdparty/qtlockedfile", etc. Perhaps this gives you enough wiggle room to do lockedfile and single application on the same line, but it doesn't hurt if it doesn't. > + (("\\$\\{synclib_NAME\\}") > + (string-append "${synclib_NAME} " > + "QtSolutions_LockedFile " > + "QtSolutions_SingleApplication " > + "KF5WidgetsAddons"))) Definitely deserves a comment and perhaps a less broad match? > + (substitute* '("application.h" "application.cpp") > + (("SharedTools::QtSingleApplication") > + "QtSingleApplication") > + (("slotParseMessage\\(const QString &(msg)?.*\\)") > + "slotParseMessage(const QString &msg)"))) Also deserves a comment about QtSingleApplication differences. > + (string-append "set(_install_dir > \"${CMAKE_INSTALL_PREFIX}" > + "/share/dbus-1/services\")"))) Would the raw string here exceed a line? > + ;; All ThirdParty (except QtProgressIndicator) > + license:lgpl2.1+ This is now just qtokenizer, right? Regards, Leo