aboutsummaryrefslogtreecommitdiff
path: root/x11/kde4-baseapps/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kde4-baseapps/files')
-rw-r--r--x11/kde4-baseapps/files/freebsd.keytab134
-rw-r--r--x11/kde4-baseapps/files/genkdmconf.sh17
-rw-r--r--x11/kde4-baseapps/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp56
-rw-r--r--x11/kde4-baseapps/files/patch-kdeprint_descriptions_Makefile.in13
-rw-r--r--x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in12
-rw-r--r--x11/kde4-baseapps/files/patch-kioslave_ldap_Makefile.in9
-rw-r--r--x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp63
-rw-r--r--x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.h37
-rw-r--r--x11/kde4-baseapps/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp22
-rw-r--r--x11/kde4-baseapps/files/patch-konqueror_konq_mainwindow.cc19
-rw-r--r--x11/kde4-baseapps/files/patch-kwin_Makefile.in11
-rw-r--r--x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp11
12 files changed, 0 insertions, 404 deletions
diff --git a/x11/kde4-baseapps/files/freebsd.keytab b/x11/kde4-baseapps/files/freebsd.keytab
deleted file mode 100644
index 2607089e1dbe..000000000000
--- a/x11/kde4-baseapps/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-baseapps/files/genkdmconf.sh b/x11/kde4-baseapps/files/genkdmconf.sh
deleted file mode 100644
index 479317482140..000000000000
--- a/x11/kde4-baseapps/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-baseapps/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp b/x11/kde4-baseapps/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp
deleted file mode 100644
index d718e60f329f..000000000000
--- a/x11/kde4-baseapps/files/patch-kcontrol_ebrowsing_plugins_shorturi_kshorturifilter.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
---- kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp.orig Sat Aug 6 01:48:21 2005
-+++ kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp Sat Aug 6 01:58:48 2005
-@@ -216,6 +216,7 @@
- QString path;
- QString ref;
- QString query;
-+ QString nameFilter;
-
- if (KURL::isRelativeURL(cmd) && QDir::isRelativePath(cmd)) {
- path = cmd;
-@@ -228,7 +229,8 @@
- // but not for "/tmp/a#b", if "a#b" is an existing file,
- // or for "/tmp/a?b" (#58990)
- if ( ( url.hasRef() || !url.query().isEmpty() ) // avoid the calling exists() when not needed
-- && QFile::exists(url.path()) )
-+ && QFile::exists(url.path())
-+ && !url.path().endsWith(QFL1("/")) ) // /tmp/?foo is a namefilter, not a query
- {
- path = url.path();
- ref = url.ref();
-@@ -338,6 +340,24 @@
- if( isLocalFullPath && !exists )
- {
- exists = ( stat( QFile::encodeName(path).data() , &buff ) == 0 );
-+ if ( !exists ) {
-+ // Support for name filter (/foo/*.txt), see also KonqMainWindow::detectNameFilter
-+ // If the app using this filter doesn't support it, well, it'll simply error out itself
-+ int lastSlash = path.findRev( '/' );
-+ if ( lastSlash > -1 && path.find( ' ', lastSlash ) == -1 ) // no space after last slash, otherwise it's more likely command-line arguments
-+ {
-+ QString fileName = path.mid( lastSlash + 1 );
-+ QString testPath = path.left( lastSlash + 1 );
-+ if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
-+ && stat( QFile::encodeName(testPath).data(), &buff ) == 0 )
-+ {
-+ nameFilter = fileName;
-+ kdDebug() << "Setting nameFilter to " << nameFilter << endl;
-+ path = testPath;
-+ exists = true;
-+ }
-+ }
-+ }
- }
-
- //kdDebug() << "path =" << path << " isLocalFullPath=" << isLocalFullPath << " exists=" << exists << endl;
-@@ -370,7 +390,9 @@
- // Open "uri" as file:/xxx if it is a non-executable local resource.
- if( isDir || S_ISREG( buff.st_mode ) )
- {
-- //kdDebug() << "Abs path as local file" << endl;
-+ //kdDebug() << "Abs path as local file or directory" << endl;
-+ if ( !nameFilter.isEmpty() )
-+ u.setFileName( nameFilter );
- setFilteredURI( data, u );
- setURIType( data, ( isDir ) ? KURIFilterData::LOCAL_DIR : KURIFilterData::LOCAL_FILE );
- return true;
diff --git a/x11/kde4-baseapps/files/patch-kdeprint_descriptions_Makefile.in b/x11/kde4-baseapps/files/patch-kdeprint_descriptions_Makefile.in
deleted file mode 100644
index 5cf57be2d1c7..000000000000
--- a/x11/kde4-baseapps/files/patch-kdeprint_descriptions_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdeprint/descriptions/Makefile.in.orig Wed Jan 26 12:17:44 2005
-+++ kdeprint/descriptions/Makefile.in Wed Jan 26 12:19:25 2005
-@@ -773,8 +773,8 @@
-
- printers.cpp: sortthem
- : > printers.cpp
-- for i in `find /usr/share/cups/model -type f ! -name '*.gz'`; do perl $(srcdir)/readppd < $$i >> printers.cpp; done
-- for i in `find /usr/share/cups/model -type f -name '*.gz'`; do \
-+ for i in `find %%LOCALBASE%%/share/cups/model -type f ! -name '*.gz'`; do perl $(srcdir)/readppd < $$i >> printers.cpp; done
-+ for i in `find %%LOCALBASE%%/share/cups/model -type f -name '*.gz'`; do \
- gzip -cd $$i | perl $(srcdir)/readppd >> printers.cpp; done
- iconv -flatin1 -tutf-8 printers.cpp > printers.new
- mv printers.new printers.cpp
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in
deleted file mode 100644
index a81fd6da8f38..000000000000
--- a/x11/kde4-baseapps/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-baseapps/files/patch-kioslave_ldap_Makefile.in b/x11/kde4-baseapps/files/patch-kioslave_ldap_Makefile.in
deleted file mode 100644
index ee406052177e..000000000000
--- a/x11/kde4-baseapps/files/patch-kioslave_ldap_Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- kioslave/ldap/Makefile.in Tue Jul 5 19:14:25 2005
-+++ kioslave/ldap/Makefile.in Tue Jul 5 19:13:47 2005
-@@ -567,6 +567,7 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = $(all_includes) $(LDAP_INCS)
-+AM_CXXFLAGS = -DLDAP_DEPRECATED
- AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH)
- LDADD = $(LIB_KIO) $(LDAP_LIBS)
diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp b/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp
deleted file mode 100644
index 4fe077c27135..000000000000
--- a/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
---- kioslave/media/kdedmodule/fstabbackend.cpp
-+++ kioslave/media/kdedmodule/fstabbackend.cpp
-@@ -47,6 +47,12 @@
- handleMtabChange();
-
- KDirWatch::self()->startScan();
-+
-+#ifdef Q_OS_FREEBSD
-+ connect( &m_mtabTimer, SIGNAL( timeout() ),
-+ this, SLOT( handleMtabChange() ) );
-+ m_mtabTimer.start(250);
-+#endif
- }
-
- FstabBackend::~FstabBackend()
-@@ -86,7 +92,7 @@
- || mount->mountType() == "tmpfs"
- || mount->mountType() == "sysfs"
- || mount->mountType() == "usbfs"
-- || mount->mountType() == "proc"
-+ || mount->mountType().contains( "proc" )
- || mount->mountType() == "unknown"
- || mount->mountType() == "none"
- || mount->mountedFrom() == "none"
-@@ -136,7 +142,7 @@
- #if 0
- else if ( !m_mtabIds.contains(id) )
- {
-- QString name = generateName(dev);
-+ QString name = generateName(dev, fs);
-
- Medium *m = new Medium(id, name);
-
-@@ -205,7 +211,7 @@
-
- if ( !m_fstabIds.contains(id) )
- {
-- QString name = generateName(dev);
-+ QString name = generateName(dev, fs);
-
- Medium *m = new Medium(id, name);
-
-@@ -247,9 +253,18 @@
- +m.replace("/", "");
- }
-
--QString FstabBackend::generateName(const QString &devNode)
-+QString FstabBackend::generateName(const QString &devNode, const QString &fsType)
- {
-- return KURL(devNode).fileName();
-+ KURL url( devNode );
-+
-+ if ( url.isValid() )
-+ {
-+ return url.fileName();
-+ }
-+ else // surely something nfs or samba based
-+ {
-+ return fsType;
-+ }
- }
-
- void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.h b/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.h
deleted file mode 100644
index e9ceadf8e9b7..000000000000
--- a/x11/kde4-baseapps/files/patch-kioslave_media_kdedmodule_fstabbackend.h
+++ /dev/null
@@ -1,37 +0,0 @@
---- kioslave/media/kdedmodule/fstabbackend.h
-+++ kioslave/media/kdedmodule/fstabbackend.h
-@@ -24,6 +24,10 @@
- #include <qobject.h>
- #include <qstringlist.h>
-
-+#ifdef Q_OS_FREEBSD
-+#include <qtimer.h>
-+#endif
-+
- class FstabBackend : public QObject, public BackendBase
- {
- Q_OBJECT
-@@ -38,17 +42,20 @@
- QString &label);
- private slots:
- void slotDirty(const QString &path);
--
--private:
- void handleFstabChange();
- void handleMtabChange();
-
-+private:
- static QString generateId(const QString &devNode,
- const QString &mountPoint);
-- static QString generateName(const QString &devNode);
-+ static QString generateName(const QString &devNode,
-+ const QString &fsType);
-
- QStringList m_mtabIds;
- QStringList m_fstabIds;
-+#ifdef Q_OS_FREEBSD
-+ QTimer m_mtabTimer;
-+#endif
- };
-
- #endif
diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp b/x11/kde4-baseapps/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp
deleted file mode 100644
index 4cb49827612d..000000000000
--- a/x11/kde4-baseapps/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Fri Aug 5 14:26:27 2005
-+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Aug 5 14:27:25 2005
-@@ -79,7 +79,7 @@
- connect( job, SIGNAL( result( KIO::Job * ) ),
- this, SLOT( slotResult( KIO::Job * ) ) );
- }
-- else if (args->isSet("s"))
-+ else if (args->isSet("s") || args->isSet("e"))
- {
- if (medium.isMounted())
- {
-@@ -93,10 +93,6 @@
- {
- invokeEject(device, true);
- }
-- }
-- else if (args->isSet("e"))
-- {
-- invokeEject(device);
- }
- else
- {
diff --git a/x11/kde4-baseapps/files/patch-konqueror_konq_mainwindow.cc b/x11/kde4-baseapps/files/patch-konqueror_konq_mainwindow.cc
deleted file mode 100644
index 4eaf87314d92..000000000000
--- a/x11/kde4-baseapps/files/patch-konqueror_konq_mainwindow.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- konqueror/konq_mainwindow.cc.orig Wed Jul 20 12:04:01 2005
-+++ konqueror/konq_mainwindow.cc Sat Aug 6 00:20:37 2005
-@@ -98,6 +98,7 @@
- #include <kiconloader.h>
- #include <kpopupmenu.h>
- #include <kprocess.h>
-+#include <kio/netaccess.h>
- #include <kio/scheduler.h>
- #include <kaccelmanager.h>
- #include <kuser.h>
-@@ -428,7 +429,7 @@
- QString fileName = path.mid( lastSlash + 1 );
- QString testPath = path.left( lastSlash + 1 );
- if ( ( fileName.find( '*' ) != -1 || fileName.find( '[' ) != -1 || fileName.find( '?' ) != -1 )
-- && ( !url.isLocalFile() || QFile::exists( testPath ) ) )
-+ && ( !url.isLocalFile() || QFile::exists( testPath ) ) && !KIO::NetAccess::exists( url, true ) )
- {
- nameFilter = fileName;
- url.setFileName( QString::null );
diff --git a/x11/kde4-baseapps/files/patch-kwin_Makefile.in b/x11/kde4-baseapps/files/patch-kwin_Makefile.in
deleted file mode 100644
index 866922634d9d..000000000000
--- a/x11/kde4-baseapps/files/patch-kwin_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kwin/Makefile.in.orig Mon Mar 21 13:23:39 2005
-+++ kwin/Makefile.in Mon Mar 21 13:23:53 2005
-@@ -605,7 +605,7 @@
- xdg_menudir = @xdg_menudir@
- INCLUDES = -I$(srcdir)/lib $(all_includes)
- @include_kompmgr_TRUE@KOMPMGR = kompmgr
--SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR)
-+SUBDIRS = lib . killer kcmkwin pics clients oldheaders data
- #>- lib_LTLIBRARIES =
- #>+ 1
- lib_LTLIBRARIES = libkdeinit_kwin.la
diff --git a/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp
deleted file mode 100644
index 904ef5903342..000000000000
--- a/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004
-+++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004
-@@ -457,6 +457,8 @@
- paths.append("/usr/lib64/netscape/plugins");
- paths.append("/usr/lib64/mozilla/plugins");
- paths.append("$MOZILLA_HOME/plugins");
-+ paths.append("/usr/local/lib/linux-flashplugin6");
-+ paths.append("/usr/X11R6/lib/linux-flashplugin6");
- config->writeEntry( "scanPaths", paths );
- }
-