Re: [PATCH cygport] Add a command to make a test release

2017-10-03 Thread Achim Gratz
Andrew Schulman writes:
> Cygport needs a way to specify which versions are prev, curr, and test in
> cygport files. David Rothenberger and I each proposed a method [1,2]. It
> doesn't matter much to me which method is picked, but it's definitely a
> missing feature.

My latest iteration on the original patch by David:

http://repo.or.cz/cygport/rpm-style.git/commitdiff/b169fec0a4a14e79a1d07bd0df300ef1f43b92a0


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

SD adaptations for Waldorf Q V3.00R3 and Q+ V3.54R2:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada


Re: [PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS

2017-10-03 Thread Andrew Schulman
> Somewhat clearer as to it's purposes, and pluralized for consistency with
> REQUIRES.

Yes! Thank you!



[PATCH cygport 1/2] Rename DEPEND to BUILD_DEPENDS

2017-10-03 Thread Jon Turney
Somewhat clearer as to it's purposes, and pluralized for consistency with
REQUIRES.

Still support the previous name for backwards compatibility
---
 lib/check_funcs.cygpart | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/check_funcs.cygpart b/lib/check_funcs.cygpart
index 93f3e12..08b1be3 100644
--- a/lib/check_funcs.cygpart
+++ b/lib/check_funcs.cygpart
@@ -543,9 +543,9 @@ check_vala_module() {
return ${ret};
 }
 
-#f* Information/DEPEND
+#f* Information/BUILD_DEPENDS
 #  SYNOPSIS
-#  DEPEND="ATOM [ATOM] ..."
+#  BUILD_DEPENDS="ATOM [ATOM] ..."
 #  DESCRIPTION
 #  A list of build-time (not runtime) dependencies to be checked before calling
 #  src_compile.  Each ATOM can be in one of the following forms:
@@ -565,6 +565,8 @@ check_vala_module() {
 #  * tex(foo.ext): TeX modules
 #  * vala(foo-1.0): Vala bindings
 #  * foo: A Cygwin package (check skipped on non-Cygwin build systems)
+#
+# DEPEND is an obsolete synonym for BUILD_DEPENDS.
 #
 __check_depends() {
local atom failed_atoms;
@@ -574,14 +576,19 @@ __check_depends() {
error "Compiling this package requires $(cross_compiling && 
echo -n ${CHOST}' ')binutils and gcc"
fi
 
-   if ! defined DEPEND
+   if ! defined BUILD_DEPENDS
then
-   return 0;
+   if defined DEPEND
+   then
+   BUILD_DEPENDS=${DEPEND}
+   else
+   return 0;
+   fi
fi
 
__deparenthesize() { echo "$@" | sed -e 's|[a-z]*(\([^)]*\))|\1|' ; }
 
-   for atom in ${DEPEND}
+   for atom in ${BUILD_DEPENDS}
do
case ${atom} in
girepository\(*)
-- 
2.14.2



[PATCH cygport 0/2] Better handling of build depends

2017-10-03 Thread Jon Turney
Jon Turney (2):
  Rename DEPEND to BUILD_DEPENDS
  Pass BUILD_DEPENDS through to .hint for source package as
build-depends:

 lib/check_funcs.cygpart | 17 -
 lib/pkg_pkg.cygpart |  5 +
 2 files changed, 17 insertions(+), 5 deletions(-)

-- 
2.14.2


[PATCH cygport 2/2] Pass BUILD_DEPENDS through to .hint for source package as build-depends:

2017-10-03 Thread Jon Turney
Converting a dependency atom to a package name with full generality requires
a database of all the pathnames contained in all packages, so we don't even
try to do that here.

In the fullness of time, calm may have the information needed to perform
that task, at which time it can start emitting build-depends: lines for
source packages into setup.ini.
---
 lib/pkg_pkg.cygpart | 5 +
 1 file changed, 5 insertions(+)

diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index cfc0770..b3aeb32 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -717,6 +717,10 @@ _EOF
then
cat >> 
${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
 external-source: ${PN}
+_EOF
+   else
+   cat >> 
${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
+build-depends: ${BUILD_DEPENDS}
 _EOF
fi
if defined ${pkg_message_var}
@@ -818,6 +822,7 @@ _EOF
cat > ${distdir}/${PN}/${PN}-${PVR}.hint <<-_EOF
 category: ${!pkg_category_var:-${CATEGORY}}
 requires:
+build-depends: ${BUILD_DEPENDS}
 sdesc: "${!pkg_summary_var:-${SUMMARY}}"
 ldesc: 
"${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY"
 skip:
-- 
2.14.2



[PATCH cygport] Add a command to make a test release

2017-10-03 Thread Jon Turney


This patch (originally by Achim Gratz) adds a mechanism for generating 
packages marked as 'test' as described in [1].


I'm not committed to any of the details, but I would like to get 
something with this functionality in, so tell me how you'd like it 
implemented and I'll do it...


[1] https://cygwin.com/ml/cygwin-apps/2016-12/msg5.html
From f0e8ed8266da36fcf5ea0b648e91c1be5e793c6b Mon Sep 17 00:00:00 2001
From: Achim Gratz 
Date: Sat, 8 Apr 2017 17:00:34 +0200
Subject: [PATCH cygport] Add a command to make a test release

lib/pkg_pkg.cygpart: inform when creating hint files for a test release.

lib/help.cygport: document command to package test releases.

bin/cygport.in: provide command to package test releases.

v2:
Add test: to all hints
Add to help output

Signed-off-by: Jon Turney 
---
 bin/cygport.in  |  3 +++
 lib/help.cygpart|  1 +
 lib/pkg_pkg.cygpart | 13 +
 3 files changed, 17 insertions(+)

diff --git a/bin/cygport.in b/bin/cygport.in
index 6cf0122..9cf6f46 100644
--- a/bin/cygport.in
+++ b/bin/cygport.in
@@ -599,6 +599,9 @@ do
__show_web;
_status=$?;
;;
+   package-test|pkg-test)
+   TESTRELEASE=cmdline;
+   ;&
package|pkg)
__stage Packaging;
__log_init ${pkglog};
diff --git a/lib/help.cygpart b/lib/help.cygpart
index 460f8f7..54819a9 100644
--- a/lib/help.cygpart
+++ b/lib/help.cygpart
@@ -46,6 +46,7 @@ __show_help() {
  test run the package's test suite, if one exists
  install  install into a DESTDIR, and run 
post-installation steps
  package  create binary and source packages
+ package-test create binary and source packages, marked as test
  upload   upload finished packages to cygwin.com
  announce send an announcement email to cygwin.com
  finish   delete the working directory
diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index cfc0770..c3b47fe 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -665,6 +665,14 @@ __pkg_dist() {
 #  libfoo-devel will use libfoo_devel_OBSOLETES.
 #
 
+   pkg_testrelease=${TESTRELEASE+test:};
+   if [ "test:" = "${pkg_testrelease:-none}" ]
+   then
+   inform "Package hint files are prepared for a 
\e[1;31mtest\e[0;0m release\n"
+   else
+   inform "Package hint files are prepared for a 
\e[1;32mcurrent\e[0;0m release\n"
+   fi
+
n=0;
while defined pkg_name[${n}]
do
@@ -712,6 +720,7 @@ category: ${!pkg_category_var:-${CATEGORY}}
 requires: ${pkg_bin_requires} ${!pkg_requires_var}
 sdesc: "${!pkg_summary_var:-${SUMMARY}}"
 ldesc: 
"${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY"
+${pkg_testrelease}
 _EOF
if defined distsubdir
then
@@ -751,6 +760,7 @@ ldesc: "The ${obspkg} package is obsolete.  Selecting this 
package for
 installation will cause the ${pkg_name[${n}]} package, which replaces this
 one, to be installed instead."
 ${obssubdir:+external-source: ${PN}}
+${pkg_testrelease}
 _EOF
done
 
@@ -777,6 +787,7 @@ external-source: ${PN}
 sdesc: "Debug info for ${PN}"
 ldesc: "This package contains files necessary for debugging the
 ${PN} package with gdb."
+${pkg_testrelease}
 _EOF
fi
 
@@ -795,6 +806,7 @@ ldesc: "The ${obspkg} package is obsolete.  Selecting this 
package for
 installation will cause the ${PN}-debuginfo package, which replaces this
 one, to be installed instead."
 external-source: ${PN}
+${pkg_testrelease}
 _EOF
done
fi
@@ -820,6 +832,7 @@ category: ${!pkg_category_var:-${CATEGORY}}
 requires:
 sdesc: "${!pkg_summary_var:-${SUMMARY}}"
 ldesc: 
"${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY"
+${pkg_testrelease}
 skip:
 _EOF
else
-- 
2.14.2



[ITA] multitail

2017-10-03 Thread Andrew Schulman
I'd like to adopt this from Dr Volker Zell. I've tested the cygport script
with the latest version, 6.4.2, and it works fine, so I have a new package
ready to upload. Andrew



Re: calm: removing test packages override.hint files

2017-10-03 Thread Marco Atzeri

On 03/10/2017 18:23, Jon Turney wrote:

On 03/10/2017 13:19, Marco Atzeri wrote:

Jon,




I suspect you could work around this (for the moment) by uploading an 
override.hint with the test: line removed, rather than removing the 
override.hint.  You should then be able to remove the override.hint in a 
subsequent upload.


calm has not complained this time


Really, I want to move to using test: labels in the pvr.hint to avoid 
all these edge cases, but we're not there yet...


no problem. It is a border case anyway.

thanks
Marco


Re: calm: removing test packages override.hint files

2017-10-03 Thread Jon Turney

On 03/10/2017 13:19, Marco Atzeri wrote:

Jon,
It seems calm do not like I remove the test packages and
the override.hint files at the same time

I do not see anything obvious wrong on my instructions

./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2-src.tar.xz
./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2.hint
./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2.tar.xz
./x86_64/release/GraphicsMagick/-override.hint
...


Thanks for pointing this out.

Yeah, this doesn't seem to work as intended.

I suspect you could work around this (for the moment) by uploading an 
override.hint with the test: line removed, rather than removing the 
override.hint.  You should then be able to remove the override.hint in a 
subsequent upload.


Really, I want to move to using test: labels in the pvr.hint to avoid 
all these edge cases, but we're not there yet...


Re: Dr. Volker Zell's packages

2017-10-03 Thread Marco Atzeri

On 03/10/2017 17:00, Andrew Schulman wrote:

Unfortunately, we haven't heard from Dr. Volker Zell in quite some time,
and a number of his packages are in need of updates or rebuilds.  I have
marked them ORPHANED in the maintainer list.  ITAs welcome.


I use multitail so I can adopt it if the package is in good shape. I'll
take a look.

Maybe openldap.


Hi Andrew,
openldap-2.4.42 builds fine with the cygwin source packages
but it segfaults during test.

The slapd.1.log suggests the segfault is on the test client and not on 
the server.


Can you try to build just to double check that is not my
computer the problem ?

Regards
Marco






Re: Dr. Volker Zell's packages

2017-10-03 Thread Andrew Schulman
> Unfortunately, we haven't heard from Dr. Volker Zell in quite some time,
> and a number of his packages are in need of updates or rebuilds.  I have
> marked them ORPHANED in the maintainer list.  ITAs welcome.

I use multitail so I can adopt it if the package is in good shape. I'll
take a look.

Maybe openldap.



calm: removing test packages override.hint files

2017-10-03 Thread Marco Atzeri

Jon,
It seems calm do not like I remove the test packages and
the override.hint files at the same time

I do not see anything obvious wrong on my instructions

./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2-src.tar.xz
./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2.hint
./x86_64/release/GraphicsMagick/-GraphicsMagick-1.3.26-2.tar.xz
./x86_64/release/GraphicsMagick/-override.hint
...


 Forwarded Message 
Subject: calm: cygwin package upload report from sourceware.org for 
Marco Atzeri

Date: Tue, 03 Oct 2017 11:25:11 -
From: cygwin-no-re...@cygwin.com
To: marco.atzeri  gmail.com

ERROR: package 'GraphicsMagick' stability 'test' selects non-existent 
version '1.3.26-2'
ERROR: package 'GraphicsMagick-debuginfo' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'ImageMagick' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'ImageMagick-debuginfo' stability 'test' selects 
non-existent version '6.9.9.11-2'
ERROR: package 'ImageMagick-doc' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'gdal' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: package 'gdal-debuginfo' stability 'test' selects non-existent 
version '2.2.2-2'
ERROR: package 'irssi' stability 'test' selects non-existent version 
'1.0.4-2'
ERROR: package 'irssi-debuginfo' stability 'test' selects non-existent 
version '1.0.4-2'
ERROR: package 'irssi-devel' stability 'test' selects non-existent 
version '1.0.4-2'
ERROR: package 'libGraphicsMagick++12' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagick-devel' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagick3' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagickWand2' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libMagick-devel' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickC++6_8' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickCore6_5' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickWand6_5' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libgdal-devel' stability 'test' selects non-existent 
version '2.2.2-2'
ERROR: package 'libgdal20' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: package 'perl-Graphics-Magick' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'perl-Image-Magick' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'perl-gdal' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: package 'python-gdal' stability 'test' selects non-existent 
version '2.2.2-2'

ERROR: error while validating merged x86 packages for Marco Atzeri
ERROR: package 'GraphicsMagick' stability 'test' selects non-existent 
version '1.3.26-2'
ERROR: package 'GraphicsMagick-debuginfo' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'ImageMagick' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'ImageMagick-debuginfo' stability 'test' selects 
non-existent version '6.9.9.11-2'
ERROR: package 'ImageMagick-doc' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'gdal' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: package 'gdal-debuginfo' stability 'test' selects non-existent 
version '2.2.2-2'
ERROR: package 'irssi' stability 'test' selects non-existent version 
'1.0.4-2'
ERROR: package 'irssi-debuginfo' stability 'test' selects non-existent 
version '1.0.4-2'
ERROR: package 'irssi-devel' stability 'test' selects non-existent 
version '1.0.4-2'
ERROR: package 'libGraphicsMagick++12' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagick-devel' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagick3' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libGraphicsMagickWand2' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'libMagick-devel' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickC++6_8' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickCore6_5' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libMagickWand6_5' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'libgdal-devel' stability 'test' selects non-existent 
version '2.2.2-2'
ERROR: package 'libgdal20' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: package 'perl-Graphics-Magick' stability 'test' selects 
non-existent version '1.3.26-2'
ERROR: package 'perl-Image-Magick' stability 'test' selects non-existent 
version '6.9.9.11-2'
ERROR: package 'perl-gdal' stability 'test' selects non-existent version 
'2.2.2-2'
ERROR: 

Re: [Attn. Maintainers] Perl 5.26.1

2017-10-03 Thread Achim Gratz
Ken Brown writes:
>> I need to have a look on what the main GNU/Linux distributions are doing
>> with this.
>
> It's the same on Debian:
>
>   https://packages.debian.org/stretch/amd64/texinfo/filelist
>
> I haven't checked any other.

Looks like SuSE splits into texinfo / makeinfo /info paclages, but
otherwise seems to handle these the same.  It does split out
perl-text-Unidecode and externalizes it in the configury, though.

>> WOuld it be possible to cleanly excise those as dependent
>> packages?
>
> I could certainly do that, but I wouldn't want to unless there's a
> GNU/Linux model to follow.  I don't think Cygwin should use special
> packaging that no one else uses.

Certainly not, I am still a bit surprised at that way of installing
things, though.


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves