Re: boost futex diff
On Sun, Dec 24, 2023 at 05:22:49PM +, Lucas Gabriel Vuotto wrote:
> On Sun, Dec 24, 2023 at 06:18:03AM +0100, Theo Buehler wrote:
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/boost/Makefile,v
> > diff -u -p -r1.140 Makefile
> > --- Makefile24 Dec 2023 00:26:12 - 1.140
> > +++ Makefile24 Dec 2023 04:57:15 -
> > @@ -11,8 +11,8 @@ COMMENT-md= machine-dependent libraries
> > VERSION= 1.84.0
> > DISTNAME= boost_${VERSION:S/./_/g}
> > PKGNAME= boost-${VERSION}
> > -REVISION= 0
> > -EPOCH =0
> > +REVISION= 1
> > +EPOCH= 0
> > CATEGORIES=devel
> > SITES=
> > https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
> > EXTRACT_SUFX= .tar.bz2
> > @@ -151,7 +151,7 @@ do-install:
> > ${INSTALL_DATA_DIR} ${PREFIX}/include/boost
> > ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
> > cd ${WRKSRC}/boost && \
> > - pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
> > + pax -rw -s ':^.*${PATCHORIG}$$::' . ${PREFIX}/include/boost
> > find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
> > find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
> > # boost-build:
> > @@ -159,11 +159,11 @@ do-install:
> > ${PREFIX}/bin
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/b2
> > @cd ${WRKSRC}/tools/build/src && \
> > - pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*\.orig$$::' . \
> > + pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*${PATCHORIG}$$::'
> > . \
> > ${PREFIX}/share/b2
> > ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/b2
> > @cd ${WRKSRC}/tools/build/example && \
> > - pax -r -w -p pm -s ':^.*\.orig$$::' . \
> > + pax -r -w -p pm -s ':^.*${PATCHORIG}$$::' . \
> > ${PREFIX}/share/examples/b2
> >
> > .include
>
> Shouldn't those "${PATCHORIG}" be replaced by "\.orig\.port"? It isn't
> an issue right now: "find $(make show=WRKSRC) -name '*?orig?port'"
> only returns the files actually ending in ${PATCHORIG} and I guess that
> if it actually becomes an issue in here, that also means that PATCHORIG
> should have been changed before.
I don't think so. I could do something like ${PATCHORIG:S/./\\./g} to
make extra sure that the two dots don't match anything but a '.'. This
is overdoing it and it isn't done elsewhere in the ports tree either.
Hardcoding \.orig\.port creates a problem for people having their
PATCHORIG set to thing else in their /etc/mk.conf. On several of my
oder dev machines where I have it set to .port.orig from the time when
PATCHORIG=.orig was the default and created a lot of pain with Rust
ports for example.
This is a lot more likely to bite people than a file foo.cppXorigYport
appearing in boost sources in the next 30 years.
Re: boost futex diff
On Sun, Dec 24, 2023 at 06:18:03AM +0100, Theo Buehler wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/boost/Makefile,v
> diff -u -p -r1.140 Makefile
> --- Makefile 24 Dec 2023 00:26:12 - 1.140
> +++ Makefile 24 Dec 2023 04:57:15 -
> @@ -11,8 +11,8 @@ COMMENT-md= machine-dependent libraries
> VERSION= 1.84.0
> DISTNAME=boost_${VERSION:S/./_/g}
> PKGNAME= boost-${VERSION}
> -REVISION=0
> -EPOCH = 0
> +REVISION=1
> +EPOCH= 0
> CATEGORIES= devel
> SITES=
> https://boostorg.jfrog.io/artifactory/main/release/${VERSION}/source/
> EXTRACT_SUFX=.tar.bz2
> @@ -151,7 +151,7 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/include/boost
> ${INSTALL_DATA} ${WRKSRC}/stage/lib/lib!(*.so) ${PREFIX}/lib
> cd ${WRKSRC}/boost && \
> - pax -rw -s ':^.*\.orig$$::' . ${PREFIX}/include/boost
> + pax -rw -s ':^.*${PATCHORIG}$$::' . ${PREFIX}/include/boost
> find ${PREFIX}/include/boost -type d -exec chmod ${DIRMODE} {} +
> find ${PREFIX}/include/boost -type f -exec chmod ${SHAREMODE} {} +
> # boost-build:
> @@ -159,11 +159,11 @@ do-install:
> ${PREFIX}/bin
> ${INSTALL_DATA_DIR} ${PREFIX}/share/b2
> @cd ${WRKSRC}/tools/build/src && \
> - pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*\.orig$$::' . \
> + pax -r -w -p pm -s ':^./engine.*$$::' -s ':^.*${PATCHORIG}$$::'
> . \
> ${PREFIX}/share/b2
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/b2
> @cd ${WRKSRC}/tools/build/example && \
> - pax -r -w -p pm -s ':^.*\.orig$$::' . \
> + pax -r -w -p pm -s ':^.*${PATCHORIG}$$::' . \
> ${PREFIX}/share/examples/b2
>
> .include
Shouldn't those "${PATCHORIG}" be replaced by "\.orig\.port"? It isn't
an issue right now: "find $(make show=WRKSRC) -name '*?orig?port'"
only returns the files actually ending in ${PATCHORIG} and I guess that
if it actually becomes an issue in here, that also means that PATCHORIG
should have been changed before.
Re: unbreak boost for powerpc, powerpc64
I suggest using ${PATCHORIG} rather than hardcoding to any particular value..
--
Sent from a phone, apologies for poor formatting.
On 24 December 2023 00:53:05 George Koehler wrote:
On Sat, 23 Dec 2023 23:46:33 +0100
Theo Buehler wrote:
Please go ahead, I can cope.
I committed it. Now if anyone runs update-plist, my commit adds
cpu_relax.hpp.orig.port to this warning,
Warning: entries NOT added to boost-1.84.0p0v0:
include/boost/atomic/detail/futex.hpp.orig.port (.orig.port suffix ?)
include/boost/fiber/detail/cpu_relax.hpp.orig.port (.orig.port suffix ?)
include/boost/fiber/detail/futex.hpp.orig.port (.orig.port suffix ?)
share/b2/tools/gcc.jam.orig.port (.orig.port suffix ?)
do-install runs pax -s ':^.*\.orig$$::' to skip .orig files, but
we changed PATCHORIG to .orig.port some time ago, so
-s ':^.*\.orig\.port$$::' might be better.
Re: [new] x11/mate/backgrounds 1.27.1
Rafael Sadowski wrote (2023-12-24 14:07 CET): > On Sun Dec 24, 2023 at 01:11:59PM +0100, Stefan Hagen wrote: > > mkf9 wrote (2023-12-24 10:47 CET): > > > I've noticed there is no mate-backgrounds package in openbsd. upstream > > > source: https://github.com/mate-desktop/mate-backgrounds/ > > > > > > may i make a request for this package to be added? ny thanks :) > > > > Do users nowadays really need wallpaper packages? > > Such a waste of resources... > > > > Port attached. > > Waste of resources? We are talking about wallpapers :-D. More > seriously, most desktop environments expects at least some default > wallpapers in a know directory. > > Feliz Navidad Marry Christmas to you too! I had disk space on package and distfile mirrors in mind. Not build time. We're not packaging simple scripts because people can just download and run them. But we're packaging image files that people can also just download and use? It just sounds unnecessary to me. That's all.
Re: [new] x11/mate/backgrounds 1.27.1
On Sun Dec 24, 2023 at 01:11:59PM +0100, Stefan Hagen wrote: > mkf9 wrote (2023-12-24 10:47 CET): > > I've noticed there is no mate-backgrounds package in openbsd. upstream > > source: https://github.com/mate-desktop/mate-backgrounds/ > > > > may i make a request for this package to be added? ny thanks :) > > Do users nowadays really need wallpaper packages? > Such a waste of resources... > > Port attached. Waste of resources? We are talking about wallpapers :-D. More seriously, most desktop environments expects at least some default wallpapers in a know directory. Feliz Navidad
Re: Link x11/kde-plasma and add kde-plasma and kde-plasma-extras meta package
On Sun Dec 24, 2023 at 03:38:00PM +0800, Kevin Lo wrote:
> On Fri, Dec 22, 2023 at 12:42:45AM +0100, Rafael Sadowski wrote:
> >
> > Hi ports@
>
> Hi Rafael,
>
> > I would like to link kde-plasma to the build and introduce two new meta
> > packages. The meta package kde-plasma comes with a README. I tried to
> > add a handful useful information.
> >
> > I use KDE Plasma as my daily desktop environment and apart from the KWin
> > compression it works great for me.
> >
> > I welcome any feedback especially for the README-plasma, it can
> > certainly be improved.
> >
> > OK?
>
> Thanks for your work on kde. There are 2 missing files:
>
> meta/kde/pkg/PLIST-plasma
> @pkgpath ${BASE_PKGPATH},-plasma
>
> /meta/kde/pkg/PLIST-plasma-extras
> @pkgpath ${BASE_PKGPATH},plasma-extras
>
> Otherwise, ok kevlo@
Thanks Kevin, that is a good point. I also moved the README from -main
to -plasma and removed the REVISION mentioned by kn@
Now diff below. If there are no more objections, I would commit it soon.
Index: meta/kde/Makefile
===
RCS file: /cvs/ports/meta/kde/Makefile,v
diff -u -p -r1.13 Makefile
--- meta/kde/Makefile 28 Oct 2023 07:47:33 - 1.13
+++ meta/kde/Makefile 24 Dec 2023 12:56:28 -
@@ -12,6 +12,9 @@ COMMENT-pim = KDE PIM personal informat
COMMENT-development = KDE development applications
COMMENT-utils =KDE utilities
+COMMENT-plasma = KDE Plasma desktop meta-package (base installation)
+COMMENT-plasma-extras =KDE Plasma desktop meta-package (full
installation)
+
PKGNAME-accessibility =kde-accessibility-${MODKDE_VERSION}
PKGNAME-admin =kde-admin-${MODKDE_VERSION}
PKGNAME-education =kde-education-${MODKDE_VERSION}
@@ -24,6 +27,10 @@ PKGNAME-pim =kde-pim-${MODKDE_VERSION}
PKGNAME-development = kde-development-${MODKDE_VERSION}
PKGNAME-utils =kde-utils-${MODKDE_VERSION}
+PLASMA_VERSION = 5.27.10
+PKGNAME-plasma = kde-plasma-${PLASMA_VERSION}
+PKGNAME-plasma-extras =kde-plasma-extras-${PLASMA_VERSION}
+
MULTI_PACKAGES += -main \
-games \
-admin \
@@ -36,6 +43,9 @@ MULTI_PACKAGES += -main \
-development \
-utils
+MULTI_PACKAGES += -plasma \
+ -plasma-extras
+
HOMEPAGE = https://kde.org
MODULES = x11/kde-applications
@@ -336,5 +346,64 @@ RUN_DEPENDS-main = \
${BUILD_PKGPATH},-network=${MODKDE_VERSION} \
${BUILD_PKGPATH},-pim=${MODKDE_VERSION} \
${BUILD_PKGPATH},-utils=${MODKDE_VERSION}
+
+WANTLIB-plasma =
+LIB_DEPENDS-plasma =
+RUN_DEPENDS-plasma += \
+ x11/kde-plasma/breeze \
+ x11/kde-plasma/breeze-gtk \
+ x11/kde-plasma/kactivitymanagerd \
+ x11/kde-plasma/kde-cli-tools \
+ x11/kde-plasma/kde-gtk-config \
+ x11/kde-plasma/kdecoration \
+ x11/kde-plasma/kdeplasma-addons \
+ x11/kde-plasma/kgamma5 \
+ x11/kde-plasma/khotkeys \
+ x11/kde-plasma/kinfocenter \
+ x11/kde-plasma/kmenuedit \
+ x11/kde-plasma/kscreen \
+ x11/kde-plasma/kscreenlocker \
+ x11/kde-plasma/ksshaskpass \
+ x11/kde-plasma/ksysguard \
+ x11/kde-plasma/ksystemstats \
+ x11/kde-plasma/kwayland-integration \
+ x11/kde-plasma/kwin \
+ x11/kde-plasma/kwrited \
+ x11/kde-plasma/layer-shell-qt \
+ x11/kde-plasma/libkscreen \
+ x11/kde-plasma/libksysguard \
+ x11/kde-plasma/milou \
+ x11/kde-plasma/oxygen \
+ x11/kde-plasma/oxygen-sounds \
+ x11/kde-plasma/plasma-browser-integration \
+ x11/kde-plasma/plasma-desktop \
+ x11/kde-plasma/plasma-nano \
+ x11/kde-plasma/plasma-pa \
+ x11/kde-plasma/plasma-sdk \
+ x11/kde-plasma/plasma-workspace \
+ x11/kde-plasma/plasma-workspace-wallpapers \
+ x11/kde-plasma/polkit-kde-agent-1 \
+ x11/kde-plasma/powerdevil \
+ x11/kde-plasma/qqc2-breeze-style \
+ x11/kde-plasma/systemsettings \
+ x11/kde-plasma/xdg-desktop-portal-kde
+
+RUN_DEPENDS-plasma += \
+ x11/kde-applications/dolphin \
+ x11/kde-applications/kdesdk-thumbnailers \
+ x11/kde-applications/kmix \
+ x11/kde-applications/konsole
+
+# extra apps
+RUN_DEPENDS-plasma-extras += \
+ ${BUILD_PKGPATH},-plasma=${PLASMA_VERSION} \
+ net/kdeconnect-kde \
+ x11/kde-applications/ark \
+ x11/kde-applications/gwenview \
+ x11/kde-applications/kate \
[new] x11/mate/backgrounds 1.27.1
mkf9 wrote (2023-12-24 10:47 CET): > I've noticed there is no mate-backgrounds package in openbsd. upstream > source: https://github.com/mate-desktop/mate-backgrounds/ > > may i make a request for this package to be added? ny thanks :) Do users nowadays really need wallpaper packages? Such a waste of resources... Port attached. mate-backgrounds.tgz Description: application/tar-gz
No mate-backgrounds package?
Hello. I've noticed there is no mate-backgrounds package in openbsd. upstream source: https://github.com/mate-desktop/mate-backgrounds/ may i make a request for this package to be added? many thanks :)
