From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 1CA1F385350F; Sat, 28 Oct 2023 16:52:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CA1F385350F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1698511952; bh=anQhQn116mNYrd8ndOTdI4esfMoxLocBOp9/PAVplfM=; h=To:Subject:Date:From:From; b=W4lSEiRwgXHSzgrC00RaKqcKD0WPz245FGEPcmkAv+wRlcPpsMp/I6+9Af6ZuqpLo NmywJfHKja+XoJDqhamxMtPARUcbCx5JNGDJ8uec+evVyqrTdsviQmnLDpXEMQ8u/K PyJHPGGJW/saj6pdZTKXX5ni19QOQpxgq0A2vrto= To: cygwin-apps-cvs@sourceware.org Subject: [cygport - the Cygwin packaging tool] branch master, updated. 0.36.7 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 73b99829b48d938df61ee65e97e6d64894e211b3 X-Git-Newrev: 4183b597eac2308a1d717cd6fa841b25bf9dae11 Message-Id: <20231028165232.1CA1F385350F@sourceware.org> Date: Sat, 28 Oct 2023 16:52:31 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=4183b597eac2308a1d717cd6fa841b25bf9dae11 commit 4183b597eac2308a1d717cd6fa841b25bf9dae11 Author: Jon Turney Date: Sat Oct 28 17:46:04 2023 +0100 Bump version to 0.36.7 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=e7e322c3161ee59b0cfa2d52658e93a0648e48f8 commit e7e322c3161ee59b0cfa2d52658e93a0648e48f8 Author: Jon Turney Date: Fri Oct 27 17:53:03 2023 +0100 Drop download/hg test hg.libsdl.org has been shutdown (not updated since 2021). There don't seem to be any existing cygports with a hg upstream to replace it. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/cygport.git;h=adedac9b1254a02b6454056494d352e85012b018 commit adedac9b1254a02b6454056494d352e85012b018 Author: Adam Dinwoodie Date: Fri Oct 27 09:41:11 2023 +0100 python-wheel: Check for pythonXX-wheel The python wheel package is required for building using the python-wheel cygclass, but nothing in cygport verifies its existence, and the error from the Python commands themselves aren't particularly helpful either. To avoid other people wasting the time I just did trying to debug Python build errors, check if the relevant wheel executable is installed, and complain if it isn't. (This seems like it might be an oversight in 2596f685, since pip depends on setuptools but not wheel) Diff: --- .github/workflows/cygwin.yml | 1 + NEWS | 7 +++++++ cygclass/python-wheel.cygclass | 1 + cygport.spec | 2 +- data/sample.cygport | 2 +- meson.build | 2 +- .../{download/hg => autotools/SDL}/SDL2_net.cygport | 6 ++---- testsuite/autotools/SDL/SDL2_net.list | 7 +++++++ .../dist/SDL2_net/SDL2_net-2.0.1-1-src.hint | 0 .../dist/SDL2_net/SDL2_net-2.0.1-1.hint | 2 +- .../SDL2_net-debuginfo/SDL2_net-debuginfo-2.0.1-1.hint | 7 +++++++ testsuite/{download/hg => autotools/SDL}/vars | 2 +- testsuite/autotools/meson.build | 1 + testsuite/distdir/SDL_net-hg-2.0.1.tar.bz2 | Bin 0 -> 269192 bytes testsuite/download/hg/SDL2_net.list | 0 testsuite/download/meson.build | 4 ---- 16 files changed, 31 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index ecde59b0..26c3c10c 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -66,6 +66,7 @@ jobs: libQtTest4-devel,^ libQtXml4-devel,^ libRmath,^ + libSDL2-devel,^ libbz2-devel,^ libcairomm1.0-devel,^ libcrypt-devel,^ diff --git a/NEWS b/NEWS index 4b02e4f0..d30f8470 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +0.36.7: + * Fix incorrect options passed to unzstd in unpack() + * Warn that DEPEND is deprecated + * autotools: Add support for the new (in autoconf 2.69) + AC_CONFIG_MACRO_DIRS macro + * python-wheel: Check that python-wheel is installed + 0.36.6: * Be more efficent about trying to turn on case-sensitivity diff --git a/cygclass/python-wheel.cygclass b/cygclass/python-wheel.cygclass index 4f71639d..3f274b98 100644 --- a/cygclass/python-wheel.cygclass +++ b/cygclass/python-wheel.cygclass @@ -111,6 +111,7 @@ do esac check_prog_req pip${ver} python${ver//.}-pip + check_prog_req wheel-${ver} python${ver//.}-wheel done #****o* python-wheel.cygclass/PKG_NAMES (python-wheel) diff --git a/cygport.spec b/cygport.spec index de74320a..8d5aa090 100644 --- a/cygport.spec +++ b/cygport.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: cygport -Version: 0.36.6 +Version: 0.36.7 Release: 1%{?dist} Summary: Cygwin package building tool diff --git a/data/sample.cygport b/data/sample.cygport index 6c525caa..3406eeb1 100644 --- a/data/sample.cygport +++ b/data/sample.cygport @@ -1,7 +1,7 @@ inherit meson NAME="cygport" -VERSION=0.36.6 +VERSION=0.36.7 RELEASE=1 CATEGORY="Devel" SUMMARY="Cygwin source packaging tool" diff --git a/meson.build b/meson.build index e2cf5342..b648c3be 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cygport', - version: '0.36.6') + version: '0.36.7') bindir = join_paths(get_option('prefix'), get_option('bindir')) datadir = join_paths(get_option('prefix'), get_option('datadir')) diff --git a/testsuite/download/hg/SDL2_net.cygport b/testsuite/autotools/SDL/SDL2_net.cygport similarity index 71% rename from testsuite/download/hg/SDL2_net.cygport rename to testsuite/autotools/SDL/SDL2_net.cygport index 34a821b4..79926dc8 100644 --- a/testsuite/download/hg/SDL2_net.cygport +++ b/testsuite/autotools/SDL/SDL2_net.cygport @@ -1,7 +1,3 @@ -HG_URI="http://hg.libsdl.org/SDL_net/" -HG_REV="release-${PV}" -inherit hg test-fetch - NAME="SDL2_net" VERSION=2.0.1 RELEASE=1 @@ -9,3 +5,5 @@ CATEGORY="Libs" SUMMARY="SDL network library" DESCRIPTION="This is an example portable network library for use with SDL." HOMEPAGE="http://www.libsdl.org/projects/SDL_net/" +SRC_URI="SDL_net-hg-2.0.1.tar.bz2" +SRC_DIR="SDL_net" diff --git a/testsuite/autotools/SDL/SDL2_net.list b/testsuite/autotools/SDL/SDL2_net.list new file mode 100644 index 00000000..2df79cb2 --- /dev/null +++ b/testsuite/autotools/SDL/SDL2_net.list @@ -0,0 +1,7 @@ +/usr/bin/cygSDL2_net-2-0-0.dll +/usr/include/SDL2/SDL_net.h +/usr/lib/libSDL2_net.dll.a +/usr/lib/pkgconfig/SDL2_net.pc +/usr/share/doc/SDL2_net/CHANGES.txt +/usr/share/doc/SDL2_net/COPYING.txt +/usr/share/doc/SDL2_net/README.txt diff --git a/testsuite/download/hg/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1-src.hint b/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1-src.hint similarity index 100% rename from testsuite/download/hg/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1-src.hint rename to testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1-src.hint diff --git a/testsuite/download/hg/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint b/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint similarity index 67% rename from testsuite/download/hg/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint rename to testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint index 8c916b64..0558eca1 100644 --- a/testsuite/download/hg/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint +++ b/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-2.0.1-1.hint @@ -1,5 +1,5 @@ category: Libs -requires: +requires: cygwin libSDL2-devel libSDL2_2.0_0 pkg-config sdesc: "SDL network library" ldesc: "This is an example portable network library for use with SDL." diff --git a/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-debuginfo/SDL2_net-debuginfo-2.0.1-1.hint b/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-debuginfo/SDL2_net-debuginfo-2.0.1-1.hint new file mode 100644 index 00000000..debb9209 --- /dev/null +++ b/testsuite/autotools/SDL/hints/SDL2_net-2.0.1-1.x86_64/dist/SDL2_net/SDL2_net-debuginfo/SDL2_net-debuginfo-2.0.1-1.hint @@ -0,0 +1,7 @@ +category: Debug +requires: cygwin-debuginfo +external-source: SDL2_net +sdesc: "Debug info for SDL2_net" +ldesc: "This package contains files necessary for debugging the +SDL2_net package with gdb." + diff --git a/testsuite/download/hg/vars b/testsuite/autotools/SDL/vars similarity index 50% rename from testsuite/download/hg/vars rename to testsuite/autotools/SDL/vars index 8bc94eda..075532a6 100644 --- a/testsuite/download/hg/vars +++ b/testsuite/autotools/SDL/vars @@ -1,3 +1,3 @@ declare -r ARCHES="all" declare -- CROSS_HOST="" -declare -- INHERITED="test-fetch hg autotools " +declare -- INHERITED="autotools " diff --git a/testsuite/autotools/meson.build b/testsuite/autotools/meson.build index 34ea6cd7..446f83c7 100644 --- a/testsuite/autotools/meson.build +++ b/testsuite/autotools/meson.build @@ -15,6 +15,7 @@ xfce4_panel = dependency('libxfce4panel-1.0', required: false) if automake.found() tests += [['autotools/c', 720]] +tests += [['autotools/SDL', 720]] if gnome_common.found() and gdk_pixbuf.found() and gi.found() tests += [['autotools/gnome', 720]] endif diff --git a/testsuite/distdir/SDL_net-hg-2.0.1.tar.bz2 b/testsuite/distdir/SDL_net-hg-2.0.1.tar.bz2 new file mode 100644 index 00000000..4df15406 Binary files /dev/null and b/testsuite/distdir/SDL_net-hg-2.0.1.tar.bz2 differ diff --git a/testsuite/download/hg/SDL2_net.list b/testsuite/download/hg/SDL2_net.list deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/download/meson.build b/testsuite/download/meson.build index b6072bef..859b2ec4 100644 --- a/testsuite/download/meson.build +++ b/testsuite/download/meson.build @@ -1,7 +1,6 @@ bzr = find_program('bzr', required: false) cvs = find_program('cvs', required: false) git = find_program('git', required: false) -hg = find_program('hg', required: false) mtn = find_program('mtn', required: false) svn = find_program('svn', required: false) @@ -15,9 +14,6 @@ if git.found() tests += [['download/git']] endif tests += [['download/gnome.org']] -if hg.found() -tests += [['download/hg']] -endif tests += [['download/mate']] if mtn.found() tests += [['download/mtn']]