Re: fcitx: add usage with kitty & fix typo
Yifei Zhan wrote:
> This is a README update:
>
> - kitty needs an extra variable to work with fcitx
> - fix my typo, fcitx-config-qt should be fcitx-configtool-qt
>
> diff --git a/inputmethods/fcitx/Makefile b/inputmethods/fcitx/Makefile
> index c2d002c859e..cfc44dfaa45 100644
> --- a/inputmethods/fcitx/Makefile
> +++ b/inputmethods/fcitx/Makefile
> @@ -2,7 +2,7 @@ COMMENT = flexible input method framework
>
> DISTNAME = fcitx5-5.0.15
> PKGNAME =${DISTNAME:S/fcitx5/fcitx/}
> -REVISION = 1
> +REVISION = 2
>
> SHARED_LIBS += Fcitx5Config 0.0 # 0.0
> SHARED_LIBS += Fcitx5Core 0.0 # 0.0
> diff --git a/inputmethods/fcitx/pkg/README b/inputmethods/fcitx/pkg/README
> index 6100b132c7c..07e2c4cd896 100644
> --- a/inputmethods/fcitx/pkg/README
> +++ b/inputmethods/fcitx/pkg/README
> @@ -8,7 +8,7 @@ chosen languages and graphical environments (e.g. Qt, GTK+).
>
> A basic installation of fcitx would be:
>
> - # pkg_add fcitx fcitx-config-qt fcitx-gtk fcitx-qt
> + # pkg_add fcitx fcitx-configtool-qt fcitx-gtk fcitx-qt
> # pkg_add $YOUR_PREFERRED_INPUT_METHOD
>
> then configure fcitx to start with your DE/WM and setup your IM
> @@ -54,6 +54,9 @@ export GTK_IM_MODULE=fcitx
> export QT_IM_MODULE=fcitx
> ${TRUEPREFIX}/bin/fcitx5 &
>
> +To use fcitx with kitty terminal, also add the following line:
> +
> +export GLFW_IM_MODULE=ibus
I guess this is not needed only for kitty, but also for other
applications using GLFW?
if so I'd add it in the previous block along with the XMODIFIERS,
GTK_IM_MODULE and qt module.
> Setting up input engines
>
check-lib-depends output for multipackages
Hello,
looking at the diff to update the modules in www/nginx I noted that the
output doesn't fully take into account the current subpackage:
% make port-lib-depends-check
nginx-njs-1.22.0p0(www/nginx,-njs):
Missing: m.10 (/var/www/modules/ngx_stream_js_module.so) (system lib)
WANTLIB += m
it shows nginx-njs which is correct, but it suggests to add `m' to
WANTLIB. What about showing the "correct" variable (i.e. WANTLIB-njs)?
% make port-lib-depends-check
nginx-njs-1.22.0p0(www/nginx,-njs):
Missing: m.10 (/var/www/modules/ngx_stream_js_module.so) (system lib)
WANTLIB-njs += m
I don't think that we can correctly tell in which WANTLIB variable the
missing library should end up (think for example if all the WANTLIBs are
missing the same library) but I think that in general it's slightly more
helpful to show the per-subpackage variable to change.
diff below shows the intended behaviour. Due to my ignorance in perl
and in the package infrastructure it's very likely an obscenity, but i
didn't manage to come up with something better in limited time.
Index: check-lib-depends
===
RCS file: /home/cvs/ports/infrastructure/bin/check-lib-depends,v
retrieving revision 1.46
diff -u -p -r1.46 check-lib-depends
--- check-lib-depends 21 Jun 2021 15:16:52 - 1.46
+++ check-lib-depends 8 Jun 2022 07:48:34 -
@@ -595,7 +595,14 @@ sub analyze
unless ($state->{quiet} && keys %{$r->{wantlib}} == 0) {
$self->print_list($state, "Extra: ", $extra);
}
- $self->print_list($state, "WANTLIB +=", $r->{wantlib});
+
+ my $subpkg = '';
+ my @multi = keys(%{$plist->fullpkgpath2->{'mandatory'}});
+ if (@multi) {
+ $subpkg = $multi[0];
+ }
+
+ $self->print_list($state, "WANTLIB$subpkg +=", $r->{wantlib});
if ($state->{full}) {
$needed_libs->dump(\*STDOUT);
}
[PATCH] infrastructure/templates/rc.template - replace rcexec variable with rc_exec function + add daemon_execdir
Hello,
Given the recent changes[0][1], the template should probably be updated.
[0] https://marc.info/?l=openbsd-cvs&m=165313015803498&w=2
[1] https://marc.info/?l=openbsd-cvs&m=165356436530341&w=2
I'm not subscribed to this mailing list so please CC me if need be.
Regards,
Raf
Index: infrastructure/templates/rc.template
===
RCS file: /cvs/ports/infrastructure/templates/rc.template,v
retrieving revision 1.14
diff -u -p -r1.14 rc.template
--- infrastructure/templates/rc.template6 Mar 2022 20:10:00 -
1.14
+++ infrastructure/templates/rc.template8 Jun 2022 09:07:38 -
@@ -6,6 +6,7 @@ See rc.subr(8) for more information.
#!/bin/ksh
daemon="${TRUEPREFIX}/bin/foobar"
+#daemon_execdir=
#daemon_flags=
#daemon_logger=
#daemon_rtable=0
@@ -23,7 +24,7 @@ daemon="${TRUEPREFIX}/bin/foobar"
#}
#rc_start() {
-# ${rcexec} "${daemon_logger:+set -o pipefail; }${daemon}
${daemon_flags}${daemon_logger:+ 2>&1 |
+# rc_exec "${daemon_logger:+set -o pipefail; }${daemon}
${daemon_flags}${daemon_logger:+ 2>&1 |
# logger -ip ${daemon_logger} -t ${_name}}"
#}
Re: fcitx: add usage with kitty & fix typo
Yifei Zhan wrote: > On 22/06/08 09:56AM, Omar Polo wrote: > > Yifei Zhan wrote: > > > [...] > > > +To use fcitx with kitty terminal, also add the following line: > > > + > > > +export GLFW_IM_MODULE=ibus > > > > I guess this is not needed only for kitty, but also for other > > applications using GLFW? > > I'm not sure, I can't validate as I'm not aware of any other > application requiring this variable despite some grepping in the ports > tree/searching on the web. However, if that's the case, I'm not > against changing it :) despite the name, it seems that only kitty uses that environment variable. (verified also with debian codesearch) https://github.com/kovidgoyal/kitty/issues/3206#issuecomment-753740868 a bit sad that this is not even mentioned in the manpage. in theory the best place to document this would be the kitty port, but since we're already documenting the other toolkit-dependent env vars in the fcitx readme adding a note about kitty seems the easier and less intrusive option. (even thought patching kitty' manpage and upstreaming the diff is also an option.)
update devel/poedit to 3.1
simple update; we can drop the patch to artwork/Makefile.in since
upstream now updates the gtk icon cache only if ${DESTDIR} is not
defined.
while here also add "textproc" as category (which feels more
appropriate) and add myself as maintainer.
the changelog is:
* Added Go / Previously Edited menu command.
* Improved source code viewer performance.
* XLIFF: added support for resname/name attributes.
* Fixed ID column sizing on some platforms.
* Fixed issues with certain rare escape sequences.
(https://github.com/vslavik/poedit/releases/tag/v3.1-oss)
ok?
Index: Makefile
===
RCS file: /home/cvs/ports/devel/poedit/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile11 Mar 2022 18:52:30 - 1.39
+++ Makefile8 Jun 2022 09:16:24 -
@@ -1,10 +1,12 @@
COMMENT= cross-platform gettext catalogs (PO-files) editor
-V= 3.0.1
+V= 3.1
DISTNAME= poedit-${V}
-CATEGORIES=devel
+CATEGORIES=devel textproc
HOMEPAGE= https://www.poedit.net/
+
+MAINTAINER=Omar Polo
MASTER_SITES= https://github.com/vslavik/poedit/releases/download/v${V}-oss/
Index: distinfo
===
RCS file: /home/cvs/ports/devel/poedit/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo22 Dec 2021 16:42:54 - 1.10
+++ distinfo8 Jun 2022 09:16:42 -
@@ -1,2 +1,2 @@
-SHA256 (poedit-3.0.1.tar.gz) = Yd4dmb5RaXoj3aC74EvZdaWgO4OQ8T2p27aBPCMu/Tk=
-SIZE (poedit-3.0.1.tar.gz) = 2962553
+SHA256 (poedit-3.1.tar.gz) = CjWlOqcGs/rvhyQhH5waUJd2jUInH34z471nVRmQuzk=
+SIZE (poedit-3.1.tar.gz) = 2984271
Index: patches/patch-artwork_Makefile_in
===
RCS file: patches/patch-artwork_Makefile_in
diff -N patches/patch-artwork_Makefile_in
--- patches/patch-artwork_Makefile_in 11 Mar 2022 18:52:30 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-don't update the gtk icon cache
-
-Index: artwork/Makefile.in
artwork/Makefile.in.orig
-+++ artwork/Makefile.in
-@@ -726,7 +726,7 @@ uninstall-am: uninstall-dist_appicons128DATA \
-
-
- update-icon-cache:
-- which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -f -t
$(DESTDIR)$(iconsdir) || true
-+ true
-
- install-data-hook: update-icon-cache
- uninstall-hook: update-icon-cache
Re: [PATCH] infrastructure/templates/rc.template - replace rcexec variable with rc_exec function + add daemon_execdir
On Wed, Jun 08, 2022 at 11:45:52AM BST, Aisha Tammy wrote:
>
>
> On 6/8/22 05:14, Raf Czlonka wrote:
> > Hello,
> >
> > Given the recent changes[0][1], the template should probably be updated.
> >
> > [0] https://marc.info/?l=openbsd-cvs&m=165313015803498&w=2
> > [1] https://marc.info/?l=openbsd-cvs&m=165356436530341&w=2
> >
> > I'm not subscribed to this mailing list so please CC me if need be.
> >
> > Regards,
> >
> > Raf
> >
> > Index: infrastructure/templates/rc.template
> > ===
> > RCS file: /cvs/ports/infrastructure/templates/rc.template,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 rc.template
> > --- infrastructure/templates/rc.template6 Mar 2022 20:10:00 -
> > 1.14
> > +++ infrastructure/templates/rc.template8 Jun 2022 09:07:38 -
> > @@ -6,6 +6,7 @@ See rc.subr(8) for more information.
> > #!/bin/ksh
> > daemon="${TRUEPREFIX}/bin/foobar"
> > +#daemon_execdir=
> > #daemon_flags=
> > #daemon_logger=
> > #daemon_rtable=0
> > @@ -23,7 +24,7 @@ daemon="${TRUEPREFIX}/bin/foobar"
> > #}
> > #rc_start() {
> > -# ${rcexec} "${daemon_logger:+set -o pipefail; }${daemon}
> > ${daemon_flags}${daemon_logger:+ 2>&1 |
> > +# rc_exec "${daemon_logger:+set -o pipefail; }${daemon}
> > ${daemon_flags}${daemon_logger:+ 2>&1 |
> > # logger -ip ${daemon_logger} -t ${_name}}"
> > #}
> Don't need daemon_logger part in rc_start now, should be only
Hi Aisha,
Oh sure, I'm sure there are other changes needed there - the above
is simply a minimal diff which incorporates only the recent changes.
BTW, the below is obviously not a diff but care should be taken if
copy-pasted as it includes three UTF-8-encoded NBSP characters.
> rc_start() {
> rc_exec "${daemon} ${daemon_flags}"
> }
Regards,
Raf
new devel/p5-X-Tiny
Hi ports@, ok to import p5-X-Tiny 0.21 ? bluhm Comment: super-lightweight exception framework Description: This stripped-down exception framework provides a baseline of functionality for distributions that want to expose exception hierarchies with minimal fuss. p5-X-Tiny.tgz Description: application/tar-gz
new devel/p5-Test-Class-Tiny
Hi ports@, ok to import p5-Test-Class-Tiny 0.03 ? bluhm Comment: xUnit in Perl, simplified Description: Test::Class has served Perl's xUnit needs for a long time but is incompatible with the Test2 framework. This module allows for a similar workflow but in a way that works with both Test2 and the older, Test::Builder-based modules. p5-Test-Class-Tiny.tgz Description: application/tar-gz
Re: [PATCH] infrastructure/templates/rc.template - replace rcexec variable with rc_exec function + add daemon_execdir
On Wed, Jun 08, 2022 at 12:07:18PM +0100, Raf Czlonka wrote:
> On Wed, Jun 08, 2022 at 11:45:52AM BST, Aisha Tammy wrote:
> >
> >
> > On 6/8/22 05:14, Raf Czlonka wrote:
> > > Hello,
> > >
> > > Given the recent changes[0][1], the template should probably be updated.
> > >
> > > [0] https://marc.info/?l=openbsd-cvs&m=165313015803498&w=2
> > > [1] https://marc.info/?l=openbsd-cvs&m=165356436530341&w=2
> > >
> > > I'm not subscribed to this mailing list so please CC me if need be.
> > >
> > > Regards,
> > >
> > > Raf
> > >
> > > Index: infrastructure/templates/rc.template
> > > ===
> > > RCS file: /cvs/ports/infrastructure/templates/rc.template,v
> > > retrieving revision 1.14
> > > diff -u -p -r1.14 rc.template
> > > --- infrastructure/templates/rc.template 6 Mar 2022 20:10:00 -
> > > 1.14
> > > +++ infrastructure/templates/rc.template 8 Jun 2022 09:07:38 -
> > > @@ -6,6 +6,7 @@ See rc.subr(8) for more information.
> > > #!/bin/ksh
> > > daemon="${TRUEPREFIX}/bin/foobar"
> > > +#daemon_execdir=
> > > #daemon_flags=
> > > #daemon_logger=
> > > #daemon_rtable=0
> > > @@ -23,7 +24,7 @@ daemon="${TRUEPREFIX}/bin/foobar"
> > > #}
> > > #rc_start() {
> > > -#${rcexec} "${daemon_logger:+set -o pipefail; }${daemon}
> > > ${daemon_flags}${daemon_logger:+ 2>&1 |
> > > +#rc_exec "${daemon_logger:+set -o pipefail; }${daemon}
> > > ${daemon_flags}${daemon_logger:+ 2>&1 |
> > > # logger -ip ${daemon_logger} -t ${_name}}"
> > > #}
> > Don't need daemon_logger part in rc_start now, should be only
>
> Hi Aisha,
>
> Oh sure, I'm sure there are other changes needed there - the above
> is simply a minimal diff which incorporates only the recent changes.
>
> BTW, the below is obviously not a diff but care should be taken if
> copy-pasted as it includes three UTF-8-encoded NBSP characters.
>
> > rc_start() {
> > rc_exec "${daemon} ${daemon_flags}"
> > }
Thanks, I will take care of updating the template.
--
Antoine
Re: Python Tkinter 8.6
-- Original Message --
From: s...@spacehopper.org
To: 3...@bell.net
Cc: ports@openbsd.org; k...@openbsd.org
Sent: Tuesday, June 7, 2022 10:50 AM
Subject: Re: Python Tkinter 8.6
Thanks for taking a look, I have a new patch!
On 2022/06/07 09:05, Stuart Cassoff wrote:
> Does it make sense to put all the TkInter bits inside .if
> ${BUILD_PACKAGES:M-tkinter} ?
do you mean LIB_DEPENDS-tkinter, WANTLIB-tkinter, etc? if so, no,
these
should be set unconditionally
I simplified this bit, no worries. Nicer, even.
> Are the changes to CHANGES.OpenBSD ok/necessary?
changes patching the build files should be added, if it's just
CONFIGURE_ARGS
etc then I think not. I don't see a patch to match what you added to
this?
I wasn't sure and erred on the side of caution.
> I also noticed that Python 3.10 doesn't uninstall cleanly.
any more info on that?
# pkg_add python-3.10.4.p1 ; pkg_delete python-3.10.4.p1
...
Error deleting directory /usr/local/lib/python3.10: Directory not empty
> @so lib/python2.7/lib-dynload/datetime.so
> @so lib/python2.7/lib-dynload/dbm.so
> +@so lib/python2.7/lib-dynload/dl.so
> @so lib/python2.7/lib-dynload/fcntl.so
> @so lib/python2.7/lib-dynload/future_builtins.so
> @so lib/python2.7/lib-dynload/grp.so
> +@so lib/python2.7/lib-dynload/imageop.so
> @so lib/python2.7/lib-dynload/itertools.so
> @so lib/python2.7/lib-dynload/math.so
> @so lib/python2.7/lib-dynload/mmap.so
you added those to PLIST-main, shouldn't they be in PLIST-tkinter?
Not me, the port did - I swear!
$ cd /usr/ports/lang/python/2.7; make fake; make update-plist
Should yield the same result for porters who are not me.
Those .so's aren't part of TkInter.
Stu
(patch also attached)
diff -u -rNp /usr/ports/lang/python/2.7/Makefile ./2.7/Makefile
--- /usr/ports/lang/python/2.7/Makefile Mon Mar 28 11:48:24 2022
+++ ./2.7/Makefile Sat Jun 4 16:21:38 2022
@@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
PORTROACH =limit:^2\.7
-REVISION-main =7
+REVISION-main =8
REVISION-idle =1
REVISION-tests = 1
REVISION-bsddb = 0
REVISION-gdbm =0
-REVISION-tkinter = 0
+REVISION-tkinter = 1
REVISION-tools = 0
CONFIGURE_ARGS += --with-ensurepip=no
diff -u -rNp /usr/ports/lang/python/2.7/patches/patch-setup_py
./2.7/patches/patch-setup_py
--- /usr/ports/lang/python/2.7/patches/patch-setup_py Fri Mar 11
14:29:11 2022
+++ ./2.7/patches/patch-setup_pySat Jun 4 13:54:33 2022
@@ -84,17 +84,7 @@ Index: setup.py
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support
64-bit
-@@ -1936,8 +1946,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions
without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
--for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3',
'83',
--'8.2', '82', '8.1', '81', '8.0', '80']:
-+for version in ['85']:
- tklib = self.compiler.find_library_file(lib_dirs,
- 'tk' +
version)
- tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1980,17 +1989,9 @@ class PyBuildExt(build_ext):
+@@ -1980,17 +1990,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
diff -u -rNp /usr/ports/lang/python/2.7/pkg/DESCR-tkinter
./2.7/pkg/DESCR-tkinter
--- /usr/ports/lang/python/2.7/pkg/DESCR-tkinter Sun Apr 24 05:31:46
2011
+++ ./2.7/pkg/DESCR-tkinter Wed Jun 8 09:22:52 2022
@@ -11,5 +11,5 @@ in C or C++. On most systems such modules may be dyna
Python is also adaptable as an extension language for existing
applications. See the internal documentation for hints.
-This package contains the Tkinter module, for using the tk toolkit
-in Python.
+This package contains the Tkinter module, a Python interface to the
+Tk graphical toolkit.
diff -u -rNp /usr/ports/lang/python/2.7/pkg/PLIST-main
./2.7/pkg/PLIST-main
--- /usr/ports/lang/python/2.7/pkg/PLIST-main Fri Mar 11 14:29:11 2022
+++ ./2.7/pkg/PLIST-mainSat Jun 4 14:05:24 2022
@@ -1593,9 +1593,11 @@
lib/python2.7/lib-dynload/Python-${FULL_VERSION}-py2.7
@so lib/python2.7/lib-dynload/crypt.so
@so lib/python2.7/lib-dynload/datetime.so
@so lib/python2.7/lib-dynload/dbm.so
+@so lib/python2.7/lib-dynload/dl.so
@so lib/python2.7/lib-dynload/fcntl.so
@so lib/python2.7/lib-dynload/future_builtins.so
@so lib/python2.7/lib-dynload/grp.so
+@so lib/python2.7/lib-dynload/imageop.so
@so lib/python2.7/lib-dynload/itertools.so
@so lib/python2.7/lib-dynload/math.so
@so lib/python2.7/lib-dynload
Re: Python Tkinter 8.6
> > ${BUILD_PACKAGES:M-tkinter} ?
>
> do you mean LIB_DEPENDS-tkinter, WANTLIB-tkinter, etc? if so, no, these
> should be set unconditionally
>
> I simplified this bit, no worries. Nicer, even.
oh, actually BUILD_PACKAGES:M-tkinter makes no sense here as there
is no no_tkinter PSEUDO_FLAVOR..
> any more info on that?
>
> # pkg_add python-3.10.4.p1 ; pkg_delete python-3.10.4.p1
> ...
> Error deleting directory /usr/local/lib/python3.10: Directory not empty
This is because there are files in PLIST-main in 3.10 with no parent
directory. However they are duplicate files as they are also in PLIST-tests
so should be removed from main. I'll fix that separately
> > @so lib/python2.7/lib-dynload/datetime.so
> > @so lib/python2.7/lib-dynload/dbm.so
> > +@so lib/python2.7/lib-dynload/dl.so
> > @so lib/python2.7/lib-dynload/fcntl.so
> > @so lib/python2.7/lib-dynload/future_builtins.so
> > @so lib/python2.7/lib-dynload/grp.so
> > +@so lib/python2.7/lib-dynload/imageop.so
> > @so lib/python2.7/lib-dynload/itertools.so
> > @so lib/python2.7/lib-dynload/math.so
> > @so lib/python2.7/lib-dynload/mmap.so
>
> you added those to PLIST-main, shouldn't they be in PLIST-tkinter?
>
> Not me, the port did - I swear!
> $ cd /usr/ports/lang/python/2.7; make fake; make update-plist
> Should yield the same result for porters who are not me.
> Those .so's aren't part of TkInter.
Yet the change to tkinter caused them to build. So if there _was_ a
no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the
CONFIGURE_ARGS was not used. But then the question is why they're
now built.
However imageop is meant to be disabled on 64-bit anyway!
# Disabled on 64-bit platforms
if sys.maxsize != 9223372036854775807L:
# Operations on images
exts.append( Extension('imageop', ['imageop.c']) )
else:
missing.extend(['imageop'])
And dl is meant to be disabled unless sizeof(int) == sizeof(long) ==
sizeof(char*)
So the change for tkinter is causing something deeply strange with
platform detection, we really need to figure out what's going on with
that
Re: Python Tkinter 8.6
On 2022/06/08 10:55, Stuart Cassoff wrote: > > > > Not me, the port did - I swear! > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Should yield the same result for porters who are not me. > > Those .so's aren't part of TkInter. > > Yet the change to tkinter caused them to build. So if there _was_ a > no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the > CONFIGURE_ARGS was not used. But then the question is why they're > now built. > > So the change for tkinter is causing something deeply strange with > platform detection, we really need to figure out what's going on with > that > > > That is the result obtained with -current Python 2.7 without my changes. > > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Not > > $ cd /usr/ports/mystuff/lang/python/2.7; make fake; make update-plist > > > Stu Oh! Are you not on a 64-bit arch then?
Re: fcitx: add usage with kitty & fix typo
Yifei Zhan wrote: > On 22/06/08 12:28PM, Omar Polo wrote: > > Yifei Zhan wrote: > > > On 22/06/08 09:56AM, Omar Polo wrote: > > > > Yifei Zhan wrote: > > > > > [...] > > > > > +To use fcitx with kitty terminal, also add the following line: > > > > > + > > > > > +export GLFW_IM_MODULE=ibus > > > > > > > > I guess this is not needed only for kitty, but also for other > > > > applications using GLFW? > > > > > > I'm not sure, I can't validate as I'm not aware of any other > > > application requiring this variable despite some grepping in the ports > > > tree/searching on the web. However, if that's the case, I'm not > > > against changing it :) > > > > despite the name, it seems that only kitty uses that environment > > variable. (verified also with debian codesearch) > > > > https://github.com/kovidgoyal/kitty/issues/3206#issuecomment-753740868 > > > > a bit sad that this is not even mentioned in the manpage. > > > > in theory the best place to document this would be the kitty port, but > > since we're already documenting the other toolkit-dependent env vars in > > the fcitx readme adding a note about kitty seems the easier and less > > intrusive option. (even thought patching kitty' manpage and upstreaming > > the diff is also an option.) > > Thanks for checking! I prefer to just put it as a sidenote on fcitx's > README now, because I don't use kitty often enough to maintain a > patch/upstreaming it, also I'm trying to maintain a single source of > truth for IME config as having those details spread across different > ports can be hard for me to keep track of. fair enough :) i'll wait a bit to see if someone else chimes in, otherwise i'll commit it a few days (ping me if i forget) Thanks, Omar Polo
Re: Python Tkinter 8.6
> > Not me, the port did - I swear! > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > Should yield the same result for porters who are not me. > Those .so's aren't part of TkInter. Yet the change to tkinter caused them to build. So if there _was_ a no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the CONFIGURE_ARGS was not used. But then the question is why they're now built. So the change for tkinter is causing something deeply strange with platform detection, we really need to figure out what's going on with that That is the result obtained with -current Python 2.7 without my changes. $ cd /usr/ports/lang/python/2.7; make fake; make update-plist Not $ cd /usr/ports/mystuff/lang/python/2.7; make fake; make update-plist Stu
Re: fcitx: add usage with kitty & fix typo
On 2022/06/08 14:12, Yifei Zhan wrote: > On 22/06/08 12:28PM, Omar Polo wrote: > > Yifei Zhan wrote: > > > On 22/06/08 09:56AM, Omar Polo wrote: > > > > Yifei Zhan wrote: > > > > > [...] > > > > > +To use fcitx with kitty terminal, also add the following line: > > > > > + > > > > > +export GLFW_IM_MODULE=ibus > > > > > > > > I guess this is not needed only for kitty, but also for other > > > > applications using GLFW? > > > > > > I'm not sure, I can't validate as I'm not aware of any other > > > application requiring this variable despite some grepping in the ports > > > tree/searching on the web. However, if that's the case, I'm not > > > against changing it :) > > > > despite the name, it seems that only kitty uses that environment > > variable. (verified also with debian codesearch) > > > > https://github.com/kovidgoyal/kitty/issues/3206#issuecomment-753740868 > > > > a bit sad that this is not even mentioned in the manpage. > > > > in theory the best place to document this would be the kitty port, but > > since we're already documenting the other toolkit-dependent env vars in > > the fcitx readme adding a note about kitty seems the easier and less > > intrusive option. (even thought patching kitty' manpage and upstreaming > > the diff is also an option.) > > Thanks for checking! I prefer to just put it as a sidenote on fcitx's > README now, because I don't use kitty often enough to maintain a > patch/upstreaming it, also I'm trying to maintain a single source of > truth for IME config as having those details spread across different > ports can be hard for me to keep track of. > Makes sense, though I note this information is on upstream's wiki https://www.fcitx-im.org/wiki/Setup_Fcitx_5 which might be worth referring to?
Re: Python Tkinter 8.6
-- Original Message -- From: s...@spacehopper.org To: 3...@bell.net Cc: ports@openbsd.org; k...@openbsd.org Sent: Wednesday, June 8, 2022 11:05 AM Subject: Re: Python Tkinter 8.6 On 2022/06/08 10:55, Stuart Cassoff wrote: > > > > Not me, the port did - I swear! > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Should yield the same result for porters who are not me. > > Those .so's aren't part of TkInter. > > Yet the change to tkinter caused them to build. So if there _was_ a > no_tkinter PSEUDO_FLAVOR then packaging -main would fail if the > CONFIGURE_ARGS was not used. But then the question is why they're > now built. > > So the change for tkinter is causing something deeply strange with > platform detection, we really need to figure out what's going on with > that > > > That is the result obtained with -current Python 2.7 without my changes. > > > $ cd /usr/ports/lang/python/2.7; make fake; make update-plist > > Not > > $ cd /usr/ports/mystuff/lang/python/2.7; make fake; make update-plist > > > Stu Oh! Are you not on a 64-bit arch then? Just checked: ok on amd64, PLIST problem on i386. Stu
Re: UPDATE: net/neochat
On Mon, Jun 6, 2022, at 2:00 PM, Rafael Sadowski wrote:
> On Mon Jun 06, 2022 at 07:58:40PM +0200, Rafael Sadowski wrote:
>> Hi NeoChat users,
>>
>> please test the following diff please. You need devel/qcoro and
>> graphics/kquickimageeditor>=0.2.0 to build and run neochat. Checkout
>> ports@, please.
>>
>> Feedback welcome, Rafael
Tested and working. OK abieber@
>>
>
> New diff with fixed MASTER_SITES. Sorry for the noise.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/neochat/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 Makefile
> --- Makefile 25 Mar 2022 11:36:59 - 1.9
> +++ Makefile 6 Jun 2022 19:59:08 -
> @@ -1,20 +1,23 @@
> COMMENT =client for Matrix chat
> -VERSION =1.2.0
> +VERSION =22.04
> DISTNAME = neochat-${VERSION}
> -REVISION = 2
>
> CATEGORIES= net
>
> -MASTER_SITES = ${MASTER_SITE_KDE:=stable/neochat/${VERSION}/}
> +MASTER_SITES = ${MASTER_SITE_KDE:=stable/plasma-mobile/${VERSION}/}
>
> # GPLv3+
> PERMIT_PACKAGE= Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} KF5ConfigCore KF5ConfigGui KF5CoreAddons
> -WANTLIB += KF5DBusAddons KF5I18n KF5Kirigami2 KF5Notifications
> -WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5Qml
> -WANTLIB += Qt5QmlModels Qt5Quick Qt5QuickControls2 Qt5Widgets
> -WANTLIB += Qt5Xml QtOlm Quotient c cmark m olm qt5keychain
> +WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
> +WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
> +WANTLIB += KF5DBusAddons KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui
> +WANTLIB += KF5KIOWidgets KF5Kirigami2 KF5Notifications KF5Service
> +WANTLIB += KF5Solid KF5SonnetCore KF5WidgetsAddons KF5WindowSystem
> +WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
> +WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
> +WANTLIB += Qt5Widgets Qt5Xml QtOlm Quotient X11 c cmark m olm
> +WANTLIB += qt5keychain
>
> MODULES =devel/kf5
>
> @@ -22,19 +25,24 @@ RUN_DEPENDS = devel/desktop-file-utils \
> devel/kf5/kitemmodels \
> devel/kf5/qqc2-desktop-style \
> devel/kf5/sonnet \
> - graphics/kquickimageeditor \
> + graphics/kquickimageeditor>=0.2.0 \
> x11/gtk+3,-guic
>
> -
> BUILD_DEPENDS = devel/gettext,-tools \
> devel/kf5/kitemmodels \
> devel/kf5/qqc2-desktop-style \
> - graphics/kquickimageeditor \
> + graphics/kquickimageeditor>=0.2.0 \
> + devel/qcoro \
> math/ecm
>
> LIB_DEPENDS =devel/kf5/kconfig \
> devel/kf5/kdbusaddons \
> devel/kf5/ki18n \
> + devel/kf5/kio \
> + devel/kf5/kcompletion \
> + devel/kf5/kservice \
> + devel/kf5/solid \
> + devel/kf5/kjobwidgets \
> devel/kf5/kirigami2 \
> devel/kf5/knotifications \
> security/qtkeychain \
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/neochat/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo 8 Dec 2021 02:52:42 - 1.2
> +++ distinfo 6 Jun 2022 19:59:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (neochat-1.2.0.tar.xz) = juS19h231DyQIRXgvgHytYcQAYOzgllkc5IumkJ0neY=
> -SIZE (neochat-1.2.0.tar.xz) = 244064
> +SHA256 (neochat-22.04.tar.xz) = qDaZXsBDB4ZKgCPg3APWN/8tuJ51lI64UlImLoqdIRI=
> +SIZE (neochat-22.04.tar.xz) = 36
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/neochat/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 11 Mar 2022 12:05:30 - 1.3
> +++ pkg/PLIST 6 Jun 2022 19:59:08 -
> @@ -1,17 +1,14 @@
> @pkgpath x11/kde4/okteta
> @bin bin/neochat
> share/applications/org.kde.neochat.desktop
> -share/icons/hicolor/16x16/apps/org.kde.neochat.svg
> -share/icons/hicolor/16x16@2/
> -share/icons/hicolor/16x16@2/apps/
> -share/icons/hicolor/16x16@2/apps/org.kde.neochat.svg
> -share/icons/hicolor/16x16@3/
> -share/icons/hicolor/16x16@3/apps/
> -share/icons/hicolor/16x16@3/apps/org.kde.neochat.svg
> share/icons/hicolor/scalable/apps/org.kde.neochat.svg
> -share/icons/hicolor/symbolic/apps/org.kde.neochat-symbolic.svg
> +share/icons/hicolor/scalable/apps/org.kde.neochat.tray.svg
> share/knotifications5/
> share/knotifications5/neochat.notifyrc
> +share/krunner/
> +share/krunner/dbusplugins/
> +share/krunner/dbusplugins/plasma-runner-neochat.desktop
> +share/locale/ar/LC_MESSAGES/neochat.mo
> share/locale/az/LC_MESSAGES/neochat.mo
> share/locale/ca/LC_MESSAGES/neochat.mo
> share/locale/ca@valencia/LC_MESSAGES/neochat.mo
> @@ -25,7 +22,9 @@ share/locale/fi/LC_MESSAGES/neochat.mo
> share/locale/fr/LC_MESSAGES/neochat.mo
> share/locale/hu/LC_M
Re: Python Tkinter 8.6
On 2022/06/08 11:36, Stuart Cassoff wrote:
> Just checked: ok on amd64, PLIST problem on i386.
ah ok, so in that case nothing changed with respect to those.
phew, I didn't fancy debugging that. I propose to either just
ignore that, or maybe add an rm -f, i386 coped without them
so far and it doesn't make much sense to poke too much at a
dead python version.
i've regen'd the diff against -current after I fixed the 3.10
tests problem, i tweaked to remove the BUILD_PKGPATH bit, and
just bumped the relevant subpackages rather than everything.
this one is ok sthen@
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/python/Makefile.inc,v
retrieving revision 1.147
diff -u -p -r1.147 Makefile.inc
--- Makefile.inc26 May 2022 15:13:55 - 1.147
+++ Makefile.inc8 Jun 2022 15:52:24 -
@@ -8,7 +8,7 @@ COMMENT-bsddb = Berkeley db module for P
COMMENT-gdbm = GNU dbm module for Python
COMMENT-idle = IDE for Python
COMMENT-tests =Python test suite
-COMMENT-tkinter = tk GUI module for Python
+COMMENT-tkinter = Python interface to the Tk graphical toolkit
COMMENT-tools =extra tools for Python
VERSION = ${FULL_VERSION:R}
@@ -95,11 +95,16 @@ RUN_DEPENDS-idle = lang/python/${VERSION
WANTLIB-idle =
MODULES += x11/tk
-# Tcl/Tk version needs to be in sync with patch-setup_py's one
+
+.if ${VERSION} == "2.7"
MODTK_VERSION =8.5
+.else
+MODTK_VERSION =8.6
+.endif
+
LIB_DEPENDS-tkinter = lang/python/${VERSION},-main \
${MODTK_LIB_DEPENDS}
-WANTLIB-tkinter = X11 pthread python${VERSION} \
+WANTLIB-tkinter = pthread python${VERSION} \
${MODTK_WANTLIB}
AUTOCONF_VERSION = 2.69
@@ -110,7 +115,10 @@ CONFIGURE_ARGS += --with-fpectl \
--with-threads \
--enable-ipv6 \
--with-system-expat \
- --with-system-ffi
+ --with-system-ffi \
+ --with-tcltk-includes='-I${MODTCL_INCDIR}
-I${MODTK_INCDIR} -I${X11BASE}/include' \
+ --with-tcltk-libs='-L${X11BASE}/lib -l${MODTCL_LIB}
-l${MODTK_LIB}'
+
.if ${VERSION} != "2.7"
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
. if ${PROPERTIES:Mlld}
Index: 2.7/Makefile
===
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.76
diff -u -p -r1.76 Makefile
--- 2.7/Makefile28 Mar 2022 15:48:24 - 1.76
+++ 2.7/Makefile8 Jun 2022 15:52:24 -
@@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
PORTROACH =limit:^2\.7
-REVISION-main =7
+REVISION-main =8
REVISION-idle =1
REVISION-tests = 1
REVISION-bsddb = 0
REVISION-gdbm =0
-REVISION-tkinter = 0
+REVISION-tkinter = 1
REVISION-tools = 0
CONFIGURE_ARGS += --with-ensurepip=no
Index: 2.7/patches/patch-setup_py
===
RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
retrieving revision 1.16
diff -u -p -r1.16 patch-setup_py
--- 2.7/patches/patch-setup_py 11 Mar 2022 19:29:11 - 1.16
+++ 2.7/patches/patch-setup_py 8 Jun 2022 15:52:24 -
@@ -84,17 +84,7 @@ Index: setup.py
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1936,8 +1946,7 @@ class PyBuildExt(build_ext):
- # The versions with dots are used on Unix, and the versions without
- # dots on Windows, for detection by cygwin.
- tcllib = tklib = tcl_includes = tk_includes = None
--for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
--'8.2', '82', '8.1', '81', '8.0', '80']:
-+for version in ['85']:
- tklib = self.compiler.find_library_file(lib_dirs,
- 'tk' + version)
- tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1980,17 +1989,9 @@ class PyBuildExt(build_ext):
+@@ -1980,17 +1990,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
Index: 2.7/pkg/DESCR-tkinter
===
RCS file: /cvs/ports/lang/python/2.7/pkg/DESCR-tkinter,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR-tkinter
--- 2.7/pkg/DESCR-tkinter 24 Apr 2011 09:31:46 - 1.1.1.1
+++ 2.7/pkg/DESCR-tkinter 8 Jun 2022 15:52:24 -
@@ -11,5 +11,5 @@ in C or C++. On most systems such modul
Python is also adaptable as an extension language
Re: [PATCH] www/nginx: update third-party modules
On 2022/06/07 21:11, Omar Polo wrote: > > nginx-lua-1.22.0p0(www/nginx,-lua): > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 > (/var/www/modules/ngx_http_lua_module.so) > WANTLIB += luajit-5.1 it wouldn't be ideal to restrict building nginx to only archs which have luajit
Re: [PATCH] www/nginx: update third-party modules
Stuart Henderson wrote: > On 2022/06/07 21:11, Omar Polo wrote: > > > > nginx-lua-1.22.0p0(www/nginx,-lua): > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 > > (/var/www/modules/ngx_http_lua_module.so) > > WANTLIB += luajit-5.1 > > it wouldn't be ideal to restrict building nginx to only archs which have > luajit openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward, see for e.g.: https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac
new devel/p5-Text-Control
Hi ports@ ok to import p5-Text-Control 0.5 ? bluhm Comment: transforms of control characters Description: These are transforms of control characters useful for debugging. This module considers byte numbers 32 - 126 to be "printable"; i.e., they represent actual ASCII characters. Anything outside this range is thus "nonprintable". p5-Text-Control.tgz Description: application/tar-gz
Re: UPDATE x11/libquotient
On Wed Jun 08, 2022 at 05:55:45AM +, Klemens Nanni wrote:
> On 08/06/2022 05:59, Rafael Sadowski wrote:
> > Any idea how to make this visible for neochact users? current.html?
> > MESSAGE?
>
> Definitely MESSAGE, imho.
>
Feedback, ok?
Index: Makefile
===
RCS file: /cvs/ports/net/neochat/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile25 Mar 2022 11:36:59 - 1.9
+++ Makefile8 Jun 2022 17:07:44 -
@@ -1,20 +1,23 @@
COMMENT = client for Matrix chat
-VERSION = 1.2.0
+VERSION = 22.04
DISTNAME = neochat-${VERSION}
-REVISION = 2
CATEGORIES=net
-MASTER_SITES = ${MASTER_SITE_KDE:=stable/neochat/${VERSION}/}
+MASTER_SITES = ${MASTER_SITE_KDE:=stable/plasma-mobile/${VERSION}/}
# GPLv3+
PERMIT_PACKAGE=Yes
-WANTLIB += ${COMPILER_LIBCXX} KF5ConfigCore KF5ConfigGui KF5CoreAddons
-WANTLIB += KF5DBusAddons KF5I18n KF5Kirigami2 KF5Notifications
-WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Multimedia Qt5Network Qt5Qml
-WANTLIB += Qt5QmlModels Qt5Quick Qt5QuickControls2 Qt5Widgets
-WANTLIB += Qt5Xml QtOlm Quotient c cmark m olm qt5keychain
+WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Codecs KF5Completion
+WANTLIB += KF5ConfigCore KF5ConfigGui KF5ConfigWidgets KF5CoreAddons
+WANTLIB += KF5DBusAddons KF5I18n KF5JobWidgets KF5KIOCore KF5KIOGui
+WANTLIB += KF5KIOWidgets KF5Kirigami2 KF5Notifications KF5Service
+WANTLIB += KF5Solid KF5SonnetCore KF5WidgetsAddons KF5WindowSystem
+WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Multimedia
+WANTLIB += Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5QuickControls2
+WANTLIB += Qt5Widgets Qt5Xml QtOlm Quotient X11 c cmark m olm
+WANTLIB += qt5keychain
MODULES = devel/kf5
@@ -22,19 +25,24 @@ RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kitemmodels \
devel/kf5/qqc2-desktop-style \
devel/kf5/sonnet \
- graphics/kquickimageeditor \
+ graphics/kquickimageeditor>=0.2.0 \
x11/gtk+3,-guic
-
BUILD_DEPENDS = devel/gettext,-tools \
devel/kf5/kitemmodels \
devel/kf5/qqc2-desktop-style \
- graphics/kquickimageeditor \
+ graphics/kquickimageeditor>=0.2.0 \
+ devel/qcoro \
math/ecm
LIB_DEPENDS = devel/kf5/kconfig \
devel/kf5/kdbusaddons \
devel/kf5/ki18n \
+ devel/kf5/kio \
+ devel/kf5/kcompletion \
+ devel/kf5/kservice \
+ devel/kf5/solid \
+ devel/kf5/kjobwidgets \
devel/kf5/kirigami2 \
devel/kf5/knotifications \
security/qtkeychain \
Index: distinfo
===
RCS file: /cvs/ports/net/neochat/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Dec 2021 02:52:42 - 1.2
+++ distinfo8 Jun 2022 17:07:44 -
@@ -1,2 +1,2 @@
-SHA256 (neochat-1.2.0.tar.xz) = juS19h231DyQIRXgvgHytYcQAYOzgllkc5IumkJ0neY=
-SIZE (neochat-1.2.0.tar.xz) = 244064
+SHA256 (neochat-22.04.tar.xz) = qDaZXsBDB4ZKgCPg3APWN/8tuJ51lI64UlImLoqdIRI=
+SIZE (neochat-22.04.tar.xz) = 36
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE 8 Jun 2022 17:07:44 -
@@ -0,0 +1,2 @@
+If you have an old configuration file in ~/.config/KDE/neochat.conf,
+you should delete it, otherwise you may run into start-up problems.
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/neochat/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 12:05:30 - 1.3
+++ pkg/PLIST 8 Jun 2022 17:07:44 -
@@ -1,17 +1,14 @@
@pkgpath x11/kde4/okteta
@bin bin/neochat
share/applications/org.kde.neochat.desktop
-share/icons/hicolor/16x16/apps/org.kde.neochat.svg
-share/icons/hicolor/16x16@2/
-share/icons/hicolor/16x16@2/apps/
-share/icons/hicolor/16x16@2/apps/org.kde.neochat.svg
-share/icons/hicolor/16x16@3/
-share/icons/hicolor/16x16@3/apps/
-share/icons/hicolor/16x16@3/apps/org.kde.neochat.svg
share/icons/hicolor/scalable/apps/org.kde.neochat.svg
-share/icons/hicolor/symbolic/apps/org.kde.neochat-symbolic.svg
+share/icons/hicolor/scalable/apps/org.kde.neochat.tray.svg
share/knotifications5/
share/knotifications5/neochat.notifyrc
+share/krunner/
+share/krunner/dbusplugins/
+share/krunner/dbusplugins/plasma-runner-neochat.desktop
+share/locale/ar/LC_MESSAGES/neochat.mo
share/locale/az/LC_MESSAGES/neochat.mo
share/locale/ca/LC_MESSAGES/neochat.mo
share/locale/ca@valencia/LC_MESSAGES/neochat.mo
@@ -25,7 +22,9 @@ share/locale/fi/LC_MESSAGES/neochat.mo
share/locale/fr/LC_MESSAGES/neochat.mo
share/lo
Re: [PATCH] www/nginx: update third-party modules
On 2022/06/08 18:57, Omar Polo wrote: > Stuart Henderson wrote: > > On 2022/06/07 21:11, Omar Polo wrote: > > > > > > nginx-lua-1.22.0p0(www/nginx,-lua): > > > Missing: luajit-5.1.1 from luajit-2.0.5pl20210608 > > > (/var/www/modules/ngx_http_lua_module.so) > > > WANTLIB += luajit-5.1 > > > > it wouldn't be ideal to restrict building nginx to only archs which have > > luajit > > openresty/lua-nginx-module upstream moved to luajit from 0.10.16 onward, > see for e.g.: > > https://github.com/openresty/lua-nginx-module/commit/d154e5a7c1cbb7810d0224862e577fc8a6b8e3ac > The luajit 2.0 branch in ports is only for 32-bit arm, amd64, i386, powerpc so it misses some important archs. The upstream 2.1 branch adds arm64 but still not sparc64 and some others. I think ngx_http_lua_module build will need to be arch-dependent then, we don't really want to block nginx build on arm64 and sparc64. (Looking at https://github.com/openresty/lua-nginx-module it is probably also best to fetch github.com/openresty/luajit2 as an additional distfile and build with that version instead though that's probably best looked at as an extra step later.)
Re: UPDATE x11/libquotient
Rafael Sadowski wrote: > On Wed Jun 08, 2022 at 05:55:45AM +, Klemens Nanni wrote: > > On 08/06/2022 05:59, Rafael Sadowski wrote: > > > Any idea how to make this visible for neochact users? current.html? > > > MESSAGE? > > > > Definitely MESSAGE, imho. > > > > Feedback, ok? it works for my limited testing, ok for me. one nit below > [...] > RCS file: pkg/MESSAGE > diff -N pkg/MESSAGE > --- /dev/null 1 Jan 1970 00:00:00 - > +++ pkg/MESSAGE 8 Jun 2022 17:07:44 - > @@ -0,0 +1,2 @@ > +If you have an old configuration file in ~/.config/KDE/neochat.conf, > +you should delete it, otherwise you may run into start-up problems. IIRC this will be showed every time neochat is installed/updated. Hopefully with next update we won't need to delete the configuration, so I think the message should be a little more precise wrt the version. What about something like: If updating from neochat 1.2.0 delete the configuration file in ~/.config/KDE/neochat.conf, otherwise it will crash at start-up.
new converters/p5-CBOR-Free
Hi ports@ ok to import p5-CBOR-Free 0.32 ? This is my final step that uses the 3 ports I have just imported. bluhm Comment: fast CBOR for everyone Description: This library implements CBOR via XS under a license that permits commercial usage with no "strings attached". p5-CBOR-Free.tgz Description: application/tar-gz
Re: [Maintainer Update] lang/node 16.15.1
I had committed this but now backed it out as it's breaking build of devel/electron [1132/32676] ACTION //electron:electron_version_args(//build/toolchain/openbsd:clang_x64) FAILED: gen/electron/electron_version.args python ../../electron/build/npm-run.py --silent generate-version-json -- /usr/obj/ports/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/electron_version.args NPM script 'generate-version-json' failed with code '243': [1133/32676] CXX obj/device/base/base/features.o [1134/32676] ACTION //electron:build_electron_definitions(//build/toolchain/openbsd:clang_x64) FAILED: gen/electron/tsc/typings/electron.d.ts python ../../electron/build/npm-run.py --silent gn-typescript-definitions -- /usr/obj/ports/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/tsc/typings/electron.d.ts NPM script 'gn-typescript-definitions' failed with code '243': It happens relatively early in the electron build so doesn't take hours to repeat but there's no output at all from the command (including without --silent) so hard to figure out what's going on To replicate after a failed build by running npm directly i.e. avoiding the Python wrapper, it's like this: cd /pobj/electron-8.2.0/chromium-80.0.3987.158/out/Release doas -u _pbuild npm run --prefix ../../electron gn-typescript-definitions -- /pobj/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/tsc/typings/electron.d.ts
[UPDATE] mail/s-postgray: v0.7.0
Hello ports@.
|After hearing some voices from postfix-users i was doing an
|iteration of this one. (No real _need_ to update from v0.6.0.)
|I could imagine this to be the last release, except for the
|build system, which is still intermediate.
...
| - An iteration that fixes some oddities, and clarifies documentation.
|(The example configuration is also better.)
|
| - Bug fixes:
|
|. -v and -p were not reset for reload, thus fixated once set.
|
|. -b and -B were not command-line-parsed by the server, only in
| --test-mode (driven by client); usage in resource-file ok, too.
|
| - --test-mode now outputs a normalized resource file.
|
| - New --focus-sender approach which i like better.
|
| [I personally now use --focus-sender mode with --count=1,
| --msg-allow=permit and --msg-defer='DEFER 4.2.0 blabla',
| and reject_unverified_sender thereafter. I could imagine
| s-postgray to become obsolete if verify(8) would do a once-
| then-wait-five-minutes graylisting itself.]
|
| - New --msg-{allow,block}, and --msg-defer for misnamed --defer-msg,
|which is kept for compatibility.
Index: Makefile
===
RCS file: /cvs/ports/mail/s-postgray/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -a -p -u -r1.1.1.1 Makefile
--- Makefile13 May 2022 17:30:07 - 1.1.1.1
+++ Makefile8 Jun 2022 18:23:56 -
@@ -1,11 +1,10 @@
COMMENT= fast and secure postfix graylisting policy server
-DISTNAME= s-postgray-0.6.0
+DISTNAME= s-postgray-0.7.0
CATEGORIES=mail
HOMEPAGE= https://www.sdaoden.eu/code.html\#s-postgray
MASTER_SITES= https://ftp.sdaoden.eu/
-FIX_EXTRACT_PERMISSIONS=Yes
MAINTAINER=Steffen Nurpmeso
Index: distinfo
===
RCS file: /cvs/ports/mail/s-postgray/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -a -p -u -r1.1.1.1 distinfo
--- distinfo13 May 2022 17:30:07 - 1.1.1.1
+++ distinfo8 Jun 2022 18:23:56 -
@@ -1,2 +1,2 @@
-SHA256 (s-postgray-0.6.0.tar.gz) = He6OqMiB1ctjcmFR9RQrX19MS/nHEz2l5xcKzooA0UY=
-SIZE (s-postgray-0.6.0.tar.gz) = 127563
+SHA256 (s-postgray-0.7.0.tar.gz) = 3K40FbXtAUyDtcUPtWBW0tHh/toB/rZ4/7Z3vX1uFs0=
+SIZE (s-postgray-0.7.0.tar.gz) = 140144
--steffen
|
|Der Kragenbaer,The moon bear,
|der holt sich munter he cheerfully and one by one
|einen nach dem anderen runter wa.ks himself off
|(By Robert Gernhardt)
Re: update: tor-browser: 11.0.13 -> 11.0.14
Hi,
On Wed, Jun 08, 2022 at 02:04:47PM +, Yifei Zhan wrote:
> here is a security update for Tor browser:
>
> - update to Tor browser 11.0.14
> - update to NoScript 11.4.6
> - update to Firefox ESR 91.10
> https://www.mozilla.org/en-US/security/advisories/mfsa2022-21/
>
> - tested .onion access/CJK fonts/JS blocking, no issue so far.
> - -stable patch will be sent tomorrow, my -stable test box is still
> building...
>
> changelog:
> https://blog.torproject.org/new-release-tor-browser-11014/
Thanks for your diff and your testing, I have the same diff but I also
synced the recent unveil changes that were recently applied to
www/firefox-esr.
Feedback or OKs?
Caspar
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- meta/tor-browser/Makefile 24 May 2022 14:21:20 - 1.56
+++ meta/tor-browser/Makefile 8 Jun 2022 18:40:48 -
@@ -2,11 +2,11 @@ COMMENT= Tor Browser meta package
MAINTAINER=Caspar Schutijser
-PKGNAME= tor-browser-11.0.13
+PKGNAME= tor-browser-11.0.14
ONLY_FOR_ARCHS = amd64
-RUN_DEPENDS= www/tor-browser/browser>=11.0.13 \
- www/tor-browser/noscript>=11.4.5 \
+RUN_DEPENDS= www/tor-browser/browser>=11.0.14 \
+ www/tor-browser/noscript>=11.4.6 \
net/tor>=0.4.7.7
.include
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile.inc
--- www/tor-browser/Makefile.inc24 May 2022 14:21:20 - 1.54
+++ www/tor-browser/Makefile.inc8 Jun 2022 18:40:48 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 11.0.13
+TB_VERSION = 11.0.14
TB_PREFIX =tb
SUBST_VARS += BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- www/tor-browser/browser/Makefile24 May 2022 14:21:20 - 1.82
+++ www/tor-browser/browser/Makefile8 Jun 2022 18:40:48 -
@@ -15,7 +15,7 @@ EXTRACT_SUFX =.tar.xz
PATCHORIG =.pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.9.0esr-11.0-1-build2
+DISTNAME = src-firefox-tor-browser-91.10.0esr-11.0-1-build1
FIX_EXTRACT_PERMISSIONS= Yes
EXTRACT_ONLY +=${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.52
diff -u -p -r1.52 distinfo
--- www/tor-browser/browser/distinfo24 May 2022 14:21:20 - 1.52
+++ www/tor-browser/browser/distinfo8 Jun 2022 18:40:48 -
@@ -1,8 +1,8 @@
SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) =
fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg=
-SHA256 (mozilla/src-firefox-tor-browser-91.9.0esr-11.0-1-build2.tar.xz) =
Oqn4Pg3bYanVRz4Iav2164Wue6MpWXIpwwLqp4SnWuc=
+SHA256 (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) =
04NnD5ZDiIpA/6MaDQ40df1Y/1Qf+oLe8+U4q6mXiKI=
SHA256 (mozilla/src-tor-launcher-0.2.33.tar.xz) =
ZG7lH5mBhkCRA26AEdCo52HP0iNlHKbRKl/BKyP0C9U=
-SHA256 (mozilla/tor-browser-linux64-11.0.13_en-US.tar.xz) =
32H9kLfBAzy7WFbz0Ha1yhnyfpPBqEdBvYOwGd/n/w4=
+SHA256 (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) =
tgaST9+CN+aXz5XCKRidpYdcGQh11yl2llXHtnrrmqY=
SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434
-SIZE (mozilla/src-firefox-tor-browser-91.9.0esr-11.0-1-build2.tar.xz) =
413001404
+SIZE (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) =
413196916
SIZE (mozilla/src-tor-launcher-0.2.33.tar.xz) = 229992
-SIZE (mozilla/tor-browser-linux64-11.0.13_en-US.tar.xz) = 86606348
+SIZE (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) = 87620816
Index: www/tor-browser/browser/files/unveil.content
===
RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.content,v
retrieving revision 1.5
diff -u -p -r1.5 unveil.content
--- www/tor-browser/browser/files/unveil.content9 Mar 2022 20:48:32
- 1.5
+++ www/tor-browser/browser/files/unveil.content8 Jun 2022 18:40:48
-
@@ -1,4 +1,4 @@
-/dev/dri/card0 rw
+/dev/dri rw
/etc/fonts r
/etc/machine-id r
@@ -33,6 +33,7 @@ $XDG_CONFIG_HOME/fontconfig r
$XDG_CONFIG_HOME/gtk-3.0 r
$XDG_CONFIG_HOME/mimeapps.list r
$XDG_CONFIG_HOME/user-dirs.dirs r
+$XDG_CACHE_HOME/fontconfig r
UPDATE: Tor Browser 11.0.14 for -stable
On Wed, Jun 08, 2022 at 08:46:21PM +0200, Caspar Schutijser wrote:
> Hi,
>
> On Wed, Jun 08, 2022 at 02:04:47PM +, Yifei Zhan wrote:
> > here is a security update for Tor browser:
> >
> > - update to Tor browser 11.0.14
> > - update to NoScript 11.4.6
> > - update to Firefox ESR 91.10
> > https://www.mozilla.org/en-US/security/advisories/mfsa2022-21/
> >
> > - tested .onion access/CJK fonts/JS blocking, no issue so far.
> > - -stable patch will be sent tomorrow, my -stable test box is still
> > building...
> >
> > changelog:
> > https://blog.torproject.org/new-release-tor-browser-11014/
>
> Thanks for your diff and your testing, I have the same diff but I also
> synced the recent unveil changes that were recently applied to
> www/firefox-esr.
>
> Feedback or OKs?
And here is a diff for -stable (still building here). OK provided that
it builds?
Caspar
Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.53.2.2
diff -u -p -r1.53.2.2 Makefile
--- meta/tor-browser/Makefile 24 May 2022 14:23:10 - 1.53.2.2
+++ meta/tor-browser/Makefile 8 Jun 2022 18:51:32 -
@@ -2,11 +2,11 @@ COMMENT= Tor Browser meta package
MAINTAINER=Caspar Schutijser
-PKGNAME= tor-browser-11.0.13
+PKGNAME= tor-browser-11.0.14
ONLY_FOR_ARCHS = amd64
-RUN_DEPENDS= www/tor-browser/browser>=11.0.13 \
- www/tor-browser/noscript>=11.4.5 \
+RUN_DEPENDS= www/tor-browser/browser>=11.0.14 \
+ www/tor-browser/noscript>=11.4.6 \
net/tor>=0.4.7.7
.include
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.51.2.2
diff -u -p -r1.51.2.2 Makefile.inc
--- www/tor-browser/Makefile.inc24 May 2022 14:23:10 - 1.51.2.2
+++ www/tor-browser/Makefile.inc8 Jun 2022 18:51:32 -
@@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
PERMIT_PACKAGE ?= Yes
CATEGORIES = www
BROWSER_NAME = tor-browser
-TB_VERSION = 11.0.13
+TB_VERSION = 11.0.14
TB_PREFIX =tb
SUBST_VARS += BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.78.2.2
diff -u -p -r1.78.2.2 Makefile
--- www/tor-browser/browser/Makefile24 May 2022 14:23:10 - 1.78.2.2
+++ www/tor-browser/browser/Makefile8 Jun 2022 18:51:32 -
@@ -15,7 +15,7 @@ EXTRACT_SUFX =.tar.xz
PATCHORIG =.pat.orig
PKGNAME = ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-91.9.0esr-11.0-1-build2
+DISTNAME = src-firefox-tor-browser-91.10.0esr-11.0-1-build1
FIX_EXTRACT_PERMISSIONS= Yes
EXTRACT_ONLY +=${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.49.2.2
diff -u -p -r1.49.2.2 distinfo
--- www/tor-browser/browser/distinfo24 May 2022 14:23:10 - 1.49.2.2
+++ www/tor-browser/browser/distinfo8 Jun 2022 18:51:32 -
@@ -1,8 +1,8 @@
SHA256 (mozilla/https-everywhere-2021.4.15-eff.xpi) =
fl9ygI6hSL7M1BbsvfM+oevEOkMuTnhbXl4TObeitwg=
-SHA256 (mozilla/src-firefox-tor-browser-91.9.0esr-11.0-1-build2.tar.xz) =
Oqn4Pg3bYanVRz4Iav2164Wue6MpWXIpwwLqp4SnWuc=
+SHA256 (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) =
04NnD5ZDiIpA/6MaDQ40df1Y/1Qf+oLe8+U4q6mXiKI=
SHA256 (mozilla/src-tor-launcher-0.2.33.tar.xz) =
ZG7lH5mBhkCRA26AEdCo52HP0iNlHKbRKl/BKyP0C9U=
-SHA256 (mozilla/tor-browser-linux64-11.0.13_en-US.tar.xz) =
32H9kLfBAzy7WFbz0Ha1yhnyfpPBqEdBvYOwGd/n/w4=
+SHA256 (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) =
tgaST9+CN+aXz5XCKRidpYdcGQh11yl2llXHtnrrmqY=
SIZE (mozilla/https-everywhere-2021.4.15-eff.xpi) = 1746434
-SIZE (mozilla/src-firefox-tor-browser-91.9.0esr-11.0-1-build2.tar.xz) =
413001404
+SIZE (mozilla/src-firefox-tor-browser-91.10.0esr-11.0-1-build1.tar.xz) =
413196916
SIZE (mozilla/src-tor-launcher-0.2.33.tar.xz) = 229992
-SIZE (mozilla/tor-browser-linux64-11.0.13_en-US.tar.xz) = 86606348
+SIZE (mozilla/tor-browser-linux64-11.0.14_en-US.tar.xz) = 87620816
Index: www/tor-browser/browser/files/unveil.content
===
RCS file: /cvs/ports/www/tor-browser/browser/files/unveil.content,v
retrieving revision 1.5
diff -u -p -r1.5 unveil.content
--- www/tor-browser/browser/files/unveil.content9 Mar 2022 20:48:32
- 1.5
+++ www/tor-browser/browser/files/unveil.content8 Jun 2022 18:51:32
-
@@ -1,4 +1,4 @@
-
update misc/open62541
Hi ports@
I would like to update misc/open62541 library. That is not easy
as it is not API compatible. The depending port misc/p5-OPCUA-Open62541
compiles, but fails in make test.
So I have to fix open62541 library bugs and add p5-OPCUA-Open62541
compatiblity layer. As the latter is my module and I doubt that
anyone else uses it, I think it is acceptable that tests fail.
Updating open62541 now would allow to work in tree.
I have removed all the patches in misc/open62541 that have been
commited upstream. New patches prevent fatal compiler warnings.
Upstream has moved include/aa_tree.h, include/ms_stdint.h,
include/ziptree.h outside of the include/open62541/ directory. This
pollutes the namespace. Fortunately two of them are only used
internally and are not needed in the package. I rmeoved them from
PLIST.
But include/aa_tree.h is included in include/open62541/ header
file. What should I do?
- ignore the namespace problem
- move include/aa_tree.h to include/open62541/aa_tree.h
- paste include/aa_tree.h content into the single header file
include/open62541/plugin/nodestore.h that needs it.
- something else
ok?
bluhm
Index: Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile11 Mar 2022 19:38:13 - 1.14
+++ Makefile8 Jun 2022 14:45:16 -
@@ -1,11 +1,10 @@
COMMENT = library implementation of OPC UA
-VERSION = 1.0.6
-REVISION = 0
+VERSION = 1.3.1
DISTNAME = open62541-${VERSION}
PKGNAME = open62541-${VERSION}
-SHARED_LIBS = open62541 1.0
+SHARED_LIBS = open62541 2.0
CATEGORIES = misc
@@ -21,7 +20,7 @@ WANTLIB = c m mbedcrypto mbedtls mbedx5
MASTER_SITES = https://github.com/open62541/open62541/
MASTER_SITES0 =
https://github.com/OPCFoundation/UA-Nodeset/archive/
DISTFILES =open62541-{archive/refs/tags/v}${VERSION}.tar.gz \
- UA-1.04.5-2020-03-06.tar.gz:0
+ UA-1.04.10-2021-09-15.tar.gz:0
MODULES = devel/cmake
@@ -53,8 +52,7 @@ FLAVORS = ns0_full
FLAVOR ?=
.if ${FLAVOR:Mns0_full}
-CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=FULL \
- -DUA_ENABLE_MICRO_EMB_DEV_PROFILE=ON
+CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=FULL
.else
CONFIGURE_ARGS += -DUA_NAMESPACE_ZERO=REDUCED
.endif
Index: distinfo
===
RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo9 Aug 2021 21:23:25 - 1.5
+++ distinfo8 Jun 2022 14:45:36 -
@@ -1,4 +1,4 @@
-SHA256 (UA-1.04.5-2020-03-06.tar.gz) =
KIty/GA+zomK1fXUBLBP7+EN5Puzx1apbXzINCtRgFM=
-SHA256 (open62541-1.0.6.tar.gz) = KZlAAlwUkpUzBkq+AETVgF6lDVKzLQWtm8DmmWVpwqY=
-SIZE (UA-1.04.5-2020-03-06.tar.gz) = 4053334
-SIZE (open62541-1.0.6.tar.gz) = 2691627
+SHA256 (UA-1.04.10-2021-09-15.tar.gz) =
TaoMRz1MU01hSqnlSqhrcb7CREZnO550yF5a3SYkw5M=
+SHA256 (open62541-1.3.1.tar.gz) = 9U0QMl/Qj8FQWuo32D2qCFkSomlSHm0Bi/xBp0S6V6o=
+SIZE (UA-1.04.10-2021-09-15.tar.gz) = 5720040
+SIZE (open62541-1.3.1.tar.gz) = 3886706
Index: patches/patch-CMakeLists_txt
===
RCS file:
/data/mirror/openbsd/cvs/ports/misc/open62541/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 19:38:13 - 1.4
+++ patches/patch-CMakeLists_txt8 Jun 2022 15:01:01 -
@@ -1,20 +1,9 @@
-GCC 4.2.1 doesn't understand "-Wpedantic".
-
Move examples to the right place.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -389,7 +389,7 @@ include(CompilerFlags)
- if(NOT UA_COMPILE_AS_CXX AND (CMAKE_COMPILER_IS_GNUCC OR
"x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
- # Compiler
- add_definitions(-std=c99 -pipe
---Wall -Wextra -Wpedantic
-+-Wall -Wextra
- -Wno-static-in-inline # clang doesn't like the use of
static inline methods inside static inline methods
- -Wno-overlength-strings # may happen in the nodeset
compiler when complex values are directly encoded
- -Wno-unused-parameter # some methods may require unused
arguments to cast to a method pointer
-@@ -1239,7 +1239,7 @@ if (UA_PACK_DEBIAN)
+@@ -1695,7 +1695,7 @@ if(UA_PACK_DEBIAN)
"examples/nodeset"
"examples/pubsub")
Index: patches/patch-arch_network_tcp_c
===
RCS file: patches/patch-arch_network_tcp_c
diff -N patches/patch-arch_network_tcp_c
--- patches/patch-arch_network_tcp_c11 Mar 2022 19:38:13 - 1.4
+++ /dev/null
Re: [Maintainer Update] lang/node 16.15.1
Ah thanks, that looks promising, I can probably fix it in the build then On 2022/06/08 22:31, Volker Schlecht wrote: > From a (very) quick glance, the issue might be related to this: > > https://github.com/npm/cli/issues/4996 > > I'll look into it, but due to time constraints might take a few days. > > Sorry for breaking the electron build ... > > On 6/8/22 20:12, Stuart Henderson wrote: > > I had committed this but now backed it out as it's breaking build of > > devel/electron > > > > [1132/32676] ACTION > > //electron:electron_version_args(//build/toolchain/openbsd:clang_x64) > > FAILED: gen/electron/electron_version.args > > python ../../electron/build/npm-run.py --silent generate-version-json -- > > /usr/obj/ports/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/electron_version.args > > NPM script 'generate-version-json' failed with code '243': > > > > [1133/32676] CXX obj/device/base/base/features.o > > [1134/32676] ACTION > > //electron:build_electron_definitions(//build/toolchain/openbsd:clang_x64) > > FAILED: gen/electron/tsc/typings/electron.d.ts > > python ../../electron/build/npm-run.py --silent gn-typescript-definitions > > -- > > /usr/obj/ports/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/tsc/typings/electron.d.ts > > NPM script 'gn-typescript-definitions' failed with code '243': > > > > It happens relatively early in the electron build so doesn't take hours to > > repeat but there's no output at all from the command (including without > > --silent) so hard to figure out what's going on > > > > To replicate after a failed build by running npm directly i.e. avoiding > > the Python wrapper, it's like this: > > > > cd /pobj/electron-8.2.0/chromium-80.0.3987.158/out/Release > > doas -u _pbuild npm run --prefix ../../electron gn-typescript-definitions > > -- > > /pobj/electron-8.2.0/chromium-80.0.3987.158/out/Release/gen/electron/tsc/typings/electron.d.ts > > >
Re: [UPDATE] mail/s-postgray: v0.7.0
Steffen Nurpmeso wrote:
> Hello ports@.
>
> |After hearing some voices from postfix-users i was doing an
> |iteration of this one. (No real _need_ to update from v0.6.0.)
> |I could imagine this to be the last release, except for the
> |build system, which is still intermediate.
> ...
> | - An iteration that fixes some oddities, and clarifies documentation.
> |(The example configuration is also better.)
> |
> | - Bug fixes:
> |
> |. -v and -p were not reset for reload, thus fixated once set.
> |
> |. -b and -B were not command-line-parsed by the server, only in
> | --test-mode (driven by client); usage in resource-file ok, too.
> |
> | - --test-mode now outputs a normalized resource file.
> |
> | - New --focus-sender approach which i like better.
> |
> | [I personally now use --focus-sender mode with --count=1,
> | --msg-allow=permit and --msg-defer='DEFER 4.2.0 blabla',
> | and reject_unverified_sender thereafter. I could imagine
> | s-postgray to become obsolete if verify(8) would do a once-
> | then-wait-five-minutes graylisting itself.]
> |
> | - New --msg-{allow,block}, and --msg-defer for misnamed --defer-msg,
> |which is kept for compatibility.
committed, thanks!
Re: update misc/open62541
On 2022/06/08 22:34, Alexander Bluhm wrote:
> Hi ports@
>
> I would like to update misc/open62541 library. That is not easy
> as it is not API compatible. The depending port misc/p5-OPCUA-Open62541
> compiles, but fails in make test.
>
> So I have to fix open62541 library bugs and add p5-OPCUA-Open62541
> compatiblity layer. As the latter is my module and I doubt that
> anyone else uses it, I think it is acceptable that tests fail.
> Updating open62541 now would allow to work in tree.
>
> I have removed all the patches in misc/open62541 that have been
> commited upstream. New patches prevent fatal compiler warnings.
>
> Upstream has moved include/aa_tree.h, include/ms_stdint.h,
> include/ziptree.h outside of the include/open62541/ directory. This
> pollutes the namespace. Fortunately two of them are only used
> internally and are not needed in the package. I rmeoved them from
> PLIST.
>
> But include/aa_tree.h is included in include/open62541/ header
> file. What should I do?
> - ignore the namespace problem
> - move include/aa_tree.h to include/open62541/aa_tree.h
> - paste include/aa_tree.h content into the single header file
> include/open62541/plugin/nodestore.h that needs it.
> - something else
I think ignore it. It's a third-party header which is presumably
why it has been moved, to distinguish it from open62541 itself.
If we run into a conflict with another port we can revisit later.
> ok?
yes
>
> bluhm
>
> Index: Makefile
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/Makefile,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 Makefile
> --- Makefile 11 Mar 2022 19:38:13 - 1.14
> +++ Makefile 8 Jun 2022 14:45:16 -
> @@ -1,11 +1,10 @@
> COMMENT =library implementation of OPC UA
>
> -VERSION =1.0.6
> -REVISION = 0
> +VERSION =1.3.1
> DISTNAME = open62541-${VERSION}
> PKGNAME =open62541-${VERSION}
>
> -SHARED_LIBS =open62541 1.0
> +SHARED_LIBS =open62541 2.0
>
> CATEGORIES = misc
>
> @@ -21,7 +20,7 @@ WANTLIB = c m mbedcrypto mbedtls mbedx5
> MASTER_SITES = https://github.com/open62541/open62541/
> MASTER_SITES0 =
> https://github.com/OPCFoundation/UA-Nodeset/archive/
> DISTFILES = open62541-{archive/refs/tags/v}${VERSION}.tar.gz \
> - UA-1.04.5-2020-03-06.tar.gz:0
> + UA-1.04.10-2021-09-15.tar.gz:0
>
> MODULES =devel/cmake
>
> @@ -53,8 +52,7 @@ FLAVORS = ns0_full
> FLAVOR ?=
>
> .if ${FLAVOR:Mns0_full}
> -CONFIGURE_ARGS +=-DUA_NAMESPACE_ZERO=FULL \
> - -DUA_ENABLE_MICRO_EMB_DEV_PROFILE=ON
> +CONFIGURE_ARGS +=-DUA_NAMESPACE_ZERO=FULL
> .else
> CONFIGURE_ARGS +=-DUA_NAMESPACE_ZERO=REDUCED
> .endif
> Index: distinfo
> ===
> RCS file: /data/mirror/openbsd/cvs/ports/misc/open62541/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- distinfo 9 Aug 2021 21:23:25 - 1.5
> +++ distinfo 8 Jun 2022 14:45:36 -
> @@ -1,4 +1,4 @@
> -SHA256 (UA-1.04.5-2020-03-06.tar.gz) =
> KIty/GA+zomK1fXUBLBP7+EN5Puzx1apbXzINCtRgFM=
> -SHA256 (open62541-1.0.6.tar.gz) =
> KZlAAlwUkpUzBkq+AETVgF6lDVKzLQWtm8DmmWVpwqY=
> -SIZE (UA-1.04.5-2020-03-06.tar.gz) = 4053334
> -SIZE (open62541-1.0.6.tar.gz) = 2691627
> +SHA256 (UA-1.04.10-2021-09-15.tar.gz) =
> TaoMRz1MU01hSqnlSqhrcb7CREZnO550yF5a3SYkw5M=
> +SHA256 (open62541-1.3.1.tar.gz) =
> 9U0QMl/Qj8FQWuo32D2qCFkSomlSHm0Bi/xBp0S6V6o=
> +SIZE (UA-1.04.10-2021-09-15.tar.gz) = 5720040
> +SIZE (open62541-1.3.1.tar.gz) = 3886706
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file:
> /data/mirror/openbsd/cvs/ports/misc/open62541/patches/patch-CMakeLists_txt,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 11 Mar 2022 19:38:13 - 1.4
> +++ patches/patch-CMakeLists_txt 8 Jun 2022 15:01:01 -
> @@ -1,20 +1,9 @@
> -GCC 4.2.1 doesn't understand "-Wpedantic".
> -
> Move examples to the right place.
>
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -389,7 +389,7 @@ include(CompilerFlags)
> - if(NOT UA_COMPILE_AS_CXX AND (CMAKE_COMPILER_IS_GNUCC OR
> "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang"))
> - # Compiler
> - add_definitions(-std=c99 -pipe
> ---Wall -Wextra -Wpedantic
> -+-Wall -Wextra
> - -Wno-static-in-inline # clang doesn't like the use of
> static inline methods inside static inline methods
> - -Wno-overlength-strings # may happen in the nodeset
> compiler when complex values are directly encoded
> - -Wno-unused-parameter # some methods may require unused
> argument
Re: [UPDATE] mail/s-postgray: v0.7.0
Omar Polo wrote in <3P0JCKN6GHS3U.2CNEOXOGPIFQO@venera>: |Steffen Nurpmeso wrote: ... |committed, thanks! Thank you Omar! That was .. tremendously quick. --steffen | |Der Kragenbaer,The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)
Re: Python Tkinter 8.6
On Wed, Jun 08, 2022 at 05:01:55PM +0100, Stuart Henderson wrote:
> On 2022/06/08 11:36, Stuart Cassoff wrote:
> > Just checked: ok on amd64, PLIST problem on i386.
> ah ok, so in that case nothing changed with respect to those.
> phew, I didn't fancy debugging that. I propose to either just
> ignore that, or maybe add an rm -f, i386 coped without them
> so far and it doesn't make much sense to poke too much at a
> dead python version.
> i've regen'd the diff against -current after I fixed the 3.10
> tests problem, i tweaked to remove the BUILD_PKGPATH bit, and
> just bumped the relevant subpackages rather than everything.
> this one is ok sthen@
This looks good.
ok kmos
--Kurt
> Index: Makefile.inc
> ===
> RCS file: /cvs/ports/lang/python/Makefile.inc,v
> retrieving revision 1.147
> diff -u -p -r1.147 Makefile.inc
> --- Makefile.inc 26 May 2022 15:13:55 - 1.147
> +++ Makefile.inc 8 Jun 2022 15:52:24 -
> @@ -8,7 +8,7 @@ COMMENT-bsddb = Berkeley db module for P
> COMMENT-gdbm = GNU dbm module for Python
> COMMENT-idle = IDE for Python
> COMMENT-tests = Python test suite
> -COMMENT-tkinter = tk GUI module for Python
> +COMMENT-tkinter = Python interface to the Tk graphical toolkit
> COMMENT-tools = extra tools for Python
>
> VERSION =${FULL_VERSION:R}
> @@ -95,11 +95,16 @@ RUN_DEPENDS-idle =lang/python/${VERSION
> WANTLIB-idle =
>
> MODULES += x11/tk
> -# Tcl/Tk version needs to be in sync with patch-setup_py's one
> +
> +.if ${VERSION} == "2.7"
> MODTK_VERSION = 8.5
> +.else
> +MODTK_VERSION = 8.6
> +.endif
> +
> LIB_DEPENDS-tkinter =lang/python/${VERSION},-main \
> ${MODTK_LIB_DEPENDS}
> -WANTLIB-tkinter =X11 pthread python${VERSION} \
> +WANTLIB-tkinter =pthread python${VERSION} \
> ${MODTK_WANTLIB}
>
> AUTOCONF_VERSION = 2.69
> @@ -110,7 +115,10 @@ CONFIGURE_ARGS +=--with-fpectl \
> --with-threads \
> --enable-ipv6 \
> --with-system-expat \
> - --with-system-ffi
> + --with-system-ffi \
> + --with-tcltk-includes='-I${MODTCL_INCDIR}
> -I${MODTK_INCDIR} -I${X11BASE}/include' \
> + --with-tcltk-libs='-L${X11BASE}/lib -l${MODTCL_LIB}
> -l${MODTK_LIB}'
> +
> .if ${VERSION} != "2.7"
> CONFIGURE_ARGS +=--enable-loadable-sqlite-extensions
> . if ${PROPERTIES:Mlld}
> Index: 2.7/Makefile
> ===
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.76
> diff -u -p -r1.76 Makefile
> --- 2.7/Makefile 28 Mar 2022 15:48:24 - 1.76
> +++ 2.7/Makefile 8 Jun 2022 15:52:24 -
> @@ -8,12 +8,12 @@ SHARED_LIBS = python2.7 0.0
> VERSION_SPEC = >=2.7,<2.8
> PORTROACH = limit:^2\.7
>
> -REVISION-main = 7
> +REVISION-main = 8
> REVISION-idle = 1
> REVISION-tests = 1
> REVISION-bsddb = 0
> REVISION-gdbm = 0
> -REVISION-tkinter = 0
> +REVISION-tkinter = 1
> REVISION-tools = 0
>
> CONFIGURE_ARGS +=--with-ensurepip=no
> Index: 2.7/patches/patch-setup_py
> ===
> RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-setup_py
> --- 2.7/patches/patch-setup_py11 Mar 2022 19:29:11 - 1.16
> +++ 2.7/patches/patch-setup_py8 Jun 2022 15:52:24 -
> @@ -84,17 +84,7 @@ Index: setup.py
> frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
>
> # All existing framework builds of Tcl/Tk don't support 64-bit
> -@@ -1936,8 +1946,7 @@ class PyBuildExt(build_ext):
> - # The versions with dots are used on Unix, and the versions without
> - # dots on Windows, for detection by cygwin.
> - tcllib = tklib = tcl_includes = tk_includes = None
> --for version in ['8.6', '86', '8.5', '85', '8.4', '84', '8.3', '83',
> --'8.2', '82', '8.1', '81', '8.0', '80']:
> -+for version in ['85']:
> - tklib = self.compiler.find_library_file(lib_dirs,
> - 'tk' + version)
> - tcllib = self.compiler.find_library_file(lib_dirs,
> -@@ -1980,17 +1989,9 @@ class PyBuildExt(build_ext):
> +@@ -1980,17 +1990,9 @@ class PyBuildExt(build_ext):
> if host_platform == 'sunos5':
> include_dirs.append('/usr/openwin/include')
> added_lib_dirs.append('/usr/openwin/lib')
> Index: 2.7/pkg/DESCR-tkinter
> ===
> RCS file: /cvs/ports/lang/python/2.7/pkg/DESCR-
