From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81573 invoked by alias); 22 Feb 2020 14:48:56 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 81463 invoked by uid 89); 22 Feb 2020 14:48:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.9 required=5.0 tests=AWL,BAYES_00,FORGED_SPF_HELO,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: sa-prd-fep-048.btinternet.com Received: from mailomta12-sa.btinternet.com (HELO sa-prd-fep-048.btinternet.com) (213.120.69.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 22 Feb 2020 14:48:41 +0000 Received: from sa-prd-rgout-003.btmx-prd.synchronoss.net ([10.2.38.6]) by sa-prd-fep-048.btinternet.com with ESMTP id <20200222144823.UYXH30845.sa-prd-fep-048.btinternet.com@sa-prd-rgout-003.btmx-prd.synchronoss.net>; Sat, 22 Feb 2020 14:48:23 +0000 Authentication-Results: btinternet.com; none X-OWM-Source-IP: 31.51.207.12 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean Received: from localhost.localdomain (31.51.207.12) by sa-prd-rgout-003.btmx-prd.synchronoss.net (5.8.340) (authenticated as jonturney@btinternet.com) id 5E3A268A02B6F5F7; Sat, 22 Feb 2020 14:48:23 +0000 From: Jon Turney To: cygwin-apps@cygwin.com Cc: Jon Turney Subject: [PATCH cygport 3/2] Generate a separate .hint for the source package Date: Sat, 22 Feb 2020 14:48:00 -0000 Message-Id: <20200222144751.22096-2-jon.turney@dronecode.org.uk> In-Reply-To: <20200208134634.58200-1-jon.turney@dronecode.org.uk> References: <20200208134634.58200-1-jon.turney@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SW-Source: 2020-02/txt/msg00050.txt.bz2 Pass through HOMEPAGE as homepage: in that hint, if present. requires: in a source package hint makes no sense. --- lib/pkg_pkg.cygpart | 21 ++++++++++++------- .../dist/multiple/multiple-3.14-1-src.hint | 6 ++++++ testsuite/hints/multiple/multiple.cygport | 1 + .../dist/single/single-2.3.4-1-src.hint | 5 +++++ 4 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint create mode 100644 testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart index 753de9e..211524d 100644 --- a/lib/pkg_pkg.cygpart +++ b/lib/pkg_pkg.cygpart @@ -878,32 +878,37 @@ _EOF done fi - # e.g. split library package w/o PN in PKG_NAMES - if [ ! -f ${distdir}/${PN}/${PN}-${PVR}.hint ] + # source package hint + if [ ! -f ${distdir}/${PN}/${PN}-${PVR}-src.hint ] then pkg_category_var=${PN//[-+\.]/_}_CATEGORY; pkg_summary_var=${PN//[-+\.]/_}_SUMMARY; pkg_description_var=${PN//[-+\.]/_}_DESCRIPTION; - if [ -f ${C}/${PN}.hint ] + if [ -f ${C}/${PN}-src.hint ] then - cp ${C}/${PN}.hint ${distdir}/${PN}/${PN}-${PVR}.hint + cp ${C}/${PN}-src.hint ${distdir}/${PN}/${PN}-${PVR}-src.hint elif [ -f ${C}/setup.hint ] then - cp ${C}/setup.hint ${distdir}/${PN}/${PN}-${PVR}.hint + cp ${C}/setup.hint ${distdir}/${PN}/${PN}-${PVR}-src.hint elif [ -n "${!pkg_category_var:-${CATEGORY}}" \ -a -n "${!pkg_summary_var:-${SUMMARY}}${!pkg_description_var:-${DESCRIPTION}}" ] then - cat > ${distdir}/${PN}/${PN}-${PVR}.hint <<-_EOF + cat > ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF category: ${!pkg_category_var:-${CATEGORY}} -requires: sdesc: "${!pkg_summary_var:-${SUMMARY}}" ldesc: "${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY}}}}" skip: ${pkg_tag} _EOF + if [ -n "${HOMEPAGE}" ] + then + cat >> ${distdir}/${PN}/${PN}-${PVR}-src.hint <<-_EOF +homepage: ${HOMEPAGE} +_EOF + fi else - warning "${PN}.hint is missing"; + warning "${PN}-src.hint is missing"; fi fi } diff --git a/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint b/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint new file mode 100644 index 0000000..51e527e --- /dev/null +++ b/testsuite/hints/multiple/hints/multiple-3.14-1.x86_64/dist/multiple/multiple-3.14-1-src.hint @@ -0,0 +1,6 @@ +category: Base +sdesc: "Summary of hints for multiple package test (source)" +ldesc: "Description of hints for multiple package test (source)" +skip: + +homepage: http://test.invalid diff --git a/testsuite/hints/multiple/multiple.cygport b/testsuite/hints/multiple/multiple.cygport index ab6ade9..f56502c 100644 --- a/testsuite/hints/multiple/multiple.cygport +++ b/testsuite/hints/multiple/multiple.cygport @@ -3,6 +3,7 @@ VERSION=3.14 RELEASE=1 SUMMARY="Summary of hints for multiple package test" DESCRIPTION="Description of hints for multiple package test" +HOMEPAGE="http://test.invalid" PKG_NAMES="libmultiple1 libmultiple-devel" diff --git a/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint b/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint new file mode 100644 index 0000000..2bb4adc --- /dev/null +++ b/testsuite/hints/single/hints/single-2.3.4-1.x86_64/dist/single/single-2.3.4-1-src.hint @@ -0,0 +1,5 @@ +category: Base +sdesc: "Summary of hints for single package test" +ldesc: "Description of hints for single package test" +skip: + -- 2.21.0