diff options
Diffstat (limited to 'x11/kde4-runtime/files')
-rw-r--r-- | x11/kde4-runtime/files/freebsd.keytab | 134 | ||||
-rw-r--r-- | x11/kde4-runtime/files/genkdmconf.sh | 17 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp | 17 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c | 11 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in | 12 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-kdm-kfrontend-config.def | 11 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c | 33 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp | 30 | ||||
-rw-r--r-- | x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 | 39 |
9 files changed, 0 insertions, 304 deletions
diff --git a/x11/kde4-runtime/files/freebsd.keytab b/x11/kde4-runtime/files/freebsd.keytab deleted file mode 100644 index 2607089e1dbe..000000000000 --- a/x11/kde4-runtime/files/freebsd.keytab +++ /dev/null @@ -1,134 +0,0 @@ -# [freebsd.keytab] Konsole Keyboard Table (FreeBSD console keys) -# -# $FreeBSD$ -# -------------------------------------------------------------- - -# NOT TESTED, MAY NEED SOME CLEANUPS -keyboard "freebsd console" - -# -------------------------------------------------------------- -# -# This configuration table allows to customize the -# meaning of the keys. -# -# The syntax is that each entry has the form : -# -# "key" Keyname { ("+"|"-") Modename } ":" (String|Operation) -# -# Keynames are those defined in <qnamespace.h> with the -# "Qt::Key_" removed. (We'd better insert the list here) -# -# Mode names are : -# -# - Shift -# - Alt -# - Control -# -# The VT100 emulation has two modes that can affect the -# sequences emitted by certain keys. These modes are -# under control of the client program. -# -# - Newline : effects Return and Enter key. -# - Application : effects Up and Down key. -# -# - Ansi : effects Up and Down key (This is for VT52, really). -# -# Operations are -# -# - scrollUpLine -# - scrollUpPage -# - scrollDownLine -# - scrollDownPage -# -# - emitSelection -# -# If the key is not found here, the text of the -# key event as provided by QT is emitted, possibly -# preceeded by ESC if the Alt key is pressed. -# -# -------------------------------------------------------------- - -key Escape : "\E" -key Tab : "\t" - -# VT100 can add an extra \n after return. -# The NewLine mode is set by an escape sequence. - -key Return-NewLine : "\r" -key Return+NewLine : "\r\n" - -# Some desperately try to save the ^H. - -key Backspace : "\x08" # Control H -key Delete : "\E[3~" - -# These codes are for the VT52 mode of VT100 -# The Ansi mode (i.e. VT100 mode) is set by -# an escape sequence - -key Up -Shift-Ansi : "\EA" -key Down -Shift-Ansi : "\EB" -key Right-Shift-Ansi : "\EC" -key Left -Shift-Ansi : "\ED" - -# VT100 emits a mode bit together -# with the arrow keys.The AppCuKeys -# mode is set by an escape sequence. - -key Up -Shift+Ansi+AppCuKeys : "\EOA" -key Down -Shift+Ansi+AppCuKeys : "\EOB" -key Right-Shift+Ansi+AppCuKeys : "\EOC" -key Left -Shift+Ansi+AppCuKeys : "\EOD" - -key Up -Shift+Ansi-AppCuKeys : "\E[A" -key Down -Shift+Ansi-AppCuKeys : "\E[B" -key Right-Shift+Ansi-AppCuKeys : "\E[C" -key Left -Shift+Ansi-AppCuKeys : "\E[D" - -# FreeBSD functions keys F1-F5 differ from Xterm - -key F1 : "\E[[A" -key F2 : "\E[[B" -key F3 : "\E[[C" -key F4 : "\E[[D" -key F5 : "\E[[E" - -key F6 : "\E[17~" -key F7 : "\E[18~" -key F8 : "\E[19~" -key F9 : "\E[20~" -key F10 : "\E[21~" -key F11 : "\E[23~" -key F12 : "\E[24~" - -key Home : "\E[1~" -key End : "\E[4~" - -key Prior -Shift : "\E[5~" -key Next -Shift : "\E[6~" -key Insert-Shift : "\E[2~" - -# Keypad-Enter. See comment on Return above. - -key Enter+NewLine : "\r\n" -key Enter-NewLine : "\r" - -key Space +Control : "\x00" - -# some of keys are used by konsole. - -key Up +Shift : scrollLineUp -key Prior +Shift : scrollPageUp -key Down +Shift : scrollLineDown -key Next +Shift : scrollPageDown - -key ScrollLock : scrollLock - -#---------------------------------------------------------- - -# keypad characters as offered by Qt -# cannot be recognized as such. - -#---------------------------------------------------------- - -# Following other strings as emitted by konsole. diff --git a/x11/kde4-runtime/files/genkdmconf.sh b/x11/kde4-runtime/files/genkdmconf.sh deleted file mode 100644 index 479317482140..000000000000 --- a/x11/kde4-runtime/files/genkdmconf.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#first, set a path for an X app -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin -export PATH - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -fi diff --git a/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp b/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp deleted file mode 100644 index e11c3de5032a..000000000000 --- a/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- kcontrol/nics/nic.cpp 15 Nov 2003 22:01:05 -0000 1.24 -+++ kcontrol/nics/nic.cpp 21 Jan 2004 13:38:46 -0000 -@@ -229,9 +229,14 @@ NICList* findNICs() - tmp->addr = buf; - - if (ifa->ifa_netmask != NULL) { -+#ifdef Q_OS_FREEBSD -+ struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask; -+ tmp->netmask=inet_ntoa(sinptr->sin_addr); -+#else - bzero(buf, 128); - getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); - tmp->netmask = buf; -+#endif - } - - if (ifa->ifa_flags & IFF_UP) diff --git a/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c b/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c deleted file mode 100644 index be29ec4d3416..000000000000 --- a/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/backend/xdmcp.c.orig Wed May 8 14:21:31 2002 -+++ kdm/backend/xdmcp.c Wed Jun 26 20:14:02 2002 -@@ -1012,7 +1012,7 @@ - - sprintf (buf, "Session %ld failed for display %.260s: %s", - (long) sessionID, name, reason); -- Debug ("send_failed(%\"s)\n", buf); -+ Debug ("send_failed(\"%s\")\n", buf); - status.length = strlen (buf); - status.data = (CARD8Ptr) buf; - header.version = XDM_PROTOCOL_VERSION; diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in deleted file mode 100644 index a81fd6da8f38..000000000000 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive - - --install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) -- - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def deleted file mode 100644 index 3776abd3beae..000000000000 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/kfrontend/config.def.orig Thu Nov 11 20:47:50 2004 -+++ kdm/kfrontend/config.def Thu Nov 11 20:51:18 2004 -@@ -10,7 +10,7 @@ - # define HALT_CMD "/usr/sbin/shutdown -h now" - # define REBOOT_CMD "/usr/sbin/shutdown -r now" - #elif defined(BSD) --# define HALT_CMD "/sbin/shutdown -h now" -+# define HALT_CMD "/sbin/shutdown -p now" - # define REBOOT_CMD "/sbin/shutdown -r now" - #elif defined(__SVR4) - # define HALT_CMD "/usr/sbin/halt" diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index 4a3ac236fe1d..000000000000 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,33 +0,0 @@ ---- kdm/kfrontend/genkdmconf.c.orig Sun Nov 28 18:26:14 2004 -+++ kdm/kfrontend/genkdmconf.c Thu Dec 2 00:41:46 2004 -@@ -578,7 +578,7 @@ - "# by Xsetup usually.\n" - "# This is not required if you use PAM with the pam_console module.\n" - "#\n" --"#chown $USER /dev/console\n" -+"chown $USER /dev/console\n" - "\n" - #ifdef _AIX - "# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n" -@@ -619,8 +619,8 @@ - "# Reassign ownership of the console to root, this should disallow\n" - "# assignment of console output to any random users's xterm. See Xstartup.\n" - "#\n" --"#chown root /dev/console\n" --"#chmod 622 /dev/console\n" -+"chown root /dev/console\n" -+/* "#chmod 622 /dev/console\n" */ - "\n" - #ifdef _AIX - "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -667,7 +667,9 @@ - " */csh|*/tcsh)\n" - " # [t]cshrc is always sourced automatically.\n" - " # Note that sourcing csh.login after .cshrc is non-standard.\n" --" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n" -+" set -a\n" -+" eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n" -+" set +a\n" - " ;;\n" - " *) # Plain sh, ksh, and anything we don't know.\n" - " [ -f /etc/profile ] && . /etc/profile\n" diff --git a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp deleted file mode 100644 index 553c411983a7..000000000000 --- a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp +++ /dev/null @@ -1,30 +0,0 @@ ---- konsole/konsole/konsole.cpp 16 Nov 2004 16:46:00 -0000 1.472.2.6 -+++ konsole/konsole/konsole.cpp 1 Dec 2004 17:05:30 -0000 1.472.2.7 -@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s) - createSessionTab(te, SmallIconSet(s->IconName()), newTitle); - setSchema(s->schemaNo()); - tabwidget->setCurrentPage(tabwidget->count()-1); -- disableMasterModeConnections(); // no duplicate connections, remove old -- enableMasterModeConnections(); -- } -- if( tabwidget ) -- m_removeSessionButton->setEnabled(tabwidget->count()>1); -+ disableMasterModeConnections(); // no duplicate connections, remove old -+ enableMasterModeConnections(); -+ if(m_removeSessionButton) -+ m_removeSessionButton->setEnabled(tabwidget->count()>1); -+ } - } - - QString Konsole::currentSession() -@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s) - rootxpms.remove(s->widget()); - } - delete s->widget(); -- if( tabwidget ) -- m_removeSessionButton->setEnabled(tabwidget->count()>1); -+ if (m_removeSessionButton) -+ m_removeSessionButton->setEnabled(tabwidget->count()>1); - } - session2action.remove(s); - action2session.remove(ra); diff --git a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 deleted file mode 100644 index f31b6341cf9c..000000000000 --- a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 +++ /dev/null @@ -1,39 +0,0 @@ -Index: konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1342.2.14 -diff -u -p -r1.1342.2.14 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 24 Nov 2004 18:29:51 -0000 1.1342.2.14 -+++ konqueror/konq_mainwindow.cc 12 Dec 2004 15:54:46 -0000 -@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP - QString viewName = view->viewName(); - kdDebug() << " - viewName=" << viewName << " " - << "frame names:" << view->frameNames().join( "," ) << endl; -+ -+ // First look for a hostextension containing this frame name -+ KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); -+ if ( ext ) -+ { -+ ext = ext->findFrameParent(callingPart, name); -+ kdDebug() << "BrowserHostExtension found part " << ext << endl; -+ if (!ext) -+ continue; // Don't use this window -+ } -+ - if ( !viewName.isEmpty() && viewName == name ) - { - kdDebug() << "found existing view by name: " << view << endl; -@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP - return view; - } - -- // First look for a hostextension containing this frame name -- KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); -- if ( ext ) -- { -- ext = ext->findFrameParent(callingPart, name); -- } -- - // KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name ); - - if ( ext ) |