diff options
| author | markd <markd> | 2004-02-04 13:58:39 +0000 |
|---|---|---|
| committer | markd <markd> | 2004-02-04 13:58:39 +0000 |
| commit | 6062fc1b44027dc9e6264b10705601c42d139921 (patch) | |
| tree | a5aae8de758fe2e8272752f25d086d84806c489b /x11 | |
| parent | 13cc6cab1feee7c8980f269353bda85b8738ccb5 (diff) | |
| download | pkgsrc-6062fc1b44027dc9e6264b10705601c42d139921.tar.gz | |
Update to KDE-3.2.0.
Changes:
Libraries
* Hidden methods in DCOP interfaces - DCOPIDLng Alexander Kellett
* Documentation parsing (kdoc based) and inclusion in generated .dcopidl files
(note: kdebindings dcopidlng only) Alexander Kellett
* Kalyptus based rewrite of DCOPIDL - DCOPIDLng Alexander Kellett
* Thumbnail generator for DVI files. Stefan Kebekus
* Thumbnail generator for Xcursor files. Fredrik Hoeglund
* KMainWindow can now maintain the statusbar and corresponding action (duplicate
(99% of the time broken) code removed from countless applications in KDE).
Benjamin Meyer
* KMainWindow, KToolbar, and several other core classes now will only stores
settings if those settings are not the default values (helping to reduce the
huge size of config files). Benjamin Meyer
* Add support for International Domain Names (IDN). Thiago Macieira, Waldo
Bastian
* KDE Password Registry and Wallet. George Staikos
* SSL session ID reuse. George Staikos
* KCookiejar: Support HttpOnly cookies. Waldo Bastian
* KLocale: support for different calendar systems Hans Petter Bieker
* KCalendarSystem: support for Hebrew calendar system Hans Petter Bieker
* Support data urls. See rfc 2397. Leo Savernik
* New tab widget classes KTabBar and KTabWidget in kdeui Stephan Binner
* New KFile permissions panel Tim Jansen
* Support for mimetype inheritance and aliases David Faure
* KDialogBase: Replace setButtonOkText() & co. with setButtonOk() that takes a
KGuiItem instead (deprecating the old methods) Martijn Klingens
* Move KPrefs from libkdepim to kdelibs. Cornelius Schumacher
* Support for "extra fields" in KIO slaves and in Konqueror / KFileDialog
David Faure <faure@kde.org>
* Add KSplashScreen, a splash screen class based on QSplashScreen (with support
for KDE's Xinerama options) Chris Howells
* KPasteTextAction: enhanced action for pasting text by offering a list with
the clipboard history. Andras Mantia
KHTML
* Non-modal find dialog David Faure
KDEfx
* Added KCPUInfo class which makes it possible for applications to do runtime
checks for architecture specific CPU features, such MMX, 3DNow! and AltiVec.
Fredrik Hoeglund
* Added MMX and SSE2 optimizations to the blending functions in KImageEffect,
that among other things are used to blend the translucent menus when the menu
effect is set to software blend, and to tint icons when they're selected in
icon views. Fredrik Hoeglund
Kate Part
* File type specific settings Christoph Cullmann
* vi style cmd line Christoph Cullmann
* Support variable lines in files Anders Lund
* Color Schemes Christoph Cullmann
* Indentation based code folding Christoph Cullmann
* Implement more DCOP interfaces and clean up the ktexteditor dcop interfaces
Christoph Cullmann
KImgIO
* Add PCX image plugin, supports reading and writing 1, 4, 8 and 24bpp images
Nadeem Hasan
* Add TGA image plugin, supports reading and writing true color TGA images
(compressed and uncompressed) Dominik Seichter
Interfaces
* Interfaces for KBytesEdit widget part Friedrich W. H. Kossebau
KSpell
* Adding ability to spell check HTML, TeX and nroff documents. Zack Rusin
* Completely reworking the spell checking dialog. Adding language selection
combo. Zack Rusin
Diffstat (limited to 'x11')
38 files changed, 933 insertions, 3348 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 812a03562dd..f3649840dba 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,21 +1,23 @@ -# $NetBSD: Makefile,v 1.49 2004/02/02 13:02:50 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2004/02/04 13:58:39 markd Exp $ -DISTNAME= kdelibs-3.1.5 -PKGREVISION= 1 +DISTNAME= kdelibs-3.2.0 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop .include "../../meta-pkgs/kde3/Makefile.kde3" CONFLICTS+= koffice3<=1.1.1 +DEPENDS+= xdg-dirs>=1.0:../../misc/xdg-dirs USE_BUILDLINK2= YES USE_LANGUAGES= c c++ +USE_PKGINSTALL= YES CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" SGML_CATALOGS= ${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat +SGML_CATALOGS+= ${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat .include "../../mk/bsd.prefs.mk" @@ -33,23 +35,17 @@ REPLACE_PERL= \ PLIST_SRC= ${WRKDIR}/PLIST UNLIMIT_RESOURCES= datasize memorysize -FOO_MAIN_FILES= \ - arts/knotify/knotify_main.cpp \ - dcop/dcopserver_main.cpp \ - kconf_update/kconf_update_main.cpp \ - kded/kbuildsycoca_main.cpp \ - kded/kded_main.cpp \ - kdeprint/management/kaddprinterwizard_main.cpp \ - kio/misc/kio_uiserver_main.cpp \ - kioslave/http/http_cache_cleaner_main.cpp \ - kioslave/http/kcookiejar/kcookiejar_main.cpp - -.include "../../meta-pkgs/kde3/Makefile.foo_main" - FIXUP_FILES= \ - kspell/ksconfig.cpp \ + kdeui/ksconfig.cpp \ kio/kssl/kopenssl.cc +# Several programs need to be setuid-root, but due to the way that KDE3 +# finds executables, the files must have their read bit set so that +# KStandardDir::findResource() will find them. +# +_KDE_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4755 +SPECIAL_PERMS+= ${PREFIX}/bin/kgrantpty ${_KDE_SETUID_ROOT} + pre-configure: @for i in ${FIXUP_FILES}; do \ ${SED} -e 's:@LOCALBASE@:${LOCALBASE}:g' \ @@ -79,8 +75,8 @@ PLIST_SUBST+= KDED_WORKAROUND="" # We will create the complete icon directory tree for use by other KDE3 # packages at post-install time. # -ICONCOLORS= hicolor locolor -ICONSIZES= 16x16 22x22 32x32 48x48 64x64 +ICONCOLORS= crystalsvg hicolor locolor +ICONSIZES= 16x16 22x22 32x32 48x48 64x64 128x128 ICONDIRS= actions/kde actions apps devices filesystems mimetypes post-install: diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST index 6965daa05e7..70580c90d4b 100644 --- a/x11/kdelibs3/PLIST +++ b/x11/kdelibs3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2004/01/15 09:52:51 markd Exp $ +@comment $NetBSD: PLIST,v 1.13 2004/02/04 13:58:39 markd Exp $ bin/artsmessage bin/checkXML ${CUPS}bin/cupsdconf @@ -8,7 +8,9 @@ bin/dcopclient bin/dcopfind bin/dcopidl bin/dcopidl2cpp +bin/dcopidlng bin/dcopobject +bin/dcopquit bin/dcopref bin/dcopserver bin/dcopserver_shutdown @@ -18,9 +20,10 @@ bin/kab2kabc bin/kaddprinterwizard bin/kbuildsycoca bin/kconf_update +bin/kconfig_compiler bin/kcookiejar -bin/kdb2html bin/kde-config +bin/kde-menu bin/kded bin/kdeinit bin/kdeinit_shutdown @@ -28,31 +31,35 @@ bin/kdeinit_wrapper bin/kdesu_stub bin/kdontchangethehostname bin/kfile +bin/kfmexec +bin/kgrantpty bin/kimage_concat bin/kinstalltheme bin/kio_http_cache_cleaner bin/kio_uiserver +bin/kioexec bin/kioslave bin/klauncher bin/kmailservice -bin/knotify bin/kpac_dhcp_helper bin/ksendbugmail bin/kshell bin/ksvgtopng bin/ktelnetservice +bin/ktradertest bin/kwrapper bin/lnusertemp ${CUPS}bin/make_driver_db_cups bin/make_driver_db_lpr bin/meinproc bin/preparetips -bin/xml2man -bin/xmlizer +etc/xdg/menus/applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h include/arts/kartsfloatwatch.h include/arts/kartsserver.h +include/arts/kaudiomanagerplay.h +include/arts/kaudioplaystream.h include/arts/kaudiorecordstream.h include/arts/kplayobject.h include/arts/kplayobjectfactory.h @@ -91,6 +98,7 @@ include/dom/html_list.h include/dom/html_misc.h include/dom/html_object.h include/dom/html_table.h +include/fixx11h.h include/kabc/address.h include/kabc/addressbook.h include/kabc/addressee.h @@ -109,20 +117,28 @@ include/kabc/formatplugin.h include/kabc/geo.h include/kabc/key.h include/kabc/ldapclient.h +include/kabc/ldifconverter.h +include/kabc/lock.h +include/kabc/locknull.h include/kabc/phonenumber.h include/kabc/picture.h include/kabc/plugin.h include/kabc/resource.h -include/kabc/resourceconfigwidget.h +include/kabc/resourcedir.h include/kabc/resourcefile.h +include/kabc/resourceldapkio.h +include/kabc/resourcenet.h include/kabc/resourceselectdialog.h include/kabc/secrecy.h include/kabc/sound.h include/kabc/stdaddressbook.h include/kabc/timezone.h +include/kabc/vcard.h include/kabc/vcardconverter.h include/kabc/vcardformat.h include/kabc/vcardformatplugin.h +include/kabc/vcardline.h +include/kabc/vcardparser.h include/kaboutapplication.h include/kaboutdata.h include/kaboutdialog.h @@ -131,6 +147,8 @@ include/kaccel.h include/kaccelgen.h include/kaccelmanager.h include/kaction.h +include/kactionclasses.h +include/kactioncollection.h include/kactionshortcutlist.h include/kactivelabel.h include/kallocator.h @@ -148,15 +166,23 @@ include/kauthicon.h include/kautomount.h include/kbookmark.h include/kbookmarkbar.h +include/kbookmarkdombuilder.h include/kbookmarkdrag.h include/kbookmarkexporter.h include/kbookmarkimporter.h +include/kbookmarkimporter_crash.h +include/kbookmarkimporter_ie.h +include/kbookmarkimporter_kde1.h +include/kbookmarkimporter_ns.h +include/kbookmarkimporter_opera.h include/kbookmarkmanager.h include/kbookmarkmenu.h include/kbookmarknotifier.h include/kbufferedio.h include/kbugreport.h include/kbuttonbox.h +include/kcalendarsystem.h +include/kcalendarsystemfactory.h include/kcatalogue.h include/kcharselect.h include/kcharsets.h @@ -164,6 +190,10 @@ include/kclipboard.h include/kcmdlineargs.h include/kcmenumngr.h include/kcmodule.h +include/kcmoduleinfo.h +include/kcmoduleloader.h +include/kcmoduleproxy.h +include/kcmultidialog.h include/kcolorbtn.h include/kcolorbutton.h include/kcolorcombo.h @@ -179,6 +209,10 @@ include/kconfig.h include/kconfigbackend.h include/kconfigbase.h include/kconfigdata.h +include/kconfigdialog.h +include/kconfigdialogmanager.h +include/kconfigskeleton.h +include/kcpuinfo.h include/kcrash.h include/kcursor.h include/kcustommenueditor.h @@ -187,14 +221,17 @@ include/kdatatool.h include/kdatepicker.h include/kdatepik.h include/kdatetbl.h +include/kdatetimewidget.h include/kdatewidget.h include/kdcopactionproxy.h include/kdcoppropertyproxy.h +include/kdcopservicestarter.h include/kde.pot -include/kde_dmalloc.h +include/kde_terminal_interface.h include/kdebug.h include/kdebugclasses.h include/kdedmodule.h +include/kdemacros.h include/kdeprint/driver.h include/kdeprint/kiconselectaction.h include/kdeprint/kmjob.h @@ -234,7 +271,6 @@ include/kdirsize.h include/kdirwatch.h include/kdiskfreesp.h include/kdockwidget.h -include/kdockwidget_p.h include/kdockwindow.h include/kdrawutil.h include/kdualcolorbtn.h @@ -243,6 +279,7 @@ include/keditcl.h include/keditlistbox.h include/kedittoolbar.h include/kemailsettings.h +include/kencodingfiledialog.h include/kextendedsocket.h include/kextsock.h include/kfile.h @@ -266,6 +303,7 @@ include/kfind.h include/kfinddialog.h include/kfontcombo.h include/kfontdialog.h +include/kfontrequester.h include/kgenericfactory.h include/kgenericfactory.tcc include/kglobal.h @@ -273,6 +311,11 @@ include/kglobalaccel.h include/kglobalsettings.h include/kguiitem.h include/khelpmenu.h +include/khexedit/byteseditinterface.h +include/khexedit/charcolumninterface.h +include/khexedit/clipboardinterface.h +include/khexedit/valuecolumninterface.h +include/khexedit/zoominterface.h include/khtml_events.h include/khtml_part.h include/khtml_settings.h @@ -283,9 +326,11 @@ include/kiconeffect.h include/kiconloader.h include/kicontheme.h include/kiconview.h +include/kidna.h include/kimageeffect.h include/kimagefilepreview.h include/kimageio.h +include/kinputdialog.h include/kinstance.h include/kio/authinfo.h include/kio/chmodjob.h @@ -302,7 +347,6 @@ include/kio/jobclasses.h include/kio/kdesasl.h include/kio/kmdbase.h include/kio/kmdcodec.h -include/kio/kpac.h include/kio/metainfojob.h include/kio/netaccess.h include/kio/observer.h @@ -325,11 +369,20 @@ include/kio/uiserver.h include/kio/uiserver_stub.h include/kipc.h include/kjanuswidget.h +include/kjs/completion.h +include/kjs/function.h include/kjs/global.h +include/kjs/identifier.h include/kjs/interpreter.h +include/kjs/list.h include/kjs/lookup.h include/kjs/object.h include/kjs/operations.h +include/kjs/property_map.h +include/kjs/reference.h +include/kjs/reference_list.h +include/kjs/scope_chain.h +include/kjs/simple_number.h include/kjs/types.h include/kjs/ustring.h include/kjs/value.h @@ -344,9 +397,22 @@ include/klineeditdlg.h include/klistbox.h include/klistview.h include/klocale.h +include/kmacroexpander.h include/kmainwindow.h include/kmainwindowiface.h +include/kmanagerselection.h include/kmdcodec.h +include/kmdichildarea.h +include/kmdichildfrm.h +include/kmdichildfrmcaption.h +include/kmdichildview.h +include/kmdidefines.h +include/kmdiiterator.h +include/kmdilistiterator.h +include/kmdimainfrm.h +include/kmdinulliterator.h +include/kmditaskbar.h +include/kmditoolviewaccessor.h include/kmediaplayer/player.h include/kmediaplayer/playerdcopobject.h include/kmediaplayer/view.h @@ -356,7 +422,9 @@ include/kmimemagic.h include/kmimesourcefactory.h include/kmimetype.h include/kmimetyperesolver.h +include/kmountpoint.h include/kmultipledrag.h +include/kmultitabbar.h include/knotifyclient.h include/knotifydialog.h include/knotifywidgetbase.h @@ -382,6 +450,7 @@ include/kparts/mainwindow.h include/kparts/part.h include/kparts/partmanager.h include/kparts/plugin.h +include/kparts/statusbarextension.h include/kpassdlg.h include/kpassivepopup.h include/kpixmap.h @@ -389,6 +458,8 @@ include/kpixmapeffect.h include/kpixmapio.h include/kpixmapprovider.h include/kpixmapsplitter.h +include/kplugininfo.h +include/kpluginselector.h include/kpopupmenu.h include/kpreviewwidgetbase.h include/kprintaction.h @@ -401,6 +472,7 @@ include/kpropertiesdialog.h include/kpropsdlg.h include/kprotocolinfo.h include/kprotocolmanager.h +include/kpty.h include/kpushbutton.h include/krandomsequence.h include/krecentdocument.h @@ -408,6 +480,15 @@ include/kregexp.h include/kregexpeditorinterface.h include/kreplace.h include/kreplacedialog.h +include/kresources/configdialog.h +include/kresources/configpage.h +include/kresources/configwidget.h +include/kresources/factory.h +include/kresources/manager.h +include/kresources/manageriface.h +include/kresources/managerimpl.h +include/kresources/resource.h +include/kresources/selectdialog.h include/krestrictedline.h include/krfcdate.h include/krootpixmap.h @@ -424,19 +505,26 @@ include/kseparator.h include/kservice.h include/kservicegroup.h include/kservicetype.h +include/ksettings/componentsdialog.h +include/ksettings/dialog.h +include/ksettings/dispatcher.h +include/ksettings/pluginpage.h include/ksharedpixmap.h include/ksharedptr.h +include/kshell.h include/kshellcompletion.h include/kshortcut.h include/kshortcutlist.h include/kshred.h include/ksimpleconfig.h +include/ksmimecrypto.h include/ksock.h include/ksockaddr.h include/ksocks.h include/ksortablevaluelist.h include/kspell.h include/kspelldlg.h +include/ksplashscreen.h include/ksqueezedtextlabel.h include/kssl.h include/ksslall.h @@ -454,6 +542,7 @@ include/ksslpeerinfo.h include/ksslpemcallback.h include/ksslpkcs12.h include/ksslpkcs7.h +include/ksslsession.h include/ksslsettings.h include/ksslsigners.h include/ksslutils.h @@ -470,12 +559,17 @@ include/kstdguiitem.h include/kstringhandler.h include/kstringvalidator.h include/kstyle.h +include/ksvgiconengine.h include/ksycoca.h include/ksycocaentry.h include/ksycocatype.h +include/ksyntaxhighlighter.h include/ksystemtray.h +include/ktabbar.h include/ktabctl.h +include/ktabwidget.h include/ktar.h +include/ktempdir.h include/ktempfile.h include/ktextbrowser.h include/ktextedit.h @@ -489,6 +583,7 @@ include/ktexteditor/document.h include/ktexteditor/documentinfo.h include/ktexteditor/dynwordwrapinterface.h include/ktexteditor/editinterface.h +include/ktexteditor/editinterfaceext.h include/ktexteditor/editor.h include/ktexteditor/editorchooser.h include/ktexteditor/encodinginterface.h @@ -503,11 +598,13 @@ include/ktexteditor/selectionextdcopinterface.h include/ktexteditor/selectioninterface.h include/ktexteditor/selectioninterfaceext.h include/ktexteditor/sessionconfiginterface.h +include/ktexteditor/texthintinterface.h include/ktexteditor/undointerface.h include/ktexteditor/view.h include/ktexteditor/viewcursorinterface.h include/ktexteditor/viewstatusmsginterface.h include/ktexteditor/wordwrapinterface.h +include/ktimewidget.h include/ktip.h include/ktoolbar.h include/ktoolbarbutton.h @@ -527,14 +624,17 @@ include/kurllabel.h include/kurlpixmapprovider.h include/kurlrequester.h include/kurlrequesterdlg.h +include/kuser.h include/kuserprofile.h include/kvmallocator.h +include/kwallet.h include/kwin.h include/kwindowinfo.h include/kwindowlistmenu.h include/kwinmodule.h include/kwizard.h include/kwordwrap.h +include/kxerrorhandler.h include/kxmessages.h include/kxmlgui.h include/kxmlguibuilder.h @@ -565,24 +665,32 @@ include/renamedlgplugin.h include/scriptclientinterface.h include/scriptinterface.h include/scriptmanager.h -lib/dcopserver.la -lib/dcopserver.so -lib/kaddprinterwizard.la -lib/kaddprinterwizard.so -lib/kbuildsycoca.la -lib/kbuildsycoca.so -lib/kconf_update.la -lib/kconf_update.so -lib/kcookiejar.la -lib/kcookiejar.so +lib/kde3/dcopserver.la +lib/kde3/dcopserver.so lib/kde3/kabc_dir.la lib/kde3/kabc_dir.so +lib/kde3/kabc_file.la +lib/kde3/kabc_file.so +lib/kde3/kabc_ldapkio.la +lib/kde3/kabc_ldapkio.so +lib/kde3/kabc_net.la +lib/kde3/kabc_net.so lib/kde3/kabcformat_binary.la lib/kde3/kabcformat_binary.so +lib/kde3/kaddprinterwizard.la +lib/kde3/kaddprinterwizard.so +lib/kde3/kbuildsycoca.la +lib/kde3/kbuildsycoca.so lib/kde3/kbzip2filter.la lib/kde3/kbzip2filter.so -lib/kde3/kcm_kabc.la -lib/kde3/kcm_kabc.so +lib/kde3/kcm_kresources.la +lib/kde3/kcm_kresources.so +lib/kde3/kconf_update.la +lib/kde3/kconf_update.so +lib/kde3/kcookiejar.la +lib/kde3/kcookiejar.so +${KDED_WORKAROUND}lib/kde3/kded.la +${KDED_WORKAROUND}lib/kde3/kded.so lib/kde3/kded_kcookiejar.la lib/kde3/kded_kcookiejar.so lib/kde3/kded_kdeprintd.la @@ -591,6 +699,10 @@ lib/kde3/kded_kpasswdserver.la lib/kde3/kded_kpasswdserver.so lib/kde3/kded_kssld.la lib/kde3/kded_kssld.so +lib/kde3/kded_kwalletd.la +lib/kde3/kded_kwalletd.so +lib/kde3/kded_proxyscout.la +lib/kde3/kded_proxyscout.so ${CUPS}lib/kde3/kdeprint_cups.la ${CUPS}lib/kde3/kdeprint_cups.so lib/kde3/kdeprint_ext.la @@ -603,6 +715,8 @@ lib/kde3/kdeprint_rlpr.la lib/kde3/kdeprint_rlpr.so lib/kde3/kdeprint_tool_escputil.la lib/kde3/kdeprint_tool_escputil.so +lib/kde3/kfileaudiopreview.la +lib/kde3/kfileaudiopreview.so lib/kde3/kgzipfilter.la lib/kde3/kgzipfilter.so lib/kde3/khtmlimagepart.la @@ -611,8 +725,10 @@ lib/kde3/kimg_eps.la lib/kde3/kimg_eps.so lib/kde3/kimg_ico.la lib/kde3/kimg_ico.so -lib/kde3/kimg_krl.la -lib/kde3/kimg_krl.so +lib/kde3/kimg_pcx.la +lib/kde3/kimg_pcx.so +lib/kde3/kimg_tga.la +lib/kde3/kimg_tga.so lib/kde3/kimg_tiff.la lib/kde3/kimg_tiff.so lib/kde3/kimg_xview.la @@ -621,14 +737,24 @@ lib/kde3/kio_file.la lib/kde3/kio_file.so lib/kde3/kio_ftp.la lib/kde3/kio_ftp.so +lib/kde3/kio_ghelp.la +lib/kde3/kio_ghelp.so lib/kde3/kio_help.la lib/kde3/kio_help.so lib/kde3/kio_http.la lib/kde3/kio_http.so +lib/kde3/kio_http_cache_cleaner.la +lib/kde3/kio_http_cache_cleaner.so lib/kde3/kio_metainfo.la lib/kde3/kio_metainfo.so +lib/kde3/kio_uiserver.la +lib/kde3/kio_uiserver.so lib/kde3/kjavaappletviewer.la lib/kde3/kjavaappletviewer.so +lib/kde3/klauncher.la +lib/kde3/klauncher.so +lib/kde3/knotify.la +lib/kde3/knotify.so lib/kde3/ktexteditor_insertfile.la lib/kde3/ktexteditor_insertfile.so lib/kde3/ktexteditor_isearch.la @@ -637,10 +763,12 @@ lib/kde3/ktexteditor_kdatatool.la lib/kde3/ktexteditor_kdatatool.so lib/kde3/libkatepart.la lib/kde3/libkatepart.so +lib/kde3/libkcertpart.la +lib/kde3/libkcertpart.so +lib/kde3/libkhtmlpart.la +lib/kde3/libkhtmlpart.so lib/kde3/libkmultipart.la lib/kde3/libkmultipart.so -lib/kde3/libkpac.la -lib/kde3/libkpac.so lib/kde3/plugins/designer/kdewidgets.la lib/kde3/plugins/designer/kdewidgets.so lib/kde3/plugins/styles/highcolor.la @@ -651,112 +779,111 @@ lib/kde3/plugins/styles/kthemestyle.la lib/kde3/plugins/styles/kthemestyle.so lib/kde3/plugins/styles/light.la lib/kde3/plugins/styles/light.so -${KDED_WORKAROUND}lib/kded.la -${KDED_WORKAROUND}lib/kded.so -lib/kio_http_cache_cleaner.la -lib/kio_http_cache_cleaner.so -lib/kio_uiserver.la -lib/kio_uiserver.so -lib/klauncher.la -lib/klauncher.so -lib/knotify.la -lib/knotify.so lib/libDCOP.la lib/libDCOP.so -lib/libDCOP.so.5 -lib/libDCOP.so.5.0 +lib/libDCOP.so.6 +lib/libDCOP.so.6.0 lib/libartskde.la lib/libartskde.so -lib/libartskde.so.2 -lib/libartskde.so.2.0 +lib/libartskde.so.3 +lib/libartskde.so.3.0 ${CUPS}lib/libcupsdconf.la ${CUPS}lib/libcupsdconf.so -lib/libdcopserver_main.la -lib/libdcopserver_main.so -lib/libdcopserver_main.so.0 -lib/libdcopserver_main.so.0.0 lib/libkabc.la lib/libkabc.so -lib/libkabc.so.2 -lib/libkabc.so.2.0 -lib/libkaddprinterwizard_main.la -lib/libkaddprinterwizard_main.so +lib/libkabc.so.3 +lib/libkabc.so.3.0 +lib/libkabc_dir.la +lib/libkabc_dir.so +lib/libkabc_dir.so.1 +lib/libkabc_dir.so.1.0 +lib/libkabc_file.la +lib/libkabc_file.so +lib/libkabc_file.so.1 +lib/libkabc_file.so.1.0 +lib/libkabc_ldapkio.la +lib/libkabc_ldapkio.so +lib/libkabc_ldapkio.so.1 +lib/libkabc_ldapkio.so.1.0 +lib/libkabc_net.la +lib/libkabc_net.so +lib/libkabc_net.so.1 +lib/libkabc_net.so.1.0 lib/libkatepartinterfaces.la lib/libkatepartinterfaces.so lib/libkatepartinterfaces.so.0 lib/libkatepartinterfaces.so.0.0 -lib/libkbuildsycoca_main.la -lib/libkbuildsycoca_main.so -lib/libkbuildsycoca_main.so.0 -lib/libkbuildsycoca_main.so.0.0 -lib/libkcertpart.la -lib/libkcertpart.so -lib/libkconf_update_main.la -lib/libkconf_update_main.so -lib/libkconf_update_main.so.0 -lib/libkconf_update_main.so.0.0 -lib/libkcookiejar_main.la -lib/libkcookiejar_main.so lib/libkdecore.la lib/libkdecore.so -lib/libkdecore.so.5 -lib/libkdecore.so.5.0 -lib/libkded_main.la -lib/libkded_main.so -lib/libkded_main.so.0 -lib/libkded_main.so.0.0 +lib/libkdecore.so.6 +lib/libkdecore.so.6.0 lib/libkdefakes.la lib/libkdefakes.so -lib/libkdefakes.so.5 -lib/libkdefakes.so.5.0 +lib/libkdefakes.so.6 +lib/libkdefakes.so.6.0 +lib/libkdefakes_nonpic.a lib/libkdefx.la lib/libkdefx.so -lib/libkdefx.so.5 -lib/libkdefx.so.5.0 +lib/libkdefx.so.6 +lib/libkdefx.so.6.0 +lib/libkdeinit_dcopserver.la +lib/libkdeinit_dcopserver.so +lib/libkdeinit_kaddprinterwizard.la +lib/libkdeinit_kaddprinterwizard.so +lib/libkdeinit_kbuildsycoca.la +lib/libkdeinit_kbuildsycoca.so +lib/libkdeinit_kconf_update.la +lib/libkdeinit_kconf_update.so +lib/libkdeinit_kcookiejar.la +lib/libkdeinit_kcookiejar.so +lib/libkdeinit_kded.la +lib/libkdeinit_kded.so +lib/libkdeinit_kio_http_cache_cleaner.la +lib/libkdeinit_kio_http_cache_cleaner.so +lib/libkdeinit_kio_uiserver.la +lib/libkdeinit_kio_uiserver.so +lib/libkdeinit_klauncher.la +lib/libkdeinit_klauncher.so lib/libkdeprint.la lib/libkdeprint.so -lib/libkdeprint.so.5 -lib/libkdeprint.so.5.0 +lib/libkdeprint.so.6 +lib/libkdeprint.so.6.0 lib/libkdeprint_management.la lib/libkdeprint_management.so -lib/libkdeprint_management.so.5 -lib/libkdeprint_management.so.5.0 +lib/libkdeprint_management.so.6 +lib/libkdeprint_management.so.6.0 lib/libkdesasl.la lib/libkdesasl.so -lib/libkdesasl.so.2 -lib/libkdesasl.so.2.0 +lib/libkdesasl.so.3 +lib/libkdesasl.so.3.0 lib/libkdesu.la lib/libkdesu.so -lib/libkdesu.so.5 -lib/libkdesu.so.5.0 +lib/libkdesu.so.6 +lib/libkdesu.so.6.0 lib/libkdeui.la lib/libkdeui.so -lib/libkdeui.so.5 -lib/libkdeui.so.5.0 +lib/libkdeui.so.6 +lib/libkdeui.so.6.0 lib/libkhtml.la lib/libkhtml.so -lib/libkhtml.so.5 -lib/libkhtml.so.5.0 +lib/libkhtml.so.6 +lib/libkhtml.so.6.0 lib/libkio.la lib/libkio.so -lib/libkio.so.5 -lib/libkio.so.5.0 -lib/libkio_http_cache_cleaner_main.la -lib/libkio_http_cache_cleaner_main.so -lib/libkio_http_cache_cleaner_main.so.0 -lib/libkio_http_cache_cleaner_main.so.0.0 -lib/libkio_uiserver_main.la -lib/libkio_uiserver_main.so -lib/libkio_uiserver_main.so.0 -lib/libkio_uiserver_main.so.0.0 +lib/libkio.so.6 +lib/libkio.so.6.0 lib/libkjava.la lib/libkjava.so lib/libkjava.so.1 lib/libkjava.so.1.0 lib/libkjs.la lib/libkjs.so -lib/libkjs.so.1 -lib/libkjs.so.1.0 +lib/libkjs.so.3 +lib/libkjs.so.3.0 +lib/libkmdi.la +lib/libkmdi.so +lib/libkmdi.so.1 +lib/libkmdi.so.1.0 lib/libkmediaplayer.la lib/libkmediaplayer.so lib/libkmediaplayer.so.0 @@ -765,34 +892,42 @@ lib/libkmid.la lib/libkmid.so lib/libkmid.so.0 lib/libkmid.so.0.95 -lib/libknotify_main.la -lib/libknotify_main.so -lib/libknotify_main.so.0 -lib/libknotify_main.so.0.0 lib/libkparts.la lib/libkparts.so lib/libkparts.so.3 lib/libkparts.so.3.0 +lib/libkresources.la +lib/libkresources.so +lib/libkresources.so.3 +lib/libkresources.so.3.0 lib/libkscreensaver.la lib/libkscreensaver.so -lib/libkscreensaver.so.5 -lib/libkscreensaver.so.5.0 +lib/libkscreensaver.so.6 +lib/libkscreensaver.so.6.0 lib/libkscript.la lib/libkscript.so lib/libkscript.so.0 lib/libkscript.so.0.0 lib/libkspell.la lib/libkspell.so -lib/libkspell.so.5 -lib/libkspell.so.5.0 +lib/libkspell.so.6 +lib/libkspell.so.6.0 lib/libktexteditor.la lib/libktexteditor.so lib/libktexteditor.so.0 lib/libktexteditor.so.0.0 lib/libkutils.la lib/libkutils.so -lib/libkutils.so.2 -lib/libkutils.so.2.0 +lib/libkutils.so.3 +lib/libkutils.so.3.0 +lib/libkwalletbackend.la +lib/libkwalletbackend.so +lib/libkwalletbackend.so.1 +lib/libkwalletbackend.so.1.0 +lib/libkwalletclient.la +lib/libkwalletclient.so +lib/libkwalletclient.so.1 +lib/libkwalletclient.so.1.0 lib/libshellscript.la lib/libshellscript.so lib/libshellscript.so.0 @@ -801,6 +936,7 @@ lib/libvcard.la lib/libvcard.so lib/libvcard.so.0 lib/libvcard.so.0.0 +share/applications/kde/kresources.desktop share/autostart/kab2kabc.desktop share/doc/kde/HTML/en/common/1.png share/doc/kde/HTML/en/common/10.png @@ -812,6 +948,7 @@ share/doc/kde/HTML/en/common/6.png share/doc/kde/HTML/en/common/7.png share/doc/kde/HTML/en/common/8.png share/doc/kde/HTML/en/common/9.png +share/doc/kde/HTML/en/common/appheader.html share/doc/kde/HTML/en/common/artistic-license.html share/doc/kde/HTML/en/common/bottom1.png share/doc/kde/HTML/en/common/bottom2.png @@ -834,6 +971,8 @@ share/doc/kde/HTML/en/common/kde-common.css share/doc/kde/HTML/en/common/kde-default.css share/doc/kde/HTML/en/common/kde-localised.css.template share/doc/kde/HTML/en/common/kde-web.css +share/doc/kde/HTML/en/common/kde_logo.png +share/doc/kde/HTML/en/common/kde_logo_bg.png share/doc/kde/HTML/en/common/kmenu.png share/doc/kde/HTML/en/common/lgpl-license share/doc/kde/HTML/en/common/lgpl-license.html @@ -849,35 +988,52 @@ share/doc/kde/HTML/en/kdelibs-apidocs/common share/doc/kde/HTML/en/kspell/common share/doc/kde/HTML/en/kspell/index.cache.bz2 share/doc/kde/HTML/en/kspell/index.docbook -share/kde/applnk/Settings/Components/kabc.desktop share/kde/apps/LICENSES/ARTISTIC share/kde/apps/LICENSES/BSD share/kde/apps/LICENSES/GPL_V2 share/kde/apps/LICENSES/LGPL_V2 share/kde/apps/LICENSES/QPL_V1.0 +share/kde/apps/dcopidlng/Ast.pm +share/kde/apps/dcopidlng/Iter.pm +share/kde/apps/dcopidlng/kalyptus +share/kde/apps/dcopidlng/kalyptusCxxToDcopIDL.pm +share/kde/apps/dcopidlng/kalyptusDataDict.pm +share/kde/apps/dcopidlng/kdocAstUtil.pm +share/kde/apps/dcopidlng/kdocLib.pm +share/kde/apps/dcopidlng/kdocParseDoc.pm +share/kde/apps/dcopidlng/kdocUtil.pm +share/kde/apps/kabc/countrytransl.map share/kde/apps/kabc/formats/binary.desktop -share/kde/apps/kabc/plugins/dir.desktop share/kde/apps/katepart/katepartreadonlyui.rc share/kde/apps/katepart/katepartui.rc share/kde/apps/katepart/syntax/ada.xml +share/kde/apps/katepart/syntax/asm6502.xml +share/kde/apps/katepart/syntax/awk.xml share/kde/apps/katepart/syntax/bash.xml +share/kde/apps/katepart/syntax/bibtex.xml share/kde/apps/katepart/syntax/c.xml share/kde/apps/katepart/syntax/changelog.xml share/kde/apps/katepart/syntax/coldfusion.xml +share/kde/apps/katepart/syntax/component-pascal.xml share/kde/apps/katepart/syntax/cpp.xml share/kde/apps/katepart/syntax/cs.xml share/kde/apps/katepart/syntax/css.xml +share/kde/apps/katepart/syntax/cue.xml +share/kde/apps/katepart/syntax/d.xml share/kde/apps/katepart/syntax/desktop.xml share/kde/apps/katepart/syntax/diff.xml +share/kde/apps/katepart/syntax/e.xml share/kde/apps/katepart/syntax/eiffel.xml share/kde/apps/katepart/syntax/ferite.xml share/kde/apps/katepart/syntax/fortran.xml +share/kde/apps/katepart/syntax/gdl.xml share/kde/apps/katepart/syntax/gnuassembler.xml share/kde/apps/katepart/syntax/haskell.xml share/kde/apps/katepart/syntax/html.xml share/kde/apps/katepart/syntax/idconsole.xml share/kde/apps/katepart/syntax/idl.xml share/kde/apps/katepart/syntax/ilerpg.xml +share/kde/apps/katepart/syntax/inform.xml share/kde/apps/katepart/syntax/java.xml share/kde/apps/katepart/syntax/javascript.xml share/kde/apps/katepart/syntax/kbasic.xml @@ -890,15 +1046,18 @@ share/kde/apps/katepart/syntax/mab.xml share/kde/apps/katepart/syntax/makefile.xml share/kde/apps/katepart/syntax/mason.xml share/kde/apps/katepart/syntax/matlab.xml +share/kde/apps/katepart/syntax/modula-2.xml share/kde/apps/katepart/syntax/objectivec.xml share/kde/apps/katepart/syntax/pascal.xml share/kde/apps/katepart/syntax/perl.xml share/kde/apps/katepart/syntax/php.xml share/kde/apps/katepart/syntax/picsrc.xml share/kde/apps/katepart/syntax/postscript.xml +share/kde/apps/katepart/syntax/progress.xml share/kde/apps/katepart/syntax/prolog.xml share/kde/apps/katepart/syntax/python.xml share/kde/apps/katepart/syntax/r.xml +share/kde/apps/katepart/syntax/rexx.xml share/kde/apps/katepart/syntax/rpmspec.xml share/kde/apps/katepart/syntax/rsiidl.xml share/kde/apps/katepart/syntax/ruby.xml @@ -906,6 +1065,7 @@ share/kde/apps/katepart/syntax/sather.xml share/kde/apps/katepart/syntax/scheme.xml share/kde/apps/katepart/syntax/sci.xml share/kde/apps/katepart/syntax/sgml.xml +share/kde/apps/katepart/syntax/sieve.xml share/kde/apps/katepart/syntax/sml.xml share/kde/apps/katepart/syntax/sql-mysql.xml share/kde/apps/katepart/syntax/sql-postgresql.xml @@ -916,15 +1076,20 @@ share/kde/apps/katepart/syntax/uscript.xml share/kde/apps/katepart/syntax/velocity.xml share/kde/apps/katepart/syntax/verilog.xml share/kde/apps/katepart/syntax/vhdl.xml +share/kde/apps/katepart/syntax/vrml.xml share/kde/apps/katepart/syntax/winehq.xml +share/kde/apps/katepart/syntax/xharbour.xml share/kde/apps/katepart/syntax/xml.xml share/kde/apps/katepart/syntax/xmldebug.xml +share/kde/apps/katepart/syntax/yacas.xml share/kde/apps/kcertpart/kcertpart.rc share/kde/apps/kcm_componentchooser/kcm_ktexteditor.desktop share/kde/apps/kconf_update/kcookiescfg.upd share/kde/apps/kconf_update/kded.upd share/kde/apps/kconf_update/kdeprintrc.upd +share/kde/apps/kconf_update/kio_help.upd share/kde/apps/kconf_update/kioslave.upd +share/kde/apps/kconf_update/move_kio_help_cache.sh share/kde/apps/kconf_update/proxytype.pl share/kde/apps/kconf_update/useragent.pl share/kde/apps/kdeprint/apsdriver1 @@ -989,17 +1154,23 @@ share/kde/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_stopprinter.png share/kde/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_testprinter.png share/kde/apps/kdeprint/icons/crystalsvg/22x22/actions/kdeprint_uploadsmb.png share/kde/apps/kdeprint/icons/crystalsvg/22x22/actions/package_utilities.png +share/kde/apps/kdeprint/icons/crystalsvg/22x22/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/actions/kdeprint_inklevel.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_process.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_class_stopped.png +share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_defect.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_process.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_process.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_remote_stopped.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_stopped.png share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps/kdeprint_printer_users.png +share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer.png +share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps/kdeprint_printer_class.png +share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer.png +share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps/kdeprint_printer_class.png ${CUPS}share/kde/apps/kdeprint/kde_logo.png share/kde/apps/kdeprint/lprngtooldriver1 share/kde/apps/kdeprint/pics/kdeprint_collate.png @@ -1037,6 +1208,7 @@ share/kde/apps/kdeui/pics/aboutkde.png share/kde/apps/kdeui/pics/keys.png share/kde/apps/kdeui/pics/ktip-background.png share/kde/apps/kdeui/pics/ktip-bulb.png +share/kde/apps/kdewidgets/pics/kactivelabel.png share/kde/apps/kdewidgets/pics/kcharselect.png share/kde/apps/kdewidgets/pics/kcmodule.png share/kde/apps/kdewidgets/pics/kcolorbutton.png @@ -1045,14 +1217,20 @@ share/kde/apps/kdewidgets/pics/kcombobox.png share/kde/apps/kdewidgets/pics/kdatepicker.png share/kde/apps/kdewidgets/pics/kdatewidget.png share/kde/apps/kdewidgets/pics/kdialog.png +share/kde/apps/kdewidgets/pics/kdoublenuminput.png +share/kde/apps/kdewidgets/pics/kdoublespinbox.png share/kde/apps/kdewidgets/pics/kdualcolorbutton.png share/kde/apps/kdewidgets/pics/keditlistbox.png share/kde/apps/kdewidgets/pics/kfontcombo.png +share/kde/apps/kdewidgets/pics/kfontrequester.png share/kde/apps/kdewidgets/pics/kgradientselector.png share/kde/apps/kdewidgets/pics/khistorycombo.png share/kde/apps/kdewidgets/pics/khsselector.png +share/kde/apps/kdewidgets/pics/kiconbutton.png +share/kde/apps/kdewidgets/pics/kiconview.png share/kde/apps/kdewidgets/pics/kintnuminput.png share/kde/apps/kdewidgets/pics/kintspinbox.png +share/kde/apps/kdewidgets/pics/kkeybutton.png share/kde/apps/kdewidgets/pics/kled.png share/kde/apps/kdewidgets/pics/klineedit.png share/kde/apps/kdewidgets/pics/klistbox.png @@ -1065,12 +1243,25 @@ share/kde/apps/kdewidgets/pics/kruler.png share/kde/apps/kdewidgets/pics/ksqueezedtextlabel.png share/kde/apps/kdewidgets/pics/ktextbrowser.png share/kde/apps/kdewidgets/pics/ktextedit.png +share/kde/apps/kdewidgets/pics/ktimewidget.png +share/kde/apps/kdewidgets/pics/kurlcomborequester.png share/kde/apps/kdewidgets/pics/kurllabel.png share/kde/apps/kdewidgets/pics/kurlrequester.png share/kde/apps/khtml/css/html4.css +share/kde/apps/khtml/css/quirks.css +share/kde/apps/khtml/icons/crystalsvg/128x128/actions/bug.png +share/kde/apps/khtml/icons/crystalsvg/16x16/actions/bug.png share/kde/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png +share/kde/apps/khtml/icons/crystalsvg/22x22/actions/bug.png +share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgnext.png +share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgrun.png +share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgrunto.png +share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgstep.png share/kde/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png +share/kde/apps/khtml/icons/crystalsvg/32x32/actions/bug.png share/kde/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png +share/kde/apps/khtml/icons/crystalsvg/48x48/actions/bug.png +share/kde/apps/khtml/icons/crystalsvg/64x64/actions/bug.png share/kde/apps/khtml/khtml.rc share/kde/apps/khtml/khtml_browser.rc share/kde/apps/khtml/khtml_popupmenu.rc @@ -1096,6 +1287,24 @@ share/kde/apps/ksgmltools2/customization/af/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/af/lang.entities share/kde/apps/ksgmltools2/customization/af/strings.entities share/kde/apps/ksgmltools2/customization/af/user.entities +share/kde/apps/ksgmltools2/customization/bg/catalog +share/kde/apps/ksgmltools2/customization/bg/contributor.entities +share/kde/apps/ksgmltools2/customization/bg/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/bg/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/bg/lang.entities +share/kde/apps/ksgmltools2/customization/bg/strings.entities +share/kde/apps/ksgmltools2/customization/bg/user.entities share/kde/apps/ksgmltools2/customization/ca/catalog share/kde/apps/ksgmltools2/customization/ca/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/ca/entities/gpl-notice.docbook @@ -1108,6 +1317,7 @@ share/kde/apps/ksgmltools2/customization/ca/entities/underArtisticLicense.docboo share/kde/apps/ksgmltools2/customization/ca/entities/underBSDLicense.docbook share/kde/apps/ksgmltools2/customization/ca/entities/underFDL.docbook share/kde/apps/ksgmltools2/customization/ca/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/ca/entities/underLGPL.docbook share/kde/apps/ksgmltools2/customization/ca/entities/underX11License.docbook share/kde/apps/ksgmltools2/customization/ca/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/ca/lang.entities @@ -1215,11 +1425,13 @@ share/kde/apps/ksgmltools2/customization/en/entities/underArtisticLicense.docboo share/kde/apps/ksgmltools2/customization/en/entities/underBSDLicense.docbook share/kde/apps/ksgmltools2/customization/en/entities/underFDL.docbook share/kde/apps/ksgmltools2/customization/en/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/en/entities/underLGPL.docbook share/kde/apps/ksgmltools2/customization/en/entities/underX11License.docbook share/kde/apps/ksgmltools2/customization/en/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/en/lang.entities share/kde/apps/ksgmltools2/customization/en/strings.entities share/kde/apps/ksgmltools2/customization/en/user.entities +share/kde/apps/ksgmltools2/customization/entities/contributor.entities share/kde/apps/ksgmltools2/customization/entities/general.entities share/kde/apps/ksgmltools2/customization/entities/l10n.entities share/kde/apps/ksgmltools2/customization/es/catalog @@ -1273,6 +1485,24 @@ share/kde/apps/ksgmltools2/customization/fi/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/fi/lang.entities share/kde/apps/ksgmltools2/customization/fi/strings.entities share/kde/apps/ksgmltools2/customization/fi/user.entities +share/kde/apps/ksgmltools2/customization/fo/catalog +share/kde/apps/ksgmltools2/customization/fo/contributor.entities +share/kde/apps/ksgmltools2/customization/fo/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/fo/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/fo/lang.entities +share/kde/apps/ksgmltools2/customization/fo/strings.entities +share/kde/apps/ksgmltools2/customization/fo/user.entities share/kde/apps/ksgmltools2/customization/fr/catalog share/kde/apps/ksgmltools2/customization/fr/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/fr/entities/gpl-notice.docbook @@ -1401,6 +1631,24 @@ share/kde/apps/ksgmltools2/customization/ko/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/ko/lang.entities share/kde/apps/ksgmltools2/customization/ko/strings.entities share/kde/apps/ksgmltools2/customization/ko/user.entities +share/kde/apps/ksgmltools2/customization/lt/catalog +share/kde/apps/ksgmltools2/customization/lt/contributor.entities +share/kde/apps/ksgmltools2/customization/lt/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/lt/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/lt/lang.entities +share/kde/apps/ksgmltools2/customization/lt/strings.entities +share/kde/apps/ksgmltools2/customization/lt/user.entities share/kde/apps/ksgmltools2/customization/nl/catalog share/kde/apps/ksgmltools2/customization/nl/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/nl/entities/gpl-notice.docbook @@ -1453,7 +1701,10 @@ share/kde/apps/ksgmltools2/customization/no/lang.entities share/kde/apps/ksgmltools2/customization/no/strings.entities share/kde/apps/ksgmltools2/customization/no/user.entities share/kde/apps/ksgmltools2/customization/obsolete/general.entities +share/kde/apps/ksgmltools2/customization/obsolete/kdex-412-10.dtd share/kde/apps/ksgmltools2/customization/obsolete/kdex.dtd +share/kde/apps/ksgmltools2/customization/obsolete/modifications.elements +share/kde/apps/ksgmltools2/customization/obsolete/rdbpool.elements share/kde/apps/ksgmltools2/customization/pl/catalog share/kde/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook @@ -1489,6 +1740,7 @@ share/kde/apps/ksgmltools2/customization/pt-BR/lang.entities share/kde/apps/ksgmltools2/customization/pt-BR/strings.entities share/kde/apps/ksgmltools2/customization/pt-BR/user.entities share/kde/apps/ksgmltools2/customization/pt/catalog +share/kde/apps/ksgmltools2/customization/pt/contributor.entities share/kde/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook share/kde/apps/ksgmltools2/customization/pt/entities/help-menu.docbook @@ -1517,6 +1769,7 @@ share/kde/apps/ksgmltools2/customization/ro/entities/underArtisticLicense.docboo share/kde/apps/ksgmltools2/customization/ro/entities/underBSDLicense.docbook share/kde/apps/ksgmltools2/customization/ro/entities/underFDL.docbook share/kde/apps/ksgmltools2/customization/ro/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/ro/entities/underLGPL.docbook share/kde/apps/ksgmltools2/customization/ro/entities/underX11License.docbook share/kde/apps/ksgmltools2/customization/ro/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/ro/lang.entities @@ -1641,6 +1894,42 @@ share/kde/apps/ksgmltools2/customization/uk/entities/update-doc.docbook share/kde/apps/ksgmltools2/customization/uk/lang.entities share/kde/apps/ksgmltools2/customization/uk/strings.entities share/kde/apps/ksgmltools2/customization/uk/user.entities +share/kde/apps/ksgmltools2/customization/wa/catalog +share/kde/apps/ksgmltools2/customization/wa/contributor.entities +share/kde/apps/ksgmltools2/customization/wa/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/wa/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/wa/lang.entities +share/kde/apps/ksgmltools2/customization/wa/strings.entities +share/kde/apps/ksgmltools2/customization/wa/user.entities +share/kde/apps/ksgmltools2/customization/xh/catalog +share/kde/apps/ksgmltools2/customization/xh/contributor.entities +share/kde/apps/ksgmltools2/customization/xh/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/xh/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/xh/lang.entities +share/kde/apps/ksgmltools2/customization/xh/strings.entities +share/kde/apps/ksgmltools2/customization/xh/user.entities share/kde/apps/ksgmltools2/customization/xsl/README share/kde/apps/ksgmltools2/customization/xsl/ca.xml share/kde/apps/ksgmltools2/customization/xsl/cs.xml @@ -1669,6 +1958,24 @@ share/kde/apps/ksgmltools2/customization/xsl/sl.xml share/kde/apps/ksgmltools2/customization/xsl/sr.xml share/kde/apps/ksgmltools2/customization/xsl/sv.xml share/kde/apps/ksgmltools2/customization/xsl/zh_tw.xml +share/kde/apps/ksgmltools2/customization/xx/catalog +share/kde/apps/ksgmltools2/customization/xx/contributor.entities +share/kde/apps/ksgmltools2/customization/xx/entities/fdl-notice.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/gpl-notice.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/help-menu.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/install-compile.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/install-intro.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/lgpl-notice.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/report-bugs.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/underArtisticLicense.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/underBSDLicense.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/underFDL.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/underGPL.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/underX11License.docbook +share/kde/apps/ksgmltools2/customization/xx/entities/update-doc.docbook +share/kde/apps/ksgmltools2/customization/xx/lang.entities +share/kde/apps/ksgmltools2/customization/xx/strings.entities +share/kde/apps/ksgmltools2/customization/xx/user.entities share/kde/apps/ksgmltools2/customization/zh-TW/catalog share/kde/apps/ksgmltools2/customization/zh-TW/entities/fdl-notice.docbook share/kde/apps/ksgmltools2/customization/zh-TW/entities/gpl-notice.docbook @@ -1719,6 +2026,37 @@ share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-pub.ent share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent/iso-tech.ent share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/readme.txt share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/soextblx.dtd +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ChangeLog +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/README +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/calstblx.dtd +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/catalog.xml +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/dbcentx.mod +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/dbgenent.mod +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/dbhierx.mod +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/dbnotnx.mod +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/dbpoolx.mod +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbookx.dtd +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsa.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsb.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsc.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsn.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amso.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-amsr.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-box.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr1.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-cyr2.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-dia.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk1.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk2.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk3.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-grk4.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat1.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-lat2.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-num.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-pub.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent/iso-tech.ent +share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/soextblx.dtd share/kde/apps/ksgmltools2/docbook/xsl/BUGS share/kde/apps/ksgmltools2/docbook/xsl/ChangeLog share/kde/apps/ksgmltools2/docbook/xsl/README @@ -2171,9 +2509,11 @@ share/kde/apps/kstyle/themes/systemalt.themerc share/kde/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc share/kde/apps/ktexteditor_isearch/ktexteditor_isearchui.rc share/kde/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc +share/kde/apps/proxyscout/eventsrc share/kde/config/colors/40 Colors share/kde/config/colors/Royal share/kde/config/colors/Web +share/kde/config/katesyntaxhighlightingrc share/kde/config/kdebug.areas share/kde/config/kdebugrc share/kde/config/kdeprintrc @@ -2182,30 +2522,70 @@ share/kde/config/kthemestylerc share/kde/config/language.codes share/kde/config/ui/kprintpreviewui.rc share/kde/config/ui/ui_standards.rc +share/kde/icons/crystalsvg/128x128/devices/blockdevice.png +share/kde/icons/crystalsvg/128x128/devices/mouse.png +share/kde/icons/crystalsvg/128x128/filesystems/chardevice.png +share/kde/icons/crystalsvg/128x128/filesystems/desktop.png +share/kde/icons/crystalsvg/128x128/filesystems/exec.png +share/kde/icons/crystalsvg/128x128/filesystems/folder.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_crystal.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_favorite.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_green.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_grey.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_home.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_home2.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_html.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_image.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_important.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_locked.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_man.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_open.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_print.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_red.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_red_open.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_sound.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_tar.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_txt.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_video.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_violet.png +share/kde/icons/crystalsvg/128x128/filesystems/folder_yellow.png +share/kde/icons/crystalsvg/128x128/filesystems/lockoverlay.png +share/kde/icons/crystalsvg/128x128/filesystems/network.png +share/kde/icons/crystalsvg/128x128/filesystems/network_local.png +share/kde/icons/crystalsvg/128x128/filesystems/trashcan_empty.png +share/kde/icons/crystalsvg/128x128/filesystems/trashcan_full.png +share/kde/icons/crystalsvg/128x128/filesystems/www.png +share/kde/icons/crystalsvg/128x128/filesystems/zip.png share/kde/icons/crystalsvg/128x128/mimetypes/applix.png +share/kde/icons/crystalsvg/128x128/mimetypes/ascii.png share/kde/icons/crystalsvg/128x128/mimetypes/binary.png share/kde/icons/crystalsvg/128x128/mimetypes/cdimage.png +share/kde/icons/crystalsvg/128x128/mimetypes/cdr.png share/kde/icons/crystalsvg/128x128/mimetypes/cdtrack.png +share/kde/icons/crystalsvg/128x128/mimetypes/colorset.png share/kde/icons/crystalsvg/128x128/mimetypes/core.png share/kde/icons/crystalsvg/128x128/mimetypes/deb.png share/kde/icons/crystalsvg/128x128/mimetypes/document.png +share/kde/icons/crystalsvg/128x128/mimetypes/document2.png share/kde/icons/crystalsvg/128x128/mimetypes/encrypted.png +share/kde/icons/crystalsvg/128x128/mimetypes/font.png share/kde/icons/crystalsvg/128x128/mimetypes/font_bitmap.png +share/kde/icons/crystalsvg/128x128/mimetypes/font_truetype.png share/kde/icons/crystalsvg/128x128/mimetypes/html.png share/kde/icons/crystalsvg/128x128/mimetypes/image.png share/kde/icons/crystalsvg/128x128/mimetypes/info.png share/kde/icons/crystalsvg/128x128/mimetypes/kmultiple.png +share/kde/icons/crystalsvg/128x128/mimetypes/koffice.png share/kde/icons/crystalsvg/128x128/mimetypes/make.png share/kde/icons/crystalsvg/128x128/mimetypes/man.png share/kde/icons/crystalsvg/128x128/mimetypes/message.png -share/kde/icons/crystalsvg/128x128/mimetypes/message2.png +share/kde/icons/crystalsvg/128x128/mimetypes/metafont.png share/kde/icons/crystalsvg/128x128/mimetypes/midi.png share/kde/icons/crystalsvg/128x128/mimetypes/mime.png -share/kde/icons/crystalsvg/128x128/mimetypes/mime_ascii.png -share/kde/icons/crystalsvg/128x128/mimetypes/mime_koffice.png share/kde/icons/crystalsvg/128x128/mimetypes/netscape_doc.png share/kde/icons/crystalsvg/128x128/mimetypes/pdf.png share/kde/icons/crystalsvg/128x128/mimetypes/postscript.png +share/kde/icons/crystalsvg/128x128/mimetypes/resource.png share/kde/icons/crystalsvg/128x128/mimetypes/rpm.png share/kde/icons/crystalsvg/128x128/mimetypes/shellscript.png share/kde/icons/crystalsvg/128x128/mimetypes/soffice.png @@ -2225,10 +2605,13 @@ share/kde/icons/crystalsvg/128x128/mimetypes/source_s.png share/kde/icons/crystalsvg/128x128/mimetypes/source_y.png share/kde/icons/crystalsvg/128x128/mimetypes/spreadsheet.png share/kde/icons/crystalsvg/128x128/mimetypes/tar.png +share/kde/icons/crystalsvg/128x128/mimetypes/template_source.png share/kde/icons/crystalsvg/128x128/mimetypes/tgz.png share/kde/icons/crystalsvg/128x128/mimetypes/txt.png +share/kde/icons/crystalsvg/128x128/mimetypes/txt2.png share/kde/icons/crystalsvg/128x128/mimetypes/unknown.png share/kde/icons/crystalsvg/128x128/mimetypes/video.png +share/kde/icons/crystalsvg/128x128/mimetypes/wordprocessing.png share/kde/icons/crystalsvg/16x16/actions/1downarrow.png share/kde/icons/crystalsvg/16x16/actions/1leftarrow.png share/kde/icons/crystalsvg/16x16/actions/1rightarrow.png @@ -2243,13 +2626,10 @@ share/kde/icons/crystalsvg/16x16/actions/attach.png share/kde/icons/crystalsvg/16x16/actions/back.png share/kde/icons/crystalsvg/16x16/actions/blend.png share/kde/icons/crystalsvg/16x16/actions/bookmark.png -share/kde/icons/crystalsvg/16x16/actions/bookmark2.png share/kde/icons/crystalsvg/16x16/actions/bookmark_add.png -share/kde/icons/crystalsvg/16x16/actions/bookmark_add2.png share/kde/icons/crystalsvg/16x16/actions/bookmark_folder.png -share/kde/icons/crystalsvg/16x16/actions/bookmark_folder2.png share/kde/icons/crystalsvg/16x16/actions/bookmark_toolbar.png -share/kde/icons/crystalsvg/16x16/actions/bookmark_toolbar2.png +share/kde/icons/crystalsvg/16x16/actions/bookmarks_list_add.png share/kde/icons/crystalsvg/16x16/actions/bottom.png share/kde/icons/crystalsvg/16x16/actions/cancel.png share/kde/icons/crystalsvg/16x16/actions/charset.png @@ -2267,7 +2647,6 @@ share/kde/icons/crystalsvg/16x16/actions/connect_creating.png share/kde/icons/crystalsvg/16x16/actions/connect_established.png share/kde/icons/crystalsvg/16x16/actions/connect_no.png share/kde/icons/crystalsvg/16x16/actions/contents.png -share/kde/icons/crystalsvg/16x16/actions/contents2.png share/kde/icons/crystalsvg/16x16/actions/contexthelp.png share/kde/icons/crystalsvg/16x16/actions/crop.png share/kde/icons/crystalsvg/16x16/actions/decrypted.png @@ -2324,7 +2703,6 @@ share/kde/icons/crystalsvg/16x16/actions/info.png share/kde/icons/crystalsvg/16x16/actions/inline_image.png share/kde/icons/crystalsvg/16x16/actions/inline_table.png share/kde/icons/crystalsvg/16x16/actions/kde1.png -share/kde/icons/crystalsvg/16x16/actions/kde2.png share/kde/icons/crystalsvg/16x16/actions/kde3.png share/kde/icons/crystalsvg/16x16/actions/kde4.png share/kde/icons/crystalsvg/16x16/actions/kde5.png @@ -2381,6 +2759,7 @@ share/kde/icons/crystalsvg/16x16/actions/ok.png share/kde/icons/crystalsvg/16x16/actions/openterm.png share/kde/icons/crystalsvg/16x16/actions/paintbrush.png share/kde/icons/crystalsvg/16x16/actions/pencil.png +share/kde/icons/crystalsvg/16x16/actions/player_eject.png share/kde/icons/crystalsvg/16x16/actions/player_end.png share/kde/icons/crystalsvg/16x16/actions/player_fwd.png share/kde/icons/crystalsvg/16x16/actions/player_pause.png @@ -2394,6 +2773,7 @@ share/kde/icons/crystalsvg/16x16/actions/queue.png share/kde/icons/crystalsvg/16x16/actions/rebuild.png share/kde/icons/crystalsvg/16x16/actions/redo.png share/kde/icons/crystalsvg/16x16/actions/reload.png +share/kde/icons/crystalsvg/16x16/actions/reload_all_tabs.png share/kde/icons/crystalsvg/16x16/actions/reload_page.png share/kde/icons/crystalsvg/16x16/actions/remove.png share/kde/icons/crystalsvg/16x16/actions/revert.png @@ -2411,7 +2791,6 @@ share/kde/icons/crystalsvg/16x16/actions/stop.png share/kde/icons/crystalsvg/16x16/actions/tab_breakoff.png share/kde/icons/crystalsvg/16x16/actions/tab_duplicate.png share/kde/icons/crystalsvg/16x16/actions/tab_new.png -share/kde/icons/crystalsvg/16x16/actions/tab_new_bg.png share/kde/icons/crystalsvg/16x16/actions/tab_new_raised.png share/kde/icons/crystalsvg/16x16/actions/tab_remove.png share/kde/icons/crystalsvg/16x16/actions/text.png @@ -2426,6 +2805,7 @@ share/kde/icons/crystalsvg/16x16/actions/text_sub.png share/kde/icons/crystalsvg/16x16/actions/text_super.png share/kde/icons/crystalsvg/16x16/actions/text_under.png share/kde/icons/crystalsvg/16x16/actions/thumbnail.png +share/kde/icons/crystalsvg/16x16/actions/today.png share/kde/icons/crystalsvg/16x16/actions/top.png share/kde/icons/crystalsvg/16x16/actions/transform.png share/kde/icons/crystalsvg/16x16/actions/translate.png @@ -2457,6 +2837,7 @@ share/kde/icons/crystalsvg/16x16/devices/3floppy_mount.png share/kde/icons/crystalsvg/16x16/devices/3floppy_unmount.png share/kde/icons/crystalsvg/16x16/devices/5floppy_mount.png share/kde/icons/crystalsvg/16x16/devices/5floppy_unmount.png +share/kde/icons/crystalsvg/16x16/devices/blockdevice.png share/kde/icons/crystalsvg/16x16/devices/camera_mount.png share/kde/icons/crystalsvg/16x16/devices/camera_unmount.png share/kde/icons/crystalsvg/16x16/devices/cdaudio_mount.png @@ -2480,42 +2861,30 @@ share/kde/icons/crystalsvg/16x16/devices/pda_black.png share/kde/icons/crystalsvg/16x16/devices/pda_blue.png share/kde/icons/crystalsvg/16x16/devices/print_class.png share/kde/icons/crystalsvg/16x16/devices/printer1.png -share/kde/icons/crystalsvg/16x16/devices/printer2.png share/kde/icons/crystalsvg/16x16/devices/scanner.png share/kde/icons/crystalsvg/16x16/devices/tablet.png share/kde/icons/crystalsvg/16x16/devices/tv.png share/kde/icons/crystalsvg/16x16/devices/zip_mount.png share/kde/icons/crystalsvg/16x16/devices/zip_unmount.png -share/kde/icons/crystalsvg/16x16/filesystems/blockdevice.png share/kde/icons/crystalsvg/16x16/filesystems/chardevice.png share/kde/icons/crystalsvg/16x16/filesystems/desktop.png share/kde/icons/crystalsvg/16x16/filesystems/exec.png -share/kde/icons/crystalsvg/16x16/filesystems/exec_wine.png -share/kde/icons/crystalsvg/16x16/filesystems/file_broken.png -share/kde/icons/crystalsvg/16x16/filesystems/file_important.png -share/kde/icons/crystalsvg/16x16/filesystems/file_locked.png share/kde/icons/crystalsvg/16x16/filesystems/folder.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_blue.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_blue_open.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_cyan.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_cyan_open.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_favorites.png +share/kde/icons/crystalsvg/16x16/filesystems/folder_crystal.png +share/kde/icons/crystalsvg/16x16/filesystems/folder_favorite.png share/kde/icons/crystalsvg/16x16/filesystems/folder_green.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_green_open.png share/kde/icons/crystalsvg/16x16/filesystems/folder_grey.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_grey_open.png share/kde/icons/crystalsvg/16x16/filesystems/folder_home.png +share/kde/icons/crystalsvg/16x16/filesystems/folder_home2.png share/kde/icons/crystalsvg/16x16/filesystems/folder_html.png share/kde/icons/crystalsvg/16x16/filesystems/folder_image.png share/kde/icons/crystalsvg/16x16/filesystems/folder_important.png share/kde/icons/crystalsvg/16x16/filesystems/folder_inbox.png share/kde/icons/crystalsvg/16x16/filesystems/folder_locked.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_mail.png share/kde/icons/crystalsvg/16x16/filesystems/folder_man.png share/kde/icons/crystalsvg/16x16/filesystems/folder_open.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_orange.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_orange_open.png share/kde/icons/crystalsvg/16x16/filesystems/folder_outbox.png +share/kde/icons/crystalsvg/16x16/filesystems/folder_print.png share/kde/icons/crystalsvg/16x16/filesystems/folder_red.png share/kde/icons/crystalsvg/16x16/filesystems/folder_red_open.png share/kde/icons/crystalsvg/16x16/filesystems/folder_sent_mail.png @@ -2524,57 +2893,51 @@ share/kde/icons/crystalsvg/16x16/filesystems/folder_tar.png share/kde/icons/crystalsvg/16x16/filesystems/folder_txt.png share/kde/icons/crystalsvg/16x16/filesystems/folder_video.png share/kde/icons/crystalsvg/16x16/filesystems/folder_violet.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_violet_open.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_wordprocessing.png share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow.png -share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png -share/kde/icons/crystalsvg/16x16/filesystems/ftp.png -share/kde/icons/crystalsvg/16x16/filesystems/home_blue.png -share/kde/icons/crystalsvg/16x16/filesystems/home_white.png share/kde/icons/crystalsvg/16x16/filesystems/link.png share/kde/icons/crystalsvg/16x16/filesystems/lockoverlay.png share/kde/icons/crystalsvg/16x16/filesystems/network.png share/kde/icons/crystalsvg/16x16/filesystems/network_local.png share/kde/icons/crystalsvg/16x16/filesystems/pipe.png -share/kde/icons/crystalsvg/16x16/filesystems/services.png -share/kde/icons/crystalsvg/16x16/filesystems/shellscript.png -share/kde/icons/crystalsvg/16x16/filesystems/shredder.png -share/kde/icons/crystalsvg/16x16/filesystems/socket.png -share/kde/icons/crystalsvg/16x16/filesystems/tar.png -share/kde/icons/crystalsvg/16x16/filesystems/temporary.png -share/kde/icons/crystalsvg/16x16/filesystems/tgz.png +share/kde/icons/crystalsvg/16x16/filesystems/server.png share/kde/icons/crystalsvg/16x16/filesystems/trashcan_empty.png share/kde/icons/crystalsvg/16x16/filesystems/trashcan_full.png share/kde/icons/crystalsvg/16x16/filesystems/www.png share/kde/icons/crystalsvg/16x16/filesystems/zip.png -share/kde/icons/crystalsvg/16x16/mimetypes/Mime.png share/kde/icons/crystalsvg/16x16/mimetypes/applix.png share/kde/icons/crystalsvg/16x16/mimetypes/ascii.png share/kde/icons/crystalsvg/16x16/mimetypes/binary.png -share/kde/icons/crystalsvg/16x16/mimetypes/binary2.png share/kde/icons/crystalsvg/16x16/mimetypes/cdimage.png +share/kde/icons/crystalsvg/16x16/mimetypes/cdr.png share/kde/icons/crystalsvg/16x16/mimetypes/cdtrack.png share/kde/icons/crystalsvg/16x16/mimetypes/colorscm.png share/kde/icons/crystalsvg/16x16/mimetypes/colorset.png share/kde/icons/crystalsvg/16x16/mimetypes/core.png share/kde/icons/crystalsvg/16x16/mimetypes/deb.png -share/kde/icons/crystalsvg/16x16/mimetypes/doc.png share/kde/icons/crystalsvg/16x16/mimetypes/document.png share/kde/icons/crystalsvg/16x16/mimetypes/document2.png share/kde/icons/crystalsvg/16x16/mimetypes/dvi.png -share/kde/icons/crystalsvg/16x16/mimetypes/empty2.png -share/kde/icons/crystalsvg/16x16/mimetypes/empty_ascii.png share/kde/icons/crystalsvg/16x16/mimetypes/encrypted.png share/kde/icons/crystalsvg/16x16/mimetypes/font.png share/kde/icons/crystalsvg/16x16/mimetypes/font_bitmap.png share/kde/icons/crystalsvg/16x16/mimetypes/font_truetype.png share/kde/icons/crystalsvg/16x16/mimetypes/font_type1.png +share/kde/icons/crystalsvg/16x16/mimetypes/gettext.png share/kde/icons/crystalsvg/16x16/mimetypes/gf.png share/kde/icons/crystalsvg/16x16/mimetypes/html.png share/kde/icons/crystalsvg/16x16/mimetypes/image.png share/kde/icons/crystalsvg/16x16/mimetypes/info.png -share/kde/icons/crystalsvg/16x16/mimetypes/java_src.png +share/kde/icons/crystalsvg/16x16/mimetypes/karbon_karbon.png +share/kde/icons/crystalsvg/16x16/mimetypes/kchart_chrt.png +share/kde/icons/crystalsvg/16x16/mimetypes/kexi_kexi.png +share/kde/icons/crystalsvg/16x16/mimetypes/kformula_kfo.png +share/kde/icons/crystalsvg/16x16/mimetypes/kivio_flw.png share/kde/icons/crystalsvg/16x16/mimetypes/kmultiple.png +share/kde/icons/crystalsvg/16x16/mimetypes/kpresenter_kpr.png +share/kde/icons/crystalsvg/16x16/mimetypes/krita_kra.png +share/kde/icons/crystalsvg/16x16/mimetypes/kspread_ksp.png +share/kde/icons/crystalsvg/16x16/mimetypes/kugar_kud.png +share/kde/icons/crystalsvg/16x16/mimetypes/kword_kwd.png share/kde/icons/crystalsvg/16x16/mimetypes/log.png share/kde/icons/crystalsvg/16x16/mimetypes/make.png share/kde/icons/crystalsvg/16x16/mimetypes/man.png @@ -2582,15 +2945,11 @@ share/kde/icons/crystalsvg/16x16/mimetypes/message.png share/kde/icons/crystalsvg/16x16/mimetypes/metafont.png share/kde/icons/crystalsvg/16x16/mimetypes/midi.png share/kde/icons/crystalsvg/16x16/mimetypes/mime.png -share/kde/icons/crystalsvg/16x16/mimetypes/mime_empty.png share/kde/icons/crystalsvg/16x16/mimetypes/misc.png share/kde/icons/crystalsvg/16x16/mimetypes/misc_doc.png -share/kde/icons/crystalsvg/16x16/mimetypes/moc_src.png -share/kde/icons/crystalsvg/16x16/mimetypes/netscape.png share/kde/icons/crystalsvg/16x16/mimetypes/netscape_doc.png share/kde/icons/crystalsvg/16x16/mimetypes/news.png share/kde/icons/crystalsvg/16x16/mimetypes/pdf.png -share/kde/icons/crystalsvg/16x16/mimetypes/pdf/document.png share/kde/icons/crystalsvg/16x16/mimetypes/pk.png share/kde/icons/crystalsvg/16x16/mimetypes/postscript.png share/kde/icons/crystalsvg/16x16/mimetypes/quicktime.png @@ -2599,9 +2958,7 @@ share/kde/icons/crystalsvg/16x16/mimetypes/real_doc.png share/kde/icons/crystalsvg/16x16/mimetypes/recycled.png share/kde/icons/crystalsvg/16x16/mimetypes/resource.png share/kde/icons/crystalsvg/16x16/mimetypes/rpm.png -share/kde/icons/crystalsvg/16x16/mimetypes/shell1.png share/kde/icons/crystalsvg/16x16/mimetypes/shellscript.png -share/kde/icons/crystalsvg/16x16/mimetypes/shellscript2.png share/kde/icons/crystalsvg/16x16/mimetypes/sound.png share/kde/icons/crystalsvg/16x16/mimetypes/source.png share/kde/icons/crystalsvg/16x16/mimetypes/source_c.png @@ -2612,16 +2969,19 @@ share/kde/icons/crystalsvg/16x16/mimetypes/source_java.png share/kde/icons/crystalsvg/16x16/mimetypes/source_l.png share/kde/icons/crystalsvg/16x16/mimetypes/source_moc.png share/kde/icons/crystalsvg/16x16/mimetypes/source_o.png +share/kde/icons/crystalsvg/16x16/mimetypes/source_php.png share/kde/icons/crystalsvg/16x16/mimetypes/source_pl.png share/kde/icons/crystalsvg/16x16/mimetypes/source_py.png share/kde/icons/crystalsvg/16x16/mimetypes/source_s.png share/kde/icons/crystalsvg/16x16/mimetypes/source_y.png share/kde/icons/crystalsvg/16x16/mimetypes/spreadsheet.png share/kde/icons/crystalsvg/16x16/mimetypes/tar.png +share/kde/icons/crystalsvg/16x16/mimetypes/template_source.png share/kde/icons/crystalsvg/16x16/mimetypes/tex.png share/kde/icons/crystalsvg/16x16/mimetypes/tgz.png share/kde/icons/crystalsvg/16x16/mimetypes/trash.png share/kde/icons/crystalsvg/16x16/mimetypes/txt.png +share/kde/icons/crystalsvg/16x16/mimetypes/txt2.png share/kde/icons/crystalsvg/16x16/mimetypes/unknown.png share/kde/icons/crystalsvg/16x16/mimetypes/vcalendar.png share/kde/icons/crystalsvg/16x16/mimetypes/vcard.png @@ -2646,6 +3006,7 @@ share/kde/icons/crystalsvg/22x22/actions/blend.png share/kde/icons/crystalsvg/22x22/actions/bookmark.png share/kde/icons/crystalsvg/22x22/actions/bookmark_add.png share/kde/icons/crystalsvg/22x22/actions/bookmark_folder.png +share/kde/icons/crystalsvg/22x22/actions/bookmarks_list_add.png share/kde/icons/crystalsvg/22x22/actions/bottom.png share/kde/icons/crystalsvg/22x22/actions/button_cancel.png share/kde/icons/crystalsvg/22x22/actions/button_ok.png @@ -2663,7 +3024,6 @@ share/kde/icons/crystalsvg/22x22/actions/connect_creating.png share/kde/icons/crystalsvg/22x22/actions/connect_established.png share/kde/icons/crystalsvg/22x22/actions/connect_no.png share/kde/icons/crystalsvg/22x22/actions/contents.png -share/kde/icons/crystalsvg/22x22/actions/contents2.png share/kde/icons/crystalsvg/22x22/actions/contexthelp.png share/kde/icons/crystalsvg/22x22/actions/crop.png share/kde/icons/crystalsvg/22x22/actions/decrypted.png @@ -2685,7 +3045,6 @@ share/kde/icons/crystalsvg/22x22/actions/fileexport.png share/kde/icons/crystalsvg/22x22/actions/filefind.png share/kde/icons/crystalsvg/22x22/actions/fileimport.png share/kde/icons/crystalsvg/22x22/actions/filenew.png -share/kde/icons/crystalsvg/22x22/actions/filenew2.png share/kde/icons/crystalsvg/22x22/actions/fileopen.png share/kde/icons/crystalsvg/22x22/actions/fileprint.png share/kde/icons/crystalsvg/22x22/actions/filequickprint.png @@ -2720,37 +3079,23 @@ share/kde/icons/crystalsvg/22x22/actions/inline_table.png share/kde/icons/crystalsvg/22x22/actions/kde.png share/kde/icons/crystalsvg/22x22/actions/key_enter.png share/kde/icons/crystalsvg/22x22/actions/klipper_dock.png -share/kde/icons/crystalsvg/22x22/actions/klipper_dock2.png share/kde/icons/crystalsvg/22x22/actions/launch.png share/kde/icons/crystalsvg/22x22/actions/leftjust.png share/kde/icons/crystalsvg/22x22/actions/locationbar_erase.png share/kde/icons/crystalsvg/22x22/actions/lock.png share/kde/icons/crystalsvg/22x22/actions/mail_delete.png -share/kde/icons/crystalsvg/22x22/actions/mail_delete2.png share/kde/icons/crystalsvg/22x22/actions/mail_find.png -share/kde/icons/crystalsvg/22x22/actions/mail_find2.png share/kde/icons/crystalsvg/22x22/actions/mail_forward.png -share/kde/icons/crystalsvg/22x22/actions/mail_forward2.png share/kde/icons/crystalsvg/22x22/actions/mail_generic.png -share/kde/icons/crystalsvg/22x22/actions/mail_generic2.png share/kde/icons/crystalsvg/22x22/actions/mail_get.png -share/kde/icons/crystalsvg/22x22/actions/mail_get2.png share/kde/icons/crystalsvg/22x22/actions/mail_new.png -share/kde/icons/crystalsvg/22x22/actions/mail_new2.png share/kde/icons/crystalsvg/22x22/actions/mail_new3.png share/kde/icons/crystalsvg/22x22/actions/mail_post_to.png -share/kde/icons/crystalsvg/22x22/actions/mail_post_to2.png share/kde/icons/crystalsvg/22x22/actions/mail_post_to3.png -share/kde/icons/crystalsvg/22x22/actions/mail_replay.png -share/kde/icons/crystalsvg/22x22/actions/mail_replayall.png share/kde/icons/crystalsvg/22x22/actions/mail_reply.png -share/kde/icons/crystalsvg/22x22/actions/mail_reply2.png share/kde/icons/crystalsvg/22x22/actions/mail_replyall.png -share/kde/icons/crystalsvg/22x22/actions/mail_replyall2.png share/kde/icons/crystalsvg/22x22/actions/mail_replylist.png -share/kde/icons/crystalsvg/22x22/actions/mail_replylist2.png share/kde/icons/crystalsvg/22x22/actions/mail_send.png -share/kde/icons/crystalsvg/22x22/actions/mail_send2.png share/kde/icons/crystalsvg/22x22/actions/make_kdevelop.png share/kde/icons/crystalsvg/22x22/actions/math_abs.png share/kde/icons/crystalsvg/22x22/actions/math_brace.png @@ -2783,6 +3128,7 @@ share/kde/icons/crystalsvg/22x22/actions/music_natur.png share/kde/icons/crystalsvg/22x22/actions/music_quarternote.png share/kde/icons/crystalsvg/22x22/actions/music_sixteenthnote.png share/kde/icons/crystalsvg/22x22/actions/news_subscribe.png +share/kde/icons/crystalsvg/22x22/actions/news_unsubscribe.png share/kde/icons/crystalsvg/22x22/actions/next.png share/kde/icons/crystalsvg/22x22/actions/openterm.png share/kde/icons/crystalsvg/22x22/actions/paintbrush.png @@ -2802,6 +3148,7 @@ share/kde/icons/crystalsvg/22x22/actions/rebuild.png share/kde/icons/crystalsvg/22x22/actions/redo.png share/kde/icons/crystalsvg/22x22/actions/reload.png share/kde/icons/crystalsvg/22x22/actions/reload3.png +share/kde/icons/crystalsvg/22x22/actions/reload_all_tabs.png share/kde/icons/crystalsvg/22x22/actions/reload_page.png share/kde/icons/crystalsvg/22x22/actions/revert.png share/kde/icons/crystalsvg/22x22/actions/rightjust.png @@ -2809,6 +3156,7 @@ share/kde/icons/crystalsvg/22x22/actions/rotate.png share/kde/icons/crystalsvg/22x22/actions/rotate_ccw.png share/kde/icons/crystalsvg/22x22/actions/rotate_cw.png share/kde/icons/crystalsvg/22x22/actions/run.png +share/kde/icons/crystalsvg/22x22/actions/save_all.png share/kde/icons/crystalsvg/22x22/actions/showmenu.png share/kde/icons/crystalsvg/22x22/actions/signature.png share/kde/icons/crystalsvg/22x22/actions/spellcheck.png @@ -2826,6 +3174,7 @@ share/kde/icons/crystalsvg/22x22/actions/text_right.png share/kde/icons/crystalsvg/22x22/actions/text_strike.png share/kde/icons/crystalsvg/22x22/actions/text_under.png share/kde/icons/crystalsvg/22x22/actions/thumbnail.png +share/kde/icons/crystalsvg/22x22/actions/today.png share/kde/icons/crystalsvg/22x22/actions/toggle_log.png share/kde/icons/crystalsvg/22x22/actions/top.png share/kde/icons/crystalsvg/22x22/actions/translate.png @@ -2853,7 +3202,94 @@ share/kde/icons/crystalsvg/22x22/actions/window_fullscreen.png share/kde/icons/crystalsvg/22x22/actions/window_new.png share/kde/icons/crystalsvg/22x22/actions/window_nofullscreen.png share/kde/icons/crystalsvg/22x22/actions/wizard.png +share/kde/icons/crystalsvg/22x22/filesystems/www.png +share/kde/icons/crystalsvg/22x22/mimetypes/applix.png +share/kde/icons/crystalsvg/22x22/mimetypes/ascii.png +share/kde/icons/crystalsvg/22x22/mimetypes/binary.png +share/kde/icons/crystalsvg/22x22/mimetypes/cdbo_list.png +share/kde/icons/crystalsvg/22x22/mimetypes/cdimage.png +share/kde/icons/crystalsvg/22x22/mimetypes/cdtrack.png +share/kde/icons/crystalsvg/22x22/mimetypes/colorscm.png +share/kde/icons/crystalsvg/22x22/mimetypes/core.png +share/kde/icons/crystalsvg/22x22/mimetypes/deb.png +share/kde/icons/crystalsvg/22x22/mimetypes/document.png +share/kde/icons/crystalsvg/22x22/mimetypes/document2.png +share/kde/icons/crystalsvg/22x22/mimetypes/dvi.png +share/kde/icons/crystalsvg/22x22/mimetypes/empty.png +share/kde/icons/crystalsvg/22x22/mimetypes/encrypted.png +share/kde/icons/crystalsvg/22x22/mimetypes/exec_wine.png +share/kde/icons/crystalsvg/22x22/mimetypes/file_locked.png +share/kde/icons/crystalsvg/22x22/mimetypes/file_temporary.png +share/kde/icons/crystalsvg/22x22/mimetypes/font.png +share/kde/icons/crystalsvg/22x22/mimetypes/font_bitmap.png +share/kde/icons/crystalsvg/22x22/mimetypes/font_truetype.png +share/kde/icons/crystalsvg/22x22/mimetypes/font_type1.png +share/kde/icons/crystalsvg/22x22/mimetypes/gf.png +share/kde/icons/crystalsvg/22x22/mimetypes/html.png +share/kde/icons/crystalsvg/22x22/mimetypes/image.png +share/kde/icons/crystalsvg/22x22/mimetypes/info.png +share/kde/icons/crystalsvg/22x22/mimetypes/karbon_karbon.png +share/kde/icons/crystalsvg/22x22/mimetypes/kchart_chrt.png +share/kde/icons/crystalsvg/22x22/mimetypes/kexi_kexi.png +share/kde/icons/crystalsvg/22x22/mimetypes/kformula_kfo.png +share/kde/icons/crystalsvg/22x22/mimetypes/kivio_flw.png +share/kde/icons/crystalsvg/22x22/mimetypes/kmultiple.png +share/kde/icons/crystalsvg/22x22/mimetypes/koffice.png +share/kde/icons/crystalsvg/22x22/mimetypes/kpresenter_kpr.png +share/kde/icons/crystalsvg/22x22/mimetypes/krita_kra.png +share/kde/icons/crystalsvg/22x22/mimetypes/kspread_ksp.png +share/kde/icons/crystalsvg/22x22/mimetypes/kugar_kud.png +share/kde/icons/crystalsvg/22x22/mimetypes/kword_kwd.png +share/kde/icons/crystalsvg/22x22/mimetypes/log.png +share/kde/icons/crystalsvg/22x22/mimetypes/make.png +share/kde/icons/crystalsvg/22x22/mimetypes/man.png +share/kde/icons/crystalsvg/22x22/mimetypes/message.png +share/kde/icons/crystalsvg/22x22/mimetypes/metafont.png +share/kde/icons/crystalsvg/22x22/mimetypes/midi.png +share/kde/icons/crystalsvg/22x22/mimetypes/mozilla_doc.png +share/kde/icons/crystalsvg/22x22/mimetypes/netscape_doc.png +share/kde/icons/crystalsvg/22x22/mimetypes/news.png +share/kde/icons/crystalsvg/22x22/mimetypes/pdf.png +share/kde/icons/crystalsvg/22x22/mimetypes/php.png +share/kde/icons/crystalsvg/22x22/mimetypes/pk.png +share/kde/icons/crystalsvg/22x22/mimetypes/postscript.png +share/kde/icons/crystalsvg/22x22/mimetypes/quicktime.png +share/kde/icons/crystalsvg/22x22/mimetypes/readme.png +share/kde/icons/crystalsvg/22x22/mimetypes/real_doc.png +share/kde/icons/crystalsvg/22x22/mimetypes/recycled.png +share/kde/icons/crystalsvg/22x22/mimetypes/rpm.png +share/kde/icons/crystalsvg/22x22/mimetypes/shellscript.png +share/kde/icons/crystalsvg/22x22/mimetypes/soffice.png +share/kde/icons/crystalsvg/22x22/mimetypes/sound.png +share/kde/icons/crystalsvg/22x22/mimetypes/source.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_c.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_cpp.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_f.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_h.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_j.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_java.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_l.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_moc.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_o.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_p.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_pl.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_py.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_s.png +share/kde/icons/crystalsvg/22x22/mimetypes/source_y.png +share/kde/icons/crystalsvg/22x22/mimetypes/spreadsheet.png +share/kde/icons/crystalsvg/22x22/mimetypes/tar.png +share/kde/icons/crystalsvg/22x22/mimetypes/tex.png +share/kde/icons/crystalsvg/22x22/mimetypes/tgz.png +share/kde/icons/crystalsvg/22x22/mimetypes/txt.png +share/kde/icons/crystalsvg/22x22/mimetypes/txt2.png share/kde/icons/crystalsvg/22x22/mimetypes/unknown.png +share/kde/icons/crystalsvg/22x22/mimetypes/vcalendar.png +share/kde/icons/crystalsvg/22x22/mimetypes/vcard.png +share/kde/icons/crystalsvg/22x22/mimetypes/vectorgfx.png +share/kde/icons/crystalsvg/22x22/mimetypes/video.png +share/kde/icons/crystalsvg/22x22/mimetypes/widget_doc.png +share/kde/icons/crystalsvg/22x22/mimetypes/wordprocessing.png +share/kde/icons/crystalsvg/22x22/mimetypes/zip.png share/kde/icons/crystalsvg/32x32/actions/1downarrow.png share/kde/icons/crystalsvg/32x32/actions/1leftarrow.png share/kde/icons/crystalsvg/32x32/actions/1rightarrow.png @@ -2870,6 +3306,7 @@ share/kde/icons/crystalsvg/32x32/actions/bookmark.png share/kde/icons/crystalsvg/32x32/actions/bookmark_add.png share/kde/icons/crystalsvg/32x32/actions/bookmark_folder.png share/kde/icons/crystalsvg/32x32/actions/bookmark_toolbar.png +share/kde/icons/crystalsvg/32x32/actions/bookmarks_list_add.png share/kde/icons/crystalsvg/32x32/actions/bottom.png share/kde/icons/crystalsvg/32x32/actions/button_cancel.png share/kde/icons/crystalsvg/32x32/actions/button_ok.png @@ -2883,7 +3320,6 @@ share/kde/icons/crystalsvg/32x32/actions/connect_creating.png share/kde/icons/crystalsvg/32x32/actions/connect_established.png share/kde/icons/crystalsvg/32x32/actions/connect_no.png share/kde/icons/crystalsvg/32x32/actions/contents.png -share/kde/icons/crystalsvg/32x32/actions/contents2.png share/kde/icons/crystalsvg/32x32/actions/contexthelp.png share/kde/icons/crystalsvg/32x32/actions/decrypted.png share/kde/icons/crystalsvg/32x32/actions/down.png @@ -2934,8 +3370,6 @@ share/kde/icons/crystalsvg/32x32/actions/mail_generic.png share/kde/icons/crystalsvg/32x32/actions/mail_get.png share/kde/icons/crystalsvg/32x32/actions/mail_new.png share/kde/icons/crystalsvg/32x32/actions/mail_post_to.png -share/kde/icons/crystalsvg/32x32/actions/mail_replay.png -share/kde/icons/crystalsvg/32x32/actions/mail_replayall.png share/kde/icons/crystalsvg/32x32/actions/mail_reply.png share/kde/icons/crystalsvg/32x32/actions/mail_replyall.png share/kde/icons/crystalsvg/32x32/actions/mail_replylist.png @@ -2973,7 +3407,6 @@ share/kde/icons/crystalsvg/32x32/actions/music_halfnote.png share/kde/icons/crystalsvg/32x32/actions/music_natur.png share/kde/icons/crystalsvg/32x32/actions/music_quarternote.png share/kde/icons/crystalsvg/32x32/actions/music_sixteenthnote.png -share/kde/icons/crystalsvg/32x32/actions/news_subscribe.png share/kde/icons/crystalsvg/32x32/actions/next.png share/kde/icons/crystalsvg/32x32/actions/openterm.png share/kde/icons/crystalsvg/32x32/actions/player_eject.png @@ -2990,6 +3423,7 @@ share/kde/icons/crystalsvg/32x32/actions/queue.png share/kde/icons/crystalsvg/32x32/actions/rebuild.png share/kde/icons/crystalsvg/32x32/actions/redo.png share/kde/icons/crystalsvg/32x32/actions/reload.png +share/kde/icons/crystalsvg/32x32/actions/reload_all_tabs.png share/kde/icons/crystalsvg/32x32/actions/reload_page.png share/kde/icons/crystalsvg/32x32/actions/revert.png share/kde/icons/crystalsvg/32x32/actions/rightjust.png @@ -2997,6 +3431,7 @@ share/kde/icons/crystalsvg/32x32/actions/rotate.png share/kde/icons/crystalsvg/32x32/actions/rotate_ccw.png share/kde/icons/crystalsvg/32x32/actions/rotate_cw.png share/kde/icons/crystalsvg/32x32/actions/run.png +share/kde/icons/crystalsvg/32x32/actions/save_all.png share/kde/icons/crystalsvg/32x32/actions/share.png share/kde/icons/crystalsvg/32x32/actions/signature.png share/kde/icons/crystalsvg/32x32/actions/spellcheck.png @@ -3009,6 +3444,7 @@ share/kde/icons/crystalsvg/32x32/actions/text_italic.png share/kde/icons/crystalsvg/32x32/actions/text_left.png share/kde/icons/crystalsvg/32x32/actions/text_right.png share/kde/icons/crystalsvg/32x32/actions/text_under.png +share/kde/icons/crystalsvg/32x32/actions/today.png share/kde/icons/crystalsvg/32x32/actions/toggle_log.png share/kde/icons/crystalsvg/32x32/actions/top.png share/kde/icons/crystalsvg/32x32/actions/undo.png @@ -3040,6 +3476,7 @@ share/kde/icons/crystalsvg/32x32/devices/3floppy_mount.png share/kde/icons/crystalsvg/32x32/devices/3floppy_unmount.png share/kde/icons/crystalsvg/32x32/devices/5floppy_mount.png share/kde/icons/crystalsvg/32x32/devices/5floppy_unmount.png +share/kde/icons/crystalsvg/32x32/devices/blockdevice.png share/kde/icons/crystalsvg/32x32/devices/camera_mount.png share/kde/icons/crystalsvg/32x32/devices/camera_unmount.png share/kde/icons/crystalsvg/32x32/devices/cdaudio_mount.png @@ -3063,77 +3500,41 @@ share/kde/icons/crystalsvg/32x32/devices/pda_black.png share/kde/icons/crystalsvg/32x32/devices/pda_blue.png share/kde/icons/crystalsvg/32x32/devices/print_class.png share/kde/icons/crystalsvg/32x32/devices/printer1.png -share/kde/icons/crystalsvg/32x32/devices/printer2.png share/kde/icons/crystalsvg/32x32/devices/scanner.png share/kde/icons/crystalsvg/32x32/devices/tablet.png share/kde/icons/crystalsvg/32x32/devices/tv.png share/kde/icons/crystalsvg/32x32/devices/zip_mount.png share/kde/icons/crystalsvg/32x32/devices/zip_unmount.png -share/kde/icons/crystalsvg/32x32/filesystems/blockdevice.png share/kde/icons/crystalsvg/32x32/filesystems/chardevice.png share/kde/icons/crystalsvg/32x32/filesystems/desktop.png -share/kde/icons/crystalsvg/32x32/filesystems/desktop2.png share/kde/icons/crystalsvg/32x32/filesystems/exec.png -share/kde/icons/crystalsvg/32x32/filesystems/exec_wine.png -share/kde/icons/crystalsvg/32x32/filesystems/favorites.png -share/kde/icons/crystalsvg/32x32/filesystems/file_broken.png -share/kde/icons/crystalsvg/32x32/filesystems/file_important.png -share/kde/icons/crystalsvg/32x32/filesystems/file_locked.png -share/kde/icons/crystalsvg/32x32/filesystems/file_temporary.png -share/kde/icons/crystalsvg/32x32/filesystems/files.png share/kde/icons/crystalsvg/32x32/filesystems/folder.png -share/kde/icons/crystalsvg/32x32/filesystems/folder3.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_2cd.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_blue.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_blue_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_cd.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_cool.png share/kde/icons/crystalsvg/32x32/filesystems/folder_crystal.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_cyan.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_cyan_open.png +share/kde/icons/crystalsvg/32x32/filesystems/folder_favorite.png share/kde/icons/crystalsvg/32x32/filesystems/folder_green.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_green_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_green_side.png share/kde/icons/crystalsvg/32x32/filesystems/folder_grey.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_grey_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_grey_side.png share/kde/icons/crystalsvg/32x32/filesystems/folder_home.png +share/kde/icons/crystalsvg/32x32/filesystems/folder_home2.png share/kde/icons/crystalsvg/32x32/filesystems/folder_html.png share/kde/icons/crystalsvg/32x32/filesystems/folder_image.png share/kde/icons/crystalsvg/32x32/filesystems/folder_important.png share/kde/icons/crystalsvg/32x32/filesystems/folder_locked.png share/kde/icons/crystalsvg/32x32/filesystems/folder_man.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_midi.png share/kde/icons/crystalsvg/32x32/filesystems/folder_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_orange.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_orange_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_penguin.png +share/kde/icons/crystalsvg/32x32/filesystems/folder_print.png share/kde/icons/crystalsvg/32x32/filesystems/folder_red.png share/kde/icons/crystalsvg/32x32/filesystems/folder_red_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_red_side.png share/kde/icons/crystalsvg/32x32/filesystems/folder_sound.png share/kde/icons/crystalsvg/32x32/filesystems/folder_tar.png share/kde/icons/crystalsvg/32x32/filesystems/folder_txt.png share/kde/icons/crystalsvg/32x32/filesystems/folder_video.png share/kde/icons/crystalsvg/32x32/filesystems/folder_violet.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_violet_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_violet_side.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_wordprocessing.png share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png -share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow_side.png -share/kde/icons/crystalsvg/32x32/filesystems/ftp.png -share/kde/icons/crystalsvg/32x32/filesystems/home_blue.png -share/kde/icons/crystalsvg/32x32/filesystems/home_white.png share/kde/icons/crystalsvg/32x32/filesystems/link.png share/kde/icons/crystalsvg/32x32/filesystems/lockoverlay.png share/kde/icons/crystalsvg/32x32/filesystems/network.png share/kde/icons/crystalsvg/32x32/filesystems/network_local.png share/kde/icons/crystalsvg/32x32/filesystems/pipe.png -share/kde/icons/crystalsvg/32x32/filesystems/services.png -share/kde/icons/crystalsvg/32x32/filesystems/shredder.png -share/kde/icons/crystalsvg/32x32/filesystems/socket.png -share/kde/icons/crystalsvg/32x32/filesystems/temporary.png share/kde/icons/crystalsvg/32x32/filesystems/trashcan_empty.png share/kde/icons/crystalsvg/32x32/filesystems/trashcan_full.png share/kde/icons/crystalsvg/32x32/filesystems/www.png @@ -3141,10 +3542,11 @@ share/kde/icons/crystalsvg/32x32/filesystems/zip.png share/kde/icons/crystalsvg/32x32/mimetypes/applix.png share/kde/icons/crystalsvg/32x32/mimetypes/ascii.png share/kde/icons/crystalsvg/32x32/mimetypes/binary.png -share/kde/icons/crystalsvg/32x32/mimetypes/binary2.png share/kde/icons/crystalsvg/32x32/mimetypes/cdimage.png +share/kde/icons/crystalsvg/32x32/mimetypes/cdr.png share/kde/icons/crystalsvg/32x32/mimetypes/cdtrack.png share/kde/icons/crystalsvg/32x32/mimetypes/colorscm.png +share/kde/icons/crystalsvg/32x32/mimetypes/colorset.png share/kde/icons/crystalsvg/32x32/mimetypes/core.png share/kde/icons/crystalsvg/32x32/mimetypes/deb.png share/kde/icons/crystalsvg/32x32/mimetypes/document.png @@ -3157,40 +3559,41 @@ share/kde/icons/crystalsvg/32x32/mimetypes/font.png share/kde/icons/crystalsvg/32x32/mimetypes/font_bitmap.png share/kde/icons/crystalsvg/32x32/mimetypes/font_truetype.png share/kde/icons/crystalsvg/32x32/mimetypes/font_type1.png +share/kde/icons/crystalsvg/32x32/mimetypes/gettext.png share/kde/icons/crystalsvg/32x32/mimetypes/gf.png share/kde/icons/crystalsvg/32x32/mimetypes/html.png share/kde/icons/crystalsvg/32x32/mimetypes/image.png -share/kde/icons/crystalsvg/32x32/mimetypes/images.png share/kde/icons/crystalsvg/32x32/mimetypes/info.png +share/kde/icons/crystalsvg/32x32/mimetypes/karbon_karbon.png +share/kde/icons/crystalsvg/32x32/mimetypes/kchart_chrt.png +share/kde/icons/crystalsvg/32x32/mimetypes/kexi_kexi.png +share/kde/icons/crystalsvg/32x32/mimetypes/kformula_kfo.png +share/kde/icons/crystalsvg/32x32/mimetypes/kivio_flw.png share/kde/icons/crystalsvg/32x32/mimetypes/kmultiple.png +share/kde/icons/crystalsvg/32x32/mimetypes/kpresenter_kpr.png +share/kde/icons/crystalsvg/32x32/mimetypes/krita_kra.png +share/kde/icons/crystalsvg/32x32/mimetypes/kspread_ksp.png +share/kde/icons/crystalsvg/32x32/mimetypes/kugar_kud.png +share/kde/icons/crystalsvg/32x32/mimetypes/kword_kwd.png share/kde/icons/crystalsvg/32x32/mimetypes/log.png share/kde/icons/crystalsvg/32x32/mimetypes/make.png share/kde/icons/crystalsvg/32x32/mimetypes/man.png share/kde/icons/crystalsvg/32x32/mimetypes/message.png -share/kde/icons/crystalsvg/32x32/mimetypes/message2.png share/kde/icons/crystalsvg/32x32/mimetypes/metafont.png share/kde/icons/crystalsvg/32x32/mimetypes/midi.png share/kde/icons/crystalsvg/32x32/mimetypes/mime.png -share/kde/icons/crystalsvg/32x32/mimetypes/mime_ascii.png -share/kde/icons/crystalsvg/32x32/mimetypes/mime_audio.png -share/kde/icons/crystalsvg/32x32/mimetypes/mime_empty.png -share/kde/icons/crystalsvg/32x32/mimetypes/mime_track.png -share/kde/icons/crystalsvg/32x32/mimetypes/mime_video.png share/kde/icons/crystalsvg/32x32/mimetypes/misc_doc.png share/kde/icons/crystalsvg/32x32/mimetypes/netscape_doc.png share/kde/icons/crystalsvg/32x32/mimetypes/pdf.png share/kde/icons/crystalsvg/32x32/mimetypes/pk.png share/kde/icons/crystalsvg/32x32/mimetypes/postscript.png -share/kde/icons/crystalsvg/32x32/mimetypes/postscript2.png share/kde/icons/crystalsvg/32x32/mimetypes/quicktime.png share/kde/icons/crystalsvg/32x32/mimetypes/readme.png -share/kde/icons/crystalsvg/32x32/mimetypes/real.png share/kde/icons/crystalsvg/32x32/mimetypes/real_doc.png share/kde/icons/crystalsvg/32x32/mimetypes/recycled.png share/kde/icons/crystalsvg/32x32/mimetypes/resource.png share/kde/icons/crystalsvg/32x32/mimetypes/rpm.png share/kde/icons/crystalsvg/32x32/mimetypes/shellscript.png -share/kde/icons/crystalsvg/32x32/mimetypes/shellscript2.png share/kde/icons/crystalsvg/32x32/mimetypes/soffice.png share/kde/icons/crystalsvg/32x32/mimetypes/sound.png share/kde/icons/crystalsvg/32x32/mimetypes/source.png @@ -3204,6 +3607,7 @@ share/kde/icons/crystalsvg/32x32/mimetypes/source_l.png share/kde/icons/crystalsvg/32x32/mimetypes/source_moc.png share/kde/icons/crystalsvg/32x32/mimetypes/source_o.png share/kde/icons/crystalsvg/32x32/mimetypes/source_p.png +share/kde/icons/crystalsvg/32x32/mimetypes/source_php.png share/kde/icons/crystalsvg/32x32/mimetypes/source_pl.png share/kde/icons/crystalsvg/32x32/mimetypes/source_py.png share/kde/icons/crystalsvg/32x32/mimetypes/source_s.png @@ -3214,6 +3618,7 @@ share/kde/icons/crystalsvg/32x32/mimetypes/template_source.png share/kde/icons/crystalsvg/32x32/mimetypes/tex.png share/kde/icons/crystalsvg/32x32/mimetypes/tgz.png share/kde/icons/crystalsvg/32x32/mimetypes/txt.png +share/kde/icons/crystalsvg/32x32/mimetypes/txt2.png share/kde/icons/crystalsvg/32x32/mimetypes/unknown.png share/kde/icons/crystalsvg/32x32/mimetypes/vcalendar.png share/kde/icons/crystalsvg/32x32/mimetypes/vcard.png @@ -3234,6 +3639,7 @@ share/kde/icons/crystalsvg/48x48/devices/3floppy_mount.png share/kde/icons/crystalsvg/48x48/devices/3floppy_unmount.png share/kde/icons/crystalsvg/48x48/devices/5floppy_mount.png share/kde/icons/crystalsvg/48x48/devices/5floppy_unmount.png +share/kde/icons/crystalsvg/48x48/devices/blockdevice.png share/kde/icons/crystalsvg/48x48/devices/camera_mount.png share/kde/icons/crystalsvg/48x48/devices/camera_unmount.png share/kde/icons/crystalsvg/48x48/devices/cdaudio_mount.png @@ -3257,77 +3663,44 @@ share/kde/icons/crystalsvg/48x48/devices/pda_black.png share/kde/icons/crystalsvg/48x48/devices/pda_blue.png share/kde/icons/crystalsvg/48x48/devices/print_class.png share/kde/icons/crystalsvg/48x48/devices/printer1.png -share/kde/icons/crystalsvg/48x48/devices/printer2.png share/kde/icons/crystalsvg/48x48/devices/scanner.png share/kde/icons/crystalsvg/48x48/devices/tablet.png share/kde/icons/crystalsvg/48x48/devices/tv.png share/kde/icons/crystalsvg/48x48/devices/zip_mount.png share/kde/icons/crystalsvg/48x48/devices/zip_unmount.png -share/kde/icons/crystalsvg/48x48/filesystems/blockdevice.png share/kde/icons/crystalsvg/48x48/filesystems/chardevice.png share/kde/icons/crystalsvg/48x48/filesystems/desktop.png share/kde/icons/crystalsvg/48x48/filesystems/exec.png -share/kde/icons/crystalsvg/48x48/filesystems/exec_wine.png -share/kde/icons/crystalsvg/48x48/filesystems/file_broken.png -share/kde/icons/crystalsvg/48x48/filesystems/file_important.png -share/kde/icons/crystalsvg/48x48/filesystems/file_locked.png -share/kde/icons/crystalsvg/48x48/filesystems/file_temporary.png -share/kde/icons/crystalsvg/48x48/filesystems/files.png share/kde/icons/crystalsvg/48x48/filesystems/folder.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_blue.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_blue_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_blue_side.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_cd.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_cool.png share/kde/icons/crystalsvg/48x48/filesystems/folder_crystal.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_cyan.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_cyan_open.png +share/kde/icons/crystalsvg/48x48/filesystems/folder_favorite.png share/kde/icons/crystalsvg/48x48/filesystems/folder_green.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_green_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_green_side.png share/kde/icons/crystalsvg/48x48/filesystems/folder_grey.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_grey_side.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_gz.png share/kde/icons/crystalsvg/48x48/filesystems/folder_home.png +share/kde/icons/crystalsvg/48x48/filesystems/folder_home2.png share/kde/icons/crystalsvg/48x48/filesystems/folder_html.png share/kde/icons/crystalsvg/48x48/filesystems/folder_image.png share/kde/icons/crystalsvg/48x48/filesystems/folder_important.png +share/kde/icons/crystalsvg/48x48/filesystems/folder_inbox.png share/kde/icons/crystalsvg/48x48/filesystems/folder_locked.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_mail.png share/kde/icons/crystalsvg/48x48/filesystems/folder_man.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_midi.png share/kde/icons/crystalsvg/48x48/filesystems/folder_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_orange.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_orange_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_penguin.png +share/kde/icons/crystalsvg/48x48/filesystems/folder_outbox.png +share/kde/icons/crystalsvg/48x48/filesystems/folder_print.png share/kde/icons/crystalsvg/48x48/filesystems/folder_red.png share/kde/icons/crystalsvg/48x48/filesystems/folder_red_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_red_side.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_rpm.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_side.png share/kde/icons/crystalsvg/48x48/filesystems/folder_sound.png share/kde/icons/crystalsvg/48x48/filesystems/folder_tar.png share/kde/icons/crystalsvg/48x48/filesystems/folder_txt.png share/kde/icons/crystalsvg/48x48/filesystems/folder_video.png share/kde/icons/crystalsvg/48x48/filesystems/folder_violet.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_violet_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_violet_side.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_wordprocessing.png share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png -share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow_side.png -share/kde/icons/crystalsvg/48x48/filesystems/ftp.png -share/kde/icons/crystalsvg/48x48/filesystems/home_blue.png -share/kde/icons/crystalsvg/48x48/filesystems/home_white.png share/kde/icons/crystalsvg/48x48/filesystems/link.png share/kde/icons/crystalsvg/48x48/filesystems/lockoverlay.png share/kde/icons/crystalsvg/48x48/filesystems/network.png share/kde/icons/crystalsvg/48x48/filesystems/network_local.png share/kde/icons/crystalsvg/48x48/filesystems/pipe.png -share/kde/icons/crystalsvg/48x48/filesystems/services.png -share/kde/icons/crystalsvg/48x48/filesystems/shredder.png -share/kde/icons/crystalsvg/48x48/filesystems/socket.png -share/kde/icons/crystalsvg/48x48/filesystems/temporary.png +share/kde/icons/crystalsvg/48x48/filesystems/server.png share/kde/icons/crystalsvg/48x48/filesystems/trashcan_empty.png share/kde/icons/crystalsvg/48x48/filesystems/trashcan_full.png share/kde/icons/crystalsvg/48x48/filesystems/www.png @@ -3335,13 +3708,12 @@ share/kde/icons/crystalsvg/48x48/filesystems/zip.png share/kde/icons/crystalsvg/48x48/mimetypes/applix.png share/kde/icons/crystalsvg/48x48/mimetypes/ascii.png share/kde/icons/crystalsvg/48x48/mimetypes/binary.png -share/kde/icons/crystalsvg/48x48/mimetypes/binary2.png share/kde/icons/crystalsvg/48x48/mimetypes/cdimage.png share/kde/icons/crystalsvg/48x48/mimetypes/cdr.png share/kde/icons/crystalsvg/48x48/mimetypes/cdtrack.png share/kde/icons/crystalsvg/48x48/mimetypes/colorscm.png +share/kde/icons/crystalsvg/48x48/mimetypes/colorset.png share/kde/icons/crystalsvg/48x48/mimetypes/core.png -share/kde/icons/crystalsvg/48x48/mimetypes/core2.png share/kde/icons/crystalsvg/48x48/mimetypes/deb.png share/kde/icons/crystalsvg/48x48/mimetypes/document.png share/kde/icons/crystalsvg/48x48/mimetypes/document2.png @@ -3351,46 +3723,42 @@ share/kde/icons/crystalsvg/48x48/mimetypes/font.png share/kde/icons/crystalsvg/48x48/mimetypes/font_bitmap.png share/kde/icons/crystalsvg/48x48/mimetypes/font_truetype.png share/kde/icons/crystalsvg/48x48/mimetypes/font_type1.png -share/kde/icons/crystalsvg/48x48/mimetypes/fonts_bitmap.png +share/kde/icons/crystalsvg/48x48/mimetypes/gettext.png share/kde/icons/crystalsvg/48x48/mimetypes/gf.png share/kde/icons/crystalsvg/48x48/mimetypes/html.png share/kde/icons/crystalsvg/48x48/mimetypes/image.png -share/kde/icons/crystalsvg/48x48/mimetypes/images.png share/kde/icons/crystalsvg/48x48/mimetypes/info.png +share/kde/icons/crystalsvg/48x48/mimetypes/karbon_karbon.png +share/kde/icons/crystalsvg/48x48/mimetypes/kchart_chrt.png +share/kde/icons/crystalsvg/48x48/mimetypes/kexi_kexi.png +share/kde/icons/crystalsvg/48x48/mimetypes/kformula_kfo.png +share/kde/icons/crystalsvg/48x48/mimetypes/kivio_flw.png share/kde/icons/crystalsvg/48x48/mimetypes/kmultiple.png +share/kde/icons/crystalsvg/48x48/mimetypes/koffice.png +share/kde/icons/crystalsvg/48x48/mimetypes/kpresenter_kpr.png +share/kde/icons/crystalsvg/48x48/mimetypes/krita_kra.png +share/kde/icons/crystalsvg/48x48/mimetypes/kspread_ksp.png +share/kde/icons/crystalsvg/48x48/mimetypes/kugar_kud.png +share/kde/icons/crystalsvg/48x48/mimetypes/kword_kwd.png share/kde/icons/crystalsvg/48x48/mimetypes/log.png share/kde/icons/crystalsvg/48x48/mimetypes/make.png -share/kde/icons/crystalsvg/48x48/mimetypes/make2.png share/kde/icons/crystalsvg/48x48/mimetypes/man.png share/kde/icons/crystalsvg/48x48/mimetypes/message.png -share/kde/icons/crystalsvg/48x48/mimetypes/message2.png share/kde/icons/crystalsvg/48x48/mimetypes/metafont.png share/kde/icons/crystalsvg/48x48/mimetypes/midi.png share/kde/icons/crystalsvg/48x48/mimetypes/mime.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_ascii.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_empty.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_html.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_koffice.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_soffice.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_sound.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_track.png -share/kde/icons/crystalsvg/48x48/mimetypes/mime_txt.png share/kde/icons/crystalsvg/48x48/mimetypes/misc_doc.png share/kde/icons/crystalsvg/48x48/mimetypes/netscape_doc.png share/kde/icons/crystalsvg/48x48/mimetypes/pdf.png -share/kde/icons/crystalsvg/48x48/mimetypes/php.png share/kde/icons/crystalsvg/48x48/mimetypes/pk.png share/kde/icons/crystalsvg/48x48/mimetypes/postscript.png -share/kde/icons/crystalsvg/48x48/mimetypes/postscript2.png share/kde/icons/crystalsvg/48x48/mimetypes/quicktime.png share/kde/icons/crystalsvg/48x48/mimetypes/readme.png -share/kde/icons/crystalsvg/48x48/mimetypes/real.png share/kde/icons/crystalsvg/48x48/mimetypes/real_doc.png share/kde/icons/crystalsvg/48x48/mimetypes/recycled.png share/kde/icons/crystalsvg/48x48/mimetypes/resource.png share/kde/icons/crystalsvg/48x48/mimetypes/rpm.png share/kde/icons/crystalsvg/48x48/mimetypes/shellscript.png -share/kde/icons/crystalsvg/48x48/mimetypes/shellscript2.png share/kde/icons/crystalsvg/48x48/mimetypes/soffice.png share/kde/icons/crystalsvg/48x48/mimetypes/sound.png share/kde/icons/crystalsvg/48x48/mimetypes/source.png @@ -3403,6 +3771,7 @@ share/kde/icons/crystalsvg/48x48/mimetypes/source_l.png share/kde/icons/crystalsvg/48x48/mimetypes/source_moc.png share/kde/icons/crystalsvg/48x48/mimetypes/source_o.png share/kde/icons/crystalsvg/48x48/mimetypes/source_p.png +share/kde/icons/crystalsvg/48x48/mimetypes/source_php.png share/kde/icons/crystalsvg/48x48/mimetypes/source_pl.png share/kde/icons/crystalsvg/48x48/mimetypes/source_py.png share/kde/icons/crystalsvg/48x48/mimetypes/source_s.png @@ -3413,8 +3782,8 @@ share/kde/icons/crystalsvg/48x48/mimetypes/template_source.png share/kde/icons/crystalsvg/48x48/mimetypes/tex.png share/kde/icons/crystalsvg/48x48/mimetypes/tgz.png share/kde/icons/crystalsvg/48x48/mimetypes/txt.png +share/kde/icons/crystalsvg/48x48/mimetypes/txt2.png share/kde/icons/crystalsvg/48x48/mimetypes/unknown.png -share/kde/icons/crystalsvg/48x48/mimetypes/unknown2.png share/kde/icons/crystalsvg/48x48/mimetypes/vcalendar.png share/kde/icons/crystalsvg/48x48/mimetypes/vcard.png share/kde/icons/crystalsvg/48x48/mimetypes/vectorgfx.png @@ -3427,6 +3796,7 @@ share/kde/icons/crystalsvg/64x64/devices/3floppy_mount.png share/kde/icons/crystalsvg/64x64/devices/3floppy_unmount.png share/kde/icons/crystalsvg/64x64/devices/5floppy_mount.png share/kde/icons/crystalsvg/64x64/devices/5floppy_unmount.png +share/kde/icons/crystalsvg/64x64/devices/blockdevice.png share/kde/icons/crystalsvg/64x64/devices/camera_mount.png share/kde/icons/crystalsvg/64x64/devices/camera_unmount.png share/kde/icons/crystalsvg/64x64/devices/cdaudio_mount.png @@ -3442,6 +3812,7 @@ share/kde/icons/crystalsvg/64x64/devices/hdd_unmount.png share/kde/icons/crystalsvg/64x64/devices/joystick.png share/kde/icons/crystalsvg/64x64/devices/memory.png share/kde/icons/crystalsvg/64x64/devices/mo_mount.png +share/kde/icons/crystalsvg/64x64/devices/mo_unmount.png share/kde/icons/crystalsvg/64x64/devices/mouse.png share/kde/icons/crystalsvg/64x64/devices/nfs_mount.png share/kde/icons/crystalsvg/64x64/devices/nfs_unmount.png @@ -3449,81 +3820,57 @@ share/kde/icons/crystalsvg/64x64/devices/pda_black.png share/kde/icons/crystalsvg/64x64/devices/pda_blue.png share/kde/icons/crystalsvg/64x64/devices/print_class.png share/kde/icons/crystalsvg/64x64/devices/printer1.png -share/kde/icons/crystalsvg/64x64/devices/printer2.png share/kde/icons/crystalsvg/64x64/devices/scanner.png share/kde/icons/crystalsvg/64x64/devices/tablet.png share/kde/icons/crystalsvg/64x64/devices/tv.png share/kde/icons/crystalsvg/64x64/devices/zip_mount.png share/kde/icons/crystalsvg/64x64/devices/zip_unmount.png -share/kde/icons/crystalsvg/64x64/filesystems/blockdevice.png share/kde/icons/crystalsvg/64x64/filesystems/chardevice.png share/kde/icons/crystalsvg/64x64/filesystems/desktop.png share/kde/icons/crystalsvg/64x64/filesystems/exec.png -share/kde/icons/crystalsvg/64x64/filesystems/exec_wine.png -share/kde/icons/crystalsvg/64x64/filesystems/file_broken.png -share/kde/icons/crystalsvg/64x64/filesystems/file_important.png -share/kde/icons/crystalsvg/64x64/filesystems/file_locked.png -share/kde/icons/crystalsvg/64x64/filesystems/file_temporary.png -share/kde/icons/crystalsvg/64x64/filesystems/files.png share/kde/icons/crystalsvg/64x64/filesystems/folder.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_blue.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_blue_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_cd.png share/kde/icons/crystalsvg/64x64/filesystems/folder_crystal.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_cyan.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_cyan_open.png +share/kde/icons/crystalsvg/64x64/filesystems/folder_favorite.png share/kde/icons/crystalsvg/64x64/filesystems/folder_green.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_green_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_green_side.png share/kde/icons/crystalsvg/64x64/filesystems/folder_grey.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_grey_side.png share/kde/icons/crystalsvg/64x64/filesystems/folder_home.png +share/kde/icons/crystalsvg/64x64/filesystems/folder_home2.png share/kde/icons/crystalsvg/64x64/filesystems/folder_html.png +share/kde/icons/crystalsvg/64x64/filesystems/folder_image.png share/kde/icons/crystalsvg/64x64/filesystems/folder_important.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_kde.png share/kde/icons/crystalsvg/64x64/filesystems/folder_locked.png share/kde/icons/crystalsvg/64x64/filesystems/folder_man.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_midi.png share/kde/icons/crystalsvg/64x64/filesystems/folder_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_orange.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_orange_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_penguin.png +share/kde/icons/crystalsvg/64x64/filesystems/folder_print.png share/kde/icons/crystalsvg/64x64/filesystems/folder_red.png share/kde/icons/crystalsvg/64x64/filesystems/folder_red_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_red_side.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_side.png share/kde/icons/crystalsvg/64x64/filesystems/folder_sound.png share/kde/icons/crystalsvg/64x64/filesystems/folder_tar.png share/kde/icons/crystalsvg/64x64/filesystems/folder_txt.png share/kde/icons/crystalsvg/64x64/filesystems/folder_video.png share/kde/icons/crystalsvg/64x64/filesystems/folder_violet.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_violet_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_violet_side.png share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png -share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow_side.png -share/kde/icons/crystalsvg/64x64/filesystems/home_blue.png -share/kde/icons/crystalsvg/64x64/filesystems/home_white.png -share/kde/icons/crystalsvg/64x64/filesystems/link.png share/kde/icons/crystalsvg/64x64/filesystems/lockoverlay.png share/kde/icons/crystalsvg/64x64/filesystems/network.png share/kde/icons/crystalsvg/64x64/filesystems/network_local.png share/kde/icons/crystalsvg/64x64/filesystems/pipe.png -share/kde/icons/crystalsvg/64x64/filesystems/services.png -share/kde/icons/crystalsvg/64x64/filesystems/temporary.png share/kde/icons/crystalsvg/64x64/filesystems/trashcan_empty.png share/kde/icons/crystalsvg/64x64/filesystems/trashcan_full.png +share/kde/icons/crystalsvg/64x64/filesystems/www.png share/kde/icons/crystalsvg/64x64/filesystems/zip.png share/kde/icons/crystalsvg/64x64/mimetypes/applix.png +share/kde/icons/crystalsvg/64x64/mimetypes/ascii.png share/kde/icons/crystalsvg/64x64/mimetypes/binary.png -share/kde/icons/crystalsvg/64x64/mimetypes/binary2.png share/kde/icons/crystalsvg/64x64/mimetypes/cdimage.png +share/kde/icons/crystalsvg/64x64/mimetypes/cdr.png share/kde/icons/crystalsvg/64x64/mimetypes/cdtrack.png +share/kde/icons/crystalsvg/64x64/mimetypes/colorset.png share/kde/icons/crystalsvg/64x64/mimetypes/core.png share/kde/icons/crystalsvg/64x64/mimetypes/deb.png share/kde/icons/crystalsvg/64x64/mimetypes/document.png share/kde/icons/crystalsvg/64x64/mimetypes/document2.png share/kde/icons/crystalsvg/64x64/mimetypes/encrypted.png +share/kde/icons/crystalsvg/64x64/mimetypes/font.png share/kde/icons/crystalsvg/64x64/mimetypes/font_bitmap.png share/kde/icons/crystalsvg/64x64/mimetypes/html.png share/kde/icons/crystalsvg/64x64/mimetypes/image.png @@ -3532,21 +3879,18 @@ share/kde/icons/crystalsvg/64x64/mimetypes/kmultiple.png share/kde/icons/crystalsvg/64x64/mimetypes/make.png share/kde/icons/crystalsvg/64x64/mimetypes/man.png share/kde/icons/crystalsvg/64x64/mimetypes/message.png -share/kde/icons/crystalsvg/64x64/mimetypes/message2.png +share/kde/icons/crystalsvg/64x64/mimetypes/metafont.png share/kde/icons/crystalsvg/64x64/mimetypes/midi.png share/kde/icons/crystalsvg/64x64/mimetypes/mime.png -share/kde/icons/crystalsvg/64x64/mimetypes/mime_ascii.png -share/kde/icons/crystalsvg/64x64/mimetypes/mime_empty.png share/kde/icons/crystalsvg/64x64/mimetypes/misc_doc.png share/kde/icons/crystalsvg/64x64/mimetypes/netscape_doc.png share/kde/icons/crystalsvg/64x64/mimetypes/pdf.png share/kde/icons/crystalsvg/64x64/mimetypes/postscript.png -share/kde/icons/crystalsvg/64x64/mimetypes/real.png share/kde/icons/crystalsvg/64x64/mimetypes/real_doc.png share/kde/icons/crystalsvg/64x64/mimetypes/recycled.png +share/kde/icons/crystalsvg/64x64/mimetypes/resource.png share/kde/icons/crystalsvg/64x64/mimetypes/rpm.png share/kde/icons/crystalsvg/64x64/mimetypes/shellscript.png -share/kde/icons/crystalsvg/64x64/mimetypes/shellscript2.png share/kde/icons/crystalsvg/64x64/mimetypes/soffice.png share/kde/icons/crystalsvg/64x64/mimetypes/sound.png share/kde/icons/crystalsvg/64x64/mimetypes/source.png @@ -3562,16 +3906,17 @@ share/kde/icons/crystalsvg/64x64/mimetypes/source_p.png share/kde/icons/crystalsvg/64x64/mimetypes/source_py.png share/kde/icons/crystalsvg/64x64/mimetypes/source_s.png share/kde/icons/crystalsvg/64x64/mimetypes/source_y.png -share/kde/icons/crystalsvg/64x64/mimetypes/sownd.png share/kde/icons/crystalsvg/64x64/mimetypes/spreadsheet.png share/kde/icons/crystalsvg/64x64/mimetypes/tar.png +share/kde/icons/crystalsvg/64x64/mimetypes/template_source.png share/kde/icons/crystalsvg/64x64/mimetypes/tgz.png share/kde/icons/crystalsvg/64x64/mimetypes/txt.png +share/kde/icons/crystalsvg/64x64/mimetypes/txt2.png share/kde/icons/crystalsvg/64x64/mimetypes/unknown.png share/kde/icons/crystalsvg/64x64/mimetypes/video.png share/kde/icons/crystalsvg/64x64/mimetypes/widget_doc.png share/kde/icons/crystalsvg/64x64/mimetypes/wordprocessing.png -share/kde/icons/crystalsvg/index.desktop +share/kde/icons/crystalsvg/index.theme share/kde/icons/crystalsvg/scalable/apps/kate.svgz share/kde/icons/crystalsvg/scalable/apps/khelpcenter.svgz share/kde/icons/crystalsvg/scalable/apps/klipper.svgz @@ -3642,7 +3987,9 @@ share/kde/icons/crystalsvg/scalable/filesystems/folder_cyan_open.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_green.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_green_open.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_grey.svgz +share/kde/icons/crystalsvg/scalable/filesystems/folder_home.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_html.svgz +share/kde/icons/crystalsvg/scalable/filesystems/folder_image.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_important.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_locked.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_man.svgz @@ -3651,9 +3998,9 @@ share/kde/icons/crystalsvg/scalable/filesystems/folder_orange.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_red.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_red_open.svgz +share/kde/icons/crystalsvg/scalable/filesystems/folder_sound.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_tar.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_txt.svgz -share/kde/icons/crystalsvg/scalable/filesystems/folder_video.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_violet.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_violet_open.svgz share/kde/icons/crystalsvg/scalable/filesystems/folder_yellow.svgz @@ -3669,21 +4016,80 @@ share/kde/icons/crystalsvg/scalable/filesystems/temporary.svgz share/kde/icons/crystalsvg/scalable/filesystems/trashcan_empty.svgz share/kde/icons/crystalsvg/scalable/filesystems/trashcan_full.svgz share/kde/icons/crystalsvg/scalable/filesystems/zip.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/applix.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/ascii.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/binary.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/cdr.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/core.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/deb.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/document.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/document2.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/dvi.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/empty.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/font.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/font_bitmap.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/gf.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/image.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/kmultiple.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/kugardata.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/log.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/make.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/message.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/metafont.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/mime_ascii.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/mime_empty.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/mozilla_doc.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/pdf.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/pk.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/resource.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/rpm.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/soffice.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_c.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_cpp.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_f.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_h.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_j.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_java.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_l.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_moc.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_o.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_p.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_pl.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_py.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_s.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/source_y.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/spreadsheet.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/tar.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/tex.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/tgz.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/txt.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/txt2.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/unknown.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/vcalendar.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/vcard.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/vectorgfx.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/video.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz +share/kde/icons/crystalsvg/scalable/mimetypes/zip.svgz share/kde/icons/default.kde -share/kde/icons/hicolor/index.desktop +share/kde/icons/hicolor/index.theme share/kde/locale/all_languages share/kde/mimelnk/all/all.desktop share/kde/mimelnk/all/allfiles.desktop share/kde/mimelnk/application/illustrator.desktop +share/kde/mimelnk/application/mathml+xml.desktop share/kde/mimelnk/application/msexcel.desktop -share/kde/mimelnk/application/msexcel2.desktop share/kde/mimelnk/application/mspowerpoint.desktop share/kde/mimelnk/application/msword.desktop -share/kde/mimelnk/application/msword2.desktop share/kde/mimelnk/application/octet-stream.desktop +share/kde/mimelnk/application/ogg.desktop share/kde/mimelnk/application/pdf.desktop share/kde/mimelnk/application/pgp-encrypted.desktop +share/kde/mimelnk/application/pgp-keys.desktop share/kde/mimelnk/application/pgp-signature.desktop +share/kde/mimelnk/application/pgp.desktop share/kde/mimelnk/application/pkcs10.desktop share/kde/mimelnk/application/pkcs7-mime.desktop share/kde/mimelnk/application/pkcs7-signature.desktop @@ -3693,17 +4099,31 @@ share/kde/mimelnk/application/smil.desktop share/kde/mimelnk/application/starcalc.desktop share/kde/mimelnk/application/starimpress.desktop share/kde/mimelnk/application/starwriter.desktop +share/kde/mimelnk/application/vnd.mozilla.xul+xml.desktop share/kde/mimelnk/application/vnd.ms-asf.desktop +share/kde/mimelnk/application/vnd.ms-excel.desktop +share/kde/mimelnk/application/vnd.ms-word.desktop +share/kde/mimelnk/application/vnd.palm.desktop +share/kde/mimelnk/application/vnd.rn-realmedia.desktop +share/kde/mimelnk/application/vnd.sun.xml.calc.desktop +share/kde/mimelnk/application/vnd.sun.xml.draw.desktop +share/kde/mimelnk/application/vnd.sun.xml.impress.desktop +share/kde/mimelnk/application/vnd.sun.xml.writer.desktop share/kde/mimelnk/application/wordperfect.desktop share/kde/mimelnk/application/x-abiword.desktop +share/kde/mimelnk/application/x-ace.desktop +share/kde/mimelnk/application/x-afm.desktop share/kde/mimelnk/application/x-amipro.desktop share/kde/mimelnk/application/x-applix.desktop share/kde/mimelnk/application/x-applixgraphics.desktop share/kde/mimelnk/application/x-applixspread.desktop share/kde/mimelnk/application/x-applixword.desktop +share/kde/mimelnk/application/x-arc.desktop share/kde/mimelnk/application/x-archive.desktop share/kde/mimelnk/application/x-arj.desktop share/kde/mimelnk/application/x-awk.desktop +share/kde/mimelnk/application/x-bittorrent.desktop +share/kde/mimelnk/application/x-bz2dvi.desktop share/kde/mimelnk/application/x-bzip.desktop share/kde/mimelnk/application/x-bzip2.desktop share/kde/mimelnk/application/x-cda.desktop @@ -3712,20 +4132,26 @@ share/kde/mimelnk/application/x-core.desktop share/kde/mimelnk/application/x-cpio.desktop share/kde/mimelnk/application/x-cue.desktop share/kde/mimelnk/application/x-dbase.desktop +share/kde/mimelnk/application/x-deb.desktop share/kde/mimelnk/application/x-designer.desktop share/kde/mimelnk/application/x-desktop.desktop share/kde/mimelnk/application/x-dvi.desktop share/kde/mimelnk/application/x-executable.desktop share/kde/mimelnk/application/x-font-bdf.desktop share/kde/mimelnk/application/x-font-ghostscript.desktop +share/kde/mimelnk/application/x-font-otf.desktop share/kde/mimelnk/application/x-font-pcf.desktop share/kde/mimelnk/application/x-font-snf.desktop share/kde/mimelnk/application/x-font-speedo.desktop +share/kde/mimelnk/application/x-font-ttc.desktop share/kde/mimelnk/application/x-font-ttf.desktop share/kde/mimelnk/application/x-font-type1.desktop +share/kde/mimelnk/application/x-gettext.desktop share/kde/mimelnk/application/x-gnumeric.desktop share/kde/mimelnk/application/x-graphite.desktop +share/kde/mimelnk/application/x-gzdvi.desktop share/kde/mimelnk/application/x-gzip.desktop +share/kde/mimelnk/application/x-gzpostscript.desktop share/kde/mimelnk/application/x-hancomword.desktop share/kde/mimelnk/application/x-iso.desktop share/kde/mimelnk/application/x-jar.desktop @@ -3733,6 +4159,8 @@ share/kde/mimelnk/application/x-java-applet.desktop share/kde/mimelnk/application/x-java.desktop share/kde/mimelnk/application/x-karbon.desktop share/kde/mimelnk/application/x-kchart.desktop +share/kde/mimelnk/application/x-kcsrc.desktop +share/kde/mimelnk/application/x-kde-wallet.desktop share/kde/mimelnk/application/x-kformula.desktop share/kde/mimelnk/application/x-kivio.desktop share/kde/mimelnk/application/x-kontour.desktop @@ -3741,6 +4169,7 @@ share/kde/mimelnk/application/x-kpresenter.desktop share/kde/mimelnk/application/x-krita.desktop share/kde/mimelnk/application/x-kspread-crypt.desktop share/kde/mimelnk/application/x-kspread.desktop +share/kde/mimelnk/application/x-kudesigner.desktop share/kde/mimelnk/application/x-kugar.desktop share/kde/mimelnk/application/x-kword-crypt.desktop share/kde/mimelnk/application/x-kword.desktop @@ -3748,18 +4177,25 @@ share/kde/mimelnk/application/x-lha.desktop share/kde/mimelnk/application/x-linguist.desktop share/kde/mimelnk/application/x-lyx.desktop share/kde/mimelnk/application/x-lzop.desktop +share/kde/mimelnk/application/x-magicpoint.desktop +share/kde/mimelnk/application/x-msaccess.desktop share/kde/mimelnk/application/x-msdos-program.desktop share/kde/mimelnk/application/x-mswinurl.desktop share/kde/mimelnk/application/x-mswrite.desktop share/kde/mimelnk/application/x-object.desktop share/kde/mimelnk/application/x-ogg.desktop +share/kde/mimelnk/application/x-ooimpress.desktop +share/kde/mimelnk/application/x-oowriter.desktop +share/kde/mimelnk/application/x-perl-module.desktop share/kde/mimelnk/application/x-perl.desktop +share/kde/mimelnk/application/x-php.desktop share/kde/mimelnk/application/x-pkcs12.desktop share/kde/mimelnk/application/x-python-bytecode.desktop share/kde/mimelnk/application/x-python.desktop share/kde/mimelnk/application/x-quattropro.desktop share/kde/mimelnk/application/x-rar.desktop share/kde/mimelnk/application/x-rpm.desktop +share/kde/mimelnk/application/x-ruby.desktop share/kde/mimelnk/application/x-sharedlib.desktop share/kde/mimelnk/application/x-shellscript.desktop share/kde/mimelnk/application/x-shockwave-flash.desktop @@ -3774,26 +4210,40 @@ share/kde/mimelnk/application/x-trash.desktop share/kde/mimelnk/application/x-troff-man.desktop share/kde/mimelnk/application/x-troff.desktop share/kde/mimelnk/application/x-tzo.desktop +share/kde/mimelnk/application/x-vnd.kde.kexi.desktop +share/kde/mimelnk/application/x-vnd.kde.kplato.desktop +share/kde/mimelnk/application/x-vnd.kde.kugar.mixed.desktop share/kde/mimelnk/application/x-x509-ca-cert.desktop share/kde/mimelnk/application/x-zerosize.desktop share/kde/mimelnk/application/x-zip.desktop share/kde/mimelnk/application/x-zoo.desktop share/kde/mimelnk/application/xhtml+xml.desktop +share/kde/mimelnk/audio/aac.desktop +share/kde/mimelnk/audio/ac3.desktop share/kde/mimelnk/audio/basic.desktop +share/kde/mimelnk/audio/mp4.desktop share/kde/mimelnk/audio/vnd.rn-realaudio.desktop +share/kde/mimelnk/audio/vorbis.desktop share/kde/mimelnk/audio/x-adpcm.desktop share/kde/mimelnk/audio/x-aiff.desktop +share/kde/mimelnk/audio/x-flac.desktop +share/kde/mimelnk/audio/x-matroska.desktop share/kde/mimelnk/audio/x-midi.desktop share/kde/mimelnk/audio/x-mod.desktop share/kde/mimelnk/audio/x-mp3.desktop share/kde/mimelnk/audio/x-mpegurl.desktop +share/kde/mimelnk/audio/x-oggflac.desktop share/kde/mimelnk/audio/x-pn-realaudio.desktop share/kde/mimelnk/audio/x-scpls.desktop +share/kde/mimelnk/audio/x-speex.desktop +share/kde/mimelnk/audio/x-vorbis.desktop share/kde/mimelnk/audio/x-wav.desktop share/kde/mimelnk/image/cgm.desktop share/kde/mimelnk/image/fax-g3.desktop share/kde/mimelnk/image/gif.desktop +share/kde/mimelnk/image/jp2.desktop share/kde/mimelnk/image/jpeg.desktop +share/kde/mimelnk/image/pjpeg.desktop share/kde/mimelnk/image/png.desktop share/kde/mimelnk/image/svg+xml.desktop share/kde/mimelnk/image/tiff.desktop @@ -3809,9 +4259,12 @@ share/kde/mimelnk/image/x-portable-bitmap.desktop share/kde/mimelnk/image/x-portable-greymap.desktop share/kde/mimelnk/image/x-portable-pixmap.desktop share/kde/mimelnk/image/x-targa.desktop +share/kde/mimelnk/image/x-vnd.adobe.photoshop.desktop +share/kde/mimelnk/image/x-vnd.trolltech.qpicture.desktop share/kde/mimelnk/image/x-wmf.desktop share/kde/mimelnk/image/x-xbm.desktop share/kde/mimelnk/image/x-xcf-gimp.desktop +share/kde/mimelnk/image/x-xcursor.desktop share/kde/mimelnk/image/x-xfig.desktop share/kde/mimelnk/image/x-xpm.desktop share/kde/mimelnk/inode/block.desktop @@ -3823,11 +4276,13 @@ share/kde/mimelnk/inode/socket.desktop share/kde/mimelnk/magic share/kde/mimelnk/message/news.desktop share/kde/mimelnk/message/rfc822.desktop +share/kde/mimelnk/model/vrml.desktop share/kde/mimelnk/multipart/mixed.desktop share/kde/mimelnk/multipart/x-mixed-replace.desktop share/kde/mimelnk/text/calendar.desktop share/kde/mimelnk/text/css.desktop -share/kde/mimelnk/text/english.desktop +share/kde/mimelnk/text/docbook.desktop +share/kde/mimelnk/text/enriched.desktop share/kde/mimelnk/text/html.desktop share/kde/mimelnk/text/plain.desktop share/kde/mimelnk/text/rdf.desktop @@ -3846,6 +4301,7 @@ share/kde/mimelnk/text/x-diff.desktop share/kde/mimelnk/text/x-java.desktop share/kde/mimelnk/text/x-katefilelist.desktop share/kde/mimelnk/text/x-latex.desktop +share/kde/mimelnk/text/x-ldif.desktop share/kde/mimelnk/text/x-log.desktop share/kde/mimelnk/text/x-lyx.desktop share/kde/mimelnk/text/x-makefile.desktop @@ -3861,15 +4317,24 @@ share/kde/mimelnk/text/x-vcard.desktop share/kde/mimelnk/text/x-xslfo.desktop share/kde/mimelnk/text/x-xslt.desktop share/kde/mimelnk/text/xml.desktop +share/kde/mimelnk/video/mp4.desktop share/kde/mimelnk/video/mpeg.desktop share/kde/mimelnk/video/quicktime.desktop +share/kde/mimelnk/video/vnd.rn-realvideo.desktop share/kde/mimelnk/video/x-flic.desktop +share/kde/mimelnk/video/x-matroska.desktop share/kde/mimelnk/video/x-mng.desktop +share/kde/mimelnk/video/x-ms-asf.desktop +share/kde/mimelnk/video/x-ms-wmv.desktop share/kde/mimelnk/video/x-msvideo.desktop +share/kde/mimelnk/video/x-ogm.desktop +share/kde/mimelnk/video/x-theora.desktop share/kde/services/bmp.kimgio +share/kde/services/data.protocol share/kde/services/eps.kimgio share/kde/services/file.protocol share/kde/services/ftp.protocol +share/kde/services/ghelp.protocol share/kde/services/gif.kimgio share/kde/services/help.protocol share/kde/services/http.protocol @@ -3884,6 +4349,8 @@ share/kde/services/kded/kcookiejar.desktop share/kde/services/kded/kdeprintd.desktop share/kde/services/kded/kpasswdserver.desktop share/kde/services/kded/kssld.desktop +share/kde/services/kded/kwalletd.desktop +share/kde/services/kded/proxyscout.desktop share/kde/services/kgzipfilter.desktop share/kde/services/khtml.desktop share/kde/services/khtmlimage.desktop @@ -3892,12 +4359,17 @@ share/kde/services/kjavaappletviewer.desktop share/kde/services/kmailservice.protocol share/kde/services/kmultipart.desktop share/kde/services/knotify.desktop -share/kde/services/krl.kimgio +share/kde/services/kresources/kabc/dir.desktop +share/kde/services/kresources/kabc/file.desktop +share/kde/services/kresources/kabc/ldapkio.desktop +share/kde/services/kresources/kabc/net.desktop share/kde/services/ktexteditor_insertfile.desktop share/kde/services/ktexteditor_isearch.desktop share/kde/services/ktexteditor_kdatatool.desktop share/kde/services/metainfo.protocol +share/kde/services/mms.protocol share/kde/services/pbm.kimgio +share/kde/services/pcx.kimgio share/kde/services/pgm.kimgio share/kde/services/png.kimgio share/kde/services/ppm.kimgio @@ -3905,6 +4377,7 @@ share/kde/services/rlogin.protocol share/kde/services/rtsp.protocol share/kde/services/shellscript.desktop share/kde/services/telnet.protocol +share/kde/services/tga.kimgio share/kde/services/tiff.kimgio share/kde/services/webdav.protocol share/kde/services/webdavs.protocol @@ -3913,6 +4386,7 @@ share/kde/services/xpm.kimgio share/kde/services/xv.kimgio share/kde/servicetypes/application.desktop share/kde/servicetypes/browserview.desktop +share/kde/servicetypes/kbytesedit.desktop share/kde/servicetypes/kcmodule.desktop share/kde/servicetypes/kcomprfilter.desktop share/kde/servicetypes/kdatatool.desktop @@ -3921,8 +4395,10 @@ share/kde/servicetypes/kfileplugin.desktop share/kde/servicetypes/kmediaplayer.desktop share/kde/servicetypes/kmediaplayerengine.desktop share/kde/servicetypes/kpart.desktop +share/kde/servicetypes/kplugininfo.desktop share/kde/servicetypes/kpropsdlgplugin.desktop share/kde/servicetypes/kregexpeditor.desktop +share/kde/servicetypes/kresources_plugin.desktop share/kde/servicetypes/krop.desktop share/kde/servicetypes/krwp.desktop share/kde/servicetypes/kscan.desktop @@ -3933,11 +4409,14 @@ share/kde/servicetypes/kurifilterplugin.desktop share/kde/servicetypes/renamedlgplugin.desktop share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/servicetypes +@dirrm share/kde/services/kresources/kabc +@dirrm share/kde/services/kresources @dirrm share/kde/services/kded @dirrm share/kde/services @dirrm share/kde/mimelnk/video @dirrm share/kde/mimelnk/text @dirrm share/kde/mimelnk/multipart +@dirrm share/kde/mimelnk/model @dirrm share/kde/mimelnk/message @dirrm share/kde/mimelnk/inode @dirrm share/kde/mimelnk/image @@ -3946,6 +4425,7 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/mimelnk/all @dirrm share/kde/mimelnk @dirrm share/kde/locale +@dirrm share/kde/icons/crystalsvg/scalable/mimetypes @dirrm share/kde/icons/crystalsvg/scalable/filesystems @dirrm share/kde/icons/crystalsvg/scalable/devices @dirrm share/kde/icons/crystalsvg/scalable/apps @@ -3968,22 +4448,25 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/icons/crystalsvg/32x32/actions @dirrm share/kde/icons/crystalsvg/32x32 @dirrm share/kde/icons/crystalsvg/22x22/mimetypes +@dirrm share/kde/icons/crystalsvg/22x22/filesystems @exec ${MKDIR} %D/share/kde/icons/crystalsvg/22x22/actions/kde @dirrm share/kde/icons/crystalsvg/22x22/actions/kde @dirrm share/kde/icons/crystalsvg/22x22/actions @dirrm share/kde/icons/crystalsvg/22x22 -@dirrm share/kde/icons/crystalsvg/16x16/mimetypes/pdf @dirrm share/kde/icons/crystalsvg/16x16/mimetypes @dirrm share/kde/icons/crystalsvg/16x16/filesystems @dirrm share/kde/icons/crystalsvg/16x16/devices @dirrm share/kde/icons/crystalsvg/16x16/actions @dirrm share/kde/icons/crystalsvg/16x16 @dirrm share/kde/icons/crystalsvg/128x128/mimetypes +@dirrm share/kde/icons/crystalsvg/128x128/filesystems +@dirrm share/kde/icons/crystalsvg/128x128/devices @dirrm share/kde/icons/crystalsvg/128x128 @dirrm share/kde/icons/crystalsvg @dirrm share/kde/config/ui @dirrm share/kde/config/colors @dirrm share/kde/config +@dirrm share/kde/apps/proxyscout @dirrm share/kde/apps/ktexteditor_kdatatool @dirrm share/kde/apps/ktexteditor_isearch @dirrm share/kde/apps/ktexteditor_insertfile @@ -4002,12 +4485,20 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/ksgmltools2/docbook/xsl/html @dirrm share/kde/apps/ksgmltools2/docbook/xsl/common @dirrm share/kde/apps/ksgmltools2/docbook/xsl +@dirrm share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/ent +@dirrm share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2 @dirrm share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/ent @dirrm share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2 @dirrm share/kde/apps/ksgmltools2/docbook @dirrm share/kde/apps/ksgmltools2/customization/zh-TW/entities @dirrm share/kde/apps/ksgmltools2/customization/zh-TW +@dirrm share/kde/apps/ksgmltools2/customization/xx/entities +@dirrm share/kde/apps/ksgmltools2/customization/xx @dirrm share/kde/apps/ksgmltools2/customization/xsl +@dirrm share/kde/apps/ksgmltools2/customization/xh/entities +@dirrm share/kde/apps/ksgmltools2/customization/xh +@dirrm share/kde/apps/ksgmltools2/customization/wa/entities +@dirrm share/kde/apps/ksgmltools2/customization/wa @dirrm share/kde/apps/ksgmltools2/customization/uk/entities @dirrm share/kde/apps/ksgmltools2/customization/uk @dirrm share/kde/apps/ksgmltools2/customization/tr/entities @@ -4037,6 +4528,8 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/ksgmltools2/customization/nn @dirrm share/kde/apps/ksgmltools2/customization/nl/entities @dirrm share/kde/apps/ksgmltools2/customization/nl +@dirrm share/kde/apps/ksgmltools2/customization/lt/entities +@dirrm share/kde/apps/ksgmltools2/customization/lt @dirrm share/kde/apps/ksgmltools2/customization/ko/entities @dirrm share/kde/apps/ksgmltools2/customization/ko @dirrm share/kde/apps/ksgmltools2/customization/ja/entities @@ -4051,6 +4544,8 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/ksgmltools2/customization/he @dirrm share/kde/apps/ksgmltools2/customization/fr/entities @dirrm share/kde/apps/ksgmltools2/customization/fr +@dirrm share/kde/apps/ksgmltools2/customization/fo/entities +@dirrm share/kde/apps/ksgmltools2/customization/fo @dirrm share/kde/apps/ksgmltools2/customization/fi/entities @dirrm share/kde/apps/ksgmltools2/customization/fi @dirrm share/kde/apps/ksgmltools2/customization/et/entities @@ -4073,6 +4568,8 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/ksgmltools2/customization/cs @dirrm share/kde/apps/ksgmltools2/customization/ca/entities @dirrm share/kde/apps/ksgmltools2/customization/ca +@dirrm share/kde/apps/ksgmltools2/customization/bg/entities +@dirrm share/kde/apps/ksgmltools2/customization/bg @dirrm share/kde/apps/ksgmltools2/customization/af/entities @dirrm share/kde/apps/ksgmltools2/customization/af @dirrm share/kde/apps/ksgmltools2/customization @@ -4084,12 +4581,18 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/kio_uiserver/icons/crystalsvg @dirrm share/kde/apps/kio_uiserver/icons @dirrm share/kde/apps/kio_uiserver +@dirrm share/kde/apps/khtml/icons/crystalsvg/64x64/actions +@dirrm share/kde/apps/khtml/icons/crystalsvg/64x64 +@dirrm share/kde/apps/khtml/icons/crystalsvg/48x48/actions +@dirrm share/kde/apps/khtml/icons/crystalsvg/48x48 @dirrm share/kde/apps/khtml/icons/crystalsvg/32x32/actions @dirrm share/kde/apps/khtml/icons/crystalsvg/32x32 @dirrm share/kde/apps/khtml/icons/crystalsvg/22x22/actions @dirrm share/kde/apps/khtml/icons/crystalsvg/22x22 @dirrm share/kde/apps/khtml/icons/crystalsvg/16x16/actions @dirrm share/kde/apps/khtml/icons/crystalsvg/16x16 +@dirrm share/kde/apps/khtml/icons/crystalsvg/128x128/actions +@dirrm share/kde/apps/khtml/icons/crystalsvg/128x128 @dirrm share/kde/apps/khtml/icons/crystalsvg @dirrm share/kde/apps/khtml/icons @dirrm share/kde/apps/khtml/css @@ -4101,9 +4604,14 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/kdeprint/tools @dirrm share/kde/apps/kdeprint/plugins @dirrm share/kde/apps/kdeprint/pics +@dirrm share/kde/apps/kdeprint/icons/crystalsvg/64x64/apps +@dirrm share/kde/apps/kdeprint/icons/crystalsvg/64x64 +@dirrm share/kde/apps/kdeprint/icons/crystalsvg/48x48/apps +@dirrm share/kde/apps/kdeprint/icons/crystalsvg/48x48 @dirrm share/kde/apps/kdeprint/icons/crystalsvg/32x32/apps @dirrm share/kde/apps/kdeprint/icons/crystalsvg/32x32/actions @dirrm share/kde/apps/kdeprint/icons/crystalsvg/32x32 +@dirrm share/kde/apps/kdeprint/icons/crystalsvg/22x22/apps @dirrm share/kde/apps/kdeprint/icons/crystalsvg/22x22/actions @dirrm share/kde/apps/kdeprint/icons/crystalsvg/22x22 @dirrm share/kde/apps/kdeprint/icons/crystalsvg/16x16/apps @@ -4121,11 +4629,11 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm share/kde/apps/kabc/plugins @dirrm share/kde/apps/kabc/formats @dirrm share/kde/apps/kabc +@dirrm share/kde/apps/dcopidlng @dirrm share/kde/apps/LICENSES @dirrm share/kde/apps -@dirrm share/kde/applnk/Settings/Components -@dirrm share/kde/applnk/Settings -@dirrm share/kde/applnk +@dirrm share/kde/applications/kde +@comment dirrm share/kde/applications @comment dirrm share/kde @dirrm share/doc/kde/HTML/en/kspell @exec ${MKDIR} %D/share/doc/kde/HTML/en/kdelibs-apidocs/libkmid/html @@ -4179,10 +4687,13 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm lib/kde3 @dirrm include/libkmid @dirrm include/ktexteditor +@dirrm include/ksettings +@dirrm include/kresources @dirrm include/kparts @dirrm include/kmediaplayer @dirrm include/kjs @dirrm include/kio +@dirrm include/khexedit @dirrm include/kdesu @dirrm include/kdeprint/lpr @dirrm include/kdeprint @@ -4190,3 +4701,5 @@ share/kde/servicetypes/scriptinterface.desktop @dirrm include/kabc @dirrm include/dom @comment dirrm include/arts +@dirrm etc/xdg/menus +@dirrm etc/xdg diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk index 41ca0b7b563..114509e3df7 100644 --- a/x11/kdelibs3/buildlink2.mk +++ b/x11/kdelibs3/buildlink2.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.23 2004/01/03 18:49:59 reed Exp $ +# $NetBSD: buildlink2.mk,v 1.24 2004/02/04 13:58:39 markd Exp $ .if !defined(KDELIBS3_BUILDLINK2_MK) KDELIBS3_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdelibs3 BUILDLINK_PKGBASE.kdelibs3?= kdelibs -BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.1.4nb3 +BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.2.0 BUILDLINK_PKGSRCDIR.kdelibs3?= ../../x11/kdelibs3 .include "../../mk/bsd.prefs.mk" diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index a88d672d8be..70c596371fe 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,43 +1,13 @@ -$NetBSD: distinfo,v 1.29 2004/01/15 09:52:51 markd Exp $ +$NetBSD: distinfo,v 1.30 2004/02/04 13:58:39 markd Exp $ -SHA1 (kdelibs-3.1.5.tar.bz2) = ee6f3f60e66e82ed8b433a57e1c6c79c1a522b18 -Size (kdelibs-3.1.5.tar.bz2) = 10549741 bytes -SHA1 (patch-aa) = 4e79f488d54f6b05a23951c6e206e6582ef2a2a7 -SHA1 (patch-ab) = 7b71c198b0588c339a2dbfbcf5d2ea85f51d2420 -SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e +SHA1 (kdelibs-3.2.0.tar.bz2) = 64780c60e66b954ba9cddfd10f1c7c20772ce4cb +Size (kdelibs-3.2.0.tar.bz2) = 12453641 bytes SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d -SHA1 (patch-af) = 4986e0d064e57c2897972cf59df914c20451a2e4 -SHA1 (patch-ag) = 67f03f7cc7c705f62e7f293b3dedb532685a2372 -SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd -SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3 -SHA1 (patch-ak) = c72a871cbcd343c86145e705dd93c00b82051d5b -SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901 -SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab -SHA1 (patch-ao) = 6f7e381fd3d5c66e7d03ce28dd8e17d8af0608c2 -SHA1 (patch-ap) = ea21692595d0b84366ebccc346c4772ba476a647 -SHA1 (patch-aq) = 69cd39a625654839c1e8358284df291f947682e5 -SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988 -SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1 -SHA1 (patch-av) = 72cc57b98d74386846a86893a1e710f8b6913811 -SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620 -SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0 -SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710 -SHA1 (patch-ba) = bab79f14e1b756ba32c30c384a377136ecf2a6b1 -SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6 +SHA1 (patch-an) = 41d2721bd55d060cde630771dad0377dbe770d73 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea -SHA1 (patch-bd) = 4f4a1fc17108f539c3e459744ccc0dc6f71bb989 -SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd -SHA1 (patch-bh) = a835be74a386dd177189a9a5f36cfe8f65a5e759 -SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb -SHA1 (patch-bm) = 9b5326099e3006c491a90ac8ad8e5f5aa0eed945 -SHA1 (patch-bn) = 279687e99974d0f17752fa780bdb1cb23962c385 -SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20 -SHA1 (patch-bq) = 24af1fd6fba160ccc293cb28dd7139b80c52eb87 -SHA1 (patch-br) = 3fa15ea8a562e58a5775ecd847461c29756c5c1b -SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5 +SHA1 (patch-bd) = f233a73d0a8148e1ae7f4e777c3f5d50b56d768f SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c -SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14 -SHA1 (patch-cd) = 27f7358d40dd7f02ae877ab0ff501086006ec12a -SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497 +SHA1 (patch-cc) = 607452fb8c4e163ef634d1624fae89bde4563ed5 +SHA1 (patch-ce) = d3e380f42beae1006ad3aea593feb10039c41f1f diff --git a/x11/kdelibs3/patches/patch-aa b/x11/kdelibs3/patches/patch-aa index 8e1fb393a5c..7162b6c2521 100644 --- a/x11/kdelibs3/patches/patch-aa +++ b/x11/kdelibs3/patches/patch-aa @@ -1,37 +1,12 @@ -$NetBSD: patch-aa,v 1.3 2003/03/11 13:10:33 markd Exp $ +$NetBSD: patch-aa,v 1.4 2004/02/04 13:58:39 markd Exp $ ---- arts/knotify/Makefile.am.orig Mon Sep 16 09:12:54 2002 -+++ arts/knotify/Makefile.am -@@ -4,15 +4,20 @@ - ####### Files - - bin_PROGRAMS = knotify --lib_LTLIBRARIES = knotify.la -+lib_LTLIBRARIES = libknotify_main.la knotify.la - --knotify_la_SOURCES = knotify.cpp knotify.skel --knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) -+libknotify_main_la_SOURCES = knotify.cpp knotify.skel -+libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) -+libknotify_main_la_LDFLAGS = $(all_libraries) -+libknotify_main_la_METASOURCES = AUTO -+ -+knotify_la_SOURCES = knotify_main.cpp -+knotify_la_LIBADD = libknotify_main.la - knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version - knotify_la_METASOURCES = AUTO - --knotify_SOURCES = dummy.cpp --knotify_LDADD = knotify.la -+knotify_SOURCES = knotify_main.cpp -+knotify_LDADD = libknotify_main.la - knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - check_PROGRAMS = knotifytest -@@ -27,6 +32,3 @@ - - messages: - $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot -- --dummy.cpp: -- echo > dummy.cpp +--- kdoctools/move_kio_help_cache.sh.orig 2003-12-09 10:16:53.000000000 +1300 ++++ kdoctools/move_kio_help_cache.sh +@@ -1,6 +1,6 @@ + #!/bin/sh + +-bas=`kde-config --localprefix`share/apps/kio_help ++bas=`kde-config --localprefix`share/kde/apps/kio_help + mv "$bas/cache" "`kde-config --path cache`kio_help" + rmdir "$bas" + exit 0 diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab deleted file mode 100644 index 040dbfbb3f5..00000000000 --- a/x11/kdelibs3/patches/patch-ab +++ /dev/null @@ -1,225 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2004/01/15 09:52:51 markd Exp $ - ---- arts/knotify/Makefile.in.orig 2003-12-29 11:16:52.000000000 +1300 -+++ arts/knotify/Makefile.in -@@ -380,17 +380,22 @@ INCLUDES = -I$(includedir)/arts $(all_in - - ####### Files - bin_PROGRAMS = knotify --lib_LTLIBRARIES = knotify.la -+lib_LTLIBRARIES = libknotify_main.la knotify.la - --#>- knotify_la_SOURCES = knotify.cpp knotify.skel -+#>- libknotify_main_la_SOURCES = knotify.cpp knotify.skel - #>+ 1 --knotify_la_SOURCES=knotify.cpp knotify_skel.cpp --knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) -+libknotify_main_la_SOURCES=knotify.cpp knotify_skel.cpp -+libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) -+libknotify_main_la_LDFLAGS = $(all_libraries) -+#>- libknotify_main_la_METASOURCES = AUTO -+ -+knotify_la_SOURCES = knotify_main.cpp -+knotify_la_LIBADD = libknotify_main.la - knotify_la_LDFLAGS = $(all_libraries) -module -avoid-version - #>- knotify_la_METASOURCES = AUTO - --knotify_SOURCES = dummy.cpp --knotify_LDADD = knotify.la -+knotify_SOURCES = knotify_main.cpp -+knotify_LDADD = libknotify_main.la - knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - check_PROGRAMS = knotifytest -@@ -409,23 +414,28 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --knotify_la_DEPENDENCIES = --am_knotify_la_OBJECTS = knotify.lo -+knotify_la_DEPENDENCIES = libknotify_main.la -+am_knotify_la_OBJECTS = knotify_main.lo - #>- knotify_la_OBJECTS = $(am_knotify_la_OBJECTS) -+#>+ 1 -+knotify_la_OBJECTS = knotify_main.lo -+libknotify_main_la_DEPENDENCIES = -+am_libknotify_main_la_OBJECTS = knotify.lo -+#>- libknotify_main_la_OBJECTS = $(am_libknotify_main_la_OBJECTS) - #>+ 4 --knotify_la_final_OBJECTS = knotify_la.all_cpp.lo --knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo --@KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS) -+libknotify_main_la_final_OBJECTS = libknotify_main_la.all_cpp.lo -+libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo -+@KDE_USE_FINAL_FALSE@libknotify_main_la_OBJECTS = $(libknotify_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libknotify_main_la_OBJECTS = $(libknotify_main_la_final_OBJECTS) - bin_PROGRAMS = knotify$(EXEEXT) - check_PROGRAMS = knotifytest$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_knotify_OBJECTS = dummy.$(OBJEXT) -+am_knotify_OBJECTS = knotify_main.$(OBJEXT) - #>- knotify_OBJECTS = $(am_knotify_OBJECTS) - #>+ 1 --knotify_OBJECTS = dummy.$(OBJEXT) --knotify_DEPENDENCIES = knotify.la -+knotify_OBJECTS = knotify_main.$(OBJEXT) -+knotify_DEPENDENCIES = libknotify_main.la - am_knotifytest_OBJECTS = knotifytest.$(OBJEXT) - #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS) - #>+ 1 -@@ -435,12 +445,18 @@ knotifytest_DEPENDENCIES = - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/knotify.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po --#>+ 5 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \ -+#>+ 9 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/libknotify_main_la.all_cpp.P ./$(DEPDIR)/knotify.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P ./$(DEPDIR)/knotify.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po - - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -461,14 +477,14 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(knotify_la_SOURCES) $(knotify_SOURCES) \ -- $(knotifytest_SOURCES) -+DIST_SOURCES = $(knotify_la_SOURCES) $(libknotify_main_la_SOURCES) \ -+ $(knotify_SOURCES) $(knotifytest_SOURCES) - DATA = $(kdelnk_DATA) - - HEADERS = $(noinst_HEADERS) - - DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in --SOURCES = $(knotify_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES) -+SOURCES = $(knotify_la_SOURCES) $(libknotify_main_la_SOURCES) $(knotify_SOURCES) $(knotifytest_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -515,6 +531,8 @@ clean-libLTLIBRARIES: - done - knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) -+libknotify_main.la: $(libknotify_main_la_OBJECTS) $(libknotify_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libknotify_main_la_LDFLAGS) $(libknotify_main_la_OBJECTS) $(libknotify_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -564,8 +582,9 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@ - - distclean-depend: -@@ -687,7 +706,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=knotify.desktop README.knotify_and_arts -+KDE_DIST=Makefile.in.rej knotify.desktop README.knotify_and_arts - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -826,13 +845,16 @@ uninstall-am: uninstall-binPROGRAMS unin - - messages: - $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - -+#>+ 3 -+knotify.moc: $(srcdir)/knotify.h -+ $(MOC) $(srcdir)/knotify.h -o knotify.moc -+ -+#>+ 1 -+mocs: knotify.moc - #>+ 5 - knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; false ) -@@ -847,7 +869,7 @@ knotify.moc: $(srcdir)/knotify.h - mocs: knotify.moc - #>+ 3 - clean-metasources: -- -rm -f knotify.moc -+ -rm -f knotify.moc knotify.moc - - #>+ 4 - clean-idl: -@@ -865,33 +887,33 @@ force-reedit: - - - #>+ 11 --knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc -- @echo 'creating knotify_la.all_cpp.cpp ...'; \ -- rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ -+libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc -+ @echo 'creating libknotify_main_la.all_cpp.cpp ...'; \ -+ rm -f libknotify_main_la.all_cpp.files libknotify_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libknotify_main_la.all_cpp.final; \ - for file in knotify.cpp knotify_skel.cpp ; do \ -- echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libknotify_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libknotify_main_la.all_cpp.final; \ - done; \ -- cat knotify_la.all_cpp.final knotify_la.all_cpp.files > knotify_la.all_cpp.cpp; \ -- rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files -+ cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ -+ rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f knotify_la.all_cpp.cpp -+ -rm -f libknotify_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) knotify_la_OBJECTS="$(knotify_la_final_OBJECTS)" all-am -+ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) knotify_la_OBJECTS="$(knotify_la_final_OBJECTS)" install-am -+ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) knotify_la_OBJECTS="$(knotify_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) knotify_la_OBJECTS="$(knotify_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -901,5 +923,5 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 3 --knotify.lo: knotify.moc --knotify.o: knotify.moc -+knotify.lo: knotify.moc knotify.moc -+knotify.o: knotify.moc knotify.moc diff --git a/x11/kdelibs3/patches/patch-ac b/x11/kdelibs3/patches/patch-ac deleted file mode 100644 index d65a7921b7a..00000000000 --- a/x11/kdelibs3/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- arts/knotify/knotify.cpp.orig Wed May 8 19:27:11 2002 -+++ arts/knotify/knotify.cpp -@@ -80,7 +80,9 @@ - }; - - --int main(int argc, char **argv) -+extern "C" int kdemain(int, char**); -+ -+int kdemain(int argc, char **argv) - { - KAboutData aboutdata("knotify", I18N_NOOP("KNotify"), - "3.0", I18N_NOOP("KDE Notification Server"), diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af deleted file mode 100644 index b20b39abe54..00000000000 --- a/x11/kdelibs3/patches/patch-af +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-af,v 1.4 2004/01/15 09:52:51 markd Exp $ - ---- dcop/Makefile.am.orig 2003-12-17 03:37:17.000000000 +1300 -+++ dcop/Makefile.am -@@ -29,7 +29,7 @@ INCLUDES= $(all_includes) - bin_PROGRAMS = dcopserver dcopserver_shutdown - check_PROGRAMS = testdcop testdcopc - --lib_LTLIBRARIES = libDCOP.la dcopserver.la -+lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la - libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) - libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries) - -@@ -41,13 +41,17 @@ METASOURCES = AUTO - # dcopstub needs to go first for --enable-final to work - libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp - -+libdcopserver_main_la_LDFLAGS = $(all_libraries) -+libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp -+libdcopserver_main_la_LIBADD = libDCOP.la -+ - dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) --dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp --dcopserver_la_LIBADD = libDCOP.la -+dcopserver_la_SOURCES = dcopserver_main.cpp -+dcopserver_la_LIBADD = libdcopserver_main.la - - dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) --dcopserver_SOURCES = dummy.cpp --dcopserver_LDADD = dcopserver.la -+dcopserver_SOURCES = dcopserver_main.cpp -+dcopserver_LDADD = libdcopserver_main.la - - dcopserver_shutdown_SOURCES = dcopserver_shutdown.c - -@@ -61,9 +65,6 @@ testdcopc_LDADD = KDE-ICE/libkICE.la $( - - EXTRA_DIST = HOWTO ICE Mainpage.dox - --dummy.cpp: -- echo > dummy.cpp -- - DOXYGEN_REFERENCES = kdecore - DOXYGEN_EXCLUDE = KDE-ICE - diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag deleted file mode 100644 index a726ac824f7..00000000000 --- a/x11/kdelibs3/patches/patch-ag +++ /dev/null @@ -1,287 +0,0 @@ -$NetBSD: patch-ag,v 1.6 2004/01/15 09:52:51 markd Exp $ - ---- dcop/Makefile.in.orig 2003-12-29 11:16:52.000000000 +1300 -+++ dcop/Makefile.in -@@ -406,7 +406,7 @@ INCLUDES = $(all_includes) - bin_PROGRAMS = dcopserver dcopserver_shutdown - check_PROGRAMS = testdcop testdcopc - --lib_LTLIBRARIES = libDCOP.la dcopserver.la -+lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la - libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) - libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries) - -@@ -418,13 +418,17 @@ noinst_HEADERS = version.h dcopglobal.h - # dcopstub needs to go first for --enable-final to work - libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp - -+libdcopserver_main_la_LDFLAGS = $(all_libraries) -+libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp -+libdcopserver_main_la_LIBADD = libDCOP.la -+ - dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries) --dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp --dcopserver_la_LIBADD = libDCOP.la -+dcopserver_la_SOURCES = dcopserver_main.cpp -+dcopserver_la_LIBADD = libdcopserver_main.la - - dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) --dcopserver_SOURCES = dummy.cpp --dcopserver_LDADD = dcopserver.la -+dcopserver_SOURCES = dcopserver_main.cpp -+dcopserver_LDADD = libdcopserver_main.la - - dcopserver_shutdown_SOURCES = dcopserver_shutdown.c - -@@ -447,14 +451,11 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = dcop-path.h - LTLIBRARIES = $(lib_LTLIBRARIES) - --dcopserver_la_DEPENDENCIES = libDCOP.la --am_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo -+dcopserver_la_DEPENDENCIES = libdcopserver_main.la -+am_dcopserver_la_OBJECTS = dcopserver_main.lo - #>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS) --#>+ 4 --dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo --dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo --@KDE_USE_FINAL_FALSE@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS) -+#>+ 1 -+dcopserver_la_OBJECTS = dcopserver_main.lo - libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la - am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \ - dcopclient.lo -@@ -465,15 +466,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo - dcopclient.lo - @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) -+libdcopserver_main_la_DEPENDENCIES = libDCOP.la -+am_libdcopserver_main_la_OBJECTS = dcopserver.lo dcopsignals.lo -+#>- libdcopserver_main_la_OBJECTS = $(am_libdcopserver_main_la_OBJECTS) -+#>+ 4 -+libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo -+libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo -+@KDE_USE_FINAL_FALSE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS) - bin_PROGRAMS = dcopserver$(EXEEXT) dcopserver_shutdown$(EXEEXT) - check_PROGRAMS = testdcop$(EXEEXT) testdcopc$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_dcopserver_OBJECTS = dummy.$(OBJEXT) -+am_dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) - #>- dcopserver_OBJECTS = $(am_dcopserver_OBJECTS) - #>+ 1 --dcopserver_OBJECTS = dummy.$(OBJEXT) --dcopserver_DEPENDENCIES = dcopserver.la -+dcopserver_OBJECTS = dcopserver_main.$(OBJEXT) -+dcopserver_DEPENDENCIES = libdcopserver_main.la - am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT) - #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS) - #>+ 1 -@@ -501,25 +510,31 @@ am__depfiles_maybe = depfiles - #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po --#>+ 15 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po -+#>+ 19 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver_shutdown.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopsignals.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcop.Po ./$(DEPDIR)/testdcopc.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dcopstub.Plo ./$(DEPDIR)/testdcop.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/testdcopc.Po - - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -547,8 +562,9 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \ -- $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) \ -- $(testdcop_SOURCES) $(testdcopc_SOURCES) -+ $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) \ -+ $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) \ -+ $(testdcopc_SOURCES) - HEADERS = $(include_HEADERS) $(noinst_HEADERS) - - -@@ -561,7 +577,7 @@ DIST_COMMON = $(include_HEADERS) $(noins - $(srcdir)/../admin/Doxyfile.am Makefile.am Makefile.in \ - dcop-path.h.in - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) -+SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) - - #>- all: all-recursive - #>+ 1 -@@ -615,6 +631,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) - @KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) - @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) -+libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -675,10 +693,11 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopobject.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopref.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver_shutdown.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopsignals.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopstub.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcop.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@ - -@@ -904,7 +923,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=dcopc.h configure.in.in -+KDE_DIST=configure.in.in Makefile.in.rej dcopc.h - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -1064,9 +1083,6 @@ uninstall-info: uninstall-info-recursive - uninstall-info-recursive uninstall-libLTLIBRARIES \ - uninstall-local uninstall-recursive - -- --dummy.cpp: -- echo > dummy.cpp - apidox-am-yes: - @if test "$(subdir)" != "."; then \ - $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ -@@ -1250,17 +1266,17 @@ testdcop.moc: $(srcdir)/testdcop.h - #>+ 1 - mocs: testdcop.moc - #>+ 3 --dcopserver.moc: $(srcdir)/dcopserver.h -- $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc -- --#>+ 1 --mocs: dcopserver.moc --#>+ 3 - dcopclient.moc: $(srcdir)/dcopclient.h - $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc - - #>+ 1 - mocs: dcopclient.moc -+#>+ 3 -+dcopserver.moc: $(srcdir)/dcopserver.h -+ $(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc -+ -+#>+ 1 -+mocs: dcopserver.moc - #>+ 8 - libDCOP.la.closure: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) - @echo "int main() {return 0;}" > libDCOP_la_closure.cpp -@@ -1272,7 +1288,7 @@ libDCOP.la.closure: $(libDCOP_la_OBJECTS - - #>+ 3 - clean-metasources: -- -rm -f testdcop.moc dcopserver.moc dcopclient.moc -+ -rm -f testdcop.moc dcopclient.moc dcopserver.moc - - #>+ 3 - clean-closures: -@@ -1289,18 +1305,6 @@ force-reedit: - - - #>+ 11 --dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc -- @echo 'creating dcopserver_la.all_cpp.cpp ...'; \ -- rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \ -- for file in dcopserver.cpp dcopsignals.cpp ; do \ -- echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \ -- done; \ -- cat dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files > dcopserver_la.all_cpp.cpp; \ -- rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files -- --#>+ 11 - libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopref.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopclient.cpp dcopclient.moc - @echo 'creating libDCOP_la.all_cpp.cpp ...'; \ - rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \ -@@ -1312,22 +1316,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi - cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \ - rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files - -+#>+ 11 -+libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc -+ @echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \ -+ rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \ -+ for file in dcopserver.cpp dcopsignals.cpp ; do \ -+ echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \ -+ done; \ -+ cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \ -+ rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files -+ - #>+ 3 - clean-final: -- -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp -+ -rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am -+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am -+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am -+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am -+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1337,9 +1353,9 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 7 --dcopclient.o: dcopclient.moc - dcopclient.lo: dcopclient.moc - testdcop.lo: testdcop.moc - dcopserver.o: dcopserver.moc --dcopserver.lo: dcopserver.moc -+dcopclient.o: dcopclient.moc - testdcop.o: testdcop.moc -+dcopserver.lo: dcopserver.moc diff --git a/x11/kdelibs3/patches/patch-ah b/x11/kdelibs3/patches/patch-ah deleted file mode 100644 index b7c7c6858bc..00000000000 --- a/x11/kdelibs3/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- dcop/dcopserver.cpp.orig Fri Jan 4 11:03:18 2002 -+++ dcop/dcopserver.cpp -@@ -1512,7 +1512,9 @@ - "Copyright (C) 1999-2001, The KDE Developers <http://www.kde.org>\n" - ; - --int main( int argc, char* argv[] ) -+extern "C" int kdemain(int, char *[]); -+ -+int kdemain( int argc, char* argv[] ) - { - bool serverid = false; - bool nofork = false; diff --git a/x11/kdelibs3/patches/patch-aj b/x11/kdelibs3/patches/patch-aj deleted file mode 100644 index aeadc51cbf3..00000000000 --- a/x11/kdelibs3/patches/patch-aj +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- kconf_update/Makefile.am.orig Wed Apr 18 00:54:02 2001 -+++ kconf_update/Makefile.am -@@ -18,22 +18,22 @@ - - INCLUDES= $(all_includes) - --lib_LTLIBRARIES = kconf_update.la -+lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la - - bin_PROGRAMS = kconf_update --kconf_update_SOURCES = dummy.cpp --kconf_update_LDADD = kconf_update.la -+kconf_update_SOURCES = kconf_update_main.cpp -+kconf_update_LDADD = libkconf_update_main.la - kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kconf_update_la_SOURCES = kconf_update.cpp --kconf_update_la_LIBADD = ../kdecore/libkdecore.la -+libkconf_update_main_la_SOURCES = kconf_update.cpp -+libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la -+libkconf_update_main_la_LDFLAGS = $(all_libraries) -+ -+kconf_update_la_SOURCES = kconf_update_main.cpp - kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kconf_update_la_LIBADD = libkconf_update_main.la - - METASOURCES = AUTO - - # Internal - # noinst_HEADERS = kconf_update.h -- --dummy.cpp: -- echo > dummy.cpp -- diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak deleted file mode 100644 index 3eb9a86329d..00000000000 --- a/x11/kdelibs3/patches/patch-ak +++ /dev/null @@ -1,120 +0,0 @@ -$NetBSD: patch-ak,v 1.5 2003/05/22 02:42:41 markd Exp $ - ---- kconf_update/Makefile.in.orig Thu May 8 05:24:04 2003 -+++ kconf_update/Makefile.in -@@ -393,16 +393,20 @@ x_libraries = @x_libraries@ - - INCLUDES = $(all_includes) - --lib_LTLIBRARIES = kconf_update.la -+lib_LTLIBRARIES = libkconf_update_main.la kconf_update.la - - bin_PROGRAMS = kconf_update --kconf_update_SOURCES = dummy.cpp --kconf_update_LDADD = kconf_update.la -+kconf_update_SOURCES = kconf_update_main.cpp -+kconf_update_LDADD = libkconf_update_main.la - kconf_update_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kconf_update_la_SOURCES = kconf_update.cpp --kconf_update_la_LIBADD = ../kdecore/libkdecore.la -+libkconf_update_main_la_SOURCES = kconf_update.cpp -+libkconf_update_main_la_LIBADD = ../kdecore/libkdecore.la -+libkconf_update_main_la_LDFLAGS = $(all_libraries) -+ -+kconf_update_la_SOURCES = kconf_update_main.cpp - kconf_update_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kconf_update_la_LIBADD = libkconf_update_main.la - - #>- METASOURCES = AUTO - subdir = kconf_update -@@ -411,28 +415,35 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kconf_update_la_DEPENDENCIES = ../kdecore/libkdecore.la --am_kconf_update_la_OBJECTS = kconf_update.lo -+kconf_update_la_DEPENDENCIES = libkconf_update_main.la -+am_kconf_update_la_OBJECTS = kconf_update_main.lo - #>- kconf_update_la_OBJECTS = $(am_kconf_update_la_OBJECTS) - #>+ 1 --kconf_update_la_OBJECTS = kconf_update.lo -+kconf_update_la_OBJECTS = kconf_update_main.lo -+libkconf_update_main_la_DEPENDENCIES = ../kdecore/libkdecore.la -+am_libkconf_update_main_la_OBJECTS = kconf_update.lo -+#>- libkconf_update_main_la_OBJECTS = $(am_libkconf_update_main_la_OBJECTS) -+#>+ 1 -+libkconf_update_main_la_OBJECTS = kconf_update.lo - bin_PROGRAMS = kconf_update$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kconf_update_OBJECTS = dummy.$(OBJEXT) -+am_kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) - #>- kconf_update_OBJECTS = $(am_kconf_update_OBJECTS) - #>+ 1 --kconf_update_OBJECTS = dummy.$(OBJEXT) --kconf_update_DEPENDENCIES = kconf_update.la -+kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) -+kconf_update_DEPENDENCIES = libkconf_update_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update.Plo --#>+ 3 --@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update.Plo -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kconf_update.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Po -+#>+ 4 -+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kconf_update.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kconf_update_main.Po - - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -452,9 +463,10 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) -+DIST_SOURCES = $(kconf_update_la_SOURCES) \ -+ $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) - DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) -+SOURCES = $(kconf_update_la_SOURCES) $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -501,6 +513,8 @@ clean-libLTLIBRARIES: - done - kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) -+libkconf_update_main.la: $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkconf_update_main_la_LDFLAGS) $(libkconf_update_main_la_OBJECTS) $(libkconf_update_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -540,8 +554,9 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconf_update_main.Po@am__quote@ - - distclean-depend: - -rm -rf ./$(DEPDIR) -@@ -779,9 +794,6 @@ uninstall-am: uninstall-binPROGRAMS unin - - # Internal - # noinst_HEADERS = kconf_update.h -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/x11/kdelibs3/patches/patch-al b/x11/kdelibs3/patches/patch-al deleted file mode 100644 index 9532746415f..00000000000 --- a/x11/kdelibs3/patches/patch-al +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-al,v 1.2 2002/08/25 19:23:51 jlam Exp $ - ---- kconf_update/kconf_update.cpp.orig Wed May 8 19:27:22 2002 -+++ kconf_update/kconf_update.cpp -@@ -666,8 +666,9 @@ - m_bOverwrite = false; - } - -+extern "C" int kdemain(int argc, char **argv); - --int main(int argc, char **argv) -+int kdemain(int argc, char **argv) - { - KAboutData aboutData("kconf_update", I18N_NOOP("KConf Update"), - "1.0.2", diff --git a/x11/kdelibs3/patches/patch-an b/x11/kdelibs3/patches/patch-an index 6547605642a..7519c48168d 100644 --- a/x11/kdelibs3/patches/patch-an +++ b/x11/kdelibs3/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.2 2002/08/25 19:23:52 jlam Exp $ +$NetBSD: patch-an,v 1.3 2004/02/04 13:58:39 markd Exp $ ---- kdecore/kstandarddirs.cpp.orig Wed May 8 19:27:28 2002 +--- kdecore/kstandarddirs.cpp.orig 2004-01-26 06:24:42.000000000 +1300 +++ kdecore/kstandarddirs.cpp -@@ -722,33 +722,33 @@ +@@ -847,33 +847,33 @@ static int tokenize( QStringList& tokens QString KStandardDirs::kde_default(const char *type) { if (!strcmp(type, "data")) @@ -50,3 +50,20 @@ $NetBSD: patch-an,v 1.2 2002/08/25 19:23:52 jlam Exp $ if (!strcmp(type, "exe")) return "bin/"; if (!strcmp(type, "lib")) +@@ -889,7 +889,7 @@ QString KStandardDirs::kde_default(const + if (!strcmp(type, "xdgconf-menu")) + return "menus/"; + if (!strcmp(type, "kcfg")) +- return "share/config.kcfg"; ++ return "share/kde/config.kcfg"; + qFatal("unknown resource type %s", type); + return QString::null; + } +@@ -1129,6 +1129,7 @@ void KStandardDirs::addKDEDefaults() + } + + xdgdirList.append("/usr/local/share/"); ++ xdgdirList.append(KDEDIR "/share/"); + xdgdirList.append("/usr/share/"); + } + diff --git a/x11/kdelibs3/patches/patch-ao b/x11/kdelibs3/patches/patch-ao deleted file mode 100644 index 711916d7e8f..00000000000 --- a/x11/kdelibs3/patches/patch-ao +++ /dev/null @@ -1,63 +0,0 @@ -$NetBSD: patch-ao,v 1.3 2003/03/11 13:10:35 markd Exp $ - ---- kded/Makefile.am.orig Mon Sep 16 09:13:07 2002 -+++ kded/Makefile.am Sat Feb 1 02:25:15 2003 -@@ -19,32 +19,40 @@ - - INCLUDES= -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) - --lib_LTLIBRARIES = kded.la kbuildsycoca.la -+lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la - --kded_la_LDFLAGS = $(all_libraries) -module -avoid-version --kded_la_LIBADD = $(LIB_KIO) --kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ -+libkded_main_la_LDFLAGS = $(all_libraries) -+libkded_main_la_LIBADD = $(LIB_KIO) -+libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp kdedmodule.cpp - --kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version --kbuildsycoca_la_LIBADD = $(LIB_KIO) --kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ -+kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kded_la_LIBADD = libkded_main.la -+kded_la_SOURCES = kded_main.cpp -+ -+libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) -+libkbuildsycoca_main_la_LIBADD = $(LIB_KIO) -+libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp \ - kbuildimageiofactory.cpp \ - kbuildprotocolinfofactory.cpp \ - kctimefactory.cpp - -+kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la -+kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp -+ - bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname - - kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kded_LDADD = kded.la --kded_SOURCES = dummy.cpp -+kded_LDADD = libkded_main.la -+kded_SOURCES = kded_main.cpp - - kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kbuildsycoca_LDADD = kbuildsycoca.la --kbuildsycoca_SOURCES = dummy.cpp -+kbuildsycoca_LDADD = libkbuildsycoca_main.la -+kbuildsycoca_SOURCES = kbuildsycoca_main.cpp - - kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) - kdontchangethehostname_LDADD = $(LIB_KDECORE) -@@ -64,6 +72,3 @@ - - update_DATA = kded.upd - updatedir = $(kde_datadir)/kconf_update -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap deleted file mode 100644 index b97395c12bc..00000000000 --- a/x11/kdelibs3/patches/patch-ap +++ /dev/null @@ -1,366 +0,0 @@ -$NetBSD: patch-ap,v 1.6 2004/01/15 09:52:51 markd Exp $ - ---- kded/Makefile.in.orig 2003-12-29 11:16:54.000000000 +1300 -+++ kded/Makefile.in -@@ -396,18 +396,22 @@ x_libraries = @x_libraries@ - - INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) - --lib_LTLIBRARIES = kded.la kbuildsycoca.la -+lib_LTLIBRARIES = libkded_main.la kded.la libkbuildsycoca_main.la kbuildsycoca.la - --kded_la_LDFLAGS = $(all_libraries) -module -avoid-version --kded_la_LIBADD = $(LIB_KIO) --kded_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ -+libkded_main_la_LDFLAGS = $(all_libraries) -+libkded_main_la_LIBADD = $(LIB_KIO) -+libkded_main_la_SOURCES = kded.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp kdedmodule.cpp - - --kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version --kbuildsycoca_la_LIBADD = $(LIB_KIO) --kbuildsycoca_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ -+kded_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kded_la_LIBADD = libkded_main.la -+kded_la_SOURCES = kded_main.cpp -+ -+libkbuildsycoca_main_la_LDFLAGS = $(all_libraries) -+libkbuildsycoca_main_la_LIBADD = $(LIB_KIO) -+libkbuildsycoca_main_la_SOURCES = kbuildsycoca.cpp kbuildservicetypefactory.cpp \ - kbuildservicefactory.cpp \ - kbuildservicegroupfactory.cpp \ - kbuildimageiofactory.cpp \ -@@ -415,15 +419,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c - kctimefactory.cpp - - -+kbuildsycoca_la_LDFLAGS = $(all_libraries) -module -avoid-version -+kbuildsycoca_la_LIBADD = libkbuildsycoca_main.la -+kbuildsycoca_la_SOURCES = kbuildsycoca_main.cpp -+ - bin_PROGRAMS = kded kbuildsycoca kdontchangethehostname - - kded_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kded_LDADD = kded.la --kded_SOURCES = dummy.cpp -+kded_LDADD = libkded_main.la -+kded_SOURCES = kded_main.cpp - - kbuildsycoca_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kbuildsycoca_LDADD = kbuildsycoca.la --kbuildsycoca_SOURCES = dummy.cpp -+kbuildsycoca_LDADD = libkbuildsycoca_main.la -+kbuildsycoca_SOURCES = kbuildsycoca_main.cpp - - kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) - kdontchangethehostname_LDADD = $(LIB_KDECORE) -@@ -451,46 +459,56 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kbuildsycoca_la_DEPENDENCIES = --am_kbuildsycoca_la_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ -- kbuildservicefactory.lo kbuildservicegroupfactory.lo \ -- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ -- kctimefactory.lo -+kbuildsycoca_la_DEPENDENCIES = libkbuildsycoca_main.la -+am_kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo - #>- kbuildsycoca_la_OBJECTS = $(am_kbuildsycoca_la_OBJECTS) -+#>+ 1 -+kbuildsycoca_la_OBJECTS = kbuildsycoca_main.lo -+kded_la_DEPENDENCIES = libkded_main.la -+am_kded_la_OBJECTS = kded_main.lo -+#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) -+#>+ 1 -+kded_la_OBJECTS = kded_main.lo -+libkbuildsycoca_main_la_DEPENDENCIES = -+am_libkbuildsycoca_main_la_OBJECTS = kbuildsycoca.lo \ -+ kbuildservicetypefactory.lo kbuildservicefactory.lo \ -+ kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ -+ kbuildprotocolinfofactory.lo kctimefactory.lo -+#>- libkbuildsycoca_main_la_OBJECTS = $(am_libkbuildsycoca_main_la_OBJECTS) - #>+ 7 --kbuildsycoca_la_final_OBJECTS = kbuildsycoca_la.all_cpp.lo --kbuildsycoca_la_nofinal_OBJECTS = kbuildsycoca.lo kbuildservicetypefactory.lo \ -- kbuildservicefactory.lo kbuildservicegroupfactory.lo \ -- kbuildimageiofactory.lo kbuildprotocolinfofactory.lo \ -- kctimefactory.lo --@KDE_USE_FINAL_FALSE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kbuildsycoca_la_OBJECTS = $(kbuildsycoca_la_final_OBJECTS) --kded_la_DEPENDENCIES = --am_kded_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ -+libkbuildsycoca_main_la_final_OBJECTS = libkbuildsycoca_main_la.all_cpp.lo -+libkbuildsycoca_main_la_nofinal_OBJECTS = kbuildsycoca.lo \ -+ kbuildservicetypefactory.lo kbuildservicefactory.lo \ -+ kbuildservicegroupfactory.lo kbuildimageiofactory.lo \ -+ kbuildprotocolinfofactory.lo kctimefactory.lo -+@KDE_USE_FINAL_FALSE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkbuildsycoca_main_la_OBJECTS = $(libkbuildsycoca_main_la_final_OBJECTS) -+libkded_main_la_DEPENDENCIES = -+am_libkded_main_la_OBJECTS = kded.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kdedmodule.lo --#>- kded_la_OBJECTS = $(am_kded_la_OBJECTS) -+#>- libkded_main_la_OBJECTS = $(am_libkded_main_la_OBJECTS) - #>+ 6 --kded_la_final_OBJECTS = kded_la.all_cpp.lo --kded_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ -+libkded_main_la_final_OBJECTS = libkded_main_la.all_cpp.lo -+libkded_main_la_nofinal_OBJECTS = kded.lo kbuildservicetypefactory.lo \ - kbuildservicefactory.lo kbuildservicegroupfactory.lo \ - kdedmodule.lo --@KDE_USE_FINAL_FALSE@kded_la_OBJECTS = $(kded_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kded_la_OBJECTS = $(kded_la_final_OBJECTS) -+@KDE_USE_FINAL_FALSE@libkded_main_la_OBJECTS = $(libkded_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkded_main_la_OBJECTS = $(libkded_main_la_final_OBJECTS) - bin_PROGRAMS = kded$(EXEEXT) kbuildsycoca$(EXEEXT) \ - kdontchangethehostname$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kbuildsycoca_OBJECTS = dummy.$(OBJEXT) -+am_kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) - #>- kbuildsycoca_OBJECTS = $(am_kbuildsycoca_OBJECTS) - #>+ 1 --kbuildsycoca_OBJECTS = dummy.$(OBJEXT) --kbuildsycoca_DEPENDENCIES = kbuildsycoca.la --am_kded_OBJECTS = dummy.$(OBJEXT) -+kbuildsycoca_OBJECTS = kbuildsycoca_main.$(OBJEXT) -+kbuildsycoca_DEPENDENCIES = libkbuildsycoca_main.la -+am_kded_OBJECTS = kded_main.$(OBJEXT) - #>- kded_OBJECTS = $(am_kded_OBJECTS) - #>+ 1 --kded_OBJECTS = dummy.$(OBJEXT) --kded_DEPENDENCIES = kded.la -+kded_OBJECTS = kded_main.$(OBJEXT) -+kded_DEPENDENCIES = libkded_main.la - am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) - #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS) - #>+ 1 -@@ -500,33 +518,39 @@ kdontchangethehostname_DEPENDENCIES = - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po --#>+ 19 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kbuildsycoca_la.all_cpp.P $(DEPDIR)/kded_la.all_cpp.P ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ -+#>+ 23 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkbuildsycoca_main_la.all_cpp.P $(DEPDIR)/libkded_main_la.all_cpp.P ./$(DEPDIR)/kbuildimageiofactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildimageiofactory.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kbuildimageiofactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildprotocolinfofactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicefactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicegroupfactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildservicetypefactory.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbuildsycoca_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kctimefactory.Plo ./$(DEPDIR)/kded.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kded_main.Plo ./$(DEPDIR)/kded_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po - - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -548,6 +572,7 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \ -+ $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) \ - $(kbuildsycoca_SOURCES) $(kded_SOURCES) \ - $(kdontchangethehostname_SOURCES) - DATA = $(servicetype_DATA) $(update_DATA) -@@ -556,7 +581,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE - - DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ - Makefile.in --SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) -+SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) $(kbuildsycoca_SOURCES) $(kded_SOURCES) $(kdontchangethehostname_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -605,6 +630,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC - $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) - kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) -+libkbuildsycoca_main.la: $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkbuildsycoca_main_la_LDFLAGS) $(libkbuildsycoca_main_la_OBJECTS) $(libkbuildsycoca_main_la_LIBADD) $(LIBS) -+libkded_main.la: $(libkded_main_la_OBJECTS) $(libkded_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkded_main_la_LDFLAGS) $(libkded_main_la_OBJECTS) $(libkded_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -650,15 +679,18 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildimageiofactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildprotocolinfofactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicefactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicegroupfactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildservicetypefactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kbuildsycoca_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kctimefactory.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kded_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdedmodule.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khostname.Po@am__quote@ - -@@ -817,7 +849,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kdedmodule.desktop README.kded kded.h HOWTO DESIGN kctimefactory.h kded.upd -+KDE_DIST=README.kded DESIGN kdedmodule.desktop kded.h HOWTO Makefile.in.rej kded.upd kctimefactory.h - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -955,19 +987,16 @@ uninstall-am: uninstall-binPROGRAMS unin - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-servicetypeDATA uninstall-updateDATA - -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - - #>+ 3 --kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h -- $(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc -+kded.moc: $(srcdir)/kded.h -+ $(MOC) $(srcdir)/kded.h -o kded.moc - - #>+ 1 --mocs: kbuildsycoca.moc -+mocs: kded.moc - #>+ 3 - kdedmodule.moc: $(srcdir)/kdedmodule.h - $(MOC) $(srcdir)/kdedmodule.h -o kdedmodule.moc -@@ -975,14 +1004,14 @@ kdedmodule.moc: $(srcdir)/kdedmodule.h - #>+ 1 - mocs: kdedmodule.moc - #>+ 3 --kded.moc: $(srcdir)/kded.h -- $(MOC) $(srcdir)/kded.h -o kded.moc -+kbuildsycoca.moc: $(srcdir)/kbuildsycoca.h -+ $(MOC) $(srcdir)/kbuildsycoca.h -o kbuildsycoca.moc - - #>+ 1 --mocs: kded.moc -+mocs: kbuildsycoca.moc - #>+ 3 - clean-metasources: -- -rm -f kbuildsycoca.moc kdedmodule.moc kded.moc -+ -rm -f kded.moc kdedmodule.moc kbuildsycoca.moc - - #>+ 2 - docs-am: -@@ -995,45 +1024,45 @@ force-reedit: - - - #>+ 11 --kbuildsycoca_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc -- @echo 'creating kbuildsycoca_la.all_cpp.cpp ...'; \ -- rm -f kbuildsycoca_la.all_cpp.files kbuildsycoca_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kbuildsycoca_la.all_cpp.final; \ -+libkbuildsycoca_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kbuildsycoca.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kbuildimageiofactory.cpp $(srcdir)/kbuildprotocolinfofactory.cpp $(srcdir)/kctimefactory.cpp kbuildsycoca.moc -+ @echo 'creating libkbuildsycoca_main_la.all_cpp.cpp ...'; \ -+ rm -f libkbuildsycoca_main_la.all_cpp.files libkbuildsycoca_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkbuildsycoca_main_la.all_cpp.final; \ - for file in kbuildsycoca.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kbuildimageiofactory.cpp kbuildprotocolinfofactory.cpp kctimefactory.cpp ; do \ -- echo "#include \"$$file\"" >> kbuildsycoca_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kbuildsycoca_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkbuildsycoca_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkbuildsycoca_main_la.all_cpp.final; \ - done; \ -- cat kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files > kbuildsycoca_la.all_cpp.cpp; \ -- rm -f kbuildsycoca_la.all_cpp.final kbuildsycoca_la.all_cpp.files -+ cat libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files > libkbuildsycoca_main_la.all_cpp.cpp; \ -+ rm -f libkbuildsycoca_main_la.all_cpp.final libkbuildsycoca_main_la.all_cpp.files - - #>+ 11 --kded_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kdedmodule.moc kded.moc -- @echo 'creating kded_la.all_cpp.cpp ...'; \ -- rm -f kded_la.all_cpp.files kded_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kded_la.all_cpp.final; \ -+libkded_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kded.cpp $(srcdir)/kbuildservicetypefactory.cpp $(srcdir)/kbuildservicefactory.cpp $(srcdir)/kbuildservicegroupfactory.cpp $(srcdir)/kdedmodule.cpp kded.moc kdedmodule.moc -+ @echo 'creating libkded_main_la.all_cpp.cpp ...'; \ -+ rm -f libkded_main_la.all_cpp.files libkded_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkded_main_la.all_cpp.final; \ - for file in kded.cpp kbuildservicetypefactory.cpp kbuildservicefactory.cpp kbuildservicegroupfactory.cpp kdedmodule.cpp ; do \ -- echo "#include \"$$file\"" >> kded_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkded_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkded_main_la.all_cpp.final; \ - done; \ -- cat kded_la.all_cpp.final kded_la.all_cpp.files > kded_la.all_cpp.cpp; \ -- rm -f kded_la.all_cpp.final kded_la.all_cpp.files -+ cat libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files > libkded_main_la.all_cpp.cpp; \ -+ rm -f libkded_main_la.all_cpp.final libkded_main_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f kbuildsycoca_la.all_cpp.cpp kded_la.all_cpp.cpp -+ -rm -f libkbuildsycoca_main_la.all_cpp.cpp libkded_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" all-am -+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_final_OBJECTS)" kded_la_OBJECTS="$(kded_la_final_OBJECTS)" install-am -+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_final_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kbuildsycoca_la_OBJECTS="$(kbuildsycoca_la_nofinal_OBJECTS)" kded_la_OBJECTS="$(kded_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkbuildsycoca_main_la_OBJECTS="$(libkbuildsycoca_main_la_nofinal_OBJECTS)" libkded_main_la_OBJECTS="$(libkded_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1043,9 +1072,9 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 7 --kded.o: kded.moc --kdedmodule.o: kdedmodule.moc --kdedmodule.lo: kdedmodule.moc - kbuildsycoca.lo: kbuildsycoca.moc -+kded.o: kded.moc - kded.lo: kded.moc -+kdedmodule.o: kdedmodule.moc - kbuildsycoca.o: kbuildsycoca.moc -+kdedmodule.lo: kdedmodule.moc diff --git a/x11/kdelibs3/patches/patch-aq b/x11/kdelibs3/patches/patch-aq deleted file mode 100644 index 9762d75c98e..00000000000 --- a/x11/kdelibs3/patches/patch-aq +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aq,v 1.3 2003/04/01 12:27:13 markd Exp $ - ---- kded/kbuildsycoca.cpp.orig Sun Mar 9 14:22:02 2003 -+++ kded/kbuildsycoca.cpp -@@ -509,7 +509,9 @@ public: - ~WaitForSignal() { kapp->eventLoop()->exitLoop(); } - }; - --int main(int argc, char **argv) -+extern "C" int kdemain(int argc, char **argv); -+ -+int kdemain(int argc, char **argv) - { - KLocale::setMainCatalogue("kdelibs"); - KAboutData d(appName, I18N_NOOP("KBuildSycoca"), appVersion, diff --git a/x11/kdelibs3/patches/patch-as b/x11/kdelibs3/patches/patch-as deleted file mode 100644 index e90cd965aa8..00000000000 --- a/x11/kdelibs3/patches/patch-as +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-as,v 1.2 2002/08/25 19:23:52 jlam Exp $ - ---- kded/kded.cpp.orig Wed May 8 19:27:28 2002 -+++ kded/kded.cpp -@@ -554,5 +554,7 @@ - }; - --int main(int argc, char *argv[]) -+extern "C" int kdemain(int, char *[]); -+ -+int kdemain(int argc, char *argv[]) - { - KAboutData aboutData( "kded", I18N_NOOP("KDE Daemon"), diff --git a/x11/kdelibs3/patches/patch-au b/x11/kdelibs3/patches/patch-au deleted file mode 100644 index a43553b3f13..00000000000 --- a/x11/kdelibs3/patches/patch-au +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-au,v 1.2 2002/08/25 19:23:53 jlam Exp $ - ---- kdeprint/management/Makefile.am.orig Mon Feb 18 17:54:40 2002 -+++ kdeprint/management/Makefile.am -@@ -1,14 +1,18 @@ - INCLUDES= -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) - --lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la -+lib_LTLIBRARIES = libkdeprint_management.la libkaddprinterwizard_main.la kaddprinterwizard.la - bin_PROGRAMS = kaddprinterwizard - --kaddprinterwizard_SOURCES = dummy.cpp --kaddprinterwizard_LDADD = kaddprinterwizard.la -+kaddprinterwizard_SOURCES = kaddprinterwizard_main.cpp -+kaddprinterwizard_LDADD = libkaddprinterwizard_main.la - kaddprinterwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) - --kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp --kaddprinterwizard_la_LIBADD = libkdeprint_management.la -+libkaddprinterwizard_main_la_SOURCES = kaddprinterwizard.cpp -+libkaddprinterwizard_main_la_LIBADD = libkdeprint_management.la -+libkaddprinterwizard_main_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -+ -+kaddprinterwizard_la_SOURCES = kaddprinterwizard_main.cpp -+kaddprinterwizard_la_LIBADD = libkaddprinterwizard_main.la libkdeprint_management.la - kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) - - libkdeprint_management_la_SOURCES = \ -@@ -45,7 +49,3 @@ - - dataicon_DATA = tileup.png tiledown.png side.png - dataicondir = $(kde_datadir)/kdeprint -- --dummy.cpp: -- echo > dummy.cpp -- diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av deleted file mode 100644 index 15dd9353d74..00000000000 --- a/x11/kdelibs3/patches/patch-av +++ /dev/null @@ -1,643 +0,0 @@ -$NetBSD: patch-av,v 1.7 2004/01/15 09:52:51 markd Exp $ - ---- kdeprint/management/Makefile.in.orig 2003-12-29 11:16:54.000000000 +1300 -+++ kdeprint/management/Makefile.in -@@ -376,15 +376,19 @@ x_includes = @x_includes@ - x_libraries = @x_libraries@ - INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) - --lib_LTLIBRARIES = libkdeprint_management.la kaddprinterwizard.la -+lib_LTLIBRARIES = libkdeprint_management.la libkaddprinterwizard_main.la kaddprinterwizard.la - bin_PROGRAMS = kaddprinterwizard - --kaddprinterwizard_SOURCES = dummy.cpp --kaddprinterwizard_LDADD = kaddprinterwizard.la -+kaddprinterwizard_SOURCES = kaddprinterwizard_main.cpp -+kaddprinterwizard_LDADD = libkaddprinterwizard_main.la - kaddprinterwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) - --kaddprinterwizard_la_SOURCES = kaddprinterwizard.cpp --kaddprinterwizard_la_LIBADD = libkdeprint_management.la -+libkaddprinterwizard_main_la_SOURCES = kaddprinterwizard.cpp -+libkaddprinterwizard_main_la_LIBADD = libkdeprint_management.la -+libkaddprinterwizard_main_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -+ -+kaddprinterwizard_la_SOURCES = kaddprinterwizard_main.cpp -+kaddprinterwizard_la_LIBADD = libkaddprinterwizard_main.la libkdeprint_management.la - kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) - - libkdeprint_management_la_SOURCES = \ -@@ -430,11 +434,18 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kaddprinterwizard_la_DEPENDENCIES = libkdeprint_management.la --am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo -+kaddprinterwizard_la_DEPENDENCIES = libkaddprinterwizard_main.la \ -+ libkdeprint_management.la -+am_kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo - #>- kaddprinterwizard_la_OBJECTS = $(am_kaddprinterwizard_la_OBJECTS) - #>+ 1 --kaddprinterwizard_la_OBJECTS = kaddprinterwizard.lo -+kaddprinterwizard_la_OBJECTS = kaddprinterwizard_main.lo -+libkaddprinterwizard_main_la_DEPENDENCIES = libkdeprint_management.la -+am_libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo -+#>- libkaddprinterwizard_main_la_OBJECTS = \ -+#>- $(am_libkaddprinterwizard_main_la_OBJECTS) -+#>+ 1 -+libkaddprinterwizard_main_la_OBJECTS = kaddprinterwizard.lo - libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la - am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \ - kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \ -@@ -479,18 +490,20 @@ libkdeprint_management_la_nofinal_OBJECT - bin_PROGRAMS = kaddprinterwizard$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kaddprinterwizard_OBJECTS = dummy.$(OBJEXT) -+am_kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT) - #>- kaddprinterwizard_OBJECTS = $(am_kaddprinterwizard_OBJECTS) - #>+ 1 --kaddprinterwizard_OBJECTS = dummy.$(OBJEXT) --kaddprinterwizard_DEPENDENCIES = kaddprinterwizard.la -+kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT) -+kaddprinterwizard_DEPENDENCIES = libkaddprinterwizard_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles - #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -537,10 +550,12 @@ am__depfiles_maybe = depfiles - #>- @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo --#>+ 99 -+#>+ 103 - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkdeprint_management_la.all_cpp.P ./$(DEPDIR)/cjanuswidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -588,8 +603,10 @@ am__depfiles_maybe = depfiles - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/jobitem.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/jobitem.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaddprinterwizard_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -656,6 +673,7 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \ -+ $(libkaddprinterwizard_main_la_SOURCES) \ - $(libkdeprint_management_la_SOURCES) \ - $(kaddprinterwizard_SOURCES) - DATA = $(dataicon_DATA) -@@ -664,7 +682,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H - - DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \ - Makefile.in --SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES) -+SOURCES = $(kaddprinterwizard_la_SOURCES) $(libkaddprinterwizard_main_la_SOURCES) $(libkdeprint_management_la_SOURCES) $(kaddprinterwizard_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -711,6 +729,8 @@ clean-libLTLIBRARIES: - done - kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS) -+libkaddprinterwizard_main.la: $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkaddprinterwizard_main_la_LDFLAGS) $(libkaddprinterwizard_main_la_OBJECTS) $(libkaddprinterwizard_main_la_LIBADD) $(LIBS) - #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) - #>+ 2 - @KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) -@@ -756,9 +776,10 @@ distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjanuswidget.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobitem.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaddprinterwizard_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiconselectaction.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigcommand.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigdialog.Plo@am__quote@ -@@ -951,7 +972,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=tiledown.png tileup.png side.png -+KDE_DIST=Makefile.in.rej side.png tiledown.png tileup.png - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -1087,9 +1108,6 @@ uninstall-am: uninstall-binPROGRAMS unin - uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \ - uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES - -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -1104,83 +1122,77 @@ libkdeprint_management.la.closure: $(lib - - - #>+ 3 --kmjobviewer.moc: $(srcdir)/kmjobviewer.h -- $(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc -- --#>+ 1 --mocs: kmjobviewer.moc --#>+ 3 --kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h -- $(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc -+kmmainview.moc: $(srcdir)/kmmainview.h -+ $(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc - - #>+ 1 --mocs: kmwsocketutil.moc -+mocs: kmmainview.moc - #>+ 3 --kmwsmb.moc: $(srcdir)/kmwsmb.h -- $(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc -+kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h -+ $(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc - - #>+ 1 --mocs: kmwsmb.moc -+mocs: kmconfigfonts.moc - #>+ 3 --kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h -- $(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc -+kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h -+ $(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc - - #>+ 1 --mocs: kmwdrivertest.moc -+mocs: kmdriverdbwidget.moc - #>+ 3 --kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h -- $(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc -+kmconfigpage.moc: $(srcdir)/kmconfigpage.h -+ $(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc - - #>+ 1 --mocs: kmconfigdialog.moc -+mocs: kmconfigpage.moc - #>+ 3 --pluginaction.moc: $(srcdir)/pluginaction.h -- $(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc -+smbview.moc: $(srcdir)/smbview.h -+ $(MOC) $(srcdir)/smbview.h -o smbview.moc - - #>+ 1 --mocs: pluginaction.moc -+mocs: smbview.moc - #>+ 3 --kmdriverdb.moc: $(srcdir)/kmdriverdb.h -- $(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc -+kmwsmb.moc: $(srcdir)/kmwsmb.h -+ $(MOC) $(srcdir)/kmwsmb.h -o kmwsmb.moc - - #>+ 1 --mocs: kmdriverdb.moc -+mocs: kmwsmb.moc - #>+ 3 --kmtimer.moc: $(srcdir)/kmtimer.h -- $(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc -+cjanuswidget.moc: $(srcdir)/cjanuswidget.h -+ $(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc - - #>+ 1 --mocs: kmtimer.moc -+mocs: cjanuswidget.moc - #>+ 3 --kmiconview.moc: $(srcdir)/kmiconview.h -- $(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc -+networkscanner.moc: $(srcdir)/networkscanner.h -+ $(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc - - #>+ 1 --mocs: kmiconview.moc -+mocs: networkscanner.moc - #>+ 3 --kmmainview.moc: $(srcdir)/kmmainview.h -- $(MOC) $(srcdir)/kmmainview.h -o kmmainview.moc -+kmlistview.moc: $(srcdir)/kmlistview.h -+ $(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc - - #>+ 1 --mocs: kmmainview.moc -+mocs: kmlistview.moc - #>+ 3 --kmconfigpage.moc: $(srcdir)/kmconfigpage.h -- $(MOC) $(srcdir)/kmconfigpage.h -o kmconfigpage.moc -+pluginaction.moc: $(srcdir)/pluginaction.h -+ $(MOC) $(srcdir)/pluginaction.h -o pluginaction.moc - - #>+ 1 --mocs: kmconfigpage.moc -+mocs: pluginaction.moc - #>+ 3 --kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h -- $(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc -+kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h -+ $(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc - - #>+ 1 --mocs: kmpropcontainer.moc -+mocs: kmconfiggeneral.moc - #>+ 3 --kmdbcreator.moc: $(srcdir)/kmdbcreator.h -- $(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc -+kmwclass.moc: $(srcdir)/kmwclass.h -+ $(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc - - #>+ 1 --mocs: kmdbcreator.moc -+mocs: kmwclass.moc - #>+ 3 - kminstancepage.moc: $(srcdir)/kminstancepage.h - $(MOC) $(srcdir)/kminstancepage.h -o kminstancepage.moc -@@ -1188,17 +1200,23 @@ kminstancepage.moc: $(srcdir)/kminstance - #>+ 1 - mocs: kminstancepage.moc - #>+ 3 --networkscanner.moc: $(srcdir)/networkscanner.h -- $(MOC) $(srcdir)/networkscanner.h -o networkscanner.moc -+kmprinterview.moc: $(srcdir)/kmprinterview.h -+ $(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc - - #>+ 1 --mocs: networkscanner.moc -+mocs: kmprinterview.moc - #>+ 3 --kmwclass.moc: $(srcdir)/kmwclass.h -- $(MOC) $(srcdir)/kmwclass.h -o kmwclass.moc -+kmiconview.moc: $(srcdir)/kmiconview.h -+ $(MOC) $(srcdir)/kmiconview.h -o kmiconview.moc - - #>+ 1 --mocs: kmwclass.moc -+mocs: kmiconview.moc -+#>+ 3 -+kmpropcontainer.moc: $(srcdir)/kmpropcontainer.h -+ $(MOC) $(srcdir)/kmpropcontainer.h -o kmpropcontainer.moc -+ -+#>+ 1 -+mocs: kmpropcontainer.moc - #>+ 3 - kmwdriverselect.moc: $(srcdir)/kmwdriverselect.h - $(MOC) $(srcdir)/kmwdriverselect.h -o kmwdriverselect.moc -@@ -1206,65 +1224,65 @@ kmwdriverselect.moc: $(srcdir)/kmwdriver - #>+ 1 - mocs: kmwdriverselect.moc - #>+ 3 --kmwizardpage.moc: $(srcdir)/kmwizardpage.h -- $(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc -+kmdbcreator.moc: $(srcdir)/kmdbcreator.h -+ $(MOC) $(srcdir)/kmdbcreator.h -o kmdbcreator.moc - - #>+ 1 --mocs: kmwizardpage.moc -+mocs: kmdbcreator.moc - #>+ 3 --kmwlocal.moc: $(srcdir)/kmwlocal.h -- $(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc -+kmpropwidget.moc: $(srcdir)/kmpropwidget.h -+ $(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc - - #>+ 1 --mocs: kmwlocal.moc -+mocs: kmpropwidget.moc - #>+ 3 --kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h -- $(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc -+kmconfigdialog.moc: $(srcdir)/kmconfigdialog.h -+ $(MOC) $(srcdir)/kmconfigdialog.h -o kmconfigdialog.moc - - #>+ 1 --mocs: kmconfigjobs.moc -+mocs: kmconfigdialog.moc - #>+ 3 --kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h -- $(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc -+kmwlocal.moc: $(srcdir)/kmwlocal.h -+ $(MOC) $(srcdir)/kmwlocal.h -o kmwlocal.moc - - #>+ 1 --mocs: kmconfigfilter.moc -+mocs: kmwlocal.moc - #>+ 3 --kmwsocket.moc: $(srcdir)/kmwsocket.h -- $(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc -+kmjobviewer.moc: $(srcdir)/kmjobviewer.h -+ $(MOC) $(srcdir)/kmjobviewer.h -o kmjobviewer.moc - - #>+ 1 --mocs: kmwsocket.moc -+mocs: kmjobviewer.moc - #>+ 3 --kmconfigfonts.moc: $(srcdir)/kmconfigfonts.h -- $(MOC) $(srcdir)/kmconfigfonts.h -o kmconfigfonts.moc -+kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h -+ $(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc - - #>+ 1 --mocs: kmconfigfonts.moc -+mocs: kmspecialprinterdlg.moc - #>+ 3 --kmpropwidget.moc: $(srcdir)/kmpropwidget.h -- $(MOC) $(srcdir)/kmpropwidget.h -o kmpropwidget.moc -+kiconselectaction.moc: $(srcdir)/kiconselectaction.h -+ $(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc - - #>+ 1 --mocs: kmpropwidget.moc -+mocs: kiconselectaction.moc - #>+ 3 --kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h -- $(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc -+kmwsocketutil.moc: $(srcdir)/kmwsocketutil.h -+ $(MOC) $(srcdir)/kmwsocketutil.h -o kmwsocketutil.moc - - #>+ 1 --mocs: kxmlcommanddlg.moc -+mocs: kmwsocketutil.moc - #>+ 3 --kmwizard.moc: $(srcdir)/kmwizard.h -- $(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc -+kmconfigfilter.moc: $(srcdir)/kmconfigfilter.h -+ $(MOC) $(srcdir)/kmconfigfilter.h -o kmconfigfilter.moc - - #>+ 1 --mocs: kmwizard.moc -+mocs: kmconfigfilter.moc - #>+ 3 --kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h -- $(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc -+kxmlcommanddlg.moc: $(srcdir)/kxmlcommanddlg.h -+ $(MOC) $(srcdir)/kxmlcommanddlg.h -o kxmlcommanddlg.moc - - #>+ 1 --mocs: kxmlcommandselector.moc -+mocs: kxmlcommanddlg.moc - #>+ 3 - kmpropertypage.moc: $(srcdir)/kmpropertypage.h - $(MOC) $(srcdir)/kmpropertypage.h -o kmpropertypage.moc -@@ -1272,62 +1290,62 @@ kmpropertypage.moc: $(srcdir)/kmproperty - #>+ 1 - mocs: kmpropertypage.moc - #>+ 3 --kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h -- $(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc -+kxmlcommandselector.moc: $(srcdir)/kxmlcommandselector.h -+ $(MOC) $(srcdir)/kxmlcommandselector.h -o kxmlcommandselector.moc - - #>+ 1 --mocs: kmdriverdialog.moc -+mocs: kxmlcommandselector.moc - #>+ 3 --kmdriverdbwidget.moc: $(srcdir)/kmdriverdbwidget.h -- $(MOC) $(srcdir)/kmdriverdbwidget.h -o kmdriverdbwidget.moc -+kmwdrivertest.moc: $(srcdir)/kmwdrivertest.h -+ $(MOC) $(srcdir)/kmwdrivertest.h -o kmwdrivertest.moc - - #>+ 1 --mocs: kmdriverdbwidget.moc -+mocs: kmwdrivertest.moc - #>+ 3 --smbview.moc: $(srcdir)/smbview.h -- $(MOC) $(srcdir)/smbview.h -o smbview.moc -+kmwsocket.moc: $(srcdir)/kmwsocket.h -+ $(MOC) $(srcdir)/kmwsocket.h -o kmwsocket.moc - - #>+ 1 --mocs: smbview.moc -+mocs: kmwsocket.moc - #>+ 3 --kmlistview.moc: $(srcdir)/kmlistview.h -- $(MOC) $(srcdir)/kmlistview.h -o kmlistview.moc -+kmwizard.moc: $(srcdir)/kmwizard.h -+ $(MOC) $(srcdir)/kmwizard.h -o kmwizard.moc - - #>+ 1 --mocs: kmlistview.moc -+mocs: kmwizard.moc - #>+ 3 --kmconfiggeneral.moc: $(srcdir)/kmconfiggeneral.h -- $(MOC) $(srcdir)/kmconfiggeneral.h -o kmconfiggeneral.moc -+kmdriverdb.moc: $(srcdir)/kmdriverdb.h -+ $(MOC) $(srcdir)/kmdriverdb.h -o kmdriverdb.moc - - #>+ 1 --mocs: kmconfiggeneral.moc -+mocs: kmdriverdb.moc - #>+ 3 --kmspecialprinterdlg.moc: $(srcdir)/kmspecialprinterdlg.h -- $(MOC) $(srcdir)/kmspecialprinterdlg.h -o kmspecialprinterdlg.moc -+kmtimer.moc: $(srcdir)/kmtimer.h -+ $(MOC) $(srcdir)/kmtimer.h -o kmtimer.moc - - #>+ 1 --mocs: kmspecialprinterdlg.moc -+mocs: kmtimer.moc - #>+ 3 --kiconselectaction.moc: $(srcdir)/kiconselectaction.h -- $(MOC) $(srcdir)/kiconselectaction.h -o kiconselectaction.moc -+kmconfigjobs.moc: $(srcdir)/kmconfigjobs.h -+ $(MOC) $(srcdir)/kmconfigjobs.h -o kmconfigjobs.moc - - #>+ 1 --mocs: kiconselectaction.moc -+mocs: kmconfigjobs.moc - #>+ 3 --kmprinterview.moc: $(srcdir)/kmprinterview.h -- $(MOC) $(srcdir)/kmprinterview.h -o kmprinterview.moc -+kmwizardpage.moc: $(srcdir)/kmwizardpage.h -+ $(MOC) $(srcdir)/kmwizardpage.h -o kmwizardpage.moc - - #>+ 1 --mocs: kmprinterview.moc -+mocs: kmwizardpage.moc - #>+ 3 --cjanuswidget.moc: $(srcdir)/cjanuswidget.h -- $(MOC) $(srcdir)/cjanuswidget.h -o cjanuswidget.moc -+kmdriverdialog.moc: $(srcdir)/kmdriverdialog.h -+ $(MOC) $(srcdir)/kmdriverdialog.h -o kmdriverdialog.moc - - #>+ 1 --mocs: cjanuswidget.moc -+mocs: kmdriverdialog.moc - #>+ 3 - clean-metasources: -- -rm -f kmjobviewer.moc kmwsocketutil.moc kmwsmb.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmlistview.moc kmconfiggeneral.moc kmspecialprinterdlg.moc kiconselectaction.moc kmprinterview.moc cjanuswidget.moc -+ -rm -f kmmainview.moc kmconfigfonts.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmwizardpage.moc kmdriverdialog.moc - - #>+ 3 - clean-closures: -@@ -1344,7 +1362,7 @@ force-reedit: - - - #>+ 11 --libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp kmwsmb.moc kmwsocketutil.moc kmjobviewer.moc kmwdrivertest.moc kmconfigdialog.moc pluginaction.moc kmdriverdb.moc kmtimer.moc kmiconview.moc kmmainview.moc kmconfigpage.moc kmpropcontainer.moc kmdbcreator.moc kminstancepage.moc networkscanner.moc kmwclass.moc kmwdriverselect.moc kmwizardpage.moc kmwlocal.moc kmconfigjobs.moc kmconfigfilter.moc kmwsocket.moc kmconfigfonts.moc kmpropwidget.moc kxmlcommanddlg.moc kmwizard.moc kxmlcommandselector.moc kmpropertypage.moc kmdriverdialog.moc kmdriverdbwidget.moc smbview.moc kmspecialprinterdlg.moc kmconfiggeneral.moc kmlistview.moc kmprinterview.moc kiconselectaction.moc cjanuswidget.moc -+libkdeprint_management_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmdbcreator.cpp $(srcdir)/kmdriverdb.cpp $(srcdir)/kmdriverdbwidget.cpp $(srcdir)/kmiconview.cpp $(srcdir)/kminfopage.cpp $(srcdir)/kmmainview.cpp $(srcdir)/kmpages.cpp $(srcdir)/kmprinterview.cpp $(srcdir)/kmjobviewer.cpp $(srcdir)/jobitem.cpp $(srcdir)/kmpropwidget.cpp $(srcdir)/kmpropcontainer.cpp $(srcdir)/kmpropertypage.cpp $(srcdir)/kmpropgeneral.cpp $(srcdir)/cjanuswidget.cpp $(srcdir)/kmpropmembers.cpp $(srcdir)/kmpropbackend.cpp $(srcdir)/kmpropdriver.cpp $(srcdir)/kmlistview.cpp $(srcdir)/kminstancepage.cpp $(srcdir)/kmtimer.cpp $(srcdir)/kmwizard.cpp $(srcdir)/kmwizardpage.cpp $(srcdir)/kmwinfopage.cpp $(srcdir)/kmwpassword.cpp $(srcdir)/kmwsocketutil.cpp $(srcdir)/kmwbackend.cpp $(srcdir)/kmwsocket.cpp $(srcdir)/kmwdriver.cpp $(srcdir)/kmwdriverselect.cpp $(srcdir)/kmwdrivertest.cpp $(srcdir)/kmwinfobase.cpp $(srcdir)/kmwname.cpp $(srcdir)/kmwend.cpp $(srcdir)/kmwclass.cpp $(srcdir)/kmwlpd.cpp $(srcdir)/kmwfile.cpp $(srcdir)/kmdriverdialog.cpp $(srcdir)/kmwsmb.cpp $(srcdir)/smbview.cpp $(srcdir)/kmconfigdialog.cpp $(srcdir)/kmconfigpage.cpp $(srcdir)/kmconfiggeneral.cpp $(srcdir)/kmspecialprinterdlg.cpp $(srcdir)/kmwlocal.cpp $(srcdir)/kiconselectaction.cpp $(srcdir)/kmconfigpreview.cpp $(srcdir)/sidepixmap.cpp $(srcdir)/pluginaction.cpp $(srcdir)/kxmlcommanddlg.cpp $(srcdir)/kxmlcommandselector.cpp $(srcdir)/kmconfigcommand.cpp $(srcdir)/kmconfigfilter.cpp $(srcdir)/kmconfigfonts.cpp $(srcdir)/kmconfigjobs.cpp $(srcdir)/networkscanner.cpp kmconfigfonts.moc kmmainview.moc kmdriverdbwidget.moc kmconfigpage.moc smbview.moc kmwsmb.moc cjanuswidget.moc networkscanner.moc kmlistview.moc pluginaction.moc kmconfiggeneral.moc kmwclass.moc kminstancepage.moc kmprinterview.moc kmiconview.moc kmpropcontainer.moc kmwdriverselect.moc kmdbcreator.moc kmpropwidget.moc kmconfigdialog.moc kmwlocal.moc kmjobviewer.moc kmspecialprinterdlg.moc kiconselectaction.moc kmwsocketutil.moc kmconfigfilter.moc kxmlcommanddlg.moc kmpropertypage.moc kxmlcommandselector.moc kmwdrivertest.moc kmwsocket.moc kmwizard.moc kmdriverdb.moc kmtimer.moc kmconfigjobs.moc kmdriverdialog.moc kmwizardpage.moc - @echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \ - rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \ -@@ -1380,77 +1398,77 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 75 --kiconselectaction.lo: kiconselectaction.moc --kmwsmb.o: kmwsmb.moc --kmwsocket.lo: kmwsocket.moc --kmconfigfilter.o: kmconfigfilter.moc --kmconfiggeneral.o: kmconfiggeneral.moc --kmdriverdialog.o: kmdriverdialog.moc --kmconfigjobs.o: kmconfigjobs.moc --kxmlcommandselector.lo: kxmlcommandselector.moc --cjanuswidget.lo: cjanuswidget.moc --kmdriverdbwidget.lo: kmdriverdbwidget.moc --kmiconview.lo: kmiconview.moc --kminstancepage.o: kminstancepage.moc --kmwsocketutil.o: kmwsocketutil.moc --kmdriverdb.o: kmdriverdb.moc --kmconfigpage.lo: kmconfigpage.moc --kmwdrivertest.o: kmwdrivertest.moc --kmdbcreator.o: kmdbcreator.moc --kmconfigdialog.lo: kmconfigdialog.moc --kmtimer.o: kmtimer.moc -+kmmainview.o: kmmainview.moc -+kmpropcontainer.lo: kmpropcontainer.moc - kmmainview.lo: kmmainview.moc --kmwsocket.o: kmwsocket.moc --kmdriverdialog.lo: kmdriverdialog.moc --kmdbcreator.lo: kmdbcreator.moc --kmjobviewer.lo: kmjobviewer.moc --kminstancepage.lo: kminstancepage.moc --kmconfigfilter.lo: kmconfigfilter.moc -+kmconfigjobs.o: kmconfigjobs.moc - kmpropwidget.o: kmpropwidget.moc --kmpropcontainer.lo: kmpropcontainer.moc --kmconfiggeneral.lo: kmconfiggeneral.moc --kmpropertypage.lo: kmpropertypage.moc --pluginaction.lo: pluginaction.moc --kmspecialprinterdlg.lo: kmspecialprinterdlg.moc --kmconfigfonts.lo: kmconfigfonts.moc --kmwlocal.lo: kmwlocal.moc --kmconfigfonts.o: kmconfigfonts.moc -+kmdbcreator.o: kmdbcreator.moc - kmwizardpage.lo: kmwizardpage.moc -+kmwclass.o: kmwclass.moc -+kmwlocal.lo: kmwlocal.moc - kmconfigpage.o: kmconfigpage.moc --kmwsocketutil.lo: kmwsocketutil.moc -+pluginaction.lo: pluginaction.moc -+kmwdrivertest.o: kmwdrivertest.moc -+smbview.lo: smbview.moc -+kmconfigdialog.lo: kmconfigdialog.moc -+kmwizardpage.o: kmwizardpage.moc - kmwdrivertest.lo: kmwdrivertest.moc -+kiconselectaction.o: kiconselectaction.moc - kmiconview.o: kmiconview.moc --kmwdriverselect.o: kmwdriverselect.moc -+kmdriverdb.o: kmdriverdb.moc -+kmpropcontainer.o: kmpropcontainer.moc -+kmtimer.o: kmtimer.moc -+kmjobviewer.o: kmjobviewer.moc -+kmtimer.lo: kmtimer.moc -+kmwdriverselect.lo: kmwdriverselect.moc - cjanuswidget.o: cjanuswidget.moc --kmprinterview.o: kmprinterview.moc -+kmwlocal.o: kmwlocal.moc -+kmjobviewer.lo: kmjobviewer.moc -+kmdriverdbwidget.o: kmdriverdbwidget.moc -+kmconfiggeneral.lo: kmconfiggeneral.moc -+kmconfigdialog.o: kmconfigdialog.moc -+smbview.o: smbview.moc -+kmwsmb.lo: kmwsmb.moc -+kiconselectaction.lo: kiconselectaction.moc - kxmlcommandselector.o: kxmlcommandselector.moc -+kminstancepage.o: kminstancepage.moc -+kmconfiggeneral.o: kmconfiggeneral.moc -+kmwclass.lo: kmwclass.moc -+kmwdriverselect.o: kmwdriverselect.moc - networkscanner.lo: networkscanner.moc -+kmdbcreator.lo: kmdbcreator.moc -+kmconfigfonts.o: kmconfigfonts.moc -+networkscanner.o: networkscanner.moc -+kmconfigfilter.lo: kmconfigfilter.moc -+kmconfigfonts.lo: kmconfigfonts.moc -+kmdriverdbwidget.lo: kmdriverdbwidget.moc -+kmwsocketutil.lo: kmwsocketutil.moc -+kminstancepage.lo: kminstancepage.moc -+kmwizard.lo: kmwizard.moc - kmpropwidget.lo: kmpropwidget.moc -+kmprinterview.lo: kmprinterview.moc -+kmwsocket.lo: kmwsocket.moc -+cjanuswidget.lo: cjanuswidget.moc -+kmwsmb.o: kmwsmb.moc -+kmlistview.o: kmlistview.moc -+kmspecialprinterdlg.lo: kmspecialprinterdlg.moc - pluginaction.o: pluginaction.moc --kmpropertypage.o: kmpropertypage.moc - kxmlcommanddlg.lo: kxmlcommanddlg.moc --kmwclass.lo: kmwclass.moc --kxmlcommanddlg.o: kxmlcommanddlg.moc --kmwlocal.o: kmwlocal.moc -+kxmlcommandselector.lo: kxmlcommandselector.moc - kmspecialprinterdlg.o: kmspecialprinterdlg.moc --kmmainview.o: kmmainview.moc -+kmconfigpage.lo: kmconfigpage.moc -+kmiconview.lo: kmiconview.moc -+kxmlcommanddlg.o: kxmlcommanddlg.moc -+kmconfigfilter.o: kmconfigfilter.moc -+kmwsocketutil.o: kmwsocketutil.moc - kmconfigjobs.lo: kmconfigjobs.moc --kmlistview.o: kmlistview.moc --networkscanner.o: networkscanner.moc --kmwizardpage.o: kmwizardpage.moc --kmwizard.o: kmwizard.moc --kmprinterview.lo: kmprinterview.moc --kmconfigdialog.o: kmconfigdialog.moc --kmwsmb.lo: kmwsmb.moc --kmwdriverselect.lo: kmwdriverselect.moc --kiconselectaction.o: kiconselectaction.moc --kmdriverdbwidget.o: kmdriverdbwidget.moc --kmtimer.lo: kmtimer.moc --kmjobviewer.o: kmjobviewer.moc --kmpropcontainer.o: kmpropcontainer.moc --kmlistview.lo: kmlistview.moc --kmwizard.lo: kmwizard.moc --smbview.o: smbview.moc - kmdriverdb.lo: kmdriverdb.moc --kmwclass.o: kmwclass.moc --smbview.lo: smbview.moc -+kmprinterview.o: kmprinterview.moc -+kmwsocket.o: kmwsocket.moc -+kmpropertypage.o: kmpropertypage.moc -+kmdriverdialog.lo: kmdriverdialog.moc -+kmlistview.lo: kmlistview.moc -+kmdriverdialog.o: kmdriverdialog.moc -+kmpropertypage.lo: kmpropertypage.moc -+kmwizard.o: kmwizard.moc diff --git a/x11/kdelibs3/patches/patch-aw b/x11/kdelibs3/patches/patch-aw deleted file mode 100644 index 9c97818dbc2..00000000000 --- a/x11/kdelibs3/patches/patch-aw +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2002/08/25 19:23:53 jlam Exp $ - ---- kdeprint/management/kaddprinterwizard.cpp.orig Wed May 8 19:27:33 2002 -+++ kdeprint/management/kaddprinterwizard.cpp -@@ -11,7 +11,9 @@ - {0, 0, 0} - }; - --int main(int argc, char *argv[]) -+extern "C" int kdemain(int, char* []); -+ -+int kdemain(int argc, char *argv[]) - { - KCmdLineArgs::init(argc, argv, "kaddprinterwizard", - I18N_NOOP("Start the add printer wizard"), diff --git a/x11/kdelibs3/patches/patch-ay b/x11/kdelibs3/patches/patch-ay deleted file mode 100644 index 9dd3d3061f9..00000000000 --- a/x11/kdelibs3/patches/patch-ay +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:53 jlam Exp $ - ---- kdoctools/xslt.cpp.orig Wed May 8 19:27:41 2002 -+++ kdoctools/xslt.cpp -@@ -52,18 +52,18 @@ - - va_list args; - -- char buffer[50000]; -+#define WF_BUFSIZE 50000 -+ char buffer[WF_BUFSIZE]; - buffer[0] = 0; - - if (input->filename) { -- sprintf(&buffer[strlen(buffer)], "%s:%d: ", input->filename, -- input->line); -+ snprintf(buffer, WF_BUFSIZE, "%s:%d: ", input->filename, input->line); - } else { -- sprintf(&buffer[strlen(buffer)], "Entity: line %d: ", input->line); -+ snprintf(buffer, WF_BUFSIZE, "Entity: line %d: ", input->line); - } - - va_start(args, msg); -- vsprintf(&buffer[strlen(buffer)], msg, args); -+ vsnprintf(&buffer[strlen(buffer)], WF_BUFSIZE, msg, args); - va_end(args); - - fprintf( stderr, "%s", buffer ); -@@ -89,9 +89,10 @@ - INFO(i18n("Reading document")); - QFile xmlFile( pat ); - xmlFile.open(IO_ReadOnly); -+ -+ int len = xmlFile.size(); - QCString contents; - contents.assign(xmlFile.readAll()); -- contents.truncate(xmlFile.size()); - xmlFile.close(); - /* if (contents.left(5) != "<?xml") { - fprintf(stderr, "xmlizer\n"); -@@ -111,8 +112,7 @@ - - INFO(i18n("Parsing document")); - xmlParserCtxtPtr ctxt = xmlCreateMemoryParserCtxt -- (contents.data(), -- contents.length()); -+ (contents.data(), len); - ctxt->sax->warning = warningsFunc; - - int directory = pat.findRev('/'); diff --git a/x11/kdelibs3/patches/patch-az b/x11/kdelibs3/patches/patch-az deleted file mode 100644 index 2f7677d83b6..00000000000 --- a/x11/kdelibs3/patches/patch-az +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-az,v 1.3 2003/03/11 13:10:35 markd Exp $ - ---- kinit/Makefile.am.orig Mon Sep 16 09:13:34 2002 -+++ kinit/Makefile.am -@@ -54,8 +54,7 @@ - klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp - - klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) --klauncher_LDADD = klauncher.la --klauncher_SOURCES = dummy.cpp -+klauncher_SOURCES = main.cpp - - METASOURCES = AUTO - -@@ -65,5 +64,3 @@ - - shell.o: wrapper.c - --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba deleted file mode 100644 index 187259380e2..00000000000 --- a/x11/kdelibs3/patches/patch-ba +++ /dev/null @@ -1,106 +0,0 @@ -$NetBSD: patch-ba,v 1.6 2004/01/15 09:52:51 markd Exp $ - ---- kinit/Makefile.in.orig 2003-12-29 11:16:58.000000000 +1300 -+++ kinit/Makefile.in -@@ -433,8 +433,7 @@ klauncher_la_LIBADD = $(LIB_KIO) - klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp - - klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) --klauncher_LDADD = klauncher.la --klauncher_SOURCES = dummy.cpp -+klauncher_SOURCES = main.cpp - - #>- METASOURCES = AUTO - -@@ -484,11 +483,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT) - #>+ 1 - kioslave_OBJECTS = kioslave.$(OBJEXT) - kioslave_DEPENDENCIES = --am_klauncher_OBJECTS = dummy.$(OBJEXT) -+am_klauncher_OBJECTS = main.$(OBJEXT) - #>- klauncher_OBJECTS = $(am_klauncher_OBJECTS) - #>+ 1 --klauncher_OBJECTS = dummy.$(OBJEXT) --klauncher_DEPENDENCIES = klauncher.la -+klauncher_OBJECTS = main.$(OBJEXT) -+klauncher_LDADD = $(LDADD) -+klauncher_DEPENDENCIES = - am_kshell_OBJECTS = shell.$(OBJEXT) - #>- kshell_OBJECTS = $(am_kshell_OBJECTS) - #>+ 1 -@@ -511,28 +511,25 @@ lnusertemp_DEPENDENCIES = - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \ --#>- @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po --#>+ 15 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po -+#>+ 13 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/klauncher_la.all_cpp.P $(DEPDIR)/kdeinit.all_cpp.P ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kinit.Po ./$(DEPDIR)/kioslave.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/kinit.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kioslave.Po ./$(DEPDIR)/klauncher.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klauncher_main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrapper.Po ./$(DEPDIR)/lnusertemp.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/setproctitle.Po ./$(DEPDIR)/shell.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/wrapper.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/setproctitle.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/shell.Po ./$(DEPDIR)/wrapper.Po - - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -681,13 +678,13 @@ distclean-compile: - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autostart.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kinit.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kioslave.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klauncher_main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrapper.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lnusertemp.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@ -@@ -896,7 +893,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=startkde.example README.wrapper README.autostart LICENSE.setproctitle README.DCOP -+KDE_DIST=startkde.example Makefile.in.rej LICENSE.setproctitle README.wrapper README.autostart README.DCOP - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -1056,9 +1053,6 @@ uninstall-info: uninstall-info-recursive - kwrapper.o: wrapper.c - - shell.o: wrapper.c -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/x11/kdelibs3/patches/patch-bb b/x11/kdelibs3/patches/patch-bb deleted file mode 100644 index 79edfe33c97..00000000000 --- a/x11/kdelibs3/patches/patch-bb +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-bb,v 1.3 2002/08/25 19:23:53 jlam Exp $ - ---- kinit/klauncher_main.cpp.orig Mon Jun 24 13:04:02 2002 -+++ kinit/klauncher_main.cpp -@@ -85,8 +85,3 @@ - launcher->exec(); - return 0; - } -- --int main(/*int argc, char **argv*/) --{ -- return 0; --} diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd index af70ffe89e4..805e7d767af 100644 --- a/x11/kdelibs3/patches/patch-bd +++ b/x11/kdelibs3/patches/patch-bd @@ -1,9 +1,9 @@ -$NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ +$NetBSD: patch-bd,v 1.8 2004/02/04 13:58:39 markd Exp $ ---- kio/kssl/kopenssl.cc.orig Wed May 7 23:46:34 2003 +--- kio/kssl/kopenssl.cc.orig 2003-11-30 22:47:08.000000000 +1300 +++ kio/kssl/kopenssl.cc -@@ -182,7 +182,7 @@ void KOpenSSLProxy::destroy() { - _me = NULL; +@@ -207,7 +207,7 @@ void KOpenSSLProxy::destroy() { + _me = 0L; } -#ifdef __OpenBSD__ @@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ #include <qdir.h> #include <qstring.h> #include <qstringlist.h> -@@ -245,26 +245,23 @@ KConfig *cfg; +@@ -270,26 +270,23 @@ KConfig *cfg; delete cfg; @@ -22,7 +22,7 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ - _cryptoLib = ll->globalLibrary(libname.latin1()); - } -#else - libpaths + libpaths - #ifdef _AIX +#ifdef _AIX << "/opt/freeware/lib/" @@ -42,9 +42,9 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ +#if !defined(__NetBSD__) && !defined(__OpenBSD__) // FIXME: #define here for the various OS types to optimize - libnamess + libnamess #ifdef hpux -@@ -299,10 +296,16 @@ KConfig *cfg; +@@ -324,10 +321,16 @@ KConfig *cfg; << "libcrypto.so.0" #endif ; @@ -61,7 +61,7 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ for (QStringList::Iterator shit = libnamesc.begin(); shit != libnamesc.end(); ++shit) { -@@ -316,9 +319,9 @@ KConfig *cfg; +@@ -341,9 +344,9 @@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } @@ -71,8 +71,8 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ -#endif if (_cryptoLib) { - #ifdef KSSL_HAVE_SSL -@@ -418,16 +421,14 @@ KConfig *cfg; + #ifdef KSSL_HAVE_SSL +@@ -462,16 +465,14 @@ KConfig *cfg; #endif } @@ -94,7 +94,7 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ for (QStringList::Iterator shit = libnamess.begin(); shit != libnamess.end(); ++shit) { -@@ -441,9 +442,9 @@ KConfig *cfg; +@@ -485,9 +486,9 @@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } @@ -104,4 +104,4 @@ $NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ -#endif if (_sslLib) { - #ifdef KSSL_HAVE_SSL + #ifdef KSSL_HAVE_SSL diff --git a/x11/kdelibs3/patches/patch-bg b/x11/kdelibs3/patches/patch-bg deleted file mode 100644 index 0503dc4f47e..00000000000 --- a/x11/kdelibs3/patches/patch-bg +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-bg,v 1.3 2003/03/11 13:10:37 markd Exp $ - ---- kio/misc/Makefile.am.orig Fri Jan 3 17:58:52 2003 -+++ kio/misc/Makefile.am -@@ -22,15 +22,19 @@ - - SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile - --lib_LTLIBRARIES = kio_uiserver.la -+lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la - bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice - --kio_uiserver_SOURCES = dummy.cpp --kio_uiserver_LDADD = kio_uiserver.la -+kio_uiserver_SOURCES = kio_uiserver_main.cpp -+kio_uiserver_LDADD = libkio_uiserver_main.la - kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub --kio_uiserver_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub -+libkio_uiserver_main_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_LDFLAGS = $(all_libraries) -+ -+kio_uiserver_la_SOURCES = kio_uiserver_main.cpp -+kio_uiserver_la_LIBADD = libkio_uiserver_main.la - kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version - - observer_DIR = $(top_srcdir)/kio/kio diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh deleted file mode 100644 index 84da979f373..00000000000 --- a/x11/kdelibs3/patches/patch-bh +++ /dev/null @@ -1,224 +0,0 @@ -$NetBSD: patch-bh,v 1.7 2004/01/15 09:52:51 markd Exp $ - ---- kio/misc/Makefile.in.orig 2003-12-29 11:17:00.000000000 +1300 -+++ kio/misc/Makefile.in -@@ -399,17 +399,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir - - SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile - --lib_LTLIBRARIES = kio_uiserver.la -+lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la - bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice - --kio_uiserver_SOURCES = dummy.cpp --kio_uiserver_LDADD = kio_uiserver.la -+kio_uiserver_SOURCES = kio_uiserver_main.cpp -+kio_uiserver_LDADD = libkio_uiserver_main.la - kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub -+#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub - #>+ 1 --kio_uiserver_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp --kio_uiserver_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp -+libkio_uiserver_main_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_LDFLAGS = $(all_libraries) -+ -+kio_uiserver_la_SOURCES = kio_uiserver_main.cpp -+kio_uiserver_la_LIBADD = libkio_uiserver_main.la - kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version - - observer_DIR = $(top_srcdir)/kio/kio -@@ -438,23 +442,28 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kio_uiserver_la_DEPENDENCIES = --am_kio_uiserver_la_OBJECTS = uiserver.lo -+kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la -+am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo - #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS) -+#>+ 1 -+kio_uiserver_la_OBJECTS = kio_uiserver_main.lo -+libkio_uiserver_main_la_DEPENDENCIES = -+am_libkio_uiserver_main_la_OBJECTS = uiserver.lo -+#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS) - #>+ 4 --kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo --kio_uiserver_la_nofinal_OBJECTS = uiserver.lo uiserver_skel.lo observer_stub.lo --@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS) -+libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo -+libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo uiserver_skel.lo observer_stub.lo -+@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS) - bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \ - ktelnetservice$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kio_uiserver_OBJECTS = dummy.$(OBJEXT) -+am_kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) - #>- kio_uiserver_OBJECTS = $(am_kio_uiserver_OBJECTS) - #>+ 1 --kio_uiserver_OBJECTS = dummy.$(OBJEXT) --kio_uiserver_DEPENDENCIES = kio_uiserver.la -+kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) -+kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la - am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) - #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) - #>+ 1 -@@ -469,14 +478,20 @@ ktelnetservice_DEPENDENCIES = - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kio_uiserver_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo --#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ -+#>+ 11 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P ./$(DEPDIR)/kio_uiserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/kio_uiserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo - -@@ -498,7 +513,8 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) \ -+DIST_SOURCES = $(kio_uiserver_la_SOURCES) \ -+ $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) \ - $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) - DATA = $(kde_services_DATA) $(protocol_DATA) - -@@ -512,7 +528,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - check-recursive installcheck-recursive - DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) -+SOURCES = $(kio_uiserver_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) - - #>- all: all-recursive - #>+ 1 -@@ -559,6 +575,8 @@ clean-libLTLIBRARIES: - done - kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) -+libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -604,7 +622,8 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmailservice.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktelnetservice.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiserver.Plo@am__quote@ -@@ -834,7 +853,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=rlogin.protocol kio_uiserver.desktop kmailservice.protocol rtsp.protocol telnet.protocol -+KDE_DIST=kio_uiserver.desktop rlogin.protocol Makefile.in.rej kmailservice.protocol telnet.protocol rtsp.protocol - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -1002,6 +1021,12 @@ dummy.cpp: uiserver.kidl - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - -+#>+ 3 -+uiserver.moc: $(srcdir)/uiserver.h -+ $(MOC) $(srcdir)/uiserver.h -o uiserver.moc -+ -+#>+ 1 -+mocs: uiserver.moc - #>+ 9 - uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; false ) -@@ -1013,12 +1038,6 @@ observer_stub.h: observer.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl - - #>+ 3 --uiserver.moc: $(srcdir)/uiserver.h -- $(MOC) $(srcdir)/uiserver.h -o uiserver.moc -- --#>+ 1 --mocs: uiserver.moc --#>+ 3 - clean-metasources: - -rm -f uiserver.moc - -@@ -1039,33 +1058,33 @@ force-reedit: - - - #>+ 11 --kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc -- @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ -- rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ -+libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc -+ @echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \ -+ rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \ - for file in uiserver.cpp uiserver_skel.cpp observer_stub.cpp ; do \ -- echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \ - done; \ -- cat kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \ -- rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files -+ cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \ -+ rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f kio_uiserver_la.all_cpp.cpp -+ -rm -f libkio_uiserver_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1075,7 +1094,7 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 5 -+$(srcdir)/uiserver.cpp: observer_stub.h - observer_stub.cpp: observer_stub.h - uiserver.lo: uiserver.moc - uiserver.o: uiserver.moc --$(srcdir)/uiserver.cpp: observer_stub.h diff --git a/x11/kdelibs3/patches/patch-bk b/x11/kdelibs3/patches/patch-bk deleted file mode 100644 index a926ef6ff7c..00000000000 --- a/x11/kdelibs3/patches/patch-bk +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bk,v 1.2 2002/08/25 19:23:54 jlam Exp $ - ---- kio/misc/uiserver.cpp.orig Fri Mar 1 19:47:27 2002 -+++ kio/misc/uiserver.cpp -@@ -967,7 +967,9 @@ - - //------------------------------------------------------------ - --int main(int argc, char **argv) -+extern "C" int kdemain(int argc, char **argv); -+ -+int kdemain(int argc, char **argv) - { - KLocale::setMainCatalogue("kdelibs"); - // GS 5/2001 - I changed the name to "KDE" to make it look better diff --git a/x11/kdelibs3/patches/patch-bm b/x11/kdelibs3/patches/patch-bm deleted file mode 100644 index 614a47105d9..00000000000 --- a/x11/kdelibs3/patches/patch-bm +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-bm,v 1.4 2003/05/22 02:42:42 markd Exp $ - ---- kioslave/http/Makefile.am.orig Wed May 7 23:46:34 2003 -+++ kioslave/http/Makefile.am -@@ -8,7 +8,7 @@ INCLUDES= -I$(top_srcdir)/interfaces $(a - ####### Files - - bin_PROGRAMS = kio_http_cache_cleaner --lib_LTLIBRARIES = kio_http_cache_cleaner.la -+lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la - kde_module_LTLIBRARIES = kio_http.la - - kio_http_la_SOURCES = http.cc httpfilter.cc -@@ -16,12 +16,15 @@ kio_http_la_METASOURCES = AUTO - kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ) - kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) - --kio_http_cache_cleaner_SOURCES = dummy.cpp --kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la -+kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp -+kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp --kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) -+libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp -+libkio_http_cache_cleaner_main_la_LIBADD = $(LIB_KIO) -+ -+kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp -+kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version $(all_libraries) - - noinst_HEADERS = http.h -@@ -29,6 +32,3 @@ noinst_HEADERS = http.h - kdelnkdir = $(kde_servicesdir) - kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \ - webdav.protocol webdavs.protocol -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn deleted file mode 100644 index 00a9d02da32..00000000000 --- a/x11/kdelibs3/patches/patch-bn +++ /dev/null @@ -1,195 +0,0 @@ -$NetBSD: patch-bn,v 1.7 2004/01/15 09:52:51 markd Exp $ - ---- kioslave/http/Makefile.in.orig 2003-12-29 11:17:01.000000000 +1300 -+++ kioslave/http/Makefile.in -@@ -385,7 +385,7 @@ INCLUDES = -I$(top_srcdir)/interfaces $( - - ####### Files - bin_PROGRAMS = kio_http_cache_cleaner --lib_LTLIBRARIES = kio_http_cache_cleaner.la -+lib_LTLIBRARIES = libkio_http_cache_cleaner_main.la kio_http_cache_cleaner.la - kde_module_LTLIBRARIES = kio_http.la - - kio_http_la_SOURCES = http.cc httpfilter.cc -@@ -393,12 +393,15 @@ kio_http_la_SOURCES = http.cc httpfilter - kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ) - kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) - --kio_http_cache_cleaner_SOURCES = dummy.cpp --kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la -+kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp -+kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp --kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) -+libkio_http_cache_cleaner_main_la_SOURCES = http_cache_cleaner.cpp -+libkio_http_cache_cleaner_main_la_LIBADD = $(LIB_KIO) -+ -+kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp -+kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version $(all_libraries) - - noinst_HEADERS = http.h -@@ -422,33 +425,47 @@ kio_http_la_final_OBJECTS = kio_http_la. - kio_http_la_nofinal_OBJECTS = http.lo httpfilter.lo - @KDE_USE_FINAL_FALSE@kio_http_la_OBJECTS = $(kio_http_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@kio_http_la_OBJECTS = $(kio_http_la_final_OBJECTS) --kio_http_cache_cleaner_la_DEPENDENCIES = --am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo -+kio_http_cache_cleaner_la_DEPENDENCIES = \ -+ libkio_http_cache_cleaner_main.la -+am_kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo - #>- kio_http_cache_cleaner_la_OBJECTS = \ - #>- $(am_kio_http_cache_cleaner_la_OBJECTS) - #>+ 1 --kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner.lo -+kio_http_cache_cleaner_la_OBJECTS = http_cache_cleaner_main.lo -+libkio_http_cache_cleaner_main_la_LDFLAGS = -+libkio_http_cache_cleaner_main_la_DEPENDENCIES = -+am_libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo -+#>- libkio_http_cache_cleaner_main_la_OBJECTS = \ -+#>- $(am_libkio_http_cache_cleaner_main_la_OBJECTS) -+#>+ 1 -+libkio_http_cache_cleaner_main_la_OBJECTS = http_cache_cleaner.lo - bin_PROGRAMS = kio_http_cache_cleaner$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) -+am_kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) - #>- kio_http_cache_cleaner_OBJECTS = $(am_kio_http_cache_cleaner_OBJECTS) - #>+ 1 --kio_http_cache_cleaner_OBJECTS = dummy.$(OBJEXT) --kio_http_cache_cleaner_DEPENDENCIES = kio_http_cache_cleaner.la -+kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) -+kio_http_cache_cleaner_DEPENDENCIES = libkio_http_cache_cleaner_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/http.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/httpfilter.Plo --#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kio_http_la.all_cc.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \ -+#>+ 11 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kio_http_la.all_cc.P ./$(DEPDIR)/http.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/httpfilter.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/http.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/http_cache_cleaner_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/httpfilter.Plo - - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -471,6 +488,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(kio_http_la_SOURCES) \ - $(kio_http_cache_cleaner_la_SOURCES) \ -+ $(libkio_http_cache_cleaner_main_la_SOURCES) \ - $(kio_http_cache_cleaner_SOURCES) - DATA = $(kdelnk_DATA) - -@@ -484,7 +502,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - check-recursive installcheck-recursive - DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO - DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) -+SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(libkio_http_cache_cleaner_main_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) - - #>- all: all-recursive - #>+ 1 -@@ -564,6 +582,8 @@ clean-libLTLIBRARIES: - $(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS) - kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS) -+libkio_http_cache_cleaner_main.la: $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkio_http_cache_cleaner_main_la_LDFLAGS) $(libkio_http_cache_cleaner_main_la_OBJECTS) $(libkio_http_cache_cleaner_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -603,9 +623,10 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http_cache_cleaner_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@ - - distclean-depend: -@@ -830,7 +851,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=http_cache_cleaner.desktop rfc2818.txt webdavs.protocol rfc2518.txt rfc2817.txt webdav.protocol rfc2616.txt https.protocol rfc3253.txt http.protocol README.webdav rfc2617.txt README.http_cache_cleaner THOUGHTS httpfilter.h -+KDE_DIST=README.http_cache_cleaner http_cache_cleaner.desktop rfc2817.txt httpfilter.h webdavs.protocol rfc3253.txt rfc2818.txt http.protocol webdav.protocol README.webdav https.protocol rfc2616.txt rfc2518.txt rfc2617.txt Makefile.in.rej THOUGHTS - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -994,9 +1015,6 @@ uninstall-info: uninstall-info-recursive - uninstall-kdelnkDATA uninstall-libLTLIBRARIES \ - uninstall-recursive - -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -@@ -1011,20 +1029,20 @@ kio_http.la.closure: $(kio_http_la_OBJEC - - - #>+ 3 --httpfilter.moc: $(srcdir)/httpfilter.h -- $(MOC) $(srcdir)/httpfilter.h -o httpfilter.moc -- --#>+ 1 --mocs: httpfilter.moc --#>+ 3 - http.moc: $(srcdir)/http.h - $(MOC) $(srcdir)/http.h -o http.moc - - #>+ 1 - mocs: http.moc - #>+ 3 -+httpfilter.moc: $(srcdir)/httpfilter.h -+ $(MOC) $(srcdir)/httpfilter.h -o httpfilter.moc -+ -+#>+ 1 -+mocs: httpfilter.moc -+#>+ 3 - clean-metasources: -- -rm -f httpfilter.moc http.moc -+ -rm -f http.moc httpfilter.moc - - #>+ 3 - clean-closures: -@@ -1041,7 +1059,7 @@ force-reedit: - - - #>+ 11 --kio_http_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/http.cc $(srcdir)/httpfilter.cc httpfilter.moc http.moc -+kio_http_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/http.cc $(srcdir)/httpfilter.cc http.moc httpfilter.moc - @echo 'creating kio_http_la.all_cc.cc ...'; \ - rm -f kio_http_la.all_cc.files kio_http_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kio_http_la.all_cc.final; \ -@@ -1077,7 +1095,7 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 5 --httpfilter.o: httpfilter.moc -+http.o: http.moc - httpfilter.lo: httpfilter.moc -+httpfilter.o: httpfilter.moc - http.lo: http.moc --http.o: http.moc diff --git a/x11/kdelibs3/patches/patch-bo b/x11/kdelibs3/patches/patch-bo deleted file mode 100644 index 1aec66da79a..00000000000 --- a/x11/kdelibs3/patches/patch-bo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bo,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- kioslave/http/http_cache_cleaner.cpp.orig Fri Dec 21 07:23:33 2001 -+++ kioslave/http/http_cache_cleaner.cpp -@@ -187,7 +187,9 @@ - } - } - --int main(int argc, char **argv) -+extern "C" int kdemain(int, char **); -+ -+int kdemain(int argc, char **argv) - { - KLocale::setMainCatalogue("kdelibs"); - KCmdLineArgs::init( argc, argv, appName, description, version, true); diff --git a/x11/kdelibs3/patches/patch-bq b/x11/kdelibs3/patches/patch-bq deleted file mode 100644 index 9c54bf284bc..00000000000 --- a/x11/kdelibs3/patches/patch-bq +++ /dev/null @@ -1,42 +0,0 @@ -$NetBSD: patch-bq,v 1.3 2003/03/11 13:10:38 markd Exp $ - ---- kioslave/http/kcookiejar/Makefile.am.orig Mon Sep 16 09:13:44 2002 -+++ kioslave/http/kcookiejar/Makefile.am -@@ -6,21 +6,25 @@ - ####### Files - - bin_PROGRAMS = kcookiejar --lib_LTLIBRARIES = kcookiejar.la -+lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la - kde_module_LTLIBRARIES = kded_kcookiejar.la - --kcookiejar_la_SOURCES = main.cpp -+libkcookiejar_main_la_SOURCES = main.cpp - METASOURCES = AUTO -+libkcookiejar_main_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkcookiejar_main_la_LIBADD = $(LIB_KDECORE) -+ -+kcookiejar_la_SOURCES = kcookiejar_main.cpp - kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version --kcookiejar_la_LIBADD = $(LIB_KDECORE) -+kcookiejar_la_LIBADD = libkcookiejar_main.la - - kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ - kcookieserver.skel kcookiewin.cpp - kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version - kded_kcookiejar_la_LIBADD = $(LIB_KIO) - --kcookiejar_SOURCES = dummy.cpp --kcookiejar_LDADD = kcookiejar.la -+kcookiejar_SOURCES = kcookiejar_main.cpp -+kcookiejar_LDADD = libkcookiejar_main.la - kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - kded_DATA = kcookiejar.desktop -@@ -28,6 +32,3 @@ - - update_DATA = kcookiescfg.upd - updatedir = $(kde_datadir)/kconf_update -- --dummy.cpp: -- echo > dummy.cpp diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br deleted file mode 100644 index 43dd90d3b57..00000000000 --- a/x11/kdelibs3/patches/patch-br +++ /dev/null @@ -1,199 +0,0 @@ -$NetBSD: patch-br,v 1.6 2004/01/15 09:52:51 markd Exp $ - ---- kioslave/http/kcookiejar/Makefile.in.orig 2003-12-29 11:17:01.000000000 +1300 -+++ kioslave/http/kcookiejar/Makefile.in -@@ -383,13 +383,17 @@ INCLUDES = $(all_includes) - - ####### Files - bin_PROGRAMS = kcookiejar --lib_LTLIBRARIES = kcookiejar.la -+lib_LTLIBRARIES = libkcookiejar_main.la kcookiejar.la - kde_module_LTLIBRARIES = kded_kcookiejar.la - --kcookiejar_la_SOURCES = main.cpp -+libkcookiejar_main_la_SOURCES = main.cpp - #>- METASOURCES = AUTO -+libkcookiejar_main_la_LDFLAGS = $(all_libraries) -module -avoid-version -+libkcookiejar_main_la_LIBADD = $(LIB_KDECORE) -+ -+kcookiejar_la_SOURCES = kcookiejar_main.cpp - kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version --kcookiejar_la_LIBADD = $(LIB_KDECORE) -+kcookiejar_la_LIBADD = libkcookiejar_main.la - - #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ - #>- kcookieserver.skel kcookiewin.cpp -@@ -400,8 +404,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp - kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version - kded_kcookiejar_la_LIBADD = $(LIB_KIO) - --kcookiejar_SOURCES = dummy.cpp --kcookiejar_LDADD = kcookiejar.la -+kcookiejar_SOURCES = kcookiejar_main.cpp -+kcookiejar_LDADD = libkcookiejar_main.la - kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) - - kded_DATA = kcookiejar.desktop -@@ -416,11 +420,11 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - --kcookiejar_la_DEPENDENCIES = --am_kcookiejar_la_OBJECTS = main.lo -+kcookiejar_la_DEPENDENCIES = libkcookiejar_main.la -+am_kcookiejar_la_OBJECTS = kcookiejar_main.lo - #>- kcookiejar_la_OBJECTS = $(am_kcookiejar_la_OBJECTS) - #>+ 1 --kcookiejar_la_OBJECTS = main.lo -+kcookiejar_la_OBJECTS = kcookiejar_main.lo - kded_kcookiejar_la_DEPENDENCIES = - am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \ - kcookiewin.lo -@@ -431,26 +435,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco - kcookiewin.lo kcookieserver_skel.lo - @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS) -+libkcookiejar_main_la_DEPENDENCIES = -+am_libkcookiejar_main_la_OBJECTS = main.lo -+#>- libkcookiejar_main_la_OBJECTS = $(am_libkcookiejar_main_la_OBJECTS) -+#>+ 1 -+libkcookiejar_main_la_OBJECTS = main.lo - bin_PROGRAMS = kcookiejar$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kcookiejar_OBJECTS = dummy.$(OBJEXT) -+am_kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT) - #>- kcookiejar_OBJECTS = $(am_kcookiejar_OBJECTS) - #>+ 1 --kcookiejar_OBJECTS = dummy.$(OBJEXT) --kcookiejar_DEPENDENCIES = kcookiejar.la -+kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT) -+kcookiejar_DEPENDENCIES = libkcookiejar_main.la - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles --#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kcookiejar.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kcookiejar.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo --#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kded_kcookiejar_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kcookiejar.Plo \ -+#>+ 11 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P $(DEPDIR)/kded_kcookiejar_la.all_cpp.P ./$(DEPDIR)/kcookiejar.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kcookiejar.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcookieserver_skel.P ./$(DEPDIR)/kcookiejar.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiejar_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo - -@@ -473,11 +488,11 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ - DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) \ -- $(kcookiejar_SOURCES) -+ $(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES) - DATA = $(kded_DATA) $(update_DATA) - - DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(kcookiejar_SOURCES) -+SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) $(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES) - - #>- all: all-am - #>+ 1 -@@ -554,6 +569,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) - $(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS) - kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) - $(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS) -+libkcookiejar_main.la: $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_DEPENDENCIES) -+ $(CXXLINK) -rpath $(libdir) $(libkcookiejar_main_la_LDFLAGS) $(libkcookiejar_main_la_OBJECTS) $(libkcookiejar_main_la_LIBADD) $(LIBS) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -593,8 +610,9 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiejar_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookieserver.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiewin.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ -@@ -736,7 +754,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=kcookieserver.h netscape_cookie_spec.html kcookiejar.desktop kcookiewin.h rfc2965 kcookiescfg.upd rfc2109 kcookiejar.h -+KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 Makefile.in.rej kcookiejar.desktop kcookieserver.h kcookiejar.h - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -880,25 +898,22 @@ uninstall-am: uninstall-binPROGRAMS unin - uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \ - uninstall-libLTLIBRARIES uninstall-updateDATA - -- --dummy.cpp: -- echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - - #>+ 3 --kcookiewin.moc: $(srcdir)/kcookiewin.h -- $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc -- --#>+ 1 --mocs: kcookiewin.moc --#>+ 3 - kcookieserver.moc: $(srcdir)/kcookieserver.h - $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc - - #>+ 1 - mocs: kcookieserver.moc -+#>+ 3 -+kcookiewin.moc: $(srcdir)/kcookiewin.h -+ $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc -+ -+#>+ 1 -+mocs: kcookiewin.moc - #>+ 5 - kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/kcookieserver.h > kcookieserver.kidl || ( rm -f kcookieserver.kidl ; false ) -@@ -907,7 +922,7 @@ kcookieserver_skel.cpp: kcookieserver.ki - - #>+ 3 - clean-metasources: -- -rm -f kcookiewin.moc kcookieserver.moc -+ -rm -f kcookieserver.moc kcookiewin.moc - - #>+ 4 - clean-idl: -@@ -925,7 +940,7 @@ force-reedit: - - - #>+ 11 --kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookiewin.moc kcookieserver.moc -+kded_kcookiejar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcookiejar.cpp $(srcdir)/kcookieserver.cpp $(srcdir)/kcookiewin.cpp kcookieserver_skel.cpp kcookieserver.moc kcookiewin.moc - @echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \ - rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \ -@@ -961,7 +976,7 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 5 --kcookiewin.lo: kcookiewin.moc --kcookiewin.o: kcookiewin.moc - kcookieserver.o: kcookieserver.moc -+kcookiewin.o: kcookiewin.moc -+kcookiewin.lo: kcookiewin.moc - kcookieserver.lo: kcookieserver.moc diff --git a/x11/kdelibs3/patches/patch-bt b/x11/kdelibs3/patches/patch-bt deleted file mode 100644 index ebf050e597d..00000000000 --- a/x11/kdelibs3/patches/patch-bt +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bt,v 1.2 2002/08/25 19:23:55 jlam Exp $ - ---- kioslave/http/kcookiejar/main.cpp.orig Wed Dec 27 18:59:18 2000 -+++ kioslave/http/kcookiejar/main.cpp -@@ -46,7 +46,9 @@ - { 0, 0, 0 } - }; - --int main(int argc, char *argv[]) -+extern "C" int kdemain(int, char *[]); -+ -+int kdemain(int argc, char *argv[]) - { - KLocale::setMainCatalogue("kdelibs"); - KCmdLineArgs::init(argc, argv, "kcookiejar", description, version); diff --git a/x11/kdelibs3/patches/patch-cc b/x11/kdelibs3/patches/patch-cc index e6c95297616..152fc54a3a4 100644 --- a/x11/kdelibs3/patches/patch-cc +++ b/x11/kdelibs3/patches/patch-cc @@ -1,7 +1,7 @@ -$NetBSD: patch-cc,v 1.3 2003/01/20 10:04:26 skrll Exp $ +$NetBSD: patch-cc,v 1.4 2004/02/04 13:58:40 markd Exp $ ---- kspell/ksconfig.cpp.orig Wed Jan 15 12:18:30 2003 -+++ kspell/ksconfig.cpp +--- kdeui/ksconfig.cpp.orig Wed Jan 15 12:18:30 2003 ++++ kdeui/ksconfig.cpp @@ -360,6 +360,8 @@ void KSpellConfig::getAvailDictsIspell ( // dictionary path QFileInfo dir ("/usr/lib/ispell"); diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd deleted file mode 100644 index f6d4fb64cc7..00000000000 --- a/x11/kdelibs3/patches/patch-cd +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cd,v 1.6 2004/01/15 09:52:51 markd Exp $ - ---- kdefx/Makefile.in.orig 2003-12-29 11:16:54.000000000 +1300 -+++ kdefx/Makefile.in -@@ -660,7 +660,7 @@ distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=configure.in.in -+KDE_DIST=configure.in.in Makefile.in.rej - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - diff --git a/x11/kdelibs3/patches/patch-ce b/x11/kdelibs3/patches/patch-ce index 3074271b7f0..f7a3646beeb 100644 --- a/x11/kdelibs3/patches/patch-ce +++ b/x11/kdelibs3/patches/patch-ce @@ -1,8 +1,8 @@ -$NetBSD: patch-ce,v 1.2 2003/03/11 13:10:39 markd Exp $ +$NetBSD: patch-ce,v 1.3 2004/02/04 13:58:40 markd Exp $ ---- kioslave/file/Makefile.in.orig Thu Jan 23 12:30:39 2003 +--- kioslave/file/Makefile.in.orig 2004-01-26 08:24:45.000000000 +1300 +++ kioslave/file/Makefile.in -@@ -358,7 +358,7 @@ SOURCES = $(kio_file_la_SOURCES) +@@ -475,7 +475,7 @@ SOURCES = $(kio_file_la_SOURCES) all: docs-am all-am .SUFFIXES: @@ -11,10 +11,10 @@ $NetBSD: patch-ce,v 1.2 2003/03/11 13:10:39 markd Exp $ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>- cd $(top_srcdir) && \ #>- $(AUTOMAKE) --foreign kioslave/file/Makefile -@@ -698,3 +698,35 @@ kde-rpo-clean: - #>+ 3 - file.lo: file.moc +@@ -892,3 +892,34 @@ file.lo: file.moc + nmcheck: file.o: file.moc + nmcheck-am: nmcheck + +# no optimization rules + @@ -22,21 +22,21 @@ $NetBSD: patch-ce,v 1.2 2003/03/11 13:10:39 markd Exp $ +LTCXXCOMPILE_NOOPT=${LTCXXCOMPILE:-O%=} + +.cpp.o: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + +.cpp.obj: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE_NOOPT) -c -o $@ `cygpath -w $<` + +.cpp.lo: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + +.cc.cpp: @@ -46,4 +46,3 @@ $NetBSD: patch-ce,v 1.2 2003/03/11 13:10:39 markd Exp $ + +file.lo: file.cpp +file.o: file.cpp -+ |