diff options
Diffstat (limited to 'x11/kdebase4-runtime/files')
8 files changed, 254 insertions, 128 deletions
diff --git a/x11/kdebase4-runtime/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase4-runtime/files/patch-kcontrol-nics-nic.cpp deleted file mode 100644 index e11c3de5032a..000000000000 --- a/x11/kdebase4-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/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp b/x11/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp deleted file mode 100644 index 7fe3246c2149..000000000000 --- a/x11/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- kcontrol/konq/previews.cpp.orig Sun Oct 26 11:46:25 2003 -+++ kcontrol/konq/previews.cpp Thu Jan 27 10:16:32 2005 -@@ -153,6 +153,11 @@ - - for ( ; it.current() ; ++it ) { - QString protocol( it.current()->text() ); -+ if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) -+ // file should be enabled in case is not defined because if not so -+ // than preview's lost when size is changed from default one -+ it.current()->setOn( true ); -+ else - it.current()->setOn( group.readBoolEntry( protocol, false ) ); - } - // config key is in bytes (default value 1MB), numinput is in MB diff --git a/x11/kdebase4-runtime/files/patch-kdm-backend-xdmcp.c b/x11/kdebase4-runtime/files/patch-kdm-backend-xdmcp.c deleted file mode 100644 index be29ec4d3416..000000000000 --- a/x11/kdebase4-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/kdebase4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def deleted file mode 100644 index 3776abd3beae..000000000000 --- a/x11/kdebase4-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/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c index 4a3ac236fe1d..a6126b314d8e 100644 --- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c +++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c @@ -1,6 +1,6 @@ ---- 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 @@ +--- kdm/kfrontend/genkdmconf.c.orig Wed Feb 23 12:26:01 2005 ++++ kdm/kfrontend/genkdmconf.c Sat Mar 19 16:43:49 2005 +@@ -562,7 +562,7 @@ "# by Xsetup usually.\n" "# This is not required if you use PAM with the pam_console module.\n" "#\n" @@ -9,7 +9,7 @@ "\n" #ifdef _AIX "# We create a pseudodevice for finger. (host:0 becomes xdm/host_0)\n" -@@ -619,8 +619,8 @@ +@@ -591,8 +591,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" @@ -19,8 +19,17 @@ +/* "#chmod 622 /dev/console\n" */ "\n" #ifdef _AIX - "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n" -@@ -667,7 +667,9 @@ + "#devname=`echo $DISPLAY | cut -c1-8`\n" +@@ -609,6 +609,8 @@ + "#! /bin/sh\n" + "# Xsession - run as user\n" + "\n" ++"session=$1\n" ++"\n" + "# Note that the respective logout scripts are not sourced.\n" + "case $SHELL in\n" + " */bash)\n" +@@ -637,7 +639,9 @@ " */csh|*/tcsh)\n" " # [t]cshrc is always sourced automatically.\n" " # Note that sourcing csh.login after .cshrc is non-standard.\n" @@ -31,3 +40,232 @@ " ;;\n" " *) # Plain sh, ksh, and anything we don't know.\n" " [ -f /etc/profile ] && . /etc/profile\n" +@@ -648,7 +652,7 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" +-"case $1 in\n" ++"case $session in\n" + " \"\")\n" + " exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n" + " ;;\n" +@@ -662,10 +666,10 @@ + " exec " KDE_BINDIR "/startkde\n" + " ;;\n" + " *)\n" +-" eval exec \"$1\"\n" ++" eval exec \"$session\"\n" + " ;;\n" + "esac\n" +-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n"; ++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n"; + + static const char def_background[] = + "[Desktop0]\n" +@@ -817,7 +821,7 @@ + * XXX this stuff is highly borked. it does not handle collisions at all. + */ + static int +-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) ) ++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) ) + { + const char *tptr; + char *nname; +@@ -840,12 +844,7 @@ + fprintf( stderr, "Warning: cannot copy file %s\n", ce->value ); + rt = 0; + } else { +- char *nbuf; +- int nlen; +- +- if (!proc || !proc( &file, &nbuf, &nlen ) || +- (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen ))) +- { ++ if (!proc || !proc( &file )) { + if (!use_destdir && !strcmp( ce->value, nname )) + linkedFile( nname ); + else { +@@ -855,7 +854,7 @@ + copiedFile( ce->value ); + } + } else { +- WriteOut( nname, mode, 0, nbuf, nlen ); ++ WriteOut( nname, mode, 0, file.buf, file.eof - file.buf ); + editedFile( ce->value ); + } + if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir) +@@ -1378,7 +1377,7 @@ + + /* + static int +-edit_resources(File *file, char **nbuf, int *nlen) ++edit_resources( File *file ) + { + // XXX remove any login*, chooser*, ... resources + return 0; +@@ -1415,15 +1414,14 @@ + paap = pap += 2; + while (!isspace( *pap )) + pap++; +- for (;;) { +- if (*pp++ != '/') +- goto no; +- for (bpp = pp; *pp != '/'; pp++) +- if (isspace( *pp )) ++ if (*pp != '/') ++ break; ++ for (;;) ++ for (bpp = ++pp; *pp != '/'; pp++) ++ if (!*pp || isspace( *pp )) + goto wbrk; +- } + wbrk: +- if (memcmp( bpp, paap, pap - paap )) ++ if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap )) + break; + } else if (*pap == '\t') { + pap++; +@@ -1472,24 +1470,25 @@ + static int mod_usebg; + + static int +-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED ) ++edit_setup( File *file ) + { +- putval( "UseBackground", +- (delstr( file, "\n" +- "(\n" +- " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" +- " */kdmdesktop\t&\n" +- " echo $! >$PIDFILE\n" +- " wait $!\n" +- " rm $PIDFILE\n" +- ")\t&\n" ) || +- delstr( file, "\n" +- "*/kdmdesktop\t&\n" ) || +- delstr( file, "\n" +- "kdmdesktop\t&\n" ) || +- delstr( file, "\n" +- "kdmdesktop\n" )) ? "true" : "false" ); +- return 0; ++ int chg = ++ delstr( file, "\n" ++ "(\n" ++ " PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" ++ " */kdmdesktop\t&\n" ++ " echo $! >$PIDFILE\n" ++ " wait $!\n" ++ " rm $PIDFILE\n" ++ ")\t&\n" ) | ++ delstr( file, "\n" ++ "*/kdmdesktop\t&\n" ) | ++ delstr( file, "\n" ++ "kdmdesktop\t&\n" ) | ++ delstr( file, "\n" ++ "kdmdesktop\n" ); ++ putval( "UseBackground", chg ? "true" : "false" ); ++ return chg; + } + + static void +@@ -1515,19 +1514,22 @@ + } + + static int +-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED ) ++edit_startup( File *file ) + { ++ int chg1 = 0, chg2 = 0; ++ + if (mod_usebg && +- !delstr( file, "\n" ++ (delstr( file, "\n" + "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" + "if [[] -f $PIDFILE ] ; then\n" + " kill `cat $PIDFILE`\n" +- "fi\n" )) +- delstr( file, "\n" +- "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" +- "test -f $PIDFILE && kill `cat $PIDFILE`\n" ); +- if (oldver < 0x0203) +- putval( "UseSessReg", ( ++ "fi\n" ) || ++ delstr( file, "\n" ++ "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n" ++ "test -f $PIDFILE && kill `cat $PIDFILE`\n" ))) ++ chg1 = 1; ++ if (oldver < 0x0203) { ++ chg2 = + #ifdef _AIX + delstr( file, "\n" + "# We create a pseudodevice for finger. (host:0 becomes [kx]dm/host_0)\n" ); +@@ -1552,11 +1554,11 @@ + " else\n" + " exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n" + " fi\n" +-"fi\n") || ++"fi\n") | + #else + # ifdef BSD + delstr( file, "\n" +-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) || ++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | + # endif + #endif /* _AIX */ + delstr( file, "\n" +@@ -1564,11 +1566,12 @@ + #ifdef BSD + " -x */Xservers" + #endif +-" $USER\n" ) || ++" $USER\n" ) | + delstr( file, "\n" +-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" ) +- ) ? "true" : "false"); +- return 0; ++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" ); ++ putval( "UseSessReg", chg2 ? "true" : "false"); ++ } ++ return chg1 | chg2; + } + + static void +@@ -1592,29 +1595,29 @@ + } + + static int +-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED ) ++edit_reset( File *file ) + { ++ return + #ifdef _AIX +- delstr( file, "\n" ++ delstr( file, "\n" + "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n" + " devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n" + " exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n" +-"fi\n" ); ++"fi\n" ) | + #else + # ifdef BSD +- delstr( file, "\n" +-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ); ++ delstr( file, "\n" ++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | + # endif + #endif /* _AIX */ +- delstr( file, "\n" ++ delstr( file, "\n" + "exec sessreg -d -l $DISPLAY" + # ifdef BSD + " -x */Xservers" + # endif +-" $USER\n" ); +- delstr( file, "\n" ++" $USER\n" ) | ++ delstr( file, "\n" + "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" ); +- return 0; + } + + static void diff --git a/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp deleted file mode 100644 index 553c411983a7..000000000000 --- a/x11/kdebase4-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/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp new file mode 100644 index 000000000000..55eed7247922 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp @@ -0,0 +1,10 @@ +--- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 ++++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 +@@ -457,6 +457,7 @@ + paths.append("/usr/lib64/netscape/plugins"); + paths.append("/usr/lib64/mozilla/plugins"); + paths.append("$MOZILLA_HOME/plugins"); ++ paths.append("/usr/local/lib/linux-flashplugin6"); + config->writeEntry( "scanPaths", paths ); + } + diff --git a/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 deleted file mode 100644 index f31b6341cf9c..000000000000 --- a/x11/kdebase4-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 ) |