public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [cygport - the Cygwin packaging tool] branch master, updated. 0.36.5
@ 2023-06-25 16:28 Jon Turney
0 siblings, 0 replies; only message in thread
From: Jon Turney @ 2023-06-25 16:28 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=51dd31664a23cbfb83c6e046a52c1f702e2c43d6
commit 51dd31664a23cbfb83c6e046a52c1f702e2c43d6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jun 25 13:55:03 2023 +0100
Bump version to 0.36.5
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=25a758ebe7e268354b753bd3915f634cf08d519c
commit 25a758ebe7e268354b753bd3915f634cf08d519c
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jun 18 22:33:51 2023 +0100
Update for updated R
Update the version of R-chron built in testsuite to the current one, as
the version we're currently testing with doesn't build cleanly with
current R (4.3.0).
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=13a2c0951a59cff2780a705c4ee6bc6e729c3057
commit 13a2c0951a59cff2780a705c4ee6bc6e729c3057
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jun 18 22:41:04 2023 +0100
Ensure lua is available for tests
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=eafbb364cdbcc34dddff6fcfc3f4297017053778
commit eafbb364cdbcc34dddff6fcfc3f4297017053778
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jun 18 19:33:55 2023 +0100
Update tests for updated perl
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=b212f8c7cbdd6aa20344e2da74f8b1cdadcb2c78
commit b212f8c7cbdd6aa20344e2da74f8b1cdadcb2c78
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun Jun 18 19:35:21 2023 +0100
Revert "Update for updated ruby"
This reverts commit a2410e09164b191931bc4a277bfd20203a2ee516.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=aba5180d7128d10ffe944ecb0f2a68098e63f5ab
commit aba5180d7128d10ffe944ecb0f2a68098e63f5ab
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jun 15 22:18:50 2023 +0100
Set the default CYGWIN_FILES globally
Set the default CYGWIN_FILES globally, rather than in __src_prep(). This
ensures it's value is correct when using commands which don't invoke
that (e.g. package, vars).
Also use $PN.README as a default, if a file of that name exists.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=59018dfbf297adac783cbf1ad3b6488c9480f4ce
commit 59018dfbf297adac783cbf1ad3b6488c9480f4ce
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu Jun 15 16:37:23 2023 +0100
meson: explicitly use 'meson setup'
Since 0.64.0 meson now warns when (the default) command 'setup' is
omitted: "WARNING: Running the setup command as `meson [options]`
instead of `meson setup [options]` is ambiguous and deprecated.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=e1c91db8bef211e3ea50851a371126009629661a
commit e1c91db8bef211e3ea50851a371126009629661a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed May 24 14:01:45 2023 +0100
doc: Fix formatting in RESTRICT documentation
Diff:
---
.github/workflows/cygwin.yml | 1 +
NEWS | 4 ++
bin/cygport.in | 12 ++++++
cygclass/meson.cygclass | 2 +-
cygport.spec | 2 +-
data/sample.cygport | 2 +-
lib/src_postinst.cygpart | 3 +-
lib/src_prep.cygpart | 12 +-----
meson.build | 2 +-
testsuite/R/cran/R-chron.cygport | 2 +-
testsuite/R/cran/R-chron.list | 1 -
.../dist/R-chron/R-chron-2.3_61-1-src.hint} | 0
.../dist/R-chron/R-chron-2.3_61-1.hint} | 0
testsuite/distdir/chron_2.3-51.tar.gz | Bin 36998 -> 0 bytes
testsuite/distdir/chron_2.3-61.tar.gz | Bin 0 -> 37347 bytes
.../dist/perl-Carp/perl-Carp-1.38-1.hint | 2 +-
testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list | 4 +-
.../dist/perl-Lchown/perl-Lchown-1.01-1.hint | 2 +-
testsuite/perl/Module-Build/perl-Lchown.list | 6 +--
testsuite/ruby/gem/ruby-rack-ssl.list | 45 +++++++++++++++++++++
20 files changed, 77 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index ec1d405b..ebb3c4f8 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -78,6 +78,7 @@ jobs:
libxfce4ui1-devel,^
libxfconf0-devel,^
lndir,^
+ lua,^
make,^
mate-common,^
mercurial,^
diff --git a/NEWS b/NEWS
index 83c39008..5af692d2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.36.5:
+ * meson: explicitly use 'meson setup'.
+ * set the default CYGWIN_FILES for all commands.
+
0.36.4:
* rubygem: Make 'gem build|install' errors fatal, and fix bindir.
diff --git a/bin/cygport.in b/bin/cygport.in
index 48bbee87..1791e5b3 100755
--- a/bin/cygport.in
+++ b/bin/cygport.in
@@ -610,6 +610,18 @@ then
unset flags map
fi
+# documented in lib/src_prep.cygport
+if [ ! -e ${top}/${cygwin_patchfile} ]
+then
+ if [ -f ${top}/README ]
+ then
+ CYGWIN_FILES="${CYGWIN_FILES:-README}"
+ elif [ -f ${top}/${PN}.README ]
+ then
+ CYGWIN_FILES="${CYGWIN_FILES:-${PN}.README}"
+ fi
+fi
+
################################################################################
#
# Command processing
diff --git a/cygclass/meson.cygclass b/cygclass/meson.cygclass
index 806449be..20df7532 100644
--- a/cygclass/meson.cygclass
+++ b/cygclass/meson.cygclass
@@ -88,7 +88,7 @@ cygmeson() {
# Flags in CYGMESON_ARGS follow, and therefore override, flags passed by
# default to cygmeson.
#****
- PYTHONUNBUFFERED=1 meson --prefix=$(__host_prefix) \
+ PYTHONUNBUFFERED=1 meson setup --prefix=$(__host_prefix) \
--localstatedir=$(__host_localstatedir) \
--sysconfdir=$(__host_sysconfdir) \
--buildtype=plain --wrap-mode=nodownload \
diff --git a/cygport.spec b/cygport.spec
index 803ccb50..64d58acf 100644
--- a/cygport.spec
+++ b/cygport.spec
@@ -1,7 +1,7 @@
%define debug_package %{nil}
Name: cygport
-Version: 0.36.4
+Version: 0.36.5
Release: 1%{?dist}
Summary: Cygwin package building tool
diff --git a/data/sample.cygport b/data/sample.cygport
index 56495ccb..f4f10e1d 100644
--- a/data/sample.cygport
+++ b/data/sample.cygport
@@ -1,7 +1,7 @@
inherit meson
NAME="cygport"
-VERSION=0.36.4
+VERSION=0.36.5
RELEASE=1
CATEGORY="Devel"
SUMMARY="Cygwin source packaging tool"
diff --git a/lib/src_postinst.cygpart b/lib/src_postinst.cygpart
index 70ddf3b7..dd947311 100644
--- a/lib/src_postinst.cygpart
+++ b/lib/src_postinst.cygpart
@@ -1507,8 +1507,7 @@ __prep_libtool_modules() {
# List of automatic postinstall or packaging step(s) which should be skipped
# for this package, and restrictions on package use.
#
-# Supported values are:
-#
+# Supported values are:
# * case-insensitive: do not build on case-insensitive filesystems.
# * debuginfo: do not create a debuginfo subpackage.
# * diff: do not generate a .src.patch file of changes made in $S.
diff --git a/lib/src_prep.cygpart b/lib/src_prep.cygpart
index da174dd8..4f54f4ee 100644
--- a/lib/src_prep.cygpart
+++ b/lib/src_prep.cygpart
@@ -473,19 +473,11 @@ __src_prep() {
# ${PF}.cygwin.patch, which is automatically applied and generated. This
# variable should not be set if that file is present.
#
-# In the absence of a ${PF}.cygwin.patch file, the default value is 'README' if
-# a file of that name exists, otherwise empty.
+# In the absence of a ${PF}.cygwin.patch file, the default value is 'README' or
+# '${PN}.README' if a file of that name exists, otherwise empty.
#
#****
- if [ ! -e ${top}/${cygwin_patchfile} ]
- then
- if [ -f ${top}/README ]
- then
- CYGWIN_FILES="${CYGWIN_FILES:-README}"
- fi
- fi
-
if [ -n "${CYGWIN_FILES}" ]
then
if [ -f ${top}/${cygwin_patchfile} ]
diff --git a/meson.build b/meson.build
index 417a4ae5..086216fd 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('cygport',
- version: '0.36.4')
+ version: '0.36.5')
bindir = join_paths(get_option('prefix'), get_option('bindir'))
datadir = join_paths(get_option('prefix'), get_option('datadir'))
diff --git a/testsuite/R/cran/R-chron.cygport b/testsuite/R/cran/R-chron.cygport
index faaaaf65..0c86ced6 100644
--- a/testsuite/R/cran/R-chron.cygport
+++ b/testsuite/R/cran/R-chron.cygport
@@ -1,7 +1,7 @@
inherit R
NAME="R-chron"
-VERSION=2.3_51
+VERSION=2.3_61
RELEASE=1
CATEGORY="Math"
SUMMARY="Chronological Objects for R"
diff --git a/testsuite/R/cran/R-chron.list b/testsuite/R/cran/R-chron.list
index e09e8a87..4bc7f99e 100644
--- a/testsuite/R/cran/R-chron.list
+++ b/testsuite/R/cran/R-chron.list
@@ -1,4 +1,3 @@
-/usr/lib/R/site-library/chron/CITATION
/usr/lib/R/site-library/chron/DESCRIPTION
/usr/lib/R/site-library/chron/INDEX
/usr/lib/R/site-library/chron/Meta/Rd.rds
diff --git a/testsuite/R/cran/hints/R-chron-2.3_51-1.x86_64/dist/R-chron/R-chron-2.3_51-1-src.hint b/testsuite/R/cran/hints/R-chron-2.3_61-1.x86_64/dist/R-chron/R-chron-2.3_61-1-src.hint
similarity index 100%
rename from testsuite/R/cran/hints/R-chron-2.3_51-1.x86_64/dist/R-chron/R-chron-2.3_51-1-src.hint
rename to testsuite/R/cran/hints/R-chron-2.3_61-1.x86_64/dist/R-chron/R-chron-2.3_61-1-src.hint
diff --git a/testsuite/R/cran/hints/R-chron-2.3_51-1.x86_64/dist/R-chron/R-chron-2.3_51-1.hint b/testsuite/R/cran/hints/R-chron-2.3_61-1.x86_64/dist/R-chron/R-chron-2.3_61-1.hint
similarity index 100%
rename from testsuite/R/cran/hints/R-chron-2.3_51-1.x86_64/dist/R-chron/R-chron-2.3_51-1.hint
rename to testsuite/R/cran/hints/R-chron-2.3_61-1.x86_64/dist/R-chron/R-chron-2.3_61-1.hint
diff --git a/testsuite/distdir/chron_2.3-51.tar.gz b/testsuite/distdir/chron_2.3-51.tar.gz
deleted file mode 100644
index 29faa155..00000000
Binary files a/testsuite/distdir/chron_2.3-51.tar.gz and /dev/null differ
diff --git a/testsuite/distdir/chron_2.3-61.tar.gz b/testsuite/distdir/chron_2.3-61.tar.gz
new file mode 100644
index 00000000..b4207917
Binary files /dev/null and b/testsuite/distdir/chron_2.3-61.tar.gz differ
diff --git a/testsuite/perl/ExtUtils-MakeMaker/hints/perl-Carp-1.38-1.noarch/dist/perl-Carp/perl-Carp-1.38-1.hint b/testsuite/perl/ExtUtils-MakeMaker/hints/perl-Carp-1.38-1.noarch/dist/perl-Carp/perl-Carp-1.38-1.hint
index af6560d7..a63ee913 100644
--- a/testsuite/perl/ExtUtils-MakeMaker/hints/perl-Carp-1.38-1.noarch/dist/perl-Carp/perl-Carp-1.38-1.hint
+++ b/testsuite/perl/ExtUtils-MakeMaker/hints/perl-Carp-1.38-1.noarch/dist/perl-Carp/perl-Carp-1.38-1.hint
@@ -1,5 +1,5 @@
category: Perl
-requires: perl5_032 perl_base
+requires: perl5_036 perl_base
sdesc: "Perl Carp distribution"
ldesc: "The Carp routines are useful in your own modules because they act
like die() or warn(), but with a message which is more likely to be useful
diff --git a/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list b/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
index d10a5c3c..0354e922 100644
--- a/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
+++ b/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
@@ -1,5 +1,5 @@
/usr/share/doc/perl-Carp/Changes
/usr/share/doc/perl-Carp/README
/usr/share/man/man3/Carp.3pm.gz
-/usr/share/perl5/vendor_perl/5.32/Carp.pm
-/usr/share/perl5/vendor_perl/5.32/Carp/Heavy.pm
+/usr/share/perl5/vendor_perl/5.36/Carp.pm
+/usr/share/perl5/vendor_perl/5.36/Carp/Heavy.pm
diff --git a/testsuite/perl/Module-Build/hints/perl-Lchown-1.01-1.x86_64/dist/perl-Lchown/perl-Lchown-1.01-1.hint b/testsuite/perl/Module-Build/hints/perl-Lchown-1.01-1.x86_64/dist/perl-Lchown/perl-Lchown-1.01-1.hint
index 86422081..147b0b08 100644
--- a/testsuite/perl/Module-Build/hints/perl-Lchown-1.01-1.x86_64/dist/perl-Lchown/perl-Lchown-1.01-1.hint
+++ b/testsuite/perl/Module-Build/hints/perl-Lchown-1.01-1.x86_64/dist/perl-Lchown/perl-Lchown-1.01-1.hint
@@ -1,5 +1,5 @@
category: Perl
-requires: cygwin perl5_032 perl_base
+requires: cygwin libgcc1 perl5_036 perl_base
sdesc: "Perl Lchown distribution"
ldesc: "The Lchown module provides a perl interface to the lchown(2) UNIX
system call, on systems that support lchown. The lchown(2) call is used to
diff --git a/testsuite/perl/Module-Build/perl-Lchown.list b/testsuite/perl/Module-Build/perl-Lchown.list
index 73873735..423b7ecd 100644
--- a/testsuite/perl/Module-Build/perl-Lchown.list
+++ b/testsuite/perl/Module-Build/perl-Lchown.list
@@ -1,6 +1,6 @@
-/usr/lib/perl5/vendor_perl/5.32/x86_64-cygwin-threads/Lchown.pm
-/usr/lib/perl5/vendor_perl/5.32/x86_64-cygwin-threads/auto/Lchown/Lchown.bs
-/usr/lib/perl5/vendor_perl/5.32/x86_64-cygwin-threads/auto/Lchown/Lchown.dll
+/usr/lib/perl5/vendor_perl/5.36/x86_64-cygwin-threads/Lchown.pm
+/usr/lib/perl5/vendor_perl/5.36/x86_64-cygwin-threads/auto/Lchown/Lchown.bs
+/usr/lib/perl5/vendor_perl/5.36/x86_64-cygwin-threads/auto/Lchown/Lchown.dll
/usr/share/doc/perl-Lchown/Changes
/usr/share/doc/perl-Lchown/README
/usr/share/doc/perl/html/html3/site/lib/Lchown.html
diff --git a/testsuite/ruby/gem/ruby-rack-ssl.list b/testsuite/ruby/gem/ruby-rack-ssl.list
index 3452a8f2..bac57e13 100644
--- a/testsuite/ruby/gem/ruby-rack-ssl.list
+++ b/testsuite/ruby/gem/ruby-rack-ssl.list
@@ -1,3 +1,48 @@
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/Rack.html
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/Rack/SSL.html
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/css/fonts.css
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/css/rdoc.css
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-Light.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-LightItalic.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-Regular.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/Lato-RegularItalic.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/SourceCodePro-Bold.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/fonts/SourceCodePro-Regular.ttf
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/add.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/arrow_up.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/brick.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/brick_link.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bug.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_black.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_toggle_minus.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/bullet_toggle_plus.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/date.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/delete.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/find.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/loadingAnimation.gif
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/macFFBgHack.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/package.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_green.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_white_text.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/page_white_width.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/plugin.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/ruby.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/tag_blue.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/tag_green.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/transparent.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/wrench.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/wrench_orange.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/images/zoom.png
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/index.html
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/darkfish.js
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/navigation.js.gz
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search.js
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search_index.js
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/search_index.js.gz
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/searcher.js
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/js/searcher.js.gz
+/usr/share/gems/doc/rack-ssl-1.4.1/rdoc/table_of_contents.html
/usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/call-i.ri
/usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/cdesc-SSL.ri
/usr/share/gems/doc/rack-ssl-1.4.1/ri/Rack/SSL/default_hsts_options-c.ri
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-25 16:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-25 16:28 [cygport - the Cygwin packaging tool] branch master, updated. 0.36.5 Jon Turney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).