public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [cygport - the Cygwin packaging tool] branch master, updated. 0.34.0-150-g336c67d
@ 2021-05-10 21:04 Jon TURNEY
  0 siblings, 0 replies; only message in thread
From: Jon TURNEY @ 2021-05-10 21:04 UTC (permalink / raw)
  To: cygwin-apps-cvs




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=336c67d359d7676216bc2e29fe304819505cdba0

commit 336c67d359d7676216bc2e29fe304819505cdba0
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun May 9 20:14:19 2021 +0100

    Updates to tests for package updates
    
    R-nanotime 0.2.4 has been archived
    R/cran requires libpcre2-devel
    python-clang needs an update as llvm svn has been shutdown
    Perl is now 5.32
    python wheels now install some additional files
    python-pynotify needs a workaround for gcc10 defaulting to -fno-common
    
    Also fix mercurial's shebang, otherwise it tries to use python2

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=96a73adb1bb526c9cc7ddfa60e47ac15a3d0ddb8

commit 96a73adb1bb526c9cc7ddfa60e47ac15a3d0ddb8
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun May 9 17:20:59 2021 +0100

    Update GitHub action to set PATH via environment file
    
    set-env has been disabled by default for security reasons (see [1]).
    Instead set the PATH via an environment file.
    
    [1] https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/


Diff:
---
 .github/workflows/cygwin.yml                     |  7 +--
 testsuite/download/R/R-nanotime.cygport          |  2 +-
 testsuite/download/svn/python-clang.cygport      | 32 +++++++++++--
 testsuite/download/svn/python-clang.list         | 57 ++++++++++++++++++++++++
 testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list |  4 +-
 testsuite/perl/Module-Build/perl-Lchown.list     |  6 +--
 testsuite/python/pygtk/python-pynotify.cygport   |  2 +
 testsuite/python/wheel/python-six.list           |  6 +++
 8 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 42e29c9..ead6069 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -5,8 +5,6 @@ on:
     - master
     - 'cygport-*'
     - 'topic/**'
-    paths-ignore:
-    - '.github/**'
 
 env:
   CASE_INSENSITIVE: 1
@@ -72,6 +70,7 @@ jobs:
         liblzma-devel,^
         libnotify-devel,^
         libpango1.0-devel,^
+        libpcre2-devel,^
         libqca-qt5-devel,^
         libtirpc-devel,^
         libxfce4ui1-devel,^
@@ -114,8 +113,10 @@ jobs:
         xfce4-panel-devel
       shell: cmd
     - name: Set PATH
+      run: echo "PATH=C:\cygwin64\bin;C:\cygwin64\lib\lapack;%SYSTEMROOT%\system32" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+    - name: Fix mercurial
       run: |
-        echo '::set-env name=PATH::C:\cygwin64\bin;C:\cygwin64\lib\lapack;%SYSTEMROOT%\system32'
+        bash -c 'sed -i s#/usr/bin/python\$#/usr/bin/python3# /usr/bin/hg'
     - name: Build
       run: |
         bash -c 'meson _build && ninja -C _build'
diff --git a/testsuite/download/R/R-nanotime.cygport b/testsuite/download/R/R-nanotime.cygport
index 71c4934..f744188 100644
--- a/testsuite/download/R/R-nanotime.cygport
+++ b/testsuite/download/R/R-nanotime.cygport
@@ -1,7 +1,7 @@
 inherit test-fetch
 
 NAME="R-nanotime"
-VERSION=0.2.4
+VERSION=0.3.2
 RELEASE=1
 CATEGORY="Math"
 SUMMARY="Nanosecond-resolution time for R"
diff --git a/testsuite/download/svn/python-clang.cygport b/testsuite/download/svn/python-clang.cygport
index 3266a37..28df512 100644
--- a/testsuite/download/svn/python-clang.cygport
+++ b/testsuite/download/svn/python-clang.cygport
@@ -1,10 +1,11 @@
-SVN_URI="http://llvm.org/svn/llvm-project/cfe"
-SVN_BRANCH="tags/RELEASE_${PV//.}/final/bindings/python"
+SVN_URI="https://github.com/llvm/llvm-project"
+SVN_BRANCH="tags/llvmorg-${PV}/clang/bindings/python"
 SVN_MODULE="python-clang"
-inherit svn test-fetch
+PYTHON_WHEEL_VERSIONS="2:default"
+inherit python-wheel svn
 
 NAME="python-clang"
-VERSION=4.0.1
+VERSION=9.0.1
 RELEASE=1
 CATEGORY="Python"
 SUMMARY="Python bindings for Clang-C Source Indexing Library"
@@ -16,3 +17,26 @@ HOMEPAGE="http://clang.llvm.org/"
 PATCH_URI="3.7.1-cygwin-ctypes.patch"
 
 ARCH=noarch
+
+python27_clang_REQUIRES="libclang${VERSION%%.*}" # ctypes
+python36_clang_REQUIRES="libclang${VERSION%%.*}" # ctypes
+python37_clang_REQUIRES="libclang${VERSION%%.*}" # ctypes
+python38_clang_REQUIRES="libclang${VERSION%%.*}" # ctypes
+
+CYGPORT_USE_UNSTABLE_API=1
+src_patch_hook() {
+	sed -i -e "s|\@CLANG_LIB_VERSION\@|${VERSION%%.*}|" clang/cindex.py
+	cat > setup.py <<_EOF
+from setuptools import setup
+
+setup(name='clang',
+      version='${VERSION}',
+      platforms=['all'],
+      packages=['clang'],
+      )
+_EOF
+	cat > setup.cfg <<_EOF
+[bdist_wheel]
+universal = 1
+_EOF
+}
diff --git a/testsuite/download/svn/python-clang.list b/testsuite/download/svn/python-clang.list
index e69de29..30680a1 100644
--- a/testsuite/download/svn/python-clang.list
+++ b/testsuite/download/svn/python-clang.list
@@ -0,0 +1,57 @@
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/INSTALLER
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/METADATA
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/RECORD
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/REQUESTED
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/WHEEL
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/direct_url.json
+/usr/lib/python2.7/site-packages/clang-9.0.1.dist-info/top_level.txt
+/usr/lib/python2.7/site-packages/clang/__init__.py
+/usr/lib/python2.7/site-packages/clang/__init__.pyc
+/usr/lib/python2.7/site-packages/clang/__init__.pyo
+/usr/lib/python2.7/site-packages/clang/cindex.py
+/usr/lib/python2.7/site-packages/clang/cindex.pyc
+/usr/lib/python2.7/site-packages/clang/cindex.pyo
+/usr/lib/python2.7/site-packages/clang/enumerations.py
+/usr/lib/python2.7/site-packages/clang/enumerations.pyc
+/usr/lib/python2.7/site-packages/clang/enumerations.pyo
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/INSTALLER
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/METADATA
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/RECORD
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/REQUESTED
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/WHEEL
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/direct_url.json
+/usr/lib/python3.7/site-packages/clang-9.0.1.dist-info/top_level.txt
+/usr/lib/python3.7/site-packages/clang/__init__.py
+/usr/lib/python3.7/site-packages/clang/__pycache__/__init__.cpython-37.opt-1.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/__init__.cpython-37.opt-2.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/__init__.cpython-37.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/cindex.cpython-37.opt-1.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/cindex.cpython-37.opt-2.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/cindex.cpython-37.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/enumerations.cpython-37.opt-1.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/enumerations.cpython-37.opt-2.pyc
+/usr/lib/python3.7/site-packages/clang/__pycache__/enumerations.cpython-37.pyc
+/usr/lib/python3.7/site-packages/clang/cindex.py
+/usr/lib/python3.7/site-packages/clang/enumerations.py
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/INSTALLER
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/METADATA
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/RECORD
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/REQUESTED
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/WHEEL
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/direct_url.json
+/usr/lib/python3.8/site-packages/clang-9.0.1.dist-info/top_level.txt
+/usr/lib/python3.8/site-packages/clang/__init__.py
+/usr/lib/python3.8/site-packages/clang/__pycache__/__init__.cpython-38.opt-1.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/__init__.cpython-38.opt-2.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/__init__.cpython-38.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/cindex.cpython-38.opt-1.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/cindex.cpython-38.opt-2.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/cindex.cpython-38.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/enumerations.cpython-38.opt-1.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/enumerations.cpython-38.opt-2.pyc
+/usr/lib/python3.8/site-packages/clang/__pycache__/enumerations.cpython-38.pyc
+/usr/lib/python3.8/site-packages/clang/cindex.py
+/usr/lib/python3.8/site-packages/clang/enumerations.py
+/usr/share/doc/python27-clang/README.txt
+/usr/share/doc/python37-clang/README.txt
+/usr/share/doc/python38-clang/README.txt
diff --git a/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list b/testsuite/perl/ExtUtils-MakeMaker/perl-Carp.list
index 7133291..d10a5c3 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.30/Carp.pm
-/usr/share/perl5/vendor_perl/5.30/Carp/Heavy.pm
+/usr/share/perl5/vendor_perl/5.32/Carp.pm
+/usr/share/perl5/vendor_perl/5.32/Carp/Heavy.pm
diff --git a/testsuite/perl/Module-Build/perl-Lchown.list b/testsuite/perl/Module-Build/perl-Lchown.list
index 97a101b..7387373 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.30/x86_64-cygwin-threads/Lchown.pm
-/usr/lib/perl5/vendor_perl/5.30/x86_64-cygwin-threads/auto/Lchown/Lchown.bs
-/usr/lib/perl5/vendor_perl/5.30/x86_64-cygwin-threads/auto/Lchown/Lchown.dll
+/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/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/python/pygtk/python-pynotify.cygport b/testsuite/python/pygtk/python-pynotify.cygport
index cfefa08..70570dc 100644
--- a/testsuite/python/pygtk/python-pynotify.cygport
+++ b/testsuite/python/pygtk/python-pynotify.cygport
@@ -14,3 +14,5 @@ PATCH_URI="mirror://portage/dev-python/${ORIG_PN}/files/${ORIG_PN}-${PV}-libnoti
 DISTCLEANFILES="src/pynotify.c"
 
 REQUIRES="python-gobject python-gtk2.0"
+
+CFLAGS+=" -fcommon"
diff --git a/testsuite/python/wheel/python-six.list b/testsuite/python/wheel/python-six.list
index e83b88c..30c417c 100644
--- a/testsuite/python/wheel/python-six.list
+++ b/testsuite/python/wheel/python-six.list
@@ -2,7 +2,9 @@
 /usr/lib/python2.7/site-packages/six-1.10.0.dist-info/LICENSE
 /usr/lib/python2.7/site-packages/six-1.10.0.dist-info/METADATA
 /usr/lib/python2.7/site-packages/six-1.10.0.dist-info/RECORD
+/usr/lib/python2.7/site-packages/six-1.10.0.dist-info/REQUESTED
 /usr/lib/python2.7/site-packages/six-1.10.0.dist-info/WHEEL
+/usr/lib/python2.7/site-packages/six-1.10.0.dist-info/direct_url.json
 /usr/lib/python2.7/site-packages/six-1.10.0.dist-info/top_level.txt
 /usr/lib/python2.7/site-packages/six.py
 /usr/lib/python2.7/site-packages/six.pyc
@@ -14,7 +16,9 @@
 /usr/lib/python3.7/site-packages/six-1.10.0.dist-info/LICENSE
 /usr/lib/python3.7/site-packages/six-1.10.0.dist-info/METADATA
 /usr/lib/python3.7/site-packages/six-1.10.0.dist-info/RECORD
+/usr/lib/python3.7/site-packages/six-1.10.0.dist-info/REQUESTED
 /usr/lib/python3.7/site-packages/six-1.10.0.dist-info/WHEEL
+/usr/lib/python3.7/site-packages/six-1.10.0.dist-info/direct_url.json
 /usr/lib/python3.7/site-packages/six-1.10.0.dist-info/top_level.txt
 /usr/lib/python3.7/site-packages/six.py
 /usr/lib/python3.8/site-packages/__pycache__/six.cpython-38.opt-1.pyc
@@ -24,7 +28,9 @@
 /usr/lib/python3.8/site-packages/six-1.10.0.dist-info/LICENSE
 /usr/lib/python3.8/site-packages/six-1.10.0.dist-info/METADATA
 /usr/lib/python3.8/site-packages/six-1.10.0.dist-info/RECORD
+/usr/lib/python3.8/site-packages/six-1.10.0.dist-info/REQUESTED
 /usr/lib/python3.8/site-packages/six-1.10.0.dist-info/WHEEL
+/usr/lib/python3.8/site-packages/six-1.10.0.dist-info/direct_url.json
 /usr/lib/python3.8/site-packages/six-1.10.0.dist-info/top_level.txt
 /usr/lib/python3.8/site-packages/six.py
 /usr/share/doc/python-six-wheel/CHANGES



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-05-10 21:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-10 21:04 [cygport - the Cygwin packaging tool] branch master, updated. 0.34.0-150-g336c67d 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).