Re: Collision in py-sip-4.19.19p0v0->4.19.24v0
On Sat, Feb 13, 2021 at 07:51:24AM +0100, Rafael Sadowski wrote: > On Mon Feb 01, 2021 at 11:26:35PM +, Mikolaj Kucharski wrote: > > Hi, > > > > This happens for a while, but recently I don't have good chunk of time > > to dive and provide a diff. Decided to finally sent an email. > > > > (I do have some not committed port on my machine) > > > > # pkg_add -Dupdate -Dupdatedepends -Drepair -u -U -V > > quirks-3.524 signed on 2021-01-30T16:42:18Z > > Collision in py-sip-4.19.19p0v0->4.19.24v0: the following files already > > exist > > /usr/local/lib/python2.7/site-packages/PyQt5/sip.pyi > > (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) > > /usr/local/lib/python2.7/site-packages/PyQt5/sip.so > > (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0) > > Can't install > > py-qt5-5.13.2p1+py3-sip-qt5-5.5.0->py-qt5-5.15.2+py3-sip-qt5-5.5.0p0: can't > > resolve py-sip-4.19.24v0 > > Couldn't find updates for github-cli-1.5.0 promplot-0.17.0 py-qt5-5.13.2p1 > > py-sip-4.19.19p0v0 py-sip-qt5-4.19.19p0 py3-hvac-0.10.6pre0 > > py3-sip-qt5-5.5.0 > > Couldn't install py-qt5-5.15.2 py-sip-4.19.24v0 py3-sip-qt5-5.5.0p0 > > > > -- > > Regards, > > Mikolaj > > > > > I think we forgot the py2 conflict in devel/py-sip. Yes, this .. makes sense. From what i could tell from the various reports we got on the lists and privately, all of them were on the py2 variant: https://marc.info/?l=openbsd-ports=161142001320174=2 https://marc.info/?l=openbsd-ports=16104407065=2 Landry
Re: Build failures from -fno-common (2021-02-10)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 > Here is an updated list of ports that fail to build with -fno-common: > > graphics/ocaml-cairoUPDATEports@openbsd.org please import the update to 1.6.2 I sent on February 6th. > From: Yozo TODA > To: ports@openbsd.org > Subject: update graphics/ocaml-cairo to 0.6.2 (Re: -fno-common update: broken > ports) > Date: Sat, 06 Feb 2021 21:37:36 +0900 it works on amd64-current usual and non-native configurations. no problem with lablgtk3 and coq. -- yozo. -BEGIN PGP SIGNATURE- iQJJBAEBCgAzFiEEP48DGKttLBTWuiCMx2ep6SZGbGQFAmAnfnAVHHlvem9AdjAw Ny52YWlvLm5lLmpwAAoJEMdnqekmRmxkUJoQAKIDV00h3zVJQINgDftO2XGKO1wj TH3eaLk1Hbll63lhmG69OCcJCZFra9TwhMlgRv5BA5G4zI4EAlkbllUcli3JFAKa EZ4Q+K0EFSqIgKAZuH5ZwOgwyWrD/XfjgJ3ehxjCwweblxIb7rcavENGv1b3OQUR Z9V6GT0bBDDQJnfHRiVFJ0SCKamf+E0aMRuUMYDbH15fiBddixxp5LufNdmTwlTV wNSow/2Rl9yWHJXr1gVXEWc4JJJreC0a6Qkgi8M2jyikKWcRAXoNeL7J3TBH/o/Z k4o0IR70Q0feBS4Ou22N5JTaOSynUqUNpkCvnXdbfRNkqFrPuC6GI3aO3m6Flr/9 X+s+UJy5YDIsCQ6atDuB8Sz+Pp3ydCyj7TR/MeGQUUXXgc7LOl0chf5B/m5RMVso CFA71oNX510PzFjEgk4fdHgj0i8J4Ox36HT7ujZ545zibDziaV8jOrhulv9D5cZq HStUFGyU27Ailb8K1u/lzSd/hmeMkMXAuWDQdrdOFZ2Hhmww3iH0rLdM5GAmTD97 G456LlfbTiFQ0KzTijsuBna8hc2A6RTU55lurZJVWP+MG46v6E0hkdS+59ep+IgN UHiAqIzWdf72OCmuu9i7gxERcLBLEdi52TkAfngAmDJfCQ1+hxpvd06TJXuardqA b6uC2E9J0rirorJT =dtBn -END PGP SIGNATURE-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:18:45 Modified files: x11/gnome/maps : Makefile distinfo Log message: Update to gnome-maps-3.38.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:13:35 Modified files: sysutils/terragrunt: Makefile distinfo Log message: Update to terragrunt-0.28.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:10:39 Modified files: sysutils/awscli: Makefile distinfo sysutils/awscli/pkg: PLIST Log message: Update to awscli-1.19.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:10:19 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.17.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:10:08 Modified files: net/py-botocore: Makefile distinfo Log message: Update to py3-botocore-1.20.7.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/13 00:06:13 Modified files: graphics/openexr: Makefile distinfo Log message: Update to OpenEXR-2.5.5.
Re: Collision in py-sip-4.19.19p0v0->4.19.24v0
On Mon Feb 01, 2021 at 11:26:35PM +, Mikolaj Kucharski wrote:
> Hi,
>
> This happens for a while, but recently I don't have good chunk of time
> to dive and provide a diff. Decided to finally sent an email.
>
> (I do have some not committed port on my machine)
>
> # pkg_add -Dupdate -Dupdatedepends -Drepair -u -U -V
> quirks-3.524 signed on 2021-01-30T16:42:18Z
> Collision in py-sip-4.19.19p0v0->4.19.24v0: the following files already exist
> /usr/local/lib/python2.7/site-packages/PyQt5/sip.pyi
> (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0)
> /usr/local/lib/python2.7/site-packages/PyQt5/sip.so
> (py-sip-qt5-4.19.19p0 and py-sip-4.19.24v0)
> Can't install
> py-qt5-5.13.2p1+py3-sip-qt5-5.5.0->py-qt5-5.15.2+py3-sip-qt5-5.5.0p0: can't
> resolve py-sip-4.19.24v0
> Couldn't find updates for github-cli-1.5.0 promplot-0.17.0 py-qt5-5.13.2p1
> py-sip-4.19.19p0v0 py-sip-qt5-4.19.19p0 py3-hvac-0.10.6pre0 py3-sip-qt5-5.5.0
> Couldn't install py-qt5-5.15.2 py-sip-4.19.24v0 py3-sip-qt5-5.5.0p0
>
> --
> Regards,
> Mikolaj
>
I think we forgot the py2 conflict in devel/py-sip.
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 2fa86521b49..edf7b384b6a 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -10,6 +10,7 @@ EPOCH=0
DISTNAME= sip-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES=devel
+REVISION= 0
HOMEPAGE= https://www.riverbankcomputing.com/software/sip/intro
diff --git a/devel/py-sip/pkg/PLIST b/devel/py-sip/pkg/PLIST
index 410b31651e2..4c0fcdcad29 100644
--- a/devel/py-sip/pkg/PLIST
+++ b/devel/py-sip/pkg/PLIST
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.12 2021/01/19 06:26:49 rsadowski Exp $
@conflict py3-sip-qt5-<5.5.0
+@conflict py-sip-qt5-<5.5.0
@bin bin/sip${MODPY_BIN_SUFFIX}
include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}/sip.h
lib/python${MODPY_VERSION}/site-packages/PyQt5/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 23:31:07 Modified files: audio/libsndfile: Makefile audio/libsndfile/patches: patch-src_wav_c Added files: audio/libsndfile/patches: patch-src_double64_c Removed files: audio/libsndfile/patches: patch-programs_sndfile-info_c Log message: Improve/Fix libsndfile-1.0.30 - Improve handling of SMPL chunks in WAV files. - Fix use of uninitialized value in endswap_int64_t_array. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25366 Diff from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 23:25:44 Modified files: multimedia/libheif: Makefile distinfo Log message: Update libheif to 1.11.0 Update diff from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 23:21:11 Modified files: multimedia/aom : Makefile distinfo Log message: Update to aom 2.0.2. 2021-02-09 v2.0.2 This release includes several bug fixes. - Bug fixes: Issue 2643: Modify the assertion in temporal filter intrinsics. Issue 2648: Fix unit test ThreadTestLarge.EncoderResultTest/49 assertion failure. Issue 2869: Add -Wimplicit-function-declaration as C flag only. Issue 2878: Avoid memset in the av1_filter_intra_predictor module functions. Issue 2903: Fix a typo bug in apply_temporal_filter_planewise. Call av1_setup_frame_size() when dropping a frame in the encode_frame_to_data_rate() function in av1/encoder/encoder.c. Update diff from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 23:20:22 Modified files: net/ircd-hybrid: Makefile distinfo Log message: Update ircd-hybrid to 8.2.38 Update diff from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 23:17:27 Modified files: graphics/libwebp: Makefile distinfo Log message: Update libwebp to 1.2.0 - 12/23/2020: version 1.2.0 * API changes: - libwebp: encode.h: add a qmin / qmax range for quality factor (cwebp adds -qrange) * lossless encoder improvements * SIMD support for Wasm builds * add xcframeworkbuild.sh, supports Mac Catalyst builds * import fuzzers from oss-fuzz & chromium (#409) * webpmux: add an '-set loop ' option (#494) * toolchain updates and bug fixes (#449, #463, #470, #475, #477, #478, #479, #488, #491) Update diff from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 23:12:16 Modified files: x11/gtk+3 : Makefile distinfo Log message: Update to gtk+3-3.24.25.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 22:59:02 Modified files: x11/i3-gaps: Makefile distinfo x11/i3-gaps/patches: patch-etc_config patch-etc_config_keycodes patch-i3-dmenu-desktop patch-i3-msg_main_c patch-i3-nagbar_main_c patch-libi3_get_exe_path_c patch-man_i3-config-wizard_man patch-man_i3-dump-log_man patch-man_i3-nagbar_man patch-man_i3_man patch-src_bindings_c patch-src_config_parser_c patch-src_main_c x11/i3-gaps/pkg: PLIST Removed files: x11/i3-gaps/patches: patch-Makefile_in patch-parser-specs_config_spec patch-src_config_directives_c patch-testcases_t_201-config-parser_t Log message: Update i3-gaps to 4.19.1 and keep in sync with x11/i3
Re: [UPDATE] x11/i3 4.19.1
On Fri Feb 12, 2021 at 11:16:32PM +, Stuart Henderson wrote:
> On 2021/02/12 09:29, Guy Godfroy wrote:
> > I ended up by almost duplicating i3-mousedrag. So now i3-sensible-*
> > stuff are back in the game.
> >
> > Let me know what you think about it.
>
> thanks, some of the diff didn't apply but I have got it into shape,
> and adapted a few things (some parts only relevant for builds from
> git which isn't needed for proper releases) and committed.
>
> it looks like the upstream ticket with i3-mousedrag is moving again,
> so I'm hoping that we'll be able to get rid of i3-mousedrag and
> merge into the main port before too long, so it's good to have things
> in sync.
>
Looks like xxCONFIGURE_ARGS is a mistake and it hides build
dependencies.
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile12 Feb 2021 23:14:04 - 1.127
+++ Makefile13 Feb 2021 05:55:21 -
@@ -3,6 +3,7 @@
COMMENT = improved dynamic tiling window manager
DISTNAME = i3-4.19.1
+REVISION = 0
CATEGORIES = x11
@@ -36,13 +37,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+BUILD_DEPENDS =textproc/asciidoc \
+ textproc/xmlto
MODULES = devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports and a bit complex
#TEST_DEPENDS= x11/p5-AnyEvent-I3
NO_TEST= Yes
-xxCONFIGURE_ARGS= -Dmans=true \
+CONFIGURE_ARGS=-Dmans=true \
-Ddocs=true
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/02/12 22:08:28 Modified files: www/tor-browser/browser/files: unveil.content unveil.gpu Log message: allow /dev/dri/card0 where /dev/drm0 was allowed ok Caspar Schutijser
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2021/02/12 22:05:55 Modified files: www/mozilla-firefox: Makefile www/mozilla-firefox/files: unveil.content unveil.gpu unveil.main www/firefox-esr: Makefile www/firefox-esr/files: unveil.content unveil.gpu Log message: allow /dev/dri/card0 where /dev/drm0 was allowed ok landry@
[update] web2ldap to 1.5.114
Hello,
Here's a quick update for web2ldap 1.5.114
Changelog: https://web2ldap.de/changes-1.5.html#r1.5.114
Lucas
diff 6d4b50840a1a1d659c8ee96b597e12af74e49fb9 /usr/ports
blob - 24e3c928569fea60e3d846f6e1d2ed19d9a50455
file + databases/web2ldap/Makefile
--- databases/web2ldap/Makefile
+++ databases/web2ldap/Makefile
@@ -2,7 +2,7 @@
COMMENT = full-featured LDAP client running as web application
-MODPY_EGG_VERSION =1.5.113
+MODPY_EGG_VERSION =1.5.114
DISTNAME = web2ldap-${MODPY_EGG_VERSION}
CATEGORIES = databases www sysutils
blob - 83f356db6fc5effd4a76e96fc52c360c8818e68c
file + databases/web2ldap/distinfo
--- databases/web2ldap/distinfo
+++ databases/web2ldap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (web2ldap-1.5.113.tar.gz) = 1M5F4ICk6wKqP/xUZAEpayWWWOAyghzRDBJPW/4x4M0=
-SIZE (web2ldap-1.5.113.tar.gz) = 524101
+SHA256 (web2ldap-1.5.114.tar.gz) = pyOOqJz+/V1TZCObsDmvQixl7h2OyznJZJNi0T9QskA=
+SIZE (web2ldap-1.5.114.tar.gz) = 524329
FIX: games/xboing -fno-common
>From FreeBSD, a bit hard to follow as their commit (re)touched the
original patches
https://svnweb.freebsd.org/ports?view=revision=548113
Once this builds, the game doesn't seem very playable. Seems like
it might be running /way/ too fast on modern systems. Tried stock
fvwm with no fancy stuff to see if compositing was problematic, no
improvement.
Does this work for anyone else? Should it get booted?
Index: Makefile
===
RCS file: /cvs/ports/games/xboing/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile12 Jul 2019 20:46:27 - 1.31
+++ Makefile13 Feb 2021 00:30:05 -
@@ -5,7 +5,7 @@ COMMENT=blockout style game for X11
V= 2.4
DISTNAME= xboing${V}
PKGNAME= xboing-${V}
-REVISION= 4
+REVISION= 5
CATEGORIES=games
Index: patches/patch-bonus_c
===
RCS file: /cvs/ports/games/xboing/patches/patch-bonus_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bonus_c
--- patches/patch-bonus_c 8 Jul 2011 11:42:09 - 1.1
+++ patches/patch-bonus_c 13 Feb 2021 00:30:05 -
@@ -1,6 +1,19 @@
$OpenBSD: patch-bonus_c,v 1.1 2011/07/08 11:42:09 jasper Exp $
bonus.c.orig Fri Nov 22 02:28:46 1996
-+++ bonus.cFri Jul 8 13:37:55 2011
+
+fix -fno-common, from FreeBSD
+
+Index: bonus.c
+--- bonus.c.orig
bonus.c
+@@ -120,7 +120,7 @@ enum BonusStates BonusState;
+ static Pixmap titlePixmap, titlePixmapM;
+ static intypos;
+ static intwaitingFrame;
+-enum BonusStates waitMode;
++extern enum BonusStates waitMode;
+ static char string[80];
+ static u_long bonusScore;
+ static intfirstTime = True;
@@ -311,7 +311,7 @@ void DrawTitleText(display, window)
XFlush(display);
Index: patches/patch-demo_c
===
RCS file: /cvs/ports/games/xboing/patches/patch-demo_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-demo_c
--- patches/patch-demo_c6 Mar 2004 02:41:00 - 1.1
+++ patches/patch-demo_c13 Feb 2021 00:30:05 -
@@ -1,6 +1,19 @@
$OpenBSD: patch-demo_c,v 1.1 2004/03/06 02:41:00 naddy Exp $
demo.c.orig2004-03-06 01:50:10.0 +0100
-+++ demo.c 2004-03-06 01:51:28.0 +0100
+
+now includes -fno-common fix, from FreeBSD
+
+Index: demo.c
+--- demo.c.orig
demo.c
+@@ -107,7 +107,7 @@ static int endFrame = 0;
+ static int startFrame = 0;
+ enum DemoStates DemoState;
+ static int waitingFrame;
+-enum DemoStates waitMode;
++extern enum DemoStates waitMode;
+
+ #if NeedFunctionPrototypes
+ void SetUpDemonstration(Display *display, Window window, Colormap colormap)
@@ -154,7 +154,7 @@ static void DoBlocks(display, window)
/* Construct the demo level filename */
Index: patches/patch-editor_c
===
RCS file: /cvs/ports/games/xboing/patches/patch-editor_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-editor_c
--- patches/patch-editor_c 6 Mar 2004 02:41:00 - 1.2
+++ patches/patch-editor_c 13 Feb 2021 00:30:05 -
@@ -1,6 +1,19 @@
$OpenBSD: patch-editor_c,v 1.2 2004/03/06 02:41:00 naddy Exp $
editor.c.orig 1996-11-22 02:28:46.0 +0100
-+++ editor.c 2004-03-06 01:55:49.0 +0100
+
+now includes -fno-common fix, from FreeBSD
+
+Index: editor.c
+--- editor.c.orig
editor.c
+@@ -121,7 +121,7 @@ void DoEditWait();
+ enum EditStates EditState;
+ enum EditStates oldEditState;
+ static int waitingFrame;
+-enum EditStates waitMode;
++extern enum EditStates waitMode;
+ static int oldWidth, oldHeight;
+ static int curBlockType;
+ static int drawAction = ED_NOP;
@@ -213,7 +213,7 @@ static void DoLoadLevel(display, window)
/* Construct the Edit level filename */
Index: patches/patch-highscore_c
===
RCS file: /cvs/ports/games/xboing/patches/patch-highscore_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-highscore_c
--- patches/patch-highscore_c 8 Jul 2011 11:42:09 - 1.1
+++ patches/patch-highscore_c 13 Feb 2021 00:30:05 -
@@ -1,6 +1,10 @@
$OpenBSD: patch-highscore_c,v 1.1 2011/07/08 11:42:09 jasper Exp $
highscore.c.orig Fri Nov 22 02:28:46 1996
-+++ highscore.cFri Jul 8 13:37:55 2011
+
+now includes -fno-common fix, from FreeBSD
+
+Index: highscore.c
+--- highscore.c.orig
highscore.c
@@ -55,6 +55,7 @@
#include
#include
@@ -18,6 +22,15 @@ $OpenBSD: patch-highscore_c,v 1.1 2011/0
#else
static int LockUnlock();
static void DeleteScore();
+@@ -137,7 +138,7 @@ static int endFrame = 0;
+ enum HighScoreStates HighScoreState;
+ static Pixmap titlePixmap, titlePixmapM;
+ static int waitingFrame;
+-enum HighScoreStates waitMode;
++extern enum
[UPDATE] net/libshout 2.4.5
Catch up with two bugfix releases; tested on amd64.
Unfortunately, 2.4.4 introduces a regression in shout.pc, which is fixed
via patch-configure.
Minor bump only after checking with check_sym.
libshout 2.4.5 (20201219)
* Improved shout.h for reading, and understanding.
* Marked dumpfile support as obsolete (as SHOUT_PROTOCOL_XAUDIOCAST
already is).
* Added Support for setting the content language.
* Avoid the use of obsolete functions (#2317).
* Several small fixes for non-blocking mode (#2321, #2315).
* Corrected detection of libogg (mostly for windows targets).
* Now accept TLS mode "auto" when build without TLS support.
* Added new tool shout(1).
libshout 2.4.4 (20201001)
* Fixed handling of blocking/non-blocking mode
* Fixed ICY port increment
* Fixed reusing of handles
* Fixed error handling of Ogg sync layer
* Fixed Passing of errors between connection and instance layer
Without this fix died connections were not correctly detected.
* Fixed and improved build scripts
Index: Makefile
===
RCS file: /cvs/ports/net/libshout/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 3 Mar 2020 21:10:08 - 1.31
+++ Makefile 12 Feb 2021 22:04:03 -
@@ -2,10 +2,9 @@
COMMENT= library for communicating with an icecast server
-DISTNAME= libshout-2.4.3
-REVISION= 0
+DISTNAME= libshout-2.4.5
-SHARED_LIBS += shout6.0 # 5.0
+SHARED_LIBS += shout6.1 # 5.0
CATEGORIES= net audio
@@ -16,7 +15,7 @@ MAINTAINER= Moritz Grimm =1 vorbis>=4
+WANTLIB += c crypto m ogg pthread speex ssl theora>=1 vorbis>=4
MASTER_SITES= https://downloads.xiph.org/releases/libshout/
Index: distinfo
===
RCS file: /cvs/ports/net/libshout/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 3 Mar 2020 21:07:01 - 1.9
+++ distinfo 12 Feb 2021 22:04:03 -
@@ -1,2 +1,2 @@
-SHA256 (libshout-2.4.3.tar.gz) = DYr1XRFBv5BxC81Bp2jJzFrbJRUCoK8d0iyNohXUDf4=
-SIZE (libshout-2.4.3.tar.gz) = 529563
+SHA256 (libshout-2.4.5.tar.gz) = 2eVoZopnOZTr4/HrXyvuBuMjal25K40MSH4cD4hqaJA=
+SIZE (libshout-2.4.5.tar.gz) = 543991
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure 12 Feb 2021 22:04:03 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Unbreak pkgconfig by not having the list start with a comma.
+
+Index: configure
+--- configure.orig
configure
+@@ -13597,7 +13597,7 @@ else
+ $as_echo "yes" >&6; }
+
+ HAVE_OGG="yes"
+-SHOUT_REQUIRES="$SHOUT_REQUIRES, ogg"
++SHOUT_REQUIRES="ogg"
+
+ fi
+ OGG_LIBS="$OGG_LDFLAGS $OGG_LIBS"
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/libshout/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 3 Mar 2020 21:10:08 - 1.8
+++ pkg/PLIST 12 Feb 2021 22:04:03 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.8 2020/03/03 21:10:08 sthen Exp $
+@bin bin/shout
include/shout/
include/shout/shout.h
@comment lib/ckport/
@@ -8,6 +9,7 @@ include/shout/shout.h
lib/libshout.la
@lib lib/libshout.so.${LIBshout_VERSION}
lib/pkgconfig/shout.pc
+@man man/man1/shout.1
share/aclocal/shout.m4
share/examples/libshout/
@comment share/examples/libshout/COPYING
[UPDATE] net/ezstream 1.0.2
Update to 1.0.2, a bugfix release resolving 3 crashes. Developed and
tested on amd64.
Adds a new master download site, accounting for extensive fallout of a
hardware failure at Xiph.org. It may take a bit more time until the
release has been (manually) deployed and mirrored there, so the 404
error during download is expected currently.
Index: Makefile
===
RCS file: /cvs/ports/net/ezstream/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 3 Mar 2020 21:11:40 - 1.23
+++ Makefile 12 Feb 2021 22:05:27 -
@@ -2,7 +2,7 @@
COMMENT= streaming source client that uses external en-/decoders
-DISTNAME= ezstream-1.0.1
+DISTNAME= ezstream-1.0.2
CATEGORIES= net multimedia
HOMEPAGE= https://icecast.org/ezstream/
@@ -15,7 +15,8 @@ PERMIT_PACKAGE= Yes
WANTLIB+= ${COMPILER_LIBCXX} c crypto iconv lzma m ogg shout \
speex ssl tag tag_c theora vorbis xml2 z
-MASTER_SITES= https://downloads.xiph.org/releases/ezstream/
+MASTER_SITES= https://downloads.xiph.org/releases/ezstream/ \
+ https://ezstream.mrsserver.net/releases/
BUILD_DEPENDS= devel/check
LIB_DEPENDS= converters/libiconv \
Index: distinfo
===
RCS file: /cvs/ports/net/ezstream/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo 3 Mar 2020 21:11:40 - 1.12
+++ distinfo 12 Feb 2021 22:05:27 -
@@ -1,2 +1,2 @@
-SHA256 (ezstream-1.0.1.tar.gz) = /Ev0lIl6ixz3Xc7vsesi69NpZ+XDtc4q+YWNu5TPEVc=
-SIZE (ezstream-1.0.1.tar.gz) = 512284
+SHA256 (ezstream-1.0.2.tar.gz) = Ed6Jf0ValbpYVGvc1AqV072mmGbsX3h5qDsCQSbFTCo=
+SIZE (ezstream-1.0.2.tar.gz) = 514884
Re: UPDATE/FIX: net/ocserv
On 2021-02-11 21:32:08, Stuart Henderson wrote: > thanks, i've adapted it to -current and then merged that (with the > 1.1.1 update) back to 6.8-stable. Thanks for the MFC. On OPENBSD_6_8, patch-src_config_c and patch-src_main_c are still present after a fresh checkout from a couple different mirrors which patch appears to be reversing since those changes are in the upstream 1.1.1 release. This builds on 6.8 but does not run properly due to the procfs errors that those patches fixed prior to 1.1.1. ocserv-1.1.1 runs correctly on 6.8-stable with patch-src_config_c and patch-src_main_c removed.
Re: UPDATE: x11/oroborus
On Fri, Feb 12, 2021 at 03:30:52PM -0800, Ryan Freeman wrote: > Took a stab here, FreeBSD has moved to 2.0.20 and uses Debian's mirror > to fetch the distfile. I followed suit. > > Never used this WM before, it doesn't even have a root menu, but this > builds and seems to run as advertised. Xterms move around and it has > default sloppy focus. > > All patches courtesy of FreeBSD, looks like this version has additional > themes. Forgot to mention this is a -fno-common fix It has been pointed out to me that the HOMEPAGE doesn't actually exist, and the likelihood of this port being needed still is rather low. If it is wanted, I suppose HOMEPAGE should just be deleted entirely. If it is not wanted, I will propose a diff to remove it.
UPDATE: x11/oroborus
Took a stab here, FreeBSD has moved to 2.0.20 and uses Debian's mirror
to fetch the distfile. I followed suit.
Never used this WM before, it doesn't even have a root menu, but this
builds and seems to run as advertised. Xterms move around and it has
default sloppy focus.
All patches courtesy of FreeBSD, looks like this version has additional
themes.
Index: Makefile
===
RCS file: /cvs/ports/x11/oroborus/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:51:18 - 1.10
+++ Makefile12 Feb 2021 23:27:18 -
@@ -3,11 +3,9 @@
COMMENT= minimalistic X11 window manager
CATEGORIES=x11
-DISTNAME= oroborus-2.0.12
-DISTFILES= oroborus_2.0.12-1.tar.gz
-REVISION= 0
-MASTER_SITES= http://www.mguillaud.net/ports/oroborus/ \
- http://matt.peterson.org/FreeBSD/ports/
+DISTNAME= oroborus-2.0.20
+DISTFILES= ${DISTNAME:S/-/_/}.tar.gz
+MASTER_SITES= http://archive.debian.org/debian/pool/main/o/oroborus/
HOMEPAGE= http://www.oroborus.org/
# GPL
Index: distinfo
===
RCS file: /cvs/ports/x11/oroborus/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:15:59 - 1.4
+++ distinfo12 Feb 2021 23:27:18 -
@@ -1,2 +1,2 @@
-SHA256 (oroborus_2.0.12-1.tar.gz) =
da6P0CzvF4e5o0iPudlw/iAyjbpb6pvLBy1ZgmRe8LE=
-SIZE (oroborus_2.0.12-1.tar.gz) = 236581
+SHA256 (oroborus_2.0.20.tar.gz) = UiClQLz2gSxnc/vlg9nqP1T0UsusVb7cqt66jDqae4k=
+SIZE (oroborus_2.0.20.tar.gz) = 335099
Index: patches/patch-src_hints_c
===
RCS file: patches/patch-src_hints_c
diff -N patches/patch-src_hints_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_hints_c 12 Feb 2021 23:27:18 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix -fno-common, from FreeBSD
+
+Index: src/hints.c
+--- src/hints.c.orig
src/hints.c
+@@ -43,7 +43,7 @@ Atom win_hints, win_state, win_client_list, win_layer,
+ win_workspace_count, win_desktop_button_proxy, win_supporting_wm_check,
+ gnome_panel_desktop_area;
+ Atom net_atoms[NET_ATOM_COUNT];
+-Display *dpy;
++extern Display *dpy;
+
+ void
+ initHints (Display * d)
Index: patches/patch-src_keyboard_c
===
RCS file: patches/patch-src_keyboard_c
diff -N patches/patch-src_keyboard_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_c12 Feb 2021 23:27:18 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix -fno-common, from FreeBSD
+
+Index: src/keyboard.c
+--- src/keyboard.c.orig
src/keyboard.c
+@@ -35,6 +35,8 @@
+ #include
+ #endif
+
++int NumLockMask, CapsLockMask, ScrollLockMask;
++
+ void
+ parseKeyString (Display * dpy, MyKey * key, char *str)
+ {
Index: patches/patch-src_keyboard_h
===
RCS file: patches/patch-src_keyboard_h
diff -N patches/patch-src_keyboard_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_keyboard_h12 Feb 2021 23:27:18 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+fix -fno-common, from FreeBSD
+
+Index: src/keyboard.h
+--- src/keyboard.h.orig
src/keyboard.h
+@@ -90,7 +90,7 @@ void grabKey (Display *, MyKey *, Window);
+ void ungrabKeys (Display *, Window);
+ void init_keyboard (Display * dpy);
+
+-int NumLockMask, CapsLockMask, ScrollLockMask;
++extern int NumLockMask, CapsLockMask, ScrollLockMask;
+
+ #endif /* __KEYBOARD_H */
+
Index: patches/patch-src_oroborus_c
===
RCS file: patches/patch-src_oroborus_c
diff -N patches/patch-src_oroborus_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_oroborus_c12 Feb 2021 23:27:18 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+fix error: use of undeclared identifier 'SIGINT'
+case SIGINT:
+
+and many others, from FreeBSD
+
+Index: src/oroborus.c
+--- src/oroborus.c.orig
src/oroborus.c
+@@ -33,6 +33,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "client.h"
+ #include "events.h"
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/oroborus/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Oct 2004 15:54:56 - 1.1.1.1
+++ pkg/PLIST 12 Feb 2021 23:27:18 -
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/18 15:54:56 naddy Exp $
-bin/oroborus
+@bin bin/oroborus
@man man/man1/oroborus.1
@man man/man5/oroborusrc.5
share/oroborus/
@@ -14,6 +14,120 @@ share/oroborus/schemes/red
share/oroborus/schemes/rose
share/oroborus/schemes/windows
share/oroborus/themes/
+share/oroborus/themes/Elberg_Blue/
+share/oroborus/themes/Elberg_Blue/bottom-active.xpm
+share/oroborus/themes/Elberg_Blue/bottom-inactive.xpm
Re: [UPDATE] x11/i3 4.19.1
On 2021/02/12 09:29, Guy Godfroy wrote: > I ended up by almost duplicating i3-mousedrag. So now i3-sensible-* > stuff are back in the game. > > Let me know what you think about it. thanks, some of the diff didn't apply but I have got it into shape, and adapted a few things (some parts only relevant for builds from git which isn't needed for proper releases) and committed. it looks like the upstream ticket with i3-mousedrag is moving again, so I'm hoping that we'll be able to get rid of i3-mousedrag and merge into the main port before too long, so it's good to have things in sync.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 16:14:30 Modified files: x11/i3-mousedrag: Makefile x11/i3-mousedrag/patches: patch-etc_config patch-etc_config_keycodes Log message: i3-mousedrag: sync some bits with i3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 16:14:05 Modified files: x11/i3 : Makefile distinfo x11/i3/patches : patch-etc_config patch-etc_config_keycodes patch-i3-dmenu-desktop patch-i3-msg_main_c patch-i3-nagbar_main_c patch-libi3_get_exe_path_c patch-src_bindings_c patch-src_config_parser_c patch-src_main_c x11/i3/pkg : PLIST Removed files: x11/i3/patches : patch-Makefile_in patch-parser-specs_config_spec patch-src_config_directives_c patch-testcases_t_201-config-parser_t Log message: update to i3-4.19.1, from Guy Godfroy with a couple of tweaks from me
Re: [update] sysutils/wmcube 0.98 -> 1.0.2 (+ -fno-common fix)
Ping. On Fri, 5 Feb 2021 00:46:13 +0100 Charlene Wendling wrote: > > This is an update for wmcube, to 1.0.2. This adds color schemes, > smooth fonts, more logos, a manual page and various fixes. > > Port-wise: > > - Move to dockapps.net, HOMEPAGE is not reachable > - Fix an hardcoded path to logo files (introduced in 1.0.0, > so our current package is not affected) > - Remove the Makefile patch, and override things with MAKE_FLAGS. That > also allows us to simplify the port, since we won't have to fix > MSDOS line endings, and that's why i've attached the diff > - Due to the previous change, don't use upstream's install target, > avoiding further patching > - Drop the wmgeneral/list.h patch. Upstream "fixed" that in 1.0.2 > - Fix the build with -fno-common > > Testing: > > It has been built and tested on macppc and amd64 without issues. > > OK? > > Charlène. wmcube.diff Description: Binary data
devel/avr32 -fno-common fixes
The GNU toolchain explicitly avoids common variables. Whoever
hacked up this derived version didn't understand that.
* binutils: Since linkrelax is already defined as a global variable,
it is already initialized to 0, so we can simply drop this
initialization.
* gcc-bootstrap, gcc: Use the mechanism provided by the .opt file
processing to initialize these globals.
With this, devel/avr32/* builds.
OK?
Index: binutils/Makefile
===
RCS file: /cvs/ports/devel/avr32/binutils/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- binutils/Makefile 12 Jul 2019 21:15:34 - 1.4
+++ binutils/Makefile 12 Feb 2021 22:41:54 -
@@ -2,6 +2,7 @@
COMMENT = Atmel AVR 32-bit binutils
V =2.23.1
+REVISION = 0
DISTNAME = avr32-binutils-${V}
# GPLv3
Index: binutils/patches/patch-gas_config_tc-avr32_c
===
RCS file: binutils/patches/patch-gas_config_tc-avr32_c
diff -N binutils/patches/patch-gas_config_tc-avr32_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ binutils/patches/patch-gas_config_tc-avr32_c12 Feb 2021 22:41:54
-
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: gas/config/tc-avr32.c
+--- gas/config/tc-avr32.c.orig
gas/config/tc-avr32.c
+@@ -47,7 +47,6 @@
+
+ /* Flags given on the command line */
+ static int avr32_pic = FALSE;
+-int linkrelax = FALSE;
+ int avr32_iarcompat = FALSE;
+
+ /* This array holds the chars that always start a comment. */
Index: gcc/Makefile
===
RCS file: /cvs/ports/devel/avr32/gcc/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- gcc/Makefile15 Jan 2021 19:03:58 - 1.8
+++ gcc/Makefile12 Feb 2021 22:41:54 -
@@ -3,7 +3,7 @@
COMMENT = Atmel AVR 32-bit gcc
V =4.4.7
DISTNAME = avr32-gcc-${V}
-REVISION = 1
+REVISION = 2
# GPLv3
PERMIT_PACKAGE = Yes
Index: gcc/patches/patch-gcc_config_avr32_avr32_c
===
RCS file: gcc/patches/patch-gcc_config_avr32_avr32_c
diff -N gcc/patches/patch-gcc_config_avr32_avr32_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ gcc/patches/patch-gcc_config_avr32_avr32_c 12 Feb 2021 22:41:54 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: gcc/config/avr32/avr32.c
+--- gcc/config/avr32/avr32.c.orig
gcc/config/avr32/avr32.c
+@@ -207,10 +207,6 @@ static const struct arch_type_s avr32_arch_types[] = {
+ {NULL, 0, 0, 0, NULL}
+ };
+
+-/* Default arch name */
+-const char *avr32_arch_name = "none";
+-const char *avr32_part_name = "none";
+-
+ const struct part_type_s *avr32_part;
+ const struct arch_type_s *avr32_arch;
+
Index: gcc/patches/patch-gcc_config_avr32_avr32_opt
===
RCS file: gcc/patches/patch-gcc_config_avr32_avr32_opt
diff -N gcc/patches/patch-gcc_config_avr32_avr32_opt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ gcc/patches/patch-gcc_config_avr32_avr32_opt12 Feb 2021 22:41:54
-
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+fix for -fno-common
+
+Index: gcc/config/avr32/avr32.opt
+--- gcc/config/avr32/avr32.opt.orig
gcc/config/avr32/avr32.opt
+@@ -56,7 +56,7 @@ Target Report Mask(HAS_ASM_ADDR_PSEUDOS)
+ Use assembler pseudo-instructions lda.w and call for handling direct
addresses. (Enabled by default)
+
+ mpart=
+-Target Report RejectNegative Joined Var(avr32_part_name)
++Target Report RejectNegative Joined Var(avr32_part_name) Init("none")
+ Specify the AVR32 part name
+
+ mcpu=
+@@ -64,7 +64,7 @@ Target Report RejectNegative Joined Undocumented Var(a
+ Specify the AVR32 part name (deprecated)
+
+ march=
+-Target Report RejectNegative Joined Var(avr32_arch_name)
++Target Report RejectNegative Joined Var(avr32_arch_name) Init("none")
+ Specify the AVR32 architecture name
+
+ mfast-float
Index: gcc-bootstrap/Makefile
===
RCS file: /cvs/ports/devel/avr32/gcc-bootstrap/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- gcc-bootstrap/Makefile 9 Jan 2021 21:41:16 - 1.8
+++ gcc-bootstrap/Makefile 12 Feb 2021 22:41:54 -
@@ -7,7 +7,7 @@ PKGNAME = avr32-gcc-bootstrap-${V}
# GPLv3
PERMIT_PACKAGE = Yes
-REVISION = 1
+REVISION = 2
WANTLIB = c gmp mpfr
DIST_SUBDIR = gcc
Index: gcc-bootstrap/patches/patch-gcc_config_avr32_avr32_c
===
RCS file: gcc-bootstrap/patches/patch-gcc_config_avr32_avr32_c
diff -N gcc-bootstrap/patches/patch-gcc_config_avr32_avr32_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ gcc-bootstrap/patches/patch-gcc_config_avr32_avr32_c12 Feb 2021
22:41:54 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2021/02/12 13:14:53 Modified files: games/clonekeen: Makefile games/clonekeen/patches: patch-src_menu_savegames_c Added files: games/clonekeen/patches: patch-src_eseq_ep2_c patch-src_gamepdo_c patch-src_menu_custommap_c patch-src_menu_keysetup_c patch-src_menu_options_c patch-src_menumanager_c patch-src_misc_ui_c Log message: -fno-common fixes for games/clonekeen.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 13:05:58 Modified files: sysutils/conky : Makefile Log message: needs docbook-xsl
Re: [UPDATE] games/multimc: Add support for Minecraft >= 1.13
On 2/12/21 6:12 PM, Kurt Mosiejczuk wrote: On Fri, Feb 12, 2021 at 04:54:35PM +0100, Peter Hessler wrote: On 2021 Feb 12 (Fri) at 15:06:00 +0100 (+0100), Muhammad Kaisar Arkhan wrote: :The reason why it crashed on Java 8 and runs on Java 11 is because of LWJGL :being compiled on Java 11 which generates a JNI (Java Native Interface) :that's incompatible with Java 8. :From my experience, I get this exception: :java.lang.NoSuchMethodError: :java.nio.ByteBuffer.position(I)Ljava/nio/ByteBuffer; :This is a rather common issue and the typical solution is to compile the JNI :with Java 8. My concern is the best out-of-box experience for players who want to play the current version of Minecraft, 1.16. Players that want to play older, and especially modded older versions, should still work but may need to change their configs. This could be something we document in a README or DESCR, though; because I do want to still play some older versions myself. Also, at a later point, I'd like to remove the RUN_DEPENDS on lwjgl2; but still allow players to manually install it for older versions. <1.12 uses lwjgl2 only, so imho the lwjgl3 package can stay with java11. Kurt, any opinions? Well, I chose Java 11 largely because when building with Java 8, the build stops and says it recommends building with Java 10 or newer and asks if you want to proceed. It doesn't do that with Java 11. Builds aren't interactive so that would fail the build. --Kurt The following diff for lwjgl3 should remove the manual user input. --- build.xml.orig Fri Feb 12 20:24:59 2021 +++ build.xml Fri Feb 12 20:26:04 2021 @@ -1139,20 +1139,6 @@ - - --message="It is recommended to build LWJGL releases on JDK 10 or higher. Continue with current JDK?" -validargs="y,n" -defaultvalue="n" -addproperty="input" -unless:set="jdk10" -/> - - - - - -- Muhammad Kaisar Arkhan h...@yukiisbo.red - kai...@arkhan.io https://yukiisbo.red - https://arkhan.io
Re: NEW: games/crispy-doom
On Fri, Feb 12, 2021 at 10:33:30AM -0800, Ryan Freeman wrote: > On Fri, Feb 12, 2021 at 09:39:26AM -0800, Ryan Freeman wrote: > > Hold off on this, it seems the CMake-based build process does in fact > > still build crispy-hexen and crispy-strife games. I mistakenly assumed > > the autotools build system was still sufficient here. > > > > I will restart this with CMake instead, apologies for the noise. > > > > Well, this got a bit more complicated than I anticipated. **snip** I was on the right path the first time, autotools is definitely preferred. I've reattached the port with one minor change: rename default.cfg.5 and heretic.cfg.5 to crispy_default.cfg.5 and crispy_heretic.cfg.5. I've made a note in the README about this. OK? crispy-doom.tar.gz Description: application/tar-gz
Remove multimedia/audiopreview
Next victim of "-fno-common". The project is dead and I don't think we should save this application. Alternatives are available.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 11:39:05 Modified files: security/nss : Makefile Removed files: security/nss/patches: patch-nss_lib_ckfw_builtins_certdata_txt Log message: Drop the patch backing out the certdata update in NSS 3.61; the main public sites affected by dropping the geotrust root (apple store, apple news etc) are on different CAs now and the other known ones are api endpoints not so likely to be important in a standard browser. OK robert, landry said 'rm all the things' earlier which I am treating as an OK ;)
Re: NEW: games/crispy-doom
On Fri, Feb 12, 2021 at 09:39:26AM -0800, Ryan Freeman wrote: > Hold off on this, it seems the CMake-based build process does in fact > still build crispy-hexen and crispy-strife games. I mistakenly assumed > the autotools build system was still sufficient here. > > I will restart this with CMake instead, apologies for the noise. > Well, this got a bit more complicated than I anticipated. Seems while CMake builds all the binaries including Hexen and Strife, it omitts everything else the autotools build normally provides -- desktop files, icons, docs, etc. I've opened an issue upstream just asking for clarification on what would be preferred, as it looks like I might be able to just uncomment the Hexen/Strife bits in the various Makefile.am files. https://github.com/fabiangreffrath/crispy-doom/issues/717 Debian appears to just use autotools as-is, and not distribute the Hexen/Strife binaries https://packages.debian.org/sid/amd64/crispy-doom/filelist FWIW -- the collision in manpage names for default.cfg.5 and heretic.cfg.5 were handled by the Debian maintainer by just adding a crispy_ prefix. I've also thought of just not installing them at all, and making a note in the package README that these man pages are available if you also install chocolate-doom. Thoughts? -ryan
Re: NEW: games/crispy-doom
Hold off on this, it seems the CMake-based build process does in fact still build crispy-hexen and crispy-strife games. I mistakenly assumed the autotools build system was still sufficient here. I will restart this with CMake instead, apologies for the noise.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2021/02/12 10:36:49 Modified files: devel/cmake: Makefile distinfo devel/cmake/patches: patch-Modules_Compiler_GNU_cmake patch-Modules_FindSDL_cmake patch-Source_cmSystemTools_cxx devel/cmake/pkg: PLIST Log message: Update cmake to 3.19.4
Re: allow /dev/dri/card0 in firefox
Hi, On Fri, Feb 12, 2021 at 11:05:13AM +1100, Jonathan Gray wrote: > drm /dev nodes with the linux names are going to be added with the old > names going away sometime later. When libdrm is changed to use the new > names firefox will need this. chromium does sandboxing better so > doesn't need a change like this. > > I didn't find any use of /dev/drm inside the firefox source itself. FWIW, with Tor Browser I just follow along with whatever happens with the Firefox port for the stuff that is not Tor Browser-specific (which includes your change). So I'm OK with whatever change is made to the Firefox port as well. Thanks, Caspar
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2021/02/12 10:29:26 Modified files: cad/geda-gaf : Makefile Added files: cad/geda-gaf/patches: patch-gattrib_include_globals_h patch-gattrib_src_globals_c Log message: -fno-common fixes for cad/geda-gaf. Looked quickly at updating this, but it's non-trivial and I'm not interested in maintaining this further.
Re: REMOVE: games/prboom
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote: > On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote: > > First time trying to remove something, here is a patch to move > > games/prboom to the attic. games/prboom-plus does everything it > > did and more with fixes. netgames can be played with: > > - games/chocolate-doom > > - games/odamex > > - games/gzdoom > > > > anything I've forgotten for removal? > > > > OK? > > -ryan > > Thanks naddy, kn, edd for the hints on Quirks and the main category unhook. > This more like it? and here is the unhook diff separately Index: Makefile === RCS file: /cvs/ports/games/Makefile,v retrieving revision 1.434 diff -u -p -r1.434 Makefile --- Makefile8 Feb 2021 20:33:31 - 1.434 +++ Makefile12 Feb 2021 17:26:23 - @@ -234,7 +234,6 @@ SUBDIR += pokerth SUBDIR += polymorphable SUBDIR += postal - SUBDIR += prboom SUBDIR += prboom-plus SUBDIR += pushover SUBDIR += puzzles
Re: REMOVE: games/prboom
On Thu, Feb 11, 2021 at 02:53:04PM -0800, Ryan Freeman wrote:
> On Wed, Feb 10, 2021 at 05:46:28PM -0800, Ryan Freeman wrote:
> > First time trying to remove something, here is a patch to move
> > games/prboom to the attic. games/prboom-plus does everything it
> > did and more with fixes. netgames can be played with:
> > - games/chocolate-doom
> > - games/odamex
> > - games/gzdoom
> >
> > anything I've forgotten for removal?
> >
> > OK?
> > -ryan
>
> Thanks naddy, kn, edd for the hints on Quirks and the main category unhook.
> This more like it?
Here is the quirks diff separately
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1173
diff -u -p -r1.1173 Quirks.pm
--- files/Quirks.pm 10 Feb 2021 12:49:31 - 1.1173
+++ files/Quirks.pm 12 Feb 2021 17:25:55 -
@@ -539,6 +539,7 @@ my $stem_extensions = {
'py-sphinx-intl' => 'py3-sphinx-intl',
'stegcracker' => 'stegseek',
'py-ldap3' => 'py3-ldap3',
+ 'prboom' => 'prboom-plus',
};
my $obsolete_reason = {
@@ -2077,6 +2078,7 @@ my $obsolete_reason = {
'icinga-web' => 38,
'icinga-cgi' => 38,
'icinga-idoutils' => 38,
+ 'prboom' => 3,
};
# reasons for obsolete packages
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 10:27:48 Modified files: x11/gnome/autoar: Tag: OPENBSD_6_8 Makefile distinfo Log message: SECURITY update to gnome-autoar-0.3.0. CVE-2020-36241.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 10:26:17 Modified files: x11/gnome/autoar: Makefile distinfo Log message: SECURITY update to gnome-autoar-0.3.0. CVE-2020-36241.
Re: [UPDATE] games/multimc: Add support for Minecraft >= 1.13
On Fri, Feb 12, 2021 at 04:54:35PM +0100, Peter Hessler wrote: > On 2021 Feb 12 (Fri) at 15:06:00 +0100 (+0100), Muhammad Kaisar Arkhan wrote: > :The reason why it crashed on Java 8 and runs on Java 11 is because of LWJGL > :being compiled on Java 11 which generates a JNI (Java Native Interface) > :that's incompatible with Java 8. > :From my experience, I get this exception: > :java.lang.NoSuchMethodError: > :java.nio.ByteBuffer.position(I)Ljava/nio/ByteBuffer; > :This is a rather common issue and the typical solution is to compile the JNI > :with Java 8. > My concern is the best out-of-box experience for players who want to play > the current version of Minecraft, 1.16. Players that want to play older, > and especially modded older versions, should still work but may need to > change their configs. > This could be something we document in a README or DESCR, though; > because I do want to still play some older versions myself. Also, at a > later point, I'd like to remove the RUN_DEPENDS on lwjgl2; but still > allow players to manually install it for older versions. > <1.12 uses lwjgl2 only, so imho the lwjgl3 package can stay with java11. > Kurt, any opinions? Well, I chose Java 11 largely because when building with Java 8, the build stops and says it recommends building with Java 10 or newer and asks if you want to proceed. It doesn't do that with Java 11. Builds aren't interactive so that would fail the build. --Kurt
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 10:01:19 Modified files: x11/gnome/gdm : Makefile x11/gnome/gdm/patches: patch-data_Init_in patch-data_PostSession_in patch-data_PreSession_in x11/gnome/gdm/pkg: gdm.rc Log message: Add support for /dev/dri/card0 and /dev/dri/renderD128.
Re: [UPDATE] games/multimc: Add support for Minecraft >= 1.13
On 2021 Feb 12 (Fri) at 15:06:00 +0100 (+0100), Muhammad Kaisar Arkhan wrote: :On 2/12/21 10:32 AM, Peter Hessler wrote: :> On 2021 Feb 11 (Thu) at 22:47:10 +0100 (+0100), Muhammad Kaisar Arkhan wrote: :> :On 2/11/21 9:43 PM, Muhammad Kaisar Arkhan wrote: :> :> Hello ports@, :> :> :> :> Thanks to games/lwjgl3 which was recently imported to the ports tree. It :> :> is now possible to play Minecraft 1.13 and above. :> :> :> :> This patch adds support for launching Minecraft 1.13 and above by :> :> generating and applying a OneSix library patch to make MultiMC use the :> :> system-wide LWJGL library instead of the version that's from Mojang when :> :> you launch Minecraft. A lot of changes to MultiMC was also done to make :> :> it load libraries outside of MultiMC's libraries folder. :> :> :> :> OK? :> :> :> : :> :Here's an updated diff because I forgot to remove a unimportant log print for :> :debugging purposes. :> : :> :It should be good now. :> : :> :> I gave the previous version of this diff a spin, and it worked for me :> with 1.12.2, 1.16.5, and the most recent snapshot 21w06a. :> :> I did get an error about glfw when I first started it, but once I :> switched to java 11 instead of java 8 it just worked. :> :> Should we modify the port to use java 11? :> :> : :The reason why it crashed on Java 8 and runs on Java 11 is because of LWJGL :being compiled on Java 11 which generates a JNI (Java Native Interface) :that's incompatible with Java 8. : :From my experience, I get this exception: :java.lang.NoSuchMethodError: :java.nio.ByteBuffer.position(I)Ljava/nio/ByteBuffer; : :This is a rather common issue and the typical solution is to compile the JNI :with Java 8. : :If you compile games/lwjgl3 with Java 8 by changing `MODJAVA_VER` to 1.8, :it'll work fine. I'm not sure if this causes issues or not down the line when :running with Java 11, I suspect it'll loose optimizations which are possible :on Java 9 and above. : :Also, I would rather not make games/multimc to only use Java 11 mainly :because in older versions of Minecraft (1.12 and below) especially with mods, :the game will crash due to strict rules surrounding "reflective access" :introduced in Java 9, the main reason of why the game still ships with Java 8 :on Windows. : :You could try by launching Minecraft 1.12 and only install the Forge Mod :Loader (Edit Instance -> Version -> Install Forge), it will crash due to :illegal reflective access on Java 11. : :I'm not sure what's the correct way to solve this issue, I was thinking about :having two FLAVOR of games/lwjgl3, one compiled with Java 8 for compatibility :reasons and the other compiled with Java 11 which will have all of the fancy :optimizations. : My concern is the best out-of-box experience for players who want to play the current version of Minecraft, 1.16. Players that want to play older, and especially modded older versions, should still work but may need to change their configs. This could be something we document in a README or DESCR, though; because I do want to still play some older versions myself. Also, at a later point, I'd like to remove the RUN_DEPENDS on lwjgl2; but still allow players to manually install it for older versions. <1.12 uses lwjgl2 only, so imho the lwjgl3 package can stay with java11. Kurt, any opinions? -peter p.s. the signature was randomly chosen ;) -- Real Programmers think better when playing Adventure or Rogue.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 07:58:44 Modified files: mail/evolution-ews: Makefile distinfo Log message: Update to evolution-ews-3.38.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 07:58:25 Modified files: mail/evolution : Makefile distinfo Log message: Update to evolution-3.38.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2021/02/12 07:58:06 Modified files: databases/evolution-data-server: Makefile distinfo Log message: Update to evolution-data-server-3.38.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 07:34:12 Modified files: security/py-josepy: Makefile distinfo security/py-josepy/pkg: PLIST Log message: update to py-josepy-1.7.0, adding support for ec keys
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 07:33:37 Modified files: fonts/cascadia-code: Makefile distinfo Log message: update to cascadia-code-2102.03
Re: [UPDATE] games/multimc: Add support for Minecraft >= 1.13
On 2/12/21 10:32 AM, Peter Hessler wrote: On 2021 Feb 11 (Thu) at 22:47:10 +0100 (+0100), Muhammad Kaisar Arkhan wrote: :On 2/11/21 9:43 PM, Muhammad Kaisar Arkhan wrote: :> Hello ports@, :> :> Thanks to games/lwjgl3 which was recently imported to the ports tree. It :> is now possible to play Minecraft 1.13 and above. :> :> This patch adds support for launching Minecraft 1.13 and above by :> generating and applying a OneSix library patch to make MultiMC use the :> system-wide LWJGL library instead of the version that's from Mojang when :> you launch Minecraft. A lot of changes to MultiMC was also done to make :> it load libraries outside of MultiMC's libraries folder. :> :> OK? :> : :Here's an updated diff because I forgot to remove a unimportant log print for :debugging purposes. : :It should be good now. : I gave the previous version of this diff a spin, and it worked for me with 1.12.2, 1.16.5, and the most recent snapshot 21w06a. I did get an error about glfw when I first started it, but once I switched to java 11 instead of java 8 it just worked. Should we modify the port to use java 11? The reason why it crashed on Java 8 and runs on Java 11 is because of LWJGL being compiled on Java 11 which generates a JNI (Java Native Interface) that's incompatible with Java 8. From my experience, I get this exception: java.lang.NoSuchMethodError: java.nio.ByteBuffer.position(I)Ljava/nio/ByteBuffer; This is a rather common issue and the typical solution is to compile the JNI with Java 8. If you compile games/lwjgl3 with Java 8 by changing `MODJAVA_VER` to 1.8, it'll work fine. I'm not sure if this causes issues or not down the line when running with Java 11, I suspect it'll loose optimizations which are possible on Java 9 and above. Also, I would rather not make games/multimc to only use Java 11 mainly because in older versions of Minecraft (1.12 and below) especially with mods, the game will crash due to strict rules surrounding "reflective access" introduced in Java 9, the main reason of why the game still ships with Java 8 on Windows. You could try by launching Minecraft 1.12 and only install the Forge Mod Loader (Edit Instance -> Version -> Install Forge), it will crash due to illegal reflective access on Java 11. I'm not sure what's the correct way to solve this issue, I was thinking about having two FLAVOR of games/lwjgl3, one compiled with Java 8 for compatibility reasons and the other compiled with Java 11 which will have all of the fancy optimizations. -- Muhammad Kaisar Arkhan h...@yukiisbo.red - kai...@arkhan.io https://yukiisbo.red - https://arkhan.io
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2021/02/12 06:44:00 Modified files: misc/mc: Makefile distinfo misc/mc/patches: patch-configure misc/mc/pkg: PLIST Log message: update to mc-4.8.26 OK robert@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2021/02/12 05:39:07 Modified files: databases/postgresql-previous: Makefile distinfo databases/postgresql-previous/pkg: PLIST Log message: postgresql-previous: update to 12.6, and rm files installed under share/doc/postgresql that conflict with databases/postgresql,-docs. ok pea@
UPDATE: libwebp 1.2.0
Here is an update to libwebp 1.2.0.
- 12/23/2020: version 1.2.0
* API changes:
- libwebp:
encode.h: add a qmin / qmax range for quality factor (cwebp adds -qrange)
* lossless encoder improvements
* SIMD support for Wasm builds
* add xcframeworkbuild.sh, supports Mac Catalyst builds
* import fuzzers from oss-fuzz & chromium (#409)
* webpmux: add an '-set loop ' option (#494)
* toolchain updates and bug fixes (#449, #463, #470, #475, #477, #478, #479,
#488, #491)
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/libwebp/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- Makefile19 Mar 2020 22:23:47 - 1.22
+++ Makefile12 Feb 2021 07:23:46 -
@@ -2,13 +2,13 @@
COMMENT= Google WebP image format conversion tool
-VER= 1.1.0
+VER= 1.2.0
CATEGORIES=graphics
GH_ACCOUNT=webmproject
GH_PROJECT=libwebp
GH_TAGNAME=v${VER}
-SHARED_LIBS += webp 4.2 # 6.0
+SHARED_LIBS += webp 4.3 # 6.0
SHARED_LIBS += webpdecoder 2.1 # 2.0
SHARED_LIBS += webpdemux2.0 # 2.0
SHARED_LIBS += webpmux 2.0 # 2.0
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/libwebp/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo19 Mar 2020 22:23:47 - 1.15
+++ distinfo12 Feb 2021 06:42:05 -
@@ -1,2 +1,2 @@
-SHA256 (libwebp-1.1.0.tar.gz) = Qk+qtgoUy5LCoGJzO2l3tMweh1pjmIh8WRGzoabFbFE=
-SIZE (libwebp-1.1.0.tar.gz) = 3579449
+SHA256 (libwebp-1.2.0.tar.gz) = 1gYIxFaC+h5dQcPCbBmb5dAYQITNipcab8VANfdkh9M=
+SIZE (libwebp-1.2.0.tar.gz) = 3636573
Re: UPDATE: Duf-0.6.0
ping
On Fri, 05 Feb 2021 at 19:14:47 +0100, Gonzalo L. Rodriguez wrote:
> Hello,
>
> Update for Duf 0.6.0:
>
> https://github.com/muesli/duf/releases/tag/v0.6.0
>
> OK? Comments?
>
> Cheers.-
>
> --
>
>%gonzalo
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/duf/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 2 Dec 2020 08:23:04 - 1.2
> +++ Makefile 5 Feb 2021 17:33:28 -
> @@ -3,10 +3,10 @@
> COMMENT =disk Usage/free utility
>
> MODGO_MODNAME = github.com/muesli/duf
> -MODGO_VERSION = v0.5.0
> +MODGO_VERSION = v0.6.0
>
> DISTNAME = duf-${MODGO_VERSION}
> -PKGNAME =duf-0.5.0
> +PKGNAME =duf-0.6.0
>
> CATEGORIES = sysutils
>
> @@ -22,10 +22,11 @@ MODGO_MODULES = \
> github.com/jedib0t/go-pretty/v6 v6.0.5 \
> github.com/lucasb-eyer/go-colorful v1.0.3 \
> github.com/mattn/go-isatty v0.0.12 \
> - github.com/mattn/go-runewidthv0.0.9 \
> + github.com/mattn/go-runewidthv0.0.10 \
> github.com/muesli/termenvv0.7.4 \
> github.com/pkg/profile v1.2.1 \
> github.com/pmezard/go-difflibv1.0.0 \
> + github.com/rivo/uniseg v0.1.0 \
> github.com/stretchr/testify v1.2.2 \
> golang.org/x/crypto
> v0.0.0-20200820211705-5c72a883971a \
> golang.org/x/net
> v0.0.0-20190404232315-eb5bcb51f2a3 \
> @@ -33,10 +34,11 @@ MODGO_MODULES = \
> golang.org/x/textv0.3.0
>
> MODGO_MODFILES = \
> - golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
> - golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c \
> - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
> - golang.org/x/sys v0.0.0-20190412213103-97732733099d \
> - golang.org/x/sys v0.0.0-20200116001909-b77594299b42
> + github.com/mattn/go-runewidthv0.0.9 \
> + golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 \
> + golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c \
> + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a \
> + golang.org/x/sys v0.0.0-20190412213103-97732733099d \
> + golang.org/x/sys v0.0.0-20200116001909-b77594299b42
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/duf/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 2 Dec 2020 08:23:04 - 1.2
> +++ distinfo 5 Feb 2021 17:33:28 -
> @@ -1,4 +1,4 @@
> -SHA256 (duf-v0.5.0.zip) = KoYG+wM0nFdOAlTNSk6m0OpHw6wgBnQj8U/N/v5xLCU=
> +SHA256 (duf-v0.6.0.zip) = uo+q61d8wUMJ/Vr419BZTq/dSnpGOJoCUppL8e19AJM=
> SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.mod) =
> vLKTkyUSN7eaF7bBm/KRNPQ+j0OMMZiYj81GGhzfBcw=
> SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) =
> a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
> SHA256 (go_modules/github.com/jedib0t/go-pretty/v6/@v/v6.0.5.mod) =
> h91BexKLyKmi+zORQ7cJ4XlqPpme33h565513f1P9qI=
> @@ -7,14 +7,17 @@ SHA256 (go_modules/github.com/lucasb-eye
> SHA256 (go_modules/github.com/lucasb-eyer/go-colorful/@v/v1.0.3.zip) =
> qobu50Rk+L3FrZp9TqRz5yxl5qPdVpLBBzbQY14+AF8=
> SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.mod) =
> GgYuVsAmbQBL6lERWs+MK1l9FAfKVa1WzOAel62j2ks=
> SHA256 (go_modules/github.com/mattn/go-isatty/@v/v0.0.12.zip) =
> B5QdJOCJTCncQrzSnWRIFc17XuhOPBS75tUa0T78vwc=
> +SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.10.mod) =
> QTaqoj/LMXaikoIvKoqYzMey/eOKWZIsFSsAb1nVlpU=
> +SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.10.zip) =
> Aw3PPqbLObNCafEZ7l/l6dWDTa9Anh8/SMBlpFMm9KY=
> SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.9.mod) =
> h9IheU+rSqxoFLv0KqEKpLdpPIMpT9GCb1gSJCh4Vwk=
> -SHA256 (go_modules/github.com/mattn/go-runewidth/@v/v0.0.9.zip) =
> DEDRkSVEgwAxiCv1dr1Bo7H/TFwl42Gz6kRAtEu6xfk=
> SHA256 (go_modules/github.com/muesli/termenv/@v/v0.7.4.mod) =
> k5LtH+QufVKNat8nkI6IVSArU8IdC6e/phuvXUb+t4k=
> SHA256 (go_modules/github.com/muesli/termenv/@v/v0.7.4.zip) =
> J8D6fADAFxGt5/9XT4OUbCFpfNz00lh32hPAinJKsD4=
> SHA256 (go_modules/github.com/pkg/profile/@v/v1.2.1.mod) =
> WbNk4Z1GA9v7C9owGpc5j9OxEE1nbWeHaucEwQtiyuQ=
> SHA256 (go_modules/github.com/pkg/profile/@v/v1.2.1.zip) =
> BYT+rR6CAjDAuJEMPOQ2aKGHXILjmPqgRQyecsLSnAo=
> SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.mod) =
> dLLnZushU3eGTVh7rfV+lVIfaS0qeGCzx3WQk/nJvsI=
> SHA256 (go_modules/github.com/pmezard/go-difflib/@v/v1.0.0.zip) =
> 3gTOzBpLjVPkNXBRAmeUvLxU8uaiYM+sUIzmnV1kV6A=
> +SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.1.0.mod) =
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2021/02/12 03:57:32 Modified files: www/nextcloud : Makefile distinfo www/nextcloud/pkg: PLIST Log message: Update for Nextclout to 20.0.7
Re: New port: Gaupol subtitle editor
Hi, reattaching the tarball for convenience, thanks!
Anindya
On Tue, Feb 02, 2021 at 11:50:40AM +, Stuart Henderson wrote:
> start COMMENT with lower-case please (unless it's a proper noun,
> but that doesn't apply here).
>
> we are a bit busy fixing hundreds of ports for a forthcoming
> clang update at the moment so it may take a while to get to it :)
>
>
> On 2021/02/02 06:41, Anindya Mukherjee wrote:
> > Attached tarball.
> >
> >
> > From: Anindya Mukherjee
> > Sent: February 1, 2021 10:31 PM
> > To: Dimitri Karamazov
> > Cc: ports@openbsd.org
> > Subject: Re: New port: Gaupol subtitle editor
> >
> > Hi, just to recap:
> >
> > This package provides Gaupol, an editor for
> > text-based subtitle files.
> >
> > Maintainer: Anindya Mukherjee
> >
> > Homepage: https://otsaloma.io/gaupol/
> >
> > Comments? OKs? I'm using it on my machine,
> > installed from pkg.
> >
> > Thanks!
> > Anindya
> >
> >
> > From: Anindya Mukherjee
> > Sent: January 29, 2021 7:18 PM
> > To: Dimitri Karamazov
> > Cc: ports@openbsd.org
> > Subject: Re: New port: Gaupol subtitle editor
> >
> > Updated tarball attached. I have added myself as
> > maintainer.
> >
> > Thanks,
> > Anindya
> >
> >
> > From: Anindya Mukherjee
> > Sent: January 29, 2021 12:04 AM
> > To: Dimitri Karamazov
> > Cc: ports@openbsd.org
> > Subject: Re: New port: Gaupol subtitle editor
> >
> > Hi,
> >
> > Many thanks for the comments and fixes. Sure, I can take
> > maintainer. So, it looks like I only need to add maintainer
> > to your version? Build and package looks ok and runs.
> > Any other suggestions?
> >
> > Thanks,
> > Anindya
> >
> > From: Dimitri Karamazov
> > Sent: January 28, 2021 9:14 PM
> > To: Anindya Mukherjee
> > Cc: ports@openbsd.org
> > Subject: Re: New port: Gaupol subtitle editor
> >
> > On Fri, Jan 29, 2021 at 04:28:50AM +, Dimitri Karamazov wrote:
> > > Hi, this is a port of gaupol, an editor for text-based subtitle files.
> > > It supports multiple subtitle file formats and provides means of
> > > creating, editing and translating subtitles and timing subtitles to
> > > match video.
> > >
> > > This is my first port, so there might be things I missed. I have tried
> > > to follow the porting guide closely. Please have a look and comment.
> > >
> > > Thanks,
> > > Anindya
> >
> > I've reattached with some changes
> >
> > -py-* nomenclature is used for python modules not for standalone ports
> > like this, so I've removed it.
> > -FLAVOR{s,} is also used for python modules only, MODPY_VERSION is suffice
> > in this case.
> > -rearranged the dependencies in alpha order and added some missing
> > runtime depends.
> >
> > There are many tests available but most of those need xorg, access to which
> > _pbuild doesn't have? One can run them as a normal user though. I'm not sure
> > if MODPY_PYTEST is of any use if the tests don't run on their own.
> >
> > Also I recommended you take maintainer since you're going to use it.
> >
> > regards,
> > Dimitri
>
>
gaupol.tar.gz
Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2021/02/12 02:40:56 Modified files: databases/postgresql: Tag: OPENBSD_6_8 Makefile distinfo databases/postgresql/pkg: Tag: OPENBSD_6_8 PLIST-docs Log message: Bugfix update to 12.6 ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2021/02/12 02:39:22 Modified files: textproc/highlight: Makefile distinfo Log message: Update to highlight-3.61.
Re: [UPDATE] games/multimc: Add support for Minecraft >= 1.13
On 2021 Feb 11 (Thu) at 22:47:10 +0100 (+0100), Muhammad Kaisar Arkhan wrote: :On 2/11/21 9:43 PM, Muhammad Kaisar Arkhan wrote: :> Hello ports@, :> :> Thanks to games/lwjgl3 which was recently imported to the ports tree. It :> is now possible to play Minecraft 1.13 and above. :> :> This patch adds support for launching Minecraft 1.13 and above by :> generating and applying a OneSix library patch to make MultiMC use the :> system-wide LWJGL library instead of the version that's from Mojang when :> you launch Minecraft. A lot of changes to MultiMC was also done to make :> it load libraries outside of MultiMC's libraries folder. :> :> OK? :> : :Here's an updated diff because I forgot to remove a unimportant log print for :debugging purposes. : :It should be good now. : I gave the previous version of this diff a spin, and it worked for me with 1.12.2, 1.16.5, and the most recent snapshot 21w06a. I did get an error about glfw when I first started it, but once I switched to java 11 instead of java 8 it just worked. Should we modify the port to use java 11? -- In specifications, Murphy's Law supersedes Ohm's.
Re: [New] libva-intel-media-driver port
On 2021/02/10 21:50, Bryan Steele wrote: > Putting something into ports knowing that it's the wrong place feels > wrong, and will undoubtedly cause friction later when moved to base. Moving from base to ports is a bit more tricky but not impossible. Moving from ports to base is no problem at all.
Re: UPDATE/FIX: net/ocserv
On 2021/02/12 00:21, Jake Stennett wrote: > thanks for the -current adaptation, I'm trying to write a patch to use cloned > interfaces without having to use MAKEDEV, I have the tun interfaces created, > but they won't go active unless I open /dev/tunN, I've looked through the > ifconfig code but couldn't see anything to help. any chance you can point me > in the right direction? Could be wrong but I don't see any indication that tun(4) works that way, I think the device nodes are required.
Re: [New] libva-intel-media-driver port
On Wed, Feb 10, 2021 at 09:50:47PM -0500, Bryan Steele wrote: Hello Bryan, > It's certainly something that would be nice to have, and has been > attempted a few times. Someone just needs to pick up the work that has > been started by others. > > The original ports discussions: > > https://marc.info/?t=15762647571=1=2 > https://marc.info/?t=15758739041=1=2 > > ..when it moved to tech@ to attempt xenocara integration: > > https://marc.info/?t=15767653863=1=2 Thanks for the pointers! I was surprised that just a few weeks ago you were suggesting libva might go into ports ;) Being more serious, I wonder if we can suggest a concrete path to Eugene should he be able and willing to put more time into this? I know that he was looking into upstreaming OpenBSD relevant patches, which is a positive chunk of work to be doing in parallel. However, it's not totally clear to me what he might need to do to get libva and its associated parts (libva-intel-media-driver etc) into xenocara and ports (as appropriate). He may well be much more au fait with these things than I am, but equally, he might not mind more detailed input from people who know more than me! Now that I understand how to use ffmpeg's hardware acceleration better (in particular when the hardware can do both decoding and encoding), I realise I undersold the effect of Eugene's work: on my 5 year old integrated "GPU" OpenBSD desktop, I'm seeing some video tasks running 50x faster than before! I imagine the folks porting OBS to OpenBSD would probably love to take advantage of this :) Laurie
Re: [UPDATE] x11/i3 4.19.1
I ended up by almost duplicating i3-mousedrag. So now i3-sensible-*
stuff are back in the game.
Let me know what you think about it.
Le 12/02/2021 à 08:37, Guy Godfroy a écrit :
> Thank you Stuart!
>
> I'll clean it a bit then. It's the first time I submit such a big port
> patch.
>
> Concerning patch-meson_build, I only translated the previous file (and
> now deleted) patch-Makefile_in. I don't know the reason i3-sensible_*
> tools were removed. Do you think we could include them again?
>
> Le 11/02/2021 à 22:09, Stuart Henderson a écrit :
>> This leaves some bits from the autoconf build which are no longer
>> needed, and misses setting a C11-compatible COMPILER. There is also
>> x11/i3-mousedrag in ports which I updated recently that is from a
>> similar codebase.
>>
>> (i3-mousedrag is built from a git checkout which doesn't come with
>> bundled manuals, so has a few extra bits for that, and I left in the
>> i3-sensible-XX scripts as I didn't see much point in patching to
>> disable them).
>>
>>
>>> Index: patches/patch-meson_build
>>> ===
>> ..
>>> + 'sh',
>>> + '-c',
>>> +-'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL &&
>>> make && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>>> ++'cp -r @0@/AnyEvent-I3 . && cd AnyEvent-I3 && perl Makefile.PL &&
>>> gmake && touch ../AnyEvent-I3.stamp'.format(meson.current_source_dir()),
>>> + ],
>>
>> I think this is unused in the i3 build
>>
>>> share/doc/i3/userguide.html
>>> share/doc/i3/wsbar.html
>>> share/examples/i3/
>>> @sample ${SYSCONFDIR}/i3/
>>> -share/examples/i3/config
>>> @sample ${SYSCONFDIR}/i3/config
>>> -share/examples/i3/config.keycodes
>>> @sample ${SYSCONFDIR}/i3/config.keycodes
>>
>> you are now creating /etc/i3/config and /etc/i3/config.keycodes with the
>> contents of the wsbar.html file..
>>
? maildiff
Index: Makefile
===
RCS file: /cvs/ports/x11/i3/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile7 Nov 2020 13:14:21 - 1.126
+++ Makefile12 Feb 2021 08:26:35 -
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager
-DISTNAME = i3-4.18.3
+DISTNAME = i3-4.19.1
CATEGORIES = x11
@@ -13,14 +13,18 @@ PERMIT_PACKAGE =Yes
# XXX use of pledge has been neutered. For more details see
# https://marc.info/?l=openbsd-ports=156762440931634=2
-WANTLIB += c cairo ev glib-2.0 gobject-2.0 harfbuzz iconv intl
-WANTLIB += m pango-1.0 pangocairo-1.0 pcre pthread startup-notification-1
+WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv
+WANTLIB += m pango-1.0 pangocairo-1.0 pcre startup-notification-1
WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
WANTLIB += yajl
+# C11
+COMPILER= base-clang ports-gcc
+COMPILER_LANGS=c
+
MASTER_SITES = ${HOMEPAGE}/downloads/
-EXTRACT_SUFX = .tar.bz2
+EXTRACT_SUFX = .tar.xz
BUILD_DEPENDS =textproc/asciidoc \
textproc/xmlto
@@ -34,24 +38,16 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/dmenu \
x11/i3status \
x11/p5-AnyEvent-I3
+MODULES=devel/meson
# Tests now use the X11::XCB Perl module, not yet in ports.
NO_TEST = Yes
#TEST_DEPENDS =x11/p5-AnyEvent-I3
-FAKE_FLAGS = i3confdir="${PREFIX}/share/examples/i3/"
-
-SEPARATE_BUILD =Yes
-USE_GMAKE =Yes
-CONFIGURE_STYLE =gnu
-CONFIGURE_ENV =CPPFLAGS="-I${X11BASE}/include \
- -I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib \
--L${LOCALBASE}/lib"
-
-.if defined(DEBUG)
-CONFIGURE_ARGS +=--enable-debug
-.endif
+CONFIGURE_ARGS=-Dmans=true \
+ -Ddocs=true
+CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
@@ -62,5 +58,9 @@ pre-configure:
${WRKSRC}/libi3/get_exe_path.c \
${WRKSRC}/man/i3-config-wizard.man \
${WRKSRC}/man/i3.man
+
+post-install:
+ rm ${WRKINST}/etc/i3/*.{orig,beforesubst}
+ mv ${WRKINST}/etc/i3 ${PREFIX}/share/examples/
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/i3/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo7 Nov 2020 13:14:21 - 1.37
+++ distinfo12 Feb 2021 08:26:35 -
@@ -1,2 +1,2 @@
-SHA256 (i3-4.18.3.tar.bz2) = U655A/rW7qgw1Y6UlpjkpQLEMsDQpYJlmgpZsbmVsQ0=
-SIZE (i3-4.18.3.tar.bz2) = 1218766
+SHA256 (i3-4.19.1.tar.xz) = IoTIEvxongM42P6b4LjRVS5Uj8Fo0WX3lbJr9JfCK0c=
+SIZE (i3-4.19.1.tar.xz) = 1277648
Index: patches/patch-etc_config
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/12 01:02:58 Added files: www/mozilla-firefox/patches: patch-Cargo_toml Log message: www/mozilla-firefox: preemptively fix built with rust 1.50. from/ok semarie@, same fix as found in #1684261
Re: allow /dev/dri/card0 in firefox
We'll need to carry both nodes for a while. Another problem is there will be people who don't upgrade, and must run MAKEDEV manually for the new nodes. Much later on, we want the old nodes to be deleted. I think the scripts can be adjusted later. We need to choose the right order of completing the move. Landry Breuil wrote: > On Fri, Feb 12, 2021 at 11:05:13AM +1100, Jonathan Gray wrote: > > drm /dev nodes with the linux names are going to be added with the old > > names going away sometime later. When libdrm is changed to use the new > > names firefox will need this. chromium does sandboxing better so > > doesn't need a change like this. > > i had the same local diff in > https://cgit.rhaalovely.net/mozilla-firefox/commit/?h=beta=1cc41ea15e73899a98843ec690569d8b0a2d3ad9 > - was planning to commit it along 86 in two weeks, but go ahead. >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2021/02/12 01:02:36 Added files: www/tor-browser/browser/patches: patch-Cargo_toml Log message: www/tor-browser/browser: preemptively fix built with rust 1.50. from/ok semarie@, same fix as found in #1684261
