From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 74B713858C83; Fri, 14 Oct 2022 12:50:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74B713858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665751812; bh=xPk5F/3jdVasf/0cUFK1twWeQNvzCXk9c3ya/rLTQS8=; h=To:Subject:Date:From:From; b=wbpOaHUeaUSxW7zdwRZjHWlzfwxCPg9C0rcs4pk3WjLHGt1KjFiTx5PVNPpW1ALcp +7tXzqEmpoJ5KR8FHUSkBZzvMekUxb7Xon+ivM9wN8BUspv1RtVXNgeQe8wc+LgPWt w7oxIlqm5CVyDYjBHtnqzbYoGIikxg+SzzN7pQAM= To: cygwin-apps-cvs@sourceware.org Subject: [cygport - the Cygwin packaging tool] branch master, updated. 0.35.4 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 5ce5102fdfd81b7cfa17f0f5e0156e782dd26f44 X-Git-Newrev: 76f7cb2b376daae8d63c440475f94f46c234b24d Message-Id: <20221014125012.74B713858C83@sourceware.org> Date: Fri, 14 Oct 2022 12:50:12 +0000 (GMT) From: Jon TURNEY List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=76f7cb2b376daae8d63c440475f94f46c234b24d commit 76f7cb2b376daae8d63c440475f94f46c234b24d Author: Jon Turney Date: Fri Oct 14 13:12:20 2022 +0100 Bump version to 0.35.4 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=c8254000d1c3780cc9d36936e2488f7ab854cd74 commit c8254000d1c3780cc9d36936e2488f7ab854cd74 Author: Jon Turney Date: Mon Oct 10 14:28:12 2022 +0100 Update README https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=0f6c5845a0ab62def16fc114258c54b02d310712 commit 0f6c5845a0ab62def16fc114258c54b02d310712 Author: William Hu Date: Sun Oct 2 16:20:35 2022 -0400 Improve "Avoid errors from find when packaging ocaml" Improve commit 7f73072a, to better handle the case when ${mldir} doesn't exist, but ${D}${mldir} does. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=2898bed9236e26b26f2d89ced7d1d868cac5a7a4 commit 2898bed9236e26b26f2d89ced7d1d868cac5a7a4 Author: Jon Turney Date: Fri Sep 30 18:31:31 2022 +0100 xorg.cygclass: Default LICENSE to 'MIT' https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=bcf322925d221c922bd489570105b38ea51d44aa commit bcf322925d221c922bd489570105b38ea51d44aa Author: Jon Turney Date: Fri Sep 30 14:02:52 2022 +0100 Replace 'egrep' with 'grep -E' throughout egrep now warns it's obsolescent and suggests using grep -E instead. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=841fc898f95f2179463e876ab4b892c8c45aa64a commit 841fc898f95f2179463e876ab4b892c8c45aa64a Author: Jon Turney Date: Tue Sep 27 17:05:14 2022 +0100 Accept 'prepare' as a synonym for 'prep' subcommand. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=9d74c8186be4e4d5297be8c9a984aefc88e2501d commit 9d74c8186be4e4d5297be8c9a984aefc88e2501d Author: Jon Turney Date: Mon Sep 19 19:10:20 2022 +0100 doc: Ignore emacs autosave files Diff: --- NEWS | 4 ++++ README | 8 +++++--- bin/cygport.in | 2 +- cygclass/xorg.cygclass | 4 ++++ cygport.spec | 2 +- data/mirrors | 6 +++--- data/sample.cygport | 2 +- doc/robodoc.rc | 1 + lib/pkg_info.cygpart | 9 +++++---- lib/pkg_upload.cygpart | 2 +- meson.build | 2 +- .../dist/xorg-util-macros/xorg-util-macros-1.19.1-1-src.hint | 1 + 12 files changed, 28 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 4c397ba9..976237d8 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +0.35.4: + * Replace 'egrep' with 'grep -E' throughout + * xorg: Default LICENSE to 'MIT' + 0.35.3: * Fix detecting configure scripts generated by autoconf version 2.13 * Fix handling of filenames without .cygport suffix on command line diff --git a/README b/README index 24d2a675..c8218e45 100644 --- a/README +++ b/README @@ -176,14 +176,16 @@ are available in the Cygwin package git repositories[5]. Please see the Cygport Reference Manual, included with this package, for documentation on the cygport API. -A Cygwin README file should be included in the CYGWIN-PATCHES directory, +A Cygwin README file may be included in the CYGWIN-PATCHES directory, named README. A standard template for this purpose is available from -the Cygwin distribution website[2]. The setup.hint files should also be +the Cygwin distribution website[2]. + +If .hint file auto-generation isn't being used, setup.hint files may also be included in CYGWIN-PATCHES. Custom postinstall and preremove commands may be included in the CYGWIN-PATCHES directory as postinstall.sh and preremove.sh; these -scripts should be written as stubs, without the she-bang header. +scripts should be written as stubs, without the sh-bang header. 5. REQUIREMENTS diff --git a/bin/cygport.in b/bin/cygport.in index 85382c29..fe6f6eff 100755 --- a/bin/cygport.in +++ b/bin/cygport.in @@ -599,7 +599,7 @@ do __DL_ONLY_MISSING=1 __src_fetch; _status=$?; ;; - prep|unpack) + prepare|unpack|prep) __stage Preparing; __src_prep; _status=$?; diff --git a/cygclass/xorg.cygclass b/cygclass/xorg.cygclass index 519ea8f5..81dddb40 100644 --- a/cygclass/xorg.cygclass +++ b/cygclass/xorg.cygclass @@ -143,6 +143,10 @@ SUMMARY="X.Org ${ORIG_PN} component" # DEFINITION HOMEPAGE="https://www.x.org/" #**** +#****o* xorg.cygclass/LICENSE (xorg) +# DEFINITION +LICENSE="MIT" +#**** #****o* xorg.cygclass/XORG_SRC_COMPRESSION # DESCRIPTION diff --git a/cygport.spec b/cygport.spec index 48085e05..6f431a3b 100644 --- a/cygport.spec +++ b/cygport.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: cygport -Version: 0.35.3 +Version: 0.35.4 Release: 1%{?dist} Summary: Cygwin package building tool diff --git a/data/mirrors b/data/mirrors index 14051c70..f2c48bb6 100644 --- a/data/mirrors +++ b/data/mirrors @@ -71,7 +71,7 @@ mirror_apache+=" https://downloads.apache.org" # SEE ALSO # perl.cygclass #**** -# cat SITES.html | egrep '^ *.*!!g' -e 's!/$!!g' mirror_cpan+=" https://cpan.metacpan.org" @@ -154,7 +154,7 @@ mirror_gcc+=" # SEE ALSO # mirror_portage #**** -# egrep '^
$' mirrors.xml | \ # sed -e 's#.*#\t\1#' -e 's#/$##' -e 's#$#/distfiles#' mirror_gentoo+=" https://gentoo.osuosl.org/distfiles" @@ -363,7 +363,7 @@ mirror_trolltech+=" ${mirror_qt}" # MIRROR LIST # http://vim.sourceforge.net/mirrors.php #**** -# cat mirrors.php | egrep '^ \(.*\).*#\t\1#' -e 's#/$##' mirror_vim+=" http://ftp.vim.org/pub/vim" diff --git a/data/sample.cygport b/data/sample.cygport index f784e828..15944a74 100644 --- a/data/sample.cygport +++ b/data/sample.cygport @@ -1,7 +1,7 @@ inherit meson NAME="cygport" -VERSION=0.35.3 +VERSION=0.35.4 RELEASE=1 CATEGORY="Devel" SUMMARY="Cygwin source packaging tool" diff --git a/doc/robodoc.rc b/doc/robodoc.rc index 443097a6..60830546 100644 --- a/doc/robodoc.rc +++ b/doc/robodoc.rc @@ -99,6 +99,7 @@ ignore files: *.rej *.txt *~ + #*# header markers: #**** remark markers: diff --git a/lib/pkg_info.cygpart b/lib/pkg_info.cygpart index fe106d4c..c399cc5f 100644 --- a/lib/pkg_info.cygpart +++ b/lib/pkg_info.cygpart @@ -364,17 +364,18 @@ __list_deps() { if check_prog ocamlc.opt then mldir=$(ocamlc.opt -where) - if [ ! -d ${mldir} ] + sys_mldir=$mldir + if [ ! -d ${sys_mldir} ] then - mldir="" + sys_mldir="" fi if [ -d ${D}${mldir} ] then - for cma in $(find ${D}${mldir} ${mldir} -name '*.cma') + for cma in $(find ${D}${mldir} ${sys_mldir} -name '*.cma') do ocamlobjinfo $cma | sed -nr "s#(Unit|Module) name: #$cma:#p" done > ${T}/.cmaobjinfo.out - for cmxa in $(find ${D}${mldir} ${mldir} -name '*.cmxa') + for cmxa in $(find ${D}${mldir} ${sys_mldir} -name '*.cmxa') do ocamlobjinfo $cmxa | sed -nr "s#(Unit|Module) name: #$cmxa:#p" done > ${T}/.cmxaobjinfo.out diff --git a/lib/pkg_upload.cygpart b/lib/pkg_upload.cygpart index ef4ffeb2..f4c22ce5 100644 --- a/lib/pkg_upload.cygpart +++ b/lib/pkg_upload.cygpart @@ -121,7 +121,7 @@ __pkg_upload() { if ssh-add -l >/dev/null 2>/dev/null then # ssh-agent is already running. Get key fingerprint: - key_fingerprint=$(ssh-keygen -l -f "$SSH_KEY" | egrep -o '[0-9a-f]{2}(:[0-9a-f]{2}){15}|SHA256:[A-Za-z0-9+/=]{43}') \ + key_fingerprint=$(ssh-keygen -l -f "$SSH_KEY" | grep -E -o '[0-9a-f]{2}(:[0-9a-f]{2}){15}|SHA256:[A-Za-z0-9+/=]{43}') \ || error "Can't read key fingerprint of ${SSH_KEY}. Not a private key file, or corresponding public key file is missing?" # Load key into ssh-agent, if it's not already loaded (prompts for passphrase): diff --git a/meson.build b/meson.build index 87c1ba2f..9508eef2 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cygport', - version: '0.35.3') + version: '0.35.4') bindir = join_paths(get_option('prefix'), get_option('bindir')) datadir = join_paths(get_option('prefix'), get_option('datadir')) diff --git a/testsuite/download/x.org/hints/xorg-util-macros-1.19.1-1.noarch/dist/xorg-util-macros/xorg-util-macros-1.19.1-1-src.hint b/testsuite/download/x.org/hints/xorg-util-macros-1.19.1-1.noarch/dist/xorg-util-macros/xorg-util-macros-1.19.1-1-src.hint index 42fb4a4d..22be5841 100644 --- a/testsuite/download/x.org/hints/xorg-util-macros-1.19.1-1.noarch/dist/xorg-util-macros/xorg-util-macros-1.19.1-1-src.hint +++ b/testsuite/download/x.org/hints/xorg-util-macros-1.19.1-1.noarch/dist/xorg-util-macros/xorg-util-macros-1.19.1-1-src.hint @@ -5,3 +5,4 @@ ldesc: "X.Org aclocal macros" skip: homepage: https://www.x.org/ +license: MIT