Re: Disable libinput in qt5 and qt6

2023-10-20 Thread Klemens Nanni
10/20/23 09:44, Rafael Sadowski пишет:
> Yes I'll prevent Qt and other ports to picking up libinput. If someone
> wants to use it as a dependency then we should enable and test it
> explicitly. 


OK kn



Re: Disable libinput in qt5 and qt6

2023-10-20 Thread Rafael Sadowski
On Tue Oct 17, 2023 at 12:09:55PM +, Klemens Nanni wrote:
> On Tue, Oct 17, 2023 at 01:47:02PM +0200, Rafael Sadowski wrote:
> > I would like to unhook libinput sooner rather than later to unhook KDE
> > plasma.  But let us first disable it over all.
> 
> You want to hook wayland/libinput-openbsd *to* the build to eventually
> hook x11/kde-plasma/ *to* to the build, right?

Correct that is the plan.

> 
> > 
> > The list of FreeBSD looks somehow too small. Can someone grep in a bulk
> > build?
> > 
> > https://www.freshports.org/x11/libinput/
> > 
> > OK to disable libinput auto detection in Qt?
> 
> So libinput-openbsd is not used yet, there is not other libinput in ports,
> which means this diff ought to be a NOOP now, but will prevent ports from
> automatically picking up libinput via Qt5 or Qt6 in the future?

Yes I'll prevent Qt and other ports to picking up libinput.  If someone
wants to use it as a dependency then we should enable and test it
explicitly.

> 
> > 
> > Index: qt5/qtbase/Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> > retrieving revision 1.64
> > diff -u -p -r1.64 Makefile
> > --- qt5/qtbase/Makefile 1 Sep 2023 13:13:27 -   1.64
> > +++ qt5/qtbase/Makefile 17 Oct 2023 11:42:56 -
> > @@ -15,6 +15,8 @@ PKGNAME-tds = qt5-tds-${VERSION}
> >  PKG_ARCH-global =  *
> >  PKG_ARCH-examples =*
> >  
> > +REVISION-main =0
> > +
> >  DPB_PROPERTIES =   parallel
> >  
> >  SHARED_LIBS +=  Qt5Concurrent4.0 # 5.15
> > @@ -141,6 +143,8 @@ CONFIGURE_ARGS +=   -confirm-license \
> >  # We have to wait until arm64 is vulkan ready.
> >  #BUILD_DEPENDS =   graphics/vulkan-loader
> >  CONFIGURE_ARGS +=  -no-vulkan
> > +
> > +CONFIGURE_ARGS +=  -no-libinput
> >  
> >  # Let's wait a little until we have more experience and test results
> >  #LIB_DEPENDS +=sysutils/libudev-openbsd
> > Index: qt6/qtbase/Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 Makefile
> > --- qt6/qtbase/Makefile 28 Jul 2023 08:44:09 -  1.25
> > +++ qt6/qtbase/Makefile 17 Oct 2023 11:42:57 -
> > @@ -11,6 +11,8 @@ PKGNAME-mysql =   qt6-mysql-${VERSION}
> >  PKGNAME-global =   qt6-global-${VERSION}
> >  PKGNAME-psql = qt6-postgresql-${VERSION}
> >  
> > +REVISION-main  0

I know I have forgotten a "=" here.

> > +
> >  PKG_ARCH-global =  *
> >  
> >  DPB_PROPERTIES =   parallel
> > @@ -115,6 +117,7 @@ CONFIGURE_ARGS +=   -DCMAKE_INSTALL_PREFIX
> > -DBUILD_WITH_PCH=OFF \
> > -DQT_FEATURE_journald=OFF \
> > -DQT_FEATURE_libudev=OFF \
> > +   -DQT_FEATURE_libinput=OFF \
> > -DQT_FEATURE_openssl_linked=ON \
> > -DQT_FEATURE_dtls=OFF
> >  
> > 
> 



Re: Disable libinput in qt5 and qt6

2023-10-17 Thread Klemens Nanni
On Tue, Oct 17, 2023 at 01:47:02PM +0200, Rafael Sadowski wrote:
> I would like to unhook libinput sooner rather than later to unhook KDE
> plasma.  But let us first disable it over all.

You want to hook wayland/libinput-openbsd *to* the build to eventually
hook x11/kde-plasma/ *to* to the build, right?

> 
> The list of FreeBSD looks somehow too small. Can someone grep in a bulk
> build?
> 
> https://www.freshports.org/x11/libinput/
> 
> OK to disable libinput auto detection in Qt?

So libinput-openbsd is not used yet, there is not other libinput in ports,
which means this diff ought to be a NOOP now, but will prevent ports from
automatically picking up libinput via Qt5 or Qt6 in the future?

> 
> Index: qt5/qtbase/Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile
> --- qt5/qtbase/Makefile   1 Sep 2023 13:13:27 -   1.64
> +++ qt5/qtbase/Makefile   17 Oct 2023 11:42:56 -
> @@ -15,6 +15,8 @@ PKGNAME-tds =   qt5-tds-${VERSION}
>  PKG_ARCH-global =*
>  PKG_ARCH-examples =  *
>  
> +REVISION-main =  0
> +
>  DPB_PROPERTIES = parallel
>  
>  SHARED_LIBS +=  Qt5Concurrent4.0 # 5.15
> @@ -141,6 +143,8 @@ CONFIGURE_ARGS += -confirm-license \
>  # We have to wait until arm64 is vulkan ready.
>  #BUILD_DEPENDS = graphics/vulkan-loader
>  CONFIGURE_ARGS +=-no-vulkan
> +
> +CONFIGURE_ARGS +=-no-libinput
>  
>  # Let's wait a little until we have more experience and test results
>  #LIB_DEPENDS +=  sysutils/libudev-openbsd
> Index: qt6/qtbase/Makefile
> ===
> RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- qt6/qtbase/Makefile   28 Jul 2023 08:44:09 -  1.25
> +++ qt6/qtbase/Makefile   17 Oct 2023 11:42:57 -
> @@ -11,6 +11,8 @@ PKGNAME-mysql = qt6-mysql-${VERSION}
>  PKGNAME-global = qt6-global-${VERSION}
>  PKGNAME-psql =   qt6-postgresql-${VERSION}
>  
> +REVISION-main0
> +
>  PKG_ARCH-global =*
>  
>  DPB_PROPERTIES = parallel
> @@ -115,6 +117,7 @@ CONFIGURE_ARGS += -DCMAKE_INSTALL_PREFIX
>   -DBUILD_WITH_PCH=OFF \
>   -DQT_FEATURE_journald=OFF \
>   -DQT_FEATURE_libudev=OFF \
> + -DQT_FEATURE_libinput=OFF \
>   -DQT_FEATURE_openssl_linked=ON \
>   -DQT_FEATURE_dtls=OFF
>  
> 



Disable libinput in qt5 and qt6

2023-10-17 Thread Rafael Sadowski
I would like to unhook libinput sooner rather than later to unhook KDE
plasma.  But let us first disable it over all.

The list of FreeBSD looks somehow too small. Can someone grep in a bulk
build?

https://www.freshports.org/x11/libinput/

OK to disable libinput auto detection in Qt?

Index: qt5/qtbase/Makefile
===
RCS file: /cvs/ports/x11/qt5/qtbase/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- qt5/qtbase/Makefile 1 Sep 2023 13:13:27 -   1.64
+++ qt5/qtbase/Makefile 17 Oct 2023 11:42:56 -
@@ -15,6 +15,8 @@ PKGNAME-tds = qt5-tds-${VERSION}
 PKG_ARCH-global =  *
 PKG_ARCH-examples =*
 
+REVISION-main =0
+
 DPB_PROPERTIES =   parallel
 
 SHARED_LIBS +=  Qt5Concurrent4.0 # 5.15
@@ -141,6 +143,8 @@ CONFIGURE_ARGS +=   -confirm-license \
 # We have to wait until arm64 is vulkan ready.
 #BUILD_DEPENDS =   graphics/vulkan-loader
 CONFIGURE_ARGS +=  -no-vulkan
+
+CONFIGURE_ARGS +=  -no-libinput
 
 # Let's wait a little until we have more experience and test results
 #LIB_DEPENDS +=sysutils/libudev-openbsd
Index: qt6/qtbase/Makefile
===
RCS file: /cvs/ports/x11/qt6/qtbase/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- qt6/qtbase/Makefile 28 Jul 2023 08:44:09 -  1.25
+++ qt6/qtbase/Makefile 17 Oct 2023 11:42:57 -
@@ -11,6 +11,8 @@ PKGNAME-mysql =   qt6-mysql-${VERSION}
 PKGNAME-global =   qt6-global-${VERSION}
 PKGNAME-psql = qt6-postgresql-${VERSION}
 
+REVISION-main  0
+
 PKG_ARCH-global =  *
 
 DPB_PROPERTIES =   parallel
@@ -115,6 +117,7 @@ CONFIGURE_ARGS +=   -DCMAKE_INSTALL_PREFIX
-DBUILD_WITH_PCH=OFF \
-DQT_FEATURE_journald=OFF \
-DQT_FEATURE_libudev=OFF \
+   -DQT_FEATURE_libinput=OFF \
-DQT_FEATURE_openssl_linked=ON \
-DQT_FEATURE_dtls=OFF