diff options
Diffstat (limited to 'x11/kdebase4/files')
17 files changed, 0 insertions, 863 deletions
diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp deleted file mode 100644 index 0da5609fb97a..000000000000 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp +++ /dev/null @@ -1,404 +0,0 @@ ---- kioslave/media/mediamanager/halbackend.cpp.orig Mon Jan 15 14:31:32 2007 -+++ kioslave/media/mediamanager/halbackend.cpp Sun Apr 8 02:18:14 2007 -@@ -17,9 +17,15 @@ - */ - - #include "halbackend.h" --#include "linuxcdpolling.h" - - #include <stdlib.h> -+#ifdef Q_OS_FREEBSD -+#include <sys/param.h> -+#include <sys/ucred.h> -+#include <sys/mount.h> -+#include <langinfo.h> -+#include <qregexp.h> -+#endif - - #include <kapplication.h> - #include <qeventloop.h> -@@ -71,6 +77,10 @@ - /* Close HAL connection */ - if (m_halContext) - { -+#ifdef Q_OS_FREEBSD -+ m_pollTimer.stop(); -+ m_pollMediaList.clear(); -+#endif - const QPtrList<Medium> medlist = m_mediaList.list(); - QPtrListIterator<Medium> it (medlist); - for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -@@ -184,6 +194,10 @@ - - libhal_free_string_array( halDeviceList ); - -+#ifdef Q_OS_FREEBSD -+ connect(&m_pollTimer, SIGNAL(timeout()), -+ this, SLOT(pollMediaList())); -+#endif - return true; - } - -@@ -251,11 +265,11 @@ - } - } - QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -+ kdDebug(1219) << "automount " << options["automount"] << endl; - if (options["automount"] == "true" && allowNotification ) { - QString error = mount(medium); - if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -+ kdDebug(1219) << "error " << error << endl; - } - m_mediaList.addMedium(medium, allowNotification); - -@@ -272,6 +286,11 @@ - Medium* medium = new Medium(udi, ""); - setFloppyProperties(medium); - m_mediaList.addMedium(medium, allowNotification); -+#ifdef Q_OS_FREEBSD -+ m_pollTimer.stop(); -+ m_pollMediaList.append(medium); -+ m_pollTimer.start(250); -+#endif - return; - } - -@@ -293,12 +312,23 @@ - - void HALBackend::RemoveDevice(const char *udi) - { -+#ifdef Q_OS_FREEBSD -+ m_pollMediaList.remove(m_mediaList.findById(udi)); -+ if (m_pollMediaList.isEmpty()) -+ m_pollTimer.stop(); -+#endif - m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -+ if ( -+ !( strcmp(key, "info.hal_mount.created_mount_point") -+ && strcmp(key, "info.hal_mount.mounted_by_uid") -+ && strcmp(key, "volume.mount_point") -+ && strcmp(key, "volume.is_mounted_read_only"))) -+ return; -+ - const char* mediumUdi = findMediumUdiFromUdi(udi); - if (!mediumUdi) - return; -@@ -334,7 +364,7 @@ - } - - const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -+ kdDebug(1219) << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; - if (!mediumUdi) - return; - -@@ -392,7 +422,7 @@ - { - Medium m( *cmedium ); - if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -+ kdDebug(1219) << "setFstabProperties worked" << endl; - m_mediaList.changeMediumState(m, false); - } - return; -@@ -407,6 +437,7 @@ - setFloppyProperties(m); - if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) - setCameraProperties(m); -+ m->setHalMounted(libhal_device_get_property_string(m_halContext, mediumUdi, "info.hal_mount.created_mount_point", NULL)); - - m_mediaList.changeMediumState(*m, false); - -@@ -479,28 +510,23 @@ - else - mimeType = "media/dvd" + MOUNT_SUFFIX; - -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- - /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -+ if (libhal_volume_disc_has_data(halVolume)) - { -- case DiscType::VCD: -+ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) - mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) - mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) - mimeType = "media/dvdvideo"; -- break; - } -+ else if (libhal_volume_disc_has_audio(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); - } - else - { -@@ -584,7 +610,7 @@ - } - } - -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -+ kdDebug(1219) << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; - QString fstype = medium->fsType(); - if ( fstype.isNull() ) - fstype = "auto"; -@@ -794,7 +820,7 @@ - if (t.endsWith("=")) - t = t.left(t.length() - 1); - valids[t] = true; -- kdDebug() << "valid " << t << endl; -+ kdDebug(1219) << "valid " << t << endl; - } - libhal_free_string_array(array); - QStringList result; -@@ -915,12 +941,20 @@ - result << "journaling=ordered"; - } - -+#ifdef Q_OS_FREEBSD -+ if (valids.contains("-C")) -+ { -+ result << QString("charset=%1").arg(nl_langinfo(CODESET)); -+ kdDebug(1219) << "mount properties " << result << " " << endl; -+ } -+#endif -+ - return result; - } - - bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -+ kdDebug(1219) << "setMountoptions " << name << " " << options << endl; - - KConfig config("mediamanagerrc"); - config.setGroup(name); -@@ -960,7 +994,7 @@ - if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, - "org.freedesktop.Hal.Device.Volume", - "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -+ kdDebug(1219) << "mount failed for " << udi << ": could not create dbus message\n"; - return i18n("Internal Error"); - } - -@@ -968,7 +1002,7 @@ - DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, - DBUS_TYPE_INVALID)) - { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -+ kdDebug(1219) << "mount failed for " << udi << ": could not append args to dbus message\n"; - dbus_message_unref (dmesg); - return i18n("Internal Error"); - } -@@ -996,7 +1030,7 @@ - return qerror; - } - -- kdDebug() << "mount queued for " << udi << endl; -+ kdDebug(1219) << "mount queued for " << udi << endl; - - dbus_message_unref (dmesg); - dbus_message_unref (reply); -@@ -1008,8 +1042,13 @@ - QString HALBackend::listUsingProcesses(const Medium* medium) - { - QString proclist, fullmsg; -+#ifndef Q_OS_FREEBSD - QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -+#else -+ QString cmdline = QString("{ fstat -m | awk '$5~/^(MOUNT|%1)/' | column -t; } 2>&1") -+ .arg(QRegExp::escape(medium->mountPoint()).replace('/', "\\/")); -+#endif -+ FILE *fuser = popen(cmdline.local8Bit(), "r"); - - uint counter = 0; - if (fuser) { -@@ -1044,7 +1083,7 @@ - - void HALBackend::slotResult(KIO::Job *job) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -+ kdDebug(1219) << "slotResult " << mount_jobs[job] << endl; - - struct mount_job_data *data = mount_jobs[job]; - QString& qerror = data->errorMessage; -@@ -1071,7 +1110,6 @@ - qerror = job->errorText(); - } - -- ResetProperties( medium->id().latin1() ); - mount_jobs.remove(job); - - /* Job completed. Notify the caller */ -@@ -1080,6 +1118,25 @@ - kapp->eventLoop()->exitLoop(); - } - -+#ifdef Q_OS_FREEBSD -+void HALBackend::pollMediaList() -+{ -+ struct statfs *mntBuf; -+ int mntNum = getmntinfo(&mntBuf, MNT_NOWAIT); -+ QPtrList<Medium>::iterator it = m_pollMediaList.begin(); -+ QPtrList<Medium>::iterator end = m_pollMediaList.end(); -+ for (; it!=end; ++it) -+ { -+ bool mounted = false; -+ const char *dev = (*it)->deviceNode().ascii(); -+ for (int n = mntNum-1; n >= 0 && !mounted; n--) -+ mounted = !strcmp(dev, mntBuf[n].f_mntfromname); -+ if ((*it)->isMounted() != mounted) -+ ResetProperties((*it)->id().latin1()); -+ } -+} -+#endif -+ - QString HALBackend::isInFstab(const Medium *medium) - { - KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -@@ -1092,11 +1149,13 @@ - QString reald = (*it)->realDeviceName(); - if ( reald.endsWith( "/" ) ) - reald = reald.left( reald.length() - 1 ); -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; -+ kdDebug(1219) << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl; - if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) - { -+#ifndef Q_OS_FREEBSD - QStringList opts = (*it)->mountOptions(); - if (opts.contains("user") || opts.contains("users")) -+#endif - return (*it)->mountPoint(); - } - } -@@ -1116,7 +1175,7 @@ - data.completed = false; - data.medium = medium; - -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -+ kdDebug(1219) << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; - KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); - connect(job, SIGNAL( result (KIO::Job *)), - SLOT( slotResult( KIO::Job *))); -@@ -1134,7 +1193,7 @@ - - QStringList soptions; - -- kdDebug() << "mounting " << medium->id() << "..." << endl; -+ kdDebug(1219) << "mounting " << medium->id() << "..." << endl; - - QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); - if (valids["flush"] == "true") -@@ -1147,10 +1206,10 @@ - - if (valids["ro"] == "true") - soptions << "ro"; -- -+#if 0 - if (valids["atime"] != "true") - soptions << "noatime"; -- -+#endif - if (valids["quiet"] == "true") - soptions << "quiet"; - -@@ -1180,6 +1239,13 @@ - soptions << QString("data=ordered"); - } - -+#ifdef Q_OS_FREEBSD -+ if (valids.contains("charset")) -+ { -+ soptions << QString("-C=%1").arg(valids["charset"]); -+ } -+#endif -+ - const char **options = new const char*[soptions.size() + 1]; - uint noptions = 0; - for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -@@ -1192,9 +1258,6 @@ - return qerror; - } - -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- - return QString(); - } - -@@ -1255,7 +1318,7 @@ - const char *options[2]; - - const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -+ kdDebug(1219) << "unmounting " << udi << "..." << endl; - - dbus_error_init(&error); - DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -@@ -1268,7 +1331,7 @@ - if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, - "org.freedesktop.Hal.Device.Volume", - "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -+ kdDebug(1219) << "unmount failed for " << udi << ": could not create dbus message\n"; - return i18n("Internal Error"); - } - -@@ -1278,7 +1341,7 @@ - if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, - DBUS_TYPE_INVALID)) - { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -+ kdDebug(1219) << "unmount failed for " << udi << ": could not append args to dbus message\n"; - dbus_message_unref (dmesg); - return i18n("Internal Error"); - } -@@ -1288,7 +1351,7 @@ - { - QString qerror, reason; - -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -+ kdDebug(1219) << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; - qerror = "<qt>"; - qerror += i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and " - "currently mounted at <b>%4</b> could not be unmounted. ").arg( -@@ -1318,13 +1381,10 @@ - return qerror; - } - -- kdDebug() << "unmount queued for " << udi << endl; -+ kdDebug(1219) << "unmount queued for " << udi << endl; - - dbus_message_unref (dmesg); - dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); - - return QString(); - } diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h deleted file mode 100644 index 21672b565977..000000000000 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.h +++ /dev/null @@ -1,33 +0,0 @@ ---- kioslave/media/mediamanager/halbackend.h.orig Mon Jan 15 12:31:32 2007 -+++ kioslave/media/mediamanager/halbackend.h Wed Feb 21 15:01:12 2007 -@@ -34,6 +34,9 @@ - #include <qobject.h> - #include <qstringlist.h> - #include <qstring.h> -+#ifdef Q_OS_FREEBSD -+#include <qtimer.h> -+#endif - - #include <config.h> - -@@ -156,6 +159,9 @@ - - private slots: - void slotResult(KIO::Job *job); -+#ifdef Q_OS_FREEBSD -+ void pollMediaList(); -+#endif - - /* Hal call-backs -- from gvm*/ - public: -@@ -233,6 +239,10 @@ - }; - - QMap<KIO::Job *, struct mount_job_data*> mount_jobs; -+#ifdef Q_OS_FREEBSD -+ QTimer m_pollTimer; -+ QPtrList<Medium> m_pollMediaList; -+#endif - }; - - #endif /* _HALBACKEND_H_ */ diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp deleted file mode 100644 index 7d0fbfa81767..000000000000 --- a/x11/kdebase4/files/extrapatch-kioslave_media_mounthelper-kio_media_mounthelper.cpp +++ /dev/null @@ -1,49 +0,0 @@ ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig Mon Jan 15 12:31:31 2007 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Wed Feb 21 15:17:23 2007 -@@ -89,7 +89,9 @@ - m_isCdrom = medium.mimeType().find("dvd")!=-1 - || medium.mimeType().find("cd")!=-1; - -- if (args->isSet("u")) -+ bool do_eject = args->isSet("s") || args->isSet("e"); -+ -+ if (args->isSet("u") || do_eject) - { - DCOPRef mediamanager("kded", "mediamanager"); - DCOPReply reply = mediamanager.call( "unmount", medium.id()); -@@ -97,30 +99,14 @@ - reply.get(m_errorStr); - kdDebug() << "medium unmount " << m_errorStr << endl; - if (m_errorStr.isNull()) -+ { -+ if( do_eject ) -+ invokeEject(device, true); -+ else - ::exit(0); -+ } - else - error(); -- } -- else if (args->isSet("s") || args->isSet("e")) -- { -- /* -- * We want to call mediamanager unmount before invoking eject. That's -- * because unmount would provide an informative error message in case of -- * failure. However, there are cases when unmount would fail -- * (supermount, slackware, see bug#116209) but eject would succeed. -- * Thus if unmount fails, save unmount error message and invokeEject() -- * anyway. Only if both unmount and eject fail, notify the user by -- * displaying the saved error message (see ejectFinished()). -- */ -- if (medium.isMounted()) -- { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- m_device = device; -- } -- invokeEject(device, true); - } - else - { diff --git a/x11/kdebase4/files/freebsd.keytab b/x11/kdebase4/files/freebsd.keytab deleted file mode 100644 index 2607089e1dbe..000000000000 --- a/x11/kdebase4/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/kdebase4/files/kdm.in b/x11/kdebase4/files/kdm.in deleted file mode 100644 index 06181ce3bbeb..000000000000 --- a/x11/kdebase4/files/kdm.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - -fi - -#run kdm -exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kdebase4/files/patch-kcontrol_kcontrol-Makefile.in b/x11/kdebase4/files/patch-kcontrol_kcontrol-Makefile.in deleted file mode 100644 index cc47b08b7e98..000000000000 --- a/x11/kdebase4/files/patch-kcontrol_kcontrol-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- kcontrol/kcontrol/Makefile.in.orig Thu Sep 14 06:24:48 2006 -+++ kcontrol/kcontrol/Makefile.in Thu Sep 14 06:24:55 2006 -@@ -1239,7 +1239,7 @@ - echo 'extern "C" int kdemain(int argc, char* argv[]);' >> kcontrol_dummy.cpp; \ - echo 'extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> kcontrol_dummy.cpp - kcontrol_LDFLAGS = $(KDE_RPATH) -no-undefined $(all_libraries) --kcontrol_LDADD = libkdeinit_kcontrol.la -+kcontrol_LDADD = libkdeinit_kcontrol.la -lintl - kcontrol_DEPENDENCIES = libkdeinit_kcontrol.la - - #>+ 5 diff --git a/x11/kdebase4/files/patch-kdeprint_descriptions_Makefile.in b/x11/kdebase4/files/patch-kdeprint_descriptions_Makefile.in deleted file mode 100644 index 5cf57be2d1c7..000000000000 --- a/x11/kdebase4/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/kdebase4/files/patch-kdm-config.def b/x11/kdebase4/files/patch-kdm-config.def deleted file mode 100644 index 5d1b849cc1d7..000000000000 --- a/x11/kdebase4/files/patch-kdm-config.def +++ /dev/null @@ -1,11 +0,0 @@ ---- kdm/config.def.orig Wed Jun 14 17:51:42 2006 -+++ kdm/config.def Wed Jun 14 17:51:57 2006 -@@ -36,7 +36,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/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in deleted file mode 100644 index 950b6f73c910..000000000000 --- a/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 -+++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 -@@ -1126,9 +1126,6 @@ - uninstall-binPROGRAMS uninstall-info-am - - --install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) -- - messages: - $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl deleted file mode 100644 index aba5681d8091..000000000000 --- a/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl +++ /dev/null @@ -1,11 +0,0 @@ ---- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 -+++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 -@@ -55,7 +55,7 @@ - while( <MAN> ) { - # print "RAW:$_"; - chop; -- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; -+ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; - my $page = $1; - my $section = $2; - my $description = $3; diff --git a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp deleted file mode 100644 index 6ef1e0a2f661..000000000000 --- a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.cpp.orig Sun Oct 1 19:31:54 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Thu Mar 29 02:19:18 2007 -@@ -152,9 +152,7 @@ - // We might want to display only network shares - // since HAL doesn't handle them - || ( networkSharesOnly -- && mount->mountType().find( "smb" ) == -1 - && mount->mountType().find( "cifs" ) == -1 -- && mount->mountType().find( "nfs" ) == -1 - ) - ) - { diff --git a/x11/kdebase4/files/patch-kwin_Makefile.in b/x11/kdebase4/files/patch-kwin_Makefile.in deleted file mode 100644 index 866922634d9d..000000000000 --- a/x11/kdebase4/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/kdebase4/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp deleted file mode 100644 index e81392e29477..000000000000 --- a/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp +++ /dev/null @@ -1,12 +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,9 @@ - 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"); -+ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); - config->writeEntry( "scanPaths", paths ); - } - diff --git a/x11/kdebase4/files/patch-plugin-keyboard-handler.diff b/x11/kdebase4/files/patch-plugin-keyboard-handler.diff deleted file mode 100644 index 8d301d6d4e69..000000000000 --- a/x11/kdebase4/files/patch-plugin-keyboard-handler.diff +++ /dev/null @@ -1,77 +0,0 @@ ------------------------------------------------------------------------- -r652585 | lunakl | 2007-04-11 16:26:32 +0200 (Wed, 11 Apr 2007) | 3 lines -Changed paths: - M /branches/KDE/3.5/kdebase/nsplugins/viewer/qxteventloop.cpp - -Fix keyboard events handling. - - ------------------------------------------------------------------------- -Index: nsplugins/viewer/qxteventloop.cpp -=================================================================== ---- nsplugins/viewer/qxteventloop.cpp (revision 652584) -+++ nsplugins/viewer/qxteventloop.cpp (revision 652585) -@@ -32,12 +32,16 @@ - ** not clear to you. - ** - **********************************************************************/ -+ -+#include <config.h> -+ - #include "qxteventloop.h" - - #if QT_VERSION >= 0x030100 - - #include <qapplication.h> - #include <qwidgetintdict.h> -+#include <kglobal.h> - - // resolve the conflict between X11's FocusIn and QEvent::FocusIn - const int XFocusOut = FocusOut; -@@ -52,6 +56,8 @@ const int XKeyRelease = KeyRelease; - - Boolean qmotif_event_dispatcher( XEvent *event ); - -+static void handle_xquerykeymap( Display* dpy, XEvent* event ); -+ - class QXtEventLoopPrivate - { - public: -@@ -147,6 +153,7 @@ void QXtEventLoopPrivate::unhook() - extern bool qt_try_modal( QWidget *, XEvent * ); // defined in qapplication_x11.cpp - Boolean qmotif_event_dispatcher( XEvent *event ) - { -+ handle_xquerykeymap( qt_xdisplay(), event ); - QApplication::sendPostedEvents(); - - QWidgetIntDict *mapper = &static_d->mapper; -@@ -462,6 +469,29 @@ bool QXtEventLoop::processEvents( Proces - return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 ); - } - -+#include <dlfcn.h> -+ -+static char xquerykeymap_data[ 32 ]; -+static int (*real_xquerykeymap)( Display*, char[32] ) = NULL; -+ -+static void handle_xquerykeymap( Display* dpy, XEvent* event ) -+{ -+ if( real_xquerykeymap == NULL ) -+ real_xquerykeymap = (int (*)( Display*, char[32] )) dlsym( RTLD_NEXT, "XQueryKeymap" ); -+ if( event->type == XFocusIn || event->type == XKeyPress || event->type == XKeyRelease ) -+ real_xquerykeymap( dpy, xquerykeymap_data ); -+ if( event->type == XFocusOut ) -+ memset( xquerykeymap_data, 0, 32 ); -+} -+ -+extern "C" KDE_EXPORT -+int XQueryKeymap( Display* , char k[32] ) -+{ -+ memcpy( k, xquerykeymap_data, 32 ); -+ return 1; -+} -+ -+ - #include "qxteventloop.moc" - - #endif diff --git a/x11/kdebase4/files/pkg-deinstall.in b/x11/kdebase4/files/pkg-deinstall.in deleted file mode 100644 index e33dd4caa775..000000000000 --- a/x11/kdebase4/files/pkg-deinstall.in +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -if [ "$2" != "POST-DEINSTALL" ]; then - exit 0 -fi - -boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me - -if [ ! -f $boguscreatenewentry ]; then - touch $boguscreatenewentry -fi - -exit 0 - diff --git a/x11/kdebase4/files/pkg-install.in b/x11/kdebase4/files/pkg-install.in deleted file mode 100644 index 87ea16dd348a..000000000000 --- a/x11/kdebase4/files/pkg-install.in +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -boguscreatenewentry=%%PREFIX%%/share/templates/.keep_me - -if [ -f $boguscreatenewentry ]; then - rm -f $boguscreatenewentry -fi - -exit 0 diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in deleted file mode 100644 index 1cacd3158de2..000000000000 --- a/x11/kdebase4/files/pkg-message.in +++ /dev/null @@ -1,20 +0,0 @@ -This port has installed fonts into %%PREFIX%%/share/apps/konsole/fonts - -You may want to add %%PREFIX%%/share/apps/konsole/fonts -to your X font path by either: - -$ xset fp+ %%PREFIX%%/share/apps/konsole/fonts -$ xset fp rehash - -or by adding it to your X-server configuration file (usually -/etc/X11/XF86Config or %%X11BASE%%/lib/X11/XF86Config) and -restarting the X-server. - -You also have to make the new path known to fontconfig by -adding a - -<dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either - -%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running - -fc-cache -f (as root if you edited local.conf) afterwards. |