From dev-return-38561-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Tue Nov 20 07:39:24 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0DA8A18067B for ; Tue, 20 Nov 2018 07:39:23 +0100 (CET) Received: (qmail 10698 invoked by uid 500); 20 Nov 2018 06:39:23 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Delivered-To: moderator for dev@subversion.apache.org Received: (qmail 36158 invoked by uid 99); 19 Nov 2018 20:24:23 -0000 X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.661 X-Spam-Level: X-Spam-Status: No, score=-1.661 tagged_above=-999 required=6.31 tests=[DKIMWL_WL_MED=-1.459, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:mime-version:date:subject:to:message-id; bh=gf7pGfzgCxXdYnFh+HbSIZivR2v7sScELgS5uxG7NbE=; b=Ak8aNbewskuTqKxcbnZWuDbWj4PS5jw7pOpYfln+1Uq5orTQnSjcEnjb6ascVRrqHx X2x1+BMz1rfl+rjS/kR6hv9I3O6U/1I2RJCUvg5OiRz6i7Pi8T76HDgxiBttn/+8ur6S yuPXue5Z+YF1bcRxV7nM1oXXXeZJvWSbUNZIePV45+Q8inPMMED1cklfPfTOVJlQ0+nl ngkNN7WDixRtYt0YcI/rvjRsE/Gobzyog8MvpCoDTGtoG2A7HtpjyZQff9V6PVoR7CLp RdglKmpBnFnTfXtjxKjl8TjI3tTnWh0002uAysfjABAxv0V+vsfMXu6JcERVm8QuSSit fE1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:subject:to:message-id; bh=gf7pGfzgCxXdYnFh+HbSIZivR2v7sScELgS5uxG7NbE=; b=odmTMC01qhKBh97V1Gh48lQBYQSPSK9X0RKVgFRWk8ufwgraCJEek0BefM1Zd2l06n +tsPQ+hPKDMiE1VM6eHczQsUF2Vb3VVV6tOHZlChR9jwRWx+E65y7HI8xNVcclbh2s7U mGYx5pgTp7xi6nXbx442Mb+O7xau8MsjV6m2lcoKlRFGYvd7SzCZPBBdxgE3nWmRXl0e WOV/RrYtzz226wXntwDa15zTbKt9znH/Li1vCsCaz/RP2HZwaVhe561zfQdgHhIp6nWh LKJKTGLvcSx8hfnVtS1VsBDiAjqteqUWFIMBSYv/s/vMQLyAIGC+Zz3kEv5PMuXFAvDb O3Pw== X-Gm-Message-State: AA+aEWavjOlTO/cDiJLXxqH/ixH0iNikNoYyyhr7CeeooeNcPGkV1kwK JnwXla/xuEQhm8ltlXHaqGAZjIVi X-Google-Smtp-Source: AFSGD/XoRQUwZKLAJmKGtMKFGXKi4L6qOgbCsoiRIAPw5WeF7WJ3R/S9juxUqJPQQEHe7qinxbkAZA== X-Received: by 2002:a6b:7c06:: with SMTP id m6-v6mr19665024iok.113.1542659057758; Mon, 19 Nov 2018 12:24:17 -0800 (PST) From: Satya Mishra X-Mailbutler-Message-Id: C8026B9B-A242-4C80-9747-60653D601488 X-Mailbutler-Data: eyJkZWxpdmVyeURhdGUiOiJNb24sIDE5IE5vdiAyMDE4IDE0OjI0OjExIC0wNjAwIn0= Content-Type: multipart/mixed; boundary="Apple-Mail=_D3CE10E3-F43F-479B-AC7A-E3C6B6D09BEB" Mime-Version: 1.0 (Mac OS X Mail 12.1 \(3445.101.1\)) Date: Mon, 19 Nov 2018 14:19:12 -0600 Subject: [PATCH] Re: SVN-4783 KWallet assumes KDE5 when Qt5 present To: dev@subversion.apache.org Message-Id: X-Mailer: Apple Mail (2.3445.101.1) --Apple-Mail=_D3CE10E3-F43F-479B-AC7A-E3C6B6D09BEB Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hi, As requested in the bug report, here=E2=80=99s a patch that doesn=E2=80=99= t hard-code the path to kf5-config, but instead assumes it=E2=80=99s in = the path. > The test for kwallet assumes KDE5 when Qt5 present, but that is not = necessarily the case. For example CentOS7 has KDE4 and Qt5. The correct = test should test for kf5-config in addition to Qt5. Regards, Satya --Apple-Mail=_D3CE10E3-F43F-479B-AC7A-E3C6B6D09BEB Content-Disposition: attachment; filename=kwallet-m4.patch Content-Type: application/octet-stream; x-unix-mode=0644; name="kwallet-m4.patch" Content-Transfer-Encoding: quoted-printable ---=20subversion-1.10.3/build/ac-macros/kwallet.m4=20=20=20=20=20=20=20=20= 2018-10-24=2011:50:47.000000000=20-0700=0D=0A+++=20= subversion-1.10.3/build/ac-macros/kwallet.m4=20=20=20=20=20=20=20=20= 2018-10-24=2011:55:37.000000000=20-0700=0D=0A@@=20-45,7=20+45,8=20@@=0D=0A= =20=20=20=20=20=20=20=20=20=20=20if=20test=20-n=20"$PKG_CONFIG";=20then=0D= =0A=20=20=20=20=20=20=20=20=20=20=20=20=20if=20test=20"$HAVE_DBUS"=20=3D=20= "yes";=20then=0D=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20= AC_CHECK_PROG(KF5_CHECK,kf5-config,yes)=0D=0A=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20AC_MSG_CHECKING([for=20Qt])=0D=0A-=20=20=20=20=20=20=20=20= =20=20=20=20=20=20if=20$PKG_CONFIG=20--exists=20Qt5Core=20Qt5DBus=20= Qt5Gui;=20then=0D=0A+=20=20=20=20=20=20=20=20=20=20=20=20=20=20if=20test=20= x"$KF5_CHECK"=20=3D=20x"yes"=20&&=20$PKG_CONFIG=20--exists=20Qt5Core=20= Qt5DBus=20Qt5Gui=20;=20then=0D=0A=20=20=20=20=20=20=20=20=20=20=20=20=20=20= =20=20=20AC_MSG_RESULT([yes,=20Qt5])=0D=0A=20=20=20=20=20=20=20=20=20=20=20= =20=20=20=20=20=20qt_pkg_config_names=3D"Qt5Core=20Qt5DBus=20Qt5Gui"=0D=0A= =20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20= kde_config_name=3D"kf5-config"=0D=0A= --Apple-Mail=_D3CE10E3-F43F-479B-AC7A-E3C6B6D09BEB--