Re: x11/py-gtk2: no need for py-numpy
On Sat, Nov 07, 2020 at 07:03:07PM +0100, Jeremie Courreges-Anglas wrote:
>
> Older mypaint releases used this but our fresh mypaint port uses
> python3/gtk3. I could not find other users of gdk_pixbuf_new_from_array
> or get_pixels_array on https://codesearch.debian.net/ . Trying to use
> missing numpy support from py-gtk2 would result in this exception:
>
> "pygtk was not compiled with Numeric Python support"
>
> Runtime tested with the gimp and the resynthetizer plugin.
>
> ok to drop the py-numpy dep in this python2-only port?
OK aja
Thanks.
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/py-gtk2/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile 7 Nov 2020 17:19:21 - 1.71
> +++ Makefile 7 Nov 2020 17:44:01 -
> @@ -1,4 +1,4 @@
> -# $OpenBSD: Makefile,v 1.71 2020/11/07 17:19:21 jca Exp $
> +# $OpenBSD: Makefile,v 1.70 2020/11/01 20:38:45 jca Exp $
>
> BROKEN-alpha=.got subsegment exceeds 64K
>
> @@ -7,7 +7,7 @@ COMMENT= GTK+2 Python bindings
> GNOME_PROJECT= pygtk
> GNOME_VERSION= 2.24.0
> PKGNAME= py-gtk2-${VERSION}
> -REVISION=9
> +REVISION=10
>
> CATEGORIES= x11
>
> @@ -33,8 +33,7 @@ MODULES=lang/python \
> BUILD_DEPENDS= ${RUN_DEPENDS}
> LIB_DEPENDS= devel/libglade2
> RUN_DEPENDS= graphics/py2-cairo>=1.2 \
> - devel/py-gobject>=2.26.0 \
> - math/py-numpy
> + devel/py-gobject>=2.26.0
>
> USE_GMAKE= No
>
> @@ -43,6 +42,7 @@ PATCH_LIST= patch-* sup-mips64-*
> .endif
>
> CONFIGURE_STYLE=gnu
> +CONFIGURE_ARGS= --disable-numpy
>
> # pick bind_textdomain_codeset
> MODGNOME_LDFLAGS=-lintl -liconv
>
>
> --
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
>
--
Antoine
Re: UPDATE: x11/xglobe
On Sat Nov 07, 2020 at 09:39:10AM +0100, Landry Breuil wrote: > On Sat, Nov 07, 2020 at 07:42:56AM +0100, Rafael Sadowski wrote: > > On Sun Jul 05, 2020 at 05:40:31PM +0200, Rafael Sadowski wrote: > > > Please find below a diff to update xglobe to 0.6. The original xglobe is > > > dead upstream. I modernized it just for fun and with the motivation to > > > get rid of Qt3/KDE3 from the ports tree. This is a complete rewrite in > > > C++17/Qt5. > > > > > > Anyway, this is the first version after the reconstruction. For KDE and > > > Linux it comes with Plasma support. For OpenBSD xwallpaper is required > > > to draw the wallpaper. > > > > > > I will try to continue to work on it and am happy about feedback. > > > > > > Rafael > > > > > > Update to 0.6.3. This version includes feedback from espie@ and ends > > with the following fixes/features: > > > > - Add support to override xwallpaper default options > > - Adjust error,infos and debug messages and bugfixes > > - Documentation > > maybe a dumb question, but does it make sense to keep the complexity > coming with the flavor ? > Good question, let the maintainer decide!
Re: devel/boost: drop python2 support and speed up make fake
On Sun Nov 08, 2020 at 01:46:14AM +0100, Jeremie Courreges-Anglas wrote:
>
> This diff drops boost_python27 and boost_numpy27. I switched the
> defaults to python3 but the boost-build .py files aren't ready for that
> (using python3 -m compileall fails with syntax errors). No idea how
> used/useful boost-build actually is or how maintainers want to deal with
> this python2/3 mix. One possible approach would be to run 2to3 on
> those files, but this doesn't catch all the py2->py3 gotchas.
I also worked on it yesterday and found the same py2->py3 issue.
>
> Feedback welcome.
>
> Unrelated, the do-install part has bugged me since some time. It
> copies ~15000 headers, forking one install(1) process per header file.
> This is expensive, on my builder the diff below moves make fake from
> ~4mn to ~4sec. I'd like to commit this seperately. oks?
Nice work! Yes please! OK rsadowski@
>
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> retrieving revision 1.101
> diff -u -p -r1.101 Makefile
> --- Makefile 5 Nov 2020 11:23:03 - 1.101
> +++ Makefile 8 Nov 2020 00:17:38 -
> @@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl
> COMMENT-md= machine-dependent libraries for boost
>
> VERSION= 1.70.0
> +REVISION=0
> DISTNAME=boost_${VERSION:S/./_/g}
> PKGNAME-main=boost-${VERSION}
> PKGNAME-md= boost-md-${VERSION}
> @@ -33,9 +34,7 @@ BOOST_LIBS= boost_atomic-mt \
> boost_math_tr1l-mt boost_math_tr1l \
> boost_prg_exec_monitor-mt boost_prg_exec_monitor \
> boost_program_options-mt boost_program_options \
> - boost_numpy27-mt boost_numpy27 \
> boost_numpy38-mt boost_numpy38 \
> - boost_python27-mt boost_python27 \
> boost_python38-mt boost_python38 \
> boost_random-mt boost_random \
> boost_regex-mt boost_regex \
> @@ -79,12 +78,12 @@ COMPILER= base-clang ports-gcc
> MULTI_PACKAGES= -main -md
>
> MODULES= lang/python
> +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
> MODPY_RUNDEP=No
>
> -# extras needed until py2 support can be removed
> -BUILD_DEPENDS+= math/py-numpy \
> - math/py-numpy,python3 \
> - lang/python/${MODPY_DEFAULT_VERSION_3}
> +BUILD_DEPENDS+= math/py-numpy${MODPY_FLAVOR}
> +# needed for byte-compiling boost-build
> +BUILD_DEPENDS+= lang/python/${MODPY_DEFAULT_VERSION_2}
>
> LIB_DEPENDS= archivers/bzip2 \
> textproc/icu4c
> @@ -116,11 +115,11 @@ BJAM_CONFIG=-sICU_PATH=${LOCALBASE} \
> cxxflags='${CXXFLAGS} -pthread' \
> variant=release \
> link=static,shared \
> - threading=single,multi \
> + threading=single,multi
>
> BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
> --with-toolset=${TOOLSET} \
> - --with-python-root=${LOCALBASE}
> + --with-python=${MODPY_BIN}
>
> # 'context' and 'coroutine' use MD bits and miss support for Alpha,
> # PA-RISC, SPARC and SuperH. The author does not care
> @@ -129,18 +128,6 @@ BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
> BOOTSTRAP+= --without-libraries=context,coroutine,fiber,stacktrace
> .endif
>
> -PY2_BOOTSTRAP=
> --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_2} \
> - --with-python-version=${MODPY_DEFAULT_VERSION_2} \
> -
> -PY3_BOOTSTRAP=
> --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3} \
> - --with-python-version=${MODPY_DEFAULT_VERSION_3} \
> -
> -PY2_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_2}
> -PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3}
> -
> -# temporary dir to stash libs when rebuilding with py2
> -PY3_DIR= ${WRKDIR}/lib.py3
> -
> # python.port.mk makes assumptions about an empty CONFIGURE_STYLE
> CONFIGURE_STYLE= none
>
> @@ -164,39 +151,20 @@ do-configure:
> cd ${WRKSRC}/tools/build/src/engine && \
> ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" /bin/sh ./build.sh cc
> && \
> cp bin.openbsd*/b2 bin.openbsd*/bjam ${WRKSRC}
> + cd ${WRKSRC} && ${SETENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}
>
> -# b2 doesn't seem to respect python parameter, we need to run twice with
> -# separate python environments. when we remove py2 support later, bootstrap
> -# can move back to the configure stage and avoid the build/rm/rebuild dance..
> do-build:
> - # First run of bootstrap/b2, setup for py3 environment:
> - sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY3_INC} \;;' \
> - < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp
> - cd ${WRKSRC} && export ${MAKE_ENV} && \
> - /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY3_BOOTSTRAP} && \
> - ./b2 ${BJAM_CONFIG} --with-python
> python=${MODPY_DEFAULT_VERSION_3}
> -
Re: devel/boost: drop python2 support and speed up make fake
On 11/7/2020 7:46 PM, Jeremie Courreges-Anglas wrote:
This diff drops boost_python27 and boost_numpy27. I switched the
defaults to python3 but the boost-build .py files aren't ready for that
(using python3 -m compileall fails with syntax errors). No idea how
used/useful boost-build actually is or how maintainers want to deal with
this python2/3 mix. One possible approach would be to run 2to3 on
those files, but this doesn't catch all the py2->py3 gotchas.
I like seeing numpy being removed. Can't comment on the rest as I don't do
much Python wise. This looks like it just might help me going forward with
Boost.
Feedback welcome.
Unrelated, the do-install part has bugged me since some time. It
copies ~15000 headers, forking one install(1) process per header file.
This is expensive, on my builder the diff below moves make fake from
~4mn to ~4sec. I'd like to commit this seperately. oks?
The install target has always bugged me as it is. Any improvement is a win.
Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile5 Nov 2020 11:23:03 - 1.101
+++ Makefile8 Nov 2020 00:17:38 -
@@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl
COMMENT-md= machine-dependent libraries for boost
VERSION= 1.70.0
+REVISION= 0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md= boost-md-${VERSION}
@@ -33,9 +34,7 @@ BOOST_LIBS= boost_atomic-mt \
boost_math_tr1l-mt boost_math_tr1l \
boost_prg_exec_monitor-mt boost_prg_exec_monitor \
boost_program_options-mt boost_program_options \
- boost_numpy27-mt boost_numpy27 \
boost_numpy38-mt boost_numpy38 \
- boost_python27-mt boost_python27 \
boost_python38-mt boost_python38 \
boost_random-mt boost_random \
boost_regex-mt boost_regex \
@@ -79,12 +78,12 @@ COMPILER= base-clang ports-gcc
MULTI_PACKAGES= -main -md
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
-# extras needed until py2 support can be removed
-BUILD_DEPENDS+=math/py-numpy \
- math/py-numpy,python3 \
- lang/python/${MODPY_DEFAULT_VERSION_3}
+BUILD_DEPENDS+=math/py-numpy${MODPY_FLAVOR}
+# needed for byte-compiling boost-build
+BUILD_DEPENDS+=lang/python/${MODPY_DEFAULT_VERSION_2}
LIB_DEPENDS= archivers/bzip2 \
textproc/icu4c
@@ -116,11 +115,11 @@ BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
cxxflags='${CXXFLAGS} -pthread' \
variant=release \
link=static,shared \
- threading=single,multi \
+ threading=single,multi
BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
--with-toolset=${TOOLSET} \
- --with-python-root=${LOCALBASE}
+ --with-python=${MODPY_BIN}
# 'context' and 'coroutine' use MD bits and miss support for Alpha,
# PA-RISC, SPARC and SuperH. The author does not care
@@ -129,18 +128,6 @@ BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
BOOTSTRAP+= --without-libraries=context,coroutine,fiber,stacktrace
.endif
-PY2_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_2} \
- --with-python-version=${MODPY_DEFAULT_VERSION_2} \
-
-PY3_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3}
\
- --with-python-version=${MODPY_DEFAULT_VERSION_3} \
-
-PY2_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_2}
-PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3}
-
-# temporary dir to stash libs when rebuilding with py2
-PY3_DIR= ${WRKDIR}/lib.py3
-
# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
CONFIGURE_STYLE= none
@@ -164,39 +151,20 @@ do-configure:
cd ${WRKSRC}/tools/build/src/engine && \
${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" /bin/sh ./build.sh cc
&& \
cp bin.openbsd*/b2 bin.openbsd*/bjam ${WRKSRC}
+ cd ${WRKSRC} && ${SETENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}
-# b2 doesn't seem to respect python parameter, we need to run twice with
-# separate python environments. when we remove py2 support later, bootstrap
-# can move back to the configure stage and avoid the build/rm/rebuild dance..
do-build:
- # First run of bootstrap/b2, setup for py3 environment:
- sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY3_INC} \;;' \
- < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp
- cd ${WRKSRC} && export ${MAKE_ENV} && \
- /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY3_BOOTSTRAP} && \
- ./b2 ${BJAM_CONFIG} --with-python
python=${MODPY_DEFAULT_VERSION_3}
- # Stash py3 libs in tempora
dwz error compiling glade on loongson
I'm trying to compile glade but getting an error from dwz about 64-bit
Dwarf not supported.
Writing /usr/ports/pobj/glade-3.36.0/fake-mips64el/debug-pkg/Makefile.new
Writing /usr/ports/pobj/glade-3.36.0/fake-mips64el/debug-pkg/PLIST
Renaming /usr/ports/pobj/glade-3.36.0/fake-mips64el/debug-pkg/Makefile.new
to Makefile
> Extracting debug info from
/usr/ports/pobj/glade-3.36.0/fake-mips64el/usr/local/bin/glade
dwz:
/usr/ports/pobj/glade-3.36.0/fake-mips64el/usr/local/bin/.debug/glade.dbg:
64-bit DWARF not supported
*** Error 1 in /usr/ports/pobj/glade-3.36.0/fake-mips64el
(debug-pkg/Makefile:26
'/usr/ports/pobj/glade-3.36.0/fake-mips64el/usr/local/bin/.debug/glade.dbg')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:3028
'_copy-debug-info': @cd /usr/ports/pobj/glade-3.36.0/fake-mips64el && exec
...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2119
'/usr/ports/packages/mips64el/all/glade-3.36.0p0.tgz': @cd
/usr/ports/devel/...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2605
'_internal-package': @case X${_DEPENDS_CACHE} in X) _DEPENDS_CACHE=$(
mktem...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2584 'package':
@:; cd /usr/ports/devel/glade && PKGPATH=devel/glade make _intern...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2137
'/var/db/pkg/glade-3.36.0p0/+CONTENTS': @cd /usr/ports/devel/glade &&
PKGPAT...)
*** Error 2 in /usr/ports/devel/glade (/usr/ports/infrastructure/mk/
bsd.port.mk:2584 'install': @lock=glade-3.36.0p0; export _LOCKS_HELD=" ...)
xmonad changes coming with ghc-8.10.2 and cabal.port.mk
As we keep inching towards cabal-install-3.4 release (the last known external blocker) I want to raise awareness of the changes coming to xmonad users with custom xmonad.hs files as part of this update. I've known and mentioned this change a few times on ports@ but it bears repeating explicitly. Primary reason for this change is each binary Haskell port will be built hermetically. The notion of hs-libraries ports will disappear. Hence such custom xmonad configurations will have to rely on Custom Build Scripts[0]. This reference is a part of MESSAGE which also points at the installed example files that I've been using for many months. This is the same approach that FreeBSD ports have taken. To make it abundantly clear, the change is not without some downsides for the user. Cabal has to be available (e.g. from the port). GHC too (same as before). The first rebuild will be slower as cabal will be warming up its build cache and potentially downloading hackage index and some sources. Usability will be somewhat lacking though if somebody feels ambitious the sample script could be improved with xmessage/xterm to provide better UX. The main goal of my message is informational. I also would like to learn about any other xmonad users with custom configs on OpenBSD. [0]https://github.com/xmonad/xmonad-testing/ Thanks Greg
[NEW] Script for semi-automatic mount/umount operations
Greetings, This is the proposal for a new port: sysutils/amount Disclaimer: I know that this kind of scripts are hardly ever accepted by OpenBSD community, nonetheless I use it on a daily basis and find it very handy. From DESCR: amount is an OpenBSD specific, POSIX compliant shell script to manage removable devices; it presents a list of available partitions, and (un)mount them upon user request. A few commands used by amount require special permissions (mount(8), umount(8), disklabel(8), fsck(8) ...), so it should be run as root I'm the author of the script; I tried to make it as close to the OpenBSD quality standard as I could, keeping it simple, but flexible enough to be adaptable to users' taste; it can be considered an alternative to the use of hotplugd, when full control of mount/unmount operations is desired. Port-wise, the Makefile is very simple; I tried to add "PKG_ARCH = *", but it triggers an error during "make package" and since I don't know if it is really needed, I didn't investigate further; please advice in case I should re-add it. I would appreciate hearing your opinion on both the port and (most important) the code style of the script (and the man page); see [1]. Any feedback welcome. All the best [1] https://github.com/just22/amount -- Alessandro De Laurenzis [mailto:jus...@atlantide.mooo.com] Web: http://www.atlantide.mooo.com LinkedIn: http://it.linkedin.com/in/delaurenzis amount.tar.gz Description: application/gzip
devel/boost: drop python2 support and speed up make fake
This diff drops boost_python27 and boost_numpy27. I switched the
defaults to python3 but the boost-build .py files aren't ready for that
(using python3 -m compileall fails with syntax errors). No idea how
used/useful boost-build actually is or how maintainers want to deal with
this python2/3 mix. One possible approach would be to run 2to3 on
those files, but this doesn't catch all the py2->py3 gotchas.
Feedback welcome.
Unrelated, the do-install part has bugged me since some time. It
copies ~15000 headers, forking one install(1) process per header file.
This is expensive, on my builder the diff below moves make fake from
~4mn to ~4sec. I'd like to commit this seperately. oks?
Index: Makefile
===
RCS file: /cvs/ports/devel/boost/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile5 Nov 2020 11:23:03 - 1.101
+++ Makefile8 Nov 2020 00:17:38 -
@@ -6,6 +6,7 @@ COMMENT-main= free peer-reviewed portabl
COMMENT-md=machine-dependent libraries for boost
VERSION= 1.70.0
+REVISION= 0
DISTNAME= boost_${VERSION:S/./_/g}
PKGNAME-main= boost-${VERSION}
PKGNAME-md=boost-md-${VERSION}
@@ -33,9 +34,7 @@ BOOST_LIBS= boost_atomic-mt \
boost_math_tr1l-mt boost_math_tr1l \
boost_prg_exec_monitor-mt boost_prg_exec_monitor \
boost_program_options-mt boost_program_options \
- boost_numpy27-mt boost_numpy27 \
boost_numpy38-mt boost_numpy38 \
- boost_python27-mt boost_python27 \
boost_python38-mt boost_python38 \
boost_random-mt boost_random \
boost_regex-mt boost_regex \
@@ -79,12 +78,12 @@ COMPILER= base-clang ports-gcc
MULTI_PACKAGES=-main -md
MODULES= lang/python
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
MODPY_RUNDEP= No
-# extras needed until py2 support can be removed
-BUILD_DEPENDS+=math/py-numpy \
- math/py-numpy,python3 \
- lang/python/${MODPY_DEFAULT_VERSION_3}
+BUILD_DEPENDS+=math/py-numpy${MODPY_FLAVOR}
+# needed for byte-compiling boost-build
+BUILD_DEPENDS+=lang/python/${MODPY_DEFAULT_VERSION_2}
LIB_DEPENDS= archivers/bzip2 \
textproc/icu4c
@@ -116,11 +115,11 @@ BJAM_CONFIG= -sICU_PATH=${LOCALBASE} \
cxxflags='${CXXFLAGS} -pthread' \
variant=release \
link=static,shared \
- threading=single,multi \
+ threading=single,multi
BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
--with-toolset=${TOOLSET} \
- --with-python-root=${LOCALBASE}
+ --with-python=${MODPY_BIN}
# 'context' and 'coroutine' use MD bits and miss support for Alpha,
# PA-RISC, SPARC and SuperH. The author does not care
@@ -129,18 +128,6 @@ BOOTSTRAP= --with-bjam=${WRKSRC}/bjam \
BOOTSTRAP+=--without-libraries=context,coroutine,fiber,stacktrace
.endif
-PY2_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_2}
\
- --with-python-version=${MODPY_DEFAULT_VERSION_2} \
-
-PY3_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3}
\
- --with-python-version=${MODPY_DEFAULT_VERSION_3} \
-
-PY2_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_2}
-PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3}
-
-# temporary dir to stash libs when rebuilding with py2
-PY3_DIR= ${WRKDIR}/lib.py3
-
# python.port.mk makes assumptions about an empty CONFIGURE_STYLE
CONFIGURE_STYLE= none
@@ -164,39 +151,20 @@ do-configure:
cd ${WRKSRC}/tools/build/src/engine && \
${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" /bin/sh ./build.sh cc
&& \
cp bin.openbsd*/b2 bin.openbsd*/bjam ${WRKSRC}
+ cd ${WRKSRC} && ${SETENV} /bin/sh ./bootstrap.sh ${BOOTSTRAP}
-# b2 doesn't seem to respect python parameter, we need to run twice with
-# separate python environments. when we remove py2 support later, bootstrap
-# can move back to the configure stage and avoid the build/rm/rebuild dance..
do-build:
- # First run of bootstrap/b2, setup for py3 environment:
- sed 's;\(using python.*PYTHON_ROOT\).*;\1 : ${PY3_INC} \;;' \
- < ${WRKSRC}/bootstrap.sh > ${WRKSRC}/bootstrap.sh.tmp
- cd ${WRKSRC} && export ${MAKE_ENV} && \
- /bin/sh ./bootstrap.sh.tmp ${BOOTSTRAP} ${PY3_BOOTSTRAP} && \
- ./b2 ${BJAM_CONFIG} --with-python
python=${MODPY_DEFAULT_VERSION_3}
- # Stash py3 libs in temporary dir:
- mkdir ${PY3_DIR}
- mv ${WRKSRC}/stage/lib/lib*python3* ${PY3_DIR}
- mv ${WRKSRC}/stage/lib/lib*numpy3* ${PY3_DIR}
- # Remove py3 .o files to force python recompilation:
- rm ${WRKSRC}/project-config.jam
- find ${WRKSRC}/bin.v2/libs/python -name "*.o" -type
Re: [UPDATE] www/snownews-1.5.12 -> 1.6.10
Once more?
:D
Tim.
trondd wrote:
> Post release poke. Made sure it still builds and runs in -current. Been
> using it on amd64 for a month.
>
> Tim.
>
> trondd wrote:
>
> > Remi Locherer wrote:
> >
> > > On Fri, Sep 18, 2020 at 06:47:44PM -0400, trondd wrote:
> > > > Looking around at RSS readers and thought I'd update snownews. Jumps us
> > > > ahead by like 10 years. Some significant changes to the configure
> > > > process
> > > > I hope I worked around right. Moved to GitHub. They also dropped
> > > > native
> > > > SSL support so I added a MESSAGE to notify any users.
> > > >
> > > > Tim.
> > >
> > > It works fine for the 2 feed I tested with. I think the message regarding
> > > HTTPS support makes sense.
> > >
> > > port-check says pkg/MESSAGE should not contain $OpenBSD$ tag.
> > >
> > > With that addressed OK remi.
> >
> > Oops. Thanks. Thought of adding the MESSAGE at the last minute and didn't
> > think to rerun portcheck. Here is the fixed diff.
> >
> > Tim.
> >
Index: Makefile
===
RCS file: /cvs/ports/www/snownews/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile12 Jul 2019 20:51:05 - 1.39
+++ Makefile19 Oct 2020 00:58:28 -
@@ -1,19 +1,22 @@
# $OpenBSD: Makefile,v 1.39 2019/07/12 20:51:05 sthen Exp $
COMMENT= text mode rss newsreader
-DISTNAME= snownews-1.5.12
-REVISION= 6
+DISTNAME= snownews-1.6.10
CATEGORIES=www
-MASTER_SITES= ${HOMEPAGE}download/
-HOMEPAGE= http://kiza.kcore.de/software/snownews/
+GH_ACCOUNT=kouya
+GH_PROJECT=snownews
+GH_TAGNAME=1.6.10
+
+HOMEPAGE= https://github.com/kouya/snownews
# GPL
PERMIT_PACKAGE=Yes
-WANTLIB += c crypto curses iconv intl m lzma pthread xml2 z
+WANTLIB += c curses iconv intl xml2 z
NO_TEST= Yes
+
USE_GMAKE= Yes
BUILD_DEPENDS= devel/gettext,-tools
@@ -21,11 +24,11 @@ RUN_DEPENDS=textproc/p5-XML-LibXML
LIB_DEPENDS= devel/gettext,-runtime \
textproc/libxml
-MAKE_ENV+= EXTRA_CFLAGS="${CFLAGS}"
-MAKE_FLAGS+= CC="${CC}"
+CONFIGURE_STYLE= simple
+CONFIGURE_ARGS=--prefix="\$${PREFIX}" --mandir="\$${PREFIX}/man" \
+ --builddir=${WRKDIR}
-CONFIGURE_STYLE= simple
-CONFIGURE_ARGS= --prefix=${PREFIX}
+MESSAGE= ${PKGDIR}/MESSAGE
post-install:
ln -f ${PREFIX}/bin/opml2snow ${PREFIX}/bin/snow2opml
Index: distinfo
===
RCS file: /cvs/ports/www/snownews/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo18 Jan 2015 03:15:50 - 1.16
+++ distinfo19 Oct 2020 00:58:28 -
@@ -1,2 +1,2 @@
-SHA256 (snownews-1.5.12.tar.gz) = Jt2W6TRdnLwcDJRwQXCA3Qw+sx5+qUT3jzMC1wYOy5A=
-SIZE (snownews-1.5.12.tar.gz) = 167944
+SHA256 (snownews-1.6.10.tar.gz) = jHgGeu914oPfSzzKHJZlh7ZlTp6Eo+bl64vdWCl5kkI=
+SIZE (snownews-1.6.10.tar.gz) = 189715
Index: patches/patch-Config_mk_in
===
RCS file: patches/patch-Config_mk_in
diff -N patches/patch-Config_mk_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Config_mk_in 19 Oct 2020 00:58:28 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: Config.mk.in
+--- Config.mk.in.orig
Config.mk.in
+@@ -21,7 +21,7 @@ PREFIX := @prefix@
+ BINDIR:= @bindir@
+ LOCALEPATH:= @localedir@
+ MANPATH := @mandir@
+-BUILDDIR := @builddir@/${NAME}
++BUILDDIR := @builddir@/build
+ PKGDIR:= @pkgdir@
+ O := .o/
+
+@@ -29,7 +29,7 @@ O:= .o/
+
+ CFLAGS:= -Wall -Wextra -Wredundant-decls -Wshadow \
+ -std=c11 -I/usr/include/libxml2
+-LDFLAGS := -liconv -lintl -lxml2 -lncurses -lz
++LDFLAGS := -liconv -lintl -lncursesw -lxml2 -lz
+ ifdef DEBUG
+ CFLAGS+= -O0 -ggdb3
+ LDFLAGS += -g -rdynamic
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 18 Sep 2009 20:51:35 - 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.13 2009/09/18 20:51:35 martynas Exp $
Makefile.orig Thu Sep 17 09:44:27 2009
-+++ Makefile Thu Sep 17 11:10:11 2009
-@@ -2,7 +2,7 @@ CC= gcc
- MAKE= make
- INSTALL=install
- LOCALEPATH= $(PREFIX)/share/locale
--MANPATH=$(PREFIX)/share/man
-+MANPATH=$(PREFIX)/man
-
- ### Compiler/linker flags ###
- ### Generated via configure ###
Index: patches/patch-configure
===
RCS file: /cvs/ports/www/snownews/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 1
Re: turn off cython tests under python2
On Sat, Nov 7, 2020 at 9:48 AM Stuart Henderson wrote: > > Here's what I make the list of victims of removing py-numpy would be. > Some of the ports involved aren't that important but others definitely > are. > > devel/boost > - (lots) > games/angrydd > games/fretsonfire > games/singularity > ...(snip)... Thanks for this updated list Stuart, this was also previously highlighted here with my thoughts on a plan at that time: https://marc.info/?l=openbsd-ports&m=160245446411390&w=2 (although a few of the things mentioned on that thread have since been addressed). > For opencv, digikam and nomacs don't appear to need python parts at all, > let alone py2, I don't think dropping py2 from there is likely to cause > much upset. interesting, hadn't looked at the ports with maintainers myself yet. but will look at if maintainers don't tackle. in which case, thanks for the hints. > > For boost, I don't see anything with a listed wantlib on any type of > the boost-numpy libs. Worth a bulk (on amd64; i386 misses too much > these days to really be a good test) to make sure but dropping that > should be possible too I think. That sounds great. Getting boost moved over would be a huge help. I think it's one of the last big stumbling blocks. > For this reason I think that we need a py2-numpy for now I don't know if we need it just yet? I'd like to at least finish trying to see how much stuff can be moved over. I had a rough sketch of a plan for everything apart from some of the games to be honest so I think we can make a lot more progress before we need a py2-numpy port.
Re: x11/py-gtk2: no need for py-numpy
Oh nice! OK, if we run into problems we can readd it with a py2-numpy port.
--
Sent from a phone, apologies for poor formatting.
On 7 November 2020 18:03:33 Jeremie Courreges-Anglas wrote:
Older mypaint releases used this but our fresh mypaint port uses
python3/gtk3. I could not find other users of gdk_pixbuf_new_from_array
or get_pixels_array on https://codesearch.debian.net/ . Trying to use
missing numpy support from py-gtk2 would result in this exception:
"pygtk was not compiled with Numeric Python support"
Runtime tested with the gimp and the resynthetizer plugin.
ok to drop the py-numpy dep in this python2-only port?
Index: Makefile
===
RCS file: /cvs/ports/x11/py-gtk2/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile7 Nov 2020 17:19:21 - 1.71
+++ Makefile7 Nov 2020 17:44:01 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2020/11/07 17:19:21 jca Exp $
+# $OpenBSD: Makefile,v 1.70 2020/11/01 20:38:45 jca Exp $
BROKEN-alpha= .got subsegment exceeds 64K
@@ -7,7 +7,7 @@ COMMENT=GTK+2 Python bindings
GNOME_PROJECT= pygtk
GNOME_VERSION= 2.24.0
PKGNAME=py-gtk2-${VERSION}
-REVISION= 9
+REVISION= 10
CATEGORIES= x11
@@ -33,8 +33,7 @@ MODULES= lang/python \
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS=devel/libglade2
RUN_DEPENDS=graphics/py2-cairo>=1.2 \
- devel/py-gobject>=2.26.0 \
- math/py-numpy
+ devel/py-gobject>=2.26.0
USE_GMAKE= No
@@ -43,6 +42,7 @@ PATCH_LIST= patch-* sup-mips64-*
.endif
CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=--disable-numpy
# pick bind_textdomain_codeset
MODGNOME_LDFLAGS=-lintl -liconv
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
x11/py-gtk2: no need for py-numpy
Older mypaint releases used this but our fresh mypaint port uses
python3/gtk3. I could not find other users of gdk_pixbuf_new_from_array
or get_pixels_array on https://codesearch.debian.net/ . Trying to use
missing numpy support from py-gtk2 would result in this exception:
"pygtk was not compiled with Numeric Python support"
Runtime tested with the gimp and the resynthetizer plugin.
ok to drop the py-numpy dep in this python2-only port?
Index: Makefile
===
RCS file: /cvs/ports/x11/py-gtk2/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile7 Nov 2020 17:19:21 - 1.71
+++ Makefile7 Nov 2020 17:44:01 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2020/11/07 17:19:21 jca Exp $
+# $OpenBSD: Makefile,v 1.70 2020/11/01 20:38:45 jca Exp $
BROKEN-alpha= .got subsegment exceeds 64K
@@ -7,7 +7,7 @@ COMMENT=GTK+2 Python bindings
GNOME_PROJECT= pygtk
GNOME_VERSION= 2.24.0
PKGNAME= py-gtk2-${VERSION}
-REVISION= 9
+REVISION= 10
CATEGORIES=x11
@@ -33,8 +33,7 @@ MODULES= lang/python \
BUILD_DEPENDS= ${RUN_DEPENDS}
LIB_DEPENDS= devel/libglade2
RUN_DEPENDS= graphics/py2-cairo>=1.2 \
- devel/py-gobject>=2.26.0 \
- math/py-numpy
+ devel/py-gobject>=2.26.0
USE_GMAKE= No
@@ -43,6 +42,7 @@ PATCH_LIST= patch-* sup-mips64-*
.endif
CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=--disable-numpy
# pick bind_textdomain_codeset
MODGNOME_LDFLAGS=-lintl -liconv
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: turn off cython tests under python2
On Fri, 6 Nov 2020 19:21:27 -0500 (EST)
Daniel Dickman wrote:
> This diff sets NO_TEST=Yes for cython under python2 so numpy can be
> updated.
>
> If we don't go this route, we'd have to convert all the cython
> consumers to python3 so cython can be made python3-only. That means
> updating consumers like py-sphinx. So going down that path doesn't
> look very simple.
>
> ok on the simpler approach below so we can move forward?
Sure, OK juanfra@.
Do you want to take the maintainership of cython?. You have been doing
the work for the last updates and looks like cython is the most
critical port in the dependency chain of some of your ports.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/cython/Makefile,v
> retrieving revision 1.45
> diff -u -p -u -r1.45 Makefile
> --- Makefile 10 Oct 2020 18:31:55 - 1.45
> +++ Makefile 7 Nov 2020 00:14:48 -
> @@ -6,6 +6,7 @@ MODPY_EGG_VERSION = 0.29.21
> DISTNAME = Cython-${MODPY_EGG_VERSION}
> PKGNAME =py-cython-${MODPY_EGG_VERSION}
> CATEGORIES = lang
> +REVISION = 0
>
> HOMEPAGE = https://cython.org/
>
> @@ -17,13 +18,22 @@ PERMIT_PACKAGE = Yes
> WANTLIB += pthread ${MODPY_WANTLIB}
>
> MODULES =lang/python
> +
> +FLAVORS =python3
> +FLAVOR ?=
> +
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> +
> BUILD_DEPENDS = devel/py-setuptools_git${MODPY_FLAVOR}
> -TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR}
>
> -FLAVORS =python3
> -FLAVOR ?=
> +# XXX: no tests under python2 so numpy can be updated.
> +# (numpy>=1.17.0 is python3-only)
> +.if ${FLAVOR:Mpython3}
> +TEST_DEPENDS += math/py-numpy${MODPY_FLAVOR}
> +.else
> +NO_TEST =Yes
> +.endif
>
> PORTHOME = ${WRKDIR}
>
--
Juan Francisco Cantero Hurtado http://juanfra.info
[UPDATE] x11/menumaker 0.99.11p0 -> 0.99.12
Greetings,
The attached diff updates x11/menumaker to the latest release.
What's new upstream
===
This is mainly a bugfix release; on top of that, support for Sakura,
QTerminal and Alacritty terminal emulators (the latter is not available
on OpenBSD) has been added.
What's new in the port
==
Since this is a trivial update, I took the opportunity to adjust the
Makefile's indentation (hoping this doesn't create troubles for the review).
All the best
--
Alessandro De Laurenzis
[mailto:jus...@atlantide.mooo.com]
Web: http://www.atlantide.mooo.com
LinkedIn: http://it.linkedin.com/in/delaurenzis
Index: Makefile
===
RCS file: /cvs/ports/x11/menumaker/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile 3 Jul 2020 21:13:23 - 1.6
+++ Makefile 7 Nov 2020 15:15:56 -
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2020/07/03 21:13:23 sthen Exp $
COMMENT = menu generation utility for X window managers
-DISTNAME = menumaker-0.99.11
+DISTNAME = menumaker-0.99.12
CATEGORIES = x11
-REVISION = 0
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=menumaker/}
@@ -11,16 +10,16 @@ HOMEPAGE = http://menumaker.sourceforge.
MAINTAINER = Alessandro De Laurenzis
# BSD
-PERMIT_PACKAGE = Yes
+PERMIT_PACKAGE = Yes
-MODULES = lang/python
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODULES = lang/python
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
-CONFIGURE_STYLE = gnu
+CONFIGURE_STYLE = gnu
-MAKE_FLAGS = PYTHON=${MODPY_BIN}
+MAKE_FLAGS = PYTHON=${MODPY_BIN}
-NO_TEST = Yes
+NO_TEST = Yes
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
Index: distinfo
===
RCS file: /cvs/ports/x11/menumaker/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 18 Apr 2020 09:01:37 - 1.2
+++ distinfo 7 Nov 2020 15:15:56 -
@@ -1,2 +1,2 @@
-SHA256 (menumaker-0.99.11.tar.gz) = nYMa267yEB2LjYLkjXZMLBqAo46X3PkHQOtUDm2z+TY=
-SIZE (menumaker-0.99.11.tar.gz) = 205196
+SHA256 (menumaker-0.99.12.tar.gz) = 46NWYYalqe1Nchwed4ilryQ8jIpFuW/m//PpRYAomww=
+SIZE (menumaker-0.99.12.tar.gz) = 206208
Re: turn off cython tests under python2
On Sat Nov 07, 2020 at 05:04:17PM +0100, Jeremie Courreges-Anglas wrote: > > If people don't want to drop boost_numpy3X we could just drop python2 > support in devel/boost. > +1
Re: turn off cython tests under python2
On Sat, Nov 07 2020, Stuart Henderson wrote: > On 2020/11/07 13:26, Jeremie Courreges-Anglas wrote: >> On Fri, Nov 06 2020, Daniel Dickman wrote: >> > This diff sets NO_TEST=Yes for cython under python2 so numpy can be >> > updated. >> > >> > If we don't go this route, we'd have to convert all the cython consumers >> > to python3 so cython can be made python3-only. That means updating >> > consumers like py-sphinx. So going down that path doesn't look very >> > simple. >> >> As a policy I think that the TEST_DEPENDS of python2-only ports >> shouldn't block updates of other ports to python3-only versions. > > Agreed. We are still some way off being able to retire a py2 version > of numpy though. Indeed. >> > ok on the simpler approach below so we can move forward? >> >> Makes sense to me, no need to bump REVISION though. I'm not sure the >> comment helps as the .if block looks self-explanatory to me. > > +1 to all of that. > > Here's what I make the list of victims of removing py-numpy would be. > Some of the ports involved aren't that important but others definitely > are. > > devel/boost > - (lots) > games/angrydd > games/fretsonfire > games/singularity > graphics/opencv > - graphics/digikam > - graphics/nomacs > graphics/piglit > lang/cython > lang/pcbasic > math/lpsolve/python > print/printrun > x11/py-gtk2 > - audio/solfege > - comms/chirp > - devel/dissy > - devel/py-hachoir-metadata > - games/childsplay > - geo/gmapcatcher > - graphics/comix > - graphics/gimp/stable >- graphics/gimp/deskew >- graphics/gimp/lensfun >- graphics/gimp/liquid-rescale >- graphics/gimp/resynthesizer >- graphics/xsane,gimp > - graphics/gnofract4d > - graphics/ufraw > - graphics/zbar > - net/nmap,-zenmap > - net/pidgin >- net/microblog-purple >- net/pidgin-sipe >- net/pidgin-window-merge >- security/pidgin-otr >- x11/pidgin-guifications >- x11/pidgin-libnotify > - print/pdfshuffler > - print/py-poppler > - x11/compiz/ccsm > - x11/driconf > - x11/gammapage > - x11/obmenu > > I don't think anyone will disagree with removing the dependency on > py2 numpy where it's not actually useful. > > For opencv, digikam and nomacs don't appear to need python parts at all, > let alone py2, I don't think dropping py2 from there is likely to cause > much upset. > > For boost, I don't see anything with a listed wantlib on any type of > the boost-numpy libs. Worth a bulk (on amd64; i386 misses too much > these days to really be a good test) to make sure but dropping that > should be possible too I think. +1 If people don't want to drop boost_numpy3X we could just drop python2 support in devel/boost. > For py-gtk2, IMHO gimp is an absolute show stopper. And for some of the > others while not exactly critical software, there's no alternative. > For this reason I think that we need a py2-numpy for now, and if we're > doing that anyway then it makes sense to use it in cython TEST_DEPENDS > too. In py-gtk2 numpy support is optional. I'll take a look. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: devel/jsoncpp
On Sat Nov 07, 2020 at 02:57:28PM +, Stuart Henderson wrote: > On 2020/11/07 15:38, Jeremie Courreges-Anglas wrote: > > On Sat, Nov 07 2020, Rafael Sadowski wrote: > > > Please find below a diff to update jsoncpp to the latest stable version > > > on github. This version includes all patches and fixes some security > > > related bugs. I removed the include path patches. > > > > While I've cared about jsoncpp in the past I don't understand how its > > headers could clash with something else (the patch mentions libc++ > > headers). That's the whole point of using an include/json/ subdirectory > > and telling people to use in their code. Maybe some people > > missed the point and started including just and > > add -I/usr/local/include/json to their build system. > > Only thing to be aware of is that some ports may start picking up jsoncpp > (or may use the system version rather than a bundled one) as a result of > this path change. > > Besides the ports where jsoncpp is a listed dependency, here are the > others where it shows in build logs. Some of these are really a pain if they > fail in bulk build so it would be nice if they could be checked to make > sure they don't start picking it up. > > devel/electron > games/odamex > games/stepmania > www/chromium > www/firefox-esr > www/iridium > www/mozilla-firefox > www/nginx > www/ruby-passenger > www/seamonkey > www/tor-browser/browser > x11/gnome/file-roller > Thanks Stuart, thanks Jeremie, I'm going to check them all.
Re: UPDATE: devel/jsoncpp
On 2020/11/07 15:38, Jeremie Courreges-Anglas wrote: > On Sat, Nov 07 2020, Rafael Sadowski wrote: > > Please find below a diff to update jsoncpp to the latest stable version > > on github. This version includes all patches and fixes some security > > related bugs. I removed the include path patches. > > While I've cared about jsoncpp in the past I don't understand how its > headers could clash with something else (the patch mentions libc++ > headers). That's the whole point of using an include/json/ subdirectory > and telling people to use in their code. Maybe some people > missed the point and started including just and > add -I/usr/local/include/json to their build system. Only thing to be aware of is that some ports may start picking up jsoncpp (or may use the system version rather than a bundled one) as a result of this path change. Besides the ports where jsoncpp is a listed dependency, here are the others where it shows in build logs. Some of these are really a pain if they fail in bulk build so it would be nice if they could be checked to make sure they don't start picking it up. devel/electron games/odamex games/stepmania www/chromium www/firefox-esr www/iridium www/mozilla-firefox www/nginx www/ruby-passenger www/seamonkey www/tor-browser/browser x11/gnome/file-roller
Re: turn off cython tests under python2
On 2020/11/07 13:26, Jeremie Courreges-Anglas wrote: > On Fri, Nov 06 2020, Daniel Dickman wrote: > > This diff sets NO_TEST=Yes for cython under python2 so numpy can be > > updated. > > > > If we don't go this route, we'd have to convert all the cython consumers > > to python3 so cython can be made python3-only. That means updating > > consumers like py-sphinx. So going down that path doesn't look very > > simple. > > As a policy I think that the TEST_DEPENDS of python2-only ports > shouldn't block updates of other ports to python3-only versions. Agreed. We are still some way off being able to retire a py2 version of numpy though. > > ok on the simpler approach below so we can move forward? > > Makes sense to me, no need to bump REVISION though. I'm not sure the > comment helps as the .if block looks self-explanatory to me. +1 to all of that. Here's what I make the list of victims of removing py-numpy would be. Some of the ports involved aren't that important but others definitely are. devel/boost - (lots) games/angrydd games/fretsonfire games/singularity graphics/opencv - graphics/digikam - graphics/nomacs graphics/piglit lang/cython lang/pcbasic math/lpsolve/python print/printrun x11/py-gtk2 - audio/solfege - comms/chirp - devel/dissy - devel/py-hachoir-metadata - games/childsplay - geo/gmapcatcher - graphics/comix - graphics/gimp/stable - graphics/gimp/deskew - graphics/gimp/lensfun - graphics/gimp/liquid-rescale - graphics/gimp/resynthesizer - graphics/xsane,gimp - graphics/gnofract4d - graphics/ufraw - graphics/zbar - net/nmap,-zenmap - net/pidgin - net/microblog-purple - net/pidgin-sipe - net/pidgin-window-merge - security/pidgin-otr - x11/pidgin-guifications - x11/pidgin-libnotify - print/pdfshuffler - print/py-poppler - x11/compiz/ccsm - x11/driconf - x11/gammapage - x11/obmenu I don't think anyone will disagree with removing the dependency on py2 numpy where it's not actually useful. For opencv, digikam and nomacs don't appear to need python parts at all, let alone py2, I don't think dropping py2 from there is likely to cause much upset. For boost, I don't see anything with a listed wantlib on any type of the boost-numpy libs. Worth a bulk (on amd64; i386 misses too much these days to really be a good test) to make sure but dropping that should be possible too I think. For py-gtk2, IMHO gimp is an absolute show stopper. And for some of the others while not exactly critical software, there's no alternative. For this reason I think that we need a py2-numpy for now, and if we're doing that anyway then it makes sense to use it in cython TEST_DEPENDS too.
Re: UPDATE: devel/jsoncpp
On Sat, Nov 07 2020, Rafael Sadowski wrote:
> Please find below a diff to update jsoncpp to the latest stable version
> on github. This version includes all patches and fixes some security
> related bugs. I removed the include path patches.
While I've cared about jsoncpp in the past I don't understand how its
headers could clash with something else (the patch mentions libc++
headers). That's the whole point of using an include/json/ subdirectory
and telling people to use in their code. Maybe some people
missed the point and started including just and
add -I/usr/local/include/json to their build system.
> I see no conflicts in
> the tree and all consumers are happy:
>
> devel/cmake
> games/minetest
> graphics/orthanc/*
> mail/kopano
> multimedia/upplay (outdated port, tweak diff in another mail).
>
> OK?
Looks correct, ok jca@
> Rafael
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/jsoncpp/Makefile,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 Makefile
> --- Makefile 12 Jul 2019 20:44:36 - 1.29
> +++ Makefile 1 Nov 2020 20:02:54 -
> @@ -4,11 +4,10 @@ COMMENT = JSON parsing C++ API
>
> GH_ACCOUNT = open-source-parsers
> GH_PROJECT = jsoncpp
> -GH_TAGNAME = 1.8.4
> -REVISION = 2
> +GH_TAGNAME = 1.9.4
>
> # no upstream revision
> -SHARED_LIBS =jsoncpp 4.0
> +SHARED_LIBS =jsoncpp 5.0
>
> CATEGORIES = devel
>
> @@ -21,7 +20,13 @@ WANTLIB = m ${COMPILER_LIBCXX}
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -MODULES =devel/meson
> +MODULES =devel/meson \
> + lang/python
> +
> +CONFIGURE_STYLE =meson
> +
> +MODPY_RUNDEP = No
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
>
> TEST_ENV += LD_PRELOAD=${WRKBUILD}/libjsoncpp.so.${LIBjsoncpp_VERSION}
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/jsoncpp/distinfo,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 distinfo
> --- distinfo 11 Feb 2018 09:05:59 - 1.14
> +++ distinfo 1 Nov 2020 20:02:54 -
> @@ -1,2 +1,2 @@
> -SHA256 (jsoncpp-1.8.4.tar.gz) = xJ3qyeCTO8twRPCFFoYaLVYJiFQLI94qwa1EOyGa/bY=
> -SIZE (jsoncpp-1.8.4.tar.gz) = 200226
> +SHA256 (jsoncpp-1.9.4.tar.gz) = 40piioFCZDuXbHIz7zgUV++teUaMZ8sa4Lg6M9dJOZk=
> +SIZE (jsoncpp-1.9.4.tar.gz) = 214057
> Index: patches/patch-include_json_config_h
> ===
> RCS file: patches/patch-include_json_config_h
> diff -N patches/patch-include_json_config_h
> --- patches/patch-include_json_config_h 18 Feb 2018 20:50:25 -
> 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,32 +0,0 @@
> -$OpenBSD: patch-include_json_config_h,v 1.4 2018/02/18 20:50:25 jca Exp $
> -
> -"explicit" on non-constructors are a C++11 feature
> -https://github.com/open-source-parsers/jsoncpp/commit/04abe38148d99b2a5270521935115d769a714adc
> -
> -Index: include/json/config.h
> include/json/config.h.orig
> -+++ include/json/config.h
> -@@ -84,15 +84,23 @@
> - #if __cplusplus >= 201103L
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT noexcept
> -+# define JSONCPP_OP_EXPLICIT explicit
> - #elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT throw()
> -+# if _MSC_VER >= 1800 // MSVC 2013
> -+# define JSONCPP_OP_EXPLICIT explicit
> -+# else
> -+# define JSONCPP_OP_EXPLICIT
> -+# endif
> - #elif defined(_MSC_VER) && _MSC_VER >= 1900
> - # define JSONCPP_OVERRIDE override
> - # define JSONCPP_NOEXCEPT noexcept
> -+# define JSONCPP_OP_EXPLICIT explicit
> - #else
> - # define JSONCPP_OVERRIDE
> - # define JSONCPP_NOEXCEPT throw()
> -+# define JSONCPP_OP_EXPLICIT
> - #endif
> -
> - #ifndef JSON_HAS_RVALUE_REFERENCES
> Index: patches/patch-include_json_value_h
> ===
> RCS file: patches/patch-include_json_value_h
> diff -N patches/patch-include_json_value_h
> --- patches/patch-include_json_value_h18 Feb 2018 20:50:25 -
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,48 +0,0 @@
> -$OpenBSD: patch-include_json_value_h,v 1.3 2018/02/18 20:50:25 jca Exp $
> -
> -"explicit" on non-constructors are a C++11 feature
> -https://github.com/open-source-parsers/jsoncpp/commit/04abe38148d99b2a5270521935115d769a714adc
> -
> -XXX Revert commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0 to avoid
> -undefined references when linking cmake.
> -
> -commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0
> -Author: Dhruv Paranjape
> -Date: Sat Jul 8 12:00:47 2017
> -
> -overload append function for R value references.
> -
> -Index: include/json/value.h
> include/json/value.h.orig
> -+++ include/json/value.h
> -@@ -322,1
Re: jsoncpp update: multimedia/upplay
On Sat, Nov 07 2020, Rafael Sadowski wrote:
> Fix upplay with upcoming jsoncpp update.
Actually you could just drop the patch. The build would then pass c++
a bogus -I/usr/include/jsoncpp but it doesn't harm.
dirbrowser/dirb_json.cpp:#include
> While here, fix WANTLIB and
> remove qtscript dependency.
>
> OK?
LGTM, ok jca@ once the jsoncpp update is in.
> diff --git a/multimedia/upplay/Makefile b/multimedia/upplay/Makefile
> index 4f5c22d5fbd..3266c6b4a13 100644
> --- a/multimedia/upplay/Makefile
> +++ b/multimedia/upplay/Makefile
> @@ -3,6 +3,7 @@
> COMMENT =UPnP audio control point
>
> DISTNAME = upplay-1.3.3
> +REVISION = 0
>
> CATEGORIES = multimedia net
>
> @@ -13,9 +14,8 @@ MAINTAINER =Pascal Stumpf
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
> -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml c jsoncpp
> -WANTLIB += m upnpp
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5WebKit
> +WANTLIB += Qt5WebKitWidgets Qt5Widgets c jsoncpp m upnpp
>
> MASTER_SITES = https://www.lesbonscomptes.com/upplay/downloads/
>
> @@ -29,7 +29,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+3,-guic
> LIB_DEPENDS =devel/jsoncpp \
> net/libupnpp>=0.17.1 \
> - x11/qt5/qtscript \
> x11/qt5/qtwebkit
>
> NO_TEST =Yes
> diff --git a/multimedia/upplay/patches/patch-upplay_pro
> b/multimedia/upplay/patches/patch-upplay_pro
> index 5b976050929..1882c44b18d 100644
> --- a/multimedia/upplay/patches/patch-upplay_pro
> +++ b/multimedia/upplay/patches/patch-upplay_pro
> @@ -8,7 +8,7 @@ Index: upplay.pro
> message("Prefix is $$PREFIX")
> DEFINES += PREFIX=\\\"$$PREFIX\\\"
> - INCLUDEPATH += /usr/include/jsoncpp
> -+ INCLUDEPATH += ${LOCALBASE}/include/jsoncpp
> ++ INCLUDEPATH += ${LOCALBASE}/include/json
>
># Installation stuff
> target.path = "$$PREFIX/bin"
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: turn off cython tests under python2
On Fri, Nov 06 2020, Daniel Dickman wrote:
> This diff sets NO_TEST=Yes for cython under python2 so numpy can be
> updated.
>
> If we don't go this route, we'd have to convert all the cython consumers
> to python3 so cython can be made python3-only. That means updating
> consumers like py-sphinx. So going down that path doesn't look very
> simple.
As a policy I think that the TEST_DEPENDS of python2-only ports
shouldn't block updates of other ports to python3-only versions.
> ok on the simpler approach below so we can move forward?
Makes sense to me, no need to bump REVISION though. I'm not sure the
comment helps as the .if block looks self-explanatory to me.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/cython/Makefile,v
> retrieving revision 1.45
> diff -u -p -u -r1.45 Makefile
> --- Makefile 10 Oct 2020 18:31:55 - 1.45
> +++ Makefile 7 Nov 2020 00:14:48 -
> @@ -6,6 +6,7 @@ MODPY_EGG_VERSION = 0.29.21
> DISTNAME = Cython-${MODPY_EGG_VERSION}
> PKGNAME =py-cython-${MODPY_EGG_VERSION}
> CATEGORIES = lang
> +REVISION = 0
>
> HOMEPAGE = https://cython.org/
>
> @@ -17,13 +18,22 @@ PERMIT_PACKAGE = Yes
> WANTLIB += pthread ${MODPY_WANTLIB}
>
> MODULES =lang/python
> +
> +FLAVORS =python3
> +FLAVOR ?=
> +
> MODPY_PI = Yes
> MODPY_SETUPTOOLS = Yes
> +
> BUILD_DEPENDS = devel/py-setuptools_git${MODPY_FLAVOR}
> -TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR}
>
> -FLAVORS =python3
> -FLAVOR ?=
> +# XXX: no tests under python2 so numpy can be updated.
> +# (numpy>=1.17.0 is python3-only)
> +.if ${FLAVOR:Mpython3}
> +TEST_DEPENDS += math/py-numpy${MODPY_FLAVOR}
> +.else
> +NO_TEST =Yes
> +.endif
>
> PORTHOME = ${WRKDIR}
>
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] Awesome WM 4.2 -> 4.3
On Wed May 20, 2020 at 11:19:08PM +0200, Enric Morales wrote:
> Hi @ports,
>
> I rebuilt my machine and lost my updated port and instead of recovering it
> from here, I went ahead and made a new one from scratch. I noticed that I
> missed a couple files (awesome themes) that needed to be patched to fix
> lookup paths. Here are some of the changes of this diff:
>
> - it removes a patch related to manpages (they are not compressed by default
> anymore, and the build works fine without that CFLAG). Instead of doing the
> work of removing the translated documentation from the CMakefiles, they are
> now removed with the port Makefile, since it will ease maintenance.
> - it builds with Lua 5.3 now
> - the API documentation is now built and installed so it can be used offline
> - I also noticed that the pango library had to be explicitly listed in the
> Makefile, it's (now?) a direct dependency of Awesome WM and it just refuses
> to build without it:
>
> [50/288] : && /usr/ports/pobj/awesome-4.3/bin/cc -O2 -pipe -DNDEBUG
> CMakeFiles/test-gravity.dir/tests/test-gravity.c.o -o test-gravity
> -L/usr/local/lib -L/usr/lib -L/usr/X11R6/lib -lxcb -L/usr/X11R6/lib
> -lxcb -L/usr/local/lib -L/usr/X11R6/lib -Wl,-rpath-link,/usr/X11R6/lib
> -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lintl -lX11 -lxcb-cursor
> -lxcb-randr -lxcb-xtest -lxcb-xinerama -lxcb-shape -lxcb-util
> -lxcb-keysyms -lxcb-icccm -lxcb-xkb -lxkbcommon-x11 -lxkbcommon -lcairo
> -lxcb-render -lstartup-notification-1 -lxdg-basedir -lxcb-xrm -lxcb
> -lexecinfo -lm -llua5.3 -lm -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0
> -lintl -lX11 -lxcb-cursor -lxcb-randr -lxcb-xtest -lxcb-xinerama
> -lxcb-shape -lxcb-util -lxcb-keysyms -lxcb-icccm -lxcb-xkb
> -lxkbcommon-x11 -lxkbcommon -lcairo -lxcb-render
> -lstartup-notification-1 -lxdg-basedir -lxcb-xrm -lexecinfo -lm
> -llua5.3 -lm -Wl,-rpath-link,/usr/X11R6/lib:/usr/local/lib && :
> [51/288] cd /usr/ports/pobj/awesome-4.3/build-amd64 &&
> /usr/ports/pobj/awesome-4.3/build-amd64/lgi-check
> FAILED: CMakeFiles/lgi-check-run
> cd /usr/ports/pobj/awesome-4.3/build-amd64 &&
> /usr/ports/pobj/awesome-4.3/build-amd64/lgi-check
> Building for Lua 5.3.
> Found lgi 0.9.1.
> Error: /usr/local/share/lua/5.3/lgi/namespace.lua:151: Typelib file for
> namespace 'Pango' (any version) not found
>
>
>WARNING
>===
>
> The lgi check failed.
> Awesome needs lgi to run.
> Add AWESOME_IGNORE_LGI=1 to your environment to continue.
>
>
> Could you please take a look at it?
>
> Cheers,
>
> Enric
I guess we need devel/pango to build awesome 4.3. Could you test the
diff below.
Rafael
diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile
index 63183e854be..a1a238e0aa8 100644
--- a/x11/awesome/Makefile
+++ b/x11/awesome/Makefile
@@ -2,10 +2,8 @@
COMMENT= highly configurable framework window manager
-VER= 4.2
-DISTNAME= awesome-${VER}
-REVISION= 1
-EXTRACT_SUFX= .tar.xz
+V= 4.3
+DISTNAME= awesome-${V}
CATEGORIES=x11
HOMEPAGE= https://awesomewm.org/
@@ -13,27 +11,25 @@ HOMEPAGE= https://awesomewm.org/
# GPLv2+
PERMIT_PACKAGE=Yes
-WANTLIB= X11 c cairo dbus-1 execinfo \
- gdk_pixbuf-2.0 glib-2.0 gobject-2.0 \
- intl ${MODLUA_WANTLIB} m \
- startup-notification-1 xcb xcb-cursor \
- xcb-icccm xcb-keysyms xcb-randr \
- xcb-render xcb-shape xcb-util \
- xcb-xinerama xcb-xkb xcb-xrm xcb-xtest \
- xdg-basedir xkbcommon-x11 xkbcommon
+WANTLIB += X11 c cairo dbus-1 execinfo gdk_pixbuf-2.0 glib-2.0
+WANTLIB += gobject-2.0 intl lua5.3 m startup-notification-1 xcb
+WANTLIB += xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-render
+WANTLIB += xcb-shape xcb-util xcb-xinerama xcb-xkb xcb-xrm xcb-xtest
+WANTLIB += xdg-basedir xkbcommon xkbcommon-x11 ${MODLUA_WANTLIB}
-MASTER_SITES=
https://github.com/awesomeWM/awesome/releases/download/v${VER}/
+MASTER_SITES=
https://github.com/awesomeWM/awesome/releases/download/v${V}/
+EXTRACT_SUFX= .tar.xz
MODULES= devel/cmake \
lang/lua
-MODLUA_VERSION=5.2
+MODLUA_VERSION=5.3
-LIB_DEPENDS= devel/libexecinfo \
+LIB_DEPENDS= ${MODLUA_LIB_DEPENDS} \
+ devel/libexecinfo \
devel/startup-notification \
graphics/cairo \
graphics/gdk-pixbuf2 \
- ${MODLUA_LIB_DEPENDS} \
x11/dbus \
x11/libxdg-basedir \
x11/xkbcommon
@@ -41,38 +37,48 @@ LIB_DEPENDS=devel/libexecin
Tcl/Tk cmake.port.mk
I think this goes in the right direction. What do you think?
Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.66
diff -u -p -r1.66 cmake.port.mk
--- cmake.port.mk 25 May 2020 05:12:00 - 1.66
+++ cmake.port.mk 6 Nov 2020 06:27:10 -
@@ -75,16 +75,21 @@ CONFIGURE_ARGS += -DLUA_INCLUDE_DIR=${MO
CONFIGURE_ARGS += -DRUBY_EXECUTABLE=${RUBY}
.endif
-# XXX Remove hackish patches
-# Tcl/Tk
+# TCL
+.if ${MODULES:Mlang/tcl}
CONFIGURE_ENV += MODTCL_VERSION=${MODTCL_VERSION} \
- MODTK_VERSION=${MODTK_VERSION} \
MODTCL_INCDIR=${MODTCL_INCDIR} \
- MODTK_INCDIR=${MODTK_INCDIR} \
MODTCL_LIBDIR=${MODTCL_LIBDIR} \
+ MODTCL_LIB=${MODTCL_LIB}
+.endif
+
+# TK
+.if ${MODULES:Mx11/tk}
+CONFIGURE_ENV += MODTK_VERSION=${MODTK_VERSION} \
+ MODTK_INCDIR=${MODTK_INCDIR} \
MODTK_LIBDIR=${MODTK_LIBDIR} \
- MODTCL_LIB=${MODTCL_LIB} \
MODTK_LIB=${MODTK_LIB}
+.endif
MODCMAKE_DEBUG ?= No
jsoncpp update: multimedia/upplay
Fix upplay with upcoming jsoncpp update. While here, fix WANTLIB and
remove qtscript dependency.
OK?
diff --git a/multimedia/upplay/Makefile b/multimedia/upplay/Makefile
index 4f5c22d5fbd..3266c6b4a13 100644
--- a/multimedia/upplay/Makefile
+++ b/multimedia/upplay/Makefile
@@ -3,6 +3,7 @@
COMMENT = UPnP audio control point
DISTNAME = upplay-1.3.3
+REVISION = 0
CATEGORIES = multimedia net
@@ -13,9 +14,8 @@ MAINTAINER = Pascal Stumpf
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
-WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml c jsoncpp
-WANTLIB += m upnpp
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5WebKit
+WANTLIB += Qt5WebKitWidgets Qt5Widgets c jsoncpp m upnpp
MASTER_SITES = https://www.lesbonscomptes.com/upplay/downloads/
@@ -29,7 +29,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
LIB_DEPENDS = devel/jsoncpp \
net/libupnpp>=0.17.1 \
- x11/qt5/qtscript \
x11/qt5/qtwebkit
NO_TEST = Yes
diff --git a/multimedia/upplay/patches/patch-upplay_pro
b/multimedia/upplay/patches/patch-upplay_pro
index 5b976050929..1882c44b18d 100644
--- a/multimedia/upplay/patches/patch-upplay_pro
+++ b/multimedia/upplay/patches/patch-upplay_pro
@@ -8,7 +8,7 @@ Index: upplay.pro
message("Prefix is $$PREFIX")
DEFINES += PREFIX=\\\"$$PREFIX\\\"
- INCLUDEPATH += /usr/include/jsoncpp
-+ INCLUDEPATH += ${LOCALBASE}/include/jsoncpp
++ INCLUDEPATH += ${LOCALBASE}/include/json
# Installation stuff
target.path = "$$PREFIX/bin"
UPDATE: devel/jsoncpp
Please find below a diff to update jsoncpp to the latest stable version
on github. This version includes all patches and fixes some security
related bugs. I removed the include path patches. I see no conflicts in
the tree and all consumers are happy:
devel/cmake
games/minetest
graphics/orthanc/*
mail/kopano
multimedia/upplay (outdated port, tweak diff in another mail).
OK?
Rafael
Index: Makefile
===
RCS file: /cvs/ports/devel/jsoncpp/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile12 Jul 2019 20:44:36 - 1.29
+++ Makefile1 Nov 2020 20:02:54 -
@@ -4,11 +4,10 @@ COMMENT = JSON parsing C++ API
GH_ACCOUNT = open-source-parsers
GH_PROJECT = jsoncpp
-GH_TAGNAME = 1.8.4
-REVISION = 2
+GH_TAGNAME = 1.9.4
# no upstream revision
-SHARED_LIBS = jsoncpp 4.0
+SHARED_LIBS = jsoncpp 5.0
CATEGORIES = devel
@@ -21,7 +20,13 @@ WANTLIB =m ${COMPILER_LIBCXX}
COMPILER = base-clang ports-gcc base-gcc
-MODULES = devel/meson
+MODULES = devel/meson \
+ lang/python
+
+CONFIGURE_STYLE = meson
+
+MODPY_RUNDEP = No
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
TEST_ENV +=LD_PRELOAD=${WRKBUILD}/libjsoncpp.so.${LIBjsoncpp_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/devel/jsoncpp/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- distinfo11 Feb 2018 09:05:59 - 1.14
+++ distinfo1 Nov 2020 20:02:54 -
@@ -1,2 +1,2 @@
-SHA256 (jsoncpp-1.8.4.tar.gz) = xJ3qyeCTO8twRPCFFoYaLVYJiFQLI94qwa1EOyGa/bY=
-SIZE (jsoncpp-1.8.4.tar.gz) = 200226
+SHA256 (jsoncpp-1.9.4.tar.gz) = 40piioFCZDuXbHIz7zgUV++teUaMZ8sa4Lg6M9dJOZk=
+SIZE (jsoncpp-1.9.4.tar.gz) = 214057
Index: patches/patch-include_json_config_h
===
RCS file: patches/patch-include_json_config_h
diff -N patches/patch-include_json_config_h
--- patches/patch-include_json_config_h 18 Feb 2018 20:50:25 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,32 +0,0 @@
-$OpenBSD: patch-include_json_config_h,v 1.4 2018/02/18 20:50:25 jca Exp $
-
-"explicit" on non-constructors are a C++11 feature
-https://github.com/open-source-parsers/jsoncpp/commit/04abe38148d99b2a5270521935115d769a714adc
-
-Index: include/json/config.h
include/json/config.h.orig
-+++ include/json/config.h
-@@ -84,15 +84,23 @@
- #if __cplusplus >= 201103L
- # define JSONCPP_OVERRIDE override
- # define JSONCPP_NOEXCEPT noexcept
-+# define JSONCPP_OP_EXPLICIT explicit
- #elif defined(_MSC_VER) && _MSC_VER > 1600 && _MSC_VER < 1900
- # define JSONCPP_OVERRIDE override
- # define JSONCPP_NOEXCEPT throw()
-+# if _MSC_VER >= 1800 // MSVC 2013
-+# define JSONCPP_OP_EXPLICIT explicit
-+# else
-+# define JSONCPP_OP_EXPLICIT
-+# endif
- #elif defined(_MSC_VER) && _MSC_VER >= 1900
- # define JSONCPP_OVERRIDE override
- # define JSONCPP_NOEXCEPT noexcept
-+# define JSONCPP_OP_EXPLICIT explicit
- #else
- # define JSONCPP_OVERRIDE
- # define JSONCPP_NOEXCEPT throw()
-+# define JSONCPP_OP_EXPLICIT
- #endif
-
- #ifndef JSON_HAS_RVALUE_REFERENCES
Index: patches/patch-include_json_value_h
===
RCS file: patches/patch-include_json_value_h
diff -N patches/patch-include_json_value_h
--- patches/patch-include_json_value_h 18 Feb 2018 20:50:25 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-$OpenBSD: patch-include_json_value_h,v 1.3 2018/02/18 20:50:25 jca Exp $
-
-"explicit" on non-constructors are a C++11 feature
-https://github.com/open-source-parsers/jsoncpp/commit/04abe38148d99b2a5270521935115d769a714adc
-
-XXX Revert commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0 to avoid
-undefined references when linking cmake.
-
-commit 23c44d9f9eed8a7ff95daca9bd44526067c144c0
-Author: Dhruv Paranjape
-Date: Sat Jul 8 12:00:47 2017
-
-overload append function for R value references.
-
-Index: include/json/value.h
include/json/value.h.orig
-+++ include/json/value.h
-@@ -322,10 +322,6 @@ Json::Value obj_value(Json::objectValue); // {}
- Value(bool value);
- /// Deep copy.
- Value(const Value& other);
--#if JSON_HAS_RVALUE_REFERENCES
-- /// Move constructor
-- Value(Value&& other);
--#endif
- ~Value();
-
- /// Deep copy, then swap(other).
-@@ -401,7 +397,7 @@ Json::Value obj_value(Json::objectValue); // {}
- bool empty() const;
-
- /// Return !isNull()
-- explicit operator bool() const;
-+ JSONCPP_OP_EXPLICIT operator bool() const;
-
- /// Remove all object members and array elements.
- /// \pre type() is arrayValue, objectValue, or nullValue
-@@ -451,10 +447,6 @@ Json::Value obj_value(Json::objectValue); // {}
- ///
- /// E
UPDATE: ircd-hybrid 8.2.34
Here is an update to ircd-hybrid 8.2.34.
-- Noteworthy changes in version 8.2.34 (2020-11-01)
* Re-implement backwards compatibility mode for old ircd-hybrid 8.2.23 and
below.
Final removal is scheduled for early 2021.
* For consistency, the `general::network_desc` configuration directive has been
renamed to `general::network_description`
* Server notices that previously have been sent to user modes +f and +u are now
sent to user mode +j (reject notices) instead. Due to this change, `unauth`
and
`full` have been removed from `general::oper_only_umodes`,
`general::oper_umodes`,
and `operator::umodes`.
* User mode +b has been replaced with +f (flood). Spam/flood notices are now
sent
to this user mode. For this, `bots` has been removed from
`general::oper_only_umodes`, `general::oper_umodes`, and `operator::umodes`.
`flood` has been added instead to these configuration directives.
* Stricten server/user ID validation. IDs have to be all uppercase everywhere
now.
Index: Makefile
===
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.55
diff -u -p -u -p -r1.55 Makefile
--- Makefile6 Oct 2020 20:04:30 - 1.55
+++ Makefile7 Nov 2020 06:16:50 -
@@ -2,7 +2,7 @@
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.2.33
+DISTNAME = ircd-hybrid-8.2.34
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 distinfo
--- distinfo6 Oct 2020 20:04:30 - 1.32
+++ distinfo7 Nov 2020 06:17:02 -
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.2.33.tgz) = GEcPpLU2GAn4ZDWZ+s0xVBxEspwOY7G0RkDWyAhFagE=
-SIZE (ircd-hybrid-8.2.33.tgz) = 1250775
+SHA256 (ircd-hybrid-8.2.34.tgz) = /Phyd2oGaxYjmQvUOGlqMf154YTGiP/l7x6ckQRjN8g=
+SIZE (ircd-hybrid-8.2.34.tgz) = 1053578
Index: patches/patch-doc_reference_conf
===
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-doc_reference_conf,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-doc_reference_conf
--- patches/patch-doc_reference_conf6 Oct 2020 20:04:30 - 1.19
+++ patches/patch-doc_reference_conf7 Nov 2020 06:18:03 -
@@ -36,7 +36,7 @@ Index: doc/reference.conf
};
/*
-@@ -991,7 +991,7 @@ serverhide {
+@@ -989,7 +989,7 @@ serverhide {
/*
* flatten_links_file: path to the flatten links cache file.
*/
@@ -45,7 +45,7 @@ Index: doc/reference.conf
/*
* hidden: hide this server from a /links output on servers that
-@@ -1300,9 +1300,9 @@ modules {
+@@ -1296,9 +1296,9 @@ modules {
* path: other paths to search for modules specified below
* and in "/module load".
*/
@@ -58,7 +58,7 @@ Index: doc/reference.conf
/* module: the name of a module to load on startup/rehash. */
# module = "some_module.la";
-@@ -1317,49 +1317,49 @@ log {
+@@ -1313,49 +1313,49 @@ log {
file {
type = oper;
Index: patches/patch-src_ircd_c
===
RCS file: /home/cvs/ports/net/ircd-hybrid/patches/patch-src_ircd_c,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-src_ircd_c
--- patches/patch-src_ircd_c15 May 2020 06:34:13 - 1.18
+++ patches/patch-src_ircd_c7 Nov 2020 06:18:01 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_ircd_c,v 1.18 2020/0
Index: src/ircd.c
--- src/ircd.c.orig
+++ src/ircd.c
-@@ -331,7 +331,6 @@ make_daemon(void)
+@@ -330,7 +330,6 @@ make_daemon(void)
}
else if (pid > 0)
{
@@ -11,7 +11,7 @@ Index: src/ircd.c
exit(EXIT_SUCCESS);
}
-@@ -344,8 +343,19 @@ main(int argc, char *argv[])
+@@ -343,8 +342,19 @@ main(int argc, char *argv[])
/* Check to see if the user is running us as root, which is a nono */
if (geteuid() == 0)
{
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 PLIST
--- pkg/PLIST 6 Oct 2020 20:04:30 - 1.22
+++ pkg/PLIST 7 Nov 2020 06:19:54 -
@@ -98,6 +98,8 @@ lib/ircd-hybrid/modules/autoload/m_stats
@so lib/ircd-hybrid/modules/autoload/m_stats.so
lib/ircd-hybrid/modules/autoload/m_svinfo.la
@so lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svsaccount.la
+@so lib/ircd-hybrid/modules/autoload/m_svsaccount.so
lib/ircd-hybrid/modules/autoload/m_svshost.la
@so lib/ircd-hybrid/modules/autoload/m_svshost.so
lib/ircd-hybrid/modules/autoload/m_svsjoin.la
[UPDATE] audio/lmms 1.2.0 -> 1.2.2
Update audio/lmms to 1.2.2
I'll take MAINTAINER if no one minds.
I'm considering adding carla to expand the plugin
compatibility. After that maybe be zynaddsubfx as a
separate port could be loaded as a plugin.
Changelog: https://github.com/LMMS/lmms/releases
Index: Makefile
===
RCS file: /cvs/ports/audio/lmms/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile30 Jan 2020 14:13:47 - 1.23
+++ Makefile7 Nov 2020 05:52:36 -
@@ -2,17 +2,24 @@
COMMENT = music studio with tracking, sampling and MIDI
-# rolled from git; requires submodules
-# git clone --recurse-submodules -b v1.2.0 https://github.com/lmms/lmms
-DISTNAME = lmms-1.2.0
-REVISION = 0
-EXTRACT_SUFX = .tar.xz
+V =1.2.2
+RPMALLOC_VER = 1.4.1
+GH_ACCOUNT = LMMS
+GH_PROJECT = lmms
+GH_TAGNAME = v${V}
CATEGORIES = audio
HOMEPAGE = https://lmms.io/
-MASTER_SITES = https://spacehopper.org/mirrors/
+MASTER_SITES0 =https://github.com/mjansson/rpmalloc/archive/
+
+MAINTAINER = Dimitri Karamazov
+
+DISTFILES += v${V}.tar.gz \
+ ${RPMALLOC_VER}.tar.gz:0
+
+EXTRACT_ONLY = v${V}.tar.gz
# GPLv2
PERMIT_PACKAGE = Yes
@@ -61,5 +68,9 @@ CONFIGURE_ARGS += -DWANT_CALF=OFF \
-DWANT_VST=OFF
NO_TEST = Yes
+
+post-extract:
+ tar zxf ${DISTDIR}/${RPMALLOC_VER}.tar.gz -C ${WRKSRC}
+ cp -r ${WRKSRC}/rpmalloc-${RPMALLOC_VER}/rpmalloc
${WRKSRC}/src/3rdparty/rpmalloc/rpmalloc/
.include
Index: distinfo
===
RCS file: /cvs/ports/audio/lmms/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo14 Jun 2019 13:51:01 - 1.4
+++ distinfo7 Nov 2020 05:52:36 -
@@ -1,2 +1,4 @@
-SHA256 (lmms-1.2.0.tar.xz) = Fom6xh4Zaysl7e85lcu+HoKj39qtQZY/ahz57NeiBnY=
-SIZE (lmms-1.2.0.tar.xz) = 14545260
+SHA256 (1.4.1.tar.gz) = 6KlEgdygJLz/8KyqJGKz9fsdV5QPxEnasNp0NJMt5hA=
+SHA256 (v1.2.2.tar.gz) = QeFeqo7glotByYMnWl0uPqV8NIHeZDhpWE/A0c4JLvY=
+SIZE (1.4.1.tar.gz) = 81530
+SIZE (v1.2.2.tar.gz) = 16501132
regards,
Dimitri
diff
Description: Binary data
Re: UPDATE: x11/xglobe
On Sat, Nov 07, 2020 at 07:42:56AM +0100, Rafael Sadowski wrote: > On Sun Jul 05, 2020 at 05:40:31PM +0200, Rafael Sadowski wrote: > > Please find below a diff to update xglobe to 0.6. The original xglobe is > > dead upstream. I modernized it just for fun and with the motivation to > > get rid of Qt3/KDE3 from the ports tree. This is a complete rewrite in > > C++17/Qt5. > > > > Anyway, this is the first version after the reconstruction. For KDE and > > Linux it comes with Plasma support. For OpenBSD xwallpaper is required > > to draw the wallpaper. > > > > I will try to continue to work on it and am happy about feedback. > > > > Rafael > > > Update to 0.6.3. This version includes feedback from espie@ and ends > with the following fixes/features: > > - Add support to override xwallpaper default options > - Adjust error,infos and debug messages and bugfixes > - Documentation maybe a dumb question, but does it make sense to keep the complexity coming with the flavor ?
