CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/05/07 22:58:22

Modified files:
multimedia/gstreamer1/plugins-bad: Makefile 

Log message:
Override Makefile.inc to include c++ (which is needed now for plugin-bad)

Fixes build on sparc64

Re: [maintainer update] dunst-1.9.2

[Lucas Raab]

On Sun, May 07, 2023 at 09:12:17AM +0300, Timo Myyrä wrote:
> Hi,
> 
> Here's a bit delayed update to dunst port.
> 
> Tweaked two regex test cases which seem to behave differently between OpenBSD
> and Linux.
> Seems to be working on amd64.
> 
> Timo

Looks/works fine on arm64 as well. ok lraab@ if anyone else wants to commit

aarch64 bulk build report

[phessler]

bulk build on arm64.ports.openbsd.org
started on  Fri May 5 01:25:40 MDT 2023
finished at Sun May 7 19:45:44 MDT 2023
lasted 2D18h20m
done with kern.version=OpenBSD 7.3-current (GENERIC.MP) #2114: Wed May  3 
12:09:14 MDT 2023

built packages:11579
May 5:3706
May 6:3829
May 7:4043


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2023-05-05/summary.log

build failures: 3
http://build-failures.rhaalovely.net/aarch64/2023-05-05/emulators/libchdr.log
http://build-failures.rhaalovely.net/aarch64/2023-05-05/emulators/ppsspp.log
http://build-failures.rhaalovely.net/aarch64/2023-05-05/net/unison,no_x11.log

recurrent failures
 failures/emulators/libchdr.log
 failures/emulators/ppsspp.log
 failures/net/unison,no_x11.log
new failures
+++ ls-failures Sun May  7 19:45:55 2023
resolved failures
--- ../old/aarch64/last//ls-failuresThu May  4 08:44:43 2023
-failures/sysutils/fzf.log
-failures/x11/gnome/zenity.log

Re: patch: fix gimp text italics rendering

[Antoine Jacoutot]

Two PKGSPEC ? 

—
Antoine

> On 7 May 2023, at 20:30, Marc Espie  wrote:
> 
> The gitlab issue says it all.
> 
> I've just checked that with this, heavily italicized fonts (like Palooka 
> Italic)
> do render correctly even when right-justified.
> 
> Okay ?
> 
> (it appears that gimp 2.99.14 as the exact same issue, but I haven't checked
> it yet)
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
> retrieving revision 1.161
> diff -u -p -r1.161 Makefile
> --- Makefile24 Apr 2023 11:40:44 -1.161
> +++ Makefile7 May 2023 18:26:39 -
> @@ -2,7 +2,7 @@ COMMENT=GNU Image Manipulation Program
> 
> DISTNAME =gimp-2.10.34
> PKGSPEC =gimp->=2,<2.99
> -REVISION =1
> +REVISION =2
> 
> .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
>gimpthumb gimpui gimpwidgets
> @@ -18,6 +18,7 @@ MASTER_SITES=https://download.gimp.org/
> HOMEPAGE=https://www.gimp.org/
> 
> EXTRACT_SUFX=.tar.bz2
> +PKGSPEC =gimp-<3
> 
> # GPLv3+
> PERMIT_PACKAGE=Yes
> Index: patches/patch-app_text_gimptextlayout_c
> ===
> RCS file: patches/patch-app_text_gimptextlayout_c
> diff -N patches/patch-app_text_gimptextlayout_c
> --- /dev/null1 Jan 1970 00:00:00 -
> +++ patches/patch-app_text_gimptextlayout_c7 May 2023 18:26:39 -
> @@ -0,0 +1,13 @@
> +See https://gitlab.gnome.org/GNOME/gimp/-/issues/325
> +Index: app/text/gimptextlayout.c
> +--- app/text/gimptextlayout.c.orig
>  app/text/gimptextlayout.c
> +@@ -655,7 +655,7 @@ gimp_text_layout_position (GimpTextLayout *layout)
> +   GimpTextDirection base_dir = layout->text->base_dir;
> +   gint  width;
> + 
> +-  pango_layout_get_pixel_size (layout->layout, , NULL);
> ++  width = layout->extents.width;
> + 
> +   if ((base_dir == GIMP_TEXT_DIRECTION_LTR && align == 
> PANGO_ALIGN_RIGHT) ||
> +   (base_dir == GIMP_TEXT_DIRECTION_RTL && align == 
> PANGO_ALIGN_LEFT) ||
> 

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2023/05/07 15:15:14

Added files:
devel/boehm-gc/patches: patch-Makefile_in 

Log message:
devel/boehm-gc: fix a parallel build race

Our make(1) treats ./libgc.la and libgc.la as distinct targets.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2023/05/07 14:04:22

Added files:
shells/bash/patches: patch-Makefile_in 

Log message:
shells/bash: fix massively parallel build

Building the loadable modules depends on files created during the
main build.

patch: fix gimp text italics rendering

[Marc Espie]

The gitlab issue says it all.

I've just checked that with this, heavily italicized fonts (like Palooka Italic)
do render correctly even when right-justified.

Okay ?

(it appears that gimp 2.99.14 as the exact same issue, but I haven't checked
it yet)

Index: Makefile
===
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.161
diff -u -p -r1.161 Makefile
--- Makefile24 Apr 2023 11:40:44 -  1.161
+++ Makefile7 May 2023 18:26:39 -
@@ -2,7 +2,7 @@ COMMENT=GNU Image Manipulation Program
 
 DISTNAME = gimp-2.10.34
 PKGSPEC =  gimp->=2,<2.99
-REVISION = 1
+REVISION = 2
 
 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
gimpthumb gimpui gimpwidgets
@@ -18,6 +18,7 @@ MASTER_SITES= https://download.gimp.org/
 HOMEPAGE=  https://www.gimp.org/
 
 EXTRACT_SUFX=  .tar.bz2
+PKGSPEC =  gimp-<3
 
 # GPLv3+
 PERMIT_PACKAGE=Yes
Index: patches/patch-app_text_gimptextlayout_c
===
RCS file: patches/patch-app_text_gimptextlayout_c
diff -N patches/patch-app_text_gimptextlayout_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-app_text_gimptextlayout_c 7 May 2023 18:26:39 -
@@ -0,0 +1,13 @@
+See https://gitlab.gnome.org/GNOME/gimp/-/issues/325
+Index: app/text/gimptextlayout.c
+--- app/text/gimptextlayout.c.orig
 app/text/gimptextlayout.c
+@@ -655,7 +655,7 @@ gimp_text_layout_position (GimpTextLayout *layout)
+   GimpTextDirection base_dir = layout->text->base_dir;
+   gint  width;
+ 
+-  pango_layout_get_pixel_size (layout->layout, , NULL);
++  width = layout->extents.width;
+ 
+   if ((base_dir == GIMP_TEXT_DIRECTION_LTR && align == PANGO_ALIGN_RIGHT) 
||
+   (base_dir == GIMP_TEXT_DIRECTION_RTL && align == PANGO_ALIGN_LEFT) 
||

Re: update productivity/vym

[Solène Rapenne]

Le Sun, 7 May 2023 17:07:06 +0200,
Solène Rapenne  a écrit :

> I updated vym to latest version, a lot of changes, it moved to GitHub
> and from gmake to cmake, which simplify the port
> 
> it works fine for me, I needed to add a patch to fix unzip/zip binaries
> path because it's hardcoded.
> 
> However, all the icons are installed in /usr/local/share/icons/ which
> seems wrong (and portcheck reports it), but I don't know how to change
> the path here, a little help would be appreciated :)
> 

patch was missing

Index: Makefile
===
RCS file: /home/cvs/ports/productivity/vym/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile3 Oct 2022 21:18:19 -   1.33
+++ Makefile7 May 2023 15:00:48 -
@@ -1,55 +1,35 @@
 COMMENT=   generate and manipulate maps of your thoughts
 
-DISTNAME=  vym-2.6.0
+VERSION =  2.9.0
+GH_ACCOUNT =   insilmaril
+GH_PROJECT =   vym
+GH_TAGNAME =   v${VERSION}
+DISTNAME=  vym-${VERSION}
 CATEGORIES=productivity x11
-REVISION=  3
 
 HOMEPAGE=  https://www.insilmaril.de/vym/
 
 # modified GPLv2
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vym/}
-EXTRACT_SUFX=  .tar.bz2
-
-WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Script Qt5Svg Qt5Widgets Qt5Xml c m pthread
 WANTLIB += ${COMPILER_LIBCXX}
 
-MODULES=   devel/qmake \
+MODULES=   devel/cmake \
x11/qt5
-MODQMAKE_ARGS= DEFINES+=VYM_DOCDIR=\\\"${PREFIX}/share/doc/vym\\\"
 
 RUN_DEPENDS=   archivers/zip \
archivers/unzip \
-   textproc/libxslt
+   devel/desktop-file-utils \
+   misc/shared-mime-info \
+   textproc/libxslt \
+   x11/gtk+4,-guic
 
-LIB_DEPENDS=   x11/qt5/qtsvg
+LIB_DEPENDS=   x11/qt5/qtscript \
+   x11/qt5/qtsvg
 
-PORTHOME=  ${WRKDIR}
+#PORTHOME= ${WRKDIR}
 NO_TEST=   Yes
-
-SHARE_DIRS=flags flags/freemind icons scripts styles
-
-pre-configure:
-   @echo "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \
-   >> ${WRKSRC}/vym.pro
-   ${SUBST_CMD} ${WRKSRC}/mainwindow.cpp ${WRKSRC}/main.cpp
-
-do-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/vym ${PREFIX}/bin
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vym/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vym/
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/vym/
-   ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/examples/vym/
-.for i in ${SHARE_DIRS}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/vym/${i}
-   find ${WRKSRC}/${i}/ -type f -exec \
-   ${INSTALL_DATA} {} ${PREFIX}/share/vym/${i} \;
-.endfor
-   ${INSTALL_DATA} ${WRKSRC}/doc/vym.1.gz ${PREFIX}/man/man1
-   gunzip -f ${PREFIX}/man/man1/vym.1.gz
-   sed -i 's,/usr/share/doc/packages,${TRUEPREFIX}/share/doc,' \
-   ${PREFIX}/man/man1/vym.1
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/productivity/vym/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo29 Apr 2018 08:13:07 -  1.9
+++ distinfo7 May 2023 13:17:59 -
@@ -1,2 +1,2 @@
-SHA256 (vym-2.6.0.tar.bz2) = fcFyGvsnEJrcS0rqrGIX/dEpSzjoGzOgikdlYvvfoUE=
-SIZE (vym-2.6.0.tar.bz2) = 6766806
+SHA256 (vym-2.9.0.tar.gz) = ckUWgaOk4UlPJcH/nUEQwTgJXWPtTRRxx27ZB2BqfNs=
+SIZE (vym-2.9.0.tar.gz) = 8594682
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/productivity/vym/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   11 Mar 2022 19:51:48 -  1.8
+++ pkg/PLIST   7 May 2023 14:02:43 -
@@ -1,211 +1,243 @@
 @bin bin/vym
-@man man/man1/vym.1
-share/doc/vym/
-share/doc/vym/vym.pdf
-share/doc/vym/vym_es.pdf
-share/doc/vym/vym_fr.pdf
-share/examples/vym/
-share/examples/vym/ao-report-example.vym
-share/examples/vym/frames.vym
-share/examples/vym/lifeforms.vym
-share/examples/vym/math.vym
-share/examples/vym/time-management.vym
-share/examples/vym/vym-contribute.vym
-share/vym/
-share/vym/flags/
-share/vym/flags/attach.png
-share/vym/flags/back.png
-share/vym/flags/bell.png
-share/vym/flags/bookmark.png
-share/vym/flags/clanbomber.png
-share/vym/flags/desktopnew.png
-share/vym/flags/flag-2arrow-down.png
-share/vym/flags/flag-2arrow-up.png
-share/vym/flags/flag-arrow-down.png
-share/vym/flags/flag-arrow-up.png
-share/vym/flags/flag-clock.png
-share/vym/flags/flag-cross-red.png
-share/vym/flags/flag-exclamationmark.png
-share/vym/flags/flag-flash.png
-share/vym/flags/flag-heart.png
-share/vym/flags/flag-hideexport.png
-share/vym/flags/flag-hook-green.png
-share/vym/flags/flag-info.png
-share/vym/flags/flag-lamp.png
-share/vym/flags/flag-lifebelt.png

Re: update audio/cozy

[Solène Rapenne]

Le Sun, 7 May 2023 17:26:19 +0200,
Stefan Hagen  a écrit :

> Solène Rapenne wrote (2023-05-07 15:39 CEST):
>  [...]  
> 
> I think you forgot to cvs add the patch :-)
> I'm seeing:
> 
> $ cozy
> ['/usr/local/bin/cozy']
> 17:23:13 [MainThread  ] [applicatio] [INFO ]  ('openbsd', '7.3', '')
> 17:23:13 [MainThread  ] [applicatio] [INFO ]  Starting up cozy 1.2.1
> 17:23:13 [MainThread  ] [db] [INFO ]  SQLite version: 3.41.2
> 17:23:13 [Thread-1 (ru] [peewee.sql] [INFO ]  writer received shutdown 
> request, exiting.
> 17:23:13 [MainThread  ] [applicatio] [INFO ]  libhandy version: 1
> handle exception
> Traceback (most recent call last):
>   File "/usr/local/lib/python3.10/site-packages/cozy/application.py", line 
> 99, in do_activate
> self.app_controller = AppController(self, main_window_builder, self.ui)
>   File 
> "/usr/local/lib/python3.10/site-packages/cozy/architecture/singleton.py", 
> line 5, in __call__
> cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
>   File "/usr/local/lib/python3.10/site-packages/cozy/app_controller.py", line 
> 52, in __init__
> self.whats_new_window: WhatsNewWindow = WhatsNewWindow()
>   File 
> "/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py",
>  line 36, in __init__
> self._fill_window()
>   File 
> "/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py",
>  line 54, in _fill_window
> last_launched_version = 
> version.parse(self.app_settings.last_launched_version)
>   File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line 
> 52, in parse
> return Version(version)
>   File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line 
> 197, in __init__
> raise InvalidVersion(f"Invalid version: '{version}'")
> packaging.version.InvalidVersion: Invalid version: 'None'
> 
> Best Regards,
> Stefan
> 
>  [...]  
> 

thanks for the -N flag for cvs diff :)

Index: Makefile
===
RCS file: /home/cvs/ports/audio/cozy/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile24 Apr 2023 11:40:34 -  1.4
+++ Makefile7 May 2023 13:28:19 -
@@ -2,8 +2,7 @@ COMMENT =   gtk3 audiobook player
 
 GH_ACCOUNT =   geigi
 GH_PROJECT =   cozy
-GH_TAGNAME =   1.1.2
-REVISION = 1
+GH_TAGNAME =   1.2.1
 
 CATEGORIES =   audio
 
@@ -18,7 +17,6 @@ MODULES = devel/dconf \
 
 COMMON_DEPENDS =   audio/py-mutagen${MODPY_FLAVOR} \
 databases/py-peewee${MODPY_FLAVOR} \
-   devel/py-gobject3${MODPY_FLAVOR} \
sysutils/py-distro${MODPY_FLAVOR} \
x11/elementary/granite \
x11/libhandy
@@ -28,9 +26,15 @@ BUILD_DEPENDS =  ${COMMON_DEPENDS} \
 
 RUN_DEPENDS =  ${COMMON_DEPENDS} \
devel/desktop-file-utils \
+   devel/py-tz${MODPY_FLAVOR} \
multimedia/gstreamer1/plugins-libav \
+   www/py-requests${MODPY_FLAVOR} \
x11/gnome/libdazzle \
x11/gtk+4,-guic
+
+# required for running tests
+# one failing test due to missing network
+PORTHOME=  ${WRKDIR}
 
 post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}
Index: distinfo
===
RCS file: /home/cvs/ports/audio/cozy/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo8 Dec 2021 20:34:13 -   1.1.1.1
+++ distinfo7 May 2023 13:01:16 -
@@ -1,2 +1,2 @@
-SHA256 (cozy-1.1.2.tar.gz) = BBIK0XIWURsesb2zzfsLYa0VsyTUeK+sRkYWKLo0Vw4=
-SIZE (cozy-1.1.2.tar.gz) = 812775
+SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
+SIZE (cozy-1.2.1.tar.gz) = 831167
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/cozy/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:07 -  1.2
+++ pkg/PLIST   7 May 2023 13:03:18 -
@@ -53,6 +53,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}artwork_cache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}book.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}collation.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}model_base.${MODPY_PYC_MAGIC_TAG}pyc
 

Re: [new] www/smarc: static web mail archive generator

[Omar Polo]

On 2023/05/07 19:45:24 +0200, Hiltjo Posthuma  wrote:
> BTW I noticed on the page: 
> https://git.omarpolo.com/?index_page==smarc.git=summary
> the URLs are:
> 
> ssh://a...@git.omarpolo.com/gotmarc.git
> https://git.omarpolo.com/gotmarc.git

ooops!  I forgot to adjust the `cloneurl' file after the rename.

> But I cloned using ssh://a...@git.omarpolo.com/smarc.git and it works.

that's indeed the correct URL.  I have fixed the address now, thanks!

Re: U-Boot 2022.10 and dtb from Linux 6.0.8

[Klemens Nanni]

On Sun, May 07, 2023 at 06:30:55PM +0200, Mark Kettenis wrote:
> As I've said before, the u-boot developers have poor quality control
> and this will almost certainly break some targets.
> 
> I think the way forward is to have a u-boot port per SoC such that we
> can leave older SoCs using an older U-Boot version that we know to be
> good while newer SoCs can switch to a newer version after testing a
> few boards.

That should always work.  Not sure if pulling them out of the main u-boot
port one by one or all at once is better, though.

For the 2207.* update it seemed as if the Pinebook Pro's breakage alone kept
all others boards on outdated versions and we practically have no other way
of disentangling this mess, afaict.

We already have sysutils/u-boot-asahi.

Would mean some ports shuffling and installing more package where boot media
is built, but that doesn't seem like too much work.

4 ruby ports related to devel/ruby-tilt

[Jeremy Evans]

Attached is a tarball with 4 new ruby ports for template libraries (or
dependencies of template libraries) supported by devel/ruby-tilt, which
I recently took over maintenance of.

textproc/ruby-commonmarker

Ruby wrapper for libcmark-gfm, GitHub's fork of the reference parser for
CommonMark. It passes all of the C tests, and is therefore
spec-complete. It also includes extensions to the CommonMark spec as
documented in the GitHub Flavored Markdown spec, such as support for
tables, strikethroughs, and autolinking.


textproc/ruby-rinku

Rinku is a Ruby library that does autolinking. It parses text and turns
anything that remotely resembles a link into an HTML link, just like the
Ruby on Rails auto_link method -- but it's about 20 times faster,
because it's written in C, and it's about 20 times smarter when linking,
because it does actual parsing instead of RegEx replacements.


textproc/ruby-unf_ext

Unicode Normalization Form support library for CRuby.

Normalizes UTF-8 strings into and from NFC, NFD, NFKC or NFKD

Compliant with Unicode 9.0


devel/ruby-idn

Ruby Bindings for the GNU LibIDN library, an implementation of the
Stringprep, Punycode and IDNA specifications defined by the IETF
Internationalized Domain Names (IDN) working group. Included are the
most important parts of the Stringprep, Punycode and IDNA APIs like
performing Stringprep processings, encoding to and decoding from
Punycode strings and converting entire domain names to and from the ACE
encoded form.


Tested on amd64.  OKs to import?

Thanks,
Jeremy


ruby-tilt-test-depends.tar.gz
Description: application/tar-gz

Re: [new] www/smarc: static web mail archive generator

[Hiltjo Posthuma]

On Sun, May 07, 2023 at 02:02:30PM +0200, Omar Polo wrote:
> please find attached a port for `smarc', a little thingy i've been
> working on recently.  it's what powers the got archive at
> , having it the ports tree would
> simplify the usage and maybe be useful to others as well.
> ok to import?
> 
> % pkg_info smarc
> Information for inst:smarc-0.1
> 
> Comment:
> static web mail archive generator
> 
> Description:
> smarc is a collection of scripts to generate a static mail archive from
> a given Maildir.  It also optionally provides a FastCGI server to allow
> searching in the archive, powered by a sqlite3 database.
> 
> The setup process is documented in smarc(7).
> 
> Maintainer: Omar Polo 
> 
> WWW: https://projects.omarpolo.com/smarc.html
> 
> 

Hi Omar,

Very nice work, will check your project.

BTW I noticed on the page: 
https://git.omarpolo.com/?index_page==smarc.git=summary
the URLs are:

ssh://a...@git.omarpolo.com/gotmarc.git
https://git.omarpolo.com/gotmarc.git

But I cloned using ssh://a...@git.omarpolo.com/smarc.git and it works.

Thanks,

-- 
Kind regards,
Hiltjo

Re: meta/xfce README change

[Landry Breuil]

Le Sun, May 07, 2023 at 03:47:55PM +, Klemens Nanni a écrit :
> On Sun, May 07, 2023 at 05:43:45PM +0200, Solene Rapenne wrote:
> > Le Sun,  7 May 2023 15:39:17 +,
> > Klemens Nanni  a écrit :
> > 
> > > On Sun, May 07, 2023 at 05:34:42PM +0200, Solene Rapenne wrote:
> > >  [...]  
> > > 
> > > If that works out of the box...
> > > 
> > >  [...]  
> > > 
> > > ... you could also say something like
> > > 
> > > If you want to use gdm, install it and select xfce in the menu, bla bla.
> > > 
> > > Would such a specific hint be more helpful than leaving users figure out
> > > gdm/xfce interaction on their own?
> > > 
> > >  [...]  
> > 
> > Nowadays, I'd expect any desktop environment to be available in GDM
> > without having to create an according .desktop file
> > 
> > I'm fine replacing the comment by what you suggest, but I don't think
> > it's useful.
> 
> Either way is fine with me, I don't have that good of an insight into DEs,
> hence my question and interest in any kind of improvement for user
> experience around install/setup/etc.
> 
> OK kn, but please wait for laundry to chime in.

Landry, FFS ! :p

ok to drop the sentence.

Re: [update] graphics/darktable 3.6.1 to 4.2.1

[Landry Breuil]

Le Sun, May 07, 2023 at 02:37:04PM +0200, Stefan Hagen a écrit :
> Hi,
> 
> this updates darktable to the latest version.
> 
> The current darktable is broken:
> 
> $ darktable
> (process:71741): libsoup-ERROR **: 13:55:36.734: libsoup3 symbols detected. 
> Using libsoup2 and libsoup3 in the same process is not supported.
> Trace/BPT trap
> $
> 
> This happens because darktable pulls in geo/osm-gps-map, which is built
> with libsoup3 now, while darktable requires libsoup2.

Whoops, my fault, sorry ! i see iirc libsoup support was axed out of
darktable in later versions, so figured out it could be backportable if
causing issue.. seems building it wasnt enough then.

> # Port changes:
> - removed geo/osm-gps-map (and therefore maps support)
> - added -DDONT_USE_INTERNAL_LIBRAW=ON; The bundled version works fine, but why
>   build it twice, when we have it in ports anyway.
> - update MODLUA_VERSION to lua5.4, otherwise it uses the bundled lua5.4
> - added WANTLIB: cups, raw, SDL2
> - added LIB_DEPENDS: print/cups,-libs, graphics/libraw, devel/sdl2
> - updated patches (new fix: swap32 renamed to oswap32 because we have a
>   similar named function in /usr/include/endian.h)
> 

All this makes sense, thanks for working on it !
> Comments / OKs?

If it works ok :)

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/05/07 10:59:36

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
small quality of life improvement:
autogenerated variables (like WRKDIR for GH_* stuff) will be hard
to figure out if you can't even see them out thanks to a fatal error,
so show the actual variable contents

Re: U-Boot 2022.10 and dtb from Linux 6.0.8

[Mark Kettenis]

> Date: Sat, 6 May 2023 17:36:53 +0200
> From: Patrick Wildt 
> 
> On Fri, Nov 18, 2022 at 12:53:44PM +, Klemens Nanni wrote:
> > On Mon, Nov 14, 2022 at 11:37:05PM +0100, Patrick Wildt wrote:
> > > Hi,
> > > 
> > > the u-boot and dtb ports haven't been updated in a while, mostly because
> > > updating those regularly breaks working machines.  I think it's time for
> > > another update, so here's a diff for both.
> > > 
> > > Before this heads into the tree it would be nice to get some testing
> > > from people with Pinebook Pro, RockPro64, and/or especially a BeagleBone
> > > Black.
> > > 
> > > I reverted the change that switches from the 'old' cpsw switch driver
> > > model to the 'new' one.  This should allow is to update the dtbs.
> > > 
> > > I've personally verified that U-Boot+DTB boot fine on NanoPi R2s, but
> > > we have many more combinations.
> > > 
> > > I can provide pre-built unsigned packages upon request.
> > 
> > I installed u-boot-aarch64-2022.10.tgz built with dtb-6.0.8.tgz and
> > followed INSTALL.arm64 to flash the new files onto my Pinebook Pro's
> > eMMC.
> > 
> > There's a u-boot logo visible in the upper right corner and OpenBSD
> > still boots, but the screen remains black now.
> > 
> > Previously, I'd see X when xenodm started, now I don't see anything.
> > No warnings or errors on serial console.
> > 
> > I also can't switch to another TTY to get a shell.
> > 
> > Reflashing u-boot from ports makes X work again, no OS changes needed.
> > 
> > I had the same issue on the same device when trying u-boot 2022.07 some
> > months ago.
> 
> While I did not find the root cause of this back then, a U-Boot 2023.04
> with a dtb from Linux 6.3 does seem to work on my machine.  Maybe that
> was something caused by U-Boot that is now fixed.
> 
> ok?

As I've said before, the u-boot developers have poor quality control
and this will almost certainly break some targets.

I think the way forward is to have a u-boot port per SoC such that we
can leave older SoCs using an older U-Boot version that we know to be
good while newer SoCs can switch to a newer version after testing a
few boards.


> diff --git a/sysutils/u-boot/Makefile b/sysutils/u-boot/Makefile
> index d2dd2fad980..4c8acde3638 100644
> --- a/sysutils/u-boot/Makefile
> +++ b/sysutils/u-boot/Makefile
> @@ -7,8 +7,7 @@ FLAVORS=  aarch64 arm riscv64
>  FLAVOR?= arm
>  
>  COMMENT= U-Boot firmware
> -VERSION= 2021.10
> -REVISION=6
> +VERSION= 2023.04
>  DISTNAME=u-boot-${VERSION}
>  PKGNAME= u-boot-${FLAVOR}-${VERSION:S/-//}
>  FULLPKGNAME= ${PKGNAME}
> @@ -24,7 +23,9 @@ PKG_ARCH=   *
>  
>  BUILD_DEPENDS=   devel/bison \
>   devel/dtc \
> - devel/swig
> + devel/swig \
> + security/gnutls \
> + sysutils/e2fsprogs
>  
>  # for pkg_resources used in tools/binman/control.py
>  BUILD_DEPENDS+=  devel/py-setuptools${MODPY_FLAVOR}
> @@ -47,6 +48,7 @@ RK3328_BL31=
> "${LOCALBASE}/share/arm-trusted-firmware/rk3328-bl31.elf"
>  RK3399_BL31= "${LOCALBASE}/share/arm-trusted-firmware/rk3399-bl31.elf"
>  SUNXI_BL31=  "${LOCALBASE}/share/arm-trusted-firmware/sun50i_a64-bl31.bin"
>  SUNXI_H6_BL31=   
> "${LOCALBASE}/share/arm-trusted-firmware/sun50i_h6-bl31.bin"
> +SUNXI_SCP=   /dev/null
>  .elif "${FLAVOR}" == "arm"
>  BUILD_DEPENDS+=  devel/arm-none-eabi/gcc,arm
>  MAKE_ENV+=   CROSS_COMPILE="arm-none-eabi-"
> @@ -163,7 +165,7 @@ FILES=\
>   u-boot-sunxi-with-spl.bin \
>   u-boot.imx \
>   u-boot-dtb.imx \
> - u-boot-spl.kwb \
> + u-boot-with-spl.kwb \
>   u-boot-with-spl.bin \
>   u-boot.itb \
>   u-boot-rockchip.bin \
> @@ -210,20 +212,20 @@ do-build:
>  .if "${BOARD:M*_h64*}"
>   cd ${WRKSRC} && \
>   mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
>   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_H6_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
>   -f ${MAKE_FILE} ${ALL_TARGET}
>  .else
>   cd ${WRKSRC} && \
>   mkdir -p build/${BOARD} && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} SCP=${SUNXI_SCP} \
> + ${MAKE_PROGRAM} ${MAKE_FLAGS} O="build/${BOARD}" \
>   -f ${MAKE_FILE} "${BOARD}"_defconfig && \
> - ${SETENV} ${MAKE_ENV} BL31=${SUNXI_BL31} ${MAKE_PROGRAM} \
> - ${MAKE_FLAGS} O="build/${BOARD}" \
> + ${SETENV} 

Re: [new] sysutils/efivar

[Klemens Nanni]

On Thu, Apr 27, 2023 at 04:00:51PM +0300, Sergii Dmytruk wrote:
> On Thu, Apr 27, 2023 at 11:34:11AM +, Klemens Nanni wrote:
> > As normal user, I'd expect EACCES or EPERM, the current warning misleads:
> > $ efivar -l
> > efivar: error listing variables: Function not implemented
> 
> The code supports multiple backends and without root none of them is
> applicable.  This leads to ENOSYS on calling any function that deals
> with efivars.  Changing this can cause differences in behaviour of the
> library.
> 
> > We point GH_* at the BSD fork and HOMEPAGE at Linux upstream.
> > Would it be better to drop HOMEAGE, i.e. stick with the fork and adjust
> > its description on GitHub so that actually becomes obvious from reading
> > the "homepage"?
> 
> Updated HOMEPAGE.  Also updated the repo to show `bsd` branch by default
> and mentioned the purpose of the fork in the description.
> 
> > Are the spaces in SHARED_LIBS intended?
> 
> Changed to tabs.

.so versioning was still wrong in this tarball.
Haven't made progress on the panics, but here's the polished port I'm
toying with.

Diff against yours to illustrate:

diff --git a/sysutils/efivar/Makefile b/sysutils/efivar/Makefile
index af873225a..165347318 100644
--- a/sysutils/efivar/Makefile
+++ b/sysutils/efivar/Makefile
@@ -28,13 +28,12 @@ PERMIT_PACKAGE =Yes
 WANTLIB += c
 
 USE_GMAKE =Yes
-MAKE_FLAGS =   CC=${CC}
-MAKE_ENV = HOST_MARCH='' \
-   LIBefivar_VERSION=${LIBefivar_VERSION} \
-   LIBefiboot_VERSION=${LIBefiboot_VERSION} \
-   LIBefisec_VERSION=${LIBefisec_VERSION}
-FAKE_FLAGS =   PREFIX=${PREFIX} \
+MAKE_FLAGS =   CC=${CC} \
MANDIR=${PREFIX}/man \
LIBDIR=${PREFIX}/lib
+MAKE_ENV = LIBefivar_VERSION=${LIBefivar_VERSION} \
+   LIBefiboot_VERSION=${LIBefiboot_VERSION} \
+   LIBefisec_VERSION=${LIBefisec_VERSION}
+FAKE_FLAGS =   PREFIX=${PREFIX}
 
 .include 
diff --git a/sysutils/efivar/patches/patch-src_Makefile 
b/sysutils/efivar/patches/patch-src_Makefile
index 4a5ea2061..a933d4469 100644
--- a/sysutils/efivar/patches/patch-src_Makefile
+++ b/sysutils/efivar/patches/patch-src_Makefile
@@ -1,17 +1,20 @@
-Fix .so versioning
 Don't create symlinks for shared libraries.
 
 Index: src/Makefile
 --- src/Makefile.orig
 +++ src/Makefile
-@@ -147,9 +147,7 @@ clean : 
+@@ -146,11 +146,9 @@ clean : 
+ 
  install : all
$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)
-   $(foreach x,$(LIBTARGETS), \
+-  $(foreach x,$(LIBTARGETS), \
 -  $(INSTALL) -m 755 $(x) $(DESTDIR)$(LIBDIR)/$(x).1.$(VERSION) ;\
 -  ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x).1 ;\
 -  ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x) ;\
-+  $(INSTALL) -m 755 $(x) $(DESTDIR)$(LIBDIR)/$(x).$(LIB$(subst 
lib,,$(x:%.so=%))_VERSION) ;\
-   )
+-  )
++  $(INSTALL) -m 755 libefivar.so 
$(DESTDIR)$(LIBDIR)/libefivar.so.$(LIBefivar_VERSION)
++  $(INSTALL) -m 755 libefiboot.so 
$(DESTDIR)$(LIBDIR)/libefiboot.so.$(LIBefiboot_VERSION)
++  $(INSTALL) -m 755 libefisec.so 
$(DESTDIR)$(LIBDIR)/libefisec.so.$(LIBefisec_VERSION)
$(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
$(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
+   $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/efivar
diff --git a/sysutils/efivar/patches/patch-src_include_defaults_mk 
b/sysutils/efivar/patches/patch-src_include_defaults_mk
index 3845881ba..7955b6fb2 100644
--- a/sysutils/efivar/patches/patch-src_include_defaults_mk
+++ b/sysutils/efivar/patches/patch-src_include_defaults_mk
@@ -1,4 +1,4 @@
-Fix .so versioning
+Don't hard-code soname into shared libraries
 Packages can't be built with -march=native
 
 Index: src/include/defaults.mk
@@ -9,7 +9,16 @@ Index: src/include/defaults.mk
  override _SOFLAGS := $(SOFLAGS)
  override SOFLAGS = $(_SOFLAGS) \
 - -shared -Wl,-soname,$@.1 \
-+ -shared -Wl,-soname,$@.$(LIB$(subst 
lib,,$(@:%.so=%))_VERSION) \
++ -shared \
   -Wl,--version-script=$(MAP) \
   $(call family,SOFLAGS)
  
+@@ -82,7 +82,7 @@ endif
+ HOST_CPPFLAGS ?= $(CPPFLAGS)
+ override _HOST_CPPFLAGS := $(HOST_CPPFLAGS)
+ override HOST_CPPFLAGS = $(_HOST_CPPFLAGS) \
+-   -DEFIVAR_BUILD_ENVIRONMENT $(HOST_MARCH)
++   -DEFIVAR_BUILD_ENVIRONMENT
+ HOST_CFLAGS_GCC ?=
+ HOST_CFLAGS_CLANG ?=
+ HOST_CFLAGS ?= $(CFLAGS) $(call family,HOST_CFLAGS)



efivar.tgz
Description: application/tar-gz

Re: [new] math/p5-graph-easy{-svg}

[Alexander Bluhm]

On Tue, Apr 11, 2023 at 12:27:14PM +0200, Johannes Thyssen Tishman wrote:
> now that 7.3 has been released I'd like to revive this thread and see if
> anyone is interested in this port. I'd appreciate any feedback in case
> the port need more work.

OK bluhm@ for p5-Graph-Easy

p5-Graph-Easy-As_svg needs:

RUN_DEPENDS =   math/p5-Graph-Easy>=0.63 \
graphics/p5-Image-Info>=1.28
TEST_DEPENDS =  devel/p5-Test-Pod \
devel/p5-Test-Pod-Coverage>=1.00
CONFIGURE_STYLE =   modbuild

Usually the cpan module fills the HOMEPAGE automatically.

For ports I run "portgen p5 Graph::Easy::As_svg".  Then I compare
the output to detect some of the things.

bluhm

Re: meta/xfce README change

[Klemens Nanni]

On Sun, May 07, 2023 at 05:43:45PM +0200, Solene Rapenne wrote:
> Le Sun,  7 May 2023 15:39:17 +,
> Klemens Nanni  a écrit :
> 
> > On Sun, May 07, 2023 at 05:34:42PM +0200, Solene Rapenne wrote:
> >  [...]  
> > 
> > If that works out of the box...
> > 
> >  [...]  
> > 
> > ... you could also say something like
> > 
> > If you want to use gdm, install it and select xfce in the menu, bla bla.
> > 
> > Would such a specific hint be more helpful than leaving users figure out
> > gdm/xfce interaction on their own?
> > 
> >  [...]  
> 
> Nowadays, I'd expect any desktop environment to be available in GDM
> without having to create an according .desktop file
> 
> I'm fine replacing the comment by what you suggest, but I don't think
> it's useful.

Either way is fine with me, I don't have that good of an insight into DEs,
hence my question and interest in any kind of improvement for user
experience around install/setup/etc.

OK kn, but please wait for laundry to chime in.

Re: meta/xfce README change

[Solène Rapenne]

Le Sun,  7 May 2023 15:39:17 +,
Klemens Nanni  a écrit :

> On Sun, May 07, 2023 at 05:34:42PM +0200, Solene Rapenne wrote:
>  [...]  
> 
> If that works out of the box...
> 
>  [...]  
> 
> ... you could also say something like
> 
> If you want to use gdm, install it and select xfce in the menu, bla bla.
> 
> Would such a specific hint be more helpful than leaving users figure out
> gdm/xfce interaction on their own?
> 
>  [...]  

Nowadays, I'd expect any desktop environment to be available in GDM
without having to create an according .desktop file

I'm fine replacing the comment by what you suggest, but I don't think
it's useful.

Re: meta/xfce README change

[Klemens Nanni]

On Sun, May 07, 2023 at 05:34:42PM +0200, Solene Rapenne wrote:
> if you have gdm and xfce4 installed, gdm offers xfce out of the box.

If that works out of the box...

> The package xfce4-session provides the magic file that make it work in
> /usr/local/share/xsessions/xfce.desktop
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/meta/xfce/Makefile,v
> retrieving revision 1.30
> diff -u -r1.30 Makefile
> --- Makefile  16 Apr 2023 18:29:39 -  1.30
> +++ Makefile  7 May 2023 15:31:25 -
> @@ -7,7 +7,7 @@
>  PKGNAME-main =   xfce-${V}
>  PKGNAME-extras = xfce-extras-${V}
>  REVISION-extras =3
> -REVISION-main =  3
> +REVISION-main =  4
>  
>  MAINTAINER = Landry Breuil 
>  
> Index: pkg/README-main
> ===
> RCS file: /home/cvs/ports/meta/xfce/pkg/README-main,v
> retrieving revision 1.20
> diff -u -r1.20 README-main
> --- pkg/README-main   24 Dec 2022 20:49:58 -  1.20
> +++ pkg/README-main   7 May 2023 15:31:20 -
> @@ -12,9 +12,6 @@
>  Simply add '${LOCALBASE}/bin/startxfce4' to your .xinitrc .xsession
>  script if you use startx(1) or xenodm(1), respectively.
>  
> -If you use gdm, have a look at https://wiki.xfce.org/faq#starting_xfce
> -which provides an xfce4.desktop for it.

... you could also say something like

If you want to use gdm, install it and select xfce in the menu, bla bla.

Would such a specific hint be more helpful than leaving users figure out
gdm/xfce interaction on their own?

> -
>  Logging out and shutting down the computer
>  ==
>  If your installation supports complete shutdown, clicking on the logout
> 

meta/xfce README change

[Solène Rapenne]

if you have gdm and xfce4 installed, gdm offers xfce out of the box.

The package xfce4-session provides the magic file that make it work in
/usr/local/share/xsessions/xfce.desktop

Index: Makefile
===
RCS file: /home/cvs/ports/meta/xfce/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile16 Apr 2023 18:29:39 -  1.30
+++ Makefile7 May 2023 15:31:25 -
@@ -7,7 +7,7 @@
 PKGNAME-main = xfce-${V}
 PKGNAME-extras =   xfce-extras-${V}
 REVISION-extras =  3
-REVISION-main =3
+REVISION-main =4
 
 MAINTAINER =   Landry Breuil 
 
Index: pkg/README-main
===
RCS file: /home/cvs/ports/meta/xfce/pkg/README-main,v
retrieving revision 1.20
diff -u -r1.20 README-main
--- pkg/README-main 24 Dec 2022 20:49:58 -  1.20
+++ pkg/README-main 7 May 2023 15:31:20 -
@@ -12,9 +12,6 @@
 Simply add '${LOCALBASE}/bin/startxfce4' to your .xinitrc .xsession
 script if you use startx(1) or xenodm(1), respectively.
 
-If you use gdm, have a look at https://wiki.xfce.org/faq#starting_xfce
-which provides an xfce4.desktop for it.
-
 Logging out and shutting down the computer
 ==
 If your installation supports complete shutdown, clicking on the logout

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2023/05/07 09:27:21

Modified files:
x11/spectrwm   : Makefile distinfo 

Log message:
update to spectrwm-3.4.1.20230507

it includes a fix that addresses a crash found hardway while running 
ssh-askpass(1):
- Fix possible crash when a window claims to be transient for itself.

OK bket@ gonzalo@

Re: update audio/cozy

[Stefan Hagen]

Solène Rapenne wrote (2023-05-07 15:39 CEST):
> this updates cozy to latest version
> 
> pygobject isn't required anymore, a few other python are now required
> for runtime. I included a patch that isn't merged in upstream yet, but
> without it you can't start cozy at all, except if you want to have to
> set 2 variables in your gsettings

I think you forgot to cvs add the patch :-)
I'm seeing:

$ cozy
['/usr/local/bin/cozy']
17:23:13 [MainThread  ] [applicatio] [INFO ]  ('openbsd', '7.3', '')
17:23:13 [MainThread  ] [applicatio] [INFO ]  Starting up cozy 1.2.1
17:23:13 [MainThread  ] [db] [INFO ]  SQLite version: 3.41.2
17:23:13 [Thread-1 (ru] [peewee.sql] [INFO ]  writer received shutdown request, 
exiting.
17:23:13 [MainThread  ] [applicatio] [INFO ]  libhandy version: 1
handle exception
Traceback (most recent call last):
  File "/usr/local/lib/python3.10/site-packages/cozy/application.py", line 99, 
in do_activate
self.app_controller = AppController(self, main_window_builder, self.ui)
  File 
"/usr/local/lib/python3.10/site-packages/cozy/architecture/singleton.py", line 
5, in __call__
cls._instances[cls] = super(Singleton, cls).__call__(*args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/cozy/app_controller.py", line 
52, in __init__
self.whats_new_window: WhatsNewWindow = WhatsNewWindow()
  File 
"/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py", 
line 36, in __init__
self._fill_window()
  File 
"/usr/local/lib/python3.10/site-packages/cozy/ui/widgets/whats_new_window.py", 
line 54, in _fill_window
last_launched_version = 
version.parse(self.app_settings.last_launched_version)
  File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line 52, 
in parse
return Version(version)
  File "/usr/local/lib/python3.10/site-packages/packaging/version.py", line 
197, in __init__
raise InvalidVersion(f"Invalid version: '{version}'")
packaging.version.InvalidVersion: Invalid version: 'None'

Best Regards,
Stefan

> Index: Makefile
> ===
> RCS file: /home/cvs/ports/audio/cozy/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- Makefile  24 Apr 2023 11:40:34 -  1.4
> +++ Makefile  7 May 2023 13:28:19 -
> @@ -2,8 +2,7 @@
>  
>  GH_ACCOUNT = geigi
>  GH_PROJECT = cozy
> -GH_TAGNAME = 1.1.2
> -REVISION =   1
> +GH_TAGNAME = 1.2.1
>  
>  CATEGORIES = audio
>  
> @@ -18,7 +17,6 @@
>  
>  COMMON_DEPENDS = audio/py-mutagen${MODPY_FLAVOR} \
>  databases/py-peewee${MODPY_FLAVOR} \
> - devel/py-gobject3${MODPY_FLAVOR} \
>   sysutils/py-distro${MODPY_FLAVOR} \
>   x11/elementary/granite \
>   x11/libhandy
> @@ -28,9 +26,15 @@
>  
>  RUN_DEPENDS =${COMMON_DEPENDS} \
>   devel/desktop-file-utils \
> + devel/py-tz${MODPY_FLAVOR} \
>   multimedia/gstreamer1/plugins-libav \
> + www/py-requests${MODPY_FLAVOR} \
>   x11/gnome/libdazzle \
>   x11/gtk+4,-guic
> +
> +# required for running tests
> +# one failing test due to missing network
> +PORTHOME=${WRKDIR}
>  
>  post-install:
>   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/audio/cozy/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 distinfo
> --- distinfo  8 Dec 2021 20:34:13 -   1.1.1.1
> +++ distinfo  7 May 2023 13:01:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (cozy-1.1.2.tar.gz) = BBIK0XIWURsesb2zzfsLYa0VsyTUeK+sRkYWKLo0Vw4=
> -SIZE (cozy-1.1.2.tar.gz) = 812775
> +SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
> +SIZE (cozy-1.2.1.tar.gz) = 831167
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/audio/cozy/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 18:20:07 -  1.2
> +++ pkg/PLIST 7 May 2023 13:03:18 -
> @@ -53,6 +53,7 @@
>  
> lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}artwork_cache.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}book.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}collation.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}model_base.${MODPY_PYC_MAGIC_TAG}pyc
>  
> 

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2023/05/07 09:20:49

Modified files:
fonts/comic-neue: Makefile distinfo 
fonts/comic-neue/pkg: PLIST 

Log message:
Update Comic Neue to version 2.51, add https for the website, and
re-install the fontconfig file so people can override it as described in
the pkg/README.

MAINTAINER timeout
OK sthen@

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/05/07 09:16:41

Modified files:
net/tdesktop   : Makefile distinfo 
Removed files:
net/tdesktop/patches: 
  
patch-Telegram_SourceFiles_api_api_chat_filters_cpp 
  
patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp 
  
patch-Telegram_SourceFiles_settings_settings_folders_cpp 
  
patch-Telegram_SourceFiles_window_window_filters_menu_cpp 

Log message:
pick up new tg_owt, cleanup/pull merged qt6 fix

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/05/07 09:11:38

Modified files:
net/tg_owt : Makefile distinfo 
net/tg_owt/pkg : PLIST 

Log message:
unbundle srtp, use security/libsrtp

update productivity/vym

[Solène Rapenne]

I updated vym to latest version, a lot of changes, it moved to GitHub
and from gmake to cmake, which simplify the port

it works fine for me, I needed to add a patch to fix unzip/zip binaries
path because it's hardcoded.

However, all the icons are installed in /usr/local/share/icons/ which
seems wrong (and portcheck reports it), but I don't know how to change
the path here, a little help would be appreciated :)

Index: Makefile
===
RCS file: /home/cvs/ports/productivity/vym/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile3 Oct 2022 21:18:19 -   1.33
+++ Makefile7 May 2023 15:00:48 -
@@ -1,55 +1,35 @@
 COMMENT=   generate and manipulate maps of your thoughts
 
-DISTNAME=  vym-2.6.0
+VERSION =  2.9.0
+GH_ACCOUNT =   insilmaril
+GH_PROJECT =   vym
+GH_TAGNAME =   v${VERSION}
+DISTNAME=  vym-${VERSION}
 CATEGORIES=productivity x11
-REVISION=  3
 
 HOMEPAGE=  https://www.insilmaril.de/vym/
 
 # modified GPLv2
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=vym/}
-EXTRACT_SUFX=  .tar.bz2
-
-WANTLIB += GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5Widgets Qt5Xml c m pthread
+WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport
+WANTLIB += Qt5Script Qt5Svg Qt5Widgets Qt5Xml c m pthread
 WANTLIB += ${COMPILER_LIBCXX}
 
-MODULES=   devel/qmake \
+MODULES=   devel/cmake \
x11/qt5
-MODQMAKE_ARGS= DEFINES+=VYM_DOCDIR=\\\"${PREFIX}/share/doc/vym\\\"
 
 RUN_DEPENDS=   archivers/zip \
archivers/unzip \
-   textproc/libxslt
+   devel/desktop-file-utils \
+   misc/shared-mime-info \
+   textproc/libxslt \
+   x11/gtk+4,-guic
 
-LIB_DEPENDS=   x11/qt5/qtsvg
+LIB_DEPENDS=   x11/qt5/qtscript \
+   x11/qt5/qtsvg
 
-PORTHOME=  ${WRKDIR}
+#PORTHOME= ${WRKDIR}
 NO_TEST=   Yes
-
-SHARE_DIRS=flags flags/freemind icons scripts styles
-
-pre-configure:
-   @echo "QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}" \
-   >> ${WRKSRC}/vym.pro
-   ${SUBST_CMD} ${WRKSRC}/mainwindow.cpp ${WRKSRC}/main.cpp
-
-do-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/vym ${PREFIX}/bin
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vym/
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/vym/
-   ${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/vym/
-   ${INSTALL_DATA} ${WRKSRC}/demos/* ${PREFIX}/share/examples/vym/
-.for i in ${SHARE_DIRS}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/vym/${i}
-   find ${WRKSRC}/${i}/ -type f -exec \
-   ${INSTALL_DATA} {} ${PREFIX}/share/vym/${i} \;
-.endfor
-   ${INSTALL_DATA} ${WRKSRC}/doc/vym.1.gz ${PREFIX}/man/man1
-   gunzip -f ${PREFIX}/man/man1/vym.1.gz
-   sed -i 's,/usr/share/doc/packages,${TRUEPREFIX}/share/doc,' \
-   ${PREFIX}/man/man1/vym.1
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/productivity/vym/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo29 Apr 2018 08:13:07 -  1.9
+++ distinfo7 May 2023 13:17:59 -
@@ -1,2 +1,2 @@
-SHA256 (vym-2.6.0.tar.bz2) = fcFyGvsnEJrcS0rqrGIX/dEpSzjoGzOgikdlYvvfoUE=
-SIZE (vym-2.6.0.tar.bz2) = 6766806
+SHA256 (vym-2.9.0.tar.gz) = ckUWgaOk4UlPJcH/nUEQwTgJXWPtTRRxx27ZB2BqfNs=
+SIZE (vym-2.9.0.tar.gz) = 8594682
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/productivity/vym/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST   11 Mar 2022 19:51:48 -  1.8
+++ pkg/PLIST   7 May 2023 14:02:43 -
@@ -1,211 +1,243 @@
 @bin bin/vym
-@man man/man1/vym.1
-share/doc/vym/
-share/doc/vym/vym.pdf
-share/doc/vym/vym_es.pdf
-share/doc/vym/vym_fr.pdf
-share/examples/vym/
-share/examples/vym/ao-report-example.vym
-share/examples/vym/frames.vym
-share/examples/vym/lifeforms.vym
-share/examples/vym/math.vym
-share/examples/vym/time-management.vym
-share/examples/vym/vym-contribute.vym
-share/vym/
-share/vym/flags/
-share/vym/flags/attach.png
-share/vym/flags/back.png
-share/vym/flags/bell.png
-share/vym/flags/bookmark.png
-share/vym/flags/clanbomber.png
-share/vym/flags/desktopnew.png
-share/vym/flags/flag-2arrow-down.png
-share/vym/flags/flag-2arrow-up.png
-share/vym/flags/flag-arrow-down.png
-share/vym/flags/flag-arrow-up.png
-share/vym/flags/flag-clock.png
-share/vym/flags/flag-cross-red.png
-share/vym/flags/flag-exclamationmark.png
-share/vym/flags/flag-flash.png
-share/vym/flags/flag-heart.png
-share/vym/flags/flag-hideexport.png
-share/vym/flags/flag-hook-green.png
-share/vym/flags/flag-info.png
-share/vym/flags/flag-lamp.png
-share/vym/flags/flag-lifebelt.png
-share/vym/flags/flag-note.png
-share/vym/flags/flag-phone.png
-share/vym/flags/flag-present.png

Re: update: spectrwm-3.4.1.20230507

[Bjorn Ketelaars]

On Sun 07/05/2023 11:16, Gleydson Soares wrote:
> update spectrwm to latest commit which includes a fix that addresses a
> crash found hardway while running ssh-askpass(1):
> 
> - Fix possible crash when a window claims to be transient for itself. 

Thanks for pursuing this!

OK bket@

update: spectrwm-3.4.1.20230507

[Gleydson Soares]

update spectrwm to latest commit which includes a fix that addresses a
crash found hardway while running ssh-askpass(1):

- Fix possible crash when a window claims to be transient for itself. 
Index: Makefile
===
RCS file: /cvs/ports/x11/spectrwm/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile23 Apr 2023 13:19:10 -  1.41
+++ Makefile7 May 2023 13:57:37 -
@@ -2,8 +2,8 @@ COMMENT=small tiling window manager
 
 GH_ACCOUNT=conformal
 GH_PROJECT=spectrwm
-GH_COMMIT= efc458efa5730680a5ff3805f6cf9d88dc88748b
-DISTNAME=  ${GH_PROJECT}-3.4.1.20230310
+GH_COMMIT= 06e3733175969c307a6fd47240a7a37b29d60513
+DISTNAME=  ${GH_PROJECT}-3.4.1.20230507
 
 SHARED_LIBS=   swmhack 1.0
 
Index: distinfo
===
RCS file: /cvs/ports/x11/spectrwm/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo23 Apr 2023 13:19:10 -  1.28
+++ distinfo7 May 2023 13:57:37 -
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 
8hjhkgcC+mA+PlGZxDIRmNXAOMMWLPLCtPuGlF2ghyw=
-SIZE (spectrwm-3.4.1.20230310-efc458ef.tar.gz) = 172141
+SHA256 (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 
1stB8RPoDDQYPHbg5BNgFYRdbqK8wvlyaKO8QMriJng=
+SIZE (spectrwm-3.4.1.20230507-06e37331.tar.gz) = 172202

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/07 08:46:42

Modified files:
math/netcdf: Makefile 

Log message:
Fix dependencies.

[update] graphics/krita-gmic-plugin 3.1.6.1 to 3.2.1.1

[Stefan Hagen]

Hi,

this is an update to the krita gmic plugin for the gmic version 3.2.1.

There's no changelog for the plugin itself. But this repo is used to
develop the plugin:
https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.1.1

I added post-configure bits to build the translation files. Otherwise the
build fails.

Comments / OKs?

Best Regards,
Stefan


Index: graphics/krita-gmic-plugin/Makefile
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- graphics/krita-gmic-plugin/Makefile 26 Sep 2022 11:03:06 -  1.7
+++ graphics/krita-gmic-plugin/Makefile 7 May 2023 14:20:12 -
@@ -1,12 +1,18 @@
 COMMENT =  krita gmic plugin
 
-V =3.1.6.1
+V =3.2.1.1
 DISTNAME = krita-gmic-plugin-${V}
 
 CATEGORIES =   graphics
 
 HOMEPAGE = https://krita.org
 
+# Info about this plugin:
+# https://invent.kde.org/graphics/krita/-/blob/master/README.packagers.md
+
+# Actually developed here:
+# https://github.com/amyspark/gmic
+
 MAINTAINER =   Stefan Hagen 
 
 # CeCILL, GPLv3
@@ -27,10 +33,16 @@ LIB_DEPENDS =   graphics/krita \
 
 WRKSRC =   ${WRKDIST}/gmic-qt
 
+USE_GMAKE =Yes
+
 CONFIGURE_ARGS +=  -DENABLE_SYSTEM_GMIC=false \
-DGMIC_QT_HOST=krita-plugin
 
 post-extract:
mv ${WRKDIR}/gmic-${V}-patched ${WRKDIST}
+
+post-configure:
+   chmod +x ${WRKSRC}/translations/lrelease.sh
+   cd ${WRKSRC}/translations/filters && gmake
 
 .include 
Index: graphics/krita-gmic-plugin/distinfo
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- graphics/krita-gmic-plugin/distinfo 26 Sep 2022 11:03:06 -  1.7
+++ graphics/krita-gmic-plugin/distinfo 7 May 2023 14:20:12 -
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.6.1-patched.tar.gz) = 
FeGVqnKKXYjTERoZnscwadBJGATdSa+0m+7D6F6T2ZQ=
-SIZE (gmic-3.1.6.1-patched.tar.gz) = 12025532
+SHA256 (gmic-3.2.1.1-patched.tar.gz) = 
c5n1+HyguVYfOPe5sAMxRjruHFAzYf961VGmTyqg4Ow=
+SIZE (gmic-3.2.1.1-patched.tar.gz) = 11700523
Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_gmic_cpp
--- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp   29 May 2022 
07:41:37 -  1.2
+++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp   7 May 2023 
14:20:12 -
@@ -1,19 +1,12 @@
 Index: src/gmic.cpp
 --- src/gmic.cpp.orig
 +++ src/gmic.cpp
-@@ -2518,6 +2518,8 @@ CImgList gmic::list_p_is_abort = CImgList& gmic_runs() {
+ inline void* get_tid() {
  #if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
 +#elif defined(__OpenBSD__)
 +  void* tid = (void*)pthread_self();
- #elif cimg_OS==1
-   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
- #elif cimg_OS==2
-@@ -2860,6 +2862,8 @@ gmic::~gmic() {
-   cimg::mutex(21);
- #if defined(__MACOSX__) || defined(__APPLE__)
-   void* tid = (void*)(cimg_ulong)getpid();
 +#elif defined(__OpenBSD__)
 +  void* tid = (void*)pthread_self();
  #elif cimg_OS==1

update audio/cozy

[Solène Rapenne]

this updates cozy to latest version

pygobject isn't required anymore, a few other python are now required
for runtime. I included a patch that isn't merged in upstream yet, but
without it you can't start cozy at all, except if you want to have to
set 2 variables in your gsettings

Index: Makefile
===
RCS file: /home/cvs/ports/audio/cozy/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile24 Apr 2023 11:40:34 -  1.4
+++ Makefile7 May 2023 13:28:19 -
@@ -2,8 +2,7 @@
 
 GH_ACCOUNT =   geigi
 GH_PROJECT =   cozy
-GH_TAGNAME =   1.1.2
-REVISION = 1
+GH_TAGNAME =   1.2.1
 
 CATEGORIES =   audio
 
@@ -18,7 +17,6 @@
 
 COMMON_DEPENDS =   audio/py-mutagen${MODPY_FLAVOR} \
 databases/py-peewee${MODPY_FLAVOR} \
-   devel/py-gobject3${MODPY_FLAVOR} \
sysutils/py-distro${MODPY_FLAVOR} \
x11/elementary/granite \
x11/libhandy
@@ -28,9 +26,15 @@
 
 RUN_DEPENDS =  ${COMMON_DEPENDS} \
devel/desktop-file-utils \
+   devel/py-tz${MODPY_FLAVOR} \
multimedia/gstreamer1/plugins-libav \
+   www/py-requests${MODPY_FLAVOR} \
x11/gnome/libdazzle \
x11/gtk+4,-guic
+
+# required for running tests
+# one failing test due to missing network
+PORTHOME=  ${WRKDIR}
 
 post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}
Index: distinfo
===
RCS file: /home/cvs/ports/audio/cozy/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo8 Dec 2021 20:34:13 -   1.1.1.1
+++ distinfo7 May 2023 13:01:16 -
@@ -1,2 +1,2 @@
-SHA256 (cozy-1.1.2.tar.gz) = BBIK0XIWURsesb2zzfsLYa0VsyTUeK+sRkYWKLo0Vw4=
-SIZE (cozy-1.1.2.tar.gz) = 812775
+SHA256 (cozy-1.2.1.tar.gz) = VSLdPiqop1R4UVxK4pnnH6MqkZcDzEpTL7p5c2PMWEQ=
+SIZE (cozy-1.2.1.tar.gz) = 831167
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/audio/cozy/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST   11 Mar 2022 18:20:07 -  1.2
+++ pkg/PLIST   7 May 2023 13:03:18 -
@@ -53,6 +53,7 @@
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}artwork_cache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}book.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}collation.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}model_base.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}offline_cache.${MODPY_PYC_MAGIC_TAG}pyc
@@ -63,6 +64,7 @@
 
lib/python${MODPY_VERSION}/site-packages/cozy/db/${MODPY_PYCACHE}track_to_file.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/cozy/db/artwork_cache.py
 lib/python${MODPY_VERSION}/site-packages/cozy/db/book.py
+lib/python${MODPY_VERSION}/site-packages/cozy/db/collation.py
 lib/python${MODPY_VERSION}/site-packages/cozy/db/file.py
 lib/python${MODPY_VERSION}/site-packages/cozy/db/model_base.py
 lib/python${MODPY_VERSION}/site-packages/cozy/db/offline_cache.py
@@ -122,7 +124,6 @@
 
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}single_file_chapter.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}storage.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}storage_block_list.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/cozy/model/${MODPY_PYCACHE}track.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/cozy/model/book.py
 lib/python${MODPY_VERSION}/site-packages/cozy/model/chapter.py
@@ -131,7 +132,6 @@
 lib/python${MODPY_VERSION}/site-packages/cozy/model/settings.py
 lib/python${MODPY_VERSION}/site-packages/cozy/model/single_file_chapter.py
 lib/python${MODPY_VERSION}/site-packages/cozy/model/storage.py
-lib/python${MODPY_VERSION}/site-packages/cozy/model/storage_block_list.py
 lib/python${MODPY_VERSION}/site-packages/cozy/model/track.py
 lib/python${MODPY_VERSION}/site-packages/cozy/open_view.py
 lib/python${MODPY_VERSION}/site-packages/cozy/power_manager.py
@@ -167,8 +167,8 @@
 
lib/python${MODPY_VERSION}/site-packages/cozy/ui/${MODPY_PYCACHE}media_controller.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 08:39:14

Modified files:
devel/p5-POE   : Makefile distinfo 
devel/p5-POE/pkg: DESCR 

Log message:
update p5-POE to 1.370

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2023/05/07 07:36:13

ports/audio/cozy/patches

Update of /cvs/ports/audio/cozy/patches
In directory cvs.openbsd.org:/tmp/cvs-serv54489/patches

Log Message:
Directory /cvs/ports/audio/cozy/patches added to the repository

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 06:37:51

Modified files:
devel/p5-Module-Build: Makefile distinfo 
devel/p5-Module-Build/pkg: DESCR 

Log message:
update p5-Module-Build to 0.4234

[update] graphics/darktable 3.6.1 to 4.2.1

[Stefan Hagen]

Hi,

this updates darktable to the latest version.

The current darktable is broken:

$ darktable
(process:71741): libsoup-ERROR **: 13:55:36.734: libsoup3 symbols detected. 
Using libsoup2 and libsoup3 in the same process is not supported.
Trace/BPT trap
$

This happens because darktable pulls in geo/osm-gps-map, which is built
with libsoup3 now, while darktable requires libsoup2.

# Port changes:
- removed geo/osm-gps-map (and therefore maps support)
- added -DDONT_USE_INTERNAL_LIBRAW=ON; The bundled version works fine, but why
  build it twice, when we have it in ports anyway.
- update MODLUA_VERSION to lua5.4, otherwise it uses the bundled lua5.4
- added WANTLIB: cups, raw, SDL2
- added LIB_DEPENDS: print/cups,-libs, graphics/libraw, devel/sdl2
- updated patches (new fix: swap32 renamed to oswap32 because we have a
  similar named function in /usr/include/endian.h)

There's a bit of churn because I sorted the libs.

# Software changes:
Quite a lot with close to 5k commits.

https://github.com/darktable-org/darktable/releases/tag/release-4.2.1
https://github.com/darktable-org/darktable/releases/tag/release-4.2.0
https://github.com/darktable-org/darktable/releases/tag/release-4.1.0
https://github.com/darktable-org/darktable/releases/tag/release-4.0.1
https://github.com/darktable-org/darktable/releases/tag/release-4.0.0
https://github.com/darktable-org/darktable/releases/tag/release-3.9.0
https://github.com/darktable-org/darktable/releases/tag/release-3.8.1
https://github.com/darktable-org/darktable/releases/tag/release-3.8.0
https://github.com/darktable-org/darktable/releases/tag/release-3.7.0

Note for testers:
Please do cp -r ~/.config/darktable ~/.config/darktable.backup
Darktable will upgrade the library and configuration files.
Afterwards they will be incompatible with older versions.

Comments / OKs?

Best Regards,
Stefan

Index: graphics/darktable/Makefile
===
RCS file: /cvs/ports/graphics/darktable/Makefile,v
retrieving revision 1.116
diff -u -p -u -p -r1.116 Makefile
--- graphics/darktable/Makefile 24 Apr 2023 11:40:43 -  1.116
+++ graphics/darktable/Makefile 7 May 2023 11:52:21 -
@@ -2,11 +2,10 @@ ONLY_FOR_ARCHS=   amd64 aarch64
 
 COMMENT=   virtual lighttable and darkroom for photographers
 
-V= 3.6.1
+V= 4.2.1
 DISTNAME=  darktable-$V
 PORTROACH= limitw:1,even skipv:release-$V
 EXTRACT_SUFX=  .tar.xz
-REVISION=  0
 
 CATEGORIES=graphics x11
 
@@ -15,46 +14,52 @@ HOMEPAGE=   https://www.darktable.org/
 # GPLv3+
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += GraphicsMagick ICE Iex-3_1 IlmThread-3_1
-WANTLIB += Imath-3_1 SM X11 Xext Xrandr atk-1.0 avif c cairo cairo-gobject
-WANTLIB += curl exiv2 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gphoto2 gphoto2_port gthread-2.0
-WANTLIB += gtk-3 harfbuzz intl jpeg json-glib-1.0 lcms2 lensfun
-WANTLIB += m openjp2 osmgpsmap-1.0 pango-1.0 pangocairo-1.0 png
-WANTLIB += pugixml rsvg-2 secret-1 soup-2.4 sqlite3 tiff webp
-WANTLIB += xml2 z OpenEXR-3_1 icudata icui18n icuuc
+WANTLIB =  ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} GraphicsMagick ICE
+WANTLIB += Iex-3_1 IlmThread-3_1 Imath-3_1 OpenEXR-3_1 SDL2 SM X11 Xext
+WANTLIB += Xrandr atk-1.0 avif c cairo cairo-gobject cups curl exiv2
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 gphoto2 gphoto2_port gthread-2.0 gtk-3 harfbuzz
+WANTLIB += heif icudata icui18n icuuc intl jpeg json-glib-1.0 jxl
+WANTLIB += jxl_threads lcms2 lensfun m openjp2 pango-1.0 pangocairo-1.0
+WANTLIB += png pugixml raw rsvg-2 secret-1 soup-2.4 sqlite3 tiff webp
+WANTLIB += webpmux xml2 z
+
 
 MASTER_SITES=  
https://github.com/darktable-org/darktable/releases/download/release-$V/
 
 MODULES=   devel/cmake \
lang/lua \
textproc/intltool
-MODLUA_VERSION=5.3
+
+MODLUA_VERSION=5.4
 
 # TLS, modern C++
 COMPILER = base-clang
 
-BUILD_DEPENDS= sysutils/coreutils \
-   graphics/p5-Image-ExifTool \
+BUILD_DEPENDS= graphics/p5-Image-ExifTool \
shells/bash \
+   sysutils/coreutils \
textproc/libxslt
+
 RUN_DEPENDS=   devel/desktop-file-utils \
graphics/p5-Image-ExifTool \
x11/gtk+4,-guic
+
 LIB_DEPENDS=   devel/gettext,-runtime \
devel/json-glib \
devel/libsoup \
-   geo/osm-gps-map \
-   graphics/GraphicsMagick \
+   devel/sdl2 \
graphics/exiv2>=0.22 \
+   graphics/GraphicsMagick \
graphics/lcms2 \
+   graphics/lensfun \
graphics/libavif \
graphics/libgphoto2>=2.5.0 \
-   graphics/lensfun \
+   graphics/libraw \
graphics/openexr \
graphics/openjp2 \
 

[new] www/smarc: static web mail archive generator

[Omar Polo]

please find attached a port for `smarc', a little thingy i've been
working on recently.  it's what powers the got archive at
, having it the ports tree would
simplify the usage and maybe be useful to others as well.
ok to import?

% pkg_info smarc
Information for inst:smarc-0.1

Comment:
static web mail archive generator

Description:
smarc is a collection of scripts to generate a static mail archive from
a given Maildir.  It also optionally provides a FastCGI server to allow
searching in the archive, powered by a sqlite3 database.

The setup process is documented in smarc(7).

Maintainer: Omar Polo 

WWW: https://projects.omarpolo.com/smarc.html




smarc.tar.gz
Description: GNU Zip compressed data

Re: new converters/p5-Sereal

[Benoit Lecocq]

On 06/05/2023 23:56, Alexander Bluhm wrote:

Hi,

ok to import p5-Sereal-5.004 ?


ok benoit@



bluhm

Comment:
fast, compact, powerful binary (de-)serialization

Description:
Sereal is an efficient, compact-output, binary and feature-rich
serialization protocol. The Perl encoder is implemented as the
Sereal::Encoder module, the Perl decoder correspondingly as
Sereal::Decoder. They are distributed separately to allow for safe
upgrading without downtime. (Hint: Upgrade the decoder everywhere
first, then the encoder.)

This "Sereal" module is a very thin wrapper around both
"Sereal::Encoder" and "Sereal::Decoder". It depends on both and loads
both. So if you have a user of both encoder and decoder, it is enough
to depend on a particular version of "Sereal" and you'll get the most
recent released versions of "Sereal::Encoder" and "Sereal::Decoder"
whose version is smaller than or equal to the version of "Sereal" you
depend on.

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 05:19:34

Modified files:
security/p5-CryptX: Makefile distinfo 

Log message:
update p5-CryptX to 0.078

Re: [new] Ymuse

[Antoine Jacoutot]

On Sun, May 07, 2023 at 12:57:11PM +0200, Antoine Jacoutot wrote:
> Hi.
> 
> OK to import?
> 
> Information for inst:ymuse-0.21
> 
> Comment:
> GTK front-end for MPD
> 
> Description:
> Ymuse is an easy, functional, and snappy GTK front-end (client) for Music 
> Player
> Daemon written in Go.
> 
> Maintainer: Antoine Jacoutot 
> 
> WWW: https://yktoo.com/en/software/ymuse/

Oops, and now with 100% more dependencies...


-- 
Antoine


ymuse.tgz
Description: application/tar-gz

[new] Ymuse

[Antoine Jacoutot]

Hi.

OK to import?

Information for inst:ymuse-0.21

Comment:
GTK front-end for MPD

Description:
Ymuse is an easy, functional, and snappy GTK front-end (client) for Music Player
Daemon written in Go.

Maintainer: Antoine Jacoutot 

WWW: https://yktoo.com/en/software/ymuse/


-- 
Antoine


ymuse.tgz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 04:42:42

Modified files:
security/p5-Crypt-Argon2: Makefile distinfo 
security/p5-Crypt-Argon2/pkg: PLIST 

Log message:
update p5-Crypt-Argon2 to 0.017

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2023/05/07 04:37:11

Modified files:
editors/kakoune: Makefile 

Log message:
maintainer shared they can't maintain anymore

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 04:23:30

Modified files:
security/p5-Crypt-LE: Makefile distinfo 
security/p5-Crypt-LE/pkg: DESCR 

Log message:
update p5-Crypt-LE to 0.39

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/05/07 04:12:46

Modified files:
net/irssi  : Makefile 
Added files:
net/irssi/patches: patch-src_core_ignore_c 
   patch-src_fe-common_core_hilight-text_c 

Log message:
irssi: don't use G_REGEX_OPTIMIZE; avoids an annoying warning from glib
when adding regexps (for /hilight or /ignore) because the pcre jit is
disabled to avoid w+x requirement.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/07 04:05:34

Modified files:
audio/audacity : Makefile distinfo 
audio/audacity/patches: patch-lib-src_portsmf_allegro_h 

Log message:
Update to audacity-3.3.2.

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 03:50:32

Modified files:
devel/p5-Path-Tiny: Makefile distinfo 
devel/p5-Path-Tiny/pkg: DESCR 

Log message:
update p5-Path-Tiny to 0.144

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/05/07 03:49:47

Modified files:
x11/gnome/zenity: Makefile 
Added files:
x11/gnome/zenity/patches: patch-data_meson_build 

Log message:
Disable broken man page generation (i.e. don't pick up help2man).
https://gitlab.gnome.org/GNOME/zenity/-/issues/53

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 03:02:35

Modified files:
devel/p5-Devel-Cover: Makefile 

Log message:
Add some build dependencies that are explicitly checked by Makefile.PL.

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2023/05/07 02:38:04

Modified files:
www/chromium/patches: 
  
patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config_components_h
 
  
patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config_h 
www/ungoogled-chromium/patches: 

patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config_components_h
 

patch-third_party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config_h 

Log message:
update ffmpeg config on arm64 to unbreak build

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 02:28:24

Modified files:
converters : Makefile 

Log message:
+p5-Sereal

CVS: cvs.openbsd.org: ports

[Alexander Bluhm]

CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/05/07 02:21:56

Log message:
import p5-Sereal 5.004
OK benoit@

Comment:
fast, compact, powerful binary (de-)serialization

Description:
Sereal is an efficient, compact-output, binary and feature-rich
serialization protocol. The Perl encoder is implemented as the
Sereal::Encoder module, the Perl decoder correspondingly as
Sereal::Decoder. They are distributed separately to allow for safe
upgrading without downtime. (Hint: Upgrade the decoder everywhere
first, then the encoder.)

This "Sereal" module is a very thin wrapper around both
"Sereal::Encoder" and "Sereal::Decoder". It depends on both and loads
both. So if you have a user of both encoder and decoder, it is enough
to depend on a particular version of "Sereal" and you'll get the most
recent released versions of "Sereal::Encoder" and "Sereal::Decoder"
whose version is smaller than or equal to the version of "Sereal" you
depend on.

Status:

Vendor Tag: bluhm
Release Tags:   bluhm_20230507

N ports/converters/p5-Sereal/Makefile
N ports/converters/p5-Sereal/distinfo
N ports/converters/p5-Sereal/pkg/DESCR
N ports/converters/p5-Sereal/pkg/PLIST

No conflicts created by this import

Re: [new] brogue-1.12

[Anton Konyahin]

On 02/05, Omar Polo wrote:

On 2023/05/02 22:21:59 +0300, Anton Konyahin  wrote:

On 02/05, Omar Polo wrote:
>I'm recluntant to patch like this an upstream software since while
>for now it could work fine, these kind of changes are very likely to
>break in future updates.

At first, I tried to fix all warnings in brogue, but there is a
hundreds of strcpy and other sprintf, so I gave up. I am glad to see
fewer patches in port, really.


for fix like strcpy/sprintf etc, especially when there are a lot to
fix, working with upstream is a better option.  You can try to start
fixing a few of them, sending a patch and see how it goes.  Time
allowing, you can follow-up with more fixes.


I tested your tarball and everything works like a charm. Should I do
something else for this port?


The policy is two ok in order to import something new.  My tarball was
obviously ok op@ to import, so we just need to wait for another
developer to import with my ok :)

I've played it for a bit, it's fun and the graphics are nice.  I'd
like to see it being imported.

Thanks!



Ping. Can somebody else look at this port, please?


brogue.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2023/05/07 00:54:21

Modified files:
graphics/imlib2: Makefile distinfo 

Log message:
update graphics/imlib2 to 1.11

mostly bugfixes.  Major cranked due to a bump of IMLIB2_LOADER_VERSION
to stay on the safe side.

while here, add the missing COMPILER line too.

CVS: cvs.openbsd.org: ports

[Omar Polo]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2023/05/07 00:49:49

Modified files:
archivers/zpaqfranz: Makefile distinfo 

Log message:
update archivers/zpaqfranz to 58.2; from maintainer, thanks!

CVS: cvs.openbsd.org: ports

[Matthieu Herrb]

CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2023/05/07 00:39:28

Modified files:
fonts/atkinson-hyperlegible: Makefile 
fonts/atkinson-hyperlegible/pkg: PLIST 

Log message:
Switch to OTF to fix empty glyphs in emacs-gtk reported by florian@
ok sthen@, phessler@, florian@

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/05/07 00:30:14

Modified files:
infrastructure/lib/OpenBSD: FS2.pm 

Log message:
zap legacy hack that dates back from when directory handles
didn't have autovivify

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/05/07 00:26:41

Modified files:
infrastructure/lib/DPB: Fetch.pm Job.pm PortBuilder.pm Vars.pm 
infrastructure/lib/DPB/Core: Distant.pm 

Log message:
add signatures to the few unannotated subs
after looking things over for parameters.

sadly, SIG handlers do not have reliable signatures so far

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2023/05/07 00:24:45

Modified files:
infrastructure/bin: dpb 

Log message:
decorate the SPINNING messages like the rest so I get a better chance
to figure out when they happen

[maintainer update] dunst-1.9.2

[Timo Myyrä]

Hi,

Here's a bit delayed update to dunst port.

Tweaked two regex test cases which seem to behave differently between OpenBSD
and Linux.
Seems to be working on amd64.

Timo

diff /usr/ports
commit - 006e9b20e2a3475a2347ae53fa188aac011d22d0
path + /usr/ports
blob - 36d61a448bda5246c0d1b41144661adcff637cc1
file + x11/dunst/Makefile
--- x11/dunst/Makefile
+++ x11/dunst/Makefile
@@ -2,7 +2,7 @@ GH_TAGNAME =v1.9.0
 
 GH_ACCOUNT =   dunst-project
 GH_PROJECT =   dunst
-GH_TAGNAME =   v1.9.0
+GH_TAGNAME =   v1.9.2
 
 CATEGORIES =   x11
 
blob - 1941e141aa88a482621ddf77a197a9985b6e1c9b
file + x11/dunst/distinfo
--- x11/dunst/distinfo
+++ x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.9.0.tar.gz) = t7jX1lYLskGx5NN+uncM3xm51dv8HU1HVyrWdvP3yYo=
-SIZE (dunst-1.9.0.tar.gz) = 4609222
+SHA256 (dunst-1.9.2.tar.gz) = +mzkXAr0uuGIsNZ5pbqS+Pm35DAbsbtHboLfJrzp5xo=
+SIZE (dunst-1.9.2.tar.gz) = 4614703
blob - aac51d44bcda0dd6dfe4ecf99ea7328927098788
file + x11/dunst/patches/patch-config_mk
--- x11/dunst/patches/patch-config_mk
+++ x11/dunst/patches/patch-config_mk
@@ -1,7 +1,7 @@
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -36,8 +36,8 @@ endif
+@@ -42,8 +42,8 @@ endif
  
  # flags
  DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE 
-DVERSION=\"${VERSION}\" -DSYSCONFDIR=\"${SYSCONFDIR}\"
blob - 352d61b0fb04ec1bf550992b0490dbb93f7a01b6
file + x11/dunst/patches/patch-docs_dunst_5_pod
--- x11/dunst/patches/patch-docs_dunst_5_pod
+++ x11/dunst/patches/patch-docs_dunst_5_pod
@@ -1,7 +1,7 @@
 Index: docs/dunst.5.pod
 --- docs/dunst.5.pod.orig
 +++ docs/dunst.5.pod
-@@ -399,7 +399,7 @@ Hide the count of stacked duplicate notifications.
+@@ -409,7 +409,7 @@ Hide the count of stacked duplicate notifications.
  Show an indicator if a notification contains actions and/or open-able URLs. 
See
  ACTIONS below for further details.
  
@@ -10,7 +10,7 @@ Index: docs/dunst.5.pod
  
  Can be set to a colon-separated list of paths to search for icons to use with
  notifications.
-@@ -413,7 +413,7 @@ replace this and will need new settings.
+@@ -423,7 +423,7 @@ replace this and will need new settings.
  Comma-separated of names of the the themes to use for looking up icons. This 
has
  to be the name of the directory in which the theme is located, not the
  human-friendly name of the theme. So for example, the theme B is
@@ -19,7 +19,7 @@ Index: docs/dunst.5.pod
  theme to B.
  
  The first theme in the list is the most important. Only if the icon cannot be
-@@ -451,12 +451,12 @@ Maximum number of notifications that will be kept in h
+@@ -461,12 +461,12 @@ Maximum number of notifications that will be kept in h
  is reached, older notifications will be deleted once a new one arrives. See
  HISTORY.
  
blob - 8ad0b097d1fbb4b654e586efcc31ffdc0cf32d28
file + x11/dunst/patches/patch-dunstrc
--- x11/dunst/patches/patch-dunstrc
+++ x11/dunst/patches/patch-dunstrc
@@ -1,7 +1,7 @@
 Index: dunstrc
 --- dunstrc.orig
 +++ dunstrc
-@@ -212,7 +212,7 @@
+@@ -217,7 +217,7 @@
  max_icon_size = 128
  
  # Paths to default icons (only neccesary when not using recursive icon 
lookup)
@@ -10,7 +10,7 @@ Index: dunstrc
  
  ### History ###
  
-@@ -226,10 +226,10 @@
+@@ -231,10 +231,10 @@
  ### Misc/Advanced ###
  
  # dmenu path.
blob - 530744f08ce2aa03548075fe61320f7cdf36e110
file + x11/dunst/patches/patch-src_dunst_c
--- x11/dunst/patches/patch-src_dunst_c
+++ x11/dunst/patches/patch-src_dunst_c
@@ -1,9 +1,9 @@
 Index: src/dunst.c
 --- src/dunst.c.orig
 +++ src/dunst.c
-@@ -96,7 +96,7 @@ static gboolean run(void *data)
- gint64 sleep = queues_get_next_datachange(now);
- gint64 timeout_at = now + sleep;
+@@ -100,7 +100,7 @@ static gboolean run(void *data)
+ gint64 sleep = timeout_at - now;
+ sleep = MAX(sleep, 1000); // Sleep at least 1ms
  
 -LOG_D("Sleeping for %li ms", sleep/1000);
 +LOG_D("Sleeping for %lli ms", (long long)sleep/1000);
blob - 3402cef0c0229e5e6cc686acf71eb5a7b40993e7
file + /dev/null
--- x11/dunst/patches/patch-src_icon-lookup_c
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't use malloc.h header on OpenBSD.
-
-Index: src/icon-lookup.c
 src/icon-lookup.c.orig
-+++ src/icon-lookup.c
-@@ -3,7 +3,6 @@
- 
- #include 
- #include 
--#include 
- #include 
- #include 
- 
blob - 1cfcbf811904bc7b5ce8b5838b9fb97f8fdee478
file + x11/dunst/patches/patch-src_notification_c
--- x11/dunst/patches/patch-src_notification_c
+++ x11/dunst/patches/patch-src_notification_c
@@ -21,7 +21,7 @@ Index: src/notification.c
  safe_setenv("DUNST_APP_NAME",  appname);
  safe_setenv("DUNST_SUMMARY",   summary);
  safe_setenv("DUNST_BODY",  body);
-@@ -683,14 +683,14 @@ void notification_update_text_to_render(struct notific
+@@ -684,14 +684,14 @@ void notification_update_text_to_render(struct notific
  char