Re: musikcube failed to build
On Sun, Jun 11, 2023 at 08:47:50PM -0400, Brad Smith wrote: > On Sun, Jun 11, 2023 at 10:41:18PM +0200, Antoine Jacoutot wrote: > > Hi. > > > > It seems that if textproc/nlohmann-json is around then dpb(1) junks it, the > > build fails. > > > > Full log attached. > > > > -- > > Antoine > > Musikcube has an internal copy of nlohmann-json. If it happens to be around > and > due to the ordering of the header paths it will pick up the system copy. I > think > it is easiest to just build with the system copy. Its just a header port. > > Also g/c CONFIGURE_ARGS as it uses taglib anyway and add depends on lame. Looks good portswise. ok for me > Index: Makefile > === > RCS file: /home/cvs/ports/audio/musikcube/Makefile,v > retrieving revision 1.7 > diff -u -p -u -p -r1.7 Makefile > --- Makefile 29 May 2023 17:54:37 - 1.7 > +++ Makefile 11 Jun 2023 23:58:29 - > @@ -3,7 +3,7 @@ COMMENT = terminal-based music player > GH_ACCOUNT = clangen > GH_PROJECT = musikcube > GH_TAGNAME = 3.0.0 > - > +REVISION = 0 > CATEGORIES = audio > > HOMEPAGE = https://musikcube.com/ > @@ -19,10 +19,10 @@ COMPILER =base-clang ports-gcc > > MODULES =devel/cmake > > -CONFIGURE_ARGS += -DENABLE_BUNDLED_TAGLIB=false > - > -BUILD_DEPENDS+= devel/asio > -LIB_DEPENDS =audio/libopenmpt \ > +BUILD_DEPENDS+= devel/asio \ > + textproc/nlohmann-json > +LIB_DEPENDS =audio/lame \ > + audio/libopenmpt \ > audio/taglib \ > devel/libev \ > graphics/ffmpeg \ > -- Antoine
Re: CVS: cvs.openbsd.org: ports
On Sun, Jun 11, 2023 at 02:03:10AM -0600, Stuart Henderson wrote: > CVSROOT: /cvs > Module name: ports > Changes by: st...@cvs.openbsd.org 2023/06/11 02:03:10 > > Modified files: > graphics/opencolorio: Makefile distinfo > graphics/opencolorio/patches: patch-src_utils_NumberUtils_h > > Log message: > update to opencolorio-2.2.1, from Brad Fails to configure: >>> Running configure in graphics/opencolorio at 1686523976.42 ===> graphics/opencolorio ===> Generating configure for opencolorio-2.2.1v1 ===> Configuring for opencolorio-2.2.1v1 -- The CXX compiler identification is Clang 13.0.0 -- The C compiler identification is Clang 13.0.0 -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /exopi-obj/pobj/opencolorio-2.2.1/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /exopi-obj/pobj/opencolorio-2.2.1/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Setting C++ version to '14' as none was specified. -- Performing Test COMPILER_SUPPORTS_CXX14 -- Performing Test COMPILER_SUPPORTS_CXX14 - Success -- Performing Test HAVE_SSE2 -- Performing Test HAVE_SSE2 - Success -- Setting SOVERSION to '2.2' as none was specified. -- Could NOT find expat (missing: expat_DIR) -- Found PkgConfig: /usr/bin/pkg-config (found version "0.29.2") -- Found expat: /usr/lib/libexpat.so.14.0 (found suitable version "2.5.0", minimum required is "2.4.1") -- Found yaml-cpp: /usr/local/lib/libyaml-cpp.so.4.0 (found suitable version "0.7.0", minimum required is "0.7.0") -- Found pystring: /usr/local/include (Required is at least version "1.1.3") -- Found Imath: /usr/local/lib/libImath-3_1.so.2.0 (found suitable version "3.1.9", minimum required is "3.0") -- Found ZLIB: /usr/lib/libz.so.7.0 (found suitable version "1.2.13.1", minimum required is "1.2.13") -- Could NOT find minizip-ng (missing: minizip-ng_DIR) -- Could NOT find minizip-ng (missing: minizip-ng_LIBRARY minizip-ng_INCLUDE_DIR) (Required is at least version "3.0.7") -- Could NOT find Git (missing: GIT_EXECUTABLE) CMake Error at /usr/local/share/cmake/Modules/ExternalProject.cmake:2806 (message): error: could not find git for clone of minizip-ng_install Call Stack (most recent call first): /usr/local/share/cmake/Modules/ExternalProject.cmake:4208 (_ep_add_download_command) share/cmake/modules/Findminizip-ng.cmake:272 (ExternalProject_Add) share/cmake/modules/FindExtPackages.cmake:141 (find_package) CMakeLists.txt:270 (include) -- Configuring incomplete, errors occurred -- Antoine
Re: USE_NOBTCFI for ports
That looks right to me. Should there perhaps be a vague mention here that the compiler defaults have been changed, but if in doubt mention the name of the options that cause the compiler to do so? The compiler options are different between arm64 and amd64. Because the teams didn't talk and convinced llvm do do both?!?!. Well, the arm64 mechanism is slightly more powerful and expressive, but this split is a cognitive load the development community did not need. It will retard deployment pace. This is the table? enable BTCFI (our default) disable BTICFI amd64 -fcf-protection=branch -fcf-protection=none arm64 -mbranch-protection=bti -mbranch-protection=none I figure the folk who are going to tweak the link-time flag to say "this does not work", would also like to play with these options to check the issue they see isn't related to something else.
Re: UPDATE: xmms
On Fri, May 19, 2023 at 01:32:55PM -0400, Brad Smith wrote:
> Disable the JACK backend. The are two backends enabled and the ao backend
> works fine.
An updated diff that also includes dealing with newer FFmpeg releases.
Index: Makefile
===
RCS file: /home/cvs/ports/audio/xmms2/Makefile,v
retrieving revision 1.61
diff -u -p -u -p -r1.61 Makefile
--- Makefile5 Nov 2022 17:06:23 - 1.61
+++ Makefile19 May 2023 07:27:18 -
@@ -3,7 +3,7 @@ COMMENT = audio player daemon with libr
V =0.8
DISTNAME = xmms2-${V}DrO_o
PKGNAME = xmms2-${V}
-REVISION = 17
+REVISION = 18
SHARED_LIBS += xmmsclient++2.0 # 4.0.0
SHARED_LIBS += xmmsclient++-glib 1.0 # 1.0.0
@@ -19,7 +19,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC ao avahi-client avahi-common
WANTLIB += avahi-glib avcodec avutil c curl ffi gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl jack m mpg123
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 intl m mpg123
WANTLIB += ogg opus pcre2-8 perl python2.7 readline sndfile sqlite3
WANTLIB += swresample vorbis vorbisenc vorbisfile xml2 z
@@ -33,7 +33,7 @@ COMPILER =base-clang ports-gcc base-gc
MODULES = lang/python \
perl
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
NO_TEST = Yes
@@ -44,7 +44,6 @@ LIB_DEPENDS = devel/glib2 \
databases/sqlite3 \
graphics/ffmpeg \
audio/libao \
- audio/jack \
textproc/libxml \
net/curl \
audio/mpg123 \
@@ -71,7 +70,7 @@ do-configure:
--no-cython \
--disable-shmvis-server \
--without-optionals=medialib-updater,tests,xmmsclient-cf,xmmsclient-ecore,ruby \
-
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
+
--without-plugins=airplay,alsa,cdda,coreaudio,faad,gme,ices,jack,mac,mad,mms,modplug,musepack,nms,ofa,oss,pulse,samba,sid,speex,sun,tremor,vocoder,waveout,wavpack
post-configure:
# avoid linking to bogus libraries
Index: patches/patch-src_plugins_avcodec_avcodec_c
===
RCS file:
/home/cvs/ports/audio/xmms2/patches/patch-src_plugins_avcodec_avcodec_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_plugins_avcodec_avcodec_c
--- patches/patch-src_plugins_avcodec_avcodec_c 11 Mar 2022 18:20:36 -
1.5
+++ patches/patch-src_plugins_avcodec_avcodec_c 19 May 2023 02:06:20 -
@@ -1,7 +1,8 @@
Deal with newer FFmpeg API.
src/plugins/avcodec/avcodec.c.orig Thu Mar 27 01:42:57 2014
-+++ src/plugins/avcodec/avcodec.c Thu Mar 27 01:52:27 2014
+Index: src/plugins/avcodec/avcodec.c
+--- src/plugins/avcodec/avcodec.c.orig
src/plugins/avcodec/avcodec.c
@@ -23,6 +23,7 @@
#include
#include
@@ -10,7 +11,14 @@ Deal with newer FFmpeg API.
#include "avcodec_compat.h"
-@@ -36,6 +37,8 @@ typedef struct {
+@@ -30,12 +31,15 @@
+
+ typedef struct {
+ AVCodecContext *codecctx;
++ AVPacket packet;
+
+ guchar *buffer;
+ guint buffer_length;
guint buffer_size;
gboolean no_demuxer;
@@ -19,7 +27,7 @@ Deal with newer FFmpeg API.
guint channels;
guint samplerate;
xmms_sample_format_t sampleformat;
-@@ -53,10 +56,14 @@ typedef struct {
+@@ -53,10 +57,14 @@ typedef struct {
static gboolean xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_plugin);
static gboolean xmms_avcodec_init (xmms_xform_t *xform);
static void xmms_avcodec_destroy (xmms_xform_t *xform);
@@ -34,7 +42,7 @@ Deal with newer FFmpeg API.
/*
* Plugin header
-@@ -85,13 +92,23 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_
+@@ -85,13 +93,23 @@ xmms_avcodec_plugin_setup (xmms_xform_plugin_t *xform_
xmms_magic_add ("A/52 (AC-3) header", "audio/x-ffmpeg-ac3",
"0 beshort 0x0b77", NULL);
xmms_magic_add ("DTS header", "audio/x-ffmpeg-dca",
@@ -59,7 +67,7 @@ Deal with newer FFmpeg API.
return TRUE;
}
-@@ -107,6 +124,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
+@@ -107,6 +125,7 @@ xmms_avcodec_destroy (xmms_xform_t *xform)
avcodec_close (data->codecctx);
av_free (data->codecctx);
@@ -67,18 +75,31 @@ Deal with newer FFmpeg API.
g_string_free (data->outbuf, TRUE);
g_free (data->buffer);
-@@ -132,9 +150,10 @@ xmms_avcodec_init (xmms_xform_t *xform)
+@@ -118,7 +137,7 @@ static gboolean
+ xmms_avcodec_init (xmms_xform_t
UPDATE: TBB 2021.9.0
Here is an update to TBB 2021.9.0.
Still needs to be run through a bulk build on a 32-bit arch.
This should build with ports-gcc, not sure if it would build on
sparc64.
Index: Makefile
===
RCS file: /home/cvs/ports/devel/tbb/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile29 May 2023 17:50:03 - 1.7
+++ Makefile11 Jun 2023 00:47:04 -
@@ -1,49 +1,39 @@
-ONLY_FOR_ARCHS = ${CLANG_ARCHS}
-
COMMENT = threading building blocks
-V =2020.3.3
+V =2021.9.0
GH_ACCOUNT = oneapi-src
GH_PROJECT = oneTBB
GH_TAGNAME = v${V}
PKGNAME = tbb-${V}
-SHARED_LIBS += tbb 1.0 #2020.3
-SHARED_LIBS += tbbmalloc 1.0 #2020.3
+SHARED_LIBS += tbb 2.0 #2021.10
+SHARED_LIBS += tbbmalloc 2.0 #2021.10
+SHARED_LIBS += tbbmalloc_proxy 0.0 #2021.10
CATEGORIES = devel
-HOMEPAGE = https://software.intel.com/en-us/tbb
+HOMEPAGE =
https://www.intel.com/content/www/us/en/developer/tools/oneapi/onetbb.html
# Apache 2.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} m
+WANTLIB += ${COMPILER_LIBCXX} m
+
+MODULES = devel/cmake
+
+COMPILER = base-clang ports-gcc
+
+CONFIGURE_ARGS+= -DTBB_STRICT=OFF
+
+# https://github.com/oneapi-src/oneTBB/issues/1125
+CONFIGURE_ARGS+= -DTBB_TEST=OFF
-# We only provide configuration for base-clang (see files/)
-COMPILER = base-clang ports-clang
+.include
-MAKE_FLAGS = CONLY="${CC}" \
- CPLUS="${CXX}" \
- CC="${CC}" \
- CXX="${CXX}" \
- CFLAGS="${CFLAGS}" \
- CXXFLAGS="${CXXFLAGS}" \
- TBB.DLL="libtbb.so.${LIBtbb_VERSION}" \
- MALLOC.DLL="libtbbmalloc.so.${LIBtbbmalloc_VERSION}"
-
-USE_GMAKE =Yes
-
-# Don't run time-consuming examples like fractal generators during build...
-ALL_TARGET = tbb tbbmalloc tbbproxy
-TEST_TARGET = test examples
-
-post-extract:
- cp ${FILESDIR}/OpenBSD*.inc ${WRKSRC}/build
-
-do-install:
- ${INSTALL_DATA} ${WRKSRC}/build/OpenBSD*_release/*.so.* ${PREFIX}/lib
- ${INSTALL_DATA_DIR} ${PREFIX}/include/tbb
- cp -R ${WRKSRC}/include/tbb/* ${PREFIX}/include/tbb
+.if ${PROPERTIES:Mlp64}
+PKG_ARGS+= -D32=0 -D64=1
+.else
+PKG_ARGS+= -D32=1 -D64=0
+.endif
.include
Index: distinfo
===
RCS file: /home/cvs/ports/devel/tbb/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo29 May 2023 17:50:03 - 1.4
+++ distinfo10 Jun 2023 04:56:23 -
@@ -1,2 +1,2 @@
-SHA256 (oneTBB-2020.3.3.tar.gz) = SUrBX2DpHZXteuwE9OHTibilW//FgdD+kRa5kzZAGWM=
-SIZE (oneTBB-2020.3.3.tar.gz) = 2640805
+SHA256 (oneTBB-2021.9.0.tar.gz) = HOSPNNraeDf1EHNf8RcvbiwmGwlGDjv3c7SXkdJH0k4=
+SIZE (oneTBB-2021.9.0.tar.gz) = 2579150
Index: files/OpenBSD.clang.inc
===
RCS file: files/OpenBSD.clang.inc
diff -N files/OpenBSD.clang.inc
--- files/OpenBSD.clang.inc 11 Mar 2022 18:53:31 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,112 +0,0 @@
-# Copyright (c) 2005-2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-#
-
-COMPILE_ONLY = -c -MMD
-PREPROC_ONLY = -E -x c++
-INCLUDE_KEY = -I
-DEFINE_KEY = -D
-OUTPUT_KEY = -o #
-OUTPUTOBJ_KEY = -o #
-PIC_KEY = -fPIC
-WARNING_AS_ERROR_KEY = -Werror
-WARNING_KEY = -Wall
-TEST_WARNING_KEY = -Wextra -Wshadow -Wcast-qual -Woverloaded-virtual
-Wnon-virtual-dtor
-WARNING_SUPPRESS = -Wno-parentheses -Wno-non-virtual-dtor -Wno-dangling-else
-DYLIB_KEY = -shared
-EXPORT_KEY = -Wl,--version-script,
-LIBDL =
-
-CPLUS = clang++
-CONLY = clang
-LIB_LINK_FLAGS = $(DYLIB_KEY) -Wl,-soname=$(BUILDING_LIBRARY)
-LIBS += -lpthread
-LINK_FLAGS = -Wl,-rpath-link=. -Wl,-rpath=. -rdynamic
-C_FLAGS = $(CPLUS_FLAGS) $(CFLAGS)
-
-ifeq ($(cfg), release)
-CPLUS_FLAGS = $(ITT_NOTIFY) -DUSE_PTHREAD
-endif
-ifeq ($(cfg), debug)
-CPLUS_FLAGS = -DTBB_USE_DEBUG $(ITT_NOTIFY) -DUSE_PTHREAD
-endif
-
-CPLUS_FLAGS += $(CXXFLAGS)
-
UPDATE: utfcpp 3.2.3
Here is an update to utfcpp 3.2.3.
Index: Makefile
===
RCS file: /home/cvs/ports/devel/utfcpp/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile11 Mar 2022 18:53:33 - 1.4
+++ Makefile12 Jun 2023 02:53:10 -
@@ -1,30 +1,24 @@
COMMENT = simple, portable library for handling UTF-8 strings
-VERSION = 2.3.4
-DISTNAME = utf8_v${VERSION:S/./_/g}
-PKGNAME = utfcpp-${VERSION}
-REVISION = 0
-
+GH_ACCOUNT = nemtrif
+GH_PROJECT = utfcpp
+GH_TAGNAME = v3.2.3
CATEGORIES = devel
-HOMEPAGE = http://utfcpp.sourceforge.net/
-
MAINTAINER = Sergey Bronnikov
-# BSD
+# Boost
PERMIT_PACKAGE = Yes
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=utfcpp/}
-EXTRACT_SUFX = .zip
+MODULES = devel/cmake
-NO_TEST = Yes
+COMPILER = base-clang ports-gcc
-WRKDIST = ${WRKDIR}
-NO_BUILD = Yes
+# ftest code missing from tarball's as well. So disable building tests.
+CONFIGURE_ARGS += -DUTF8_TESTS=OFF \
+ -DUTF8_SAMPLES=OFF
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/include/utfcpp/utf8
- ${INSTALL_DATA} ${WRKDIR}/source/*.* ${PREFIX}/include/utfcpp
- ${INSTALL_DATA} ${WRKDIR}/source/utf8/*.* ${PREFIX}/include/utfcpp/utf8
+NO_BUILD = Yes
+NO_TEST = Yes
.include
Index: distinfo
===
RCS file: /home/cvs/ports/devel/utfcpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo12 Aug 2016 09:20:01 - 1.1.1.1
+++ distinfo12 Jun 2023 01:01:30 -
@@ -1,2 +1,2 @@
-SHA256 (utf8_v2_3_4.zip) = M3POuyXYjGYqK5YMTVhdr5rns5YDHs14bnuzGxXQEO8=
-SIZE (utf8_v2_3_4.zip) = 22422
+SHA256 (utfcpp-3.2.3.tar.gz) = O6mw27/wh2e9/+jwOxDllso1EiiGJyLkydTRJtKGUlA=
+SIZE (utfcpp-3.2.3.tar.gz) = 28770
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/devel/utfcpp/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 11 Mar 2022 18:53:33 - 1.3
+++ pkg/PLIST 12 Jun 2023 01:07:52 -
@@ -1,6 +1,13 @@
-include/utfcpp/
-include/utfcpp/utf8/
-include/utfcpp/utf8.h
-include/utfcpp/utf8/checked.h
-include/utfcpp/utf8/core.h
-include/utfcpp/utf8/unchecked.h
+include/utf8cpp/
+include/utf8cpp/utf8/
+include/utf8cpp/utf8.h
+include/utf8cpp/utf8/checked.h
+include/utf8cpp/utf8/core.h
+include/utf8cpp/utf8/cpp11.h
+include/utf8cpp/utf8/cpp17.h
+include/utf8cpp/utf8/unchecked.h
+lib/cmake/
+lib/cmake/utf8cpp/
+lib/cmake/utf8cpp/utf8cppConfig.cmake
+lib/cmake/utf8cpp/utf8cppConfigVersion.cmake
+lib/cmake/utf8cpp/utf8cppTargets.cmake
And port adjustments.
Index: geo/osrm-backend/Makefile
===
RCS file: /home/cvs/ports/geo/osrm-backend/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- geo/osrm-backend/Makefile 11 Jun 2023 07:55:46 - 1.11
+++ geo/osrm-backend/Makefile 12 Jun 2023 02:39:43 -
@@ -7,7 +7,7 @@ COMMENT = high-performance road network
GH_ACCOUNT = Project-OSRM
GH_PROJECT = osrm-backend
GH_TAGNAME = v5.27.1
-
+REVISION = 0
CATEGORIES = geo
HOMEPAGE = https://project-osrm.org/
@@ -35,7 +35,7 @@ LIB_DEPENDS = archivers/bzip2 \
CONFIGURE_ARGS = -DOSMIUM_INCLUDE_DIR=${LOCALBASE}/include/osmium \
-DENABLE_CCACHE=Off
-CXXFLAGS +=-I${LOCALBASE}/include/utfcpp
+CXXFLAGS +=-I${LOCALBASE}/include/utf8cpp
# Requires network access, and http access to sample osrm data is 403'd
NO_TEST = Yes
Index: productivity/ledger/Makefile
===
RCS file: /home/cvs/ports/productivity/ledger/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- productivity/ledger/Makefile3 May 2023 11:00:46 - 1.35
+++ productivity/ledger/Makefile12 Jun 2023 02:42:59 -
@@ -3,6 +3,7 @@ COMMENT = command line double-entry acc
GH_TAGNAME = v3.3.2
GH_ACCOUNT = ledger
GH_PROJECT = ledger
+REVISION = 0
SHARED_LIBS += ledger1.0 # 3.0
@@ -30,7 +31,7 @@ LIB_DEPENDS = devel/boost \
devel/gmp \
devel/mpfr
-CONFIGURE_ARGS=-DUTFCPP_PATH=${LOCALBASE}/include/utfcpp
+CONFIGURE_ARGS=-DUTFCPP_PATH=${LOCALBASE}/include/utf8cpp
# Use this to make sure version.info gets generated, the actual
# installation bits are removed as the remaining .info files are
Re: musikcube failed to build
On 2023-06-11 8:47 p.m., Brad Smith wrote: On Sun, Jun 11, 2023 at 10:41:18PM +0200, Antoine Jacoutot wrote: Hi. It seems that if textproc/nlohmann-json is around then dpb(1) junks it, the build fails. Full log attached. -- Antoine Musikcube has an internal copy of nlohmann-json. If it happens to be around and due to the ordering of the header paths it will pick up the system copy. I think it is easiest to just build with the system copy. Its just a header port. Also g/c CONFIGURE_ARGS as it uses taglib anyway and add depends on lame. Ah, ya, the taglib handling did change recently. https://github.com/clangen/musikcube/commit/0ec1edb9810afe60c5206b201f48855abddfd2df Index: Makefile === RCS file: /home/cvs/ports/audio/musikcube/Makefile,v retrieving revision 1.7 diff -u -p -u -p -r1.7 Makefile --- Makefile29 May 2023 17:54:37 - 1.7 +++ Makefile11 Jun 2023 23:58:29 - @@ -3,7 +3,7 @@ COMMENT = terminal-based music player GH_ACCOUNT = clangen GH_PROJECT = musikcube GH_TAGNAME = 3.0.0 - +REVISION = 0 CATEGORIES = audio HOMEPAGE = https://musikcube.com/ @@ -19,10 +19,10 @@ COMPILER = base-clang ports-gcc MODULES = devel/cmake -CONFIGURE_ARGS += -DENABLE_BUNDLED_TAGLIB=false - -BUILD_DEPENDS+=devel/asio -LIB_DEPENDS = audio/libopenmpt \ +BUILD_DEPENDS+=devel/asio \ + textproc/nlohmann-json +LIB_DEPENDS = audio/lame \ + audio/libopenmpt \ audio/taglib \ devel/libev \ graphics/ffmpeg \
Re: musikcube failed to build
On Sun, Jun 11, 2023 at 10:41:18PM +0200, Antoine Jacoutot wrote: > Hi. > > It seems that if textproc/nlohmann-json is around then dpb(1) junks it, the > build fails. > > Full log attached. > > -- > Antoine Musikcube has an internal copy of nlohmann-json. If it happens to be around and due to the ordering of the header paths it will pick up the system copy. I think it is easiest to just build with the system copy. Its just a header port. Also g/c CONFIGURE_ARGS as it uses taglib anyway and add depends on lame. Index: Makefile === RCS file: /home/cvs/ports/audio/musikcube/Makefile,v retrieving revision 1.7 diff -u -p -u -p -r1.7 Makefile --- Makefile29 May 2023 17:54:37 - 1.7 +++ Makefile11 Jun 2023 23:58:29 - @@ -3,7 +3,7 @@ COMMENT = terminal-based music player GH_ACCOUNT = clangen GH_PROJECT = musikcube GH_TAGNAME = 3.0.0 - +REVISION = 0 CATEGORIES = audio HOMEPAGE = https://musikcube.com/ @@ -19,10 +19,10 @@ COMPILER = base-clang ports-gcc MODULES = devel/cmake -CONFIGURE_ARGS += -DENABLE_BUNDLED_TAGLIB=false - -BUILD_DEPENDS+=devel/asio -LIB_DEPENDS = audio/libopenmpt \ +BUILD_DEPENDS+=devel/asio \ + textproc/nlohmann-json +LIB_DEPENDS = audio/lame \ + audio/libopenmpt \ audio/taglib \ devel/libev \ graphics/ffmpeg \
[maintainer update] games/lwjgl3 3.2.4alpha2 -> 3.3.1.0
Here's an overdue update of lwjgl3 to a newer release. This release will
allow playing Minecraft versions > 1.19.2 along with the older lwjgl3
playable releases.
If I don't hear anything in a day or two I'll go ahead and commit this.
lwjgl3 moved from dyncall to FFI for this release. They also dropped support
for bullet.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/games/lwjgl3/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile11 Mar 2022 19:04:38 - 1.9
+++ Makefile12 Jun 2023 00:32:53 -
@@ -2,10 +2,10 @@ COMMENT = lightweight game library for j
BROKEN-i386 = ld: error: undefined symbol: __stack_smash_handler
-V =3.2.4alpha2
+V =3.3.1.0
DISTNAME = lwjgl3-${V}
-KOTLIN_V = 1.3.61
+KOTLIN_V = 1.6.20-M1
.if ${MACHINE_ARCH} == "i386"
M_ARCH = ""
@@ -32,11 +32,11 @@ MAINTAINER =Kurt Mosiejczuk
Re: UPDATE: ppsspp 1.15.4
ping.
On 2023-05-29 2:05 a.m., Brad Smith wrote:
Here is an update to ppsspp 1.15.4.
https://www.ppsspp.org/news/
Index: Makefile
===
RCS file: /home/cvs/ports/emulators/ppsspp/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile25 Apr 2023 15:33:02 - 1.20
+++ Makefile28 May 2023 06:45:26 -
@@ -3,10 +3,10 @@ NOT_FOR_ARCHS = ${BE_ARCHS}
# FakeJit fallback broken in (at least) 1.10.3
# ppsspp-1.10.3/Core/MIPS/JitCommon/JitCommon.cpp:75:10: error: cannot
initialize return object of type 'MIPSComp::JitInterface *' with an rvalue of
type 'MIPSComp::FakeJit *'
-PPSSPP_JIT_ARCHS = arm aarch64 i386 amd64
+PPSSPP_JIT_ARCHS = aarch64 amd64 arm i386
ONLY_FOR_ARCHS = ${PPSSPP_JIT_ARCHS}
-V = 1.14.4
+V =1.15.4
DISTNAME =ppsspp-$V
COMMENT = Sony PlayStation Portable emulator
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/ppsspp/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo25 Apr 2023 15:33:02 - 1.10
+++ distinfo24 May 2023 04:35:59 -
@@ -1,2 +1,2 @@
-SHA256 (ppsspp/ppsspp-1.14.4.tar.xz) =
VO3kGvVpEW2cKE97FX0USdzROURnXmDCh1vzo5lPXdo=
-SIZE (ppsspp/ppsspp-1.14.4.tar.xz) = 46405556
+SHA256 (ppsspp/ppsspp-1.15.4.tar.xz) =
ogvSe0zagR1s0hgvv80W9wktal0H/LvQDMcjBTC99ow=
+SIZE (ppsspp/ppsspp-1.15.4.tar.xz) = 51947468
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/emulators/ppsspp/patches/patch-CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt13 May 2023 08:22:02 - 1.9
+++ patches/patch-CMakeLists_txt28 May 2023 07:02:55 -
@@ -1,21 +1,24 @@
-- fix includes
-- honor CFLAGS and DEBUG
-- set _POSIX_C_SOURCE=200809L for locale_t (build fails otherwise)
-- use system libpng on arm platforms
+- Fix building on OpenBSD
+ 94aed7a1011ef48e6524fb16bfb7dfb025dc0746
+
+- Fix includes
+- Honor CFLAGS and DEBUG
+- Use system libpng on arm platforms
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -252,6 +252,8 @@ endif()
- if(NOT LIBRETRO AND NOT IOS)
- find_package(SDL2)
+@@ -258,6 +258,9 @@ if(MACOSX AND NOT IOS)
+ endif()
endif()
+
+include_directories(${X11BASE}/include)
+include_directories(${LOCALBASE}/lib/libzip/include)
++
include(FindThreads)
if(APPLE)
-@@ -351,13 +353,13 @@ if(NOT MSVC)
+@@ -358,13 +361,13 @@ if(NOT MSVC)
endif()
endif()
@@ -33,15 +36,16 @@ Index: CMakeLists.txt
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g
-D_NDEBUG")
# Enable checking printf-like format strings (also works for logging functions)
-@@ -388,7 +390,6 @@ if(NOT MSVC)
- if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT
${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+@@ -404,7 +407,7 @@ if(NOT MSVC)
add_definitions(-Wno-psabi)
endif()
-- add_definitions(-D_XOPEN_SOURCE=700)
- add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
+ add_definitions(-D_XOPEN_SOURCE=700)
+- add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
++ add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1
-D_BSD_SOURCE)
add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
elseif(ANDROID)
-@@ -900,6 +901,7 @@ endif()
+ add_definitions(-fsigned-char)
+@@ -933,6 +936,7 @@ endif()
find_package(LIBZIP)
if(LIBZIP_FOUND AND USE_SYSTEM_LIBZIP)
add_definitions(-DSHARED_LIBZIP)
@@ -49,7 +53,7 @@ Index: CMakeLists.txt
else()
add_library(libzip STATIC
ext/libzip/zip_add.c
-@@ -1037,7 +1039,7 @@ else()
+@@ -1070,7 +1074,7 @@ else()
endif()
# Arm platforms require at least libpng17.
@@ -58,12 +62,3 @@ Index: CMakeLists.txt
set(PNG_REQUIRED_VERSION 1.7)
else()
set(PNG_REQUIRED_VERSION 1.6)
-@@ -2123,7 +2125,7 @@ if(USE_MINIUPNPC)
-
- if (NOT WIN32)
- add_definitions (-DMINIUPNPC_SET_SOCKET_TIMEOUT)
-- add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE
-D_POSIX_C_SOURCE=200112L)
-+ add_definitions (-D_BSD_SOURCE -D_DEFAULT_SOURCE
-D_POSIX_C_SOURCE=200809L)
- endif()
- if (MACOSX)
- add_definitions (-D_DARWIN_C_SOURCE)
Index: patches/patch-Core_AVIDump_cpp
===
RCS file: patches/patch-Core_AVIDump_cpp
diff -N patches/patch-Core_AVIDump_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Core_AVIDump_cpp 20 May 2023
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 16:30:54 Modified files: archivers/minizip: Makefile Log message: missing BDEP, from Brad, reported by pvk
Re: musikcube failed to build
On Sun, 11 Jun 2023 22:41:18 +0200 Antoine Jacoutot wrote: > Hi. > > It seems that if textproc/nlohmann-json is around then dpb(1) junks > it, the build fails. > > Full log attached. > I'm not very familiar with junking in dpb. Does it mean textproc/nlohmann-json should be added as a build dependency for musikcube, or that junking should be disabled in musikcube?
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/11 14:59:09 Modified files: x11/remmina: Makefile distinfo x11/remmina/patches: patch-plugins_vnc_vnc_plugin_c patch-src_remmina_ssh_c x11/remmina/pkg: PLIST Log message: Update to remmina-1.4.31.
UPDATE: xfiles 1.1.1
Update to XFiles 1.1.1 - Added statusbar displaying metadata of highlight file. - Added support for old XLFD fonts in addition to Xft fonts. - Added support for multiple (fallback) Xft fonts. Comments? Index: Makefile === RCS file: /cvs/ports/x11/xfiles/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile26 Apr 2023 09:10:55 - 1.2 +++ Makefile11 Jun 2023 20:39:20 - @@ -2,8 +2,7 @@ COMMENT = simple X11 file manager GH_ACCOUNT = phillbush GH_PROJECT = xfiles -GH_TAGNAME = v1.0.4 -REVISION = 0 +GH_TAGNAME = v1.1.1 CATEGORIES = x11 sysutils Index: distinfo === RCS file: /cvs/ports/x11/xfiles/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo26 Apr 2023 08:57:09 - 1.1.1.1 +++ distinfo11 Jun 2023 20:39:20 - @@ -1,2 +1,2 @@ -SHA256 (xfiles-1.0.4.tar.gz) = UTXWxr0RpW91h1LD5hrX4vIshYUUQu+iNVpa84vzTuo= -SIZE (xfiles-1.0.4.tar.gz) = 134751 +SHA256 (xfiles-1.1.1.tar.gz) = R/4l/Cp3gAHOcOSIfuQmM3oDzC/j44uVt0537wz/cDA= +SIZE (xfiles-1.1.1.tar.gz) = 147262
musikcube failed to build
Hi. It seems that if textproc/nlohmann-json is around then dpb(1) junks it, the build fails. Full log attached. -- Antoine >>> Building on exopi-5 under audio/musikcube BDEPENDS = [www/libmicrohttpd;audio/taglib;graphics/ffmpeg;net/curl;devel/asio;devel/libev;audio/libopenmpt;devel/cmake;devel/ninja] DIST = [audio/musikcube:musikcube-3.0.0.tar.gz] FULLPKGNAME = musikcube-3.0.0 RDEPENDS = [audio/taglib;graphics/ffmpeg;net/curl;www/libmicrohttpd;audio/libopenmpt;devel/libev] (Junk lock obtained for exopi-5 at 1686447221.91) >>> Running depends in audio/musikcube at 1686447221.94 last junk was in graphics/opencsg /usr/sbin/pkg_add -aI -Drepair asio-1.28.0 curl-8.1.2 ffmpeg-4.4.4v1 libev-4.33 libmicrohttpd-0.9.70p0 libopenmpt-0.6.10 was: /usr/sbin/pkg_add -aI -Drepair asio-1.28.0 cmake-3.26.4v0 curl-8.1.2 ffmpeg-4.4.4v1 libev-4.33 libmicrohttpd-0.9.70p0 libopenmpt-0.6.10 ninja-1.11.1 taglib-1.13p0 /usr/sbin/pkg_add -aI -Drepair asio-1.28.0 curl-8.1.2 ffmpeg-4.4.4v1 libev-4.33 libmicrohttpd-0.9.70p0 libopenmpt-0.6.10 >>> Running show-prepare-results in audio/musikcube at 1686447228.08 ===> audio/musikcube ===> musikcube-3.0.0 depends on: asio-* -> asio-1.28.0 ===> musikcube-3.0.0 depends on: cmake-* -> cmake-3.26.4v0 ===> musikcube-3.0.0 depends on: ninja-* -> ninja-1.11.1 ===> musikcube-3.0.0 depends on: libopenmpt-* -> libopenmpt-0.6.10 ===> musikcube-3.0.0 depends on: taglib-* -> taglib-1.13p0 ===> musikcube-3.0.0 depends on: libev-* -> libev-4.33 ===> musikcube-3.0.0 depends on: ffmpeg-* -> ffmpeg-4.4.4v1 ===> musikcube-3.0.0 depends on: curl-* -> curl-8.1.2 ===> musikcube-3.0.0 depends on: libmicrohttpd-* -> libmicrohttpd-0.9.70p0 ===> Verifying specs: c++ c++abi pthread avcodec avformat avutil c crypto curl curses ev m microhttpd mp3lame mpg123 openmpt panel sndio ssl swresample tag z ===> found c++.9.0 c++abi.6.0 pthread.27.0 avcodec.25.0 avformat.22.0 avutil.15.0 c.97.0 crypto.51.0 curl.26.20 curses.14.0 ev.3.1 m.10.1 microhttpd.0.4 mp3lame.2.2 mpg123.7.2 openmpt.0.1 panel.6.0 sndio.7.2 ssl.54.0 swresample.4.0 tag.13.1 z.7.0 asio-1.28.0 cmake-3.26.4v0 curl-8.1.2 ffmpeg-4.4.4v1 libev-4.33 libmicrohttpd-0.9.70p0 libopenmpt-0.6.10 ninja-1.11.1 taglib-1.13p0 (Junk lock released for exopi-5 at 1686447230.79) distfiles size=4758625 >>> Running patch in audio/musikcube at 1686447230.81 ===> audio/musikcube ===> Checking files for musikcube-3.0.0 `/exopi-cvs/ports/distfiles/musikcube-3.0.0.tar.gz' is up to date. >> (SHA256) musikcube-3.0.0.tar.gz: OK ===> Extracting for musikcube-3.0.0 ===> Patching for musikcube-3.0.0 ===> Applying OpenBSD patch patch-CMakeLists_txt Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: CMakeLists.txt |--- CMakeLists.txt.orig |+++ CMakeLists.txt -- Patching file CMakeLists.txt using Plan A... Hunk #1 succeeded at 122. done ===> Applying OpenBSD patch patch-src_plugins_server_main_cpp Hmm... Looks like a unified diff to me... The text leading up to this was: -- |disable http/websocket server by default | |Index: src/plugins/server/main.cpp |--- src/plugins/server/main.cpp.orig |+++ src/plugins/server/main.cpp -- Patching file src/plugins/server/main.cpp using Plan A... Hunk #1 succeeded at 179. done ===> Compiler link: clang -> /usr/bin/clang ===> Compiler link: clang++ -> /usr/bin/clang++ ===> Compiler link: cc -> /usr/bin/cc ===> Compiler link: c++ -> /usr/bin/c++ >>> Running configure in audio/musikcube at 1686447231.99 ===> audio/musikcube ===> Generating configure for musikcube-3.0.0 ===> Configuring for musikcube-3.0.0 -- The C compiler identification is Clang 13.0.0 -- The CXX compiler identification is Clang 13.0.0 -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working C compiler: /exopi-obj/pobj/musikcube-3.0.0/bin/cc - skipped -- Detecting C compile features -- Detecting C compile features - done -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Check for working CXX compiler: /exopi-obj/pobj/musikcube-3.0.0/bin/c++ - skipped -- Detecting CXX compile features -- Detecting CXX compile features - done -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB -- Performing Test HAVE_CXX_ATOMICS64_WITHOUT_LIB - Success -- Performing Test LLVM_HAS_ATOMICS -- Performing Test LLVM_HAS_ATOMICS - Success -- [configure-bsd-paths] resolved BSD_PATH_PREFIX to: '/usr/local' -- [1;33m[ccache] disabled; homebrew or standalone build detected.[m -- [cross-compile] not enabled! -- [vendor-link-directories] /usr/local/lib;/usr/local/opt/openssl/lib;/usr/local/opt/ncurses/lib -- [vendor-include-directories] /usr/local/include;/usr/local/opt/openssl/include;/usr/local/opt/ncurses/include -- [os-system-libs] -- [build] musikcube_LINK_LIBS:
UPDATE: pngquant 2.18.0
Here is an update to pngquant 2.18.0.
version 2.17
- fix for Unicode filenames on Windows
- builds for ARM
- small quality improvements
version 2.16
- reduced stack usage, prevenitng stack overlfow in pathological cases
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/pngquant/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile8 May 2022 09:39:33 - 1.5
+++ Makefile9 Jun 2023 02:21:37 -
@@ -2,8 +2,7 @@ COMMENT = PNG compressor
GH_ACCOUNT = kornelski
GH_PROJECT = pngquant
-GH_TAGNAME = 2.15.1
-REVISION = 0
+GH_TAGNAME = 2.18.0
CATEGORIES = graphics
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/pngquant/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 May 2021 16:22:03 - 1.2
+++ distinfo9 Jun 2023 02:21:41 -
@@ -1,2 +1,2 @@
-SHA256 (pngquant-2.15.1.tar.gz) = JIVrKKykfteGM/piXrdLhXgtYtrMS8pjT87fL26VxLc=
-SIZE (pngquant-2.15.1.tar.gz) = 71163
+SHA256 (pngquant-2.18.0.tar.gz) = Qk/0MuUd/Dz1/4ABrRtkGYhQaGxePCbs1Hfktp70+t4=
+SIZE (pngquant-2.18.0.tar.gz) = 71187
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/pngquant/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure
--- patches/patch-configure 11 Mar 2022 19:23:12 - 1.2
+++ patches/patch-configure 9 Jun 2023 00:17:59 -
@@ -3,19 +3,16 @@ Remove optimizations
Index: configure
--- configure.orig
+++ configure
-@@ -291,15 +291,6 @@ status "Compiler" "$CC"
- CFLAGS=${CFLAGS:--fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
- cflags "-std=c99 -I."
+@@ -293,10 +293,10 @@ cflags "-std=c99 -I."
--# DEBUG
--if [ -z "$DEBUG" ]; then
+ # DEBUG
+ if [ -z "$DEBUG" ]; then
-cflags "-O3 -DNDEBUG"
--status "Debug" "no"
--else
++cflags "-DNDEBUG"
+ status "Debug" "no"
+ else
-cflags "-O1 -g -DDEBUG"
--status "Debug" "yes"
--fi
--
- # SSE
- if [ "$SSE" = 'auto' ]; then
- SSE=0
++cflags "-g -DDEBUG"
+ status "Debug" "yes"
+ fi
+
Index: patches/patch-test_test_sh
===
RCS file: patches/patch-test_test_sh
diff -N patches/patch-test_test_sh
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_test_sh 9 Jun 2023 02:20:57 -
@@ -0,0 +1,9 @@
+Index: test/test.sh
+--- test/test.sh.orig
test/test.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ set -eu
+ set -o pipefail
+
Re: New [cad/solvespace] - 3.1
Hi Stuart, > - the Makefile comment about FindCairo.cmake is outdated/confusing Updated thank you. While I was there I removed the other post-extract command as it was not really necessary. > - please drop those sprintf->snprintf patches, you can try sending > them upstream if you like, there's not really a need for that in ports Done! I have a pull request open already for upstream. > - BUILD_DEPENDS looks wrong; don't list extract dependencies there, > that's handled by ports infrastructure. what is gtk+4 for in there? Understood, thank you. Regarding gtk+4, nice catch I'm not sure how it landed there. portcheck wants x11/gtk+4,-guic so I probably confused something there. > - don't hardcode CMAKE_BUILD_TYPE, that's handled by the cmale module Got it :) > - any reason why you don't have COMPILER=base-clang ports-gcc? When compiling with gcc the build fails with undefined symbol errors. Not sure why, but this doesn't happen with clang. Please find attached an updated tarball. Thanks for the feedback :) Kind regards, Johannes > On 2023/05/26 09:30, Johannes Thyssen Tishman wrote: > > Hi Stefan, > > > > > Looks good now. > > > > > > OK for import sdk@ > > > > Awesome, thanks for that. Please find attached the port with the > > following last minute tweaks: > > > > - Formated DESCR based on your suggestions > > - Updated DESCR to match description on solvespace's website > > - Dropped Jerome KASPER from MAINTAINER as per his request > > > > Thanks again :) > > > > Kind regards, > > > > -- > > Johannes Thyssen Tishman > > https://thyssentishman.com > > solvespace.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/11 13:17:12 Modified files: sysutils/awscli: Makefile distinfo Log message: Update to awscli-1.27.151.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/11 13:16:56 Modified files: net/py-boto3 : Makefile distinfo Log message: Update to py3-boto3-1.26.151.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/11 13:16:46 Modified files: net/py-botocore: Makefile distinfo net/py-botocore/pkg: PLIST Log message: Update to py3-botocore-1.29.151.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/11 13:13:11 Modified files: x11/gnome/gjs : Makefile distinfo Log message: Update to gjs-1.76.1.
Re: new x11/qt6ct
On Sat, Jun 10, 2023 at 08:29:03PM +, Klemens Nanni wrote: > Direct x11/qt5ct pendant. > Feedback? OK? > > --- > Information for inst:qt6ct-0.8 > > Comment: > Qt6 configuration tool > > Description: > This program allows users to configure Qt6 settings (theme, font, icons, etc.) > under DE/WM without Qt integration. > > Set QT_QPA_PLATFORMTHEME=qt6ct in the environment to use it. > > Maintainer: Klemens Nanni > > WWW: https://github.com/trialuser02/qt6ct Now with x11/qt6/qttools to provide `lrelease` during build, thanks rsadowski. qt6ct.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2023/06/11 10:53:17 Modified files: infrastructure/lib/DPB/Job: Fetch.pm Port.pm Log message: "current" was just a proxy for task phase, but we actively use that now for job display, so GC the unneeded field
Re: [new] sysutils/awscliv2, devel/py-awscrt
On Sat, Jun 10, 2023 at 3:00 AM Stuart Henderson wrote: > > It does make sense for upstream to only use the specific tested versions > with their bundled binary distribution but when they make it as hard > requirements into the source distribution too, it means that it's barely > usable for pip installs (in virtualenvs only, really, to isolate it from > other software) and probably every OS wanting to package it is going to > need to patch those away. And really, why should every OS wanting to > package it go to the trouble of doing this (and redoing for every/most > updates)? As I said in private, I do agree. I'll work with upstream to try improve this. New port attached which patches the dep versions. This builds and installs on -current. .joel awscliv2-current-20230611.tar.gz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2023/06/11 09:40:22 Modified files: devel/dwz : Makefile distinfo devel/dwz/patches: patch-Makefile patch-dwz_c Added files: devel/dwz/patches: patch-args_c Log message: Update to dwz-0.15 Changelog: https://sourceware.org/pipermail/dwz/2022q4/001385.html Put through a bulk by tb@ Improved comment from kn@ ok tb@ sthen@ kn@
Re: [new] sysutils/lsblk
Stuart Henderson wrote: > On 2023/06/11 12:56, Benjamin Stürz wrote: > > On 11.06.23 09:34, Stuart Henderson wrote: > > > On 2023/06/10 23:40, Benjamin Stürz wrote: > > > > Hi, > > > > > > > > what should I do next? > > > > I have at least 2 OKs now, but I don't have any commit rights. > > > > > > I only count 1 developer ok so far (op@). > > > > Sorry, I thought > > > Build and tests OK on current/amd64 in a VM on VirtualBox. > > by Laurent Cheylus also counted as an ok. > > Only developer OKs count for that. In OpenBSD, and "ok" is a formal statement made in a commit message to indicate both review & shared responsibility. The latter means, if an an error is introduced, such persons are equally responsible to handle the in-tree details such as potentially backing it out, further fixing etc. In addition, it also causes the commit log to track people who are familiar with a particular subsystem. In the future, this can suggest who should see changes there, without throwing diffs into void and hoping for an answer.
Re: [new] sysutils/lsblk
On 2023/06/11 12:56, Benjamin Stürz wrote: > On 11.06.23 09:34, Stuart Henderson wrote: > > On 2023/06/10 23:40, Benjamin Stürz wrote: > > > Hi, > > > > > > what should I do next? > > > I have at least 2 OKs now, but I don't have any commit rights. > > > > I only count 1 developer ok so far (op@). > > Sorry, I thought > > Build and tests OK on current/amd64 in a VM on VirtualBox. > by Laurent Cheylus also counted as an ok. Only developer OKs count for that. > > I'll add my ok but I'd prefer to add something like this to DESCR: > > > > Because it accesses the raw disk devices, it must be run as root. > > New tarball attached. > New DESCR: > Show information about block devices that are attached to the system, > including name, size, type, and information about the disklabel on them, > such as name, size, type, and mount point of each partition. > Because it accesses the raw disk devices, it must be run as root. > > This is an incompatible clone of util-linux's lsblk(8) for OpenBSD.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/06/11 07:19:54 Modified files: x11/qt6/qtbase : Makefile Added files: x11/qt6/qtbase/patches: patch-src_network_ssl_qsslsocket_cpp patch-src_plugins_tls_schannel_qtls_schannel_cpp Log message: Fix CVE-2023-34410 https://www.qt.io/blog/security-advisory-qt-network-2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/06/11 07:15:54 Modified files: textproc : Makefile Log message: +ktextaddons
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2023/06/11 07:14:11 Log message: Import ktextaddons-1.3.2, Tweaks and OK sthen@, thanks Comment: various text handling addons Description: Text addons (autocorrection, text to speak grammar checking, texttranslator, emoticon support) for the KDE desktop. Maintainer: Rafael Sadowski WWW: https://invent.kde.org/libraries/ktextaddons Status: Vendor Tag: rsadowski Release Tags: rsadowski_20230607 N ports/textproc/ktextaddons/Makefile N ports/textproc/ktextaddons/distinfo N ports/textproc/ktextaddons/pkg/DESCR N ports/textproc/ktextaddons/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/06/11 05:41:38 Modified files: www/chromium : Makefile www/chromium/patches: patch-build_config_compiler_BUILD_gn www/iridium: Makefile www/iridium/patches: patch-build_config_compiler_BUILD_gn www/ungoogled-chromium: Makefile www/ungoogled-chromium/patches: patch-build_config_compiler_BUILD_gn Log message: add the -Wl,-z,nobtcfi linker flag until we fixup v8 bti on amd64
Re: [new] sysutils/lsblk
On 11.06.23 09:34, Stuart Henderson wrote: On 2023/06/10 23:40, Benjamin Stürz wrote: Hi, what should I do next? I have at least 2 OKs now, but I don't have any commit rights. I only count 1 developer ok so far (op@). Sorry, I thought Build and tests OK on current/amd64 in a VM on VirtualBox. by Laurent Cheylus also counted as an ok. I'll add my ok but I'd prefer to add something like this to DESCR: Because it accesses the raw disk devices, it must be run as root. New tarball attached. New DESCR: Show information about block devices that are attached to the system, including name, size, type, and information about the disklabel on them, such as name, size, type, and mount point of each partition. Because it accesses the raw disk devices, it must be run as root. This is an incompatible clone of util-linux's lsblk(8) for OpenBSD. lsblk-1.2.4.tgz Description: Binary data
Re: USE_NOBTCFI for ports
On Sun, Jun 11, 2023 at 11:41:55AM +0100, Stuart Henderson wrote: > Similar to the existing support for wxneeded, this adds ports > infrastructure to add -z nobtcfi to the linker invocation via our > wrapper script. ok tb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 04:47:07 Modified files: graphics/libvips: Makefile distinfo graphics/libvips/pkg: PLIST Removed files: graphics/libvips/patches: patch-libvips_include_vips_dispatch_h patch-libvips_include_vips_vips_h Log message: update to libvips-8.14.2, from Brad dropping previous maintainer per their request
USE_NOBTCFI for ports
Similar to the existing support for wxneeded, this adds ports
infrastructure to add -z nobtcfi to the linker invocation via our
wrapper script.
It looks like ld.bfd doesn't have this (yet?) so adding the flag is only
done for lld. (For amd64, only seabios uses ld.bfd; about half a dozen
ports use ld.bfd on some of mips64/powerpc for various reasons).
Index: databases/sqlports/Makefile
===
RCS file: /cvs/ports/databases/sqlports/Makefile,v
retrieving revision 1.136
diff -u -p -r1.136 Makefile
--- databases/sqlports/Makefile 9 Jan 2023 17:09:55 - 1.136
+++ databases/sqlports/Makefile 11 Jun 2023 10:34:24 -
@@ -1,5 +1,5 @@
CATEGORIES = databases
-V =7.37
+V =7.38
DISTNAME = sqlports-$V
DISTFILES =
COMMENT-main = sqlite database of ports
Index: databases/sqlports/files/Info.pm
===
RCS file: /cvs/ports/databases/sqlports/files/Info.pm,v
retrieving revision 1.36
diff -u -p -r1.36 Info.pm
--- databases/sqlports/files/Info.pm9 Jan 2023 17:09:55 - 1.36
+++ databases/sqlports/files/Info.pm11 Jun 2023 10:34:24 -
@@ -100,6 +100,7 @@ our $vars = {
USE_GMAKE => 'YesNoVar',
USE_GROFF => 'YesNoVar',
USE_LIBTOOL => 'YesNoGnuVar',
+USE_NOBTCFI => 'YesNoVar',
USE_NOEXECONLY => 'YesNoVar',
USE_WXNEEDED => 'YesNoSpecialVar',
COMPILER => 'DefinedVar',
Index: infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1588
diff -u -p -r1.1588 bsd.port.mk
--- infrastructure/mk/bsd.port.mk 17 May 2023 10:34:42 - 1.1588
+++ infrastructure/mk/bsd.port.mk 11 Jun 2023 10:34:24 -
@@ -136,9 +136,10 @@ _ALL_VARIABLES += BROKEN COMES_WITH \
CONFIGURE_STYLE USE_LIBTOOL SEPARATE_BUILD \
SHARED_LIBS TARGETS PSEUDO_FLAVOR \
AUTOCONF_VERSION AUTOMAKE_VERSION CONFIGURE_ARGS \
- GH_ACCOUNT GH_COMMIT GH_PROJECT GH_TAGNAME \
- MAKEFILE_LIST USE_LLD USE_NOEXECONLY USE_WXNEEDED COMPILER \
- COMPILER_LANGS COMPILER_LINKS SUBST_VARS UPDATE_PLIST_ARGS \
+ GH_ACCOUNT GH_COMMIT GH_PROJECT GH_TAGNAME MAKEFILE_LIST \
+ USE_LLD USE_NOEXECONLY USE_WXNEEDED USE_NOBTCFI \
+ COMPILER COMPILER_LANGS COMPILER_LINKS \
+ SUBST_VARS UPDATE_PLIST_ARGS \
PKGPATHS DEBUG_PACKAGES DEBUG_CONFIGURE_ARGS \
FIX_CRLF_FILES
_ALL_VARIABLES_PER_ARCH += BROKEN
@@ -411,6 +412,10 @@ _LINKER_FLAGS += --no-execute-only
USE_WXNEEDED ?= No
.if ${USE_WXNEEDED:L} == "yes"
_LINKER_FLAGS += -z wxneeded
+.endif
+USE_NOBTCFI ?= No
+.if ${USE_NOBTCFI:L} == "yes" && ${USE_LLD:L} == "yes"
+_LINKER_FLAGS += -z nobtcfi
.endif
USE_GMAKE ?= No
.if ${USE_GMAKE:L} == "yes"
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 04:13:36 Modified files: sysutils/czkawka: Makefile Removed files: sysutils/czkawka/patches: patch-modcargo-crates_libc-0_2_132_src_unix_bsd_netbsdlike_openbsd_mod_rs Log message: devel/czkawka: actually remove patch (rm is not enough...), switch to MODCARGO_WANTLIB, drop dependency on devel/pango, which is pulled in via gtk+4 and sync WANTLIB for -gui. No bump since the patch left behind broke the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:59:38 Modified files: graphics : Makefile Log message: +cgif
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:59:12 Log message: Import graphics/cgif, from Brad, ok sthen CGIF is a fast and lightweight GIF encoder that can create GIF animations and images. Summary of the main features: - user-defined global or local color-palette with up to 256 colors (limit of the GIF format) - size-optimizations for GIF animations: - option to set a pixel to transparent if it has identical color in the previous frame (transparency optimization) - do encoding just for the rectangular area that differs from the previous frame (width/height optimization) - fast: a GIF with 256 colors and 1024x1024 pixels can be created in below 50 ms even on a minimalistic system - MIT license (permissive) - different options for GIF animations: static image, N repetitions, infinite repetitions - additional source-code for verifying the encoder after making changes - user-defined delay time from one frame to the next (can be set independently for each frame) - source-code conforms to the C99 standard Status: Vendor Tag: tb Release Tags: tb_20230611 N ports/graphics/cgif/Makefile N ports/graphics/cgif/distinfo N ports/graphics/cgif/pkg/DESCR N ports/graphics/cgif/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:55:26 Modified files: graphics : Makefile Log message: +libspng
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:54:36 Log message: Import graphics/libspng, from Brad, ok sthen Libspng is a C library for reading and writing Portable Network Graphics (PNG) format files with a focus on security and ease of use. The goal is to provide a fast PNG library with a simpler API than libpng. Status: Vendor Tag: tb Release Tags: tb_20230611 N ports/graphics/libspng/Makefile N ports/graphics/libspng/distinfo N ports/graphics/libspng/pkg/DESCR N ports/graphics/libspng/pkg/PLIST No conflicts created by this import
Re: [new] textproc/htmlq
Thanks. Imported with an additional
WANTLIB = ${MODCARGO_WANTLIB} m
line. ${MODCARGO_WANTLIB} is needed to pick up the correct libraries on
all architectures and libm is needed for at least pow(3), which I
believe is pulled in via the rand crate.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:40:38 Modified files: textproc : Makefile Log message: +htmlq
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 03:38:58 Log message: Import textproc/htmlq, a tool like jq that uses CSS selectors to extract bits of content from HTML files. From Xi Lu (lx () shellcodes ! org) who also takes MAINTAINER ok sthen Status: Vendor Tag: tb Release Tags: tb_20230611 N ports/textproc/htmlq/Makefile N ports/textproc/htmlq/distinfo N ports/textproc/htmlq/crates.inc N ports/textproc/htmlq/pkg/PLIST N ports/textproc/htmlq/pkg/DESCR No conflicts created by this import
Re: [update] Lagrange to 1.16.3
Am Sat, 10 Jun 2023 19:32:06 +0200 schrieb Omar Polo : > On 2023/06/06 19:59:14 +0200, Florian Viehweger > wrote: > > Hi, > > > > this is an update for Lagrange to 1.16.3. > > > > Some testing done on amd64. No issues found. > > > > portcheck and 'make port-lib-depends-check' are happy. > > > > Changes listed here [1]. > > > > Comments? > > browsed for a while and nothing exlpoded/catched fire... > > committed, thanks! :) > > Thank you for testing and importing! -- greetings, Florian Viehweger
Re: [new] textproc/htmlq
On 2023/06/11 17:06, lux wrote: > Hi, I fixed, thank you. thanks, > > MODCARGO_CRATES_UPDATE = libc > > > > but you didn't use an updated libc version in the MKDCARGO_CRATES > > lines The MODCARGO_CRATES_UPDATE line is good, but libc in MODCARGO_CRATES needs a newer version. With this change, htmlq is OK sthen@ to import. diff -uNp -r htmlq.orig/Makefile htmlq/Makefile --- htmlq.orig/Makefile Sun Jun 11 09:59:15 2023 +++ htmlq/Makefile Sun Jun 11 10:17:32 2023 @@ -13,6 +13,9 @@ PERMIT_PACKAGE = Yes MODULES = devel/cargo +# for riscv64 and powerpc64, please keep: libc >= 0.2.113 +MODCARGO_CRATES_UPDATE =libc + CONFIGURE_STYLE = cargo SEPARATE_BUILD = Yes diff -uNp -r htmlq.orig/crates.inc htmlq/crates.inc --- htmlq.orig/crates.inc Sat Jun 10 12:57:11 2023 +++ htmlq/crates.incSun Jun 11 10:18:16 2023 @@ -20,7 +20,7 @@ MODCARGO_CRATES +=idna0.2.3 # MIT/Apache-2.0 MODCARGO_CRATES += itoa0.4.8 # MIT OR Apache-2.0 MODCARGO_CRATES += kuchiki 0.8.1 # MIT MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0 -MODCARGO_CRATES += libc0.2.101 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc0.2.144 # MIT OR Apache-2.0 MODCARGO_CRATES += log 0.4.14 # MIT OR Apache-2.0 MODCARGO_CRATES += mac 0.1.1 # MIT/Apache-2.0 MODCARGO_CRATES += markup5ever 0.10.1 # MIT / Apache-2.0 diff -uNp -r htmlq.orig/distinfo htmlq/distinfo --- htmlq.orig/distinfo Sat Jun 10 12:26:29 2023 +++ htmlq/distinfo Sun Jun 11 10:18:19 2023 @@ -20,7 +20,7 @@ SHA256 (cargo/idna-0.2.3.tar.gz) = QYoKb6uCFHX2NO/jzMR SHA256 (cargo/itoa-0.4.8.tar.gz) = txmR/1YpSqkitFATnuCLO/xwmCxrLHVidxN1z3NULdQ= SHA256 (cargo/kuchiki-0.8.1.tar.gz) = HqjpxuAxN3z/gu4wAdyAJs30Me1OLmtR+Yq4xzSEo1g= SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY= -SHA256 (cargo/libc-0.2.101.tar.gz) = PLADNocb5e0sjtRLYK6ZWdxbnwhTlCLtQ/CeNOyuuiE= +SHA256 (cargo/libc-0.2.144.tar.gz) = KwDMHCKKZ4LQ8HbnsjKALgxWidQbtd82byprZiHP3+E= SHA256 (cargo/log-0.4.14.tar.gz) = Ubm75sR9Ufw+GpuUWWWUa0xEFCq4eSxQg1qYDTYsJxA= SHA256 (cargo/mac-0.1.1.tar.gz) = xB4MT++GlhrG1vioJgn1XzGwXk/OFJrFcQ5Dnfdhm6Q= SHA256 (cargo/markup5ever-0.10.1.tar.gz) = ok9A+wOFLRzdhDMM3cr5jp7Aint3aOlS+tO0zwSOyP0= @@ -97,7 +97,7 @@ SIZE (cargo/idna-0.2.3.tar.gz) = 271023 SIZE (cargo/itoa-0.4.8.tar.gz) = 11926 SIZE (cargo/kuchiki-0.8.1.tar.gz) = 22153 SIZE (cargo/lazy_static-1.4.0.tar.gz) = 10443 -SIZE (cargo/libc-0.2.101.tar.gz) = 530003 +SIZE (cargo/libc-0.2.144.tar.gz) = 682092 SIZE (cargo/log-0.4.14.tar.gz) = 34582 SIZE (cargo/mac-0.1.1.tar.gz) = 4838 SIZE (cargo/markup5ever-0.10.1.tar.gz) = 34668 htmlq.tar.gz Description: application/tar-gz
Re: [new] textproc/htmlq
On Sun, 2023-06-11 at 09:31 +0100, Stuart Henderson wrote: > On 2023/06/10 21:13, lux wrote: > > Hi ports@, > > > > htmlq is a like `jq' tool, but for HTML. Uses CSS selectors to > > extract > > bits of content from HTML files. > > > > Github: https://github.com/mgdm/htmlq > > > > I'm make a port, and test on AMD64 7.3, works fine for me: > > > > $ uname -a > > OpenBSD openbsd 7.3 GENERIC.MP#1125 amd6 > > $ curl --silent www.openbsd.org | htmlq title > > OpenBSD > > $ curl --silent www.openbsd.org | htmlq --text title > > OpenBSD > > $ curl --silent 'https://www.openbsd.org/faq/faq4.html#Download' | > > htmlq --attribute href a | grep '\.iso' > > https://cdn.openbsd.org/pub/OpenBSD/7.3/alpha/install73.iso > > ... > > > > Known issues at compile time, cargo will generate a warning when it > > is > > compiled: > > > > > warning: the following packages contain code that will be > > > rejected by > > a future version of Rust: html5ever v0.25.1 > > > > This warn is about trailing semicolons when using Rust macros > > (https://github.com/rust-lang/rust/issues/79813) and can be ignored > > for > > now. > > > > OK to import? Thank you. > > - Should use crates.inc not modules.inc > > - You have this... > > # for riscv64 and powerpc65, please keep: libc >= 0.2.113 > MODCARGO_CRATES_UPDATE = libc > > but you didn't use an updated libc version in the MKDCARGO_CRATES > lines > > (also typo, should be powerpc64) > > - there's a lot of repetition in pkg_info because you've included > things > in DESCR which are already printed - the contents of COMMENT, and the > website URL which is added automatically from HOMEPAGE: > > $ pkg_info htmlq > Information for inst:htmlq-0.4.0 > > Comment: > like jq, but for HTML > > Description: > Like jq, but for HTML. Uses CSS selectors to extract bits of content > from HTML files. > > For information about how to use this, see > https://github.com/mgdm/htmlq. > > Maintainer: Xi Lu > > WWW: https://github.com/mgdm/htmlq > > - little request, I'd find it easier if you sent tar.gz rather than > zip, > vim's archive viewer is a little nicer for tar.gz (can show all files > in a directory in one screen, rather than having to open them one by > one, which makes it slightly faster to read through when reviewing) > Hi, I fixed, thank you. htmlq.tar.gz Description: application/compressed-tar
Re: [raf...@sizeofvoid.org: Re: grive2 doesn't work]
On 2023/06/03 06:42, Rafael Sadowski wrote: > OK? $ grive Please run grive with the "-a" option if this is the first time you're accessing your Google Drive! $ ktrace grive -a --- Please open this URL in your browser to authenticate Grive2: exception: bind: Invalid argument $ kdump|grep -5 'CALL bind' 73349 griveRET kbind 0 73349 griveCALL socket(AF_INET,0x1,0) 73349 griveRET socket 3 73349 griveCALL kbind(0x7c192a446908,24,0x6bb5b172161041f5) 73349 griveRET kbind 0 73349 griveCALL bind(3,0x7c192a4469d0,256) 73349 griveRET bind -1 errno 22 Invalid argument 73349 griveCALL kbind(0x7c192a446908,24,0x6bb5b172161041f5) 73349 griveRET kbind 0 73349 griveCALL close(3) 73349 griveRET close 0 $ > - Forwarded message from Rafael Sadowski - > > From: Rafael Sadowski > Date: Fri, 2 Jun 2023 21:53:26 +0200 > Subject: Re: grive2 doesn't work > To: Luca Di Gregorio > Cc: b...@openbsd.org > > On Fri Jun 02, 2023 at 08:18:00PM +0200, Luca Di Gregorio wrote: > > Hi, I've just installed grive2 and tried: > > > > grive -a > > > > When I go to the URL, Google says that the request from the app grive2 is > > not valid. > > > > Is this a bug? > > I think our grive2 port use and old google oauth method/API. It's form > 2019. Are you able to build ports at your own? If so you can try this > diff: > > > Index: Makefile > === > RCS file: /cvs/ports/sysutils/grive2/Makefile,v > retrieving revision 1.13 > diff -u -p -u -p -r1.13 Makefile > --- Makefile 11 Mar 2022 19:57:31 - 1.13 > +++ Makefile 2 Jun 2023 19:49:55 - > @@ -2,9 +2,7 @@ COMMENT = third-party client for Google > > GH_ACCOUNT = vitalif > GH_PROJECT = grive2 > -GH_COMMIT = 548ea362f319cd1f7fcbad0344fde8449fa14255 > - > -DISTNAME = grive2-0.5.1 > +GH_TAGNAME = v0.5.3 > > CATEGORIES = sysutils > > Index: distinfo > === > RCS file: /cvs/ports/sysutils/grive2/distinfo,v > retrieving revision 1.4 > diff -u -p -u -p -r1.4 distinfo > --- distinfo 9 Oct 2020 19:40:13 - 1.4 > +++ distinfo 2 Jun 2023 19:49:55 - > @@ -1,2 +1,2 @@ > -SHA256 (grive2-0.5.1-548ea362.tar.gz) = > wJIn9bDA483dfmpHEYa3sRNtOMb6DGC3hYgpiNzUd0A= > -SIZE (grive2-0.5.1-548ea362.tar.gz) = 169931 > +SHA256 (grive2-0.5.3.tar.gz) = TLZ8MulHSTU+CM5f77gx/vo+e0m4YzKUiahIBN8RRJ0= > +SIZE (grive2-0.5.3.tar.gz) = 172452 > Index: patches/patch-CMakeLists_txt > === > RCS file: patches/patch-CMakeLists_txt > diff -N patches/patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 11 Mar 2022 19:57:31 - 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 - > @@ -1,18 +0,0 @@ > -Index: CMakeLists.txt > CMakeLists.txt.orig > -+++ CMakeLists.txt > -@@ -1,5 +1,7 @@ > - cmake_minimum_required(VERSION 2.8) > - > -+project(grive2) > -+ > - include(GNUInstallDirs) > - > - # Grive version. remember to update it for every new release! > -@@ -12,4 +14,4 @@ add_definitions( -D_FILE_OFFSET_BITS=64 -std=c++0x ) > - add_subdirectory( systemd ) > - add_subdirectory( libgrive ) > - add_subdirectory( grive ) > -- > -\ No newline at end of file > -+ > Index: patches/patch-grive_CMakeLists_txt > === > RCS file: /cvs/ports/sysutils/grive2/patches/patch-grive_CMakeLists_txt,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 patch-grive_CMakeLists_txt > --- patches/patch-grive_CMakeLists_txt11 Mar 2022 19:57:31 - > 1.3 > +++ patches/patch-grive_CMakeLists_txt2 Jun 2023 19:49:55 - > @@ -1,7 +1,7 @@ > Index: grive/CMakeLists.txt > --- grive/CMakeLists.txt.orig > +++ grive/CMakeLists.txt > -@@ -25,7 +25,7 @@ set_target_properties( grive_executable > +@@ -36,7 +36,7 @@ set_target_properties( grive_executable > ) > > install(TARGETS grive_executable RUNTIME DESTINATION bin) > Index: patches/patch-libgrive_CMakeLists_txt > === > RCS file: /cvs/ports/sysutils/grive2/patches/patch-libgrive_CMakeLists_txt,v > retrieving revision 1.3 > diff -u -p -u -p -r1.3 patch-libgrive_CMakeLists_txt > --- patches/patch-libgrive_CMakeLists_txt 11 Mar 2022 19:57:31 - > 1.3 > +++ patches/patch-libgrive_CMakeLists_txt 2 Jun 2023 19:49:55 - > @@ -1,8 +1,8 @@ > Index: libgrive/CMakeLists.txt > --- libgrive/CMakeLists.txt.orig > +++ libgrive/CMakeLists.txt > -@@ -6,7 +6,6 @@ find_package(LibGcrypt REQUIRED) > - find_package(CURL REQUIRED) > +@@ -7,7 +7,6 @@ find_package(CURL REQUIRED) > + find_package(Backtrace) > find_package(Boost 1.40.0 COMPONENTS program_options filesystem > unit_test_framework regex system REQUIRED) > find_package(BFD) > -find_package(CppUnit) > Index:
Re: New [cad/solvespace] - 3.1
- the Makefile comment about FindCairo.cmake is outdated/confusing - please drop those sprintf->snprintf patches, you can try sending them upstream if you like, there's not really a need for that in ports - BUILD_DEPENDS looks wrong; don't list extract dependencies there, that's handled by ports infrastructure. what is gtk+4 for in there? - don't hardcode CMAKE_BUILD_TYPE, that's handled by the cmale module - any reason why you don't have COMPILER=base-clang ports-gcc? On 2023/05/26 09:30, Johannes Thyssen Tishman wrote: > Hi Stefan, > > > Looks good now. > > > > OK for import sdk@ > > Awesome, thanks for that. Please find attached the port with the > following last minute tweaks: > > - Formated DESCR based on your suggestions > - Updated DESCR to match description on solvespace's website > - Dropped Jerome KASPER from MAINTAINER as per his request > > Thanks again :) > > Kind regards, > > -- > Johannes Thyssen Tishman > https://thyssentishman.com >
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/11 02:42:45 Modified files: sysutils/czkawka: Makefile crates.inc distinfo Log message: Update to czkawka 6.0.0 https://github.com/qarmin/czkawka/releases/tag/6.0.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 02:40:08 Modified files: security/lego : Makefile distinfo Log message: update to lego-4.12.1, from Horia Racoviceanu (maintainer)
Re: NEW: textproc/ktextaddon
On 2023/06/10 09:33, Rafael Sadowski wrote: > Find attached ktextaddons-1.3.2 as tarball. I need ktextaddons to update > KDE Gear to 23.04.1. Please take a short look on the new port. Thanks! > > Comment: > various text handling addons > > Description: > Various text handling addons for the KDE dekstop. ^^ desktop It would be better not to just repeat COMMENT here. How about this, borrowed from metainfo.yaml? Text addons (autocorrection, text to speak, grammar checking, text translator, emoticon support) for the KDE desktop. Otherwise looks ok.
Re: [new] textproc/htmlq
On 2023/06/10 21:13, lux wrote: > Hi ports@, > > htmlq is a like `jq' tool, but for HTML. Uses CSS selectors to extract > bits of content from HTML files. > > Github: https://github.com/mgdm/htmlq > > I'm make a port, and test on AMD64 7.3, works fine for me: > > $ uname -a > OpenBSD openbsd 7.3 GENERIC.MP#1125 amd6 > $ curl --silent www.openbsd.org | htmlq title > OpenBSD > $ curl --silent www.openbsd.org | htmlq --text title > OpenBSD > $ curl --silent 'https://www.openbsd.org/faq/faq4.html#Download' | > htmlq --attribute href a | grep '\.iso' > https://cdn.openbsd.org/pub/OpenBSD/7.3/alpha/install73.iso > ... > > Known issues at compile time, cargo will generate a warning when it is > compiled: > > > warning: the following packages contain code that will be rejected by > a future version of Rust: html5ever v0.25.1 > > This warn is about trailing semicolons when using Rust macros > (https://github.com/rust-lang/rust/issues/79813) and can be ignored for > now. > > OK to import? Thank you. - Should use crates.inc not modules.inc - You have this... # for riscv64 and powerpc65, please keep: libc >= 0.2.113 MODCARGO_CRATES_UPDATE =libc but you didn't use an updated libc version in the MKDCARGO_CRATES lines (also typo, should be powerpc64) - there's a lot of repetition in pkg_info because you've included things in DESCR which are already printed - the contents of COMMENT, and the website URL which is added automatically from HOMEPAGE: $ pkg_info htmlq Information for inst:htmlq-0.4.0 Comment: like jq, but for HTML Description: Like jq, but for HTML. Uses CSS selectors to extract bits of content from HTML files. For information about how to use this, see https://github.com/mgdm/htmlq. Maintainer: Xi Lu WWW: https://github.com/mgdm/htmlq - little request, I'd find it easier if you sent tar.gz rather than zip, vim's archive viewer is a little nicer for tar.gz (can show all files in a directory in one screen, rather than having to open them one by one, which makes it slightly faster to read through when reviewing)
Re: NEW: cgif 0.3.2
On 2023/06/03 08:43, Brad Smith wrote: > Here is a new port for cgif 0.3.2. ok > > Information for inst:cgif-0.3.2 > > Comment: > GIF encoder written in C > > Description: > CGIF is a fast and lightweight GIF encoder that can create GIF animations and > images. Summary of the main features: > - user-defined global or local color-palette with up to 256 colors (limit of > the > GIF format) > - size-optimizations for GIF animations: > - option to set a pixel to transparent if it has identical color in the > previous frame (transparency optimization) > - do encoding just for the rectangular area that differs from the previous > frame (width/height optimization) > - fast: a GIF with 256 colors and 1024x1024 pixels can be created in below 50 > ms > even on a minimalistic system > - MIT license (permissive) > - different options for GIF animations: static image, N repetitions, infinite > repetitions > - additional source-code for verifying the encoder after making changes > - user-defined delay time from one frame to the next (can be set independently > for each frame) > - source-code conforms to the C99 standard > > Maintainer: Brad Smith > > WWW: https://github.com/dloebl/cgif
Re: NEW: libspng 0.7.4
On 2023/06/03 08:40, Brad Smith wrote: > Here is a new port for libspng 0.7.4. typo: CONFIGURE_ARGSA+= otherwise ok > > Information for inst:libspng-0.7.4 > > Comment: > simple PNG decoding and encoding library > > Description: > Libspng is a C library for reading and writing Portable Network > Graphics (PNG) format files with a focus on security and ease of > use. > > The goal is to provide a fast PNG library with a simpler API than > libpng. > > Maintainer: Brad Smith > > WWW: https://libspng.org/
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 02:11:26 Modified files: graphics/libimagequant: Makefile distinfo graphics/libimagequant/pkg: PLIST Added files: graphics/libimagequant/patches: patch-Makefile Log message: update to libimagequant-2.18.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 02:09:11 Modified files: archivers/minizip: Makefile distinfo archivers/minizip/patches: patch-CMakeLists_txt archivers/minizip/pkg: PLIST Removed files: archivers/minizip/patches: patch-minizip_pc_cmakein Log message: update to minizip-4.0.0, from Brad
Re: UPDATE: minizip 4.0.0
On 2023/06/10 20:25, Brad Smith wrote: > On Fri, Jun 09, 2023 at 11:13:37PM -0400, Brad Smith wrote: > > Here is an update to minizip 4.0.0. > > > > > > https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.0 > > Updated diff. The comment in the Makefile is no longer true. The > tests can be re-enabled and pass fine. That came up when Wen Heping sent an update before, that's because upstream disabled signed zip support by default just to make the test pass(!). https://github.com/zlib-ng/minizip-ng/commit/60649ada97581 Not sure if any of the ports depending on minizip care about that and it's now the upstream default so I'll commit as-is, it can be revisited if needed.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/06/11 02:03:34 Modified files: www/nginx : Makefile Log message: add PORTROACH = limitw:1,even
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 02:03:10 Modified files: graphics/opencolorio: Makefile distinfo graphics/opencolorio/patches: patch-src_utils_NumberUtils_h Log message: update to opencolorio-2.2.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 02:02:40 Modified files: net/pidgin : Makefile distinfo Log message: update to pidgin-2.14.12, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rob...@cvs.openbsd.org 2023/06/11 01:59:21 Modified files: www/odoo : Makefile Log message: add PORTROACH
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:58:45 Modified files: multimedia/dav1d: Makefile distinfo multimedia/dav1d/patches: patch-src_arm_64_ipred16_S patch-src_arm_64_ipred_S Removed files: multimedia/dav1d/patches: patch-src_thread_task_c Log message: update to dav1d-1.2.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:55:46 Modified files: geo/osrm-backend: Makefile distinfo geo/osrm-backend/patches: patch-CMakeLists_txt geo/osrm-backend/pkg: PLIST Added files: geo/osrm-backend/patches: patch-src_extractor_edge_based_graph_factory_cpp patch-src_extractor_extractor_cpp patch-src_guidance_guidance_processing_cpp patch-src_partitioner_recursive_bisection_cpp Log message: update to osrm-backend-5.27.1, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:54:27 Modified files: devel/yaml-cpp : Makefile distinfo devel/yaml-cpp/pkg: PLIST Added files: devel/yaml-cpp/patches: patch-CMakeLists_txt patch-yaml-cpp-config_cmake_in Log message: update to yaml-cpp-0.7.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:47:12 Modified files: graphics/opensubdiv: Makefile Added files: graphics/opensubdiv/patches: patch-opensubdiv_osd_tbbEvaluator_cpp Log message: opensubdiv: patch to allow building with newer tbb. From Brad.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:40:33 Modified files: devel/glog : Makefile distinfo devel/glog/patches: patch-src_symbolize_unittest_cc devel/glog/pkg : PLIST Added files: devel/glog/patches: patch-src_raw_logging_cc patch-src_utilities_cc Removed files: devel/glog/patches: patch-CMakeLists_txt patch-src_stacktrace_powerpc-inl_h Log message: update to glog-0.6.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:37:17 Modified files: devel/mercurial: Makefile distinfo Log message: update to mercurial-6.4.4, from Josiah Frentsos
Re: [new] sysutils/lsblk
On 2023/06/10 23:40, Benjamin Stürz wrote: > Hi, > > what should I do next? > I have at least 2 OKs now, but I don't have any commit rights. I only count 1 developer ok so far (op@). I'll add my ok but I'd prefer to add something like this to DESCR: Because it accesses the raw disk devices, it must be run as root.
Re: CVS: cvs.openbsd.org: ports
When updating a Python port, please check for pyproject.toml to see if
the build backend listed in MODPY_PYBUULD in the port Makefile is still
correct.
If there's no such file, or the file exists but doesn't have a
build-backend line in the [build-system] section, the default is
setuptools, otherwise update the MODPY_PYBUILD line in the port so that
dependencies are setup correctly.
Generally if this changes it will usually be from setuptools to some
newer backend.
On 2023/06/11 07:04, Theo Buehler wrote:
> On Wed, Jun 07, 2023 at 04:48:05AM -0600, Sebastian Reitenbach wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: sebas...@cvs.openbsd.org2023/06/07 04:48:05
> >
> > Modified files:
> > security/py-fickling: Makefile distinfo
> > security/py-fickling/pkg: PLIST
> >
> > Log message:
> > update to 0.0.6
> >
>
> Did not build here:
>
> >>> Building on localhost under security/py-fickling,python3
>BDEPENDS =
> [devel/py-build,python3;lang/python/3.10;devel/py-installer,python3;devel/py-wheel,python3;devel/py-setuptools,python3]
>DIST = [security/py-fickling,python3:fickling-0.0.6.tar.gz]
>FULLPKGNAME = py3-fickling-0.0.6
>RDEPENDS = [lang/python/3.10;devel/py-astunparse,python3]
> (Junk lock obtained for localhost at 1686437523.47)
> >>> Running depends in security/py-fickling,python3 at 1686437523.49
>last junk was in devel/py-matrix-common,python3
> /usr/sbin/pkg_add -aI -Drepair py3-build-0.10.0 py3-installer-0.7.0
> py3-wheel-0.40.0
> was: /usr/sbin/pkg_add -aI -Drepair py3-build-0.10.0 py3-installer-0.7.0
> py3-setuptools-67.6.1v0 py3-wheel-0.40.0 python-3.10.11p0
> /usr/sbin/pkg_add -aI -Drepair py3-build-0.10.0 py3-installer-0.7.0
> py3-wheel-0.40.0
> >>> Running show-prepare-results in security/py-fickling,python3 at
> >>> 1686437523.78
> ===> security/py-fickling,python3
> ===> py3-fickling-0.0.6 depends on: python->=3.10,<3.11 -> python-3.10.11p0
> ===> py3-fickling-0.0.6 depends on: py3-build-* -> py3-build-0.10.0
> ===> py3-fickling-0.0.6 depends on: py3-installer-* -> py3-installer-0.7.0
> ===> py3-fickling-0.0.6 depends on: py3-setuptools-* ->
> py3-setuptools-67.6.1v0
> ===> py3-fickling-0.0.6 depends on: py3-wheel-* -> py3-wheel-0.40.0
> py3-build-0.10.0
> py3-installer-0.7.0
> py3-setuptools-67.6.1v0
> py3-wheel-0.40.0
> python-3.10.11p0
> (Junk lock released for localhost at 1686437524.68)
> distfiles size=20946
> >>> Running build in security/py-fickling,python3 at 1686437524.69
> ===> security/py-fickling,python3
> ===> Checking files for py3-fickling-0.0.6
> `/data/distfiles/fickling-0.0.6.tar.gz' is up to date.
> >> (SHA256) fickling-0.0.6.tar.gz: OK
> ===> Extracting for py3-fickling-0.0.6
> ===> Patching for py3-fickling-0.0.6
> ===> Compiler link: clang -> /usr/bin/clang
> ===> Compiler link: clang++ -> /usr/bin/clang++
> ===> Compiler link: cc -> /usr/bin/cc
> ===> Compiler link: c++ -> /usr/bin/c++
> ===> Generating configure for py3-fickling-0.0.6
> ===> Configuring for py3-fickling-0.0.6
> ===> Building for py3-fickling-0.0.6
> * Getting build dependencies for wheel...
>
> Traceback (most recent call last):
> File "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_impl.py",
> line 321, in _call_hook
> raise BackendUnavailable(data.get('traceback', ''))
> pyproject_hooks._impl.BackendUnavailable: Traceback (most recent call last):
> File
> "/usr/local/lib/python3.10/site-packages/pyproject_hooks/_in_process/_in_process.py",
> line 77, in _build_backend
> obj = import_module(mod_path)
> File "/usr/local/lib/python3.10/importlib/__init__.py", line 126, in
> import_module
> return _bootstrap._gcd_import(name[level:], package, level)
> File "", line 1050, in _gcd_import
> File "", line 1027, in _find_and_load
> File "", line 992, in _find_and_load_unlocked
> File "", line 241, in _call_with_frames_removed
> File "", line 1050, in _gcd_import
> File "", line 1027, in _find_and_load
> File "", line 1004, in _find_and_load_unlocked
> ModuleNotFoundError: No module named 'flit_core'
>
> ERROR Backend 'flit_core.buildapi' is not available.
> *** Error 1 in security/py-fickling
> (/usr/ports/lang/python/python.port.mk:361 'do-build': @: ; if [ -e
> /tmp/pobj/py-fickling-0.0.6-python3/...)
> *** Error 2 in security/py-fickling
> (/usr/ports/infrastructure/mk/bsd.port.mk:2957
> '/tmp/pobj/py-fickling-0.0.6-python3/.build_done': @cd /u...)
> *** Error 2 in security/py-fickling
> (/usr/ports/infrastructure/mk/bsd.port.mk:2601 'build':
> @lock=py3-fickling-0.0.6; export _LOCKS_HELD=" ...)
> ===> Exiting security/py-fickling,python3 with an error
> *** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'build':
> @: ${echo_msg:=echo}; : ${target:=build}; for i in ; do eval...)
> >>> Ended at 1686437526.20
> max_stuck=0.27/depends=0.29/show-prepare-results=0.92/build=1.52
> Error: job failed with 512 on localhost at 1686437526
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/11 01:09:45 Modified files: net/guacamole : Makefile.inc net/guacamole/client: distinfo net/guacamole/server: Makefile distinfo net/guacamole/server/pkg: PLIST Log message: update to guacamole-1.5.2
