Re: current sabnzbd and sabyenc
On Thu 17/03/2022 21:56, Justin Yates Fletcher wrote:
> Hi all,
>
> Long time user, but first time in ports@ I think. I've been following
> -current for some months now and all has generally been fine, but I have hit
> a problem that I think might be something to bring up here.
>
> The news/sabnzbd Makefile lists the version:
> VERSION = 3.5.2
>
> With a dependency on py-sabyenc:
> news/py-sabyenc${MODPY_FLAVOR}>=5.1.0
>
> Yet 3.5.2 requires version sabyenc 4.0.0:
>
> https://github.com/sabnzbd/sabnzbd/blob/3.5.2/sabnzbd/constants.py#L63
>
> SABYENC_VERSION_REQUIRED = "4.0.0"
>
> Even the most recent tag sabsnbd tag still requires sabyenc 4.0.0
>
> https://github.com/sabnzbd/sabnzbd/blob/3.5.3/sabnzbd/constants.py#L63
>
> SABYENC_VERSION_REQUIRED = "4.0.0"
>
> It is only the "develop" branch that depends on sabyenc 5.1.0
>
> https://github.com/sabnzbd/sabnzbd/blob/develop/sabnzbd/constants.py#L63
>
> SABYENC_VERSION_REQUIRED = "5.1.0"
>
> Is this just a mismatch that will be sorted out as the ports stabilize for
> the next release? Or a "bug" where sabyenc needs to be rolled back to
> 4.0.0? Or..??
My bad, sorry! I just reverted py-sabyenc (and set EPOCH), and updated
sabnzbd.
[sparc64] fix build of qtwebkit
In gstreamer 1.20, GstAppSinkCallbacks grew a new member. An initializer
needs to be adapted to keep ports-gcc happy.
For details see the change to gstappsink.h in
https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1046/diffs
Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile11 Mar 2022 20:17:10 - 1.36
+++ Makefile17 Mar 2022 19:34:21 -
@@ -13,7 +13,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH =0
-REVISION = 6
+REVISION = 7
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
SHARED_LIBS += Qt5WebKitWidgets3.1 # 5.9
Index:
patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
===
RCS file:
patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
diff -N
patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++
patches/patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer_cpp
17 Mar 2022 19:34:14 -
@@ -0,0 +1,16 @@
+gstreamer 1.20 grew a new_event callback in GstAppSinkCallbacks which
+broke the build with ports-gcc.
+
+error: braces around scalar initializer for type 'gboolean (*)(GstAppSink*,
gpointer)' {aka 'int (*)(_GstAppSink*, void*)'}
+
+Index: Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
+--- Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp.orig
Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
+@@ -230,6 +230,7 @@ void AudioFileReader::handleNewDeinterleavePad(GstPad*
+ [](GstAppSink* sink, gpointer userData) -> GstFlowReturn {
+ return
static_cast(userData)->handleSample(sink);
+ },
++nullptr, // new_event
+ { nullptr }
+ };
+ gst_app_sink_set_callbacks(GST_APP_SINK(sink), &callbacks, this, 0);
Re: Anki crashing when trying to import/export decks.
On Wed, 16 Mar 2022 16:49:24 + Stuart Henderson wrote: > On 2022/03/16 17:05, Solene Rapenne wrote: > > On Wed, 16 Mar 2022 06:40:53 + > > Hashim Mahmoud : > > > > > On Tue, 15 Mar 2022 20:10:17 + > > > Hashim Mahmoud wrote: > > > > > > > Anki works with full functionality as expected, but when > > > > clicking "File>Import" or clicking the "File>Export" button, > > > > and selecting any export format, whether checking "Include > > > > media" or not, crashes the program, with the attached error > > > > log. > > > > > > Forgot to mention, this is on OpenBSD 7.0. > > > > > > > I can reproduce this on -current > > > > A backtrace would be nice.. OK... I think I isolated the problem. This seems to be a theme related issue, or at least, an xfce4-appearance-settings theming issue. I use Nordic theme, Papirus-Dark icons and Sans Regular font in Xfce settings. I replicated these in a .gtkrc-2.0 and settings.ini for gtk3 so I can use these themes in cwm, and they work fine for most apps (claws mail, thunar, etc). No theme at all applies to Anki, so it looks ugly as hell... but exporting/importing works. I have no idea what to do from there, but at least we narrowed down where the problem is.
Re: [NEW] cad/lepton-eda
On Thu, Mar 17, 2022 at 09:09:26PM +, Stuart Henderson wrote: > On 2021/06/21 11:38, Dmitry Pryakhin wrote: > > Hello friends, > > > > I am one of the developers of the Lepton Electronic Design > > Automation suite (Lepton EDA) [1], [2]. It has been ported > > to several platforms [3], and we would be glad to see it in > > the OpenBSD Ports Collection, too. > > Could you please take a look at the port cad/lepton-eda > > I've created (available on github [4] and attached)? > > Tested on amd64 with the stable- ports tree. > > Please advice and correct me if something is wrong. > > Thank you. > > > > pkg/DESCR: > > -- > > Lepton EDA is a suite of free software tools for designing > > electronics. It provides schematic capture, netlisting into > > over 30 netlist formats, and many other features. > > It was forked from the gEDA/gaf suite in late 2016 by most > > of its active developers at that time. > > It's backward compatible with its predecessor and > > supports the same file format for symbols and schematics. > > It's in active development and well supported. > > > > [1] https://github.com/lepton-eda/lepton-eda > > [2] https://github.com/lepton-eda/lepton-eda/wiki/Screenshots > > [3] https://github.com/lepton-eda/lepton-eda/wiki/Portability > > [4] https://github.com/graahnul-grom/openbsd-lepton-eda > > > > Regards, > > Dmitry. > > > > https://graahnul-grom.github.io > > Hi Dmitry, sorry this slipped through the cracks. > > I have updated to 1.9.17 and fixed some minor ports issues (mostly > to do with picking up software which is present at build time; during > bulk package builds other packages are added and removed all the time > so anything which is picked up by autoconf must either be listed as a > dependency or disabled). > > I don't know the software well, but I can run leptop-schematic and open > the example files and this all looks OK. (I am doing this all on > -current). > > One thing I have found is that at first startup, guile compiles files > to ~/.cache/guile which is rather slow. I see there's something in > the build system to precompile these but I haven't figured out how > to get that to work as part of the port build. You'll see my commented- > out lines in the Makefile in the attached port - do you have any > ideas? > > While it would be nice to have that done, I'd also be happy enough with > importing this as-is and look at precompile later, I think it's generally > in good shape. > > Would any ports dev like to give me an OK to import? > Looks ok here from a ports perspective. ok. -- Tracey Emery
Re: [NEW] cad/lepton-eda
On 2021/06/21 11:38, Dmitry Pryakhin wrote: > Hello friends, > > I am one of the developers of the Lepton Electronic Design > Automation suite (Lepton EDA) [1], [2]. It has been ported > to several platforms [3], and we would be glad to see it in > the OpenBSD Ports Collection, too. > Could you please take a look at the port cad/lepton-eda > I've created (available on github [4] and attached)? > Tested on amd64 with the stable- ports tree. > Please advice and correct me if something is wrong. > Thank you. > > pkg/DESCR: > -- > Lepton EDA is a suite of free software tools for designing > electronics. It provides schematic capture, netlisting into > over 30 netlist formats, and many other features. > It was forked from the gEDA/gaf suite in late 2016 by most > of its active developers at that time. > It's backward compatible with its predecessor and > supports the same file format for symbols and schematics. > It's in active development and well supported. > > [1] https://github.com/lepton-eda/lepton-eda > [2] https://github.com/lepton-eda/lepton-eda/wiki/Screenshots > [3] https://github.com/lepton-eda/lepton-eda/wiki/Portability > [4] https://github.com/graahnul-grom/openbsd-lepton-eda > > Regards, > Dmitry. > > https://graahnul-grom.github.io Hi Dmitry, sorry this slipped through the cracks. I have updated to 1.9.17 and fixed some minor ports issues (mostly to do with picking up software which is present at build time; during bulk package builds other packages are added and removed all the time so anything which is picked up by autoconf must either be listed as a dependency or disabled). I don't know the software well, but I can run leptop-schematic and open the example files and this all looks OK. (I am doing this all on -current). One thing I have found is that at first startup, guile compiles files to ~/.cache/guile which is rather slow. I see there's something in the build system to precompile these but I haven't figured out how to get that to work as part of the port build. You'll see my commented- out lines in the Makefile in the attached port - do you have any ideas? While it would be nice to have that done, I'd also be happy enough with importing this as-is and look at precompile later, I think it's generally in good shape. Would any ports dev like to give me an OK to import? lepton-eda.tgz Description: application/tar-gz
current sabnzbd and sabyenc
Hi all,
Long time user, but first time in ports@ I think. I've been following
-current for some months now and all has generally been fine, but I
have hit a problem that I think might be something to bring up here.
The news/sabnzbd Makefile lists the version:
VERSION = 3.5.2
With a dependency on py-sabyenc:
news/py-sabyenc${MODPY_FLAVOR}>=5.1.0
Yet 3.5.2 requires version sabyenc 4.0.0:
https://github.com/sabnzbd/sabnzbd/blob/3.5.2/sabnzbd/constants.py#L63
SABYENC_VERSION_REQUIRED = "4.0.0"
Even the most recent tag sabsnbd tag still requires sabyenc 4.0.0
https://github.com/sabnzbd/sabnzbd/blob/3.5.3/sabnzbd/constants.py#L63
SABYENC_VERSION_REQUIRED = "4.0.0"
It is only the "develop" branch that depends on sabyenc 5.1.0
https://github.com/sabnzbd/sabnzbd/blob/develop/sabnzbd/constants.py#L63
SABYENC_VERSION_REQUIRED = "5.1.0"
Is this just a mismatch that will be sorted out as the ports stabilize
for the next release? Or a "bug" where sabyenc needs to be rolled back
to 4.0.0? Or..??
Thanks,
Justin
Re: UPDATE: sysutils/py-pynetbox
On 2022/03/17 20:03, Ricardo wrote:
> Hey sthen@
>
> Oh, I failed to see that warning about soon to be deprecated method. Sorry.
>
> OK, I think the issue is with docker testing from tests/integration/*
yes.
> so I'm passing --fixtures to pytest to avoid all those tests.
that is a pytest command to list fixtures which are available to pytest,
it means that is does not try to run any tests at all. this is one way to
disable the integration tests:
Index: Makefile
===
RCS file: /cvs/ports/sysutils/py-pynetbox/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile11 Mar 2022 19:57:53 - 1.29
+++ Makefile17 Mar 2022 20:16:58 -
@@ -1,9 +1,8 @@
COMMENT = NetBox API client library
-MODPY_EGG_VERSION =6.1.3
+MODPY_EGG_VERSION =6.6.1
DISTNAME = pynetbox-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = sysutils net
@@ -16,8 +15,7 @@ MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
-MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =lib
+MODPY_PYTEST_ARGS =--ignore=tests/integration tests
FLAVORS = python3
FLAVOR = python3
Index: distinfo
===
RCS file: /cvs/ports/sysutils/py-pynetbox/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo8 Oct 2021 13:37:44 - 1.21
+++ distinfo17 Mar 2022 20:16:58 -
@@ -1,2 +1,2 @@
-SHA256 (pynetbox-6.1.3.tar.gz) = 5XnFp0/5jf/SzssEUbL//BkkcxtWh219l7mqorbveqY=
-SIZE (pynetbox-6.1.3.tar.gz) = 58425
+SHA256 (pynetbox-6.6.1.tar.gz) = F7V1TGB8yfa+/jnjmhiM+djJ/8v2Nvt1xZhbuNAaAyQ=
+SIZE (pynetbox-6.6.1.tar.gz) = 62678
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/py-pynetbox/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 11 Mar 2022 19:57:53 - 1.11
+++ pkg/PLIST 17 Mar 2022 20:16:58 -
@@ -37,9 +37,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/${MODPY_PYCACHE}ipam.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/${MODPY_PYCACHE}users.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/${MODPY_PYCACHE}virtualization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pynetbox/models/${MODPY_PYCACHE}wireless.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/circuits.py
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/dcim.py
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/extras.py
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/ipam.py
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/users.py
lib/python${MODPY_VERSION}/site-packages/pynetbox/models/virtualization.py
+lib/python${MODPY_VERSION}/site-packages/pynetbox/models/wireless.py
Re: [update patch] htop 3.0.5 -> 3.1.2
On Wed Mar 16, 2022 at 10:01:35PM +, Stuart Henderson wrote:
> On 2022/03/16 22:10, Rafael Sadowski wrote:
> > On Wed Mar 16, 2022 at 03:21:29PM +0100, Martin Ziemer wrote:
> > > This patch updates htop from 3.0.5 to 3.1.2.
> > >
> > > Tested on two amd64 systems.
> >
> > I ran into on updating it:
> >
> > Error: Dependency htop-3.1.2 doesn't match FULLPKGNAME:
> > htop-3.0.5pl20210418p0
>
> I think you may have a copy in mystuff
>
> Here's an improved diff
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/htop/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 11 Mar 2022 19:57:32 - 1.30
> +++ Makefile 16 Mar 2022 21:59:52 -
> @@ -2,10 +2,7 @@ COMMENT =interactive process viewer
>
> GH_ACCOUNT = htop-dev
> GH_PROJECT = htop
> -#GH_TAGNAME =3.0.5
> -GH_COMMIT = feec16cbb53dabc6a52ef2f69a6a13798be82617
> -DISTNAME = htop-3.0.5pl20210418
> -REVISION = 0
> +GH_TAGNAME = 3.1.2
>
> CATEGORIES = sysutils
>
> @@ -16,7 +13,7 @@ MAINTAINER =Ian Sutton
> # GPLv2 only
> PERMIT_PACKAGE = Yes
>
> -WANTLIB =c curses kvm m
> +WANTLIB =c curses execinfo kvm m
>
> RUN_DEPENDS =devel/desktop-file-utils
>
> @@ -25,7 +22,7 @@ NO_TEST = Yes
> DEBUG_PACKAGES = ${BUILD_PACKAGES}
>
> CONFIGURE_STYLE =autoreconf
> -AUTOCONF_VERSION = 2.69
> +AUTOCONF_VERSION = 2.71
> AUTOMAKE_VERSION = 1.16
> AUTORECONF = ./autogen.sh
> CONFIGURE_ARGS +=--disable-unicode \
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/htop/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 23 Apr 2021 21:16:16 - 1.8
> +++ distinfo 16 Mar 2022 21:59:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (htop-3.0.5pl20210418-feec16cb.tar.gz) =
> bUysbhZRqsVVLSZcz4GvUl5ekauQCn81QQLqFP+ruF0=
> -SIZE (htop-3.0.5pl20210418-feec16cb.tar.gz) = 314058
> +SHA256 (htop-3.1.2.tar.gz) = /pVZY3yPIfX9UxpMByBIpAQXOAasva0TWca4L9h6oAE=
> +SIZE (htop-3.1.2.tar.gz) = 387656
>
Thanks, OK rsadowski
Re: UPDATE: sysutils/py-pynetbox
On 2022/03/17 17:46, Ricardo wrote: > Hey ports@ > > Update to sysutils/py-pynetbox, released 3 weeks ago. Changes: > https://github.com/netbox-community/pynetbox/compare/v6.1.3...v6.6.1 > > It was a pretty straightforward update. The only thing I noticed was that > regress testing was NOK - didn't performed any test. > > After dropping pytest, I noticed some tests needed yaml, so added > textproc/py-yaml as dependency. Simply fix. :) > > make test now runs all the tests without any error or warning. > > Besides that, ran a few API queries successfully (amd64), but additional eyes > would be greatly appreciated. > > Take care. > ~Ricardo Please don't disable MODPY_PYTEST : ===> Regression tests for py3-pynetbox-6.6.1 running test WARNING: Testing via this command is deprecated and will be removed in a future version. Users looking for a generic test entry point independent of test runner are encouraged to use tox. running egg_info writing pynetbox.egg-info/PKG-INFO [...] Just fix the dir name in MODPY_PYTEST_ARGS instead. It was probably missed with a previous update.
Re: UPDATE prosody 0.12.0 from MAINTAINER
Lucas wrote: > - I wanted to disable the Lua 5.1 flavor. Is the approach used the right > one? This was a misunderstanding on my side, and the port does build and package with Lua 5.1. Reattached tarball with FLAVORS = lua52 lua53 FLAVOR ?= luaunbound-1.0.0.tgz Description: Binary data
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Mon Mar 14 23:34:00 MDT 2022 Finished: Thu Mar 17 10:23:16 MDT 2022 Duration: 2 Days 10 hours 49 minutes Built using OpenBSD 7.1-beta (GENERIC.MP) #1238: Mon Mar 14 14:11:25 MDT 2022 Built 9327 packages Number of packages built each day: Mar 14: 924 Mar 15: 7027 Mar 16: 1102 Mar 17: 274 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2022-03-14/summary.log Build failures: 20 http://build-failures.rhaalovely.net/sparc64/2022-03-14/audio/hydrogen.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/cad/oce.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/devel/fnc.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/devel/kf5/kio.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/devel/xtensa-esp32-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/devel/xtensa-lx106-elf/binutils.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/games/gargoyle.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/games/stepmania.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/graphics/birdfont.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/graphics/opencolorio.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/lang/algol68g.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/lang/clazy.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/multimedia/mkvtoolnix.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/productivity/gnucash.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/security/veracrypt.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/www/unit/unit-ruby.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/x11/gnome/gjs.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/x11/gnome/secrets.log http://build-failures.rhaalovely.net/sparc64/2022-03-14/x11/qt5/qtwebkit.log Recurrent failures: failures/cad/oce.log failures/devel/avr/gcc.log failures/devel/xtensa-esp32-elf/binutils.log failures/devel/xtensa-lx106-elf/binutils.log failures/games/gargoyle.log failures/lang/clazy.log failures/multimedia/mkvtoolnix.log failures/productivity/gnucash.log failures/security/veracrypt.log failures/www/unit/unit-ruby.log failures/x11/gnome/gjs.log failures/x11/qt5/qtwebkit.log New failures: +failures/audio/hydrogen.log +failures/devel/fnc.log +failures/devel/kf5/kio.log +failures/x11/gnome/secrets.log Resolved failures: -failures/devel/jdk/1.8.log -failures/devel/kf5/kfilemetadata.log -failures/devel/kf5/kwidgetsaddons.log -failures/security/opensc.log -failures/sysutils/libvirt.log -failures/sysutils/ruby-augeas,ruby27.log -failures/www/ruby-raindrops,ruby31.log -failures/x11/lxqt/panel.log -failures/x11/qt5/docs,-html.log Packages newly built: +audio/amused +cad/qelectrotech +databases/architect +databases/jxplorer +databases/liquibase +databases/puppetdb5 +databases/puppetdb5,-main +databases/puppetdb5,-plugin +devel/apache-ant +devel/apktool +devel/dex2jar +devel/jadx +devel/javahelp +devel/jd-gui +devel/jdk/1.8 +devel/kf5/kbookmarks +devel/kf5/kcompletion +devel/kf5/kconfigwidgets +devel/kf5/kfilemetadata +devel/kf5/kfilemetadata,-locale +devel/kf5/kfilemetadata,-main +devel/kf5/kiconthemes +devel/kf5/kjobwidgets +devel/kf5/kpeople +devel/kf5/ktextwidgets +devel/kf5/kwallet +devel/kf5/kwidgetsaddons +devel/kf5/kxmlgui +devel/kf5/qqc2-desktop-style +devel/kproperty +devel/leiningen +devel/libvirt-glib +devel/maven +devel/netbeans +emulators/nono +games/freecol +games/jbrickshooter +games/libgdx/1.9.11 +games/libgdx/1.9.9 +games/lwjgl +games/minecraft +geo/josm +java/gradle +java/jBCrypt +java/jna +java/tanukiwrapper +lang/abcl +lang/clojure +lang/kawa +lang/lucee +lang/processing +lang/scala +math/geogebra +meta/lxqt +meta/lxqt,-extras +meta/lxqt,-main +net/i2p +net/neochat +net/openfire +productivity/deskzilla +productivity/impressive +productivity/projectlibre +productivity/thinkingrock +security/burpsuite +security/opensc +security/pinentry-dmenu +security/tls-attacker +security/zaproxy +sysutils/collectd +sysutils/collectd,-main +sysutils/collectd,-memcachec +sysutils/collectd,-mqtt +sysutils/collectd,-mysql +sysutils/collectd,-nut +sysutils/collectd,-pgsql +sysutils/collectd,-ping +sysutils/collectd,-prometheus +sysutils/collectd,-python +sysutils/collectd,-redis +sysutils/collectd,-riemann +sysutils/collectd,-rrdtool +sysutils/collectd,-snmp +sysutils/collectd,-virt +sysutils/ec2-api-tools +sysutils/libvirt +sysutils/libvirt-python +sysutils/libvirt-python,python3 +sysutils/p5-Sys-Virt +sysutils/riemann +sysutils/ruby-augeas,ruby27 +sysutils/ruby-libvirt,ruby27 +sysutils/ruby-libvirt,ruby30 +sysutils/ruby-libvirt,ruby31 +sysutils/ruby-puppet/5 +sysutils/ruby-puppet/6 +sysutils/rundeck +sysutils/virt-manager +textproc/crossfire +textproc/epubcheck +textproc/pdftk +textproc/solr +textproc
Re: UPDATE prosody 0.12.0 from MAINTAINER
Thanks for the review, Stuart.
Stuart Henderson wrote:
> On 2022/03/16 23:53, Lucas wrote:
> > - added an optional but recommend dependency on a new port which
> > provides Lua bindings for libunbound, net/luaunbound, developed by
> > one of the Prosody devs
>
> luaunbound needs NO_TEST, otherwise it's OK with me to import
Done.
> > Of course, as soon as I sent this email I remembered I forgot to check
> > if the new plugin manager with LuaRocks works. It does, but not out of
> > the box: it's invoked as `luarocks`, while it should be `luarocks-5.3`
> > in this case. I could patch it to literal `luarocks-5.3`, but I think
> > it would be more correct to patch it to something that doesn't force me
> > to keep both in sync, something like `luarocks-${MODLUA_VERSION}` and
> > then replace. Is that the correct approach? Patching like that and then
> > adding a `post-patch:` target using ${SUBST_CMD}?
>
> exactly
Done.
There are two more things about net/luaunbound that I'm not 100% sure
about tho:
- It does generated a shared library, to be consumed by Lua, placed
under of /usr/local/lib/lua/*. The PLIST doesn't include a @so marker
and the .so isn't versioned according to SHARED_LIBS. Is it correct to
leave it like that? I have seen similar stuff in other ports.
- I wanted to disable the Lua 5.1 flavor. Is the approach used the right
one?
Thanks again!
diff 541cc6a9ec0e6eefd79c24f305db8e38e0e859e4
bab5e988ddd31020ccb388d57402886713091264
blob - 111da98c2182b99f76398aaf581238cb9dcda46e
blob + f723ce6d950ef739d7d5a4a37d4b0909a3e485b2
--- net/prosody/Makefile
+++ net/prosody/Makefile
@@ -1,5 +1,5 @@
COMMENT = communications server for Jabber/XMPP written in Lua
-DISTNAME = prosody-0.11.13
+DISTNAME = prosody-0.12.0
CATEGORIES = net
HOMEPAGE = https://prosody.im/
@@ -11,20 +11,22 @@ MASTER_SITES = https://prosody.im/downloads/source/
PERMIT_PACKAGE = Yes
MODULES = lang/lua
-MODLUA_VERSION = 5.2
+MODLUA_VERSION = 5.3
-MODLUA_RUN_DEPENDS += databases/luadbi \
- devel/lua-bitop \
+MODLUA_RUN_DEPENDS += converters/luastruct \
+ databases/luadbi \
devel/luafs \
+ devel/luarocks \
+ net/luaunbound \
security/luasec \
textproc/luaexpat
-LIB_DEPENDS = devel/libidn
+LIB_DEPENDS = textproc/icu4c
# fails, depends on busted not yet in
NO_TEST = Yes
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
-WANTLIB += crypto idn
+WANTLIB += crypto icudata icui18n icuuc
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --prefix="${PREFIX}" \
@@ -34,6 +36,7 @@ CONFIGURE_ARGS += --prefix="${PREFIX}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
--lua-version="${MODLUA_VERSION}" \
--no-example-certs \
+ --idn-library=icu \
--c-compiler="${CC}" \
--linker="${CC}" \
--ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
@@ -47,6 +50,9 @@ pre-configure:
cd ${WRKSRC}; sed -i -e 's,^#!/usr/bin/env lua,#!${MODLUA_BIN},' -e \
's,^lua ,${MODLUA_BIN} ,' prosody prosodyctl
+post-patch:
+ ${SUBST_CMD} ${WRKSRC}/util/prosodyctl.lua
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody
${INSTALL_DATA} ${WRKSRC}/README \
blob - 1259a78118331eeda8b325c7586b7b975b0eab4a
blob + 4c568d96106682731568f8292407e98b43194031
--- net/prosody/distinfo
+++ net/prosody/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.11.13.tar.gz) = OcYbNGoJtRJbYEy5aeFCBsu8uGyBFW/8a6LWJSfPBDI=
-SIZE (prosody-0.11.13.tar.gz) = 439816
+SHA256 (prosody-0.12.0.tar.gz) = dS/zIBXaxWX8NBfCGWryaJccNY7gZuUfXZEkE1gNiJo=
+SIZE (prosody-0.12.0.tar.gz) = 610330
blob - 77b129d26593e3f817c3ed091d1971315a39b745
blob + 9a2584e6469c8ace4698242ce55c89ff7f641b94
--- net/prosody/patches/patch-core_certmanager_lua
+++ net/prosody/patches/patch-core_certmanager_lua
@@ -1,7 +1,7 @@
Index: core/certmanager.lua
--- core/certmanager.lua.orig
+++ core/certmanager.lua
-@@ -110,7 +110,7 @@ end
+@@ -202,7 +202,7 @@ end
-- Built-in defaults
local core_defaults = {
@@ -9,4 +9,4 @@ Index: core/certmanager.lua
+ cafile = "/etc/ssl/cert.pem";
depth = 9;
protocol = "tlsv1+";
- verify = (ssl_x509 and { "peer", "client_once", }) or "none";
+ verify = "none";
blob - c71921bfdeffd77276b9058509080de47c86db43
blob + 2b8227c237db7c1ebd5d295793948c03623af83a
--- net/prosody/patches/patch-prosody_cfg_lua_dist
+++ net/prosody/patches/patch-prosody_cfg_lua_dist
@@ -12,10 +12,10 @@ Index: prosody.cfg.lua.dist
+-- Enable POSIX-only options
+pidfile = "/var/prosody/prosody.pid"
+
- -- Enable use of libevent for better performance under high load
- -- For more information see: https://
Re: Update: arx-libertatis 1.2
On Thu, Mar 17, 2022 at 01:58:13PM +0100, Theo Buehler wrote: > > ** Message: 03:32:58.894: Cannot create profile directory > > /arx-libertatis-1.2_writes_to_HOME/.config/inkscape. > > The variable that is poisoned this way is PORTHOME. Setting it to > WRKDIR will make the warning go away. Thanks, that did the trick. > Another thing: the port picks up Doxygen if it's installed. That should > perhaps be neutered (although the port doesn't seem to do anything with > it). > > -- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE) I'm thoroughly removing this from CMakeList.txt. Thanks.
Re: Update: arx-libertatis 1.2
> ** Message: 03:32:58.894: Cannot create profile directory > /arx-libertatis-1.2_writes_to_HOME/.config/inkscape. The variable that is poisoned this way is PORTHOME. Setting it to WRKDIR will make the warning go away. Another thing: the port picks up Doxygen if it's installed. That should perhaps be neutered (although the port doesn't seem to do anything with it). -- Could NOT find Doxygen (missing: DOXYGEN_EXECUTABLE)
Re: Update: vulkan ports to sdk 1.3.204.1
On Thu, Mar 17, 2022 at 06:41:26AM -0600, Thomas Frohwein wrote: [...] > The Tigerlake seems less stable. Sometimes when I start vkquake on it, > the graphics have artifacts like flickering, and when that happened, > the whole system became unresponsive once. I've tested this with our > current vulkan 1.2.198.0 and the same thing happens there, too, so not > a regression. Usually, exiting the program and starting it again fixes > it. Just to add some more details: while the behavior when the issues happen is inconsistent, one time it was a write after free. With the behavior, I would suspect this to be related to mesa/drm rather than vulkan itself. Here the output: [...] = Quake Initialized = execing quake.rc execing default.cfg execing config.cfg Initializing samplers Texture lod bias: 0.00 execing autoexec.cfg 3 demo(s) in loop vkQuake 1.12.2 Server (24778 CRC) Introduction Using protocol fte999 Couldn't find a cdrip for track 4 player entered the game vkquake(48151) in malloc(): write after free 0x746c7fbd000 Abort trap
Update: vulkan ports to sdk 1.3.204.1
Hi,
This updates the vulkan-* and spirv-* ports to 1.3.204.1 from February
16. I've tested them on both Intel Tigerlake and amdgpu Vega 10 without
regressions, using vkcube, vulkaninfo, and vkquake.
The Tigerlake seems less stable. Sometimes when I start vkquake on it,
the graphics have artifacts like flickering, and when that happened,
the whole system became unresponsive once. I've tested this with our
current vulkan 1.2.198.0 and the same thing happens there, too, so not
a regression. Usually, exiting the program and starting it again fixes
it.
In other new, it seems that the dependency on glslang is gone. I've been
able to run my test cases (vkcube, vkcubepp, vulkaninfo, and vkquake)
including `VK_INSTANCE_LAYERS=VK_LAYER_KHRONOS_validation` env without
issues, and it's not needed for the build.
After spirv-headers, spirv-tools has now also adopted the vulkan
versioning. This makes it easier to keep things in sync, but means that
now spirv-headers also needs an EPOCH=0, unfortunately.
The 2 patches that fixed vulkaninfo in vulkan-tools aren't needed
anymore for vulkaninfo to work.
More testing would be appreciated, especially on other Tigerlake GPUs
and non-amd64 arches.
OK?
Index: graphics/spirv-headers/Makefile
===
RCS file: /cvs/ports/graphics/spirv-headers/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- graphics/spirv-headers/Makefile 11 Mar 2022 19:23:27 - 1.8
+++ graphics/spirv-headers/Makefile 17 Mar 2022 12:11:00 -
@@ -1,6 +1,6 @@
COMMENT = SPIRV-Headers
-V =1.2.198.0
+V =1.3.204.1
DISTNAME = spirv-headers-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Headers
Index: graphics/spirv-headers/distinfo
===
RCS file: /cvs/ports/graphics/spirv-headers/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/spirv-headers/distinfo 9 Dec 2021 04:48:31 - 1.6
+++ graphics/spirv-headers/distinfo 17 Mar 2022 12:11:00 -
@@ -1,2 +1,2 @@
-SHA256 (spirv-headers-1.2.198.0.tar.gz) =
MwGiOsoENDNqZD5DPcrKzdYAAKs9013AB4opfAYSShI=
-SIZE (spirv-headers-1.2.198.0.tar.gz) = 416113
+SHA256 (spirv-headers-1.3.204.1.tar.gz) =
JihkBTlowhfUWyS4kESnc2oyNhiUdD3Wz+eI3yWMdGw=
+SIZE (spirv-headers-1.3.204.1.tar.gz) = 417550
Index: graphics/spirv-tools/Makefile
===
RCS file: /cvs/ports/graphics/spirv-tools/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- graphics/spirv-tools/Makefile 11 Mar 2022 19:23:27 - 1.11
+++ graphics/spirv-tools/Makefile 17 Mar 2022 12:11:00 -
@@ -1,10 +1,11 @@
COMMENT = API and commands for processing SPIR-V
-V =2021.4
+V =1.3.204.1
DISTNAME = spirv-tools-${V}
GH_ACCOUNT = KhronosGroup
GH_PROJECT = SPIRV-Tools
-GH_TAGNAME = v${V}
+GH_TAGNAME = sdk-${V}
+EPOCH =0
CATEGORIES = devel graphics
Index: graphics/spirv-tools/distinfo
===
RCS file: /cvs/ports/graphics/spirv-tools/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- graphics/spirv-tools/distinfo 9 Dec 2021 04:48:31 - 1.7
+++ graphics/spirv-tools/distinfo 17 Mar 2022 12:11:00 -
@@ -1,2 +1,2 @@
-SHA256 (spirv-tools-2021.4.tar.gz) =
1o3iYHCN2nhdEJ/xzu7N4tKrcRQvpb9ZBhu59H3Tuyw=
-SIZE (spirv-tools-2021.4.tar.gz) = 2887505
+SHA256 (spirv-tools-1.3.204.1.tar.gz) =
bhmQDpSJRCQwJK7dCiAbrzhUs3e5zHo4ZVO8EDsIczU=
+SIZE (spirv-tools-1.3.204.1.tar.gz) = 2905629
Index: graphics/vulkan-headers/Makefile
===
RCS file: /cvs/ports/graphics/vulkan-headers/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- graphics/vulkan-headers/Makefile11 Mar 2022 19:23:30 - 1.9
+++ graphics/vulkan-headers/Makefile17 Mar 2022 12:11:00 -
@@ -1,6 +1,6 @@
COMMENT = Vulkan header files
-V =1.2.198.0
+V =1.3.204.1
PKGNAME = vulkan-headers-${V}
GH_TAGNAME = sdk-${V}
GH_ACCOUNT = KhronosGroup
Index: graphics/vulkan-headers/distinfo
===
RCS file: /cvs/ports/graphics/vulkan-headers/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- graphics/vulkan-headers/distinfo9 Dec 2021 04:48:31 - 1.6
+++ graphics/vulkan-headers/distinfo17 Mar 2022 12:11:00 -
@@ -1,2 +1,2 @@
-SHA256 (Vulkan-Headers-sdk-1.2.198.0.tar.gz) =
NHgsYcrZs8zy+gox7Dl9T86ZSQUAtPN3HLGkhxP+zoA=
-SIZE (Vulkan-Headers-sdk-1.2.198.0.tar.gz) = 1288107
+SHA256 (Vulkan-Headers-sdk-1.3.204.1.tar.gz) =
nE0z9xRnyRV0n79IwMOo7ngz8Vur85jjRjzYh5H7WS4=
+SIZE (Vulkan-Headers-sdk-1.3.204.1.tar.gz) = 1422950
Index: graphics/vulkan-headers/patches/patch-registry_cgenerator_py
Update: arx-libertatis 1.2
Hi,
This is a diff to finally update Arx Libertatis to 1.2. It was held up
by not starting, which is probably the the infinite loop in GitHub PR
#265. Now it runs fine; I tested the update with a few minutes of play
time, and everything looks as expected.
The build now uses graphics/inkscape to generate icons. This leads to
the ugly, but non-breaking warning:
** Message: 03:32:58.894: Cannot create profile directory
/arx-libertatis-1.2_writes_to_HOME/.config/inkscape.
I tried a couple of ways to work around this; setting $HOME,
$INKSCAPE_PROFILE_DIR, via MAKE_ENV, CONFIGURE_ENV, or patching it into
cmake/Icons.cmake, all unsuccessfully. At this point, I think this can
still be updated, unless someone has a solution for this warning.
Other things of note:
- Upstream switched from devel/sdl to devel/sdl2 as default.
- Now includes a blender plugin; I assume for modding (not tested).
- Now includes an install target (yay!) and a test target.
- The new shared library libArxIO builds only if libc is linked explicitly.
The README has details on how to get started with the game data.
Release announcement:
https://arx-libertatis.org/releases/1.2
Detailed changelog:
https://wiki.arx-libertatis.org/Changelog#1.2
I'm planning to update this soon, but looking to see if any comments,
especially regarding the inkscape warning.
comments? oks?
Index: Makefile
===
RCS file: /cvs/ports/games/arx-libertatis/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile11 Mar 2022 19:04:07 - 1.10
+++ Makefile17 Mar 2022 12:01:15 -
@@ -3,53 +3,50 @@ CATEGORIES = games
MAINTAINER = Thomas Frohwein
+PKGNAME = arx-libertatis-${GH_TAGNAME}
GH_ACCOUNT = arx
GH_PROJECT = ArxLibertatis
-GH_TAGNAME = 1.1.2-r1
-PKGNAME = arx-libertatis-${GH_TAGNAME:S/-r/pl/}
-REVISION = 4
+GH_TAGNAME = 1.2
+
+SHARED_LIBS += ArxIO 0.0 # 1.2
# GPLv3+, fonts are SIL OFL 1.1 license
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL c freetype m openal
-WANTLIB += z
+WANTLIB += ${COMPILER_LIBCXX} SDL2 c epoxy freetype m openal z
-# C++11
+# C++17
COMPILER = base-clang ports-gcc base-gcc
MODULES = devel/cmake
BUILD_DEPENDS =devel/boost \
- devel/desktop-file-utils
+ devel/cppunit \
+ graphics/ImageMagick \
+ graphics/glm \
+ graphics/inkscape \
+ graphics/optipng
LIB_DEPENDS = audio/openal \
- devel/sdl \
- graphics/glew
-
-RUN_DEPENDS = devel/desktop-file-utils
+ devel/sdl2
+RUN_DEPENDS = devel/desktop-file-utils \
+ x11/gtk+3,-guic
-CONFIGURE_ARGS = -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+CONFIGURE_ARGS = -DBUILD_CRASHHANDLER=OFF \
-DBUILD_CRASHREPORTER=OFF \
+ -DBUILD_IO_LIBRARY=OFF \
+ -DBUILD_TESTS=ON \
+ -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
+ -DCMAKE_INSTALL_MANDIR=${LOCALBASE}/man \
-DCMAKE_INSTALL_PREFIX=${LOCALBASE}/share/arx \
- -DUSE_QT4=OFF \
- -DUSE_QT5=OFF
-
-NO_TEST = Yes
+ -DUNITY_BUILD=OFF
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/arx
- ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/data/icons/arx-libertatis.desktop \
- ${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/data/icons/arx-libertatis.png \
- ${PREFIX}/share/pixmaps
- ${INSTALL_MAN} ${WRKSRC}/data/man/{arxsavetool.1,arxunpak.1} \
- ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/data/man/arx.6 ${PREFIX}/man/man6
- ${INSTALL_PROGRAM} ${WRKBUILD}/{arxsavetool,arxunpak} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKBUILD}/arx ${PREFIX}/share/arx
- ${INSTALL_SCRIPT} ${WRKSRC}/scripts/arx-install-data ${PREFIX}/bin
- ${SUBST_CMD} -c -m 755 ${FILESDIR}/arx ${PREFIX}/bin/arx
+post-install:
+ ln -sf ${TRUEPREFIX}/share/arx/bin/arx ${PREFIX}/bin/arx
+ ln -sf ${TRUEPREFIX}/share/arx/bin/arx-install-data \
+ ${PREFIX}/bin/arx-install-data
+ ln -sf ${TRUEPREFIX}/share/arx/bin/arxsavetool \
+ ${PREFIX}/bin/arxsavetool
+ ln -sf ${TRUEPREFIX}/share/arx/bin/arxunpak \
+ ${PREFIX}/bin/arxunpak
.include
Index: distinfo
===
RCS file: /cvs/ports/games/arx-libertatis/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo6 May 2018 15:15:00 - 1.1.1.1
+++ distinfo17 Mar 2022 12:01:15 -
@@ -1,2 +1,2 @@
-SHA256 (ArxLibertatis-1.1.2-r1.tar.gz) =
mFv5eVuLpo9s71X
Re: update devel/codeblocks to 20.03 patch level 12751
On Thu, Mar 17, 2022 at 12:38:07AM +, Stuart Henderson wrote:
> On 2022/03/16 19:39, Josh Grosse wrote:
> > Yes, thanks! I'll rebuild here and send an updated diff
> > after I've tested. It takes a few hours on this laptop. :)
New diff attached. Your recommended changes, plus:
* revised distinfo - the tarball is now an svn repository instead
of an export from it.
* subversion added to BUILD_DEPENDS.
This allows the banner to display the correct patch level.
> It took a while here too :)
>
> If you find yourself rebuilding ports a few times while you work
> on an update, you might save some time with ccache:
>
> pkg_add ccache
> echo 'USE_CCACHE=Yes' >> /etc/mk.conf
Using ccache helped a great deal. Thank you!
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 3e30ad54745..2b04993456b 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,11 +1,17 @@
BROKEN-alpha= sqvm.cpp:394:1: internal compiler error: Segmentation fault
COMMENT= Code::Blocks C/C++ IDE
-V= 20.03
+V= 20.03pl12751
+
+# source tarball for this OpenBSD-specific patch level:
+MASTER_SITES1= https://jggimi.net/codeblocks/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1
+
DISTNAME= codeblocks-${V}
PKGNAME= codeblocks-${V}
EXTRACT_SUFX= .tar.xz
-REVISION= 2
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
WRKDIST= ${WRKDIR}/codeblocks-${V}
@@ -31,7 +37,7 @@ HOMEPAGE= http://www.codeblocks.org/
PERMIT_PACKAGE=Yes
WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xau Xdmcp Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
WANTLIB += cairo-gobject curses epoxy execinfo expat ffi fontconfig
WANTLIB += freetype fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0
@@ -46,7 +52,8 @@ WANTLIB += wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm z zstd
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
-BUILD_DEPENDS= archivers/zip
+BUILD_DEPENDS= archivers/zip \
+ devel/subversion,-main
LIB_DEPENDS= archivers/bzip2 \
devel/boost \
diff --git a/devel/codeblocks/distinfo b/devel/codeblocks/distinfo
index 09f55e353a9..acdd8b882c6 100644
--- a/devel/codeblocks/distinfo
+++ b/devel/codeblocks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
-SIZE (codeblocks-20.03.tar.xz) = 11799264
+SHA256 (codeblocks-20.03pl12751.tar.xz) =
HagjdMW4C+2Vg+kg/H0vMg0EOw/ZGbJpJOCenpafCAw=
+SIZE (codeblocks-20.03pl12751.tar.xz) = 34112980
diff --git a/devel/codeblocks/patches/patch-configure
b/devel/codeblocks/patches/patch-configure
index 46c8967c235..353f464c7cb 100644
--- a/devel/codeblocks/patches/patch-configure
+++ b/devel/codeblocks/patches/patch-configure
@@ -3,7 +3,7 @@ undefined reference to `free'
Index: configure
--- configure.orig
+++ configure
-@@ -16911,7 +16911,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
+@@ -16899,7 +16899,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
else
ax_check_save_flags=$LDFLAGS
@@ -11,7 +11,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -16935,7 +16934,6 @@ fi
+@@ -16923,7 +16922,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
$ax_cv_check_ldflags___Wl___no_undefined" >&5
$as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; }
if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then :
diff --git a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
index 59247107298..ab710b33327 100644
--- a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
+++ b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
@@ -4,7 +4,7 @@ Fix build when tinyxml is installed.
Index: src/base/tinyxml/Makefile.in
--- src/base/tinyxml/Makefile.in.orig
+++ src/base/tinyxml/Makefile.in
-@@ -423,10 +423,10 @@ top_builddir = @top_builddir@
+@@ -417,10 +417,10 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
zlib_CFLAGS = @zlib_CFLAGS@
zlib_LIBS = @zlib_LIBS@
diff --git
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
b/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
deleted file mode 100644
index 59dead9a877..000
---
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
+++ /dev/null
@@ -1,58 +0,0 @@
-Add support for riscv64
-
-Index: src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h.orig
-+++ src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
-@@ -643,6 +643,52 @@
- #define PR_BYTES_PER_WORD_LOG2 3
- #define PR_BYT
Re: [update patch] htop 3.0.5 -> 3.1.2
Am Wed, Mar 16, 2022 at 10:01:35PM + schrieb Stuart Henderson:
> On 2022/03/16 22:10, Rafael Sadowski wrote:
> > On Wed Mar 16, 2022 at 03:21:29PM +0100, Martin Ziemer wrote:
> > > This patch updates htop from 3.0.5 to 3.1.2.
> > >
> > > Tested on two amd64 systems.
> >
> > I ran into on updating it:
> >
> > Error: Dependency htop-3.1.2 doesn't match FULLPKGNAME:
> > htop-3.0.5pl20210418p0
>
> I think you may have a copy in mystuff
>
> Here's an improved diff
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/htop/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile 11 Mar 2022 19:57:32 - 1.30
> +++ Makefile 16 Mar 2022 21:59:52 -
> @@ -2,10 +2,7 @@ COMMENT =interactive process viewer
>
> GH_ACCOUNT = htop-dev
> GH_PROJECT = htop
> -#GH_TAGNAME =3.0.5
> -GH_COMMIT = feec16cbb53dabc6a52ef2f69a6a13798be82617
> -DISTNAME = htop-3.0.5pl20210418
> -REVISION = 0
> +GH_TAGNAME = 3.1.2
>
> CATEGORIES = sysutils
>
> @@ -16,7 +13,7 @@ MAINTAINER =Ian Sutton
> # GPLv2 only
> PERMIT_PACKAGE = Yes
>
> -WANTLIB =c curses kvm m
> +WANTLIB =c curses execinfo kvm m
>
> RUN_DEPENDS =devel/desktop-file-utils
>
> @@ -25,7 +22,7 @@ NO_TEST = Yes
> DEBUG_PACKAGES = ${BUILD_PACKAGES}
>
> CONFIGURE_STYLE =autoreconf
> -AUTOCONF_VERSION = 2.69
> +AUTOCONF_VERSION = 2.71
> AUTOMAKE_VERSION = 1.16
> AUTORECONF = ./autogen.sh
> CONFIGURE_ARGS +=--disable-unicode \
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/htop/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 23 Apr 2021 21:16:16 - 1.8
> +++ distinfo 16 Mar 2022 21:59:52 -
> @@ -1,2 +1,2 @@
> -SHA256 (htop-3.0.5pl20210418-feec16cb.tar.gz) =
> bUysbhZRqsVVLSZcz4GvUl5ekauQCn81QQLqFP+ruF0=
> -SIZE (htop-3.0.5pl20210418-feec16cb.tar.gz) = 314058
> +SHA256 (htop-3.1.2.tar.gz) = /pVZY3yPIfX9UxpMByBIpAQXOAasva0TWca4L9h6oAE=
> +SIZE (htop-3.1.2.tar.gz) = 387656
Just rebuilt the port with the better diff: Works great
