diff options
Diffstat (limited to 'x11')
116 files changed, 3960 insertions, 5340 deletions
diff --git a/x11/kde-lite/Makefile b/x11/kde-lite/Makefile index 57e6e2cc1341..e1047081a545 100644 --- a/x11/kde-lite/Makefile +++ b/x11/kde-lite/Makefile @@ -18,11 +18,12 @@ MASTERDIR= ${.CURDIR}/../../x11/kde3 CONFLICTS= kde-[0-9]* .endif -WITHOUT_KOFFICE= yes -WITHOUT_KDESDK= yes WITHOUT_KDEVELOP= yes WITHOUT_KDEEDU= yes -WITHOUT_KDEPIM= yes -WITHOUT_QUANTA= yes +WITHOUT_KDENETWORK= yes +WITHOUT_KDESDK= yes +WITHOUT_KDETOYS= yes +WITHOUT_KDEWEBDEV= yes +WITHOUT_KOFFICE= yes .include "${MASTERDIR}/Makefile" diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index 46eb8e0bad91..c0b437043022 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -35,7 +35,7 @@ CONFIG_FILE= ${LOCALBASE}/etc/kde-meta.conf ALL_MODULES= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\ - KDESDK KDETOYS KDEUTILS QUANTA + KDESDK KDETOYS KDEUTILS KDEWEBDEV ## Forwards parts of the environment to scripts/configure.kde3 @@ -140,11 +140,11 @@ RUN_DEPENDS+= khangman:${PORTSDIR}/misc/kdeedu3 .if !defined(WITHOUT_KDEADMIN) RUN_DEPENDS+= kcron:${PORTSDIR}/sysutils/kdeadmin3 .endif -.if !defined(WITHOUT_QUANTA) -RUN_DEPENDS+= quanta:${PORTSDIR}/www/quanta +.if !defined(WITHOUT_KDEWEBDEV) +RUN_DEPENDS+= quanta:${PORTSDIR}/www/kdewebdev .endif .if !defined(WITHOUT_KDETOYS) -RUN_DEPENDS+= kmoon:${PORTSDIR}/x11-clocks/kdetoys3 +RUN_DEPENDS+= amor:${PORTSDIR}/x11-clocks/kdetoys3 .endif .if !defined(WITHOUT_KDEARTWORK) RUN_DEPENDS+= kbanner.kss:${PORTSDIR}/x11-themes/kdeartwork3 diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde index 961f8bb4ccce..f7bc1fbbed54 100644 --- a/x11/kde3/Makefile.kde +++ b/x11/kde3/Makefile.kde @@ -14,6 +14,7 @@ COPY= -c -p # For ports that have I18N components only. .if defined(KDE_I18N) _NO_KDE_FINAL= yes +_NO_KDE_CLOSURE= yes _NO_KDE_NDEBUG= yes DISTNAME?= ${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION} # Since KDE 3.1.3, the kde-i18n tarballs have the ${KDE_VERSION} @@ -38,6 +39,10 @@ post-extract: CONFIGURE_ARGS+=--enable-final .endif +.if !defined(_NO_KDE_CLOSURE) && defined(WANT_KDE_CLOSURE) +CONFIGURE_ARGS+=--enable-closure +.endif + .if !defined(_NO_KDE_NDEBUG) .if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG) CONFIGURE_ARGS+=--disable-debug diff --git a/x11/kde3/scripts/configure.kde3 b/x11/kde3/scripts/configure.kde3 index 63c4763204e7..45b711ebc41b 100644 --- a/x11/kde3/scripts/configure.kde3 +++ b/x11/kde3/scripts/configure.kde3 @@ -81,7 +81,7 @@ Please select what additional KDE modules you would like to install.\n\n" \ "KDESDK" "KDE software development kit" "$status_kdesdk" \ "KDETOYS" "Miscellaneous small applications" "$status_kdetoys" \ "KDEUTILS" "Utilities like kcalc, kcharselect, ark, kedit, etc" "$status_kdeutils" \ -"QUANTA" "Comprehensive website development environment" "$status_quanta" \ +"KDEWEBDEV" "Comprehensive website development environment" "$status_kdewebdev" \ 2> $tempselection ## Save the return value from dialog. diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kde4-baseapps/files/freebsd.keytab b/x11/kde4-baseapps/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kde4-baseapps/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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/kdm.sh b/x11/kde4-baseapps/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kde4-baseapps/files/kdm.sh +++ b/x11/kde4-baseapps/files/genkdmconf.sh diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-dm.c b/x11/kde4-baseapps/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp b/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h b/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp b/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kde4-baseapps/files/patch-kxkb_rules.cpp b/x11/kde4-baseapps/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kde4-baseapps/files/patch-kxkb_rules.h b/x11/kde4-baseapps/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kde4-baseapps/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kde4-baseapps/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kde4-baseapps/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kde4-baseapps/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kde4-runtime/files/freebsd.keytab b/x11/kde4-runtime/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kde4-runtime/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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/kdm.sh b/x11/kde4-runtime/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kde4-runtime/files/kdm.sh +++ b/x11/kde4-runtime/files/genkdmconf.sh diff --git a/x11/kde4-runtime/files/patch-kdm-backend-dm.c b/x11/kde4-runtime/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp b/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h b/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp b/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kde4-runtime/files/patch-kxkb_rules.cpp b/x11/kde4-runtime/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kde4-runtime/files/patch-kxkb_rules.h b/x11/kde4-runtime/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kde4-runtime/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kde4-runtime/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kde4-runtime/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kde4-runtime/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kde4-workspace/files/freebsd.keytab b/x11/kde4-workspace/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kde4-workspace/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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-workspace/files/kdm.sh b/x11/kde4-workspace/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kde4-workspace/files/kdm.sh +++ b/x11/kde4-workspace/files/genkdmconf.sh diff --git a/x11/kde4-workspace/files/patch-kdm-backend-dm.c b/x11/kde4-workspace/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp b/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h b/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp b/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kde4-workspace/files/patch-kxkb_rules.cpp b/x11/kde4-workspace/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kde4-workspace/files/patch-kxkb_rules.h b/x11/kde4-workspace/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kde4-workspace/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kde4-workspace/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kde4-workspace/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kde4-workspace/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile index 46eb8e0bad91..c0b437043022 100644 --- a/x11/kde4/Makefile +++ b/x11/kde4/Makefile @@ -35,7 +35,7 @@ CONFIG_FILE= ${LOCALBASE}/etc/kde-meta.conf ALL_MODULES= KDEACCESSIBILITY KDEADMIN KDEARTWORK KDEVELOP KDEEDU\ KDEGAMES KDEGRAPHICS KDEMULTIMEDIA KDENETWORK KOFFICE KDEPIM\ - KDESDK KDETOYS KDEUTILS QUANTA + KDESDK KDETOYS KDEUTILS KDEWEBDEV ## Forwards parts of the environment to scripts/configure.kde3 @@ -140,11 +140,11 @@ RUN_DEPENDS+= khangman:${PORTSDIR}/misc/kdeedu3 .if !defined(WITHOUT_KDEADMIN) RUN_DEPENDS+= kcron:${PORTSDIR}/sysutils/kdeadmin3 .endif -.if !defined(WITHOUT_QUANTA) -RUN_DEPENDS+= quanta:${PORTSDIR}/www/quanta +.if !defined(WITHOUT_KDEWEBDEV) +RUN_DEPENDS+= quanta:${PORTSDIR}/www/kdewebdev .endif .if !defined(WITHOUT_KDETOYS) -RUN_DEPENDS+= kmoon:${PORTSDIR}/x11-clocks/kdetoys3 +RUN_DEPENDS+= amor:${PORTSDIR}/x11-clocks/kdetoys3 .endif .if !defined(WITHOUT_KDEARTWORK) RUN_DEPENDS+= kbanner.kss:${PORTSDIR}/x11-themes/kdeartwork3 diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde index 961f8bb4ccce..f7bc1fbbed54 100644 --- a/x11/kde4/Makefile.kde +++ b/x11/kde4/Makefile.kde @@ -14,6 +14,7 @@ COPY= -c -p # For ports that have I18N components only. .if defined(KDE_I18N) _NO_KDE_FINAL= yes +_NO_KDE_CLOSURE= yes _NO_KDE_NDEBUG= yes DISTNAME?= ${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION} # Since KDE 3.1.3, the kde-i18n tarballs have the ${KDE_VERSION} @@ -38,6 +39,10 @@ post-extract: CONFIGURE_ARGS+=--enable-final .endif +.if !defined(_NO_KDE_CLOSURE) && defined(WANT_KDE_CLOSURE) +CONFIGURE_ARGS+=--enable-closure +.endif + .if !defined(_NO_KDE_NDEBUG) .if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG) CONFIGURE_ARGS+=--disable-debug diff --git a/x11/kde4/scripts/configure.kde3 b/x11/kde4/scripts/configure.kde3 index 63c4763204e7..45b711ebc41b 100644 --- a/x11/kde4/scripts/configure.kde3 +++ b/x11/kde4/scripts/configure.kde3 @@ -81,7 +81,7 @@ Please select what additional KDE modules you would like to install.\n\n" \ "KDESDK" "KDE software development kit" "$status_kdesdk" \ "KDETOYS" "Miscellaneous small applications" "$status_kdetoys" \ "KDEUTILS" "Utilities like kcalc, kcharselect, ark, kedit, etc" "$status_kdeutils" \ -"QUANTA" "Comprehensive website development environment" "$status_quanta" \ +"KDEWEBDEV" "Comprehensive website development environment" "$status_kdewebdev" \ 2> $tempselection ## Save the return value from dialog. diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kdebase3/files/freebsd.keytab b/x11/kdebase3/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kdebase3/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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/kdebase3/files/kdm.sh b/x11/kdebase3/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kdebase3/files/kdm.sh +++ b/x11/kdebase3/files/genkdmconf.sh diff --git a/x11/kdebase3/files/patch-kdm-backend-dm.c b/x11/kdebase3/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kdebase3/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp b/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kdebase3/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kdebase3/files/patch-kxkb_kcmlayout.h b/x11/kdebase3/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kdebase3/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kdebase3/files/patch-kxkb_kxkb.cpp b/x11/kdebase3/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kdebase3/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kdebase3/files/patch-kxkb_rules.cpp b/x11/kdebase3/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kdebase3/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kdebase3/files/patch-kxkb_rules.h b/x11/kdebase3/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kdebase3/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kdebase3/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kdebase4-runtime/files/freebsd.keytab b/x11/kdebase4-runtime/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kdebase4-runtime/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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-runtime/files/kdm.sh b/x11/kdebase4-runtime/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kdebase4-runtime/files/kdm.sh +++ b/x11/kdebase4-runtime/files/genkdmconf.sh diff --git a/x11/kdebase4-runtime/files/patch-kdm-backend-dm.c b/x11/kdebase4-runtime/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp b/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h b/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp b/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp b/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kdebase4-runtime/files/patch-kxkb_rules.h b/x11/kdebase4-runtime/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kdebase4-runtime/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kdebase4-runtime/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kdebase4-runtime/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kdebase4-runtime/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kdebase4-workspace/files/freebsd.keytab b/x11/kdebase4-workspace/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kdebase4-workspace/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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-workspace/files/kdm.sh b/x11/kdebase4-workspace/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kdebase4-workspace/files/kdm.sh +++ b/x11/kdebase4-workspace/files/genkdmconf.sh diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp b/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h b/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp b/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kdebase4-workspace/files/patch-kxkb_rules.h b/x11/kdebase4-workspace/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kdebase4-workspace/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kdebase4-workspace/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kdebase4-workspace/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kdebase4-workspace/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 21e13d7867b8..0902fc3ffdaf 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,10 +8,9 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -20,6 +19,8 @@ COMMENT= Basic applications for the KDE system BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} LIB_DEPENDS= smbclient:${PORTSDIR}/net/samba-libsmbclient +CONFLICTS= kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.* + USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} @@ -40,8 +41,7 @@ CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ - MOTIF "Support Netscape plugins, requires openmotif" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -50,12 +50,6 @@ OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif -.if !defined(WITHOUT_MOTIF) -RUN_DEPENDS= nspluginviewer:${PORTSDIR}/www/konqueror-nsplugins -.elseif defined(WITHOUT_MOTIF) -CONFIGURE_ARGS+= --without-motif -.endif - post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -72,14 +66,15 @@ post-build: @${CAT} ${PKGDIR}/pkg-install | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${PKGINSTALL} @${CAT} ${FILESDIR}/kdm.sh | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/kdm.sh + | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' > ${WRKDIR}/genkdmconf.sh post-install: + ${INSTALL_DATA} ${FILESDIR}/freebsd.keytab ${PREFIX}/share/apps/konsole/ ${RM} -f ${PREFIX}/share/apps/konsole/linux.desktop ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - ${INSTALL_SCRIPT} ${WRKDIR}/kdm.sh ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKDIR}/genkdmconf.sh ${PREFIX}/etc/rc.d/ .if !defined(PACKAGE_BUILDING) @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 25dba8c07361..8a1c9c12aba2 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdebase-3.2.3.tar.bz2) = fd05a338d155610856b06988d8dff117 -SIZE (KDE/kdebase-3.2.3.tar.bz2) = 17330422 +MD5 (KDE/kdebase-3.3.0.tar.bz2) = e8fc098ffb09fcc0a8fdc4446149a8e3 +SIZE (KDE/kdebase-3.3.0.tar.bz2) = 19849208 diff --git a/x11/kdebase4/files/freebsd.keytab b/x11/kdebase4/files/freebsd.keytab new file mode 100644 index 000000000000..2607089e1dbe --- /dev/null +++ b/x11/kdebase4/files/freebsd.keytab @@ -0,0 +1,134 @@ +# [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.sh b/x11/kdebase4/files/genkdmconf.sh index 479317482140..479317482140 100644 --- a/x11/kdebase4/files/kdm.sh +++ b/x11/kdebase4/files/genkdmconf.sh diff --git a/x11/kdebase4/files/patch-kdm-backend-dm.c b/x11/kdebase4/files/patch-kdm-backend-dm.c new file mode 100644 index 000000000000..a36cb7d63260 --- /dev/null +++ b/x11/kdebase4/files/patch-kdm-backend-dm.c @@ -0,0 +1,40 @@ +Index: dm.c +=================================================================== +RCS file: /home/kde/kdebase/kdm/backend/dm.c,v +retrieving revision 1.90.2.3 +diff -u -3 -p -r1.90.2.3 dm.c +--- kdm/backend/dm.c 13 Aug 2004 19:21:11 -0000 1.90.2.3 ++++ kdm/backend/dm.c 23 Aug 2004 16:32:29 -0000 +@@ -1033,7 +1033,7 @@ static void + MainLoop (void) + { + struct display *d; +- struct timeval tv; ++ struct timeval *tvp, tv; + time_t to; + int nready; + char buf; +@@ -1055,12 +1055,17 @@ MainLoop (void) + to = serverTimeout; + if (utmpTimeout < to) + to = utmpTimeout; +- to -= now; +- if (to < 0) +- to = 0; +- tv.tv_sec = to; +- tv.tv_usec = 0; +- nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, &tv); ++ if (to == TO_INF) ++ tvp = 0; ++ else { ++ to -= now; ++ if (to < 0) ++ to = 0; ++ tv.tv_sec = to; ++ tv.tv_usec = 0; ++ tvp = &to; ++ } ++ nready = select (WellKnownSocketsMax + 1, &reads, 0, 0, tvp); + Debug ("select returns %d\n", nready); + time (&now); + #if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) diff --git a/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp b/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp deleted file mode 100644 index 750137b49743..000000000000 --- a/x11/kdebase4/files/patch-kxkb_kcmlayout.cpp +++ /dev/null @@ -1,83 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.cpp,v -retrieving revision 1.82.2.1 -retrieving revision 1.86 -diff -u -p -r1.82.2.1 -r1.86 ---- kxkb/kcmlayout.cpp 2004/05/19 12:09:58 1.82.2.1 -+++ kxkb/kcmlayout.cpp 2004/06/28 14:19:03 1.86 -@@ -79,7 +79,8 @@ OptionListItem * OptionListItem::findChi - } - - LayoutConfig::LayoutConfig(QWidget *parent, const char *name) -- : KCModule(parent, name), m_rules(0) -+ : KCModule(parent, name), -+ m_rules(NULL) - { - QVBoxLayout *main = new QVBoxLayout(this, 0, KDialog::spacingHint()); - -@@ -122,7 +124,7 @@ LayoutConfig::LayoutConfig(QWidget *pare - #endif - - //Read rules - we _must_ read _before_ creating xkb-options comboboxes -- ruleChanged("xfree86"); -+ ruleChanged(); - - makeOptionsTab(); - -@@ -292,6 +294,8 @@ QWidget* LayoutConfig::makeOptionsTab() - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(changed())); - connect(listView, SIGNAL(clicked(QListViewItem *)), SLOT(updateOptionsCommand())); - -+ connect(widget->chkEnableOptions, SIGNAL(toggled(bool)), SLOT(changed())); -+ - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->checkResetOld, SIGNAL(toggled(bool)), SLOT(updateOptionsCommand())); - -@@ -405,10 +409,10 @@ void LayoutConfig::load() - bool use = config->readBoolEntry( "Use", false ); - - // find out which rule applies -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -+ //QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); - - // update other files -- ruleChanged(rule); -+ ruleChanged(); - - // find out about the model - QString model = config->readEntry("Model", "pc104"); -@@ -499,12 +506,12 @@ void LayoutConfig::load() - emit KCModule::changed( false ); - } - --void LayoutConfig::ruleChanged(const QString &rule) -+void LayoutConfig::ruleChanged() - { -- if( rule == m_rule ) -- return; -+// if( rule == m_rule ) -+// return; - -- m_rule = rule; -+// m_rule = rule; - - QString model; //, layout; - if (m_rules) -@@ -514,7 +521,7 @@ void LayoutConfig::ruleChanged(const QSt - } - - delete m_rules; -- m_rules = new KeyRules(rule); -+ m_rules = new KeyRules(); - - QStringList tmp; - widget->comboModel->clear(); -@@ -672,7 +680,7 @@ void LayoutConfig::save() - void LayoutConfig::defaults() - { - widget->chkEnable->setChecked(false); -- ruleChanged("xfree86"); -+ ruleChanged(); - - widget->comboModel->setCurrentText("pc104"); - //layoutCombo->setCurrentText("us"); diff --git a/x11/kdebase4/files/patch-kxkb_kcmlayout.h b/x11/kdebase4/files/patch-kxkb_kcmlayout.h deleted file mode 100644 index e2630a0a4398..000000000000 --- a/x11/kdebase4/files/patch-kxkb_kcmlayout.h +++ /dev/null @@ -1,25 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kcmlayout.h,v -retrieving revision 1.22 -retrieving revision 1.23 -diff -u -p -r1.22 -r1.23 ---- kxkb/kcmlayout.h 2003/10/29 07:30:36 1.22 -+++ kxkb/kcmlayout.h 2004/06/28 14:19:03 1.23 -@@ -54,7 +54,7 @@ protected slots: - void variantChanged(); - void latinChanged(); - void layoutSelChanged(QListViewItem *); -- void ruleChanged(const QString &rule); -+ void ruleChanged(); - void updateLayoutCommand(); - void updateOptionsCommand(); - void add(); -@@ -71,7 +71,7 @@ private: - QDict<OptionListItem> m_optionGroups; - QDict<char> m_variants; - QDict<char> m_includes; -- QString m_rule; -+// QString m_rule; - KeyRules *m_rules; - - QWidget* makeOptionsTab(); diff --git a/x11/kdebase4/files/patch-kxkb_kxkb.cpp b/x11/kdebase4/files/patch-kxkb_kxkb.cpp deleted file mode 100644 index bc011c166585..000000000000 --- a/x11/kdebase4/files/patch-kxkb_kxkb.cpp +++ /dev/null @@ -1,23 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/kxkb.cpp,v -retrieving revision 1.70 -retrieving revision 1.72 -diff -u -p -r1.70 -r1.72 ---- kxkb/kxkb.cpp 2003/10/30 18:58:11 1.70 -+++ kxkb/kxkb.cpp 2004/06/28 14:19:03 1.72 -@@ -222,12 +222,12 @@ bool KXKBApp::settingsRead() - } - } - -- QString rule = "xfree86"; //config->readEntry("Rule", "xfree86"); -- m_rules = new KeyRules( rule ); -+ m_rules = new KeyRules(); - m_model = config->readEntry("Model", "pc104"); - m_layout = config->readEntry("Layout", ""); - m_defaultLayout = m_layout; - -+ - m_list = config->readListEntry("Additional"); - if (!m_list.contains(m_layout)) - { - diff --git a/x11/kdebase4/files/patch-kxkb_rules.cpp b/x11/kdebase4/files/patch-kxkb_rules.cpp deleted file mode 100644 index c76490862b0f..000000000000 --- a/x11/kdebase4/files/patch-kxkb_rules.cpp +++ /dev/null @@ -1,85 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.cpp,v -retrieving revision 1.37 -retrieving revision 1.38 -diff -u -p -r1.37 -r1.38 ---- kxkb/rules.cpp 2003/10/24 06:15:26 1.37 -+++ kxkb/rules.cpp 2004/06/28 14:19:03 1.38 -@@ -16,11 +16,23 @@ - - #include "rules.h" - --const QString X11_DIR( "/usr/X11R6/lib/X11/" ); -+const char* X11DirList[2] = {"/usr/X11R6/lib/X11/", "/usr/local/X11R6/lib/X11/"}; -+const char* rulesFileList[2] = {"xkb/rules/xfree86", "xkb/rules/xorg"}; - --KeyRules::KeyRules(QString rule): -+KeyRules::KeyRules(): - m_layouts(90) - { -+ for(int ii=0; ii<2; ii++) -+ if( QDir(X11DirList[ii]).exists() ) { -+ X11_DIR = X11DirList[ii]; -+ break; -+ } -+ -+ if( X11_DIR.isEmpty() ) { -+ kdDebug() << "Cannot find X11 directory!" << endl; -+ return; -+ } -+ - // ugly check for XFree 4.3 or older - if( QDir(X11_DIR + "xkb/symbols/pc").exists() ) { - m_xfree43 = true; -@@ -29,8 +41,20 @@ KeyRules::KeyRules(QString rule): - m_xfree43 = false; - } - -- loadRules(X11_DIR + QString("xkb/rules/%1").arg(rule)); -- loadOldLayouts(X11_DIR + QString("xkb/rules/xfree86")); -+ QString rulesFile; -+ for(int ii=0; ii<2; ii++) -+ if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) { -+ rulesFile = X11_DIR + rulesFileList[ii]; -+ break; -+ } -+ -+ if( rulesFile.isEmpty() ) { -+ kdDebug() << "Cannot find rules file in " << X11_DIR << endl; -+ return; -+ } -+ -+ loadRules(rulesFile); -+ loadOldLayouts(rulesFile); - loadGroups(::locate("config", "kxkb_groups")); - } - -@@ -51,9 +75,7 @@ static struct { - { 0, 0 } - }; - -- XkbRF_RulesPtr rules; -- -- rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); -+ XkbRF_RulesPtr rules = XkbRF_Load(QFile::encodeName(file).data(), "", true, true); - - if (rules == NULL) { - kdDebug() << "Unable to load rules" << endl; -@@ -176,7 +198,7 @@ unsigned int KeyRules::getGroup(const QS - return it == m_initialGroups.end() ? 0 : it.data(); - } - -- -+/* - QStringList KeyRules::rules(QString path) - { - QStringList result; -@@ -193,7 +215,7 @@ QStringList KeyRules::rules(QString path - - return result; - } -- -+*/ - - /* pretty simple algorithm - reads the layout file and - tries to find "xkb_symbols" diff --git a/x11/kdebase4/files/patch-kxkb_rules.h b/x11/kdebase4/files/patch-kxkb_rules.h deleted file mode 100644 index 23d2432f51e6..000000000000 --- a/x11/kdebase4/files/patch-kxkb_rules.h +++ /dev/null @@ -1,33 +0,0 @@ -=================================================================== -RCS file: /usr/repos/kde/kdebase/kxkb/rules.h,v -retrieving revision 1.11 -retrieving revision 1.12 -diff -u -p -r1.11 -r1.12 ---- kxkb/rules.h 2003/08/24 04:02:38 1.11 -+++ kxkb/rules.h 2004/06/28 14:19:03 1.12 -@@ -10,14 +10,14 @@ class KeyRules - { - public: - -- KeyRules(QString rule="xfree86"); -+ KeyRules(); - - const QDict<char> &models() const { return m_models; }; - const QDict<char> &layouts() const { return m_layouts; }; - const QDict<char> &options() const { return m_options; }; - - void parseVariants(const QStringList& vars, QDict<char>& variants, bool chkVars=true); -- static QStringList rules(QString path = QString::null); -+// static QStringList rules(QString path = QString::null); - - QStringList getVariants(const QString& layout); - unsigned int getGroup(const QString& layout, const char* baseGr); -@@ -42,6 +42,8 @@ private: - QStringList m_oldLayouts; - QStringList m_nonLatinLayouts; - bool m_xfree43; -+ -+ QString X11_DIR; // pseudo-constant - }; - - diff --git a/x11/kdebase4/files/patch-post-3.2.3-kdebase-htmlframes b/x11/kdebase4/files/patch-post-3.2.3-kdebase-htmlframes deleted file mode 100644 index 87a3a7688f32..000000000000 --- a/x11/kdebase4/files/patch-post-3.2.3-kdebase-htmlframes +++ /dev/null @@ -1,138 +0,0 @@ -Index: konqueror/konq_mainwindow.cc -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v -retrieving revision 1.1274.2.24 -diff -u -p -r1.1274.2.24 konq_mainwindow.cc ---- konqueror/konq_mainwindow.cc 7 Jun 2004 23:10:55 -0000 1.1274.2.24 -+++ konqueror/konq_mainwindow.cc 3 Aug 2004 14:54:23 -0000 -@@ -862,6 +862,7 @@ void KonqMainWindow::slotOpenURLRequest( - { - kdDebug(1202) << "KonqMainWindow::slotOpenURLRequest frameName=" << args.frameName << endl; - -+ KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); - QString frameName = args.frameName; - - if ( !frameName.isEmpty() ) -@@ -882,11 +883,11 @@ void KonqMainWindow::slotOpenURLRequest( - frameName.lower() != _parent ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- KonqView *view = childView( frameName, &hostExtension, 0 ); -+ KonqView *view = childView( callingPart, frameName, &hostExtension, 0 ); - if ( !view ) - { - KonqMainWindow *mainWindow = 0; -- view = findChildView( frameName, &mainWindow, &hostExtension, 0 ); -+ view = findChildView( callingPart, frameName, &mainWindow, &hostExtension, 0 ); - - if ( !view || !mainWindow ) - { -@@ -909,8 +910,7 @@ void KonqMainWindow::slotOpenURLRequest( - } - } - -- KParts::ReadOnlyPart *part = static_cast<KParts::ReadOnlyPart *>( sender()->parent() ); -- KonqView *view = childView( part ); -+ KonqView *view = childView( callingPart ); - openURL( view, url, args ); - } - -@@ -1045,7 +1045,7 @@ void KonqMainWindow::slotCreateNewWindow - if ( !args.frameName.isEmpty() && args.frameName.lower() != "_blank" ) - { - KParts::BrowserHostExtension *hostExtension = 0; -- if ( findChildView( args.frameName, &mainWindow, &hostExtension, &part ) ) -+ if ( findChildView( 0, args.frameName, &mainWindow, &hostExtension, &part ) ) - { - // Found a view. If url isn't empty, we should open it - but this never happens currently - // findChildView put the resulting part in 'part', so we can just return now -@@ -2097,9 +2097,9 @@ KonqView * KonqMainWindow::childView( KP - return 0L; - } - --KonqView * KonqMainWindow::childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { -- //kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; -+ kdDebug() << "KonqMainWindow::childView this=" << this << " looking for " << name << endl; - - MapViews::ConstIterator it = m_mapViews.begin(); - MapViews::ConstIterator end = m_mapViews.end(); -@@ -2107,11 +2107,11 @@ KonqView * KonqMainWindow::childView( co - { - KonqView* view = it.data(); - QString viewName = view->viewName(); -- //kdDebug() << " - viewName=" << viewName << " " -- // << "frame names:" << view->frameNames().join( "," ) << endl; -+ kdDebug() << " - viewName=" << viewName << " " -+ << "frame names:" << view->frameNames().join( "," ) << endl; - if ( !viewName.isEmpty() && viewName == name ) - { -- //kdDebug() << "found existing view by name: " << view << endl; -+ kdDebug() << "found existing view by name: " << view << endl; - if ( hostExtension ) - *hostExtension = 0; - if ( part ) -@@ -2120,8 +2120,13 @@ KonqView * KonqMainWindow::childView( co - } - - // First look for a hostextension containing this frame name -- // (KonqView looks for it recursively) -- KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), 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 ) - { -@@ -2131,7 +2136,7 @@ KonqView * KonqMainWindow::childView( co - { - if ( frameIt.current()->name() == name ) - { -- //kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; -+ kdDebug() << "found a frame of name " << name << " : " << frameIt.current() << endl; - if ( hostExtension ) - *hostExtension = ext; - if ( part ) -@@ -2146,7 +2151,7 @@ KonqView * KonqMainWindow::childView( co - } - - // static --KonqView * KonqMainWindow::findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) -+KonqView * KonqMainWindow::findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ) - { - if ( !s_lstViews ) - return 0; -@@ -2154,7 +2159,7 @@ KonqView * KonqMainWindow::findChildView - QPtrListIterator<KonqMainWindow> it( *s_lstViews ); - for (; it.current(); ++it ) - { -- KonqView *res = it.current()->childView( name, hostExtension, part ); -+ KonqView *res = it.current()->childView( callingPart, name, hostExtension, part ); - if ( res ) - { - if ( mainWindow ) -Index: konqueror/konq_mainwindow.h -=================================================================== -RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.h,v -retrieving revision 1.423.2.4 -diff -u -p -r1.423.2.4 konq_mainwindow.h ---- konqueror/konq_mainwindow.h 7 Jun 2004 23:10:56 -0000 1.423.2.4 -+++ konqueror/konq_mainwindow.h 3 Aug 2004 14:54:23 -0000 -@@ -145,10 +145,10 @@ public: - void insertChildView( KonqView *childView ); - void removeChildView( KonqView *childView ); - KonqView *childView( KParts::ReadOnlyPart *view ); -- KonqView *childView( const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ KonqView *childView( KParts::ReadOnlyPart *callingPart, const QString &name, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // dcop idl bug! it can't handle KonqMainWindow *&mainWindow -- static KonqView *findChildView( const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); -+ static KonqView *findChildView( KParts::ReadOnlyPart *callingPart, const QString &name, KonqMainWindow **mainWindow, KParts::BrowserHostExtension **hostExtension, KParts::ReadOnlyPart **part ); - - // Total number of views - int viewCount() const { return m_mapViews.count(); } diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 58c0d7450c18..929fe25dee06 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -1,8 +1,6 @@ bin/appletproxy bin/drkonqi bin/extensionproxy -bin/filesharelist -bin/fileshareset bin/genkdmconf bin/kaccess bin/kappfinder @@ -12,9 +10,12 @@ bin/kcheckpass bin/kcminit bin/kcmshell bin/kcontrol +bin/kcontroledit bin/kdcop bin/kdebugdialog bin/kdeeject +bin/kdeinstallktheme +bin/kdepasswd bin/kdeprintfax bin/kdesktop bin/kdesktop_lock @@ -24,11 +25,13 @@ bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet +bin/kdmctl bin/keditbookmarks bin/keditfiletype bin/kfind bin/kfmclient bin/kfontinst +bin/kfontview bin/khc_indexbuilder bin/khelpcenter bin/khotkeys @@ -61,13 +64,13 @@ bin/ktip bin/kwebdesktop bin/kwin bin/kwin_killer_helper +bin/kwin_rules_dialog bin/kwrite bin/kwriteconfig -bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc -etc/rc.d/kdm.sh +etc/rc.d/genkdmconf.sh etc/xdg/menus/applications-merged/kde-essential.menu etc/xdg/menus/kde-information.menu etc/xdg/menus/kde-screensavers.menu @@ -99,7 +102,6 @@ include/kfileivi.h include/kgreeterplugin.h include/kivdirectoryoverlay.h include/knewmenu.h -include/konq_bgnddlg.h include/konq_defaults.h include/konq_dirpart.h include/konq_drag.h @@ -134,6 +136,7 @@ include/kwin/kwinbutton.h include/kwin/options.h include/kwin/workspace.h lib/kconf_update_bin/khotkeys_update +lib/kconf_update_bin/kwin_update_window_settings lib/kde3/appletproxy.la lib/kde3/appletproxy.so lib/kde3/childpanel_panelextension.la @@ -152,8 +155,6 @@ lib/kde3/extensionproxy.la lib/kde3/extensionproxy.so lib/kde3/fontthumbnail.la lib/kde3/fontthumbnail.so -lib/kde3/gsthumbnail.la -lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la lib/kde3/htmlthumbnail.so lib/kde3/imagethumbnail.la @@ -188,12 +189,8 @@ lib/kde3/kcm_css.la lib/kde3/kcm_css.so lib/kde3/kcm_display.la lib/kde3/kcm_display.so -lib/kde3/kcm_email.la -lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la @@ -234,20 +231,23 @@ lib/kde3/kcm_konsole.la lib/kde3/kcm_konsole.so lib/kde3/kcm_ksplashthemes.la lib/kde3/kcm_ksplashthemes.so +lib/kde3/kcm_kthememanager.la +lib/kde3/kcm_kthememanager.so lib/kde3/kcm_kurifilt.la lib/kde3/kcm_kurifilt.so lib/kde3/kcm_kwindecoration.la lib/kde3/kcm_kwindecoration.so lib/kde3/kcm_kwinoptions.la lib/kde3/kcm_kwinoptions.so +lib/kde3/kcm_kwinrules.la +lib/kde3/kcm_kwinrules.so lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so -lib/kde3/kcm_passwords.la -lib/kde3/kcm_passwords.so +lib/kde3/kcm_nsplugins.so lib/kde3/kcm_performance.la lib/kde3/kcm_performance.so lib/kde3/kcm_printmgr.la @@ -268,6 +268,8 @@ lib/kde3/kcm_style.la lib/kde3/kcm_style.so lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so +lib/kde3/kcm_useraccount.la +lib/kde3/kcm_useraccount.so lib/kde3/kcm_xinerama.la lib/kde3/kcm_xinerama.so lib/kde3/kcminit.la @@ -276,10 +278,14 @@ lib/kde3/kcmshell.la lib/kde3/kcmshell.so lib/kde3/kcontrol.la lib/kde3/kcontrol.so +lib/kde3/kcontroledit.la +lib/kde3/kcontroledit.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so lib/kde3/kded_konqy_preloader.la lib/kde3/kded_konqy_preloader.so +lib/kde3/kded_kwrited.la +lib/kde3/kded_kwrited.so lib/kde3/kded_mountwatcher.la lib/kde3/kded_mountwatcher.so lib/kde3/kdesktop.la @@ -302,6 +308,8 @@ lib/kde3/kickermenu_find.la lib/kde3/kickermenu_find.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konqueror.la +lib/kde3/kickermenu_konqueror.so lib/kde3/kickermenu_konsole.la lib/kde3/kickermenu_konsole.so lib/kde3/kickermenu_prefmenu.la @@ -368,6 +376,8 @@ lib/kde3/konq_iconview.la lib/kde3/konq_iconview.so lib/kde3/konq_listview.la lib/kde3/konq_listview.so +lib/kde3/konq_remoteencoding.la +lib/kde3/konq_remoteencoding.so lib/kde3/konq_shellcmdplugin.la lib/kde3/konq_shellcmdplugin.so lib/kde3/konq_sidebar.la @@ -430,10 +440,10 @@ lib/kde3/kwin_modernsys_config.la lib/kde3/kwin_modernsys_config.so lib/kde3/kwin_quartz_config.la lib/kde3/kwin_quartz_config.so +lib/kde3/kwin_rules_dialog.la +lib/kde3/kwin_rules_dialog.so lib/kde3/kwrite.la lib/kde3/kwrite.so -lib/kde3/kwrited.la -lib/kde3/kwrited.so lib/kde3/kxkb.la lib/kde3/kxkb.so lib/kde3/launcher_panelapplet.la @@ -503,6 +513,8 @@ lib/libkdeinit_kcmshell.la lib/libkdeinit_kcmshell.so lib/libkdeinit_kcontrol.la lib/libkdeinit_kcontrol.so +lib/libkdeinit_kcontroledit.la +lib/libkdeinit_kcontroledit.so lib/libkdeinit_kdesktop.la lib/libkdeinit_kdesktop.so lib/libkdeinit_keditbookmarks.la @@ -533,20 +545,21 @@ lib/libkdeinit_ksmserver.la lib/libkdeinit_ksmserver.so lib/libkdeinit_kwin.la lib/libkdeinit_kwin.so +lib/libkdeinit_kwin_rules_dialog.la +lib/libkdeinit_kwin_rules_dialog.so lib/libkdeinit_kwrite.la lib/libkdeinit_kwrite.so -lib/libkdeinit_kwrited.la -lib/libkdeinit_kwrited.so lib/libkdeinit_kxkb.la lib/libkdeinit_kxkb.so +lib/libkfontinst.la +lib/libkfontinst.so +lib/libkfontinst.so.0 lib/libkickermain.la lib/libkickermain.so lib/libkickermain.so.1 lib/libkonq.la lib/libkonq.so lib/libkonq.so.6 -lib/libkonq_sidebar_tree.la -lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la lib/libkonqsidebarplugin.so lib/libkonqsidebarplugin.so.3 @@ -582,18 +595,17 @@ share/applications/kde/devices.desktop share/applications/kde/display.desktop share/applications/kde/dma.desktop share/applications/kde/ebrowsing.desktop -share/applications/kde/email.desktop -share/applications/kde/energy.desktop share/applications/kde/filebrowser.desktop -share/applications/kde/fileshare.desktop share/applications/kde/filetypes.desktop share/applications/kde/fonts.desktop share/applications/kde/icons.desktop +share/applications/kde/installktheme.desktop share/applications/kde/interrupts.desktop share/applications/kde/ioports.desktop share/applications/kde/ioslaveinfo.desktop share/applications/kde/kappfinder.desktop share/applications/kde/kate.desktop +share/applications/kde/kcm_useraccount.desktop share/applications/kde/kcmaccess.desktop share/applications/kde/kcmcgi.desktop share/applications/kde/kcmcss.desktop @@ -606,6 +618,7 @@ share/applications/kde/kcmnotify.desktop share/applications/kde/kcmperformance.desktop share/applications/kde/kcmsmserver.desktop share/applications/kde/kcmtaskbar.desktop +share/applications/kde/kdepasswd.desktop share/applications/kde/kdeprintfax.desktop share/applications/kde/kdm.desktop share/applications/kde/keyboard.desktop @@ -615,6 +628,7 @@ share/applications/kde/kfmclient.desktop share/applications/kde/kfmclient_dir.desktop share/applications/kde/kfmclient_html.desktop share/applications/kde/kfmclient_war.desktop +share/applications/kde/kfontview.desktop share/applications/kde/khotkeys.desktop share/applications/kde/khtml_behavior.desktop share/applications/kde/khtml_fonts.desktop @@ -631,9 +645,11 @@ share/applications/kde/kpersonalizer.desktop share/applications/kde/krandrtray.desktop share/applications/kde/ksplashthememgr.desktop share/applications/kde/ksysguard.desktop +share/applications/kde/kthememanager.desktop share/applications/kde/ktip.desktop share/applications/kde/kwindecoration.desktop share/applications/kde/kwinoptions.desktop +share/applications/kde/kwinrules.desktop share/applications/kde/kwrite.desktop share/applications/kde/lanbrowser.desktop share/applications/kde/language.desktop @@ -644,7 +660,6 @@ share/applications/kde/nic.desktop share/applications/kde/panel.desktop share/applications/kde/panel_appearance.desktop share/applications/kde/partitions.desktop -share/applications/kde/passwords.desktop share/applications/kde/pci.desktop share/applications/kde/printers.desktop share/applications/kde/privacy.desktop @@ -661,6 +676,8 @@ share/applications/kde/xserver.desktop share/applnk/.hidden/battery.desktop share/applnk/.hidden/bwarning.desktop share/applnk/.hidden/cwarning.desktop +share/applnk/.hidden/email.desktop +share/applnk/.hidden/energy.desktop share/applnk/.hidden/fileappearance.desktop share/applnk/.hidden/filebehavior.desktop share/applnk/.hidden/filepreviews.desktop @@ -676,10 +693,12 @@ share/applnk/.hidden/kwinactions.desktop share/applnk/.hidden/kwinadvanced.desktop share/applnk/.hidden/kwinfocus.desktop share/applnk/.hidden/kwinmoving.desktop +share/applnk/.hidden/passwords.desktop share/applnk/.hidden/power.desktop share/applnk/.hidden/randr.desktop share/applnk/.hidden/smb.desktop share/applnk/.hidden/socks.desktop +share/applnk/.hidden/userinfo.desktop share/applnk/.hidden/virtualdesktops.desktop share/applnk/.hidden/xinerama.desktop share/applnk/Internet/keditbookmarks.desktop @@ -691,7 +710,6 @@ share/applnk/Settings/LookNFeel/panel_appearance.desktop share/applnk/Settings/WebBrowsing/khtml_appearance.desktop share/applnk/Settings/WebBrowsing/nsplugin.desktop share/applnk/Settings/WebBrowsing/smb.desktop -share/applnk/Settings/email.desktop share/applnk/Settingsmenu/printmgr.desktop share/applnk/System/ScreenSavers/KBlankscreen.desktop share/applnk/System/ScreenSavers/KRandom.desktop @@ -845,6 +863,8 @@ share/apps/kappfinder/apps/Multimedia/Grip.desktop share/apps/kappfinder/apps/Multimedia/MP3info.desktop share/apps/kappfinder/apps/Multimedia/XMovie.desktop share/apps/kappfinder/apps/Multimedia/alevt.desktop +share/apps/kappfinder/apps/Multimedia/alsamixergui.desktop +share/apps/kappfinder/apps/Multimedia/audacity.desktop share/apps/kappfinder/apps/Multimedia/aviplay.desktop share/apps/kappfinder/apps/Multimedia/bcast2000.desktop share/apps/kappfinder/apps/Multimedia/enjoympeg.desktop @@ -855,7 +875,9 @@ share/apps/kappfinder/apps/Multimedia/mtv.desktop share/apps/kappfinder/apps/Multimedia/ogle.desktop share/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/apps/kappfinder/apps/Multimedia/realplayer.desktop +share/apps/kappfinder/apps/Multimedia/rezound.desktop share/apps/kappfinder/apps/Multimedia/slab.desktop +share/apps/kappfinder/apps/Multimedia/sweep.desktop share/apps/kappfinder/apps/Multimedia/xawtv.desktop share/apps/kappfinder/apps/Multimedia/xcam.desktop share/apps/kappfinder/apps/Multimedia/xine.desktop @@ -912,6 +934,7 @@ share/apps/kappfinder/apps/Utilities/calctool.desktop share/apps/kappfinder/apps/Utilities/e-notes.desktop share/apps/kappfinder/apps/Utilities/oclock.desktop share/apps/kappfinder/apps/Utilities/xgnokii.desktop +share/apps/kate/externaltools share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png share/apps/kate/icons/crystalsvg/16x16/actions/modified.png @@ -934,6 +957,7 @@ share/apps/kate/scripts/sample.desktop share/apps/kate/scripts/sample.sh share/apps/kate/tips share/apps/kbookmark/directory_bookmarkbar.desktop +share/apps/kcm_componentchooser/kcm_browser.desktop share/apps/kcm_componentchooser/kcm_kemail.desktop share/apps/kcm_componentchooser/kcm_terminal.desktop share/apps/kcmcss/template.css @@ -974,6 +998,7 @@ share/apps/kconf_update/kwin_focus1.sh share/apps/kconf_update/kwin_focus1.upd share/apps/kconf_update/kwiniconify.upd share/apps/kconf_update/kwinsticky.upd +share/apps/kconf_update/kwinupdatewindowsettings.upd share/apps/kconf_update/move_favicons.sh share/apps/kconf_update/move_session_config.sh share/apps/kconf_update/pluginlibFix.pl @@ -991,6 +1016,12 @@ share/apps/kcontrol/pics/part1.png share/apps/kcontrol/pics/part2.png share/apps/kcontrol/pics/part3.png share/apps/kcontrol/pics/play.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png +share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png +share/apps/kcontroledit/kcontroleditui.rc share/apps/kdcop/kdcopui.rc share/apps/kdeprint/template/background.png share/apps/kdeprint/template/class.template @@ -1089,8 +1120,37 @@ share/apps/kdisplay/color-schemes/WindowsXP.kcsrc share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc share/apps/kdm/pics/kdeflower.png share/apps/kdm/pics/kdelogo.png +share/apps/kdm/pics/users/Apple.png +share/apps/kdm/pics/users/BeachBall.png +share/apps/kdm/pics/users/Blowfish.png +share/apps/kdm/pics/users/Bug.png +share/apps/kdm/pics/users/Butterfly.png +share/apps/kdm/pics/users/Car.png +share/apps/kdm/pics/users/Cow.png +share/apps/kdm/pics/users/Daemon.png +share/apps/kdm/pics/users/Dog.png +share/apps/kdm/pics/users/Elephant.png +share/apps/kdm/pics/users/Flower.png +share/apps/kdm/pics/users/Frog.png +share/apps/kdm/pics/users/Ghost.png +share/apps/kdm/pics/users/Guitar.png +share/apps/kdm/pics/users/Heart.png +share/apps/kdm/pics/users/Konqui.png +share/apps/kdm/pics/users/Lion.png +share/apps/kdm/pics/users/Monkey.png +share/apps/kdm/pics/users/Penguin.png +share/apps/kdm/pics/users/Pig.png +share/apps/kdm/pics/users/Rabbit.png +share/apps/kdm/pics/users/Ring.png +share/apps/kdm/pics/users/Scream.png +share/apps/kdm/pics/users/Shark.png +share/apps/kdm/pics/users/Splash.png +share/apps/kdm/pics/users/Star.png +share/apps/kdm/pics/users/Teddybear.png +share/apps/kdm/pics/users/Turtle.png share/apps/kdm/pics/users/default1.png share/apps/kdm/pics/users/default2.png +share/apps/kdm/pics/users/default3.png share/apps/kdm/pics/users/root1.png share/apps/kdm/sessions/9wm.desktop share/apps/kdm/sessions/aewm++.desktop @@ -1137,6 +1197,7 @@ share/apps/kdm/sessions/waimea.desktop share/apps/kdm/sessions/wm2.desktop share/apps/kdm/sessions/wmaker.desktop share/apps/kdm/sessions/xfce.desktop +share/apps/kdm/sessions/xfce4.desktop share/apps/keditbookmarks/keditbookmarks-genui.rc share/apps/keditbookmarks/keditbookmarksui.rc share/apps/kfindpart/icons/locolor/22x22/actions/archive.png @@ -1146,6 +1207,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/info.png share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/apps/kfindpart/icons/locolor/22x22/actions/save.png share/apps/kfindpart/icons/locolor/22x22/actions/search.png +share/apps/kfontview/kfontviewpart.rc share/apps/khelpcenter/glossary.html.in share/apps/khelpcenter/glossary.xslt share/apps/khelpcenter/intro.html.in @@ -1205,6 +1267,7 @@ share/apps/kicker/icons/locolor/16x16/actions/modified.png share/apps/kicker/menuext/find.desktop share/apps/kicker/menuext/find/kfind.desktop share/apps/kicker/menuext/find/websearch.desktop +share/apps/kicker/menuext/konquerormenu.desktop share/apps/kicker/menuext/konsolemenu.desktop share/apps/kicker/menuext/prefmenu.desktop share/apps/kicker/menuext/printmenu.desktop @@ -1332,16 +1395,20 @@ share/apps/kio_info/kde-info2html share/apps/kio_info/kde-info2html.conf share/apps/kjobviewer/kjobviewerui.rc share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png +share/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new_sep.png share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/apps/kmenuedit/kmenueditui.rc share/apps/konqiconview/konq_iconview.rc share/apps/konqiconview/konq_multicolumnview.rc +share/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc share/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/apps/konqlistview/konq_detailedlistview.rc share/apps/konqlistview/konq_infolistview.rc share/apps/konqlistview/konq_textview.rc share/apps/konqlistview/konq_treeview.rc +share/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc share/apps/konqsidebartng/add/virtualfolderadd.desktop share/apps/konqsidebartng/add/webmodule_add.desktop @@ -1373,7 +1440,6 @@ share/apps/konqsidebartng/virtual_folders/services/.directory share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop share/apps/konqsidebartng/virtual_folders/services/devices.desktop share/apps/konqsidebartng/virtual_folders/services/fonts.desktop -share/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop share/apps/konqsidebartng/websidebar/websidebar.html share/apps/konqueror/about/background.png @@ -1406,6 +1472,7 @@ share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png share/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png +share/apps/konqueror/konq-simplebrowser.rc share/apps/konqueror/konqueror.rc share/apps/konqueror/pics/arrow_bottomleft.png share/apps/konqueror/pics/arrow_bottomright.png @@ -1418,7 +1485,10 @@ share/apps/konqueror/pics/indicator_noconnect.png share/apps/konqueror/pics/indicator_viewactive.png share/apps/konqueror/pics/thumbnailfont_7x4.png share/apps/konqueror/profiles/filemanagement +share/apps/konqueror/profiles/kde_devel share/apps/konqueror/profiles/midnightcommander +share/apps/konqueror/profiles/simplebrowser +share/apps/konqueror/profiles/tabbedbrowsing share/apps/konqueror/profiles/webbrowsing share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop @@ -1432,6 +1502,8 @@ share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop +share/apps/konqueror/servicemenus/installfont.desktop +share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop share/apps/konqueror/servicemenus/konsolehere.desktop share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop @@ -1477,15 +1549,16 @@ share/apps/konsole/LightPicture.schema share/apps/konsole/Linux.schema share/apps/konsole/README.KeyTab share/apps/konsole/README.Schema +share/apps/konsole/README.default.Keytab +share/apps/konsole/README.default.Schema share/apps/konsole/Transparent.schema share/apps/konsole/Transparent_MC.schema share/apps/konsole/Transparent_darkbg.schema share/apps/konsole/Transparent_lightbg.schema share/apps/konsole/WhiteOnBlack.schema share/apps/konsole/XTerm.schema -share/apps/konsole/default.Keytab -share/apps/konsole/default.Schema share/apps/konsole/eventsrc +share/apps/konsole/freebsd.keytab share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png @@ -1577,19 +1650,22 @@ share/apps/kwin/web.desktop share/apps/kwrite/kwriteui.rc share/apps/naughtyapplet/pics/naughty-happy.png share/apps/naughtyapplet/pics/naughty-sad.png +share/apps/plugin/nspluginpart.rc share/autostart/kdesktop.desktop share/autostart/khotkeys.desktop share/autostart/klipper.desktop share/autostart/konqy_preload.desktop share/autostart/ktip.desktop -share/autostart/kwrited.desktop share/autostart/panel.desktop +share/config.kcfg/kcm_useraccount.kcfg +share/config.kcfg/kcm_useraccount_pass.kcfg +share/config.kcfg/konqueror.kcfg +share/config.kcfg/kwin.kcfg share/config/kdesktop_custom_menu1 share/config/kdesktop_custom_menu2 share/config/klipperrc share/config/konqsidebartng.rc share/config/kshorturifilterrc -share/config/kwritedrc share/config/kxkb_groups share/config/mountwatcher.desktop share/desktop-directories/kde-development.directory @@ -1610,6 +1686,7 @@ share/desktop-directories/kde-main.directory share/desktop-directories/kde-more.directory share/desktop-directories/kde-multimedia.directory share/desktop-directories/kde-office.directory +share/desktop-directories/kde-science.directory share/desktop-directories/kde-settings-accessibility.directory share/desktop-directories/kde-settings-components.directory share/desktop-directories/kde-settings-desktop.directory @@ -2151,6 +2228,7 @@ share/icons/crystalsvg/128x128/apps/kfm_home.png share/icons/crystalsvg/128x128/apps/khelpcenter.png share/icons/crystalsvg/128x128/apps/kjobviewer.png share/icons/crystalsvg/128x128/apps/klipper.png +share/icons/crystalsvg/128x128/apps/kmenu.png share/icons/crystalsvg/128x128/apps/konqueror.png share/icons/crystalsvg/128x128/apps/konsole.png share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -2175,7 +2253,6 @@ share/icons/crystalsvg/128x128/apps/package_network.png share/icons/crystalsvg/128x128/apps/package_settings.png share/icons/crystalsvg/128x128/apps/package_toys.png share/icons/crystalsvg/128x128/apps/package_utilities.png -share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/apps/penguin.png share/icons/crystalsvg/128x128/apps/personal.png share/icons/crystalsvg/128x128/apps/phppg.png @@ -2322,7 +2399,6 @@ share/icons/crystalsvg/16x16/apps/package_wordprocessing.png share/icons/crystalsvg/16x16/apps/pan.png share/icons/crystalsvg/16x16/apps/panel.png share/icons/crystalsvg/16x16/apps/panel_settings.png -share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/apps/penguin.png share/icons/crystalsvg/16x16/apps/personal.png share/icons/crystalsvg/16x16/apps/phppg.png @@ -2369,6 +2445,7 @@ share/icons/crystalsvg/16x16/apps/xv.png share/icons/crystalsvg/16x16/devices/print_printer.png share/icons/crystalsvg/16x16/filesystems/folder_print2.png share/icons/crystalsvg/22x22/actions/newfont.png +share/icons/crystalsvg/22x22/actions/textwaterfall.png share/icons/crystalsvg/22x22/apps/klipper.png share/icons/crystalsvg/22x22/apps/konqueror.png share/icons/crystalsvg/22x22/apps/ksplash.png @@ -2376,6 +2453,7 @@ share/icons/crystalsvg/22x22/apps/kvirc.png share/icons/crystalsvg/22x22/apps/nedit.png share/icons/crystalsvg/22x22/apps/randr.png share/icons/crystalsvg/32x32/actions/newfont.png +share/icons/crystalsvg/32x32/actions/textwaterfall.png share/icons/crystalsvg/32x32/apps/abiword.png share/icons/crystalsvg/32x32/apps/access.png share/icons/crystalsvg/32x32/apps/acroread.png @@ -2451,6 +2529,7 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png share/icons/crystalsvg/32x32/apps/kfind.png share/icons/crystalsvg/32x32/apps/kfm.png share/icons/crystalsvg/32x32/apps/kfm_home.png +share/icons/crystalsvg/32x32/apps/kfontview.png share/icons/crystalsvg/32x32/apps/khelpcenter.png share/icons/crystalsvg/32x32/apps/kjobviewer.png share/icons/crystalsvg/32x32/apps/klipper.png @@ -2504,7 +2583,6 @@ share/icons/crystalsvg/32x32/apps/package_toys.png share/icons/crystalsvg/32x32/apps/package_utilities.png share/icons/crystalsvg/32x32/apps/package_wordprocessing.png share/icons/crystalsvg/32x32/apps/pan.png -share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/apps/penguin.png share/icons/crystalsvg/32x32/apps/personal.png share/icons/crystalsvg/32x32/apps/phppg.png @@ -2622,6 +2700,7 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png share/icons/crystalsvg/48x48/apps/kfind.png share/icons/crystalsvg/48x48/apps/kfm.png share/icons/crystalsvg/48x48/apps/kfm_home.png +share/icons/crystalsvg/48x48/apps/kfontview.png share/icons/crystalsvg/48x48/apps/khelpcenter.png share/icons/crystalsvg/48x48/apps/kjobviewer.png share/icons/crystalsvg/48x48/apps/klipper.png @@ -2670,7 +2749,6 @@ share/icons/crystalsvg/48x48/apps/package_toys.png share/icons/crystalsvg/48x48/apps/package_utilities.png share/icons/crystalsvg/48x48/apps/package_wordprocessing.png share/icons/crystalsvg/48x48/apps/pan.png -share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/apps/penguin.png share/icons/crystalsvg/48x48/apps/personal.png share/icons/crystalsvg/48x48/apps/phppg.png @@ -2770,7 +2848,6 @@ share/icons/crystalsvg/64x64/apps/package_network.png share/icons/crystalsvg/64x64/apps/package_settings.png share/icons/crystalsvg/64x64/apps/package_toys.png share/icons/crystalsvg/64x64/apps/package_utilities.png -share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/apps/penguin.png share/icons/crystalsvg/64x64/apps/personal.png share/icons/crystalsvg/64x64/apps/phppg.png @@ -2790,6 +2867,83 @@ share/icons/crystalsvg/64x64/apps/xclock.png share/icons/crystalsvg/64x64/apps/xfmail.png share/icons/crystalsvg/64x64/apps/xmag.png share/icons/crystalsvg/64x64/devices/print_printer.png +share/icons/crystalsvg/scalable/apps/access.svgz +share/icons/crystalsvg/scalable/apps/acroread.svgz +share/icons/crystalsvg/scalable/apps/aim.svgz +share/icons/crystalsvg/scalable/apps/aktion.svgz +share/icons/crystalsvg/scalable/apps/antivirus.svgz +share/icons/crystalsvg/scalable/apps/applixware.svgz +share/icons/crystalsvg/scalable/apps/ark.svgz +share/icons/crystalsvg/scalable/apps/arts.svgz +share/icons/crystalsvg/scalable/apps/artsbuilder.svgz +share/icons/crystalsvg/scalable/apps/artscontrol.svgz +share/icons/crystalsvg/scalable/apps/background.svgz +share/icons/crystalsvg/scalable/apps/bell.svgz +share/icons/crystalsvg/scalable/apps/browser.svgz +share/icons/crystalsvg/scalable/apps/cache.svgz +share/icons/crystalsvg/scalable/apps/camera.svgz +share/icons/crystalsvg/scalable/apps/clanbomber.svgz +share/icons/crystalsvg/scalable/apps/clock.svgz +share/icons/crystalsvg/scalable/apps/colors.svgz +share/icons/crystalsvg/scalable/apps/core.svgz +share/icons/crystalsvg/scalable/apps/date.svgz +share/icons/crystalsvg/scalable/apps/display.svgz +share/icons/crystalsvg/scalable/apps/download_manager.svgz +share/icons/crystalsvg/scalable/apps/email.svgz +share/icons/crystalsvg/scalable/apps/energy.svgz +share/icons/crystalsvg/scalable/apps/error.svgz +share/icons/crystalsvg/scalable/apps/filetypes.svgz +share/icons/crystalsvg/scalable/apps/fonts.svgz +share/icons/crystalsvg/scalable/apps/galeon.svgz +share/icons/crystalsvg/scalable/apps/gnome/apps.svgz +share/icons/crystalsvg/scalable/apps/go.svgz +share/icons/crystalsvg/scalable/apps/harddrive.svgz +share/icons/crystalsvg/scalable/apps/hardware.svgz +share/icons/crystalsvg/scalable/apps/hwinfo.svgz +share/icons/crystalsvg/scalable/apps/karbon14.svgz +share/icons/crystalsvg/scalable/apps/kate.svgz +share/icons/crystalsvg/scalable/apps/kcalc.svgz +share/icons/crystalsvg/scalable/apps/kcmdevices.svgz +share/icons/crystalsvg/scalable/apps/kcmkwm.svgz +share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz +share/icons/crystalsvg/scalable/apps/kdict.svgz +share/icons/crystalsvg/scalable/apps/kdvi.svgz +share/icons/crystalsvg/scalable/apps/khelpcenter.svgz +share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz +share/icons/crystalsvg/scalable/apps/klipper.svgz +share/icons/crystalsvg/scalable/apps/kmail.svgz +share/icons/crystalsvg/scalable/apps/konqueror.svgz +share/icons/crystalsvg/scalable/apps/konsole.svgz +share/icons/crystalsvg/scalable/apps/kopete.svgz +share/icons/crystalsvg/scalable/apps/ksnapshot.svgz +share/icons/crystalsvg/scalable/apps/kwrite.svgz +share/icons/crystalsvg/scalable/apps/locale.svgz +share/icons/crystalsvg/scalable/apps/mail.svgz +share/icons/crystalsvg/scalable/apps/my_mac.svgz +share/icons/crystalsvg/scalable/apps/mycomputer.svgz +share/icons/crystalsvg/scalable/apps/netscape.svgz +share/icons/crystalsvg/scalable/apps/openoffice.svgz +share/icons/crystalsvg/scalable/apps/package_toys.svgz +share/icons/crystalsvg/scalable/apps/package_utilities.svgz +share/icons/crystalsvg/scalable/apps/penguin.svgz +share/icons/crystalsvg/scalable/apps/quicktime.svgz +share/icons/crystalsvg/scalable/apps/realplayer.svgz +share/icons/crystalsvg/scalable/apps/samba.svgz +share/icons/crystalsvg/scalable/apps/shell.svgz +share/icons/crystalsvg/scalable/apps/soffice.svgz +share/icons/crystalsvg/scalable/apps/staroffice.svgz +share/icons/crystalsvg/scalable/apps/stylesheet.svgz +share/icons/crystalsvg/scalable/apps/terminal.svgz +share/icons/crystalsvg/scalable/apps/tux.svgz +share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/apps/winprops.svgz +share/icons/crystalsvg/scalable/apps/x.svgz +share/icons/crystalsvg/scalable/apps/xapp.svgz +share/icons/crystalsvg/scalable/apps/xcalc.svgz +share/icons/crystalsvg/scalable/apps/xchat.svgz +share/icons/crystalsvg/scalable/apps/xclock.svgz +share/icons/crystalsvg/scalable/apps/xeyes.svgz +share/icons/crystalsvg/scalable/apps/xpaint.svgz share/icons/hicolor/16x16/apps/khotkeys.png share/icons/hicolor/32x32/apps/khotkeys.png share/icons/locolor/16x16/apps/kcmfontinst.png @@ -2803,7 +2957,6 @@ share/locale/l10n/ae/entry.desktop share/locale/l10n/ae/flag.png share/locale/l10n/af/entry.desktop share/locale/l10n/af/flag.png -share/locale/l10n/africa.desktop share/locale/l10n/ag/entry.desktop share/locale/l10n/ag/flag.png share/locale/l10n/ai/entry.desktop @@ -2820,7 +2973,6 @@ share/locale/l10n/ar/entry.desktop share/locale/l10n/ar/flag.png share/locale/l10n/as/entry.desktop share/locale/l10n/as/flag.png -share/locale/l10n/asia.desktop share/locale/l10n/at/entry.desktop share/locale/l10n/at/flag.png share/locale/l10n/au/entry.desktop @@ -2872,7 +3024,9 @@ share/locale/l10n/cc/entry.desktop share/locale/l10n/cc/flag.png share/locale/l10n/cd/entry.desktop share/locale/l10n/cd/flag.png +share/locale/l10n/centralafrica.desktop share/locale/l10n/centralamerica.desktop +share/locale/l10n/centralasia.desktop share/locale/l10n/centraleurope.desktop share/locale/l10n/cf/entry.desktop share/locale/l10n/cf/flag.png @@ -2916,6 +3070,7 @@ share/locale/l10n/do/entry.desktop share/locale/l10n/do/flag.png share/locale/l10n/dz/entry.desktop share/locale/l10n/dz/flag.png +share/locale/l10n/eastasia.desktop share/locale/l10n/easteurope.desktop share/locale/l10n/ec/entry.desktop share/locale/l10n/ec/flag.png @@ -3059,6 +3214,7 @@ share/locale/l10n/mg/entry.desktop share/locale/l10n/mg/flag.png share/locale/l10n/mh/entry.desktop share/locale/l10n/mh/flag.png +share/locale/l10n/middleeast.desktop share/locale/l10n/mk/entry.desktop share/locale/l10n/mk/flag.png share/locale/l10n/ml/entry.desktop @@ -3105,6 +3261,7 @@ share/locale/l10n/nl/entry.desktop share/locale/l10n/nl/flag.png share/locale/l10n/no/entry.desktop share/locale/l10n/no/flag.png +share/locale/l10n/northafrica.desktop share/locale/l10n/northamerica.desktop share/locale/l10n/northeurope.desktop share/locale/l10n/np/entry.desktop @@ -3178,7 +3335,10 @@ share/locale/l10n/sn/entry.desktop share/locale/l10n/sn/flag.png share/locale/l10n/so/entry.desktop share/locale/l10n/so/flag.png +share/locale/l10n/southafrica.desktop share/locale/l10n/southamerica.desktop +share/locale/l10n/southasia.desktop +share/locale/l10n/southeastasia.desktop share/locale/l10n/southeurope.desktop share/locale/l10n/sr/entry.desktop share/locale/l10n/sr/flag.png @@ -3244,6 +3404,7 @@ share/locale/l10n/vn/entry.desktop share/locale/l10n/vn/flag.png share/locale/l10n/vu/entry.desktop share/locale/l10n/vu/flag.png +share/locale/l10n/westafrica.desktop share/locale/l10n/westeurope.desktop share/locale/l10n/wf/entry.desktop share/locale/l10n/wf/flag.png @@ -3259,8 +3420,11 @@ share/locale/l10n/zm/entry.desktop share/locale/l10n/zm/flag.png share/locale/l10n/zw/entry.desktop share/locale/l10n/zw/flag.png +share/mimelnk/application/x-kate-project.desktop share/mimelnk/application/x-konsole.desktop share/mimelnk/application/x-ksysguard.desktop +share/mimelnk/application/x-ktheme.desktop +share/mimelnk/application/x-smb-server.desktop share/mimelnk/application/x-smb-workgroup.desktop share/mimelnk/fonts/folder.desktop share/mimelnk/fonts/system-folder.desktop @@ -3302,7 +3466,6 @@ share/services/fish.protocol share/services/floppy.protocol share/services/fonts.protocol share/services/fontthumbnail.desktop -share/services/gsthumbnail.desktop share/services/gzip.protocol share/services/htmlthumbnail.desktop share/services/imagethumbnail.desktop @@ -3313,6 +3476,7 @@ share/services/kaccess.desktop share/services/katedefaultproject.desktop share/services/kded/favicons.desktop share/services/kded/konqy_preloader.desktop +share/services/kded/kwrited.desktop share/services/kded/mountwatcher.desktop share/services/kdeprint_part.desktop share/services/kfile_font.desktop @@ -3341,6 +3505,7 @@ share/services/kurisearchfilter.desktop share/services/kwrited.desktop share/services/kxkb.desktop share/services/ldap.protocol +share/services/ldaps.protocol share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol @@ -3359,6 +3524,7 @@ share/services/searchproviders/alltheweb.desktop share/services/searchproviders/altavista.desktop share/services/searchproviders/appsy.desktop share/services/searchproviders/austronaut.desktop +share/services/searchproviders/backports.desktop share/services/searchproviders/bugft.desktop share/services/searchproviders/bugno.desktop share/services/searchproviders/call.desktop @@ -3366,7 +3532,9 @@ share/services/searchproviders/citeseer.desktop share/services/searchproviders/cpan.desktop share/services/searchproviders/ctan.desktop share/services/searchproviders/ctan_cat.desktop +share/services/searchproviders/dbug.desktop share/services/searchproviders/de2en.desktop +share/services/searchproviders/deb.desktop share/services/searchproviders/dmoz.desktop share/services/searchproviders/docbook.desktop share/services/searchproviders/doi.desktop @@ -3379,6 +3547,7 @@ share/services/searchproviders/excite.desktop share/services/searchproviders/feedster.desktop share/services/searchproviders/foldoc.desktop share/services/searchproviders/fr2en.desktop +share/services/searchproviders/freedb.desktop share/services/searchproviders/freshmeat.desktop share/services/searchproviders/froogle.desktop share/services/searchproviders/google.desktop @@ -3387,12 +3556,14 @@ share/services/searchproviders/google_groups.desktop share/services/searchproviders/google_images.desktop share/services/searchproviders/google_lucky.desktop share/services/searchproviders/google_news.desktop +share/services/searchproviders/gracenote.desktop share/services/searchproviders/hotbot.desktop share/services/searchproviders/hyperdictionary.desktop share/services/searchproviders/hyperdictionary_thesaurus.desktop share/services/searchproviders/imdb.desktop share/services/searchproviders/it2en.desktop share/services/searchproviders/jeeves.desktop +share/services/searchproviders/katatudo.desktop share/services/searchproviders/kde.desktop share/services/searchproviders/kde_webcvs.desktop share/services/searchproviders/leo.desktop @@ -3439,6 +3610,7 @@ share/services/useragentstrings/ie55onwinnt5.desktop share/services/useragentstrings/ie60onwinnt51.desktop share/services/useragentstrings/lynxoncurrent.desktop share/services/useragentstrings/mozoncurrent.desktop +share/services/useragentstrings/mozoncurrent16.desktop share/services/useragentstrings/mozonwin2000.desktop share/services/useragentstrings/mozonwinnt4.desktop share/services/useragentstrings/nn301oncurrent.desktop @@ -3461,21 +3633,36 @@ share/servicetypes/searchprovider.desktop share/servicetypes/terminalemulator.desktop share/servicetypes/thumbcreator.desktop share/servicetypes/uasprovider.desktop +share/sounds/KDE_Beep.ogg share/sounds/KDE_Beep_Ahem.wav share/sounds/KDE_Beep_Beep.wav share/sounds/KDE_Beep_Bottles.wav +share/sounds/KDE_Beep_Car.ogg +share/sounds/KDE_Beep_Classic.ogg share/sounds/KDE_Beep_ClassicBeep.wav share/sounds/KDE_Beep_ClockChime.wav +share/sounds/KDE_Beep_Connect.ogg share/sounds/KDE_Beep_Connect.wav +share/sounds/KDE_Beep_Digital_1.ogg +share/sounds/KDE_Beep_Digital_2.ogg share/sounds/KDE_Beep_Door.wav share/sounds/KDE_Beep_Honk.wav share/sounds/KDE_Beep_Lightning.wav +share/sounds/KDE_Beep_Phone_1.ogg +share/sounds/KDE_Beep_Phone_2.ogg share/sounds/KDE_Beep_Pop.wav share/sounds/KDE_Beep_RimShot.wav share/sounds/KDE_Beep_RingRing.wav share/sounds/KDE_Beep_ShortBeep.wav share/sounds/KDE_Beep_Yo.wav +share/sounds/KDE_Bottles.ogg +share/sounds/KDE_Chimes_1.ogg +share/sounds/KDE_Chimes_2.ogg +share/sounds/KDE_Chimes_3.ogg share/sounds/KDE_Click.wav +share/sounds/KDE_Click_1.ogg +share/sounds/KDE_Click_2.ogg +share/sounds/KDE_Click_3.ogg share/sounds/KDE_Close_Window.wav share/sounds/KDE_Critical_Error.wav share/sounds/KDE_Desktop1.wav @@ -3486,21 +3673,70 @@ share/sounds/KDE_Desktop5.wav share/sounds/KDE_Desktop6.wav share/sounds/KDE_Desktop7.wav share/sounds/KDE_Desktop8.wav +share/sounds/KDE_Desktop_1.ogg +share/sounds/KDE_Desktop_2.ogg +share/sounds/KDE_Desktop_3.ogg +share/sounds/KDE_Desktop_4.ogg +share/sounds/KDE_Desktop_5.ogg +share/sounds/KDE_Desktop_6.ogg +share/sounds/KDE_Desktop_7.ogg +share/sounds/KDE_Desktop_8.ogg +share/sounds/KDE_Dialog_Appear.ogg share/sounds/KDE_Dialog_Appear.wav +share/sounds/KDE_Dialog_Disappear.ogg share/sounds/KDE_Dialog_Disappear.wav +share/sounds/KDE_Door.ogg +share/sounds/KDE_Drum_Break.ogg share/sounds/KDE_Error.wav +share/sounds/KDE_Error_1.ogg +share/sounds/KDE_Error_2.ogg +share/sounds/KDE_Event_1.ogg +share/sounds/KDE_Event_2.ogg +share/sounds/KDE_Event_3.ogg +share/sounds/KDE_Event_4.ogg +share/sounds/KDE_Event_5.ogg +share/sounds/KDE_Glass_Break.ogg +share/sounds/KDE_Keyboard_Key_1.ogg share/sounds/KDE_Logout.wav +share/sounds/KDE_Logout_1.ogg +share/sounds/KDE_Logout_2.ogg +share/sounds/KDE_Logout_3.ogg share/sounds/KDE_Notify.wav +share/sounds/KDE_Pop.ogg +share/sounds/KDE_Star_Ship_1.ogg share/sounds/KDE_Startup.wav +share/sounds/KDE_Startup_1.ogg +share/sounds/KDE_Startup_2.ogg +share/sounds/KDE_Startup_3.ogg +share/sounds/KDE_TypeWriter_Bell.ogg +share/sounds/KDE_TypeWriter_End_Of_Line.ogg +share/sounds/KDE_TypeWriter_Key_1.ogg +share/sounds/KDE_TypeWriter_Key_2.ogg +share/sounds/KDE_TypeWriter_Reload.ogg +share/sounds/KDE_TypeWriter_Scroll.ogg +share/sounds/KDE_Vox_Ahem.ogg +share/sounds/KDE_Vox_Yo.ogg +share/sounds/KDE_Warp.ogg +share/sounds/KDE_Water_Drop.ogg +share/sounds/KDE_Window_Close.ogg share/sounds/KDE_Window_Close.wav +share/sounds/KDE_Window_DeIconify.ogg share/sounds/KDE_Window_DeIconify.wav +share/sounds/KDE_Window_Hide.ogg +share/sounds/KDE_Window_Iconify.ogg share/sounds/KDE_Window_Iconify.wav share/sounds/KDE_Window_Maximize.wav +share/sounds/KDE_Window_Open.ogg share/sounds/KDE_Window_Open.wav +share/sounds/KDE_Window_Shade_Down.ogg share/sounds/KDE_Window_Shade_Down.wav +share/sounds/KDE_Window_Shade_Up.ogg share/sounds/KDE_Window_Shade_Up.wav +share/sounds/KDE_Window_Sticky.ogg share/sounds/KDE_Window_Sticky.wav +share/sounds/KDE_Window_UnHide.ogg share/sounds/KDE_Window_UnMaximize.wav +share/sounds/KDE_Window_UnSticky.ogg share/sounds/KDE_Window_UnSticky.wav share/sounds/pop.wav share/templates/.source/CAMERA-Device.desktop @@ -3821,12 +4057,9 @@ share/wallpapers/triplegears.jpg @dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16 -@dirrm share/icons/crystalsvg/64x64/apps -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/32x32/apps +@dirrm share/icons/crystalsvg/scalable/apps/gnome +@dirrm share/icons/crystalsvg/scalable/apps @dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/fonts/override @dirrm share/fonts @dirrm share/doc/kdm @@ -3928,6 +4161,8 @@ share/wallpapers/triplegears.jpg @dirrm share/doc/HTML/en/kcontrol @dirrm share/doc/HTML/en/kate @dirrm share/desktop-directories +@dirrm share/config.kcfg +@dirrm share/apps/plugin @dirrm share/apps/naughtyapplet/pics @dirrm share/apps/naughtyapplet @dirrm share/apps/kwrite @@ -4020,6 +4255,7 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/khelpcenter/plugins/Applications @dirrm share/apps/khelpcenter/plugins @dirrm share/apps/khelpcenter +@dirrm share/apps/kfontview @dirrm share/apps/kfindpart/icons/locolor/22x22/actions @dirrm share/apps/kfindpart/icons/locolor/22x22 @dirrm share/apps/kfindpart/icons/locolor @@ -4048,6 +4284,16 @@ share/wallpapers/triplegears.jpg @dirrm share/apps/kdeprint_part @dirrm share/apps/kdeprint/template @dirrm share/apps/kdcop +@dirrm share/apps/kcontroledit/icons/locolor/16x16/actions +@dirrm share/apps/kcontroledit/icons/locolor/16x16 +@dirrm share/apps/kcontroledit/icons/locolor +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/32x32 +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22/actions +@dirrm share/apps/kcontroledit/icons/crystalsvg/22x22 +@dirrm share/apps/kcontroledit/icons/crystalsvg +@dirrm share/apps/kcontroledit/icons +@dirrm share/apps/kcontroledit @dirrm share/apps/kcontrol/pics @dirrm share/apps/kcontrol @dirrm share/apps/kcmlocale/pics diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 3ec71f896601..5291618d0b6d 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,19 +8,19 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 5 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs -CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* +CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.* BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ +LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ + art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ cups.2:${PORTSDIR}/print/cups-base \ fam.0:${PORTSDIR}/devel/fam \ @@ -42,6 +42,7 @@ USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes +_NO_KDE_CLOSURE=yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 536c08c26477..f2547c4be01c 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.2.3.tar.bz2) = d9d1c4bd2016a96f156b491ca908dc16 -SIZE (KDE/kdelibs-3.2.3.tar.bz2) = 12737024 +MD5 (KDE/kdelibs-3.3.0.tar.bz2) = 1c208724987433fc1929d22928c1a358 +SIZE (KDE/kdelibs-3.3.0.tar.bz2) = 15703843 diff --git a/x11/kdelibs3/files/patch-dcop_dcopserver.cpp b/x11/kdelibs3/files/patch-dcop_dcopserver.cpp deleted file mode 100644 index 2099d87d1839..000000000000 --- a/x11/kdelibs3/files/patch-dcop_dcopserver.cpp +++ /dev/null @@ -1,185 +0,0 @@ -Index: dcopserver.cpp -=================================================================== -RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v -retrieving revision 1.160.2.3 -diff -u -p -r1.160.2.3 dcopserver.cpp ---- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 -+++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 -@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE - fprintf (addfp, "\n"); - } - -+#ifndef HAVE_MKSTEMPS -+#include <string.h> -+#include <strings.h> - --#ifndef HAVE_MKSTEMP --static char *unique_filename (const char *path, const char *prefix) --#else --static char *unique_filename (const char *path, const char *prefix, int *pFd) --#endif -+/* this is based on code taken from the GNU libc, distributed under the LGPL license */ -+ -+/* Generate a unique temporary file name from TEMPLATE. -+ -+ TEMPLATE has the form: -+ -+ <path>/ccXXXXXX<suffix> -+ -+ SUFFIX_LEN tells us how long <suffix> is (it can be zero length). -+ -+ The last six characters of TEMPLATE before <suffix> must be "XXXXXX"; -+ they are replaced with a string that makes the filename unique. -+ -+ Returns a file descriptor open on the file for reading and writing. */ -+ -+int mkstemps (char* _template, int suffix_len) - { --#ifndef HAVE_MKSTEMP --#ifndef X_NOT_POSIX -- return ((char *) tempnam (path, prefix)); --#else -- char tempFile[PATH_MAX]; -- char *tmp; -+ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -+ char *XXXXXX; -+ int len; -+ int count; -+ int value; -+ -+ len = strlen (_template); -+ -+ if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) -+ return -1; -+ -+ XXXXXX = &_template[len - 6 - suffix_len]; -+ -+ value = rand(); -+ for (count = 0; count < 256; ++count) -+ { -+ int v = value; -+ int fd; -+ -+ /* Fill in the random bits. */ -+ XXXXXX[0] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[1] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[2] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[3] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[4] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[5] = letters[v % 62]; -+ -+ fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); -+ if (fd >= 0) -+ /* The file does not exist. */ -+ return fd; -+ -+ /* This is a random value. It is only necessary that the next -+ TMP_MAX values generated by adding 7777 to VALUE are different -+ with (module 2^32). */ -+ value += 7777; -+ } -+ /* We return the null string if we can't find a unique file name. */ -+ _template[0] = '\0'; -+ return -1; -+} - -- snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); -- tmp = (char *) mktemp (tempFile); -- if (tmp) -- { -- char *ptr = (char *) malloc (strlen (tmp) + 1); -- if (ptr != NULL) -- { -- strcpy (ptr, tmp); -- } -- return (ptr); -- } -- else -- return (NULL); - #endif --#else -+ -+static char *unique_filename (const char *path, const char *prefix, int *pFd) -+{ - char tempFile[PATH_MAX]; - char *ptr; - -@@ -480,43 +523,10 @@ static char *unique_filename (const char - if (ptr != NULL) - { - strcpy(ptr, tempFile); -- *pFd = mkstemp(ptr); -+ *pFd = mkstemps(ptr, 0); - } - return ptr; --#endif --} -- --#if 0 --Status SetAuthentication_local (int count, IceListenObj *listenObjs) --{ -- int i; -- for (i = 0; i < count; i ++) { -- char *prot = IceGetListenConnectionString(listenObjs[i]); -- if (!prot) continue; -- char *host = strchr(prot, '/'); -- char *sock = 0; -- if (host) { -- *host=0; -- host++; -- sock = strchr(host, ':'); -- if (sock) { -- *sock = 0; -- sock++; -- } -- } --#ifndef NDEBUG -- qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", -- (unsigned)i, prot, sock); --#endif -- if (sock && !strcmp(prot, "local")) { -- chmod(sock, 0700); -- } -- IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); -- free(prot); -- } -- return 1; - } --#endif - - #define MAGIC_COOKIE_LEN 16 - -@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO - int original_umask; - int i; - QCString command; --#ifdef HAVE_MKSTEMP - int fd; --#endif - - original_umask = umask (0077); /* disallow non-owner access */ - - path = getenv ("DCOP_SAVE_DIR"); - if (!path) - path = "/tmp"; --#ifndef HAVE_MKSTEMP -- if ((addAuthFile = unique_filename (path, "dcop")) == NULL) -- goto bad; - -- if (!(addfp = fopen (addAuthFile, "w"))) -- goto bad; --#else - if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) - goto bad; - - if (!(addfp = fdopen(fd, "wb"))) - goto bad; --#endif - - if ((*_authDataEntries = static_cast<IceAuthDataEntry *>(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) - goto bad; diff --git a/x11/kdelibs3/files/patch-kdecore-kextsock.cpp b/x11/kdelibs3/files/patch-kdecore-kextsock.cpp deleted file mode 100644 index d07c32c8cf25..000000000000 --- a/x11/kdelibs3/files/patch-kdecore-kextsock.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- kdecore/kextsock.cpp 11 Dec 2003 22:54:36 -0000 1.67 -+++ kdecore/kextsock.cpp 22 Jan 2004 19:59:13 -0000 -@@ -1892,7 +1892,11 @@ int KExtendedSocket::doLookup(const QStr - err = kde_getaddrinfo(_host, _serv, &hint, res); - - #ifdef HAVE_RES_INIT -- if (err == EAI_NONAME || err == EAI_NODATA || err == EAI_AGAIN) -+ if (err == EAI_NONAME || -+#ifdef EAI_NODATA -+ err == EAI_NODATA || -+#endif -+ err == EAI_AGAIN) - { - // A loookup error occurred and nothing was resolved - // However, since the user could have just dialed up to the ISP -@@ -2274,7 +2278,11 @@ void KExtendedSocket::dnsResultsReady() - else - { - d->status = nothing; -+#ifdef EAI_NODATA - setError(IO_LookupError, EAI_NODATA); -+#else -+ setError(IO_LookupError, EAI_NONAME); -+#endif - } - - emit lookupFinished(n); diff --git a/x11/kdelibs3/files/patch-kdecore-kidna.cpp b/x11/kdelibs3/files/patch-kdecore-kidna.cpp deleted file mode 100644 index 821a171977e8..000000000000 --- a/x11/kdelibs3/files/patch-kdecore-kidna.cpp +++ /dev/null @@ -1,58 +0,0 @@ -Index: kdecore/kidna.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kidna.cpp,v -retrieving revision 1.9.4.1 -diff -u -5 -p -d -r1.9.4.1 kidna.cpp ---- kdecore/kidna.cpp 4 Feb 2004 11:43:34 -0000 1.9.4.1 -+++ kdecore/kidna.cpp 13 Mar 2004 20:24:13 -0000 -@@ -21,16 +21,16 @@ - - #include "kidna.h" - - #include <kdebug.h> - --#include "ltdl.h" -+#include <dlfcn.h> - #include <stdlib.h> - - #define IDNA_SUCCESS 0 - --static lt_dlhandle KIDNA_lib; // = 0 -+void *KIDNA_lib; // = 0 - static bool KIDNA_lib_load_failed; // = false - - typedef int (*KIDNA_utf8_to_ace_t)(const char *, char **, int); - typedef int (*KIDNA_utf8ace_to_utf8_t)(const char *, char **, int); - -@@ -38,27 +38,27 @@ static KIDNA_utf8_to_ace_t KIDNA_utf8_to - static KIDNA_utf8ace_to_utf8_t KIDNA_utf8ace_to_utf8; // = 0 - - static void KIDNA_load_lib() - { - KIDNA_lib_load_failed = true; // Unless proven otherwise -- KIDNA_lib = lt_dlopen("/usr/local/lib/libidn.la"); -+ KIDNA_lib = dlopen("%%LOCALBASE%%/lib/libidn.so", RTLD_LAZY); - if (!KIDNA_lib) - { -- KIDNA_lib = lt_dlopen("/usr/lib/libidn.la"); -+ KIDNA_lib = dlopen("/usr/lib/libidn.so", RTLD_LAZY); - } - - if (!KIDNA_lib) - return; // Error - -- KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) lt_dlsym(KIDNA_lib, "idna_to_ascii_8z"); -+ KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) dlsym(KIDNA_lib, "idna_to_ascii_8z"); - if (!KIDNA_utf8_to_ace) - { - kdWarning() << "Symbol idna_utf8_to_ace not found." << endl; - return; // Error - } - -- KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) lt_dlsym(KIDNA_lib, "idna_to_unicode_8z8z"); -+ KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) dlsym(KIDNA_lib, "idna_to_unicode_8z8z"); - if (!KIDNA_utf8ace_to_utf8) - { - kdWarning() << "Symbol idna_utf8ace_to_utf8 not found." << endl; - return; // Error - } diff --git a/x11/kdelibs3/files/patch-kdecore_kstandarddirs.cpp b/x11/kdelibs3/files/patch-kdecore_kstandarddirs.cpp deleted file mode 100644 index 30d6bd10edbe..000000000000 --- a/x11/kdelibs3/files/patch-kdecore_kstandarddirs.cpp +++ /dev/null @@ -1,38 +0,0 @@ -Index: kstandarddirs.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kstandarddirs.cpp,v -retrieving revision 1.168.2.3 -retrieving revision 1.168.2.4 -diff -u -p -r1.168.2.3 -r1.168.2.4 ---- kdecore/kstandarddirs.cpp 8 Jun 2004 09:27:57 -0000 1.168.2.3 -+++ kdecore/kstandarddirs.cpp 26 Jun 2004 14:42:16 -0000 1.168.2.4 -@@ -651,7 +651,28 @@ void KStandardDirs::createSpecialResourc - char link[1024]; - link[1023] = 0; - int result = readlink(QFile::encodeName(dir).data(), link, 1023); -- if ((result == -1) && (errno == ENOENT)) -+ bool relink = (result == -1) && (errno == ENOENT); -+ if ((result > 0) && (link[0] == '/')) -+ { -+ link[result] = 0; -+ struct stat stat_buf; -+ int res = lstat(link, &stat_buf); -+ if ((res == -1) && (errno == ENOENT)) -+ { -+ relink = true; -+ } -+ else if ((res == -1) || (!S_ISDIR(stat_buf.st_mode))) -+ { -+ fprintf(stderr, "Error: \"%s\" is not a directory.\n", link); -+ relink = true; -+ } -+ else if (stat_buf.st_uid != getuid()) -+ { -+ fprintf(stderr, "Error: \"%s\" is owned by uid %d instead of uid %d.\n", link, stat_buf.st_uid, getuid()); -+ relink = true; -+ } -+ } -+ if (relink) - { - QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin")); - if (srv.isEmpty()) diff --git a/x11/kdelibs3/files/patch-kdefx_kstyle.cpp b/x11/kdelibs3/files/patch-kdefx_kstyle.cpp deleted file mode 100644 index 27106d2563ec..000000000000 --- a/x11/kdelibs3/files/patch-kdefx_kstyle.cpp +++ /dev/null @@ -1,134 +0,0 @@ ---- kdefx/kstyle.cpp.orig 19 Jun 2004 15:00:06 -0000 1.49 -+++ kdefx/kstyle.cpp 19 Jun 2004 15:07:47 -0000 -@@ -158,12 +158,16 @@ struct KStylePrivate - float menuOpacity; - - TransparencyEngine transparencyEngine; - KStyle::KStyleScrollBarType scrollbarType; - TransparencyHandler* menuHandler; - KStyle::KStyleFlags flags; -+ -+ //For KPE_ListViewBranch -+ QBitmap *verticalLine; -+ QBitmap *horizontalLine; - }; - - // ----------------------------------------------------------------------------- - - - KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype ) -@@ -206,23 +210,28 @@ KStyle::KStyle( KStyleFlags flags, KStyl - // Create an instance of the menu transparency handler - d->menuOpacity = settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90); - d->menuHandler = new TransparencyHandler(this, d->transparencyEngine, - d->menuOpacity, d->menuDropShadow); - } - } -+ -+ d->verticalLine = 0; -+ d->horizontalLine = 0; - - // Create a transparency handler if only drop shadows are enabled. - if (!d->menuHandler && d->menuDropShadow) - d->menuHandler = new TransparencyHandler(this, Disabled, 1.0, d->menuDropShadow); - } - - - KStyle::~KStyle() - { -- if (d->menuHandler) -- delete d->menuHandler; -+ delete d->verticalLine; -+ delete d->horizontalLine; -+ -+ delete d->menuHandler; - - d->menuHandler = NULL; - delete d; - } - - -@@ -391,46 +400,40 @@ void KStyle::drawKStylePrimitive( KStyle - break; - } - - case KPE_ListViewBranch: { - // Typical Windows style listview branch element (dotted line). - -- static QBitmap *verticalLine = 0, *horizontalLine = 0; -- static QCleanupHandler<QBitmap> qlv_cleanup_bitmap; -- - // Create the dotline pixmaps if not already created -- if ( !verticalLine ) -+ if ( !d->verticalLine ) - { - // make 128*1 and 1*128 bitmaps that can be used for - // drawing the right sort of lines. -- verticalLine = new QBitmap( 1, 129, true ); -- horizontalLine = new QBitmap( 128, 1, true ); -+ d->verticalLine = new QBitmap( 1, 129, true ); -+ d->horizontalLine = new QBitmap( 128, 1, true ); - QPointArray a( 64 ); - QPainter p2; -- p2.begin( verticalLine ); -+ p2.begin( d->verticalLine ); - - int i; - for( i=0; i < 64; i++ ) - a.setPoint( i, 0, i*2+1 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); -- verticalLine->setMask( *verticalLine ); -+ d->verticalLine->setMask( *d->verticalLine ); - -- p2.begin( horizontalLine ); -+ p2.begin( d->horizontalLine ); - for( i=0; i < 64; i++ ) - a.setPoint( i, i*2+1, 0 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); -- horizontalLine->setMask( *horizontalLine ); -- -- qlv_cleanup_bitmap.add( &verticalLine ); -- qlv_cleanup_bitmap.add( &horizontalLine ); -+ d->horizontalLine->setMask( *d->horizontalLine ); - } - - p->setPen( cg.text() ); // cg.dark() is bad for dark color schemes. - - if (flags & Style_Horizontal) - { -@@ -441,13 +444,13 @@ void KStyle::drawKStylePrimitive( KStyle - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; -- p->drawPixmap( point, other, *horizontalLine, 0, 0, i, thickness ); -+ p->drawPixmap( point, other, *d->horizontalLine, 0, 0, i, thickness ); - point += i; - } - - } else { - int point = r.y(); - int other = r.x(); -@@ -457,13 +460,13 @@ void KStyle::drawKStylePrimitive( KStyle - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; -- p->drawPixmap( other, point, *verticalLine, 0, pixmapoffset, thickness, i ); -+ p->drawPixmap( other, point, *d->verticalLine, 0, pixmapoffset, thickness, i ); - point += i; - } - } - - break; - } diff --git a/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp b/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp deleted file mode 100644 index a9ae71f61519..000000000000 --- a/x11/kdelibs3/files/patch-kdeui-kxmlguifactory.cpp +++ /dev/null @@ -1,23 +0,0 @@ -Index: kxmlguifactory.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdeui/kxmlguifactory.cpp,v -retrieving revision 1.149 -retrieving revision 1.151 -diff -u -3 -p -r1.149 -r1.151 ---- kxmlguifactory.cpp 19 Jun 2004 21:35:02 -0000 1.149 -+++ kdeui/kxmlguifactory.cpp 22 Jun 2004 15:56:16 -0000 1.151 -@@ -124,7 +124,14 @@ QString KXMLGUIFactory::readConfigFile( - return QString::null; - } - -+#if QT_VERSION <= 0x030302 -+ // Work around bug in QString::fromUtf8 (which calls strlen). -+ QByteArray buffer(file.size() + 1); -+ buffer = file.readAll(); -+ buffer[ buffer.size() - 1 ] = '\0'; -+#else - QByteArray buffer(file.readAll()); -+#endif - return QString::fromUtf8(buffer.data(), buffer.size()); - } - diff --git a/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-htmlframes b/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-htmlframes deleted file mode 100644 index bc5b3a2f8a80..000000000000 --- a/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-htmlframes +++ /dev/null @@ -1,434 +0,0 @@ -Index: khtml/khtml_ext.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.cpp,v -retrieving revision 1.85.2.2 -diff -u -p -r1.85.2.2 khtml_ext.cpp ---- khtml/khtml_ext.cpp 24 Apr 2004 08:20:46 -0000 1.85.2.2 -+++ khtml/khtml_ext.cpp 3 Aug 2004 14:36:43 -0000 -@@ -646,6 +646,19 @@ bool KHTMLPartBrowserHostExtension::open - return m_part->openURLInFrame( url, urlArgs ); - } - -+void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) -+{ -+ if (id == VIRTUAL_FIND_FRAME_PARENT) -+ { -+ FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data); -+ KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); -+ if (parentPart) -+ param->parent = parentPart->browserHostExtension(); -+ return; -+ } -+ BrowserHostExtension::virtual_hook( id, data ); -+} -+ - // BCI: remove in KDE 4 - KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const QString &text, const QString &icon, const QObject *receiver, const char *slot, QObject *parent, const char *name ) - : KAction( text, icon, 0, receiver, slot, parent, name ) -Index: khtml/khtml_ext.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.h,v -retrieving revision 1.26.2.1 -diff -u -p -r1.26.2.1 khtml_ext.h ---- khtml/khtml_ext.h 29 Feb 2004 15:27:43 -0000 1.26.2.1 -+++ khtml/khtml_ext.h 3 Aug 2004 14:36:43 -0000 -@@ -98,6 +98,9 @@ public: - virtual const QPtrList<KParts::ReadOnlyPart> frames() const; - - virtual bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); -+ -+protected: -+ virtual void virtual_hook( int id, void* data ); - private: - KHTMLPart *m_part; - }; -Index: khtml/khtml_part.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v -retrieving revision 1.959.2.20 -diff -u -p -r1.959.2.20 khtml_part.cpp ---- khtml/khtml_part.cpp 29 Jun 2004 09:08:16 -0000 1.959.2.20 -+++ khtml/khtml_part.cpp 3 Aug 2004 14:36:46 -0000 -@@ -757,12 +757,16 @@ DOM::Document KHTMLPart::document() cons - return d->m_doc; - } - -- - KParts::BrowserExtension *KHTMLPart::browserExtension() const - { - return d->m_extension; - } - -+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const -+{ -+ return d->m_hostExtension; -+} -+ - KHTMLView *KHTMLPart::view() const - { - return d->m_view; -@@ -880,29 +884,18 @@ QVariant KHTMLPart::crossFrameExecuteScr - // we always allow these - } - else { -- while (destpart->parentPart()) -- destpart = destpart->parentPart(); -- destpart = destpart->findFrame(target); -- -+ destpart = findFrame(target); - if (!destpart) -- destpart = this; // ### doesn't make sense, does it? -+ destpart = this; - } - - // easy way out? - if (destpart == this) - return executeScript(DOM::Node(), script); - -- - // now compare the domains -- if (!destpart->htmlDocument().isNull() && -- !htmlDocument().isNull()) { -- DOM::DOMString actDomain = htmlDocument().domain(); -- DOM::DOMString destDomain = destpart->htmlDocument().domain(); -- -- if (actDomain == destDomain) -- return destpart->executeScript(DOM::Node(), script); -- } -- -+ if (destpart->checkFrameAccess(this)) -+ return destpart->executeScript(DOM::Node(), script); - - // eww, something went wrong. better execute it in our frame - return executeScript(DOM::Node(), script); -@@ -3358,7 +3351,7 @@ void KHTMLPart::urlSelected( const QStri - if ( hasTarget ) - { - // unknown frame names should open in a new window. -- khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false ); -+ khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false ); - if ( frame ) - { - args.metaData()["referrer"] = d->m_referrer; -@@ -4364,6 +4357,7 @@ void KHTMLPart::slotChildDocCreated() - void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) - { - khtml::ChildFrame *child = frame( sender()->parent() ); -+ KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent())); - - // TODO: handle child target correctly! currently the script are always executed fur the parent - QString urlStr = url.url(); -@@ -4395,7 +4389,7 @@ void KHTMLPart::slotChildURLRequest( con - } - else if ( frameName != QString::fromLatin1( "_self" ) ) - { -- khtml::ChildFrame *_frame = recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); - - if ( !_frame ) - { -@@ -4437,46 +4431,92 @@ khtml::ChildFrame *KHTMLPart::frame( con - return 0L; - } - --//#define DEBUG_FINDFRAME -+//#define DEBUG_FINDFRAME - --KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) - { -+ if (callingHtmlPart == this) -+ return true; // trivial -+ -+ if (htmlDocument().isNull()) { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl; -- FrameIt it2 = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it2 != end; ++it2 ) -- kdDebug(6050) << " - having frame '" << (*it2).m_name << "'" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl; - #endif -- // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames -- ConstFrameIt it = d->m_frames.find( f ); -- if ( it == d->m_frames.end() ) -- { -+ return false; // we are empty? -+ } -+ -+ // now compare the domains -+ if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() && -+ !htmlDocument().isNull()) { -+ DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain(); -+ DOM::DOMString destDomain = htmlDocument().domain(); -+ - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl; - #endif -- return 0L; -+ -+ if (actDomain == destDomain) -+ return true; - } -- else { -- KParts::ReadOnlyPart *p = (*it).m_part; -- if ( p && p->inherits( "KHTMLPart" )) -- { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl; -+ else -+ { -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl; -+ } - #endif -- return (KHTMLPart*)p; -- } -- else -- { -+ return false; -+} -+ -+KHTMLPart * -+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) -+{ - #ifdef DEBUG_FINDFRAME -- if (p) -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl; -- else -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl; -+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; -+#endif -+ // Check access -+ KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); -+ -+ if (!checkFrameAccess(callingHtmlPart)) -+ return 0; -+ -+ FrameIt it = d->m_frames.find( f ); -+ FrameIt end = d->m_frames.end(); -+ if ( it != end ) -+ { -+#ifdef DEBUG_FINDFRAME -+ kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl; - #endif -- return 0L; -+ if (childFrame) -+ *childFrame = &(*it); -+ return this; -+ } -+ -+ it = d->m_frames.begin(); -+ for (; it != end; ++it ) -+ { -+ KParts::ReadOnlyPart *p = (*it).m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ { -+ KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame); -+ if (frameParent) -+ return frameParent; - } - } -+ return 0; -+} -+ -+ -+KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+{ -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); -+ if (parentFrame) -+ { -+ KParts::ReadOnlyPart *p = childFrame->m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ return static_cast<KHTMLPart *>(p); -+ } -+ return 0; - } - - KParts::ReadOnlyPart *KHTMLPart::currentFrame() const -@@ -4514,37 +4554,29 @@ KHTMLPart *KHTMLPart::parentPart() - return (KHTMLPart *)parent(); - } - --khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, -- bool callParent ) -+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, -+ const KParts::URLArgs &args, bool callParent ) - { -- FrameIt it = d->m_frames.find( args.frameName ); -- -- if ( it != d->m_frames.end() ) -- return &(*it); -- -- it = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it != end; ++it ) -- if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) ) -- { -- KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part; -- -- khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false ); -- if ( !res ) -- continue; -- -- childPart->requestObject( res, url, args ); -- return 0L; -- } -+#ifdef DEBUG_FINDFRAME -+ kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; -+#endif -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); -+ if (childPart) -+ { -+ if (childPart == this) -+ return childFrame; -+ -+ childPart->requestObject( childFrame, url, args ); -+ return 0; -+ } - - if ( parentPart() && callParent ) - { -- khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent ); - -- if ( res ) -- parentPart()->requestObject( res, url, args ); -- -- return 0L; -+ if ( res ) -+ parentPart()->requestObject( res, url, args ); - } - - return 0L; -@@ -4552,7 +4584,7 @@ khtml::ChildFrame *KHTMLPart::recursiveF - - void KHTMLPart::saveState( QDataStream &stream ) - { -- kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl; -+ kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl; - - stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() - << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); -Index: khtml/khtml_part.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v -retrieving revision 1.248.2.5 -diff -u -p -r1.248.2.5 khtml_part.h ---- khtml/khtml_part.h 29 Jun 2004 09:08:16 -0000 1.248.2.5 -+++ khtml/khtml_part.h 3 Aug 2004 14:36:47 -0000 -@@ -287,6 +287,7 @@ public: - */ - KParts::BrowserExtension *browserExtension() const; - KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const; -+ KParts::BrowserHostExtension *browserHostExtension() const; - - /** - * Returns a pointer to the HTML document's view. -@@ -812,6 +813,16 @@ public: - KHTMLPart *findFrame( const QString &f ); - - /** -+ * @internal -+ * Recursively finds the part containing the frame with name @p f -+ * and checks if it is accessible by @p callingPart -+ * Returns 0L if no suitable frame can't be found. -+ * Returns parent part if a suitable frame was found and -+ * frame info in @p *childFrame -+ */ -+ KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame=0 ); -+ -+ /** - * Return the current frame (the one that has focus) - * Not necessarily a direct child of ours, framesets can be nested. - * Returns "this" if this part isn't a frameset. -@@ -1376,6 +1387,8 @@ private: - - bool restoreURL( const KURL &url ); - void emitSelectionChanged(); -+ // Returns whether callingHtmlPart may access this part -+ bool checkFrameAccess(KHTMLPart *callingHtmlPart); - bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); - void startAutoScroll(); - void stopAutoScroll(); -@@ -1434,7 +1447,7 @@ private: - DOM::DocumentImpl *xmlDocImpl() const; - khtml::ChildFrame *frame( const QObject *obj ); - -- khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true ); -+ khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true ); - - bool checkLinkSecurity( const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null ); - QVariant executeScript( const QString& filename, int baseLine, const DOM::Node &n, const QString& script ); -Index: kparts/browserextension.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.cpp,v -retrieving revision 1.60.2.1 -diff -u -p -r1.60.2.1 browserextension.cpp ---- kparts/browserextension.cpp 10 Apr 2004 15:08:49 -0000 1.60.2.1 -+++ kparts/browserextension.cpp 3 Aug 2004 14:36:48 -0000 -@@ -636,6 +636,17 @@ BrowserHostExtension *BrowserHostExtensi - void BrowserExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+BrowserHostExtension * -+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame) -+{ -+ FindFrameParentParams param; -+ param.parent = 0; -+ param.callingPart = callingPart; -+ param.frame = frame; -+ virtual_hook(VIRTUAL_FIND_FRAME_PARENT, ¶m); -+ return param.parent; -+} -+ - void BrowserHostExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -Index: kparts/browserextension.h -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.h,v -retrieving revision 1.110 -diff -u -p -r1.110 browserextension.h ---- kparts/browserextension.h 26 Sep 2003 07:13:13 -0000 1.110 -+++ kparts/browserextension.h 3 Aug 2004 14:36:48 -0000 -@@ -671,10 +671,16 @@ public: - * - * Note that this method does not query the child objects recursively. - */ -- - virtual const QPtrList<KParts::ReadOnlyPart> frames() const; - - /** -+ * @internal -+ * Returns the part that contains @p frame and that may be accessed -+ * by @p callingPart -+ */ -+ BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame); -+ -+ /** - * Opens the given url in a hosted child frame. The frame name is specified in the - * frameName variable in the urlArgs argument structure (see KParts::URLArgs ) . - */ -@@ -687,6 +693,19 @@ public: - static BrowserHostExtension *childObject( QObject *obj ); - - protected: -+ /** This 'enum' along with the structure below is NOT part of the public API. -+ * It's going to disappear in KDE 4.0 and is likely to change inbetween. -+ * -+ * @internal -+ */ -+ enum { VIRTUAL_FIND_FRAME_PARENT = 0x10 }; -+ struct FindFrameParentParams -+ { -+ BrowserHostExtension *parent; -+ KParts::ReadOnlyPart *callingPart; -+ QString frame; -+ }; -+ - virtual void virtual_hook( int id, void* data ); - private: - class BrowserHostExtensionPrivate; diff --git a/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-kcookiejar b/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-kcookiejar deleted file mode 100644 index 2da6e9ac39d2..000000000000 --- a/x11/kdelibs3/files/patch-post-3.2.3-kdelibs-kcookiejar +++ /dev/null @@ -1,140 +0,0 @@ -Index: kioslave/http/kcookiejar/kcookiejar.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookiejar.cpp,v -retrieving revision 1.116 -retrieving revision 1.117 -diff -u -p -r1.116 -r1.117 ---- kioslave/http/kcookiejar/kcookiejar.cpp 19 Jul 2004 10:16:22 -0000 1.116 -+++ kioslave/http/kcookiejar/kcookiejar.cpp 20 Jul 2004 15:29:24 -0000 1.117 -@@ -244,6 +244,14 @@ KCookieJar::KCookieJar() - m_globalAdvice = KCookieDunno; - m_configChanged = false; - m_cookiesChanged = false; -+ -+ QString twoLevelTLD="name,ai,au,bd,bh,ck,eg,et,fk,il,in,kh,kr,mk,mt,na,np,nz,pg,pk,qa,sa,sb,sg,sv,ua,ug,uk,uy,vn,za,zw"; -+ QStringList countries = QStringList::split(',', twoLevelTLD); -+ for(QStringList::ConstIterator it = countries.begin(); -+ it != countries.end(); ++it) -+ { -+ m_twoLevelTLD.replace(*it, (int *) 1); -+ } - } - - // -@@ -528,14 +536,14 @@ static const char * parseNameValue(const - - } - --static void stripDomain(const QString &_fqdn, QString &_domain) -+void KCookieJar::stripDomain(const QString &_fqdn, QString &_domain) - { - QStringList domains; -- KCookieJar::extractDomains(_fqdn, domains); -+ extractDomains(_fqdn, domains); - _domain = domains[0]; - } - --static QString stripDomain( KHttpCookiePtr cookiePtr) -+QString KCookieJar::stripDomain( KHttpCookiePtr cookiePtr) - { - QString domain; // We file the cookie under this domain. - if (cookiePtr->domain().isEmpty()) -@@ -620,6 +628,13 @@ void KCookieJar::extractDomains(const QS - { - if (partList.count() == 1) - break; // We only have a TLD left. -+ -+ if ((partList.count() == 2) && (m_twoLevelTLD[partList[1].lower()])) -+ { -+ // This domain uses two-level TLDs in the form xxxx.yy -+ break; -+ } -+ - if ((partList.count() == 2) && (partList[1].length() == 2)) - { - // If this is a TLD, we should stop. (e.g. co.uk) -@@ -634,14 +649,6 @@ void KCookieJar::extractDomains(const QS - break; - } - -- // The .name domain uses <name>.<surname>.name -- // Although the TLD is striclty speaking .name, for our purpose -- // it should be <surname>.name since people should not be able -- // to set cookies for everyone with the same surname. -- // Matches <surname>.name -- if ((partList.count() == 2)&& (partList[1].lower() == L1("name"))) -- break; -- - QString domain = partList.join(L1(".")); - _domains.append('.' + domain); - _domains.append(domain); -Index: kioslave/http/kcookiejar/kcookiejar.h -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookiejar.h,v -retrieving revision 1.33 -retrieving revision 1.34 -diff -u -p -r1.33 -r1.34 ---- kioslave/http/kcookiejar/kcookiejar.h 22 Nov 2003 16:50:45 -0000 1.33 -+++ kioslave/http/kcookiejar/kcookiejar.h 20 Jul 2004 15:29:24 -0000 1.34 -@@ -306,8 +306,8 @@ public: - /** - * Returns a list of domains (_domainList) relevant for this host. - */ -- static void extractDomains(const QString &_fqdn, -- QStringList &_domainList); -+ void extractDomains(const QString &_fqdn, -+ QStringList &_domainList); - - static QString adviceToStr(KCookieAdvice _advice); - static KCookieAdvice strToAdvice(const QString &_str); -@@ -329,11 +329,15 @@ public: - */ - void setShowCookieDetails (bool value) { m_showCookieDetails = value; } - -+protected: -+ void stripDomain(const QString &_fqdn, QString &_domain); -+ QString stripDomain( KHttpCookiePtr cookiePtr); - - protected: - QStringList m_domainList; - KCookieAdvice m_globalAdvice; - QDict<KHttpCookieList> m_cookieDomains; -+ QDict<int> m_twoLevelTLD; - - bool m_configChanged; - bool m_cookiesChanged; -Index: kioslave/http/kcookiejar/kcookieserver.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookieserver.cpp,v -retrieving revision 1.50 -retrieving revision 1.51 -diff -u -p -r1.50 -r1.51 ---- kioslave/http/kcookiejar/kcookieserver.cpp 9 Jun 2003 10:56:42 -0000 1.50 -+++ kioslave/http/kcookiejar/kcookieserver.cpp 20 Jul 2004 15:29:24 -0000 1.51 -@@ -131,7 +131,7 @@ bool KCookieServer::cookiesPending( cons - if (!KCookieJar::parseURL(url, fqdn, path)) - return false; - -- KCookieJar::extractDomains( fqdn, domains ); -+ mCookieJar->extractDomains( fqdn, domains ); - for( KHttpCookie *cookie = mPendingCookies->first(); - cookie != 0L; - cookie = mPendingCookies->next()) -@@ -557,7 +557,7 @@ KCookieServer::setDomainAdvice(QString u - if (KCookieJar::parseURL(url, fqdn, dummy)) - { - QStringList domains; -- KCookieJar::extractDomains(fqdn, domains); -+ mCookieJar->extractDomains(fqdn, domains); - mCookieJar->setDomainAdvice(domains[0], - KCookieJar::strToAdvice(advice)); - } -@@ -573,7 +573,7 @@ KCookieServer::getDomainAdvice(QString u - if (KCookieJar::parseURL(url, fqdn, dummy)) - { - QStringList domains; -- KCookieJar::extractDomains(fqdn, domains); -+ mCookieJar->extractDomains(fqdn, domains); - advice = mCookieJar->getDomainAdvice(domains[0]); - } - return KCookieJar::adviceToStr(advice); diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 2e9c0f13fe3c..9f4d9a408459 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -14,6 +14,9 @@ bin/dcopref bin/dcopserver bin/dcopserver_shutdown bin/dcopstart +bin/filesharelist +bin/fileshareset +bin/ghns bin/imagetops bin/kab2kabc bin/kaddprinterwizard @@ -32,6 +35,7 @@ bin/kdontchangethehostname bin/kfile bin/kfmexec bin/kgrantpty +bin/khotnewstuff bin/kimage_concat bin/kinstalltheme bin/kio_http_cache_cleaner @@ -50,6 +54,7 @@ bin/kwrapper bin/lnusertemp bin/make_driver_db_cups bin/make_driver_db_lpr +bin/makekdewidgets bin/meinproc bin/preparetips etc/rc.d/kdelibs.sh @@ -117,6 +122,9 @@ include/kabc/formatplugin.h include/kabc/geo.h include/kabc/key.h include/kabc/ldapclient.h +include/kabc/ldapconfigwidget.h +include/kabc/ldapurl.h +include/kabc/ldif.h include/kabc/ldifconverter.h include/kabc/lock.h include/kabc/locknull.h @@ -149,6 +157,7 @@ include/kaccelmanager.h include/kaction.h include/kactionclasses.h include/kactioncollection.h +include/kactionselector.h include/kactionshortcutlist.h include/kactivelabel.h include/kallocator.h @@ -179,6 +188,7 @@ include/kbookmarkmanager.h include/kbookmarkmenu.h include/kbookmarknotifier.h include/kbufferedio.h +include/kbufferedsocket.h include/kbugreport.h include/kbuttonbox.h include/kcalendarsystem.h @@ -186,6 +196,7 @@ include/kcalendarsystemfactory.h include/kcatalogue.h include/kcharselect.h include/kcharsets.h +include/kclientsocketbase.h include/kclipboard.h include/kcmdlineargs.h include/kcmenumngr.h @@ -216,6 +227,7 @@ include/kcpuinfo.h include/kcrash.h include/kcursor.h include/kcustommenueditor.h +include/kdatagramsocket.h include/kdatastream.h include/kdatatool.h include/kdatepicker.h @@ -321,6 +333,7 @@ include/khtml_part.h include/khtml_settings.h include/khtmldefaults.h include/khtmlview.h +include/khttpproxysocketdevice.h include/kicondialog.h include/kiconeffect.h include/kiconloader.h @@ -330,6 +343,9 @@ include/kidna.h include/kimageeffect.h include/kimagefilepreview.h include/kimageio.h +include/kimiface.h +include/kimproxy.h +include/kimproxyiface.h include/kinputdialog.h include/kinstance.h include/kio/authinfo.h @@ -389,6 +405,7 @@ include/kjs/value.h include/kkeybutton.h include/kkeydialog.h include/kkeynative.h +include/klanguagebutton.h include/klargefile.h include/kled.h include/klibloader.h @@ -396,7 +413,9 @@ include/klineedit.h include/klineeditdlg.h include/klistbox.h include/klistview.h +include/klistviewsearchline.h include/klocale.h +include/klockfile.h include/kmacroexpander.h include/kmainwindow.h include/kmainwindowiface.h @@ -421,10 +440,23 @@ include/kmessagebox.h include/kmimemagic.h include/kmimesourcefactory.h include/kmimetype.h +include/kmimetypechooser.h include/kmimetyperesolver.h include/kmountpoint.h +include/kmulticastsocket.h +include/kmulticastsocketdevice.h include/kmultipledrag.h include/kmultitabbar.h +include/knetworkinterface.h +include/knewstuff/downloaddialog.h +include/knewstuff/engine.h +include/knewstuff/entry.h +include/knewstuff/knewstuff.h +include/knewstuff/knewstuffgeneric.h +include/knewstuff/provider.h +include/knewstuff/providerdialog.h +include/knewstuff/uploaddialog.h +include/knfsshare.h include/knotifyclient.h include/knotifydialog.h include/knotifywidgetbase.h @@ -478,8 +510,10 @@ include/krandomsequence.h include/krecentdocument.h include/kregexp.h include/kregexpeditorinterface.h +include/kremoteencoding.h include/kreplace.h include/kreplacedialog.h +include/kresolver.h include/kresources/configdialog.h include/kresources/configpage.h include/kresources/configwidget.h @@ -490,11 +524,13 @@ include/kresources/managerimpl.h include/kresources/resource.h include/kresources/selectdialog.h include/krestrictedline.h +include/kreverseresolver.h include/krfcdate.h include/krootpixmap.h include/krootprop.h include/kruler.h include/krun.h +include/ksambashare.h include/ksavefile.h include/kscan.h include/ksconfig.h @@ -502,6 +538,7 @@ include/kscreensaver.h include/kscreensaver_vroot.h include/kselect.h include/kseparator.h +include/kserversocket.h include/kservice.h include/kservicegroup.h include/kservicetype.h @@ -520,9 +557,23 @@ include/ksimpleconfig.h include/ksmimecrypto.h include/ksock.h include/ksockaddr.h +include/ksocketaddress.h +include/ksocketbase.h +include/ksocketdevice.h include/ksocks.h +include/ksockssocketdevice.h include/ksortablevaluelist.h include/kspell.h +include/kspell2/backgroundchecker.h +include/kspell2/broker.h +include/kspell2/configdialog.h +include/kspell2/configwidget.h +include/kspell2/defaultdictionary.h +include/kspell2/dialog.h +include/kspell2/dictionary.h +include/kspell2/filter.h +include/kspell2/highlighter.h +include/kspell2/settings.h include/kspelldlg.h include/ksplashscreen.h include/ksqueezedtextlabel.h @@ -556,6 +607,7 @@ include/kstdaccel.h include/kstdaction.h include/kstddirs.h include/kstdguiitem.h +include/kstreamsocket.h include/kstringhandler.h include/kstringvalidator.h include/kstyle.h @@ -600,6 +652,7 @@ include/ktexteditor/selectioninterfaceext.h include/ktexteditor/sessionconfiginterface.h include/ktexteditor/texthintinterface.h include/ktexteditor/undointerface.h +include/ktexteditor/variableinterface.h include/ktexteditor/view.h include/ktexteditor/viewcursorinterface.h include/ktexteditor/viewstatusmsginterface.h @@ -697,6 +750,8 @@ lib/kde3/kded_kcookiejar.la lib/kde3/kded_kcookiejar.so lib/kde3/kded_kdeprintd.la lib/kde3/kded_kdeprintd.so +lib/kde3/kded_kdetrayproxy.la +lib/kde3/kded_kdetrayproxy.so lib/kde3/kded_kpasswdserver.la lib/kde3/kded_kpasswdserver.so lib/kde3/kded_kssld.la @@ -723,14 +778,20 @@ lib/kde3/kgzipfilter.la lib/kde3/kgzipfilter.so lib/kde3/khtmlimagepart.la lib/kde3/khtmlimagepart.so +lib/kde3/kimg_dds.la +lib/kde3/kimg_dds.so lib/kde3/kimg_eps.la lib/kde3/kimg_eps.so +lib/kde3/kimg_exr.la +lib/kde3/kimg_exr.so lib/kde3/kimg_ico.la lib/kde3/kimg_ico.so lib/kde3/kimg_jp2.la lib/kde3/kimg_jp2.so lib/kde3/kimg_pcx.la lib/kde3/kimg_pcx.so +lib/kde3/kimg_rgb.la +lib/kde3/kimg_rgb.so lib/kde3/kimg_tga.la lib/kde3/kimg_tga.so lib/kde3/kimg_tiff.la @@ -759,6 +820,12 @@ lib/kde3/klauncher.la lib/kde3/klauncher.so lib/kde3/knotify.la lib/kde3/knotify.so +lib/kde3/kspell_ispell.la +lib/kde3/kspell_ispell.so +lib/kde3/ktexteditor_autobookmarker.la +lib/kde3/ktexteditor_autobookmarker.so +lib/kde3/ktexteditor_docwordcompletion.la +lib/kde3/ktexteditor_docwordcompletion.so lib/kde3/ktexteditor_insertfile.la lib/kde3/ktexteditor_insertfile.so lib/kde3/ktexteditor_isearch.la @@ -859,6 +926,9 @@ lib/libkdeui.so.6 lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.6 +lib/libkimproxy.la +lib/libkimproxy.so +lib/libkimproxy.so.0 lib/libkio.la lib/libkio.so lib/libkio.so.6 @@ -877,6 +947,9 @@ lib/libkmediaplayer.so.0 lib/libkmid.la lib/libkmid.so lib/libkmid.so.0 +lib/libknewstuff.la +lib/libknewstuff.so +lib/libknewstuff.so.1 lib/libkparts.la lib/libkparts.so lib/libkparts.so.3 @@ -892,6 +965,9 @@ lib/libkscript.so.0 lib/libkspell.la lib/libkspell.so lib/libkspell.so.6 +lib/libkspell2.la +lib/libkspell2.so +lib/libkspell2.so.1 lib/libktexteditor.la lib/libktexteditor.so lib/libktexteditor.so.0 @@ -927,54 +1003,81 @@ share/apps/kabc/formats/binary.desktop share/apps/katepart/katepartreadonlyui.rc share/apps/katepart/katepartui.rc share/apps/katepart/syntax/ada.xml +share/apps/katepart/syntax/ahdl.xml +share/apps/katepart/syntax/alert.xml +share/apps/katepart/syntax/ansic89.xml share/apps/katepart/syntax/asm6502.xml share/apps/katepart/syntax/awk.xml share/apps/katepart/syntax/bash.xml share/apps/katepart/syntax/bibtex.xml share/apps/katepart/syntax/c.xml +share/apps/katepart/syntax/cg.xml share/apps/katepart/syntax/changelog.xml +share/apps/katepart/syntax/cisco.xml +share/apps/katepart/syntax/clipper.xml share/apps/katepart/syntax/coldfusion.xml +share/apps/katepart/syntax/commonlisp.xml share/apps/katepart/syntax/component-pascal.xml share/apps/katepart/syntax/cpp.xml share/apps/katepart/syntax/cs.xml +share/apps/katepart/syntax/css-php.xml share/apps/katepart/syntax/css.xml share/apps/katepart/syntax/cue.xml share/apps/katepart/syntax/d.xml +share/apps/katepart/syntax/debianchangelog.xml +share/apps/katepart/syntax/debiancontrol.xml share/apps/katepart/syntax/desktop.xml share/apps/katepart/syntax/diff.xml +share/apps/katepart/syntax/doxygen.xml share/apps/katepart/syntax/e.xml share/apps/katepart/syntax/eiffel.xml +share/apps/katepart/syntax/euphoria.xml share/apps/katepart/syntax/ferite.xml +share/apps/katepart/syntax/fgl-4gl.xml +share/apps/katepart/syntax/fgl-per.xml share/apps/katepart/syntax/fortran.xml share/apps/katepart/syntax/gdl.xml +share/apps/katepart/syntax/gettext.xml share/apps/katepart/syntax/gnuassembler.xml share/apps/katepart/syntax/haskell.xml +share/apps/katepart/syntax/html-php.xml share/apps/katepart/syntax/html.xml share/apps/katepart/syntax/idconsole.xml share/apps/katepart/syntax/idl.xml share/apps/katepart/syntax/ilerpg.xml share/apps/katepart/syntax/inform.xml share/apps/katepart/syntax/java.xml +share/apps/katepart/syntax/javascript-php.xml share/apps/katepart/syntax/javascript.xml +share/apps/katepart/syntax/jsp.xml share/apps/katepart/syntax/kbasic.xml share/apps/katepart/syntax/language.dtd share/apps/katepart/syntax/latex.xml share/apps/katepart/syntax/ldif.xml +share/apps/katepart/syntax/lex.xml share/apps/katepart/syntax/literate-haskell.xml +share/apps/katepart/syntax/logtalk.xml share/apps/katepart/syntax/lpc.xml +share/apps/katepart/syntax/lua.xml share/apps/katepart/syntax/mab.xml share/apps/katepart/syntax/makefile.xml share/apps/katepart/syntax/mason.xml share/apps/katepart/syntax/matlab.xml +share/apps/katepart/syntax/mips.xml share/apps/katepart/syntax/modula-2.xml +share/apps/katepart/syntax/mup.xml share/apps/katepart/syntax/objectivec.xml +share/apps/katepart/syntax/ocaml.xml share/apps/katepart/syntax/pascal.xml share/apps/katepart/syntax/perl.xml share/apps/katepart/syntax/php.xml share/apps/katepart/syntax/picsrc.xml +share/apps/katepart/syntax/pike.xml share/apps/katepart/syntax/postscript.xml +share/apps/katepart/syntax/povray.xml share/apps/katepart/syntax/progress.xml share/apps/katepart/syntax/prolog.xml +share/apps/katepart/syntax/purebasic.xml share/apps/katepart/syntax/python.xml share/apps/katepart/syntax/r.xml share/apps/katepart/syntax/rexx.xml @@ -992,6 +1095,8 @@ share/apps/katepart/syntax/sql-postgresql.xml share/apps/katepart/syntax/sql.xml share/apps/katepart/syntax/syntax.template share/apps/katepart/syntax/tcl.xml +share/apps/katepart/syntax/tibasic.xml +share/apps/katepart/syntax/txt2tags.xml share/apps/katepart/syntax/uscript.xml share/apps/katepart/syntax/velocity.xml share/apps/katepart/syntax/verilog.xml @@ -1002,7 +1107,9 @@ share/apps/katepart/syntax/xharbour.xml share/apps/katepart/syntax/xml.xml share/apps/katepart/syntax/xmldebug.xml share/apps/katepart/syntax/yacas.xml +share/apps/katepart/syntax/yacc.xml share/apps/kcertpart/kcertpart.rc +share/apps/kcm_componentchooser/kcm_instantmessenger.desktop share/apps/kcm_componentchooser/kcm_ktexteditor.desktop share/apps/kconf_update/kcookiescfg.upd share/apps/kconf_update/kded.upd @@ -1125,9 +1232,9 @@ share/apps/kdeprint/tiledown.png share/apps/kdeprint/tileup.png share/apps/kdeprint/tools/escputil.desktop share/apps/kdeui/pics/aboutkde.png -share/apps/kdeui/pics/keys.png share/apps/kdeui/pics/ktip-background.png share/apps/kdeui/pics/ktip-bulb.png +share/apps/kdewidgets/pics/kactionselector.png share/apps/kdewidgets/pics/kactivelabel.png share/apps/kdewidgets/pics/kcharselect.png share/apps/kdewidgets/pics/kcmodule.png @@ -1135,6 +1242,8 @@ share/apps/kdewidgets/pics/kcolorbutton.png share/apps/kdewidgets/pics/kcolorcombo.png share/apps/kdewidgets/pics/kcombobox.png share/apps/kdewidgets/pics/kdatepicker.png +share/apps/kdewidgets/pics/kdatetable.png +share/apps/kdewidgets/pics/kdatetimewidget.png share/apps/kdewidgets/pics/kdatewidget.png share/apps/kdewidgets/pics/kdialog.png share/apps/kdewidgets/pics/kdoublenuminput.png @@ -1155,6 +1264,7 @@ share/apps/kdewidgets/pics/kled.png share/apps/kdewidgets/pics/klineedit.png share/apps/kdewidgets/pics/klistbox.png share/apps/kdewidgets/pics/klistview.png +share/apps/kdewidgets/pics/kpalettetable.png share/apps/kdewidgets/pics/kpasswordedit.png share/apps/kdewidgets/pics/kprogress.png share/apps/kdewidgets/pics/kpushbutton.png @@ -1169,6 +1279,7 @@ share/apps/kdewidgets/pics/kurllabel.png share/apps/kdewidgets/pics/kurlrequester.png share/apps/khtml/css/html4.css share/apps/khtml/css/quirks.css +share/apps/khtml/domain_info share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png @@ -1190,6 +1301,7 @@ share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png share/apps/kjava/kjava.jar share/apps/kjava/kjava.policy share/apps/kjava/pluginsinfo +share/apps/knewstuff/types share/apps/knotify/eventsrc share/apps/ksgmltools2/customization/README share/apps/ksgmltools2/customization/af/catalog @@ -1534,6 +1646,7 @@ share/apps/ksgmltools2/customization/kde-navig-online.xsl share/apps/ksgmltools2/customization/kde-navig.xsl share/apps/ksgmltools2/customization/kde-nochunk.xsl share/apps/ksgmltools2/customization/kde-style.xsl +share/apps/ksgmltools2/customization/kde-ttlpg-online.xsl share/apps/ksgmltools2/customization/kde-ttlpg.xsl share/apps/ksgmltools2/customization/kde-web-navig.xsl share/apps/ksgmltools2/customization/kde-web.xsl @@ -2428,6 +2541,7 @@ share/apps/kstyle/themes/qtwindows.themerc share/apps/kstyle/themes/riscos.themerc share/apps/kstyle/themes/system.themerc share/apps/kstyle/themes/systemalt.themerc +share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc @@ -2440,7 +2554,9 @@ share/config/katesyntaxhighlightingrc share/config/kdebug.areas share/config/kdebugrc share/config/kdeprintrc +share/config/khotnewstuffrc share/config/ksslcalist +share/config/ktexteditor_autobookmarkerrc share/config/kthemestylerc share/config/language.codes share/config/ui/kprintpreviewui.rc @@ -2493,11 +2609,15 @@ share/doc/HTML/en/common/web-doctop.png share/doc/HTML/en/common/x11-license.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kdelibs-apidocs/common +share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/devices/blockdevice.png +share/icons/crystalsvg/128x128/devices/chardevice.png share/icons/crystalsvg/128x128/devices/mouse.png -share/icons/crystalsvg/128x128/filesystems/chardevice.png +share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png +share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png share/icons/crystalsvg/128x128/filesystems/desktop.png share/icons/crystalsvg/128x128/filesystems/exec.png +share/icons/crystalsvg/128x128/filesystems/file_broken.png share/icons/crystalsvg/128x128/filesystems/folder.png share/icons/crystalsvg/128x128/filesystems/folder_crystal.png share/icons/crystalsvg/128x128/filesystems/folder_favorite.png @@ -2529,6 +2649,7 @@ share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png share/icons/crystalsvg/128x128/filesystems/lockoverlay.png share/icons/crystalsvg/128x128/filesystems/network.png share/icons/crystalsvg/128x128/filesystems/network_local.png +share/icons/crystalsvg/128x128/filesystems/pipe.png share/icons/crystalsvg/128x128/filesystems/trashcan_empty.png share/icons/crystalsvg/128x128/filesystems/trashcan_full.png share/icons/crystalsvg/128x128/filesystems/www.png @@ -2539,29 +2660,44 @@ share/icons/crystalsvg/128x128/mimetypes/binary.png share/icons/crystalsvg/128x128/mimetypes/cdimage.png share/icons/crystalsvg/128x128/mimetypes/cdr.png share/icons/crystalsvg/128x128/mimetypes/cdtrack.png -share/icons/crystalsvg/128x128/mimetypes/colorset.png +share/icons/crystalsvg/128x128/mimetypes/colorscm.png share/icons/crystalsvg/128x128/mimetypes/core.png share/icons/crystalsvg/128x128/mimetypes/deb.png share/icons/crystalsvg/128x128/mimetypes/document.png share/icons/crystalsvg/128x128/mimetypes/document2.png +share/icons/crystalsvg/128x128/mimetypes/dvi.png +share/icons/crystalsvg/128x128/mimetypes/empty.png share/icons/crystalsvg/128x128/mimetypes/encrypted.png +share/icons/crystalsvg/128x128/mimetypes/exec_wine.png share/icons/crystalsvg/128x128/mimetypes/font.png share/icons/crystalsvg/128x128/mimetypes/font_bitmap.png share/icons/crystalsvg/128x128/mimetypes/font_truetype.png +share/icons/crystalsvg/128x128/mimetypes/font_type1.png +share/icons/crystalsvg/128x128/mimetypes/gf.png share/icons/crystalsvg/128x128/mimetypes/html.png share/icons/crystalsvg/128x128/mimetypes/image.png share/icons/crystalsvg/128x128/mimetypes/info.png +share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png +share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png share/icons/crystalsvg/128x128/mimetypes/kmultiple.png share/icons/crystalsvg/128x128/mimetypes/koffice.png +share/icons/crystalsvg/128x128/mimetypes/krita_kra.png +share/icons/crystalsvg/128x128/mimetypes/log.png share/icons/crystalsvg/128x128/mimetypes/make.png share/icons/crystalsvg/128x128/mimetypes/man.png share/icons/crystalsvg/128x128/mimetypes/message.png share/icons/crystalsvg/128x128/mimetypes/metafont.png share/icons/crystalsvg/128x128/mimetypes/midi.png -share/icons/crystalsvg/128x128/mimetypes/mime.png +share/icons/crystalsvg/128x128/mimetypes/misc.png +share/icons/crystalsvg/128x128/mimetypes/mozilla_doc.png share/icons/crystalsvg/128x128/mimetypes/netscape_doc.png share/icons/crystalsvg/128x128/mimetypes/pdf.png +share/icons/crystalsvg/128x128/mimetypes/pk.png share/icons/crystalsvg/128x128/mimetypes/postscript.png +share/icons/crystalsvg/128x128/mimetypes/quicktime.png +share/icons/crystalsvg/128x128/mimetypes/readme.png +share/icons/crystalsvg/128x128/mimetypes/real_doc.png +share/icons/crystalsvg/128x128/mimetypes/recycled.png share/icons/crystalsvg/128x128/mimetypes/resource.png share/icons/crystalsvg/128x128/mimetypes/rpm.png share/icons/crystalsvg/128x128/mimetypes/shellscript.png @@ -2572,23 +2708,32 @@ share/icons/crystalsvg/128x128/mimetypes/source_c.png share/icons/crystalsvg/128x128/mimetypes/source_cpp.png share/icons/crystalsvg/128x128/mimetypes/source_f.png share/icons/crystalsvg/128x128/mimetypes/source_h.png +share/icons/crystalsvg/128x128/mimetypes/source_j.png share/icons/crystalsvg/128x128/mimetypes/source_java.png share/icons/crystalsvg/128x128/mimetypes/source_l.png share/icons/crystalsvg/128x128/mimetypes/source_moc.png share/icons/crystalsvg/128x128/mimetypes/source_o.png share/icons/crystalsvg/128x128/mimetypes/source_p.png +share/icons/crystalsvg/128x128/mimetypes/source_php.png +share/icons/crystalsvg/128x128/mimetypes/source_pl.png share/icons/crystalsvg/128x128/mimetypes/source_py.png share/icons/crystalsvg/128x128/mimetypes/source_s.png share/icons/crystalsvg/128x128/mimetypes/source_y.png share/icons/crystalsvg/128x128/mimetypes/spreadsheet.png share/icons/crystalsvg/128x128/mimetypes/tar.png share/icons/crystalsvg/128x128/mimetypes/template_source.png +share/icons/crystalsvg/128x128/mimetypes/tex.png share/icons/crystalsvg/128x128/mimetypes/tgz.png share/icons/crystalsvg/128x128/mimetypes/txt.png share/icons/crystalsvg/128x128/mimetypes/txt2.png share/icons/crystalsvg/128x128/mimetypes/unknown.png +share/icons/crystalsvg/128x128/mimetypes/vcalendar.png +share/icons/crystalsvg/128x128/mimetypes/vcard.png +share/icons/crystalsvg/128x128/mimetypes/vectorgfx.png share/icons/crystalsvg/128x128/mimetypes/video.png +share/icons/crystalsvg/128x128/mimetypes/widget_doc.png share/icons/crystalsvg/128x128/mimetypes/wordprocessing.png +share/icons/crystalsvg/128x128/mimetypes/zip.png share/icons/crystalsvg/16x16/actions/1downarrow.png share/icons/crystalsvg/16x16/actions/1leftarrow.png share/icons/crystalsvg/16x16/actions/1rightarrow.png @@ -2686,6 +2831,7 @@ share/icons/crystalsvg/16x16/actions/kde4.png share/icons/crystalsvg/16x16/actions/kde5.png share/icons/crystalsvg/16x16/actions/kde6.png share/icons/crystalsvg/16x16/actions/key_enter.png +share/icons/crystalsvg/16x16/actions/knewstuff.png share/icons/crystalsvg/16x16/actions/launch.png share/icons/crystalsvg/16x16/actions/locationbar_erase.png share/icons/crystalsvg/16x16/actions/lock.png @@ -2745,6 +2891,8 @@ share/icons/crystalsvg/16x16/actions/player_play.png share/icons/crystalsvg/16x16/actions/player_rew.png share/icons/crystalsvg/16x16/actions/player_start.png share/icons/crystalsvg/16x16/actions/player_stop.png +share/icons/crystalsvg/16x16/actions/player_time.png +share/icons/crystalsvg/16x16/actions/player_volume.png share/icons/crystalsvg/16x16/actions/previous.png share/icons/crystalsvg/16x16/actions/project_open.png share/icons/crystalsvg/16x16/actions/queue.png @@ -2760,6 +2908,7 @@ share/icons/crystalsvg/16x16/actions/rotate_ccw.png share/icons/crystalsvg/16x16/actions/rotate_cw.png share/icons/crystalsvg/16x16/actions/run.png share/icons/crystalsvg/16x16/actions/save_all.png +share/icons/crystalsvg/16x16/actions/services.png share/icons/crystalsvg/16x16/actions/share.png share/icons/crystalsvg/16x16/actions/signature.png share/icons/crystalsvg/16x16/actions/spellcheck.png @@ -2811,6 +2960,7 @@ share/icons/crystalsvg/16x16/actions/window_fullscreen.png share/icons/crystalsvg/16x16/actions/window_new.png share/icons/crystalsvg/16x16/actions/window_nofullscreen.png share/icons/crystalsvg/16x16/actions/wizard.png +share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/devices/3floppy_mount.png share/icons/crystalsvg/16x16/devices/3floppy_unmount.png share/icons/crystalsvg/16x16/devices/5floppy_mount.png @@ -2824,6 +2974,7 @@ share/icons/crystalsvg/16x16/devices/cdrom_mount.png share/icons/crystalsvg/16x16/devices/cdrom_unmount.png share/icons/crystalsvg/16x16/devices/cdwriter_mount.png share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png +share/icons/crystalsvg/16x16/devices/chardevice.png share/icons/crystalsvg/16x16/devices/dvd_mount.png share/icons/crystalsvg/16x16/devices/dvd_unmount.png share/icons/crystalsvg/16x16/devices/hdd_mount.png @@ -2842,9 +2993,10 @@ share/icons/crystalsvg/16x16/devices/printer1.png share/icons/crystalsvg/16x16/devices/scanner.png share/icons/crystalsvg/16x16/devices/tablet.png share/icons/crystalsvg/16x16/devices/tv.png +share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png +share/icons/crystalsvg/16x16/devices/usbpendrive_unmount.png share/icons/crystalsvg/16x16/devices/zip_mount.png share/icons/crystalsvg/16x16/devices/zip_unmount.png -share/icons/crystalsvg/16x16/filesystems/chardevice.png share/icons/crystalsvg/16x16/filesystems/desktop.png share/icons/crystalsvg/16x16/filesystems/exec.png share/icons/crystalsvg/16x16/filesystems/file_broken.png @@ -2896,13 +3048,14 @@ share/icons/crystalsvg/16x16/mimetypes/cdimage.png share/icons/crystalsvg/16x16/mimetypes/cdr.png share/icons/crystalsvg/16x16/mimetypes/cdtrack.png share/icons/crystalsvg/16x16/mimetypes/colorscm.png -share/icons/crystalsvg/16x16/mimetypes/colorset.png share/icons/crystalsvg/16x16/mimetypes/core.png share/icons/crystalsvg/16x16/mimetypes/deb.png share/icons/crystalsvg/16x16/mimetypes/document.png share/icons/crystalsvg/16x16/mimetypes/document2.png share/icons/crystalsvg/16x16/mimetypes/dvi.png +share/icons/crystalsvg/16x16/mimetypes/empty.png share/icons/crystalsvg/16x16/mimetypes/encrypted.png +share/icons/crystalsvg/16x16/mimetypes/exec_wine.png share/icons/crystalsvg/16x16/mimetypes/font.png share/icons/crystalsvg/16x16/mimetypes/font_bitmap.png share/icons/crystalsvg/16x16/mimetypes/font_truetype.png @@ -2929,9 +3082,7 @@ share/icons/crystalsvg/16x16/mimetypes/man.png share/icons/crystalsvg/16x16/mimetypes/message.png share/icons/crystalsvg/16x16/mimetypes/metafont.png share/icons/crystalsvg/16x16/mimetypes/midi.png -share/icons/crystalsvg/16x16/mimetypes/mime.png share/icons/crystalsvg/16x16/mimetypes/misc.png -share/icons/crystalsvg/16x16/mimetypes/misc_doc.png share/icons/crystalsvg/16x16/mimetypes/netscape_doc.png share/icons/crystalsvg/16x16/mimetypes/news.png share/icons/crystalsvg/16x16/mimetypes/pdf.png @@ -2964,7 +3115,6 @@ share/icons/crystalsvg/16x16/mimetypes/tar.png share/icons/crystalsvg/16x16/mimetypes/template_source.png share/icons/crystalsvg/16x16/mimetypes/tex.png share/icons/crystalsvg/16x16/mimetypes/tgz.png -share/icons/crystalsvg/16x16/mimetypes/trash.png share/icons/crystalsvg/16x16/mimetypes/txt.png share/icons/crystalsvg/16x16/mimetypes/txt2.png share/icons/crystalsvg/16x16/mimetypes/unknown.png @@ -3064,7 +3214,6 @@ share/icons/crystalsvg/22x22/actions/inline_image.png share/icons/crystalsvg/22x22/actions/inline_table.png share/icons/crystalsvg/22x22/actions/kde.png share/icons/crystalsvg/22x22/actions/key_enter.png -share/icons/crystalsvg/22x22/actions/klipper_dock.png share/icons/crystalsvg/22x22/actions/launch.png share/icons/crystalsvg/22x22/actions/leftjust.png share/icons/crystalsvg/22x22/actions/locationbar_erase.png @@ -3188,11 +3337,12 @@ share/icons/crystalsvg/22x22/actions/window_fullscreen.png share/icons/crystalsvg/22x22/actions/window_new.png share/icons/crystalsvg/22x22/actions/window_nofullscreen.png share/icons/crystalsvg/22x22/actions/wizard.png +share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png +share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png share/icons/crystalsvg/22x22/filesystems/www.png share/icons/crystalsvg/22x22/mimetypes/applix.png share/icons/crystalsvg/22x22/mimetypes/ascii.png share/icons/crystalsvg/22x22/mimetypes/binary.png -share/icons/crystalsvg/22x22/mimetypes/cdbo_list.png share/icons/crystalsvg/22x22/mimetypes/cdimage.png share/icons/crystalsvg/22x22/mimetypes/cdtrack.png share/icons/crystalsvg/22x22/mimetypes/colorscm.png @@ -3236,7 +3386,6 @@ share/icons/crystalsvg/22x22/mimetypes/mozilla_doc.png share/icons/crystalsvg/22x22/mimetypes/netscape_doc.png share/icons/crystalsvg/22x22/mimetypes/news.png share/icons/crystalsvg/22x22/mimetypes/pdf.png -share/icons/crystalsvg/22x22/mimetypes/php.png share/icons/crystalsvg/22x22/mimetypes/pk.png share/icons/crystalsvg/22x22/mimetypes/postscript.png share/icons/crystalsvg/22x22/mimetypes/quicktime.png @@ -3276,14 +3425,6 @@ share/icons/crystalsvg/22x22/mimetypes/video.png share/icons/crystalsvg/22x22/mimetypes/widget_doc.png share/icons/crystalsvg/22x22/mimetypes/wordprocessing.png share/icons/crystalsvg/22x22/mimetypes/zip.png -share/icons/crystalsvg/32x32/actions/1downarrow.png -share/icons/crystalsvg/32x32/actions/1leftarrow.png -share/icons/crystalsvg/32x32/actions/1rightarrow.png -share/icons/crystalsvg/32x32/actions/1uparrow.png -share/icons/crystalsvg/32x32/actions/2downarrow.png -share/icons/crystalsvg/32x32/actions/2leftarrow.png -share/icons/crystalsvg/32x32/actions/2rightarrow.png -share/icons/crystalsvg/32x32/actions/2uparrow.png share/icons/crystalsvg/32x32/actions/about_kde.png share/icons/crystalsvg/32x32/actions/apply.png share/icons/crystalsvg/32x32/actions/attach.png @@ -3346,7 +3487,7 @@ share/icons/crystalsvg/32x32/actions/identity.png share/icons/crystalsvg/32x32/actions/indent.png share/icons/crystalsvg/32x32/actions/kde.png share/icons/crystalsvg/32x32/actions/kdevelop_down.png -share/icons/crystalsvg/32x32/actions/klipper_doc.png +share/icons/crystalsvg/32x32/actions/knewstuff.png share/icons/crystalsvg/32x32/actions/leftjust.png share/icons/crystalsvg/32x32/actions/locationbar_erase.png share/icons/crystalsvg/32x32/actions/lock.png @@ -3459,6 +3600,7 @@ share/icons/crystalsvg/32x32/actions/window_fullscreen.png share/icons/crystalsvg/32x32/actions/window_new.png share/icons/crystalsvg/32x32/actions/window_nofullscreen.png share/icons/crystalsvg/32x32/actions/wizard.png +share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/devices/3floppy_mount.png share/icons/crystalsvg/32x32/devices/3floppy_unmount.png share/icons/crystalsvg/32x32/devices/5floppy_mount.png @@ -3472,6 +3614,7 @@ share/icons/crystalsvg/32x32/devices/cdrom_mount.png share/icons/crystalsvg/32x32/devices/cdrom_unmount.png share/icons/crystalsvg/32x32/devices/cdwriter_mount.png share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png +share/icons/crystalsvg/32x32/devices/chardevice.png share/icons/crystalsvg/32x32/devices/dvd_mount.png share/icons/crystalsvg/32x32/devices/dvd_unmount.png share/icons/crystalsvg/32x32/devices/hdd_mount.png @@ -3490,9 +3633,10 @@ share/icons/crystalsvg/32x32/devices/printer1.png share/icons/crystalsvg/32x32/devices/scanner.png share/icons/crystalsvg/32x32/devices/tablet.png share/icons/crystalsvg/32x32/devices/tv.png +share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png +share/icons/crystalsvg/32x32/devices/usbpendrive_unmount.png share/icons/crystalsvg/32x32/devices/zip_mount.png share/icons/crystalsvg/32x32/devices/zip_unmount.png -share/icons/crystalsvg/32x32/filesystems/chardevice.png share/icons/crystalsvg/32x32/filesystems/desktop.png share/icons/crystalsvg/32x32/filesystems/exec.png share/icons/crystalsvg/32x32/filesystems/file_broken.png @@ -3540,13 +3684,13 @@ share/icons/crystalsvg/32x32/mimetypes/cdimage.png share/icons/crystalsvg/32x32/mimetypes/cdr.png share/icons/crystalsvg/32x32/mimetypes/cdtrack.png share/icons/crystalsvg/32x32/mimetypes/colorscm.png -share/icons/crystalsvg/32x32/mimetypes/colorset.png share/icons/crystalsvg/32x32/mimetypes/core.png share/icons/crystalsvg/32x32/mimetypes/deb.png share/icons/crystalsvg/32x32/mimetypes/document.png share/icons/crystalsvg/32x32/mimetypes/document2.png share/icons/crystalsvg/32x32/mimetypes/dvi.png share/icons/crystalsvg/32x32/mimetypes/empty.png +share/icons/crystalsvg/32x32/mimetypes/exec_wine.png share/icons/crystalsvg/32x32/mimetypes/file_locked.png share/icons/crystalsvg/32x32/mimetypes/file_temporary.png share/icons/crystalsvg/32x32/mimetypes/font.png @@ -3575,8 +3719,7 @@ share/icons/crystalsvg/32x32/mimetypes/man.png share/icons/crystalsvg/32x32/mimetypes/message.png share/icons/crystalsvg/32x32/mimetypes/metafont.png share/icons/crystalsvg/32x32/mimetypes/midi.png -share/icons/crystalsvg/32x32/mimetypes/mime.png -share/icons/crystalsvg/32x32/mimetypes/misc_doc.png +share/icons/crystalsvg/32x32/mimetypes/misc.png share/icons/crystalsvg/32x32/mimetypes/netscape_doc.png share/icons/crystalsvg/32x32/mimetypes/pdf.png share/icons/crystalsvg/32x32/mimetypes/pk.png @@ -3620,15 +3763,20 @@ share/icons/crystalsvg/32x32/mimetypes/vectorgfx.png share/icons/crystalsvg/32x32/mimetypes/video.png share/icons/crystalsvg/32x32/mimetypes/widget_doc.png share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png +share/icons/crystalsvg/48x48/actions/back.png share/icons/crystalsvg/48x48/actions/bookmark.png +share/icons/crystalsvg/48x48/actions/down.png share/icons/crystalsvg/48x48/actions/exit.png share/icons/crystalsvg/48x48/actions/fileclose.png +share/icons/crystalsvg/48x48/actions/forward.png share/icons/crystalsvg/48x48/actions/gear.png share/icons/crystalsvg/48x48/actions/indent.png share/icons/crystalsvg/48x48/actions/lock.png share/icons/crystalsvg/48x48/actions/misc.png share/icons/crystalsvg/48x48/actions/share.png share/icons/crystalsvg/48x48/actions/unindent.png +share/icons/crystalsvg/48x48/actions/up.png +share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/devices/3floppy_mount.png share/icons/crystalsvg/48x48/devices/3floppy_unmount.png share/icons/crystalsvg/48x48/devices/5floppy_mount.png @@ -3642,6 +3790,7 @@ share/icons/crystalsvg/48x48/devices/cdrom_mount.png share/icons/crystalsvg/48x48/devices/cdrom_unmount.png share/icons/crystalsvg/48x48/devices/cdwriter_mount.png share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png +share/icons/crystalsvg/48x48/devices/chardevice.png share/icons/crystalsvg/48x48/devices/dvd_mount.png share/icons/crystalsvg/48x48/devices/dvd_unmount.png share/icons/crystalsvg/48x48/devices/hdd_mount.png @@ -3660,9 +3809,10 @@ share/icons/crystalsvg/48x48/devices/printer1.png share/icons/crystalsvg/48x48/devices/scanner.png share/icons/crystalsvg/48x48/devices/tablet.png share/icons/crystalsvg/48x48/devices/tv.png +share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png +share/icons/crystalsvg/48x48/devices/usbpendrive_unmount.png share/icons/crystalsvg/48x48/devices/zip_mount.png share/icons/crystalsvg/48x48/devices/zip_unmount.png -share/icons/crystalsvg/48x48/filesystems/chardevice.png share/icons/crystalsvg/48x48/filesystems/desktop.png share/icons/crystalsvg/48x48/filesystems/exec.png share/icons/crystalsvg/48x48/filesystems/file_broken.png @@ -3713,13 +3863,14 @@ share/icons/crystalsvg/48x48/mimetypes/cdimage.png share/icons/crystalsvg/48x48/mimetypes/cdr.png share/icons/crystalsvg/48x48/mimetypes/cdtrack.png share/icons/crystalsvg/48x48/mimetypes/colorscm.png -share/icons/crystalsvg/48x48/mimetypes/colorset.png share/icons/crystalsvg/48x48/mimetypes/core.png share/icons/crystalsvg/48x48/mimetypes/deb.png share/icons/crystalsvg/48x48/mimetypes/document.png share/icons/crystalsvg/48x48/mimetypes/document2.png share/icons/crystalsvg/48x48/mimetypes/dvi.png +share/icons/crystalsvg/48x48/mimetypes/empty.png share/icons/crystalsvg/48x48/mimetypes/encrypted.png +share/icons/crystalsvg/48x48/mimetypes/exec_wine.png share/icons/crystalsvg/48x48/mimetypes/font.png share/icons/crystalsvg/48x48/mimetypes/font_bitmap.png share/icons/crystalsvg/48x48/mimetypes/font_truetype.png @@ -3747,8 +3898,8 @@ share/icons/crystalsvg/48x48/mimetypes/man.png share/icons/crystalsvg/48x48/mimetypes/message.png share/icons/crystalsvg/48x48/mimetypes/metafont.png share/icons/crystalsvg/48x48/mimetypes/midi.png -share/icons/crystalsvg/48x48/mimetypes/mime.png -share/icons/crystalsvg/48x48/mimetypes/misc_doc.png +share/icons/crystalsvg/48x48/mimetypes/misc.png +share/icons/crystalsvg/48x48/mimetypes/mozilla_doc.png share/icons/crystalsvg/48x48/mimetypes/netscape_doc.png share/icons/crystalsvg/48x48/mimetypes/pdf.png share/icons/crystalsvg/48x48/mimetypes/pk.png @@ -3767,6 +3918,7 @@ share/icons/crystalsvg/48x48/mimetypes/source_c.png share/icons/crystalsvg/48x48/mimetypes/source_cpp.png share/icons/crystalsvg/48x48/mimetypes/source_f.png share/icons/crystalsvg/48x48/mimetypes/source_h.png +share/icons/crystalsvg/48x48/mimetypes/source_j.png share/icons/crystalsvg/48x48/mimetypes/source_java.png share/icons/crystalsvg/48x48/mimetypes/source_l.png share/icons/crystalsvg/48x48/mimetypes/source_moc.png @@ -3793,6 +3945,8 @@ share/icons/crystalsvg/48x48/mimetypes/widget_doc.png share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png +share/icons/crystalsvg/64x64/actions/knewstuff.png +share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/devices/3floppy_mount.png share/icons/crystalsvg/64x64/devices/3floppy_unmount.png share/icons/crystalsvg/64x64/devices/5floppy_mount.png @@ -3806,6 +3960,7 @@ share/icons/crystalsvg/64x64/devices/cdrom_mount.png share/icons/crystalsvg/64x64/devices/cdrom_unmount.png share/icons/crystalsvg/64x64/devices/cdwriter_mount.png share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png +share/icons/crystalsvg/64x64/devices/chardevice.png share/icons/crystalsvg/64x64/devices/dvd_mount.png share/icons/crystalsvg/64x64/devices/dvd_unmount.png share/icons/crystalsvg/64x64/devices/hdd_mount.png @@ -3824,9 +3979,10 @@ share/icons/crystalsvg/64x64/devices/printer1.png share/icons/crystalsvg/64x64/devices/scanner.png share/icons/crystalsvg/64x64/devices/tablet.png share/icons/crystalsvg/64x64/devices/tv.png +share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png +share/icons/crystalsvg/64x64/devices/usbpendrive_unmount.png share/icons/crystalsvg/64x64/devices/zip_mount.png share/icons/crystalsvg/64x64/devices/zip_unmount.png -share/icons/crystalsvg/64x64/filesystems/chardevice.png share/icons/crystalsvg/64x64/filesystems/desktop.png share/icons/crystalsvg/64x64/filesystems/exec.png share/icons/crystalsvg/64x64/filesystems/file_broken.png @@ -3872,28 +4028,48 @@ share/icons/crystalsvg/64x64/mimetypes/binary.png share/icons/crystalsvg/64x64/mimetypes/cdimage.png share/icons/crystalsvg/64x64/mimetypes/cdr.png share/icons/crystalsvg/64x64/mimetypes/cdtrack.png -share/icons/crystalsvg/64x64/mimetypes/colorset.png +share/icons/crystalsvg/64x64/mimetypes/colorscm.png share/icons/crystalsvg/64x64/mimetypes/core.png share/icons/crystalsvg/64x64/mimetypes/deb.png share/icons/crystalsvg/64x64/mimetypes/document.png share/icons/crystalsvg/64x64/mimetypes/document2.png +share/icons/crystalsvg/64x64/mimetypes/dvi.png +share/icons/crystalsvg/64x64/mimetypes/empty.png share/icons/crystalsvg/64x64/mimetypes/encrypted.png +share/icons/crystalsvg/64x64/mimetypes/exec_wine.png share/icons/crystalsvg/64x64/mimetypes/font.png share/icons/crystalsvg/64x64/mimetypes/font_bitmap.png +share/icons/crystalsvg/64x64/mimetypes/font_truetype.png +share/icons/crystalsvg/64x64/mimetypes/font_type1.png +share/icons/crystalsvg/64x64/mimetypes/gf.png share/icons/crystalsvg/64x64/mimetypes/html.png share/icons/crystalsvg/64x64/mimetypes/image.png share/icons/crystalsvg/64x64/mimetypes/info.png +share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png +share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png +share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png +share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +share/icons/crystalsvg/64x64/mimetypes/koffice.png +share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png +share/icons/crystalsvg/64x64/mimetypes/krita_kra.png +share/icons/crystalsvg/64x64/mimetypes/kspread_ksp.png +share/icons/crystalsvg/64x64/mimetypes/kugar_kud.png +share/icons/crystalsvg/64x64/mimetypes/kword_kwd.png +share/icons/crystalsvg/64x64/mimetypes/log.png share/icons/crystalsvg/64x64/mimetypes/make.png share/icons/crystalsvg/64x64/mimetypes/man.png share/icons/crystalsvg/64x64/mimetypes/message.png share/icons/crystalsvg/64x64/mimetypes/metafont.png share/icons/crystalsvg/64x64/mimetypes/midi.png -share/icons/crystalsvg/64x64/mimetypes/mime.png -share/icons/crystalsvg/64x64/mimetypes/misc_doc.png +share/icons/crystalsvg/64x64/mimetypes/misc.png +share/icons/crystalsvg/64x64/mimetypes/mozilla_doc.png share/icons/crystalsvg/64x64/mimetypes/netscape_doc.png share/icons/crystalsvg/64x64/mimetypes/pdf.png +share/icons/crystalsvg/64x64/mimetypes/pk.png share/icons/crystalsvg/64x64/mimetypes/postscript.png +share/icons/crystalsvg/64x64/mimetypes/quicktime.png +share/icons/crystalsvg/64x64/mimetypes/readme.png share/icons/crystalsvg/64x64/mimetypes/real_doc.png share/icons/crystalsvg/64x64/mimetypes/recycled.png share/icons/crystalsvg/64x64/mimetypes/resource.png @@ -3906,42 +4082,41 @@ share/icons/crystalsvg/64x64/mimetypes/source_c.png share/icons/crystalsvg/64x64/mimetypes/source_cpp.png share/icons/crystalsvg/64x64/mimetypes/source_f.png share/icons/crystalsvg/64x64/mimetypes/source_h.png +share/icons/crystalsvg/64x64/mimetypes/source_j.png share/icons/crystalsvg/64x64/mimetypes/source_java.png share/icons/crystalsvg/64x64/mimetypes/source_l.png share/icons/crystalsvg/64x64/mimetypes/source_moc.png share/icons/crystalsvg/64x64/mimetypes/source_o.png share/icons/crystalsvg/64x64/mimetypes/source_p.png +share/icons/crystalsvg/64x64/mimetypes/source_php.png +share/icons/crystalsvg/64x64/mimetypes/source_pl.png share/icons/crystalsvg/64x64/mimetypes/source_py.png share/icons/crystalsvg/64x64/mimetypes/source_s.png share/icons/crystalsvg/64x64/mimetypes/source_y.png share/icons/crystalsvg/64x64/mimetypes/spreadsheet.png share/icons/crystalsvg/64x64/mimetypes/tar.png share/icons/crystalsvg/64x64/mimetypes/template_source.png +share/icons/crystalsvg/64x64/mimetypes/tex.png share/icons/crystalsvg/64x64/mimetypes/tgz.png share/icons/crystalsvg/64x64/mimetypes/txt.png share/icons/crystalsvg/64x64/mimetypes/txt2.png share/icons/crystalsvg/64x64/mimetypes/unknown.png +share/icons/crystalsvg/64x64/mimetypes/vcalendar.png +share/icons/crystalsvg/64x64/mimetypes/vcard.png +share/icons/crystalsvg/64x64/mimetypes/vectorgfx.png share/icons/crystalsvg/64x64/mimetypes/video.png share/icons/crystalsvg/64x64/mimetypes/widget_doc.png share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png +share/icons/crystalsvg/64x64/mimetypes/zip.png share/icons/crystalsvg/index.theme -share/icons/crystalsvg/scalable/apps/kate.svgz -share/icons/crystalsvg/scalable/apps/khelpcenter.svgz -share/icons/crystalsvg/scalable/apps/klipper.svgz -share/icons/crystalsvg/scalable/apps/kmail.svgz -share/icons/crystalsvg/scalable/apps/konqueror.svgz -share/icons/crystalsvg/scalable/apps/konsole.svgz -share/icons/crystalsvg/scalable/apps/kwrite.svgz -share/icons/crystalsvg/scalable/apps/openoffice.svgz -share/icons/crystalsvg/scalable/apps/shell.svgz -share/icons/crystalsvg/scalable/apps/staroffice.svgz -share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/actions/about_kde.svgz share/icons/crystalsvg/scalable/devices/3floppy_mount.svgz share/icons/crystalsvg/scalable/devices/3floppy_umount.svgz share/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz share/icons/crystalsvg/scalable/devices/5floppy_mount.svgz share/icons/crystalsvg/scalable/devices/5floppy_umount.svgz share/icons/crystalsvg/scalable/devices/5floppy_unmount.svgz +share/icons/crystalsvg/scalable/devices/blockdevice.svgz share/icons/crystalsvg/scalable/devices/camera_mount.svgz share/icons/crystalsvg/scalable/devices/camera_umount.svgz share/icons/crystalsvg/scalable/devices/camera_unmount.svgz @@ -3954,6 +4129,7 @@ share/icons/crystalsvg/scalable/devices/cdrom_unmount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_mount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_umount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_unmount.svgz +share/icons/crystalsvg/scalable/devices/chardevice.svgz share/icons/crystalsvg/scalable/devices/dvd_mount.svgz share/icons/crystalsvg/scalable/devices/dvd_umount.svgz share/icons/crystalsvg/scalable/devices/dvd_unmount.svgz @@ -3976,11 +4152,11 @@ share/icons/crystalsvg/scalable/devices/printer2.svgz share/icons/crystalsvg/scalable/devices/scanner.svgz share/icons/crystalsvg/scalable/devices/tablet.svgz share/icons/crystalsvg/scalable/devices/tv.svgz +share/icons/crystalsvg/scalable/devices/usbpendrive_mount.svgz +share/icons/crystalsvg/scalable/devices/usbpendrive_unmount.svgz share/icons/crystalsvg/scalable/devices/zip_mount.svgz share/icons/crystalsvg/scalable/devices/zip_umount.svgz share/icons/crystalsvg/scalable/devices/zip_unmount.svgz -share/icons/crystalsvg/scalable/filesystems/blockdevice.svgz -share/icons/crystalsvg/scalable/filesystems/chardevice.svgz share/icons/crystalsvg/scalable/filesystems/desktop.svgz share/icons/crystalsvg/scalable/filesystems/exec.svgz share/icons/crystalsvg/scalable/filesystems/exec_wine.svgz @@ -4001,6 +4177,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_image.svgz share/icons/crystalsvg/scalable/filesystems/folder_important.svgz share/icons/crystalsvg/scalable/filesystems/folder_locked.svgz share/icons/crystalsvg/scalable/filesystems/folder_man.svgz +share/icons/crystalsvg/scalable/filesystems/folder_man2.svgz share/icons/crystalsvg/scalable/filesystems/folder_open.svgz share/icons/crystalsvg/scalable/filesystems/folder_orange.svgz share/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz @@ -4027,31 +4204,52 @@ share/icons/crystalsvg/scalable/filesystems/zip.svgz share/icons/crystalsvg/scalable/mimetypes/applix.svgz share/icons/crystalsvg/scalable/mimetypes/ascii.svgz share/icons/crystalsvg/scalable/mimetypes/binary.svgz +share/icons/crystalsvg/scalable/mimetypes/cdimage.svgz share/icons/crystalsvg/scalable/mimetypes/cdr.svgz +share/icons/crystalsvg/scalable/mimetypes/cdtrack.svgz +share/icons/crystalsvg/scalable/mimetypes/colorscm.svgz share/icons/crystalsvg/scalable/mimetypes/core.svgz share/icons/crystalsvg/scalable/mimetypes/deb.svgz share/icons/crystalsvg/scalable/mimetypes/document.svgz share/icons/crystalsvg/scalable/mimetypes/document2.svgz share/icons/crystalsvg/scalable/mimetypes/dvi.svgz share/icons/crystalsvg/scalable/mimetypes/empty.svgz +share/icons/crystalsvg/scalable/mimetypes/encrypted.svgz +share/icons/crystalsvg/scalable/mimetypes/exec_wine.svgz +share/icons/crystalsvg/scalable/mimetypes/file_locked.svgz +share/icons/crystalsvg/scalable/mimetypes/file_temporary.svgz share/icons/crystalsvg/scalable/mimetypes/font.svgz share/icons/crystalsvg/scalable/mimetypes/font_bitmap.svgz +share/icons/crystalsvg/scalable/mimetypes/font_truetype.svgz +share/icons/crystalsvg/scalable/mimetypes/font_type1.svgz share/icons/crystalsvg/scalable/mimetypes/gf.svgz +share/icons/crystalsvg/scalable/mimetypes/html.svgz share/icons/crystalsvg/scalable/mimetypes/image.svgz +share/icons/crystalsvg/scalable/mimetypes/image2.svgz +share/icons/crystalsvg/scalable/mimetypes/karbon_karbon.svgz +share/icons/crystalsvg/scalable/mimetypes/kexi_kexi.svgz share/icons/crystalsvg/scalable/mimetypes/kmultiple.svgz +share/icons/crystalsvg/scalable/mimetypes/koffice.svgz share/icons/crystalsvg/scalable/mimetypes/kugardata.svgz share/icons/crystalsvg/scalable/mimetypes/log.svgz share/icons/crystalsvg/scalable/mimetypes/make.svgz +share/icons/crystalsvg/scalable/mimetypes/man.svgz share/icons/crystalsvg/scalable/mimetypes/message.svgz share/icons/crystalsvg/scalable/mimetypes/metafont.svgz -share/icons/crystalsvg/scalable/mimetypes/mime_ascii.svgz -share/icons/crystalsvg/scalable/mimetypes/mime_empty.svgz share/icons/crystalsvg/scalable/mimetypes/mozilla_doc.svgz +share/icons/crystalsvg/scalable/mimetypes/netscape_doc.svgz share/icons/crystalsvg/scalable/mimetypes/pdf.svgz share/icons/crystalsvg/scalable/mimetypes/pk.svgz +share/icons/crystalsvg/scalable/mimetypes/postscript.svgz +share/icons/crystalsvg/scalable/mimetypes/quicktime.svgz +share/icons/crystalsvg/scalable/mimetypes/readme.svgz +share/icons/crystalsvg/scalable/mimetypes/real_doc.svgz +share/icons/crystalsvg/scalable/mimetypes/recycled.svgz share/icons/crystalsvg/scalable/mimetypes/resource.svgz share/icons/crystalsvg/scalable/mimetypes/rpm.svgz +share/icons/crystalsvg/scalable/mimetypes/shellscript.svgz share/icons/crystalsvg/scalable/mimetypes/soffice.svgz +share/icons/crystalsvg/scalable/mimetypes/sound.svgz share/icons/crystalsvg/scalable/mimetypes/source.svgz share/icons/crystalsvg/scalable/mimetypes/source_c.svgz share/icons/crystalsvg/scalable/mimetypes/source_cpp.svgz @@ -4063,6 +4261,7 @@ share/icons/crystalsvg/scalable/mimetypes/source_l.svgz share/icons/crystalsvg/scalable/mimetypes/source_moc.svgz share/icons/crystalsvg/scalable/mimetypes/source_o.svgz share/icons/crystalsvg/scalable/mimetypes/source_p.svgz +share/icons/crystalsvg/scalable/mimetypes/source_php.svgz share/icons/crystalsvg/scalable/mimetypes/source_pl.svgz share/icons/crystalsvg/scalable/mimetypes/source_py.svgz share/icons/crystalsvg/scalable/mimetypes/source_s.svgz @@ -4104,19 +4303,28 @@ share/mimelnk/application/pkcs7-signature.desktop share/mimelnk/application/postscript.desktop share/mimelnk/application/sieve.desktop share/mimelnk/application/smil.desktop -share/mimelnk/application/starcalc.desktop -share/mimelnk/application/starimpress.desktop -share/mimelnk/application/starwriter.desktop share/mimelnk/application/vnd.mozilla.xul+xml.desktop share/mimelnk/application/vnd.ms-asf.desktop share/mimelnk/application/vnd.ms-excel.desktop share/mimelnk/application/vnd.ms-word.desktop share/mimelnk/application/vnd.palm.desktop share/mimelnk/application/vnd.rn-realmedia.desktop +share/mimelnk/application/vnd.stardivision.calc.desktop +share/mimelnk/application/vnd.stardivision.chart.desktop +share/mimelnk/application/vnd.stardivision.draw.desktop +share/mimelnk/application/vnd.stardivision.impress.desktop +share/mimelnk/application/vnd.stardivision.math.desktop +share/mimelnk/application/vnd.stardivision.writer-global.desktop +share/mimelnk/application/vnd.stardivision.writer.desktop share/mimelnk/application/vnd.sun.xml.calc.desktop +share/mimelnk/application/vnd.sun.xml.calc.template.desktop share/mimelnk/application/vnd.sun.xml.draw.desktop +share/mimelnk/application/vnd.sun.xml.draw.template.desktop share/mimelnk/application/vnd.sun.xml.impress.desktop +share/mimelnk/application/vnd.sun.xml.impress.template.desktop share/mimelnk/application/vnd.sun.xml.writer.desktop +share/mimelnk/application/vnd.sun.xml.writer.master.desktop +share/mimelnk/application/vnd.sun.xml.writer.template.desktop share/mimelnk/application/wordperfect.desktop share/mimelnk/application/x-abiword.desktop share/mimelnk/application/x-ace.desktop @@ -4144,6 +4352,7 @@ share/mimelnk/application/x-deb.desktop share/mimelnk/application/x-designer.desktop share/mimelnk/application/x-desktop.desktop share/mimelnk/application/x-dvi.desktop +share/mimelnk/application/x-executable-script.desktop share/mimelnk/application/x-executable.desktop share/mimelnk/application/x-font-bdf.desktop share/mimelnk/application/x-font-ghostscript.desktop @@ -4161,6 +4370,7 @@ share/mimelnk/application/x-gzdvi.desktop share/mimelnk/application/x-gzip.desktop share/mimelnk/application/x-gzpostscript.desktop share/mimelnk/application/x-hancomword.desktop +share/mimelnk/application/x-ica.desktop share/mimelnk/application/x-iso.desktop share/mimelnk/application/x-jar.desktop share/mimelnk/application/x-java-applet.desktop @@ -4186,11 +4396,13 @@ share/mimelnk/application/x-lzop.desktop share/mimelnk/application/x-magicpoint.desktop share/mimelnk/application/x-msaccess.desktop share/mimelnk/application/x-msdos-program.desktop +share/mimelnk/application/x-msmetafile.desktop share/mimelnk/application/x-mswrite.desktop share/mimelnk/application/x-object.desktop share/mimelnk/application/x-ogg.desktop share/mimelnk/application/x-ooimpress.desktop share/mimelnk/application/x-oowriter.desktop +share/mimelnk/application/x-pak.desktop share/mimelnk/application/x-perl-module.desktop share/mimelnk/application/x-perl.desktop share/mimelnk/application/x-php.desktop @@ -4227,6 +4439,9 @@ share/mimelnk/audio/aac.desktop share/mimelnk/audio/ac3.desktop share/mimelnk/audio/basic.desktop share/mimelnk/audio/mp4.desktop +share/mimelnk/audio/mpeg.desktop +share/mimelnk/audio/mpegurl.desktop +share/mimelnk/audio/prs.sid.desktop share/mimelnk/audio/vnd.rn-realaudio.desktop share/mimelnk/audio/vorbis.desktop share/mimelnk/audio/x-adpcm.desktop @@ -4235,8 +4450,11 @@ share/mimelnk/audio/x-flac.desktop share/mimelnk/audio/x-matroska.desktop share/mimelnk/audio/x-midi.desktop share/mimelnk/audio/x-mod.desktop +share/mimelnk/audio/x-mp2.desktop share/mimelnk/audio/x-mp3.desktop share/mimelnk/audio/x-mpegurl.desktop +share/mimelnk/audio/x-ms-wma.desktop +share/mimelnk/audio/x-musepack.desktop share/mimelnk/audio/x-oggflac.desktop share/mimelnk/audio/x-pn-realaudio.desktop share/mimelnk/audio/x-scpls.desktop @@ -4254,7 +4472,9 @@ share/mimelnk/image/svg+xml.desktop share/mimelnk/image/tiff.desktop share/mimelnk/image/wmf.desktop share/mimelnk/image/x-bmp.desktop +share/mimelnk/image/x-dds.desktop share/mimelnk/image/x-eps.desktop +share/mimelnk/image/x-exr.desktop share/mimelnk/image/x-ico.desktop share/mimelnk/image/x-jng.desktop share/mimelnk/image/x-msod.desktop @@ -4263,6 +4483,7 @@ share/mimelnk/image/x-photo-cd.desktop share/mimelnk/image/x-portable-bitmap.desktop share/mimelnk/image/x-portable-greymap.desktop share/mimelnk/image/x-portable-pixmap.desktop +share/mimelnk/image/x-rgb.desktop share/mimelnk/image/x-targa.desktop share/mimelnk/image/x-vnd.adobe.photoshop.desktop share/mimelnk/image/x-vnd.trolltech.qpicture.desktop @@ -4303,6 +4524,7 @@ share/mimelnk/text/x-chdr.desktop share/mimelnk/text/x-csrc.desktop share/mimelnk/text/x-csv.desktop share/mimelnk/text/x-diff.desktop +share/mimelnk/text/x-hex.desktop share/mimelnk/text/x-java.desktop share/mimelnk/text/x-katefilelist.desktop share/mimelnk/text/x-latex.desktop @@ -4323,6 +4545,7 @@ share/mimelnk/text/x-vcard.desktop share/mimelnk/text/x-xslfo.desktop share/mimelnk/text/x-xslt.desktop share/mimelnk/text/xml.desktop +share/mimelnk/video/avi.desktop share/mimelnk/video/mp4.desktop share/mimelnk/video/mpeg.desktop share/mimelnk/video/quicktime.desktop @@ -4335,9 +4558,13 @@ share/mimelnk/video/x-ms-wmv.desktop share/mimelnk/video/x-msvideo.desktop share/mimelnk/video/x-ogm.desktop share/mimelnk/video/x-theora.desktop +share/nls/POSIX +share/nls/en_US.US-ASCII share/services/bmp.kimgio share/services/data.protocol +share/services/dds.kimgio share/services/eps.kimgio +share/services/exr.kimgio share/services/file.protocol share/services/ftp.protocol share/services/ghelp.protocol @@ -4354,6 +4581,7 @@ share/services/kbzip2filter.desktop share/services/kcertpart.desktop share/services/kded/kcookiejar.desktop share/services/kded/kdeprintd.desktop +share/services/kded/kdetrayproxy.desktop share/services/kded/kpasswdserver.desktop share/services/kded/kssld.desktop share/services/kded/kwalletd.desktop @@ -4370,6 +4598,9 @@ share/services/kresources/kabc/dir.desktop share/services/kresources/kabc/file.desktop share/services/kresources/kabc/ldapkio.desktop share/services/kresources/kabc/net.desktop +share/services/kspell_ispell.desktop +share/services/ktexteditor_autobookmarker.desktop +share/services/ktexteditor_docwordcompletion.desktop share/services/ktexteditor_insertfile.desktop share/services/ktexteditor_isearch.desktop share/services/ktexteditor_kdatatool.desktop @@ -4380,6 +4611,7 @@ share/services/pcx.kimgio share/services/pgm.kimgio share/services/png.kimgio share/services/ppm.kimgio +share/services/rgb.kimgio share/services/rlogin.protocol share/services/rtsp.protocol share/services/shellscript.desktop @@ -4394,6 +4626,7 @@ share/services/xpm.kimgio share/services/xv.kimgio share/servicetypes/application.desktop share/servicetypes/browserview.desktop +share/servicetypes/dcopinstantmessenger.desktop share/servicetypes/kbytesedit.desktop share/servicetypes/kcmodule.desktop share/servicetypes/kcomprfilter.desktop @@ -4410,6 +4643,7 @@ share/servicetypes/kresources_plugin.desktop share/servicetypes/krop.desktop share/servicetypes/krwp.desktop share/servicetypes/kscan.desktop +share/servicetypes/kspellclient.desktop share/servicetypes/ktexteditor.desktop share/servicetypes/ktexteditoreditor.desktop share/servicetypes/ktexteditorplugin.desktop @@ -4436,6 +4670,8 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html @@ -4470,6 +4706,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4488,6 +4725,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4506,6 +4744,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4536,37 +4775,43 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/crystalsvg/scalable/mimetypes @dirrm share/icons/crystalsvg/scalable/filesystems @dirrm share/icons/crystalsvg/scalable/devices -@dirrm share/icons/crystalsvg/scalable/apps +@dirrm share/icons/crystalsvg/scalable/actions @dirrm share/icons/crystalsvg/scalable @dirrm share/icons/crystalsvg/64x64/mimetypes @dirrm share/icons/crystalsvg/64x64/filesystems @dirrm share/icons/crystalsvg/64x64/devices +@dirrm share/icons/crystalsvg/64x64/apps @dirrm share/icons/crystalsvg/64x64/actions @dirrm share/icons/crystalsvg/64x64 @dirrm share/icons/crystalsvg/48x48/mimetypes @dirrm share/icons/crystalsvg/48x48/filesystems @dirrm share/icons/crystalsvg/48x48/devices +@dirrm share/icons/crystalsvg/48x48/apps @dirrm share/icons/crystalsvg/48x48/actions @dirrm share/icons/crystalsvg/48x48 @dirrm share/icons/crystalsvg/32x32/mimetypes @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices +@dirrm share/icons/crystalsvg/32x32/apps @dirrm share/icons/crystalsvg/32x32/actions/kde @dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/mimetypes @dirrm share/icons/crystalsvg/22x22/filesystems +@dirrm share/icons/crystalsvg/22x22/devices @dirrm share/icons/crystalsvg/22x22/actions/kde @dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/mimetypes @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices +@dirrm share/icons/crystalsvg/16x16/apps @dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/mimetypes @dirrm share/icons/crystalsvg/128x128/filesystems @dirrm share/icons/crystalsvg/128x128/devices +@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 @dirrm share/icons/crystalsvg @dirrm share/icons @@ -4580,6 +4825,8 @@ share/servicetypes/scriptinterface.desktop @dirrm share/doc/HTML/en/kdelibs-apidocs/kresources @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts/html @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts +@dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff/html +@dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi @dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html @@ -4618,6 +4865,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/ktexteditor_kdatatool @dirrm share/apps/ktexteditor_isearch @dirrm share/apps/ktexteditor_insertfile +@dirrm share/apps/ktexteditor_docwordcompletion @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps/riscos @dirrm share/apps/kstyle/pixmaps @@ -4723,6 +4971,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/ksgmltools2/customization @dirrm share/apps/ksgmltools2 @dirrm share/apps/knotify +@dirrm share/apps/knewstuff @dirrm share/apps/kjava @dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps @dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16 @@ -4787,9 +5036,11 @@ share/servicetypes/scriptinterface.desktop @dirrm lib/kde3 @dirrm include/libkmid @dirrm include/ktexteditor +@dirrm include/kspell2 @dirrm include/ksettings @dirrm include/kresources @dirrm include/kparts +@dirrm include/knewstuff @dirrm include/kmediaplayer @dirrm include/kjs @dirrm include/kio diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 3ec71f896601..5291618d0b6d 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,19 +8,19 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION= 5 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Base set of libraries needed by KDE programs -CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* +CONFLICTS= kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.* BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} -LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ +LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ + art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ artsc.0:${PORTSDIR}/audio/arts \ cups.2:${PORTSDIR}/print/cups-base \ fam.0:${PORTSDIR}/devel/fam \ @@ -42,6 +42,7 @@ USE_OPENLDAP= yes USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes +_NO_KDE_CLOSURE=yes INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 536c08c26477..f2547c4be01c 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdelibs-3.2.3.tar.bz2) = d9d1c4bd2016a96f156b491ca908dc16 -SIZE (KDE/kdelibs-3.2.3.tar.bz2) = 12737024 +MD5 (KDE/kdelibs-3.3.0.tar.bz2) = 1c208724987433fc1929d22928c1a358 +SIZE (KDE/kdelibs-3.3.0.tar.bz2) = 15703843 diff --git a/x11/kdelibs4/files/patch-dcop_dcopserver.cpp b/x11/kdelibs4/files/patch-dcop_dcopserver.cpp deleted file mode 100644 index 2099d87d1839..000000000000 --- a/x11/kdelibs4/files/patch-dcop_dcopserver.cpp +++ /dev/null @@ -1,185 +0,0 @@ -Index: dcopserver.cpp -=================================================================== -RCS file: /home/kde/kdelibs/dcop/dcopserver.cpp,v -retrieving revision 1.160.2.3 -diff -u -p -r1.160.2.3 dcopserver.cpp ---- dcop/dcopserver.cpp 30 Apr 2004 15:00:08 -0000 1.160.2.3 -+++ dcop/dcopserver.cpp 26 Jul 2004 09:03:06 -0000 -@@ -443,35 +443,78 @@ write_iceauth (FILE *addfp, IceAuthDataE - fprintf (addfp, "\n"); - } - -+#ifndef HAVE_MKSTEMPS -+#include <string.h> -+#include <strings.h> - --#ifndef HAVE_MKSTEMP --static char *unique_filename (const char *path, const char *prefix) --#else --static char *unique_filename (const char *path, const char *prefix, int *pFd) --#endif -+/* this is based on code taken from the GNU libc, distributed under the LGPL license */ -+ -+/* Generate a unique temporary file name from TEMPLATE. -+ -+ TEMPLATE has the form: -+ -+ <path>/ccXXXXXX<suffix> -+ -+ SUFFIX_LEN tells us how long <suffix> is (it can be zero length). -+ -+ The last six characters of TEMPLATE before <suffix> must be "XXXXXX"; -+ they are replaced with a string that makes the filename unique. -+ -+ Returns a file descriptor open on the file for reading and writing. */ -+ -+int mkstemps (char* _template, int suffix_len) - { --#ifndef HAVE_MKSTEMP --#ifndef X_NOT_POSIX -- return ((char *) tempnam (path, prefix)); --#else -- char tempFile[PATH_MAX]; -- char *tmp; -+ static const char letters[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; -+ char *XXXXXX; -+ int len; -+ int count; -+ int value; -+ -+ len = strlen (_template); -+ -+ if ((int) len < 6 + suffix_len || strncmp (&_template[len - 6 - suffix_len], "XXXXXX", 6)) -+ return -1; -+ -+ XXXXXX = &_template[len - 6 - suffix_len]; -+ -+ value = rand(); -+ for (count = 0; count < 256; ++count) -+ { -+ int v = value; -+ int fd; -+ -+ /* Fill in the random bits. */ -+ XXXXXX[0] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[1] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[2] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[3] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[4] = letters[v % 62]; -+ v /= 62; -+ XXXXXX[5] = letters[v % 62]; -+ -+ fd = open (_template, O_RDWR|O_CREAT|O_EXCL, 0600); -+ if (fd >= 0) -+ /* The file does not exist. */ -+ return fd; -+ -+ /* This is a random value. It is only necessary that the next -+ TMP_MAX values generated by adding 7777 to VALUE are different -+ with (module 2^32). */ -+ value += 7777; -+ } -+ /* We return the null string if we can't find a unique file name. */ -+ _template[0] = '\0'; -+ return -1; -+} - -- snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix); -- tmp = (char *) mktemp (tempFile); -- if (tmp) -- { -- char *ptr = (char *) malloc (strlen (tmp) + 1); -- if (ptr != NULL) -- { -- strcpy (ptr, tmp); -- } -- return (ptr); -- } -- else -- return (NULL); - #endif --#else -+ -+static char *unique_filename (const char *path, const char *prefix, int *pFd) -+{ - char tempFile[PATH_MAX]; - char *ptr; - -@@ -480,43 +523,10 @@ static char *unique_filename (const char - if (ptr != NULL) - { - strcpy(ptr, tempFile); -- *pFd = mkstemp(ptr); -+ *pFd = mkstemps(ptr, 0); - } - return ptr; --#endif --} -- --#if 0 --Status SetAuthentication_local (int count, IceListenObj *listenObjs) --{ -- int i; -- for (i = 0; i < count; i ++) { -- char *prot = IceGetListenConnectionString(listenObjs[i]); -- if (!prot) continue; -- char *host = strchr(prot, '/'); -- char *sock = 0; -- if (host) { -- *host=0; -- host++; -- sock = strchr(host, ':'); -- if (sock) { -- *sock = 0; -- sock++; -- } -- } --#ifndef NDEBUG -- qDebug("DCOPServer: SetAProc_loc: conn %d, prot=%s, file=%s", -- (unsigned)i, prot, sock); --#endif -- if (sock && !strcmp(prot, "local")) { -- chmod(sock, 0700); -- } -- IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); -- free(prot); -- } -- return 1; - } --#endif - - #define MAGIC_COOKIE_LEN 16 - -@@ -529,28 +539,19 @@ SetAuthentication (int count, IceListenO - int original_umask; - int i; - QCString command; --#ifdef HAVE_MKSTEMP - int fd; --#endif - - original_umask = umask (0077); /* disallow non-owner access */ - - path = getenv ("DCOP_SAVE_DIR"); - if (!path) - path = "/tmp"; --#ifndef HAVE_MKSTEMP -- if ((addAuthFile = unique_filename (path, "dcop")) == NULL) -- goto bad; - -- if (!(addfp = fopen (addAuthFile, "w"))) -- goto bad; --#else - if ((addAuthFile = unique_filename (path, "dcop", &fd)) == NULL) - goto bad; - - if (!(addfp = fdopen(fd, "wb"))) - goto bad; --#endif - - if ((*_authDataEntries = static_cast<IceAuthDataEntry *>(malloc (count * 2 * sizeof (IceAuthDataEntry)))) == NULL) - goto bad; diff --git a/x11/kdelibs4/files/patch-kdecore-kextsock.cpp b/x11/kdelibs4/files/patch-kdecore-kextsock.cpp deleted file mode 100644 index d07c32c8cf25..000000000000 --- a/x11/kdelibs4/files/patch-kdecore-kextsock.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- kdecore/kextsock.cpp 11 Dec 2003 22:54:36 -0000 1.67 -+++ kdecore/kextsock.cpp 22 Jan 2004 19:59:13 -0000 -@@ -1892,7 +1892,11 @@ int KExtendedSocket::doLookup(const QStr - err = kde_getaddrinfo(_host, _serv, &hint, res); - - #ifdef HAVE_RES_INIT -- if (err == EAI_NONAME || err == EAI_NODATA || err == EAI_AGAIN) -+ if (err == EAI_NONAME || -+#ifdef EAI_NODATA -+ err == EAI_NODATA || -+#endif -+ err == EAI_AGAIN) - { - // A loookup error occurred and nothing was resolved - // However, since the user could have just dialed up to the ISP -@@ -2274,7 +2278,11 @@ void KExtendedSocket::dnsResultsReady() - else - { - d->status = nothing; -+#ifdef EAI_NODATA - setError(IO_LookupError, EAI_NODATA); -+#else -+ setError(IO_LookupError, EAI_NONAME); -+#endif - } - - emit lookupFinished(n); diff --git a/x11/kdelibs4/files/patch-kdecore-kidna.cpp b/x11/kdelibs4/files/patch-kdecore-kidna.cpp deleted file mode 100644 index 821a171977e8..000000000000 --- a/x11/kdelibs4/files/patch-kdecore-kidna.cpp +++ /dev/null @@ -1,58 +0,0 @@ -Index: kdecore/kidna.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kidna.cpp,v -retrieving revision 1.9.4.1 -diff -u -5 -p -d -r1.9.4.1 kidna.cpp ---- kdecore/kidna.cpp 4 Feb 2004 11:43:34 -0000 1.9.4.1 -+++ kdecore/kidna.cpp 13 Mar 2004 20:24:13 -0000 -@@ -21,16 +21,16 @@ - - #include "kidna.h" - - #include <kdebug.h> - --#include "ltdl.h" -+#include <dlfcn.h> - #include <stdlib.h> - - #define IDNA_SUCCESS 0 - --static lt_dlhandle KIDNA_lib; // = 0 -+void *KIDNA_lib; // = 0 - static bool KIDNA_lib_load_failed; // = false - - typedef int (*KIDNA_utf8_to_ace_t)(const char *, char **, int); - typedef int (*KIDNA_utf8ace_to_utf8_t)(const char *, char **, int); - -@@ -38,27 +38,27 @@ static KIDNA_utf8_to_ace_t KIDNA_utf8_to - static KIDNA_utf8ace_to_utf8_t KIDNA_utf8ace_to_utf8; // = 0 - - static void KIDNA_load_lib() - { - KIDNA_lib_load_failed = true; // Unless proven otherwise -- KIDNA_lib = lt_dlopen("/usr/local/lib/libidn.la"); -+ KIDNA_lib = dlopen("%%LOCALBASE%%/lib/libidn.so", RTLD_LAZY); - if (!KIDNA_lib) - { -- KIDNA_lib = lt_dlopen("/usr/lib/libidn.la"); -+ KIDNA_lib = dlopen("/usr/lib/libidn.so", RTLD_LAZY); - } - - if (!KIDNA_lib) - return; // Error - -- KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) lt_dlsym(KIDNA_lib, "idna_to_ascii_8z"); -+ KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) dlsym(KIDNA_lib, "idna_to_ascii_8z"); - if (!KIDNA_utf8_to_ace) - { - kdWarning() << "Symbol idna_utf8_to_ace not found." << endl; - return; // Error - } - -- KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) lt_dlsym(KIDNA_lib, "idna_to_unicode_8z8z"); -+ KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) dlsym(KIDNA_lib, "idna_to_unicode_8z8z"); - if (!KIDNA_utf8ace_to_utf8) - { - kdWarning() << "Symbol idna_utf8ace_to_utf8 not found." << endl; - return; // Error - } diff --git a/x11/kdelibs4/files/patch-kdecore_kstandarddirs.cpp b/x11/kdelibs4/files/patch-kdecore_kstandarddirs.cpp deleted file mode 100644 index 30d6bd10edbe..000000000000 --- a/x11/kdelibs4/files/patch-kdecore_kstandarddirs.cpp +++ /dev/null @@ -1,38 +0,0 @@ -Index: kstandarddirs.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdecore/kstandarddirs.cpp,v -retrieving revision 1.168.2.3 -retrieving revision 1.168.2.4 -diff -u -p -r1.168.2.3 -r1.168.2.4 ---- kdecore/kstandarddirs.cpp 8 Jun 2004 09:27:57 -0000 1.168.2.3 -+++ kdecore/kstandarddirs.cpp 26 Jun 2004 14:42:16 -0000 1.168.2.4 -@@ -651,7 +651,28 @@ void KStandardDirs::createSpecialResourc - char link[1024]; - link[1023] = 0; - int result = readlink(QFile::encodeName(dir).data(), link, 1023); -- if ((result == -1) && (errno == ENOENT)) -+ bool relink = (result == -1) && (errno == ENOENT); -+ if ((result > 0) && (link[0] == '/')) -+ { -+ link[result] = 0; -+ struct stat stat_buf; -+ int res = lstat(link, &stat_buf); -+ if ((res == -1) && (errno == ENOENT)) -+ { -+ relink = true; -+ } -+ else if ((res == -1) || (!S_ISDIR(stat_buf.st_mode))) -+ { -+ fprintf(stderr, "Error: \"%s\" is not a directory.\n", link); -+ relink = true; -+ } -+ else if (stat_buf.st_uid != getuid()) -+ { -+ fprintf(stderr, "Error: \"%s\" is owned by uid %d instead of uid %d.\n", link, stat_buf.st_uid, getuid()); -+ relink = true; -+ } -+ } -+ if (relink) - { - QString srv = findExe(QString::fromLatin1("lnusertemp"), KDEDIR+QString::fromLatin1("/bin")); - if (srv.isEmpty()) diff --git a/x11/kdelibs4/files/patch-kdefx_kstyle.cpp b/x11/kdelibs4/files/patch-kdefx_kstyle.cpp deleted file mode 100644 index 27106d2563ec..000000000000 --- a/x11/kdelibs4/files/patch-kdefx_kstyle.cpp +++ /dev/null @@ -1,134 +0,0 @@ ---- kdefx/kstyle.cpp.orig 19 Jun 2004 15:00:06 -0000 1.49 -+++ kdefx/kstyle.cpp 19 Jun 2004 15:07:47 -0000 -@@ -158,12 +158,16 @@ struct KStylePrivate - float menuOpacity; - - TransparencyEngine transparencyEngine; - KStyle::KStyleScrollBarType scrollbarType; - TransparencyHandler* menuHandler; - KStyle::KStyleFlags flags; -+ -+ //For KPE_ListViewBranch -+ QBitmap *verticalLine; -+ QBitmap *horizontalLine; - }; - - // ----------------------------------------------------------------------------- - - - KStyle::KStyle( KStyleFlags flags, KStyleScrollBarType sbtype ) -@@ -206,23 +210,28 @@ KStyle::KStyle( KStyleFlags flags, KStyl - // Create an instance of the menu transparency handler - d->menuOpacity = settings.readDoubleEntry("/KStyle/Settings/MenuOpacity", 0.90); - d->menuHandler = new TransparencyHandler(this, d->transparencyEngine, - d->menuOpacity, d->menuDropShadow); - } - } -+ -+ d->verticalLine = 0; -+ d->horizontalLine = 0; - - // Create a transparency handler if only drop shadows are enabled. - if (!d->menuHandler && d->menuDropShadow) - d->menuHandler = new TransparencyHandler(this, Disabled, 1.0, d->menuDropShadow); - } - - - KStyle::~KStyle() - { -- if (d->menuHandler) -- delete d->menuHandler; -+ delete d->verticalLine; -+ delete d->horizontalLine; -+ -+ delete d->menuHandler; - - d->menuHandler = NULL; - delete d; - } - - -@@ -391,46 +400,40 @@ void KStyle::drawKStylePrimitive( KStyle - break; - } - - case KPE_ListViewBranch: { - // Typical Windows style listview branch element (dotted line). - -- static QBitmap *verticalLine = 0, *horizontalLine = 0; -- static QCleanupHandler<QBitmap> qlv_cleanup_bitmap; -- - // Create the dotline pixmaps if not already created -- if ( !verticalLine ) -+ if ( !d->verticalLine ) - { - // make 128*1 and 1*128 bitmaps that can be used for - // drawing the right sort of lines. -- verticalLine = new QBitmap( 1, 129, true ); -- horizontalLine = new QBitmap( 128, 1, true ); -+ d->verticalLine = new QBitmap( 1, 129, true ); -+ d->horizontalLine = new QBitmap( 128, 1, true ); - QPointArray a( 64 ); - QPainter p2; -- p2.begin( verticalLine ); -+ p2.begin( d->verticalLine ); - - int i; - for( i=0; i < 64; i++ ) - a.setPoint( i, 0, i*2+1 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); -- verticalLine->setMask( *verticalLine ); -+ d->verticalLine->setMask( *d->verticalLine ); - -- p2.begin( horizontalLine ); -+ p2.begin( d->horizontalLine ); - for( i=0; i < 64; i++ ) - a.setPoint( i, i*2+1, 0 ); - p2.setPen( color1 ); - p2.drawPoints( a ); - p2.end(); - QApplication::flushX(); -- horizontalLine->setMask( *horizontalLine ); -- -- qlv_cleanup_bitmap.add( &verticalLine ); -- qlv_cleanup_bitmap.add( &horizontalLine ); -+ d->horizontalLine->setMask( *d->horizontalLine ); - } - - p->setPen( cg.text() ); // cg.dark() is bad for dark color schemes. - - if (flags & Style_Horizontal) - { -@@ -441,13 +444,13 @@ void KStyle::drawKStylePrimitive( KStyle - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; -- p->drawPixmap( point, other, *horizontalLine, 0, 0, i, thickness ); -+ p->drawPixmap( point, other, *d->horizontalLine, 0, 0, i, thickness ); - point += i; - } - - } else { - int point = r.y(); - int other = r.x(); -@@ -457,13 +460,13 @@ void KStyle::drawKStylePrimitive( KStyle - - while( point < end ) - { - int i = 128; - if ( i+point > end ) - i = end-point; -- p->drawPixmap( other, point, *verticalLine, 0, pixmapoffset, thickness, i ); -+ p->drawPixmap( other, point, *d->verticalLine, 0, pixmapoffset, thickness, i ); - point += i; - } - } - - break; - } diff --git a/x11/kdelibs4/files/patch-kdeui-kxmlguifactory.cpp b/x11/kdelibs4/files/patch-kdeui-kxmlguifactory.cpp deleted file mode 100644 index a9ae71f61519..000000000000 --- a/x11/kdelibs4/files/patch-kdeui-kxmlguifactory.cpp +++ /dev/null @@ -1,23 +0,0 @@ -Index: kxmlguifactory.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kdeui/kxmlguifactory.cpp,v -retrieving revision 1.149 -retrieving revision 1.151 -diff -u -3 -p -r1.149 -r1.151 ---- kxmlguifactory.cpp 19 Jun 2004 21:35:02 -0000 1.149 -+++ kdeui/kxmlguifactory.cpp 22 Jun 2004 15:56:16 -0000 1.151 -@@ -124,7 +124,14 @@ QString KXMLGUIFactory::readConfigFile( - return QString::null; - } - -+#if QT_VERSION <= 0x030302 -+ // Work around bug in QString::fromUtf8 (which calls strlen). -+ QByteArray buffer(file.size() + 1); -+ buffer = file.readAll(); -+ buffer[ buffer.size() - 1 ] = '\0'; -+#else - QByteArray buffer(file.readAll()); -+#endif - return QString::fromUtf8(buffer.data(), buffer.size()); - } - diff --git a/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-htmlframes b/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-htmlframes deleted file mode 100644 index bc5b3a2f8a80..000000000000 --- a/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-htmlframes +++ /dev/null @@ -1,434 +0,0 @@ -Index: khtml/khtml_ext.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.cpp,v -retrieving revision 1.85.2.2 -diff -u -p -r1.85.2.2 khtml_ext.cpp ---- khtml/khtml_ext.cpp 24 Apr 2004 08:20:46 -0000 1.85.2.2 -+++ khtml/khtml_ext.cpp 3 Aug 2004 14:36:43 -0000 -@@ -646,6 +646,19 @@ bool KHTMLPartBrowserHostExtension::open - return m_part->openURLInFrame( url, urlArgs ); - } - -+void KHTMLPartBrowserHostExtension::virtual_hook( int id, void *data ) -+{ -+ if (id == VIRTUAL_FIND_FRAME_PARENT) -+ { -+ FindFrameParentParams *param = static_cast<FindFrameParentParams*>(data); -+ KHTMLPart *parentPart = m_part->findFrameParent(param->callingPart, param->frame); -+ if (parentPart) -+ param->parent = parentPart->browserHostExtension(); -+ return; -+ } -+ BrowserHostExtension::virtual_hook( id, data ); -+} -+ - // BCI: remove in KDE 4 - KHTMLZoomFactorAction::KHTMLZoomFactorAction( KHTMLPart *part, bool direction, const QString &text, const QString &icon, const QObject *receiver, const char *slot, QObject *parent, const char *name ) - : KAction( text, icon, 0, receiver, slot, parent, name ) -Index: khtml/khtml_ext.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_ext.h,v -retrieving revision 1.26.2.1 -diff -u -p -r1.26.2.1 khtml_ext.h ---- khtml/khtml_ext.h 29 Feb 2004 15:27:43 -0000 1.26.2.1 -+++ khtml/khtml_ext.h 3 Aug 2004 14:36:43 -0000 -@@ -98,6 +98,9 @@ public: - virtual const QPtrList<KParts::ReadOnlyPart> frames() const; - - virtual bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); -+ -+protected: -+ virtual void virtual_hook( int id, void* data ); - private: - KHTMLPart *m_part; - }; -Index: khtml/khtml_part.cpp -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v -retrieving revision 1.959.2.20 -diff -u -p -r1.959.2.20 khtml_part.cpp ---- khtml/khtml_part.cpp 29 Jun 2004 09:08:16 -0000 1.959.2.20 -+++ khtml/khtml_part.cpp 3 Aug 2004 14:36:46 -0000 -@@ -757,12 +757,16 @@ DOM::Document KHTMLPart::document() cons - return d->m_doc; - } - -- - KParts::BrowserExtension *KHTMLPart::browserExtension() const - { - return d->m_extension; - } - -+KParts::BrowserHostExtension *KHTMLPart::browserHostExtension() const -+{ -+ return d->m_hostExtension; -+} -+ - KHTMLView *KHTMLPart::view() const - { - return d->m_view; -@@ -880,29 +884,18 @@ QVariant KHTMLPart::crossFrameExecuteScr - // we always allow these - } - else { -- while (destpart->parentPart()) -- destpart = destpart->parentPart(); -- destpart = destpart->findFrame(target); -- -+ destpart = findFrame(target); - if (!destpart) -- destpart = this; // ### doesn't make sense, does it? -+ destpart = this; - } - - // easy way out? - if (destpart == this) - return executeScript(DOM::Node(), script); - -- - // now compare the domains -- if (!destpart->htmlDocument().isNull() && -- !htmlDocument().isNull()) { -- DOM::DOMString actDomain = htmlDocument().domain(); -- DOM::DOMString destDomain = destpart->htmlDocument().domain(); -- -- if (actDomain == destDomain) -- return destpart->executeScript(DOM::Node(), script); -- } -- -+ if (destpart->checkFrameAccess(this)) -+ return destpart->executeScript(DOM::Node(), script); - - // eww, something went wrong. better execute it in our frame - return executeScript(DOM::Node(), script); -@@ -3358,7 +3351,7 @@ void KHTMLPart::urlSelected( const QStri - if ( hasTarget ) - { - // unknown frame names should open in a new window. -- khtml::ChildFrame *frame = recursiveFrameRequest( cURL, args, false ); -+ khtml::ChildFrame *frame = recursiveFrameRequest( this, cURL, args, false ); - if ( frame ) - { - args.metaData()["referrer"] = d->m_referrer; -@@ -4364,6 +4357,7 @@ void KHTMLPart::slotChildDocCreated() - void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) - { - khtml::ChildFrame *child = frame( sender()->parent() ); -+ KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent())); - - // TODO: handle child target correctly! currently the script are always executed fur the parent - QString urlStr = url.url(); -@@ -4395,7 +4389,7 @@ void KHTMLPart::slotChildURLRequest( con - } - else if ( frameName != QString::fromLatin1( "_self" ) ) - { -- khtml::ChildFrame *_frame = recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *_frame = recursiveFrameRequest( callingHtmlPart, url, args ); - - if ( !_frame ) - { -@@ -4437,46 +4431,92 @@ khtml::ChildFrame *KHTMLPart::frame( con - return 0L; - } - --//#define DEBUG_FINDFRAME -+//#define DEBUG_FINDFRAME - --KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+bool KHTMLPart::checkFrameAccess(KHTMLPart *callingHtmlPart) - { -+ if (callingHtmlPart == this) -+ return true; // trivial -+ -+ if (htmlDocument().isNull()) { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame '" << f << "'" << endl; -- FrameIt it2 = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it2 != end; ++it2 ) -- kdDebug(6050) << " - having frame '" << (*it2).m_name << "'" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Empty part " << this << " URL = " << m_url << endl; - #endif -- // ### http://www.w3.org/TR/html4/appendix/notes.html#notes-frames -- ConstFrameIt it = d->m_frames.find( f ); -- if ( it == d->m_frames.end() ) -- { -+ return false; // we are empty? -+ } -+ -+ // now compare the domains -+ if (callingHtmlPart && !callingHtmlPart->htmlDocument().isNull() && -+ !htmlDocument().isNull()) { -+ DOM::DOMString actDomain = callingHtmlPart->htmlDocument().domain(); -+ DOM::DOMString destDomain = htmlDocument().domain(); -+ - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " not found" << endl; -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: actDomain = '" << actDomain.string() << "' destDomain = '" << destDomain.string() << "'" << endl; - #endif -- return 0L; -+ -+ if (actDomain == destDomain) -+ return true; - } -- else { -- KParts::ReadOnlyPart *p = (*it).m_part; -- if ( p && p->inherits( "KHTMLPart" )) -- { - #ifdef DEBUG_FINDFRAME -- kdDebug(6050) << "KHTMLPart::findFrame frame " << f << " is a KHTMLPart, ok" << endl; -+ else -+ { -+ kdDebug(6050) << "KHTMLPart::checkFrameAccess: Unknown part/domain " << callingHtmlPart << " tries to access part " << this << endl; -+ } - #endif -- return (KHTMLPart*)p; -- } -- else -- { -+ return false; -+} -+ -+KHTMLPart * -+KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame ) -+{ - #ifdef DEBUG_FINDFRAME -- if (p) -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but isn't a KHTMLPart ! " << p->className() << endl; -- else -- kdWarning() << "KHTMLPart::findFrame frame " << f << " found but m_part=0L" << endl; -+ kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl; -+#endif -+ // Check access -+ KHTMLPart *callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart); -+ -+ if (!checkFrameAccess(callingHtmlPart)) -+ return 0; -+ -+ FrameIt it = d->m_frames.find( f ); -+ FrameIt end = d->m_frames.end(); -+ if ( it != end ) -+ { -+#ifdef DEBUG_FINDFRAME -+ kdDebug(6050) << "KHTMLPart::findFrameParent: FOUND!" << endl; - #endif -- return 0L; -+ if (childFrame) -+ *childFrame = &(*it); -+ return this; -+ } -+ -+ it = d->m_frames.begin(); -+ for (; it != end; ++it ) -+ { -+ KParts::ReadOnlyPart *p = (*it).m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ { -+ KHTMLPart *frameParent = static_cast<KHTMLPart*>(p)->findFrameParent(callingPart, f, childFrame); -+ if (frameParent) -+ return frameParent; - } - } -+ return 0; -+} -+ -+ -+KHTMLPart *KHTMLPart::findFrame( const QString &f ) -+{ -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *parentFrame = findFrameParent(this, f, &childFrame); -+ if (parentFrame) -+ { -+ KParts::ReadOnlyPart *p = childFrame->m_part; -+ if ( p && p->inherits( "KHTMLPart" )) -+ return static_cast<KHTMLPart *>(p); -+ } -+ return 0; - } - - KParts::ReadOnlyPart *KHTMLPart::currentFrame() const -@@ -4514,37 +4554,29 @@ KHTMLPart *KHTMLPart::parentPart() - return (KHTMLPart *)parent(); - } - --khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, -- bool callParent ) -+khtml::ChildFrame *KHTMLPart::recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, -+ const KParts::URLArgs &args, bool callParent ) - { -- FrameIt it = d->m_frames.find( args.frameName ); -- -- if ( it != d->m_frames.end() ) -- return &(*it); -- -- it = d->m_frames.begin(); -- FrameIt end = d->m_frames.end(); -- for (; it != end; ++it ) -- if ( (*it).m_part && (*it).m_part->inherits( "KHTMLPart" ) ) -- { -- KHTMLPart *childPart = (KHTMLPart *)(KParts::ReadOnlyPart *)(*it).m_part; -- -- khtml::ChildFrame *res = childPart->recursiveFrameRequest( url, args, false ); -- if ( !res ) -- continue; -- -- childPart->requestObject( res, url, args ); -- return 0L; -- } -+#ifdef DEBUG_FINDFRAME -+ kdDebug( 6050 ) << "KHTMLPart::recursiveFrameRequest this = " << this << ", frame = " << args.frameName << ", url = " << url << endl; -+#endif -+ khtml::ChildFrame *childFrame; -+ KHTMLPart *childPart = findFrameParent(callingHtmlPart, args.frameName, &childFrame); -+ if (childPart) -+ { -+ if (childPart == this) -+ return childFrame; -+ -+ childPart->requestObject( childFrame, url, args ); -+ return 0; -+ } - - if ( parentPart() && callParent ) - { -- khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( url, args ); -+ khtml::ChildFrame *res = parentPart()->recursiveFrameRequest( callingHtmlPart, url, args, callParent ); - -- if ( res ) -- parentPart()->requestObject( res, url, args ); -- -- return 0L; -+ if ( res ) -+ parentPart()->requestObject( res, url, args ); - } - - return 0L; -@@ -4552,7 +4584,7 @@ khtml::ChildFrame *KHTMLPart::recursiveF - - void KHTMLPart::saveState( QDataStream &stream ) - { -- kdDebug( 6050 ) << "KHTMLPart::saveState saving URL " << m_url.url() << endl; -+ kdDebug( 6050 ) << "KHTMLPart::saveState this = " << this << " saving URL " << m_url.url() << endl; - - stream << m_url << (Q_INT32)d->m_view->contentsX() << (Q_INT32)d->m_view->contentsY() - << (Q_INT32) d->m_view->contentsWidth() << (Q_INT32) d->m_view->contentsHeight() << (Q_INT32) d->m_view->marginWidth() << (Q_INT32) d->m_view->marginHeight(); -Index: khtml/khtml_part.h -=================================================================== -RCS file: /home/kde/kdelibs/khtml/khtml_part.h,v -retrieving revision 1.248.2.5 -diff -u -p -r1.248.2.5 khtml_part.h ---- khtml/khtml_part.h 29 Jun 2004 09:08:16 -0000 1.248.2.5 -+++ khtml/khtml_part.h 3 Aug 2004 14:36:47 -0000 -@@ -287,6 +287,7 @@ public: - */ - KParts::BrowserExtension *browserExtension() const; - KParts::LiveConnectExtension *liveConnectExtension( const khtml::RenderPart *) const; -+ KParts::BrowserHostExtension *browserHostExtension() const; - - /** - * Returns a pointer to the HTML document's view. -@@ -812,6 +813,16 @@ public: - KHTMLPart *findFrame( const QString &f ); - - /** -+ * @internal -+ * Recursively finds the part containing the frame with name @p f -+ * and checks if it is accessible by @p callingPart -+ * Returns 0L if no suitable frame can't be found. -+ * Returns parent part if a suitable frame was found and -+ * frame info in @p *childFrame -+ */ -+ KHTMLPart *findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame=0 ); -+ -+ /** - * Return the current frame (the one that has focus) - * Not necessarily a direct child of ours, framesets can be nested. - * Returns "this" if this part isn't a frameset. -@@ -1376,6 +1387,8 @@ private: - - bool restoreURL( const KURL &url ); - void emitSelectionChanged(); -+ // Returns whether callingHtmlPart may access this part -+ bool checkFrameAccess(KHTMLPart *callingHtmlPart); - bool openURLInFrame( const KURL &url, const KParts::URLArgs &urlArgs ); - void startAutoScroll(); - void stopAutoScroll(); -@@ -1434,7 +1447,7 @@ private: - DOM::DocumentImpl *xmlDocImpl() const; - khtml::ChildFrame *frame( const QObject *obj ); - -- khtml::ChildFrame *recursiveFrameRequest( const KURL &url, const KParts::URLArgs &args, bool callParent = true ); -+ khtml::ChildFrame *recursiveFrameRequest( KHTMLPart *callingHtmlPart, const KURL &url, const KParts::URLArgs &args, bool callParent = true ); - - bool checkLinkSecurity( const KURL &linkURL,const QString &message = QString::null, const QString &button = QString::null ); - QVariant executeScript( const QString& filename, int baseLine, const DOM::Node &n, const QString& script ); -Index: kparts/browserextension.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.cpp,v -retrieving revision 1.60.2.1 -diff -u -p -r1.60.2.1 browserextension.cpp ---- kparts/browserextension.cpp 10 Apr 2004 15:08:49 -0000 1.60.2.1 -+++ kparts/browserextension.cpp 3 Aug 2004 14:36:48 -0000 -@@ -636,6 +636,17 @@ BrowserHostExtension *BrowserHostExtensi - void BrowserExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -+BrowserHostExtension * -+BrowserHostExtension::findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame) -+{ -+ FindFrameParentParams param; -+ param.parent = 0; -+ param.callingPart = callingPart; -+ param.frame = frame; -+ virtual_hook(VIRTUAL_FIND_FRAME_PARENT, ¶m); -+ return param.parent; -+} -+ - void BrowserHostExtension::virtual_hook( int, void* ) - { /*BASE::virtual_hook( id, data );*/ } - -Index: kparts/browserextension.h -=================================================================== -RCS file: /home/kde/kdelibs/kparts/browserextension.h,v -retrieving revision 1.110 -diff -u -p -r1.110 browserextension.h ---- kparts/browserextension.h 26 Sep 2003 07:13:13 -0000 1.110 -+++ kparts/browserextension.h 3 Aug 2004 14:36:48 -0000 -@@ -671,10 +671,16 @@ public: - * - * Note that this method does not query the child objects recursively. - */ -- - virtual const QPtrList<KParts::ReadOnlyPart> frames() const; - - /** -+ * @internal -+ * Returns the part that contains @p frame and that may be accessed -+ * by @p callingPart -+ */ -+ BrowserHostExtension *findFrameParent(KParts::ReadOnlyPart *callingPart, const QString &frame); -+ -+ /** - * Opens the given url in a hosted child frame. The frame name is specified in the - * frameName variable in the urlArgs argument structure (see KParts::URLArgs ) . - */ -@@ -687,6 +693,19 @@ public: - static BrowserHostExtension *childObject( QObject *obj ); - - protected: -+ /** This 'enum' along with the structure below is NOT part of the public API. -+ * It's going to disappear in KDE 4.0 and is likely to change inbetween. -+ * -+ * @internal -+ */ -+ enum { VIRTUAL_FIND_FRAME_PARENT = 0x10 }; -+ struct FindFrameParentParams -+ { -+ BrowserHostExtension *parent; -+ KParts::ReadOnlyPart *callingPart; -+ QString frame; -+ }; -+ - virtual void virtual_hook( int id, void* data ); - private: - class BrowserHostExtensionPrivate; diff --git a/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-kcookiejar b/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-kcookiejar deleted file mode 100644 index 2da6e9ac39d2..000000000000 --- a/x11/kdelibs4/files/patch-post-3.2.3-kdelibs-kcookiejar +++ /dev/null @@ -1,140 +0,0 @@ -Index: kioslave/http/kcookiejar/kcookiejar.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookiejar.cpp,v -retrieving revision 1.116 -retrieving revision 1.117 -diff -u -p -r1.116 -r1.117 ---- kioslave/http/kcookiejar/kcookiejar.cpp 19 Jul 2004 10:16:22 -0000 1.116 -+++ kioslave/http/kcookiejar/kcookiejar.cpp 20 Jul 2004 15:29:24 -0000 1.117 -@@ -244,6 +244,14 @@ KCookieJar::KCookieJar() - m_globalAdvice = KCookieDunno; - m_configChanged = false; - m_cookiesChanged = false; -+ -+ QString twoLevelTLD="name,ai,au,bd,bh,ck,eg,et,fk,il,in,kh,kr,mk,mt,na,np,nz,pg,pk,qa,sa,sb,sg,sv,ua,ug,uk,uy,vn,za,zw"; -+ QStringList countries = QStringList::split(',', twoLevelTLD); -+ for(QStringList::ConstIterator it = countries.begin(); -+ it != countries.end(); ++it) -+ { -+ m_twoLevelTLD.replace(*it, (int *) 1); -+ } - } - - // -@@ -528,14 +536,14 @@ static const char * parseNameValue(const - - } - --static void stripDomain(const QString &_fqdn, QString &_domain) -+void KCookieJar::stripDomain(const QString &_fqdn, QString &_domain) - { - QStringList domains; -- KCookieJar::extractDomains(_fqdn, domains); -+ extractDomains(_fqdn, domains); - _domain = domains[0]; - } - --static QString stripDomain( KHttpCookiePtr cookiePtr) -+QString KCookieJar::stripDomain( KHttpCookiePtr cookiePtr) - { - QString domain; // We file the cookie under this domain. - if (cookiePtr->domain().isEmpty()) -@@ -620,6 +628,13 @@ void KCookieJar::extractDomains(const QS - { - if (partList.count() == 1) - break; // We only have a TLD left. -+ -+ if ((partList.count() == 2) && (m_twoLevelTLD[partList[1].lower()])) -+ { -+ // This domain uses two-level TLDs in the form xxxx.yy -+ break; -+ } -+ - if ((partList.count() == 2) && (partList[1].length() == 2)) - { - // If this is a TLD, we should stop. (e.g. co.uk) -@@ -634,14 +649,6 @@ void KCookieJar::extractDomains(const QS - break; - } - -- // The .name domain uses <name>.<surname>.name -- // Although the TLD is striclty speaking .name, for our purpose -- // it should be <surname>.name since people should not be able -- // to set cookies for everyone with the same surname. -- // Matches <surname>.name -- if ((partList.count() == 2)&& (partList[1].lower() == L1("name"))) -- break; -- - QString domain = partList.join(L1(".")); - _domains.append('.' + domain); - _domains.append(domain); -Index: kioslave/http/kcookiejar/kcookiejar.h -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookiejar.h,v -retrieving revision 1.33 -retrieving revision 1.34 -diff -u -p -r1.33 -r1.34 ---- kioslave/http/kcookiejar/kcookiejar.h 22 Nov 2003 16:50:45 -0000 1.33 -+++ kioslave/http/kcookiejar/kcookiejar.h 20 Jul 2004 15:29:24 -0000 1.34 -@@ -306,8 +306,8 @@ public: - /** - * Returns a list of domains (_domainList) relevant for this host. - */ -- static void extractDomains(const QString &_fqdn, -- QStringList &_domainList); -+ void extractDomains(const QString &_fqdn, -+ QStringList &_domainList); - - static QString adviceToStr(KCookieAdvice _advice); - static KCookieAdvice strToAdvice(const QString &_str); -@@ -329,11 +329,15 @@ public: - */ - void setShowCookieDetails (bool value) { m_showCookieDetails = value; } - -+protected: -+ void stripDomain(const QString &_fqdn, QString &_domain); -+ QString stripDomain( KHttpCookiePtr cookiePtr); - - protected: - QStringList m_domainList; - KCookieAdvice m_globalAdvice; - QDict<KHttpCookieList> m_cookieDomains; -+ QDict<int> m_twoLevelTLD; - - bool m_configChanged; - bool m_cookiesChanged; -Index: kioslave/http/kcookiejar/kcookieserver.cpp -=================================================================== -RCS file: /home/kde/kdelibs/kioslave/http/kcookiejar/kcookieserver.cpp,v -retrieving revision 1.50 -retrieving revision 1.51 -diff -u -p -r1.50 -r1.51 ---- kioslave/http/kcookiejar/kcookieserver.cpp 9 Jun 2003 10:56:42 -0000 1.50 -+++ kioslave/http/kcookiejar/kcookieserver.cpp 20 Jul 2004 15:29:24 -0000 1.51 -@@ -131,7 +131,7 @@ bool KCookieServer::cookiesPending( cons - if (!KCookieJar::parseURL(url, fqdn, path)) - return false; - -- KCookieJar::extractDomains( fqdn, domains ); -+ mCookieJar->extractDomains( fqdn, domains ); - for( KHttpCookie *cookie = mPendingCookies->first(); - cookie != 0L; - cookie = mPendingCookies->next()) -@@ -557,7 +557,7 @@ KCookieServer::setDomainAdvice(QString u - if (KCookieJar::parseURL(url, fqdn, dummy)) - { - QStringList domains; -- KCookieJar::extractDomains(fqdn, domains); -+ mCookieJar->extractDomains(fqdn, domains); - mCookieJar->setDomainAdvice(domains[0], - KCookieJar::strToAdvice(advice)); - } -@@ -573,7 +573,7 @@ KCookieServer::getDomainAdvice(QString u - if (KCookieJar::parseURL(url, fqdn, dummy)) - { - QStringList domains; -- KCookieJar::extractDomains(fqdn, domains); -+ mCookieJar->extractDomains(fqdn, domains); - advice = mCookieJar->getDomainAdvice(domains[0]); - } - return KCookieJar::adviceToStr(advice); diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 2e9c0f13fe3c..9f4d9a408459 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -14,6 +14,9 @@ bin/dcopref bin/dcopserver bin/dcopserver_shutdown bin/dcopstart +bin/filesharelist +bin/fileshareset +bin/ghns bin/imagetops bin/kab2kabc bin/kaddprinterwizard @@ -32,6 +35,7 @@ bin/kdontchangethehostname bin/kfile bin/kfmexec bin/kgrantpty +bin/khotnewstuff bin/kimage_concat bin/kinstalltheme bin/kio_http_cache_cleaner @@ -50,6 +54,7 @@ bin/kwrapper bin/lnusertemp bin/make_driver_db_cups bin/make_driver_db_lpr +bin/makekdewidgets bin/meinproc bin/preparetips etc/rc.d/kdelibs.sh @@ -117,6 +122,9 @@ include/kabc/formatplugin.h include/kabc/geo.h include/kabc/key.h include/kabc/ldapclient.h +include/kabc/ldapconfigwidget.h +include/kabc/ldapurl.h +include/kabc/ldif.h include/kabc/ldifconverter.h include/kabc/lock.h include/kabc/locknull.h @@ -149,6 +157,7 @@ include/kaccelmanager.h include/kaction.h include/kactionclasses.h include/kactioncollection.h +include/kactionselector.h include/kactionshortcutlist.h include/kactivelabel.h include/kallocator.h @@ -179,6 +188,7 @@ include/kbookmarkmanager.h include/kbookmarkmenu.h include/kbookmarknotifier.h include/kbufferedio.h +include/kbufferedsocket.h include/kbugreport.h include/kbuttonbox.h include/kcalendarsystem.h @@ -186,6 +196,7 @@ include/kcalendarsystemfactory.h include/kcatalogue.h include/kcharselect.h include/kcharsets.h +include/kclientsocketbase.h include/kclipboard.h include/kcmdlineargs.h include/kcmenumngr.h @@ -216,6 +227,7 @@ include/kcpuinfo.h include/kcrash.h include/kcursor.h include/kcustommenueditor.h +include/kdatagramsocket.h include/kdatastream.h include/kdatatool.h include/kdatepicker.h @@ -321,6 +333,7 @@ include/khtml_part.h include/khtml_settings.h include/khtmldefaults.h include/khtmlview.h +include/khttpproxysocketdevice.h include/kicondialog.h include/kiconeffect.h include/kiconloader.h @@ -330,6 +343,9 @@ include/kidna.h include/kimageeffect.h include/kimagefilepreview.h include/kimageio.h +include/kimiface.h +include/kimproxy.h +include/kimproxyiface.h include/kinputdialog.h include/kinstance.h include/kio/authinfo.h @@ -389,6 +405,7 @@ include/kjs/value.h include/kkeybutton.h include/kkeydialog.h include/kkeynative.h +include/klanguagebutton.h include/klargefile.h include/kled.h include/klibloader.h @@ -396,7 +413,9 @@ include/klineedit.h include/klineeditdlg.h include/klistbox.h include/klistview.h +include/klistviewsearchline.h include/klocale.h +include/klockfile.h include/kmacroexpander.h include/kmainwindow.h include/kmainwindowiface.h @@ -421,10 +440,23 @@ include/kmessagebox.h include/kmimemagic.h include/kmimesourcefactory.h include/kmimetype.h +include/kmimetypechooser.h include/kmimetyperesolver.h include/kmountpoint.h +include/kmulticastsocket.h +include/kmulticastsocketdevice.h include/kmultipledrag.h include/kmultitabbar.h +include/knetworkinterface.h +include/knewstuff/downloaddialog.h +include/knewstuff/engine.h +include/knewstuff/entry.h +include/knewstuff/knewstuff.h +include/knewstuff/knewstuffgeneric.h +include/knewstuff/provider.h +include/knewstuff/providerdialog.h +include/knewstuff/uploaddialog.h +include/knfsshare.h include/knotifyclient.h include/knotifydialog.h include/knotifywidgetbase.h @@ -478,8 +510,10 @@ include/krandomsequence.h include/krecentdocument.h include/kregexp.h include/kregexpeditorinterface.h +include/kremoteencoding.h include/kreplace.h include/kreplacedialog.h +include/kresolver.h include/kresources/configdialog.h include/kresources/configpage.h include/kresources/configwidget.h @@ -490,11 +524,13 @@ include/kresources/managerimpl.h include/kresources/resource.h include/kresources/selectdialog.h include/krestrictedline.h +include/kreverseresolver.h include/krfcdate.h include/krootpixmap.h include/krootprop.h include/kruler.h include/krun.h +include/ksambashare.h include/ksavefile.h include/kscan.h include/ksconfig.h @@ -502,6 +538,7 @@ include/kscreensaver.h include/kscreensaver_vroot.h include/kselect.h include/kseparator.h +include/kserversocket.h include/kservice.h include/kservicegroup.h include/kservicetype.h @@ -520,9 +557,23 @@ include/ksimpleconfig.h include/ksmimecrypto.h include/ksock.h include/ksockaddr.h +include/ksocketaddress.h +include/ksocketbase.h +include/ksocketdevice.h include/ksocks.h +include/ksockssocketdevice.h include/ksortablevaluelist.h include/kspell.h +include/kspell2/backgroundchecker.h +include/kspell2/broker.h +include/kspell2/configdialog.h +include/kspell2/configwidget.h +include/kspell2/defaultdictionary.h +include/kspell2/dialog.h +include/kspell2/dictionary.h +include/kspell2/filter.h +include/kspell2/highlighter.h +include/kspell2/settings.h include/kspelldlg.h include/ksplashscreen.h include/ksqueezedtextlabel.h @@ -556,6 +607,7 @@ include/kstdaccel.h include/kstdaction.h include/kstddirs.h include/kstdguiitem.h +include/kstreamsocket.h include/kstringhandler.h include/kstringvalidator.h include/kstyle.h @@ -600,6 +652,7 @@ include/ktexteditor/selectioninterfaceext.h include/ktexteditor/sessionconfiginterface.h include/ktexteditor/texthintinterface.h include/ktexteditor/undointerface.h +include/ktexteditor/variableinterface.h include/ktexteditor/view.h include/ktexteditor/viewcursorinterface.h include/ktexteditor/viewstatusmsginterface.h @@ -697,6 +750,8 @@ lib/kde3/kded_kcookiejar.la lib/kde3/kded_kcookiejar.so lib/kde3/kded_kdeprintd.la lib/kde3/kded_kdeprintd.so +lib/kde3/kded_kdetrayproxy.la +lib/kde3/kded_kdetrayproxy.so lib/kde3/kded_kpasswdserver.la lib/kde3/kded_kpasswdserver.so lib/kde3/kded_kssld.la @@ -723,14 +778,20 @@ lib/kde3/kgzipfilter.la lib/kde3/kgzipfilter.so lib/kde3/khtmlimagepart.la lib/kde3/khtmlimagepart.so +lib/kde3/kimg_dds.la +lib/kde3/kimg_dds.so lib/kde3/kimg_eps.la lib/kde3/kimg_eps.so +lib/kde3/kimg_exr.la +lib/kde3/kimg_exr.so lib/kde3/kimg_ico.la lib/kde3/kimg_ico.so lib/kde3/kimg_jp2.la lib/kde3/kimg_jp2.so lib/kde3/kimg_pcx.la lib/kde3/kimg_pcx.so +lib/kde3/kimg_rgb.la +lib/kde3/kimg_rgb.so lib/kde3/kimg_tga.la lib/kde3/kimg_tga.so lib/kde3/kimg_tiff.la @@ -759,6 +820,12 @@ lib/kde3/klauncher.la lib/kde3/klauncher.so lib/kde3/knotify.la lib/kde3/knotify.so +lib/kde3/kspell_ispell.la +lib/kde3/kspell_ispell.so +lib/kde3/ktexteditor_autobookmarker.la +lib/kde3/ktexteditor_autobookmarker.so +lib/kde3/ktexteditor_docwordcompletion.la +lib/kde3/ktexteditor_docwordcompletion.so lib/kde3/ktexteditor_insertfile.la lib/kde3/ktexteditor_insertfile.so lib/kde3/ktexteditor_isearch.la @@ -859,6 +926,9 @@ lib/libkdeui.so.6 lib/libkhtml.la lib/libkhtml.so lib/libkhtml.so.6 +lib/libkimproxy.la +lib/libkimproxy.so +lib/libkimproxy.so.0 lib/libkio.la lib/libkio.so lib/libkio.so.6 @@ -877,6 +947,9 @@ lib/libkmediaplayer.so.0 lib/libkmid.la lib/libkmid.so lib/libkmid.so.0 +lib/libknewstuff.la +lib/libknewstuff.so +lib/libknewstuff.so.1 lib/libkparts.la lib/libkparts.so lib/libkparts.so.3 @@ -892,6 +965,9 @@ lib/libkscript.so.0 lib/libkspell.la lib/libkspell.so lib/libkspell.so.6 +lib/libkspell2.la +lib/libkspell2.so +lib/libkspell2.so.1 lib/libktexteditor.la lib/libktexteditor.so lib/libktexteditor.so.0 @@ -927,54 +1003,81 @@ share/apps/kabc/formats/binary.desktop share/apps/katepart/katepartreadonlyui.rc share/apps/katepart/katepartui.rc share/apps/katepart/syntax/ada.xml +share/apps/katepart/syntax/ahdl.xml +share/apps/katepart/syntax/alert.xml +share/apps/katepart/syntax/ansic89.xml share/apps/katepart/syntax/asm6502.xml share/apps/katepart/syntax/awk.xml share/apps/katepart/syntax/bash.xml share/apps/katepart/syntax/bibtex.xml share/apps/katepart/syntax/c.xml +share/apps/katepart/syntax/cg.xml share/apps/katepart/syntax/changelog.xml +share/apps/katepart/syntax/cisco.xml +share/apps/katepart/syntax/clipper.xml share/apps/katepart/syntax/coldfusion.xml +share/apps/katepart/syntax/commonlisp.xml share/apps/katepart/syntax/component-pascal.xml share/apps/katepart/syntax/cpp.xml share/apps/katepart/syntax/cs.xml +share/apps/katepart/syntax/css-php.xml share/apps/katepart/syntax/css.xml share/apps/katepart/syntax/cue.xml share/apps/katepart/syntax/d.xml +share/apps/katepart/syntax/debianchangelog.xml +share/apps/katepart/syntax/debiancontrol.xml share/apps/katepart/syntax/desktop.xml share/apps/katepart/syntax/diff.xml +share/apps/katepart/syntax/doxygen.xml share/apps/katepart/syntax/e.xml share/apps/katepart/syntax/eiffel.xml +share/apps/katepart/syntax/euphoria.xml share/apps/katepart/syntax/ferite.xml +share/apps/katepart/syntax/fgl-4gl.xml +share/apps/katepart/syntax/fgl-per.xml share/apps/katepart/syntax/fortran.xml share/apps/katepart/syntax/gdl.xml +share/apps/katepart/syntax/gettext.xml share/apps/katepart/syntax/gnuassembler.xml share/apps/katepart/syntax/haskell.xml +share/apps/katepart/syntax/html-php.xml share/apps/katepart/syntax/html.xml share/apps/katepart/syntax/idconsole.xml share/apps/katepart/syntax/idl.xml share/apps/katepart/syntax/ilerpg.xml share/apps/katepart/syntax/inform.xml share/apps/katepart/syntax/java.xml +share/apps/katepart/syntax/javascript-php.xml share/apps/katepart/syntax/javascript.xml +share/apps/katepart/syntax/jsp.xml share/apps/katepart/syntax/kbasic.xml share/apps/katepart/syntax/language.dtd share/apps/katepart/syntax/latex.xml share/apps/katepart/syntax/ldif.xml +share/apps/katepart/syntax/lex.xml share/apps/katepart/syntax/literate-haskell.xml +share/apps/katepart/syntax/logtalk.xml share/apps/katepart/syntax/lpc.xml +share/apps/katepart/syntax/lua.xml share/apps/katepart/syntax/mab.xml share/apps/katepart/syntax/makefile.xml share/apps/katepart/syntax/mason.xml share/apps/katepart/syntax/matlab.xml +share/apps/katepart/syntax/mips.xml share/apps/katepart/syntax/modula-2.xml +share/apps/katepart/syntax/mup.xml share/apps/katepart/syntax/objectivec.xml +share/apps/katepart/syntax/ocaml.xml share/apps/katepart/syntax/pascal.xml share/apps/katepart/syntax/perl.xml share/apps/katepart/syntax/php.xml share/apps/katepart/syntax/picsrc.xml +share/apps/katepart/syntax/pike.xml share/apps/katepart/syntax/postscript.xml +share/apps/katepart/syntax/povray.xml share/apps/katepart/syntax/progress.xml share/apps/katepart/syntax/prolog.xml +share/apps/katepart/syntax/purebasic.xml share/apps/katepart/syntax/python.xml share/apps/katepart/syntax/r.xml share/apps/katepart/syntax/rexx.xml @@ -992,6 +1095,8 @@ share/apps/katepart/syntax/sql-postgresql.xml share/apps/katepart/syntax/sql.xml share/apps/katepart/syntax/syntax.template share/apps/katepart/syntax/tcl.xml +share/apps/katepart/syntax/tibasic.xml +share/apps/katepart/syntax/txt2tags.xml share/apps/katepart/syntax/uscript.xml share/apps/katepart/syntax/velocity.xml share/apps/katepart/syntax/verilog.xml @@ -1002,7 +1107,9 @@ share/apps/katepart/syntax/xharbour.xml share/apps/katepart/syntax/xml.xml share/apps/katepart/syntax/xmldebug.xml share/apps/katepart/syntax/yacas.xml +share/apps/katepart/syntax/yacc.xml share/apps/kcertpart/kcertpart.rc +share/apps/kcm_componentchooser/kcm_instantmessenger.desktop share/apps/kcm_componentchooser/kcm_ktexteditor.desktop share/apps/kconf_update/kcookiescfg.upd share/apps/kconf_update/kded.upd @@ -1125,9 +1232,9 @@ share/apps/kdeprint/tiledown.png share/apps/kdeprint/tileup.png share/apps/kdeprint/tools/escputil.desktop share/apps/kdeui/pics/aboutkde.png -share/apps/kdeui/pics/keys.png share/apps/kdeui/pics/ktip-background.png share/apps/kdeui/pics/ktip-bulb.png +share/apps/kdewidgets/pics/kactionselector.png share/apps/kdewidgets/pics/kactivelabel.png share/apps/kdewidgets/pics/kcharselect.png share/apps/kdewidgets/pics/kcmodule.png @@ -1135,6 +1242,8 @@ share/apps/kdewidgets/pics/kcolorbutton.png share/apps/kdewidgets/pics/kcolorcombo.png share/apps/kdewidgets/pics/kcombobox.png share/apps/kdewidgets/pics/kdatepicker.png +share/apps/kdewidgets/pics/kdatetable.png +share/apps/kdewidgets/pics/kdatetimewidget.png share/apps/kdewidgets/pics/kdatewidget.png share/apps/kdewidgets/pics/kdialog.png share/apps/kdewidgets/pics/kdoublenuminput.png @@ -1155,6 +1264,7 @@ share/apps/kdewidgets/pics/kled.png share/apps/kdewidgets/pics/klineedit.png share/apps/kdewidgets/pics/klistbox.png share/apps/kdewidgets/pics/klistview.png +share/apps/kdewidgets/pics/kpalettetable.png share/apps/kdewidgets/pics/kpasswordedit.png share/apps/kdewidgets/pics/kprogress.png share/apps/kdewidgets/pics/kpushbutton.png @@ -1169,6 +1279,7 @@ share/apps/kdewidgets/pics/kurllabel.png share/apps/kdewidgets/pics/kurlrequester.png share/apps/khtml/css/html4.css share/apps/khtml/css/quirks.css +share/apps/khtml/domain_info share/apps/khtml/icons/crystalsvg/128x128/actions/bug.png share/apps/khtml/icons/crystalsvg/16x16/actions/bug.png share/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png @@ -1190,6 +1301,7 @@ share/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png share/apps/kjava/kjava.jar share/apps/kjava/kjava.policy share/apps/kjava/pluginsinfo +share/apps/knewstuff/types share/apps/knotify/eventsrc share/apps/ksgmltools2/customization/README share/apps/ksgmltools2/customization/af/catalog @@ -1534,6 +1646,7 @@ share/apps/ksgmltools2/customization/kde-navig-online.xsl share/apps/ksgmltools2/customization/kde-navig.xsl share/apps/ksgmltools2/customization/kde-nochunk.xsl share/apps/ksgmltools2/customization/kde-style.xsl +share/apps/ksgmltools2/customization/kde-ttlpg-online.xsl share/apps/ksgmltools2/customization/kde-ttlpg.xsl share/apps/ksgmltools2/customization/kde-web-navig.xsl share/apps/ksgmltools2/customization/kde-web.xsl @@ -2428,6 +2541,7 @@ share/apps/kstyle/themes/qtwindows.themerc share/apps/kstyle/themes/riscos.themerc share/apps/kstyle/themes/system.themerc share/apps/kstyle/themes/systemalt.themerc +share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc share/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc @@ -2440,7 +2554,9 @@ share/config/katesyntaxhighlightingrc share/config/kdebug.areas share/config/kdebugrc share/config/kdeprintrc +share/config/khotnewstuffrc share/config/ksslcalist +share/config/ktexteditor_autobookmarkerrc share/config/kthemestylerc share/config/language.codes share/config/ui/kprintpreviewui.rc @@ -2493,11 +2609,15 @@ share/doc/HTML/en/common/web-doctop.png share/doc/HTML/en/common/x11-license.html share/doc/HTML/en/common/xml.dcl share/doc/HTML/en/kdelibs-apidocs/common +share/icons/crystalsvg/128x128/apps/password.png share/icons/crystalsvg/128x128/devices/blockdevice.png +share/icons/crystalsvg/128x128/devices/chardevice.png share/icons/crystalsvg/128x128/devices/mouse.png -share/icons/crystalsvg/128x128/filesystems/chardevice.png +share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png +share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png share/icons/crystalsvg/128x128/filesystems/desktop.png share/icons/crystalsvg/128x128/filesystems/exec.png +share/icons/crystalsvg/128x128/filesystems/file_broken.png share/icons/crystalsvg/128x128/filesystems/folder.png share/icons/crystalsvg/128x128/filesystems/folder_crystal.png share/icons/crystalsvg/128x128/filesystems/folder_favorite.png @@ -2529,6 +2649,7 @@ share/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png share/icons/crystalsvg/128x128/filesystems/lockoverlay.png share/icons/crystalsvg/128x128/filesystems/network.png share/icons/crystalsvg/128x128/filesystems/network_local.png +share/icons/crystalsvg/128x128/filesystems/pipe.png share/icons/crystalsvg/128x128/filesystems/trashcan_empty.png share/icons/crystalsvg/128x128/filesystems/trashcan_full.png share/icons/crystalsvg/128x128/filesystems/www.png @@ -2539,29 +2660,44 @@ share/icons/crystalsvg/128x128/mimetypes/binary.png share/icons/crystalsvg/128x128/mimetypes/cdimage.png share/icons/crystalsvg/128x128/mimetypes/cdr.png share/icons/crystalsvg/128x128/mimetypes/cdtrack.png -share/icons/crystalsvg/128x128/mimetypes/colorset.png +share/icons/crystalsvg/128x128/mimetypes/colorscm.png share/icons/crystalsvg/128x128/mimetypes/core.png share/icons/crystalsvg/128x128/mimetypes/deb.png share/icons/crystalsvg/128x128/mimetypes/document.png share/icons/crystalsvg/128x128/mimetypes/document2.png +share/icons/crystalsvg/128x128/mimetypes/dvi.png +share/icons/crystalsvg/128x128/mimetypes/empty.png share/icons/crystalsvg/128x128/mimetypes/encrypted.png +share/icons/crystalsvg/128x128/mimetypes/exec_wine.png share/icons/crystalsvg/128x128/mimetypes/font.png share/icons/crystalsvg/128x128/mimetypes/font_bitmap.png share/icons/crystalsvg/128x128/mimetypes/font_truetype.png +share/icons/crystalsvg/128x128/mimetypes/font_type1.png +share/icons/crystalsvg/128x128/mimetypes/gf.png share/icons/crystalsvg/128x128/mimetypes/html.png share/icons/crystalsvg/128x128/mimetypes/image.png share/icons/crystalsvg/128x128/mimetypes/info.png +share/icons/crystalsvg/128x128/mimetypes/karbon_karbon.png +share/icons/crystalsvg/128x128/mimetypes/kexi_kexi.png share/icons/crystalsvg/128x128/mimetypes/kmultiple.png share/icons/crystalsvg/128x128/mimetypes/koffice.png +share/icons/crystalsvg/128x128/mimetypes/krita_kra.png +share/icons/crystalsvg/128x128/mimetypes/log.png share/icons/crystalsvg/128x128/mimetypes/make.png share/icons/crystalsvg/128x128/mimetypes/man.png share/icons/crystalsvg/128x128/mimetypes/message.png share/icons/crystalsvg/128x128/mimetypes/metafont.png share/icons/crystalsvg/128x128/mimetypes/midi.png -share/icons/crystalsvg/128x128/mimetypes/mime.png +share/icons/crystalsvg/128x128/mimetypes/misc.png +share/icons/crystalsvg/128x128/mimetypes/mozilla_doc.png share/icons/crystalsvg/128x128/mimetypes/netscape_doc.png share/icons/crystalsvg/128x128/mimetypes/pdf.png +share/icons/crystalsvg/128x128/mimetypes/pk.png share/icons/crystalsvg/128x128/mimetypes/postscript.png +share/icons/crystalsvg/128x128/mimetypes/quicktime.png +share/icons/crystalsvg/128x128/mimetypes/readme.png +share/icons/crystalsvg/128x128/mimetypes/real_doc.png +share/icons/crystalsvg/128x128/mimetypes/recycled.png share/icons/crystalsvg/128x128/mimetypes/resource.png share/icons/crystalsvg/128x128/mimetypes/rpm.png share/icons/crystalsvg/128x128/mimetypes/shellscript.png @@ -2572,23 +2708,32 @@ share/icons/crystalsvg/128x128/mimetypes/source_c.png share/icons/crystalsvg/128x128/mimetypes/source_cpp.png share/icons/crystalsvg/128x128/mimetypes/source_f.png share/icons/crystalsvg/128x128/mimetypes/source_h.png +share/icons/crystalsvg/128x128/mimetypes/source_j.png share/icons/crystalsvg/128x128/mimetypes/source_java.png share/icons/crystalsvg/128x128/mimetypes/source_l.png share/icons/crystalsvg/128x128/mimetypes/source_moc.png share/icons/crystalsvg/128x128/mimetypes/source_o.png share/icons/crystalsvg/128x128/mimetypes/source_p.png +share/icons/crystalsvg/128x128/mimetypes/source_php.png +share/icons/crystalsvg/128x128/mimetypes/source_pl.png share/icons/crystalsvg/128x128/mimetypes/source_py.png share/icons/crystalsvg/128x128/mimetypes/source_s.png share/icons/crystalsvg/128x128/mimetypes/source_y.png share/icons/crystalsvg/128x128/mimetypes/spreadsheet.png share/icons/crystalsvg/128x128/mimetypes/tar.png share/icons/crystalsvg/128x128/mimetypes/template_source.png +share/icons/crystalsvg/128x128/mimetypes/tex.png share/icons/crystalsvg/128x128/mimetypes/tgz.png share/icons/crystalsvg/128x128/mimetypes/txt.png share/icons/crystalsvg/128x128/mimetypes/txt2.png share/icons/crystalsvg/128x128/mimetypes/unknown.png +share/icons/crystalsvg/128x128/mimetypes/vcalendar.png +share/icons/crystalsvg/128x128/mimetypes/vcard.png +share/icons/crystalsvg/128x128/mimetypes/vectorgfx.png share/icons/crystalsvg/128x128/mimetypes/video.png +share/icons/crystalsvg/128x128/mimetypes/widget_doc.png share/icons/crystalsvg/128x128/mimetypes/wordprocessing.png +share/icons/crystalsvg/128x128/mimetypes/zip.png share/icons/crystalsvg/16x16/actions/1downarrow.png share/icons/crystalsvg/16x16/actions/1leftarrow.png share/icons/crystalsvg/16x16/actions/1rightarrow.png @@ -2686,6 +2831,7 @@ share/icons/crystalsvg/16x16/actions/kde4.png share/icons/crystalsvg/16x16/actions/kde5.png share/icons/crystalsvg/16x16/actions/kde6.png share/icons/crystalsvg/16x16/actions/key_enter.png +share/icons/crystalsvg/16x16/actions/knewstuff.png share/icons/crystalsvg/16x16/actions/launch.png share/icons/crystalsvg/16x16/actions/locationbar_erase.png share/icons/crystalsvg/16x16/actions/lock.png @@ -2745,6 +2891,8 @@ share/icons/crystalsvg/16x16/actions/player_play.png share/icons/crystalsvg/16x16/actions/player_rew.png share/icons/crystalsvg/16x16/actions/player_start.png share/icons/crystalsvg/16x16/actions/player_stop.png +share/icons/crystalsvg/16x16/actions/player_time.png +share/icons/crystalsvg/16x16/actions/player_volume.png share/icons/crystalsvg/16x16/actions/previous.png share/icons/crystalsvg/16x16/actions/project_open.png share/icons/crystalsvg/16x16/actions/queue.png @@ -2760,6 +2908,7 @@ share/icons/crystalsvg/16x16/actions/rotate_ccw.png share/icons/crystalsvg/16x16/actions/rotate_cw.png share/icons/crystalsvg/16x16/actions/run.png share/icons/crystalsvg/16x16/actions/save_all.png +share/icons/crystalsvg/16x16/actions/services.png share/icons/crystalsvg/16x16/actions/share.png share/icons/crystalsvg/16x16/actions/signature.png share/icons/crystalsvg/16x16/actions/spellcheck.png @@ -2811,6 +2960,7 @@ share/icons/crystalsvg/16x16/actions/window_fullscreen.png share/icons/crystalsvg/16x16/actions/window_new.png share/icons/crystalsvg/16x16/actions/window_nofullscreen.png share/icons/crystalsvg/16x16/actions/wizard.png +share/icons/crystalsvg/16x16/apps/password.png share/icons/crystalsvg/16x16/devices/3floppy_mount.png share/icons/crystalsvg/16x16/devices/3floppy_unmount.png share/icons/crystalsvg/16x16/devices/5floppy_mount.png @@ -2824,6 +2974,7 @@ share/icons/crystalsvg/16x16/devices/cdrom_mount.png share/icons/crystalsvg/16x16/devices/cdrom_unmount.png share/icons/crystalsvg/16x16/devices/cdwriter_mount.png share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png +share/icons/crystalsvg/16x16/devices/chardevice.png share/icons/crystalsvg/16x16/devices/dvd_mount.png share/icons/crystalsvg/16x16/devices/dvd_unmount.png share/icons/crystalsvg/16x16/devices/hdd_mount.png @@ -2842,9 +2993,10 @@ share/icons/crystalsvg/16x16/devices/printer1.png share/icons/crystalsvg/16x16/devices/scanner.png share/icons/crystalsvg/16x16/devices/tablet.png share/icons/crystalsvg/16x16/devices/tv.png +share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png +share/icons/crystalsvg/16x16/devices/usbpendrive_unmount.png share/icons/crystalsvg/16x16/devices/zip_mount.png share/icons/crystalsvg/16x16/devices/zip_unmount.png -share/icons/crystalsvg/16x16/filesystems/chardevice.png share/icons/crystalsvg/16x16/filesystems/desktop.png share/icons/crystalsvg/16x16/filesystems/exec.png share/icons/crystalsvg/16x16/filesystems/file_broken.png @@ -2896,13 +3048,14 @@ share/icons/crystalsvg/16x16/mimetypes/cdimage.png share/icons/crystalsvg/16x16/mimetypes/cdr.png share/icons/crystalsvg/16x16/mimetypes/cdtrack.png share/icons/crystalsvg/16x16/mimetypes/colorscm.png -share/icons/crystalsvg/16x16/mimetypes/colorset.png share/icons/crystalsvg/16x16/mimetypes/core.png share/icons/crystalsvg/16x16/mimetypes/deb.png share/icons/crystalsvg/16x16/mimetypes/document.png share/icons/crystalsvg/16x16/mimetypes/document2.png share/icons/crystalsvg/16x16/mimetypes/dvi.png +share/icons/crystalsvg/16x16/mimetypes/empty.png share/icons/crystalsvg/16x16/mimetypes/encrypted.png +share/icons/crystalsvg/16x16/mimetypes/exec_wine.png share/icons/crystalsvg/16x16/mimetypes/font.png share/icons/crystalsvg/16x16/mimetypes/font_bitmap.png share/icons/crystalsvg/16x16/mimetypes/font_truetype.png @@ -2929,9 +3082,7 @@ share/icons/crystalsvg/16x16/mimetypes/man.png share/icons/crystalsvg/16x16/mimetypes/message.png share/icons/crystalsvg/16x16/mimetypes/metafont.png share/icons/crystalsvg/16x16/mimetypes/midi.png -share/icons/crystalsvg/16x16/mimetypes/mime.png share/icons/crystalsvg/16x16/mimetypes/misc.png -share/icons/crystalsvg/16x16/mimetypes/misc_doc.png share/icons/crystalsvg/16x16/mimetypes/netscape_doc.png share/icons/crystalsvg/16x16/mimetypes/news.png share/icons/crystalsvg/16x16/mimetypes/pdf.png @@ -2964,7 +3115,6 @@ share/icons/crystalsvg/16x16/mimetypes/tar.png share/icons/crystalsvg/16x16/mimetypes/template_source.png share/icons/crystalsvg/16x16/mimetypes/tex.png share/icons/crystalsvg/16x16/mimetypes/tgz.png -share/icons/crystalsvg/16x16/mimetypes/trash.png share/icons/crystalsvg/16x16/mimetypes/txt.png share/icons/crystalsvg/16x16/mimetypes/txt2.png share/icons/crystalsvg/16x16/mimetypes/unknown.png @@ -3064,7 +3214,6 @@ share/icons/crystalsvg/22x22/actions/inline_image.png share/icons/crystalsvg/22x22/actions/inline_table.png share/icons/crystalsvg/22x22/actions/kde.png share/icons/crystalsvg/22x22/actions/key_enter.png -share/icons/crystalsvg/22x22/actions/klipper_dock.png share/icons/crystalsvg/22x22/actions/launch.png share/icons/crystalsvg/22x22/actions/leftjust.png share/icons/crystalsvg/22x22/actions/locationbar_erase.png @@ -3188,11 +3337,12 @@ share/icons/crystalsvg/22x22/actions/window_fullscreen.png share/icons/crystalsvg/22x22/actions/window_new.png share/icons/crystalsvg/22x22/actions/window_nofullscreen.png share/icons/crystalsvg/22x22/actions/wizard.png +share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png +share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png share/icons/crystalsvg/22x22/filesystems/www.png share/icons/crystalsvg/22x22/mimetypes/applix.png share/icons/crystalsvg/22x22/mimetypes/ascii.png share/icons/crystalsvg/22x22/mimetypes/binary.png -share/icons/crystalsvg/22x22/mimetypes/cdbo_list.png share/icons/crystalsvg/22x22/mimetypes/cdimage.png share/icons/crystalsvg/22x22/mimetypes/cdtrack.png share/icons/crystalsvg/22x22/mimetypes/colorscm.png @@ -3236,7 +3386,6 @@ share/icons/crystalsvg/22x22/mimetypes/mozilla_doc.png share/icons/crystalsvg/22x22/mimetypes/netscape_doc.png share/icons/crystalsvg/22x22/mimetypes/news.png share/icons/crystalsvg/22x22/mimetypes/pdf.png -share/icons/crystalsvg/22x22/mimetypes/php.png share/icons/crystalsvg/22x22/mimetypes/pk.png share/icons/crystalsvg/22x22/mimetypes/postscript.png share/icons/crystalsvg/22x22/mimetypes/quicktime.png @@ -3276,14 +3425,6 @@ share/icons/crystalsvg/22x22/mimetypes/video.png share/icons/crystalsvg/22x22/mimetypes/widget_doc.png share/icons/crystalsvg/22x22/mimetypes/wordprocessing.png share/icons/crystalsvg/22x22/mimetypes/zip.png -share/icons/crystalsvg/32x32/actions/1downarrow.png -share/icons/crystalsvg/32x32/actions/1leftarrow.png -share/icons/crystalsvg/32x32/actions/1rightarrow.png -share/icons/crystalsvg/32x32/actions/1uparrow.png -share/icons/crystalsvg/32x32/actions/2downarrow.png -share/icons/crystalsvg/32x32/actions/2leftarrow.png -share/icons/crystalsvg/32x32/actions/2rightarrow.png -share/icons/crystalsvg/32x32/actions/2uparrow.png share/icons/crystalsvg/32x32/actions/about_kde.png share/icons/crystalsvg/32x32/actions/apply.png share/icons/crystalsvg/32x32/actions/attach.png @@ -3346,7 +3487,7 @@ share/icons/crystalsvg/32x32/actions/identity.png share/icons/crystalsvg/32x32/actions/indent.png share/icons/crystalsvg/32x32/actions/kde.png share/icons/crystalsvg/32x32/actions/kdevelop_down.png -share/icons/crystalsvg/32x32/actions/klipper_doc.png +share/icons/crystalsvg/32x32/actions/knewstuff.png share/icons/crystalsvg/32x32/actions/leftjust.png share/icons/crystalsvg/32x32/actions/locationbar_erase.png share/icons/crystalsvg/32x32/actions/lock.png @@ -3459,6 +3600,7 @@ share/icons/crystalsvg/32x32/actions/window_fullscreen.png share/icons/crystalsvg/32x32/actions/window_new.png share/icons/crystalsvg/32x32/actions/window_nofullscreen.png share/icons/crystalsvg/32x32/actions/wizard.png +share/icons/crystalsvg/32x32/apps/password.png share/icons/crystalsvg/32x32/devices/3floppy_mount.png share/icons/crystalsvg/32x32/devices/3floppy_unmount.png share/icons/crystalsvg/32x32/devices/5floppy_mount.png @@ -3472,6 +3614,7 @@ share/icons/crystalsvg/32x32/devices/cdrom_mount.png share/icons/crystalsvg/32x32/devices/cdrom_unmount.png share/icons/crystalsvg/32x32/devices/cdwriter_mount.png share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png +share/icons/crystalsvg/32x32/devices/chardevice.png share/icons/crystalsvg/32x32/devices/dvd_mount.png share/icons/crystalsvg/32x32/devices/dvd_unmount.png share/icons/crystalsvg/32x32/devices/hdd_mount.png @@ -3490,9 +3633,10 @@ share/icons/crystalsvg/32x32/devices/printer1.png share/icons/crystalsvg/32x32/devices/scanner.png share/icons/crystalsvg/32x32/devices/tablet.png share/icons/crystalsvg/32x32/devices/tv.png +share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png +share/icons/crystalsvg/32x32/devices/usbpendrive_unmount.png share/icons/crystalsvg/32x32/devices/zip_mount.png share/icons/crystalsvg/32x32/devices/zip_unmount.png -share/icons/crystalsvg/32x32/filesystems/chardevice.png share/icons/crystalsvg/32x32/filesystems/desktop.png share/icons/crystalsvg/32x32/filesystems/exec.png share/icons/crystalsvg/32x32/filesystems/file_broken.png @@ -3540,13 +3684,13 @@ share/icons/crystalsvg/32x32/mimetypes/cdimage.png share/icons/crystalsvg/32x32/mimetypes/cdr.png share/icons/crystalsvg/32x32/mimetypes/cdtrack.png share/icons/crystalsvg/32x32/mimetypes/colorscm.png -share/icons/crystalsvg/32x32/mimetypes/colorset.png share/icons/crystalsvg/32x32/mimetypes/core.png share/icons/crystalsvg/32x32/mimetypes/deb.png share/icons/crystalsvg/32x32/mimetypes/document.png share/icons/crystalsvg/32x32/mimetypes/document2.png share/icons/crystalsvg/32x32/mimetypes/dvi.png share/icons/crystalsvg/32x32/mimetypes/empty.png +share/icons/crystalsvg/32x32/mimetypes/exec_wine.png share/icons/crystalsvg/32x32/mimetypes/file_locked.png share/icons/crystalsvg/32x32/mimetypes/file_temporary.png share/icons/crystalsvg/32x32/mimetypes/font.png @@ -3575,8 +3719,7 @@ share/icons/crystalsvg/32x32/mimetypes/man.png share/icons/crystalsvg/32x32/mimetypes/message.png share/icons/crystalsvg/32x32/mimetypes/metafont.png share/icons/crystalsvg/32x32/mimetypes/midi.png -share/icons/crystalsvg/32x32/mimetypes/mime.png -share/icons/crystalsvg/32x32/mimetypes/misc_doc.png +share/icons/crystalsvg/32x32/mimetypes/misc.png share/icons/crystalsvg/32x32/mimetypes/netscape_doc.png share/icons/crystalsvg/32x32/mimetypes/pdf.png share/icons/crystalsvg/32x32/mimetypes/pk.png @@ -3620,15 +3763,20 @@ share/icons/crystalsvg/32x32/mimetypes/vectorgfx.png share/icons/crystalsvg/32x32/mimetypes/video.png share/icons/crystalsvg/32x32/mimetypes/widget_doc.png share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png +share/icons/crystalsvg/48x48/actions/back.png share/icons/crystalsvg/48x48/actions/bookmark.png +share/icons/crystalsvg/48x48/actions/down.png share/icons/crystalsvg/48x48/actions/exit.png share/icons/crystalsvg/48x48/actions/fileclose.png +share/icons/crystalsvg/48x48/actions/forward.png share/icons/crystalsvg/48x48/actions/gear.png share/icons/crystalsvg/48x48/actions/indent.png share/icons/crystalsvg/48x48/actions/lock.png share/icons/crystalsvg/48x48/actions/misc.png share/icons/crystalsvg/48x48/actions/share.png share/icons/crystalsvg/48x48/actions/unindent.png +share/icons/crystalsvg/48x48/actions/up.png +share/icons/crystalsvg/48x48/apps/password.png share/icons/crystalsvg/48x48/devices/3floppy_mount.png share/icons/crystalsvg/48x48/devices/3floppy_unmount.png share/icons/crystalsvg/48x48/devices/5floppy_mount.png @@ -3642,6 +3790,7 @@ share/icons/crystalsvg/48x48/devices/cdrom_mount.png share/icons/crystalsvg/48x48/devices/cdrom_unmount.png share/icons/crystalsvg/48x48/devices/cdwriter_mount.png share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png +share/icons/crystalsvg/48x48/devices/chardevice.png share/icons/crystalsvg/48x48/devices/dvd_mount.png share/icons/crystalsvg/48x48/devices/dvd_unmount.png share/icons/crystalsvg/48x48/devices/hdd_mount.png @@ -3660,9 +3809,10 @@ share/icons/crystalsvg/48x48/devices/printer1.png share/icons/crystalsvg/48x48/devices/scanner.png share/icons/crystalsvg/48x48/devices/tablet.png share/icons/crystalsvg/48x48/devices/tv.png +share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png +share/icons/crystalsvg/48x48/devices/usbpendrive_unmount.png share/icons/crystalsvg/48x48/devices/zip_mount.png share/icons/crystalsvg/48x48/devices/zip_unmount.png -share/icons/crystalsvg/48x48/filesystems/chardevice.png share/icons/crystalsvg/48x48/filesystems/desktop.png share/icons/crystalsvg/48x48/filesystems/exec.png share/icons/crystalsvg/48x48/filesystems/file_broken.png @@ -3713,13 +3863,14 @@ share/icons/crystalsvg/48x48/mimetypes/cdimage.png share/icons/crystalsvg/48x48/mimetypes/cdr.png share/icons/crystalsvg/48x48/mimetypes/cdtrack.png share/icons/crystalsvg/48x48/mimetypes/colorscm.png -share/icons/crystalsvg/48x48/mimetypes/colorset.png share/icons/crystalsvg/48x48/mimetypes/core.png share/icons/crystalsvg/48x48/mimetypes/deb.png share/icons/crystalsvg/48x48/mimetypes/document.png share/icons/crystalsvg/48x48/mimetypes/document2.png share/icons/crystalsvg/48x48/mimetypes/dvi.png +share/icons/crystalsvg/48x48/mimetypes/empty.png share/icons/crystalsvg/48x48/mimetypes/encrypted.png +share/icons/crystalsvg/48x48/mimetypes/exec_wine.png share/icons/crystalsvg/48x48/mimetypes/font.png share/icons/crystalsvg/48x48/mimetypes/font_bitmap.png share/icons/crystalsvg/48x48/mimetypes/font_truetype.png @@ -3747,8 +3898,8 @@ share/icons/crystalsvg/48x48/mimetypes/man.png share/icons/crystalsvg/48x48/mimetypes/message.png share/icons/crystalsvg/48x48/mimetypes/metafont.png share/icons/crystalsvg/48x48/mimetypes/midi.png -share/icons/crystalsvg/48x48/mimetypes/mime.png -share/icons/crystalsvg/48x48/mimetypes/misc_doc.png +share/icons/crystalsvg/48x48/mimetypes/misc.png +share/icons/crystalsvg/48x48/mimetypes/mozilla_doc.png share/icons/crystalsvg/48x48/mimetypes/netscape_doc.png share/icons/crystalsvg/48x48/mimetypes/pdf.png share/icons/crystalsvg/48x48/mimetypes/pk.png @@ -3767,6 +3918,7 @@ share/icons/crystalsvg/48x48/mimetypes/source_c.png share/icons/crystalsvg/48x48/mimetypes/source_cpp.png share/icons/crystalsvg/48x48/mimetypes/source_f.png share/icons/crystalsvg/48x48/mimetypes/source_h.png +share/icons/crystalsvg/48x48/mimetypes/source_j.png share/icons/crystalsvg/48x48/mimetypes/source_java.png share/icons/crystalsvg/48x48/mimetypes/source_l.png share/icons/crystalsvg/48x48/mimetypes/source_moc.png @@ -3793,6 +3945,8 @@ share/icons/crystalsvg/48x48/mimetypes/widget_doc.png share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png share/icons/crystalsvg/48x48/mimetypes/zip.png share/icons/crystalsvg/64x64/actions/favorites.png +share/icons/crystalsvg/64x64/actions/knewstuff.png +share/icons/crystalsvg/64x64/apps/password.png share/icons/crystalsvg/64x64/devices/3floppy_mount.png share/icons/crystalsvg/64x64/devices/3floppy_unmount.png share/icons/crystalsvg/64x64/devices/5floppy_mount.png @@ -3806,6 +3960,7 @@ share/icons/crystalsvg/64x64/devices/cdrom_mount.png share/icons/crystalsvg/64x64/devices/cdrom_unmount.png share/icons/crystalsvg/64x64/devices/cdwriter_mount.png share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png +share/icons/crystalsvg/64x64/devices/chardevice.png share/icons/crystalsvg/64x64/devices/dvd_mount.png share/icons/crystalsvg/64x64/devices/dvd_unmount.png share/icons/crystalsvg/64x64/devices/hdd_mount.png @@ -3824,9 +3979,10 @@ share/icons/crystalsvg/64x64/devices/printer1.png share/icons/crystalsvg/64x64/devices/scanner.png share/icons/crystalsvg/64x64/devices/tablet.png share/icons/crystalsvg/64x64/devices/tv.png +share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png +share/icons/crystalsvg/64x64/devices/usbpendrive_unmount.png share/icons/crystalsvg/64x64/devices/zip_mount.png share/icons/crystalsvg/64x64/devices/zip_unmount.png -share/icons/crystalsvg/64x64/filesystems/chardevice.png share/icons/crystalsvg/64x64/filesystems/desktop.png share/icons/crystalsvg/64x64/filesystems/exec.png share/icons/crystalsvg/64x64/filesystems/file_broken.png @@ -3872,28 +4028,48 @@ share/icons/crystalsvg/64x64/mimetypes/binary.png share/icons/crystalsvg/64x64/mimetypes/cdimage.png share/icons/crystalsvg/64x64/mimetypes/cdr.png share/icons/crystalsvg/64x64/mimetypes/cdtrack.png -share/icons/crystalsvg/64x64/mimetypes/colorset.png +share/icons/crystalsvg/64x64/mimetypes/colorscm.png share/icons/crystalsvg/64x64/mimetypes/core.png share/icons/crystalsvg/64x64/mimetypes/deb.png share/icons/crystalsvg/64x64/mimetypes/document.png share/icons/crystalsvg/64x64/mimetypes/document2.png +share/icons/crystalsvg/64x64/mimetypes/dvi.png +share/icons/crystalsvg/64x64/mimetypes/empty.png share/icons/crystalsvg/64x64/mimetypes/encrypted.png +share/icons/crystalsvg/64x64/mimetypes/exec_wine.png share/icons/crystalsvg/64x64/mimetypes/font.png share/icons/crystalsvg/64x64/mimetypes/font_bitmap.png +share/icons/crystalsvg/64x64/mimetypes/font_truetype.png +share/icons/crystalsvg/64x64/mimetypes/font_type1.png +share/icons/crystalsvg/64x64/mimetypes/gf.png share/icons/crystalsvg/64x64/mimetypes/html.png share/icons/crystalsvg/64x64/mimetypes/image.png share/icons/crystalsvg/64x64/mimetypes/info.png +share/icons/crystalsvg/64x64/mimetypes/karbon_karbon.png +share/icons/crystalsvg/64x64/mimetypes/kchart_chrt.png +share/icons/crystalsvg/64x64/mimetypes/kformula_kfo.png +share/icons/crystalsvg/64x64/mimetypes/kivio_flw.png share/icons/crystalsvg/64x64/mimetypes/kmultiple.png +share/icons/crystalsvg/64x64/mimetypes/koffice.png +share/icons/crystalsvg/64x64/mimetypes/kpresenter_kpr.png +share/icons/crystalsvg/64x64/mimetypes/krita_kra.png +share/icons/crystalsvg/64x64/mimetypes/kspread_ksp.png +share/icons/crystalsvg/64x64/mimetypes/kugar_kud.png +share/icons/crystalsvg/64x64/mimetypes/kword_kwd.png +share/icons/crystalsvg/64x64/mimetypes/log.png share/icons/crystalsvg/64x64/mimetypes/make.png share/icons/crystalsvg/64x64/mimetypes/man.png share/icons/crystalsvg/64x64/mimetypes/message.png share/icons/crystalsvg/64x64/mimetypes/metafont.png share/icons/crystalsvg/64x64/mimetypes/midi.png -share/icons/crystalsvg/64x64/mimetypes/mime.png -share/icons/crystalsvg/64x64/mimetypes/misc_doc.png +share/icons/crystalsvg/64x64/mimetypes/misc.png +share/icons/crystalsvg/64x64/mimetypes/mozilla_doc.png share/icons/crystalsvg/64x64/mimetypes/netscape_doc.png share/icons/crystalsvg/64x64/mimetypes/pdf.png +share/icons/crystalsvg/64x64/mimetypes/pk.png share/icons/crystalsvg/64x64/mimetypes/postscript.png +share/icons/crystalsvg/64x64/mimetypes/quicktime.png +share/icons/crystalsvg/64x64/mimetypes/readme.png share/icons/crystalsvg/64x64/mimetypes/real_doc.png share/icons/crystalsvg/64x64/mimetypes/recycled.png share/icons/crystalsvg/64x64/mimetypes/resource.png @@ -3906,42 +4082,41 @@ share/icons/crystalsvg/64x64/mimetypes/source_c.png share/icons/crystalsvg/64x64/mimetypes/source_cpp.png share/icons/crystalsvg/64x64/mimetypes/source_f.png share/icons/crystalsvg/64x64/mimetypes/source_h.png +share/icons/crystalsvg/64x64/mimetypes/source_j.png share/icons/crystalsvg/64x64/mimetypes/source_java.png share/icons/crystalsvg/64x64/mimetypes/source_l.png share/icons/crystalsvg/64x64/mimetypes/source_moc.png share/icons/crystalsvg/64x64/mimetypes/source_o.png share/icons/crystalsvg/64x64/mimetypes/source_p.png +share/icons/crystalsvg/64x64/mimetypes/source_php.png +share/icons/crystalsvg/64x64/mimetypes/source_pl.png share/icons/crystalsvg/64x64/mimetypes/source_py.png share/icons/crystalsvg/64x64/mimetypes/source_s.png share/icons/crystalsvg/64x64/mimetypes/source_y.png share/icons/crystalsvg/64x64/mimetypes/spreadsheet.png share/icons/crystalsvg/64x64/mimetypes/tar.png share/icons/crystalsvg/64x64/mimetypes/template_source.png +share/icons/crystalsvg/64x64/mimetypes/tex.png share/icons/crystalsvg/64x64/mimetypes/tgz.png share/icons/crystalsvg/64x64/mimetypes/txt.png share/icons/crystalsvg/64x64/mimetypes/txt2.png share/icons/crystalsvg/64x64/mimetypes/unknown.png +share/icons/crystalsvg/64x64/mimetypes/vcalendar.png +share/icons/crystalsvg/64x64/mimetypes/vcard.png +share/icons/crystalsvg/64x64/mimetypes/vectorgfx.png share/icons/crystalsvg/64x64/mimetypes/video.png share/icons/crystalsvg/64x64/mimetypes/widget_doc.png share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png +share/icons/crystalsvg/64x64/mimetypes/zip.png share/icons/crystalsvg/index.theme -share/icons/crystalsvg/scalable/apps/kate.svgz -share/icons/crystalsvg/scalable/apps/khelpcenter.svgz -share/icons/crystalsvg/scalable/apps/klipper.svgz -share/icons/crystalsvg/scalable/apps/kmail.svgz -share/icons/crystalsvg/scalable/apps/konqueror.svgz -share/icons/crystalsvg/scalable/apps/konsole.svgz -share/icons/crystalsvg/scalable/apps/kwrite.svgz -share/icons/crystalsvg/scalable/apps/openoffice.svgz -share/icons/crystalsvg/scalable/apps/shell.svgz -share/icons/crystalsvg/scalable/apps/staroffice.svgz -share/icons/crystalsvg/scalable/apps/wine.svgz +share/icons/crystalsvg/scalable/actions/about_kde.svgz share/icons/crystalsvg/scalable/devices/3floppy_mount.svgz share/icons/crystalsvg/scalable/devices/3floppy_umount.svgz share/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz share/icons/crystalsvg/scalable/devices/5floppy_mount.svgz share/icons/crystalsvg/scalable/devices/5floppy_umount.svgz share/icons/crystalsvg/scalable/devices/5floppy_unmount.svgz +share/icons/crystalsvg/scalable/devices/blockdevice.svgz share/icons/crystalsvg/scalable/devices/camera_mount.svgz share/icons/crystalsvg/scalable/devices/camera_umount.svgz share/icons/crystalsvg/scalable/devices/camera_unmount.svgz @@ -3954,6 +4129,7 @@ share/icons/crystalsvg/scalable/devices/cdrom_unmount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_mount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_umount.svgz share/icons/crystalsvg/scalable/devices/cdwriter_unmount.svgz +share/icons/crystalsvg/scalable/devices/chardevice.svgz share/icons/crystalsvg/scalable/devices/dvd_mount.svgz share/icons/crystalsvg/scalable/devices/dvd_umount.svgz share/icons/crystalsvg/scalable/devices/dvd_unmount.svgz @@ -3976,11 +4152,11 @@ share/icons/crystalsvg/scalable/devices/printer2.svgz share/icons/crystalsvg/scalable/devices/scanner.svgz share/icons/crystalsvg/scalable/devices/tablet.svgz share/icons/crystalsvg/scalable/devices/tv.svgz +share/icons/crystalsvg/scalable/devices/usbpendrive_mount.svgz +share/icons/crystalsvg/scalable/devices/usbpendrive_unmount.svgz share/icons/crystalsvg/scalable/devices/zip_mount.svgz share/icons/crystalsvg/scalable/devices/zip_umount.svgz share/icons/crystalsvg/scalable/devices/zip_unmount.svgz -share/icons/crystalsvg/scalable/filesystems/blockdevice.svgz -share/icons/crystalsvg/scalable/filesystems/chardevice.svgz share/icons/crystalsvg/scalable/filesystems/desktop.svgz share/icons/crystalsvg/scalable/filesystems/exec.svgz share/icons/crystalsvg/scalable/filesystems/exec_wine.svgz @@ -4001,6 +4177,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_image.svgz share/icons/crystalsvg/scalable/filesystems/folder_important.svgz share/icons/crystalsvg/scalable/filesystems/folder_locked.svgz share/icons/crystalsvg/scalable/filesystems/folder_man.svgz +share/icons/crystalsvg/scalable/filesystems/folder_man2.svgz share/icons/crystalsvg/scalable/filesystems/folder_open.svgz share/icons/crystalsvg/scalable/filesystems/folder_orange.svgz share/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz @@ -4027,31 +4204,52 @@ share/icons/crystalsvg/scalable/filesystems/zip.svgz share/icons/crystalsvg/scalable/mimetypes/applix.svgz share/icons/crystalsvg/scalable/mimetypes/ascii.svgz share/icons/crystalsvg/scalable/mimetypes/binary.svgz +share/icons/crystalsvg/scalable/mimetypes/cdimage.svgz share/icons/crystalsvg/scalable/mimetypes/cdr.svgz +share/icons/crystalsvg/scalable/mimetypes/cdtrack.svgz +share/icons/crystalsvg/scalable/mimetypes/colorscm.svgz share/icons/crystalsvg/scalable/mimetypes/core.svgz share/icons/crystalsvg/scalable/mimetypes/deb.svgz share/icons/crystalsvg/scalable/mimetypes/document.svgz share/icons/crystalsvg/scalable/mimetypes/document2.svgz share/icons/crystalsvg/scalable/mimetypes/dvi.svgz share/icons/crystalsvg/scalable/mimetypes/empty.svgz +share/icons/crystalsvg/scalable/mimetypes/encrypted.svgz +share/icons/crystalsvg/scalable/mimetypes/exec_wine.svgz +share/icons/crystalsvg/scalable/mimetypes/file_locked.svgz +share/icons/crystalsvg/scalable/mimetypes/file_temporary.svgz share/icons/crystalsvg/scalable/mimetypes/font.svgz share/icons/crystalsvg/scalable/mimetypes/font_bitmap.svgz +share/icons/crystalsvg/scalable/mimetypes/font_truetype.svgz +share/icons/crystalsvg/scalable/mimetypes/font_type1.svgz share/icons/crystalsvg/scalable/mimetypes/gf.svgz +share/icons/crystalsvg/scalable/mimetypes/html.svgz share/icons/crystalsvg/scalable/mimetypes/image.svgz +share/icons/crystalsvg/scalable/mimetypes/image2.svgz +share/icons/crystalsvg/scalable/mimetypes/karbon_karbon.svgz +share/icons/crystalsvg/scalable/mimetypes/kexi_kexi.svgz share/icons/crystalsvg/scalable/mimetypes/kmultiple.svgz +share/icons/crystalsvg/scalable/mimetypes/koffice.svgz share/icons/crystalsvg/scalable/mimetypes/kugardata.svgz share/icons/crystalsvg/scalable/mimetypes/log.svgz share/icons/crystalsvg/scalable/mimetypes/make.svgz +share/icons/crystalsvg/scalable/mimetypes/man.svgz share/icons/crystalsvg/scalable/mimetypes/message.svgz share/icons/crystalsvg/scalable/mimetypes/metafont.svgz -share/icons/crystalsvg/scalable/mimetypes/mime_ascii.svgz -share/icons/crystalsvg/scalable/mimetypes/mime_empty.svgz share/icons/crystalsvg/scalable/mimetypes/mozilla_doc.svgz +share/icons/crystalsvg/scalable/mimetypes/netscape_doc.svgz share/icons/crystalsvg/scalable/mimetypes/pdf.svgz share/icons/crystalsvg/scalable/mimetypes/pk.svgz +share/icons/crystalsvg/scalable/mimetypes/postscript.svgz +share/icons/crystalsvg/scalable/mimetypes/quicktime.svgz +share/icons/crystalsvg/scalable/mimetypes/readme.svgz +share/icons/crystalsvg/scalable/mimetypes/real_doc.svgz +share/icons/crystalsvg/scalable/mimetypes/recycled.svgz share/icons/crystalsvg/scalable/mimetypes/resource.svgz share/icons/crystalsvg/scalable/mimetypes/rpm.svgz +share/icons/crystalsvg/scalable/mimetypes/shellscript.svgz share/icons/crystalsvg/scalable/mimetypes/soffice.svgz +share/icons/crystalsvg/scalable/mimetypes/sound.svgz share/icons/crystalsvg/scalable/mimetypes/source.svgz share/icons/crystalsvg/scalable/mimetypes/source_c.svgz share/icons/crystalsvg/scalable/mimetypes/source_cpp.svgz @@ -4063,6 +4261,7 @@ share/icons/crystalsvg/scalable/mimetypes/source_l.svgz share/icons/crystalsvg/scalable/mimetypes/source_moc.svgz share/icons/crystalsvg/scalable/mimetypes/source_o.svgz share/icons/crystalsvg/scalable/mimetypes/source_p.svgz +share/icons/crystalsvg/scalable/mimetypes/source_php.svgz share/icons/crystalsvg/scalable/mimetypes/source_pl.svgz share/icons/crystalsvg/scalable/mimetypes/source_py.svgz share/icons/crystalsvg/scalable/mimetypes/source_s.svgz @@ -4104,19 +4303,28 @@ share/mimelnk/application/pkcs7-signature.desktop share/mimelnk/application/postscript.desktop share/mimelnk/application/sieve.desktop share/mimelnk/application/smil.desktop -share/mimelnk/application/starcalc.desktop -share/mimelnk/application/starimpress.desktop -share/mimelnk/application/starwriter.desktop share/mimelnk/application/vnd.mozilla.xul+xml.desktop share/mimelnk/application/vnd.ms-asf.desktop share/mimelnk/application/vnd.ms-excel.desktop share/mimelnk/application/vnd.ms-word.desktop share/mimelnk/application/vnd.palm.desktop share/mimelnk/application/vnd.rn-realmedia.desktop +share/mimelnk/application/vnd.stardivision.calc.desktop +share/mimelnk/application/vnd.stardivision.chart.desktop +share/mimelnk/application/vnd.stardivision.draw.desktop +share/mimelnk/application/vnd.stardivision.impress.desktop +share/mimelnk/application/vnd.stardivision.math.desktop +share/mimelnk/application/vnd.stardivision.writer-global.desktop +share/mimelnk/application/vnd.stardivision.writer.desktop share/mimelnk/application/vnd.sun.xml.calc.desktop +share/mimelnk/application/vnd.sun.xml.calc.template.desktop share/mimelnk/application/vnd.sun.xml.draw.desktop +share/mimelnk/application/vnd.sun.xml.draw.template.desktop share/mimelnk/application/vnd.sun.xml.impress.desktop +share/mimelnk/application/vnd.sun.xml.impress.template.desktop share/mimelnk/application/vnd.sun.xml.writer.desktop +share/mimelnk/application/vnd.sun.xml.writer.master.desktop +share/mimelnk/application/vnd.sun.xml.writer.template.desktop share/mimelnk/application/wordperfect.desktop share/mimelnk/application/x-abiword.desktop share/mimelnk/application/x-ace.desktop @@ -4144,6 +4352,7 @@ share/mimelnk/application/x-deb.desktop share/mimelnk/application/x-designer.desktop share/mimelnk/application/x-desktop.desktop share/mimelnk/application/x-dvi.desktop +share/mimelnk/application/x-executable-script.desktop share/mimelnk/application/x-executable.desktop share/mimelnk/application/x-font-bdf.desktop share/mimelnk/application/x-font-ghostscript.desktop @@ -4161,6 +4370,7 @@ share/mimelnk/application/x-gzdvi.desktop share/mimelnk/application/x-gzip.desktop share/mimelnk/application/x-gzpostscript.desktop share/mimelnk/application/x-hancomword.desktop +share/mimelnk/application/x-ica.desktop share/mimelnk/application/x-iso.desktop share/mimelnk/application/x-jar.desktop share/mimelnk/application/x-java-applet.desktop @@ -4186,11 +4396,13 @@ share/mimelnk/application/x-lzop.desktop share/mimelnk/application/x-magicpoint.desktop share/mimelnk/application/x-msaccess.desktop share/mimelnk/application/x-msdos-program.desktop +share/mimelnk/application/x-msmetafile.desktop share/mimelnk/application/x-mswrite.desktop share/mimelnk/application/x-object.desktop share/mimelnk/application/x-ogg.desktop share/mimelnk/application/x-ooimpress.desktop share/mimelnk/application/x-oowriter.desktop +share/mimelnk/application/x-pak.desktop share/mimelnk/application/x-perl-module.desktop share/mimelnk/application/x-perl.desktop share/mimelnk/application/x-php.desktop @@ -4227,6 +4439,9 @@ share/mimelnk/audio/aac.desktop share/mimelnk/audio/ac3.desktop share/mimelnk/audio/basic.desktop share/mimelnk/audio/mp4.desktop +share/mimelnk/audio/mpeg.desktop +share/mimelnk/audio/mpegurl.desktop +share/mimelnk/audio/prs.sid.desktop share/mimelnk/audio/vnd.rn-realaudio.desktop share/mimelnk/audio/vorbis.desktop share/mimelnk/audio/x-adpcm.desktop @@ -4235,8 +4450,11 @@ share/mimelnk/audio/x-flac.desktop share/mimelnk/audio/x-matroska.desktop share/mimelnk/audio/x-midi.desktop share/mimelnk/audio/x-mod.desktop +share/mimelnk/audio/x-mp2.desktop share/mimelnk/audio/x-mp3.desktop share/mimelnk/audio/x-mpegurl.desktop +share/mimelnk/audio/x-ms-wma.desktop +share/mimelnk/audio/x-musepack.desktop share/mimelnk/audio/x-oggflac.desktop share/mimelnk/audio/x-pn-realaudio.desktop share/mimelnk/audio/x-scpls.desktop @@ -4254,7 +4472,9 @@ share/mimelnk/image/svg+xml.desktop share/mimelnk/image/tiff.desktop share/mimelnk/image/wmf.desktop share/mimelnk/image/x-bmp.desktop +share/mimelnk/image/x-dds.desktop share/mimelnk/image/x-eps.desktop +share/mimelnk/image/x-exr.desktop share/mimelnk/image/x-ico.desktop share/mimelnk/image/x-jng.desktop share/mimelnk/image/x-msod.desktop @@ -4263,6 +4483,7 @@ share/mimelnk/image/x-photo-cd.desktop share/mimelnk/image/x-portable-bitmap.desktop share/mimelnk/image/x-portable-greymap.desktop share/mimelnk/image/x-portable-pixmap.desktop +share/mimelnk/image/x-rgb.desktop share/mimelnk/image/x-targa.desktop share/mimelnk/image/x-vnd.adobe.photoshop.desktop share/mimelnk/image/x-vnd.trolltech.qpicture.desktop @@ -4303,6 +4524,7 @@ share/mimelnk/text/x-chdr.desktop share/mimelnk/text/x-csrc.desktop share/mimelnk/text/x-csv.desktop share/mimelnk/text/x-diff.desktop +share/mimelnk/text/x-hex.desktop share/mimelnk/text/x-java.desktop share/mimelnk/text/x-katefilelist.desktop share/mimelnk/text/x-latex.desktop @@ -4323,6 +4545,7 @@ share/mimelnk/text/x-vcard.desktop share/mimelnk/text/x-xslfo.desktop share/mimelnk/text/x-xslt.desktop share/mimelnk/text/xml.desktop +share/mimelnk/video/avi.desktop share/mimelnk/video/mp4.desktop share/mimelnk/video/mpeg.desktop share/mimelnk/video/quicktime.desktop @@ -4335,9 +4558,13 @@ share/mimelnk/video/x-ms-wmv.desktop share/mimelnk/video/x-msvideo.desktop share/mimelnk/video/x-ogm.desktop share/mimelnk/video/x-theora.desktop +share/nls/POSIX +share/nls/en_US.US-ASCII share/services/bmp.kimgio share/services/data.protocol +share/services/dds.kimgio share/services/eps.kimgio +share/services/exr.kimgio share/services/file.protocol share/services/ftp.protocol share/services/ghelp.protocol @@ -4354,6 +4581,7 @@ share/services/kbzip2filter.desktop share/services/kcertpart.desktop share/services/kded/kcookiejar.desktop share/services/kded/kdeprintd.desktop +share/services/kded/kdetrayproxy.desktop share/services/kded/kpasswdserver.desktop share/services/kded/kssld.desktop share/services/kded/kwalletd.desktop @@ -4370,6 +4598,9 @@ share/services/kresources/kabc/dir.desktop share/services/kresources/kabc/file.desktop share/services/kresources/kabc/ldapkio.desktop share/services/kresources/kabc/net.desktop +share/services/kspell_ispell.desktop +share/services/ktexteditor_autobookmarker.desktop +share/services/ktexteditor_docwordcompletion.desktop share/services/ktexteditor_insertfile.desktop share/services/ktexteditor_isearch.desktop share/services/ktexteditor_kdatatool.desktop @@ -4380,6 +4611,7 @@ share/services/pcx.kimgio share/services/pgm.kimgio share/services/png.kimgio share/services/ppm.kimgio +share/services/rgb.kimgio share/services/rlogin.protocol share/services/rtsp.protocol share/services/shellscript.desktop @@ -4394,6 +4626,7 @@ share/services/xpm.kimgio share/services/xv.kimgio share/servicetypes/application.desktop share/servicetypes/browserview.desktop +share/servicetypes/dcopinstantmessenger.desktop share/servicetypes/kbytesedit.desktop share/servicetypes/kcmodule.desktop share/servicetypes/kcomprfilter.desktop @@ -4410,6 +4643,7 @@ share/servicetypes/kresources_plugin.desktop share/servicetypes/krop.desktop share/servicetypes/krwp.desktop share/servicetypes/kscan.desktop +share/servicetypes/kspellclient.desktop share/servicetypes/ktexteditor.desktop share/servicetypes/ktexteditoreditor.desktop share/servicetypes/ktexteditorplugin.desktop @@ -4436,6 +4670,8 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html @@ -4470,6 +4706,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4488,6 +4725,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4506,6 +4744,7 @@ share/servicetypes/scriptinterface.desktop @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html @@ -4536,37 +4775,43 @@ share/servicetypes/scriptinterface.desktop @dirrm share/icons/crystalsvg/scalable/mimetypes @dirrm share/icons/crystalsvg/scalable/filesystems @dirrm share/icons/crystalsvg/scalable/devices -@dirrm share/icons/crystalsvg/scalable/apps +@dirrm share/icons/crystalsvg/scalable/actions @dirrm share/icons/crystalsvg/scalable @dirrm share/icons/crystalsvg/64x64/mimetypes @dirrm share/icons/crystalsvg/64x64/filesystems @dirrm share/icons/crystalsvg/64x64/devices +@dirrm share/icons/crystalsvg/64x64/apps @dirrm share/icons/crystalsvg/64x64/actions @dirrm share/icons/crystalsvg/64x64 @dirrm share/icons/crystalsvg/48x48/mimetypes @dirrm share/icons/crystalsvg/48x48/filesystems @dirrm share/icons/crystalsvg/48x48/devices +@dirrm share/icons/crystalsvg/48x48/apps @dirrm share/icons/crystalsvg/48x48/actions @dirrm share/icons/crystalsvg/48x48 @dirrm share/icons/crystalsvg/32x32/mimetypes @dirrm share/icons/crystalsvg/32x32/filesystems @dirrm share/icons/crystalsvg/32x32/devices +@dirrm share/icons/crystalsvg/32x32/apps @dirrm share/icons/crystalsvg/32x32/actions/kde @dirrm share/icons/crystalsvg/32x32/actions @dirrm share/icons/crystalsvg/32x32 @dirrm share/icons/crystalsvg/22x22/mimetypes @dirrm share/icons/crystalsvg/22x22/filesystems +@dirrm share/icons/crystalsvg/22x22/devices @dirrm share/icons/crystalsvg/22x22/actions/kde @dirrm share/icons/crystalsvg/22x22/actions @dirrm share/icons/crystalsvg/22x22 @dirrm share/icons/crystalsvg/16x16/mimetypes @dirrm share/icons/crystalsvg/16x16/filesystems @dirrm share/icons/crystalsvg/16x16/devices +@dirrm share/icons/crystalsvg/16x16/apps @dirrm share/icons/crystalsvg/16x16/actions @dirrm share/icons/crystalsvg/16x16 @dirrm share/icons/crystalsvg/128x128/mimetypes @dirrm share/icons/crystalsvg/128x128/filesystems @dirrm share/icons/crystalsvg/128x128/devices +@dirrm share/icons/crystalsvg/128x128/apps @dirrm share/icons/crystalsvg/128x128 @dirrm share/icons/crystalsvg @dirrm share/icons @@ -4580,6 +4825,8 @@ share/servicetypes/scriptinterface.desktop @dirrm share/doc/HTML/en/kdelibs-apidocs/kresources @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts/html @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts +@dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff/html +@dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi @dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html @@ -4618,6 +4865,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/ktexteditor_kdatatool @dirrm share/apps/ktexteditor_isearch @dirrm share/apps/ktexteditor_insertfile +@dirrm share/apps/ktexteditor_docwordcompletion @dirrm share/apps/kstyle/themes @dirrm share/apps/kstyle/pixmaps/riscos @dirrm share/apps/kstyle/pixmaps @@ -4723,6 +4971,7 @@ share/servicetypes/scriptinterface.desktop @dirrm share/apps/ksgmltools2/customization @dirrm share/apps/ksgmltools2 @dirrm share/apps/knotify +@dirrm share/apps/knewstuff @dirrm share/apps/kjava @dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16/apps @dirrm share/apps/kio_uiserver/icons/crystalsvg/16x16 @@ -4787,9 +5036,11 @@ share/servicetypes/scriptinterface.desktop @dirrm lib/kde3 @dirrm include/libkmid @dirrm include/ktexteditor +@dirrm include/kspell2 @dirrm include/ksettings @dirrm include/kresources @dirrm include/kparts +@dirrm include/knewstuff @dirrm include/kmediaplayer @dirrm include/kjs @dirrm include/kio diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index 752ca9e66319..01b4703629eb 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -9,7 +9,7 @@ PORTNAME= xscreensaver-kde PORTVERSION= ${KDE_VERSION} CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src PKGNAMEPREFIX= kdeartwork- DISTNAME= kdeartwork-${PORTVERSION} DIST_SUBDIR= KDE diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index 1fc4378247d3..891a7c856eb4 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,2 +1,2 @@ -MD5 (KDE/kdeartwork-3.2.3.tar.bz2) = 86bc54962ffee206fda15acfd228d52c -SIZE (KDE/kdeartwork-3.2.3.tar.bz2) = 17165998 +MD5 (KDE/kdeartwork-3.3.0.tar.bz2) = 6e8ea5c980a770708ab639c49a8d5e0f +SIZE (KDE/kdeartwork-3.3.0.tar.bz2) = 17811533 diff --git a/x11/xscreensaver-kde/pkg-plist b/x11/xscreensaver-kde/pkg-plist index 344a5c6f1dbc..5856077b58d9 100644 --- a/x11/xscreensaver-kde/pkg-plist +++ b/x11/xscreensaver-kde/pkg-plist @@ -2,13 +2,16 @@ bin/kxsconfig bin/kxsrun share/applnk/System/ScreenSavers/anemone.desktop share/applnk/System/ScreenSavers/ant.desktop +share/applnk/System/ScreenSavers/antinspect.desktop share/applnk/System/ScreenSavers/antspotlight.desktop share/applnk/System/ScreenSavers/apollonian.desktop +share/applnk/System/ScreenSavers/apple2.desktop share/applnk/System/ScreenSavers/atlantis.desktop share/applnk/System/ScreenSavers/attraction.desktop share/applnk/System/ScreenSavers/atunnel.desktop share/applnk/System/ScreenSavers/barcode.desktop share/applnk/System/ScreenSavers/blaster.desktop +share/applnk/System/ScreenSavers/blinkbox.desktop share/applnk/System/ScreenSavers/blitspin.desktop share/applnk/System/ScreenSavers/blocktube.desktop share/applnk/System/ScreenSavers/bouboule.desktop @@ -53,11 +56,14 @@ share/applnk/System/ScreenSavers/flow.desktop share/applnk/System/ScreenSavers/fluidballs.desktop share/applnk/System/ScreenSavers/flurry.desktop share/applnk/System/ScreenSavers/flyingtoasters.desktop +share/applnk/System/ScreenSavers/fontglide.desktop share/applnk/System/ScreenSavers/forest.desktop +share/applnk/System/ScreenSavers/fuzzyflakes.desktop share/applnk/System/ScreenSavers/galaxy.desktop share/applnk/System/ScreenSavers/gears.desktop share/applnk/System/ScreenSavers/gflux.desktop share/applnk/System/ScreenSavers/glblur.desktop +share/applnk/System/ScreenSavers/gleidescope.desktop share/applnk/System/ScreenSavers/glforestfire.desktop share/applnk/System/ScreenSavers/glknots.desktop share/applnk/System/ScreenSavers/glmatrix.desktop @@ -96,6 +102,8 @@ share/applnk/System/ScreenSavers/loop.desktop share/applnk/System/ScreenSavers/maze.desktop share/applnk/System/ScreenSavers/menger.desktop share/applnk/System/ScreenSavers/metaballs.desktop +share/applnk/System/ScreenSavers/mirrorblob.desktop +share/applnk/System/ScreenSavers/mismunch.desktop share/applnk/System/ScreenSavers/moebius.desktop share/applnk/System/ScreenSavers/moire.desktop share/applnk/System/ScreenSavers/moire2.desktop @@ -104,7 +112,9 @@ share/applnk/System/ScreenSavers/morph3d.desktop share/applnk/System/ScreenSavers/mountain.desktop share/applnk/System/ScreenSavers/munch.desktop share/applnk/System/ScreenSavers/nerverot.desktop +share/applnk/System/ScreenSavers/noof.desktop share/applnk/System/ScreenSavers/noseguy.desktop +share/applnk/System/ScreenSavers/pacman.desktop share/applnk/System/ScreenSavers/pedal.desktop share/applnk/System/ScreenSavers/penetrate.desktop share/applnk/System/ScreenSavers/penrose.desktop @@ -112,10 +122,12 @@ share/applnk/System/ScreenSavers/petri.desktop share/applnk/System/ScreenSavers/phosphor.desktop share/applnk/System/ScreenSavers/piecewise.desktop share/applnk/System/ScreenSavers/pipes.desktop -share/applnk/System/ScreenSavers/pixmaps.desktop +share/applnk/System/ScreenSavers/polyhedra.desktop share/applnk/System/ScreenSavers/polyominoes.desktop share/applnk/System/ScreenSavers/polytopes.desktop +share/applnk/System/ScreenSavers/pong.desktop share/applnk/System/ScreenSavers/popsquares.desktop +share/applnk/System/ScreenSavers/providence.desktop share/applnk/System/ScreenSavers/pulsar.desktop share/applnk/System/ScreenSavers/pyro.desktop share/applnk/System/ScreenSavers/qix.desktop @@ -161,6 +173,8 @@ share/applnk/System/ScreenSavers/webcollage.desktop share/applnk/System/ScreenSavers/whirlwindwarp.desktop share/applnk/System/ScreenSavers/whirlygig.desktop share/applnk/System/ScreenSavers/worm.desktop +share/applnk/System/ScreenSavers/wormhole.desktop +share/applnk/System/ScreenSavers/xanalogtv.desktop share/applnk/System/ScreenSavers/xflame.desktop share/applnk/System/ScreenSavers/xjack.desktop share/applnk/System/ScreenSavers/xlyap.desktop @@ -170,33 +184,6 @@ share/applnk/System/ScreenSavers/xspirograph.desktop share/applnk/System/ScreenSavers/xsublim.desktop share/applnk/System/ScreenSavers/xteevee.desktop share/applnk/System/ScreenSavers/zoom.desktop -share/config/antrc -share/config/attractionrc -share/config/bouboulerc -share/config/bubblesrc -share/config/coralrc -share/config/crystalrc -share/config/decayscreenrc -share/config/deluxerc -share/config/demonrc -share/config/driftrc -share/config/epicyclerc -share/config/fadeplotrc -share/config/flamerc -share/config/flowrc -share/config/forestrc -share/config/gearsrc -share/config/gooprc -share/config/gravrc -share/config/halorc -share/config/imsmaprc -share/config/interferencerc -share/config/kumpparc -share/config/laserrc -share/config/lissierc -share/config/penroserc -share/config/rocksrc -share/config/sliprc @dirrm share/applnk/System/ScreenSavers @dirrm share/applnk/System @dirrm share/applnk |