diff options
| author | markd <markd> | 2003-03-11 13:10:15 +0000 |
|---|---|---|
| committer | markd <markd> | 2003-03-11 13:10:15 +0000 |
| commit | 9bb52812fa09038cdda9415be3c20cac0fd613ad (patch) | |
| tree | ce99eff5443d74e3e5c4e2dfa0d0cb7ccf7ac90a /x11/kdebase3 | |
| parent | 088bdde597fa897632f4b03c0b896a3d1540e691 (diff) | |
| download | pkgsrc-9bb52812fa09038cdda9415be3c20cac0fd613ad.tar.gz | |
Update KDE to 3.1.
Many bugfixes and functionality enhancements including:
General
New default widget style: Keramik
New default icon theme: Crystal
Created and enhanced framework to effectively disable certain features of
the GUI, like for example shell access, disallowing to select custom wall
papers. "Kiosk mode"
Usability improvements:
Kicker: Context menu, applet menus, wording and panel feature consistency
improved
Kicker: Redesigned control module.
KCalc: Usability Improvements.
KSnapshot: Usability Improvements.
KsCD: User Interface Improvements in configuration and information dialogs
kdelibs
Extended the DCOP commandline client to
enable nonGUI applications (such as shell scripts) to use DCOP
send DCOP messages to multiple users and/or sessions concurrently
Added to notification dialog to allow applications to configure their
notifications with a common GUI.
Added "Open File", "Open Destination" and "Keep window open" to download
progress dialog.
KDatePicker has now week number display and selection.
Added KLocale support for setting/retrieving the first day of a week
Support for "Multimedia keys" on your keyboard.
Added on-demand icon loading support to improve startup performance of
applications.
KHTML:
Improvements to printing support.
Page Info and Frame info dialog.
Auto-Scroll support of webpages using Shift combined with arrow keys.
Many, many Bugfixes and improvements.
Small codebase merges with Safari. The main merge is planned for a future
release however, as it requires more testing.
KIO:
Modified thumbnail ioslave that can extract a thumbnail from the file
directly if it contains one, rather than generating one itself.
Added fish:// protocol slave, which can access remote filesystems via
SSH and SCP
Cleanups and Corrections in smtp:// protocol slave.
Activated rtsp:// protocol slave.
Added support for Public Key Authentication and interopability with newer
versions of OpenSSH to sftp:// protocol slave.
KSSL:
SSL certificate policies can now be configured based on the host name
Diffstat (limited to 'x11/kdebase3')
72 files changed, 3545 insertions, 3516 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 6585782d328..2a595e09e3e 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2003/02/24 08:12:31 skrll Exp $ +# $NetBSD: Makefile,v 1.19 2003/03/11 13:10:16 markd Exp $ -DISTNAME= kdebase-3.0.5a -PKGREVISION= 3 +DISTNAME= kdebase-3.1 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop @@ -20,14 +19,12 @@ CONFIGURE_ARGS+= --without-pam CONFIGURE_ARGS+= --without-cdparanoia CONFIGURE_ARGS+= --without-lame CONFIGURE_ARGS+= --without-vorbis +CONFIGURE_ARGS+= --without-java .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" LIBS+= ${EXPORT_SYMBOLS_LDFLAGS} -.if exists(/usr/include/machine/apmvar.h) -CPPFLAGS+= -D__NetBSD_APM__ -.endif .endif PLIST_SRC= ${WRKDIR}/PLIST.Xdpms @@ -58,6 +55,12 @@ CONFIGURE_ENV+= RUN_KAPPFINDER=no PLIST_SRC+= ${PKGDIR}/PLIST +.if ${OPSYS} == "NetBSD" && !exists(${X11BASE}/lib/libxkbfile.so) +PLIST_SUBST+= KCMKEYBOARD="kcm_keyboard.a" +.else +PLIST_SUBST+= KCMKEYBOARD="kcm_keyboard.so" +.endif + ICONDIR= share/kde/icons FOO_MAIN_FILES= \ diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 78924c0a43a..ec268300779 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.8 2003/01/20 10:04:02 skrll Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/03/11 13:10:17 markd Exp $ bin/appletproxy bin/chooser -bin/conttest bin/drkonqi bin/extensionproxy +bin/filesharelist +bin/fileshareset bin/kaccess -bin/kaddressbook bin/kappfinder bin/kate bin/kblankscrn.kss @@ -21,10 +21,10 @@ bin/kdesktop bin/kdesktop_lock bin/kdesu bin/kdesud +bin/kdialog bin/kdm bin/kdm_config bin/kdm_greet -bin/kdmdesktop bin/keditbookmarks bin/keditfiletype bin/kfind @@ -33,8 +33,10 @@ bin/kfmexec bin/khelpcenter bin/khotkeys bin/kicker +bin/kinfocenter bin/kjobviewer bin/klipper +bin/klocaldomainurifilterhelper bin/kmenuedit bin/konqueror bin/konsole @@ -46,6 +48,7 @@ bin/kprinter bin/krandom.kss bin/krdb bin/kreadconfig +bin/krootimage bin/ksmserver bin/ksplash bin/kstart @@ -68,11 +71,19 @@ include/KWinInterface.h include/KonquerorIface.h include/ccont.h include/kate/application.h -include/kate/docmanager.h +include/kate/documentmanager.h include/kate/mainwindow.h include/kate/plugin.h +include/kate/pluginconfiginterface.h +include/kate/pluginconfiginterfaceextension.h +include/kate/pluginmanager.h +include/kate/toolviewmanager.h include/kate/viewmanager.h +include/kbookmarkimporter_crash.h +include/kbookmarkimporter_ie.h +include/kbookmarkimporter_opera.h include/kfileivi.h +include/kivdirectoryoverlay.h include/knewmenu.h include/konq_bgnddlg.h include/konq_defaults.h @@ -122,16 +133,10 @@ lib/kcontrol.la lib/kcontrol.so lib/kde3/childpanel_panelextension.la lib/kde3/childpanel_panelextension.so -lib/kde3/childpanel_panelextension.so.1 -lib/kde3/childpanel_panelextension.so.1.0 lib/kde3/clock_panelapplet.la lib/kde3/clock_panelapplet.so -lib/kde3/clock_panelapplet.so.1 -lib/kde3/clock_panelapplet.so.1.0 lib/kde3/dockbar_panelextension.la lib/kde3/dockbar_panelextension.so -lib/kde3/dockbar_panelextension.so.1 -lib/kde3/dockbar_panelextension.so.1.0 lib/kde3/gsthumbnail.la lib/kde3/gsthumbnail.so lib/kde3/htmlthumbnail.la @@ -140,8 +145,6 @@ lib/kde3/imagethumbnail.la lib/kde3/imagethumbnail.so lib/kde3/kasbar_panelextension.la lib/kde3/kasbar_panelextension.so -lib/kde3/kasbar_panelextension.so.1 -lib/kde3/kasbar_panelextension.so.1.0 lib/kde3/kcm_access.la lib/kde3/kcm_access.so lib/kde3/kcm_arts.la @@ -150,10 +153,14 @@ lib/kde3/kcm_background.la lib/kde3/kcm_background.so lib/kde3/kcm_bell.la lib/kde3/kcm_bell.so +lib/kde3/kcm_cgi.la +lib/kde3/kcm_cgi.so lib/kde3/kcm_clock.la lib/kde3/kcm_clock.so lib/kde3/kcm_colors.la lib/kde3/kcm_colors.so +lib/kde3/kcm_componentchooser.la +lib/kde3/kcm_componentchooser.so lib/kde3/kcm_crypto.la lib/kde3/kcm_crypto.so lib/kde3/kcm_css.la @@ -162,12 +169,18 @@ lib/kde3/kcm_email.la lib/kde3/kcm_email.so lib/kde3/kcm_energy.la lib/kde3/kcm_energy.so +lib/kde3/kcm_fileshare.la +lib/kde3/kcm_fileshare.so lib/kde3/kcm_filetypes.la lib/kde3/kcm_filetypes.so lib/kde3/kcm_fontinst.la lib/kde3/kcm_fontinst.so lib/kde3/kcm_fonts.la lib/kde3/kcm_fonts.so +lib/kde3/kcm_helpcenter.la +lib/kde3/kcm_helpcenter.so +lib/kde3/kcm_history.la +lib/kde3/kcm_history.so lib/kde3/kcm_icons.la lib/kde3/kcm_icons.so lib/kde3/kcm_info.la @@ -176,10 +189,12 @@ lib/kde3/kcm_input.la lib/kde3/kcm_input.so lib/kde3/kcm_ioslaveinfo.la lib/kde3/kcm_ioslaveinfo.so +lib/kde3/kcm_kded.la +lib/kde3/kcm_kded.so lib/kde3/kcm_kdm.la lib/kde3/kcm_kdm.so +lib/kde3/${KCMKEYBOARD} lib/kde3/kcm_keyboard.la -lib/kde3/kcm_keyboard.so lib/kde3/kcm_keys.la lib/kde3/kcm_keys.so lib/kde3/kcm_khotkeys.la @@ -206,8 +221,6 @@ lib/kde3/kcm_launch.la lib/kde3/kcm_launch.so lib/kde3/kcm_locale.la lib/kde3/kcm_locale.so -lib/kde3/kcm_midi.la -lib/kde3/kcm_midi.so lib/kde3/kcm_nic.la lib/kde3/kcm_nic.so lib/kde3/kcm_passwords.la @@ -220,8 +233,6 @@ lib/kde3/kcm_screensaver.la lib/kde3/kcm_screensaver.so lib/kde3/kcm_smserver.la lib/kde3/kcm_smserver.so -lib/kde3/kcm_socks.la -lib/kde3/kcm_socks.so lib/kde3/kcm_spellchecking.la lib/kde3/kcm_spellchecking.so lib/kde3/kcm_style.la @@ -230,18 +241,30 @@ lib/kde3/kcm_taskbar.la lib/kde3/kcm_taskbar.so lib/kde3/kcm_themes.la lib/kde3/kcm_themes.so -lib/kde3/kcm_usb.la -lib/kde3/kcm_usb.so lib/kde3/kded_favicons.la lib/kde3/kded_favicons.so +lib/kde3/kfile_font.la +lib/kde3/kfile_font.so lib/kde3/khelpcenter.la lib/kde3/khelpcenter.so lib/kde3/kickermenu_kdeprint.la lib/kde3/kickermenu_kdeprint.so +lib/kde3/kickermenu_konsole.la +lib/kde3/kickermenu_konsole.so +lib/kde3/kickermenu_prefmenu.la +lib/kde3/kickermenu_prefmenu.so +lib/kde3/kickermenu_recentdocs.la +lib/kde3/kickermenu_recentdocs.so +lib/kde3/kio_about.la +lib/kde3/kio_about.so +lib/kde3/kio_cgi.la +lib/kde3/kio_cgi.so lib/kde3/kio_filter.la lib/kde3/kio_filter.so lib/kde3/kio_finger.la lib/kde3/kio_finger.so +lib/kde3/kio_fish.la +lib/kde3/kio_fish.so lib/kde3/kio_floppy.la lib/kde3/kio_floppy.so lib/kde3/kio_imap4.la @@ -250,6 +273,8 @@ lib/kde3/kio_info.la lib/kde3/kio_info.so lib/kde3/kio_ldap.la lib/kde3/kio_ldap.so +lib/kde3/kio_mac.la +lib/kde3/kio_mac.so lib/kde3/kio_man.la lib/kde3/kio_man.so lib/kde3/kio_nfs.la @@ -270,6 +295,8 @@ lib/kde3/kio_tar.la lib/kde3/kio_tar.so lib/kde3/kio_thumbnail.la lib/kde3/kio_thumbnail.so +lib/kde3/kio_zip.la +lib/kde3/kio_zip.so lib/kde3/klipper_panelapplet.la lib/kde3/klipper_panelapplet.so lib/kde3/konq_aboutpage.la @@ -306,6 +333,10 @@ lib/kde3/kwin_icewm_config.la lib/kde3/kwin_icewm_config.so lib/kde3/kwin_kde1.la lib/kde3/kwin_kde1.so +lib/kde3/kwin_keramik.la +lib/kde3/kwin_keramik.so +lib/kde3/kwin_keramik_config.la +lib/kde3/kwin_keramik_config.so lib/kde3/kwin_kstep.la lib/kde3/kwin_kstep.so lib/kde3/kwin_kwmtheme.la @@ -330,50 +361,38 @@ lib/kde3/kwin_web.la lib/kde3/kwin_web.so lib/kde3/launcher_panelapplet.la lib/kde3/launcher_panelapplet.so -lib/kde3/launcher_panelapplet.so.1 -lib/kde3/launcher_panelapplet.so.1.0 lib/kde3/libkdeprint_part.la lib/kde3/libkdeprint_part.so -lib/kde3/libkhelpcenterpart.la -lib/kde3/libkhelpcenterpart.so +lib/kde3/libkmanpart.la +lib/kde3/libkmanpart.so +lib/kde3/libkonsolepart.la +lib/kde3/libkonsolepart.so lib/kde3/libkshorturifilter.la lib/kde3/libkshorturifilter.so lib/kde3/libkuriikwsfilter.la lib/kde3/libkuriikwsfilter.so lib/kde3/libkurisearchfilter.la lib/kde3/libkurisearchfilter.so +lib/kde3/liblocaldomainurifilter.la +lib/kde3/liblocaldomainurifilter.so lib/kde3/lockout_panelapplet.la lib/kde3/lockout_panelapplet.so -lib/kde3/lockout_panelapplet.so.0 -lib/kde3/lockout_panelapplet.so.0.0 lib/kde3/minipager_panelapplet.la lib/kde3/minipager_panelapplet.so -lib/kde3/minipager_panelapplet.so.1 -lib/kde3/minipager_panelapplet.so.1.0 lib/kde3/naughty_panelapplet.la lib/kde3/naughty_panelapplet.so -lib/kde3/naughty_panelapplet.so.1 -lib/kde3/naughty_panelapplet.so.1.0 +lib/kde3/picturethumbnail.la +lib/kde3/picturethumbnail.so lib/kde3/run_panelapplet.la lib/kde3/run_panelapplet.so -lib/kde3/run_panelapplet.so.1 -lib/kde3/run_panelapplet.so.1.0 lib/kde3/sysguard_panelapplet.la lib/kde3/sysguard_panelapplet.so -lib/kde3/sysguard_panelapplet.so.1 -lib/kde3/sysguard_panelapplet.so.1.0 lib/kde3/systemtray_panelapplet.la lib/kde3/systemtray_panelapplet.so -lib/kde3/systemtray_panelapplet.so.1 -lib/kde3/systemtray_panelapplet.so.1.0 lib/kde3/taskbar_panelapplet.la lib/kde3/taskbar_panelapplet.so -lib/kde3/taskbar_panelapplet.so.1 -lib/kde3/taskbar_panelapplet.so.1.0 lib/kde3/taskbar_panelextension.la lib/kde3/taskbar_panelextension.so -lib/kde3/taskbar_panelextension.so.1 -lib/kde3/taskbar_panelextension.so.1.0 lib/kde3/textthumbnail.la lib/kde3/textthumbnail.so lib/kdesktop.la @@ -386,6 +405,8 @@ lib/khotkeys.la lib/khotkeys.so lib/kicker.la lib/kicker.so +lib/kicker.so.0 +lib/kicker.so.0.0 lib/kjobviewer.la lib/kjobviewer.so lib/klipper.la @@ -396,6 +417,8 @@ lib/konqueror.la lib/konqueror.so lib/konsole.la lib/konsole.so +lib/kprinter.la +lib/kprinter.so lib/ksmserver.la lib/ksmserver.so lib/kwin.la @@ -425,8 +448,6 @@ lib/libkate_main.so.0 lib/libkate_main.so.0.0 lib/libkateinterfaces.la lib/libkateinterfaces.so -lib/libkateinterfaces.so.0 -lib/libkateinterfaces.so.0.0 lib/libkcminit_main.la lib/libkcminit_main.so lib/libkcminit_main.so.0 @@ -475,10 +496,14 @@ lib/libkmenuedit_main.la lib/libkmenuedit_main.so lib/libkmenuedit_main.so.0 lib/libkmenuedit_main.so.0.0 +lib/libkmultitabbar.la +lib/libkmultitabbar.so +lib/libkmultitabbar.so.0 +lib/libkmultitabbar.so.0.0 lib/libkonq.la lib/libkonq.so -lib/libkonq.so.4 -lib/libkonq.so.4.0 +lib/libkonq.so.5 +lib/libkonq.so.5.0 lib/libkonq_sidebar_tree.la lib/libkonq_sidebar_tree.so lib/libkonqsidebarplugin.la @@ -491,8 +516,6 @@ lib/libkonsole_main.la lib/libkonsole_main.so lib/libkonsole_main.so.0 lib/libkonsole_main.so.0.0 -lib/libkonsolepart.la -lib/libkonsolepart.so lib/libksgrd.la lib/libksgrd.so lib/libksgrd.so.0 @@ -523,8 +546,8 @@ lib/libsensordisplays.so.0 lib/libsensordisplays.so.0.0 lib/libtaskbar.la lib/libtaskbar.so -lib/libtaskbar.so.1 -lib/libtaskbar.so.1.0 +lib/libtaskbar.so.2 +lib/libtaskbar.so.2.0 lib/libtaskmanager.la lib/libtaskmanager.so lib/libtaskmanager.so.1 @@ -535,9 +558,6 @@ share/autostart/klipper.desktop share/autostart/ktip.desktop share/autostart/kwrited.desktop share/autostart/panel.desktop -share/doc/kde/HTML/en/kaddressbook/common -share/doc/kde/HTML/en/kaddressbook/index.cache.bz2 -share/doc/kde/HTML/en/kaddressbook/index.docbook share/doc/kde/HTML/en/kate/TODO share/doc/kde/HTML/en/kate/advanced.docbook share/doc/kde/HTML/en/kate/common @@ -557,91 +577,151 @@ share/doc/kde/HTML/en/kate/part.docbook share/doc/kde/HTML/en/kate/plugins.docbook share/doc/kde/HTML/en/kate/regular-expressions.docbook share/doc/kde/HTML/en/kate/unhighlighted.png +share/doc/kde/HTML/en/kcontrol/arts/common +share/doc/kde/HTML/en/kcontrol/arts/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/arts/index.docbook +share/doc/kde/HTML/en/kcontrol/arts/midi.docbook +share/doc/kde/HTML/en/kcontrol/background/common +share/doc/kde/HTML/en/kcontrol/background/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/background/index.docbook +share/doc/kde/HTML/en/kcontrol/bell/common +share/doc/kde/HTML/en/kcontrol/bell/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/bell/index.docbook +share/doc/kde/HTML/en/kcontrol/cache/common +share/doc/kde/HTML/en/kcontrol/cache/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/cache/index.docbook +share/doc/kde/HTML/en/kcontrol/clock/common +share/doc/kde/HTML/en/kcontrol/clock/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/clock/index.docbook +share/doc/kde/HTML/en/kcontrol/colors/common +share/doc/kde/HTML/en/kcontrol/colors/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/colors/index.docbook share/doc/kde/HTML/en/kcontrol/common +share/doc/kde/HTML/en/kcontrol/cookies/common +share/doc/kde/HTML/en/kcontrol/cookies/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/cookies/index.docbook +share/doc/kde/HTML/en/kcontrol/crypto/common +share/doc/kde/HTML/en/kcontrol/crypto/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/crypto/index.docbook +share/doc/kde/HTML/en/kcontrol/desktop/common +share/doc/kde/HTML/en/kcontrol/desktop/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/desktop/index.docbook +share/doc/kde/HTML/en/kcontrol/ebrowsing/common +share/doc/kde/HTML/en/kcontrol/ebrowsing/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/ebrowsing/index.docbook +share/doc/kde/HTML/en/kcontrol/email/common +share/doc/kde/HTML/en/kcontrol/email/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/email/index.docbook +share/doc/kde/HTML/en/kcontrol/energy/common +share/doc/kde/HTML/en/kcontrol/energy/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/energy/index.docbook +share/doc/kde/HTML/en/kcontrol/filemanager/common +share/doc/kde/HTML/en/kcontrol/filemanager/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/filemanager/index.docbook +share/doc/kde/HTML/en/kcontrol/filemanager/kfileman1.png +share/doc/kde/HTML/en/kcontrol/filemanager/kfileman2.png +share/doc/kde/HTML/en/kcontrol/filetypes/common +share/doc/kde/HTML/en/kcontrol/filetypes/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/filetypes/index.docbook +share/doc/kde/HTML/en/kcontrol/fonts/common +share/doc/kde/HTML/en/kcontrol/fonts/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/fonts/index.docbook +share/doc/kde/HTML/en/kcontrol/helpindex.html/common +share/doc/kde/HTML/en/kcontrol/helpindex.html/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/helpindex.html/index.docbook +share/doc/kde/HTML/en/kcontrol/icons/common +share/doc/kde/HTML/en/kcontrol/icons/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/icons/index.docbook share/doc/kde/HTML/en/kcontrol/index.cache.bz2 share/doc/kde/HTML/en/kcontrol/index.docbook -share/doc/kde/HTML/en/kcontrol/kalarmd.docbook -share/doc/kde/HTML/en/kcontrol/kcmaccess.docbook -share/doc/kde/HTML/en/kcontrol/kcmaction.docbook -share/doc/kde/HTML/en/kcontrol/kcmbackgnd.docbook -share/doc/kde/HTML/en/kcontrol/kcmbatmon.docbook -share/doc/kde/HTML/en/kcontrol/kcmbell.docbook -share/doc/kde/HTML/en/kcontrol/kcmblockdev.docbook -share/doc/kde/HTML/en/kcontrol/kcmcache.docbook -share/doc/kde/HTML/en/kcontrol/kcmcolor.docbook -share/doc/kde/HTML/en/kcontrol/kcmcookie.docbook -share/doc/kde/HTML/en/kcontrol/kcmcrypto.docbook -share/doc/kde/HTML/en/kcontrol/kcmcss.docbook -share/doc/kde/HTML/en/kcontrol/kcmdatetime.docbook -share/doc/kde/HTML/en/kcontrol/kcmdesktop.docbook -share/doc/kde/HTML/en/kcontrol/kcmdeviceinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmdmainfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmebrowse.docbook -share/doc/kde/HTML/en/kcontrol/kcmemail.docbook -share/doc/kde/HTML/en/kcontrol/kcmenergy.docbook -share/doc/kde/HTML/en/kcontrol/kcmfile.docbook -share/doc/kde/HTML/en/kcontrol/kcmfileman.docbook -share/doc/kde/HTML/en/kcontrol/kcmfontinst.docbook -share/doc/kde/HTML/en/kcontrol/kcmfonts.docbook -share/doc/kde/HTML/en/kcontrol/kcmicon.docbook -share/doc/kde/HTML/en/kcontrol/kcmintinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmioportinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmkbd.docbook -share/doc/kde/HTML/en/kcontrol/kcmkbrowse.docbook -share/doc/kde/HTML/en/kcontrol/kcmkeybind.docbook -share/doc/kde/HTML/en/kcontrol/kcmkonsole.docbook -share/doc/kde/HTML/en/kcontrol/kcmkwintheme.docbook -share/doc/kde/HTML/en/kcontrol/kcmlaunch.docbook -share/doc/kde/HTML/en/kcontrol/kcmlisa.docbook -share/doc/kde/HTML/en/kcontrol/kcmlocate.docbook -share/doc/kde/HTML/en/kcontrol/kcmloginmanage.docbook -share/doc/kde/HTML/en/kcontrol/kcmlowbatcrit.docbook -share/doc/kde/HTML/en/kcontrol/kcmlowbatwarn.docbook -share/doc/kde/HTML/en/kcontrol/kcmmemoryinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmmidi.docbook -share/doc/kde/HTML/en/kcontrol/kcmmixer.docbook -share/doc/kde/HTML/en/kcontrol/kcmmouse.docbook -share/doc/kde/HTML/en/kcontrol/kcmnetscapeplugins.docbook -share/doc/kde/HTML/en/kcontrol/kcmnics.docbook -share/doc/kde/HTML/en/kcontrol/kcmpanel.docbook -share/doc/kde/HTML/en/kcontrol/kcmpartitioninfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmpasswd.docbook -share/doc/kde/HTML/en/kcontrol/kcmpciinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmpcmcia.docbook -share/doc/kde/HTML/en/kcontrol/kcmpowerctrl.docbook -share/doc/kde/HTML/en/kcontrol/kcmprocinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmproxie.docbook -share/doc/kde/HTML/en/kcontrol/kcmscnsave.docbook -share/doc/kde/HTML/en/kcontrol/kcmscsiinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmsessionman.docbook -share/doc/kde/HTML/en/kcontrol/kcmsmbstat.docbook -share/doc/kde/HTML/en/kcontrol/kcmsndinfo.docbook -share/doc/kde/HTML/en/kcontrol/kcmsndsrv.docbook -share/doc/kde/HTML/en/kcontrol/kcmsocks.docbook -share/doc/kde/HTML/en/kcontrol/kcmspellchecking.docbook -share/doc/kde/HTML/en/kcontrol/kcmstyle.docbook -share/doc/kde/HTML/en/kcontrol/kcmsysnotify.docbook -share/doc/kde/HTML/en/kcontrol/kcmtalk.docbook -share/doc/kde/HTML/en/kcontrol/kcmtaskbar.docbook -share/doc/kde/HTML/en/kcontrol/kcmusb.docbook -share/doc/kde/HTML/en/kcontrol/kcmuseragent.docbook -share/doc/kde/HTML/en/kcontrol/kcmwinshare.docbook -share/doc/kde/HTML/en/kcontrol/kcmxmlrpc.docbook -share/doc/kde/HTML/en/kcontrol/kcmxservinfo.docbook -share/doc/kde/HTML/en/kcontrol/kfileman1.png -share/doc/kde/HTML/en/kcontrol/kfileman2.png -share/doc/kde/HTML/en/kcontrol/nettimeouts.docbook -share/doc/kde/HTML/en/kcontrol/printmanager.docbook -share/doc/kde/HTML/en/kcontrol/printsystem.docbook -share/doc/kde/HTML/en/kcontrol/protocols.docbook +share/doc/kde/HTML/en/kcontrol/kcmaccess/common +share/doc/kde/HTML/en/kcontrol/kcmaccess/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmaccess/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmcss/common +share/doc/kde/HTML/en/kcontrol/kcmcss/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmcss/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmfontinst/common +share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmfontinst/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmkonsole/common +share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmkonsole/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmlaunch/common +share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmlaunch/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmnotify/common +share/doc/kde/HTML/en/kcontrol/kcmnotify/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmnotify/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmsmserver/common +share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmsmserver/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmstyle/common +share/doc/kde/HTML/en/kcontrol/kcmstyle/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook +share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common +share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook +share/doc/kde/HTML/en/kcontrol/kdm/common +share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +share/doc/kde/HTML/en/kcontrol/keyboard/common +share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook +share/doc/kde/HTML/en/kcontrol/keys/common +share/doc/kde/HTML/en/kcontrol/keys/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/keys/index.docbook +share/doc/kde/HTML/en/kcontrol/khtml/common +share/doc/kde/HTML/en/kcontrol/khtml/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/khtml/index.docbook +share/doc/kde/HTML/en/kcontrol/khtml/nsplugin.docbook +share/doc/kde/HTML/en/kcontrol/kthememgr/common +share/doc/kde/HTML/en/kcontrol/kthememgr/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kthememgr/index.docbook +share/doc/kde/HTML/en/kcontrol/kwindecoration/common +share/doc/kde/HTML/en/kcontrol/kwindecoration/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/kwindecoration/index.docbook +share/doc/kde/HTML/en/kcontrol/language/common +share/doc/kde/HTML/en/kcontrol/language/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/language/index.docbook +share/doc/kde/HTML/en/kcontrol/mouse/common +share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/mouse/index.docbook +share/doc/kde/HTML/en/kcontrol/netpref/common +share/doc/kde/HTML/en/kcontrol/netpref/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/netpref/index.docbook +share/doc/kde/HTML/en/kcontrol/panel/common +share/doc/kde/HTML/en/kcontrol/panel/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/panel/index.docbook +share/doc/kde/HTML/en/kcontrol/passwords/common +share/doc/kde/HTML/en/kcontrol/passwords/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/passwords/index.docbook +share/doc/kde/HTML/en/kcontrol/proxy/common +share/doc/kde/HTML/en/kcontrol/proxy/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/proxy/index.docbook +share/doc/kde/HTML/en/kcontrol/proxy/socks.docbook +share/doc/kde/HTML/en/kcontrol/screensaver/common +share/doc/kde/HTML/en/kcontrol/screensaver/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/screensaver/index.docbook share/doc/kde/HTML/en/kcontrol/screenshot.png -share/doc/kde/HTML/en/kcontrol/systemcontrol.docbook -share/doc/kde/HTML/en/kcontrol/thememgr.docbook +share/doc/kde/HTML/en/kcontrol/smb/common +share/doc/kde/HTML/en/kcontrol/smb/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/smb/index.docbook +share/doc/kde/HTML/en/kcontrol/spellchecking/common +share/doc/kde/HTML/en/kcontrol/spellchecking/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/spellchecking/index.docbook +share/doc/kde/HTML/en/kcontrol/useragent/common +share/doc/kde/HTML/en/kcontrol/useragent/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/useragent/index.docbook +share/doc/kde/HTML/en/kcontrol/windowmanagement/common +share/doc/kde/HTML/en/kcontrol/windowmanagement/index.cache.bz2 +share/doc/kde/HTML/en/kcontrol/windowmanagement/index.docbook +share/doc/kde/HTML/en/kdebase-apidocs/common share/doc/kde/HTML/en/kdebugdialog/common share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2 share/doc/kde/HTML/en/kdebugdialog/index.docbook share/doc/kde/HTML/en/kdeprint/add-printer-wiz.docbook share/doc/kde/HTML/en/kdeprint/common +share/doc/kde/HTML/en/kdeprint/cr32-action-wizard.png share/doc/kde/HTML/en/kdeprint/cups-config.docbook share/doc/kde/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png share/doc/kde/HTML/en/kdeprint/cupsaddprinterwizard1.png @@ -678,7 +758,6 @@ share/doc/kde/HTML/en/kdeprint/extensions.docbook share/doc/kde/HTML/en/kdeprint/external-command.docbook share/doc/kde/HTML/en/kdeprint/final-word.docbook share/doc/kde/HTML/en/kdeprint/getting-started.docbook -share/doc/kde/HTML/en/kdeprint/hi32-action-wizard.png share/doc/kde/HTML/en/kdeprint/highlights.docbook share/doc/kde/HTML/en/kdeprint/index.cache.bz2 share/doc/kde/HTML/en/kdeprint/index.docbook @@ -733,6 +812,7 @@ share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook share/doc/kde/HTML/en/khelpcenter/faq/winmng.docbook +share/doc/kde/HTML/en/khelpcenter/glossary/checkxrefs share/doc/kde/HTML/en/khelpcenter/glossary/common share/doc/kde/HTML/en/khelpcenter/glossary/index.cache.bz2 share/doc/kde/HTML/en/khelpcenter/glossary/index.docbook @@ -815,12 +895,65 @@ share/doc/kde/HTML/en/kicker/screenshot_right.png share/doc/kde/HTML/en/kicker/taskbar_group.png share/doc/kde/HTML/en/kicker/terminals_icon.png share/doc/kde/HTML/en/kicker/windowlist_icon.png +share/doc/kde/HTML/en/kinfocenter/common +share/doc/kde/HTML/en/kinfocenter/devices/common +share/doc/kde/HTML/en/kinfocenter/devices/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/devices/index.docbook +share/doc/kde/HTML/en/kinfocenter/dma/common +share/doc/kde/HTML/en/kinfocenter/dma/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/dma/index.docbook +share/doc/kde/HTML/en/kinfocenter/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/index.docbook +share/doc/kde/HTML/en/kinfocenter/interrupts/common +share/doc/kde/HTML/en/kinfocenter/interrupts/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/interrupts/index.docbook +share/doc/kde/HTML/en/kinfocenter/ioports/common +share/doc/kde/HTML/en/kinfocenter/ioports/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/ioports/index.docbook +share/doc/kde/HTML/en/kinfocenter/memory/common +share/doc/kde/HTML/en/kinfocenter/memory/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/memory/index.docbook +share/doc/kde/HTML/en/kinfocenter/nics/common +share/doc/kde/HTML/en/kinfocenter/nics/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/nics/index.docbook +share/doc/kde/HTML/en/kinfocenter/partitions/common +share/doc/kde/HTML/en/kinfocenter/partitions/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/partitions/index.docbook +share/doc/kde/HTML/en/kinfocenter/pci/common +share/doc/kde/HTML/en/kinfocenter/pci/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/pci/index.docbook +share/doc/kde/HTML/en/kinfocenter/pcmcia/common +share/doc/kde/HTML/en/kinfocenter/pcmcia/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/pcmcia/index.docbook +share/doc/kde/HTML/en/kinfocenter/processor/common +share/doc/kde/HTML/en/kinfocenter/processor/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/processor/index.docbook +share/doc/kde/HTML/en/kinfocenter/protocols/common +share/doc/kde/HTML/en/kinfocenter/protocols/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/protocols/index.docbook +share/doc/kde/HTML/en/kinfocenter/samba/common +share/doc/kde/HTML/en/kinfocenter/samba/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/samba/index.docbook +share/doc/kde/HTML/en/kinfocenter/scsi/common +share/doc/kde/HTML/en/kinfocenter/scsi/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/scsi/index.docbook +share/doc/kde/HTML/en/kinfocenter/sound/common +share/doc/kde/HTML/en/kinfocenter/sound/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/sound/index.docbook +share/doc/kde/HTML/en/kinfocenter/usb/common +share/doc/kde/HTML/en/kinfocenter/usb/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/usb/index.docbook +share/doc/kde/HTML/en/kinfocenter/xserver/common +share/doc/kde/HTML/en/kinfocenter/xserver/index.cache.bz2 +share/doc/kde/HTML/en/kinfocenter/xserver/index.docbook share/doc/kde/HTML/en/kioslave/audiocd.docbook share/doc/kde/HTML/en/kioslave/bzip.docbook share/doc/kde/HTML/en/kioslave/bzip2.docbook +share/doc/kde/HTML/en/kioslave/cgi.docbook share/doc/kde/HTML/en/kioslave/common share/doc/kde/HTML/en/kioslave/file.docbook share/doc/kde/HTML/en/kioslave/finger.docbook +share/doc/kde/HTML/en/kioslave/fish.docbook share/doc/kde/HTML/en/kioslave/floppy.docbook share/doc/kde/HTML/en/kioslave/ftp.docbook share/doc/kde/HTML/en/kioslave/gopher.docbook @@ -835,6 +968,7 @@ share/doc/kde/HTML/en/kioslave/index.docbook share/doc/kde/HTML/en/kioslave/info.docbook share/doc/kde/HTML/en/kioslave/lan.docbook share/doc/kde/HTML/en/kioslave/ldap.docbook +share/doc/kde/HTML/en/kioslave/mac.docbook share/doc/kde/HTML/en/kioslave/mailto.docbook share/doc/kde/HTML/en/kioslave/man.docbook share/doc/kde/HTML/en/kioslave/news.docbook @@ -869,17 +1003,29 @@ share/doc/kde/HTML/en/kmenuedit/i_paste.png share/doc/kde/HTML/en/kmenuedit/icon_sets.png share/doc/kde/HTML/en/kmenuedit/index.cache.bz2 share/doc/kde/HTML/en/kmenuedit/index.docbook +share/doc/kde/HTML/en/konqueror/basics.docbook +share/doc/kde/HTML/en/konqueror/bookmarks.docbook +share/doc/kde/HTML/en/konqueror/browser.docbook share/doc/kde/HTML/en/konqueror/cmndline.png +share/doc/kde/HTML/en/konqueror/commands.docbook share/doc/kde/HTML/en/konqueror/common +share/doc/kde/HTML/en/konqueror/config.docbook +share/doc/kde/HTML/en/konqueror/credits.docbook share/doc/kde/HTML/en/konqueror/dirtree.png share/doc/kde/HTML/en/konqueror/dragdrop.png -share/doc/kde/HTML/en/konqueror/filetype1.png -share/doc/kde/HTML/en/konqueror/filetype3.png -share/doc/kde/HTML/en/konqueror/filetype4.png +share/doc/kde/HTML/en/konqueror/faq.docbook +share/doc/kde/HTML/en/konqueror/filemanager.docbook share/doc/kde/HTML/en/konqueror/index.cache.bz2 share/doc/kde/HTML/en/konqueror/index.docbook +share/doc/kde/HTML/en/konqueror/introduction.docbook share/doc/kde/HTML/en/konqueror/konqorg.png share/doc/kde/HTML/en/konqueror/parts.png +share/doc/kde/HTML/en/konqueror/path-complete.docbook +share/doc/kde/HTML/en/konqueror/plugins.docbook +share/doc/kde/HTML/en/konqueror/save-settings.docbook +share/doc/kde/HTML/en/konqueror/shortcut1.png +share/doc/kde/HTML/en/konqueror/shortcut2.png +share/doc/kde/HTML/en/konqueror/sidebar.docbook share/doc/kde/HTML/en/konsole/common share/doc/kde/HTML/en/konsole/index.cache.bz2 share/doc/kde/HTML/en/konsole/index.docbook @@ -901,7 +1047,19 @@ share/fonts/console8x8.pcf.gz share/fonts/fonts.dir share/fonts/override/fonts.dir share/kde/applnk/.directory +share/kde/applnk/.hidden/fileappearance.desktop +share/kde/applnk/.hidden/filebehavior.desktop +share/kde/applnk/.hidden/filepreviews.desktop +share/kde/applnk/.hidden/kcmkonsole.desktop +share/kde/applnk/.hidden/kicker_config.desktop +share/kde/applnk/.hidden/kicker_config_appearance.desktop share/kde/applnk/.hidden/konqfilemgr.desktop +share/kde/applnk/.hidden/kwinactions.desktop +share/kde/applnk/.hidden/kwinadvanced.desktop +share/kde/applnk/.hidden/kwinfocus.desktop +share/kde/applnk/.hidden/kwinmoving.desktop +share/kde/applnk/.hidden/midi.desktop +share/kde/applnk/.hidden/smb.desktop share/kde/applnk/Applications/.directory share/kde/applnk/Development/.directory share/kde/applnk/Editors/.directory @@ -912,32 +1070,49 @@ share/kde/applnk/Games/.directory share/kde/applnk/Games/Arcade/.directory share/kde/applnk/Games/Board/.directory share/kde/applnk/Games/Card/.directory +share/kde/applnk/Games/Kidsgames/.directory share/kde/applnk/Games/Roguelikes/.directory share/kde/applnk/Games/TacticStrategy/.directory share/kde/applnk/Graphics/.directory +share/kde/applnk/Graphics/More/.directory share/kde/applnk/Help.desktop share/kde/applnk/Home.desktop share/kde/applnk/Internet/.directory +share/kde/applnk/Internet/More/.directory share/kde/applnk/Internet/Terminal/.directory share/kde/applnk/Internet/keditbookmarks.desktop share/kde/applnk/Internet/konqbrowser.desktop share/kde/applnk/KControl.desktop share/kde/applnk/Kfind.desktop share/kde/applnk/Multimedia/.directory +share/kde/applnk/Multimedia/More/.directory share/kde/applnk/Office/.directory -share/kde/applnk/Settings/.directory -share/kde/applnk/Settings/Databases/.directory -share/kde/applnk/Settings/FileBrowsing/.directory -share/kde/applnk/Settings/FileBrowsing/filetypes.desktop -share/kde/applnk/Settings/FileBrowsing/kcmkonq.desktop -share/kde/applnk/Settings/Help/.directory +share/kde/applnk/Settings/Accessibility/.directory +share/kde/applnk/Settings/Accessibility/kcmaccess.desktop +share/kde/applnk/Settings/Accessibility/keyboard_layout.desktop +share/kde/applnk/Settings/Accessibility/keys.desktop +share/kde/applnk/Settings/Accessibility/language.desktop +share/kde/applnk/Settings/Components/.directory +share/kde/applnk/Settings/Components/componentchooser.desktop +share/kde/applnk/Settings/Components/filebrowser.desktop +share/kde/applnk/Settings/Components/filetypes.desktop +share/kde/applnk/Settings/Components/kcmkded.desktop +share/kde/applnk/Settings/Components/kcmsmserver.desktop +share/kde/applnk/Settings/Components/spellchecking.desktop +share/kde/applnk/Settings/Desktop/.directory +share/kde/applnk/Settings/Desktop/desktop.desktop +share/kde/applnk/Settings/Desktop/desktopappearance.desktop +share/kde/applnk/Settings/Desktop/desktopbehavior.desktop +share/kde/applnk/Settings/Desktop/filetrash.desktop +share/kde/applnk/Settings/Desktop/kcmtaskbar.desktop +share/kde/applnk/Settings/Desktop/kwinoptions.desktop +share/kde/applnk/Settings/Desktop/panel.desktop share/kde/applnk/Settings/Information/.directory share/kde/applnk/Settings/Information/devices.desktop share/kde/applnk/Settings/Information/dma.desktop share/kde/applnk/Settings/Information/interrupts.desktop share/kde/applnk/Settings/Information/ioports.desktop share/kde/applnk/Settings/Information/ioslaveinfo.desktop -share/kde/applnk/Settings/Information/kcmusb.desktop share/kde/applnk/Settings/Information/memory.desktop share/kde/applnk/Settings/Information/nic.desktop share/kde/applnk/Settings/Information/partitions.desktop @@ -948,68 +1123,78 @@ share/kde/applnk/Settings/Information/smbstatus.desktop share/kde/applnk/Settings/Information/sound.desktop share/kde/applnk/Settings/Information/xserver.desktop share/kde/applnk/Settings/LookNFeel/.directory -share/kde/applnk/Settings/LookNFeel/Desktop/background.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/borders.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/desktop.desktop -share/kde/applnk/Settings/LookNFeel/Desktop/virtualdesktops.desktop share/kde/applnk/Settings/LookNFeel/Themes/iconthemes.desktop share/kde/applnk/Settings/LookNFeel/Windows/actions.desktop share/kde/applnk/Settings/LookNFeel/Windows/kwinmouse.desktop share/kde/applnk/Settings/LookNFeel/Windows/mouse.desktop share/kde/applnk/Settings/LookNFeel/background.desktop +share/kde/applnk/Settings/LookNFeel/borders.desktop share/kde/applnk/Settings/LookNFeel/colors.desktop share/kde/applnk/Settings/LookNFeel/desktop.desktop share/kde/applnk/Settings/LookNFeel/fonts.desktop share/kde/applnk/Settings/LookNFeel/icons.desktop share/kde/applnk/Settings/LookNFeel/kcmlaunch.desktop share/kde/applnk/Settings/LookNFeel/kcmtaskbar.desktop -share/kde/applnk/Settings/LookNFeel/keys.desktop share/kde/applnk/Settings/LookNFeel/kthememgr.desktop share/kde/applnk/Settings/LookNFeel/kwindecoration.desktop -share/kde/applnk/Settings/LookNFeel/kwinoptions.desktop share/kde/applnk/Settings/LookNFeel/panel.desktop +share/kde/applnk/Settings/LookNFeel/panel_appearance.desktop share/kde/applnk/Settings/LookNFeel/screensaver.desktop share/kde/applnk/Settings/LookNFeel/style.desktop share/kde/applnk/Settings/LookNFeel/virtualdesktops.desktop share/kde/applnk/Settings/Network/.directory +share/kde/applnk/Settings/Network/WebBrowsing/.directory +share/kde/applnk/Settings/Network/WebBrowsing/cache.desktop +share/kde/applnk/Settings/Network/WebBrowsing/cookies.desktop +share/kde/applnk/Settings/Network/WebBrowsing/ebrowsing.desktop +share/kde/applnk/Settings/Network/WebBrowsing/kcmcgi.desktop +share/kde/applnk/Settings/Network/WebBrowsing/kcmcss.desktop +share/kde/applnk/Settings/Network/WebBrowsing/kcmhistory.desktop +share/kde/applnk/Settings/Network/WebBrowsing/khtml_behavior.desktop +share/kde/applnk/Settings/Network/WebBrowsing/khtml_fonts.desktop +share/kde/applnk/Settings/Network/WebBrowsing/khtml_java_js.desktop +share/kde/applnk/Settings/Network/WebBrowsing/khtml_plugins.desktop +share/kde/applnk/Settings/Network/WebBrowsing/useragent.desktop share/kde/applnk/Settings/Network/email.desktop +share/kde/applnk/Settings/Network/fileshare.desktop +share/kde/applnk/Settings/Network/lanbrowser.desktop share/kde/applnk/Settings/Network/netpref.desktop -share/kde/applnk/Settings/Network/smb.desktop -share/kde/applnk/Settings/Network/socks.desktop +share/kde/applnk/Settings/Network/proxy.desktop share/kde/applnk/Settings/Peripherals/.directory share/kde/applnk/Settings/Peripherals/keyboard.desktop share/kde/applnk/Settings/Peripherals/mouse.desktop -share/kde/applnk/Settings/Personalization/.directory -share/kde/applnk/Settings/Personalization/crypto.desktop -share/kde/applnk/Settings/Personalization/kcmaccess.desktop -share/kde/applnk/Settings/Personalization/kcmkonsole.desktop +share/kde/applnk/Settings/Peripherals/printers.desktop share/kde/applnk/Settings/Personalization/kcmlayout.desktop -share/kde/applnk/Settings/Personalization/kcmsmserver.desktop -share/kde/applnk/Settings/Personalization/language.desktop -share/kde/applnk/Settings/Personalization/passwords.desktop -share/kde/applnk/Settings/Personalization/spellchecking.desktop share/kde/applnk/Settings/PowerControl/.directory share/kde/applnk/Settings/PowerControl/energy.desktop +share/kde/applnk/Settings/Security/.directory +share/kde/applnk/Settings/Security/crypto.desktop +share/kde/applnk/Settings/Security/passwords.desktop share/kde/applnk/Settings/Sound/.directory share/kde/applnk/Settings/Sound/arts.desktop share/kde/applnk/Settings/Sound/bell.desktop share/kde/applnk/Settings/Sound/kcmnotify.desktop -share/kde/applnk/Settings/Sound/midi.desktop share/kde/applnk/Settings/System/.directory share/kde/applnk/Settings/System/clock.desktop +share/kde/applnk/Settings/System/desktoppath.desktop share/kde/applnk/Settings/System/kcmfontinst.desktop +share/kde/applnk/Settings/System/kcmhelpcenter.desktop share/kde/applnk/Settings/System/kdm.desktop -share/kde/applnk/Settings/System/printmgr.desktop -share/kde/applnk/Settings/WebBrowsing/.directory -share/kde/applnk/Settings/WebBrowsing/cache.desktop -share/kde/applnk/Settings/WebBrowsing/cookies.desktop -share/kde/applnk/Settings/WebBrowsing/ebrowsing.desktop -share/kde/applnk/Settings/WebBrowsing/kcmcss.desktop -share/kde/applnk/Settings/WebBrowsing/konqhtml.desktop -share/kde/applnk/Settings/WebBrowsing/proxy.desktop +share/kde/applnk/Settings/WebBrowsing/khtml_appearance.desktop +share/kde/applnk/Settings/WebBrowsing/nsplugin.desktop share/kde/applnk/Settings/WebBrowsing/smb.desktop -share/kde/applnk/Settings/WebBrowsing/useragent.desktop +share/kde/applnk/Settings/email.desktop +share/kde/applnk/Settingsmenu/.directory +share/kde/applnk/Settingsmenu/KControl.desktop +share/kde/applnk/Settingsmenu/kappfinder.desktop +share/kde/applnk/Settingsmenu/kcmkicker.desktop +share/kde/applnk/Settingsmenu/kmenuedit.desktop +share/kde/applnk/Settingsmenu/kpersonalizer.desktop +share/kde/applnk/Settingsmenu/printmgr.desktop share/kde/applnk/System/.directory +share/kde/applnk/System/More/.directory +share/kde/applnk/System/More/konquerorsu.desktop +share/kde/applnk/System/More/konsolesu.desktop share/kde/applnk/System/ScreenSavers/.directory share/kde/applnk/System/ScreenSavers/KBlankscreen.desktop share/kde/applnk/System/ScreenSavers/KRandom.desktop @@ -1018,6 +1203,8 @@ share/kde/applnk/System/kappfinder.desktop share/kde/applnk/System/kfmclient.desktop share/kde/applnk/System/kfmclient_dir.desktop share/kde/applnk/System/kfmclient_html.desktop +share/kde/applnk/System/kfmclient_war.desktop +share/kde/applnk/System/kinfocenter.desktop share/kde/applnk/System/kmenuedit.desktop share/kde/applnk/System/konquerorsu.desktop share/kde/applnk/System/konsole.desktop @@ -1027,33 +1214,25 @@ share/kde/applnk/System/ksysguard.desktop share/kde/applnk/Toys/.directory share/kde/applnk/Toys/ktip.desktop share/kde/applnk/Utilities/.directory -share/kde/applnk/Utilities/kaddressbook.desktop +share/kde/applnk/Utilities/More/.directory +share/kde/applnk/Utilities/More/kpager.desktop +share/kde/applnk/Utilities/XUtilities/.directory share/kde/applnk/Utilities/kdeprintfax.desktop share/kde/applnk/Utilities/kjobviewer.desktop share/kde/applnk/Utilities/klipper.desktop share/kde/applnk/Utilities/kpager.desktop -share/kde/applnk/WordProcessing/.directory +share/kde/applnk/Utilities/ktip.desktop +share/kde/applnk/konqueror.desktop share/kde/apps/clockapplet/pics/lcd.png share/kde/apps/drkonqi/debuggers/gdbrc share/kde/apps/drkonqi/pics/konqi.png share/kde/apps/drkonqi/presets/developerrc share/kde/apps/drkonqi/presets/enduserrc -share/kde/apps/kaddressbook/kaddressbookui.rc -share/kde/apps/kaddressbook/pics/abentry.xpm -share/kde/apps/kaddressbook/pics/delete.xpm -share/kde/apps/kaddressbook/pics/down.xpm -share/kde/apps/kaddressbook/pics/filemail.xpm -share/kde/apps/kaddressbook/pics/find.xpm -share/kde/apps/kaddressbook/pics/group.xpm -share/kde/apps/kaddressbook/pics/page.xpm -share/kde/apps/kaddressbook/pics/up.xpm share/kde/apps/kappfinder/apps/Development/Forte.desktop share/kde/apps/kappfinder/apps/Development/assistant.desktop -share/kde/apps/kappfinder/apps/Development/converter.desktop share/kde/apps/kappfinder/apps/Development/ddd.desktop share/kde/apps/kappfinder/apps/Development/designer.desktop share/kde/apps/kappfinder/apps/Development/dlgedit.desktop -share/kde/apps/kappfinder/apps/Development/gideon.desktop share/kde/apps/kappfinder/apps/Development/j2mewtk.desktop share/kde/apps/kappfinder/apps/Development/linguist.desktop share/kde/apps/kappfinder/apps/Development/pose.desktop @@ -1061,6 +1240,7 @@ share/kde/apps/kappfinder/apps/Editors/emacs.desktop share/kde/apps/kappfinder/apps/Editors/gedit.desktop share/kde/apps/kappfinder/apps/Editors/gvim.desktop share/kde/apps/kappfinder/apps/Editors/lemacs.desktop +share/kde/apps/kappfinder/apps/Editors/nano.desktop share/kde/apps/kappfinder/apps/Editors/nedit.desktop share/kde/apps/kappfinder/apps/Editors/pico.desktop share/kde/apps/kappfinder/apps/Editors/xedit.desktop @@ -1074,6 +1254,8 @@ share/kde/apps/kappfinder/apps/Games/Arcade/Trophy.desktop share/kde/apps/kappfinder/apps/Games/Arcade/TuxRacer.desktop share/kde/apps/kappfinder/apps/Games/Arcade/XKobo.desktop share/kde/apps/kappfinder/apps/Games/Arcade/XSoldier.desktop +share/kde/apps/kappfinder/apps/Games/Arcade/alephone-nogl.desktop +share/kde/apps/kappfinder/apps/Games/Arcade/alephone.desktop share/kde/apps/kappfinder/apps/Games/Arcade/cxhextris.desktop share/kde/apps/kappfinder/apps/Games/Arcade/rocksndiamonds.desktop share/kde/apps/kappfinder/apps/Games/Board/Gataxx.desktop @@ -1102,6 +1284,8 @@ share/kde/apps/kappfinder/apps/Games/Roguelikes/pernband.desktop share/kde/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop share/kde/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop share/kde/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop +share/kde/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop +share/kde/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop share/kde/apps/kappfinder/apps/Games/defendguin.desktop share/kde/apps/kappfinder/apps/Games/penguin-command.desktop share/kde/apps/kappfinder/apps/Games/xshipwars.desktop @@ -1114,8 +1298,12 @@ share/kde/apps/kappfinder/apps/Graphics/Sketch.desktop share/kde/apps/kappfinder/apps/Graphics/Xpcd.desktop share/kde/apps/kappfinder/apps/Graphics/Xwpick.desktop share/kde/apps/kappfinder/apps/Graphics/bitmap.desktop +share/kde/apps/kappfinder/apps/Graphics/ghostview.desktop share/kde/apps/kappfinder/apps/Graphics/gimp.desktop +share/kde/apps/kappfinder/apps/Graphics/gv.desktop +share/kde/apps/kappfinder/apps/Graphics/sodipodi.desktop share/kde/apps/kappfinder/apps/Graphics/tgif.desktop +share/kde/apps/kappfinder/apps/Graphics/xdvi.desktop share/kde/apps/kappfinder/apps/Graphics/xfig.desktop share/kde/apps/kappfinder/apps/Graphics/xpaint.desktop share/kde/apps/kappfinder/apps/Graphics/xv.desktop @@ -1138,12 +1326,20 @@ share/kde/apps/kappfinder/apps/Internet/Terminal/lftp.desktop share/kde/apps/kappfinder/apps/Internet/Terminal/mutt.desktop share/kde/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop share/kde/apps/kappfinder/apps/Internet/Terminal/pine.desktop +share/kde/apps/kappfinder/apps/Internet/Terminal/silc.desktop +share/kde/apps/kappfinder/apps/Internet/Terminal/slrn.desktop +share/kde/apps/kappfinder/apps/Internet/Terminal/w3m.desktop share/kde/apps/kappfinder/apps/Internet/arena.desktop +share/kde/apps/kappfinder/apps/Internet/balsa.desktop share/kde/apps/kappfinder/apps/Internet/coolmail.desktop +share/kde/apps/kappfinder/apps/Internet/dc_gui.desktop +share/kde/apps/kappfinder/apps/Internet/ed2k_gui.desktop share/kde/apps/kappfinder/apps/Internet/ethereal.desktop share/kde/apps/kappfinder/apps/Internet/gFTP.desktop +share/kde/apps/kappfinder/apps/Internet/gnomemeeting.desktop share/kde/apps/kappfinder/apps/Internet/gnometalk.desktop share/kde/apps/kappfinder/apps/Internet/gtelnet.desktop +share/kde/apps/kappfinder/apps/Internet/ickle.desktop share/kde/apps/kappfinder/apps/Internet/knews.desktop share/kde/apps/kappfinder/apps/Internet/licq.desktop share/kde/apps/kappfinder/apps/Internet/mozilla.desktop @@ -1167,10 +1363,13 @@ share/kde/apps/kappfinder/apps/Multimedia/gtv.desktop share/kde/apps/kappfinder/apps/Multimedia/jazz.desktop share/kde/apps/kappfinder/apps/Multimedia/mplayer.desktop share/kde/apps/kappfinder/apps/Multimedia/mtv.desktop +share/kde/apps/kappfinder/apps/Multimedia/ogle.desktop +share/kde/apps/kappfinder/apps/Multimedia/oqtplayer.desktop share/kde/apps/kappfinder/apps/Multimedia/realplayer.desktop share/kde/apps/kappfinder/apps/Multimedia/slab.desktop share/kde/apps/kappfinder/apps/Multimedia/xawtv.desktop share/kde/apps/kappfinder/apps/Multimedia/xcam.desktop +share/kde/apps/kappfinder/apps/Multimedia/xine.desktop share/kde/apps/kappfinder/apps/Multimedia/xmms-enqueue.desktop share/kde/apps/kappfinder/apps/Multimedia/xmms.desktop share/kde/apps/kappfinder/apps/Office/Applix.desktop @@ -1181,78 +1380,29 @@ share/kde/apps/kappfinder/apps/Office/GnomeTimeTracker.desktop share/kde/apps/kappfinder/apps/Office/Gnumeric.desktop share/kde/apps/kappfinder/apps/Office/Guppi.desktop share/kde/apps/kappfinder/apps/Office/Ical.desktop +share/kde/apps/kappfinder/apps/Office/WordPerfect.desktop +share/kde/apps/kappfinder/apps/Office/WordPerfect2000.desktop share/kde/apps/kappfinder/apps/Office/XAcc.desktop share/kde/apps/kappfinder/apps/Office/XsLite.desktop share/kde/apps/kappfinder/apps/Office/abiword.desktop -share/kde/apps/kappfinder/apps/Office/adobe.desktop +share/kde/apps/kappfinder/apps/Office/acroread.desktop +share/kde/apps/kappfinder/apps/Office/gnucash.desktop share/kde/apps/kappfinder/apps/Office/lyx.desktop +share/kde/apps/kappfinder/apps/Office/mrproject.desktop share/kde/apps/kappfinder/apps/Office/netscapeaddressbook.desktop share/kde/apps/kappfinder/apps/Office/plan.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Ant.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Atlantis.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Attraction.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bouboule.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Braid.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubble3d.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Bubbles.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Cage.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Compass.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Coral.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Crystal.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Cynosure.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Demon.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Drift.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Fadeplot.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flag.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flame.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Flow.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Forest.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/GLPlanet.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Galaxy.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Gears.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Goop.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Grav.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Hopalong.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Hypercube.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Ifs.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Imsmap.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Interference.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Julia.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Kaleidescope.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Kumppa.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/LMorph.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lament.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Laser.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lightning.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Lissie.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Moenius.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Penrose.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Phosphor.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Pulsar.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Rubik.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Slip.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Sonar.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Sproingies.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Stairs.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Starfish.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Strange.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Superquadrics.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Swirl.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/T3d.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Triangle.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Vines.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/Worm.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XFlame.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XJack.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XMatrix.desktop -share/kde/apps/kappfinder/apps/System/ScreenSavers/XPipes.desktop +share/kde/apps/kappfinder/apps/Office/pybliographic.desktop +share/kde/apps/kappfinder/apps/Office/scribus.desktop +share/kde/apps/kappfinder/apps/Office/xpdf.desktop share/kde/apps/kappfinder/apps/System/Terminal/aterm.desktop share/kde/apps/kappfinder/apps/System/Terminal/procinfo.desktop +share/kde/apps/kappfinder/apps/System/Terminal/rxvt.desktop share/kde/apps/kappfinder/apps/System/Terminal/vmstat.desktop +share/kde/apps/kappfinder/apps/System/citrix_ica.desktop share/kde/apps/kappfinder/apps/System/editres.desktop share/kde/apps/kappfinder/apps/System/sam.desktop +share/kde/apps/kappfinder/apps/System/wine.desktop share/kde/apps/kappfinder/apps/System/xosview.desktop -share/kde/apps/kappfinder/apps/Toys/GTali.desktop share/kde/apps/kappfinder/apps/Toys/xeyes.desktop share/kde/apps/kappfinder/apps/Toys/xpinguin.desktop share/kde/apps/kappfinder/apps/Utilities/GnomeWho.desktop @@ -1271,26 +1421,13 @@ share/kde/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop share/kde/apps/kappfinder/apps/Utilities/calctool.desktop share/kde/apps/kappfinder/apps/Utilities/e-notes.desktop share/kde/apps/kappfinder/apps/Utilities/oclock.desktop -share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect.desktop -share/kde/apps/kappfinder/apps/WordProcessing/WordPerfect2000.desktop -share/kde/apps/kappfinder/apps/WordProcessing/acroread.desktop -share/kde/apps/kappfinder/apps/WordProcessing/ghostview.desktop -share/kde/apps/kappfinder/apps/WordProcessing/gv.desktop -share/kde/apps/kappfinder/apps/WordProcessing/lyx.desktop -share/kde/apps/kappfinder/apps/WordProcessing/pybliographic.desktop -share/kde/apps/kappfinder/apps/WordProcessing/xdvi.desktop -share/kde/apps/kappfinder/apps/WordProcessing/xpdf.desktop -share/kde/apps/kate/icons/hicolor/16x16/actions/curfiledir.png -share/kde/apps/kate/icons/hicolor/16x16/actions/highlighting.png -share/kde/apps/kate/icons/hicolor/16x16/actions/modified.png -share/kde/apps/kate/icons/hicolor/16x16/actions/null.png -share/kde/apps/kate/icons/hicolor/16x16/actions/save_all.png -share/kde/apps/kate/icons/hicolor/22x22/actions/save_all.png -share/kde/apps/kate/icons/hicolor/32x32/actions/highlighting.png -share/kde/apps/kate/icons/hicolor/32x32/actions/indent.png -share/kde/apps/kate/icons/hicolor/32x32/actions/unindent.png -share/kde/apps/kate/icons/hicolor/48x48/actions/indent.png -share/kde/apps/kate/icons/hicolor/48x48/actions/unindent.png +share/kde/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png +share/kde/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png +share/kde/apps/kate/icons/crystalsvg/16x16/actions/modified.png +share/kde/apps/kate/icons/crystalsvg/16x16/actions/null.png +share/kde/apps/kate/icons/crystalsvg/16x16/actions/save_all.png +share/kde/apps/kate/icons/crystalsvg/22x22/actions/save_all.png +share/kde/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png share/kde/apps/kate/icons/locolor/16x16/actions/curfiledir.png share/kde/apps/kate/icons/locolor/16x16/actions/indent.png share/kde/apps/kate/icons/locolor/16x16/actions/modified.png @@ -1309,12 +1446,17 @@ share/kde/apps/kate/scripts/sample.desktop share/kde/apps/kate/scripts/sample.sh share/kde/apps/kate/scripts/tolower.desktop share/kde/apps/kate/scripts/tolower.sh +share/kde/apps/kate/tips share/kde/apps/kbookmark/directory_bookmarkbar.desktop +share/kde/apps/kcm_componentchooser/kcm_kemail.desktop +share/kde/apps/kcm_componentchooser/kcm_terminal.desktop share/kde/apps/kcmcss/template.css share/kde/apps/kcmfontinst/StarOffice/microsoft-cp1252.xpp share/kde/apps/kcmfontinst/pics/kcmfontinst_star_office.png share/kde/apps/kcmfontinst/psnames -share/kde/apps/kcminput/cursor_large.pcf.gz +share/kde/apps/kcminput/cursor_large_black.pcf.gz +share/kde/apps/kcminput/cursor_large_white.pcf.gz +share/kde/apps/kcminput/cursor_small_white.pcf.gz share/kde/apps/kcminput/pics/mouse_lh.png share/kde/apps/kcminput/pics/mouse_rh.png share/kde/apps/kcmkeys/kde3.kksrc @@ -1324,13 +1466,16 @@ share/kde/apps/kcmkeys/unix3.kksrc share/kde/apps/kcmkeys/win3.kksrc share/kde/apps/kcmkeys/win4.kksrc share/kde/apps/kcmlocale/pics/background.png -share/kde/apps/kcmusb/usb.ids share/kde/apps/kconf_update/convertShortcuts.pl share/kde/apps/kconf_update/favicons.upd share/kde/apps/kconf_update/kaccel.upd share/kde/apps/kconf_update/kcmdisplayrc.upd +share/kde/apps/kconf_update/kicker-${PKGVERSION}-properSizeSetting.pl +share/kde/apps/kconf_update/kickerrc.upd share/kde/apps/kconf_update/klipper-1-2.pl +share/kde/apps/kconf_update/klipper-kde31.sh share/kde/apps/kconf_update/klipperrc.upd +share/kde/apps/kconf_update/klippershortcuts.upd share/kde/apps/kconf_update/konsole.upd share/kde/apps/kconf_update/ksmserver.upd share/kde/apps/kconf_update/kwin.upd @@ -1354,7 +1499,9 @@ share/kde/apps/kcontrol/pics/play.png share/kde/apps/kdcop/kdcopui.rc share/kde/apps/kdeprint/template/background.png share/kde/apps/kdeprint/template/class.template +share/kde/apps/kdeprint/template/driver.template share/kde/apps/kdeprint/template/htmlstyles.css +share/kde/apps/kdeprint/template/jobs.template share/kde/apps/kdeprint/template/kdelogo2.png share/kde/apps/kdeprint/template/kdeprint.png share/kde/apps/kdeprint/template/lines.png @@ -1366,7 +1513,7 @@ share/kde/apps/kdeprint/template/shadow1.png share/kde/apps/kdeprint_part/kdeprint_part.rc share/kde/apps/kdeprintfax/anytops share/kde/apps/kdeprintfax/faxfilters -share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions/abentry.png +share/kde/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png share/kde/apps/kdeprintfax/kdeprintfaxui.rc share/kde/apps/kdesktop/DesktopLinks/Home.desktop share/kde/apps/kdesktop/directory.autostart @@ -1426,6 +1573,10 @@ share/kde/apps/kdisplay/color-schemes/DesertRed.kcsrc share/kde/apps/kdisplay/color-schemes/DigitalCDE.kcsrc share/kde/apps/kdisplay/color-schemes/EveX.kcsrc share/kde/apps/kdisplay/color-schemes/KDEOne.kcsrc +share/kde/apps/kdisplay/color-schemes/KDETwo.kcsrc +share/kde/apps/kdisplay/color-schemes/Keramik.kcsrc +share/kde/apps/kdisplay/color-schemes/KeramikEmerald.kcsrc +share/kde/apps/kdisplay/color-schemes/KeramikWhite.kcsrc share/kde/apps/kdisplay/color-schemes/MediaPeach.kcsrc share/kde/apps/kdisplay/color-schemes/Next.kcsrc share/kde/apps/kdisplay/color-schemes/PaleGray.kcsrc @@ -1452,11 +1603,36 @@ share/kde/apps/kfindpart/icons/locolor/22x22/actions/openfile.png share/kde/apps/kfindpart/icons/locolor/22x22/actions/save.png share/kde/apps/kfindpart/icons/locolor/22x22/actions/search.png share/kde/apps/khelpcenter/glossary.html.in +share/kde/apps/khelpcenter/glossary.xslt share/kde/apps/khelpcenter/intro.html.in share/kde/apps/khelpcenter/khelpcenterui.rc +share/kde/apps/khelpcenter/plugins/Applications/.directory +share/kde/apps/khelpcenter/plugins/Manpages/.directory +share/kde/apps/khelpcenter/plugins/Manpages/man1.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man2.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man3.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man4.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man5.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man6.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop +share/kde/apps/khelpcenter/plugins/Manpages/man9.desktop +share/kde/apps/khelpcenter/plugins/Manpages/mann.desktop share/kde/apps/khelpcenter/plugins/Tutorials/.directory share/kde/apps/khelpcenter/plugins/Tutorials/quickstart.desktop share/kde/apps/khelpcenter/plugins/Tutorials/visualdict.desktop +share/kde/apps/khelpcenter/plugins/applets.desktop +share/kde/apps/khelpcenter/plugins/contact.desktop +share/kde/apps/khelpcenter/plugins/faq.desktop +share/kde/apps/khelpcenter/plugins/info.desktop +share/kde/apps/khelpcenter/plugins/kcontrolmodules.desktop +share/kde/apps/khelpcenter/plugins/kicmodules.desktop +share/kde/apps/khelpcenter/plugins/konqplugins.desktop +share/kde/apps/khelpcenter/plugins/links.desktop +share/kde/apps/khelpcenter/plugins/support.desktop +share/kde/apps/khelpcenter/plugins/userguide.desktop +share/kde/apps/khelpcenter/plugins/welcome.desktop +share/kde/apps/khelpcenter/table-of-contents.xslt share/kde/apps/kicker/applets/clockapplet.desktop share/kde/apps/kicker/applets/klipper.desktop share/kde/apps/kicker/applets/ksysguardapplet.desktop @@ -1472,9 +1648,12 @@ share/kde/apps/kicker/extensions/childpanelextension.desktop share/kde/apps/kicker/extensions/dockbarextension.desktop share/kde/apps/kicker/extensions/kasbarextension.desktop share/kde/apps/kicker/extensions/taskbarextension.desktop -share/kde/apps/kicker/icons/hicolor/16x16/actions/modified.png +share/kde/apps/kicker/icons/crystalsvg/16x16/actions/modified.png share/kde/apps/kicker/icons/locolor/16x16/actions/modified.png +share/kde/apps/kicker/menuext/konsolemenu.desktop +share/kde/apps/kicker/menuext/prefmenu.desktop share/kde/apps/kicker/menuext/printmenu.desktop +share/kde/apps/kicker/menuext/recentdocs.desktop share/kde/apps/kicker/pics/disk1.png share/kde/apps/kicker/pics/disk10.png share/kde/apps/kicker/pics/disk2.png @@ -1487,6 +1666,12 @@ share/kde/apps/kicker/pics/disk8.png share/kde/apps/kicker/pics/disk9.png share/kde/apps/kicker/pics/kside.png share/kde/apps/kicker/pics/kside_tile.png +share/kde/apps/kicker/tiles/KDE_button_large_down.png +share/kde/apps/kicker/tiles/KDE_button_large_up.png +share/kde/apps/kicker/tiles/KDE_button_normal_down.png +share/kde/apps/kicker/tiles/KDE_button_normal_up.png +share/kde/apps/kicker/tiles/KDE_button_tiny_down.png +share/kde/apps/kicker/tiles/KDE_button_tiny_up.png share/kde/apps/kicker/tiles/blue_wood_large_down.png share/kde/apps/kicker/tiles/blue_wood_large_up.png share/kde/apps/kicker/tiles/blue_wood_normal_down.png @@ -1499,23 +1684,17 @@ share/kde/apps/kicker/tiles/green_wood_normal_down.png share/kde/apps/kicker/tiles/green_wood_normal_up.png share/kde/apps/kicker/tiles/green_wood_tiny_down.png share/kde/apps/kicker/tiles/green_wood_tiny_up.png -share/kde/apps/kicker/tiles/kde2_button_large_down.png -share/kde/apps/kicker/tiles/kde2_button_large_up.png -share/kde/apps/kicker/tiles/kde2_button_normal_down.png -share/kde/apps/kicker/tiles/kde2_button_normal_up.png -share/kde/apps/kicker/tiles/kde2_button_tiny_down.png -share/kde/apps/kicker/tiles/kde2_button_tiny_up.png +share/kde/apps/kicker/tiles/light_gray_large_down.png +share/kde/apps/kicker/tiles/light_gray_large_up.png +share/kde/apps/kicker/tiles/light_gray_normal_up.png +share/kde/apps/kicker/tiles/light_gray_tiny_down.png +share/kde/apps/kicker/tiles/light_gray_tiny_up.png share/kde/apps/kicker/tiles/light_green_large_down.png share/kde/apps/kicker/tiles/light_green_large_up.png share/kde/apps/kicker/tiles/light_green_normal_down.png share/kde/apps/kicker/tiles/light_green_normal_up.png share/kde/apps/kicker/tiles/light_green_tiny_down.png share/kde/apps/kicker/tiles/light_green_tiny_up.png -share/kde/apps/kicker/tiles/light_grey_large_down.png -share/kde/apps/kicker/tiles/light_grey_large_up.png -share/kde/apps/kicker/tiles/light_grey_normal_up.png -share/kde/apps/kicker/tiles/light_grey_tiny_down.png -share/kde/apps/kicker/tiles/light_grey_tiny_up.png share/kde/apps/kicker/tiles/light_pastel_large_down.png share/kde/apps/kicker/tiles/light_pastel_large_up.png share/kde/apps/kicker/tiles/light_pastel_normal_up.png @@ -1527,12 +1706,12 @@ share/kde/apps/kicker/tiles/light_purple_normal_down.png share/kde/apps/kicker/tiles/light_purple_normal_up.png share/kde/apps/kicker/tiles/light_purple_tiny_down.png share/kde/apps/kicker/tiles/light_purple_tiny_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_large_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_large_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_normal_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_normal_up.png -share/kde/apps/kicker/tiles/nuts_andBolts_tiny_down.png -share/kde/apps/kicker/tiles/nuts_andBolts_tiny_up.png +share/kde/apps/kicker/tiles/nuts_and_bolts_large_down.png +share/kde/apps/kicker/tiles/nuts_and_bolts_large_up.png +share/kde/apps/kicker/tiles/nuts_and_bolts_normal_down.png +share/kde/apps/kicker/tiles/nuts_and_bolts_normal_up.png +share/kde/apps/kicker/tiles/nuts_and_bolts_tiny_down.png +share/kde/apps/kicker/tiles/nuts_and_bolts_tiny_up.png share/kde/apps/kicker/tiles/red_wood_large_down.png share/kde/apps/kicker/tiles/red_wood_large_up.png share/kde/apps/kicker/tiles/red_wood_normal_down.png @@ -1581,30 +1760,30 @@ share/kde/apps/kicker/tiles/solid_red_normal_down.png share/kde/apps/kicker/tiles/solid_red_normal_up.png share/kde/apps/kicker/tiles/solid_red_tiny_down.png share/kde/apps/kicker/tiles/solid_red_tiny_up.png -share/kde/apps/kicker/tiles/solid_tgri_large_down.png -share/kde/apps/kicker/tiles/solid_tgri_large_up.png -share/kde/apps/kicker/tiles/solid_tgri_normal_down.png -share/kde/apps/kicker/tiles/solid_tgri_normal_up.png -share/kde/apps/kicker/tiles/solid_tgri_tiny_down.png -share/kde/apps/kicker/tiles/solid_tgri_tiny_up.png +share/kde/apps/kicker/tiles/solid_tigereye_large_down.png +share/kde/apps/kicker/tiles/solid_tigereye_large_up.png +share/kde/apps/kicker/tiles/solid_tigereye_normal_down.png +share/kde/apps/kicker/tiles/solid_tigereye_normal_up.png +share/kde/apps/kicker/tiles/solid_tigereye_tiny_down.png +share/kde/apps/kicker/tiles/solid_tigereye_tiny_up.png share/kde/apps/kicker/wallpapers/deck_plate.png share/kde/apps/kicker/wallpapers/green_line.png share/kde/apps/kicker/wallpapers/rail.png +share/kde/apps/kinfocenter/kinfocenterui.rc share/kde/apps/kio_finger/kio_finger.css share/kde/apps/kio_finger/kio_finger.pl share/kde/apps/kio_info/kde-info2html share/kde/apps/kio_info/kde-info2html.conf -share/kde/apps/kioslave/smb.html share/kde/apps/kjobviewer/kjobviewerui.rc -share/kde/apps/klipper/pics/klipper_dock.png -share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png -share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png +share/kde/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png +share/kde/apps/kmenuedit/icons/crystalsvg/32x32/actions/menu_new.png share/kde/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png share/kde/apps/kmenuedit/kmenueditui.rc share/kde/apps/konqiconview/konq_iconview.rc share/kde/apps/konqiconview/konq_multicolumnview.rc share/kde/apps/konqiconview/kpartplugins/kshellcmdplugin.rc share/kde/apps/konqlistview/konq_detailedlistview.rc +share/kde/apps/konqlistview/konq_infolistview.rc share/kde/apps/konqlistview/konq_textview.rc share/kde/apps/konqlistview/konq_treeview.rc share/kde/apps/konqlistview/kpartplugins/kshellcmdplugin.rc @@ -1628,15 +1807,13 @@ share/kde/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop share/kde/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop share/kde/apps/konqsidebartng/virtual_folders/services/.directory share/kde/apps/konqsidebartng/virtual_folders/services/audiocd.desktop +share/kde/apps/konqsidebartng/virtual_folders/services/devices.desktop share/kde/apps/konqsidebartng/virtual_folders/services/lisa.desktop share/kde/apps/konqsidebartng/virtual_folders/services/printsystem.desktop -share/kde/apps/konqueror/about/back.png share/kde/apps/konqueror/about/background.png share/kde/apps/konqueror/about/background_rtl.png share/kde/apps/konqueror/about/bgtable.png share/kde/apps/konqueror/about/bgtable_rtl.png -share/kde/apps/konqueror/about/gohome.png -share/kde/apps/konqueror/about/history.png share/kde/apps/konqueror/about/intro.html share/kde/apps/konqueror/about/intro_rtl.html share/kde/apps/konqueror/about/kdelogo2.png @@ -1647,25 +1824,19 @@ share/kde/apps/konqueror/about/konqueror_rtl.png share/kde/apps/konqueror/about/lightning.png share/kde/apps/konqueror/about/lines.png share/kde/apps/konqueror/about/lines2.png -share/kde/apps/konqueror/about/locationbar_erase.png -share/kde/apps/konqueror/about/locationbar_erase_rtl.png share/kde/apps/konqueror/about/more.png -share/kde/apps/konqueror/about/openterm.png share/kde/apps/konqueror/about/pointers.gif share/kde/apps/konqueror/about/shadow1.png share/kde/apps/konqueror/about/specs.html share/kde/apps/konqueror/about/specs_rtl.html share/kde/apps/konqueror/about/tips.html share/kde/apps/konqueror/about/tips_rtl.html -share/kde/apps/konqueror/about/view_left_right.png -share/kde/apps/konqueror/about/viewmag.png -share/kde/apps/konqueror/about/window_fullscreen.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde1.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde2.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde3.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde4.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde5.png -share/kde/apps/konqueror/icons/hicolor/16x16/actions/kde6.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde4.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde5.png +share/kde/apps/konqueror/icons/crystalsvg/16x16/actions/kde6.png share/kde/apps/konqueror/konqueror.rc share/kde/apps/konqueror/pics/arrow_bottomleft.png share/kde/apps/konqueror/pics/arrow_bottomright.png @@ -1681,6 +1852,7 @@ share/kde/apps/konqueror/profiles/filemanagement share/kde/apps/konqueror/profiles/filepreview share/kde/apps/konqueror/profiles/midnightcommander share/kde/apps/konqueror/profiles/webbrowsing +share/kde/apps/konqueror/servicemenus/konsolehere.desktop share/kde/apps/konqueror/tiles/bluemorning.png share/kde/apps/konqueror/tiles/canvas.png share/kde/apps/konqueror/tiles/checker.png @@ -1691,6 +1863,7 @@ share/kde/apps/konqueror/tiles/noise.png share/kde/apps/konqueror/tiles/paper_flieder.png share/kde/apps/konqueror/tiles/punika_attack.png share/kde/apps/konqueror/tiles/redfiber.png +share/kde/apps/konsole/BlackOnLightColor.schema share/kde/apps/konsole/BlackOnLightYellow.schema share/kde/apps/konsole/BlackOnWhite.schema share/kde/apps/konsole/DarkPicture.schema @@ -1700,7 +1873,6 @@ share/kde/apps/konsole/GreenTint.schema share/kde/apps/konsole/GreenTint_MC.schema share/kde/apps/konsole/LightPicture.schema share/kde/apps/konsole/Linux.schema -share/kde/apps/konsole/Paper.schema share/kde/apps/konsole/README.KeyTab share/kde/apps/konsole/README.Schema share/kde/apps/konsole/Transparent.schema @@ -1714,6 +1886,10 @@ share/kde/apps/konsole/default.Schema share/kde/apps/konsole/linux.desktop share/kde/apps/konsole/linux.keytab share/kde/apps/konsole/mc.desktop +share/kde/apps/konsole/profiles/2shells +share/kde/apps/konsole/profiles/3shells +share/kde/apps/konsole/profiles/4shells +share/kde/apps/konsole/profiles/5shells share/kde/apps/konsole/screen.desktop share/kde/apps/konsole/shell.desktop share/kde/apps/konsole/su.desktop @@ -1797,6 +1973,7 @@ share/kde/apps/kwin/icewm-themes/titleIS.xpm share/kde/apps/kwin/icewm-themes/titleIT.xpm share/kde/apps/kwin/icewm.desktop share/kde/apps/kwin/kde1.desktop +share/kde/apps/kwin/keramik.desktop share/kde/apps/kwin/kstep.desktop share/kde/apps/kwin/laptop.desktop share/kde/apps/kwin/modernsystem.desktop @@ -1824,9 +2001,15 @@ share/kde/apps/naughtyapplet/pics/naughty-sad.png share/kde/config/kdesktop_custom_menu1 share/kde/config/kdesktop_custom_menu2 share/kde/config/kdm/README +share/kde/config/kdm/Xaccess share/kde/config/kdm/Xreset +share/kde/config/kdm/Xresources +share/kde/config/kdm/Xservers +share/kde/config/kdm/Xsession share/kde/config/kdm/Xsetup share/kde/config/kdm/Xstartup +share/kde/config/kdm/Xwilling +share/kde/config/kdm/backgroundrc share/kde/config/kdm/kdmrc share/kde/config/klipperrc share/kde/config/konqsidebartng.rc @@ -1835,418 +2018,561 @@ share/kde/config/kshorturifilterrc share/kde/config/kuriikwsfilterrc share/kde/config/kwritedrc share/kde/icons/Daemon.png -share/kde/icons/hicolor/16x16/actions/view_choose.png -share/kde/icons/hicolor/16x16/actions/view_detailed.png -share/kde/icons/hicolor/16x16/actions/view_icon.png -share/kde/icons/hicolor/16x16/actions/view_multicolumn.png -share/kde/icons/hicolor/16x16/actions/view_text.png -share/kde/icons/hicolor/16x16/actions/view_tree.png -share/kde/icons/hicolor/16x16/apps/access.png -share/kde/icons/hicolor/16x16/apps/acroread.png -share/kde/icons/hicolor/16x16/apps/agent.png -share/kde/icons/hicolor/16x16/apps/alevt.png -share/kde/icons/hicolor/16x16/apps/applixware.png -share/kde/icons/hicolor/16x16/apps/arts.png -share/kde/icons/hicolor/16x16/apps/background.png -share/kde/icons/hicolor/16x16/apps/bell.png -share/kde/icons/hicolor/16x16/apps/blender.png -share/kde/icons/hicolor/16x16/apps/cache.png -share/kde/icons/hicolor/16x16/apps/clock.png -share/kde/icons/hicolor/16x16/apps/colors.png -share/kde/icons/hicolor/16x16/apps/cookie.png -share/kde/icons/hicolor/16x16/apps/date.png -share/kde/icons/hicolor/16x16/apps/designer.png -share/kde/icons/hicolor/16x16/apps/dlgedit.png -share/kde/icons/hicolor/16x16/apps/emacs.png -share/kde/icons/hicolor/16x16/apps/email.png -share/kde/icons/hicolor/16x16/apps/energy.png -share/kde/icons/hicolor/16x16/apps/energy_star.png -share/kde/icons/hicolor/16x16/apps/enhanced_browsing.png -share/kde/icons/hicolor/16x16/apps/filetypes.png -share/kde/icons/hicolor/16x16/apps/fonts.png -share/kde/icons/hicolor/16x16/apps/gimp.png -share/kde/icons/hicolor/16x16/apps/go.png -share/kde/icons/hicolor/16x16/apps/gv.png -share/kde/icons/hicolor/16x16/apps/gvim.png -share/kde/icons/hicolor/16x16/apps/help_index.png -share/kde/icons/hicolor/16x16/apps/hwinfo.png -share/kde/icons/hicolor/16x16/apps/icons.png -share/kde/icons/hicolor/16x16/apps/iconthemes.png -share/kde/icons/hicolor/16x16/apps/input_devices_settings.png -share/kde/icons/hicolor/16x16/apps/kaddressbook.png -share/kde/icons/hicolor/16x16/apps/kappfinder.png -share/kde/icons/hicolor/16x16/apps/kate.png -share/kde/icons/hicolor/16x16/apps/kcmdevices.png -share/kde/icons/hicolor/16x16/apps/kcmkicker.png -share/kde/icons/hicolor/16x16/apps/kcmkwm.png -share/kde/icons/hicolor/16x16/apps/kcmmemory.png -share/kde/icons/hicolor/16x16/apps/kcmmidi.png -share/kde/icons/hicolor/16x16/apps/kcmpartitions.png -share/kde/icons/hicolor/16x16/apps/kcmpci.png -share/kde/icons/hicolor/16x16/apps/kcmprocessor.png -share/kde/icons/hicolor/16x16/apps/kcmscsi.png -share/kde/icons/hicolor/16x16/apps/kcmsound.png -share/kde/icons/hicolor/16x16/apps/kcmsystem.png -share/kde/icons/hicolor/16x16/apps/kcmx.png -share/kde/icons/hicolor/16x16/apps/kcontrol.png -share/kde/icons/hicolor/16x16/apps/kdeprintfax.png -share/kde/icons/hicolor/16x16/apps/kdisknav.png -share/kde/icons/hicolor/16x16/apps/kdmconfig.png -share/kde/icons/hicolor/16x16/apps/keditbookmarks.png -share/kde/icons/hicolor/16x16/apps/key_bindings.png -share/kde/icons/hicolor/16x16/apps/keyboard.png -share/kde/icons/hicolor/16x16/apps/keyboard_layout.png -share/kde/icons/hicolor/16x16/apps/kfind.png -share/kde/icons/hicolor/16x16/apps/kfm.png -share/kde/icons/hicolor/16x16/apps/kfm_home.png -share/kde/icons/hicolor/16x16/apps/khelpcenter.png -share/kde/icons/hicolor/16x16/apps/kicker.png -share/kde/icons/hicolor/16x16/apps/kjobviewer.png -share/kde/icons/hicolor/16x16/apps/klipper.png -share/kde/icons/hicolor/16x16/apps/kmenu.png -share/kde/icons/hicolor/16x16/apps/kmenuedit.png -share/kde/icons/hicolor/16x16/apps/knotify.png -share/kde/icons/hicolor/16x16/apps/konqueror.png -share/kde/icons/hicolor/16x16/apps/konsole.png -share/kde/icons/hicolor/16x16/apps/kpager.png -share/kde/icons/hicolor/16x16/apps/kpersonalizer.png -share/kde/icons/hicolor/16x16/apps/kscreensaver.png -share/kde/icons/hicolor/16x16/apps/ksysguard.png -share/kde/icons/hicolor/16x16/apps/kthememgr.png -share/kde/icons/hicolor/16x16/apps/ktip.png -share/kde/icons/hicolor/16x16/apps/kwin.png -share/kde/icons/hicolor/16x16/apps/kwrite.png -share/kde/icons/hicolor/16x16/apps/licq.png -share/kde/icons/hicolor/16x16/apps/locale.png -share/kde/icons/hicolor/16x16/apps/looknfeel.png -share/kde/icons/hicolor/16x16/apps/lyx.png -share/kde/icons/hicolor/16x16/apps/mathematica.png -share/kde/icons/hicolor/16x16/apps/mouse.png -share/kde/icons/hicolor/16x16/apps/mozilla.png -share/kde/icons/hicolor/16x16/apps/multimedia.png -share/kde/icons/hicolor/16x16/apps/nedit.png -share/kde/icons/hicolor/16x16/apps/netscape.png -share/kde/icons/hicolor/16x16/apps/opera.png -share/kde/icons/hicolor/16x16/apps/package_applications.png -share/kde/icons/hicolor/16x16/apps/package_development.png -share/kde/icons/hicolor/16x16/apps/package_editors.png -share/kde/icons/hicolor/16x16/apps/package_edutainment.png -share/kde/icons/hicolor/16x16/apps/package_favourite.png -share/kde/icons/hicolor/16x16/apps/package_games.png -share/kde/icons/hicolor/16x16/apps/package_games_arcade.png -share/kde/icons/hicolor/16x16/apps/package_games_board.png -share/kde/icons/hicolor/16x16/apps/package_games_card.png -share/kde/icons/hicolor/16x16/apps/package_games_strategy.png -share/kde/icons/hicolor/16x16/apps/package_graphics.png -share/kde/icons/hicolor/16x16/apps/package_multimedia.png -share/kde/icons/hicolor/16x16/apps/package_network.png -share/kde/icons/hicolor/16x16/apps/package_settings.png -share/kde/icons/hicolor/16x16/apps/package_system.png -share/kde/icons/hicolor/16x16/apps/package_toys.png -share/kde/icons/hicolor/16x16/apps/package_utilities.png -share/kde/icons/hicolor/16x16/apps/package_wordprocessing.png -share/kde/icons/hicolor/16x16/apps/panel.png -share/kde/icons/hicolor/16x16/apps/panel_settings.png -share/kde/icons/hicolor/16x16/apps/password.png -share/kde/icons/hicolor/16x16/apps/penguin.png -share/kde/icons/hicolor/16x16/apps/personal.png -share/kde/icons/hicolor/16x16/apps/plan.png -share/kde/icons/hicolor/16x16/apps/printmgr.png -share/kde/icons/hicolor/16x16/apps/proxy.png -share/kde/icons/hicolor/16x16/apps/pybliographic.png -share/kde/icons/hicolor/16x16/apps/realplayer.png -share/kde/icons/hicolor/16x16/apps/remote.png -share/kde/icons/hicolor/16x16/apps/samba.png -share/kde/icons/hicolor/16x16/apps/style.png -share/kde/icons/hicolor/16x16/apps/stylesheet.png -share/kde/icons/hicolor/16x16/apps/terminal.png -share/kde/icons/hicolor/16x16/apps/usb.png -share/kde/icons/hicolor/16x16/apps/wabi.png -share/kde/icons/hicolor/16x16/apps/window_list.png -share/kde/icons/hicolor/16x16/apps/winprops.png -share/kde/icons/hicolor/16x16/apps/wp.png -share/kde/icons/hicolor/16x16/apps/xcalc.png -share/kde/icons/hicolor/16x16/apps/xclipboard.png -share/kde/icons/hicolor/16x16/apps/xclock.png -share/kde/icons/hicolor/16x16/apps/xconsole.png -share/kde/icons/hicolor/16x16/apps/xedit.png -share/kde/icons/hicolor/16x16/apps/xemacs.png -share/kde/icons/hicolor/16x16/apps/xeyes.png -share/kde/icons/hicolor/16x16/apps/xfig.png -share/kde/icons/hicolor/16x16/apps/xfmail.png -share/kde/icons/hicolor/16x16/apps/xload.png -share/kde/icons/hicolor/16x16/apps/xmag.png -share/kde/icons/hicolor/16x16/apps/xmms.png -share/kde/icons/hicolor/16x16/apps/xosview.png -share/kde/icons/hicolor/16x16/apps/xpaint.png -share/kde/icons/hicolor/16x16/apps/xv.png -share/kde/icons/hicolor/16x16/devices/print_class.png -share/kde/icons/hicolor/16x16/devices/print_printer.png -share/kde/icons/hicolor/16x16/filesystems/file_important.png -share/kde/icons/hicolor/16x16/filesystems/folder_important.png -share/kde/icons/hicolor/16x16/filesystems/folder_print2.png -share/kde/icons/hicolor/22x22/actions/view_choose.png -share/kde/icons/hicolor/22x22/actions/view_detailed.png -share/kde/icons/hicolor/22x22/actions/view_icon.png -share/kde/icons/hicolor/22x22/actions/view_multicolumn.png -share/kde/icons/hicolor/22x22/actions/view_text.png -share/kde/icons/hicolor/22x22/actions/view_tree.png -share/kde/icons/hicolor/32x32/actions/view_choose.png -share/kde/icons/hicolor/32x32/actions/view_detailed.png -share/kde/icons/hicolor/32x32/actions/view_icon.png -share/kde/icons/hicolor/32x32/actions/view_multicolumn.png -share/kde/icons/hicolor/32x32/actions/view_text.png -share/kde/icons/hicolor/32x32/actions/view_tree.png -share/kde/icons/hicolor/32x32/apps/access.png -share/kde/icons/hicolor/32x32/apps/acroread.png -share/kde/icons/hicolor/32x32/apps/agent.png -share/kde/icons/hicolor/32x32/apps/alevt.png -share/kde/icons/hicolor/32x32/apps/applixware.png -share/kde/icons/hicolor/32x32/apps/background.png -share/kde/icons/hicolor/32x32/apps/bell.png -share/kde/icons/hicolor/32x32/apps/blender.png -share/kde/icons/hicolor/32x32/apps/cache.png -share/kde/icons/hicolor/32x32/apps/clanbomber.png -share/kde/icons/hicolor/32x32/apps/clock.png -share/kde/icons/hicolor/32x32/apps/colors.png -share/kde/icons/hicolor/32x32/apps/cookie.png -share/kde/icons/hicolor/32x32/apps/date.png -share/kde/icons/hicolor/32x32/apps/designer.png -share/kde/icons/hicolor/32x32/apps/dlgedit.png -share/kde/icons/hicolor/32x32/apps/emacs.png -share/kde/icons/hicolor/32x32/apps/email.png -share/kde/icons/hicolor/32x32/apps/energy.png -share/kde/icons/hicolor/32x32/apps/energy_star.png -share/kde/icons/hicolor/32x32/apps/enhanced_browsing.png -share/kde/icons/hicolor/32x32/apps/error.png -share/kde/icons/hicolor/32x32/apps/filetypes.png -share/kde/icons/hicolor/32x32/apps/fonts.png -share/kde/icons/hicolor/32x32/apps/gimp.png -share/kde/icons/hicolor/32x32/apps/go.png -share/kde/icons/hicolor/32x32/apps/gv.png -share/kde/icons/hicolor/32x32/apps/gvim.png -share/kde/icons/hicolor/32x32/apps/help_index.png -share/kde/icons/hicolor/32x32/apps/hwinfo.png -share/kde/icons/hicolor/32x32/apps/icons.png -share/kde/icons/hicolor/32x32/apps/iconthemes.png -share/kde/icons/hicolor/32x32/apps/input_devices_settings.png -share/kde/icons/hicolor/32x32/apps/kaddressbook.png -share/kde/icons/hicolor/32x32/apps/kappfinder.png -share/kde/icons/hicolor/32x32/apps/kate.png -share/kde/icons/hicolor/32x32/apps/kcmdevices.png -share/kde/icons/hicolor/32x32/apps/kcmdrkonqi.png -share/kde/icons/hicolor/32x32/apps/kcmfontinst.png -share/kde/icons/hicolor/32x32/apps/kcmkicker.png -share/kde/icons/hicolor/32x32/apps/kcmkwm.png -share/kde/icons/hicolor/32x32/apps/kcmmemory.png -share/kde/icons/hicolor/32x32/apps/kcmmidi.png -share/kde/icons/hicolor/32x32/apps/kcmpartitions.png -share/kde/icons/hicolor/32x32/apps/kcmpci.png -share/kde/icons/hicolor/32x32/apps/kcmprocessor.png -share/kde/icons/hicolor/32x32/apps/kcmscsi.png -share/kde/icons/hicolor/32x32/apps/kcmsound.png -share/kde/icons/hicolor/32x32/apps/kcmsystem.png -share/kde/icons/hicolor/32x32/apps/kcmx.png -share/kde/icons/hicolor/32x32/apps/kcontrol.png -share/kde/icons/hicolor/32x32/apps/kdeprintfax.png -share/kde/icons/hicolor/32x32/apps/kdisknav.png -share/kde/icons/hicolor/32x32/apps/kdmconfig.png -share/kde/icons/hicolor/32x32/apps/keditbookmarks.png -share/kde/icons/hicolor/32x32/apps/key_bindings.png -share/kde/icons/hicolor/32x32/apps/keyboard.png -share/kde/icons/hicolor/32x32/apps/keyboard_layout.png -share/kde/icons/hicolor/32x32/apps/kfind.png -share/kde/icons/hicolor/32x32/apps/kfm.png -share/kde/icons/hicolor/32x32/apps/kfm_home.png -share/kde/icons/hicolor/32x32/apps/khelpcenter.png -share/kde/icons/hicolor/32x32/apps/kjobviewer.png -share/kde/icons/hicolor/32x32/apps/klipper.png -share/kde/icons/hicolor/32x32/apps/kmenu.png -share/kde/icons/hicolor/32x32/apps/kmenuedit.png -share/kde/icons/hicolor/32x32/apps/knotify.png -share/kde/icons/hicolor/32x32/apps/konqueror.png -share/kde/icons/hicolor/32x32/apps/konsole.png -share/kde/icons/hicolor/32x32/apps/kpager.png -share/kde/icons/hicolor/32x32/apps/kpersonalizer.png -share/kde/icons/hicolor/32x32/apps/kscreensaver.png -share/kde/icons/hicolor/32x32/apps/ksysguard.png -share/kde/icons/hicolor/32x32/apps/kthememgr.png -share/kde/icons/hicolor/32x32/apps/ktip.png -share/kde/icons/hicolor/32x32/apps/kwin.png -share/kde/icons/hicolor/32x32/apps/kwrite.png -share/kde/icons/hicolor/32x32/apps/licq.png -share/kde/icons/hicolor/32x32/apps/locale.png -share/kde/icons/hicolor/32x32/apps/looknfeel.png -share/kde/icons/hicolor/32x32/apps/lyx.png -share/kde/icons/hicolor/32x32/apps/mathematica.png -share/kde/icons/hicolor/32x32/apps/mouse.png -share/kde/icons/hicolor/32x32/apps/multimedia.png -share/kde/icons/hicolor/32x32/apps/nedit.png -share/kde/icons/hicolor/32x32/apps/netscape.png -share/kde/icons/hicolor/32x32/apps/opera.png -share/kde/icons/hicolor/32x32/apps/package.png -share/kde/icons/hicolor/32x32/apps/package_applications.png -share/kde/icons/hicolor/32x32/apps/package_editors.png -share/kde/icons/hicolor/32x32/apps/package_edutainment.png -share/kde/icons/hicolor/32x32/apps/package_favourite.png -share/kde/icons/hicolor/32x32/apps/package_games.png -share/kde/icons/hicolor/32x32/apps/package_games_arcade.png -share/kde/icons/hicolor/32x32/apps/package_games_board.png -share/kde/icons/hicolor/32x32/apps/package_games_card.png -share/kde/icons/hicolor/32x32/apps/package_games_strategy.png -share/kde/icons/hicolor/32x32/apps/package_graphics.png -share/kde/icons/hicolor/32x32/apps/package_multimedia.png -share/kde/icons/hicolor/32x32/apps/package_network.png -share/kde/icons/hicolor/32x32/apps/package_settings.png -share/kde/icons/hicolor/32x32/apps/package_system.png -share/kde/icons/hicolor/32x32/apps/package_toys.png -share/kde/icons/hicolor/32x32/apps/package_utilities.png -share/kde/icons/hicolor/32x32/apps/package_wordprocessing.png -share/kde/icons/hicolor/32x32/apps/password.png -share/kde/icons/hicolor/32x32/apps/penguin.png -share/kde/icons/hicolor/32x32/apps/personal.png -share/kde/icons/hicolor/32x32/apps/plan.png -share/kde/icons/hicolor/32x32/apps/printmgr.png -share/kde/icons/hicolor/32x32/apps/proxy.png -share/kde/icons/hicolor/32x32/apps/pybliographic.png -share/kde/icons/hicolor/32x32/apps/pysol.png -share/kde/icons/hicolor/32x32/apps/realplayer.png -share/kde/icons/hicolor/32x32/apps/samba.png -share/kde/icons/hicolor/32x32/apps/style.png -share/kde/icons/hicolor/32x32/apps/stylesheet.png -share/kde/icons/hicolor/32x32/apps/terminal.png -share/kde/icons/hicolor/32x32/apps/usb.png -share/kde/icons/hicolor/32x32/apps/wabi.png -share/kde/icons/hicolor/32x32/apps/window_list.png -share/kde/icons/hicolor/32x32/apps/winprops.png -share/kde/icons/hicolor/32x32/apps/wp.png -share/kde/icons/hicolor/32x32/apps/x.png -share/kde/icons/hicolor/32x32/apps/xapp.png -share/kde/icons/hicolor/32x32/apps/xawtv.png -share/kde/icons/hicolor/32x32/apps/xcalc.png -share/kde/icons/hicolor/32x32/apps/xclipboard.png -share/kde/icons/hicolor/32x32/apps/xclock.png -share/kde/icons/hicolor/32x32/apps/xconsole.png -share/kde/icons/hicolor/32x32/apps/xedit.png -share/kde/icons/hicolor/32x32/apps/xemacs.png -share/kde/icons/hicolor/32x32/apps/xeyes.png -share/kde/icons/hicolor/32x32/apps/xfig.png -share/kde/icons/hicolor/32x32/apps/xfmail.png -share/kde/icons/hicolor/32x32/apps/xload.png -share/kde/icons/hicolor/32x32/apps/xmag.png -share/kde/icons/hicolor/32x32/apps/xmms.png -share/kde/icons/hicolor/32x32/apps/xosview.png -share/kde/icons/hicolor/32x32/apps/xpaint.png -share/kde/icons/hicolor/32x32/apps/xv.png -share/kde/icons/hicolor/32x32/devices/print_class.png -share/kde/icons/hicolor/32x32/devices/print_printer.png -share/kde/icons/hicolor/32x32/filesystems/file_important.png -share/kde/icons/hicolor/32x32/filesystems/folder_important.png -share/kde/icons/hicolor/32x32/filesystems/folder_print2.png -share/kde/icons/hicolor/48x48/apps/access.png -share/kde/icons/hicolor/48x48/apps/agent.png -share/kde/icons/hicolor/48x48/apps/bell.png -share/kde/icons/hicolor/48x48/apps/blender.png -share/kde/icons/hicolor/48x48/apps/clock.png -share/kde/icons/hicolor/48x48/apps/colors.png -share/kde/icons/hicolor/48x48/apps/cookie.png -share/kde/icons/hicolor/48x48/apps/date.png -share/kde/icons/hicolor/48x48/apps/designer.png -share/kde/icons/hicolor/48x48/apps/emacs.png -share/kde/icons/hicolor/48x48/apps/email.png -share/kde/icons/hicolor/48x48/apps/energy.png -share/kde/icons/hicolor/48x48/apps/energy_star.png -share/kde/icons/hicolor/48x48/apps/enhanced_browsing.png -share/kde/icons/hicolor/48x48/apps/filetypes.png -share/kde/icons/hicolor/48x48/apps/fonts.png -share/kde/icons/hicolor/48x48/apps/gimp.png -share/kde/icons/hicolor/48x48/apps/go.png -share/kde/icons/hicolor/48x48/apps/gvim.png -share/kde/icons/hicolor/48x48/apps/help_index.png -share/kde/icons/hicolor/48x48/apps/hwinfo.png -share/kde/icons/hicolor/48x48/apps/icons.png -share/kde/icons/hicolor/48x48/apps/iconthemes.png -share/kde/icons/hicolor/48x48/apps/input_devices_settings.png -share/kde/icons/hicolor/48x48/apps/kaddressbook.png -share/kde/icons/hicolor/48x48/apps/kappfinder.png -share/kde/icons/hicolor/48x48/apps/kate.png -share/kde/icons/hicolor/48x48/apps/kcmdevices.png -share/kde/icons/hicolor/48x48/apps/kcmdrkonqi.png -share/kde/icons/hicolor/48x48/apps/kcmfontinst.png -share/kde/icons/hicolor/48x48/apps/kcmkwm.png -share/kde/icons/hicolor/48x48/apps/kcmmemory.png -share/kde/icons/hicolor/48x48/apps/kcmmidi.png -share/kde/icons/hicolor/48x48/apps/kcmpartitions.png -share/kde/icons/hicolor/48x48/apps/kcmpci.png -share/kde/icons/hicolor/48x48/apps/kcmprocessor.png -share/kde/icons/hicolor/48x48/apps/kcmscsi.png -share/kde/icons/hicolor/48x48/apps/kcmsystem.png -share/kde/icons/hicolor/48x48/apps/kcontrol.png -share/kde/icons/hicolor/48x48/apps/kdisknav.png -share/kde/icons/hicolor/48x48/apps/kdmconfig.png -share/kde/icons/hicolor/48x48/apps/key_bindings.png -share/kde/icons/hicolor/48x48/apps/keyboard.png -share/kde/icons/hicolor/48x48/apps/keyboard_layout.png -share/kde/icons/hicolor/48x48/apps/kfind.png -share/kde/icons/hicolor/48x48/apps/kfm.png -share/kde/icons/hicolor/48x48/apps/kfm_home.png -share/kde/icons/hicolor/48x48/apps/khelpcenter.png -share/kde/icons/hicolor/48x48/apps/klipper.png -share/kde/icons/hicolor/48x48/apps/kmenu.png -share/kde/icons/hicolor/48x48/apps/kmenuedit.png -share/kde/icons/hicolor/48x48/apps/knotify.png -share/kde/icons/hicolor/48x48/apps/konqueror.png -share/kde/icons/hicolor/48x48/apps/konsole.png -share/kde/icons/hicolor/48x48/apps/kpager.png -share/kde/icons/hicolor/48x48/apps/kscreensaver.png -share/kde/icons/hicolor/48x48/apps/ksysguard.png -share/kde/icons/hicolor/48x48/apps/kthememgr.png -share/kde/icons/hicolor/48x48/apps/ktip.png -share/kde/icons/hicolor/48x48/apps/kwin.png -share/kde/icons/hicolor/48x48/apps/kwrite.png -share/kde/icons/hicolor/48x48/apps/licq.png -share/kde/icons/hicolor/48x48/apps/locale.png -share/kde/icons/hicolor/48x48/apps/looknfeel.png -share/kde/icons/hicolor/48x48/apps/mouse.png -share/kde/icons/hicolor/48x48/apps/mozilla.png -share/kde/icons/hicolor/48x48/apps/multimedia.png -share/kde/icons/hicolor/48x48/apps/netscape.png -share/kde/icons/hicolor/48x48/apps/opera.png -share/kde/icons/hicolor/48x48/apps/package.png -share/kde/icons/hicolor/48x48/apps/package_applications.png -share/kde/icons/hicolor/48x48/apps/package_editors.png -share/kde/icons/hicolor/48x48/apps/package_edutainment.png -share/kde/icons/hicolor/48x48/apps/package_favourite.png -share/kde/icons/hicolor/48x48/apps/package_games.png -share/kde/icons/hicolor/48x48/apps/package_games_arcade.png -share/kde/icons/hicolor/48x48/apps/package_games_board.png -share/kde/icons/hicolor/48x48/apps/package_games_card.png -share/kde/icons/hicolor/48x48/apps/package_games_strategy.png -share/kde/icons/hicolor/48x48/apps/package_graphics.png -share/kde/icons/hicolor/48x48/apps/package_multimedia.png -share/kde/icons/hicolor/48x48/apps/package_network.png -share/kde/icons/hicolor/48x48/apps/package_settings.png -share/kde/icons/hicolor/48x48/apps/package_system.png -share/kde/icons/hicolor/48x48/apps/package_toys.png -share/kde/icons/hicolor/48x48/apps/package_utilities.png -share/kde/icons/hicolor/48x48/apps/package_wordprocessing.png -share/kde/icons/hicolor/48x48/apps/password.png -share/kde/icons/hicolor/48x48/apps/personal.png -share/kde/icons/hicolor/48x48/apps/proxy.png -share/kde/icons/hicolor/48x48/apps/remote.png -share/kde/icons/hicolor/48x48/apps/samba.png -share/kde/icons/hicolor/48x48/apps/style.png -share/kde/icons/hicolor/48x48/apps/stylesheet.png -share/kde/icons/hicolor/48x48/apps/terminal.png -share/kde/icons/hicolor/48x48/apps/usb.png -share/kde/icons/hicolor/48x48/apps/window_list.png -share/kde/icons/hicolor/48x48/apps/winprops.png -share/kde/icons/hicolor/48x48/apps/xedit.png -share/kde/icons/hicolor/48x48/apps/xemacs.png -share/kde/icons/hicolor/48x48/apps/xmag.png -share/kde/icons/hicolor/48x48/apps/xv.png -share/kde/icons/hicolor/48x48/filesystems/file_important.png -share/kde/icons/hicolor/48x48/filesystems/folder_important.png +share/kde/icons/crystalsvg/128x128/apps/access.png +share/kde/icons/crystalsvg/128x128/apps/acroread.png +share/kde/icons/crystalsvg/128x128/apps/applixware.png +share/kde/icons/crystalsvg/128x128/apps/background.png +share/kde/icons/crystalsvg/128x128/apps/cache.png +share/kde/icons/crystalsvg/128x128/apps/clanbomber.png +share/kde/icons/crystalsvg/128x128/apps/clock.png +share/kde/icons/crystalsvg/128x128/apps/email.png +share/kde/icons/crystalsvg/128x128/apps/filetypes.png +share/kde/icons/crystalsvg/128x128/apps/gimp.png +share/kde/icons/crystalsvg/128x128/apps/help_index.png +share/kde/icons/crystalsvg/128x128/apps/hwinfo.png +share/kde/icons/crystalsvg/128x128/apps/kappfinder.png +share/kde/icons/crystalsvg/128x128/apps/kate.png +share/kde/icons/crystalsvg/128x128/apps/kcmdevices.png +share/kde/icons/crystalsvg/128x128/apps/kcmmemory.png +share/kde/icons/crystalsvg/128x128/apps/kcmpartitions.png +share/kde/icons/crystalsvg/128x128/apps/kcmpci.png +share/kde/icons/crystalsvg/128x128/apps/kcontrol.png +share/kde/icons/crystalsvg/128x128/apps/kdmconfig.png +share/kde/icons/crystalsvg/128x128/apps/keditbookmarks.png +share/kde/icons/crystalsvg/128x128/apps/kfm_home.png +share/kde/icons/crystalsvg/128x128/apps/khelpcenter.png +share/kde/icons/crystalsvg/128x128/apps/klipper.png +share/kde/icons/crystalsvg/128x128/apps/konqueror.png +share/kde/icons/crystalsvg/128x128/apps/kscreensaver.png +share/kde/icons/crystalsvg/128x128/apps/ksysguard.png +share/kde/icons/crystalsvg/128x128/apps/kthememgr.png +share/kde/icons/crystalsvg/128x128/apps/ktip.png +share/kde/icons/crystalsvg/128x128/apps/kwrite.png +share/kde/icons/crystalsvg/128x128/apps/licq.png +share/kde/icons/crystalsvg/128x128/apps/linuxconf.png +share/kde/icons/crystalsvg/128x128/apps/looknfeel.png +share/kde/icons/crystalsvg/128x128/apps/mozilla.png +share/kde/icons/crystalsvg/128x128/apps/multimedia.png +share/kde/icons/crystalsvg/128x128/apps/netscape.png +share/kde/icons/crystalsvg/128x128/apps/package.png +share/kde/icons/crystalsvg/128x128/apps/package_applications.png +share/kde/icons/crystalsvg/128x128/apps/package_favourite.png +share/kde/icons/crystalsvg/128x128/apps/package_games.png +share/kde/icons/crystalsvg/128x128/apps/package_multimedia.png +share/kde/icons/crystalsvg/128x128/apps/package_network.png +share/kde/icons/crystalsvg/128x128/apps/package_settings.png +share/kde/icons/crystalsvg/128x128/apps/package_toys.png +share/kde/icons/crystalsvg/128x128/apps/package_utilities.png +share/kde/icons/crystalsvg/128x128/apps/password.png +share/kde/icons/crystalsvg/128x128/apps/penguin.png +share/kde/icons/crystalsvg/128x128/apps/personal.png +share/kde/icons/crystalsvg/128x128/apps/phppg.png +share/kde/icons/crystalsvg/128x128/apps/pysol.png +share/kde/icons/crystalsvg/128x128/apps/staroffice.png +share/kde/icons/crystalsvg/128x128/apps/terminal.png +share/kde/icons/crystalsvg/128x128/apps/tux.png +share/kde/icons/crystalsvg/128x128/apps/wp.png +share/kde/icons/crystalsvg/128x128/apps/xclock.png +share/kde/icons/crystalsvg/128x128/apps/xfmail.png +share/kde/icons/crystalsvg/128x128/apps/xmag.png +share/kde/icons/crystalsvg/16x16/apps/access.png +share/kde/icons/crystalsvg/16x16/apps/acroread.png +share/kde/icons/crystalsvg/16x16/apps/agent.png +share/kde/icons/crystalsvg/16x16/apps/alevt.png +share/kde/icons/crystalsvg/16x16/apps/applixware.png +share/kde/icons/crystalsvg/16x16/apps/arts.png +share/kde/icons/crystalsvg/16x16/apps/background.png +share/kde/icons/crystalsvg/16x16/apps/bell.png +share/kde/icons/crystalsvg/16x16/apps/blender.png +share/kde/icons/crystalsvg/16x16/apps/cache.png +share/kde/icons/crystalsvg/16x16/apps/clanbomber.png +share/kde/icons/crystalsvg/16x16/apps/clock.png +share/kde/icons/crystalsvg/16x16/apps/colors.png +share/kde/icons/crystalsvg/16x16/apps/cookie.png +share/kde/icons/crystalsvg/16x16/apps/date.png +share/kde/icons/crystalsvg/16x16/apps/designer.png +share/kde/icons/crystalsvg/16x16/apps/dlgedit.png +share/kde/icons/crystalsvg/16x16/apps/emacs.png +share/kde/icons/crystalsvg/16x16/apps/email.png +share/kde/icons/crystalsvg/16x16/apps/energy.png +share/kde/icons/crystalsvg/16x16/apps/energy_star.png +share/kde/icons/crystalsvg/16x16/apps/enhanced_browsing.png +share/kde/icons/crystalsvg/16x16/apps/filetypes.png +share/kde/icons/crystalsvg/16x16/apps/fonts.png +share/kde/icons/crystalsvg/16x16/apps/gimp.png +share/kde/icons/crystalsvg/16x16/apps/gnome/apps.png +share/kde/icons/crystalsvg/16x16/apps/go.png +share/kde/icons/crystalsvg/16x16/apps/gv.png +share/kde/icons/crystalsvg/16x16/apps/gvim.png +share/kde/icons/crystalsvg/16x16/apps/help_index.png +share/kde/icons/crystalsvg/16x16/apps/hwinfo.png +share/kde/icons/crystalsvg/16x16/apps/icons.png +share/kde/icons/crystalsvg/16x16/apps/iconthemes.png +share/kde/icons/crystalsvg/16x16/apps/input_devices_settings.png +share/kde/icons/crystalsvg/16x16/apps/kappfinder.png +share/kde/icons/crystalsvg/16x16/apps/kate.png +share/kde/icons/crystalsvg/16x16/apps/kcmdevices.png +share/kde/icons/crystalsvg/16x16/apps/kcmkicker.png +share/kde/icons/crystalsvg/16x16/apps/kcmkwm.png +share/kde/icons/crystalsvg/16x16/apps/kcmmemory.png +share/kde/icons/crystalsvg/16x16/apps/kcmmidi.png +share/kde/icons/crystalsvg/16x16/apps/kcmpartitions.png +share/kde/icons/crystalsvg/16x16/apps/kcmpci.png +share/kde/icons/crystalsvg/16x16/apps/kcmprocessor.png +share/kde/icons/crystalsvg/16x16/apps/kcmscsi.png +share/kde/icons/crystalsvg/16x16/apps/kcmsound.png +share/kde/icons/crystalsvg/16x16/apps/kcmsystem.png +share/kde/icons/crystalsvg/16x16/apps/kcmx.png +share/kde/icons/crystalsvg/16x16/apps/kcontrol.png +share/kde/icons/crystalsvg/16x16/apps/kdeprintfax.png +share/kde/icons/crystalsvg/16x16/apps/kdisknav.png +share/kde/icons/crystalsvg/16x16/apps/kdmconfig.png +share/kde/icons/crystalsvg/16x16/apps/keditbookmarks.png +share/kde/icons/crystalsvg/16x16/apps/key_bindings.png +share/kde/icons/crystalsvg/16x16/apps/keyboard.png +share/kde/icons/crystalsvg/16x16/apps/keyboard_layout.png +share/kde/icons/crystalsvg/16x16/apps/kfind.png +share/kde/icons/crystalsvg/16x16/apps/kfm.png +share/kde/icons/crystalsvg/16x16/apps/kfm_home.png +share/kde/icons/crystalsvg/16x16/apps/khelpcenter.png +share/kde/icons/crystalsvg/16x16/apps/kicker.png +share/kde/icons/crystalsvg/16x16/apps/kjobviewer.png +share/kde/icons/crystalsvg/16x16/apps/klipper.png +share/kde/icons/crystalsvg/16x16/apps/kmenu.png +share/kde/icons/crystalsvg/16x16/apps/kmenuedit.png +share/kde/icons/crystalsvg/16x16/apps/knotify.png +share/kde/icons/crystalsvg/16x16/apps/konqueror.png +share/kde/icons/crystalsvg/16x16/apps/konsole.png +share/kde/icons/crystalsvg/16x16/apps/kpager.png +share/kde/icons/crystalsvg/16x16/apps/kpersonalizer.png +share/kde/icons/crystalsvg/16x16/apps/kscreensaver.png +share/kde/icons/crystalsvg/16x16/apps/ksysguard.png +share/kde/icons/crystalsvg/16x16/apps/kthememgr.png +share/kde/icons/crystalsvg/16x16/apps/ktip.png +share/kde/icons/crystalsvg/16x16/apps/kvirc.png +share/kde/icons/crystalsvg/16x16/apps/kwin.png +share/kde/icons/crystalsvg/16x16/apps/kwrite.png +share/kde/icons/crystalsvg/16x16/apps/kxkb.png +share/kde/icons/crystalsvg/16x16/apps/licq.png +share/kde/icons/crystalsvg/16x16/apps/linuxconf.png +share/kde/icons/crystalsvg/16x16/apps/locale.png +share/kde/icons/crystalsvg/16x16/apps/looknfeel.png +share/kde/icons/crystalsvg/16x16/apps/lyx.png +share/kde/icons/crystalsvg/16x16/apps/mac.png +share/kde/icons/crystalsvg/16x16/apps/mathematica.png +share/kde/icons/crystalsvg/16x16/apps/mozilla.png +share/kde/icons/crystalsvg/16x16/apps/mozilla/m.png +share/kde/icons/crystalsvg/16x16/apps/mozilla/mail.png +share/kde/icons/crystalsvg/16x16/apps/multimedia.png +share/kde/icons/crystalsvg/16x16/apps/nedit.png +share/kde/icons/crystalsvg/16x16/apps/netscape.png +share/kde/icons/crystalsvg/16x16/apps/opera.png +share/kde/icons/crystalsvg/16x16/apps/package.png +share/kde/icons/crystalsvg/16x16/apps/package_application.png +share/kde/icons/crystalsvg/16x16/apps/package_applications.png +share/kde/icons/crystalsvg/16x16/apps/package_development.png +share/kde/icons/crystalsvg/16x16/apps/package_editors.png +share/kde/icons/crystalsvg/16x16/apps/package_edutainment.png +share/kde/icons/crystalsvg/16x16/apps/package_favourite.png +share/kde/icons/crystalsvg/16x16/apps/package_games.png +share/kde/icons/crystalsvg/16x16/apps/package_games_arcade.png +share/kde/icons/crystalsvg/16x16/apps/package_games_board.png +share/kde/icons/crystalsvg/16x16/apps/package_games_card.png +share/kde/icons/crystalsvg/16x16/apps/package_games_strategy.png +share/kde/icons/crystalsvg/16x16/apps/package_graphics.png +share/kde/icons/crystalsvg/16x16/apps/package_multimedia.png +share/kde/icons/crystalsvg/16x16/apps/package_network.png +share/kde/icons/crystalsvg/16x16/apps/package_settings.png +share/kde/icons/crystalsvg/16x16/apps/package_system.png +share/kde/icons/crystalsvg/16x16/apps/package_toys.png +share/kde/icons/crystalsvg/16x16/apps/package_utilities.png +share/kde/icons/crystalsvg/16x16/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/16x16/apps/panel.png +share/kde/icons/crystalsvg/16x16/apps/panel_settings.png +share/kde/icons/crystalsvg/16x16/apps/password.png +share/kde/icons/crystalsvg/16x16/apps/penguin.png +share/kde/icons/crystalsvg/16x16/apps/personal.png +share/kde/icons/crystalsvg/16x16/apps/phppg.png +share/kde/icons/crystalsvg/16x16/apps/plan.png +share/kde/icons/crystalsvg/16x16/apps/printmgr.png +share/kde/icons/crystalsvg/16x16/apps/proxy.png +share/kde/icons/crystalsvg/16x16/apps/pybliographic.png +share/kde/icons/crystalsvg/16x16/apps/realplayer.png +share/kde/icons/crystalsvg/16x16/apps/remote.png +share/kde/icons/crystalsvg/16x16/apps/samba.png +share/kde/icons/crystalsvg/16x16/apps/soffice.png +share/kde/icons/crystalsvg/16x16/apps/style.png +share/kde/icons/crystalsvg/16x16/apps/stylesheet.png +share/kde/icons/crystalsvg/16x16/apps/terminal.png +share/kde/icons/crystalsvg/16x16/apps/tux.png +share/kde/icons/crystalsvg/16x16/apps/usb.png +share/kde/icons/crystalsvg/16x16/apps/vnc.png +share/kde/icons/crystalsvg/16x16/apps/wabi.png +share/kde/icons/crystalsvg/16x16/apps/window_list.png +share/kde/icons/crystalsvg/16x16/apps/winprops.png +share/kde/icons/crystalsvg/16x16/apps/wp.png +share/kde/icons/crystalsvg/16x16/apps/xcalc.png +share/kde/icons/crystalsvg/16x16/apps/xchat.png +share/kde/icons/crystalsvg/16x16/apps/xclipboard.png +share/kde/icons/crystalsvg/16x16/apps/xclock.png +share/kde/icons/crystalsvg/16x16/apps/xconsole.png +share/kde/icons/crystalsvg/16x16/apps/xedit.png +share/kde/icons/crystalsvg/16x16/apps/xemacs.png +share/kde/icons/crystalsvg/16x16/apps/xeyes.png +share/kde/icons/crystalsvg/16x16/apps/xfig.png +share/kde/icons/crystalsvg/16x16/apps/xfmail.png +share/kde/icons/crystalsvg/16x16/apps/xload.png +share/kde/icons/crystalsvg/16x16/apps/xmag.png +share/kde/icons/crystalsvg/16x16/apps/xmms.png +share/kde/icons/crystalsvg/16x16/apps/xosview.png +share/kde/icons/crystalsvg/16x16/apps/xpaint.png +share/kde/icons/crystalsvg/16x16/apps/xv.png +share/kde/icons/crystalsvg/16x16/devices/print_printer.png +share/kde/icons/crystalsvg/16x16/filesystems/folder_print2.png +share/kde/icons/crystalsvg/22x22/apps/kvirc.png +share/kde/icons/crystalsvg/22x22/apps/nedit.png +share/kde/icons/crystalsvg/32x32/apps/access.png +share/kde/icons/crystalsvg/32x32/apps/acroread.png +share/kde/icons/crystalsvg/32x32/apps/agent.png +share/kde/icons/crystalsvg/32x32/apps/alevt.png +share/kde/icons/crystalsvg/32x32/apps/applixware.png +share/kde/icons/crystalsvg/32x32/apps/background.png +share/kde/icons/crystalsvg/32x32/apps/bell.png +share/kde/icons/crystalsvg/32x32/apps/blender.png +share/kde/icons/crystalsvg/32x32/apps/cache.png +share/kde/icons/crystalsvg/32x32/apps/clanbomber.png +share/kde/icons/crystalsvg/32x32/apps/clock.png +share/kde/icons/crystalsvg/32x32/apps/colors.png +share/kde/icons/crystalsvg/32x32/apps/cookie.png +share/kde/icons/crystalsvg/32x32/apps/date.png +share/kde/icons/crystalsvg/32x32/apps/designer.png +share/kde/icons/crystalsvg/32x32/apps/dlgedit.png +share/kde/icons/crystalsvg/32x32/apps/emacs.png +share/kde/icons/crystalsvg/32x32/apps/email.png +share/kde/icons/crystalsvg/32x32/apps/energy.png +share/kde/icons/crystalsvg/32x32/apps/energy_star.png +share/kde/icons/crystalsvg/32x32/apps/enhanced_browsing.png +share/kde/icons/crystalsvg/32x32/apps/error.png +share/kde/icons/crystalsvg/32x32/apps/filetypes.png +share/kde/icons/crystalsvg/32x32/apps/fonts.png +share/kde/icons/crystalsvg/32x32/apps/galeon.png +share/kde/icons/crystalsvg/32x32/apps/gimp.png +share/kde/icons/crystalsvg/32x32/apps/gnome/app.png +share/kde/icons/crystalsvg/32x32/apps/go.png +share/kde/icons/crystalsvg/32x32/apps/gv.png +share/kde/icons/crystalsvg/32x32/apps/gvim.png +share/kde/icons/crystalsvg/32x32/apps/help_index.png +share/kde/icons/crystalsvg/32x32/apps/hwinfo.png +share/kde/icons/crystalsvg/32x32/apps/icons.png +share/kde/icons/crystalsvg/32x32/apps/iconthemes.png +share/kde/icons/crystalsvg/32x32/apps/input_devices_settings.png +share/kde/icons/crystalsvg/32x32/apps/kappfinder.png +share/kde/icons/crystalsvg/32x32/apps/kate.png +share/kde/icons/crystalsvg/32x32/apps/kcmdevices.png +share/kde/icons/crystalsvg/32x32/apps/kcmdrkonqi.png +share/kde/icons/crystalsvg/32x32/apps/kcmfontinst.png +share/kde/icons/crystalsvg/32x32/apps/kcmkicker.png +share/kde/icons/crystalsvg/32x32/apps/kcmkwm.png +share/kde/icons/crystalsvg/32x32/apps/kcmmemory.png +share/kde/icons/crystalsvg/32x32/apps/kcmmidi.png +share/kde/icons/crystalsvg/32x32/apps/kcmpartitions.png +share/kde/icons/crystalsvg/32x32/apps/kcmpci.png +share/kde/icons/crystalsvg/32x32/apps/kcmprocessor.png +share/kde/icons/crystalsvg/32x32/apps/kcmscsi.png +share/kde/icons/crystalsvg/32x32/apps/kcmsound.png +share/kde/icons/crystalsvg/32x32/apps/kcmsystem.png +share/kde/icons/crystalsvg/32x32/apps/kcmx.png +share/kde/icons/crystalsvg/32x32/apps/kcontrol.png +share/kde/icons/crystalsvg/32x32/apps/kdeprintfax.png +share/kde/icons/crystalsvg/32x32/apps/kdisknav.png +share/kde/icons/crystalsvg/32x32/apps/kdmconfig.png +share/kde/icons/crystalsvg/32x32/apps/keditbookmarks.png +share/kde/icons/crystalsvg/32x32/apps/key_bindings.png +share/kde/icons/crystalsvg/32x32/apps/keyboard.png +share/kde/icons/crystalsvg/32x32/apps/keyboard_layout.png +share/kde/icons/crystalsvg/32x32/apps/kfind.png +share/kde/icons/crystalsvg/32x32/apps/kfm.png +share/kde/icons/crystalsvg/32x32/apps/kfm_home.png +share/kde/icons/crystalsvg/32x32/apps/khelpcenter.png +share/kde/icons/crystalsvg/32x32/apps/kjobviewer.png +share/kde/icons/crystalsvg/32x32/apps/klipper.png +share/kde/icons/crystalsvg/32x32/apps/kmenu.png +share/kde/icons/crystalsvg/32x32/apps/kmenuedit.png +share/kde/icons/crystalsvg/32x32/apps/knotify.png +share/kde/icons/crystalsvg/32x32/apps/konqueror.png +share/kde/icons/crystalsvg/32x32/apps/konsole.png +share/kde/icons/crystalsvg/32x32/apps/kpager.png +share/kde/icons/crystalsvg/32x32/apps/kpersonalizer.png +share/kde/icons/crystalsvg/32x32/apps/kscreensaver.png +share/kde/icons/crystalsvg/32x32/apps/ksysguard.png +share/kde/icons/crystalsvg/32x32/apps/kthememgr.png +share/kde/icons/crystalsvg/32x32/apps/ktip.png +share/kde/icons/crystalsvg/32x32/apps/kvirc.png +share/kde/icons/crystalsvg/32x32/apps/kwin.png +share/kde/icons/crystalsvg/32x32/apps/kwrite.png +share/kde/icons/crystalsvg/32x32/apps/kxkb.png +share/kde/icons/crystalsvg/32x32/apps/licq.png +share/kde/icons/crystalsvg/32x32/apps/linuxconf.png +share/kde/icons/crystalsvg/32x32/apps/locale.png +share/kde/icons/crystalsvg/32x32/apps/looknfeel.png +share/kde/icons/crystalsvg/32x32/apps/lyx.png +share/kde/icons/crystalsvg/32x32/apps/mac.png +share/kde/icons/crystalsvg/32x32/apps/mathematica.png +share/kde/icons/crystalsvg/32x32/apps/mozilla.png +share/kde/icons/crystalsvg/32x32/apps/mozilla/m.png +share/kde/icons/crystalsvg/32x32/apps/mozilla/mail.png +share/kde/icons/crystalsvg/32x32/apps/multimedia.png +share/kde/icons/crystalsvg/32x32/apps/nedit.png +share/kde/icons/crystalsvg/32x32/apps/netscape.png +share/kde/icons/crystalsvg/32x32/apps/opera.png +share/kde/icons/crystalsvg/32x32/apps/package.png +share/kde/icons/crystalsvg/32x32/apps/package_applications.png +share/kde/icons/crystalsvg/32x32/apps/package_editors.png +share/kde/icons/crystalsvg/32x32/apps/package_edutainment.png +share/kde/icons/crystalsvg/32x32/apps/package_favourite.png +share/kde/icons/crystalsvg/32x32/apps/package_games.png +share/kde/icons/crystalsvg/32x32/apps/package_games_arcade.png +share/kde/icons/crystalsvg/32x32/apps/package_games_board.png +share/kde/icons/crystalsvg/32x32/apps/package_games_card.png +share/kde/icons/crystalsvg/32x32/apps/package_games_strategy.png +share/kde/icons/crystalsvg/32x32/apps/package_graphics.png +share/kde/icons/crystalsvg/32x32/apps/package_multimedia.png +share/kde/icons/crystalsvg/32x32/apps/package_network.png +share/kde/icons/crystalsvg/32x32/apps/package_settings.png +share/kde/icons/crystalsvg/32x32/apps/package_system.png +share/kde/icons/crystalsvg/32x32/apps/package_toys.png +share/kde/icons/crystalsvg/32x32/apps/package_utilities.png +share/kde/icons/crystalsvg/32x32/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/32x32/apps/password.png +share/kde/icons/crystalsvg/32x32/apps/penguin.png +share/kde/icons/crystalsvg/32x32/apps/personal.png +share/kde/icons/crystalsvg/32x32/apps/phppg.png +share/kde/icons/crystalsvg/32x32/apps/plan.png +share/kde/icons/crystalsvg/32x32/apps/printmgr.png +share/kde/icons/crystalsvg/32x32/apps/proxy.png +share/kde/icons/crystalsvg/32x32/apps/pybliographic.png +share/kde/icons/crystalsvg/32x32/apps/pysol.png +share/kde/icons/crystalsvg/32x32/apps/realplayer.png +share/kde/icons/crystalsvg/32x32/apps/samba.png +share/kde/icons/crystalsvg/32x32/apps/soffice.png +share/kde/icons/crystalsvg/32x32/apps/style.png +share/kde/icons/crystalsvg/32x32/apps/stylesheet.png +share/kde/icons/crystalsvg/32x32/apps/terminal.png +share/kde/icons/crystalsvg/32x32/apps/tux.png +share/kde/icons/crystalsvg/32x32/apps/usb.png +share/kde/icons/crystalsvg/32x32/apps/vnc.png +share/kde/icons/crystalsvg/32x32/apps/wabi.png +share/kde/icons/crystalsvg/32x32/apps/window_list.png +share/kde/icons/crystalsvg/32x32/apps/winprops.png +share/kde/icons/crystalsvg/32x32/apps/wp.png +share/kde/icons/crystalsvg/32x32/apps/x.png +share/kde/icons/crystalsvg/32x32/apps/xapp.png +share/kde/icons/crystalsvg/32x32/apps/xawtv.png +share/kde/icons/crystalsvg/32x32/apps/xcalc.png +share/kde/icons/crystalsvg/32x32/apps/xclipboard.png +share/kde/icons/crystalsvg/32x32/apps/xclock.png +share/kde/icons/crystalsvg/32x32/apps/xconsole.png +share/kde/icons/crystalsvg/32x32/apps/xedit.png +share/kde/icons/crystalsvg/32x32/apps/xemacs.png +share/kde/icons/crystalsvg/32x32/apps/xeyes.png +share/kde/icons/crystalsvg/32x32/apps/xfig.png +share/kde/icons/crystalsvg/32x32/apps/xfmail.png +share/kde/icons/crystalsvg/32x32/apps/xload.png +share/kde/icons/crystalsvg/32x32/apps/xmag.png +share/kde/icons/crystalsvg/32x32/apps/xmms.png +share/kde/icons/crystalsvg/32x32/apps/xosview.png +share/kde/icons/crystalsvg/32x32/apps/xpaint.png +share/kde/icons/crystalsvg/32x32/apps/xv.png +share/kde/icons/crystalsvg/32x32/devices/print_printer.png +share/kde/icons/crystalsvg/32x32/filesystems/folder_print2.png +share/kde/icons/crystalsvg/48x48/apps/access.png +share/kde/icons/crystalsvg/48x48/apps/acroread.png +share/kde/icons/crystalsvg/48x48/apps/agent.png +share/kde/icons/crystalsvg/48x48/apps/applixware.png +share/kde/icons/crystalsvg/48x48/apps/background.png +share/kde/icons/crystalsvg/48x48/apps/bell.png +share/kde/icons/crystalsvg/48x48/apps/blender.png +share/kde/icons/crystalsvg/48x48/apps/cache.png +share/kde/icons/crystalsvg/48x48/apps/clanbomber.png +share/kde/icons/crystalsvg/48x48/apps/clock.png +share/kde/icons/crystalsvg/48x48/apps/colors.png +share/kde/icons/crystalsvg/48x48/apps/cookie.png +share/kde/icons/crystalsvg/48x48/apps/date.png +share/kde/icons/crystalsvg/48x48/apps/designer.png +share/kde/icons/crystalsvg/48x48/apps/emacs.png +share/kde/icons/crystalsvg/48x48/apps/email.png +share/kde/icons/crystalsvg/48x48/apps/energy.png +share/kde/icons/crystalsvg/48x48/apps/energy_star.png +share/kde/icons/crystalsvg/48x48/apps/enhanced_browsing.png +share/kde/icons/crystalsvg/48x48/apps/filetypes.png +share/kde/icons/crystalsvg/48x48/apps/fonts.png +share/kde/icons/crystalsvg/48x48/apps/galeon.png +share/kde/icons/crystalsvg/48x48/apps/gimp.png +share/kde/icons/crystalsvg/48x48/apps/gnome/apps.png +share/kde/icons/crystalsvg/48x48/apps/go.png +share/kde/icons/crystalsvg/48x48/apps/gvim.png +share/kde/icons/crystalsvg/48x48/apps/help_index.png +share/kde/icons/crystalsvg/48x48/apps/hwinfo.png +share/kde/icons/crystalsvg/48x48/apps/icons.png +share/kde/icons/crystalsvg/48x48/apps/iconthemes.png +share/kde/icons/crystalsvg/48x48/apps/input_devices_settings.png +share/kde/icons/crystalsvg/48x48/apps/kappfinder.png +share/kde/icons/crystalsvg/48x48/apps/kate.png +share/kde/icons/crystalsvg/48x48/apps/kcmdevices.png +share/kde/icons/crystalsvg/48x48/apps/kcmdrkonqi.png +share/kde/icons/crystalsvg/48x48/apps/kcmfontinst.png +share/kde/icons/crystalsvg/48x48/apps/kcmkwm.png +share/kde/icons/crystalsvg/48x48/apps/kcmmemory.png +share/kde/icons/crystalsvg/48x48/apps/kcmmidi.png +share/kde/icons/crystalsvg/48x48/apps/kcmpartitions.png +share/kde/icons/crystalsvg/48x48/apps/kcmpci.png +share/kde/icons/crystalsvg/48x48/apps/kcmprocessor.png +share/kde/icons/crystalsvg/48x48/apps/kcmscsi.png +share/kde/icons/crystalsvg/48x48/apps/kcmsystem.png +share/kde/icons/crystalsvg/48x48/apps/kcontrol.png +share/kde/icons/crystalsvg/48x48/apps/kdisknav.png +share/kde/icons/crystalsvg/48x48/apps/kdmconfig.png +share/kde/icons/crystalsvg/48x48/apps/keditbookmarks.png +share/kde/icons/crystalsvg/48x48/apps/key_bindings.png +share/kde/icons/crystalsvg/48x48/apps/keyboard.png +share/kde/icons/crystalsvg/48x48/apps/keyboard_layout.png +share/kde/icons/crystalsvg/48x48/apps/kfind.png +share/kde/icons/crystalsvg/48x48/apps/kfm.png +share/kde/icons/crystalsvg/48x48/apps/kfm_home.png +share/kde/icons/crystalsvg/48x48/apps/khelpcenter.png +share/kde/icons/crystalsvg/48x48/apps/klipper.png +share/kde/icons/crystalsvg/48x48/apps/kmenu.png +share/kde/icons/crystalsvg/48x48/apps/kmenuedit.png +share/kde/icons/crystalsvg/48x48/apps/knotify.png +share/kde/icons/crystalsvg/48x48/apps/konqueror.png +share/kde/icons/crystalsvg/48x48/apps/konsole.png +share/kde/icons/crystalsvg/48x48/apps/kpager.png +share/kde/icons/crystalsvg/48x48/apps/kscreensaver.png +share/kde/icons/crystalsvg/48x48/apps/ksysguard.png +share/kde/icons/crystalsvg/48x48/apps/kthememgr.png +share/kde/icons/crystalsvg/48x48/apps/ktip.png +share/kde/icons/crystalsvg/48x48/apps/kvirc.png +share/kde/icons/crystalsvg/48x48/apps/kwin.png +share/kde/icons/crystalsvg/48x48/apps/kwrite.png +share/kde/icons/crystalsvg/48x48/apps/kxkb.png +share/kde/icons/crystalsvg/48x48/apps/licq.png +share/kde/icons/crystalsvg/48x48/apps/linuxconf.png +share/kde/icons/crystalsvg/48x48/apps/locale.png +share/kde/icons/crystalsvg/48x48/apps/looknfeel.png +share/kde/icons/crystalsvg/48x48/apps/mozilla.png +share/kde/icons/crystalsvg/48x48/apps/mozilla/m.png +share/kde/icons/crystalsvg/48x48/apps/mozilla/mail.png +share/kde/icons/crystalsvg/48x48/apps/multimedia.png +share/kde/icons/crystalsvg/48x48/apps/nedit.png +share/kde/icons/crystalsvg/48x48/apps/netscape.png +share/kde/icons/crystalsvg/48x48/apps/opera.png +share/kde/icons/crystalsvg/48x48/apps/package.png +share/kde/icons/crystalsvg/48x48/apps/package_applications.png +share/kde/icons/crystalsvg/48x48/apps/package_editors.png +share/kde/icons/crystalsvg/48x48/apps/package_edutainment.png +share/kde/icons/crystalsvg/48x48/apps/package_favourite.png +share/kde/icons/crystalsvg/48x48/apps/package_games.png +share/kde/icons/crystalsvg/48x48/apps/package_games_arcade.png +share/kde/icons/crystalsvg/48x48/apps/package_games_board.png +share/kde/icons/crystalsvg/48x48/apps/package_games_card.png +share/kde/icons/crystalsvg/48x48/apps/package_games_strategy.png +share/kde/icons/crystalsvg/48x48/apps/package_graphics.png +share/kde/icons/crystalsvg/48x48/apps/package_multimedia.png +share/kde/icons/crystalsvg/48x48/apps/package_network.png +share/kde/icons/crystalsvg/48x48/apps/package_settings.png +share/kde/icons/crystalsvg/48x48/apps/package_system.png +share/kde/icons/crystalsvg/48x48/apps/package_toys.png +share/kde/icons/crystalsvg/48x48/apps/package_utilities.png +share/kde/icons/crystalsvg/48x48/apps/package_wordprocessing.png +share/kde/icons/crystalsvg/48x48/apps/password.png +share/kde/icons/crystalsvg/48x48/apps/penguin.png +share/kde/icons/crystalsvg/48x48/apps/personal.png +share/kde/icons/crystalsvg/48x48/apps/phppg.png +share/kde/icons/crystalsvg/48x48/apps/proxy.png +share/kde/icons/crystalsvg/48x48/apps/pysol.png +share/kde/icons/crystalsvg/48x48/apps/remote.png +share/kde/icons/crystalsvg/48x48/apps/samba.png +share/kde/icons/crystalsvg/48x48/apps/soffice.png +share/kde/icons/crystalsvg/48x48/apps/staroffice.png +share/kde/icons/crystalsvg/48x48/apps/style.png +share/kde/icons/crystalsvg/48x48/apps/stylesheet.png +share/kde/icons/crystalsvg/48x48/apps/terminal.png +share/kde/icons/crystalsvg/48x48/apps/tux.png +share/kde/icons/crystalsvg/48x48/apps/usb.png +share/kde/icons/crystalsvg/48x48/apps/vnc.png +share/kde/icons/crystalsvg/48x48/apps/window_list.png +share/kde/icons/crystalsvg/48x48/apps/winprops.png +share/kde/icons/crystalsvg/48x48/apps/wmaker_apps.png +share/kde/icons/crystalsvg/48x48/apps/wp.png +share/kde/icons/crystalsvg/48x48/apps/xclock.png +share/kde/icons/crystalsvg/48x48/apps/xedit.png +share/kde/icons/crystalsvg/48x48/apps/xemacs.png +share/kde/icons/crystalsvg/48x48/apps/xfmail.png +share/kde/icons/crystalsvg/48x48/apps/xmag.png +share/kde/icons/crystalsvg/48x48/apps/xv.png +share/kde/icons/crystalsvg/64x64/apps/acroread.png +share/kde/icons/crystalsvg/64x64/apps/applixware.png +share/kde/icons/crystalsvg/64x64/apps/background.png +share/kde/icons/crystalsvg/64x64/apps/cache.png +share/kde/icons/crystalsvg/64x64/apps/clanbomber.png +share/kde/icons/crystalsvg/64x64/apps/clock.png +share/kde/icons/crystalsvg/64x64/apps/email.png +share/kde/icons/crystalsvg/64x64/apps/filetypes.png +share/kde/icons/crystalsvg/64x64/apps/gimp.png +share/kde/icons/crystalsvg/64x64/apps/gvim.png +share/kde/icons/crystalsvg/64x64/apps/help_index.png +share/kde/icons/crystalsvg/64x64/apps/hwinfo.png +share/kde/icons/crystalsvg/64x64/apps/kappfinder.png +share/kde/icons/crystalsvg/64x64/apps/kate.png +share/kde/icons/crystalsvg/64x64/apps/kcmdevices.png +share/kde/icons/crystalsvg/64x64/apps/kcmmemory.png +share/kde/icons/crystalsvg/64x64/apps/kcmpartitions.png +share/kde/icons/crystalsvg/64x64/apps/kcmpci.png +share/kde/icons/crystalsvg/64x64/apps/kcontrol.png +share/kde/icons/crystalsvg/64x64/apps/kdmconfig.png +share/kde/icons/crystalsvg/64x64/apps/keditbookmarks.png +share/kde/icons/crystalsvg/64x64/apps/kfind.png +share/kde/icons/crystalsvg/64x64/apps/kfm_home.png +share/kde/icons/crystalsvg/64x64/apps/khelpcenter.png +share/kde/icons/crystalsvg/64x64/apps/klipper.png +share/kde/icons/crystalsvg/64x64/apps/kmenu.png +share/kde/icons/crystalsvg/64x64/apps/konqueror.png +share/kde/icons/crystalsvg/64x64/apps/konsole.png +share/kde/icons/crystalsvg/64x64/apps/kscreensaver.png +share/kde/icons/crystalsvg/64x64/apps/ksysguard.png +share/kde/icons/crystalsvg/64x64/apps/kthememgr.png +share/kde/icons/crystalsvg/64x64/apps/ktip.png +share/kde/icons/crystalsvg/64x64/apps/kvirc.png +share/kde/icons/crystalsvg/64x64/apps/kwrite.png +share/kde/icons/crystalsvg/64x64/apps/licq.png +share/kde/icons/crystalsvg/64x64/apps/linuxconf.png +share/kde/icons/crystalsvg/64x64/apps/looknfeel.png +share/kde/icons/crystalsvg/64x64/apps/mozilla.png +share/kde/icons/crystalsvg/64x64/apps/multimedia.png +share/kde/icons/crystalsvg/64x64/apps/nedit.png +share/kde/icons/crystalsvg/64x64/apps/netscape.png +share/kde/icons/crystalsvg/64x64/apps/package.png +share/kde/icons/crystalsvg/64x64/apps/package_applications.png +share/kde/icons/crystalsvg/64x64/apps/package_favourite.png +share/kde/icons/crystalsvg/64x64/apps/package_games.png +share/kde/icons/crystalsvg/64x64/apps/package_multimedia.png +share/kde/icons/crystalsvg/64x64/apps/package_network.png +share/kde/icons/crystalsvg/64x64/apps/package_settings.png +share/kde/icons/crystalsvg/64x64/apps/package_toys.png +share/kde/icons/crystalsvg/64x64/apps/package_utilities.png +share/kde/icons/crystalsvg/64x64/apps/password.png +share/kde/icons/crystalsvg/64x64/apps/penguin.png +share/kde/icons/crystalsvg/64x64/apps/personal.png +share/kde/icons/crystalsvg/64x64/apps/phppg.png +share/kde/icons/crystalsvg/64x64/apps/pysol.png +share/kde/icons/crystalsvg/64x64/apps/qtella.png +share/kde/icons/crystalsvg/64x64/apps/staroffice.png +share/kde/icons/crystalsvg/64x64/apps/terminal.png +share/kde/icons/crystalsvg/64x64/apps/tux.png +share/kde/icons/crystalsvg/64x64/apps/wp.png +share/kde/icons/crystalsvg/64x64/apps/xclock.png +share/kde/icons/crystalsvg/64x64/apps/xfmail.png +share/kde/icons/crystalsvg/64x64/apps/xmag.png share/kde/icons/locolor/16x16/apps/bell.png share/kde/icons/locolor/16x16/apps/kcmfontinst.png share/kde/icons/locolor/32x32/apps/bell.png @@ -2288,7 +2614,7 @@ share/kde/locale/l10n/by/entry.desktop share/kde/locale/l10n/by/flag.png share/kde/locale/l10n/ca/entry.desktop share/kde/locale/l10n/ca/flag.png -share/kde/locale/l10n/caribbean.desktop +share/kde/locale/l10n/centralamerica.desktop share/kde/locale/l10n/centraleurope.desktop share/kde/locale/l10n/ch/entry.desktop share/kde/locale/l10n/ch/flag.png @@ -2298,6 +2624,10 @@ share/kde/locale/l10n/cn/entry.desktop share/kde/locale/l10n/cn/flag.png share/kde/locale/l10n/co/entry.desktop share/kde/locale/l10n/co/flag.png +share/kde/locale/l10n/cr/entry.desktop +share/kde/locale/l10n/cr/flag.png +share/kde/locale/l10n/cu/entry.desktop +share/kde/locale/l10n/cu/flag.png share/kde/locale/l10n/cz/entry.desktop share/kde/locale/l10n/cz/flag.png share/kde/locale/l10n/de/entry.desktop @@ -2327,6 +2657,8 @@ share/kde/locale/l10n/gb/entry.desktop share/kde/locale/l10n/gb/flag.png share/kde/locale/l10n/gd/entry.desktop share/kde/locale/l10n/gd/flag.png +share/kde/locale/l10n/gh/entry.desktop +share/kde/locale/l10n/gh/flag.png share/kde/locale/l10n/gr/entry.desktop share/kde/locale/l10n/gr/flag.png share/kde/locale/l10n/gt/entry.desktop @@ -2347,6 +2679,8 @@ share/kde/locale/l10n/in/entry.desktop share/kde/locale/l10n/in/flag.png share/kde/locale/l10n/iq/entry.desktop share/kde/locale/l10n/iq/flag.png +share/kde/locale/l10n/ir/entry.desktop +share/kde/locale/l10n/ir/flag.png share/kde/locale/l10n/is/entry.desktop share/kde/locale/l10n/is/flag.png share/kde/locale/l10n/it/entry.desktop @@ -2363,6 +2697,8 @@ share/kde/locale/l10n/kp/entry.desktop share/kde/locale/l10n/kp/flag.png share/kde/locale/l10n/kr/entry.desktop share/kde/locale/l10n/kr/flag.png +share/kde/locale/l10n/kw/entry.desktop +share/kde/locale/l10n/kw/flag.png share/kde/locale/l10n/lb/entry.desktop share/kde/locale/l10n/lb/flag.png share/kde/locale/l10n/lc/entry.desktop @@ -2375,12 +2711,16 @@ share/kde/locale/l10n/lv/entry.desktop share/kde/locale/l10n/lv/flag.png share/kde/locale/l10n/ly/entry.desktop share/kde/locale/l10n/ly/flag.png +share/kde/locale/l10n/ma/entry.desktop +share/kde/locale/l10n/ma/flag.png share/kde/locale/l10n/mk/entry.desktop share/kde/locale/l10n/mk/flag.png share/kde/locale/l10n/mt/entry.desktop share/kde/locale/l10n/mt/flag.png share/kde/locale/l10n/mx/entry.desktop share/kde/locale/l10n/mx/flag.png +share/kde/locale/l10n/ni/entry.desktop +share/kde/locale/l10n/ni/flag.png share/kde/locale/l10n/nl/entry.desktop share/kde/locale/l10n/nl/flag.png share/kde/locale/l10n/no/entry.desktop @@ -2419,6 +2759,8 @@ share/kde/locale/l10n/si/entry.desktop share/kde/locale/l10n/si/flag.png share/kde/locale/l10n/sk/entry.desktop share/kde/locale/l10n/sk/flag.png +share/kde/locale/l10n/so/entry.desktop +share/kde/locale/l10n/so/flag.png share/kde/locale/l10n/southamerica.desktop share/kde/locale/l10n/southeurope.desktop share/kde/locale/l10n/sr/entry.desktop @@ -2429,6 +2771,8 @@ share/kde/locale/l10n/sy/entry.desktop share/kde/locale/l10n/sy/flag.png share/kde/locale/l10n/th/entry.desktop share/kde/locale/l10n/th/flag.png +share/kde/locale/l10n/tn/entry.desktop +share/kde/locale/l10n/tn/flag.png share/kde/locale/l10n/tr/entry.desktop share/kde/locale/l10n/tr/flag.png share/kde/locale/l10n/tt/entry.desktop @@ -2457,11 +2801,15 @@ share/kde/mimelnk/application/x-ksysguard.desktop share/kde/mimelnk/application/x-ktheme.desktop share/kde/mimelnk/print/class.desktop share/kde/mimelnk/print/folder.desktop +share/kde/mimelnk/print/jobs.desktop share/kde/mimelnk/print/manager.desktop share/kde/mimelnk/print/printer.desktop +share/kde/services/about.protocol share/kde/services/bzip.protocol share/kde/services/bzip2.protocol +share/kde/services/cgi.protocol share/kde/services/finger.protocol +share/kde/services/fish.protocol share/kde/services/floppy.protocol share/kde/services/gsthumbnail.desktop share/kde/services/gzip.protocol @@ -2471,36 +2819,41 @@ share/kde/services/imap4.protocol share/kde/services/imaps.protocol share/kde/services/info.protocol share/kde/services/kaccess.desktop -share/kde/services/kate_component.desktop share/kde/services/kded/favicons.desktop share/kde/services/kdeprint_part.desktop +share/kde/services/kfile_font.desktop share/kde/services/kfindpart.desktop share/kde/services/khelpcenter.desktop +share/kde/services/kmanpart.desktop share/kde/services/konq_aboutpage.desktop share/kde/services/konq_detailedlistview.desktop share/kde/services/konq_iconview.desktop +share/kde/services/konq_infolistview.desktop share/kde/services/konq_multicolumnview.desktop share/kde/services/konq_sidebartng.desktop share/kde/services/konq_textview.desktop share/kde/services/konq_treeview.desktop -share/kde/services/konqueror.desktop share/kde/services/konqueror_config.desktop share/kde/services/konsolepart.desktop share/kde/services/kshorturifilter.desktop share/kde/services/kuriikwsfilter.desktop share/kde/services/kurisearchfilter.desktop -share/kde/services/kwrite_component.desktop +share/kde/services/kwrited.desktop share/kde/services/kxkb.desktop share/kde/services/ldap.protocol +share/kde/services/localdomainurifilter.desktop +share/kde/services/mac.protocol share/kde/services/man.protocol share/kde/services/nfs.protocol share/kde/services/nntp.protocol +share/kde/services/picturethumbnail.desktop share/kde/services/pop3.protocol share/kde/services/pop3s.protocol share/kde/services/print.protocol share/kde/services/searchproviders/acronym.desktop share/kde/services/searchproviders/alltheweb.desktop share/kde/services/searchproviders/altavista.desktop +share/kde/services/searchproviders/appsy.desktop share/kde/services/searchproviders/austronaut.desktop share/kde/services/searchproviders/bugft.desktop share/kde/services/searchproviders/bugno.desktop @@ -2526,6 +2879,7 @@ share/kde/services/searchproviders/mamma.desktop share/kde/services/searchproviders/metacrawler.desktop share/kde/services/searchproviders/msdn.desktop share/kde/services/searchproviders/nl-teletekst.desktop +share/kde/services/searchproviders/pgpkeys.desktop share/kde/services/searchproviders/php.desktop share/kde/services/searchproviders/python.desktop share/kde/services/searchproviders/rfc.desktop @@ -2533,7 +2887,7 @@ share/kde/services/searchproviders/rpmfind.desktop share/kde/services/searchproviders/ruby_application_archive.desktop share/kde/services/searchproviders/seek.desktop share/kde/services/searchproviders/sourceforge.desktop -share/kde/services/searchproviders/tel.desktop +share/kde/services/searchproviders/tel_at.desktop share/kde/services/searchproviders/thesaurus.desktop share/kde/services/searchproviders/vivisimo.desktop share/kde/services/searchproviders/voila.desktop @@ -2553,6 +2907,7 @@ share/kde/services/useragentstrings/ie50onppc.desktop share/kde/services/useragentstrings/ie50onwin95.desktop share/kde/services/useragentstrings/ie55onwin98.desktop share/kde/services/useragentstrings/ie55onwinnt5.desktop +share/kde/services/useragentstrings/ie60onwinnt51.desktop share/kde/services/useragentstrings/lynxoncurrent.desktop share/kde/services/useragentstrings/mozm18oncurrent.desktop share/kde/services/useragentstrings/mozm18onwinnt4.desktop @@ -2563,10 +2918,13 @@ share/kde/services/useragentstrings/nn476onppc.desktop share/kde/services/useragentstrings/op403onwinnt4.desktop share/kde/services/useragentstrings/w3moncurrent.desktop share/kde/services/useragentstrings/wgetoncurrent.desktop +share/kde/services/zip.protocol share/kde/servicetypes/findpart.desktop +share/kde/servicetypes/kateplugin.desktop share/kde/servicetypes/konqaboutpage.desktop share/kde/servicetypes/konqpopupmenuplugin.desktop share/kde/servicetypes/searchprovider.desktop +share/kde/servicetypes/terminalemulator.desktop share/kde/servicetypes/thumbcreator.desktop share/kde/servicetypes/uasprovider.desktop share/kde/sounds/KDE_Beep_Ahem.wav @@ -2626,6 +2984,7 @@ share/kde/templates/linkFloppy.desktop share/kde/templates/linkHD.desktop share/kde/templates/linkProgram.desktop share/kde/templates/linkURL.desktop +share/kde/wallpapers/All-Good-People-1.jpg share/kde/wallpapers/Blkmarble.jpg share/kde/wallpapers/Chicken-Songs-2.jpg share/kde/wallpapers/Circuit.jpg @@ -2638,6 +2997,7 @@ share/kde/wallpapers/Time-For-Lunch-2.jpg share/kde/wallpapers/Totally-New-Product-1.jpg share/kde/wallpapers/Won-Ton-Soup-3.jpg share/kde/wallpapers/default_blue.jpg +share/kde/wallpapers/default_gears.jpg share/kde/wallpapers/kde_box.png share/kde/wallpapers/kde_passion.jpg share/kde/wallpapers/kdm_bg.jpg @@ -2668,10 +3028,12 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale/l10n/tw @dirrm share/kde/locale/l10n/tt @dirrm share/kde/locale/l10n/tr +@dirrm share/kde/locale/l10n/tn @dirrm share/kde/locale/l10n/th @dirrm share/kde/locale/l10n/sy @dirrm share/kde/locale/l10n/sv @dirrm share/kde/locale/l10n/sr +@dirrm share/kde/locale/l10n/so @dirrm share/kde/locale/l10n/sk @dirrm share/kde/locale/l10n/si @dirrm share/kde/locale/l10n/se @@ -2690,15 +3052,18 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale/l10n/nz @dirrm share/kde/locale/l10n/no @dirrm share/kde/locale/l10n/nl +@dirrm share/kde/locale/l10n/ni @dirrm share/kde/locale/l10n/mx @dirrm share/kde/locale/l10n/mt @dirrm share/kde/locale/l10n/mk +@dirrm share/kde/locale/l10n/ma @dirrm share/kde/locale/l10n/ly @dirrm share/kde/locale/l10n/lv @dirrm share/kde/locale/l10n/lu @dirrm share/kde/locale/l10n/lt @dirrm share/kde/locale/l10n/lc @dirrm share/kde/locale/l10n/lb +@dirrm share/kde/locale/l10n/kw @dirrm share/kde/locale/l10n/kr @dirrm share/kde/locale/l10n/kp @dirrm share/kde/locale/l10n/kn @@ -2707,6 +3072,7 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale/l10n/jm @dirrm share/kde/locale/l10n/it @dirrm share/kde/locale/l10n/is +@dirrm share/kde/locale/l10n/ir @dirrm share/kde/locale/l10n/iq @dirrm share/kde/locale/l10n/in @dirrm share/kde/locale/l10n/il @@ -2717,6 +3083,7 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale/l10n/hn @dirrm share/kde/locale/l10n/gt @dirrm share/kde/locale/l10n/gr +@dirrm share/kde/locale/l10n/gh @dirrm share/kde/locale/l10n/gd @dirrm share/kde/locale/l10n/gb @dirrm share/kde/locale/l10n/fr @@ -2731,6 +3098,8 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale/l10n/dj @dirrm share/kde/locale/l10n/de @dirrm share/kde/locale/l10n/cz +@dirrm share/kde/locale/l10n/cu +@dirrm share/kde/locale/l10n/cr @dirrm share/kde/locale/l10n/co @dirrm share/kde/locale/l10n/cn @dirrm share/kde/locale/l10n/cl @@ -2757,17 +3126,28 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/locale @comment dirrm share/kde/icons/locolor/32x32/apps @comment dirrm share/kde/icons/locolor/16x16/apps -@comment dirrm share/kde/icons/hicolor/48x48/filesystems -@comment dirrm share/kde/icons/hicolor/48x48/apps -@comment dirrm share/kde/icons/hicolor/32x32/filesystems -@comment dirrm share/kde/icons/hicolor/32x32/devices -@comment dirrm share/kde/icons/hicolor/32x32/apps -@comment dirrm share/kde/icons/hicolor/32x32/actions -@comment dirrm share/kde/icons/hicolor/22x22/actions -@comment dirrm share/kde/icons/hicolor/16x16/filesystems -@comment dirrm share/kde/icons/hicolor/16x16/devices -@comment dirrm share/kde/icons/hicolor/16x16/apps -@comment dirrm share/kde/icons/hicolor/16x16/actions +@comment dirrm share/kde/icons/crystalsvg/64x64/apps +@comment dirrm share/kde/icons/crystalsvg/64x64 +@comment dirrm share/kde/icons/crystalsvg/48x48/apps/mozilla +@comment dirrm share/kde/icons/crystalsvg/48x48/apps/gnome +@comment dirrm share/kde/icons/crystalsvg/48x48/apps +@comment dirrm share/kde/icons/crystalsvg/48x48 +@comment dirrm share/kde/icons/crystalsvg/32x32/filesystems +@comment dirrm share/kde/icons/crystalsvg/32x32/devices +@comment dirrm share/kde/icons/crystalsvg/32x32/apps/mozilla +@comment dirrm share/kde/icons/crystalsvg/32x32/apps/gnome +@comment dirrm share/kde/icons/crystalsvg/32x32/apps +@comment dirrm share/kde/icons/crystalsvg/32x32 +@comment dirrm share/kde/icons/crystalsvg/22x22/apps +@comment dirrm share/kde/icons/crystalsvg/22x22 +@comment dirrm share/kde/icons/crystalsvg/16x16/filesystems +@comment dirrm share/kde/icons/crystalsvg/16x16/devices +@comment dirrm share/kde/icons/crystalsvg/16x16/apps/mozilla +@comment dirrm share/kde/icons/crystalsvg/16x16/apps/gnome +@comment dirrm share/kde/icons/crystalsvg/16x16/apps +@comment dirrm share/kde/icons/crystalsvg/16x16 +@comment dirrm share/kde/icons/crystalsvg/128x128/apps +@comment dirrm share/kde/icons/crystalsvg/128x128 @comment dirrm share/kde/icons @unexec ${RM} -f %D/share/kde/config/kdm/kdmsts 2>/dev/null || ${TRUE} @dirrm share/kde/config/kdm @@ -2791,13 +3171,15 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kscreensaver @dirrm share/kde/apps/kpersonalizer/pics @dirrm share/kde/apps/kpersonalizer +@dirrm share/kde/apps/konsole/profiles @dirrm share/kde/apps/konsole @dirrm share/kde/apps/konqueror/tiles +@dirrm share/kde/apps/konqueror/servicemenus @dirrm share/kde/apps/konqueror/profiles @dirrm share/kde/apps/konqueror/pics -@dirrm share/kde/apps/konqueror/icons/hicolor/16x16/actions -@dirrm share/kde/apps/konqueror/icons/hicolor/16x16 -@dirrm share/kde/apps/konqueror/icons/hicolor +@dirrm share/kde/apps/konqueror/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/konqueror/icons/crystalsvg/16x16 +@dirrm share/kde/apps/konqueror/icons/crystalsvg @dirrm share/kde/apps/konqueror/icons @dirrm share/kde/apps/konqueror/about @dirrm share/kde/apps/konqueror @@ -2817,19 +3199,17 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kmenuedit/icons/locolor/16x16/actions @dirrm share/kde/apps/kmenuedit/icons/locolor/16x16 @dirrm share/kde/apps/kmenuedit/icons/locolor -@dirrm share/kde/apps/kmenuedit/icons/hicolor/32x32/actions -@dirrm share/kde/apps/kmenuedit/icons/hicolor/32x32 -@dirrm share/kde/apps/kmenuedit/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kmenuedit/icons/hicolor/22x22 -@dirrm share/kde/apps/kmenuedit/icons/hicolor +@dirrm share/kde/apps/kmenuedit/icons/crystalsvg/32x32/actions +@dirrm share/kde/apps/kmenuedit/icons/crystalsvg/32x32 +@dirrm share/kde/apps/kmenuedit/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/kmenuedit/icons/crystalsvg/22x22 +@dirrm share/kde/apps/kmenuedit/icons/crystalsvg @dirrm share/kde/apps/kmenuedit/icons @dirrm share/kde/apps/kmenuedit -@dirrm share/kde/apps/klipper/pics -@dirrm share/kde/apps/klipper @dirrm share/kde/apps/kjobviewer -@dirrm share/kde/apps/kioslave @dirrm share/kde/apps/kio_info @dirrm share/kde/apps/kio_finger +@dirrm share/kde/apps/kinfocenter @dirrm share/kde/apps/kicker/wallpapers @dirrm share/kde/apps/kicker/tiles @dirrm share/kde/apps/kicker/pics @@ -2837,14 +3217,16 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kicker/icons/locolor/16x16/actions @dirrm share/kde/apps/kicker/icons/locolor/16x16 @dirrm share/kde/apps/kicker/icons/locolor -@dirrm share/kde/apps/kicker/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kicker/icons/hicolor/16x16 -@dirrm share/kde/apps/kicker/icons/hicolor +@dirrm share/kde/apps/kicker/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/kicker/icons/crystalsvg/16x16 +@dirrm share/kde/apps/kicker/icons/crystalsvg @dirrm share/kde/apps/kicker/icons @dirrm share/kde/apps/kicker/extensions @dirrm share/kde/apps/kicker/applets @dirrm share/kde/apps/kicker @dirrm share/kde/apps/khelpcenter/plugins/Tutorials +@dirrm share/kde/apps/khelpcenter/plugins/Manpages +@dirrm share/kde/apps/khelpcenter/plugins/Applications @dirrm share/kde/apps/khelpcenter/plugins @dirrm share/kde/apps/khelpcenter @dirrm share/kde/apps/kfindpart/icons/locolor/22x22/actions @@ -2866,9 +3248,9 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kdesktop/patterns @dirrm share/kde/apps/kdesktop/DesktopLinks @dirrm share/kde/apps/kdesktop -@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kdeprintfax/icons/hicolor/16x16 -@dirrm share/kde/apps/kdeprintfax/icons/hicolor +@dirrm share/kde/apps/kdeprintfax/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/kdeprintfax/icons/crystalsvg/16x16 +@dirrm share/kde/apps/kdeprintfax/icons/crystalsvg @dirrm share/kde/apps/kdeprintfax/icons @dirrm share/kde/apps/kdeprintfax @dirrm share/kde/apps/kdeprint_part @@ -2878,7 +3260,6 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kcontrol/pics @dirrm share/kde/apps/kcontrol @comment dirrm share/kde/apps/kconf_update -@dirrm share/kde/apps/kcmusb @dirrm share/kde/apps/kcmlocale/pics @dirrm share/kde/apps/kcmlocale @dirrm share/kde/apps/kcmkeys @@ -2888,6 +3269,7 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kcmfontinst/StarOffice @dirrm share/kde/apps/kcmfontinst @dirrm share/kde/apps/kcmcss +@dirrm share/kde/apps/kcm_componentchooser @dirrm share/kde/apps/kbookmark @dirrm share/kde/apps/kate/scripts @dirrm share/kde/apps/kate/pics @@ -2896,23 +3278,19 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kate/icons/locolor/16x16/actions @dirrm share/kde/apps/kate/icons/locolor/16x16 @dirrm share/kde/apps/kate/icons/locolor -@dirrm share/kde/apps/kate/icons/hicolor/48x48/actions -@dirrm share/kde/apps/kate/icons/hicolor/48x48 -@dirrm share/kde/apps/kate/icons/hicolor/32x32/actions -@dirrm share/kde/apps/kate/icons/hicolor/32x32 -@dirrm share/kde/apps/kate/icons/hicolor/22x22/actions -@dirrm share/kde/apps/kate/icons/hicolor/22x22 -@dirrm share/kde/apps/kate/icons/hicolor/16x16/actions -@dirrm share/kde/apps/kate/icons/hicolor/16x16 -@dirrm share/kde/apps/kate/icons/hicolor +@dirrm share/kde/apps/kate/icons/crystalsvg/32x32/actions +@dirrm share/kde/apps/kate/icons/crystalsvg/32x32 +@dirrm share/kde/apps/kate/icons/crystalsvg/22x22/actions +@dirrm share/kde/apps/kate/icons/crystalsvg/22x22 +@dirrm share/kde/apps/kate/icons/crystalsvg/16x16/actions +@dirrm share/kde/apps/kate/icons/crystalsvg/16x16 +@dirrm share/kde/apps/kate/icons/crystalsvg @dirrm share/kde/apps/kate/icons @comment dirrm share/kde/apps/kate -@dirrm share/kde/apps/kappfinder/apps/WordProcessing @dirrm share/kde/apps/kappfinder/apps/Utilities/XUtilities @dirrm share/kde/apps/kappfinder/apps/Utilities @dirrm share/kde/apps/kappfinder/apps/Toys @dirrm share/kde/apps/kappfinder/apps/System/Terminal -@dirrm share/kde/apps/kappfinder/apps/System/ScreenSavers @dirrm share/kde/apps/kappfinder/apps/System @dirrm share/kde/apps/kappfinder/apps/Office @dirrm share/kde/apps/kappfinder/apps/Multimedia @@ -2930,8 +3308,6 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/kappfinder/apps/Development @dirrm share/kde/apps/kappfinder/apps @dirrm share/kde/apps/kappfinder -@dirrm share/kde/apps/kaddressbook/pics -@dirrm share/kde/apps/kaddressbook @dirrm share/kde/apps/drkonqi/presets @dirrm share/kde/apps/drkonqi/pics @dirrm share/kde/apps/drkonqi/debuggers @@ -2939,35 +3315,43 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/kde/apps/clockapplet/pics @dirrm share/kde/apps/clockapplet @comment dirrm share/kde/apps -@dirrm share/kde/applnk/WordProcessing +@dirrm share/kde/applnk/Utilities/XUtilities +@dirrm share/kde/applnk/Utilities/More @dirrm share/kde/applnk/Utilities @dirrm share/kde/applnk/Toys @dirrm share/kde/applnk/System/Terminal @dirrm share/kde/applnk/System/ScreenSavers +@dirrm share/kde/applnk/System/More @dirrm share/kde/applnk/System +@dirrm share/kde/applnk/Settingsmenu @dirrm share/kde/applnk/Settings/WebBrowsing @dirrm share/kde/applnk/Settings/System @dirrm share/kde/applnk/Settings/Sound +@dirrm share/kde/applnk/Settings/Security @dirrm share/kde/applnk/Settings/PowerControl @dirrm share/kde/applnk/Settings/Personalization @dirrm share/kde/applnk/Settings/Peripherals +@dirrm share/kde/applnk/Settings/Network/WebBrowsing @dirrm share/kde/applnk/Settings/Network @dirrm share/kde/applnk/Settings/LookNFeel/Windows @dirrm share/kde/applnk/Settings/LookNFeel/Themes -@dirrm share/kde/applnk/Settings/LookNFeel/Desktop @dirrm share/kde/applnk/Settings/LookNFeel @dirrm share/kde/applnk/Settings/Information -@dirrm share/kde/applnk/Settings/Help -@dirrm share/kde/applnk/Settings/FileBrowsing -@dirrm share/kde/applnk/Settings/Databases +@dirrm share/kde/applnk/Settings/Desktop +@dirrm share/kde/applnk/Settings/Components +@dirrm share/kde/applnk/Settings/Accessibility @dirrm share/kde/applnk/Settings @dirrm share/kde/applnk/Office +@dirrm share/kde/applnk/Multimedia/More @dirrm share/kde/applnk/Multimedia @dirrm share/kde/applnk/Internet/Terminal +@dirrm share/kde/applnk/Internet/More @dirrm share/kde/applnk/Internet +@dirrm share/kde/applnk/Graphics/More @dirrm share/kde/applnk/Graphics @dirrm share/kde/applnk/Games/TacticStrategy @dirrm share/kde/applnk/Games/Roguelikes +@dirrm share/kde/applnk/Games/Kidsgames @dirrm share/kde/applnk/Games/Card @dirrm share/kde/applnk/Games/Board @dirrm share/kde/applnk/Games/Arcade @@ -2988,6 +3372,23 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/doc/kde/HTML/en/kmenuedit @dirrm share/doc/kde/HTML/en/klipper @dirrm share/doc/kde/HTML/en/kioslave +@dirrm share/doc/kde/HTML/en/kinfocenter/xserver +@dirrm share/doc/kde/HTML/en/kinfocenter/usb +@dirrm share/doc/kde/HTML/en/kinfocenter/sound +@dirrm share/doc/kde/HTML/en/kinfocenter/scsi +@dirrm share/doc/kde/HTML/en/kinfocenter/samba +@dirrm share/doc/kde/HTML/en/kinfocenter/protocols +@dirrm share/doc/kde/HTML/en/kinfocenter/processor +@dirrm share/doc/kde/HTML/en/kinfocenter/pcmcia +@dirrm share/doc/kde/HTML/en/kinfocenter/pci +@dirrm share/doc/kde/HTML/en/kinfocenter/partitions +@dirrm share/doc/kde/HTML/en/kinfocenter/nics +@dirrm share/doc/kde/HTML/en/kinfocenter/memory +@dirrm share/doc/kde/HTML/en/kinfocenter/ioports +@dirrm share/doc/kde/HTML/en/kinfocenter/interrupts +@dirrm share/doc/kde/HTML/en/kinfocenter/dma +@dirrm share/doc/kde/HTML/en/kinfocenter/devices +@dirrm share/doc/kde/HTML/en/kinfocenter @dirrm share/doc/kde/HTML/en/kicker @dirrm share/doc/kde/HTML/en/khelpcenter/visualdict @dirrm share/doc/kde/HTML/en/khelpcenter/userguide @@ -3000,9 +3401,55 @@ share/kde/wallpapers/triplegears.jpg @dirrm share/doc/kde/HTML/en/kdesu @dirrm share/doc/kde/HTML/en/kdeprint @dirrm share/doc/kde/HTML/en/kdebugdialog +@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html +@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq/html +@dirrm share/doc/kde/HTML/en/kdebase-apidocs/libkonq +@dirrm share/doc/kde/HTML/en/kdebase-apidocs +@dirrm share/doc/kde/HTML/en/kcontrol/windowmanagement +@dirrm share/doc/kde/HTML/en/kcontrol/useragent +@dirrm share/doc/kde/HTML/en/kcontrol/spellchecking +@dirrm share/doc/kde/HTML/en/kcontrol/smb +@dirrm share/doc/kde/HTML/en/kcontrol/screensaver +@dirrm share/doc/kde/HTML/en/kcontrol/proxy +@dirrm share/doc/kde/HTML/en/kcontrol/passwords +@dirrm share/doc/kde/HTML/en/kcontrol/panel +@dirrm share/doc/kde/HTML/en/kcontrol/netpref +@dirrm share/doc/kde/HTML/en/kcontrol/mouse +@dirrm share/doc/kde/HTML/en/kcontrol/language +@dirrm share/doc/kde/HTML/en/kcontrol/kwindecoration +@dirrm share/doc/kde/HTML/en/kcontrol/kthememgr +@dirrm share/doc/kde/HTML/en/kcontrol/khtml +@dirrm share/doc/kde/HTML/en/kcontrol/keys +@dirrm share/doc/kde/HTML/en/kcontrol/keyboard +@dirrm share/doc/kde/HTML/en/kcontrol/kdm +@dirrm share/doc/kde/HTML/en/kcontrol/kcmtaskbar +@dirrm share/doc/kde/HTML/en/kcontrol/kcmstyle +@dirrm share/doc/kde/HTML/en/kcontrol/kcmsmserver +@dirrm share/doc/kde/HTML/en/kcontrol/kcmnotify +@dirrm share/doc/kde/HTML/en/kcontrol/kcmlaunch +@dirrm share/doc/kde/HTML/en/kcontrol/kcmkonsole +@dirrm share/doc/kde/HTML/en/kcontrol/kcmfontinst +@dirrm share/doc/kde/HTML/en/kcontrol/kcmcss +@dirrm share/doc/kde/HTML/en/kcontrol/kcmaccess +@dirrm share/doc/kde/HTML/en/kcontrol/icons +@dirrm share/doc/kde/HTML/en/kcontrol/helpindex.html +@dirrm share/doc/kde/HTML/en/kcontrol/fonts +@dirrm share/doc/kde/HTML/en/kcontrol/filetypes +@dirrm share/doc/kde/HTML/en/kcontrol/filemanager +@dirrm share/doc/kde/HTML/en/kcontrol/energy +@dirrm share/doc/kde/HTML/en/kcontrol/email +@dirrm share/doc/kde/HTML/en/kcontrol/ebrowsing +@dirrm share/doc/kde/HTML/en/kcontrol/desktop +@dirrm share/doc/kde/HTML/en/kcontrol/crypto +@dirrm share/doc/kde/HTML/en/kcontrol/cookies +@dirrm share/doc/kde/HTML/en/kcontrol/colors +@dirrm share/doc/kde/HTML/en/kcontrol/clock +@dirrm share/doc/kde/HTML/en/kcontrol/cache +@dirrm share/doc/kde/HTML/en/kcontrol/bell +@dirrm share/doc/kde/HTML/en/kcontrol/background +@dirrm share/doc/kde/HTML/en/kcontrol/arts @dirrm share/doc/kde/HTML/en/kcontrol @dirrm share/doc/kde/HTML/en/kate -@dirrm share/doc/kde/HTML/en/kaddressbook @comment dirrm share/doc/kde/HTML/en @comment dirrm share/autostart @comment dirrm lib/kde3 diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index db0f8a48920..0ab1e582bcb 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,109 +1,110 @@ -$NetBSD: distinfo,v 1.21 2003/02/25 02:11:34 dmcmahill Exp $ +$NetBSD: distinfo,v 1.22 2003/03/11 13:10:17 markd Exp $ -SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 -Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes +SHA1 (kdebase-3.1.tar.bz2) = 8b1e7dbecf476f84fa4332e88b15ae6be562f0d8 +Size (kdebase-3.1.tar.bz2) = 14887352 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = c1fda81e979a6c4df311e205ca29d69d6568655d -SHA1 (patch-ab) = 803bd6397d5cbc08f52cea51977cf62af0bfbd9e -SHA1 (patch-ac) = 5ea63b6fb0562439742b3bc14418cc1230ef4e7b -SHA1 (patch-ae) = 5ff81a4237c17c73e04d36519972b167638b4fdd +SHA1 (patch-aa) = 56e8d1ee573bf2a1f9003bf9b4a174a6167b1714 +SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44 +SHA1 (patch-ac) = 14c207fa0ed246d10367dbc6182c6f0f5fd256fd +SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302 SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1 SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5 -SHA1 (patch-ai) = d924b1d75422c9c35cd9f1931ea482b22a8730f9 -SHA1 (patch-ak) = 1bb9e60a0bd31e0d9d53f883541a906a971fd3ed -SHA1 (patch-al) = ee1f5c7500af18e9583ae3d63093f9eef6fe60bc -SHA1 (patch-am) = 45858098fd0231132ac2efdaab37b292fca0a1ef -SHA1 (patch-an) = c5d74fc960875ce6171608556a5dcac1d9e8d221 -SHA1 (patch-ao) = 492b70c4420b8ee50277720aa264a10d2046c80b +SHA1 (patch-ai) = a19bf878b24dfdba3ab68b6f52c3b8d72d4ed7f0 +SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0 +SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c +SHA1 (patch-am) = 7ff4d5216774434bb1fc88049737c58201a946ac +SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24 +SHA1 (patch-ao) = 87b48897ab359eebc00c23492a6b3eeea1f7eb42 SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2 SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d -SHA1 (patch-au) = 887c7869d43175874df0f55e76538db888c85610 +SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d -SHA1 (patch-aw) = f9c604f2524a452d7b233c8de2ce8237469d2a6b +SHA1 (patch-aw) = 20328a251e47305ce333758783a65fcc79322116 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2 -SHA1 (patch-az) = f4878ae808e47270fcb1329a34c1424abcbc84a5 -SHA1 (patch-ba) = 0258d4d4a41748df51648878f4e53cd05f67eb7d +SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81 +SHA1 (patch-ba) = b38d5e62e9555e35accacf3af6f54eb9160e0a2d SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58 SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5 -SHA1 (patch-bg) = 6df462d4c521d327b6a50c8b73be547c469a0ed0 +SHA1 (patch-bg) = c17806c947f6ab30f5892af0ea16d1ebef3e4a6a SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164 -SHA1 (patch-bj) = 56046bc920beba28a7f21364c1f46d9061697105 -SHA1 (patch-bk) = 7e961c42269c3593db06c3165629fbbf6a962a1a -SHA1 (patch-bl) = 00e1169fb75f4a2fe43a48f24ac5b5b1a412d7b1 -SHA1 (patch-bm) = 40c32f182882dbf58cb94450aa21a83888d5e2c3 +SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081 +SHA1 (patch-bk) = 2bb5d37b5f7bd2412ad27361f81ab62ab5e04efd +SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab +SHA1 (patch-bm) = af8ef008bbe2c2900da7410a6b8f0b694c1d2d19 SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef -SHA1 (patch-bo) = 9c3108d7f9a1de3c82f2e4d78a0e9f5dbe3478f0 -SHA1 (patch-bp) = 615ddb599e26f123cb8f21700c3f0528bc37c99c +SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66 +SHA1 (patch-bp) = 1b51f504e3a0c72b4af9386813f767cc7957e90b SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21 -SHA1 (patch-bs) = 9ee2903934e50c8786a2b45854255f8022e31524 +SHA1 (patch-bs) = 70841168931ce0e60ca86c124ff34728165974e3 SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 SHA1 (patch-bx) = dcdec38d984452032176946bafddc9a6614b2b6f -SHA1 (patch-by) = 6196da890587636881baac5ac477c850773618e3 -SHA1 (patch-bz) = ef63ef3ea3c28898e5d8cef4631866854998d41c +SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b +SHA1 (patch-bz) = 709994385a421cef33ff1a1348ea20ecc9eb10e0 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b -SHA1 (patch-cc) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c -SHA1 (patch-cd) = 9b21211aef51f94d20c10fbdfda878df7fe77764 +SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144 +SHA1 (patch-cd) = 0ee3d935c4f554a47b19a57cc00e71c6f3ac8b47 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e -SHA1 (patch-cg) = fb7cf305bec67a5cbb80afa9799b3937989910a5 -SHA1 (patch-ch) = c7204694b08da0579c978575b0792b2ff2fb5b1b -SHA1 (patch-ci) = 07f5c0bfae64c180ce954c5eb07a7e425d98a9b2 -SHA1 (patch-cj) = d45347d84fd0cade1fd6e8e2700bdc0280f520ea +SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5 +SHA1 (patch-ch) = 3323eb9bd11c048c079369e1854a8125f74372d2 +SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4 +SHA1 (patch-cj) = b0ec3f40af1113066d217c88998bdb6488985a26 SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd -SHA1 (patch-cm) = 0e2a608749547ac42000a8ce8222303837cd834a -SHA1 (patch-cn) = fc363f836b2acde2ad9bc01759460e997e34aa96 -SHA1 (patch-cp) = 0624d4a11fdd617309dcb711d9beabb6d7d78b36 +SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec +SHA1 (patch-cn) = 6f44ed18999310ab8debbdc3711e763deb0c1b0e +SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f -SHA1 (patch-cs) = 39e69b9d7d4b4a4d28b6532c175b2c8afa1dd1a6 -SHA1 (patch-ct) = e38c308944f34572cbad4e3caa664d6566990b6e +SHA1 (patch-cs) = d55c1f45ee52a3927452e9136e4d4eac73c4e6ac +SHA1 (patch-ct) = 4582ca80dca92afc612a3d168b4128029bb25b41 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf SHA1 (patch-cx) = 8a2d029f56481c1b3d1626c82096fda36700cf00 -SHA1 (patch-cy) = 05a6cebbd223e79c44d6714c78be841ebd63fd8f -SHA1 (patch-cz) = bb88de51bdb08d37d0c77d90509ac7cc6ae17854 +SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80 +SHA1 (patch-cz) = b0382597de90c16de150b2bca9f55afadce28de2 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 -SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d -SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71 -SHA1 (patch-de) = da0cc619f194a806dc437bda163d2b9a9faeadb2 -SHA1 (patch-df) = dc52254033ede1582ac375bd47f356045da96970 -SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d -SHA1 (patch-dh) = a89a4d94a568de02e7d095068356edf6e7011464 +SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4 +SHA1 (patch-dh) = 603f6f0ecc544fe1db01d728e41d0b1f225818ce SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59 -SHA1 (patch-dj) = 228bd1ab238bfab1ee7b56019d3e7ff91889940c +SHA1 (patch-dj) = 7f546f877a66fdda3fd460f338311cbc1c7efc2a SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d -SHA1 (patch-dl) = 546246a024afbf95a19e260d1d8ed70ff946e6dd +SHA1 (patch-dl) = 863ece9d3b0b00ea2660d0f91e73f48bdafa3894 SHA1 (patch-dm) = 866cb67d9bb39f889226ef5c588552379d153eff -SHA1 (patch-dn) = d21ad2ceb35b4dd6ec71fded225073e9563c755a +SHA1 (patch-dn) = 76e7a0dec98f63cc8e9addc4a3fdd0f07710110f SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9 -SHA1 (patch-dp) = c1b48e1f71ee8b0041ec826b8e7918dba8726242 +SHA1 (patch-dp) = dbadef9408bb47f546cc9dab0620a2515f5424e6 SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796 -SHA1 (patch-dr) = 5729df616b45c2a231b14e55499c8cb2ffcfd64a +SHA1 (patch-dr) = 5edc88e7e28731d85442bf4a26b95ab2ca2eca0a SHA1 (patch-ds) = 4a8bc0f2624fb8ee1ddf7013e751d6fb93e4d47b -SHA1 (patch-dt) = 7f6d79614955732ac3c4b3d6a2f12e824cefa107 +SHA1 (patch-dt) = 90baacdc4d0f85baeb3ea0c3f227cbffb37c08f1 SHA1 (patch-du) = 9069c9775c1a2b309bcd23d971fb8f24dcd36cf6 -SHA1 (patch-dv) = 4381edc1e061041211d2ac9d8411e4ffa42a9cd0 +SHA1 (patch-dv) = c19d5ea88fad2cbffed3c42d58dd5b3dfb3982b4 SHA1 (patch-dw) = a50a08c8a1eafeffe187512de9bda98edb5f5045 -SHA1 (patch-dx) = 426d933c13e0404ed7e50d5d2c7e573a94970703 +SHA1 (patch-dx) = 5a233d14aa9736143f99196b34a79cabab9944ea SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c -SHA1 (patch-dz) = f0e94e83ac04f9a9b56265194be0d472914ef7de +SHA1 (patch-dz) = 01b735d0aed64b2a046cd6bea8c7387a9bcefafc SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714 -SHA1 (patch-eb) = 83bfcc81190f36738a9cec134992ba4f091a3324 +SHA1 (patch-eb) = 2f1778a43bf5c64d3265380e0c7211d6b8279da2 SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec -SHA1 (patch-ed) = f59922d3522c3ee8348659d9ee3d979c54c03875 +SHA1 (patch-ed) = 630c378126a915b4545335b9dbc2de4fea3a303e SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3 -SHA1 (patch-ef) = 5daff08d2bc845b0298d9c708e465547ea51f847 +SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610 -SHA1 (patch-eh) = 94aa1dd47b86ec9ee7a9f4ac715dceecb8aa3c82 -SHA1 (patch-ei) = 69312f1e54ba35908dfe7650ba92686acead542b -SHA1 (patch-ej) = 0838deb8434d7f5867d5947bcd3733246ecac4c6 -SHA1 (patch-ek) = 004a6c7933c90e1bcbd9d271708e4432f79a8986 -SHA1 (patch-em) = 2e42263d67e5e44035bed13dc3e5245fc3a86709 +SHA1 (patch-eh) = 604ec8175c4001541a1e90cf99bfe1cd90bd418a +SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7 +SHA1 (patch-ej) = 9499c43aac6db3f5fcb909d9ca1138c955982bef +SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94 +SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 -SHA1 (patch-ep) = 77d65151a6e74adcfc1143ced2cb393d08029b2c -SHA1 (patch-eq) = e83191cdc198b4e36cc50cbd14adbe4c3c7e9e8a -SHA1 (patch-er) = 5f385cb7708287d711ddea17518b4a2284e0b2fc -SHA1 (patch-es) = 4d0b2012db5db034cbcbca394dfa66250f5556aa +SHA1 (patch-ep) = dfe68fe99903c5bf0d59df9f4a1c64f9baa82a84 +SHA1 (patch-eq) = a1dc61bc7d7c0a04245e21e9f63d5f8cf1a2220c +SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380 +SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32 +SHA1 (patch-et) = a9556424082a5daa60b963e3d7620d5705cb24c6 +SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93 +SHA1 (patch-ev) = 9cb8626d6e6e3164c19ecb95663f2b9878256e47 +SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5 +SHA1 (patch-ex) = 6dad116e38ba30ea1a9a3529e250b1e512c4865f diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa index 3a46adf2c7f..1579ea7b4f5 100644 --- a/x11/kdebase3/patches/patch-aa +++ b/x11/kdebase3/patches/patch-aa @@ -1,31 +1,28 @@ -$NetBSD: patch-aa,v 1.4 2003/02/25 02:11:35 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.5 2003/03/11 13:10:18 markd Exp $ ---- configure.orig Tue Dec 17 05:46:51 2002 +--- configure.orig Fri Jan 17 09:03:15 2003 +++ configure -@@ -24829,7 +24829,7 @@ main () +@@ -30923,64 +30923,6 @@ _ACEOF - char buf[20]; - buf[0]='\0'; -- strlat(buf, "KDE function test", sizeof(buf)); -+ strlcat(buf, "KDE function test", sizeof(buf)); - ; - return 0; -@@ -25442,57 +25442,6 @@ cat >>confdefs.h <<EOF - #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int - EOF -- echo "$as_me:25445: checking sizeof(size_t) == sizeof(unsigned int)" >&5 --echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned int)... $ECHO_C" >&6 +- echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5 +-echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --#line 25448 "configure" +-#line $LINENO "configure" -#include "confdefs.h" - +-#ifdef F77_DUMMY_MAIN +-# ifdef __cplusplus +- extern "C" +-# endif +- int F77_DUMMY_MAIN() { return 1; } +-#endif -int -main () -{ - -- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT +- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG - choke me - #endif - @@ -34,31 +31,31 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:11:35 dmcmahill Exp $ -} -_ACEOF -rm -f conftest.$ac_objext --if { (eval echo "$as_me:25464: \"$ac_compile\"") >&5 +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -- echo "$as_me:25467: \$? = $ac_status" >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:25470: \"$ac_try\"") >&5 +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -- echo "$as_me:25473: \$? = $ac_status" >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- echo "$as_me:25475: result: yes" >&5 +- echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 - -- echo "$as_me:25481: result: no" >&5 +- echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -- { { echo "$as_me:25483: error: -- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int) +- { { echo "$as_me:$LINENO: error: +- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long) - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&5 -echo "$as_me: error: -- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned int) +- Apparently on your system our assumption sizeof(size_t) == sizeof(unsigned long) - does not apply. Please mail kde-devel@kde.org with a description of your system! - " >&2;} - { (exit 1); exit 1; }; } @@ -66,10 +63,11 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:11:35 dmcmahill Exp $ -fi -rm -f conftest.$ac_objext conftest.$ac_ext - - echo "$as_me:25496: checking if it's safe to enable UTMP" >&5 +- + echo "$as_me:$LINENO: checking if it's safe to enable UTMP" >&5 echo $ECHO_N "checking if it's safe to enable UTMP... $ECHO_C" >&6 -@@ -26368,7 +26317,24 @@ if { (eval echo "$as_me:26358: \"$ac_lin +@@ -32958,7 +32900,24 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l (exit $ac_status); }; }; then ac_cv_have_dpms="-lXdpms" @@ -95,11 +93,3 @@ $NetBSD: patch-aa,v 1.4 2003/02/25 02:11:35 dmcmahill Exp $ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -@@ -29555,6 +29521,7 @@ echo $ECHO_N "checking if ksysguardd can - case "$host" in - *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; - *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; -+ *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; - *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; - *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;; - *) ksysguardd_compile=no; UNAME='' ;; diff --git a/x11/kdebase3/patches/patch-ab b/x11/kdebase3/patches/patch-ab index c28d194e96f..72218c1427b 100644 --- a/x11/kdebase3/patches/patch-ab +++ b/x11/kdebase3/patches/patch-ab @@ -1,56 +1,58 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:36 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2003/03/11 13:10:18 markd Exp $ ---- kate/app/Makefile.am.orig Thu Jan 10 17:03:37 2002 +--- kate/app/Makefile.am.orig Fri Dec 6 09:39:40 2002 +++ kate/app/Makefile.am -@@ -1,29 +1,35 @@ --lib_LTLIBRARIES = kate.la kwrite.la -+lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la +@@ -1,4 +1,4 @@ +-lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la ++lib_LTLIBRARIES = libkateinterfaces.la libkate_main.la kate.la libkwrite_main.la kwrite.la bin_PROGRAMS = kate kwrite --kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ -- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ -- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ -- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp -+libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ -+ kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ -+ katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ -+ katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ -+ kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ -+ kategrepdialog.cpp katefiledialog.cpp + libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ +@@ -10,31 +10,33 @@ libkateinterfaces_la_SOURCES = kateapp.c --kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript -+libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript + libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la + libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version +-kate_la_SOURCES = katemain.cpp +-kate_la_LIBADD = libkateinterfaces.la ++libkate_main_la_SOURCES = katemain.cpp ++libkate_main_la_LIBADD = libkateinterfaces.la +libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kate_la_SOURCES = dummy_main.cpp -+kate_la_LIBADD = libkate_main.la - kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version ++kate_la_LIBADD = libkate_main.la + kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version --kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp --kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la -+libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp -+libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la +-kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp +-kwrite_la_LIBADD = -lktexteditor ++libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ++libkwrite_main_la_LIBADD = -lktexteditor +libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kwrite_la_SOURCES = dummy_main.cpp -+kwrite_la_LIBADD = libkwrite_main.la ++kwrite_la_LIBADD = libkwrite_main.la kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version --kate_SOURCES = dummy.cpp +-kate_SOURCES = dummy_kate.cpp -kate_LDADD = kate.la +kate_SOURCES = dummy_main.cpp +kate_LDADD = libkate_main.la kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kwrite_SOURCES = dummy.cpp +-kwrite_SOURCES = dummy_kwrite.cpp -kwrite_LDADD = kwrite.la +kwrite_SOURCES = dummy_main.cpp +kwrite_LDADD = libkwrite_main.la kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) -- --dummy.cpp: -- echo > dummy.cpp - INCLUDES= -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) + dummy_kate_la.cpp: + echo > dummy_kate_la.cpp +-dummy_kate.cpp: +- echo > dummy_kate.cpp +- +-dummy_kwrite.cpp: +- echo > dummy_kwrite.cpp +- + METASOURCES = AUTO + + INCLUDES= -I../interfaces -I$(srcdir)/../lib $(all_includes) diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac index b7664ec9cc4..f3271aca729 100644 --- a/x11/kdebase3/patches/patch-ac +++ b/x11/kdebase3/patches/patch-ac @@ -1,458 +1,465 @@ -$NetBSD: patch-ac,v 1.3 2003/01/02 09:12:33 skrll Exp $ +$NetBSD: patch-ac,v 1.4 2003/03/11 13:10:18 markd Exp $ ---- kate/app/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kate/app/Makefile.in.orig Fri Jan 17 09:03:04 2003 +++ kate/app/Makefile.in -@@ -286,35 +286,45 @@ qt_libraries = @qt_libraries@ +@@ -284,7 +284,7 @@ qt_includes = @qt_includes@ + qt_libraries = @qt_libraries@ x_includes = @x_includes@ x_libraries = @x_libraries@ - --lib_LTLIBRARIES = kate.la kwrite.la -+lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la +-lib_LTLIBRARIES = libkateinterfaces.la kate.la kwrite.la ++lib_LTLIBRARIES = libkateinterfaces.la libkate_main.la kate.la libkwrite_main.la kwrite.la bin_PROGRAMS = kate kwrite --#>- kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ --#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ --#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ --#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ --#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp --#>+ 5 --kate_la_SOURCES=kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ -- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ -- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ -- kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp -+#>- libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ -+#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ -+#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ -+#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ -+#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ -+#>- kategrepdialog.cpp katefiledialog.cpp -+#>+ 6 -+libkate_main_la_SOURCES=kateapp.cpp kateconfigdialog.cpp \ -+ kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ -+ katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ -+ katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ -+ kateviewspace.cpp katemain.cpp \ -+ kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp - - --kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript -+libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript + #>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ +@@ -304,20 +304,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp + + libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la + libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version +-kate_la_SOURCES = katemain.cpp +-kate_la_LIBADD = libkateinterfaces.la ++libkate_main_la_SOURCES = katemain.cpp ++libkate_main_la_LIBADD = libkateinterfaces.la +libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kate_la_SOURCES = dummy_main.cpp +kate_la_LIBADD = libkate_main.la - kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version --kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp --kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la -+libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp -+libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la +-kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp +-kwrite_la_LIBADD = -lktexteditor ++libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ++libkwrite_main_la_LIBADD = -lktexteditor +libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +kwrite_la_SOURCES = dummy_main.cpp +kwrite_la_LIBADD = libkwrite_main.la kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version --kate_SOURCES = dummy.cpp +-kate_SOURCES = dummy_kate.cpp -kate_LDADD = kate.la +kate_SOURCES = dummy_main.cpp +kate_LDADD = libkate_main.la kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kwrite_SOURCES = dummy.cpp +-kwrite_SOURCES = dummy_kwrite.cpp -kwrite_LDADD = kwrite.la +kwrite_SOURCES = dummy_main.cpp +kwrite_LDADD = libkwrite_main.la kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) - INCLUDES = -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) -@@ -326,45 +336,55 @@ CONFIG_HEADER = $(top_builddir)/config.h + #>- METASOURCES = AUTO +@@ -329,19 +337,21 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) --kate_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la --am_kate_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ +-kate_la_DEPENDENCIES = libkateinterfaces.la +-am_kate_la_OBJECTS = katemain.lo +kate_la_DEPENDENCIES = libkate_main.la +am_kate_la_OBJECTS = dummy_main.lo -+#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) -+#>+ 1 + #>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) + #>+ 1 +-kate_la_OBJECTS = katemain.lo +-kwrite_la_DEPENDENCIES = +-am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo kwritedialogs.lo +kate_la_OBJECTS = dummy_main.lo +kwrite_la_DEPENDENCIES = libkwrite_main.la +am_kwrite_la_OBJECTS = dummy_main.lo -+#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) + #>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) +-#>+ 4 +-kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo +-kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo kwritedialogs.lo +-@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) +#>+ 1 +kwrite_la_OBJECTS = dummy_main.lo -+libkate_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -+am_libkate_main_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ - kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ - katefilelist.lo katefileselector.lo katemainwindow.lo \ - katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ - kateviewspace.lo katemain.lo kategrepdialog.lo \ - katefiledialog.lo --#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) ++libkate_main_la_DEPENDENCIES = libkateinterfaces.la ++am_libkate_main_la_OBJECTS = katemain.lo +#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS) - #>+ 9 --kate_la_final_OBJECTS = kate_la.all_cpp.lo --kate_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ -+libkate_main_la_final_OBJECTS = libkate_main_la.all_cpp.lo -+libkate_main_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ - kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ - katefilelist.lo katefileselector.lo katemainwindow.lo \ - katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ - kateviewspace.lo katemain.lo kategrepdialog.lo \ - katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo --@KDE_USE_FINAL_FALSE@kate_la_OBJECTS = $(kate_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kate_la_OBJECTS = $(kate_la_final_OBJECTS) --kwrite_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la --am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo --#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) -+@KDE_USE_FINAL_FALSE@libkate_main_la_OBJECTS = $(libkate_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkate_main_la_OBJECTS = $(libkate_main_la_final_OBJECTS) -+libkwrite_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la -+am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo ++#>+ 1 ++libkate_main_la_OBJECTS = katemain.lo + libkateinterfaces_la_DEPENDENCIES = \ + ../interfaces/libkateinterfacesprivate.la \ + ../lib/libkmultitabbar.la +@@ -364,19 +374,29 @@ libkateinterfaces_la_nofinal_OBJECTS = k + katedockcontainer.lo kateIface_skel.lo + @KDE_USE_FINAL_FALSE@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libkateinterfaces_la_OBJECTS = $(libkateinterfaces_la_final_OBJECTS) ++libkwrite_main_la_DEPENDENCIES = ++am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo \ ++ kwritedialogs.lo +#>- libkwrite_main_la_OBJECTS = $(am_libkwrite_main_la_OBJECTS) - #>+ 4 --kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo --kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo --@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) ++#>+ 5 +libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo -+libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo ++libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ ++ kwritedialogs.lo +@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) --am_kate_OBJECTS = dummy.$(OBJEXT) +-am_kate_OBJECTS = dummy_kate.$(OBJEXT) +am_kate_OBJECTS = dummy_main.$(OBJEXT) #>- kate_OBJECTS = $(am_kate_OBJECTS) #>+ 1 --kate_OBJECTS = dummy.$(OBJEXT) +-kate_OBJECTS = dummy_kate.$(OBJEXT) -kate_DEPENDENCIES = kate.la --am_kwrite_OBJECTS = dummy.$(OBJEXT) +-am_kwrite_OBJECTS = dummy_kwrite.$(OBJEXT) +kate_OBJECTS = dummy_main.$(OBJEXT) +kate_DEPENDENCIES = libkate_main.la +am_kwrite_OBJECTS = dummy_main.$(OBJEXT) #>- kwrite_OBJECTS = $(am_kwrite_OBJECTS) #>+ 1 --kwrite_OBJECTS = dummy.$(OBJEXT) +-kwrite_OBJECTS = dummy_kwrite.$(OBJEXT) -kwrite_DEPENDENCIES = kwrite.la +kwrite_OBJECTS = dummy_main.$(OBJEXT) +kwrite_DEPENDENCIES = libkwrite_main.la DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -372,7 +392,8 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -385,8 +405,8 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ -@@ -387,8 +408,9 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@ $(DEPDIR)/kateviewmanager.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kateviewspace.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kwritemain.Plo --#>+ 31 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/kate_la.all_cpp.P $(DEPDIR)/kwrite_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ -+#>+ 33 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/libkate_main_la.all_cpp.P $(DEPDIR)/libkwrite_main_la.all_cpp.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ -@@ -403,7 +425,8 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateviewmanager.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kateviewspace.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwritemain.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateappIface_skel.P $(DEPDIR)/kateIface_skel.P $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ -@@ -438,10 +461,11 @@ CXXLD = $(CXX) - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy_kate.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy_kwrite.Po \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ +@@ -409,8 +429,8 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritedialogs.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritemain.Plo + #>+ 47 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateIface_skel.P $(DEPDIR)/kwrite_la.all_cpp.P $(DEPDIR)/libkateinterfaces_la.all_cpp.P ./$(DEPDIR)/dummy_kate.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy_kwrite.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kateIface_skel.P $(DEPDIR)/libkateinterfaces_la.all_cpp.P $(DEPDIR)/libkwrite_main_la.all_cpp.P ./$(DEPDIR)/dummy_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ +@@ -432,8 +452,8 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kbookmarkhandler.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwritedialogs.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwritemain.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateIface_skel.P ./$(DEPDIR)/dummy_kate.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy_kwrite.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kateIface_skel.P ./$(DEPDIR)/dummy_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ +@@ -476,10 +496,10 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ --DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) \ + DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ +- $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) \ - $(kwrite_SOURCES) -+DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ -+ $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) \ -+ $(kate_SOURCES) $(kwrite_SOURCES) ++ $(libkate_main_la_SOURCES) $(libkateinterfaces_la_SOURCES) \ ++ $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) DIST_COMMON = Makefile.am Makefile.in --SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) -+SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) +-SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkateinterfaces_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) ++SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkateinterfaces_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) #>- all: all-am #>+ 1 -@@ -492,6 +516,10 @@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE +@@ -528,8 +548,12 @@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) +libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) + libkateinterfaces.la: $(libkateinterfaces_la_OBJECTS) $(libkateinterfaces_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkateinterfaces_la_LDFLAGS) $(libkateinterfaces_la_OBJECTS) $(libkateinterfaces_la_LIBADD) $(LIBS) +libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -529,7 +557,8 @@ mostlyclean-compile: +@@ -572,8 +596,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)/dummy_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateapp.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigdialog.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigplugindialogpage.Plo@am__quote@ -@@ -604,7 +633,7 @@ distclean-tags: - +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_kate.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_kwrite.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kactionselector.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kateapp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kateconfigdialog.Plo@am__quote@ +@@ -665,7 +689,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=katefilelist.cpp katemain.cpp katefiledialog.h katepluginmanager.h katefileselector.h kateviewmanager.cpp kateviewspace.h kateconsole.cpp kateconfigdialog.h kwritemain.h katedocmanager.cpp katefilelist.h katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kateapp.h kategrepdialog.cpp katedocmanager.h katesplitter.cpp katemain.h kateconfigplugindialogpage.h katesplitter.h kateappIface.h katemainwindow.h katepluginmanager.cpp kateviewmanager.h kateIface.h kategrepdialog.h -+KDE_DIST=katemain.cpp katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateappIface.h kateconfigplugindialogpage.h kateviewmanager.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h katefilelist.cpp kateconfigdialog.h katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katedocmanager.h katepluginmanager.cpp kateconfigplugindialogpage.cpp +-KDE_DIST=katefilelist.cpp katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h kategrepdialog.cpp katefileselector.h katedocmanager.h katesplitter.cpp kateviewmanager.cpp kateviewspace.h katemain.h katedockcontainer.cpp kateconsole.cpp kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h katepluginmanager.cpp kbookmarkhandler.h kateviewmanager.h katemailfilesdialog.cpp kateIface.h katedocmanager.cpp katefilelist.h kwritedialogs.h kbookmarkhandler.cpp katefileselector.cpp kateconsole.h kateviewspace.cpp katemainwindow.cpp kactionselector.cpp katedockcontainer.h kategrepdialog.h ++KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h kbookmarkhandler.h katemailfilesdialog.cpp kactionselector.cpp katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateviewmanager.cpp kwritedialogs.h kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedockcontainer.h kactionselector.h katefileselector.cpp katepluginmanager.h kateconsole.h katedockcontainer.cpp kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h katedocmanager.cpp katepluginmanager.cpp kbookmarkhandler.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -718,46 +747,37 @@ uninstall-am: uninstall-binPROGRAMS unin - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-info-am uninstall-libLTLIBRARIES +@@ -788,91 +812,85 @@ uninstall-am: uninstall-binPROGRAMS unin + dummy_kate_la.cpp: + echo > dummy_kate_la.cpp - --dummy.cpp: -- echo > dummy.cpp +-dummy_kate.cpp: +- echo > dummy_kate.cpp +- +-dummy_kwrite.cpp: +- echo > dummy_kwrite.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: --#>+ 9 --kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) -- $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) --kateappIface_skel.cpp: kateappIface.kidl -- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl --kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) -- $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) --kateIface_skel.cpp: kateIface.kidl -- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl -+#>+ 3 -+kateviewmanager.moc: $(srcdir)/kateviewmanager.h -+ $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc - #>+ 3 --kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h -- $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc -+katesplitter.moc: $(srcdir)/katesplitter.h -+ $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc ++katefilelist.moc: $(srcdir)/katefilelist.h ++ $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc ++ ++#>+ 3 + kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h + $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc #>+ 3 -kateconsole.moc: $(srcdir)/kateconsole.h - $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc -+katefileselector.moc: $(srcdir)/katefileselector.h -+ $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc ++kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h ++ $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc #>+ 3 --katemainwindow.moc: $(srcdir)/katemainwindow.h -- $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc -+katefilelist.moc: $(srcdir)/katefilelist.h -+ $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc + katemainwindow.moc: $(srcdir)/katemainwindow.h + $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc #>+ 3 -katedocmanager.moc: $(srcdir)/katedocmanager.h - $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc -+kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h -+ $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc ++katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h ++ $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc #>+ 3 -kategrepdialog.moc: $(srcdir)/kategrepdialog.h - $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc -+kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h -+ $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc ++kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h ++ $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc + + #>+ 3 +-kwritemain.moc: $(srcdir)/kwritemain.h +- $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc ++kactionselector.moc: $(srcdir)/kactionselector.h ++ $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc + + #>+ 3 +-kateviewspace.moc: $(srcdir)/kateviewspace.h +- $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc ++katedockcontainer.moc: $(srcdir)/katedockcontainer.h ++ $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc + + #>+ 3 +-kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h +- $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc ++kategrepdialog.moc: $(srcdir)/kategrepdialog.h ++ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc + + #>+ 3 +-katefiledialog.moc: $(srcdir)/katefiledialog.h +- $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc ++kateconsole.moc: $(srcdir)/kateconsole.h ++ $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc + + #>+ 3 + katefileselector.moc: $(srcdir)/katefileselector.h + $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc + + #>+ 3 +-katedockcontainer.moc: $(srcdir)/katedockcontainer.h +- $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc +- +-#>+ 3 +-katepluginmanager.moc: $(srcdir)/katepluginmanager.h +- $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc ++katesplitter.moc: $(srcdir)/katesplitter.h ++ $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc + + #>+ 3 +-katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h +- $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc ++kateviewmanager.moc: $(srcdir)/kateviewmanager.h ++ $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc #>+ 3 -katefilelist.moc: $(srcdir)/katefilelist.h - $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc -+katemainwindow.moc: $(srcdir)/katemainwindow.h -+ $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc ++kwritemain.moc: $(srcdir)/kwritemain.h ++ $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc #>+ 3 kateapp.moc: $(srcdir)/kateapp.h -@@ -772,32 +792,38 @@ kateviewspace.moc: $(srcdir)/kateviewspa - $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc + $(MOC) $(srcdir)/kateapp.h -o kateapp.moc #>+ 3 -katesplitter.moc: $(srcdir)/katesplitter.h - $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc -- --#>+ 3 ++kateviewspace.moc: $(srcdir)/kateviewspace.h ++ $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc + + #>+ 3 -kateviewmanager.moc: $(srcdir)/kateviewmanager.h - $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc +katefiledialog.moc: $(srcdir)/katefiledialog.h + $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc #>+ 3 --katefileselector.moc: $(srcdir)/katefileselector.h -- $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc +-kactionselector.moc: $(srcdir)/kactionselector.h +- $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc +katedocmanager.moc: $(srcdir)/katedocmanager.h + $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc #>+ 3 --katefiledialog.moc: $(srcdir)/katefiledialog.h -- $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc -+kategrepdialog.moc: $(srcdir)/kategrepdialog.h -+ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc - - #>+ 3 -kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h - $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc -+kateconsole.moc: $(srcdir)/kateconsole.h -+ $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc ++katepluginmanager.moc: $(srcdir)/katepluginmanager.h ++ $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc #>+ 3 - katepluginmanager.moc: $(srcdir)/katepluginmanager.h - $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc - -+#>+ 9 -+kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOP_DEPENDENCIES) -+ $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) -+kateappIface_skel.cpp: kateappIface.kidl -+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl -+kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES) -+ $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) -+kateIface_skel.cpp: kateIface.kidl -+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl -+ + kwritedialogs.moc: $(srcdir)/kwritedialogs.h +@@ -886,7 +904,7 @@ kateIface_skel.cpp: kateIface.kidl + #>+ 3 clean-metasources: -- -rm -f kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc katefilelist.moc kateapp.moc kwritemain.moc kateviewspace.moc katesplitter.moc kateviewmanager.moc katefileselector.moc katefiledialog.moc kateconfigplugindialogpage.moc katepluginmanager.moc -+ -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc +- -rm -f kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefiledialog.moc katefileselector.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc kwritedialogs.moc ++ -rm -f katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc katemailfilesdialog.moc kbookmarkhandler.moc kactionselector.moc katedockcontainer.moc kategrepdialog.moc kateconsole.moc katefileselector.moc katesplitter.moc kateviewmanager.moc kwritemain.moc kateapp.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc katepluginmanager.moc kwritedialogs.moc - #>+ 5 + #>+ 4 clean-idl: -@@ -816,45 +842,45 @@ force-reedit: +@@ -904,19 +922,7 @@ force-reedit: #>+ 11 --kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc katefilelist.moc kategrepdialog.moc kateapp.moc kateviewspace.moc kateviewmanager.moc katesplitter.moc katefiledialog.moc katefileselector.moc kateconfigplugindialogpage.moc katepluginmanager.moc -- @echo 'creating kate_la.all_cpp.cpp ...'; \ -- rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ -+libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc -+ @echo 'creating libkate_main_la.all_cpp.cpp ...'; \ -+ rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ - for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp ; do \ -- echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ - done; \ -- cat kate_la.all_cpp.final kate_la.all_cpp.files > kate_la.all_cpp.cpp; \ -- rm -f kate_la.all_cpp.final kate_la.all_cpp.files -+ cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ -+ rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files - - #>+ 11 --kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc +-kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp kwritemain.moc katefiledialog.moc kwritedialogs.moc - @echo 'creating kwrite_la.all_cpp.cpp ...'; \ - rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ -+libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwritemain.moc katefiledialog.moc +- for file in kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ; do \ +- echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ +- done; \ +- cat kwrite_la.all_cpp.final kwrite_la.all_cpp.files > kwrite_la.all_cpp.cpp; \ +- rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files +- +-#>+ 11 +-libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katefiledialog.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc ++libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp katefilelist.moc kbookmarkhandler.moc katemailfilesdialog.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kactionselector.moc katedockcontainer.moc kateconsole.moc kategrepdialog.moc katefileselector.moc katesplitter.moc kateviewmanager.moc kateapp.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc katepluginmanager.moc + @echo 'creating libkateinterfaces_la.all_cpp.cpp ...'; \ + rm -f libkateinterfaces_la.all_cpp.files libkateinterfaces_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkateinterfaces_la.all_cpp.final; \ +@@ -927,22 +933,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd + cat libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files > libkateinterfaces_la.all_cpp.cpp; \ + rm -f libkateinterfaces_la.all_cpp.final libkateinterfaces_la.all_cpp.files + ++#>+ 11 ++libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp kwritemain.moc katefiledialog.moc kwritedialogs.moc + @echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ + rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ - for file in kwritemain.cpp katefiledialog.cpp ; do \ -- echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ ++ for file in kwritemain.cpp katefiledialog.cpp kwritedialogs.cpp ; do \ + echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ - done; \ -- cat kwrite_la.all_cpp.final kwrite_la.all_cpp.files > kwrite_la.all_cpp.cpp; \ -- rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files ++ done; \ + cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ + rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files - ++ #>+ 3 clean-final: -- -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp -+ -rm -f libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp +- -rm -f kwrite_la.all_cpp.cpp libkateinterfaces_la.all_cpp.cpp ++ -rm -f libkateinterfaces_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am -+ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" all-am ++ $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am -+ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" install-am ++ $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am +- $(MAKE) kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkateinterfaces_la_OBJECTS="$(libkateinterfaces_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -864,33 +890,33 @@ kde-rpo-clean: +@@ -952,43 +970,43 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 31 + #>+ 41 -kategrepdialog.o: kategrepdialog.moc -kateapp.o: kateapp.moc -katesplitter.lo: katesplitter.moc --kateconsole.lo: kateconsole.moc ++kateapp.lo: kateapp.moc ++katemainwindow.lo: katemainwindow.moc ++kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc ++katemailfilesdialog.o: katemailfilesdialog.moc ++katefileselector.o: katefileselector.moc + kateconsole.lo: kateconsole.moc + kbookmarkhandler.o: kbookmarkhandler.moc +-kactionselector.o: kactionselector.moc -kategrepdialog.lo: kategrepdialog.moc ++kateapp.o: kateapp.moc ++katefiledialog.lo: katefiledialog.moc ++katefiledialog.o: katefiledialog.moc ++katedocmanager.lo: katedocmanager.moc + katesplitter.o: katesplitter.moc -katefileselector.lo: katefileselector.moc --katesplitter.o: katesplitter.moc --kwritemain.o: kwritemain.moc + kwritemain.o: kwritemain.moc +-kwritedialogs.lo: kwritedialogs.moc -kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc -+kwritemain.lo: kwritemain.moc -+kateapp.lo: kateapp.moc - kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc +-katedockcontainer.lo: katedockcontainer.moc +-kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc -katefileselector.o: katefileselector.moc -katefiledialog.o: katefiledialog.moc -kateconsole.o: kateconsole.moc ++katemailfilesdialog.lo: katemailfilesdialog.moc ++katefilelist.lo: katefilelist.moc + kactionselector.lo: kactionselector.moc -kateviewmanager.o: kateviewmanager.moc - katemainwindow.lo: katemainwindow.moc -+kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc +-katemainwindow.lo: katemainwindow.moc ++katesplitter.lo: katesplitter.moc ++kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc ++kwritemain.lo: kwritemain.moc + kwritedialogs.o: kwritedialogs.moc ++kwritedialogs.lo: kwritedialogs.moc +kategrepdialog.o: kategrepdialog.moc +kateviewspace.o: kateviewspace.moc +katepluginmanager.lo: katepluginmanager.moc kateconfigdialog.o: kateconfigdialog.moc -kwritemain.lo: kwritemain.moc -kateviewmanager.lo: kateviewmanager.moc +-katefiledialog.lo: katefiledialog.moc + katedockcontainer.o: katedockcontainer.moc +-kbookmarkhandler.lo: kbookmarkhandler.moc ++kactionselector.o: kactionselector.moc +katepluginmanager.o: katepluginmanager.moc -+katefileselector.o: katefileselector.moc +kateconsole.o: kateconsole.moc -+kateconsole.lo: kateconsole.moc +kategrepdialog.lo: kategrepdialog.moc -+kateapp.o: kateapp.moc +katefilelist.o: katefilelist.moc - katefiledialog.lo: katefiledialog.moc katemainwindow.o: katemainwindow.moc -+katefiledialog.o: katefiledialog.moc +-katedocmanager.lo: katedocmanager.moc +kateviewmanager.o: kateviewmanager.moc - katedocmanager.lo: katedocmanager.moc ++kbookmarkhandler.lo: kbookmarkhandler.moc +kateviewspace.lo: kateviewspace.moc -+katesplitter.o: katesplitter.moc katedocmanager.o: katedocmanager.moc -+kwritemain.o: kwritemain.moc -+katefileselector.lo: katefileselector.moc -+kateviewmanager.lo: kateviewmanager.moc ++katedockcontainer.lo: katedockcontainer.moc kateconfigdialog.lo: kateconfigdialog.moc -katepluginmanager.lo: katepluginmanager.moc - katefilelist.lo: katefilelist.moc +-katemailfilesdialog.o: katemailfilesdialog.moc +-katemailfilesdialog.lo: katemailfilesdialog.moc +-katefilelist.lo: katefilelist.moc -katepluginmanager.o: katepluginmanager.moc -kateviewspace.o: kateviewspace.moc -kateviewspace.lo: kateviewspace.moc --kateapp.lo: kateapp.moc -katefilelist.o: katefilelist.moc -+katesplitter.lo: katesplitter.moc +-kateapp.lo: kateapp.moc ++katefileselector.lo: katefileselector.moc ++kateviewmanager.lo: kateviewmanager.moc diff --git a/x11/kdebase3/patches/patch-ae b/x11/kdebase3/patches/patch-ae index 012036ef44e..c7277c81247 100644 --- a/x11/kdebase3/patches/patch-ae +++ b/x11/kdebase3/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2002/08/25 19:23:36 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2003/03/11 13:10:18 markd Exp $ ---- kate/app/katemain.cpp.orig Sun Feb 24 23:16:06 2002 +--- kate/app/katemain.cpp.orig Fri Dec 6 09:39:41 2002 +++ kate/app/katemain.cpp -@@ -36,7 +36,9 @@ +@@ -36,7 +36,9 @@ static KCmdLineOptions options[] = { 0,0,0 } }; @@ -11,5 +11,5 @@ $NetBSD: patch-ae,v 1.2 2002/08/25 19:23:36 jlam Exp $ + +int kdemain( int argc, char **argv ) { - KAboutData *data = new KAboutData ("kate", I18N_NOOP("Kate"), "2.0", + KAboutData *data = new KAboutData ("kate", I18N_NOOP("Kate"), "2.1", I18N_NOOP( "Kate - KDE Advanced Text Editor" ), KAboutData::License_GPL, diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai index 484797a69e8..078275c8c91 100644 --- a/x11/kdebase3/patches/patch-ai +++ b/x11/kdebase3/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ +$NetBSD: patch-ai,v 1.5 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/access/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kcontrol/access/Makefile.in.orig Fri Jan 17 09:03:04 2003 +++ kcontrol/access/Makefile.in -@@ -291,16 +291,20 @@ INCLUDES = $(all_includes) +@@ -290,16 +290,20 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kaccess @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -318,27 +322,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -317,27 +321,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -72,31 +72,30 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -346,13 +355,16 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -346,12 +355,18 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kaccess.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo -#>+ 5 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaccess_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+#>+ 7 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaccess_main_la.all_cpp.P $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaccess_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \ ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaccess_main_la.all_cpp.P ./$(DEPDIR)/kaccess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kaccess.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -374,13 +386,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -374,13 +389,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \ @@ -112,36 +111,36 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ #>- all: all-am #>+ 1 -@@ -453,6 +465,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc +@@ -460,6 +475,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc @KDE_USE_CLOSURE_TRUE@kcm_access.la: kcm_access.la.closure $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@kcm_access.la: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(kcm_access_la_LDFLAGS) $(kcm_access_la_OBJECTS) $(kcm_access_la_LIBADD) $(LIBS) +libkaccess_main.la: $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkaccess_main_la_LDFLAGS) $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -487,8 +501,9 @@ mostlyclean-compile: +@@ -499,8 +516,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)/kaccess.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaccess_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaccess_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmaccess.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - -@@ -583,7 +598,7 @@ distclean-tags: +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaccess.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaccess_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaccess_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmaccess.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ +@@ -609,7 +627,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kaccess.h kcmaccess.desktop configure.in.in kaccess.desktop -+KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h +-KDE_DIST=kaccess.h configure.in.in kcmaccess.desktop kaccess.desktop ++KDE_DIST=kcmaccess.desktop kaccess.desktop kaccess.h configure.in.in DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -713,21 +728,18 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -745,21 +763,18 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot @@ -167,7 +166,7 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ #>+ 8 kcm_access.la.closure: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) @echo "int main() {return 0;}" > kcm_access_la_closure.cpp -@@ -739,7 +751,7 @@ kcm_access.la.closure: $(kcm_access_la_O +@@ -771,7 +786,7 @@ kcm_access.la.closure: $(kcm_access_la_O #>+ 3 clean-metasources: @@ -176,7 +175,7 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ #>+ 3 clean-closures: -@@ -756,33 +768,33 @@ force-reedit: +@@ -788,33 +803,33 @@ force-reedit: #>+ 11 @@ -223,7 +222,7 @@ $NetBSD: patch-ai,v 1.4 2003/01/02 09:12:33 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -792,7 +804,7 @@ kde-rpo-clean: +@@ -824,7 +839,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-ak b/x11/kdebase3/patches/patch-ak index 3ac4b1f5631..1817a6d4473 100644 --- a/x11/kdebase3/patches/patch-ak +++ b/x11/kdebase3/patches/patch-ak @@ -1,15 +1,15 @@ -$NetBSD: patch-ak,v 1.2 2002/08/25 19:23:36 jlam Exp $ +$NetBSD: patch-ak,v 1.3 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/access/main.cpp.orig Mon Jan 7 10:39:46 2002 +--- kcontrol/access/main.cpp.orig Fri Dec 6 09:39:48 2002 +++ kcontrol/access/main.cpp -@@ -11,7 +11,9 @@ - "with disabilities."); +@@ -5,7 +5,9 @@ + #include <kaboutdata.h> + #include <kcmdlineargs.h> - --int main(int argc, char *argv[]) +-int main(int argc, char * argv[] ) +extern "C" int kdemain(int, char *[]); + +int kdemain(int argc, char *argv[]) { - KAboutData about("kaccess", I18N_NOOP("KDE Accessibility Tool"), "0.1", - DESCRIPTION, KAboutData::License_QPL, + KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("KDE Accessibility Tool"), + 0, 0, KAboutData::License_GPL, diff --git a/x11/kdebase3/patches/patch-al b/x11/kdebase3/patches/patch-al index 3f134455190..c1495ef018b 100644 --- a/x11/kdebase3/patches/patch-al +++ b/x11/kdebase3/patches/patch-al @@ -1,9 +1,9 @@ -$NetBSD: patch-al,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-al,v 1.3 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/ebrowsing/Makefile.am.orig Tue Feb 19 13:43:23 2002 +--- kcontrol/ebrowsing/Makefile.am.orig Sun Oct 27 11:04:51 2002 +++ kcontrol/ebrowsing/Makefile.am -@@ -10,7 +10,7 @@ - +@@ -8,7 +8,7 @@ METASOURCES = AUTO + kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp -kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am index 965989016cd..ab48323d332 100644 --- a/x11/kdebase3/patches/patch-am +++ b/x11/kdebase3/patches/patch-am @@ -1,9 +1,9 @@ -$NetBSD: patch-am,v 1.3 2003/01/02 09:12:33 skrll Exp $ +$NetBSD: patch-am,v 1.4 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/ebrowsing/Makefile.in.orig Tue Nov 26 12:01:10 2002 +--- kcontrol/ebrowsing/Makefile.in.orig Fri Jan 17 09:03:04 2003 +++ kcontrol/ebrowsing/Makefile.in -@@ -298,7 +298,7 @@ kde_module_LTLIBRARIES = kcm_kurifilt.la - +@@ -294,7 +294,7 @@ INCLUDES = -I$(srcdir)/plugins/ikws $(al + kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp -kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined @@ -11,12 +11,12 @@ $NetBSD: patch-am,v 1.3 2003/01/02 09:12:33 skrll Exp $ kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) data_DATA = ebrowsing.desktop -@@ -549,7 +549,7 @@ distclean-tags: - +@@ -561,7 +561,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=main.h filteropts.h ebrowsing.desktop -+KDE_DIST=main.h ebrowsing.desktop filteropts.h +-KDE_DIST=filteropts.h main.h ebrowsing.desktop ++KDE_DIST=ebrowsing.desktop filteropts.h main.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) diff --git a/x11/kdebase3/patches/patch-an b/x11/kdebase3/patches/patch-an index 7c263a3bcd1..0a66b1ef8cc 100644 --- a/x11/kdebase3/patches/patch-an +++ b/x11/kdebase3/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-an,v 1.3 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/kcontrol/Makefile.am.orig Wed May 8 19:21:01 2002 +--- kcontrol/kcontrol/Makefile.am.orig Fri Jan 3 17:41:16 2003 +++ kcontrol/kcontrol/Makefile.am -@@ -22,41 +22,52 @@ +@@ -22,41 +22,52 @@ METASOURCES = AUTO SUBDIRS = . pics @@ -74,8 +74,8 @@ $NetBSD: patch-an,v 1.2 2002/08/25 19:23:37 jlam Exp $ +kcminit_LDADD = libkcminit_main.la kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - rcdir = $(kde_datadir)/kcontrol -@@ -71,6 +82,3 @@ + rccontroldir = $(kde_datadir)/kcontrol +@@ -81,6 +92,3 @@ EXTRA_DIST = $(data_DATA) messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao index f40ec5f3611..9f04971a44b 100644 --- a/x11/kdebase3/patches/patch-ao +++ b/x11/kdebase3/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ +$NetBSD: patch-ao,v 1.4 2003/03/11 13:10:19 markd Exp $ ---- kcontrol/kcontrol/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kcontrol/kcontrol/Makefile.in.orig Fri Jan 17 09:03:05 2003 +++ kcontrol/kcontrol/Makefile.in -@@ -310,52 +310,65 @@ INCLUDES = $(all_includes) +@@ -309,52 +309,65 @@ INCLUDES = $(all_includes) SUBDIRS = . pics @@ -94,8 +94,8 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ +kcminit_LDADD = libkcminit_main.la kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic - rcdir = $(kde_datadir)/kcontrol -@@ -372,7 +385,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + rccontroldir = $(kde_datadir)/kcontrol +@@ -373,7 +386,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -104,7 +104,7 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 -@@ -380,50 +393,68 @@ kcminit_la_final_OBJECTS = kcminit_la.al +@@ -381,50 +394,68 @@ kcminit_la_final_OBJECTS = kcminit_la.al kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo @KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) @@ -196,80 +196,71 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -432,40 +463,49 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ +@@ -434,11 +465,17 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo --#>+ 27 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ -+#>+ 33 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P $(DEPDIR)/aboutwidget.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/proxywidget.Plo $(DEPDIR)/quickhelp.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/searchwidget.Plo $(DEPDIR)/toplevel.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/aboutwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ -@@ -492,8 +532,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/aboutwidget.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/indexwidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcminit_main.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcrootonly.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/modloader.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ +@@ -449,13 +486,19 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/quickhelp.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/searchwidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo +-#>+ 33 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/kcmshell_la.all_cpp.P $(DEPDIR)/kcontrol_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ ++#>+ 45 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P $(DEPDIR)/kcminit_la.all_cpp.P $(DEPDIR)/libkcminit_main_la.all_cpp.P $(DEPDIR)/libkcmshell_main_la.all_cpp.P $(DEPDIR)/libkcontrol_main_la.all_cpp.P ./$(DEPDIR)/aboutwidget.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/indexwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcminit_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrootonly.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/modloader.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ +@@ -467,11 +510,17 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/searchwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kcdialog_skel.P $(DEPDIR)/moduleIface_skel.P ./$(DEPDIR)/aboutwidget.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo ./$(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dockcontainer.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/global.Plo ./$(DEPDIR)/helpwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/indexwidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcdialog.Plo ./$(DEPDIR)/kcminit.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo ./$(DEPDIR)/kcrootonly.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcminit_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmshell_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcontrol_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcrootonly.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/modloader.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ +@@ -503,8 +552,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ @@ -278,10 +269,10 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ + $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) \ + $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) \ + $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) - DATA = $(data_DATA) $(rc_DATA) + DATA = $(data_DATA) $(rccontrol_DATA) $(rcinfo_DATA) -@@ -503,7 +544,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -514,7 +564,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -290,7 +281,7 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -556,6 +597,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc +@@ -565,6 +615,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) @@ -300,46 +291,46 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ + $(CXXLINK) -rpath $(libdir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) +libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -598,13 +645,17 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dockcontainer.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/global.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/helpwidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/indexwidget.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcdialog.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcminit.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcminit_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell_main.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcontrol_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcontrol_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcrootonly.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kecdialog.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -770,7 +821,7 @@ distclean-tags: - +@@ -612,13 +668,17 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aboutwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockcontainer.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/global.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/helpwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indexwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcminit.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcminit_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmshell.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmshell_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmshell_main.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcontrol_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcontrol_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcrootonly.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kecdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ +@@ -816,7 +876,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=quickhelp.cpp moduletreeview.cpp aboutwidget.h toplevel.h hi48-app-kcontrol.png modules.cpp kcontrolui.rc helpwidget.h main.h searchwidget.h proxywidget.cpp moduleIface.cpp hi16-app-kcontrol.png dockcontainer.h kcdialog.cpp kecdialog.h KControl.desktop modules.h modloader.h moduleiconview.cpp hi32-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h helpwidget.cpp global.h modulemenu.h kcrootonly.cpp modulemenu.cpp kcmshell.h moduleinfo.h moduletreeview.h moduleiconview.h dockcontainer.cpp aboutwidget.cpp version.h indexwidget.h moduleIface.h kcrootonly.h -+KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h +-KDE_DIST=cr32-app-kcontrol.png quickhelp.cpp cr48-app-kcontrol.png kcdialog.h proxywidget.h moduletreeview.cpp quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png helpwidget.cpp aboutwidget.h global.h toplevel.h modulemenu.h kcrootonly.cpp modulemenu.cpp kinfocenterui.rc modules.cpp kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h proxywidget.cpp moduleIface.cpp moduleiconview.h dockcontainer.cpp dockcontainer.h kcdialog.cpp kecdialog.h cr16-app-kcontrol.png aboutwidget.cpp version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h moduleiconview.cpp kcrootonly.h ++KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h aboutwidget.cpp quickhelp.h cr128-app-kcontrol.png searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h kinfocenter.desktop kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop cr48-app-kcontrol.png moduletreeview.cpp proxywidget.cpp modules.h version.h cr16-app-kcontrol.png quickhelp.cpp moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -832,7 +883,6 @@ install-strip: +@@ -884,7 +944,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -915,84 +965,81 @@ uninstall-info: uninstall-info-recursive + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -981,84 +1040,81 @@ install-data-local: KControl_NoDisplay.d messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot @@ -458,7 +449,7 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ #>+ 5 kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) -@@ -1008,7 +1055,7 @@ moduleIface_skel.cpp: moduleIface.kidl +@@ -1074,7 +1130,7 @@ moduleIface_skel.cpp: moduleIface.kidl #>+ 3 clean-metasources: @@ -467,7 +458,7 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ #>+ 5 clean-idl: -@@ -1053,45 +1100,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi +@@ -1125,45 +1181,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files #>+ 11 @@ -546,7 +537,7 @@ $NetBSD: patch-ao,v 1.3 2003/01/02 09:12:33 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1101,39 +1160,39 @@ kde-rpo-clean: +@@ -1173,39 +1241,39 @@ kde-rpo-clean: -rm -f *.rpo #>+ 37 diff --git a/x11/kdebase3/patches/patch-au b/x11/kdebase3/patches/patch-au index fc8a1ff8108..5ebacd97a6e 100644 --- a/x11/kdebase3/patches/patch-au +++ b/x11/kdebase3/patches/patch-au @@ -1,8 +1,8 @@ -$NetBSD: patch-au,v 1.2 2002/08/25 19:23:37 jlam Exp $ +$NetBSD: patch-au,v 1.3 2003/03/11 13:10:20 markd Exp $ ---- kcontrol/kcontrol/main.cpp.orig Wed May 8 19:21:01 2002 +--- kcontrol/kcontrol/main.cpp.orig Sun Sep 22 04:54:58 2002 +++ kcontrol/kcontrol/main.cpp -@@ -86,7 +86,9 @@ +@@ -86,7 +86,9 @@ KControlApp::~KControlApp() delete toplevel; } @@ -11,5 +11,5 @@ $NetBSD: patch-au,v 1.2 2002/08/25 19:23:37 jlam Exp $ + +int kdemain(int argc, char *argv[]) { - KAboutData aboutData( "kcontrol", I18N_NOOP("KDE Control Center"), - KCONTROL_VERSION, I18N_NOOP("The KDE Control Center"), KAboutData::License_GPL, + KLocale::setMainCatalogue("kcontrol"); + KAboutData aboutKControl( "kcontrol", I18N_NOOP("KDE Control Center"), diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw index 146f0c7e683..853e5384b67 100644 --- a/x11/kdebase3/patches/patch-aw +++ b/x11/kdebase3/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-aw,v 1.4 2003/03/11 13:10:20 markd Exp $ ---- kdeprint/kjobviewer/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kdeprint/kjobviewer/Makefile.in.orig Fri Jan 17 09:03:06 2003 +++ kdeprint/kjobviewer/Makefile.in -@@ -289,15 +289,20 @@ x_libraries = @x_libraries@ +@@ -287,15 +287,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kjobviewer @@ -28,7 +28,7 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h -@@ -315,22 +320,27 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -313,22 +318,27 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -65,31 +65,31 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -338,13 +348,16 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -337,13 +347,16 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kjobviewer.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo -#>+ 5 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kjobviewer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kjobviewer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kjobviewer.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Po ./$(DEPDIR)/main.Plo +#>+ 7 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkjobviewer_main_la.all_cpp.P $(DEPDIR)/kjobviewer.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkjobviewer_main_la.all_cpp.P ./$(DEPDIR)/kjobviewer.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Po ./$(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kjobviewer.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kjobviewer_main.Po ./$(DEPDIR)/main.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -365,13 +378,14 @@ CXXLD = $(CXX) +@@ -364,13 +377,14 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -106,36 +106,36 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>- all: all-am #>+ 1 -@@ -420,6 +434,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -417,6 +431,8 @@ clean-libLTLIBRARIES: + done kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) +libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -454,8 +470,9 @@ mostlyclean-compile: +@@ -456,8 +472,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)/kjobviewer.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kjobviewer_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kjobviewer_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kjobviewer.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kjobviewer_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kjobviewer_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -549,7 +566,7 @@ distclean-tags: - +@@ -565,7 +582,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png -+KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop +-KDE_DIST=kjobviewerui.rc cr16-app-kjobviewer.png cr32-app-kjobviewer.png kjobviewer.desktop ++KDE_DIST=kjobviewerui.rc cr16-app-kjobviewer.png kjobviewer.desktop cr32-app-kjobviewer.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -670,9 +687,6 @@ uninstall-am: uninstall-kde-icons unins +@@ -692,9 +709,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-info-am uninstall-libLTLIBRARIES uninstall-rcDATA @@ -145,7 +145,7 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. -@@ -684,8 +698,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h +@@ -706,8 +720,12 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc #>+ 3 @@ -159,7 +159,7 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 2 docs-am: -@@ -709,33 +727,33 @@ force-reedit: +@@ -731,33 +749,33 @@ force-reedit: #>+ 11 @@ -206,7 +206,7 @@ $NetBSD: patch-aw,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -745,5 +763,5 @@ kde-rpo-clean: +@@ -767,5 +785,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-az b/x11/kdebase3/patches/patch-az index 91e6dfba407..dc4999f1771 100644 --- a/x11/kdebase3/patches/patch-az +++ b/x11/kdebase3/patches/patch-az @@ -1,6 +1,6 @@ -$NetBSD: patch-az,v 1.2 2002/08/25 19:23:38 jlam Exp $ +$NetBSD: patch-az,v 1.3 2003/03/11 13:10:21 markd Exp $ ---- kdesktop/Makefile.am.orig Wed May 8 19:21:24 2002 +--- kdesktop/Makefile.am.orig Mon Sep 16 09:08:45 2002 +++ kdesktop/Makefile.am @@ -1,10 +1,16 @@ ## Makefile.am of kdebase/kdesktop @@ -21,17 +21,16 @@ $NetBSD: patch-az,v 1.2 2002/08/25 19:23:38 jlam Exp $ SUBDIRS = . lock pics patterns programs init kwebdesktop -@@ -12,15 +18,17 @@ +@@ -12,15 +18,17 @@ SUBDIRS = . lock pics patterns programs - bin_PROGRAMS = kdesktop kdmdesktop + bin_PROGRAMS = kdesktop bin_SCRIPTS = kdeeject -lib_LTLIBRARIES = kdesktop.la +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la --kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ -- lockeng.cc KDesktopIface.skel \ -+libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ -+ desktop.cc main.cc lockeng.cc KDesktopIface.skel \ +-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ ++libkdesktop_main_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ + lockeng.cc KDesktopIface.skel \ bgmanager.cc init.cc KScreensaverIface.skel \ minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ startupid.cpp diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba index 87f43511386..f37ee472bdb 100644 --- a/x11/kdebase3/patches/patch-ba +++ b/x11/kdebase3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-ba,v 1.4 2003/03/11 13:10:21 markd Exp $ ---- kdesktop/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kdesktop/Makefile.in.orig Fri Jan 17 09:03:06 2003 +++ kdesktop/Makefile.in -@@ -287,10 +287,17 @@ x_includes = @x_includes@ +@@ -286,10 +286,17 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) @@ -22,25 +22,23 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ SUBDIRS = . lock pics patterns programs init kwebdesktop -@@ -298,22 +305,24 @@ SUBDIRS = . lock pics patterns programs +@@ -297,22 +304,24 @@ SUBDIRS = . lock pics patterns programs ####### Files - bin_PROGRAMS = kdesktop kdmdesktop + bin_PROGRAMS = kdesktop bin_SCRIPTS = kdeeject -lib_LTLIBRARIES = kdesktop.la +lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la --#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ --#>- lockeng.cc KDesktopIface.skel \ -+#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ -+#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ +-#>- kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ ++#>- libkdesktop_main_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ + #>- lockeng.cc KDesktopIface.skel \ #>- bgmanager.cc init.cc KScreensaverIface.skel \ #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ #>- startupid.cpp #>+ 5 --kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ -- lockeng.cc \ -+libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc \ -+ desktop.cc main.cc lockeng.cc \ +-kdesktop_la_SOURCES=main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ ++libkdesktop_main_la_SOURCES=main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \ + lockeng.cc \ bgmanager.cc init.cc \ minicli.cpp pixmapserver.cc kcustommenu.cc \ startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc @@ -53,36 +51,40 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h -@@ -339,27 +348,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -334,27 +343,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ +- $(top_builddir)/kcontrol/background/libbgnd.la +-am_kdesktop_la_OBJECTS = main.lo krootwm.lo xautolock.lo kdiconview.lo \ +- desktop.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ +- pixmapserver.lo kcustommenu.lo startupid.lo +kdesktop_la_DEPENDENCIES = libkdesktop_main.la +am_kdesktop_la_OBJECTS = kdesktop_main.lo -+#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) + #>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) +#>+ 1 +kdesktop_la_OBJECTS = kdesktop_main.lo +libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ - $(top_builddir)/kcontrol/background/libbgnd.la --am_kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ -+am_libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ - desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo --#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) ++ $(top_builddir)/kcontrol/background/libbgnd.la ++am_libkdesktop_main_la_OBJECTS = main.lo krootwm.lo xautolock.lo \ ++ kdiconview.lo desktop.lo lockeng.lo bgmanager.lo init.lo \ ++ minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo +#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) #>+ 6 -kdesktop_la_final_OBJECTS = kdesktop_la.all_cc.lo kdesktop_la.all_cpp.lo --kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ -+libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo -+libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ - desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ - pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo +-kdesktop_la_nofinal_OBJECTS = main.lo krootwm.lo xautolock.lo kdiconview.lo \ +- desktop.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ +- pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo -@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) ++libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo ++libkdesktop_main_la_nofinal_OBJECTS = main.lo krootwm.lo xautolock.lo \ ++ kdiconview.lo desktop.lo lockeng.lo bgmanager.lo init.lo \ ++ minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo +@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) - bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) + bin_PROGRAMS = kdesktop$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kdesktop_OBJECTS = dummy.$(OBJEXT) @@ -93,95 +95,99 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ -kdesktop_DEPENDENCIES = kdesktop.la +kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) +kdesktop_DEPENDENCIES = libkdesktop_main.la - am_kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) - #>- kdmdesktop_OBJECTS = $(am_kdmdesktop_OBJECTS) - #>+ 1 -@@ -375,23 +389,26 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ + SCRIPTS = $(bin_SCRIPTS) + + +@@ -366,25 +380,31 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo --#>+ 15 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ -+#>+ 17 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/libkdesktop_main_la.all_cpp.P $(DEPDIR)/libkdesktop_main_la.all_cc.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/startupid.Plo $(DEPDIR)/xautolock.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ -@@ -424,8 +441,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bgmanager.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenu.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/minicli.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/pixmapserver.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/startupid.Plo ./$(DEPDIR)/xautolock.Plo +-#>+ 17 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P ./$(DEPDIR)/bgmanager.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ ++#>+ 21 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/libkdesktop_main_la.all_cpp.P $(DEPDIR)/libkdesktop_main_la.all_cc.P ./$(DEPDIR)/bgmanager.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenu.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/minicli.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pixmapserver.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/startupid.Plo ./$(DEPDIR)/xautolock.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P ./$(DEPDIR)/bgmanager.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/init.Plo ./$(DEPDIR)/kcustommenu.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktop.Plo ./$(DEPDIR)/init.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcustommenu.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdesktop_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdiconview.Plo ./$(DEPDIR)/krootwm.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/lockeng.Plo ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/minicli.Plo \ +@@ -418,7 +438,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $( CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ --DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) \ -- $(kdmdesktop_SOURCES) +-DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) +DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \ -+ $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) ++ $(kdesktop_SOURCES) DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -438,7 +455,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -431,7 +452,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) --SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) -+SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) +-SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) ++SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) #>- all: all-recursive #>+ 1 -@@ -487,6 +504,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -478,6 +499,8 @@ clean-libLTLIBRARIES: + done kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) +libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -547,9 +566,10 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bgmanager.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktop.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/init.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcustommenu.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdesktop_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdesktop_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdiconview.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdmdesktop.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/krootwm.Plo@am__quote@ -@@ -746,7 +766,7 @@ distclean-tags: - +@@ -539,9 +562,10 @@ distclean-compile: + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgmanager.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktop.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcustommenu.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdesktop_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdesktop_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdiconview.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krootwm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lockeng.Plo@am__quote@ +@@ -752,7 +776,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcustommenu.h kdesktopbindings.cpp pixmapserver.cc DESIGN lockeng.cc kdesktop.desktop kdesktop_custom_menu1 minicli.cpp startupid.cpp kdiconview.h kcustommenu.cc bgmanager.cc kdeeject kdesktop_custom_menu2 init.cc kdmdesktop.h -+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc main.cc desktop.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc kdmdesktop.h +-KDE_DIST=kcustommenu.h kdesktopbindings.cpp pixmapserver.cc DESIGN lockeng.cc kdesktop.desktop kdesktop_custom_menu1 minicli.cpp startupid.cpp kdiconview.h kcustommenu.cc bgmanager.cc kdeeject kdesktop_custom_menu2 init.cc ++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -900,67 +920,67 @@ dummy.cc: +@@ -912,35 +936,21 @@ dummy.cc: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -199,25 +205,21 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ -KBackgroundIface_skel.cc: KBackgroundIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl - --#>+ 3 + #>+ 3 -krootwm.moc: $(srcdir)/krootwm.h - $(MOC) $(srcdir)/krootwm.h -o krootwm.moc -- - #>+ 3 --minicli.moc: $(srcdir)/minicli.h -- $(MOC) $(srcdir)/minicli.h -o minicli.moc +xautolock.moc: $(srcdir)/xautolock.h + $(MOC) $(srcdir)/xautolock.h -o xautolock.moc #>+ 3 --startupid.moc: $(srcdir)/startupid.h -- $(MOC) $(srcdir)/startupid.h -o startupid.moc +-minicli.moc: $(srcdir)/minicli.h +- $(MOC) $(srcdir)/minicli.h -o minicli.moc +lockeng.moc: $(srcdir)/lockeng.h + $(MOC) $(srcdir)/lockeng.h -o lockeng.moc #>+ 3 --kdmdesktop.moc: $(srcdir)/kdmdesktop.h -- $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc +-startupid.moc: $(srcdir)/startupid.h +- $(MOC) $(srcdir)/startupid.h -o startupid.moc +bgmanager.moc: $(srcdir)/bgmanager.h + $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc @@ -229,14 +231,7 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 desktop.moc: $(srcdir)/desktop.h - $(MOC) $(srcdir)/desktop.h -o desktop.moc - - #>+ 3 -+kdmdesktop.moc: $(srcdir)/kdmdesktop.h -+ $(MOC) $(srcdir)/kdmdesktop.h -o kdmdesktop.moc -+ -+#>+ 3 - pixmapserver.moc: $(srcdir)/pixmapserver.h +@@ -951,24 +961,38 @@ pixmapserver.moc: $(srcdir)/pixmapserver $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc #>+ 3 @@ -278,20 +273,20 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 clean-metasources: -- -rm -f krootwm.moc minicli.moc startupid.moc kdmdesktop.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc -+ -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +- -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc ++ -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc #>+ 6 clean-idl: -@@ -980,45 +1000,45 @@ force-reedit: +@@ -988,45 +1012,45 @@ force-reedit: #>+ 11 --kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc +-kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc - @echo 'creating kdesktop_la.all_cc.cc ...'; \ - rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ - echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ -- for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ +- for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ +libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc @@ -315,11 +310,11 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ - for file in minicli.cpp startupid.cpp ; do \ - echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ -+libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc ++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ + rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ -+ for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ ++ for file in main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc ; do \ + echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ done; \ @@ -352,36 +347,32 @@ $NetBSD: patch-ba,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1028,25 +1048,25 @@ kde-rpo-clean: +@@ -1036,23 +1060,23 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 23 + #>+ 21 -kdiconview.o: kdiconview.moc -lockeng.o: lockeng.moc krootwm.lo: krootwm.moc -+minicli.lo: minicli.moc -+krootwm.o: krootwm.moc - pixmapserver.lo: pixmapserver.moc +-pixmapserver.lo: pixmapserver.moc -bgmanager.o: bgmanager.moc -+kdmdesktop.lo: kdmdesktop.moc -+kdmdesktop.o: kdmdesktop.moc ++minicli.lo: minicli.moc + krootwm.o: krootwm.moc ++pixmapserver.lo: pixmapserver.moc xautolock.o: xautolock.moc --krootwm.o: krootwm.moc --kcustommenu.o: kcustommenu.moc --pixmapserver.o: pixmapserver.moc -minicli.o: minicli.moc +-pixmapserver.o: pixmapserver.moc +-kcustommenu.o: kcustommenu.moc -desktop.lo: desktop.moc +lockeng.o: lockeng.moc +bgmanager.lo: bgmanager.moc +startupid.o: startupid.moc xautolock.lo: xautolock.moc -startupid.lo: startupid.moc --kdmdesktop.o: kdmdesktop.moc -lockeng.lo: lockeng.moc --minicli.lo: minicli.moc desktop.o: desktop.moc +-minicli.lo: minicli.moc -startupid.o: startupid.moc --kdmdesktop.lo: kdmdesktop.moc -bgmanager.lo: bgmanager.moc +desktop.lo: desktop.moc +kcustommenu.o: kcustommenu.moc diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg index 517567fb8fe..a61c84384ea 100644 --- a/x11/kdebase3/patches/patch-bg +++ b/x11/kdebase3/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bg,v 1.4 2003/03/11 13:10:21 markd Exp $ ---- khotkeys/khotkeys/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- khotkeys/khotkeys/Makefile.in.orig Fri Jan 17 09:03:07 2003 +++ khotkeys/khotkeys/Makefile.in -@@ -289,16 +289,20 @@ x_includes = @x_includes@ +@@ -288,16 +288,20 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = khotkeys @@ -29,7 +29,7 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = khotkeys.desktop -@@ -315,22 +319,27 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -314,22 +318,27 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -66,27 +66,27 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -338,13 +347,16 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -338,13 +347,16 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo -#>+ 5 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/khotkeys.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/khotkeys.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo +#>+ 7 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/libkhotkeys_main_la.all_cpp.P $(DEPDIR)/khotkeys.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/libkhotkeys_main_la.all_cpp.P ./$(DEPDIR)/khotkeys.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P ./$(DEPDIR)/khotkeys.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -107,28 +107,28 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>- all: all-am #>+ 1 -@@ -420,6 +433,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -418,6 +431,8 @@ clean-libLTLIBRARIES: + done khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) +libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -454,8 +469,9 @@ mostlyclean-compile: +@@ -457,8 +472,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)/khotkeys.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -532,7 +548,7 @@ distclean-tags: - +@@ -548,7 +564,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=khkglobalaccel.cpp khotkeys.desktop khkglobalaccel.h @@ -136,7 +136,7 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -647,30 +663,27 @@ uninstall-am: uninstall-autostartDATA un +@@ -669,30 +685,27 @@ uninstall-am: uninstall-autostartDATA un uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \ uninstall-info-am uninstall-libLTLIBRARIES @@ -176,7 +176,7 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 4 clean-idl: -@@ -688,33 +701,33 @@ force-reedit: +@@ -710,33 +723,33 @@ force-reedit: #>+ 11 @@ -223,7 +223,7 @@ $NetBSD: patch-bg,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -725,6 +738,6 @@ kde-rpo-clean: +@@ -747,6 +760,6 @@ kde-rpo-clean: #>+ 5 khotkeys.lo: khotkeys.moc diff --git a/x11/kdebase3/patches/patch-bj b/x11/kdebase3/patches/patch-bj index 08a19a331da..e6c30a9b14c 100644 --- a/x11/kdebase3/patches/patch-bj +++ b/x11/kdebase3/patches/patch-bj @@ -1,15 +1,15 @@ -$NetBSD: patch-bj,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bj,v 1.3 2003/03/11 13:10:21 markd Exp $ ---- kicker/Makefile.am.orig Wed May 8 19:21:48 2002 +--- kicker/Makefile.am.orig Tue Jul 2 06:53:58 2002 +++ kicker/Makefile.am -@@ -3,18 +3,22 @@ +@@ -3,18 +3,22 @@ INCLUDES = $(all_includes) SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data bin_PROGRAMS = kicker -lib_LTLIBRARIES = kicker.la +lib_LTLIBRARIES = libkicker_main.la kicker.la - CLEANFILES = dummy.cpp + CLEANFILES = dummy.cpp dummy_la.cpp -kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ +libkicker_main_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ @@ -21,10 +21,10 @@ $NetBSD: patch-bj,v 1.2 2002/08/25 19:23:39 jlam Exp $ +libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -kicker_LDADD = kicker.la --kicker_SOURCES = dummy.cpp +-kicker_SOURCES = dummy_la.cpp +kicker_la_LIBADD = libkicker_main.la +kicker_la_SOURCES = kicker_main.cpp -+kicker_la_LDFLAGS = -module -avoid-version $(all_libraries) ++kicker_la_LDFLAGS = -module $(all_libraries) + +kicker_LDADD = libkicker_main.la +kicker_SOURCES = kicker_main.cpp diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk index 62defeacd71..5f5bb0cfd70 100644 --- a/x11/kdebase3/patches/patch-bk +++ b/x11/kdebase3/patches/patch-bk @@ -1,15 +1,15 @@ -$NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bk,v 1.4 2003/03/11 13:10:21 markd Exp $ ---- kicker/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kicker/Makefile.in.orig Fri Jan 17 09:03:07 2003 +++ kicker/Makefile.in -@@ -291,19 +291,23 @@ INCLUDES = $(all_includes) +@@ -289,19 +289,23 @@ INCLUDES = $(all_includes) SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data bin_PROGRAMS = kicker -lib_LTLIBRARIES = kicker.la +lib_LTLIBRARIES = libkicker_main.la kicker.la - CLEANFILES = dummy.cpp + CLEANFILES = dummy.cpp dummy_la.cpp -kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ +libkicker_main_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ @@ -22,17 +22,17 @@ $NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ +libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -kicker_LDADD = kicker.la --kicker_SOURCES = dummy.cpp +-kicker_SOURCES = dummy_la.cpp +kicker_la_LIBADD = libkicker_main.la +kicker_la_SOURCES = kicker_main.cpp -+kicker_la_LDFLAGS = -module -avoid-version $(all_libraries) ++kicker_la_LDFLAGS = -module $(all_libraries) + +kicker_LDADD = libkicker_main.la +kicker_SOURCES = kicker_main.cpp kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = panel.desktop -@@ -314,21 +318,26 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -318,21 +322,26 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -55,43 +55,45 @@ $NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ bin_PROGRAMS = kicker$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) --am_kicker_OBJECTS = dummy.$(OBJEXT) +-am_kicker_OBJECTS = dummy_la.$(OBJEXT) +am_kicker_OBJECTS = kicker_main.$(OBJEXT) #>- kicker_OBJECTS = $(am_kicker_OBJECTS) #>+ 1 --kicker_OBJECTS = dummy.$(OBJEXT) +-kicker_OBJECTS = dummy_la.$(OBJEXT) -kicker_DEPENDENCIES = kicker.la +kicker_OBJECTS = kicker_main.$(OBJEXT) +kicker_DEPENDENCIES = libkicker_main.la DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -336,9 +345,11 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -341,9 +350,13 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po -#>+ 2 --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po -+#>+ 3 -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Po ++#>+ 4 ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kicker_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -359,7 +370,8 @@ CXXLD = $(CXX) +@@ -364,7 +377,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) +DIST_SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) \ + $(kicker_SOURCES) - DATA = $(autostart_DATA) + DATA = $(autostart_DATA) $(config_DATA) $(update_DATA) -@@ -369,7 +381,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -374,7 +388,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -100,10 +102,10 @@ $NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -416,11 +428,13 @@ uninstall-libLTLIBRARIES: - - clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -419,11 +433,13 @@ clean-libLTLIBRARIES: + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done -#>- kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) -#>+ 2 -@KDE_USE_CLOSURE_TRUE@kicker.la: kicker.la.closure $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) @@ -115,20 +117,29 @@ $NetBSD: patch-bk,v 1.3 2003/01/02 09:12:34 skrll Exp $ +@KDE_USE_CLOSURE_TRUE@libkicker_main.la: libkicker_main.la.closure $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) +@KDE_USE_CLOSURE_FALSE@libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -456,7 +470,8 @@ distclean-compile: +@@ -464,7 +480,8 @@ distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kicker_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kicker_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_la.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kicker_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kicker_main.Po@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) -@@ -740,17 +755,17 @@ dummy.cpp: + -rm -rf ./$(DEPDIR) +@@ -649,7 +666,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kcmkicker.desktop panel.desktop kicker-3.1-properSizeSetting.pl kickerrc.upd ++KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop kicker.la.closure kicker.la.blsav kickerrc.upd kicker libkicker_main.la.blsav panel.desktop libkicker_main.la.closure + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -807,17 +824,17 @@ dummy.cpp dummy_la.cpp: .NOEXPORT: #>+ 8 diff --git a/x11/kdebase3/patches/patch-bl b/x11/kdebase3/patches/patch-bl index ae8afba2fbb..d8a13ecb7fc 100644 --- a/x11/kdebase3/patches/patch-bl +++ b/x11/kdebase3/patches/patch-bl @@ -1,13 +1,13 @@ -$NetBSD: patch-bl,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bl,v 1.3 2003/03/11 13:10:21 markd Exp $ ---- kicker/applets/launcher/Makefile.am.orig Tue Feb 26 16:58:10 2002 +--- kicker/applets/launcher/Makefile.am.orig Fri Jan 3 17:42:28 2003 +++ kicker/applets/launcher/Makefile.am -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ lnk_DATA = quicklauncher.desktop EXTRA_DIST = $(lnk_DATA) - launcher_panelapplet_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) -+launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) + launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) ++launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm index 1ee2fcaa4bd..225a09139ab 100644 --- a/x11/kdebase3/patches/patch-bm +++ b/x11/kdebase3/patches/patch-bm @@ -1,13 +1,13 @@ -$NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bm,v 1.4 2003/03/11 13:10:22 markd Exp $ ---- kicker/applets/launcher/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kicker/applets/launcher/Makefile.in.orig Fri Jan 17 09:03:07 2003 +++ kicker/applets/launcher/Makefile.in -@@ -301,14 +301,14 @@ lnk_DATA = quicklauncher.desktop +@@ -300,14 +300,14 @@ lnk_DATA = quicklauncher.desktop EXTRA_DIST = $(lnk_DATA) - launcher_panelapplet_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module --launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) -+launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) + launcher_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) ++launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) subdir = kicker/applets/launcher mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h @@ -19,8 +19,8 @@ $NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \ quickaddappsmenu.lo #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS) -@@ -622,10 +622,6 @@ srcdoc: - .NOEXPORT: +@@ -651,10 +651,6 @@ launcher_panelapplet.la.closure: $(launc + #>+ 3 -quickbutton.moc: $(srcdir)/quickbutton.h @@ -30,7 +30,7 @@ $NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ quickaddappsmenu.moc: $(srcdir)/quickaddappsmenu.h $(MOC) $(srcdir)/quickaddappsmenu.h -o quickaddappsmenu.moc -@@ -634,8 +630,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch +@@ -663,8 +659,12 @@ quicklauncher.moc: $(srcdir)/quicklaunch $(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc #>+ 3 @@ -42,9 +42,9 @@ $NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ - -rm -f quickbutton.moc quickaddappsmenu.moc quicklauncher.moc + -rm -f quickaddappsmenu.moc quicklauncher.moc quickbutton.moc - #>+ 2 - docs-am: -@@ -648,7 +648,7 @@ force-reedit: + #>+ 3 + clean-closures: +@@ -681,7 +681,7 @@ force-reedit: #>+ 11 @@ -53,7 +53,7 @@ $NetBSD: patch-bm,v 1.3 2003/01/02 09:12:34 skrll Exp $ @echo 'creating launcher_panelapplet_la.all_cpp.cpp ...'; \ rm -f launcher_panelapplet_la.all_cpp.files launcher_panelapplet_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> launcher_panelapplet_la.all_cpp.final; \ -@@ -684,9 +684,9 @@ kde-rpo-clean: +@@ -717,9 +717,9 @@ kde-rpo-clean: -rm -f *.rpo #>+ 7 diff --git a/x11/kdebase3/patches/patch-bo b/x11/kdebase3/patches/patch-bo index 3bc7f7b5def..fb56f39f22d 100644 --- a/x11/kdebase3/patches/patch-bo +++ b/x11/kdebase3/patches/patch-bo @@ -1,11 +1,11 @@ -$NetBSD: patch-bo,v 1.2 2002/08/25 19:23:39 jlam Exp $ +$NetBSD: patch-bo,v 1.3 2003/03/11 13:10:22 markd Exp $ ---- kicker/extensions/childpanel/Makefile.am.orig Tue Feb 26 17:04:57 2002 +--- kicker/extensions/childpanel/Makefile.am.orig Fri Jan 3 17:42:34 2003 +++ kicker/extensions/childpanel/Makefile.am -@@ -5,7 +5,7 @@ +@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = childpanel_pane childpanel_panelextension_la_SOURCES = childpanelextension.cpp childpanelextension.skel childpanel_panelextension_la_METASOURCES = AUTO - childpanel_panelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module + childpanel_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la +childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker_main.la diff --git a/x11/kdebase3/patches/patch-bp b/x11/kdebase3/patches/patch-bp index 72b143cadc6..5ff92d57fce 100644 --- a/x11/kdebase3/patches/patch-bp +++ b/x11/kdebase3/patches/patch-bp @@ -1,17 +1,17 @@ -$NetBSD: patch-bp,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bp,v 1.4 2003/03/11 13:10:22 markd Exp $ ---- kicker/extensions/childpanel/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kicker/extensions/childpanel/Makefile.in.orig Fri Jan 17 09:03:08 2003 +++ kicker/extensions/childpanel/Makefile.in -@@ -295,7 +295,7 @@ kde_module_LTLIBRARIES = childpanel_pane +@@ -293,7 +293,7 @@ kde_module_LTLIBRARIES = childpanel_pane childpanel_panelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp #>- childpanel_panelextension_la_METASOURCES = AUTO - childpanel_panelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module + childpanel_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la +childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker_main.la noinst_HEADERS = childpanelextension.h -@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-bp,v 1.3 2003/01/02 09:12:34 skrll Exp $ am_childpanel_panelextension_la_OBJECTS = childpanelextension.lo #>- childpanel_panelextension_la_OBJECTS = \ #>- $(am_childpanel_panelextension_la_OBJECTS) -@@ -676,5 +676,5 @@ kde-rpo-clean: +@@ -708,5 +708,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs index 62773a83491..ca1451daa09 100644 --- a/x11/kdebase3/patches/patch-bs +++ b/x11/kdebase3/patches/patch-bs @@ -1,9 +1,9 @@ -$NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bs,v 1.4 2003/03/11 13:10:22 markd Exp $ ---- kicker/proxy/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kicker/proxy/Makefile.in.orig Fri Jan 17 09:03:08 2003 +++ kicker/proxy/Makefile.in -@@ -288,27 +288,35 @@ x_libraries = @x_libraries@ - +@@ -286,27 +286,35 @@ x_includes = @x_includes@ + x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/../share $(all_includes) -CLEANFILES = dummy.cpp @@ -51,7 +51,7 @@ $NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -318,29 +326,40 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -316,29 +324,40 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -104,32 +104,32 @@ $NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -348,11 +367,19 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -347,11 +366,19 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy.Plo -#>+ 3 --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy.Plo ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/appletproxy_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/appletproxy_main.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy_main.Po +#>+ 7 -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ -+@AMDEP_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/appletproxy_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/appletproxy_main.Po \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/extensionproxy_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -374,11 +401,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -373,11 +400,13 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \ @@ -145,7 +145,7 @@ $NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>- all: all-am #>+ 1 -@@ -429,6 +458,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS +@@ -426,6 +455,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS $(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS) extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS) @@ -153,31 +153,31 @@ $NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ + $(CXXLINK) -rpath $(libdir) $(libappletproxy_main_la_LDFLAGS) $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_LIBADD) $(LIBS) +libextensionproxy_main.la: $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libextensionproxy_main_la_LDFLAGS) $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -467,8 +500,11 @@ distclean-compile: +@@ -469,8 +502,11 @@ distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy_main.Po@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) -@@ -571,7 +607,6 @@ install-strip: + -rm -rf ./$(DEPDIR) +@@ -591,7 +627,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -641,9 +676,6 @@ uninstall-am: uninstall-binPROGRAMS unin + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -661,9 +696,6 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot @@ -187,7 +187,7 @@ $NetBSD: patch-bs,v 1.3 2003/01/02 09:12:34 skrll Exp $ # 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: -@@ -691,7 +723,7 @@ kde-rpo-clean: +@@ -711,7 +743,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-by b/x11/kdebase3/patches/patch-by index d95c09717b1..c7125b496b2 100644 --- a/x11/kdebase3/patches/patch-by +++ b/x11/kdebase3/patches/patch-by @@ -1,8 +1,8 @@ -$NetBSD: patch-by,v 1.2 2002/08/25 19:23:40 jlam Exp $ +$NetBSD: patch-by,v 1.3 2003/03/11 13:10:22 markd Exp $ ---- klipper/Makefile.am.orig Fri Mar 1 09:59:20 2002 +--- klipper/Makefile.am.orig Tue Jan 14 12:39:15 2003 +++ klipper/Makefile.am -@@ -1,25 +1,26 @@ +@@ -1,26 +1,27 @@ INCLUDES= $(all_includes) bin_PROGRAMS = klipper @@ -11,15 +11,17 @@ $NetBSD: patch-by,v 1.2 2002/08/25 19:23:40 jlam Exp $ kde_module_LTLIBRARIES = klipper_panelapplet.la -CLEANFILES = dummy.cpp +- +-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ +libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel ++libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ + toplevel.skel --klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) --klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel +-klipper_la_METASOURCES = AUTO +libklipper_main_la_METASOURCES = AUTO +libklipper_main_la_LDFLAGS = $(all_libraries) - --klipper_la_METASOURCES = AUTO ++ +klipper_la_LIBADD = libklipper_main.la +klipper_la_SOURCES = klipper_main.cpp klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -32,7 +34,7 @@ $NetBSD: patch-by,v 1.2 2002/08/25 19:23:40 jlam Exp $ -klipper_panelapplet_la_LIBADD = klipper.la +klipper_panelapplet_la_LIBADD = libklipper_main.la - klipper_panelapplet_la_SOURCES = applet.cpp + klipper_panelapplet_la_SOURCES = applet.cpp applet.skel klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version - diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz index 89ce44e6c13..762f47cfb0e 100644 --- a/x11/kdebase3/patches/patch-bz +++ b/x11/kdebase3/patches/patch-bz @@ -1,8 +1,8 @@ -$NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-bz,v 1.5 2003/03/11 13:10:23 markd Exp $ ---- klipper/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- klipper/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ klipper/Makefile.in -@@ -289,24 +289,26 @@ x_libraries = @x_libraries@ +@@ -287,27 +287,29 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper @@ -13,17 +13,20 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ -CLEANFILES = dummy.cpp - -klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) --#>- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel +-#>- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ +libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) -+#>- libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel - #>+ 1 --klipper_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp -+libklipper_main_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp -+ -+#>- libklipper_main_la_METASOURCES = AUTO -+libklipper_main_la_LDFLAGS = $(all_libraries) ++#>- libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ + #>- toplevel.skel + #>+ 2 +-klipper_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ ++libklipper_main_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp \ + toplevel_skel.cpp + -#>- klipper_la_METASOURCES = AUTO ++#>- libklipper_main_la_METASOURCES = AUTO ++libklipper_main_la_LDFLAGS = $(all_libraries) ++ +klipper_la_LIBADD = libklipper_main.la +klipper_la_SOURCES = klipper_main.cpp klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -36,10 +39,10 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ -klipper_panelapplet_la_LIBADD = klipper.la +klipper_panelapplet_la_LIBADD = libklipper_main.la - klipper_panelapplet_la_SOURCES = applet.cpp - klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version - -@@ -332,29 +334,34 @@ CONFIG_HEADER = $(top_builddir)/config.h + #>- klipper_panelapplet_la_SOURCES = applet.cpp applet.skel + #>+ 1 + klipper_panelapplet_la_SOURCES=applet.cpp applet_skel.cpp +@@ -333,17 +335,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -61,8 +64,11 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ +klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la am_klipper_panelapplet_la_OBJECTS = applet.lo #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) - #>+ 1 - klipper_panelapplet_la_OBJECTS = applet.lo + #>+ 4 +@@ -351,14 +348,24 @@ klipper_panelapplet_la_final_OBJECTS = k + klipper_panelapplet_la_nofinal_OBJECTS = applet.lo applet_skel.lo + @KDE_USE_FINAL_FALSE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_final_OBJECTS) +libklipper_main_la_DEPENDENCIES = +am_libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ + configdialog.lo @@ -87,37 +93,47 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -363,14 +370,17 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ +@@ -368,18 +375,21 @@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo --#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/klipper_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+#>+ 9 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libklipper_main_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/applet.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo +-#>+ 9 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet_skel.P $(DEPDIR)/klipper_la.all_cpp.P $(DEPDIR)/klipper_panelapplet_la.all_cpp.P ./$(DEPDIR)/applet.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet_skel.P ./$(DEPDIR)/applet.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/urlgrabber.Plo ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo ++#>+ 11 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/applet_skel.P $(DEPDIR)/toplevel_skel.P $(DEPDIR)/klipper_panelapplet_la.all_cpp.P $(DEPDIR)/libklipper_main_la.all_cpp.P ./$(DEPDIR)/applet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/applet_skel.P $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/applet.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/configdialog.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/klipper_main.Po ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo ./$(DEPDIR)/urlgrabber.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -393,12 +403,12 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -401,11 +411,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \ - $(klipper_SOURCES) + $(libklipper_main_la_SOURCES) $(klipper_SOURCES) - DATA = $(appl_DATA) $(apps_DATA) $(autostart_DATA) $(dockicon_DATA) \ - $(update_DATA) + DATA = $(appl_DATA) $(apps_DATA) $(autostart_DATA) $(update_DATA) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(klipper_SOURCES) @@ -125,43 +141,55 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ #>- all: all-am #>+ 1 -@@ -468,6 +478,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip +@@ -482,6 +492,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) klipper_panelapplet.la: $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(klipper_panelapplet_la_LDFLAGS) $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_LIBADD) $(LIBS) +libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -504,7 +516,8 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/applet.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/configdialog.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/urlgrabber.Plo@am__quote@ -@@ -651,7 +664,7 @@ distclean-tags: +@@ -523,7 +535,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/applet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configdialog.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klipper_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klipper_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlgrabber.Plo@am__quote@ +@@ -669,7 +682,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=toplevel.h hi48-app-klipper.png klipperrc.desktop klipperbindings.cpp klipper.desktop hi32-app-klipper.png urlgrabber.h hi16-app-klipper.png klipperrc.upd klipper_dock.png configdialog.h klipper-1-2.pl version.h applet.h -+KDE_DIST=applet.h klipper_dock.png hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp version.h configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop +-KDE_DIST=toplevel.h cr64-app-klipper.png klipperrc.desktop klipperbindings.cpp cr48-app-klipper.png klipper.desktop cr32-app-klipper.png urlgrabber.h klipperrc.upd klipper-kde31.sh cr128-app-klipper.png configdialog.h cr16-app-klipper.png klipper-1-2.pl version.h klippershortcuts.upd applet.h ++KDE_DIST=applet.h cr128-app-klipper.png toplevel.h cr48-app-klipper.png cr64-app-klipper.png klipper-kde31.sh klipperbindings.cpp version.h configdialog.h cr32-app-klipper.png klipper-1-2.pl cr16-app-klipper.png klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop klippershortcuts.upd DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -700,7 +713,6 @@ install-strip: +@@ -724,7 +737,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -814,10 +826,6 @@ toplevel_skel.cpp: toplevel.kidl + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -825,16 +837,18 @@ dummy.cpp: + .NOEXPORT: + + #>+ 5 ++applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false ) ++applet_skel.cpp: applet.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl ++ ++#>+ 5 + toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false ) + toplevel_skel.cpp: toplevel.kidl $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl #>+ 3 @@ -172,21 +200,35 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ urlgrabber.moc: $(srcdir)/urlgrabber.h $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc -@@ -830,8 +838,12 @@ applet.moc: $(srcdir)/applet.h +@@ -846,21 +860,19 @@ toplevel.moc: $(srcdir)/toplevel.h + applet.moc: $(srcdir)/applet.h $(MOC) $(srcdir)/applet.h -o applet.moc - #>+ 3 +-#>+ 5 +-applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; /bin/false ) +-applet_skel.cpp: applet.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl ++#>+ 3 +configdialog.moc: $(srcdir)/configdialog.h + $(MOC) $(srcdir)/configdialog.h -o configdialog.moc -+ -+#>+ 3 + + #>+ 3 clean-metasources: - -rm -f configdialog.moc urlgrabber.moc toplevel.moc applet.moc + -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc - #>+ 4 + #>+ 5 clean-idl: -@@ -863,33 +875,33 @@ force-reedit: + -rm -f \ +- toplevel_skel.cpp toplevel_skel.h toplevel.kidl \ +- applet_skel.cpp applet_skel.h applet.kidl ++ applet_skel.cpp applet_skel.h applet.kidl \ ++ toplevel_skel.cpp toplevel_skel.h toplevel.kidl + + #>+ 2 + docs-am: +@@ -893,18 +905,6 @@ force-reedit: #>+ 11 @@ -194,46 +236,58 @@ $NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $ - @echo 'creating klipper_la.all_cpp.cpp ...'; \ - rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ +- for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ +- echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ +- done; \ +- cat klipper_la.all_cpp.final klipper_la.all_cpp.files > klipper_la.all_cpp.cpp; \ +- rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files +- +-#>+ 11 + klipper_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/applet.cpp applet_skel.cpp applet.moc + @echo 'creating klipper_panelapplet_la.all_cpp.cpp ...'; \ + rm -f klipper_panelapplet_la.all_cpp.files klipper_panelapplet_la.all_cpp.final; \ +@@ -916,22 +916,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr + cat klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files > klipper_panelapplet_la.all_cpp.cpp; \ + rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files + ++#>+ 11 +libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc toplevel.moc configdialog.moc + @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ + rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ -- echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ ++ for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ; do \ + echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \ - done; \ -- cat klipper_la.all_cpp.final klipper_la.all_cpp.files > klipper_la.all_cpp.cpp; \ -- rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files ++ done; \ + cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ + rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files - ++ #>+ 3 clean-final: -- -rm -f klipper_la.all_cpp.cpp -+ -rm -f libklipper_main_la.all_cpp.cpp +- -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp ++ -rm -f klipper_panelapplet_la.all_cpp.cpp libklipper_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" all-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" install-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" install-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" all-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" install-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -899,11 +911,11 @@ kde-rpo-clean: +@@ -941,11 +953,11 @@ kde-rpo-clean: -rm -f *.rpo #>+ 9 diff --git a/x11/kdebase3/patches/patch-cc b/x11/kdebase3/patches/patch-cc index 27ec62314d8..7ebca29cc97 100644 --- a/x11/kdebase3/patches/patch-cc +++ b/x11/kdebase3/patches/patch-cc @@ -1,8 +1,8 @@ -$NetBSD: patch-cc,v 1.2 2002/08/25 19:23:40 jlam Exp $ +$NetBSD: patch-cc,v 1.3 2003/03/11 13:10:23 markd Exp $ ---- kmenuedit/Makefile.am.orig Thu Jun 7 15:26:30 2001 +--- kmenuedit/Makefile.am.orig Mon Sep 16 09:08:52 2002 +++ kmenuedit/Makefile.am -@@ -1,17 +1,18 @@ +@@ -1,17 +1,19 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit @@ -10,13 +10,13 @@ $NetBSD: patch-cc,v 1.2 2002/08/25 19:23:40 jlam Exp $ +lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la -CLEANFILES = dummy.cpp -+libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -+libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libkmenuedit_main_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp + +-kmenuedit_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libkmenuedit_main_la_LDFLAGS = $(all_libraries) --kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -- --kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kmenuedit_la_SOURCES = kmenuedit_main.cpp +kmenuedit_la_LIBADD = libkmenuedit_main.la kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -27,4 +27,4 @@ $NetBSD: patch-cc,v 1.2 2002/08/25 19:23:40 jlam Exp $ +kmenuedit_LDADD = libkmenuedit_main.la kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) - noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h + noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd index fa810b0f739..43eb0b7c3e1 100644 --- a/x11/kdebase3/patches/patch-cd +++ b/x11/kdebase3/patches/patch-cd @@ -1,8 +1,8 @@ -$NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ +$NetBSD: patch-cd,v 1.4 2003/03/11 13:10:23 markd Exp $ ---- kmenuedit/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kmenuedit/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ kmenuedit/Makefile.in -@@ -289,17 +289,18 @@ x_libraries = @x_libraries@ +@@ -287,17 +287,19 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit @@ -10,13 +10,13 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ +lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la -CLEANFILES = dummy.cpp -+libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -+libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libkmenuedit_main_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp + +-kmenuedit_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libkmenuedit_main_la_LDFLAGS = $(all_libraries) --kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp -- --kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kmenuedit_la_SOURCES = kmenuedit_main.cpp +kmenuedit_la_LIBADD = libkmenuedit_main.la kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -27,33 +27,35 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ +kmenuedit_LDADD = libkmenuedit_main.la kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) - noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h -@@ -323,26 +324,31 @@ CONFIG_HEADER = $(top_builddir)/config.h + noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h +@@ -321,24 +323,31 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kmenuedit_la_DEPENDENCIES = --am_kmenuedit_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ +-am_kmenuedit_la_OBJECTS = basictab.lo treeview.lo desktopfileeditor.lo \ +- menueditview.lo kmenuedit.lo main.lo khotkeys.lo +kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la +am_kmenuedit_la_OBJECTS = kmenuedit_main.lo -+#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) + #>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) +-#>+ 5 +-kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo +-kmenuedit_la_nofinal_OBJECTS = basictab.lo treeview.lo desktopfileeditor.lo \ +- menueditview.lo kmenuedit.lo main.lo khotkeys.lo +-@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) +#>+ 1 +kmenuedit_la_OBJECTS = kmenuedit_main.lo +libkmenuedit_main_la_DEPENDENCIES = -+am_libkmenuedit_main_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ - desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ - khotkeys.lo --#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) ++am_libkmenuedit_main_la_OBJECTS = basictab.lo treeview.lo \ ++ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ ++ khotkeys.lo +#>- libkmenuedit_main_la_OBJECTS = $(am_libkmenuedit_main_la_OBJECTS) - #>+ 6 --kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo --kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ ++#>+ 6 +libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo -+libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ - desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ - khotkeys.lo --@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) ++libkmenuedit_main_la_nofinal_OBJECTS = basictab.lo treeview.lo \ ++ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ ++ khotkeys.lo +@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) bin_PROGRAMS = kmenuedit$(EXEEXT) @@ -70,45 +72,39 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -351,21 +357,27 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/basictab.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo --#>+ 11 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kmenuedit_la.all_cpp.P $(DEPDIR)/basictab.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo +@@ -349,21 +358,24 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/basictab.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo +-#>+ 13 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kmenuedit_la.all_cpp.P ./$(DEPDIR)/basictab.Plo \ +#>+ 15 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkmenuedit_main_la.all_cpp.P $(DEPDIR)/basictab.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/basictab.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkmenuedit_main_la.all_cpp.P ./$(DEPDIR)/basictab.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/basictab.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo - #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -386,7 +398,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -128,45 +124,45 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -447,6 +460,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -445,6 +458,8 @@ clean-libLTLIBRARIES: + done kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) +libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -483,9 +498,10 @@ distclean-compile: - - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basictab.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktopfileeditor.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/menueditview.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/namedlg.Plo@am__quote@ -@@ -642,7 +658,7 @@ distclean-tags: +@@ -486,9 +501,10 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basictab.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktopfileeditor.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmenuedit.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmenuedit_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmenuedit_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menueditview.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Plo@am__quote@ +@@ -658,7 +674,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kmenuedit.desktop hi16-app-kmenuedit.png hi32-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png -+KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png +-KDE_DIST=cr48-app-kmenuedit.png uninstall.desktop kmenuedit.desktop cr16-app-kmenuedit.png kmenueditui.rc cr32-app-kmenuedit.png ++KDE_DIST=cr32-app-kmenuedit.png cr16-app-kmenuedit.png cr48-app-kmenuedit.png kmenuedit.desktop kmenueditui.rc uninstall.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -704,7 +720,6 @@ install-strip: +@@ -726,7 +742,6 @@ install-strip: mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* -@@ -795,10 +810,6 @@ dummy.cpp: + -rm -f Makefile $(CONFIG_CLEAN_FILES) +@@ -822,10 +837,6 @@ dummy.cpp: .NOEXPORT: #>+ 3 @@ -177,7 +173,7 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ basictab.moc: $(srcdir)/basictab.h $(MOC) $(srcdir)/basictab.h -o basictab.moc -@@ -807,16 +818,20 @@ treeview.moc: $(srcdir)/treeview.h +@@ -834,16 +845,20 @@ treeview.moc: $(srcdir)/treeview.h $(MOC) $(srcdir)/treeview.h -o treeview.moc #>+ 3 @@ -201,19 +197,19 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 2 docs-am: -@@ -843,33 +858,33 @@ force-reedit: +@@ -870,33 +885,33 @@ force-reedit: #>+ 11 --kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp menueditview.moc treeview.moc basictab.moc desktopfileeditor.moc kmenuedit.moc +-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp menueditview.moc treeview.moc basictab.moc desktopfileeditor.moc kmenuedit.moc - @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ - rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ -+libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc ++libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc + @echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \ + rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \ - for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ; do \ + for file in basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ; do \ - echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \ @@ -248,7 +244,7 @@ $NetBSD: patch-cd,v 1.3 2003/01/02 09:12:34 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -879,13 +894,13 @@ kde-rpo-clean: +@@ -906,13 +921,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 diff --git a/x11/kdebase3/patches/patch-cg b/x11/kdebase3/patches/patch-cg index 52c6a252a73..86e0fb4255f 100644 --- a/x11/kdebase3/patches/patch-cg +++ b/x11/kdebase3/patches/patch-cg @@ -1,8 +1,8 @@ -$NetBSD: patch-cg,v 1.2 2002/08/25 19:23:41 jlam Exp $ +$NetBSD: patch-cg,v 1.3 2003/03/11 13:10:23 markd Exp $ ---- konqueror/Makefile.am.orig Wed May 8 19:22:28 2002 +--- konqueror/Makefile.am.orig Fri Jan 17 07:40:04 2003 +++ konqueror/Makefile.am -@@ -5,7 +5,7 @@ +@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar @@ -11,7 +11,7 @@ $NetBSD: patch-cg,v 1.2 2002/08/25 19:23:41 jlam Exp $ konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc -@@ -22,7 +22,7 @@ +@@ -22,7 +22,7 @@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror @@ -20,9 +20,9 @@ $NetBSD: patch-cg,v 1.2 2002/08/25 19:23:41 jlam Exp $ KonquerorIface.cc KonquerorIface.skel \ KonqMainWindowIface.cc KonqMainWindowIface.skel \ KonqViewIface.cc KonqViewIface.skel \ -@@ -37,11 +37,15 @@ - konq_browseriface.cc \ - delayedinitializer.cc +@@ -43,11 +43,15 @@ noinst_HEADERS = KonqMainWindowIface.h K + konq_misc.h konq_openurlrequest.h konq_profiledlg.h konq_run.h \ + konq_view.h konq_viewmgr.h version.h +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version +libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la @@ -39,7 +39,7 @@ $NetBSD: patch-cg,v 1.2 2002/08/25 19:23:41 jlam Exp $ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) # Hmm, this experiment of a static konq failed, don't trust it... -@@ -55,9 +59,6 @@ +@@ -61,9 +65,6 @@ konqueror_LDFLAGS = $(KDE_RPATH) $(all_l #konqueror_static_SOURCES = dummy.cc #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch index 6241316306c..6201d5b29d3 100644 --- a/x11/kdebase3/patches/patch-ch +++ b/x11/kdebase3/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-ch,v 1.4 2003/03/11 13:10:23 markd Exp $ ---- konqueror/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- konqueror/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ konqueror/Makefile.in -@@ -293,7 +293,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t +@@ -291,7 +291,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar @@ -11,7 +11,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc -@@ -310,7 +310,7 @@ include_HEADERS = KonquerorIface.h +@@ -308,7 +308,7 @@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror @@ -20,7 +20,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ -@@ -325,7 +325,7 @@ bin_PROGRAMS = konqueror +@@ -323,7 +323,7 @@ bin_PROGRAMS = konqueror #>- konq_browseriface.cc \ #>- delayedinitializer.cc #>+ 14 @@ -29,8 +29,8 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ -@@ -341,11 +341,15 @@ konqueror_la_SOURCES=konq_main.cc \ - delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc +@@ -346,11 +346,15 @@ noinst_HEADERS = KonqMainWindowIface.h K + konq_view.h konq_viewmgr.h version.h +libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version @@ -47,8 +47,8 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ +konqueror_LDADD = libkonqueror_main.la konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) - data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop -@@ -367,32 +371,37 @@ CONFIG_HEADER = $(top_builddir)/config.h + data_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop +@@ -375,32 +379,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -96,62 +96,64 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -403,7 +412,7 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ -@@ -414,12 +423,14 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo --#>+ 31 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/konqueror_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po -+#>+ 35 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/libkonqueror_main_la.all_cc.P $(DEPDIR)/KonqMainWindowIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ -@@ -430,11 +441,13 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/KonqMainWindowIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ -@@ -445,7 +458,9 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po +@@ -413,7 +422,7 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonqViewIface.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonquerorIface.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/delayedinitializer.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_actions.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ +@@ -424,13 +433,15 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_misc.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_profiledlg.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo +-#>+ 33 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/konqueror_la.all_cc.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Po ++#>+ 37 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P $(DEPDIR)/libkonqueror_main_la.all_cc.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/KonqViewIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/KonquerorIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/delayedinitializer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_actions.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ +@@ -441,12 +452,14 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_misc.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_profiledlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Po + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_skel.P $(DEPDIR)/KonqMainWindowIface_skel.P $(DEPDIR)/KonqViewIface_skel.P ./$(DEPDIR)/KonqMainWindowIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/KonqViewIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/KonquerorIface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/delayedinitializer.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/konq_actions.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_actions.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ +@@ -457,7 +470,9 @@ am__depfiles_maybe = depfiles + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_misc.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_profiledlg.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_run.Plo ./$(DEPDIR)/konq_view.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konq_viewmgr.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konqueror_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -466,7 +481,8 @@ CXXLD = $(CXX) +@@ -478,7 +493,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -159,53 +161,53 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ +DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \ + $(konqueror_SOURCES) DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ - $(kdelnk_DATA) $(konqdata_DATA) - -@@ -480,7 +496,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r - DIST_COMMON = $(include_HEADERS) AUTHORS ChangeLog Makefile.am \ - Makefile.in TODO + $(data5_DATA) $(kde_apps_DATA) $(kde_services_DATA) \ + $(konqdata_DATA) +@@ -493,7 +509,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS ChangeLog \ + Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) +SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) $(konqueror_SOURCES) #>- all: all-recursive #>+ 1 -@@ -529,6 +545,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -540,6 +556,8 @@ clean-libLTLIBRARIES: + done konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) +libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -567,7 +585,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonqViewIface.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonquerorIface.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/delayedinitializer.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_actions.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_browseriface.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_combo.Plo@am__quote@ -@@ -581,6 +598,8 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_run.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_view.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_viewmgr.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konqueror_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konqueror_main.Po@am__quote@ +@@ -583,7 +601,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KonqViewIface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/KonquerorIface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delayedinitializer.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_actions.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_browseriface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_combo.Plo@am__quote@ +@@ -597,6 +614,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_run.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_view.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konq_viewmgr.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konqueror_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konqueror_main.Po@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) -@@ -818,7 +837,7 @@ distclean-tags: - + -rm -rf ./$(DEPDIR) +@@ -889,7 +908,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=profile_midnightcommander.desktop KonqMainWindowIface.h konq_mainwindow.h profile_webbrowsing.desktop konq_viewmgr.cc konq_viewmgr.h konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop delayedinitializer.h konq_factory.h konq_profiledlg.h konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_frame.h konq_browseriface.cc KonquerorIface.cc konq_view.h konq_guiclients.h convert_kdelnk.sh IDEAS konq_run.h KonqViewIface.h konq_view.cc konqueror.rc konq_main.h profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_browseriface.h konq_factory.cc konq_actions.h konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc konq_misc.h Home.desktop kfmclient.desktop konq_openurlrequest.h konqueror_config.desktop version.h konq_combo.h -+KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_misc.h konq_view.cc konq_browseriface.h delayedinitializer.h DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc konq_guiclients.h konq_viewmgr.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop konq_view.h konq_mainwindow.cc konq_actions.cc konq_frame.cc konq_actions.h KonqMainWindowIface.cc KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_profiledlg.cc konq_factory.h konq_run.cc version.h konq_run.h konq_factory.cc konq_combo.h konq_main.h konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop KonqViewIface.cc konq_profiledlg.h konq_openurlrequest.h profile_webbrowsing.desktop KonqViewIface.h +-KDE_DIST=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konq_viewmgr.cc konq_mainwindow.cc konqfilemgr.desktop konq_frame.cc kfmclient_dir.desktop DESIGN KonqMainWindowIface.cc profile_filepreview.desktop konq_combo.cc konq_profiledlg.cc kfmclient_html.desktop konqueror.desktop konq_misc.cc konqbrowser.desktop konq_browseriface.cc uninstall.desktop KonquerorIface.cc convert_kdelnk.sh IDEAS konq_view.cc konqueror.rc profile_filemanagement.desktop DESIGN_config konq_guiclients.cc konq_factory.cc konq_actions.cc konq_run.cc konquerorsu.desktop KonqViewIface.cc delayedinitializer.cc Home.desktop kfmclient.desktop konqueror_config.desktop ++KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_view.cc DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc profile_filemanagement.desktop kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop uninstall.desktop konq_mainwindow.cc konq_actions.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_profiledlg.cc konq_run.cc konq_factory.cc konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop kfmclient_war.desktop KonqViewIface.cc profile_webbrowsing.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -976,9 +995,6 @@ uninstall-info: uninstall-info-recursive +@@ -1056,9 +1075,6 @@ uninstall-info: uninstall-info-recursive #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static @@ -215,7 +217,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp -@@ -1007,23 +1023,13 @@ uninstall-local: +@@ -1079,23 +1095,13 @@ uninstall-local: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -244,7 +246,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 3 delayedinitializer.moc: $(srcdir)/delayedinitializer.h -@@ -1034,40 +1040,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main +@@ -1106,40 +1112,50 @@ konq_mainwindow.moc: $(srcdir)/konq_main $(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc #>+ 3 @@ -313,7 +315,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 6 clean-idl: -@@ -1087,33 +1103,33 @@ force-reedit: +@@ -1159,33 +1175,33 @@ force-reedit: #>+ 11 @@ -360,7 +362,7 @@ $NetBSD: patch-ch,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1123,25 +1139,25 @@ kde-rpo-clean: +@@ -1195,25 +1211,25 @@ kde-rpo-clean: -rm -f *.rpo #>+ 23 diff --git a/x11/kdebase3/patches/patch-ci b/x11/kdebase3/patches/patch-ci index 509be8919c1..c210d037657 100644 --- a/x11/kdebase3/patches/patch-ci +++ b/x11/kdebase3/patches/patch-ci @@ -1,28 +1,28 @@ -$NetBSD: patch-ci,v 1.2 2002/08/25 19:23:41 jlam Exp $ +$NetBSD: patch-ci,v 1.3 2003/03/11 13:10:23 markd Exp $ ---- konqueror/client/Makefile.am.orig Wed Aug 9 18:10:36 2000 +--- konqueror/client/Makefile.am.orig Mon Sep 16 09:08:52 2002 +++ konqueror/client/Makefile.am @@ -1,12 +1,16 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS = kfmclient -lib_LTLIBRARIES = kfmclient.la -+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la ++lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la INCLUDES= -I.. $(all_includes) +libkfmclient_main_la_LDFLAGS = $(all_libraries) -+libkfmclient_main_la_LIBADD = $(LIB_KFILE) ++libkfmclient_main_la_LIBADD = $(LIB_KIO) +libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub + kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version --kfmclient_la_LIBADD = $(LIB_KFILE) +-kfmclient_la_LIBADD = $(LIB_KIO) -kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub +kfmclient_la_LIBADD = libkfmclient_main.la +kfmclient_la_SOURCES = kfmclient_main.cc noinst_HEADERS = kfmclient.h METASOURCES = AUTO -@@ -14,12 +18,9 @@ +@@ -14,12 +18,9 @@ METASOURCES = AUTO KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj index f3234576c58..a654ead5b7c 100644 --- a/x11/kdebase3/patches/patch-cj +++ b/x11/kdebase3/patches/patch-cj @@ -1,8 +1,8 @@ -$NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-cj,v 1.4 2003/03/11 13:10:24 markd Exp $ ---- konqueror/client/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- konqueror/client/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ konqueror/client/Makefile.in -@@ -289,14 +289,18 @@ x_libraries = @x_libraries@ +@@ -287,14 +287,18 @@ x_libraries = @x_libraries@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS = kfmclient @@ -11,10 +11,10 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ INCLUDES = -I.. $(all_includes) -kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version --kfmclient_la_LIBADD = $(LIB_KFILE) +-kfmclient_la_LIBADD = $(LIB_KIO) -#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub +libkfmclient_main_la_LDFLAGS = $(all_libraries) -+libkfmclient_main_la_LIBADD = $(LIB_KFILE) ++libkfmclient_main_la_LIBADD = $(LIB_KIO) +#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub #>+ 1 -kfmclient_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc @@ -26,7 +26,7 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ noinst_HEADERS = kfmclient.h #>- METASOURCES = AUTO -@@ -304,31 +308,36 @@ noinst_HEADERS = kfmclient.h +@@ -302,31 +306,36 @@ noinst_HEADERS = kfmclient.h KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop @@ -74,28 +74,28 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -336,10 +345,16 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -335,10 +344,16 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo -#>+ 3 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/kfmclient_la.all_cc.P $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kfmclient.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/kfmclient_la.all_cc.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kfmclient.Plo ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kfmclient.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Po +#>+ 7 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/libkfmclient_main_la.all_cc.P $(DEPDIR)/kfmclient.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/kfmclient.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P $(DEPDIR)/libkfmclient_main_la.all_cc.P ./$(DEPDIR)/kfmclient.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KonquerorIface_stub.P $(DEPDIR)/KDesktopIface_stub.P ./$(DEPDIR)/kfmclient.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kfmclient_main.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -360,11 +375,12 @@ CXXLD = $(CXX) +@@ -359,11 +374,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -110,27 +110,27 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- all: all-am #>+ 1 -@@ -413,6 +429,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -410,6 +426,8 @@ clean-libLTLIBRARIES: + done kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) +libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -447,8 +465,9 @@ mostlyclean-compile: +@@ -449,8 +467,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)/kfmclient.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kfmclient_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kfmclient_main.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kfmclient_main.Po@am__quote@ distclean-depend: - -rm -rf $(DEPDIR) -@@ -617,15 +636,16 @@ uninstall-am: uninstall-binPROGRAMS unin + -rm -rf ./$(DEPDIR) +@@ -637,15 +656,16 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES @@ -150,7 +150,7 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 9 KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) -@@ -637,10 +657,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl +@@ -657,10 +677,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl #>+ 3 @@ -161,7 +161,7 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ clean-metasources: -rm -f kfmclient.moc -@@ -661,33 +677,33 @@ force-reedit: +@@ -681,33 +697,33 @@ force-reedit: #>+ 11 @@ -208,7 +208,7 @@ $NetBSD: patch-cj,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -697,8 +713,8 @@ kde-rpo-clean: +@@ -717,8 +733,8 @@ kde-rpo-clean: -rm -f *.rpo #>+ 6 diff --git a/x11/kdebase3/patches/patch-cm b/x11/kdebase3/patches/patch-cm index 6d401396fb4..e623606d12c 100644 --- a/x11/kdebase3/patches/patch-cm +++ b/x11/kdebase3/patches/patch-cm @@ -1,28 +1,25 @@ -$NetBSD: patch-cm,v 1.2 2002/08/25 19:23:42 jlam Exp $ +$NetBSD: patch-cm,v 1.3 2003/03/11 13:10:24 markd Exp $ ---- konqueror/keditbookmarks/Makefile.am.orig Sun Mar 3 04:35:00 2002 +--- konqueror/keditbookmarks/Makefile.am.orig Sun Oct 27 11:06:42 2002 +++ konqueror/keditbookmarks/Makefile.am -@@ -2,23 +2,25 @@ +@@ -2,22 +2,23 @@ INCLUDES= -I$(top_srcdir)/libkonq $(all_ METASOURCES = AUTO -lib_LTLIBRARIES = keditbookmarks.la +lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la --keditbookmarks_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp -+libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp +-keditbookmarks_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp ++libkeditbookmarks_main_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp ++libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML) ++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) + +keditbookmarks_la_SOURCES = keditbookmarks_main.cpp kbookmarklistener_DIR = $(top_srcdir)/libkonq --keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) -+libkeditbookmarks_main_la_METASOURCES = AUTO -+ +-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML) +keditbookmarks_la_LIBADD = libkeditbookmarks_main.la keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version --keditbookmarks_la_METASOURCES = AUTO bin_PROGRAMS = keditbookmarks @@ -30,7 +27,7 @@ $NetBSD: patch-cm,v 1.2 2002/08/25 19:23:42 jlam Exp $ -keditbookmarks_LDADD = keditbookmarks.la +keditbookmarks_SOURCES = keditbookmarks_main.cpp +keditbookmarks_LDADD = libkeditbookmarks_main.la - keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) + keditbookmarks_LDFLAGS = $(all_libraries) - -dummy.cpp: - echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn index 102cbccac21..a483f8cb4ec 100644 --- a/x11/kdebase3/patches/patch-cn +++ b/x11/kdebase3/patches/patch-cn @@ -1,31 +1,28 @@ -$NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- konqueror/keditbookmarks/Makefile.in.orig Fri Jan 17 09:03:09 2003 +++ konqueror/keditbookmarks/Makefile.in -@@ -290,21 +290,26 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all +@@ -288,20 +288,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all - METASOURCES = AUTO + #>- METASOURCES = AUTO -lib_LTLIBRARIES = keditbookmarks.la +lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la --#>- keditbookmarks_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp -+#>- libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp +-#>- keditbookmarks_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp ++#>- libkeditbookmarks_main_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp #>+ 1 --keditbookmarks_la_SOURCES=main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp -+libkeditbookmarks_main_la_SOURCES=main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp +-keditbookmarks_la_SOURCES=main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp ++libkeditbookmarks_main_la_SOURCES=main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp ++libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML) ++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) + +keditbookmarks_la_SOURCES = keditbookmarks_main.cpp kbookmarklistener_DIR = $(top_srcdir)/libkonq --keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la -+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) -+#>- libkeditbookmarks_main_la_METASOURCES = AUTO -+ +-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML) +keditbookmarks_la_LIBADD = libkeditbookmarks_main.la keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version --#>- keditbookmarks_la_METASOURCES = AUTO bin_PROGRAMS = keditbookmarks @@ -33,15 +30,16 @@ $NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ -keditbookmarks_LDADD = keditbookmarks.la +keditbookmarks_SOURCES = keditbookmarks_main.cpp +keditbookmarks_LDADD = libkeditbookmarks_main.la - keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) + keditbookmarks_LDFLAGS = $(all_libraries) rcdir = $(kde_datadir)/keditbookmarks -@@ -319,22 +324,29 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -314,24 +318,31 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -keditbookmarks_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la --am_keditbookmarks_la_OBJECTS = main.lo toplevel.lo commands.lo +-am_keditbookmarks_la_OBJECTS = main.lo items.lo toplevel.lo favicons.lo \ +- commands.lo +keditbookmarks_la_DEPENDENCIES = libkeditbookmarks_main.la +am_keditbookmarks_la_OBJECTS = keditbookmarks_main.lo #>- keditbookmarks_la_OBJECTS = $(am_keditbookmarks_la_OBJECTS) @@ -49,16 +47,19 @@ $NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ +keditbookmarks_la_OBJECTS = keditbookmarks_main.lo +libkeditbookmarks_main_la_DEPENDENCIES = \ + $(top_builddir)/libkonq/libkonq.la -+am_libkeditbookmarks_main_la_OBJECTS = main.lo toplevel.lo commands.lo ++am_libkeditbookmarks_main_la_OBJECTS = main.lo items.lo toplevel.lo \ ++ favicons.lo commands.lo +#>- libkeditbookmarks_main_la_OBJECTS = \ +#>- $(am_libkeditbookmarks_main_la_OBJECTS) - #>+ 4 + #>+ 5 -keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo --keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo +-keditbookmarks_la_nofinal_OBJECTS = main.lo items.lo toplevel.lo favicons.lo \ +- commands.lo toplevel_skel.lo -@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS) +libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo -+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo ++libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo items.lo toplevel.lo \ ++ favicons.lo commands.lo toplevel_skel.lo +@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS) bin_PROGRAMS = keditbookmarks$(EXEEXT) @@ -75,41 +76,40 @@ $NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -342,13 +354,19 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -340,15 +351,21 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo --#>+ 5 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/keditbookmarks_la.all_cpp.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo -+#>+ 9 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libkeditbookmarks_main_la.all_cpp.P $(DEPDIR)/commands.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commands.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo +-#>+ 7 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/keditbookmarks_la.all_cpp.P ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \ ++#>+ 11 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libkeditbookmarks_main_la.all_cpp.P ./$(DEPDIR)/commands.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/commands.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -369,11 +387,12 @@ CXXLD = $(CXX) +@@ -370,11 +387,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) +DIST_SOURCES = $(keditbookmarks_la_SOURCES) \ + $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES) - DATA = $(data_DATA) $(rc_DATA) + DATA = $(rc_DATA) DIST_COMMON = Makefile.am Makefile.in -SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) @@ -117,79 +117,97 @@ $NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- all: all-am #>+ 1 -@@ -422,6 +441,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -421,6 +439,8 @@ clean-libLTLIBRARIES: + done keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) +libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -457,7 +478,8 @@ distclean-compile: +@@ -461,9 +481,10 @@ distclean-compile: -rm -f *.tab.c - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commands.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keditbookmarks_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keditbookmarks_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ - -@@ -552,7 +574,7 @@ distclean-tags: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/favicons.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keditbookmarks_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keditbookmarks_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@ +@@ -554,7 +575,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=toplevel.h keditbookmarks.desktop keditbookmarksui.rc hi32-app-keditbookmarks.png commands.h hi16-app-keditbookmarks.png kinsertionsort.h -+KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc +-KDE_DIST=toplevel.h cr48-app-keditbookmarks.png cr128-app-keditbookmarks.png cr32-app-keditbookmarks.png uninstall.desktop cr64-app-keditbookmarks.png keditbookmarksui.rc favicons.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h ++KDE_DIST=commands.h kinsertionsort.h favicons.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc cr128-app-keditbookmarks.png cr48-app-keditbookmarks.png cr16-app-keditbookmarks.png uninstall.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -672,9 +694,6 @@ uninstall-am: uninstall-kde-icons unins - uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ +@@ -681,9 +702,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-libLTLIBRARIES uninstall-rcDATA -- + -dummy.cpp: - echo > dummy.cpp - # Tell versions [3.59,3.63) of GNU make to not export all variables. +- + install-data-local: uninstall.desktop + $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet + $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop +@@ -691,27 +709,27 @@ install-data-local: uninstall.desktop # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -686,16 +705,16 @@ toplevel_skel.cpp: toplevel.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl - #>+ 3 --toplevel.moc: $(srcdir)/toplevel.h -- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc +-#>+ 5 +-toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false ) +-toplevel_skel.cpp: toplevel.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl - --#>+ 3 - commands.moc: $(srcdir)/commands.h - $(MOC) $(srcdir)/commands.h -o commands.moc + #>+ 3 + favicons.moc: $(srcdir)/favicons.h + $(MOC) $(srcdir)/favicons.h -o favicons.moc #>+ 3 -+toplevel.moc: $(srcdir)/toplevel.h -+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++commands.moc: $(srcdir)/commands.h ++ $(MOC) $(srcdir)/commands.h -o commands.moc + +#>+ 3 + toplevel.moc: $(srcdir)/toplevel.h + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + +-#>+ 3 +-commands.moc: $(srcdir)/commands.h +- $(MOC) $(srcdir)/commands.h -o commands.moc ++#>+ 5 ++toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false ) ++toplevel_skel.cpp: toplevel.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl + + #>+ 3 clean-metasources: -- -rm -f toplevel.moc commands.moc -+ -rm -f commands.moc toplevel.moc +- -rm -f favicons.moc toplevel.moc commands.moc ++ -rm -f favicons.moc commands.moc toplevel.moc #>+ 4 clean-idl: -@@ -724,33 +743,33 @@ force-reedit: +@@ -749,33 +767,33 @@ force-reedit: #>+ 11 --keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp toplevel.moc commands.moc +-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/items.cpp $(srcdir)/toplevel.cpp $(srcdir)/favicons.cpp $(srcdir)/commands.cpp toplevel_skel.cpp favicons.moc toplevel.moc commands.moc - @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ - rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ -+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp commands.moc toplevel.moc ++libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/items.cpp $(srcdir)/toplevel.cpp $(srcdir)/favicons.cpp $(srcdir)/commands.cpp toplevel_skel.cpp favicons.moc commands.moc toplevel.moc + @echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \ + rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \ - for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp ; do \ + for file in main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \ @@ -224,14 +242,17 @@ $NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -760,7 +779,7 @@ kde-rpo-clean: +@@ -785,9 +803,9 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 5 --commands.o: commands.moc --toplevel.lo: toplevel.moc --commands.lo: commands.moc - toplevel.o: toplevel.moc + #>+ 7 ++toplevel.o: toplevel.moc +commands.lo: commands.moc +toplevel.lo: toplevel.moc -+commands.o: commands.moc + commands.o: commands.moc +-favicons.lo: favicons.moc + favicons.o: favicons.moc +-toplevel.lo: toplevel.moc +-commands.lo: commands.moc +-toplevel.o: toplevel.moc ++favicons.lo: favicons.moc diff --git a/x11/kdebase3/patches/patch-cp b/x11/kdebase3/patches/patch-cp index a1ba9e376a4..37a5632310a 100644 --- a/x11/kdebase3/patches/patch-cp +++ b/x11/kdebase3/patches/patch-cp @@ -1,10 +1,10 @@ -$NetBSD: patch-cp,v 1.2 2002/08/25 19:23:42 jlam Exp $ +$NetBSD: patch-cp,v 1.3 2003/03/11 13:10:24 markd Exp $ ---- konqueror/keditbookmarks/main.cpp.orig Wed May 8 19:22:33 2002 +--- konqueror/keditbookmarks/main.cpp.orig Tue Nov 5 04:45:04 2002 +++ konqueror/keditbookmarks/main.cpp -@@ -32,7 +32,9 @@ - { 0, 0, 0} - }; +@@ -110,7 +110,9 @@ int askUser(KApplication &app, QString e + } + } -int main(int argc, char ** argv) +extern "C" int kdemain(int, char **); @@ -12,4 +12,4 @@ $NetBSD: patch-cp,v 1.2 2002/08/25 19:23:42 jlam Exp $ +int kdemain(int argc, char ** argv) { KLocale::setMainCatalogue("konqueror"); - KAboutData aboutData( "keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.0", + KAboutData aboutData("keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.1", diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs index f96099d0d5b..1c344fa1404 100644 --- a/x11/kdebase3/patches/patch-cs +++ b/x11/kdebase3/patches/patch-cs @@ -1,19 +1,18 @@ -$NetBSD: patch-cs,v 1.3 2002/08/28 07:15:41 skrll Exp $ +$NetBSD: patch-cs,v 1.4 2003/03/11 13:10:24 markd Exp $ ---- konsole/konsole/Makefile.am.orig Mon Aug 5 15:56:24 2002 +--- konsole/konsole/Makefile.am.orig Fri Jan 3 17:43:59 2003 +++ konsole/konsole/Makefile.am -@@ -12,7 +12,8 @@ INCLUDES = $(all_includes) +@@ -12,7 +12,7 @@ INCLUDES = -I. $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole --lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la -+lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ -+ libkonsole_main.la konsole.la +-lib_LTLIBRARIES = kwrited.la konsole.la ++lib_LTLIBRARIES = libkwrited_main.la kwrited.la libkonsole_main.la konsole.la + # libkonsolepart is a part, but konsole.la links directly to it, so we can't # install it under kde_module - -@@ -32,24 +33,32 @@ libkonsolepart_la_LDFLAGS = $(all_librar - libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS) +@@ -34,26 +34,34 @@ libkonsolepart_la_LDFLAGS = $(all_librar + libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS) # kwrited kdeinit module -kwrited_la_SOURCES = kwrited.cpp @@ -30,29 +29,32 @@ $NetBSD: patch-cs,v 1.3 2002/08/28 07:15:41 skrll Exp $ -kwrited_SOURCES = dummy.cpp -kwrited_LDADD = kwrited.la +kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la ++kwrited_LDADD = libkwrited_main.la kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) + # konsole kdeinit module --konsole_la_SOURCES = main.cpp konsole.cpp --konsole_la_LIBADD = libkonsolepart.la -+libkonsole_main_la_SOURCES = main.cpp konsole.cpp -+libkonsole_main_la_LIBADD = libkonsolepart.la +-konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ ++libkonsole_main_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ + konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp +libkonsole_main_la_LDFLAGS = $(all_libraries) ++libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) + +konsole_la_SOURCES = konsole_main.cpp -+konsole_la_LIBADD = libkonsole_main.la konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version +-konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) ++konsole_la_LIBADD = libkonsole_main.la - # konsole executable - has all the sources, doesn't link kparts, saves startup time - konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ - TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ -- konsole_wcwidth.cpp -+ konsole_wcwidth.cpp konsole_main.cpp - konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI) + # konsole executable +-konsole_SOURCES = dummy.cpp +-konsole_LDADD = konsole.la $(LIB_KIO) ++konsole_SOURCES = konsole_main.cpp ++konsole_LDADD = libkonsole_main.la konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -91,9 +100,6 @@ messages: rc.cpp + # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp +@@ -97,9 +105,6 @@ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot rm -f schemas.cpp rm -f tips.cpp @@ -60,5 +62,5 @@ $NetBSD: patch-cs,v 1.3 2002/08/28 07:15:41 skrll Exp $ -dummy.cpp: - echo > dummy.cpp - konsole.lo: konsole.o - + # setting up x-application/konsole as a special mimetype + mimedir = $(kde_mimedir)/application diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct index 95495753226..6c4ad5e9417 100644 --- a/x11/kdebase3/patches/patch-ct +++ b/x11/kdebase3/patches/patch-ct @@ -1,20 +1,18 @@ -$NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-ct,v 1.5 2003/03/11 13:10:24 markd Exp $ ---- konsole/konsole/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- konsole/konsole/Makefile.in.orig Fri Jan 17 09:03:10 2003 +++ konsole/konsole/Makefile.in -@@ -303,7 +303,9 @@ INCLUDES = $(all_includes) +@@ -301,7 +301,7 @@ INCLUDES = -I. $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole --lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la -+lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ -+ libkonsole_main.la konsole.la -+ +-lib_LTLIBRARIES = kwrited.la konsole.la ++lib_LTLIBRARIES = libkwrited_main.la kwrited.la libkonsole_main.la konsole.la + # libkonsolepart is a part, but konsole.la links directly to it, so we can't - # install it under kde_module -@@ -336,28 +338,36 @@ libkonsolepart_la_LDFLAGS = $(all_librar - libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS) +@@ -336,30 +336,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar + libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS) # kwrited kdeinit module -kwrited_la_SOURCES = kwrited.cpp @@ -31,45 +29,56 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ -kwrited_SOURCES = dummy.cpp -kwrited_LDADD = kwrited.la +kwrited_SOURCES = kwrited_main.cpp -+kwrited_LDADD = libkwrited_main.la ++kwrited_LDADD = libkwrited_main.la kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) # konsole kdeinit module --konsole_la_SOURCES = main.cpp konsole.cpp --konsole_la_LIBADD = libkonsolepart.la -+libkonsole_main_la_SOURCES = main.cpp konsole.cpp -+libkonsole_main_la_LIBADD = libkonsolepart.la +-#>- konsole_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ ++#>- libkonsole_main_la_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + #>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ + #>- konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp + #>+ 3 +-konsole_la_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ ++libkonsole_main_la_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ + konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp + +libkonsole_main_la_LDFLAGS = $(all_libraries) ++libkonsole_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) + +konsole_la_SOURCES = konsole_main.cpp -+konsole_la_LIBADD = libkonsole_main.la konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version +-konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIBUTIL) $(XTESTLIB) ++konsole_la_LIBADD = libkonsole_main.la - # konsole executable - has all the sources, doesn't link kparts, saves startup time - #>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ - #>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ --#>- konsole_wcwidth.cpp -+#>- konsole_wcwidth.cpp konsole_main.cpp - #>+ 3 - konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ - TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ -- konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp -+ konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp - - konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI) + # konsole executable +-konsole_SOURCES = dummy.cpp +-konsole_LDADD = konsole.la $(LIB_KIO) ++konsole_SOURCES = konsole_main.cpp ++konsole_LDADD = libkonsole_main.la konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -391,19 +401,24 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) --konsole_la_DEPENDENCIES = libkonsolepart.la --am_konsole_la_OBJECTS = main.lo konsole.lo + +@@ -394,27 +402,32 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-konsole_la_DEPENDENCIES = +-am_konsole_la_OBJECTS = TEPty.lo BlockArray.lo main.lo konsole.lo \ +- schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ +- TEmulation.lo TEHistory.lo keytrans.lo konsole_wcwidth.lo \ +- konsolebookmarkhandler.lo konsolebookmarkmenu.lo \ +- konsole_child.lo +konsole_la_DEPENDENCIES = libkonsole_main.la +am_konsole_la_OBJECTS = konsole_main.lo #>- konsole_la_OBJECTS = $(am_konsole_la_OBJECTS) --#>+ 4 +-#>+ 8 -konsole_la_final_OBJECTS = konsole_la.all_cpp.lo --konsole_la_nofinal_OBJECTS = main.lo konsole.lo +-konsole_la_nofinal_OBJECTS = TEPty.lo BlockArray.lo main.lo konsole.lo \ +- schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ +- TEmulation.lo TEHistory.lo keytrans.lo konsole_wcwidth.lo \ +- konsolebookmarkhandler.lo konsolebookmarkmenu.lo \ +- konsole_child.lo konsoleiface_skel.lo sessioniface_skel.lo -@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS) -kwrited_la_DEPENDENCIES = libkonsolepart.la @@ -82,18 +91,26 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ #>+ 1 -kwrited_la_OBJECTS = kwrited.lo +kwrited_la_OBJECTS = kwrited_main.lo -+libkonsole_main_la_DEPENDENCIES = libkonsolepart.la -+am_libkonsole_main_la_OBJECTS = main.lo konsole.lo ++libkonsole_main_la_DEPENDENCIES = ++am_libkonsole_main_la_OBJECTS = TEPty.lo BlockArray.lo main.lo \ ++ konsole.lo schema.lo session.lo TEWidget.lo TEmuVt102.lo \ ++ TEScreen.lo TEmulation.lo TEHistory.lo keytrans.lo \ ++ konsole_wcwidth.lo konsolebookmarkhandler.lo \ ++ konsolebookmarkmenu.lo konsole_child.lo +#>- libkonsole_main_la_OBJECTS = $(am_libkonsole_main_la_OBJECTS) -+#>+ 4 ++#>+ 8 +libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.lo -+libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo ++libkonsole_main_la_nofinal_OBJECTS = TEPty.lo BlockArray.lo main.lo \ ++ konsole.lo schema.lo session.lo TEWidget.lo TEmuVt102.lo \ ++ TEScreen.lo TEmulation.lo TEHistory.lo keytrans.lo \ ++ konsole_wcwidth.lo konsolebookmarkhandler.lo \ ++ konsolebookmarkmenu.lo konsole_child.lo konsoleiface_skel.lo sessioniface_skel.lo +@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS) libkonsolepart_la_DEPENDENCIES = am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ -@@ -416,6 +431,11 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt +@@ -427,25 +440,30 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt konsole_wcwidth.lo TEmulation.lo TEHistory.lo keytrans.lo konsoleiface_skel.lo sessioniface_skel.lo @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) @@ -105,27 +122,19 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ kwrited$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -424,7 +444,7 @@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo - konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ - TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ - TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ -- konsole_wcwidth.$(OBJEXT) -+ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) + +-am_konsole_OBJECTS = dummy.$(OBJEXT) ++am_konsole_OBJECTS = konsole_main.$(OBJEXT) #>- konsole_OBJECTS = $(am_konsole_OBJECTS) - #>+ 8 - konsole_final_OBJECTS = konsole.all_cpp.o -@@ -432,7 +452,7 @@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT - konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ - TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ - TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ -- konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) -+ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) - @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) - konsole_DEPENDENCIES = -@@ -442,11 +462,11 @@ am_konsole_grantpty_OBJECTS = konsole_gr + #>+ 1 +-konsole_OBJECTS = dummy.$(OBJEXT) +-konsole_DEPENDENCIES = konsole.la ++konsole_OBJECTS = konsole_main.$(OBJEXT) ++konsole_DEPENDENCIES = libkonsole_main.la + am_konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) + #>- konsole_grantpty_OBJECTS = $(am_konsole_grantpty_OBJECTS) + #>+ 1 konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) - konsole_grantpty_LDADD = $(LDADD) konsole_grantpty_DEPENDENCIES = -am_kwrited_OBJECTS = dummy.$(OBJEXT) +am_kwrited_OBJECTS = kwrited_main.$(OBJEXT) @@ -138,88 +147,75 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -461,32 +481,40 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - #>- @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ - #>- @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ - #>- @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ --#>- @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po --#>+ 33 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/konsole_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P $(DEPDIR)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/session.Po -+#>+ 41 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/libkonsole_main_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P $(DEPDIR)/konsole.all_cpp.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEScreen.Plo $(DEPDIR)/TEScreen.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/session.Po - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/BlockArray.Plo $(DEPDIR)/BlockArray.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEHistory.Plo $(DEPDIR)/TEHistory.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEPty.Plo $(DEPDIR)/TEPty.Po \ -@@ -494,15 +522,19 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/session.Po +@@ -458,44 +476,56 @@ am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/TEmuVt102.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_child.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_grantpty.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_part.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsole_wcwidth.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkhandler.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkmenu.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo +-#>+ 29 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/konsole_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P ./$(DEPDIR)/BlockArray.Plo \ ++#>+ 37 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P $(DEPDIR)/libkonsole_main_la.all_cpp.P $(DEPDIR)/libkonsolepart_la.all_cpp.P ./$(DEPDIR)/BlockArray.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmuVt102.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_child.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_part.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_wcwidth.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkhandler.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkmenu.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/konsoleiface_skel.P $(DEPDIR)/sessioniface_skel.P ./$(DEPDIR)/BlockArray.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEHistory.Plo ./$(DEPDIR)/TEPty.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEScreen.Plo ./$(DEPDIR)/TEWidget.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmuVt102.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keytrans.Plo ./$(DEPDIR)/konsole.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/TEmulation.Plo ./$(DEPDIR)/keytrans.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_child.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_grantpty.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_part.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsole_wcwidth.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkhandler.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/konsolebookmarkmenu.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwrited_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -532,14 +564,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -526,14 +556,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \ @@ -237,7 +233,7 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ #>- all: all-am #>+ 1 -@@ -590,11 +623,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons +@@ -610,11 +641,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) @@ -247,111 +243,154 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ #>+ 2 @KDE_USE_CLOSURE_TRUE@libkonsolepart.la: libkonsolepart.la.closure $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) + $(CXXLINK) -rpath $(kde_moduledir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) +libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -649,16 +686,19 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmuVt102.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keytrans.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keytrans.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_grantpty.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_part.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_wcwidth.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_wcwidth.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/schema.Plo@am__quote@ -@@ -776,7 +816,7 @@ distclean-tags: - +@@ -667,16 +702,19 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEWidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmuVt102.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TEmulation.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keytrans.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_child.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_grantpty.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_part.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsole_wcwidth.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsolebookmarkhandler.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/konsolebookmarkmenu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwrited_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/schema.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Plo@am__quote@ +@@ -805,7 +843,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h TEmulation.cpp keytrans.cpp konsolerc konsoleiface.h TEHistory.cpp konsole_wcwidth.cpp -+KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp +-KDE_DIST=x-konsole.desktop sessioniface.h TEScreen.cpp MakeDefaults konsole_part.h konsolebookmarkmenu.cpp TEmulation.cpp konsole_child.cpp keytrans.cpp konsolerc konsoleiface.h konsolebookmarkhandler.cpp TEHistory.cpp konsole_wcwidth.cpp ++KDE_DIST=keytrans.cpp konsoleiface.h konsole_part.h konsolebookmarkmenu.cpp konsole_wcwidth.cpp x-konsole.desktop konsolerc konsole_child.cpp sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp konsolebookmarkhandler.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -918,9 +958,6 @@ messages: rc.cpp +@@ -962,50 +1000,37 @@ messages: rc.cpp + $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot rm -f schemas.cpp rm -f tips.cpp - +- -dummy.cpp: - echo > dummy.cpp -- - #>- konsole.lo: konsole.o - #>+ 1 - konsole.lo: konsole.moc konsole.o -@@ -929,8 +966,12 @@ konsole.lo: konsole.moc konsole.o + # 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: +-#>+ 9 +-konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false ) +-konsoleiface_skel.cpp: konsoleiface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl +-sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false ) +-sessioniface_skel.cpp: sessioniface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl +- #>+ 3 -kwrited.moc: $(srcdir)/kwrited.h - $(MOC) $(srcdir)/kwrited.h -o kwrited.moc -+konsole_part.moc: $(srcdir)/konsole_part.h -+ $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc -+ -+#>+ 3 -+konsole.moc: $(srcdir)/konsole.h -+ $(MOC) $(srcdir)/konsole.h -o konsole.moc ++konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h ++ $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc #>+ 3 TEWidget.moc: $(srcdir)/TEWidget.h -@@ -941,10 +982,6 @@ TEmulation.moc: $(srcdir)/TEmulation.h + $(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc + + #>+ 3 +-konsole_child.moc: $(srcdir)/konsole_child.h +- $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc +- +-#>+ 3 + TEmulation.moc: $(srcdir)/TEmulation.h $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc #>+ 3 +-konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h +- $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc ++kwrited.moc: $(srcdir)/kwrited.h ++ $(MOC) $(srcdir)/kwrited.h -o kwrited.moc + + #>+ 3 -konsole.moc: $(srcdir)/konsole.h - $(MOC) $(srcdir)/konsole.h -o konsole.moc -- --#>+ 3 - session.moc: $(srcdir)/session.h - $(MOC) $(srcdir)/session.h -o session.moc ++TEPty.moc: $(srcdir)/TEPty.h ++ $(MOC) $(srcdir)/TEPty.h -o TEPty.moc + + #>+ 3 +-konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h +- $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc ++konsole_part.moc: $(srcdir)/konsole_part.h ++ $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc ++ ++#>+ 3 ++konsole.moc: $(srcdir)/konsole.h ++ $(MOC) $(srcdir)/konsole.h -o konsole.moc -@@ -953,8 +990,8 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h + #>+ 3 + session.moc: $(srcdir)/session.h +@@ -1016,12 +1041,22 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc #>+ 3 -konsole_part.moc: $(srcdir)/konsole_part.h - $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc -+kwrited.moc: $(srcdir)/kwrited.h -+ $(MOC) $(srcdir)/kwrited.h -o kwrited.moc ++konsole_child.moc: $(srcdir)/konsole_child.h ++ $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc #>+ 3 - TEPty.moc: $(srcdir)/TEPty.h -@@ -981,7 +1018,7 @@ libkonsolepart.la.closure: $(libkonsolep +-TEPty.moc: $(srcdir)/TEPty.h +- $(MOC) $(srcdir)/TEPty.h -o TEPty.moc ++konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h ++ $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc ++ ++#>+ 9 ++konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; /bin/false ) ++konsoleiface_skel.cpp: konsoleiface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub konsoleiface.kidl ++sessioniface.kidl: $(srcdir)/sessioniface.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/sessioniface.h > sessioniface.kidl || ( rm -f sessioniface.kidl ; /bin/false ) ++sessioniface_skel.cpp: sessioniface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl + + #>+ 8 + libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) +@@ -1034,7 +1069,7 @@ libkonsolepart.la.closure: $(libkonsolep #>+ 3 clean-metasources: -- -rm -f kwrited.moc TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc -+ -rm -f konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc +- -rm -f kwrited.moc TEWidget.moc konsole_child.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc ++ -rm -f konsolebookmarkmenu.moc TEWidget.moc TEmulation.moc kwrited.moc TEPty.moc konsole_part.moc konsole.moc session.moc TEmuVt102.moc konsole_child.moc konsolebookmarkhandler.moc #>+ 7 clean-idl: -@@ -1006,19 +1043,19 @@ force-reedit: +@@ -1059,19 +1094,19 @@ force-reedit: #>+ 11 --konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc +-konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc konsole_child.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc TEmuVt102.moc session.moc TEPty.moc - @echo 'creating konsole_la.all_cpp.cpp ...'; \ - rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ -+libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole.moc ++libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsolebookmarkmenu.moc TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc konsolebookmarkhandler.moc konsole_child.moc + @echo 'creating libkonsole_main_la.all_cpp.cpp ...'; \ + rm -f libkonsole_main_la.all_cpp.files libkonsole_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_cpp.final; \ - for file in main.cpp konsole.cpp ; do \ + for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ - echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkonsole_main_la.all_cpp.files; \ @@ -363,77 +402,75 @@ $NetBSD: patch-ct,v 1.4 2003/01/02 09:12:35 skrll Exp $ + rm -f libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files #>+ 11 --libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc +-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc +libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEmulation.moc TEWidget.moc TEPty.moc konsole_part.moc session.moc TEmuVt102.moc @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkonsolepart_la.all_cpp.final; \ -@@ -1030,11 +1067,11 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) - rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files - - #>+ 11 --konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc konsole.moc session.moc TEmuVt102.moc TEPty.moc -+konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc - @echo 'creating konsole.all_cpp.cpp ...'; \ - rm -f konsole.all_cpp.files konsole.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> konsole.all_cpp.final; \ -- for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ -+ for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ; do \ - echo "#include \"$$file\"" >> konsole.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ - done; \ -@@ -1043,20 +1080,20 @@ konsole.all_cpp.cpp: $(srcdir)/Makefile. +@@ -1084,20 +1119,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) #>+ 3 clean-final: -- -rm -f konsole_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp -+ -rm -f libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp +- -rm -f konsole_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp ++ -rm -f libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am -+ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1066,18 +1103,18 @@ kde-rpo-clean: +@@ -1107,25 +1142,25 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 16 + #>+ 23 ++konsole.o: konsole.moc + konsole_child.lo: konsole_child.moc -kwrited.lo: kwrited.moc -TEmuVt102.o: TEmuVt102.moc -TEWidget.o: TEWidget.moc -session.lo: session.moc +-konsole_child.o: konsole_child.moc -TEPty.lo: TEPty.moc --session.o: session.moc ++konsolebookmarkhandler.lo: konsolebookmarkhandler.moc + session.o: session.moc + konsole.lo: konsole.moc +-konsolebookmarkhandler.lo: konsolebookmarkhandler.moc -TEmulation.lo: TEmulation.moc +-konsole.o: konsole.moc +-konsolebookmarkmenu.o: konsolebookmarkmenu.moc +-TEPty.o: TEPty.moc +-TEmuVt102.lo: TEmuVt102.moc ++TEWidget.lo: TEWidget.moc + TEmulation.o: TEmulation.moc ++konsolebookmarkhandler.o: konsolebookmarkhandler.moc ++TEmuVt102.o: TEmuVt102.moc + konsolebookmarkmenu.lo: konsolebookmarkmenu.moc +TEmuVt102.lo: TEmuVt102.moc - konsole.o: konsole.moc +TEPty.lo: TEPty.moc +session.lo: session.moc - TEPty.o: TEPty.moc --TEmuVt102.lo: TEmuVt102.moc +TEmulation.lo: TEmulation.moc ++TEPty.o: TEPty.moc konsole_part.lo: konsole_part.moc -+session.o: session.moc -+TEWidget.lo: TEWidget.moc - TEmulation.o: TEmulation.moc --konsole_part.o: konsole_part.moc - kwrited.o: kwrited.moc +-kwrited.o: kwrited.moc -TEWidget.lo: TEWidget.moc -+konsole_part.o: konsole_part.moc +-konsolebookmarkhandler.o: konsolebookmarkhandler.moc + konsole_part.o: konsole_part.moc ++kwrited.o: kwrited.moc ++konsole_child.o: konsole_child.moc +kwrited.lo: kwrited.moc -+TEmuVt102.o: TEmuVt102.moc +TEWidget.o: TEWidget.moc ++konsolebookmarkmenu.o: konsolebookmarkmenu.moc diff --git a/x11/kdebase3/patches/patch-cy b/x11/kdebase3/patches/patch-cy index 1ddc744f9c3..7271f033e8e 100644 --- a/x11/kdebase3/patches/patch-cy +++ b/x11/kdebase3/patches/patch-cy @@ -1,8 +1,8 @@ -$NetBSD: patch-cy,v 1.2 2002/08/25 19:23:43 jlam Exp $ +$NetBSD: patch-cy,v 1.3 2003/03/11 13:10:24 markd Exp $ ---- ksmserver/Makefile.am.orig Wed May 8 19:22:50 2002 +--- ksmserver/Makefile.am.orig Tue Jul 2 06:54:12 2002 +++ ksmserver/Makefile.am -@@ -20,18 +20,21 @@ +@@ -20,18 +20,21 @@ SUBDIRS = . INCLUDES= $(all_includes) bin_PROGRAMS = ksmserver @@ -12,9 +12,9 @@ $NetBSD: patch-cy,v 1.2 2002/08/25 19:23:43 jlam Exp $ ksmserver_la_METASOURCES = AUTO # Order is important for --enable-final! --ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp +-ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel -ksmserver_SOURCES = dummy.cpp -+libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp ++libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel +ksmserver_la_SOURCES = ksmserver_main.cpp +ksmserver_SOURCES = ksmserver_main.cpp @@ -29,7 +29,7 @@ $NetBSD: patch-cy,v 1.2 2002/08/25 19:23:43 jlam Exp $ picsdir = $(kde_datadir)/ksmserver/pics pics_DATA = shutdownkonq.png -@@ -48,6 +51,3 @@ +@@ -47,6 +50,3 @@ testsh_LDADD = $(LIB_KDEUI) shutdown.lo messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz index 8730c70ed67..61488de4f1d 100644 --- a/x11/kdebase3/patches/patch-cz +++ b/x11/kdebase3/patches/patch-cz @@ -1,8 +1,8 @@ -$NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-cz,v 1.4 2003/03/11 13:10:25 markd Exp $ ---- ksmserver/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- ksmserver/Makefile.in.orig Fri Jan 17 09:03:10 2003 +++ ksmserver/Makefile.in -@@ -308,18 +308,21 @@ SUBDIRS = . +@@ -307,20 +307,23 @@ SUBDIRS = . INCLUDES = $(all_includes) bin_PROGRAMS = ksmserver @@ -12,9 +12,12 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- ksmserver_la_METASOURCES = AUTO # Order is important for --enable-final! --ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp +-#>- ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel ++#>- libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel + #>+ 1 +-ksmserver_la_SOURCES=main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp -ksmserver_SOURCES = dummy.cpp -+libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp ++libksmserver_main_la_SOURCES=main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp +ksmserver_la_SOURCES = ksmserver_main.cpp +ksmserver_SOURCES = ksmserver_main.cpp @@ -45,15 +48,15 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ +#>- libksmserver_main_la_OBJECTS = $(am_libksmserver_main_la_OBJECTS) #>+ 4 -ksmserver_la_final_OBJECTS = ksmserver_la.all_cpp.lo --ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo +-ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo KSMServerInterface_skel.lo -@KDE_USE_FINAL_FALSE@ksmserver_la_OBJECTS = $(ksmserver_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@ksmserver_la_OBJECTS = $(ksmserver_la_final_OBJECTS) +libksmserver_main_la_final_OBJECTS = libksmserver_main_la.all_cpp.lo -+libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo ++libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo KSMServerInterface_skel.lo +@KDE_USE_FINAL_FALSE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_final_OBJECTS) + EXTRA_PROGRAMS = testsh$(EXEEXT) bin_PROGRAMS = ksmserver$(EXEEXT) - check_PROGRAMS = testsh$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_ksmserver_OBJECTS = dummy.$(OBJEXT) @@ -64,32 +67,32 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ -ksmserver_DEPENDENCIES = ksmserver.la +ksmserver_OBJECTS = ksmserver_main.$(OBJEXT) +ksmserver_DEPENDENCIES = libksmserver_main.la - am_testsh_OBJECTS = test.$(OBJEXT) shutdown.$(OBJEXT) + am_testsh_OBJECTS = test.$(OBJEXT) #>- testsh_OBJECTS = $(am_testsh_OBJECTS) - #>+ 4 -@@ -370,14 +378,17 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ + #>+ 1 +@@ -368,14 +376,17 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ksmserver_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksmserver_main.Po ./$(DEPDIR)/main.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/test.Po -#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_la.all_cpp.P $(DEPDIR)/testsh.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P $(DEPDIR)/ksmserver_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \ +#>+ 9 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libksmserver_main_la.all_cpp.P $(DEPDIR)/testsh.all_cpp.P $(DEPDIR)/ksmserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po - -@@ -400,8 +411,8 @@ CXXLD = $(CXX) ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P $(DEPDIR)/libksmserver_main_la.all_cpp.P ./$(DEPDIR)/ksmserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmserver_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P ./$(DEPDIR)/ksmserver_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmserver_main.Po ./$(DEPDIR)/main.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po + +@@ -398,8 +409,8 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -100,7 +103,7 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ DATA = $(pics_DATA) $(update_DATA) HEADERS = $(noinst_HEADERS) -@@ -413,7 +424,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -411,7 +422,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -109,35 +112,35 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -462,6 +473,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -458,6 +469,8 @@ clean-libLTLIBRARIES: + done ksmserver.la: $(ksmserver_la_OBJECTS) $(ksmserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(ksmserver_la_LDFLAGS) $(ksmserver_la_OBJECTS) $(ksmserver_la_LIBADD) $(LIBS) +libksmserver_main.la: $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libksmserver_main_la_LDFLAGS) $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -502,7 +515,8 @@ mostlyclean-compile: +@@ -500,7 +513,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)/ksmserver_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksmserver_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shutdown.Plo@am__quote@ -@@ -660,7 +674,7 @@ distclean-tags: - +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksmserver_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksmserver_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shutdown.Plo@am__quote@ +@@ -671,7 +685,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE configure.in.in -+KDE_DIST=configure.in.in LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png +-KDE_DIST=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE KSMServerInterface.h configure.in.in ++KDE_DIST=move_session_config.sh LICENSE ksmserver.upd shutdownkonq.png configure.in.in KSMServerInterface.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -801,24 +815,21 @@ uninstall-info: uninstall-info-recursive +@@ -817,30 +831,27 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot @@ -148,38 +151,48 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: +-#>+ 5 +-KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; /bin/false ) +-KSMServerInterface_skel.cpp: KSMServerInterface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl ++#>+ 3 ++server.moc: $(srcdir)/server.h ++ $(MOC) $(srcdir)/server.h -o server.moc + #>+ 3 --shutdown.moc: $(srcdir)/shutdown.h -- $(MOC) $(srcdir)/shutdown.h -o shutdown.moc -- + shutdown.moc: $(srcdir)/shutdown.h + $(MOC) $(srcdir)/shutdown.h -o shutdown.moc + -#>+ 3 - server.moc: $(srcdir)/server.h - $(MOC) $(srcdir)/server.h -o server.moc +-server.moc: $(srcdir)/server.h +- $(MOC) $(srcdir)/server.h -o server.moc ++#>+ 5 ++KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; /bin/false ) ++KSMServerInterface_skel.cpp: KSMServerInterface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl #>+ 3 -+shutdown.moc: $(srcdir)/shutdown.h -+ $(MOC) $(srcdir)/shutdown.h -o shutdown.moc -+ -+#>+ 3 clean-metasources: - -rm -f shutdown.moc server.moc + -rm -f server.moc shutdown.moc - #>+ 2 - docs-am: -@@ -831,16 +842,16 @@ force-reedit: + #>+ 4 + clean-idl: +@@ -858,33 +869,33 @@ force-reedit: #>+ 11 --ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp shutdown.moc server.moc +-ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp shutdown.moc server.moc - @echo 'creating ksmserver_la.all_cpp.cpp ...'; \ - rm -f ksmserver_la.all_cpp.files ksmserver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> ksmserver_la.all_cpp.final; \ -+libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp server.moc shutdown.moc ++libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp server.moc shutdown.moc + @echo 'creating libksmserver_main_la.all_cpp.cpp ...'; \ + rm -f libksmserver_main_la.all_cpp.files libksmserver_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libksmserver_main_la.all_cpp.final; \ - for file in main.cpp server.cpp shutdown.cpp ; do \ + for file in main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp ; do \ - echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libksmserver_main_la.all_cpp.files; \ @@ -190,35 +203,31 @@ $NetBSD: patch-cz,v 1.3 2003/01/02 09:12:35 skrll Exp $ + cat libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files > libksmserver_main_la.all_cpp.cpp; \ + rm -f libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files - #>+ 11 - testsh.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/test.cpp $(srcdir)/shutdown.cpp shutdown.moc -@@ -856,20 +867,20 @@ testsh.all_cpp.cpp: $(srcdir)/Makefile.i - #>+ 3 clean-final: -- -rm -f ksmserver_la.all_cpp.cpp testsh.all_cpp.cpp -+ -rm -f libksmserver_main_la.all_cpp.cpp testsh.all_cpp.cpp +- -rm -f ksmserver_la.all_cpp.cpp ++ -rm -f libksmserver_main_la.all_cpp.cpp #>+ 2 final: -- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am -+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" all-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" all-am #>+ 2 final-install: -- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am -+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" install-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" install-am #>+ 2 no-final: -- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am -+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: -- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am -+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -879,7 +890,7 @@ kde-rpo-clean: +@@ -894,7 +905,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdebase3/patches/patch-dc b/x11/kdebase3/patches/patch-dc deleted file mode 100644 index d768342ae6c..00000000000 --- a/x11/kdebase3/patches/patch-dc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-dc,v 1.2 2002/08/25 19:23:45 jlam Exp $ - ---- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Fri Dec 28 09:48:05 2001 -+++ ksysguard/ksysguardd/FreeBSD/CPU.c -@@ -19,7 +19,11 @@ - */ - - #include <sys/dkstat.h> -+#ifdef __NetBSD__ -+#include <sys/sched.h> /* CPUSTATES */ -+#else - #include <devstat.h> -+#endif - #include <fcntl.h> - #include <kvm.h> - #include <nlist.h> diff --git a/x11/kdebase3/patches/patch-dd b/x11/kdebase3/patches/patch-dd deleted file mode 100644 index 9bac5e55370..00000000000 --- a/x11/kdebase3/patches/patch-dd +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-dd,v 1.3 2002/08/25 19:23:45 jlam Exp $ - ---- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 22:11:20 2001 -+++ ksysguard/ksysguardd/FreeBSD/Memory.c Tue Aug 20 14:20:49 2002 -@@ -32,7 +32,12 @@ - #include <sys/types.h> - #include <sys/vmmeter.h> - #include <unistd.h> -+/* Everything post 1.5.x uses uvm/uvm_* includes */ -+#if __NetBSD_Version__ >= 105010000 -+#include <uvm/uvm_param.h> -+#else - #include <vm/vm_param.h> -+#endif - - #include "Command.h" - #include "Memory.h" -@@ -77,6 +82,49 @@ exitMemory(void) - int - updateMemory(void) - { -+#ifdef __NetBSD__ -+#define ARRLEN(X) (sizeof(X)/sizeof(X[0])) -+ long pagesize; /* using a long promotes the arithmetic */ -+ size_t len; -+ -+ { static int mib[]={ CTL_HW, HW_PHYSMEM }; -+ -+ len = sizeof(Total); -+ sysctl(mib, ARRLEN(mib), &Total, &len, NULL, 0); -+ Total >>= 10; -+ } -+ -+ { struct uvmexp x; -+ static int mib[] = { CTL_VM, VM_UVMEXP }; -+ -+ len = sizeof(x); -+ STotal = SUsed = SFree = -1; -+ pagesize = 1; -+ if (-1 < sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0)) { -+ pagesize = x.pagesize; -+ STotal = (pagesize*x.swpages) >> 10; -+ SUsed = (pagesize*x.swpginuse) >> 10; -+ SFree = STotal - SUsed; -+ } -+ } -+ -+ /* can't find NetBSD filesystem buffer info */ -+ Buffers = -1; -+ -+ /* NetBSD doesn't know about vm.stats */ -+ Cached = -1; -+ -+ { static int mib[]={ CTL_VM, VM_METER }; -+ struct vmtotal x; -+ -+ len = sizeof(x); -+ MFree = Used = -1; -+ if (sysctl(mib, ARRLEN(mib), &x, &len, NULL, 0) > -1) { -+ MFree = (x.t_free * pagesize) >> 10; -+ Used = (x.t_rm * pagesize) >> 10; -+ } -+ } -+#else - int mib[2]; - size_t len; - struct vmtotal p; -@@ -119,6 +167,7 @@ updateMemory(void) - sysctlbyname("vm.vmmeter", &p, &len, NULL, 0); - MFree = p.t_free * getpagesize() / 1024; - Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached; -+#endif - - return 0; - } diff --git a/x11/kdebase3/patches/patch-de b/x11/kdebase3/patches/patch-de deleted file mode 100644 index 0b0d1c867c1..00000000000 --- a/x11/kdebase3/patches/patch-de +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-de,v 1.3 2003/02/24 08:12:32 skrll Exp $ - ---- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001 -+++ ksysguard/ksysguardd/FreeBSD/apm.c -@@ -20,6 +20,14 @@ - */ - -+#if defined(__NetBSD_APM__) -+ - #include <fcntl.h> -+#if defined(__NetBSD__) -+#include <machine/apmvar.h> -+#include <sys/ioctl.h> -+#include <unistd.h> -+#else - #include <machine/apm_bios.h> -+#endif - #include <stdio.h> - -@@ -63,6 +71,14 @@ int - updateApm(void) - { -- struct apm_info info; - int retval; -+#if defined(__NetBSD__) -+ struct apm_power_info info; -+ -+ retval = ioctl(ApmFD, APM_IOC_GETPOWER, &info); -+ -+ BattFill = info.battery_life; -+ BattTime = info.minutes_left; -+#else -+ struct apm_info info; - - retval = ioctl(ApmFD, APMIO_GETINFO, &info); -@@ -70,4 +86,5 @@ updateApm(void) - BattFill = info.ai_batt_life; - BattTime = info.ai_batt_time; -+#endif - - return retval; -@@ -97,2 +114,22 @@ printApmBatTimeInfo(const char* c) - fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); - } -+ -+#else -+ -+void -+initApm(void) -+{ -+} -+ -+void -+exitApm(void) -+{ -+} -+ -+int -+updateApm(void) -+{ -+ return -1; -+} -+ -+#endif diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df deleted file mode 100644 index e1bb85a8047..00000000000 --- a/x11/kdebase3/patches/patch-df +++ /dev/null @@ -1,516 +0,0 @@ -$NetBSD: patch-df,v 1.7 2003/01/04 15:04:46 skrll Exp $ - ---- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Tue Nov 5 02:41:09 2002 -+++ ksysguard/ksysguardd/FreeBSD/netdev.c -@@ -20,300 +20,265 @@ - */ - - #include <sys/types.h> -+#include <ifaddrs.h> - #include <sys/socket.h> -+#include <sys/param.h> - #include <sys/sysctl.h> --#include <sys/time.h> -- -+#include <net/route.h> - #include <net/if.h> --#include <net/if_mib.h> -- --#include <fcntl.h> --#include <stdio.h> -+#include <net/if_dl.h> -+#include <stdlib.h> - #include <string.h> --#include <unistd.h> - - #include "Command.h" - #include "ksysguardd.h" - #include "netdev.h" - -+#define I_bytes 0 -+#define I_packs 1 -+#define I_errs 2 -+#define I_mcasts 3 -+#define I_lost 4 - typedef struct { - char name[32]; -- u_long recBytes; -- u_long recPacks; -- u_long recErrs; -- u_long recDrop; -- u_long recMulticast; -- u_long sentBytes; -- u_long sentPacks; -- u_long sentErrs; -- u_long sentMulticast; -- u_long sentColls; -+ u_long recv[5],Drecv[5],sent[5],Dsent[5]; - } NetDevInfo; - -+#define LEN(X) (sizeof(X)/sizeof(X[0])) -+ - #define MAXNETDEVS 64 --static NetDevInfo NetDevs[MAXNETDEVS]; -+static NetDevInfo NetDevs[MAXNETDEVS], newval[MAXNETDEVS]; - static int NetDevCnt = 0; - --char **parseCommand(const char *cmd) --{ -- char tmp_cmd[1024]; -- char *begin; -- static char sensor[100]; -- static char interface[100]; -- static char *retval[2]; -- -- strncpy(tmp_cmd, cmd, 1024); -- -- begin = rindex(tmp_cmd, '/'); -- *begin = '\0'; -- begin++; -- strcpy(sensor, begin); -- retval[1] = sensor; -- -- begin = rindex(tmp_cmd, '/'); -- *begin = '\0'; -- begin = rindex(tmp_cmd, '/'); -- begin++; -- strcpy(interface, begin); -- retval[0] = interface; - -- return retval; --} -- --int numActivIfaces(void) --{ -- int counter = 0; -- int name[6]; -- int num_iface, i; -+/* Read the system's traffic registers. -+ * Merely count the IFs if countp nonzero. -+ * Returns count of IFs read, or -1; the data are written into newval. -+ * Based on getifaddrs source; getifaddrs itself seems to -+ * compile incorrectly, omitting the traffic data. (It also -+ * does things this doesn't need, thus this is slightly more efficient.) -+ */ -+static int readSys(int countp) { - size_t len; -- struct ifmibdata ifmd; -- -- len = sizeof(num_iface); -- sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); -- -- for (i = 1; i < num_iface + 1; i++) { -- name[0] = CTL_NET; -- name[1] = PF_LINK; -- name[2] = NETLINK_GENERIC; -- name[3] = IFMIB_IFDATA; -- name[4] = i; -- name[5] = IFDATA_GENERAL; -- -- len = sizeof(ifmd); -- sysctl(name, 6, &ifmd, &len, NULL, 0); -- if (ifmd.ifmd_flags & IFF_UP) -- counter++; -+ char *bfr, *ptr; -+ struct rt_msghdr *rtm; -+ NetDevInfo *nv; -+ static int mib[] = { -+ /* see sysctl(3): */ -+ CTL_NET, -+ PF_ROUTE, -+ 0, /* `currently always 0' */ -+ 0, /* `may be set to 0 to select all address families' */ -+ NET_RT_IFLIST, -+ 0 /* ignored but six levels are needed */ -+ }; -+ -+ if (-1==sysctl(mib, LEN(mib), NULL, &len, NULL, 0)) -+ return -1; -+ if (!(bfr = malloc(len))) -+ return -1; -+ if (-1==sysctl(mib, LEN(mib), bfr, &len, NULL, 0)) { -+ free(bfr); -+ return -1; - } -+ nv = newval; -+ for (ptr=bfr; ptr<bfr+len; ptr+=rtm->rtm_msglen) { -+ struct if_msghdr *ifm; -+ -+ rtm = (void*)ptr; /* chg ptr type to router msg */ -+ if (rtm->rtm_version != RTM_VERSION) continue; -+ if (rtm->rtm_type != RTM_IFINFO) continue; -+ ifm = (void*)rtm; /* chg ptr type to interface msg */ -+ if (!(ifm->ifm_flags & IFF_UP)) continue; -+ -+ if (!countp) { -+ /* a sdl is concat'd to the if msg */ -+ struct sockaddr_dl *sdl = (void*)(ifm+1); -+ -+ /* copy and terminate the name */ -+ /*fixme: check for overruns */ -+ memcpy(nv->name, sdl->sdl_data, sdl->sdl_nlen); -+ nv->name[sdl->sdl_nlen] = 0; -+ -+ /* copy the data */ -+ nv->recv[I_bytes] = ifm->ifm_data.ifi_ibytes; -+ nv->recv[I_packs] = ifm->ifm_data.ifi_ipackets; -+ nv->recv[I_errs] = ifm->ifm_data.ifi_ierrors; -+ nv->recv[I_mcasts] = ifm->ifm_data.ifi_imcasts; -+ nv->recv[I_lost] = ifm->ifm_data.ifi_iqdrops; -+ nv->sent[I_bytes] = ifm->ifm_data.ifi_obytes; -+ nv->sent[I_packs] = ifm->ifm_data.ifi_opackets; -+ nv->sent[I_errs] = ifm->ifm_data.ifi_oerrors; -+ nv->sent[I_mcasts] = ifm->ifm_data.ifi_omcasts; -+ nv->sent[I_lost] = ifm->ifm_data.ifi_collisions; -+ } - -- return counter; -+ /*fixme: guard against buffer overrun */ -+ nv++; -+ } -+ free(bfr); -+ return nv-newval; - } - -+ -+ -+ - /* ------------------------------ public part --------------------------- */ - --void initNetDev(void) --{ -- int i; -- char monitor[1024]; -+static void prVal(const char*, int); -+void printNetDevRecv(const char *cmd) { prVal(cmd,0); } -+void printNetDevSent(const char *cmd) { prVal(cmd,1); } -+ -+static void prInfo(const char*, int); -+void printNetDevRecvInfo(const char *cmd) { prInfo(cmd,0); } -+void printNetDevSentInfo(const char *cmd) { prInfo(cmd,1); } -+ -+static struct { -+ char *label; -+ cmdExecutor read, inform; -+ struct { -+ char *label, *info; -+ int index; -+ } op[5]; -+} opTable[] = { -+ {"receiver", -+ printNetDevRecv, printNetDevRecvInfo, -+ {{"data", "Received Data\t0\t0\tB/s\n", I_bytes}, -+ {"packets", "Received Packets\t0\t0\tHz\n", I_packs}, -+ {"errors", "Receiver Errors\t0\t0\tHz\n", I_errs}, -+ {"multicast", "Received Multicast Packets\t0\t0\tHz\n", I_mcasts}, -+ {"drops", "Receiver Drops\t0\t0\tHz\n", I_lost}}}, -+ {"transmitter", -+ printNetDevSent, printNetDevSentInfo, -+ {{"data", "Sent Data\t0\t0\tB/s\n", I_bytes}, -+ {"packets", "Sent Packets\t0\t0\tHz\n", I_packs}, -+ {"errors", "Transmitter Errors\t0\t0\tHz\n", I_errs}, -+ {"multicast", "Sent Multicast Packets\t0\t0\tHz\n", I_mcasts}, -+ {"collisions", "Transmitter Collisions\t0\t0\tHz\n", I_lost}}} -+}; -+ -+ -+static void prVal(const char *cmd, int N) { -+ char *p, *q, *r; -+ int i, d; - -- updateNetDev(); -- -- for (i = 0; i < NetDevCnt; i++) { -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevRecBytes, printNetDevRecBytesInfo); -- -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); -- registerMonitor(monitor, "integer", printNetDevSentBytes, printNetDevSentBytesInfo); -- } -+ if (!(p=rindex(cmd, '/'))) -+ return; -+ *p=0; -+ q=rindex(cmd, '/'); -+ *q=0; -+ r=rindex(cmd, '/'); -+ r++; -+ for (d=NetDevCnt; d--; ) -+ if (!strcmp(r, NetDevs[d].name)) -+ break; -+ *q=*p='/'; -+ -+ if (-1 == d) return; -+ -+ p++; -+ for (i=0; i<LEN(opTable[0].op); i++) -+ if (!strcmp(p, opTable[N].op[i].label)) -+ fprintf(CurrentClient, "%lu", -+ /*fixme: ugly and presumptuous */ -+ (N?NetDevs[d].Dsent:NetDevs[d].Drecv)[opTable[N].op[i].index]); -+ fprintf(CurrentClient, "\n"); - } - --void exitNetDev(void) --{ -- int i; -- char monitor[1024]; - -- for (i = 0; i < NetDevCnt; i++) { -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/data", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/packets", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/errors", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/drops", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/receiver/multicast", NetDevs[i].name); -- removeMonitor(monitor); -- -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/data", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/packets", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/errors", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/multicast", NetDevs[i].name); -- removeMonitor(monitor); -- snprintf(monitor, sizeof(monitor), "network/interfaces/%s/transmitter/collisions", NetDevs[i].name); -- removeMonitor(monitor); -- } --} -+static void prInfo(const char *cmd, int N) { -+ char *p, *q; -+ int i; - --void updateNetDev(void) --{ -- int name[6]; -- int num_iface, i; -- size_t len; -- struct ifmibdata ifmd; -+ if (!(p=rindex(cmd, '/'))) return; -+ p++; - -- len = sizeof(num_iface); -- sysctlbyname("net.link.generic.system.ifcount", &num_iface, &len, NULL, 0); -+ q = p+strlen(p)-1; -+ if ('?' != *q) return; -+ *q=0; -+ -+ for (i=0; i<LEN(opTable[0].op); i++) -+ if (!strcmp(p, opTable[N].op[i].label)) -+ fputs(opTable[N].op[i].info, CurrentClient); - -- NetDevCnt = 0; -- for (i = 1; i < num_iface + 1; i++) { -- name[0] = CTL_NET; -- name[1] = PF_LINK; -- name[2] = NETLINK_GENERIC; -- name[3] = IFMIB_IFDATA; -- name[4] = i; -- name[5] = IFDATA_GENERAL; -- -- len = sizeof(ifmd); -- sysctl(name, 6, &ifmd, &len, NULL, 0); -- if (ifmd.ifmd_flags & IFF_UP) { -- strncpy(NetDevs[NetDevCnt].name, ifmd.ifmd_name, 32); -- NetDevs[NetDevCnt].recBytes = ifmd.ifmd_data.ifi_ibytes - NetDevs[NetDevCnt].recBytes; -- NetDevs[NetDevCnt].recPacks = ifmd.ifmd_data.ifi_ipackets - NetDevs[NetDevCnt].recPacks; -- NetDevs[NetDevCnt].recErrs = ifmd.ifmd_data.ifi_ierrors - NetDevs[NetDevCnt].recErrs; -- NetDevs[NetDevCnt].recDrop = ifmd.ifmd_data.ifi_iqdrops - NetDevs[NetDevCnt].recDrop; -- NetDevs[NetDevCnt].recMulticast = ifmd.ifmd_data.ifi_imcasts - NetDevs[NetDevCnt].recMulticast; -- NetDevs[NetDevCnt].sentBytes = ifmd.ifmd_data.ifi_obytes - NetDevs[NetDevCnt].sentBytes; -- NetDevs[NetDevCnt].sentPacks = ifmd.ifmd_data.ifi_opackets - NetDevs[NetDevCnt].sentPacks; -- NetDevs[NetDevCnt].sentErrs = ifmd.ifmd_data.ifi_oerrors - NetDevs[NetDevCnt].sentErrs; -- NetDevs[NetDevCnt].sentMulticast = ifmd.ifmd_data.ifi_omcasts - NetDevs[NetDevCnt].sentMulticast; -- NetDevs[NetDevCnt].sentColls = ifmd.ifmd_data.ifi_collisions - NetDevs[NetDevCnt].sentColls; -- NetDevCnt++; -- } -- } -+ *q='?'; - } - --void checkNetDev(void) --{ -- if (numActivIfaces() != NetDevCnt) { -- /* interface has been added or removed -- so we do a reset */ -- exitNetDev(); -- initNetDev(); -- } --} - --void printNetDevRecBytes(const char *cmd) --{ -+static void NDreg(int setp) { - int i; -- char **retval; -- -- retval = parseCommand(cmd); -- -- if (retval[0] == NULL || retval[1] == NULL) -- return; - -- for (i = 0; i < NetDevCnt; i++) { -- if (!strcmp(NetDevs[i].name, retval[0])) { -- if (!strncmp(retval[1], "data", 4)) -- fprintf(CurrentClient, "%lu", NetDevs[i].recBytes); -- if (!strncmp(retval[1], "packets", 7)) -- fprintf(CurrentClient, "%lu", NetDevs[i].recPacks); -- if (!strncmp(retval[1], "errors", 6)) -- fprintf(CurrentClient, "%lu", NetDevs[i].recErrs); -- if (!strncmp(retval[1], "drops", 5)) -- fprintf(CurrentClient, "%lu", NetDevs[i].recDrop); -- if (!strncmp(retval[1], "multicast", 9)) -- fprintf(CurrentClient, "%lu", NetDevs[i].recMulticast); -+ for (i = 0; i<NetDevCnt; i++) { -+ int j; -+ -+ for (j=0; j<LEN(opTable); j++) { -+ int k; -+ -+ for (k=0; k<LEN(opTable[0].op); k++) { -+ char buffer[1024]; -+ -+ snprintf(buffer, sizeof(buffer), -+ "network/interfaces/%s/%s/%s", -+ NetDevs[i].name, -+ opTable[j].label, -+ opTable[j].op[k].label); -+ -+ /* printf("%d %d %d %s\n",i,j,k,buffer); */ -+ -+ if (setp) -+ registerMonitor(buffer, -+ "integer", -+ opTable[j].read, -+ opTable[j].inform); -+ else -+ removeMonitor(buffer); -+ } - } - } -- -- fprintf(CurrentClient, "\n"); - } - --void printNetDevRecBytesInfo(const char *cmd) --{ -- char **retval; -- -- retval = parseCommand(cmd); -- -- if (retval[1] == NULL) -- return; -+void initNetDev(void) { -+ int i; -+ updateNetDev(); -+ for (i=LEN(NetDevs); i--;) -+ strcpy(NetDevs[i].name, newval[i].name); -+ NDreg(!0); -+} - -- if (!strncmp(retval[1], "data", 4)) -- fprintf(CurrentClient, "Received Data\t0\t0\tkBytes/s\n"); -- if (!strncmp(retval[1], "packets", 7)) -- fprintf(CurrentClient, "Received Packets\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "errors", 6)) -- fprintf(CurrentClient, "Receiver Errors\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "drops", 5)) -- fprintf(CurrentClient, "Receiver Drops\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "multicast", 9)) -- fprintf(CurrentClient, "Received Multicast Packets\t0\t0\t1/s\n"); -+void exitNetDev(void) { -+ NDreg(0); - } - --void printNetDevSentBytes(const char *cmd) --{ -- int i; -- char **retval; -- -- retval = parseCommand(cmd); -- -- if (retval[0] == NULL || retval[1] == NULL) -+void updateNetDev(void) { -+ NetDevInfo *p, *q; -+ int n; -+ -+ if (-1==(n = readSys(0))) - return; - -- for (i = 0; i < NetDevCnt; i++) { -- if (!strcmp(NetDevs[i].name, retval[0])) { -- if (!strncmp(retval[1], "data", 4)) -- fprintf(CurrentClient, "%lu", NetDevs[i].sentBytes); -- if (!strncmp(retval[1], "packets", 7)) -- fprintf(CurrentClient, "%lu", NetDevs[i].sentPacks); -- if (!strncmp(retval[1], "errors", 6)) -- fprintf(CurrentClient, "%lu", NetDevs[i].sentErrs); -- if (!strncmp(retval[1], "multicast", 9)) -- fprintf(CurrentClient, "%lu", NetDevs[i].sentMulticast); -- if (!strncmp(retval[1], "collisions", 10)) -- fprintf(CurrentClient, "%lu", NetDevs[i].sentColls); -+ NetDevCnt = n; -+ /*fixme: assumes the interfaces are in the same order each time */ -+ for (p=NetDevs, q=newval; n--; p++, q++) { -+ int i; -+ /* calculate deltas */ -+ for (i=0; i<5; i++) { -+ p->Drecv[i] = q->recv[i]-p->recv[i]; -+ p->recv[i] = q->recv[i]; -+ p->Dsent[i] = q->sent[i]-p->sent[i]; -+ p->sent[i] = q->sent[i]; - } - } -- -- fprintf(CurrentClient, "\n"); - } - --void printNetDevSentBytesInfo(const char *cmd) --{ -- char **retval; -- -- retval = parseCommand(cmd); -- -- if (retval[1] == NULL) -- return; - -- if (!strncmp(retval[1], "data", 4)) -- fprintf(CurrentClient, "Sent Data\t0\t0\tkBytes/s\n"); -- if (!strncmp(retval[1], "packets", 7)) -- fprintf(CurrentClient, "Sent Packets\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "errors", 6)) -- fprintf(CurrentClient, "Transmitter Errors\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "multicast", 9)) -- fprintf(CurrentClient, "Sent Multicast Packets\t0\t0\t1/s\n"); -- if (!strncmp(retval[1], "collisions", 10)) -- fprintf(CurrentClient, "Transmitter Collisions\t0\t0\t1/s\n"); -+void checkNetDev(void) { -+ if (readSys(!0) != NetDevCnt) { -+ /* interface has been added or removed -+ so we do a reset */ -+ exitNetDev(); -+ initNetDev(); -+ } - } -+ -+ -+/* eof */ diff --git a/x11/kdebase3/patches/patch-dg b/x11/kdebase3/patches/patch-dg index e6fe6ee2a6e..3ff7ddc46f7 100644 --- a/x11/kdebase3/patches/patch-dg +++ b/x11/kdebase3/patches/patch-dg @@ -1,8 +1,8 @@ -$NetBSD: patch-dg,v 1.2 2002/08/25 19:23:45 jlam Exp $ +$NetBSD: patch-dg,v 1.3 2003/03/11 13:10:27 markd Exp $ ---- kwin/Makefile.am.orig Wed May 8 19:23:01 2002 +--- kwin/Makefile.am.orig Tue Jul 2 06:54:15 2002 +++ kwin/Makefile.am -@@ -3,13 +3,17 @@ +@@ -3,13 +3,17 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -10,9 +10,9 @@ $NetBSD: patch-dg,v 1.2 2002/08/25 19:23:45 jlam Exp $ +lib_LTLIBRARIES = libkwin.la kwin.la # workspace.cpp has to be first in order not to break --enable-final --kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ -+libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ +-kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ ++libkwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ + popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ killwindow.cpp kwinbutton.cpp -kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) @@ -23,16 +23,16 @@ $NetBSD: patch-dg,v 1.2 2002/08/25 19:23:45 jlam Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -18,7 +22,7 @@ +@@ -18,7 +22,7 @@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp --kwin_LDADD = kwin.la -+kwin_LDADD = libkwin.la +-kwin_LDADD = kwin.la ++kwin_LDADD = libkwin.la kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -34,7 +38,6 @@ +@@ -34,7 +38,6 @@ data_DATA= eventsrc sounddir= $(kde_sounddir) sound_DATA = pop.wav diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh index 96353a037a8..acc1847227c 100644 --- a/x11/kdebase3/patches/patch-dh +++ b/x11/kdebase3/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-dh,v 1.4 2003/03/11 13:10:27 markd Exp $ ---- kwin/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/Makefile.in -@@ -292,18 +292,22 @@ INCLUDES = $(all_includes) +@@ -290,18 +290,22 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -10,14 +10,14 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ +lib_LTLIBRARIES = libkwin.la kwin.la # workspace.cpp has to be first in order not to break --enable-final --#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ -+#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ - #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ +-#>- kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ ++#>- libkwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ + #>- popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ #>- killwindow.cpp kwinbutton.cpp #>+ 3 --kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ -+libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ - tabbox.cpp options.cpp plugins.cpp events.cpp \ +-kwin_la_SOURCES=workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ ++libkwin_la_SOURCES=workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ + popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp \ killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp -kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) @@ -29,16 +29,16 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -312,7 +316,7 @@ kwinincludedir = $(includedir)/kwin +@@ -310,7 +314,7 @@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp --kwin_LDADD = kwin.la -+kwin_LDADD = libkwin.la +-kwin_LDADD = kwin.la ++kwin_LDADD = libkwin.la kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -323,7 +327,6 @@ data_DATA = eventsrc +@@ -321,7 +325,6 @@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav @@ -46,40 +46,38 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin -@@ -332,16 +335,23 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -330,18 +333,23 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kwin_la_DEPENDENCIES = --am_kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo +-am_kwin_la_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ +kwin_la_DEPENDENCIES = libkwin.la +am_kwin_la_OBJECTS = kwin_main.lo - #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) --#>+ 5 --kwin_la_final_OBJECTS = kwin_la.all_cpp.lo --kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ -- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo --@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) ++#>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) +#>+ 1 +kwin_la_OBJECTS = kwin_main.lo +libkwin_la_DEPENDENCIES = -+am_libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ -+ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ -+ kwinbutton.lo ++am_libkwin_la_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ + main.lo popupinfo.lo tabbox.lo options.lo plugins.lo events.lo \ + killwindow.lo kwinbutton.lo +-#>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) +#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) -+#>+ 6 + #>+ 6 +-kwin_la_final_OBJECTS = kwin_la.all_cpp.lo +-kwin_la_nofinal_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo -+libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ -+ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ -+ kwinbutton.lo KWinInterface_skel.lo ++libkwin_la_nofinal_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ + main.lo popupinfo.lo tabbox.lo options.lo plugins.lo events.lo \ + killwindow.lo kwinbutton.lo KWinInterface_skel.lo +-@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) +@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -349,7 +359,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) +@@ -349,7 +357,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) @@ -88,44 +86,50 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -359,23 +369,23 @@ LIBS = @LIBS@ - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - #>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ - #>- @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo -+#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo - #>+ 13 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo +@@ -360,26 +368,26 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d + am__depfiles_maybe = depfiles + #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/workspace.Plo ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo + #>+ 15 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/workspace.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -396,7 +406,7 @@ CXXLD = $(CXX) +@@ -400,7 +408,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -134,7 +138,7 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) -@@ -409,7 +419,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -413,7 +421,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -143,33 +147,33 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>- all: all-recursive #>+ 1 -@@ -458,6 +468,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -460,6 +468,8 @@ clean-libLTLIBRARIES: + done kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) +libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -496,6 +508,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/events.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/killwindow.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwinbutton.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ -@@ -706,7 +719,7 @@ distclean-tags: - +@@ -503,6 +513,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/killwindow.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwin_main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwin_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kwinbutton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ +@@ -732,7 +743,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp pluginlibFix.pl tabbox.cpp hi16-app-kwin.png plugins.h events.h kwinbindings.cpp LICENSE hi48-app-kwin.png options.cpp kwinbutton.cpp hi32-app-kwin.png tabbox.h events.cpp -+KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png +-KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp cr16-app-kwin.png pluginlibFix.pl tabbox.cpp placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h options.cpp popupinfo.cpp kwinbutton.cpp cr48-app-kwin.png tabbox.h events.cpp ++KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h placement.h options.cpp LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h popupinfo.cpp events.h cr16-app-kwin.png atoms.h killwindow.cpp tabbox.cpp eventsrc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -863,25 +876,15 @@ messages: +@@ -895,25 +906,15 @@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -198,7 +202,7 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ options.moc: $(srcdir)/options.h $(MOC) $(srcdir)/options.h -o options.moc -@@ -894,8 +897,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h +@@ -930,8 +931,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h $(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc #>+ 3 @@ -213,24 +217,24 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ + +#>+ 3 clean-metasources: -- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc kwinbutton.moc -+ -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc +- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc ++ -rm -f workspace.moc client.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc plugins.moc #>+ 4 clean-idl: -@@ -927,33 +940,33 @@ force-reedit: +@@ -963,33 +974,33 @@ force-reedit: #>+ 11 --kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc kwinbutton.moc +-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc - @echo 'creating kwin_la.all_cpp.cpp ...'; \ - rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ -+libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc ++libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc popupinfo.moc plugins.moc + @echo 'creating libkwin_la.all_cpp.cpp ...'; \ + rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ - for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ + for file in workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ @@ -265,26 +269,29 @@ $NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -963,15 +976,15 @@ kde-rpo-clean: +@@ -999,17 +1010,17 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 13 --kwinbutton.lo: kwinbutton.moc - kwinbutton.o: kwinbutton.moc --tabbox.lo: tabbox.moc --tabbox.o: tabbox.moc + #>+ 15 ++workspace.o: workspace.moc ++options.lo: options.moc ++tabbox.o: tabbox.moc ++popupinfo.lo: popupinfo.moc ++options.o: options.moc + kwinbutton.lo: kwinbutton.moc + tabbox.lo: tabbox.moc -options.o: options.moc -client.lo: client.moc - workspace.o: workspace.moc -client.o: client.moc -options.lo: options.moc - plugins.o: plugins.moc -+options.lo: options.moc + kwinbutton.o: kwinbutton.moc +-tabbox.o: tabbox.moc +-popupinfo.o: popupinfo.moc +-workspace.o: workspace.moc +client.o: client.moc -+tabbox.o: tabbox.moc + plugins.o: plugins.moc workspace.lo: workspace.moc +-popupinfo.lo: popupinfo.moc +client.lo: client.moc -+options.o: options.moc ++popupinfo.o: popupinfo.moc plugins.lo: plugins.moc -+kwinbutton.lo: kwinbutton.moc -+tabbox.lo: tabbox.moc diff --git a/x11/kdebase3/patches/patch-dj b/x11/kdebase3/patches/patch-dj index 2ac9feb58b6..02ec26fc5ef 100644 --- a/x11/kdebase3/patches/patch-dj +++ b/x11/kdebase3/patches/patch-dj @@ -1,8 +1,8 @@ -$NetBSD: patch-dj,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-dj,v 1.4 2003/03/11 13:10:27 markd Exp $ ---- kwin/clients/b2/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/b2/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/b2/Makefile.in -@@ -293,7 +293,7 @@ SUBDIRS = . config +@@ -292,7 +292,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_b2.la kwin_b2_la_SOURCES = b2client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dj,v 1.3 2003/01/02 09:12:35 skrll Exp $ kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -308,7 +308,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dj,v 1.3 2003/01/02 09:12:35 skrll Exp $ am_kwin_b2_la_OBJECTS = b2client.lo #>- kwin_b2_la_OBJECTS = $(am_kwin_b2_la_OBJECTS) #>+ 1 -@@ -551,7 +551,7 @@ distclean-tags: - +@@ -562,7 +562,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=bitmaps.h b2.desktop diff --git a/x11/kdebase3/patches/patch-dl b/x11/kdebase3/patches/patch-dl index 44d426628e4..735d74ffe4c 100644 --- a/x11/kdebase3/patches/patch-dl +++ b/x11/kdebase3/patches/patch-dl @@ -1,8 +1,8 @@ -$NetBSD: patch-dl,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-dl,v 1.4 2003/03/11 13:10:27 markd Exp $ ---- kwin/clients/default/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/default/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/default/Makefile.in -@@ -293,7 +293,7 @@ SUBDIRS = . config +@@ -292,7 +292,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_default.la kwin_default_la_SOURCES = kdedefault.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dl,v 1.3 2003/01/02 09:12:35 skrll Exp $ kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -304,7 +304,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -303,7 +303,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-dl,v 1.3 2003/01/02 09:12:35 skrll Exp $ am_kwin_default_la_OBJECTS = kdedefault.lo #>- kwin_default_la_OBJECTS = $(am_kwin_default_la_OBJECTS) #>+ 1 -@@ -717,5 +717,5 @@ kde-rpo-clean: +@@ -729,5 +729,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dn b/x11/kdebase3/patches/patch-dn index e3cc1ddf637..9eda35b8e32 100644 --- a/x11/kdebase3/patches/patch-dn +++ b/x11/kdebase3/patches/patch-dn @@ -1,8 +1,8 @@ -$NetBSD: patch-dn,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-dn,v 1.4 2003/03/11 13:10:27 markd Exp $ ---- kwin/clients/icewm/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/icewm/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/icewm/Makefile.in -@@ -293,7 +293,7 @@ SUBDIRS = . config icewm-themes +@@ -291,7 +291,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin_icewm.la kwin_icewm_la_SOURCES = icewm.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dn,v 1.3 2003/01/02 09:12:35 skrll Exp $ kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-dn,v 1.3 2003/01/02 09:12:35 skrll Exp $ am_kwin_icewm_la_OBJECTS = icewm.lo #>- kwin_icewm_la_OBJECTS = $(am_kwin_icewm_la_OBJECTS) #>+ 1 -@@ -747,5 +747,5 @@ kde-rpo-clean: +@@ -763,5 +763,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp index 1583d66dbfa..12d1d31fe5d 100644 --- a/x11/kdebase3/patches/patch-dp +++ b/x11/kdebase3/patches/patch-dp @@ -1,8 +1,8 @@ -$NetBSD: patch-dp,v 1.3 2003/01/02 09:12:35 skrll Exp $ +$NetBSD: patch-dp,v 1.4 2003/03/11 13:10:27 markd Exp $ ---- kwin/clients/kde1/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/kde1/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/kde1/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kde1.la kwin_kde1_la_SOURCES = kde1client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dp,v 1.3 2003/01/02 09:12:35 skrll Exp $ kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -305,7 +305,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dp,v 1.3 2003/01/02 09:12:35 skrll Exp $ am_kwin_kde1_la_OBJECTS = kde1client.lo #>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS) #>+ 1 -@@ -482,7 +482,7 @@ distclean-tags: - +@@ -493,7 +493,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kde1.desktop kde1client_bitmaps.h @@ -29,7 +29,7 @@ $NetBSD: patch-dp,v 1.3 2003/01/02 09:12:35 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -654,5 +654,5 @@ kde-rpo-clean: +@@ -671,5 +671,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dr b/x11/kdebase3/patches/patch-dr index f3a1f107fd1..a658737b95f 100644 --- a/x11/kdebase3/patches/patch-dr +++ b/x11/kdebase3/patches/patch-dr @@ -1,8 +1,8 @@ -$NetBSD: patch-dr,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-dr,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/kstep/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/kstep/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/kstep/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kstep.la kwin_kstep_la_SOURCES = nextclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dr,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-dr,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_kstep_la_OBJECTS = nextclient.lo #>- kwin_kstep_la_OBJECTS = $(am_kwin_kstep_la_OBJECTS) #>+ 1 -@@ -659,5 +659,5 @@ kde-rpo-clean: +@@ -676,5 +676,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dt b/x11/kdebase3/patches/patch-dt index 245a18bc6cb..178d65dfae0 100644 --- a/x11/kdebase3/patches/patch-dt +++ b/x11/kdebase3/patches/patch-dt @@ -1,8 +1,8 @@ -$NetBSD: patch-dt,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-dt,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/kwmtheme/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/kwmtheme/Makefile.in.orig Fri Jan 17 09:03:11 2003 +++ kwin/clients/kwmtheme/Makefile.in -@@ -292,7 +292,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kwmtheme.la kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dt,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -303,7 +303,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -301,7 +301,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) diff --git a/x11/kdebase3/patches/patch-dv b/x11/kdebase3/patches/patch-dv index f97131b65ed..e2cef87f16b 100644 --- a/x11/kdebase3/patches/patch-dv +++ b/x11/kdebase3/patches/patch-dv @@ -1,8 +1,8 @@ -$NetBSD: patch-dv,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-dv,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/laptop/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/laptop/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/laptop/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_laptop.la kwin_laptop_la_SOURCES = laptopclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dv,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx index 625ae0b0a82..34acff2119d 100644 --- a/x11/kdebase3/patches/patch-dx +++ b/x11/kdebase3/patches/patch-dx @@ -1,8 +1,8 @@ -$NetBSD: patch-dx,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-dx,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/modernsystem/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/modernsystem/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/modernsystem/Makefile.in -@@ -295,7 +295,7 @@ SUBDIRS = config +@@ -294,7 +294,7 @@ SUBDIRS = config kde_module_LTLIBRARIES = kwin_modernsys.la kwin_modernsys_la_SOURCES = modernsys.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dx,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -311,7 +311,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -310,7 +310,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,8 +20,8 @@ $NetBSD: patch-dx,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_modernsys_la_OBJECTS = modernsys.lo #>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS) #>+ 1 -@@ -553,7 +553,7 @@ distclean-tags: - +@@ -564,7 +564,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=modernsystem.desktop btnhighcolor.h buttondata.h @@ -29,7 +29,7 @@ $NetBSD: patch-dx,v 1.3 2003/01/02 09:12:36 skrll Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -745,5 +745,5 @@ kde-rpo-clean: +@@ -762,5 +762,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dz b/x11/kdebase3/patches/patch-dz index 87bba13e709..8879616aae8 100644 --- a/x11/kdebase3/patches/patch-dz +++ b/x11/kdebase3/patches/patch-dz @@ -1,8 +1,8 @@ -$NetBSD: patch-dz,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-dz,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/quartz/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/quartz/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/quartz/Makefile.in -@@ -293,7 +293,7 @@ SUBDIRS = . config +@@ -292,7 +292,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_quartz.la kwin_quartz_la_SOURCES = quartz.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dz,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -309,7 +309,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -308,7 +308,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-dz,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_quartz_la_OBJECTS = quartz.lo #>- kwin_quartz_la_OBJECTS = $(am_kwin_quartz_la_OBJECTS) #>+ 1 -@@ -747,5 +747,5 @@ kde-rpo-clean: +@@ -764,5 +764,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-eb b/x11/kdebase3/patches/patch-eb index 5c8ab410d54..e3c23bec7e2 100644 --- a/x11/kdebase3/patches/patch-eb +++ b/x11/kdebase3/patches/patch-eb @@ -1,8 +1,8 @@ -$NetBSD: patch-eb,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-eb,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/redmond/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/redmond/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/redmond/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_redmond.la kwin_redmond_la_SOURCES = redmond.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-eb,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-eb,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_redmond_la_OBJECTS = redmond.lo #>- kwin_redmond_la_OBJECTS = $(am_kwin_redmond_la_OBJECTS) #>+ 1 -@@ -659,5 +659,5 @@ kde-rpo-clean: +@@ -676,5 +676,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed index f537ccbc02d..2ac876a5888 100644 --- a/x11/kdebase3/patches/patch-ed +++ b/x11/kdebase3/patches/patch-ed @@ -1,8 +1,8 @@ -$NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-ed,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/riscos/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/riscos/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/riscos/Makefile.in -@@ -301,7 +301,7 @@ StickyButton.cpp \ +@@ -299,7 +299,7 @@ StickyButton.cpp \ HelpButton.cpp \ Static.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -327,7 +327,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -325,7 +325,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ HelpButton.lo Static.lo -@@ -664,40 +664,40 @@ kwin_riscos.la.closure: $(kwin_riscos_la +@@ -683,40 +683,40 @@ kwin_riscos.la.closure: $(kwin_riscos_la #>+ 3 @@ -76,7 +76,7 @@ $NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ #>+ 3 clean-closures: -@@ -714,7 +714,7 @@ force-reedit: +@@ -733,7 +733,7 @@ force-reedit: #>+ 11 @@ -85,7 +85,7 @@ $NetBSD: patch-ed,v 1.3 2003/01/02 09:12:36 skrll Exp $ @echo 'creating kwin_riscos_la.all_cpp.cpp ...'; \ rm -f kwin_riscos_la.all_cpp.files kwin_riscos_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwin_riscos_la.all_cpp.final; \ -@@ -750,19 +750,19 @@ kde-rpo-clean: +@@ -769,19 +769,19 @@ kde-rpo-clean: -rm -f *.rpo #>+ 17 diff --git a/x11/kdebase3/patches/patch-ef b/x11/kdebase3/patches/patch-ef index bdde0b95a0c..7fab88e278b 100644 --- a/x11/kdebase3/patches/patch-ef +++ b/x11/kdebase3/patches/patch-ef @@ -1,8 +1,8 @@ -$NetBSD: patch-ef,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-ef,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/system/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/system/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/system/Makefile.in -@@ -291,7 +291,7 @@ INCLUDES = $(all_includes) +@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_system.la kwin_system_la_SOURCES = systemclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-ef,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-ef,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_system_la_OBJECTS = systemclient.lo #>- kwin_system_la_OBJECTS = $(am_kwin_system_la_OBJECTS) #>+ 1 -@@ -659,5 +659,5 @@ kde-rpo-clean: +@@ -676,5 +676,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh index 34e1c52631a..9b1ae765157 100644 --- a/x11/kdebase3/patches/patch-eh +++ b/x11/kdebase3/patches/patch-eh @@ -1,8 +1,8 @@ -$NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-eh,v 1.4 2003/03/11 13:10:28 markd Exp $ ---- kwin/clients/web/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kwin/clients/web/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kwin/clients/web/Makefile.in -@@ -311,7 +311,7 @@ noinst_HEADERS = \ +@@ -309,7 +309,7 @@ noinst_HEADERS = \ WebButtonSticky.h @@ -11,7 +11,7 @@ $NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -324,7 +324,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -322,7 +322,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ WebButtonMaximize.lo WebButtonSticky.lo -@@ -663,40 +663,40 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC +@@ -679,40 +679,40 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC #>+ 3 @@ -78,7 +78,7 @@ $NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ #>+ 3 clean-closures: -@@ -713,7 +713,7 @@ force-reedit: +@@ -729,7 +729,7 @@ force-reedit: #>+ 11 @@ -87,7 +87,7 @@ $NetBSD: patch-eh,v 1.3 2003/01/02 09:12:36 skrll Exp $ @echo 'creating kwin_web_la.all_cpp.cpp ...'; \ rm -f kwin_web_la.all_cpp.files kwin_web_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwin_web_la.all_cpp.final; \ -@@ -749,19 +749,19 @@ kde-rpo-clean: +@@ -765,19 +765,19 @@ kde-rpo-clean: -rm -f *.rpo #>+ 17 diff --git a/x11/kdebase3/patches/patch-ei b/x11/kdebase3/patches/patch-ei index 8a1309d7081..686ddb654c2 100644 --- a/x11/kdebase3/patches/patch-ei +++ b/x11/kdebase3/patches/patch-ei @@ -1,42 +1,41 @@ -$NetBSD: patch-ei,v 1.2 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-ei,v 1.3 2003/03/11 13:10:28 markd Exp $ ---- kxkb/Makefile.am.orig Wed May 8 19:23:13 2002 +--- kxkb/Makefile.am.orig Sun Oct 27 11:07:27 2002 +++ kxkb/Makefile.am -@@ -3,11 +3,11 @@ +@@ -7,20 +7,24 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb -kxkb_SOURCES = dummy.cpp +kxkb_SOURCES = kxkb_main.cpp kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kxkb_LDADD = kxkb.la -+kxkb_LDADD = libkxkb_main.la +-kxkb_LDADD = kxkb.la -lxkbfile ++kxkb_LDADD = libkxkb_main.la -lxkbfile -lib_LTLIBRARIES = kxkb.la +lib_LTLIBRARIES = libkxkb_main.la kxkb.la kde_module_LTLIBRARIES = kcm_keyboard.la - kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp -@@ -15,9 +15,13 @@ + kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined - kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) + kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile --kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp +-kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp +libkxkb_main_la_LDFLAGS = $(all_libraries) -+libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile + +kxkb_la_SOURCES = kxkb_main.cpp kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) +-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile +kxkb_la_LIBADD = libkxkb_main.la data_DATA = keyboard.desktop datadir = $(kde_appsdir)/Settings/Peripherals -@@ -32,6 +36,3 @@ - messages: +@@ -37,6 +41,3 @@ services_DATA = kxkb.desktop + messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot - $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot + $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot - -dummy.cpp: - echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index 0b2e393d21a..fea62443f49 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,61 +1,55 @@ -$NetBSD: patch-ej,v 1.4 2003/01/02 09:12:36 skrll Exp $ +$NetBSD: patch-ej,v 1.5 2003/03/11 13:10:29 markd Exp $ ---- kxkb/Makefile.in.orig Fri Dec 27 18:19:11 2002 +--- kxkb/Makefile.in.orig Fri Jan 17 09:03:12 2003 +++ kxkb/Makefile.in -@@ -291,11 +291,11 @@ INCLUDES = $(all_includes) +@@ -293,11 +293,11 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb -kxkb_SOURCES = dummy.cpp +kxkb_SOURCES = kxkb_main.cpp kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) --kxkb_LDADD = kxkb.la -+kxkb_LDADD = libkxkb_main.la +-kxkb_LDADD = kxkb.la -lxkbfile ++kxkb_LDADD = libkxkb_main.la -lxkbfile -lib_LTLIBRARIES = kxkb.la +lib_LTLIBRARIES = libkxkb_main.la kxkb.la kde_module_LTLIBRARIES = kcm_keyboard.la - kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp -@@ -303,9 +303,13 @@ kcm_keyboard_la_SOURCES = rules.cpp kcml + #>- kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui +@@ -306,9 +306,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined - kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) + kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile --kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp -+libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp +-kxkb_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_SOURCES = kxkb.cpp rules.cpp extension.cpp pixmap.cpp +libkxkb_main_la_LDFLAGS = $(all_libraries) -+libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile + +kxkb_la_SOURCES = kxkb_main.cpp kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version --kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) +-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) -lxkbfile +kxkb_la_LIBADD = libkxkb_main.la data_DATA = keyboard.desktop - -@@ -325,22 +329,27 @@ kcm_keyboard_la_final_OBJECTS = kcm_keyb - kcm_keyboard_la_nofinal_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo - @KDE_USE_FINAL_FALSE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_nofinal_OBJECTS) - @KDE_USE_FINAL_TRUE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_final_OBJECTS) + data2_DATA = keyboard_layout.desktop +@@ -327,19 +331,24 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc + #>- kcm_keyboard_la_OBJECTS = $(am_kcm_keyboard_la_OBJECTS) + #>+ 1 + kcm_keyboard_la_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo kcmmiscwidget.lo -kxkb_la_DEPENDENCIES = --am_kxkb_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +-am_kxkb_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +kxkb_la_DEPENDENCIES = libkxkb_main.la +am_kxkb_la_OBJECTS = kxkb_main.lo #>- kxkb_la_OBJECTS = $(am_kxkb_la_OBJECTS) -+#>+ 1 + #>+ 1 +-kxkb_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +kxkb_la_OBJECTS = kxkb_main.lo +libkxkb_main_la_DEPENDENCIES = -+am_libkxkb_main_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo ++am_libkxkb_main_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo +#>- libkxkb_main_la_OBJECTS = $(am_libkxkb_main_la_OBJECTS) - #>+ 4 --kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo --kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo --@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS) -+libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo -+libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo -+@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS) -+@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS) ++#>+ 1 ++libkxkb_main_la_OBJECTS = kxkb.lo rules.lo extension.lo pixmap.lo bin_PROGRAMS = kxkb$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -70,151 +64,106 @@ $NetBSD: patch-ej,v 1.4 2003/01/02 09:12:36 skrll Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -348,19 +357,19 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -348,14 +357,16 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ --#>- @AMDEP_TRUE@ $(DEPDIR)/rules.Plo -+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ -+#>- @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo - #>+ 9 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/kxkb_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/libkxkb_main_la.all_cpp.P $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/extension.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/extension.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmlayout.Plo ./$(DEPDIR)/kcmmisc.Plo \ +-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/pixmap.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/kxkb_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxkb_main.Po ./$(DEPDIR)/pixmap.Plo \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo +-#>+ 5 +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcmmiscwidget.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/extension.Plo \ ++#>+ 6 ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kcmmiscwidget.P ./$(DEPDIR)/extension.Plo \ + @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmlayout.Plo ./$(DEPDIR)/kcmmisc.Plo \ +-@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/pixmap.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb.Plo ./$(DEPDIR)/kxkb_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxkb_main.Po ./$(DEPDIR)/pixmap.Plo \ + @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -382,11 +391,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C +@@ -378,7 +389,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ - $(kxkb_SOURCES) + $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) - DATA = $(data_DATA) $(services_DATA) + DATA = $(data_DATA) $(data2_DATA) $(services_DATA) + +@@ -388,7 +399,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) +SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) - #>- all: all-am + #>- all: all-recursive #>+ 1 -@@ -459,6 +468,8 @@ clean-libLTLIBRARIES: +@@ -468,6 +479,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) +libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -493,11 +504,12 @@ mostlyclean-compile: +@@ -507,11 +520,12 @@ 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)/extension.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmlayout.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmmisc.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pixmap.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rules.Plo@am__quote@ - -@@ -592,7 +604,7 @@ distclean-tags: - +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extension.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmlayout.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmmisc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxkb_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Plo@am__quote@ + +@@ -698,7 +712,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp LICENSE kcmlayout.h configure.in.in kxkb.desktop -+KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h +-KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp keyboard_layout.desktop LICENSE kcmlayout.h configure.in.in kcmmiscwidget.ui kxkb.desktop ++KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -729,9 +741,6 @@ install-data-local: uninstall.desktop - messages: +@@ -859,9 +873,6 @@ install-data-local: uninstall.desktop + messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot - $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot + $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.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: -@@ -788,33 +797,33 @@ kcm_keyboard_la.all_cpp.cpp: $(srcdir)/M - rm -f kcm_keyboard_la.all_cpp.final kcm_keyboard_la.all_cpp.files - - #>+ 11 --kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc -- @echo 'creating kxkb_la.all_cpp.cpp ...'; \ -- rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ -+libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc -+ @echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \ -+ rm -f libkxkb_main_la.all_cpp.files libkxkb_main_la.all_cpp.final; \ -+ echo "#define KDE_USE_FINAL 1" >> libkxkb_main_la.all_cpp.final; \ - for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp ; do \ -- echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ -+ echo "#include \"$$file\"" >> libkxkb_main_la.all_cpp.files; \ -+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxkb_main_la.all_cpp.final; \ - done; \ -- cat kxkb_la.all_cpp.final kxkb_la.all_cpp.files > kxkb_la.all_cpp.cpp; \ -- rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files -+ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ -+ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files - - #>+ 3 - clean-final: -- -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp -+ -rm -f kcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" all-am -+ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" install-am -+ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" all-am -+ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" install-am -+ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -824,9 +833,9 @@ kde-rpo-clean: +@@ -946,13 +957,13 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 7 + #>+ 11 +-$(srcdir)/rules.cpp: kcmmiscwidget.h +-kcmlayout.lo: kcmlayout.moc +-kxkb.o: kxkb.moc +-kcmlayout.o: kcmlayout.moc ++$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h ++$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h + $(srcdir)/pixmap.cpp: kcmmiscwidget.h -kcmmisc.lo: kcmmisc.moc kxkb.lo: kxkb.moc +-$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h +kcmlayout.o: kcmlayout.moc - kcmlayout.lo: kcmlayout.moc --kcmmisc.o: kcmmisc.moc - kxkb.o: kxkb.moc --kcmlayout.o: kcmlayout.moc -+kcmmisc.o: kcmmisc.moc ++kcmlayout.lo: kcmlayout.moc ++kxkb.o: kxkb.moc ++$(srcdir)/rules.cpp: kcmmiscwidget.h + kcmmisc.o: kcmmisc.moc +-$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +kcmmisc.lo: kcmmisc.moc diff --git a/x11/kdebase3/patches/patch-ek b/x11/kdebase3/patches/patch-ek index 6422757bb40..8a40df27d52 100644 --- a/x11/kdebase3/patches/patch-ek +++ b/x11/kdebase3/patches/patch-ek @@ -1,8 +1,8 @@ -$NetBSD: patch-ek,v 1.2 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-ek,v 1.3 2003/03/11 13:10:29 markd Exp $ ---- kxkb/kxkb.cpp.orig Sat Mar 2 22:03:52 2002 +--- kxkb/kxkb.cpp.orig Sun Oct 27 11:07:27 2002 +++ kxkb/kxkb.cpp -@@ -483,7 +483,9 @@ +@@ -503,7 +503,9 @@ void LayoutMap::setLayout(WId winId, con const char * DESCRIPTION = I18N_NOOP("A utility to switch keyboard maps."); @@ -11,5 +11,5 @@ $NetBSD: patch-ek,v 1.2 2002/08/25 19:23:48 jlam Exp $ + +int kdemain(int argc, char *argv[]) { - KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.6", + KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.8", DESCRIPTION, KAboutData::License_LGPL, diff --git a/x11/kdebase3/patches/patch-em b/x11/kdebase3/patches/patch-em index 2f3fc0bc555..46f26e256d4 100644 --- a/x11/kdebase3/patches/patch-em +++ b/x11/kdebase3/patches/patch-em @@ -1,6 +1,6 @@ -$NetBSD: patch-em,v 1.2 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-em,v 1.3 2003/03/11 13:10:29 markd Exp $ ---- legacyimport/Makefile.am.orig Wed May 16 02:41:36 2001 +--- legacyimport/Makefile.am.orig Mon Sep 16 09:08:59 2002 +++ legacyimport/Makefile.am @@ -1,14 +1,18 @@ INCLUDES = $(all_includes) @@ -10,9 +10,9 @@ $NetBSD: patch-em,v 1.2 2002/08/25 19:23:48 jlam Exp $ +lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la -klegacyimport_la_SOURCES = legacyimport.cpp --klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) +-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libklegacyimport_main_la_SOURCES = legacyimport.cpp -+libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +libklegacyimport_main_la_LDFLAGS = $(all_libraries) + +klegacyimport_la_SOURCES = klegacyimport_main.cpp diff --git a/x11/kdebase3/patches/patch-ep b/x11/kdebase3/patches/patch-ep index 4e788466687..2aa771a5407 100644 --- a/x11/kdebase3/patches/patch-ep +++ b/x11/kdebase3/patches/patch-ep @@ -1,17 +1,17 @@ -$NetBSD: patch-ep,v 1.2 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-ep,v 1.3 2003/03/11 13:10:29 markd Exp $ ---- startkde.orig Wed May 8 22:08:15 2002 +--- startkde.orig Sun Dec 1 06:58:15 2002 +++ startkde -@@ -17,7 +17,7 @@ +@@ -21,7 +21,7 @@ trap 'echo GOT SIGHUP' HUP # - # * Then ksmserver is started which in turn starts + # * Then ksmserver is started which in turn starts # 1) the window manager (kwin) -# 2) everything in $KDEDIR/share/autostart (kdesktop, kicker, etc.) +# 2) everything in $KDEDIR/share/kde/autostart (kdesktop, kicker, etc.) # 3) the rest of the session. # Set a left cursor instead of the standard X11 "X" cursor, since I've heard -@@ -56,15 +56,15 @@ +@@ -60,15 +60,15 @@ test -n "$KDEHOME" && kdehome=`echo "$KD # Where X is the original font database that was set up before this script # runs. @@ -20,7 +20,7 @@ $NetBSD: patch-ep,v 1.2 2002/08/25 19:23:48 jlam Exp $ +usr_odir=$kdehome/share/kde/fonts/override +usr_fdir=$kdehome/share/kde/fonts if test -n "$KDEDIRS"; then - kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'` + kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'` - sys_odir=$kdedirs_first/share/fonts/override - sys_fdir=$kdedirs_first/share/fonts + sys_odir=$kdedirs_first/share/kde/fonts/override @@ -33,21 +33,12 @@ $NetBSD: patch-ep,v 1.2 2002/08/25 19:23:48 jlam Exp $ fi # We run mkfontdir on the user's font dirs (if we have permission) to pick -@@ -79,7 +79,7 @@ +@@ -83,7 +83,7 @@ test -d "$sys_fdir" && xset fp+ "$sys_fd # # Add any user-installed font directories to the X font path -kde_fontsdir=$kdehome/share/fonts +kde_fontsdir=$kdehome/share/kde/fonts kde_fontpaths=$kde_fontsdir/fontpaths - - if test -r $kde_fontpaths ; then -@@ -115,7 +115,7 @@ - dcopserver_shutdown - # run KPersonalizer before the session, if this is the first login --grep 'FirstLogin=false' $kdehome/share/config/kpersonalizerrc >/dev/null 2>/dev/null -+grep 'FirstLogin=false' $kdehome/share/kde/config/kpersonalizerrc >/dev/null 2>/dev/null - if test $? -ne 0; then - # start only dcopserver, don't start whole kdeinit (takes too long) - dcopserver + if test -r "$kde_fontpaths" ; then diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq index 8eb7eed62c3..cd5ee20e03e 100644 --- a/x11/kdebase3/patches/patch-eq +++ b/x11/kdebase3/patches/patch-eq @@ -1,13 +1,128 @@ -$NetBSD: patch-eq,v 1.4 2003/01/13 17:01:24 skrll Exp $ +$NetBSD: patch-eq,v 1.5 2003/03/11 13:10:29 markd Exp $ ---- klipper/urlgrabber.cpp.orig Mon Dec 16 02:44:19 2002 -+++ klipper/urlgrabber.cpp -@@ -210,7 +210,7 @@ void URLGrabber::execute( const struct C - // the quotes have to be replaced as well as they might - // be part of config files from older klipper versions - // replace \%s to %s -- int pos; -+ int pos = 0; - while ( (pos = cmdLine.find("%s", pos)) >= 0 ) { - if ( pos > 0 && cmdLine.at( pos - 1 ) == '\\' ) { - cmdLine.remove( pos -1, 1 ); // \%s -> %s +--- legacyimport/Makefile.in.orig Fri Jan 17 09:03:12 2003 ++++ legacyimport/Makefile.in +@@ -287,14 +287,18 @@ x_libraries = @x_libraries@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = klegacyimport +-lib_LTLIBRARIES = klegacyimport.la ++lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la + +-klegacyimport_la_SOURCES = legacyimport.cpp +-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) ++libklegacyimport_main_la_SOURCES = legacyimport.cpp ++libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) ++libklegacyimport_main_la_LDFLAGS = $(all_libraries) ++ ++klegacyimport_la_SOURCES = klegacyimport_main.cpp ++klegacyimport_la_LIBADD = libklegacyimport_main.la + klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-klegacyimport_SOURCES = dummy.cpp +-klegacyimport_LDADD = klegacyimport.la ++klegacyimport_SOURCES = klegacyimport_main.cpp ++klegacyimport_LDADD = libklegacyimport_main.la + klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = legacyimport.h +@@ -310,19 +314,25 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-klegacyimport_la_DEPENDENCIES = +-am_klegacyimport_la_OBJECTS = legacyimport.lo ++klegacyimport_la_DEPENDENCIES = libklegacyimport_main.la ++am_klegacyimport_la_OBJECTS = klegacyimport_main.lo + #>- klegacyimport_la_OBJECTS = $(am_klegacyimport_la_OBJECTS) + #>+ 1 +-klegacyimport_la_OBJECTS = legacyimport.lo ++klegacyimport_la_OBJECTS = klegacyimport_main.lo ++libklegacyimport_main_la_DEPENDENCIES = ++am_libklegacyimport_main_la_OBJECTS = legacyimport.lo ++#>- libklegacyimport_main_la_OBJECTS = \ ++#>- $(am_libklegacyimport_main_la_OBJECTS) ++#>+ 1 ++libklegacyimport_main_la_OBJECTS = legacyimport.lo + bin_PROGRAMS = klegacyimport$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_klegacyimport_OBJECTS = dummy.$(OBJEXT) ++am_klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) + #>- klegacyimport_OBJECTS = $(am_klegacyimport_OBJECTS) + #>+ 1 +-klegacyimport_OBJECTS = dummy.$(OBJEXT) +-klegacyimport_DEPENDENCIES = klegacyimport.la ++klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT) ++klegacyimport_DEPENDENCIES = libklegacyimport_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -331,10 +341,12 @@ LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klegacyimport_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/klegacyimport_main.Po \ + #>- @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo +-#>+ 3 +-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ ++#>+ 4 ++@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/klegacyimport_main.Plo \ ++@AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/klegacyimport_main.Po \ + @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo + + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -356,13 +368,14 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) ++DIST_SOURCES = $(klegacyimport_la_SOURCES) \ ++ $(libklegacyimport_main_la_SOURCES) $(klegacyimport_SOURCES) + DATA = $(apps_DATA) + + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES) ++SOURCES = $(klegacyimport_la_SOURCES) $(libklegacyimport_main_la_SOURCES) $(klegacyimport_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -409,6 +422,8 @@ clean-libLTLIBRARIES: + done + klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS) ++libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +@@ -448,7 +463,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)/klegacyimport_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/klegacyimport_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legacyimport.Plo@am__quote@ + + distclean-depend: +@@ -538,7 +554,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=configure.in.in klegacyimport.desktop ++KDE_DIST=Makefile.am.rej klegacyimport.desktop configure.in.in dummy.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -705,5 +721,5 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 3 +-legacyimport.lo: legacyimport.moc + legacyimport.o: legacyimport.moc ++legacyimport.lo: legacyimport.moc diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er index 086b325f51c..4774d080222 100644 --- a/x11/kdebase3/patches/patch-er +++ b/x11/kdebase3/patches/patch-er @@ -1,8 +1,8 @@ -$NetBSD: patch-er,v 1.4 2003/01/19 09:35:27 skrll Exp $ +$NetBSD: patch-er,v 1.5 2003/03/11 13:10:29 markd Exp $ ---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig Sun Jan 19 09:30:06 2003 -+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c -@@ -200,7 +200,9 @@ updateProcess(int pid) +--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig Sun Feb 2 10:23:23 2003 ++++ ksysguard/ksysguardd/NetBSD/ProcessList.c +@@ -190,7 +190,9 @@ updateProcess(int pid) ps->ppid = p.kp_eproc.e_ppid; ps->uid = p.kp_eproc.e_ucred.cr_uid; ps->gid = p.kp_eproc.e_pgid; @@ -10,5 +10,5 @@ $NetBSD: patch-er,v 1.4 2003/01/19 09:35:27 skrll Exp $ ps->priority = p.kp_proc.p_priority; +#endif ps->niceLevel = p.kp_proc.p_nice; - #endif + /* this isn't usertime -- it's total time (??) */ diff --git a/x11/kdebase3/patches/patch-es b/x11/kdebase3/patches/patch-es index a11d20fb288..78ca6c55c48 100644 --- a/x11/kdebase3/patches/patch-es +++ b/x11/kdebase3/patches/patch-es @@ -1,22 +1,13 @@ -$NetBSD: patch-es,v 1.4 2003/02/04 18:06:50 skrll Exp $ +$NetBSD: patch-es,v 1.5 2003/03/11 13:10:29 markd Exp $ ---- kwin/client.cpp.orig Mon Jun 24 12:57:29 2002 -+++ kwin/client.cpp -@@ -104,7 +104,7 @@ public: +--- kwin/clients/keramik/Makefile.am.orig Mon Sep 16 09:08:55 2002 ++++ kwin/clients/keramik/Makefile.am +@@ -13,7 +13,7 @@ embedtool_LDFLAGS = $(all_librar + kde_module_LTLIBRARIES = kwin_keramik.la - extern Atom qt_wm_state; - extern Time qt_x_time; --extern Atom qt_window_role; -+extern Atom qt_wm_window_role; - extern Atom qt_sm_client_id; + kwin_keramik_la_SOURCES = keramik.cpp +-kwin_keramik_la_LIBADD = ../../kwin.la ++kwin_keramik_la_LIBADD = ../../libkwin.la + kwin_keramik_la_COMPILE_FIRST = tiles.h + kwin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module - static int nullErrorHandler(Display *, XErrorEvent *) -@@ -2775,7 +2775,7 @@ static QCString getStringProperty(WId w, - */ - QCString Client::staticWindowRole(WId w) - { -- return getStringProperty(w, qt_window_role); -+ return getStringProperty(w, qt_wm_window_role); - } - - /*! diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et new file mode 100644 index 00000000000..7e934349f5e --- /dev/null +++ b/x11/kdebase3/patches/patch-et @@ -0,0 +1,31 @@ +$NetBSD: patch-et,v 1.4 2003/03/11 13:10:30 markd Exp $ + +--- kwin/clients/keramik/Makefile.in.orig Fri Jan 17 09:03:11 2003 ++++ kwin/clients/keramik/Makefile.in +@@ -299,7 +299,7 @@ embedtool_LDFLAGS = $(all_libraries) $(K + kde_module_LTLIBRARIES = kwin_keramik.la + + kwin_keramik_la_SOURCES = keramik.cpp +-kwin_keramik_la_LIBADD = ../../kwin.la ++kwin_keramik_la_LIBADD = ../../libkwin.la + kwin_keramik_la_COMPILE_FIRST = tiles.h + kwin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + +@@ -316,7 +316,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_keramik_la_DEPENDENCIES = ../../kwin.la ++kwin_keramik_la_DEPENDENCIES = ../../libkwin.la + am_kwin_keramik_la_OBJECTS = keramik.lo + #>- kwin_keramik_la_OBJECTS = $(am_kwin_keramik_la_OBJECTS) + #>+ 1 +@@ -589,7 +589,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=keramik.h keramik.desktop configure.in.in ++KDE_DIST=keramik.desktop keramik.h configure.in.in + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-eu b/x11/kdebase3/patches/patch-eu new file mode 100644 index 00000000000..296c6e5b419 --- /dev/null +++ b/x11/kdebase3/patches/patch-eu @@ -0,0 +1,14 @@ +$NetBSD: patch-eu,v 1.1 2003/03/11 13:10:30 markd Exp $ + +--- konsole/konsole/TEPty.cpp.orig Sun Feb 9 01:08:17 2003 ++++ konsole/konsole/TEPty.cpp +@@ -180,6 +180,9 @@ extern "C" { + #if KDE_VERSION <306 + #undef HAVE_OPENPTY + #endif ++#ifdef __NetBSD__ ++ #undef HAVE_OPENPTY ++#endif + + template class QIntDict<TEPty>; + diff --git a/x11/kdebase3/patches/patch-ev b/x11/kdebase3/patches/patch-ev new file mode 100644 index 00000000000..39e2c5e8280 --- /dev/null +++ b/x11/kdebase3/patches/patch-ev @@ -0,0 +1,17 @@ +$NetBSD: patch-ev,v 1.1 2003/03/11 13:10:30 markd Exp $ + +--- ksysguard/ksysguardd/NetBSD/apm.c.orig Thu Oct 3 22:13:00 2002 ++++ ksysguard/ksysguardd/NetBSD/apm.c +@@ -19,6 +19,7 @@ + $Id: patch-ev,v 1.1 2003/03/11 13:10:30 markd Exp $ + */ + ++#ifdef __i386__ + + #include <fcntl.h> + #include <machine/apmvar.h> +@@ -99,3 +100,4 @@ + fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); + } + ++#endif diff --git a/x11/kdebase3/patches/patch-ew b/x11/kdebase3/patches/patch-ew new file mode 100644 index 00000000000..d661f9740a1 --- /dev/null +++ b/x11/kdebase3/patches/patch-ew @@ -0,0 +1,13 @@ +$NetBSD: patch-ew,v 1.1 2003/03/11 13:10:30 markd Exp $ + +--- khelpcenter/docmetainfo.cpp.orig Fri Dec 6 09:40:24 2002 ++++ khelpcenter/docmetainfo.cpp +@@ -146,7 +146,7 @@ void DocMetaInfo::scanMetaInfo( bool for + + if ( metaInfos.isEmpty() ) { + KStandardDirs* kstd = KGlobal::dirs(); +- kstd->addResourceType( "data", "share/apps/khelpcenter" ); ++ kstd->addResourceType( "data", "share/kde/apps/khelpcenter" ); + metaInfos = kstd->findDirs( "data", "plugins" ); + } + for( it = metaInfos.begin(); it != metaInfos.end(); it++) { diff --git a/x11/kdebase3/patches/patch-ex b/x11/kdebase3/patches/patch-ex new file mode 100644 index 00000000000..19727f78701 --- /dev/null +++ b/x11/kdebase3/patches/patch-ex @@ -0,0 +1,12 @@ +$NetBSD: patch-ex,v 1.1 2003/03/11 13:10:31 markd Exp $ + +--- khelpcenter/infoconsts.h.orig Sat Aug 3 02:12:14 2002 ++++ khelpcenter/infoconsts.h +@@ -37,6 +37,7 @@ const uint ERR_NO_HIERARCHY = 4; + const unsigned int INFODIRS = 9; + const QString INFODIR[] = {"", "/usr/info/", "/usr/share/info/", + "/usr/lib/info/", ++ "/usr/pkg/info/", + "/usr/local/info/", "/usr/local/lib/info/", + "/usr/X11R6/info/", "/usr/X11R6/lib/info/", + "/usr/X11R6/lib/xemacs/info/"}; |