cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace KDE4 konsole with KDE5 and yakuake-kde4 with yakuake (KDE5)

Browse Source 
- zap konsole from meta/kde4
- unhook kde4/konsole, hook x11/kde-applications/konsole
- unhook yakuake-kde4, hook yakuake
- replace TEST_DEPENDS in kde4/libs (Tests looks good with KDE5 konsole)
This commit is contained in:
rsadowski 2018-06-08 05:22:52 +00:00
parent 3ba7e90db1
commit 1204a631ca
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/kde4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.30 2018/05/02 20:12:40 rsadowski Exp $
# $OpenBSD: Makefile,v 1.31 2018/06/08 05:22:52 rsadowski Exp $
PKGNAME = kde4-${MODKDE4_VERSION}
@ -26,10 +26,10 @@ PKGSPEC-network = kdenetwork-${MODKDE4_SPEC}
PKGSPEC-sdk = kdesdk-${MODKDE4_SPEC}
PKGSPEC-toys = kdetoys-${MODKDE4_SPEC}
REVISION-minimal = 6
REVISION-minimal = 7
REVISION-games = 0
REVISION-extras = 0
REVISION-main = 2
REVISION-main = 3
MAINTAINER = KDE porting team <openbsd-kde@googlegroups.com>
@ -215,7 +215,6 @@ RUN_DEPENDS-minimal = \
${KDE4-accessibility} \
${MODKDE4_DEP_DIR}/baseapps \
${MODKDE4_DEP_DIR}/kgpg \
${MODKDE4_DEP_DIR}/konsole \
${MODKDE4_DEP_DIR}/kwalletmanager \
${MODKDE4_DEP_DIR}/workspace
@ -234,7 +233,6 @@ RUN_DEPENDS-main = \
${MODKDE4_DEP_DIR}/artwork \
${MODKDE4_DEP_DIR}/base-artwork \
${MODKDE4_DEP_DIR}/kgpg \
${MODKDE4_DEP_DIR}/konsole \
${MODKDE4_DEP_DIR}/kwalletmanager \
${MODKDE4_DEP_DIR}/pim \
${MODKDE4_DEP_DIR}/wallpapers \

4
x11/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.616 2018/06/01 17:57:43 solene Exp $
# $OpenBSD: Makefile,v 1.617 2018/06/08 05:22:52 rsadowski Exp $
SUBDIR =
SUBDIR += 2bwm
@ -413,7 +413,7 @@
SUBDIR += xwrits
SUBDIR += xzoom
SUBDIR += yad
SUBDIR += yakuake-kde4
SUBDIR += yakuake
SUBDIR += yeahconsole
SUBDIR += yeahlaunch

4
x11/kde-applications/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2018/06/06 10:30:16 rsadowski Exp $
# $OpenBSD: Makefile,v 1.10 2018/06/08 05:22:52 rsadowski Exp $
SUBDIR =
#SUBDIR += kde-l10n
@ -114,7 +114,7 @@
#SUBDIR += kolourpaint
#SUBDIR += kompare
#SUBDIR += konquest
#SUBDIR += konsole
SUBDIR += konsole
#SUBDIR += kontactinterface
#SUBDIR += kopete
#SUBDIR += kpat

4
x11/kde4/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2018/06/06 10:30:16 rsadowski Exp $
# $OpenBSD: Makefile,v 1.48 2018/06/08 05:22:52 rsadowski Exp $
# Build dependency tree of main building blocks:
# OUTSIDE: akonadi, attica, automoc, cagibi, phonon, qimageblitz,
@ -91,7 +91,7 @@ SUBDIR += pim-runtime
SUBDIR += workspace
SUBDIR += baseapps
#SUBDIR += kate x11/kde-applications
SUBDIR += konsole
#SUBDIR += konsole x11/kde-applications
# bindings and wrappers
SUBDIR += kross-interpreters

4
x11/kde4/libs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.84 2018/05/01 06:42:41 jasper Exp $
# $OpenBSD: Makefile,v 1.85 2018/06/08 05:22:52 rsadowski Exp $
COMMENT-main = KDE core libraries
COMMENT-en_US = KDE en_US locale data
@ -166,7 +166,7 @@ MODKDE4_SYSCONF_FILES = dbus-1 share/examples/kde \
TEST_IS_INTERACTIVE = X11
TEST_DEPENDS = ${BUILD_PKGPATH} \
x11/kde-applications/kate \
${MODKDE4_DEP_DIR}/konsole>=${MODKDE4_DEP_VERSION}
x11/kde-applications/konsole
post-extract:
.for M in ${NEW_CMAKE_MODULES} ${REWR_CMAKE_MODULES}