https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=7eb4cfc67713c137669aa4c1e252f430f03963f9 commit 7eb4cfc67713c137669aa4c1e252f430f03963f9 Author: Christian Franke <[email protected]> Date: Fri Mar 1 13:56:45 2024 +0100 dodoc: Skip a file if a compressed version already exists This prevents __prepdoc() (run by default during postinstall unless RESTRICT=postinst-doc) from also adding the uncompressed version of a default doc file, if src_install() already explicitly installed a compressed version. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=4edc8a4bf9a31fd375694406b3d3365557195322 commit 4edc8a4bf9a31fd375694406b3d3365557195322 Author: Jon Turney <[email protected]> Date: Mon Mar 25 13:48:50 2024 +0000 Update supported WX_VERSION range listed in doc Diff: --- cygclass/wxwidgets.cygclass | 4 ++-- lib/src_install.cygpart | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cygclass/wxwidgets.cygclass b/cygclass/wxwidgets.cygclass index 7fe92838..f8b4158f 100644 --- a/cygclass/wxwidgets.cygclass +++ b/cygclass/wxwidgets.cygclass @@ -47,8 +47,8 @@ # The desired major.minor branch of the wxWidgets toolkit. This variable must # be set before inherit()ing the wxwidgets.cygclass. # NOTE -# Even minor version numbers represent stable branches; versions 2.6, 2.8 -# and 3.0 are supported. +# Even minor version numbers represent stable branches; versions 2.8, 3.0 +# and 3.1 are supported. #**** #****v* wxwidgets.cygclass/WX_TOOLKIT # DESCRIPTION diff --git a/lib/src_install.cygpart b/lib/src_install.cygpart index 18210488..7aca673c 100644 --- a/lib/src_install.cygpart +++ b/lib/src_install.cygpart @@ -163,10 +163,11 @@ docinto() { # Installs the given files or directories into $D/usr/share/doc/PN/, or a # subdirectory thereof specified by the previous call to docinto. # If a FILE does not exist, FILE.md, FILE.rst and FILE.txt are also -# considered. +# considered. A FILE is skipped if the destination file or a compressed +# version (.bz2, .gz, .xz, .zstd) of it already exists. #**** dodoc() { - local docdir d f i x + local docdir d e f i x case "${_docinto_dir}" in '') docdir=/usr/share/doc/${PN} ;; @@ -193,6 +194,10 @@ dodoc() { do if [ -s "${i}${x}" -a ! -f "${D}${docdir}/${i}${x}" ] then + for e in bz2 gz xz zst + do + ! [ -f "${D}${docdir}/${i}${x}.${e}" ] || continue 2 + done __doinstall 0644 "${i}${x}" ${docdir} || error "dodoc ${i} failed" break fi
[cygport - the Cygwin packaging tool] branch master, updated. 0.36.8-8-g7eb4cfc6
Jon Turney via Cygwin-apps-cvs Mon, 29 Apr 2024 12:32:35 -0700
