On Sat Mar 21, 2020 at 02:57:39AM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Mar 20 2020, Marc Espie <es...@nerim.net> wrote:
> > On Fri, Mar 20, 2020 at 05:16:12PM +0000, Stuart Henderson wrote:
> >> On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
> >> > >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> >> > >> alpha[N]? We could of course also use EPOCH here.
> >> > >
> >> > > adding support for alpha[N] would be in suffix_compare in
> >> > > PackageName.pm
> >> > > (and from_string), but that would only work (afaik) if the suffix was
> >> > > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
> >> >
> >> > I suspect that the lack of support for alpha[N] is intentional, as in
> >> > "You should not put alpha-quality software in the ports tree."
> >>
> >> Yes, I think so too.
> >>
> >> > The current situation is that we have ports using alpha releases in the
> >> > tree, and I see no reason to arbitrarily draw a line between alpha and
> >> > beta releases.
> >> > Diff below, not tested much yet. Thoughts?
> >>
> >> I agree with adding it.
> >>
> >> It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
> >> packages-specs(7) too,
>
> Bah, I should have mentioned that the diff was not intended as complete.
> Thanks for the pointers, I did not find other places to tweak.
>
> www/faq/ports/guide.html says:
>
> "* Do not use alpha or beta code when preparing a port. Use the latest
> regular or patch release."
>
> but I don't think it needs changing.
>
> >> and I think anything currently using "alpha" will
> >> need an EPOCH bump.
>
> Hmm this indeed raises a point... I'm not sure why they would need an
> EPOCH bump. The packages contents won't change, only the way the
> pkg_* tools handle them, right?
>
> There are three affected ports:
>
> ritchie ~$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath, fullpkgname
> from ports where fullpkgname like "%alpha%";'
> archivers/libmspack|libmspack-0.10.1alphav1
> lang/squeak/funsqueak|squeak-funsqueak-3.10alpha7
> net/py-tlslite-ng,python3|py3-tlslite-ng-0.8.0alpha37p1
>
> - the version of funsqueak hasn't changed since import
> - net/py-tlslite-ng has been imported weeks ago and has had no version
> bump
> - the last update of archivers/libmspack came with an EPOCH bump so
> I don't see how its version could be considered lower than any
> previous version available in the tree
>
> Even though I can't find a reason for adding/bumping EPOCH in those
> ports, I'll do it anyway to resolve any concern, unless I hear
> objections.
>
> > Definitely wants tests.
>
> The diff below:
> - implements the changes as pointed by landry@
> - documents "alpha" in packages-specs(7)
> - adds "alpha" to the tests in regress/usr.sbin/pkg_add/check-name, as
> suggested by sthen@; ''make pkgnames'' still succeeds
>
> ok?
>
Thanks Jeremie, tested with the diff qtwebkit diff below.
>From /var/log/messages
Mar 21 11:55:33 kubus pkg_add: Added qtwebkit-5.212.0p0->5.212.0-alpha4
>
> Index: usr.sbin/pkg_add/OpenBSD/PackageName.pm
> ===================================================================
> RCS file: /d/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> retrieving revision 1.53
> diff -u -p -r1.53 PackageName.pm
> --- usr.sbin/pkg_add/OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -0000
> 1.53
> +++ usr.sbin/pkg_add/OpenBSD/PackageName.pm 21 Mar 2020 01:47:15 -0000
> @@ -153,7 +153,7 @@ sub from_string
> my ($class, $string) = @_;
> my $o = bless { deweys => [ split(/\./o, $string) ],
> suffix => '', suffix_value => 0}, $class;
> - if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
> + if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
> $o->{deweys}->[-1] = $1;
> $o->{suffix} = $2;
> $o->{suffix_value} = $3;
> @@ -193,10 +193,13 @@ sub suffix_compare
> if ($a->{suffix} gt $b->{suffix}) {
> return -suffix_compare($b, $a);
> }
> - # order is '', beta, pre, rc
> + # order is '', alpha, beta, pre, rc
> # we know that a < b,
> if ($a->{suffix} eq '') {
> return 1;
> + }
> + if ($a->{suffix} eq 'alpha') {
> + return -1;
> }
> if ($a->{suffix} eq 'beta') {
> return -1;
> Index: regress/usr.sbin/pkg_add/check-name
> ===================================================================
> RCS file: /d/cvs/src/regress/usr.sbin/pkg_add/check-name,v
> retrieving revision 1.11
> diff -u -p -r1.11 check-name
> --- regress/usr.sbin/pkg_add/check-name 27 Jan 2010 15:41:58 -0000
> 1.11
> +++ regress/usr.sbin/pkg_add/check-name 21 Mar 2020 01:47:15 -0000
> @@ -119,5 +119,5 @@ ok(check_list(["correct order is pNvM"],
> "mixed up vp");
> ok(check_list([], check_name("pkgname-1.0p0v0")), "correct name");
>
> -ok(check_order(qw(speex-1.2beta3 speex-1.2rc1 speex-1.2 speex-1.2pl1
> - speex-1.3beta1)), 'check order');
> +ok(check_order(qw(speex-1.2alpha3 speex-1.2beta3 speex-1.2rc1 speex-1.2
> + speex-1.2pl1 speex-1.3beta1)), 'check order');
> Index: share/man/man7/packages-specs.7
> ===================================================================
> RCS file: /d/cvs/src/share/man/man7/packages-specs.7,v
> retrieving revision 1.25
> diff -u -p -r1.25 packages-specs.7
> --- share/man/man7/packages-specs.7 27 Oct 2014 22:45:30 -0000 1.25
> +++ share/man/man7/packages-specs.7 21 Mar 2020 01:47:15 -0000
> @@ -109,6 +109,7 @@ Other parts are compared alphabetically.
> .It
> The last part may contain an extra suffix matching
> .Ar rc[N] ,
> +.Ar alpha[N] ,
> .Ar beta[N] ,
> .Ar pre[N] ,
> or
> @@ -118,12 +119,14 @@ with
> an optional number.
> These correspond to traditional notations for
> .Sq release candidate ,
> +.Sq alpha version ,
> .Sq beta version ,
> .Sq pre-release ,
> .Sq patch-level ,
> and are ordered accordingly, e.g.,
> -.Ar beta
> -is oldest,
> +.Ar alpha
> +is oldest, then
> +.Ar beta ,
> .Ar rc
> and
> .Ar pre
> @@ -137,6 +140,8 @@ then normal version, and finally
> "foo-1.001" is older than "foo-1.002", which in turns is older than
> "foo-1.0010"
> .It
> "foo-1.0rc2" is not comparable to "foo-1.0pre3"
> +.It
> +"bar-1.0alpha5" is older than "bar-1.0beta3"
> .It
> "bar-1.0beta3" is older than "bar-1.0rc1"
> .It
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
This diff disable dwz for now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 20 Mar 2020 16:44:29 -0000 1.20
+++ Makefile 21 Mar 2020 10:56:39 -0000
@@ -9,15 +9,13 @@ CATEGORIES = www
DPB_PROPERTIES = parallel
VERSION = ${QT5_WEBKIT_VERSION}
-DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
-PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
-REVISION = 0
+DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
-SHARED_LIBS += Qt5WebKit 3.0 # 5.9
-SHARED_LIBS += Qt5WebKitWidgets 3.0 # 5.9
+SHARED_LIBS += Qt5WebKit 3.1 # 5.9
+SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
SHARED_LIBS += JavaScriptCore 0.0 # 5.212.9
-SHARED_LIBS += WebCore 0.0 # 5.212.9
-SHARED_LIBS += WebKit2 0.0 # 5.212.9
+SHARED_LIBS += WebCore 1.0 # 5.212.9
+SHARED_LIBS += WebKit2 0.1 # 5.212.9
SHARED_LIBS += WTF 0.0 # 5.212.9
# Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
@@ -37,6 +35,7 @@ WANTLIB += hyphen icui18n icuuc jpeg m p
MASTER_SITES =
https://github.com/annulen/webkit/releases/download/${DISTNAME}/
MODULES = devel/cmake \
+ lang/python \
lang/ruby \
x11/qt5
@@ -46,6 +45,7 @@ CONFIGURE_STYLE = cmake
# Remove default "first" target and build all
ALL_TARGET =
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP = No
MODRUBY_RUNDEP = No
@@ -79,6 +79,7 @@ CONFIGURE_ARGS += -DCMAKE_EXE_LINKER_FLA
-DENABLE_TOOLS=OFF \
-DPORT=Qt \
-DSHARED_CORE=ON \
+ -DSKIP_DWZ=ON \
-DUSE_GSTREAMER=ON \
-DUSE_LD_GOLD=OFF \
-DUSE_QT_MULTIMEDIA=OFF \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 19 Feb 2020 16:08:53 -0000 1.3
+++ distinfo 21 Mar 2020 10:56:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (qt/qtwebkit-5.212.0-alpha3.tar.xz) =
NX7uWCRFV0Ry5BDr7OYy0G+g7JQ1j8Q0XypxOSLfXhc=
-SIZE (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 12457896
+SHA256 (qt/qtwebkit-5.212.0-alpha4.tar.xz) =
nKEm2pJzZk3SOjzNDJvrzre7U0vd10PbMcr2pabUqeY=
+SIZE (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 12528508
Index: patches/patch-Source_JavaScriptCore_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-Source_JavaScriptCore_CMakeLists_txt
--- patches/patch-Source_JavaScriptCore_CMakeLists_txt 19 Feb 2020 16:08:53
-0000 1.1
+++ patches/patch-Source_JavaScriptCore_CMakeLists_txt 21 Mar 2020 10:56:39
-0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_JavaScriptCore_CM
Index: Source/JavaScriptCore/CMakeLists.txt
--- Source/JavaScriptCore/CMakeLists.txt.orig
+++ Source/JavaScriptCore/CMakeLists.txt
-@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390)
+@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
elseif (WTF_CPU_S390X)
elseif (WTF_CPU_MIPS)
elseif (WTF_CPU_SH4)
Index: patches/patch-Source_WebCore_dom_Document_cpp
===================================================================
RCS file: patches/patch-Source_WebCore_dom_Document_cpp
diff -N patches/patch-Source_WebCore_dom_Document_cpp
--- patches/patch-Source_WebCore_dom_Document_cpp 19 Feb 2020 16:08:53
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.2 2020/02/19 16:08:53
rsadowski Exp $
-
-Fix build with icu4c >=65
-
-Index: Source/WebCore/dom/Document.cpp
---- Source/WebCore/dom/Document.cpp.orig
-+++ Source/WebCore/dom/Document.cpp
-@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* character
- unsigned i = 0;
-
- UChar32 c;
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (!isValidNameStart(c))
- return false;
-
- while (i < length) {
-- U16_NEXT(characters, i, length, c)
-+ U16_NEXT(characters, i, length, c);
- if (!isValidNamePart(c))
- return false;
- }
-@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif
-
- for (unsigned i = 0; i < length;) {
- UChar32 c;
-- U16_NEXT(qualifiedName, i, length, c)
-+ U16_NEXT(qualifiedName, i, length, c);
- if (c == ':') {
- if (sawColon) {
- ec = NAMESPACE_ERR;
Index: patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
===================================================================
RCS file:
/cvs/ports/x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1
patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
--- patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp 19 Feb
2020 16:08:53 -0000 1.1
+++ patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp 21 Mar
2020 10:56:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_WebKit_qt_WebCore
Index: Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
--- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp.orig
+++ Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
-@@ -964,6 +964,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
+@@ -965,6 +965,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
if (view->needsLayout())
view->layout();
view->adjustViewSize();
