rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

plasma-workspace: update to 5.11.5

This commit is contained in:
Mark Davies 2018-01-22 17:22:56 +13:00
parent 39b9f89178
commit 0becf38ac2
9 changed files with 826 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plasma-workspace/Makefile
View File

@ -19,13 +19,15 @@ DEPENDS+= plasma-integration>=${PLASMAVER}:../../wip/plasma-integration
USE_TOOLS+= msgmerge pkg-config
BUILDLINK_TRANSFORM+= rm:-fvisibility=hidden
# generation of ksmserver.moc fails when ${PREFIX}/include in the moc include path
SUBST_CLASSES+= fix-moc
SUBST_STAGE.fix-moc= post-configure
SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
SUBST_FILES.fix-moc= _KDE_build/ksmserver/CMakeFiles/kdeinit_ksmserver_automoc.dir/AutogenInfo.cmake
SUBST_FILES.fix-moc+= _KDE_build/runners/windows/CMakeFiles/krunner_windows_automoc.dir/AutogenInfo.cmake
SUBST_FILES.fix-moc+= _KDE_build/applets/notifications/lib/CMakeFiles/plasma_applet_notifications_automoc.dir/AutogenInfo.cmake
SUBST_FILES.fix-moc= _KDE_build/ksmserver/CMakeFiles/kdeinit_ksmserver_autogen.dir/AutogenInfo.cmake
SUBST_FILES.fix-moc+= _KDE_build/runners/windows/CMakeFiles/krunner_windows_autogen.dir/AutogenInfo.cmake
SUBST_FILES.fix-moc+= _KDE_build/applets/notifications/lib/CMakeFiles/plasma_applet_notifications_autogen.dir/AutogenInfo.cmake
SUBST_SED.fix-moc= -e 's,;${PREFIX}/include;,;,g'
SUBST_CLASSES+= qtpath
@ -36,12 +38,14 @@ SUBST_STAGE.qtpath= post-patch
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/krunner.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/krunner.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/plasmashell.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/plasmashell.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/org.kde.klipper.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/org.kde.klipper.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/org.kde.plasmashell.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/org.kde.plasmashell.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/klipper.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/klipper.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/xembedsniproxy.desktop \
${PKG_SYSCONFDIR}/xdg/autostart/xembedsniproxy.desktop
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/kuiserver.categories \
${PKG_SYSCONFDIR}/xdg/kuiserver.categories
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/plasmoids.knsrc \
${PKG_SYSCONFDIR}/xdg/plasmoids.knsrc
CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/wallpaper.knsrc \

1456
plasma-workspace/PLIST
View File

File diff suppressed because it is too large Load Diff

17
plasma-workspace/distinfo
View File

@ -1,14 +1,15 @@
$NetBSD$
SHA1 (plasma-workspace-5.6.3.tar.xz) = 8ff9e86763da375efea274be347118a61a96346b
RMD160 (plasma-workspace-5.6.3.tar.xz) = a4c7dea5c0d4a6d17f67418932ad14f0e6456f04
SHA512 (plasma-workspace-5.6.3.tar.xz) = 745a19f449fff6a83f6e5ca3c923f38fccc6374a31b983e47b6774808e674b12ea2c4ac18730f989a07f953a5819791d8df1a66550685ee7654e975fc1724a5f
Size (plasma-workspace-5.6.3.tar.xz) = 7030108 bytes
SHA1 (plasma-workspace-5.11.5.tar.xz) = fd24972b5ea77ef901a7f68dc47b36f3679cf2dd
RMD160 (plasma-workspace-5.11.5.tar.xz) = 65ae370f6ccf30a42a4ce606b3dec2a7ae875473
SHA512 (plasma-workspace-5.11.5.tar.xz) = 6f15e529665a5fbe24ee0420d1c8fe96ff97dbd2788ae120cd1834889b307b5979ca2aedd4f97d3cadcc7ed5cdb06c0e5f9c704ec732468db4b8ecf89270826f
Size (plasma-workspace-5.11.5.tar.xz) = 6494360 bytes
SHA1 (patch-components_shellprivate_CMakeLists.txt) = b8672d3415e8054087c77e3262bde46e41c88be2
SHA1 (patch-klipper_CMakeLists.txt) = 2f5f755a8056da155137da9dee6a9ffe531e2d79
SHA1 (patch-klipper_CMakeLists.txt) = fa95e84f44901d35b3e672e2270df89038cd4551
SHA1 (patch-krunner_CMakeLists.txt) = eb11603f00eefda5a67c8bcce85726099216f270
SHA1 (patch-libtaskmanager_CMakeLists.txt) = f45c7eeb97b8950d2588099156a45590133387f4
SHA1 (patch-shell_CMakeLists.txt) = 3054075aa6661716fff22bf80e0db05bfb425aa1
SHA1 (patch-startkde_startkde.cmake) = 684129b87d920fd513c62c45527eb9dd1774c95b
SHA1 (patch-kuiserver_CMakeLists.txt) = 27ce4883f0cee6549c74eff65d834df78fd5d79b
SHA1 (patch-libtaskmanager_CMakeLists.txt) = 8ebb715c22c1be95a161281b9eececfbdfd936da
SHA1 (patch-shell_CMakeLists.txt) = 0dbf40b1213d6714e420064ddb5b8454d27f141c
SHA1 (patch-startkde_startkde.cmake) = 49e9f3a5a3d0eb76865c1120d8aa3fee3a886030
SHA1 (patch-wallpapers_image_CMakeLists.txt) = a62a155eed7cf69cada8d1e697a29b14e54ca683
SHA1 (patch-xembed-sni-proxy_CMakeLists.txt) = 8158c958866ccd90858e76d40333e8719dda81a0

7
plasma-workspace/hacks.mk Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: hacks.mk,v 1.1 2018/01/17 20:00:21 markd Exp $
# linking -lQt5Widgets on NetBSD with gcc produces
# ld: BFD (NetBSD Binutils nb1) 2.27 assertion fail
# /usr/src/external/gpl3/binutils/lib/libbfd/../../dist/bfd/elflink.c:2694
# unless -lexecinfo preceeds -lQt5Widgets
BUILDLINK_TRANSFORM.NetBSD+=l:Qt5Widgets:execinfo:Qt5Widgets

8
plasma-workspace/patches/patch-klipper_CMakeLists.txt
View File

@ -2,14 +2,14 @@ $NetBSD$
Install via examples dir
--- klipper/CMakeLists.txt.orig 2016-04-19 11:20:13.000000000 +0000
--- klipper/CMakeLists.txt.orig 2018-01-02 13:12:27.432500443 +0000
+++ klipper/CMakeLists.txt
@@ -65,7 +65,7 @@ install(TARGETS kdeinit_klipper ${KDE_IN
@@ -66,7 +66,7 @@ install(TARGETS kdeinit_klipper ${KDE_IN
install(TARGETS klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(PROGRAMS org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
-install(PROGRAMS klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(PROGRAMS klipper.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
# Plasma Data Engine
set(plasma_engine_clipboard_SRCS ${libklipper_common_SRCS} clipboardengine.cpp clipboardservice.cpp clipboardjob.cpp)

12
plasma-workspace/patches/patch-kuiserver_CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
$NetBSD$
Install via examples dir
--- kuiserver/CMakeLists.txt.orig 2018-01-02 13:12:27.460500629 +0000
+++ kuiserver/CMakeLists.txt
@@ -78,4 +78,4 @@ install(TARGETS kuiserver5 ${KDE_INSTALL
install( FILES kuiserver.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
# contains list of debug categories, for kdebugsettings
-install(FILES kuiserver.categories DESTINATION ${KDE_INSTALL_CONFDIR})
+install(FILES kuiserver.categories DESTINATION ${KDE_INSTALL_XDG_EX_DIR})

7
plasma-workspace/patches/patch-libtaskmanager_CMakeLists.txt
View File

@ -2,14 +2,11 @@ $NetBSD$
Install via examples dir
--- libtaskmanager/CMakeLists.txt.orig 2016-04-19 11:20:13.000000000 +0000
--- libtaskmanager/CMakeLists.txt.orig 2018-01-02 13:12:27.468500683 +0000
+++ libtaskmanager/CMakeLists.txt
@@ -110,7 +110,7 @@ install(EXPORT libtaskmanagerLibraryTarg
@@ -110,4 +110,4 @@ install(EXPORT libtaskmanagerLibraryTarg
FILE LibTaskManagerLibraryTargets.cmake )
install(FILES taskmanagerrulesrc
- DESTINATION ${KDE_INSTALL_CONFDIR})
+ DESTINATION ${KDE_INSTALL_XDG_EX_DIR})
#set(tasksmodel_SRCS
# modeltest/dynamictreemodel.cpp

10
plasma-workspace/patches/patch-shell_CMakeLists.txt
View File

@ -2,14 +2,14 @@ $NetBSD$
Install via examples dir
--- shell/CMakeLists.txt.orig 2016-04-19 11:20:13.000000000 +0000
--- shell/CMakeLists.txt.orig 2018-01-02 13:12:27.504500922 +0000
+++ shell/CMakeLists.txt
@@ -96,7 +96,7 @@ if(HAVE_X11)
endif()
@@ -104,7 +104,7 @@ endif()
install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTEXDIR})
install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
install(FILES

14
plasma-workspace/patches/patch-startkde_startkde.cmake
View File

@ -2,11 +2,11 @@ $NetBSD$
Ensure QT bindir is on path
--- startkde/startkde.cmake.orig 2016-04-19 11:20:13.000000000 +0000
--- startkde/startkde.cmake.orig 2018-01-02 13:12:27.516501002 +0000
+++ startkde/startkde.cmake
@@ -17,6 +17,12 @@ trap 'echo GOT SIGHUP' HUP
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE
@@ -7,6 +7,12 @@
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
+qtbindir=@QTDIR@/bin
+case $PATH in
@ -14,6 +14,6 @@ Ensure QT bindir is on path
+ *) PATH=$qtbindir:$PATH; export PATH;;
+esac
+
# in case we have been started with full pathname spec without being in PATH
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
if [ -n "$bindir" ]; then
# Check if a Plasma session already is running and whether it's possible to connect to X
kcheckrunning
kcheckrunning_result=$?