From ed2a5d1033abe43b59984354f13ba6e4e6a24c22 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 30 Mar 2018 23:23:36 +0000 Subject: [PATCH] kde-workspace: remove --- common/shlibs | 7 -- srcpkgs/kde-python | 1 - srcpkgs/kde-workspace-devel | 1 - srcpkgs/kde-workspace/REMOVE | 7 -- srcpkgs/kde-workspace/files/kde-np.pam | 9 -- srcpkgs/kde-workspace/files/kde.pam | 5 -- srcpkgs/kde-workspace/files/kdm/run | 2 - srcpkgs/kde-workspace/files/kscreensaver.pam | 1 - .../kde-workspace/patches/etc-scripts.patch | 11 --- .../kde-workspace/patches/fix-inline.patch | 11 --- .../kde-workspace/patches/kdm-xinitrd.patch | 18 ---- .../kde-workspace/patches/khotkeys-qt4.patch | 22 ----- .../patches/musl-__uint16_t.patch | 14 ---- srcpkgs/kde-workspace/patches/musl-uint.patch | 15 ---- .../patches/patch-kdm_kcm_main.cpp.diff | 20 ----- .../kde-workspace/patches/q_byte_order.patch | 27 ------ .../patches/terminate-server.patch | 11 --- srcpkgs/kde-workspace/template | 83 ------------------- 18 files changed, 265 deletions(-) delete mode 120000 srcpkgs/kde-python delete mode 120000 srcpkgs/kde-workspace-devel delete mode 100644 srcpkgs/kde-workspace/REMOVE delete mode 100644 srcpkgs/kde-workspace/files/kde-np.pam delete mode 100644 srcpkgs/kde-workspace/files/kde.pam delete mode 100755 srcpkgs/kde-workspace/files/kdm/run delete mode 100644 srcpkgs/kde-workspace/files/kscreensaver.pam delete mode 100644 srcpkgs/kde-workspace/patches/etc-scripts.patch delete mode 100644 srcpkgs/kde-workspace/patches/fix-inline.patch delete mode 100644 srcpkgs/kde-workspace/patches/kdm-xinitrd.patch delete mode 100644 srcpkgs/kde-workspace/patches/khotkeys-qt4.patch delete mode 100644 srcpkgs/kde-workspace/patches/musl-__uint16_t.patch delete mode 100644 srcpkgs/kde-workspace/patches/musl-uint.patch delete mode 100644 srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp.diff delete mode 100644 srcpkgs/kde-workspace/patches/q_byte_order.patch delete mode 100644 srcpkgs/kde-workspace/patches/terminate-server.patch delete mode 100644 srcpkgs/kde-workspace/template diff --git a/common/shlibs b/common/shlibs index fbd059b6d19..410fc6ef8cb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1320,12 +1320,6 @@ libkactivities-models.so.1 kactivities-4.10.4_1 libqimageblitz.so.4 qimageblitz-0.0.6_1 libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1 libkexiv2.so.11 libkexiv2-4.10.4_1 -libkscreensaver.so.5 kde-workspace-4.10.4_1 -libkdecorations.so.4 kde-workspace-4.10.4_1 -libplasmaclock.so.4 kde-workspace-4.10.4_1 -libtaskmanager.so.4 kde-workspace-4.10.4_1 -libkworkspace.so.4 kde-workspace-4.10.4_1 -libprocessui.so.4 kde-workspace-4.10.4_1 libkgapi2.so.2 libkgapi-2.0.1_1 libqoauth.so.1 qoauth-1.0.1_1 libqoauth.so.2 qoauth-qt5-2.0.0_1 @@ -2713,7 +2707,6 @@ libz80ex.so.1 z80ex-1.1.21_1 libz80ex_dasm.so.1 z80ex-1.1.21_1 libqmmp.so.1 qmmp-1.1.4_1 libqmmpui.so.1 qmmp-1.1.4_1 -libksignalplotter.so.4 kde-workspace-4.11.22_1 libalkimia5.so.7 libalkimia-7.0_1 libpayeeidentifier_iban_bic_widgets.so.5 kmymoney-5.0.0_1 libkmm_plugin.so.5 kmymoney-5.0.0_1 diff --git a/srcpkgs/kde-python b/srcpkgs/kde-python deleted file mode 120000 index 99611c36813..00000000000 --- a/srcpkgs/kde-python +++ /dev/null @@ -1 +0,0 @@ -kde-workspace \ No newline at end of file diff --git a/srcpkgs/kde-workspace-devel b/srcpkgs/kde-workspace-devel deleted file mode 120000 index 99611c36813..00000000000 --- a/srcpkgs/kde-workspace-devel +++ /dev/null @@ -1 +0,0 @@ -kde-workspace \ No newline at end of file diff --git a/srcpkgs/kde-workspace/REMOVE b/srcpkgs/kde-workspace/REMOVE deleted file mode 100644 index 163827dd09d..00000000000 --- a/srcpkgs/kde-workspace/REMOVE +++ /dev/null @@ -1,7 +0,0 @@ -case "$ACTION" in -pre) - if [ -d usr/share/apps/kdm/faces ]; then - rm -rf usr/share/apps/kdm/faces - fi - ;; -esac diff --git a/srcpkgs/kde-workspace/files/kde-np.pam b/srcpkgs/kde-workspace/files/kde-np.pam deleted file mode 100644 index b709211a668..00000000000 --- a/srcpkgs/kde-workspace/files/kde-np.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_tally.so onerr=succeed file=/var/log/faillog -auth required pam_shells.so -auth requisite pam_nologin.so -auth required pam_env.so -auth optional pam_permit.so -account include system-login -password include system-login -session include system-login diff --git a/srcpkgs/kde-workspace/files/kde.pam b/srcpkgs/kde-workspace/files/kde.pam deleted file mode 100644 index cfdbef0de0b..00000000000 --- a/srcpkgs/kde-workspace/files/kde.pam +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth include system-login -account include system-login -password include system-login -session include system-login diff --git a/srcpkgs/kde-workspace/files/kdm/run b/srcpkgs/kde-workspace/files/kdm/run deleted file mode 100755 index bc7f3db9792..00000000000 --- a/srcpkgs/kde-workspace/files/kdm/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec kdm -nodaemon diff --git a/srcpkgs/kde-workspace/files/kscreensaver.pam b/srcpkgs/kde-workspace/files/kscreensaver.pam deleted file mode 100644 index 90e170b93b7..00000000000 --- a/srcpkgs/kde-workspace/files/kscreensaver.pam +++ /dev/null @@ -1 +0,0 @@ -auth include system-login diff --git a/srcpkgs/kde-workspace/patches/etc-scripts.patch b/srcpkgs/kde-workspace/patches/etc-scripts.patch deleted file mode 100644 index 903a90a5303..00000000000 --- a/srcpkgs/kde-workspace/patches/etc-scripts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/srcpkgs/kde-workspace/patches/fix-inline.patch b/srcpkgs/kde-workspace/patches/fix-inline.patch deleted file mode 100644 index 486479cb1eb..00000000000 --- a/srcpkgs/kde-workspace/patches/fix-inline.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/backend/client.c 2015-08-12 09:03:15.000000000 +0200 -+++ kdm/backend/client.c 2018-01-04 08:42:56.428031407 +0100 -@@ -34,6 +34,8 @@ - * - * user verification and session initiation. - */ -+#undef inline -+#define inline __inline /* fixes build with -std=iso9899:1990 */ - #include "dm.h" - #include "dm_auth.h" - #include "dm_error.h" diff --git a/srcpkgs/kde-workspace/patches/kdm-xinitrd.patch b/srcpkgs/kde-workspace/patches/kdm-xinitrd.patch deleted file mode 100644 index f0ec9b0f112..00000000000 --- a/srcpkgs/kde-workspace/patches/kdm-xinitrd.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 -+++ kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 -@@ -742,6 +742,15 @@ - "[ -f /etc/xprofile ] && . /etc/xprofile\n" - "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" - "\n" -+"# run all system xinitrc shell scripts.\n" -+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" -+" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" -+" if [ -x \"$i\" ]; then\n" -+" . \"$i\"\n" -+" fi\n" -+" done\n" -+"fi\n" -+"\n" - "if [ -d /etc/X11/Xresources ]; then\n" - " for i in /etc/X11/Xresources/*; do\n" - " [ -f $i ] && xrdb -merge $i\n" diff --git a/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch b/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch deleted file mode 100644 index bc93f9a5dde..00000000000 --- a/srcpkgs/kde-workspace/patches/khotkeys-qt4.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp~ 2014-03-05 18:41:23.126818552 +0000 -+++ khotkeys/kcm_hotkeys/actions/dbus_action_widget.cpp 2014-03-05 18:42:05.563172036 +0000 -@@ -117,7 +117,7 @@ - - void DbusActionWidget::launchDbusBrowser() const - { -- if( KRun::runCommand( "qdbusviewer", window()) == 0 ) -+ if( KRun::runCommand( "qdbusviewer-qt4", window()) == 0 ) - { - KMessageBox::sorry( window(), i18n( "Failed to run qdbusviewer" )); - } ---- khotkeys/libkhotkeysprivate/actions/dbus_action.cpp~ 2014-03-05 18:41:29.120107842 +0000 -+++ khotkeys/libkhotkeysprivate/actions/dbus_action.cpp 2014-03-05 18:41:52.349936188 +0000 -@@ -133,7 +133,7 @@ - } - kDebug() << "D-Bus call:" << _application << ":" << _object << ":" << _function << ":" << args_list; - KProcess proc; -- proc << "qdbus" << _application << _object << _function << args_list; -+ proc << "qdbus-qt4" << _application << _object << _function << args_list; - proc.startDetached(); - } - diff --git a/srcpkgs/kde-workspace/patches/musl-__uint16_t.patch b/srcpkgs/kde-workspace/patches/musl-__uint16_t.patch deleted file mode 100644 index 4376deb9442..00000000000 --- a/srcpkgs/kde-workspace/patches/musl-__uint16_t.patch +++ /dev/null @@ -1,14 +0,0 @@ -Use Qt defined type quint16 instead of GNU libc -internal type __uint16_t. - ---- ksmserver/fadeeffect.cpp 2015-05-07 20:13:26.000000000 +0200 -+++ ksmserver/fadeeffect.cpp 2015-10-09 00:29:17.537504092 +0200 -@@ -237,7 +237,7 @@ - __m128i *result, uint length) - { - length = (length + 15) >> 4; -- register const __m128i alpha = _mm_set1_epi16(__uint16_t (a)); -+ register const __m128i alpha = _mm_set1_epi16(quint16 (a)); - register const __m128i negalpha = _mm_xor_si128(alpha, _mm_set1_epi16 (0x00ff)); - - for (uint i = 0; i < length; i++) diff --git a/srcpkgs/kde-workspace/patches/musl-uint.patch b/srcpkgs/kde-workspace/patches/musl-uint.patch deleted file mode 100644 index ab7ceff7af6..00000000000 --- a/srcpkgs/kde-workspace/patches/musl-uint.patch +++ /dev/null @@ -1,15 +0,0 @@ -The type uint is not defined by musl libc headers. - ---- ksysguard/ksysguardd/Linux/netstat.c 2015-05-07 20:13:26.000000000 +0200 -+++ ksysguard/ksysguardd/Linux/netstat.c 2015-10-09 00:02:49.350628001 +0200 -@@ -32,6 +32,10 @@ - #include "ccont.h" - #include "netstat.h" - -+#if !defined(__GLIBC__) -+typedef unsigned int uint; -+#endif -+ - static CONTAINER TcpSocketList = 0; - static CONTAINER UdpSocketList = 0; - static CONTAINER UnixSocketList = 0; diff --git a/srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp.diff b/srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp.diff deleted file mode 100644 index e840c1ce98e..00000000000 --- a/srcpkgs/kde-workspace/patches/patch-kdm_kcm_main.cpp.diff +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-kdm_kcm_main.cpp,v 1.1 2012/03/19 19:44:03 markd Exp $ - -Allow $PKG_SYSCONFDIR/kdm/kdmrc to override the one under $PREFIX - ---- kdm/kcm/main.cpp.orig 2010-05-27 17:23:09.000000000 +0000 -+++ kdm/kcm/main.cpp -@@ -281,8 +281,12 @@ KConfig *KDModule::createTempConfig() - pTempConfigFile->open(); - QString tempConfigName = pTempConfigFile->fileName(); - -+ QFile confFile (QString::fromLatin1( "@PKG_SYSCONFDIR@" "/kdm/kdmrc" )); -+ if ( !confFile.exists() ) -+ confFile.setFileName (QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); -+ - KConfig *pSystemKDMConfig = new KConfig( -- QString::fromLatin1(KDE_CONFDIR "/kdm/kdmrc"), KConfig::SimpleConfig); -+ confFile.fileName(), KConfig::SimpleConfig); - - KConfig *pTempConfig = pSystemKDMConfig->copyTo(tempConfigName); - pTempConfig->sync(); diff --git a/srcpkgs/kde-workspace/patches/q_byte_order.patch b/srcpkgs/kde-workspace/patches/q_byte_order.patch deleted file mode 100644 index 1d06a5e1271..00000000000 --- a/srcpkgs/kde-workspace/patches/q_byte_order.patch +++ /dev/null @@ -1,27 +0,0 @@ -Use Qt defined macros Q_BYTE_ORDER, Q_BIG_ENDIAN and -Q_LITLLE_ENDIAN which are defined also for musl libc. - ---- ksplash/ksplashx/scale.cpp 2015-05-07 20:13:26.000000000 +0200 -+++ ksplash/ksplashx/scale.cpp 2015-10-09 00:07:44.940604940 +0200 -@@ -165,18 +165,18 @@ - - // FIXME: replace with mRed, etc... These work on pointers to pixels, not - // pixel values --#if BYTE_ORDER == BIG_ENDIAN -+#if Q_BYTE_ORDER == Q_BIG_ENDIAN - #define A_VAL(p) ((unsigned char *)(p))[0] - #define R_VAL(p) ((unsigned char *)(p))[1] - #define G_VAL(p) ((unsigned char *)(p))[2] - #define B_VAL(p) ((unsigned char *)(p))[3] --#elif BYTE_ORDER == LITTLE_ENDIAN -+#elif Q_BYTE_ORDER == Q_LITTLE_ENDIAN - #define A_VAL(p) ((unsigned char *)(p))[3] - #define R_VAL(p) ((unsigned char *)(p))[2] - #define G_VAL(p) ((unsigned char *)(p))[1] - #define B_VAL(p) ((unsigned char *)(p))[0] - #else --#error "BYTE_ORDER is not defined" -+#error "Q_BYTE_ORDER is not defined" - #endif - - #define INV_XAP (256 - xapoints[x]) diff --git a/srcpkgs/kde-workspace/patches/terminate-server.patch b/srcpkgs/kde-workspace/patches/terminate-server.patch deleted file mode 100644 index 0945913175a..00000000000 --- a/srcpkgs/kde-workspace/patches/terminate-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template deleted file mode 100644 index e7161a14e7c..00000000000 --- a/srcpkgs/kde-workspace/template +++ /dev/null @@ -1,83 +0,0 @@ -# Template file for 'kde-workspace' -_kdeversion=4.14.3 -_kappversion=15.08.0 - -pkgname=kde-workspace -version=4.11.22 -revision=10 -short_desc="Provides the interface and basic tools for the KDE workspace" -maintainer="Juan RP " -license="GPL-2, LGPL-2.1, FDL" -homepage="http://www.kde.org" -distfiles="http://download.kde.org/Attic/applications/${_kappversion}/src/${pkgname}-${version}.tar.xz" -checksum=f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 - -build_style=cmake -configure_args="-Wno-dev -DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc - -DWITH_Xmms=OFF -DWITH_libgps=OFF -DWITH_NepomukCore=OFF -DWITH_Soprano=OFF - -DWITH_CkConnector=ON" - -# XXX prison. -hostmakedepends="automoc4 pkg-config" -makedepends="libressl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-devel - qt-webkit-devel kdelibs-devel kactivities-devel xcb-util-keysyms-devel - qimageblitz-devel xcb-util-image-devel xcb-util-renderutil-devel boost-devel - libjpeg-turbo-devel libpng-devel libXcursor-devel libXi-devel libxkbfile-devel - libXrandr-devel libXfixes-devel libSM-devel libXcomposite-devel libXdamage-devel - libXtst-devel libXft-devel glib-devel fontconfig-devel kdepimlibs-devel - libsensors-devel wayland-devel MesaLib-devel pam-devel libusb-compat-devel - NetworkManager-devel pciutils-devel libraw1394-devel python-devel libqalculate-devel - akonadi-devel qjson-devel ConsoleKit2-devel" -depends="kde-wallpapers>=${_kdeversion} kde-base-artwork>=${_kdeversion}" -conf_files=" - /etc/kdm/kdmrc - /etc/ksysguarddrc - /etc/pam.d/kde-np - /etc/pam.d/kde - /etc/pam.d/kscreensaver" -system_accounts="kdm" -kdm_homedir="/var/lib/kdm" -make_dirs=" - /etc/kde/env 0755 root root - /etc/kde/shutdown 0755 root root - /var/lib/kdm 0755 kdm kdm" - -CXXFLAGS="-std=gnu++98" - -pre_configure() { - sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp -} - -post_install() { - vmkdir etc/pam.d - for f in kde kde-np kscreensaver; do - install -m644 ${FILESDIR}/${f}.pam ${DESTDIR}/etc/pam.d/${f} - done - vsv kdm - vmkdir usr/share/xsessions - ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop \ - ${DESTDIR}/usr/share/xsessions - - install -Dm644 ${DESTDIR}/usr/share/config/kdm/kdmrc \ - ${DESTDIR}/etc/kdm/kdmrc -} - -kde-workspace-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove usr/share/apps/cmake - } -} -kde-python_package() { - short_desc+=" - Python 2 bindings" - pycompile_module="PyKDE4" - pycompile_dirs="usr/share/apps/plasma_scriptengine_python" - pkg_install() { - vmove usr/lib/python2.7 - vmove usr/share/apps/plasma_scriptengine_python - vmove "/usr/share/kde4/services/plasma-scriptengine*" - } -}