Re: [matth...@herrb.eu: remove 2 obsolete libraries from Xenocara]

2018-05-20 Thread Nigel Taylor 
Ok.

Built on amd64 here, with libraries removed. Ready to build packages
with these changes when snapshot is available.


On 05/20/18 10:45, Matthieu Herrb wrote:
> The xenocara part is now committed. Ok for the ports diff ?
> 
> - Forwarded message from Matthieu Herrb  -
> 
> Date: Sat, 28 Apr 2018 19:24:28 +0200
> From: Matthieu Herrb 
> To: t...@openbsd.org
> Subject: remove 2 obsolete libraries from Xenocara
> 
> Hi,
> 
> libXfontcache and libXxf86misc are implementing the client part of X
> extensions that have been disabled/removed for a while in the X
> server. So builing them or linking to them is useless.
> 
> The patch below stops building them in xenocara. A few ports where
> using libXxf86misc. Rebuilding them without this library just requires
> an update to WANTLIB (patch below, too).
> 
> To test make sure you build xenocara with an empty /usr/X11R6 or that
> you remove all files removed from sets manually.
> 
> PS: This also prepares for the switch to xorgproto and xserver 1.20.
> 
> oks?
> 
> [...]
> 
> and the ports diff
> 
> Index: x11/kde/base3/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/kde/base3/Makefile,v
> retrieving revision 1.158
> diff -u -p -u -r1.158 Makefile
> --- x11/kde/base3/Makefile14 Jan 2018 14:42:18 -  1.158
> +++ x11/kde/base3/Makefile28 Apr 2018 16:45:31 -
> @@ -13,7 +13,7 @@ PKGNAME-en_US = kde3-locale-en_US-${VER
>  PKGNAME-locale = kde3-locale-${VERSION}
>  PKG_ARCH-en_US = *
>  PKG_ARCH-locale =*
> -REVISION-main =  53
> +REVISION-main =  54
>  REVISION-samba = 28
>  REVISION-en_US = 6
>  REVISION-locale =5
> @@ -73,7 +73,7 @@ WANTLIB += art_lgpl_2 fam idn lber-2.4 l
>  
>  WANTLIB-main =  ${WANTLIB} c sndio GL GLU Xau Xcomposite
>  WANTLIB-main += Xcursor Xdamage Xdmcp Xfixes Xft Xi Xinerama Xmu
> -WANTLIB-main += Xrandr Xss Xtst Xxf86misc Xxf86vm X11-xcb drm
> +WANTLIB-main += Xrandr Xss Xtst Xxf86vm X11-xcb drm
>  WANTLIB-main += glapi xcb-dri2 xcb-glx xkbfile
>  WANTLIB-main += ${KDE}/artsflow ${KDE}/artsflow_idl ${KDE}/artskde
>  WANTLIB-main += ${KDE}/kabc ${KDE}/katepartinterfaces ${KDE}/kdefakes
> Index: x11/mate/screensaver/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/mate/screensaver/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 Makefile
> --- x11/mate/screensaver/Makefile 10 Feb 2018 15:07:17 -  1.5
> +++ x11/mate/screensaver/Makefile 28 Apr 2018 16:45:37 -
> @@ -4,11 +4,13 @@ COMMENT=MATE screensaver
>  
>  MATE_PROJECT=mate-screensaver
>  
> +REVISION=0
> +
>  # LGPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB += GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
> -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86misc Xxf86vm
> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86vm
>  WANTLIB += c dconf drm epoxy expat ffi fontconfig freetype gdk_pixbuf-2.0
>  WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
>  WANTLIB += iconv intl lzma m pcre pixman-1 png pthread
> Index: x11/mate/settings-daemon/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/mate/settings-daemon/Makefile,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 Makefile
> --- x11/mate/settings-daemon/Makefile 27 Apr 2018 12:09:19 -  1.8
> +++ x11/mate/settings-daemon/Makefile 28 Apr 2018 16:45:37 -
> @@ -4,12 +4,13 @@ COMMENT=MATE settings daemon
>  
>  MATE_PROJECT=mate-settings-daemon
>  MATE_VERSION=1.20.1
> +REVISION=0
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> -WANTLIB += Xinerama Xrandr Xrender Xxf86misc c dconf epoxy expat
> +WANTLIB += Xinerama Xrandr Xrender c dconf epoxy expat
>  WANTLIB += ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
>  WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl lzma
>  WANTLIB += m pcre pixman-1 png pthread xcb
> Index: x11/xscreensaver/Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/xscreensaver/Makefile,v
> retrieving revision 1.95
> diff -u -p -u -r1.95 Makefile
> --- x11/xscreensaver/Makefile 26 Apr 2018 20:13:04 -  1.95
> +++ x11/xscreensaver/Makefile 28 Apr 2018 16:45:46 -
> @@ -5,6 +5,8 @@ COMMENT=  screen saver and locker for th
>  # XXX x11/kde4/artwork plist may need regen if an update adds a new hack.
>  DISTNAME=xscreensaver-5.39
>  
> +REVISION=0
> +
>  CATEGORIES=  x11
>  
>  HOMEPAGE=http://www.jwz.org/xscreensaver/
> @@ -13,7 +15,7 @@ HOMEPAGE=   http://www.jwz.org/xscreensav
>

[matth...@herrb.eu: remove 2 obsolete libraries from Xenocara]

2018-05-20 Thread Matthieu Herrb 
The xenocara part is now committed. Ok for the ports diff ?

- Forwarded message from Matthieu Herrb  -

Date: Sat, 28 Apr 2018 19:24:28 +0200
From: Matthieu Herrb 
To: t...@openbsd.org
Subject: remove 2 obsolete libraries from Xenocara

Hi,

libXfontcache and libXxf86misc are implementing the client part of X
extensions that have been disabled/removed for a while in the X
server. So builing them or linking to them is useless.

The patch below stops building them in xenocara. A few ports where
using libXxf86misc. Rebuilding them without this library just requires
an update to WANTLIB (patch below, too).

To test make sure you build xenocara with an empty /usr/X11R6 or that
you remove all files removed from sets manually.

PS: This also prepares for the switch to xorgproto and xserver 1.20.

oks?

[...]

and the ports diff

Index: x11/kde/base3/Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/kde/base3/Makefile,v
retrieving revision 1.158
diff -u -p -u -r1.158 Makefile
--- x11/kde/base3/Makefile  14 Jan 2018 14:42:18 -  1.158
+++ x11/kde/base3/Makefile  28 Apr 2018 16:45:31 -
@@ -13,7 +13,7 @@ PKGNAME-en_US =   kde3-locale-en_US-${VER
 PKGNAME-locale =   kde3-locale-${VERSION}
 PKG_ARCH-en_US =   *
 PKG_ARCH-locale =  *
-REVISION-main =53
+REVISION-main =54
 REVISION-samba =   28
 REVISION-en_US =   6
 REVISION-locale =  5
@@ -73,7 +73,7 @@ WANTLIB += art_lgpl_2 fam idn lber-2.4 l
 
 WANTLIB-main =  ${WANTLIB} c sndio GL GLU Xau Xcomposite
 WANTLIB-main += Xcursor Xdamage Xdmcp Xfixes Xft Xi Xinerama Xmu
-WANTLIB-main += Xrandr Xss Xtst Xxf86misc Xxf86vm X11-xcb drm
+WANTLIB-main += Xrandr Xss Xtst Xxf86vm X11-xcb drm
 WANTLIB-main += glapi xcb-dri2 xcb-glx xkbfile
 WANTLIB-main += ${KDE}/artsflow ${KDE}/artsflow_idl ${KDE}/artskde
 WANTLIB-main += ${KDE}/kabc ${KDE}/katepartinterfaces ${KDE}/kdefakes
Index: x11/mate/screensaver/Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/mate/screensaver/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- x11/mate/screensaver/Makefile   10 Feb 2018 15:07:17 -  1.5
+++ x11/mate/screensaver/Makefile   28 Apr 2018 16:45:37 -
@@ -4,11 +4,13 @@ COMMENT=  MATE screensaver
 
 MATE_PROJECT=  mate-screensaver
 
+REVISION=  0
+
 # LGPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += GL ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86misc Xxf86vm
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xss Xtst Xxf86vm
 WANTLIB += c dconf drm epoxy expat ffi fontconfig freetype gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += iconv intl lzma m pcre pixman-1 png pthread
Index: x11/mate/settings-daemon/Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/mate/settings-daemon/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- x11/mate/settings-daemon/Makefile   27 Apr 2018 12:09:19 -  1.8
+++ x11/mate/settings-daemon/Makefile   28 Apr 2018 16:45:37 -
@@ -4,12 +4,13 @@ COMMENT=  MATE settings daemon
 
 MATE_PROJECT=  mate-settings-daemon
 MATE_VERSION=  1.20.1
+REVISION=  0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender Xxf86misc c dconf epoxy expat
+WANTLIB += Xinerama Xrandr Xrender c dconf epoxy expat
 WANTLIB += ffi fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 iconv intl lzma
 WANTLIB += m pcre pixman-1 png pthread xcb
Index: x11/xscreensaver/Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.95
diff -u -p -u -r1.95 Makefile
--- x11/xscreensaver/Makefile   26 Apr 2018 20:13:04 -  1.95
+++ x11/xscreensaver/Makefile   28 Apr 2018 16:45:46 -
@@ -5,6 +5,8 @@ COMMENT=screen saver and locker for th
 # XXX x11/kde4/artwork plist may need regen if an update adds a new hack.
 DISTNAME=  xscreensaver-5.39
 
+REVISION=  0
+
 CATEGORIES=x11
 
 HOMEPAGE=  http://www.jwz.org/xscreensaver/
@@ -13,7 +15,7 @@ HOMEPAGE= http://www.jwz.org/xscreensav
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86misc
+WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt
 WANTLIB += Xxf86vm atk-1.0 c cairo fontconfig freetype gdk-x11-2.0
 WANTLIB += gdk_pixbuf-2.0 gdk_pixbuf_xlib-2.0 gio-2.0 glade-2.0
 WANTLIB += gle glib-2.0 gmodule-2.0