Hello community, here is the log from the commit of package plasma5-workspace for openSUSE:Factory checked in at 2014-07-28 16:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old) and /work/SRC/openSUSE:Factory/.plasma5-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace" Changes: -------- New Changes file: --- /dev/null 2014-07-24 01:57:42.080040256 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-workspace.new/plasma5-workspace.changes 2014-07-28 16:11:49.000000000 +0200 @@ -0,0 +1,31 @@ +------------------------------------------------------------------- +Thu Jul 24 17:51:58 UTC 2014 - [email protected] + +- Update to 5.0.1~20140724-3ba9875 snapshot + +------------------------------------------------------------------- +Fri Jul 11 17:32:07 UTC 2014 - [email protected] + +- Update to 5.0.0 + * Plasma 5.0 Final +- Rename package to plasma5-workspace + +------------------------------------------------------------------- +Sun Jul 6 20:11:41 UTC 2014 - [email protected] + +- Add 0001-Rename-qdbus-in-startkde.patch + The qdbus executable is called qdbus-qt5 in the libqt5-qttools package. + This patch ensures we don't try to use the Qt4 executable. + +------------------------------------------------------------------- +Thu Jul 3 17:35:40 UTC 2014 - [email protected] + +- Update to 4.98.0 + * Plasma 5 RC release +- Drop e79b769.patch and rename_1.diff, merged upstream + +------------------------------------------------------------------- +Thu Jun 5 17:45:58 UTC 2014 - [email protected] + +- Activate plasma-workspace5 package + New: ---- 0001-Rename-qdbus-in-startkde.patch plasma-workspace-5.0.1~20140724~3ba9875.tar.xz plasma5-workspace.changes plasma5-workspace.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-workspace.spec ++++++ # # spec file for package plasma5-workspace # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: plasma5-workspace Version: 5.0.1~20140724~3ba9875 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org/ Source0: plasma-workspace-%{version}.tar.xz # PATCH-FIX_OPENSUSE 0001-Rename-qdbus-in-startkde.patch [email protected] -- Rename the qdbus executable in startkde Patch0: 0001-Rename-qdbus-in-startkde.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= 5.0.0 BuildRequires: kactivities5-devel >= 5.0.0 BuildRequires: kcmutils-devel >= 5.0.0 BuildRequires: kcoreaddons-devel >= 5.0.0 BuildRequires: kcrash-devel >= 5.0.0 BuildRequires: kdeclarative-devel >= 5.0.0 BuildRequires: kdelibs4support-devel >= 5.0.0 BuildRequires: kdesu-devel >= 5.0.0 BuildRequires: kdewebkit-devel >= 5.0.0 BuildRequires: kdoctools-devel >= 5.0.0 BuildRequires: kf5-filesystem BuildRequires: kidletime-devel >= 5.0.0 BuildRequires: kjsembed-devel >= 5.0.0 BuildRequires: knewstuff-devel >= 5.0.0 BuildRequires: knotifyconfig-devel >= 5.0.0 BuildRequires: krunner-devel >= 5.0.0 BuildRequires: ktexteditor-devel >= 5.0.0 BuildRequires: kwallet-framework-devel >= 5.0.0 BuildRequires: kwin5-devel BuildRequires: libkscreen2-devel BuildRequires: libksysguard5-devel BuildRequires: libxcb-devel BuildRequires: pam-devel BuildRequires: phonon4qt5-devel BuildRequires: plasma-framework-devel >= 5.0.0 BuildRequires: solid-devel >= 5.0.0 BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.3.0 BuildRequires: pkgconfig(Qt5Qml) >= 5.3.0 BuildRequires: pkgconfig(Qt5Quick) >= 5.3.0 BuildRequires: pkgconfig(Qt5Script) >= 5.3.0 BuildRequires: pkgconfig(Qt5Sql) >= 5.3.0 BuildRequires: pkgconfig(Qt5Test) >= 5.3.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) Conflicts: kdebase4-workspace Provides: baloo5-runner Obsoletes: baloo5-runner Provides: plasma-workspace5 = %{version} Obsoletes: plasma-workspace5 <= %{version} # used within startup Requires: kde-cli-tools5 Requires: kded Requires: kdelibs4support Requires: kinit Requires: kwin5 Requires: libqt5-qttools >= 5.3.0 # contains default style, cursors, etc Requires: breeze # needed by krunner Requires: milou5 # heavily used by plasma Requires: libqt5-qtquickcontrols # battery applet Requires: solid-imports # de-facto even required... Recommends: kactivities5 # we want wallpaper previews Recommends: kio-extras5 # notifications... Recommends: phonon4qt5-backend # people should be able to adjust desktop Recommends: systemsettings5 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains the basic packages for a Plasma workspace. %package devel Summary: The KDE Plasma Workspace Components Group: Development/Libraries/KDE Requires: %{name} = %{version} Conflicts: kdebase4-workspace-devel Provides: plasma-workspace5-devel = %{version} Obsoletes: plasma-workspace5-devel <= %{version} %description devel This package contains the basic packages for a K Desktop Environment workspace. Development files. %prep %setup -q -n plasma-workspace-%{version} %patch0 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DBUILD_po=OFF %make_jobs %install %kf5_makeinstall -C build install -p -D -m755 drkonqi/doc/examples/installdbgsymbols_suse.sh \ %{buildroot}/usr/bin/installdbgsymbols.sh # we have a separate package for Plasma5 session rm -rf %{buildroot}%{_kf5_sharedir}/xsessions %post /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc COPYING* %{_kf5_bindir}/installdbgsymbols.sh %{_kf5_bindir}/kcheckrunning %{_kf5_bindir}/kcminit %{_kf5_bindir}/kcminit_startup %{_kf5_bindir}/kdostartupconfig5 %{_kf5_bindir}/kglobalaccel5 %{_kf5_bindir}/klipper %{_kf5_bindir}/krunner %{_kf5_bindir}/ksmserver %{_kf5_bindir}/ksplashqml %{_kf5_bindir}/kstartupconfig5 %{_kf5_bindir}/kuiserver5 %{_kf5_bindir}/plasmashell %{_kf5_bindir}/startkde %{_kf5_bindir}/systemmonitor %{_kf5_configdir}/autostart/org.kde.klipper.desktop %{_kf5_configdir}/autostart/plasmashell.desktop %{_kf5_configdir}/autostart/krunner.desktop %config %{_kf5_configdir}/plasmoids.knsrc %config %{_kf5_configdir}/wallpaper.knsrc %dir %{_kf5_libdir}/libexec %{_kf5_libdir}/libexec/drkonqi %{_kf5_libdir}/libexec/kcheckpass %{_kf5_libdir}/libexec/kscreenlocker_greet %{_kf5_libdir}/libexec/ksyncdbusenv %{_kf5_libdir}/libkdeinit5_kcminit.so %{_kf5_libdir}/libkdeinit5_kcminit_startup.so %{_kf5_libdir}/libkdeinit5_kglobalaccel5.so %{_kf5_libdir}/libkdeinit5_klipper.so %{_kf5_libdir}/libkdeinit5_ksmserver.so %{_kf5_libdir}/libkdeinit5_kuiserver5.so %{_kf5_libdir}/libkworkspace.so.* %{_kf5_libdir}/libplasma-geolocation-interface.so.* %{_kf5_libdir}/libtaskmanager.so.* %{_kf5_libdir}/libweather_ion.so.* %{_kf5_libdir}/libKF5XmlRpcClientPrivate.so.* %{_kf5_plugindir}/ %{_kf5_qmldir}/ %{_kf5_applicationsdir}/org.kde.klipper.desktop %{_kf5_configkcfgdir}/freespacenotifier.kcfg %{_kf5_sharedir}/dbus-1/services/kf5_org.kde.kuiserver.service %{_kf5_sharedir}/dbus-1/services/org.kde.kglobalaccel.service %{_kf5_sharedir}/dbus-1/services/org.kde.krunner.service %{_kf5_sharedir}/desktop-directories/ %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} %doc %{_kf5_htmldir}/en/klipper/ %{_kf5_sharedir}/drkonqi/ %{_kf5_notifydir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ %{_kf5_sharedir}/ksmserver/ %{_kf5_sharedir}/ksplash/ %{_kf5_sharedir}/kstyle/ %{_kf5_plasmadir}/ %{_kf5_sharedir}/solid/ %{_kf5_sharedir}/sddm/ %files devel %defattr(-,root,root) %doc COPYING* %{_includedir}/KDE/ %{_includedir}/kworkspace/ %{_includedir}/plasma/ %{_includedir}/taskmanager/ %{_kf5_libdir}/cmake/KRunnerAppDBusInterface/ %{_kf5_libdir}/cmake/KSMServerDBusInterface/ %{_kf5_libdir}/cmake/LibKWorkspace/ %{_kf5_libdir}/cmake/LibTaskManager/ %{_kf5_libdir}/cmake/ScreenSaverDBusInterface/ %{_kf5_libdir}/libkworkspace.so %{_kf5_libdir}/libplasma-geolocation-interface.so %{_kf5_libdir}/libtaskmanager.so %{_kf5_libdir}/libweather_ion.so %{_kf5_libdir}/libKF5XmlRpcClientPrivate.so %{_kf5_sharedir}/dbus-1/interfaces/ %changelog ++++++ 0001-Rename-qdbus-in-startkde.patch ++++++ diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake index 40e3377..37c2840 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -20,13 +20,13 @@ unset DYLD_FORCE_FLAT_NAMESPACE bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` if [ -n "$bindir" ]; then qbindir=`qtpaths --binaries-dir` - qdbus=$qbindir/qdbus + qdbus=$qbindir/qdbus-qt5 case $PATH in $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; *) PATH=$bindir:$PATH; export PATH;; esac else - qdbus=qdbus + qdbus=qdbus-qt5 fi # Check if a KDE session already is running and whether it's possible to connect to X @@ -294,9 +294,9 @@ fi if $qdbus >/dev/null 2>/dev/null; then : # ok else - echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 + echo 'startkde: Could not start D-Bus. Can you call qdbus-qt5?' 1>&2 test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null - xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" + xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus-qt5?" exit 1 fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
