[packages/kdebase/dev-trinity] update sources and patches to R14.0.0

glen glen at pld-linux.org
Mon Mar 23 09:09:17 CET 2015 

commit 8b6231bf49b0a2526879fb3941fd8b49456894b9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Mar 23 10:09:08 2015 +0200

    update sources and patches to R14.0.0

 kdebase-kdm-default_background.patch |   4 +-
 kdebase-kdm_utmpx.patch              |   4 +-
 kdebase-kdmconfig.patch              | 165 +++++++++++++++++------------------
 kdebase-kio_settings.patch           |   4 +-
 kdebase-konsole-history_clear.patch  |  10 +--
 kdebase-konsole-wordseps.patch       |  10 +--
 kdebase-nsplugins_dirs.patch         |  34 ++++----
 kdebase-screensavers.patch           |  54 ++++++------
 kdebase-session.patch                |  10 +--
 kdebase-vmenus.patch                 |  16 ++--
 kdebase.spec                         |  59 ++++++-------
 11 files changed, 182 insertions(+), 188 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 1004b3a..2f05ca6 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -41,9 +41,7 @@
 %bcond_without	xscreensaver	# Enable xscreensaver support
 %bcond_without	xtest	# Enable xext support
 
-
-%define		_state		stable
-%define		_minlibsevr	9:%{version}
+%define		minlibsevr	9:%{version}
 Summary:	K Desktop Environment - core files
 Summary(es.UTF-8):	K Desktop Environment - archivos básicos
 Summary(ja.UTF-8):	KDEデスクトップ環境 - 基本ファイル
@@ -54,13 +52,13 @@ Summary(ru.UTF-8):	K Desktop Environment - базовые файлы
 Summary(uk.UTF-8):	K Desktop Environment - базові файли
 Summary(zh_CN.UTF-8):	KDE核心
 Name:		kdebase
-Version:	3.5.13.2
+Version:	R14.0.0
 Release:	0.27
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
-Source0:	http://ftp.fau.de/trinity/releases/%{version}/%{name}-trinity-%{version}.tar.xz
-# Source0-md5:	5687691f62ea0018047872d7b822fa1e
+Source0:	http://tde-mirror.yosemite.net/trinity/releases/%{version}/tdebase-%{version}.tar.bz2
+# Source0-md5:	6dd72f44985342de33c2b1b5d6257c15
 Source1:	%{name}-kdesktop.pam
 Source2:	%{name}-kdm.pam
 Source3:	%{name}-kdm-np.pam
@@ -103,18 +101,18 @@ BuildRequires:	cdparanoia-III-devel
 BuildRequires:	cmake >= 2.8
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	dbus-devel
-BuildRequires:	dbus-tqt-devel
+BuildRequires:	dbus-1-tqt-devel >= 0.9
 %{?with_apidocs:BuildRequires:	doxygen}
 BuildRequires:	glib2-devel
 %{?with_apidocs:BuildRequires:	graphviz}
 %{?with_kerberos5:BuildRequires: heimdal-devel}
-BuildRequires:	kdelibs-devel >= %{_minlibsevr}
+BuildRequires:	kdelibs-devel >= %{minlibsevr}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 1.0.8
 %{?with_libraw1394:BuildRequires:	libraw1394-devel >= 1.2.0}
 %{?with_samba:BuildRequires:	libsmbclient-devel >= 1:3.0.23d-3}
 BuildRequires:	libstdc++-devel >= 5:4.1.0-0.20051206r108118.1
-BuildRequires:	libtqtinterface-devel >= %{version}
+BuildRequires:	libtqtinterface-devel >= 4.2.0
 %{?with_libusb:BuildRequires:	libusb-compat-devel}
 %{?with_libusb:BuildRequires:	libusb-devel}
 BuildRequires:	libxml2-devel
@@ -126,7 +124,7 @@ BuildRequires:	pam-devel
 BuildRequires:	pcre-devel
 BuildRequires:	perl-Digest-MD5
 BuildRequires:	pkgconfig
-%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
+#%{?with_hidden_visibility:BuildRequires:	qt-devel >= 6:3.3.5.051113-1}
 %{?with_apidocs:BuildRequires:	qt-doc}
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(find_lang) >= 1.32
@@ -213,7 +211,7 @@ Requires:	%{name}-desktop-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-kfontinst = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libkate = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libksgrd = %{epoch}:%{version}-%{release}
-Requires:	kdelibs-devel >= %{_minlibsevr}
+Requires:	kdelibs-devel >= %{minlibsevr}
 
 %description devel
 This package contains header files needed to develop KDE applications.
@@ -333,7 +331,7 @@ widocznymi, cienkimi krawędziami.
 Summary:	KDE greeter libraries
 Summary(pl.UTF-8):	Biblioteki służące do zapytań o hasło
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 Provides:	kde-kgreet
 Conflicts:	kdm <= 3.2.90.040503-1
 
@@ -348,7 +346,7 @@ wyglądu.
 Summary:	KDE greeter libraries
 Summary(pl.UTF-8):	Biblioteki służące do zapytań o hasło
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 Provides:	kde-kgreet
 Conflicts:	kdm <= 3.2.90.040503-1
 
@@ -362,7 +360,7 @@ Narzędzia służące do zapytań o hasło - winbind.
 Summary:	KDE LDAP protocol service
 Summary(pl.UTF-8):	Obsługa protokołu LDAP
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 Conflicts:	konqueror < 9:3.2.90.040210
 
 %description -n kde-kio-ldap
@@ -375,7 +373,7 @@ Obsługa protokołu LDAP.
 Summary:	KDE NNTP protocol service
 Summary(pl.UTF-8):	Obsługa protokołu NNTP
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description -n kde-kio-nntp
 KDE NNTP protocol service.
@@ -387,7 +385,7 @@ Obsługa protokołu NNTP.
 Summary:	KDE POP3 protocol service
 Summary(pl.UTF-8):	Obsługa protokołu POP3
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description -n kde-kio-pop3
 KDE POP3 protocol service.
@@ -398,7 +396,7 @@ Obsługa protokołu POP3.
 %package -n kde-kio-smb
 Summary:	Windows Connection Module for TDE
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description -n kde-kio-smb
 This package provides the "smb://" protocol, to connect to and from
@@ -408,7 +406,7 @@ Windows and Samba shares.
 Summary:	KDE SMTP protocol service
 Summary(pl.UTF-8):	Obsługa protokołu SMTP
 Group:		X11/Libraries
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description -n kde-kio-smtp
 KDE SMTP protocol service.
@@ -522,7 +520,7 @@ Summary:	Common files for konsole and konsolepart
 Summary(pl.UTF-8):	Pliki wspólne dla konsole i konsolepart
 Group:		X11/Applications
 Requires(post,postun):	fontpostinst
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description common-konsole
 Color schemes, icons, fonts and shell profiles for konsole.
@@ -534,7 +532,7 @@ Schematy kolorów, ikony, czcionki oraz profile sesji dla konsole.
 Summary:	KDE Core Apps
 Summary(pl.UTF-8):	Podstawowe aplikacje KDE
 Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 Requires:	xdg-menus
 Suggests:	sudo
 
@@ -568,7 +566,7 @@ Requires:	kde-kgreet
 Requires:	kde-kside
 Requires:	kde-logoutpic
 Requires:	kde-splash-Default
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 Requires:	konqueror = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.99.7.1
 Requires:	xorg-app-setxkbmap
@@ -616,7 +614,7 @@ Centrum informacji o systemie dla KDE.
 Summary:	Menu Updating Tool
 Summary(pl.UTF-8):	Narzędzie do aktualizacji menu
 Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description kappfinder
 The tool for finding installed application and adding them to your
@@ -703,7 +701,7 @@ bardzo zaawansowanym użytkownikom.
 Summary:	A KDE version of dialog
 Summary(pl.UTF-8):	Wersja KDE dialogu
 Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description kdialog
 Kdialog allows to display window dialogs with KDE widgets from shell
@@ -782,7 +780,7 @@ Emulator terminala dla KDE.
 Summary:	Desktop Pager
 Summary(pl.UTF-8):	Przełącznik biurek
 Group:		X11/Applications
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description kpager
 KDE Desktop Pager.
@@ -862,7 +860,7 @@ Summary:	A libraries for KDE text editors
 Summary(pl.UTF-8):	Biblioteki dla edytorów tekstu KDE
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description libkate
 A libraries shared between KDE text editors. They provide an
@@ -877,7 +875,7 @@ Summary:	ksgrd library
 Summary(pl.UTF-8):	Biblioteka ksgrd
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description libksgrd
 A library containing functions for the system monitor KSysGuard.
@@ -1007,7 +1005,7 @@ Summary:	Konqueror shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone konquerora
 Group:		X11/Libraries
 Requires(post,postun):	/sbin/ldconfig
-Requires:	kdelibs >= %{_minlibsevr}
+Requires:	kdelibs >= %{minlibsevr}
 
 %description -n konqueror-libs
 Konqueror shared libraries.
@@ -1035,7 +1033,8 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
 - listę przestrzeni nazw (namespace)
 
 %prep
-%setup -q -n %{name}-trinity-%{version}
+%setup -qc
+mv tdebase/* .
 #%patch100 -p0
 %patch1 -p1
 %{?with_groupwindows:%patch2 -p1}
@@ -1087,7 +1086,7 @@ cd -
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-KDE-settings-desktop;/' \
 	kcontrol/konq/desktoppath.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;TrayIcon;/' \
-	kcontrol/randr/krandrtray.desktop
+	kcontrol/randr/tderandrtray.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;X-Help;/' \
 	-e 's/Name=/Name=KDE/g' -e s'/Name[pl]=Pomoc/Name[pl]=Pomoc KDE/g' \
 	-e 's/OnlyShowIn=KDE;//g' khelpcenter/Help.desktop
@@ -1099,7 +1098,7 @@ cd -
 	konsole/konsolesu.desktop
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;WebBrowser;/' \
 	konqueror/konqbrowser.desktop
-%{__sed} -i -e 's/\(^Categories=.*$\)/\1;/' kioslave/media/kcmodule/media.desktop
+%{__sed} -i -e 's/\(^Categories=.*$\)/\1;/' tdeioslave/media/tdecmodule/media.desktop
 for f in `find . -name \*.desktop`; do
 	if grep -q '\[ven\]' $f; then
 		sed -i -e 's/\[ven\]/[ve]/' $f
diff --git a/kdebase-kdm-default_background.patch b/kdebase-kdm-default_background.patch
index 3d3d8ab..028f0bb 100644
--- a/kdebase-kdm-default_background.patch
+++ b/kdebase-kdm-default_background.patch
@@ -81,8 +81,8 @@
  
      QString quickHelp() const;
      const KAboutData* aboutData() const;
---- kdebase-3.5.4/kdm/kfrontend/genkdmconf.c.orig	2006-09-30 23:32:51.000000000 +0200
-+++ kdebase-3.5.4/kdm/kfrontend/genkdmconf.c	2006-10-01 14:42:31.000000000 +0200
+--- kdebase-3.5.4/tdm/kfrontend/gentdmconf.c	2006-09-30 23:32:51.000000000 +0200
++++ kdebase-3.5.4/tdm/kfrontend/gentdmconf.c	2006-10-01 14:42:31.000000000 +0200
 @@ -711,8 +711,8 @@
  "BlendBalance=100\n"
  "BlendMode=NoBlending\n"
diff --git a/kdebase-kdm_utmpx.patch b/kdebase-kdm_utmpx.patch
index f85e49e..0c58f77 100644
--- a/kdebase-kdm_utmpx.patch
+++ b/kdebase-kdm_utmpx.patch
@@ -1,5 +1,5 @@
---- kdebase-050210/kdm/backend/dm.h.orig	2005-02-08 21:51:08.000000000 +0100
-+++ kdebase-050210/kdm/backend/dm.h	2005-02-11 12:00:00.277539336 +0100
+--- kdebase-050210/tdm/backend/dm.h.orig	2005-02-08 21:51:08.000000000 +0100
++++ kdebase-050210/tdm/backend/dm.h	2005-02-11 12:00:00.277539336 +0100
 @@ -137,15 +137,7 @@
  #  define WTMP_FILE "/usr/adm/wtmp"
  # endif
diff --git a/kdebase-kdmconfig.patch b/kdebase-kdmconfig.patch
index fbd7bbf..9310cba 100644
--- a/kdebase-kdmconfig.patch
+++ b/kdebase-kdmconfig.patch
@@ -1,22 +1,22 @@
---- kdebase-030317/kcontrol/kdm/background.cpp~	Sun Mar 16 00:35:44 2003
-+++ kdebase-030317/kcontrol/kdm/background.cpp	Tue Mar 18 19:31:12 2003
-@@ -53,7 +53,7 @@
+--- kdebase-R14.0.0/kcontrol/tdm/background.cpp~	2013-02-16 06:27:24.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/tdm/background.cpp	2015-03-22 22:58:05.883155469 +0200
+@@ -51,7 +51,7 @@
  		" This is done by running some program (possibly xsetroot) in the script"
- 		" specified in the Setup= option in kdmrc (usually Xsetup).") );
+ 		" specified in the Setup= option in tdmrc (usually Xsetup).") );
      config->setGroup( "X-*-Greeter" );
--    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/kdm/backgroundrc" ) );
+-    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) );
 +    m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg","/etc/X11/kdm/backgroundrc" ) );
      m_background = new BGDialog( this, m_simpleConf, false );
  
-     connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
---- kdebase-trinity-3.5.13.2/kcontrol/kdm/kdm-appear.cpp~	2012-09-16 15:52:02.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kcontrol/kdm/kdm-appear.cpp	2014-05-27 13:58:32.057608488 +0300
+     connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
+--- kdebase-R14.0.0/kcontrol/tdm/tdm-appear.cpp~	2015-03-22 22:59:16.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/tdm/tdm-appear.cpp	2015-03-22 23:00:16.913255807 +0200
 @@ -355,7 +355,7 @@
- bool KDMAppearanceWidget::setLogo(TQString logo)
+ bool TDMAppearanceWidget::setLogo(TQString logo)
  {
      TQString flogo = logo.isEmpty() ?
--                    locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
-+                    locate("data", TQString::fromLatin1("kdm/pics/pldlogo.png") ) :
+-                    locate("data", TQString::fromLatin1("tdm/pics/kdelogo.png") ) :
++                    locate("data", TQString::fromLatin1("tdm/pics/pldlogo.png") ) :
                      logo;
      TQImage p(flogo);
      if (p.isNull())
@@ -38,147 +38,147 @@
    logoRadio->setChecked( true );
    slotAreaRadioClicked( KdmLogo );
    setLogo( "" );
---- kdebase-030924/kcontrol/kdm/kdm-users.cpp~	2003-09-23 21:46:11.000000000 +0200
-+++ kdebase-030924/kcontrol/kdm/kdm-users.cpp	2003-09-24 16:39:25.000000000 +0200
-@@ -65,7 +65,7 @@
-     // We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
+--- kdebase-R14.0.0/kcontrol/tdm/tdm-users.cpp~	2014-11-13 03:00:24.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/tdm/tdm-users.cpp	2015-03-22 23:01:49.701383180 +0200
+@@ -74,7 +74,7 @@
+     // We assume that $kde_datadir/tdm exists, but better check for pics/ and pics/users,
      // and create them if necessary.
      config->setGroup( "X-*-Greeter" );
--    m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
+-    m_userPixDir = config->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
 +    m_userPixDir = config->readEntry( "FaceDir", "/etc/X11/kdm/faces" ) + '/';
      m_notFirst = false;
-     QDir testDir( m_userPixDir );
-     if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ))
---- kdebase-trinity-3.5.13.2/kcontrol/kdm/main.cpp~	2012-09-16 15:52:02.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kcontrol/kdm/main.cpp	2014-05-27 14:03:23.136893424 +0300
+     TQDir testDir( m_userPixDir );
+     if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
+--- kdebase-R14.0.0/kcontrol/tdm/main.cpp~	2014-11-24 15:00:51.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/tdm/main.cpp	2015-03-22 22:50:45.317002792 +0200
 @@ -174,11 +174,11 @@
  	<< "' have unknown GID " << tgmapci.key() << endl;
  
    struct stat st;
--  if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) {
--    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
+-  if( stat( KDE_CONFDIR "/tdm/tdmdistrc" ,&st ) == 0) {
+-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
 +  if( stat( "/etc/X11/kdm/kdmdistrc" ,&st ) == 0) {
 +    config = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));
    }
    else {
--    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+-    config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
 +    config = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));
    }
  
    TQVBoxLayout *top = new TQVBoxLayout(this);
---- kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp~	2014-06-03 23:19:33.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp	2014-06-04 11:12:35.914596433 +0300
-@@ -51,11 +51,11 @@
+--- kdebase-R14.0.0/kcontrol/screensaver/scrnsave.cpp~	2014-05-05 15:20:20.000000000 +0300
++++ kdebase-R14.0.0/kcontrol/screensaver/scrnsave.cpp	2015-03-22 22:51:52.440535817 +0200
+@@ -52,11 +52,11 @@
  #include <fixx11h.h>
  
  #define OPEN_TDMCONFIG_AND_SET_GROUP									\
--if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) {							\
--	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));		\
+-if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {							\
+-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));		\
 +if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) {							\
 +	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));		\
  }													\
  else {													\
--	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));		\
+-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));		\
 +	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));		\
  }													\
- mTDMConfig->setGroup("X-*-Greeter");
+ mTDMConfig->setGroup("X-:*-Greeter");
  
---- kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc~	2013-05-06 11:08:22.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdesktop/lock/main.cc	2014-06-04 11:13:06.705992318 +0300
-@@ -52,11 +52,11 @@
+--- kdebase-R14.0.0/kdesktop/lock/main.cc~	2014-12-03 09:00:49.000000000 +0200
++++ kdebase-R14.0.0/kdesktop/lock/main.cc	2015-03-22 22:52:54.543743116 +0200
+@@ -55,11 +55,11 @@
  #endif
  
  #define OPEN_TDMCONFIG_AND_SET_GROUP									\
--if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) {							\
--	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));		\
+-if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {							\
+-	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));		\
 +if( stat( "/etc/X11/kdm/kdmdistrc" , &st ) == 0) {							\
 +	tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmdistrc" ));		\
  }													\
  else {													\
--	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));		\
+-	tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));		\
 +	tdmconfig = new KSimpleConfig( TQString::fromLatin1( "/etc/X11/kdm/kdmrc" ));		\
  }													\
- tdmconfig->setGroup("X-*-Greeter");
+ tdmconfig->setGroup("X-:*-Greeter");
  
---- kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c~	2013-03-04 19:36:45.000000000 +0200
-+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/kdmctl.c	2014-06-04 11:13:21.883347041 +0300
+--- kdebase-R14.0.0/tdm/kfrontend/tdmctl.c~	2012-03-08 06:01:31.000000000 +0200
++++ kdebase-R14.0.0/tdm/kfrontend/tdmctl.c	2015-03-22 22:54:40.705892492 +0200
 @@ -146,7 +146,7 @@
  {
  	char *dpy = getenv( "DISPLAY" );
  	const char *ctl = getenv( "DM_CONTROL" );
--	const char *cfg = KDE_CONFDIR "/kdm/kdmrc";
+-	const char *cfg = KDE_CONFDIR "/tdm/tdmrc";
 +	const char *cfg = "/etc/X11/kdm/kdmrc";
  	char *ptr;
  	int fd;
  
---- kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt~	2012-09-16 15:52:03.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/CMakeLists.txt	2014-06-04 11:10:30.672252448 +0300
-@@ -35,7 +35,7 @@
-   set( GENKDMCONF_FLAGS "--no-old" )
+--- kdebase-R14.0.0/tdm/kfrontend/CMakeLists.txt~	2013-08-06 07:00:09.000000000 +0300
++++ kdebase-R14.0.0/tdm/kfrontend/CMakeLists.txt	2015-03-22 22:57:16.357264389 +0200
+@@ -36,7 +36,7 @@
+   set( GENTDMCONF_FLAGS "--no-old" )
  endif( )
  
--install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
-+install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/genkdmconf --in \$ENV{DESTDIR}/etc/X11/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
+-install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentdmconf --in \$ENV{DESTDIR}${CONFIG_INSTALL_DIR}/tdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENTDMCONF_FLAGS} )" )
++install( CODE "execute_process( COMMAND ${CMAKE_CURRENT_BINARY_DIR}/gentdmconf --in \$ENV{DESTDIR}/etc/X11/kdm --no-in-notice --face-src ${CMAKE_CURRENT_SOURCE_DIR}/pics ${GENKDMCONF_FLAGS} )" )
  
  
  ##### config.ci (generated) #####################
---- kdebase-trinity-3.5.13.2/kdm/config.def~	2014-05-27 13:55:54.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdm/config.def	2014-05-27 14:35:25.710243084 +0300
-@@ -29,7 +29,7 @@
+--- kdebase-R14.0.0/tdm/config.def	2014-12-09 09:10:58.000000000 +0200
++++ kdebase-R14.0.0/tdm/config.def	2015-03-23 06:34:45.452474544 +0200
+@@ -30,7 +30,7 @@
  #define RCVERMAJOR 2
  #define RCVERMINOR 3
  
--#define KDMCONF KDE_CONFDIR "/kdm"
-+#define KDMCONF "/etc/X11/kdm"
- #define KDMDATA KDE_DATADIR "/kdm"
+-#define TDMCONF KDE_CONFDIR "/tdm"
++#define TDMCONF "/etc/X11/kdm"
+ #define TDMDATA KDE_DATADIR "/tdm"
  
  #ifdef _AIX
-@@ -1164,7 +1164,7 @@
+@@ -1173,7 +1173,7 @@
  
  Key: Willing
  Type: string
 -Default: ""
-+Default: KDMCONF "/Xwilling"
++Default: TDMCONF "/Xwilling"
  User: core
  # will be overwritten
  Instance: #
-@@ -1581,7 +1581,7 @@
+@@ -1590,7 +1590,7 @@
  
  Key: Setup
  Type: string
 -Default: ""
-+Default: KDMCONF "/Xsetup"
++Default: TDMCONF "/Xsetup"
  User: core
  # will be overwritten
  Instance: #*/""
-@@ -1602,7 +1602,7 @@
+@@ -1611,7 +1611,7 @@
  
  Key: Startup
  Type: string
 -Default: ""
-+Default: KDMCONF "/Xstartup"
++Default: TDMCONF "/Xstartup"
  User: core
  # will be overwritten
  Instance: #*/""
-@@ -1620,7 +1620,7 @@
+@@ -1629,7 +1629,7 @@
  
  Key: Reset
  Type: string
 -Default: ""
-+Default: KDMCONF "/Xreset"
++Default: TDMCONF "/Xreset"
  User: core
  # will be overwritten
  Instance: #*/""
-@@ -1638,7 +1638,7 @@
+@@ -1647,7 +1647,7 @@
  
  Key: Session
  Type: string
 -Default: XBINDIR "/xterm -ls -T"
-+Default: KDMCONF "/Xsession"
++Default: TDMCONF "/Xsession"
  #Merge: xdm - incompatible!
  User: core
  # will be overwritten
-@@ -1746,10 +1746,10 @@
+@@ -1755,10 +1755,10 @@
  
  Key: AllowRootLogin
  Type: bool
@@ -191,7 +191,7 @@
  Merge: xdm
  Comment:
   Allow root logins?
-@@ -1759,11 +1759,11 @@
+@@ -1768,11 +1768,11 @@
  
  Key: AllowNullPasswd
  Type: bool
@@ -206,16 +206,16 @@
  Merge: xdm
  Comment:
   Allow to log in, when user has set an empty password?
-@@ -1931,7 +1931,7 @@
- Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
+@@ -1933,7 +1933,7 @@
+ Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions," TDMDATA "/sessions"
  User: core
  User: greeter-c
--Instance: */"/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
-+Instance: */"/etc/X11/sessions,/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
+-Instance: */"/usr/share/xsessions,/var/lib/menu-xdg/xsessions," TDMDATA "/sessions"
++Instance: */"/etc/X11/sessions,/usr/share/xsessions,/var/lib/menu-xdg/xsessions," TDMDATA "/sessions"
  Comment:
   The directories containing session type definitions in .desktop format.
  Description:
-@@ -1933,10 +1933,10 @@
+@@ -1942,10 +1942,10 @@
  
  Key: ClientLogFile
  Type: string
@@ -229,31 +229,28 @@
  Comment:
   The file (relative to $HOME) to redirect the session output to. This is
   a printf format string; one %s will be replaced with the display name.
-@@ -1997,9 +1997,9 @@
+@@ -2047,7 +2047,7 @@
   None/LOGO_NONE: nothing
   Logo/LOGO_LOGO: the image specified by <option>LogoPixmap</option>
   Clock/LOGO_CLOCK: a neat analog clock
--Default: Clock
+-Default: None
 +Default: Logo
  User: greeter
--Instance: */Logo
-+Instance: #*/Clock
+ Instance: */None
  Comment:
-  What should be shown in the greeter's logo are:
- Description:
-@@ -2009,9 +2009,9 @@
+@@ -2059,9 +2059,9 @@
  
  Key: LogoPixmap
  Type: string
 -Default: ""
-+Default: KDMDATA "/pics/pldlogo.png"
++Default: TDMDATA "/pics/pldlogo.png"
  User: greeter(logo)
--Instance: */KDMDATA "/pics/kdelogo.png"
-+Instance: #*/KDMDATA "/pics/kdelogo.png"
+-Instance: */TDMDATA "/pics/kdelogo.png"
++Instance: */None
  Comment:
   The image to show when LogoArea=Logo.
  Description:
-@@ -2092,9 +2092,9 @@
+@@ -2094,9 +2094,9 @@
  
  Key: GreetString
  Type: string
@@ -265,7 +262,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2227,7 +2227,7 @@
+@@ -2277,7 +2277,7 @@
  
  Key: MinShowUID
  Type: int
@@ -274,12 +271,12 @@
  User: greeter(lowUserId)
  # will be overwritten
  Instance: #*/
-@@ -2288,7 +2288,7 @@
+@@ -2338,7 +2338,7 @@
  
  Key: FaceDir
  Type: string
--Default: *KDMDATA "/faces"
-+Default: *KDMCONF "/faces"
+-Default: *TDMDATA "/faces"
++Default: *TDMCONF "/faces"
  User: greeter
  Instance: #*/"/usr/share/faces"
  Update: upd_facedir
diff --git a/kdebase-kio_settings.patch b/kdebase-kio_settings.patch
index 4a6d269..9ee229c 100644
--- a/kdebase-kio_settings.patch
+++ b/kdebase-kio_settings.patch
@@ -1,5 +1,5 @@
---- kdebase-trinity-3.5.13.2/kioslave/settings/kio_settings.cc~	2014-05-27 14:47:44.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kioslave/settings/kio_settings.cc	2014-05-27 14:48:11.446790682 +0300
+--- kdebase-trinity-3.5.13.2/tdeioslave/settings/tdeio_settings.cc~	2014-05-27 14:47:44.000000000 +0300
++++ kdebase-trinity-3.5.13.2/tdeioslave/settings/tdeio_settings.cc	2014-05-27 14:48:11.446790682 +0300
 @@ -122,7 +122,7 @@
  KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath)
  {
diff --git a/kdebase-konsole-history_clear.patch b/kdebase-konsole-history_clear.patch
index 2c2fdaa..a3d5968 100644
--- a/kdebase-konsole-history_clear.patch
+++ b/kdebase-konsole-history_clear.patch
@@ -1,11 +1,11 @@
---- kdebase-trinity-3.5.13.2/konsole/konsole/konsole.cpp~	2014-05-27 14:51:11.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/konsole/konsole/konsole.cpp	2014-05-27 14:53:50.441495466 +0300
-@@ -1084,7 +1084,7 @@
+--- kdebase-R14.0.0/konsole/konsole/konsole.cpp~	2015-03-23 07:14:35.000000000 +0200
++++ kdebase-R14.0.0/konsole/konsole/konsole.cpp	2015-03-23 07:23:34.904182231 +0200
+@@ -1127,7 +1127,7 @@
                                TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
    m_saveHistory->setEnabled(b_histEnabled );
  
--  m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
-+  m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", Qt::CTRL+Qt::ALT+Qt::Key_W, TQT_TQOBJECT(this),
+-  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, TQT_TQOBJECT(this),
++  m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", Qt::CTRL+Qt::ALT+Qt::Key_W, TQT_TQOBJECT(this),
                                 TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
    m_clearHistory->setEnabled(b_histEnabled);
  
diff --git a/kdebase-konsole-wordseps.patch b/kdebase-konsole-wordseps.patch
index 782339e..aace238 100644
--- a/kdebase-konsole-wordseps.patch
+++ b/kdebase-konsole-wordseps.patch
@@ -23,14 +23,14 @@ glen, 2005-07-20
       b_framevis = config->readBoolEntry("has frame",true);
       QPtrList<TEWidget> tes = activeTEs();
       for (TEWidget *_te = tes.first(); _te; _te = tes.next()) {
---- kdebase-3.4.1/konsole/konsole/konsole_part.cpp~	2005-07-20 15:29:27.000000000 +0300
-+++ kdebase-3.4.1/konsole/konsole/konsole_part.cpp	2005-07-20 15:31:36.000000000 +0300
-@@ -557,7 +557,7 @@
+--- kdebase-R14.0.0/konsole/konsole/konsole_part.cpp~	2014-10-22 23:44:30.000000000 +0300
++++ kdebase-R14.0.0/konsole/konsole/konsole_part.cpp	2015-03-23 07:13:51.317261422 +0200
+@@ -576,7 +576,7 @@
    n_keytab=config->readNumEntry("keytab",0); // act. the keytab for this session
-   n_scroll = QMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
+   n_scroll = TQMIN(config->readUnsignedNumEntry("scrollbar",TEWidget::SCRRIGHT),2);
    m_histSize = config->readNumEntry("history",DEFAULT_HISTORY_SIZE);
 -  s_word_seps= config->readEntry("wordseps",":@-./_~");
 +  s_word_seps= config->readEntry("wordseps",":@-./_~?=&%+#");
- 
    n_encoding = config->readNumEntry("encoding",0);
  
+   TQFont tmpFont = TDEGlobalSettings::fixedFont();
diff --git a/kdebase-nsplugins_dirs.patch b/kdebase-nsplugins_dirs.patch
index dad39d6..a6707d6 100644
--- a/kdebase-nsplugins_dirs.patch
+++ b/kdebase-nsplugins_dirs.patch
@@ -1,11 +1,9 @@
---- kdebase-trinity-3.5.13.2/kcontrol/konqhtml/pluginopts.cpp~	2012-09-16 15:52:02.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kcontrol/konqhtml/pluginopts.cpp	2014-05-27 14:37:56.150101063 +0300
-@@ -374,26 +374,8 @@
-     if ( config->hasKey( "scanPaths" ) && !useDefault )
-         paths = config->readListEntry( "scanPaths" );
-     else {//keep sync with kdebase/nsplugins
--        paths.append("$HOME/.mozilla/plugins");
--        paths.append("$HOME/.netscape/plugins");
+--- kdebase-R14.0.0/kcontrol/konqhtml/pluginopts.cpp~	2013-02-16 06:27:24.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/konqhtml/pluginopts.cpp	2015-03-23 06:42:24.092854046 +0200
+@@ -376,24 +376,10 @@
+     else {//keep sync with tdebase/nsplugins
+         paths.append("$HOME/.mozilla/plugins");
+         paths.append("$HOME/.netscape/plugins");
 -	paths.append("/usr/lib/iceweasel/plugins");
 -        paths.append("/usr/lib/iceape/plugins");
 -        paths.append("/usr/lib/firefox/plugins");
@@ -22,21 +20,20 @@
 -        paths.append("/usr/lib/mozilla/plugins");
 -	paths.append("/usr/lib64/netscape/plugins");
 -	paths.append("/usr/lib64/mozilla/plugins");
--        paths.append("$MOZILLA_HOME/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
 -
 +		paths.append("/usr/lib/trinity/plugins/konqueror");
 +		paths.append("/usr/lib64/trinity/plugins/konqueror");
++		paths.append("/usr/libx32/trinity/plugins/konqueror");
      }
  
      // fill list
---- kdebase-trinity-3.5.13.2/nsplugins/plugin_paths.cpp~	2012-09-16 15:52:05.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/nsplugins/plugin_paths.cpp	2014-05-27 14:40:07.442462633 +0300
-@@ -39,25 +39,8 @@
-     if ( !config->hasKey("scanPaths") ) {
-         TQStringList paths;
-         // keep sync with kdebase/kcontrol/konqhtml
--        paths.append("$HOME/.mozilla/plugins");
--        paths.append("$HOME/.netscape/plugins");
+--- kdebase-R14.0.0/nsplugins/plugin_paths.cpp~	2013-01-27 10:32:05.000000000 +0200
++++ kdebase-R14.0.0/nsplugins/plugin_paths.cpp	2015-03-23 06:43:18.448997726 +0200
+@@ -41,23 +41,10 @@
+         // keep sync with tdebase/kcontrol/konqhtml
+         paths.append("$HOME/.mozilla/plugins");
+         paths.append("$HOME/.netscape/plugins");
 -	paths.append("/usr/lib/iceweasel/plugins");
 -	paths.append("/usr/lib/iceape/plugins");
 -        paths.append("/usr/lib/firefox/plugins");
@@ -53,9 +50,10 @@
 -        paths.append("/usr/lib/mozilla/plugins");
 -        paths.append("/usr/lib64/netscape/plugins");
 -        paths.append("/usr/lib64/mozilla/plugins");
--        paths.append("$MOZILLA_HOME/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
 +		paths.append("/usr/lib/trinity/plugins/konqueror");
 +		paths.append("/usr/lib64/trinity/plugins/konqueror");
++		paths.append("/usr/libx32/trinity/plugins/konqueror");
          config->writeEntry( "scanPaths", paths );
      }
  
diff --git a/kdebase-screensavers.patch b/kdebase-screensavers.patch
index 62d0427..fa1f808 100644
--- a/kdebase-screensavers.patch
+++ b/kdebase-screensavers.patch
@@ -1,21 +1,21 @@
---- kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp~	2014-05-27 14:43:26.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kcontrol/screensaver/scrnsave.cpp	2014-05-27 14:44:03.279359098 +0300
-@@ -84,10 +84,9 @@
-     mMonitor = 0;
-     mTesting = false;
+--- kdebase-R14.0.0/kcontrol/screensaver/scrnsave.cpp~	2015-03-23 06:44:16.000000000 +0200
++++ kdebase-R14.0.0/kcontrol/screensaver/scrnsave.cpp	2015-03-23 06:46:05.480967022 +0200
+@@ -96,10 +96,9 @@
+     struct stat st;
+     OPEN_TDMCONFIG_AND_SET_GROUP
  
--    // Add non-KDE path
-     KGlobal::dirs()->addResourceType("scrsav",
--                                     KGlobal::dirs()->kde_default("apps") +
+-    // Add non-TDE path
+     TDEGlobal::dirs()->addResourceType("scrsav",
+-                                     TDEGlobal::dirs()->kde_default("apps") +
 -                                     "apps/ScreenSavers/");
-+                                     KGlobal::dirs()->kde_default("data") +
++                                     TDEKGlobal::dirs()->kde_default("data") +
 +                                     "kscreensaver/");
  
      setQuickHelp( i18n("<h1>Screen Saver</h1> This module allows you to enable and"
         " configure a screen saver. Note that you can enable a screen saver"
-@@ -111,19 +111,6 @@
+@@ -113,19 +112,6 @@
  
-     setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
+     setButtons( TDECModule::Help | TDECModule::Default | TDECModule::Apply );
  
 -    // Add KDE specific screensaver path
 -    TQString relPath="System/ScreenSavers/";
@@ -26,15 +26,15 @@
 -      kdDebug() << "relPath=" << relPath << endl;
 -    }
 -
--    KGlobal::dirs()->addResourceType("scrsav",
--                                     KGlobal::dirs()->kde_default("apps") +
+-    TDEGlobal::dirs()->addResourceType("scrsav",
+-                                     TDEGlobal::dirs()->kde_default("apps") +
 -                                     relPath);
 -
      readSettings( false );
  
-     mSetupProc = new KProcess;
---- kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt~	2012-09-16 15:52:04.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kscreensaver/CMakeLists.txt	2014-06-04 11:07:10.329823207 +0300
+     mSetupProc = new TDEProcess;
+--- kdebase-trinity-3.5.13.2/tdescreensaver/CMakeLists.txt~	2012-09-16 15:52:04.000000000 +0300
++++ kdebase-trinity-3.5.13.2/tdescreensaver/CMakeLists.txt	2014-06-04 11:07:10.329823207 +0300
 @@ -23,7 +23,7 @@
  
  ##### other data ################################
@@ -44,15 +44,15 @@
  
  
  ##### krandom (executable) ######################
---- kdebase-trinity-3.5.13.2/kdesktop/lock/lockprocess.cc~	2013-05-14 22:43:53.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdesktop/lock/lockprocess.cc	2014-05-27 14:45:38.113472747 +0300
-@@ -276,22 +276,9 @@
+--- kdebase-R14.0.0/kdesktop/lock/lockprocess.cc~	2014-11-29 01:19:50.000000000 +0200
++++ kdebase-R14.0.0/kdesktop/lock/lockprocess.cc	2015-03-23 06:47:24.508389362 +0200
+@@ -261,22 +261,9 @@
      }
-     XSelectInput( qt_xdisplay(), qt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
+     XSelectInput( tqt_xdisplay(), tqt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
  
--    // Add non-KDE path
-     KGlobal::dirs()->addResourceType("scrsav",
--                                    KGlobal::dirs()->kde_default("apps") +
+-    // Add non-TDE path
+     TDEGlobal::dirs()->addResourceType("scrsav",
+-                                    TDEGlobal::dirs()->kde_default("apps") +
 -                                    "System/ScreenSavers/");
 -
 -    // Add KDE specific screensaver path
@@ -63,11 +63,11 @@
 -      relPath=servGroup->relPath();
 -      kdDebug(1204) << "relPath=" << relPath << endl;
 -    }
--    KGlobal::dirs()->addResourceType("scrsav",
--                                     KGlobal::dirs()->kde_default("apps") +
+-    TDEGlobal::dirs()->addResourceType("scrsav",
+-                                     TDEGlobal::dirs()->kde_default("apps") +
 -                                     relPath);
-+                                     KGlobal::dirs()->kde_default("data") +
++                                     TDEGlobal::dirs()->kde_default("data") +
 +                                     "kscreensaver/");
  
      // virtual root property
-     gXA_VROOT = XInternAtom (qt_xdisplay(), "__SWM_VROOT", False);
+     gXA_VROOT = XInternAtom (tqt_xdisplay(), "__SWM_VROOT", False);
diff --git a/kdebase-session.patch b/kdebase-session.patch
index 8bea7ad..3c78252 100644
--- a/kdebase-session.patch
+++ b/kdebase-session.patch
@@ -1,5 +1,5 @@
---- kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt~	2012-09-16 15:52:03.000000000 +0300
-+++ kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/CMakeLists.txt	2014-06-04 11:22:28.208119436 +0300
+--- kdebase-R14.0.0/tdm/kfrontend/sessions/CMakeLists.txt~	2013-08-10 09:15:18.000000000 +0300
++++ kdebase-R14.0.0/tdm/kfrontend/sessions/CMakeLists.txt	2015-03-23 06:53:43.207998906 +0200
 @@ -12,18 +12,5 @@
  configure_file( tde.desktop.cmake tde.desktop @ONLY )
  
@@ -17,7 +17,7 @@
 -    ratpoison.desktop sapphire.desktop sawfish.desktop
 -    twm.desktop ude.desktop vtwm.desktop w9wm.desktop
 -    waimea.desktop wm2.desktop wmaker.desktop xfce.desktop
--    xfce4.desktop
--  DESTINATION ${DATA_INSTALL_DIR}/kdm/sessions )
-+  ${CMAKE_CURRENT_BINARY_DIR}/tde.desktop RENAME kde.desktop
+-    xfce4.desktop kde-plasma-safe.desktop kde-plasma.desktop
+-  DESTINATION ${DATA_INSTALL_DIR}/tdm/sessions )
++  ${CMAKE_CURRENT_BINARY_DIR}/tde.desktop
 +  DESTINATION ${SHARE_INSTALL_PREFIX}/xsessions )
diff --git a/kdebase-vmenus.patch b/kdebase-vmenus.patch
index 62e45c9..d33a801 100644
--- a/kdebase-vmenus.patch
+++ b/kdebase-vmenus.patch
@@ -1,13 +1,13 @@
---- kdebase-031204/applnk/kde-essential.menu.orig	2003-11-23 16:35:20.000000000 +0100
-+++ kdebase-031204/applnk/kde-essential.menu	2003-12-04 17:08:45.000000000 +0100
+--- kdebase-R14.0.0/applnk/tde-essential.menu~	2012-03-23 11:06:16.000000000 +0200
++++ kdebase-R14.0.0/applnk/tde-essential.menu	2015-03-23 07:11:17.792635136 +0200
 @@ -4,7 +4,7 @@
  <Menu>
          <!-- The following menus are hidden by default -->
  	<Menu>
 -		<Name>Settings</Name>
 +		<Name>KDE-Settings</Name>
- 		<Directory>kde-settings.directory</Directory>
-                 <MergeFile>../kde-settings.menu</MergeFile>
+ 		<Directory>tde-settings.directory</Directory>
+                 <MergeFile>../tde-settings.menu</MergeFile>
  	</Menu>
 @@ -16,12 +16,4 @@
          <Move>
@@ -17,13 +17,13 @@
 -		<Name>System</Name>
 -		<Menu>
 -			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--	                <MergeFile>../kde-screensavers.menu</MergeFile>
+-			<Directory>tde-system-screensavers.directory</Directory>
+-	                <MergeFile>../tde-screensavers.menu</MergeFile>
 -		</Menu>
 -	</Menu>
  </Menu>
---- kdebase-031030/applnk/kde-settings.menu.orig	2003-04-02 22:47:54.000000000 +0200
-+++ kdebase-031030/applnk/kde-settings.menu	2003-10-30 11:21:33.000000000 +0100
+--- kdebase-031030/applnk/tde-settings.menu.orig	2003-04-02 22:47:54.000000000 +0200
++++ kdebase-031030/applnk/tde-settings.menu	2003-10-30 11:21:33.000000000 +0100
 @@ -2,7 +2,7 @@
    "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/8b6231bf49b0a2526879fb3941fd8b49456894b9

More information about the pld-cvs-commit mailing list