[packages/kdebase/dev-trinity] updated patches
glen
glen at pld-linux.org
Tue May 27 17:33:01 CEST 2014
commit 438261a1d04752ea5a085dd7e4444aff945522f4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue May 27 15:00:22 2014 +0300
updated patches
kde-ac260-lt.patch | 12 -
kde-common-PLD.patch | 28 +-
kdebase-consolekit.patch | 810 -----------------------------------
kdebase-kdm-default_background.patch | 10 +-
kdebase-kdmconfig.patch | 81 ++--
kdebase-kio_settings.patch | 16 +-
kdebase-konsole-history_clear.patch | 14 +-
kdebase-nsplugins_dirs.patch | 26 +-
kdebase-screensavers.patch | 24 +-
kdebase-session.patch | 6 +-
kdebase-startkde.patch | 19 -
kdebase-tango.patch | 25 --
kdebase.spec | 20 +-
openssl.patch | 38 --
14 files changed, 101 insertions(+), 1028 deletions(-)
---
diff --git a/kdebase.spec b/kdebase.spec
index 24c3933..287249c 100644
--- a/kdebase.spec
+++ b/kdebase.spec
@@ -48,7 +48,7 @@ Source10: %{name}-servicemenus.tar.bz2
# Source10-md5: f48ac7af286f4c87961de4bb24d07772
Source13: %{name}-konqsidebartng-PLD-entries-0.2.tar.bz2
# Source13-md5: aa373b561e1cedb78b652f43e19fc122
-Patch100: %{name}-branch.diff
+#Patch100: %{name}-branch.diff
Patch0: kde-common-PLD.patch
Patch1: %{name}-fontdir.patch
# http://www.icefox.net/articles/kdeosx/grouplayer.diff
@@ -57,7 +57,6 @@ Patch3: %{name}-kdm_utmpx.patch
Patch4: %{name}-kdmconfig.patch
Patch5: %{name}-kicker.patch
Patch7: %{name}-nsplugins_dirs.patch
-Patch8: %{name}-startkde.patch
Patch9: %{name}-kcm_fonts.patch
Patch10: %{name}-kdesukonsole.patch
Patch12: %{name}-screensavers.patch
@@ -68,15 +67,10 @@ Patch18: %{name}-kio_settings.patch
Patch19: %{name}-konsole-default-keytab.patch
Patch20: %{name}-seesar.patch
Patch21: %{name}-konsole-wordseps.patch
-Patch22: %{name}-tango.patch
-Patch24: kde-ac260-lt.patch
Patch25: %{name}-konsole-history_clear.patch
Patch26: %{name}-kdm-default_background.patch
-Patch27: %{name}-consolekit.patch
Patch28: %{name}-no_mkfontdir.patch
-Patch29: kde-am.patch
Patch30: ac264.patch
-Patch31: openssl.patch
BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: OpenGL-devel
%{?with_arts:BuildRequires: artsc-devel >= %{artsver}}
@@ -85,6 +79,7 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: cdparanoia-III-devel
+BuildRequires: cmake >= 2.8
BuildRequires: cups-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: db-devel
@@ -95,7 +90,7 @@ BuildRequires: ed
%{?with_hidden_visibility:BuildRequires: gcc-c++ >= 5:4.1.0-0.20051206r108118.1}
BuildRequires: gettext-devel
%{?with_apidocs:BuildRequires: graphviz}
-BuildRequires: hal-devel
+#BuildRequires: hal-devel
%{?with_kerberos5:BuildRequires: heimdal-devel}
BuildRequires: jasper-devel
BuildRequires: kdelibs-devel >= %{_minlibsevr}
@@ -1074,7 +1069,7 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
%prep
%setup -q -n %{name}-trinity-%{version}
-%patch100 -p0
+#%patch100 -p0
%patch0 -p1
%patch1 -p1
%{?with_groupwindows:%patch2 -p1}
@@ -1082,7 +1077,6 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
%patch4 -p1
%patch5 -p1
%patch7 -p1
-%patch8 -p1
# Outdated but some things
# must be revised (AA default settings)
#%patch9 -p1
@@ -1096,15 +1090,10 @@ kcontrol i innych z kdebase z przypisami. Zawiera:
#%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch22 -p0
-%patch24 -p1
%patch25 -p1
%patch26 -p1
-%patch27 -p1
%patch28 -p1
-%patch29 -p1
%patch30 -p1
-%patch31 -p1
cd kcontrol/ebrowsing/plugins/ikws/searchproviders
for i in google*.desktop
@@ -1154,7 +1143,6 @@ for f in `find . -name \*.desktop`; do
fi
done
-mv -f configure{,.dist}
%build
%if %{with apidocs}
if [ ! -f "%{_kdedocdir}/en/common/kde-common.css" ]; then
diff --git a/kde-ac260-lt.patch b/kde-ac260-lt.patch
deleted file mode 100644
index acbbc6c..0000000
--- a/kde-ac260-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN arts-1.5.4.org/admin/libtool.m4.in arts-1.5.4/admin/libtool.m4.in
---- arts-1.5.4.org/admin/libtool.m4.in 2006-07-24 09:06:24.000000000 +0200
-+++ arts-1.5.4/admin/libtool.m4.in 2006-09-09 12:45:13.172062500 +0200
-@@ -3542,7 +3542,7 @@
- # The `*' in the case matches for architectures that use `case' in
- # $output_verbose_cmd can trigger glob expansion during the loop
- # eval without this substitution.
-- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-+ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-
- for p in `eval $output_verbose_link_cmd`; do
- case $p in
diff --git a/kde-common-PLD.patch b/kde-common-PLD.patch
index 21a7c91..7bd956d 100644
--- a/kde-common-PLD.patch
+++ b/kde-common-PLD.patch
@@ -1,10 +1,10 @@
---- kdelibs-3.5.3.or/admin/acinclude.m4.in 2006-05-23 13:02:06.000000000 +0000
-+++ kdelibs-3.5.3/admin/acinclude.m4.in 2006-07-01 14:55:49.345359250 +0000
-@@ -428,7 +428,7 @@
+--- kdebase-trinity-3.5.13.2/admin/acinclude.m4.in~ 2014-05-27 13:52:35.000000000 +0300
++++ kdebase-trinity-3.5.13.2/admin/acinclude.m4.in 2014-05-27 13:54:12.266346471 +0300
+@@ -468,7 +468,7 @@
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
-- kde_htmldir='\${datadir}/doc/HTML'
+- kde_htmldir='\${datadir}/doc/tde/HTML'
+ kde_htmldir='/usr/share/doc/kde/HTML'
fi
if test -z "$kde_appsdir"; then
@@ -152,23 +152,3 @@
}
for $opt (@kde_options) {
---- x/admin/acinclude.m4.in.orig 2008-10-08 10:18:48.844247699 +0200
-+++ x/admin/acinclude.m4.in 2008-10-08 10:21:26.884232831 +0200
-@@ -4612,7 +4612,8 @@
-
- AC_DEFUN([KDE_CHECK_PYTHON],
- [
-- KDE_CHECK_PYTHON_INTERN("2.5",
-+ KDE_CHECK_PYTHON_INTERN("2.6",
-+ [KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
-@@ -4624,6 +4625,7 @@
- ])
- ])
- ])
-+ ])
- ])
-
- AC_DEFUN([KDE_CHECK_STL],
diff --git a/kdebase-consolekit.patch b/kdebase-consolekit.patch
deleted file mode 100644
index 1827233..0000000
--- a/kdebase-consolekit.patch
+++ /dev/null
@@ -1,810 +0,0 @@
-diff -up kdebase-3.5.8/kdm/configure.in.in.consolekit kdebase-3.5.8/kdm/configure.in.in
---- kdebase-3.5.8/kdm/configure.in.in.consolekit 2006-01-19 11:03:15.000000000 -0600
-+++ kdebase-3.5.8/kdm/configure.in.in 2007-10-13 12:29:13.000000000 -0500
-@@ -240,4 +240,51 @@ if test "x$with_kdm_xconsole" = xyes; th
- AC_DEFINE(WITH_KDM_XCONSOLE, 1, [Build kdm with built-in xconsole])
- fi
-
-+########### Check for DBus
-+
-+ AC_MSG_CHECKING(for DBus)
-+
-+ dbus_inc=NOTFOUND
-+ dbus_lib=NOTFOUND
-+ dbus=NOTFOUND
-+
-+ search_incs="$kde_includes $kde_extra_includes /usr/include /usr/include/dbus-1.0 /usr/local/include /usr/local/include/dbus-1.0"
-+ AC_FIND_FILE(dbus/dbus.h, $search_incs, dbus_incdir)
-+
-+ search_incs_arch_deps="$kde_includes $kde_extra_includes /usr/lib$kdelibsuff/dbus-1.0/include /usr/local/lib$kdelibsuff/dbus-1.0/include"
-+ AC_FIND_FILE(dbus/dbus-arch-deps.h, $search_incs_arch_deps, dbus_incdir_arch_deps)
-+
-+ if test -r $dbus_incdir/dbus/dbus.h && test -r $dbus_incdir_arch_deps/dbus/dbus-arch-deps.h ; then
-+ DBUS_INCS="-I$dbus_incdir -I$dbus_incdir_arch_deps"
-+ dbus_inc=FOUND
-+ fi
-+
-+ search_libs="$kde_libraries $kde_extra_libs /usr/lib$kdelibsuff /usr/local/lib$kdelibsuff"
-+ AC_FIND_FILE(libdbus-1.so, $search_libs, dbus_libdir)
-+
-+ if test -r $dbus_libdir/libdbus-1.so ; then
-+ DBUS_LIBS="-L$dbus_libdir -ldbus-1"
-+ dbus_lib=FOUND
-+ fi
-+
-+ if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then
-+ KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-+ fi
-+
-+ dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+ if test -z "$dbus_bus_var"; then
-+ dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+ fi
-+ AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
-+
-+ if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-+ AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-+ dbus=FOUND
-+ else
-+ AC_MSG_RESULT(searched but not found)
-+ fi
-+
-+ AC_SUBST(DBUS_INCS)
-+ AC_SUBST(DBUS_LIBS)
-+
- dnl AC_OUTPUT(kdm/kfrontend/sessions/kde.desktop)
-diff -up /dev/null kdebase-3.5.8/kdm/backend/consolekit.h
---- /dev/null 2007-10-02 10:07:00.902689260 -0500
-+++ kdebase-3.5.8/kdm/backend/consolekit.h 2007-10-13 12:29:13.000000000 -0500
-@@ -0,0 +1,36 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2006 William Jon McCann <mccann at jhu.edu>
-+ * Copyright (C) 2007 Kevin Kofler <Kevin at tigcc.ticalc.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+
-+#ifndef __CONSOLE_KIT_H
-+#define __CONSOLE_KIT_H
-+
-+#include <pwd.h>
-+
-+struct display;
-+
-+char * open_ck_session (struct passwd *pwent,
-+ struct display *display);
-+void close_ck_session (const char *cookie);
-+void unlock_ck_session (const char *user,
-+ const char *x11_display);
-+
-+#endif /* __CONSOLE_KIT_H */
-diff -up kdebase-3.5.8/kdm/backend/session.c.consolekit kdebase-3.5.8/kdm/backend/session.c
---- kdebase-3.5.8/kdm/backend/session.c.consolekit 2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/session.c 2007-10-13 12:31:25.000000000 -0500
-@@ -45,6 +45,10 @@ from the copyright holder.
- #include <ctype.h>
- #include <signal.h>
-
-+#ifdef WITH_CONSOLE_KIT
-+#include "consolekit.h"
-+#endif
-+
- struct display *td;
- const char *td_setup = "auto";
-
-@@ -527,6 +531,10 @@ ManageSession( struct display *d )
- volatile int clientPid = 0;
- volatile Time_t tdiff = 0;
-
-+#ifdef WITH_CONSOLE_KIT
-+ char *ck_session_cookie;
-+#endif
-+
- td = d;
- Debug( "ManageSession %s\n", d->name );
- if ((ex = Setjmp( abortSession ))) {
-@@ -622,7 +630,12 @@ ManageSession( struct display *d )
- if (td_setup)
- SetupDisplay( td_setup );
-
-+#ifdef WITH_CONSOLE_KIT
-+ ck_session_cookie = open_ck_session (getpwnam(curuser), d);
-+ if (!(clientPid = StartClient(ck_session_cookie))) {
-+#else
- if (!(clientPid = StartClient())) {
-+#endif
- LogError( "Client start failed\n" );
- SessionExit( EX_NORMAL ); /* XXX maybe EX_REMANAGE_DPY? -- enable in dm.c! */
- }
-@@ -644,6 +657,14 @@ ManageSession( struct display *d )
- catchTerm( SIGTERM );
- }
- }
-+
-+#ifdef WITH_CONSOLE_KIT
-+ if (ck_session_cookie != NULL) {
-+ close_ck_session (ck_session_cookie);
-+ free (ck_session_cookie);
-+ }
-+#endif
-+
- /*
- * Sometimes the Xsession somehow manages to exit before
- * a server crash is noticed - so we sleep a bit and wait
-diff -up kdebase-3.5.8/kdm/backend/dm.h.consolekit kdebase-3.5.8/kdm/backend/dm.h
---- kdebase-3.5.8/kdm/backend/dm.h.consolekit 2005-09-10 03:26:12.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/dm.h 2007-10-13 12:29:13.000000000 -0500
-@@ -37,6 +37,8 @@ from the copyright holder.
- #ifndef _DM_H_
- #define _DM_H_ 1
-
-+#define WITH_CONSOLE_KIT
-+
- #include "greet.h"
- #include <config.ci>
-
-@@ -476,7 +478,11 @@ char **GRecvArgv( void );
- #define GCONV_BINARY 5
- typedef char *(*GConvFunc)( int what, const char *prompt );
- int Verify( GConvFunc gconv, int rootok );
-+#ifdef WITH_CONSOLE_KIT
-+int StartClient( const char *ck_session_cookie );
-+#else
- int StartClient( void );
-+#endif
- void SessionExit( int status ) ATTR_NORETURN;
- int ReadDmrc( void );
- extern char **userEnviron, **systemEnviron;
-diff -up /dev/null kdebase-3.5.8/kdm/backend/consolekit.c
---- /dev/null 2007-10-02 10:07:00.902689260 -0500
-+++ kdebase-3.5.8/kdm/backend/consolekit.c 2007-10-13 12:29:13.000000000 -0500
-@@ -0,0 +1,552 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2006-2007 William Jon McCann <mccann at jhu.edu>
-+ * Copyright (C) 2007 Kevin Kofler <Kevin at tigcc.ticalc.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *
-+ */
-+
-+#include "dm.h"
-+#include "dm_auth.h"
-+#include "dm_error.h"
-+
-+#include <stdlib.h>
-+#include <string.h>
-+#include <pwd.h>
-+
-+#define DBUS_API_SUBJECT_TO_CHANGE
-+#include <dbus/dbus.h>
-+
-+#include "consolekit.h"
-+
-+
-+#define CK_NAME "org.freedesktop.ConsoleKit"
-+#define CK_PATH "/org/freedesktop/ConsoleKit"
-+#define CK_INTERFACE "org.freedesktop.ConsoleKit"
-+#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager"
-+#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
-+#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-+
-+static DBusConnection *private_connection = NULL;
-+
-+static void
-+add_param_int (DBusMessageIter *iter_struct,
-+ const char *key,
-+ int value)
-+{
-+ DBusMessageIter iter_struct_entry;
-+ DBusMessageIter iter_var;
-+
-+ dbus_message_iter_open_container (iter_struct,
-+ DBUS_TYPE_STRUCT,
-+ NULL,
-+ &iter_struct_entry);
-+
-+ dbus_message_iter_append_basic (&iter_struct_entry,
-+ DBUS_TYPE_STRING,
-+ &key);
-+
-+ dbus_message_iter_open_container (&iter_struct_entry,
-+ DBUS_TYPE_VARIANT,
-+ DBUS_TYPE_INT32_AS_STRING,
-+ &iter_var);
-+
-+ dbus_message_iter_append_basic (&iter_var,
-+ DBUS_TYPE_INT32,
-+ &value);
-+
-+ dbus_message_iter_close_container (&iter_struct_entry,
-+ &iter_var);
-+
-+ dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
-+}
-+
-+static void
-+add_param_boolean (DBusMessageIter *iter_struct,
-+ const char *key,
-+ int value)
-+{
-+ DBusMessageIter iter_struct_entry;
-+ DBusMessageIter iter_var;
-+
-+ dbus_message_iter_open_container (iter_struct,
-+ DBUS_TYPE_STRUCT,
-+ NULL,
-+ &iter_struct_entry);
-+
-+ dbus_message_iter_append_basic (&iter_struct_entry,
-+ DBUS_TYPE_STRING,
-+ &key);
-+
-+ dbus_message_iter_open_container (&iter_struct_entry,
-+ DBUS_TYPE_VARIANT,
-+ DBUS_TYPE_BOOLEAN_AS_STRING,
-+ &iter_var);
-+
-+ dbus_message_iter_append_basic (&iter_var,
-+ DBUS_TYPE_BOOLEAN,
-+ &value);
-+
-+ dbus_message_iter_close_container (&iter_struct_entry,
-+ &iter_var);
-+
-+ dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
-+}
-+
-+static void
-+add_param_string (DBusMessageIter *iter_struct,
-+ const char *key,
-+ const char *value)
-+{
-+ DBusMessageIter iter_struct_entry;
-+ DBusMessageIter iter_var;
-+
-+ dbus_message_iter_open_container (iter_struct,
-+ DBUS_TYPE_STRUCT,
-+ NULL,
-+ &iter_struct_entry);
-+
-+ dbus_message_iter_append_basic (&iter_struct_entry,
-+ DBUS_TYPE_STRING,
-+ &key);
-+
-+ dbus_message_iter_open_container (&iter_struct_entry,
-+ DBUS_TYPE_VARIANT,
-+ DBUS_TYPE_STRING_AS_STRING,
-+ &iter_var);
-+
-+ dbus_message_iter_append_basic (&iter_var,
-+ DBUS_TYPE_STRING,
-+ &value);
-+
-+ dbus_message_iter_close_container (&iter_struct_entry,
-+ &iter_var);
-+
-+ dbus_message_iter_close_container (iter_struct, &iter_struct_entry);
-+}
-+
-+static int
-+session_get_x11_display (DBusConnection *connection,
-+ const char *ssid,
-+ char **str)
-+{
-+ DBusError error;
-+ DBusMessage *message;
-+ DBusMessage *reply;
-+ DBusMessageIter iter;
-+ const char *value;
-+
-+ if (str != NULL) {
-+ *str = NULL;
-+ }
-+
-+ message = dbus_message_new_method_call (CK_NAME,
-+ ssid,
-+ CK_SESSION_INTERFACE,
-+ "GetX11Display");
-+ if (message == NULL) {
-+ Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
-+ return FALSE;
-+ }
-+
-+ dbus_error_init (&error);
-+ reply = dbus_connection_send_with_reply_and_block (connection,
-+ message,
-+ -1, &error);
-+ if (dbus_error_is_set (&error)) {
-+ Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
-+ reply = NULL;
-+ }
-+
-+ dbus_connection_flush (connection);
-+ dbus_message_unref (message);
-+
-+ if (reply == NULL) {
-+ return FALSE;
-+ }
-+
-+ dbus_message_iter_init (reply, &iter);
-+ dbus_message_iter_get_basic (&iter, &value);
-+ if (str != NULL) {
-+ *str = strdup (value);
-+ }
-+ dbus_message_unref (reply);
-+
-+ return TRUE;
-+}
-+
-+static int
-+session_unlock (DBusConnection *connection,
-+ const char *ssid)
-+{
-+ DBusError error;
-+ DBusMessage *message;
-+ DBusMessage *reply;
-+
-+ Debug ("ConsoleKit: Unlocking session %s", ssid);
-+ message = dbus_message_new_method_call (CK_NAME,
-+ ssid,
-+ CK_SESSION_INTERFACE,
-+ "Unlock");
-+ if (message == NULL) {
-+ Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
-+ return FALSE;
-+ }
-+
-+ dbus_error_init (&error);
-+ reply = dbus_connection_send_with_reply_and_block (connection,
-+ message,
-+ -1, &error);
-+ dbus_message_unref (message);
-+ dbus_message_unref (reply);
-+ dbus_connection_flush (connection);
-+
-+ if (dbus_error_is_set (&error)) {
-+ Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
-+ return FALSE;
-+ }
-+
-+ return TRUE;
-+}
-+
-+/* from libhal */
-+static char **
-+get_path_array_from_iter (DBusMessageIter *iter,
-+ int *num_elements)
-+{
-+ int count;
-+ char **buffer;
-+
-+ count = 0;
-+ buffer = (char **)malloc (sizeof (char *) * 8);
-+
-+ if (buffer == NULL)
-+ goto oom;
-+
-+ buffer[0] = NULL;
-+ while (dbus_message_iter_get_arg_type (iter) == DBUS_TYPE_OBJECT_PATH) {
-+ const char *value;
-+ char *str;
-+
-+ if ((count % 8) == 0 && count != 0) {
-+ buffer = realloc (buffer, sizeof (char *) * (count + 8));
-+ if (buffer == NULL)
-+ goto oom;
-+ }
-+
-+ dbus_message_iter_get_basic (iter, &value);
-+ str = strdup (value);
-+ if (str == NULL)
-+ goto oom;
-+
-+ buffer[count] = str;
-+
-+ dbus_message_iter_next (iter);
-+ count++;
-+ }
-+
-+ if ((count % 8) == 0) {
-+ buffer = realloc (buffer, sizeof (char *) * (count + 1));
-+ if (buffer == NULL)
-+ goto oom;
-+ }
-+
-+ buffer[count] = NULL;
-+ if (num_elements != NULL)
-+ *num_elements = count;
-+ return buffer;
-+
-+oom:
-+ LogWarn ("%s %d : error allocating memory\n", __FILE__, __LINE__);
-+ return NULL;
-+
-+}
-+
-+static char **
-+get_sessions_for_user (DBusConnection *connection,
-+ const char *user,
-+ const char *x11_display)
-+{
-+ DBusError error;
-+ DBusMessage *message;
-+ DBusMessage *reply;
-+ DBusMessageIter iter;
-+ DBusMessageIter iter_reply;
-+ DBusMessageIter iter_array;
-+ struct passwd *pwent;
-+ char **sessions;
-+
-+ sessions = NULL;
-+ message = NULL;
-+ reply = NULL;
-+
-+ pwent = getpwnam (user);
-+
-+ dbus_error_init (&error);
-+ message = dbus_message_new_method_call (CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE,
-+ "GetSessionsForUser");
-+ if (message == NULL) {
-+ Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
-+ goto out;
-+ }
-+
-+ dbus_message_iter_init_append (message, &iter);
-+ dbus_message_iter_append_basic (&iter,
-+ DBUS_TYPE_UINT32,
-+ &pwent->pw_uid);
-+
-+ dbus_error_init (&error);
-+ reply = dbus_connection_send_with_reply_and_block (connection,
-+ message,
-+ -1, &error);
-+ dbus_connection_flush (connection);
-+
-+ if (dbus_error_is_set (&error)) {
-+ Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
-+ goto out;
-+ }
-+
-+ if (reply == NULL) {
-+ Debug ("ConsoleKit: No reply for GetSessionsForUser");
-+ goto out;
-+ }
-+
-+ dbus_message_iter_init (reply, &iter_reply);
-+ if (dbus_message_iter_get_arg_type (&iter_reply) != DBUS_TYPE_ARRAY) {
-+ Debug ("ConsoleKit: Wrong reply for GetSessionsForUser - expecting an array.");
-+ goto out;
-+ }
-+
-+ dbus_message_iter_recurse (&iter_reply, &iter_array);
-+ sessions = get_path_array_from_iter (&iter_array, NULL);
-+
-+ out:
-+ if (message != NULL) {
-+ dbus_message_unref (message);
-+ }
-+ if (reply != NULL) {
-+ dbus_message_unref (reply);
-+ }
-+
-+ return sessions;
-+}
-+
-+void
-+unlock_ck_session (const char *user,
-+ const char *x11_display)
-+{
-+ DBusError error;
-+ DBusConnection *connection;
-+ char **sessions;
-+ int i;
-+
-+ Debug ("ConsoleKit: Unlocking session for %s on %s", user, x11_display);
-+
-+ dbus_error_init (&error);
-+ connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
-+ if (connection == NULL) {
-+ Debug ("ConsoleKit: Failed to connect to the D-Bus daemon: %s", error.message);
-+ dbus_error_free (&error);
-+ return;
-+ }
-+
-+ sessions = get_sessions_for_user (connection, user, x11_display);
-+ if (sessions == NULL || sessions[0] == NULL) {
-+ Debug ("ConsoleKit: no sessions found");
-+ return;
-+ }
-+
-+ for (i = 0; sessions[i] != NULL; i++) {
-+ char *ssid;
-+ char *xdisplay;
-+
-+ ssid = sessions[i];
-+ session_get_x11_display (connection, ssid, &xdisplay);
-+ Debug ("ConsoleKit: session %s has DISPLAY %s", ssid, xdisplay);
-+
-+ if (xdisplay != NULL
-+ && x11_display != NULL
-+ && strcmp (xdisplay, x11_display) == 0) {
-+ int res;
-+
-+ res = session_unlock (connection, ssid);
-+ if (! res) {
-+ LogError ("ConsoleKit: Unable to unlock %s", ssid);
-+ }
-+ }
-+
-+ free (xdisplay);
-+ }
-+
-+ freeStrArr (sessions);
-+}
-+
-+char *
-+open_ck_session (struct passwd *pwent,
-+ struct display *d)
-+{
-+ DBusConnection *connection;
-+ DBusError error;
-+ DBusMessage *message;
-+ DBusMessage *reply;
-+ DBusMessageIter iter;
-+ DBusMessageIter iter_struct;
-+ char *cookie;
-+
-+ cookie = NULL;
-+
-+ Debug ("ConsoleKit: Opening session for %s", pwent->pw_name);
-+
-+ dbus_error_init (&error);
-+ connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &error);
-+ private_connection = connection;
-+
-+ if (connection == NULL) {
-+ Debug ("ConsoleKit: Failed to connect to the D-Bus daemon: %s", error.message);
-+ dbus_error_free (&error);
-+ return NULL;
-+ }
-+
-+ dbus_connection_set_exit_on_disconnect (connection, FALSE);
-+ /* FIXME: What to do about these?
-+ dbus_connection_set_watch_functions( connection,
-+ dbusAddWatch,
-+ dbusRemoveWatch,
-+ dbusToggleWatch,
-+ data, 0 );
-+ dbus_connection_set_timeout_functions( connection,
-+ dbusAddTimeout,
-+ dbusRemoveTimeout,
-+ dbusToggleTimeout,
-+ data, 0 );
-+ dbus_connection_set_wakeup_main_function( connection,
-+ dbusWakeupMain,
-+ data, 0 ); */
-+
-+ dbus_error_init (&error);
-+ message = dbus_message_new_method_call (CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE,
-+ "OpenSessionWithParameters");
-+ if (message == NULL) {
-+ Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
-+ return NULL;
-+ }
-+
-+ dbus_message_iter_init_append (message, &iter);
-+ dbus_message_iter_open_container (&iter,
-+ DBUS_TYPE_ARRAY,
-+ DBUS_STRUCT_BEGIN_CHAR_AS_STRING
-+ DBUS_TYPE_STRING_AS_STRING
-+ DBUS_TYPE_VARIANT_AS_STRING
-+ DBUS_STRUCT_END_CHAR_AS_STRING,
-+ &iter_struct);
-+
-+ add_param_int (&iter_struct, "user", pwent->pw_uid);
-+ add_param_string (&iter_struct, "x11-display", d->name);
-+ add_param_boolean (&iter_struct, "is-local", ((d->displayType & d_location) == dLocal));
-+#ifdef XDMCP
-+ if ((d->displayType & d_location) != dLocal && d->remoteHost) {
-+ add_param_string (&iter_struct, "remote-host-name", d->remoteHost);
-+ }
-+#endif
-+
-+#ifdef HAVE_VTS
-+ if (d->serverVT > 0) {
-+ char device[20];
-+
-+ /* FIXME: how does xorg construct this */
-+ sprintf(device, "/dev/tty%d", d->serverVT);
-+ add_param_string (&iter_struct, "x11-display-device", device);
-+ }
-+#endif
-+
-+ dbus_message_iter_close_container (&iter, &iter_struct);
-+
-+ reply = dbus_connection_send_with_reply_and_block (connection,
-+ message,
-+ -1, &error);
-+ if (dbus_error_is_set (&error)) {
-+ Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
-+ reply = NULL;
-+ }
-+
-+ dbus_connection_flush (connection);
-+
-+ dbus_message_unref (message);
-+ dbus_error_free (&error);
-+
-+ if (reply != NULL) {
-+ const char *value;
-+
-+ dbus_message_iter_init (reply, &iter);
-+ dbus_message_iter_get_basic (&iter, &value);
-+ cookie = strdup (value);
-+ dbus_message_unref (reply);
-+ }
-+
-+ return cookie;
-+}
-+
-+void
-+close_ck_session (const char *cookie)
-+{
-+ DBusError error;
-+ DBusMessage *message;
-+ DBusMessage *reply;
-+ DBusMessageIter iter;
-+
-+ if (cookie == NULL) {
-+ return;
-+ }
-+
-+ if (private_connection == NULL) {
-+ return;
-+ }
-+
-+ dbus_error_init (&error);
-+ message = dbus_message_new_method_call (CK_NAME,
-+ CK_MANAGER_PATH,
-+ CK_MANAGER_INTERFACE,
-+ "CloseSession");
-+ if (message == NULL) {
-+ Debug ("ConsoleKit: Couldn't allocate the D-Bus message");
-+ return;
-+ }
-+
-+ dbus_message_iter_init_append (message, &iter);
-+ dbus_message_iter_append_basic (&iter,
-+ DBUS_TYPE_STRING,
-+ &cookie);
-+
-+ reply = dbus_connection_send_with_reply_and_block (private_connection,
-+ message,
-+ -1, &error);
-+ if (dbus_error_is_set (&error)) {
-+ Debug ("ConsoleKit: %s raised:\n %s\n\n", error.name, error.message);
-+ reply = NULL;
-+ }
-+
-+ dbus_connection_flush (private_connection);
-+
-+ dbus_message_unref (message);
-+ dbus_error_free (&error);
-+
-+ dbus_connection_close (private_connection);
-+ private_connection = NULL;
-+}
-diff -up kdebase-3.5.8/kdm/backend/Imakefile.consolekit kdebase-3.5.8/kdm/backend/Imakefile
---- kdebase-3.5.8/kdm/backend/Imakefile.consolekit 2005-09-10 03:26:12.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/Imakefile 2007-10-13 12:29:13.000000000 -0500
-@@ -155,13 +155,13 @@ PROCTITLE_DEFINES = -DHAS_SETPROCTITLE
- netaddr.c reset.c resource.c protodpy.c policy.c \
- session.c socket.c streams.c util.c xdmcp.c \
- process.c mitauth.c \
-- genauth.c access.c choose.c \
-+ genauth.c access.c choose.c consolekit.c \
- $(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS)
- COMMOBJS = auth.o daemon.o server.o dpylist.o dm.o error.o \
- netaddr.o reset.o resource.o protodpy.o policy.o \
- session.o socket.o streams.o util.o xdmcp.o \
- process.o mitauth.o \
-- genauth.o access.o choose.o \
-+ genauth.o access.o choose.o consolekit.o \
- $(XDMAUTHOBJS) $(RPCOBJS) $(KRB5OBJS)
-
- SRCS1 = $(COMMSRCS) client.c
-diff -up kdebase-3.5.8/kdm/backend/Makefile.am.consolekit kdebase-3.5.8/kdm/backend/Makefile.am
---- kdebase-3.5.8/kdm/backend/Makefile.am.consolekit 2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/Makefile.am 2007-10-13 12:30:24.000000000 -0500
-@@ -1,9 +1,9 @@
- # forcibly remove thread-related defines & flags
- AUTOMAKE_OPTIONS = foreign
--CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) -I.. -I../..
-+CPPFLAGS = $(USER_INCLUDES) $(X_INCLUDES) $(KRB4_INCS) $(KRB5_INCS) $(DBUS_INCS) -I.. -I../..
- LDFLAGS = $(USER_LDFLAGS) $(X_LDFLAGS) $(X_RPATH) $(KRB4_RPATH) $(KRB5_RPATH)
- LDADD = $(LIB_X11) -lXau $(LIBXDMCP) $(PASSWDLIBS) $(LIBSHADOW) $(LIBGEN) \
-- $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
-+ $(LIB_LIBS) $(KRB4_LIBS) $(KRB5_LIBS) $(DBUS_LIBS) $(LIBSOCKET) $(LIBRESOLV) \
- $(LIBUCB) $(LIBUTIL) $(LIBPOSIX4)
-
- bin_PROGRAMS = kdm
-@@ -13,6 +13,7 @@ kdm_SOURCES = \
- bootman.c \
- choose.c \
- client.c \
-+ consolekit.c \
- ctrl.c \
- daemon.c \
- dm.c \
-diff -up kdebase-3.5.8/kdm/backend/client.c.consolekit kdebase-3.5.8/kdm/backend/client.c
---- kdebase-3.5.8/kdm/backend/client.c.consolekit 2007-10-08 04:51:33.000000000 -0500
-+++ kdebase-3.5.8/kdm/backend/client.c 2007-10-13 12:29:13.000000000 -0500
-@@ -82,6 +82,10 @@ extern int loginsuccess( const char *Use
- # include <shadow.h>
- #endif
-
-+#ifdef WITH_CONSOLE_KIT
-+#include "consolekit.h"
-+#endif
-+
- /*
- * Session data, mostly what struct verify_info was for
- */
-@@ -1120,8 +1124,13 @@ static int removeSession;
- static int removeCreds;
- #endif
-
-+#ifdef WITH_CONSOLE_KIT
-+int
-+StartClient( const char *ck_session_cookie )
-+#else
- int
- StartClient()
-+#endif
- {
- const char *home, *sessargs, *desksess;
- char **env, *xma;
-@@ -1217,6 +1226,11 @@ StartClient()
- if (krbtkfile[0] != '\0')
- env = setEnv( env, "KRBTKFILE", krbtkfile );
- #endif
-+#ifdef WITH_CONSOLE_KIT
-+ if (ck_session_cookie != NULL) {
-+ env = setEnv ( env, "XDG_SESSION_COOKIE", ck_session_cookie );
-+ }
-+#endif
- userEnviron = inheritEnv( env, envvars );
- env = systemEnv( p->pw_name );
- systemEnviron = setEnv( env, "HOME", p->pw_dir );
diff --git a/kdebase-kdm-default_background.patch b/kdebase-kdm-default_background.patch
index 77714cd..3d3d8ab 100644
--- a/kdebase-kdm-default_background.patch
+++ b/kdebase-kdm-default_background.patch
@@ -1,7 +1,7 @@
---- kdebase-3.5.4/kcontrol/background/bgdialog.cpp.orig 2006-09-30 23:07:48.000000000 +0200
-+++ kdebase-3.5.4/kcontrol/background/bgdialog.cpp 2006-10-01 14:23:52.000000000 +0200
-@@ -362,6 +362,48 @@
- load( true );
+--- kdebase-trinity-3.5.13.2/kcontrol/background/bgdialog.cpp~ 2012-09-16 15:52:02.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kcontrol/background/bgdialog.cpp 2014-05-27 14:55:13.858446285 +0300
+@@ -380,6 +380,48 @@
+ eRenderer()->setWallpaper( eRenderer()->wallpaper() );
}
+void BGDialog::kdmdefaults()
@@ -46,7 +46,7 @@
+ emit changed(true);
+}
+
- QString BGDialog::quickHelp() const
+ TQString BGDialog::quickHelp() const
{
return i18n("<h1>Background</h1> This module allows you to control the"
--- kdebase-030317/kcontrol/background/bgdialog.h~ Thu Feb 6 00:35:39 2003
diff --git a/kdebase-kdmconfig.patch b/kdebase-kdmconfig.patch
index 0a0afb2..a952d53 100644
--- a/kdebase-kdmconfig.patch
+++ b/kdebase-kdmconfig.patch
@@ -9,35 +9,35 @@
m_background = new BGDialog( this, m_simpleConf, false );
connect(m_background, SIGNAL(changed(bool)), SIGNAL(changed(bool)));
---- kdebase-031010/kcontrol/kdm/kdm-appear.cpp.orig 2003-09-23 21:46:11.000000000 +0200
-+++ kdebase-031010/kcontrol/kdm/kdm-appear.cpp 2003-10-10 19:41:03.000000000 +0200
-@@ -385,7 +385,7 @@
- bool KDMAppearanceWidget::setLogo(QString logo)
+--- 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
+@@ -355,7 +355,7 @@
+ bool KDMAppearanceWidget::setLogo(TQString logo)
{
- QString flogo = logo.isEmpty() ?
-- locate("data", QString::fromLatin1("kdm/pics/kdelogo.png") ) :
-+ locate("data", QString::fromLatin1("kdm/pics/pldlogo.png") ) :
+ TQString flogo = logo.isEmpty() ?
+- locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
++ locate("data", TQString::fromLatin1("kdm/pics/pldlogo.png") ) :
logo;
- QPixmap p(flogo);
+ TQImage p(flogo);
if (p.isNull())
-@@ -516,7 +516,7 @@
+@@ -502,7 +502,7 @@
config->setGroup("X-*-Greeter");
// Read the greeting string
-- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n")));
+- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %n")));
+ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to PLD Linux at %n")));
// Regular logo or clock
- QString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -566,7 +566,7 @@
+ TQString logoArea = config->readEntry("LogoArea", "Logo" );
+@@ -556,7 +556,7 @@
void KDMAppearanceWidget::defaults()
{
-- greetstr_lined->setText( i18n("Welcome to %s at %n") );
+- greetstr_lined->setText( i18n("Welcome to %n") );
+ greetstr_lined->setText( i18n("Welcome to PLD Linux at %n") );
logoRadio->setChecked( true );
slotAreaRadioClicked( KdmLogo );
- posCenterRadio->setChecked( true );
+ 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 @@
@@ -49,17 +49,23 @@
m_notFirst = false;
QDir testDir( m_userPixDir );
if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ))
---- kdebase-3.1/kcontrol/kdm/main.cpp.orig Sun Oct 27 00:05:07 2002
-+++ kdebase-3.1/kcontrol/kdm/main.cpp Thu Nov 21 02:51:19 2002
-@@ -92,7 +92,7 @@
- usermap.insert( QString::fromLocal8Bit( ps->pw_name ), ps->pw_uid );
- endpwent();
-
-- config = new KSimpleConfig( QString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
-+ config = new KSimpleConfig( QString::fromLatin1( "/etc/X11/kdm/kdmrc" ));
-
- QVBoxLayout *top = new QVBoxLayout(this);
- tab = new QTabWidget(this);
+--- 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
+@@ -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( "/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( "/etc/X11/kdm/kdmrc" ));
+ }
+
+ TQVBoxLayout *top = new TQVBoxLayout(this);
--- kdebase-030930/kdm/kfrontend/Makefile.am~ 2003-09-30 00:47:50.000000000 +0200
+++ kdebase-030930/kdm/kfrontend/Makefile.am 2003-09-30 10:06:29.000000000 +0200
@@ -38,7 +38,7 @@
@@ -71,8 +77,8 @@
messages:
$(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot
---- kdebase-3.5.4/kdm/config.def.orig 2005-10-10 17:04:31.000000000 +0200
-+++ kdebase-3.5.4/kdm/config.def 2006-10-01 13:13:08.000000000 +0200
+--- 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 @@
#define RCVERMAJOR 2
#define RCVERMINOR 3
@@ -155,16 +161,12 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
-@@ -1921,10 +1921,10 @@
-
- Key: SessionsDirs
- Type: list
--Default: KDMDATA "/sessions"
-+Default: "/usr/share/xsessions"
+@@ -1931,7 +1931,7 @@
+ Default: "/usr/share/xsessions,/var/lib/menu-xdg/xsessions," KDMDATA "/sessions"
User: core
User: greeter-c
--Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
-+Instance: #*/"/etc/X11/sessions"
+-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"
Comment:
The directories containing session type definitions in .desktop format.
Description:
@@ -206,15 +208,18 @@
Comment:
The image to show when LogoArea=Logo.
Description:
-@@ -2044,7 +2044,7 @@
+@@ -2092,9 +2092,9 @@
Key: GreetString
Type: string
--Default: "Welcome to %s at %n"
+-Default: "Welcome to Trinity at %n"
+Default: "Welcome to PLD Linux at %n"
User: greeter
- Instance: #*/"K Desktop Environment (%n)"
+-Instance: #*/"Welcome to Trinity at %n"
++Instance: #*/"Welcome to PLD Linux at %n"
Comment:
+ The headline in the greeter. The following character pairs are replaced:
+ - %d -> current display
@@ -2227,7 +2227,7 @@
Key: MinShowUID
diff --git a/kdebase-kio_settings.patch b/kdebase-kio_settings.patch
index 60c0e78..4a6d269 100644
--- a/kdebase-kio_settings.patch
+++ b/kdebase-kio_settings.patch
@@ -1,12 +1,12 @@
---- kdebase-040519/kioslave/settings/kio_settings.cc.orig 2004-05-19 01:55:33.000000000 +0200
-+++ kdebase-040519/kioslave/settings/kio_settings.cc 2004-05-19 23:47:15.910694936 +0200
-@@ -120,7 +120,7 @@
- KServiceGroup::Ptr SettingsProtocol::findGroup(const QString &relPath)
+--- 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
+@@ -122,7 +122,7 @@
+ KServiceGroup::Ptr SettingsProtocol::findGroup(const TQString &relPath)
{
- QString nextPart;
-- QString alreadyFound("Settings/");
-+ QString alreadyFound("KDE-Settings/");
- QStringList rest = QStringList::split('/', relPath);
+ TQString nextPart;
+- TQString alreadyFound("Settings/");
++ TQString alreadyFound("KDE-Settings/");
+ TQStringList rest = TQStringList::split('/', relPath);
kdDebug() << "Trying harder to find group " << relPath << endl;
@@ -183,7 +183,7 @@
diff --git a/kdebase-konsole-history_clear.patch b/kdebase-konsole-history_clear.patch
index 3f89eb4..2c2fdaa 100644
--- a/kdebase-konsole-history_clear.patch
+++ b/kdebase-konsole-history_clear.patch
@@ -1,11 +1,11 @@
---- kdebase-3.5.4/konsole/konsole/konsole.cpp.wordseps 2006-09-20 14:03:11.000000000 +0200
-+++ kdebase-3.5.4/konsole/konsole/konsole.cpp 2006-09-20 14:39:42.000000000 +0200
-@@ -1066,7 +1066,7 @@
- SLOT(slotSaveHistory()), m_shortcuts, "save_history");
+--- 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 @@
+ TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history");
m_saveHistory->setEnabled(b_histEnabled );
-- m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", 0, this,
-+ m_clearHistory = new KAction(i18n("Clear &History"), "history_clear", Qt::CTRL+Qt::ALT+Qt::Key_W, this,
- SLOT(slotClearHistory()), m_shortcuts, "clear_history");
+- 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),
+ TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history");
m_clearHistory->setEnabled(b_histEnabled);
diff --git a/kdebase-nsplugins_dirs.patch b/kdebase-nsplugins_dirs.patch
index 9e44738..3bb1ff3 100644
--- a/kdebase-nsplugins_dirs.patch
+++ b/kdebase-nsplugins_dirs.patch
@@ -1,11 +1,13 @@
---- kdebase/kcontrol/konqhtml/pluginopts.cpp.org 2007-10-09 09:58:45.408911766 +0200
-+++ kdebase/kcontrol/konqhtml/pluginopts.cpp 2007-10-09 09:59:40.350918314 +0200
-@@ -374,24 +374,8 @@
+--- 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");
+- paths.append("/usr/lib/iceweasel/plugins");
+- paths.append("/usr/lib/iceape/plugins");
- paths.append("/usr/lib/firefox/plugins");
- paths.append("/usr/lib64/browser-plugins");
- paths.append("/usr/lib/browser-plugins");
@@ -22,19 +24,21 @@
- paths.append("/usr/lib64/mozilla/plugins");
- paths.append("$MOZILLA_HOME/plugins");
-
-+ paths.append("/usr/lib/kde3/plugins/konqueror");
-+ paths.append("/usr/lib64/kde3/plugins/konqueror");
++ paths.append("/usr/lib/kde3/plugins/konqueror");
++ paths.append("/usr/lib64/kde3/plugins/konqueror");
}
// fill list
---- kdebase/nsplugins/plugin_paths.cpp.org 2007-10-09 10:00:30.832761847 +0200
-+++ kdebase/nsplugins/plugin_paths.cpp 2007-10-09 10:00:54.760302272 +0200
-@@ -39,23 +39,8 @@
+--- 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") ) {
- QStringList paths;
+ TQStringList paths;
// keep sync with kdebase/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");
- paths.append("/usr/lib64/browser-plugins");
- paths.append("/usr/lib/browser-plugins");
@@ -50,8 +54,8 @@
- paths.append("/usr/lib64/netscape/plugins");
- paths.append("/usr/lib64/mozilla/plugins");
- paths.append("$MOZILLA_HOME/plugins");
-+ paths.append("/usr/lib/kde3/plugins/konqueror");
-+ paths.append("/usr/lib64/kde3/plugins/konqueror");
++ paths.append("/usr/lib/kde3/plugins/konqueror");
++ paths.append("/usr/lib64/kde3/plugins/konqueror");
config->writeEntry( "scanPaths", paths );
}
diff --git a/kdebase-screensavers.patch b/kdebase-screensavers.patch
index 74598bd..f15e3b7 100644
--- a/kdebase-screensavers.patch
+++ b/kdebase-screensavers.patch
@@ -1,5 +1,5 @@
---- kdebase-3.1.1/kcontrol/screensaver/scrnsave.cpp~ 2005-01-14 16:55:19.000000000 +0100
-+++ kdebase-3.1.1/kcontrol/screensaver/scrnsave.cpp 2005-01-14 17:00:15.238121600 +0100
+--- 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;
@@ -13,12 +13,12 @@
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"
-@@ -101,19 +100,6 @@
+@@ -111,19 +111,6 @@
setButtons( KCModule::Help | KCModule::Default | KCModule::Apply );
- // Add KDE specific screensaver path
-- QString relPath="System/ScreenSavers/";
+- TQString relPath="System/ScreenSavers/";
- KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
- if (servGroup)
- {
@@ -43,11 +43,11 @@
+desktopdir = $(kde_datadir)/kscreensaver
EXTRA_DIST = $(desktop_DATA)
---- kdebase-030502/kdesktop/lock/lockprocess.cc~ 2003-05-02 00:36:02.000000000 +0200
-+++ kdebase-030502/kdesktop/lock/lockprocess.cc 2003-05-02 15:41:23.000000000 +0200
-@@ -91,22 +91,9 @@
- XSelectInput( qt_xdisplay(), qt_xrootwin(),
- SubstructureNotifyMask | rootAttr.your_event_mask );
+--- 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 @@
+ }
+ XSelectInput( qt_xdisplay(), qt_xrootwin(), SubstructureNotifyMask | rootAttr.your_event_mask );
- // Add non-KDE path
KGlobal::dirs()->addResourceType("scrsav",
@@ -55,7 +55,7 @@
- "System/ScreenSavers/");
-
- // Add KDE specific screensaver path
-- QString relPath="System/ScreenSavers/";
+- TQString relPath="System/ScreenSavers/";
- KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers");
- if (servGroup)
- {
@@ -68,5 +68,5 @@
+ KGlobal::dirs()->kde_default("data") +
+ "kscreensaver/");
- mLockOnce = false;
-
+ // virtual root property
+ gXA_VROOT = XInternAtom (qt_xdisplay(), "__SWM_VROOT", False);
diff --git a/kdebase-session.patch b/kdebase-session.patch
index 16eddcf..2dca5fd 100644
--- a/kdebase-session.patch
+++ b/kdebase-session.patch
@@ -1,9 +1,9 @@
---- kdebase-3.2.0/kdm/kfrontend/sessions/Makefile.am.orig 2004-01-28 09:13:08.000000000 +0100
-+++ kdebase-3.2.0/kdm/kfrontend/sessions/Makefile.am 2004-01-28 09:19:46.000000000 +0100
+--- kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/Makefile.am~ 2012-09-16 15:52:03.000000000 +0300
++++ kdebase-trinity-3.5.13.2/kdm/kfrontend/sessions/Makefile.am 2014-05-27 14:47:14.574323666 +0300
@@ -1,49 +1,3 @@
-sessionsdir = $(kde_datadir)/kdm/sessions
-sessions_DATA = \
-- kde.desktop gnome.desktop \
+- admin.desktop tde.desktop gnome.desktop \
- 9wm.desktop \
- aewm++.desktop \
- aewm.desktop \
diff --git a/kdebase-startkde.patch b/kdebase-startkde.patch
deleted file mode 100644
index fb80f4a..0000000
--- a/kdebase-startkde.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- kdebase-031021/startkde.orig 2003-10-14 22:48:48.000000000 +0200
-+++ kdebase-031021/startkde 2003-10-21 13:58:14.000000000 +0200
-@@ -259,6 +259,7 @@
-
- # run KPersonalizer before the session, if this is the first login
- if test "$kpersonalizerrc_general_firstlogin" = "true"; then
-+ if [ -x /usr/bin/kpersonalizer ]; then
- # start only dcopserver, don't start whole kdeinit (takes too long)
- echo 'startkde: Running kpersonalizer...' 1>&2
- dcopserver
-@@ -270,6 +271,7 @@
- done
- dcopquit kwin
- dcopserver_shutdown --wait
-+ fi
- fi
-
- # the splashscreen and progress indicator
-
diff --git a/kdebase-tango.patch b/kdebase-tango.patch
deleted file mode 100644
index 37a8c77..0000000
--- a/kdebase-tango.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-ndex: kdialog/kdialog.cpp
-===================================================================
---- kdialog/kdialog.cpp (revision 495779)
-+++ kdialog/kdialog.cpp (working copy)
-@@ -622,6 +622,20 @@
- context = KIcon::Application;
- else if ( contextStr == QString::fromLatin1( "Actions" ) )
- context = KIcon::Action;
-+ else if ( contextStr == QString::fromLatin1( "Animations" ) )
-+ context = KIcon::Animation;
-+ else if ( contextStr == QString::fromLatin1( "Categories" ) )
-+ context = KIcon::Category;
-+ else if ( contextStr == QString::fromLatin1( "Emblems" ) )
-+ context = KIcon::Emblem;
-+ else if ( contextStr == QString::fromLatin1( "Emotes" ) )
-+ context = KIcon::Emote;
-+ else if ( contextStr == QString::fromLatin1( "International" ) )
-+ context = KIcon::International;
-+ else if ( contextStr == QString::fromLatin1( "Places" ) )
-+ context = KIcon::Place;
-+ else if ( contextStr == QString::fromLatin1( "Status" ) )
-+ context = KIcon::StatusIcon;
-
- KIconDialog dlg(0, "icon dialog");
- kapp->setTopWidget( &dlg );
diff --git a/openssl.patch b/openssl.patch
deleted file mode 100644
index 2a22c9a..0000000
--- a/openssl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kdebase-3.5.10/kcontrol/crypto/crypto.cpp~ 2010-05-03 14:04:15.993377732 +0300
-+++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp 2010-05-03 14:04:18.086082037 +0300
-@@ -2321,7 +2321,11 @@
- unsigned int i;
- SSL_CTX *ctx;
- SSL *ssl;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+const SSL_METHOD *meth;
-+#else
- SSL_METHOD *meth;
-+#endif
-
- SSLv2Box->clear();
- SSLv3Box->clear();
-@@ -2337,7 +2341,11 @@
- CipherItem *item;
- for (i=0; ; i++) {
- int j, k;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const SSL_CIPHER *sc;
-+#else
- SSL_CIPHER *sc;
-+#endif
- sc = (meth->get_cipher)(i);
- if (!sc)
- break;
-@@ -2365,7 +2373,11 @@
-
- for (i=0; ; i++) {
- int j, k;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const SSL_CIPHER *sc;
-+#else
- SSL_CIPHER *sc;
-+#endif
- sc = (meth->get_cipher)(i);
- if (!sc)
- break;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kdebase.git/commitdiff/438261a1d04752ea5a085dd7e4444aff945522f4
More information about the pld-cvs-commit
mailing list