My first suggestion to deactivate KDE4. - Unhook all kde4 module consumers - Unhook x11/kde4 - Register removals in quirks (Not up-to-date diff part. Just for showing and discussing). - Remove multimedia/phonon kde4 bits - Set phonon FLAVOR = qt5 for now
This want through a full amd64 bulk build. Following plan: - Remove kde4 in port-modules(5) - Import final KDE5 ports https://marc.info/?l=openbsd-ports&m=159069772407105&w=2 - Start working/testing to remove multimedia/phonon module OPEN points: - How to handle graphics/prison and devel/kf5/prison name conflict https://marc.info/?l=openbsd-ports&m=159176617003075&w=2 - How to remove meta/qt4? Just add in quirks? Objections, OKs? Rafael Index: cad/Makefile =================================================================== RCS file: /cvs/ports/cad/Makefile,v retrieving revision 1.39 diff -u -p -r1.39 Makefile --- cad/Makefile 31 Mar 2020 15:04:47 -0000 1.39 +++ cad/Makefile 9 Jun 2020 06:58:11 -0000 @@ -10,7 +10,7 @@ SUBDIR += gtkwave SUBDIR += kicad SUBDIR += kicad-share - SUBDIR += klogic + #SUBDIR += klogic SUBDIR += librecad SUBDIR += magic SUBDIR += necpp Index: databases/Makefile =================================================================== RCS file: /cvs/ports/databases/Makefile,v retrieving revision 1.397 diff -u -p -r1.397 Makefile --- databases/Makefile 1 Jun 2020 20:54:46 -0000 1.397 +++ databases/Makefile 9 Jun 2020 06:58:13 -0000 @@ -228,7 +228,7 @@ SUBDIR += ruby-tiny_tds,ruby27 SUBDIR += sharedance SUBDIR += skytools - SUBDIR += soprano + #SUBDIR += soprano SUBDIR += sqlbox SUBDIR += sqlite SUBDIR += sqlite3 Index: devel/Makefile =================================================================== RCS file: /cvs/ports/devel/Makefile,v retrieving revision 1.1984 diff -u -p -r1.1984 Makefile --- devel/Makefile 8 Jun 2020 11:19:22 -0000 1.1984 +++ devel/Makefile 9 Jun 2020 06:58:14 -0000 @@ -37,7 +37,7 @@ SUBDIR += autoconf-archive SUBDIR += autogen SUBDIR += automake - SUBDIR += automoc + #SUBDIR += automoc SUBDIR += avr SUBDIR += avr32 SUBDIR += avrdude Index: devel/quirks/Makefile =================================================================== RCS file: /cvs/ports/devel/quirks/Makefile,v retrieving revision 1.955 diff -u -p -r1.955 Makefile --- devel/quirks/Makefile 8 Jun 2020 11:07:41 -0000 1.955 +++ devel/quirks/Makefile 9 Jun 2020 06:58:23 -0000 @@ -5,7 +5,7 @@ CATEGORIES = devel databases DISTFILES = # API.rev -PKGNAME = quirks-3.346 +PKGNAME = quirks-3.347 PKG_ARCH = * MAINTAINER = Marc Espie <es...@openbsd.org> Index: devel/quirks/files/Quirks.pm =================================================================== RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v retrieving revision 1.973 diff -u -p -r1.973 Quirks.pm --- devel/quirks/files/Quirks.pm 8 Jun 2020 11:07:41 -0000 1.973 +++ devel/quirks/files/Quirks.pm 9 Jun 2020 06:58:23 -0000 @@ -1586,6 +1586,26 @@ my $obsolete_reason = { 'hs-MissingH' => 5, 'hs-HaXml' => 5, 'py-gstreamer' => 5, + 'klogic' => 3, + 'soprano' => 3, + 'automoc' => 3, + 'prison' => 3, + 'qimageblitz' => 3, + 'cagibi' => 3, + 'libkvkontakte' => 3, + 'libalkimia' => 3, + 'libkfbapi' => 3, + 'libkgapi' => 3, + 'akonadi' => 3, + 'attica' => 3, + 'qoauth' => 3, + 'kwebkitpart' => 3, + 'grantlee' => 3, + 'libkscreen' => 3, + 'polkit-qt' => 3, + 'phonon-gstreamer' => 3, + 'phonon-gstreamer-icons' => 3, + 'phonon-vlc' => 3, }; # reasons for obsolete packages Index: graphics/Makefile =================================================================== RCS file: /cvs/ports/graphics/Makefile,v retrieving revision 1.507 diff -u -p -r1.507 Makefile --- graphics/Makefile 19 May 2020 15:34:55 -0000 1.507 +++ graphics/Makefile 9 Jun 2020 06:58:29 -0000 @@ -234,7 +234,7 @@ SUBDIR += potrace SUBDIR += povray SUBDIR += pqiv - SUBDIR += prison + #SUBDIR += prison SUBDIR += pstoedit SUBDIR += py-Pillow SUBDIR += py-Pillow,python3 @@ -258,7 +258,7 @@ SUBDIR += py-sane,python3 SUBDIR += py-seaborn SUBDIR += pycha - SUBDIR += qimageblitz + #SUBDIR += qimageblitz SUBDIR += qiv SUBDIR += quesoglc SUBDIR += quirc Index: meta/Makefile =================================================================== RCS file: /cvs/ports/meta/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- meta/Makefile 15 Apr 2020 15:57:27 -0000 1.16 +++ meta/Makefile 9 Jun 2020 06:58:34 -0000 @@ -6,7 +6,7 @@ SUBDIR += geda SUBDIR += gnome SUBDIR += gnustep - SUBDIR += kde4 + #SUBDIR += kde4 SUBDIR += lxqt SUBDIR += mate SUBDIR += msp430 Index: multimedia/phonon/phonon.port.mk =================================================================== RCS file: /cvs/ports/multimedia/phonon/phonon.port.mk,v retrieving revision 1.9 diff -u -p -r1.9 phonon.port.mk --- multimedia/phonon/phonon.port.mk 19 Oct 2018 20:53:27 -0000 1.9 +++ multimedia/phonon/phonon.port.mk 9 Jun 2020 06:58:36 -0000 @@ -2,9 +2,6 @@ .if ${MODULES:Mx11/qt5} || ${MODULES:Mdevel/kf5} MODPHONON_WANTLIB = phonon4qt5 MODPHONON_LIB_DEPENDS = phonon-qt5->=4.10.1:multimedia/phonon-qt5 -.else -MODPHONON_WANTLIB = ${MODKDE4_LIB_DIR}/phonon_s -MODPHONON_LIB_DEPENDS = phonon->=4.10.1:multimedia/phonon .endif # If enabled (default), make sure at least one Phonon backend is @@ -13,8 +10,6 @@ MODPHONON_PLUGIN_DEPS ?= Yes .if ${MODPHONON_PLUGIN_DEPS:L} == "yes" . if ${MODULES:Mx11/qt5} || ${MODULES:Mdevel/kf5} MODPHONON_RUN_DEPENDS = phonon-qt5-gstreamer-*:multimedia/phonon-backend/gstreamer,qt5 -. else -MODPHONON_RUN_DEPENDS = phonon-vlc-*|phonon-gstreamer-*:multimedia/phonon-backend/vlc . endif .endif Index: multimedia/phonon-backend/gstreamer/Makefile =================================================================== RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- multimedia/phonon-backend/gstreamer/Makefile 1 Sep 2019 18:56:02 -0000 1.25 +++ multimedia/phonon-backend/gstreamer/Makefile 9 Jun 2020 06:58:36 -0000 @@ -36,7 +36,7 @@ WANTLIB-main += gstaudio-1.0 gstbase-1.0 WANTLIB-main += gstreamer-1.0 gstvideo-1.0 gstapp-1.0 FLAVORS = qt5 -FLAVOR ?= +FLAVOR = qt5 .if ${FLAVOR:Mqt5} LIB_DEPENDS-main += x11/qt5/qtx11extras WANTLIB-main += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets Qt5X11Extras Index: multimedia/phonon-backend/vlc/Makefile =================================================================== RCS file: /cvs/ports/multimedia/phonon-backend/vlc/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- multimedia/phonon-backend/vlc/Makefile 1 Sep 2019 18:56:40 -0000 1.9 +++ multimedia/phonon-backend/vlc/Makefile 9 Jun 2020 06:58:36 -0000 @@ -13,7 +13,7 @@ BUILD_DEPENDS = devel/gettext,-tools LIB_DEPENDS = x11/vlc>=2 FLAVORS = qt5 -FLAVOR ?= +FLAVOR = qt5 .if ${FLAVOR:Mqt5} WANTLIB += Qt5Core Qt5Gui Qt5Widgets Index: net/Makefile =================================================================== RCS file: /cvs/ports/net/Makefile,v retrieving revision 1.1208 diff -u -p -r1.1208 Makefile --- net/Makefile 7 Jun 2020 11:23:03 -0000 1.1208 +++ net/Makefile 9 Jun 2020 06:58:36 -0000 @@ -41,7 +41,7 @@ SUBDIR += btpd SUBDIR += bwm-ng SUBDIR += cadaver - SUBDIR += cagibi + #SUBDIR += cagibi SUBDIR += castget SUBDIR += cftp SUBDIR += cgo @@ -200,7 +200,7 @@ SUBDIR += libgadu SUBDIR += libircclient SUBDIR += libktorrent - SUBDIR += libkvkontakte + #SUBDIR += libkvkontakte SUBDIR += libmaxminddb SUBDIR += libmesode SUBDIR += libmygpo-qt Index: productivity/Makefile =================================================================== RCS file: /cvs/ports/productivity/Makefile,v retrieving revision 1.89 diff -u -p -r1.89 Makefile --- productivity/Makefile 25 Feb 2020 05:39:18 -0000 1.89 +++ productivity/Makefile 9 Jun 2020 06:58:41 -0000 @@ -1,9 +1,9 @@ # $OpenBSD: Makefile,v 1.89 2020/02/25 05:39:18 rsadowski Exp $ SUBDIR = - SUBDIR += akonadi + #SUBDIR += akonadi SUBDIR += aqbanking - SUBDIR += attica + #SUBDIR += attica SUBDIR += baikal SUBDIR += bruce SUBDIR += calcurse @@ -23,9 +23,9 @@ SUBDIR += khard SUBDIR += kmymoney SUBDIR += ledger - SUBDIR += libalkimia - SUBDIR += libkfbapi - SUBDIR += libkgapi + #SUBDIR += libalkimia + #SUBDIR += libkfbapi + #SUBDIR += libkgapi SUBDIR += librcps SUBDIR += lifeograph SUBDIR += mcds Index: productivity/kmymoney/Makefile =================================================================== RCS file: /cvs/ports/productivity/kmymoney/Makefile,v retrieving revision 1.32 diff -u -p -r1.32 Makefile --- productivity/kmymoney/Makefile 17 Jul 2019 14:46:34 -0000 1.32 +++ productivity/kmymoney/Makefile 9 Jun 2020 06:58:41 -0000 @@ -1,4 +1,5 @@ # $OpenBSD: Makefile,v 1.32 2019/07/17 14:46:34 danj Exp $ +BROKEN = KDE4 deleted, update is comming COMMENT = accounting for KDE 4 CATEGORIES = productivity x11 HOMEPAGE = https://kmymoney.org/ Index: security/Makefile =================================================================== RCS file: /cvs/ports/security/Makefile,v retrieving revision 1.580 diff -u -p -r1.580 Makefile --- security/Makefile 8 Jun 2020 10:58:33 -0000 1.580 +++ security/Makefile 9 Jun 2020 06:58:43 -0000 @@ -345,7 +345,7 @@ SUBDIR += py-yaswfp SUBDIR += qca SUBDIR += qca-qt5 - SUBDIR += qoauth + #SUBDIR += qoauth SUBDIR += qtkeychain SUBDIR += radiusniff SUBDIR += rarcrack Index: www/Makefile =================================================================== RCS file: /cvs/ports/www/Makefile,v retrieving revision 1.964 diff -u -p -r1.964 Makefile --- www/Makefile 7 Jun 2020 23:29:33 -0000 1.964 +++ www/Makefile 9 Jun 2020 06:58:51 -0000 @@ -78,7 +78,7 @@ SUBDIR += kore,curl SUBDIR += kore,pgsql SUBDIR += kore,python - SUBDIR += kwebkitpart + #SUBDIR += kwebkitpart SUBDIR += larbin SUBDIR += libcroco SUBDIR += libmicrohttpd Index: x11/Makefile =================================================================== RCS file: /cvs/ports/x11/Makefile,v retrieving revision 1.658 diff -u -p -r1.658 Makefile --- x11/Makefile 28 May 2020 08:12:45 -0000 1.658 +++ x11/Makefile 9 Jun 2020 06:58:55 -0000 @@ -88,7 +88,7 @@ SUBDIR += gob2 SUBDIR += goggles SUBDIR += golem - SUBDIR += grantlee + #SUBDIR += grantlee SUBDIR += grantlee-qt5 SUBDIR += greybird SUBDIR += gtk+2 @@ -143,7 +143,7 @@ SUBDIR += kde SUBDIR += kde-applications SUBDIR += kde-shared-data - SUBDIR += kde4 + #SUBDIR += kde4 SUBDIR += keybinder SUBDIR += keybinder3 SUBDIR += keynav @@ -160,7 +160,7 @@ SUBDIR += libfm SUBDIR += libgdiplus SUBDIR += libhandy - SUBDIR += libkscreen + #SUBDIR += libkscreen SUBDIR += libqaccessibilityclient SUBDIR += libxdg-basedir SUBDIR += lsw @@ -224,7 +224,7 @@ SUBDIR += pidgin-libnotify SUBDIR += piewm SUBDIR += podbrowser - SUBDIR += polkit-qt + #SUBDIR += polkit-qt SUBDIR += polkit-qt5 SUBDIR += polybar SUBDIR += pwm
