UPDATE: x11/qt5/qtwebkit

classic Classic list List threaded Threaded
15 messages Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: x11/qt5/qtwebkit

Rafael Sadowski
Simple update qtwebkit to the latest version 5.212.0 Alpha 4:

Release log:
- https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4

Port changes:
- Add missing python model after reading release notes "QtWebKit does
  not require Python 2 anymore for building and can use Python 3
  instead"
- removed icu patched, it has been merged upstream.

Tested with otter-browser on amd64.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 25 Feb 2020 14:03:00 -0000 1.19
+++ Makefile 16 Mar 2020 05:05:27 -0000
@@ -9,15 +9,15 @@ CATEGORIES = www
 DPB_PROPERTIES = parallel
 
 VERSION = ${QT5_WEBKIT_VERSION}
-DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
+DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
 PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
-REVISION = 0
+REVISION = 1
 
-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 +37,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 +47,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
 
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 16 Mar 2020 05:05:27 -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 16 Mar 2020 05:05:27 -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 16 Mar 2020 05:05:27 -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();

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/qt5/qtwebkit

Rafael Sadowski
On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:

> Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>
> Release log:
> - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>
> Port changes:
> - Add missing python model after reading release notes "QtWebKit does
>   not require Python 2 anymore for building and can use Python 3
>   instead"
> - removed icu patched, it has been merged upstream.
>
> Tested with otter-browser on amd64.
>

I would like to see this in the next release.

> OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 25 Feb 2020 14:03:00 -0000 1.19
> +++ Makefile 16 Mar 2020 05:05:27 -0000
> @@ -9,15 +9,15 @@ CATEGORIES = www
>  DPB_PROPERTIES = parallel
>  
>  VERSION = ${QT5_WEBKIT_VERSION}
> -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
>  PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
> -REVISION = 0
> +REVISION = 1

Any concept howto handle the version bump -alpha3 to -alpha4? We have
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.

Any opinions?

>  
> -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 +37,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 +47,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
>  
> 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 16 Mar 2020 05:05:27 -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 16 Mar 2020 05:05:27 -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 16 Mar 2020 05:05:27 -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();
>

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/qt5/qtwebkit

Landry Breuil-5
On Fri, Mar 20, 2020 at 07:31:52AM +0100, Rafael Sadowski wrote:

> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
> > Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
> >
> > Release log:
> > - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
> >
> > Port changes:
> > - Add missing python model after reading release notes "QtWebKit does
> >   not require Python 2 anymore for building and can use Python 3
> >   instead"
> > - removed icu patched, it has been merged upstream.
> >
> > Tested with otter-browser on amd64.
> >
>
> I would like to see this in the next release.
>
> > OK?
> >
> > Index: Makefile
> > ===================================================================
> > RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> > retrieving revision 1.19
> > diff -u -p -u -p -r1.19 Makefile
> > --- Makefile 25 Feb 2020 14:03:00 -0000 1.19
> > +++ Makefile 16 Mar 2020 05:05:27 -0000
> > @@ -9,15 +9,15 @@ CATEGORIES = www
> >  DPB_PROPERTIES = parallel
> >  
> >  VERSION = ${QT5_WEBKIT_VERSION}
> > -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> > +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
> >  PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
> > -REVISION = 0
> > +REVISION = 1
>
> Any concept howto handle the version bump -alpha3 to -alpha4? We have
> 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).

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/qt5/qtwebkit

Jeremie Courreges-Anglas-2
In reply to this post by Rafael Sadowski
On Fri, Mar 20 2020, Rafael Sadowski <[hidden email]> wrote:

> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
>> Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>>
>> Release log:
>> - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>>
>> Port changes:
>> - Add missing python model after reading release notes "QtWebKit does
>>   not require Python 2 anymore for building and can use Python 3
>>   instead"
>> - removed icu patched, it has been merged upstream.
>>
>> Tested with otter-browser on amd64.
>>
>
> I would like to see this in the next release.

make configure difference:

--8<--

[...]

 -- The C compiler identification is Clang 8.0.1
 -- The CXX compiler identification is Clang 8.0.1
 -- Check for working C compiler: /usr/ports/pobj/qtwebkit-5.212.0/bin/cc
@@ -45,12 +423,15 @@
 -- Found ICU libraries: /usr/local/lib/libicuuc.so.17.0
 -- Found LibXml2: /usr/local/lib/libxml2.so.16.1 (found suitable version "2.9.10", minimum required is "2.8.0")
 -- Found LibXslt: /usr/local/lib/libxslt.so.4.0 (found suitable version "1.1.34", minimum required is "1.1.7")
+-- Could NOT find Dwz (missing: DWZ_EXECUTABLE) (Required is at least version "0.13")
 -- Found WebP: /usr/local/include  
 -- Qt OpenGL implementation: GL
 -- Qt OpenGL libraries: Qt5::Gui_GL
 -- Qt EGL libraries: Qt5::Gui_EGL
 -- Performing Test Qt5Gui_PRIVATE_HEADER_FOUND
 -- Performing Test Qt5Gui_PRIVATE_HEADER_FOUND - Success
+-- Performing Test Qt5Network_PRIVATE_HEADER_FOUND
+-- Performing Test Qt5Network_PRIVATE_HEADER_FOUND - Success
 -- Performing Test Qt5Quick_PRIVATE_HEADER_FOUND
 -- Performing Test Qt5Quick_PRIVATE_HEADER_FOUND - Success
 -- Found X11: /usr/X11R6/include  
@@ -127,29 +508,33 @@
  * GStreamer (required version >= 1.0.3)
  * Hyphen
 
+-- The following OPTIONAL packages have not been found:
+
+ * Dwz (required version >= 0.13)
+

[...]

-->8--

We have no dwz package so this looks rather safe.  Your choice.  ;)

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

Jeremie Courreges-Anglas-2
In reply to this post by Landry Breuil-5
On Fri, Mar 20 2020, Landry Breuil <[hidden email]> wrote:

> On Fri, Mar 20, 2020 at 07:31:52AM +0100, Rafael Sadowski wrote:
>> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
>> > Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>> >
>> > Release log:
>> > - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>> >
>> > Port changes:
>> > - Add missing python model after reading release notes "QtWebKit does
>> >   not require Python 2 anymore for building and can use Python 3
>> >   instead"
>> > - removed icu patched, it has been merged upstream.
>> >
>> > Tested with otter-browser on amd64.
>> >
>>
>> I would like to see this in the next release.
>>
>> > OK?
>> >
>> > Index: Makefile
>> > ===================================================================
>> > RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
>> > retrieving revision 1.19
>> > diff -u -p -u -p -r1.19 Makefile
>> > --- Makefile 25 Feb 2020 14:03:00 -0000 1.19
>> > +++ Makefile 16 Mar 2020 05:05:27 -0000
>> > @@ -9,15 +9,15 @@ CATEGORIES = www
>> >  DPB_PROPERTIES = parallel
>> >  
>> >  VERSION = ${QT5_WEBKIT_VERSION}
>> > -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
>> > +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
>> >  PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
>> > -REVISION = 0
>> > +REVISION = 1
>>
>> Any concept howto handle the version bump -alpha3 to -alpha4? We have
>> 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."

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?
cc'ing espie


Index: OpenBSD/PackageName.pm
===================================================================
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
retrieving revision 1.53
diff -u -p -r1.53 PackageName.pm
--- OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -0000 1.53
+++ OpenBSD/PackageName.pm 20 Mar 2020 14:48:00 -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;



--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: UPDATE: x11/qt5/qtwebkit

Stuart Henderson
In reply to this post by Jeremie Courreges-Anglas-2
On 2020/03/20 17:37, Jeremie Courreges-Anglas wrote:
> +-- The following OPTIONAL packages have not been found:

I'd prefer to disable these when noticed in case the relevant port is added later..

> + * Dwz (required version >= 0.13)
> +
> We have no dwz package so this looks rather safe.  Your choice.  ;)

If anyone feels like porting this, it looks like it might be quite useful!

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

Stuart Henderson
In reply to this post by Jeremie Courreges-Anglas-2
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, and I think anything currently using "alpha" will
need an EPOCH bump.



> cc'ing espie
>
>
> Index: OpenBSD/PackageName.pm
> ===================================================================
> RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> retrieving revision 1.53
> diff -u -p -r1.53 PackageName.pm
> --- OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -0000 1.53
> +++ OpenBSD/PackageName.pm 20 Mar 2020 14:48:00 -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;
>
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

Marc Espie-2
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, and I think anything currently using "alpha" will
> need an EPOCH bump.
>
Definitely wants tests.

>
> > cc'ing espie
> >
> >
> > Index: OpenBSD/PackageName.pm
> > ===================================================================
> > RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> > retrieving revision 1.53
> > diff -u -p -r1.53 PackageName.pm
> > --- OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -0000 1.53
> > +++ OpenBSD/PackageName.pm 20 Mar 2020 14:48:00 -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;
> >
> >
> >
> > --
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> >
>

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Jeremie Courreges-Anglas-2
On Fri, Mar 20 2020, Marc Espie <[hidden email]> 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?


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

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Theo Buehler-3
On Sat, Mar 21, 2020 at 02:57:39AM +0100, Jeremie Courreges-Anglas wrote:

> On Fri, Mar 20 2020, Marc Espie <[hidden email]> 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?

Thank you. I am in favor of this change. I had to look in PackageName.pm
when I was trying to figure out how to deal with tlslite-ng's alpha
version. The diff reads fine, but I don't feel qualified okaying it. I'm
of course fine with bumping EPOCH in tlslite-ng if people think it's
needed.

>
>
> 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
>

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Stuart Henderson
In reply to this post by Jeremie Courreges-Anglas-2
Oh, forget what I said about EPOCH, I figured out why is not needed now :-)

--
Sent from a phone, apologies for poor formatting.

On 21 March 2020 02:00:31 Jeremie Courreges-Anglas <[hidden email]> wrote:

> On Fri, Mar 20 2020, Marc Espie <[hidden email]> 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?
>
>
> 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



Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Rafael Sadowski
In reply to this post by Jeremie Courreges-Anglas-2
On Sat Mar 21, 2020 at 02:57:39AM +0100, Jeremie Courreges-Anglas wrote:

> On Fri, Mar 20 2020, Marc Espie <[hidden email]> 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();

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Jeremie Courreges-Anglas-2
On Sat, Mar 21 2020, Rafael Sadowski <[hidden email]> wrote:

[...]

> Thanks Jeremie, tested with the diff qtwebkit diff below.

Thanks for testing.  It's nice that you want to use the support for
"alpha" releases right now, but I wouldn't delay your qtwebkit update
for this reason.

> From /var/log/messages
> Mar 21 11:55:33 kubus pkg_add: Added qtwebkit-5.212.0p0->5.212.0-alpha4

[...]

> 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

1. (pointed out by Landry earlier) the suffix should be right after the
version, ie:

DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}alpha4

2. with explicit support for "alpha" in the pkg_* tools,
  qtwebkit-5.212.0alpha4 (your update) < qtwebkit-5.212.0p0 (-current)

If you want to be benefit from support for "alpha" right now, you should
use EPOCH so that your qtwebkit update actually appears newer.
Else, you could keep using your "new alpha release -> REVISION bump"
scheme until upstream bumps to qtwebkit-5.212.1 or qtwebkit-5.213.0 etc.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Jeremie Courreges-Anglas-2
On Sat, Mar 21 2020, Jeremie Courreges-Anglas <[hidden email]> wrote:
> On Sat, Mar 21 2020, Rafael Sadowski <[hidden email]> wrote:
>
> [...]
>
>> Thanks Jeremie, tested with the diff qtwebkit diff below.
>
> Thanks for testing.  It's nice that you want to use the support for
> "alpha" releases right now, but I wouldn't delay your qtwebkit update
> for this reason.

I have committed the support for "alpha" package versions, so you're
free to build upon it for your qtwebkit update.

Thanks to all who provided help and feedback, this item had been bugging
for some time.

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: package-specs(7) and alpha releases

Rafael Sadowski
On Thu Mar 26, 2020 at 08:58:05PM +0100, Jeremie Courreges-Anglas wrote:

> On Sat, Mar 21 2020, Jeremie Courreges-Anglas <[hidden email]> wrote:
> > On Sat, Mar 21 2020, Rafael Sadowski <[hidden email]> wrote:
> >
> > [...]
> >
> >> Thanks Jeremie, tested with the diff qtwebkit diff below.
> >
> > Thanks for testing.  It's nice that you want to use the support for
> > "alpha" releases right now, but I wouldn't delay your qtwebkit update
> > for this reason.
>
> I have committed the support for "alpha" package versions, so you're
> free to build upon it for your qtwebkit update.
>
> Thanks to all who provided help and feedback, this item had been bugging
> for some time.
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

And here is my final diff. jca@ helped me here and open my eyes. We need
to bump all all QT5_WEBKIT_VERSION/MODQT5_WEBKIT_VERSION consumer.

Tested like this:

qtwebkit-5.212.0p1->5.212.0alpha4v0
qtwebkit-5.212.0alpha4v0->qtwebkit-5.212.0alpha5v0

Any objections? OKs?

diff --git meta/qt5/Makefile meta/qt5/Makefile
index 5d0841cbb63..56931bbd82c 100644
--- meta/qt5/Makefile
+++ meta/qt5/Makefile
@@ -6,6 +6,7 @@ COMMENT-examples = examples for Qt5, meta-package
 PKGNAME = qt5-${MODQT5_VERSION}
 PKGNAME-main = ${PKGNAME}
 PKGNAME-examples = qt5-examples-${MODQT5_VERSION}
+REVISION-main = 0
 
 MULTI_PACKAGES = -main -examples
 
diff --git x11/qt5/Makefile.version x11/qt5/Makefile.version
index aa4980b34d2..2838c2a0719 100644
--- x11/qt5/Makefile.version
+++ x11/qt5/Makefile.version
@@ -3,7 +3,7 @@
 
 QT5_VERSION = 5.13.2
 QT5_DIST_VERSION = 5.13.2
-QT5_WEBKIT_VERSION = 5.212.0
+QT5_WEBKIT_VERSION = 5.212.0alpha4v0
 
 # This one is used for building dependencies for examples and documentation,
 # which obviously should be in sync with core packages.
diff --git x11/qt5/qttools/Makefile x11/qt5/qttools/Makefile
index b866ba3cc2f..68848c75b1c 100644
--- x11/qt5/qttools/Makefile
+++ x11/qt5/qttools/Makefile
@@ -4,6 +4,7 @@ QT5NAME = QtTools
 COMMENT-main = Qt development tools
 COMMENT-webview = Webkit-based Qt Designer plugin
 PKGNAME-webview = qwebview-${VERSION}
+REVISON-webview = 0
 
 DPB_PROPERTIES = parallel
 
diff --git x11/qt5/qtwebkit/Makefile x11/qt5/qtwebkit/Makefile
index d10c4ce5c91..d314a342d8c 100644
--- x11/qt5/qtwebkit/Makefile
+++ x11/qt5/qtwebkit/Makefile
@@ -8,16 +8,15 @@ CATEGORIES = www
 
 DPB_PROPERTIES = parallel
 
-VERSION = ${QT5_WEBKIT_VERSION}
-DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
+DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION:C/alpha4v0/-alpha4/}
 PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
-REVISION = 1
 
-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.
@@ -47,6 +46,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
 
@@ -59,6 +59,9 @@ BUILD_DEPENDS = devel/bison \
 RUN_DEPENDS = geo/geoclue \
  x11/dbus
 
+# avoid using wrong $VERSION
+RUN_DEPENDS-examples =
+
 # no leveldb dependency, requires -lmemenv; QtWebKit uses internal version
 LIB_DEPENDS = databases/sqlite3 \
  graphics/libwebp \
@@ -97,6 +100,8 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX="${WRKINST}${TRUEPREFIX}" \
  -DKDE_INSTALL_LIBDIR=${WRKINST}${MODQT_LIBDIR} \
  -DKDE_INSTALL_QMLDIR=${WRKINST}${MODQT_LIBDIR}/qml
 
+CONFIGURE_ARGS += -DPYTHON_EXECUTABLE=${MODPY_BIN}
+
 .include <bsd.port.arch.mk>
 
 # sync with Source/JavaScriptCore/assembler/MacroAssembler.h
diff --git x11/qt5/qtwebkit/distinfo x11/qt5/qtwebkit/distinfo
index 28c86f25aa3..3a40e645f77 100644
--- x11/qt5/qtwebkit/distinfo
+++ x11/qt5/qtwebkit/distinfo
@@ -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
diff --git x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
index b56405cb210..142ad53b843 100644
--- x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
+++ x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_JavaScriptCore_CMakeLists_txt,v 1.1 2020/02/19 16:08:53 r
 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)
diff --git x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
deleted file mode 100644
index 0815dc900b9..00000000000
--- x11/qt5/qtwebkit/patches/patch-Source_WebCore_dom_Document_cpp
+++ /dev/null
@@ -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;
diff --git x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
index 2436eb7e306..f31b5712f8a 100644
--- x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
+++ x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v 1.1 2020/
 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();
diff --git x11/qt5/qtwebkit/pkg/PLIST x11/qt5/qtwebkit/pkg/PLIST
index ec588fd5335..009cfb19463 100644
--- x11/qt5/qtwebkit/pkg/PLIST
+++ x11/qt5/qtwebkit/pkg/PLIST
@@ -2,36 +2,36 @@
 @conflict qt5-<5.6
 @pkgpath x11/qt5/qtwebkit,-main
 include/X11/qt5/QtWebKit/
-include/X11/qt5/QtWebKit/${VERSION}/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qhttpheader_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkreply_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquicknetworkrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickurlschemedelegate_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebpage_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qquickwebview_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qtwebsecurityorigin_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebchannelwebkittransport_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdatabase_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebdownloaditem_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebelement_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebhistory_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebiconimageprovider_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebkittest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebloadrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationhistory_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebnavigationrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpermissionrequest_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebplugindatabase_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebpreferences_p_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebscriptworld_p.h
-include/X11/qt5/QtWebKit/${VERSION}/QtWebKit/private/qwebsecurityorigin_p.h
+include/X11/qt5/QtWebKit/5.212.0/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
+include/X11/qt5/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
 include/X11/qt5/QtWebKit/QWebDatabase
 include/X11/qt5/QtWebKit/QWebElement
 include/X11/qt5/QtWebKit/QWebElementCollection
@@ -66,13 +66,13 @@ include/X11/qt5/QtWebKit/qwebpluginfactory.h
 include/X11/qt5/QtWebKit/qwebsecurityorigin.h
 include/X11/qt5/QtWebKit/qwebsettings.h
 include/X11/qt5/QtWebKitWidgets/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebframe_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebinspector_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebpage_p.h
-include/X11/qt5/QtWebKitWidgets/${VERSION}/QtWebKitWidgets/private/qwebviewaccessible_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebframe_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebinspector_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebpage_p.h
+include/X11/qt5/QtWebKitWidgets/5.212.0/QtWebKitWidgets/private/qwebviewaccessible_p.h
 include/X11/qt5/QtWebKitWidgets/QGraphicsWebView
 include/X11/qt5/QtWebKitWidgets/QWebFrame
 include/X11/qt5/QtWebKitWidgets/QWebHitTestResult