kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to KDE-3.2

Browse source 
Changes:
Base

Kate
* Moving KATE view management over to KMDI Joseph Wenninger
* Basic project managment Christoph Cullmann

KControl
* Xinerama KControl module, enhanced KDE Xinerama and dual-head support
  George Staikos
* add/update control module for configuring per-domain settings. See Bug
  49145. Leo Savernik
* Support for per-style configuration settings in the style control center
  module, a module for Keramik Maksim Orlovich
* Add support for installing/removing- and switching Xcursor themes to the
  mouse KControl module Fredrik Hoeglund
* Font installer - create fonts:/ ioslave, and modify KControl module to
  use this. See http://members.lycos.co.uk/cpdrummond for (old)
  screenshots/download Craig Drummond

KHotKeys
* Update to version 2.0, which includes more features like mouse
  gestures. Lubos Lunak

KWin
* Full support for latest NETWM spec version in KWin, and seamless usage
  of other compliant window managers with KDE. Lubos Lunak
* New API for window decoration plugins. Lubos Lunak
* Focus stealing prevention. Lubos Lunak
* Add an option to allow wide borders to some of the window decoration
  styles Gunnar Schmi DT

Kicker
* Make addition of non-KDE applications to Kicker easier Alexander Kellett
* Enable backgrounds for child panels and all applets, allow for
  colorization of background pixmaps Aaron J. Seigo
* Allow applets to export a menu to the handle Aaron J. Seigo
* User defined plain colors for tiles Aaron J. Seigo
* Make the panel transparent. Zack Rusin
* Add an option to the RMB-menu and to the "Advanced Options" in kcontrol
  to enable/disable the panel handle when "Custom" size is selected.

KDM
* More sophisticated session definitions, common with GDM Oswald
  Buddenhagen
* Pluggable greeter input methods; better architectural compliance with
  PAM's input model. Oswald Buddenhagen

Various (kwin, kdesktop, kcontrol, ksmserver)
* Optimally support the X Resize and Rotate extension. Hamish Rodda

All KDE applications (kdebase/kdenetwork/kdepim/kdegraphics,...)
* No absolute paths to user home directories in KDE config files. This
  allows to support roaming users. Helge Deller

Konsole
* Add a better interface to konsolepart for other apps. Dominique Devriese
* Added "Set Selection End" to right mouse button menu.
* Column text selecting when Ctrl and Alt are pressed
* Uses now KTabWidget, allows tab context menus and more Stephan Binner
* Utilize KNotify (e.g. passive popup) for "Activity", "Bell",
  "Shell Exit" and "Silence" events
* ZModem up- and download (requires rzsz) Waldo Bastian
* Make bidi rendering (for RTL languages) configurable. Meni Livne


KEditBookmarks
* Export to HTML and printing of bookmark collection. Alexander Kellett
* Recursive favicon updates in bookmark editor. Alexander Kellett
* Field for incremental searching on titles. Alexander Kellett
* Opera and Internet Explorer bookmark collection exporting. Alexander
  Kellett
* Bookmark editor now includes an extra pane to allow title/url editing
  without use of context menu / keyboard shortcuts. Alexander Kellett
* More detailed bookmark access information (last viewed, first seen, view
  counts). Alexander Kellett
* Recursive - entire collection, per folder - alphabetical sorting
  Alexander Kellett

Konqueror
* Enhanced Konqueror statusbar and kpart statusbar extension. Statusbar
  notifications for secure connections, wallet, js errors. David Faure,
  George Staikos
* Bookmarklets support in the form of a "Mini-tools" konq-plugin
  Alexander Kellett
* Addition of an advanced Add Bookmark dialog. Alexander Kellett
* Read-only bookmark menu includes. Alexander Kellett
* Ability to select which items should be shown in the bookmark bar.
  Alexander Kellett
* Servicemenu improvements: placed in a common Actions submenu, allow
  grouping into submenus, allow for separators, allow simple mimetype
  globbing Aaron J. Seigo
* Bookmarking of all loaded tabs as a folder. Alexander Kellett
* Lightweight bookmark editing from within bookmarks menu via context
  menu. Alexander Kellett
* New sidebar module: Web. Implements sidebar modules similar to those
  introduced in Netscape 6/Mozilla. George Staikos
* Konqueror "preloading", often reducing Konqueror startup time. Lubos Lunak
* Spellchecking in text forms and spelling highlighting Scott Wheeler,
  Don Sanders

Tabbed Browsing
* "New Tab" and "Close Tab" buttons besides the tab bar Stephan Binner
* Loading/read state indication by tab color Stephan Binner
* Drag and drop support from/to tabs and to empty tab bar space Stephan
  Binner
* Allow to reorder tabs with pressed middle mouse button Stephan Binner
* Middle mouse button on tabs or empty tab bar space opens clipboard
  content Stephan Binner
* Support for opening external URLs and popups in new tabs Stephan Binner
* Optional permanent close buttons within tabs and permanent shown tab
  bar Stephan Binner

KHTML part
* KHTML: Implement caret mode. This is a prerequisite for designmode.
  See Bug 48302. Leo Savernik
* KHTML: add infrastructure for per-domain settings. See Bug 49145.
  Leo Savernik
* better support for samba shares through libsmbclient of samba 3.0
  Stephan Kulow

KIO Slaves
* kio_smtp: SMTP pipelining support for faster submission, esp. over
  high-latency links. Marc Mutz

KDesktop
* Added GUI for "Mouse wheel over desktop switches desktop" option.
* Make screen savers capable of being DPMS aware, so they can be disabled
  when watching a movie or TV if the app sets up X DPMS appropriately.
  Gregor Jasny
* Screen locker: pluggable greeter input methods; better architectural
  compliance with PAM's input model. Oswald Buddenhagen
* Shadow behind the text of the desktop icons, for more readability Laur
  Ivan
* E-mail addresses entered in "Run Command..." (Alt-F2) will start mailer.
  Waldo Bastian
* Numeric expression in "Run Command..." (Alt-F2) is evaluated. Waldo
  Bastian
This commit is contained in:
markd 2004-02-04 14:25:58 +00:00
parent 32a372a9e3
commit 0bc0f8e6fe
115 changed files with 1213 additions and 8599 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
x11/kdebase3/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.38 2004/01/23 21:50:52 jmmv Exp $
# $NetBSD: Makefile,v 1.39 2004/02/04 14:25:58 markd Exp $
DISTNAME= kdebase-3.1.5
PKGREVISION= 2
DISTNAME= kdebase-3.2.0
CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop
@ -22,7 +21,14 @@ CONFIGURE_ARGS+= --without-lame
CONFIGURE_ARGS+= --without-vorbis
CONFIGURE_ARGS+= --without-java
REPLACE_PERL= kcontrol/fileshare/fileshareset
REPLACE_PERL= \
kcontrol/fileshare/fileshareset \
kcontrol/keys/convertShortcuts.pl \
kicker/kicker-3.1-properSizeSetting.pl \
kioslave/finger/kio_finger.pl \
kwin/kwin3_plugin.pl \
kwin/pluginlibFix.pl \
konsole/schemaStrip.pl
RCD_SCRIPTS= kdm
@ -68,43 +74,17 @@ PLIST_SUBST+= KCMKEYBOARD="kcm_keyboard.so"
ICONDIR= share/kde/icons
FOO_MAIN_FILES= \
kate/app/dummy_main.cpp \
kcontrol/access/kaccess_main.cpp \
kcontrol/kcontrol/kcminit_main.cpp \
kcontrol/kcontrol/kcmshell_main.cpp \
kcontrol/kcontrol/kcontrol_main.cpp \
kdeprint/kjobviewer/kjobviewer_main.cpp \
kdesktop/kdesktop_main.cc \
khotkeys/khotkeys/khotkeys_main.cpp \
kicker/kicker_main.cpp \
kicker/proxy/appletproxy_main.cpp \
kicker/proxy/extensionproxy_main.cpp \
klipper/klipper_main.cpp \
kmenuedit/kmenuedit_main.cpp \
konqueror/client/kfmclient_main.cc \
konqueror/keditbookmarks/keditbookmarks_main.cpp \
konqueror/konqueror_main.cc \
konsole/konsole/konsole_main.cpp \
konsole/konsole/kwrited_main.cpp \
ksmserver/ksmserver_main.cpp \
kxkb/kxkb_main.cpp \
legacyimport/klegacyimport_main.cpp
.include "../../meta-pkgs/kde3/Makefile.foo_main"
# Several programs need to be setuid-root, but due to the way that KDE3
# finds executables, the files must have their read bit set so that
# KStandardDir::findResource() will find them.
#
_KDE_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4755
SPECIAL_PERMS+= ${PREFIX}/bin/konsole_grantpty ${_KDE_SETUID_ROOT}
SPECIAL_PERMS+= ${PREFIX}/bin/kcheckpass ${_KDE_SETUID_ROOT}
SPECIAL_PERMS+= ${PREFIX}/bin/ksysguardd ${_KDE_SETUID_ROOT}
pre-configure:
cd ${WRKSRC}; \
files="kioslave/info/kde-info2html.conf khelpcenter/infoconsts.h"; \
files="kioslave/info/kde-info2html.conf"; \
for file in $${files}; do \
${SED} -e 's|@LOCALBASE@|${LOCALBASE}|' $${file} > \
$${file}.new; \

1554
x11/kdebase3/PLIST
View file

File diff suppressed because it is too large Load diff

4
x11/kdebase3/buildlink2.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink2.mk,v 1.16 2004/01/03 18:49:59 reed Exp $
# $NetBSD: buildlink2.mk,v 1.17 2004/02/04 14:25:58 markd Exp $
.if !defined(KDEBASE3_BUILDLINK2_MK)
KDEBASE3_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= kdebase3
BUILDLINK_PKGBASE.kdebase3?= kdebase
BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.1.4nb3
BUILDLINK_DEPENDS.kdebase3?= kdebase>=3.2.0
BUILDLINK_PKGSRCDIR.kdebase3?= ../../x11/kdebase3
.include "../../mk/bsd.prefs.mk"

126
x11/kdebase3/distinfo
View file

@ -1,126 +1,24 @@
$NetBSD: distinfo,v 1.40 2004/01/22 18:55:26 jmmv Exp $
$NetBSD: distinfo,v 1.41 2004/02/04 14:25:58 markd Exp $
SHA1 (kdebase-3.1.5.tar.bz2) = 489f802e2558db2025ca59ca888286a026bf2552
Size (kdebase-3.1.5.tar.bz2) = 15163007 bytes
SHA1 (kdebase-3.2.0.tar.bz2) = 8632e98a9f34479c085c951330b2c7bcc01ad62e
Size (kdebase-3.2.0.tar.bz2) = 17404034 bytes
SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
Size (Daemon.png) = 15725 bytes
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
Size (Daemon.README) = 2191 bytes
SHA1 (patch-aa) = 89cc384b677d1d6c9ef8282d1bd4b8d184d8191e
SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44
SHA1 (patch-ac) = 87a5a42d1dbb50cb1e76532693c367508a75f7ba
SHA1 (patch-ad) = 40be5fb84b1fe2a7a08e4c2119350246004e5b29
SHA1 (patch-ae) = 2a1717aea4ee6b3a891dc93102af523db3801302
SHA1 (patch-af) = df818f3fb40ed58bed493552519548930a644af1
SHA1 (patch-ag) = eaa30fb93c43d93e4227bc5018e6b56a2680cea2
SHA1 (patch-ah) = 3a07da7a6be10cd429c5c3472491084ce6595ec5
SHA1 (patch-ai) = 8294023f053c2689eddffbf01d32c335f536fb16
SHA1 (patch-aj) = 87e9ada51ab2d584cd3af40cc5772d52f7357429
SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0
SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c
SHA1 (patch-am) = 4acb2c8548b064ab472d6545b8f16cf8476404c2
SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24
SHA1 (patch-ao) = c31c60390af7f121cab70ad3a8717a43adf26b1d
SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2
SHA1 (patch-aq) = e8a32080b981b8bc732cb76c060fb6b6cc0db5db
SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d
SHA1 (patch-as) = 6c1dbaa28f0e650979a3a79c8be30ddb1e0876a9
SHA1 (patch-at) = 2f747db0e1102ff219d1723598cbe4a6e78c0cbb
SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f
SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d
SHA1 (patch-aw) = 473ced4a3db648f915015ad4a8ebb35de0a1c99e
SHA1 (patch-ax) = 27d74a4893edfa60bbfd1d2b7a993b7a3b236282
SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2
SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81
SHA1 (patch-ba) = f8b87788ca6aca5e2f9706f3c9b5ff7a08723bbe
SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a
SHA1 (patch-aa) = fcb678ef0112e2d39f2d7ced126c88f2862b3351
SHA1 (patch-ab) = 5ddff11c04fb004a8ddaedbec2655fdd3cf3d466
SHA1 (patch-bb) = 37698647ac7f2e0ffcad2702d53b953759e89e45
SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58
SHA1 (patch-bd) = 1e13d72ec5fa3bc08641f24c999dbc0e33ab11b0
SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786
SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5
SHA1 (patch-bg) = 310a3d1b91b510223c15ac79d4536c67df7cb207
SHA1 (patch-bh) = 7cc29ef896f3337cee768439904f9adfeef792fe
SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164
SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081
SHA1 (patch-bk) = 80ed1bd3ef30aecbe15dfaf572dbc6755ff3325d
SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab
SHA1 (patch-bm) = 79a9fd0d6731b3023363486c085ffd7b398012fd
SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef
SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66
SHA1 (patch-bp) = b6bf3872aa3a4a7bd69a0bb7ecc31f349daf6ac1
SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21
SHA1 (patch-bs) = fba91b1e399d9285751b90311888b7369b76289f
SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a
SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16
SHA1 (patch-bx) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b
SHA1 (patch-bz) = 58a28f1c7204b7e179cbd2412319057d62ea5aa4
SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b
SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144
SHA1 (patch-cd) = 65fdd27e126a8a9f0466236d78622cc938e8a952
SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e
SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5
SHA1 (patch-ch) = 2169262518f56002e67c78e6e4501f59522dcbc5
SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4
SHA1 (patch-cj) = 77665b0fcccff0456cb07c51d1843674123bf765
SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd
SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec
SHA1 (patch-cn) = 479c9eb941526beaf69841f7cb76db9f5c2dcb8c
SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f
SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f
SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018
SHA1 (patch-ct) = 6b61eccce2bd22842568b6faebff52b9239974c4
SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf
SHA1 (patch-cx) = 5e44d311404a839ab30c45d7a9ba764197a96b4b
SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80
SHA1 (patch-cz) = 3807ed902aa07bd1c28ccdedb61b38db2cd5e394
SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81
SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4
SHA1 (patch-dh) = 778f0d994dbddb123c213daf97ec2194bcd0b8c8
SHA1 (patch-di) = c6044dc47bde5eee686163ca2f3e90d016dacd59
SHA1 (patch-dj) = c3b5f503720234518192732e4ca3f32514aad1ff
SHA1 (patch-dk) = 1933b34e056d384b59c86b78301fa3c21854b33d
SHA1 (patch-dl) = 863ece9d3b0b00ea2660d0f91e73f48bdafa3894
SHA1 (patch-dm) = 866cb67d9bb39f889226ef5c588552379d153eff
SHA1 (patch-dn) = 6ea2c644d31eca109c4657ab64c0e2f56ba2d0a5
SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9
SHA1 (patch-dp) = 2c5c9461b53b43e0c25069b54e709218896565ab
SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796
SHA1 (patch-dr) = c32988360a5a0f938a12ea376fd9c781fbbabe0a
SHA1 (patch-ds) = 4a8bc0f2624fb8ee1ddf7013e751d6fb93e4d47b
SHA1 (patch-dt) = 90baacdc4d0f85baeb3ea0c3f227cbffb37c08f1
SHA1 (patch-du) = 9069c9775c1a2b309bcd23d971fb8f24dcd36cf6
SHA1 (patch-dv) = c19d5ea88fad2cbffed3c42d58dd5b3dfb3982b4
SHA1 (patch-dw) = a50a08c8a1eafeffe187512de9bda98edb5f5045
SHA1 (patch-dx) = 7e9f24f67b44a542b6346bd80f159539014864b4
SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c
SHA1 (patch-dz) = 0f3d737904114f906d33f42a50b6969a293d13c8
SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714
SHA1 (patch-eb) = 473b4f0111d5a86249371d51ef671a2bcbfead73
SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec
SHA1 (patch-ed) = 0f5968e790d547b9b41d12fbb7ea99e0454636e5
SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3
SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef
SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610
SHA1 (patch-eh) = ab160ddc92d4dd601b89a5b7e43e1427549f00df
SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7
SHA1 (patch-ej) = eaac77fe210920a5729fc71eae8b0e979ebfec74
SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94
SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd
SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1
SHA1 (patch-ep) = 6762a5d93ea1d0c4ba7ef0b447eb1e3fb3deac82
SHA1 (patch-eq) = 527bdbb2ad75b6bdb6633f3f432136fa01b81950
SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
SHA1 (patch-ep) = 10e341753321415043b08cad0494a269f8d19643
SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380
SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32
SHA1 (patch-et) = 610488a6c7b006e632c9faab7fe7ecf1473c95cf
SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93
SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
SHA1 (patch-ex) = 989581c86846b7eede2221cb3c4e896f40ad17d5
SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4
SHA1 (patch-fa) = 1ea4390477d7f68283b68e695bcb2e4b7c18aecc
SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346
SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31
SHA1 (patch-fd) = 0005eaf7eaecb6377da5342c27effd798f425c95
SHA1 (patch-fe) = eb98edce602c3f56e02b7fc1ae907582723787df
SHA1 (patch-ff) = 4d324c4d346183020915815aa47c9bfb2b55a9ca
SHA1 (patch-fg) = c8553eae605ec0ed3d6c7a6cdd84696ab37b8adc
SHA1 (patch-fe) = 3da89e7228d5246e98a244d7f52d9052c3dbcfa2
SHA1 (patch-ff) = a027ccd5f578d41560e970aa54fca9b5760da0ac
SHA1 (patch-fg) = 31219a3d9b45f143dc76ffebd75bbb9b140fcdfa

80
x11/kdebase3/patches/patch-aa
View file

@ -1,81 +1,17 @@
$NetBSD: patch-aa,v 1.11 2004/01/15 10:15:14 markd Exp $
$NetBSD: patch-aa,v 1.12 2004/02/04 14:25:58 markd Exp $
--- configure.orig 2003-12-17 14:22:44.000000000 +1300
--- configure.orig 2004-01-26 08:22:39.000000000 +1300
+++ configure
@@ -22983,7 +22983,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
@@ -27907,7 +27907,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
# if you're trying to debug this check and think it's incorrect,
# better check your installation. The check _is_ correct - your
# installation is not.
- if test -f actest.cpp && grep klineedit actest.cpp > /dev/null; then
+ if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
kde_cv_uic_plugins=yes
fi
fi
@@ -31436,63 +31436,6 @@ _ACEOF
- 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 $LINENO "configure" */
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
- choke me
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- { { 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 long)
- does not apply. Please mail kde-devel@kde.org with a description of your system!
- " >&2;}
- { (exit 1); exit 1; }; }
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
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
@@ -33636,6 +33579,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
@@ -38076,6 +38076,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_cv_have_dpms="-lXdpms"
@ -99,7 +35,7 @@ $NetBSD: patch-aa,v 1.11 2004/01/15 10:15:14 markd Exp $
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -38585,6 +38545,7 @@ fi
@@ -45372,6 +45389,7 @@ fi
case "$UNAME" in
Linux) LIBHOSTS="$LIBSENSORS" ;;
FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;

69
x11/kdebase3/patches/patch-ab
View file

@ -1,58 +1,13 @@
$NetBSD: patch-ab,v 1.3 2003/03/11 13:10:18 markd Exp $
$NetBSD: patch-ab,v 1.4 2004/02/04 14:25:58 markd Exp $
--- kate/app/Makefile.am.orig Fri Dec 6 09:39:40 2002
+++ kate/app/Makefile.am
@@ -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
libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \
@@ -10,31 +10,33 @@ libkateinterfaces_la_SOURCES = kateapp.c
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
-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_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_kwrite.cpp
-kwrite_LDADD = kwrite.la
+kwrite_SOURCES = dummy_main.cpp
+kwrite_LDADD = libkwrite_main.la
kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries)
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)
--- kdm/backend/client.c.orig 2004-02-01 09:34:23.000000000 +1300
+++ kdm/backend/client.c
@@ -1148,7 +1148,7 @@ StartClient ()
chown (td->fifoPath, curuid, -1);
endpwent ();
#if !defined(USE_PAM) && !defined(AIXV3)
-# ifndef QNX4 /* QNX4 doesn't need endspent() to end shadow passwd ops */
+# if !(defined(QNX4) || defined(__NetBSD__)) /* QNX4 doesn't need endspent() to end shadow passwd ops */
endspent ();
# endif
#endif

542
x11/kdebase3/patches/patch-ac
View file

@ -1,533 +1,15 @@
$NetBSD: patch-ac,v 1.7 2004/01/15 10:15:14 markd Exp $
$NetBSD: patch-ac,v 1.8 2004/02/04 14:25:58 markd Exp $
--- kate/app/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300
+++ kate/app/Makefile.in
@@ -422,7 +422,7 @@ target_os = @target_os@
target_vendor = @target_vendor@
x_includes = @x_includes@
x_libraries = @x_libraries@
-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
--- libkonq/favicons/move_favicons.sh.orig 2003-11-30 22:43:25.000000000 +1300
+++ libkonq/favicons/move_favicons.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \
@@ -442,20 +442,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp
prefix=$(kde-config --localprefix)
-source1="$prefix/share/icons/favicons"
-source2="$prefix/share/cache/favicons"
+source1="$prefix/share/kde/icons/favicons"
+source2="$prefix/share/kde/cache/favicons"
dest="$(kde-config --path cache)/favicons"
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
-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_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_kwrite.cpp
-kwrite_LDADD = kwrite.la
+kwrite_SOURCES = dummy_main.cpp
+kwrite_LDADD = libkwrite_main.la
kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries)
#>- METASOURCES = AUTO
@@ -468,19 +476,21 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-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 = 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)
-#>+ 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 = libkateinterfaces.la
+am_libkate_main_la_OBJECTS = katemain.lo
+#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS)
+#>+ 1
+libkate_main_la_OBJECTS = katemain.lo
libkateinterfaces_la_DEPENDENCIES = \
../interfaces/libkateinterfacesprivate.la \
../lib/libkmultitabbar.la
@@ -503,25 +513,35 @@ 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)
+#>+ 5
+libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.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_kate.$(OBJEXT)
+am_kate_OBJECTS = dummy_main.$(OBJEXT)
#>- kate_OBJECTS = $(am_kate_OBJECTS)
#>+ 1
-kate_OBJECTS = dummy_kate.$(OBJEXT)
-kate_DEPENDENCIES = kate.la
-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_kwrite.$(OBJEXT)
-kwrite_DEPENDENCIES = kwrite.la
+kwrite_OBJECTS = dummy_main.$(OBJEXT)
+kwrite_DEPENDENCIES = libkwrite_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy_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 \
@@ -544,8 +564,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 \
@@ -567,8 +587,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 \
@@ -610,10 +630,10 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \
- $(libkateinterfaces_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) $(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
@@ -662,8 +682,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)
@@ -706,8 +730,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@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@
@@ -831,7 +855,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kateconfigdialog.h katemailfilesdialog.h kateviewspace.h katemainwindow.h kwritedialogs.h katedockcontainer.h katefiledialog.h kateconfigplugindialogpage.h katefileselector.h kateconsole.h katesplitter.h katepluginmanager.h kwritemain.h kategrepdialog.h kateapp.h kactionselector.h kateIface.h katedocmanager.h kateviewmanager.h katemain.h kbookmarkhandler.h katefilelist.h
+KDE_DIST=katemailfilesdialog.h katefileselector.h kateIface.h kateapp.h kbookmarkhandler.h katefiledialog.h katesplitter.h kwritemain.h Makefile.in.rej kateconfigplugindialogpage.h kwritedialogs.h kategrepdialog.h kateviewspace.h katemain.h kateconfigdialog.h katedockcontainer.h kactionselector.h katepluginmanager.h kateconsole.h katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -968,46 +992,40 @@ uninstall-am: uninstall-binPROGRAMS unin
dummy_kate_la.cpp:
echo > dummy_kate_la.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:
#>+ 3
-kateconsole.moc: $(srcdir)/kateconsole.h
- $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
+katefilelist.moc: $(srcdir)/katefilelist.h
+ $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc
#>+ 1
-mocs: kateconsole.moc
+mocs: katefilelist.moc
#>+ 3
-katefiledialog.moc: $(srcdir)/katefiledialog.h
- $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc
+kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h
+ $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc
#>+ 1
-mocs: katefiledialog.moc
+mocs: kateconfigdialog.moc
#>+ 3
-katesplitter.moc: $(srcdir)/katesplitter.h
- $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc
+kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h
+ $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc
#>+ 1
-mocs: katesplitter.moc
+mocs: kateconfigplugindialogpage.moc
#>+ 3
-katepluginmanager.moc: $(srcdir)/katepluginmanager.h
- $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
+katemainwindow.moc: $(srcdir)/katemainwindow.h
+ $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
#>+ 1
-mocs: katepluginmanager.moc
+mocs: katemainwindow.moc
#>+ 3
-katedocmanager.moc: $(srcdir)/katedocmanager.h
- $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc
+katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
+ $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc
#>+ 1
-mocs: katedocmanager.moc
+mocs: katemailfilesdialog.moc
#>+ 3
kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h
$(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc
@@ -1015,17 +1033,11 @@ kbookmarkhandler.moc: $(srcdir)/kbookmar
#>+ 1
mocs: kbookmarkhandler.moc
#>+ 3
-kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h
- $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc
-
-#>+ 1
-mocs: kateconfigplugindialogpage.moc
-#>+ 3
-katemainwindow.moc: $(srcdir)/katemainwindow.h
- $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc
+kactionselector.moc: $(srcdir)/kactionselector.h
+ $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc
#>+ 1
-mocs: katemainwindow.moc
+mocs: kactionselector.moc
#>+ 3
katedockcontainer.moc: $(srcdir)/katedockcontainer.h
$(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc
@@ -1033,71 +1045,77 @@ katedockcontainer.moc: $(srcdir)/katedoc
#>+ 1
mocs: katedockcontainer.moc
#>+ 3
-kateviewmanager.moc: $(srcdir)/kateviewmanager.h
- $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc
+kategrepdialog.moc: $(srcdir)/kategrepdialog.h
+ $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
#>+ 1
-mocs: kateviewmanager.moc
+mocs: kategrepdialog.moc
#>+ 3
-katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h
- $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc
+kateconsole.moc: $(srcdir)/kateconsole.h
+ $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc
#>+ 1
-mocs: katemailfilesdialog.moc
+mocs: kateconsole.moc
#>+ 3
-kwritemain.moc: $(srcdir)/kwritemain.h
- $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
+katefileselector.moc: $(srcdir)/katefileselector.h
+ $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc
#>+ 1
-mocs: kwritemain.moc
+mocs: katefileselector.moc
#>+ 3
-kateviewspace.moc: $(srcdir)/kateviewspace.h
- $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc
+katesplitter.moc: $(srcdir)/katesplitter.h
+ $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc
#>+ 1
-mocs: kateviewspace.moc
+mocs: katesplitter.moc
#>+ 3
-kateapp.moc: $(srcdir)/kateapp.h
- $(MOC) $(srcdir)/kateapp.h -o kateapp.moc
+kateviewmanager.moc: $(srcdir)/kateviewmanager.h
+ $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc
#>+ 1
-mocs: kateapp.moc
+mocs: kateviewmanager.moc
#>+ 3
-kwritedialogs.moc: $(srcdir)/kwritedialogs.h
- $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc
+kwritemain.moc: $(srcdir)/kwritemain.h
+ $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc
#>+ 1
-mocs: kwritedialogs.moc
+mocs: kwritemain.moc
#>+ 3
-kactionselector.moc: $(srcdir)/kactionselector.h
- $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc
+kateapp.moc: $(srcdir)/kateapp.h
+ $(MOC) $(srcdir)/kateapp.h -o kateapp.moc
#>+ 1
-mocs: kactionselector.moc
+mocs: kateapp.moc
#>+ 3
-kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h
- $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.moc
+kateviewspace.moc: $(srcdir)/kateviewspace.h
+ $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc
#>+ 1
-mocs: kateconfigdialog.moc
+mocs: kateviewspace.moc
#>+ 3
-kategrepdialog.moc: $(srcdir)/kategrepdialog.h
- $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc
+katefiledialog.moc: $(srcdir)/katefiledialog.h
+ $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc
#>+ 1
-mocs: kategrepdialog.moc
+mocs: katefiledialog.moc
#>+ 3
-katefilelist.moc: $(srcdir)/katefilelist.h
- $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc
+katedocmanager.moc: $(srcdir)/katedocmanager.h
+ $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc
#>+ 1
-mocs: katefilelist.moc
+mocs: katedocmanager.moc
#>+ 3
-katefileselector.moc: $(srcdir)/katefileselector.h
- $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc
+katepluginmanager.moc: $(srcdir)/katepluginmanager.h
+ $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc
#>+ 1
-mocs: katefileselector.moc
+mocs: katepluginmanager.moc
+#>+ 3
+kwritedialogs.moc: $(srcdir)/kwritedialogs.h
+ $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc
+
+#>+ 1
+mocs: kwritedialogs.moc
#>+ 5
kateIface.kidl: $(srcdir)/kateIface.h $(DCOP_DEPENDENCIES)
$(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; false )
@@ -1106,7 +1124,7 @@ kateIface_skel.cpp: kateIface.kidl
#>+ 3
clean-metasources:
- -rm -f kateconsole.moc katefiledialog.moc katesplitter.moc katepluginmanager.moc katedocmanager.moc kbookmarkhandler.moc kateconfigplugindialogpage.moc katemainwindow.moc katedockcontainer.moc kateviewmanager.moc katemailfilesdialog.moc kwritemain.moc kateviewspace.moc kateapp.moc kwritedialogs.moc kactionselector.moc kateconfigdialog.moc kategrepdialog.moc katefilelist.moc katefileselector.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
#>+ 4
clean-idl:
@@ -1124,19 +1142,7 @@ force-reedit:
#>+ 11
-kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp katefiledialog.moc kwritemain.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; \
- 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 kateconsole.moc katefiledialog.moc katesplitter.moc katepluginmanager.moc katedocmanager.moc kbookmarkhandler.moc kateconfigplugindialogpage.moc katemainwindow.moc katedockcontainer.moc kateviewmanager.moc katemailfilesdialog.moc kateviewspace.moc kateapp.moc kateconfigdialog.moc kactionselector.moc kategrepdialog.moc katefilelist.moc katefileselector.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; \
@@ -1147,22 +1153,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 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 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 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) 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) 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) 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) 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
@@ -1172,43 +1190,43 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 41
-kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc
-katefiledialog.lo: katefiledialog.moc
-kateconfigdialog.lo: kateconfigdialog.moc
-kactionselector.o: kactionselector.moc
-kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc
-kateconfigdialog.o: kateconfigdialog.moc
-kbookmarkhandler.lo: kbookmarkhandler.moc
-katesplitter.lo: katesplitter.moc
-kactionselector.lo: kactionselector.moc
-kategrepdialog.lo: kategrepdialog.moc
-kwritedialogs.o: kwritedialogs.moc
-kwritemain.o: kwritemain.moc
-kateconsole.lo: kateconsole.moc
-kwritedialogs.lo: kwritedialogs.moc
-katedockcontainer.lo: katedockcontainer.moc
-katefileselector.o: katefileselector.moc
kateapp.lo: kateapp.moc
-katedockcontainer.o: katedockcontainer.moc
katemainwindow.lo: katemainwindow.moc
-katemainwindow.o: katemainwindow.moc
-katefilelist.o: katefilelist.moc
-kateviewmanager.lo: kateviewmanager.moc
+kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc
+katemailfilesdialog.o: katemailfilesdialog.moc
+katefileselector.o: katefileselector.moc
+kateconsole.lo: kateconsole.moc
+kbookmarkhandler.o: kbookmarkhandler.moc
+kateapp.o: kateapp.moc
+katefiledialog.lo: katefiledialog.moc
+katefiledialog.o: katefiledialog.moc
katedocmanager.lo: katedocmanager.moc
+katesplitter.o: katesplitter.moc
+kwritemain.o: kwritemain.moc
katemailfilesdialog.lo: katemailfilesdialog.moc
-katemailfilesdialog.o: katemailfilesdialog.moc
+katefilelist.lo: katefilelist.moc
+kactionselector.lo: kactionselector.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
-katefilelist.lo: katefilelist.moc
+kateconfigdialog.o: kateconfigdialog.moc
+katedockcontainer.o: katedockcontainer.moc
+kactionselector.o: kactionselector.moc
katepluginmanager.o: katepluginmanager.moc
+kateconsole.o: kateconsole.moc
+kategrepdialog.lo: kategrepdialog.moc
+katefilelist.o: katefilelist.moc
+katemainwindow.o: katemainwindow.moc
kateviewmanager.o: kateviewmanager.moc
+kbookmarkhandler.lo: kbookmarkhandler.moc
+kateviewspace.lo: kateviewspace.moc
katedocmanager.o: katedocmanager.moc
-kbookmarkhandler.o: kbookmarkhandler.moc
+katedockcontainer.lo: katedockcontainer.moc
+kateconfigdialog.lo: kateconfigdialog.moc
katefileselector.lo: katefileselector.moc
-kategrepdialog.o: kategrepdialog.moc
-kateviewspace.lo: kateviewspace.moc
-kateapp.o: kateapp.moc
-kwritemain.lo: kwritemain.moc
-katesplitter.o: katesplitter.moc
-kateconsole.o: kateconsole.moc
-katefiledialog.o: katefiledialog.moc
+kateviewmanager.lo: kateviewmanager.moc
if [ -n "$prefix" -a -d "$source1" ]; then

30
x11/kdebase3/patches/patch-ad
View file

@ -1,13 +1,21 @@
$NetBSD: patch-ad,v 1.4 2003/08/02 19:33:20 mrg Exp $
$NetBSD: patch-ad,v 1.5 2004/02/04 14:25:58 markd Exp $
--- kcontrol/kfontinst/kfontinst/AfmCreator.cpp.orig 2003-05-07 21:44:02.000000000 +1000
+++ kcontrol/kfontinst/kfontinst/AfmCreator.cpp 2003-08-03 02:40:17.000000000 +1000
@@ -43,7 +43,7 @@
#include <kdeversion.h>
#include <stdio.h>
#include <string.h>
-#include <fstream.h>
+#include <fstream>
--- ksmserver/move_session_config.sh.orig 2002-03-18 14:26:20.000000000 +1200
+++ ksmserver/move_session_config.sh
@@ -1,8 +1,8 @@
#!/bin/sh
static const char * constNotDef = ".notdef";
static const char * constKfiComment = "Comment kfontinst ";
prefix=`kde-config --localprefix`
-source="${prefix}/share/config"
-dest="${prefix}/share/config/session"
+source="${prefix}/share/kde/config"
+dest="${prefix}/share/kde/config/session"
# move session config files
@@ -29,4 +29,4 @@ fi
# update references in ksmserverrc
-sed -e 's^share/config/\([^/:]*\):^share/config/session/\1_^'
+sed -e 's^share/kde/config/\([^/:]*\):^share/kde/config/session/\1_^'

15
x11/kdebase3/patches/patch-ae
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ae,v 1.3 2003/03/11 13:10:18 markd Exp $
--- kate/app/katemain.cpp.orig Fri Dec 6 09:39:41 2002
+++ kate/app/katemain.cpp
@@ -36,7 +36,9 @@ static KCmdLineOptions options[] =
{ 0,0,0 }
};
-int main( int argc, char **argv )
+extern "C" int kdemain( int argc, char **argv );
+
+int kdemain( int argc, char **argv )
{
KAboutData *data = new KAboutData ("kate", I18N_NOOP("Kate"), "2.1",
I18N_NOOP( "Kate - KDE Advanced Text Editor" ), KAboutData::License_GPL,

15
x11/kdebase3/patches/patch-af
View file

@ -1,15 +0,0 @@
$NetBSD: patch-af,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kate/app/kwritemain.cpp.orig Wed May 8 19:20:50 2002
+++ kate/app/kwritemain.cpp
@@ -510,7 +510,9 @@
{ 0, 0, 0}
};
-int main(int argc, char **argv)
+extern "C" int kdemain(int argc, char **argv);
+
+int kdemain(int argc, char **argv)
{
KLocale::setMainCatalogue("kate"); //lukas: set this to have the kwritepart translated using kate message catalog

14
x11/kdebase3/patches/patch-ag
View file

@ -1,14 +0,0 @@
$NetBSD: patch-ag,v 1.4 2003/08/02 19:33:20 mrg Exp $
--- kcontrol/kfontinst/kfontinst/Encodings.cpp.orig 2003-05-07 21:44:02.000000000 +1000
+++ kcontrol/kfontinst/kfontinst/Encodings.cpp 2003-08-03 03:44:55.000000000 +1000
@@ -33,7 +33,8 @@
#include "CompressedFile.h"
#include <qdir.h>
#include <ctype.h>
-#include <fstream.h>
+#include <fstream>
+using namespace std;
// Use the strict maps - needed for creating AFMs...
#define STRICT_ENCODING_MAPS

38
x11/kdebase3/patches/patch-ah
View file

@ -1,38 +0,0 @@
$NetBSD: patch-ah,v 1.2 2002/08/25 19:23:36 jlam Exp $
--- kcontrol/access/Makefile.am.orig Wed May 8 19:20:50 2002
+++ kcontrol/access/Makefile.am
@@ -4,16 +4,20 @@
bin_PROGRAMS = kaccess
-kaccess_SOURCES = dummy.cpp
+kaccess_SOURCES = kaccess_main.cpp
kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kaccess_LDADD = kaccess.la
+kaccess_LDADD = libkaccess_main.la
kde_module_LTLIBRARIES = kcm_access.la
-lib_LTLIBRARIES = kaccess.la
+lib_LTLIBRARIES = libkaccess_main.la kaccess.la
-kaccess_la_SOURCES = kaccess.cpp main.cpp
-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kaccess_la_LIBADD = $(LIB_KDEUI)
+libkaccess_main_la_SOURCES = kaccess.cpp main.cpp
+libkaccess_main_la_LDFLAGS = $(all_libraries)
+libkaccess_main_la_LIBADD = $(LIB_KDEUI)
+
+kaccess_la_SOURCES = kaccess_main.cpp
+kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kaccess_la_LIBADD = libkaccess_main.la
kcm_access_la_SOURCES = kcmaccess.cpp
kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -32,6 +36,3 @@
messages:
$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
$(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot
-
-dummy.cpp:
- echo > dummy.cpp

206
x11/kdebase3/patches/patch-ai
View file

@ -1,206 +0,0 @@
$NetBSD: patch-ai,v 1.8 2004/01/15 10:15:14 markd Exp $
--- kcontrol/access/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300
+++ kcontrol/access/Makefile.in
@@ -428,16 +428,20 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kaccess
-kaccess_SOURCES = dummy.cpp
+kaccess_SOURCES = kaccess_main.cpp
kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kaccess_LDADD = kaccess.la
+kaccess_LDADD = libkaccess_main.la
kde_module_LTLIBRARIES = kcm_access.la
-lib_LTLIBRARIES = kaccess.la
+lib_LTLIBRARIES = libkaccess_main.la kaccess.la
-kaccess_la_SOURCES = kaccess.cpp main.cpp
-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kaccess_la_LIBADD = $(LIB_KDEUI)
+libkaccess_main_la_SOURCES = kaccess.cpp main.cpp
+libkaccess_main_la_LDFLAGS = $(all_libraries)
+libkaccess_main_la_LIBADD = $(LIB_KDEUI)
+
+kaccess_la_SOURCES = kaccess_main.cpp
+kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kaccess_la_LIBADD = libkaccess_main.la
kcm_access_la_SOURCES = kcmaccess.cpp
kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -456,37 +460,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kaccess_la_DEPENDENCIES =
-am_kaccess_la_OBJECTS = kaccess.lo main.lo
+kaccess_la_DEPENDENCIES = libkaccess_main.la
+am_kaccess_la_OBJECTS = kaccess_main.lo
#>- kaccess_la_OBJECTS = $(am_kaccess_la_OBJECTS)
-#>+ 4
-kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo
-kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo
-@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS)
+#>+ 1
+kaccess_la_OBJECTS = kaccess_main.lo
kcm_access_la_DEPENDENCIES =
am_kcm_access_la_OBJECTS = kcmaccess.lo
#>- kcm_access_la_OBJECTS = $(am_kcm_access_la_OBJECTS)
#>+ 1
kcm_access_la_OBJECTS = kcmaccess.lo
+libkaccess_main_la_DEPENDENCIES =
+am_libkaccess_main_la_OBJECTS = kaccess.lo main.lo
+#>- libkaccess_main_la_OBJECTS = $(am_libkaccess_main_la_OBJECTS)
+#>+ 4
+libkaccess_main_la_final_OBJECTS = libkaccess_main_la.all_cpp.lo
+libkaccess_main_la_nofinal_OBJECTS = kaccess.lo main.lo
+@KDE_USE_FINAL_FALSE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_final_OBJECTS)
bin_PROGRAMS = kaccess$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kaccess_OBJECTS = dummy.$(OBJEXT)
+am_kaccess_OBJECTS = kaccess_main.$(OBJEXT)
#>- kaccess_OBJECTS = $(am_kaccess_OBJECTS)
#>+ 1
-kaccess_OBJECTS = dummy.$(OBJEXT)
-kaccess_DEPENDENCIES = kaccess.la
+kaccess_OBJECTS = kaccess_main.$(OBJEXT)
+kaccess_DEPENDENCIES = libkaccess_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/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 \
+#>+ 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) \
@@ -508,13 +523,13 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \
- $(kaccess_SOURCES)
+ $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES)
DATA = $(data_DATA) $(services_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES)
+SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES)
#>- all: all-am
#>+ 1
@@ -594,6 +609,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)
@@ -633,8 +650,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@
@@ -775,7 +793,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kcmaccess.desktop configure.in.in kaccess.desktop kaccess.h
+KDE_DIST=configure.in.in Makefile.in.rej kcmaccess.desktop kaccess.desktop kaccess.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -925,9 +943,6 @@ uninstall-am: uninstall-binPROGRAMS unin
messages:
$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
$(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.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:
@@ -972,33 +987,33 @@ force-reedit:
#>+ 11
-kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc
- @echo 'creating kaccess_la.all_cpp.cpp ...'; \
- rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \
+libkaccess_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc
+ @echo 'creating libkaccess_main_la.all_cpp.cpp ...'; \
+ rm -f libkaccess_main_la.all_cpp.files libkaccess_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkaccess_main_la.all_cpp.final; \
for file in kaccess.cpp main.cpp ; do \
- echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkaccess_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_main_la.all_cpp.final; \
done; \
- cat kaccess_la.all_cpp.final kaccess_la.all_cpp.files > kaccess_la.all_cpp.cpp; \
- rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files
+ cat libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files > libkaccess_main_la.all_cpp.cpp; \
+ rm -f libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kaccess_la.all_cpp.cpp
+ -rm -f libkaccess_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1008,7 +1023,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-kcmaccess.o: kcmaccess.moc
-kaccess.o: kaccess.moc
kcmaccess.lo: kcmaccess.moc
kaccess.lo: kaccess.moc
+kcmaccess.o: kcmaccess.moc
+kaccess.o: kaccess.moc

16
x11/kdebase3/patches/patch-aj
View file

@ -1,16 +0,0 @@
$NetBSD: patch-aj,v 1.4 2003/08/02 19:33:21 mrg Exp $
--- kcontrol/kfontinst/kfontinst/FontEngine.cpp.orig 2003-08-03 03:46:55.000000000 +1000
+++ kcontrol/kfontinst/kfontinst/FontEngine.cpp 2003-08-03 03:47:02.000000000 +1000
@@ -36,8 +36,9 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
-#include <fstream.h>
-#include <iostream.h>
+#include <fstream>
+#include <iostream>
+using namespace std;
#include <stdio.h>
#include <netinet/in.h>
#include <arpa/inet.h>

15
x11/kdebase3/patches/patch-ak
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ak,v 1.3 2003/03/11 13:10:19 markd Exp $
--- kcontrol/access/main.cpp.orig Fri Dec 6 09:39:48 2002
+++ kcontrol/access/main.cpp
@@ -5,7 +5,9 @@
#include <kaboutdata.h>
#include <kcmdlineargs.h>
-int main(int argc, char * argv[] )
+extern "C" int kdemain(int, char *[]);
+
+int kdemain(int argc, char *argv[])
{
KAboutData about(I18N_NOOP("kaccess"), I18N_NOOP("KDE Accessibility Tool"),
0, 0, KAboutData::License_GPL,

13
x11/kdebase3/patches/patch-al
View file

@ -1,13 +0,0 @@
$NetBSD: patch-al,v 1.3 2003/03/11 13:10:19 markd Exp $
--- kcontrol/ebrowsing/Makefile.am.orig Sun Oct 27 11:04:51 2002
+++ kcontrol/ebrowsing/Makefile.am
@@ -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
+kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
# Don't link this lib to the plugins. They are dlopened and linking to them
# results in crashes when closing kcmshell.

32
x11/kdebase3/patches/patch-am
View file

@ -1,32 +0,0 @@
$NetBSD: patch-am,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kcontrol/ebrowsing/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300
+++ kcontrol/ebrowsing/Makefile.in
@@ -432,7 +432,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
+kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH}
kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA)
data_DATA = ebrowsing.desktop
@@ -738,7 +738,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=filteropts.h ebrowsing.desktop main.h
+KDE_DIST=Makefile.in.rej ebrowsing.desktop filteropts.h main.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -982,7 +982,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-filteropts.lo: filteropts.moc
-main.o: main.moc
filteropts.o: filteropts.moc
main.lo: main.moc
+main.o: main.moc
+filteropts.lo: filteropts.moc

84
x11/kdebase3/patches/patch-an
View file

@ -1,84 +0,0 @@
$NetBSD: patch-an,v 1.3 2003/03/11 13:10:19 markd Exp $
--- kcontrol/kcontrol/Makefile.am.orig Fri Jan 3 17:41:16 2003
+++ kcontrol/kcontrol/Makefile.am
@@ -22,41 +22,52 @@ METASOURCES = AUTO
SUBDIRS = . pics
-CLEANFILES = dummy.cpp
-
bin_PROGRAMS = kcontrol kcmshell kcminit
-lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
-
-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \
- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \
+ libkcmshell_main.la kcmshell.la \
+ libkcminit_main.la kcminit.la
+
+libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
+ searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \
+ proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \
+ global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel
-kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcontrol_main_la_LDFLAGS = $(all_libraries)
+
+kcontrol_la_SOURCES = kcontrol_main.cpp
+kcontrol_la_LIBADD = libkcontrol_main.la
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
- proxywidget.cpp kcdialog.cpp global.cpp \
- kcdialog.skel
-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \
+ kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \
+ kcdialog.skel
+libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcmshell_main_la_LDFLAGS = $(all_libraries)
+
+kcmshell_la_SOURCES = kcmshell_main.cpp
+kcmshell_la_LIBADD = libkcmshell_main.la
kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+libkcminit_main_la_SOURCES = kcminit.cpp global.cpp
+libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcminit_main_la_LDFLAGS = $(all_libraries)
kcminit_la_SOURCES = kcminit.cpp global.cpp
-kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+kcminit_la_LIBADD = libkcminit_main.la
kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcontrol_SOURCES = dummy.cpp
-kcontrol_LDADD = kcontrol.la
+kcontrol_SOURCES = kcontrol_main.cpp
+kcontrol_LDADD = libkcontrol_main.la
kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-kcmshell_SOURCES = dummy.cpp
-kcmshell_LDADD = kcmshell.la
+kcmshell_SOURCES = kcmshell_main.cpp
+kcmshell_LDADD = libkcmshell_main.la
kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-kcminit_SOURCES = dummy.cpp
-kcminit_LDADD = kcminit.la
+kcminit_SOURCES = kcminit_main.cpp
+kcminit_LDADD = libkcminit_main.la
kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
rccontroldir = $(kde_datadir)/kcontrol
@@ -81,6 +92,3 @@ EXTRA_DIST = $(data_DATA)
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
-
-dummy.cpp:
- echo > dummy.cpp

648
x11/kdebase3/patches/patch-ao
View file

@ -1,648 +0,0 @@
$NetBSD: patch-ao,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kcontrol/kcontrol/Makefile.in.orig 2004-01-02 14:05:56.000000000 +1300
+++ kcontrol/kcontrol/Makefile.in
@@ -447,52 +447,65 @@ INCLUDES = $(all_includes)
SUBDIRS = . pics
-CLEANFILES = dummy.cpp
-
bin_PROGRAMS = kcontrol kcmshell kcminit
-lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la
+lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \
+ libkcmshell_main.la kcmshell.la \
+ libkcminit_main.la kcminit.la
+
-#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
-#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \
-#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
-#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \
+#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \
+#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \
+#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
#>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel
#>+ 5
-kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \
- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \
- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \
- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
+libkcontrol_main_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp \
+ searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \
+ proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \
+ global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \
kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp
-kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcontrol_main_la_LDFLAGS = $(all_libraries)
+
+kcontrol_la_SOURCES = kcontrol_main.cpp
+kcontrol_la_LIBADD = libkcontrol_main.la
kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version
-#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
-#>- proxywidget.cpp kcdialog.cpp global.cpp \
-#>- kcdialog.skel
-#>+ 3
-kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \
- proxywidget.cpp kcdialog.cpp global.cpp \
- kcdialog_skel.cpp
+#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \
+#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \
+#>- kcdialog.skel
+#>+ 3
+libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \
+ kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \
+ kcdialog_skel.cpp
-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcmshell_main_la_LDFLAGS = $(all_libraries)
+
+kcmshell_la_SOURCES = kcmshell_main.cpp
+kcmshell_la_LIBADD = libkcmshell_main.la
kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version
+libkcminit_main_la_SOURCES = kcminit.cpp global.cpp
+libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libkcminit_main_la_LDFLAGS = $(all_libraries)
+
kcminit_la_SOURCES = kcminit.cpp global.cpp
-kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+kcminit_la_LIBADD = libkcminit_main.la
kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcontrol_SOURCES = dummy.cpp
-kcontrol_LDADD = kcontrol.la
+kcontrol_SOURCES = kcontrol_main.cpp
+kcontrol_LDADD = libkcontrol_main.la
kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-kcmshell_SOURCES = dummy.cpp
-kcmshell_LDADD = kcmshell.la
+kcmshell_SOURCES = kcmshell_main.cpp
+kcmshell_LDADD = libkcmshell_main.la
kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
-kcminit_SOURCES = dummy.cpp
-kcminit_LDADD = kcminit.la
+kcminit_SOURCES = kcminit_main.cpp
+kcminit_LDADD = libkcminit_main.la
kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
rccontroldir = $(kde_datadir)/kcontrol
@@ -512,7 +525,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kcminit_la_DEPENDENCIES =
+kcminit_la_DEPENDENCIES = libkcminit_main.la
am_kcminit_la_OBJECTS = kcminit.lo global.lo
#>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS)
#>+ 4
@@ -520,60 +533,84 @@ 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)
-kcmshell_la_DEPENDENCIES =
-am_kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
- kecdialog.lo proxywidget.lo kcdialog.lo global.lo
+kcmshell_la_DEPENDENCIES = libkcmshell_main.la
+am_kcmshell_la_OBJECTS = kcmshell_main.lo
#>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS)
+#>+ 1
+kcmshell_la_OBJECTS = kcmshell_main.lo
+kcontrol_la_DEPENDENCIES = libkcontrol_main.la
+am_kcontrol_la_OBJECTS = kcontrol_main.lo
+#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS)
+#>+ 1
+kcontrol_la_OBJECTS = kcontrol_main.lo
+libkcminit_main_la_DEPENDENCIES =
+am_libkcminit_main_la_OBJECTS = kcminit.lo global.lo
+#>- libkcminit_main_la_OBJECTS = $(am_libkcminit_main_la_OBJECTS)
+#>+ 4
+libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo
+libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo
+@KDE_USE_FINAL_FALSE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS)
+libkcmshell_main_la_DEPENDENCIES =
+am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
+ kecdialog.lo proxywidget.lo kcdialog.lo global.lo
+#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS)
#>+ 5
-kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo
-kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
+libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo
+libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \
kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo
-@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS)
-kcontrol_la_DEPENDENCIES =
-am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \
+@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS)
+libkcontrol_main_la_DEPENDENCIES =
+am_libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \
searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \
proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \
global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \
kecdialog.lo kcrootonly.lo moduleIface.lo
-#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS)
+#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS)
#>+ 8
-kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo
-kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \
+libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo
+libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \
searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \
proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \
global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \
kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo
-@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS)
bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kcminit_OBJECTS = dummy.$(OBJEXT)
+am_kcminit_OBJECTS = kcminit_main.$(OBJEXT)
#>- kcminit_OBJECTS = $(am_kcminit_OBJECTS)
#>+ 1
-kcminit_OBJECTS = dummy.$(OBJEXT)
-kcminit_DEPENDENCIES = kcminit.la
-am_kcmshell_OBJECTS = dummy.$(OBJEXT)
+kcminit_OBJECTS = kcminit_main.$(OBJEXT)
+kcminit_DEPENDENCIES = libkcminit_main.la
+am_kcmshell_OBJECTS = kcmshell_main.$(OBJEXT)
#>- kcmshell_OBJECTS = $(am_kcmshell_OBJECTS)
#>+ 1
-kcmshell_OBJECTS = dummy.$(OBJEXT)
-kcmshell_DEPENDENCIES = kcmshell.la
-am_kcontrol_OBJECTS = dummy.$(OBJEXT)
+kcmshell_OBJECTS = kcmshell_main.$(OBJEXT)
+kcmshell_DEPENDENCIES = libkcmshell_main.la
+am_kcontrol_OBJECTS = kcontrol_main.$(OBJEXT)
#>- kcontrol_OBJECTS = $(am_kcontrol_OBJECTS)
#>+ 1
-kcontrol_OBJECTS = dummy.$(OBJEXT)
-kcontrol_DEPENDENCIES = kcontrol.la
+kcontrol_OBJECTS = kcontrol_main.$(OBJEXT)
+kcontrol_DEPENDENCIES = libkcontrol_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/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 \
@@ -584,13 +621,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 \
@@ -602,11 +645,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 \
@@ -637,8 +686,9 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \
- $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) \
- $(kcontrol_SOURCES)
+ $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) \
+ $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) \
+ $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES)
DATA = $(data_DATA) $(rccontrol_DATA) $(rcinfo_DATA)
@@ -649,7 +699,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES)
+SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -700,6 +750,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)
+libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS)
+libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES)
+ $(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)
@@ -747,13 +803,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@
@@ -993,7 +1053,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=cr16-app-kcontrol.png cr32-app-kcontrol.png moduleIface.h kcontrolui.rc cr48-app-kcontrol.png kcrootonly.h kcmshell.h cr64-app-kcontrol.png modulemenu.h modulemenu.cpp KControl_NoDisplay.desktop helpwidget.h moduleiconview.h KControl.desktop modloader.h moduleinfo.h aboutwidget.h quickhelp.h dockcontainer.h toplevel.h kinfocenterui.rc global.h moduletreeview.h indexwidget.h modules.h main.h kcdialog.h kecdialog.h proxywidget.h searchwidget.h version.h cr128-app-kcontrol.png kinfocenter.desktop
+KDE_DIST=kcontrolui.rc indexwidget.h cr64-app-kcontrol.png kinfocenterui.rc proxywidget.h dockcontainer.h cr32-app-kcontrol.png modulemenu.h quickhelp.h cr128-app-kcontrol.png searchwidget.h main.h Makefile.in.rej moduletreeview.h kcdialog.h kecdialog.h moduleIface.h aboutwidget.h kinfocenter.desktop kcrootonly.h toplevel.h helpwidget.h KControl.desktop cr48-app-kcontrol.png modules.h version.h cr16-app-kcontrol.png moduleiconview.h KControl_NoDisplay.desktop moduleinfo.h global.h kcmshell.h modulemenu.cpp modloader.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1067,7 +1127,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -1172,67 +1231,58 @@ install-data-local: KControl_NoDisplay.d
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot
-
-dummy.cpp:
- echo > dummy.cpp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
#>+ 3
-kcmshell.moc: $(srcdir)/kcmshell.h
- $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc
-
-#>+ 1
-mocs: kcmshell.moc
-#>+ 3
-proxywidget.moc: $(srcdir)/proxywidget.h
- $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
+indexwidget.moc: $(srcdir)/indexwidget.h
+ $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc
#>+ 1
-mocs: proxywidget.moc
+mocs: indexwidget.moc
#>+ 3
-moduletreeview.moc: $(srcdir)/moduletreeview.h
- $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc
+main.moc: $(srcdir)/main.h
+ $(MOC) $(srcdir)/main.h -o main.moc
#>+ 1
-mocs: moduletreeview.moc
+mocs: main.moc
#>+ 3
-toplevel.moc: $(srcdir)/toplevel.h
- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+moduleinfo.moc: $(srcdir)/moduleinfo.h
+ $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc
#>+ 1
-mocs: toplevel.moc
+mocs: moduleinfo.moc
#>+ 3
-aboutwidget.moc: $(srcdir)/aboutwidget.h
- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
+kcmshell.moc: $(srcdir)/kcmshell.h
+ $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc
#>+ 1
-mocs: aboutwidget.moc
+mocs: kcmshell.moc
#>+ 3
-kecdialog.moc: $(srcdir)/kecdialog.h
- $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc
+helpwidget.moc: $(srcdir)/helpwidget.h
+ $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc
#>+ 1
-mocs: kecdialog.moc
+mocs: helpwidget.moc
#>+ 3
-moduleiconview.moc: $(srcdir)/moduleiconview.h
- $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
+toplevel.moc: $(srcdir)/toplevel.h
+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
#>+ 1
-mocs: moduleiconview.moc
+mocs: toplevel.moc
#>+ 3
-moduleIface.moc: $(srcdir)/moduleIface.h
- $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
+moduletreeview.moc: $(srcdir)/moduletreeview.h
+ $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc
#>+ 1
-mocs: moduleIface.moc
+mocs: moduletreeview.moc
#>+ 3
-dockcontainer.moc: $(srcdir)/dockcontainer.h
- $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
+kecdialog.moc: $(srcdir)/kecdialog.h
+ $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc
#>+ 1
-mocs: dockcontainer.moc
+mocs: kecdialog.moc
#>+ 3
modulemenu.moc: $(srcdir)/modulemenu.h
$(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc
@@ -1240,17 +1290,17 @@ modulemenu.moc: $(srcdir)/modulemenu.h
#>+ 1
mocs: modulemenu.moc
#>+ 3
-moduleinfo.moc: $(srcdir)/moduleinfo.h
- $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc
+modules.moc: $(srcdir)/modules.h
+ $(MOC) $(srcdir)/modules.h -o modules.moc
#>+ 1
-mocs: moduleinfo.moc
+mocs: modules.moc
#>+ 3
-quickhelp.moc: $(srcdir)/quickhelp.h
- $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc
+moduleiconview.moc: $(srcdir)/moduleiconview.h
+ $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc
#>+ 1
-mocs: quickhelp.moc
+mocs: moduleiconview.moc
#>+ 3
kcdialog.moc: $(srcdir)/kcdialog.h
$(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc
@@ -1264,29 +1314,35 @@ searchwidget.moc: $(srcdir)/searchwidget
#>+ 1
mocs: searchwidget.moc
#>+ 3
-modules.moc: $(srcdir)/modules.h
- $(MOC) $(srcdir)/modules.h -o modules.moc
+moduleIface.moc: $(srcdir)/moduleIface.h
+ $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc
#>+ 1
-mocs: modules.moc
+mocs: moduleIface.moc
#>+ 3
-helpwidget.moc: $(srcdir)/helpwidget.h
- $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc
+aboutwidget.moc: $(srcdir)/aboutwidget.h
+ $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc
#>+ 1
-mocs: helpwidget.moc
+mocs: aboutwidget.moc
#>+ 3
-indexwidget.moc: $(srcdir)/indexwidget.h
- $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc
+proxywidget.moc: $(srcdir)/proxywidget.h
+ $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc
#>+ 1
-mocs: indexwidget.moc
+mocs: proxywidget.moc
#>+ 3
-main.moc: $(srcdir)/main.h
- $(MOC) $(srcdir)/main.h -o main.moc
+dockcontainer.moc: $(srcdir)/dockcontainer.h
+ $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc
#>+ 1
-mocs: main.moc
+mocs: dockcontainer.moc
+#>+ 3
+quickhelp.moc: $(srcdir)/quickhelp.h
+ $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc
+
+#>+ 1
+mocs: quickhelp.moc
#>+ 5
kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES)
$(DCOPIDL) $(srcdir)/kcdialog.h > kcdialog.kidl || ( rm -f kcdialog.kidl ; false )
@@ -1301,7 +1357,7 @@ moduleIface_skel.cpp: moduleIface.kidl
#>+ 3
clean-metasources:
- -rm -f kcmshell.moc proxywidget.moc moduletreeview.moc toplevel.moc aboutwidget.moc kecdialog.moc moduleiconview.moc moduleIface.moc dockcontainer.moc modulemenu.moc moduleinfo.moc quickhelp.moc kcdialog.moc searchwidget.moc modules.moc helpwidget.moc indexwidget.moc main.moc
+ -rm -f indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc
#>+ 5
clean-idl:
@@ -1352,45 +1408,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi
rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files
#>+ 11
-kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc proxywidget.moc kecdialog.moc moduleinfo.moc kcdialog.moc
- @echo 'creating kcmshell_la.all_cpp.cpp ...'; \
- rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \
+libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp
+ @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \
+ rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \
+ for file in kcminit.cpp global.cpp ; do \
+ echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \
+ done; \
+ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \
+ rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files
+
+#>+ 11
+libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc
+ @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \
+ rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \
for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp ; do \
- echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \
done; \
- cat kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files > kcmshell_la.all_cpp.cpp; \
- rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files
+ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \
+ rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files
#>+ 11
-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp proxywidget.moc moduletreeview.moc toplevel.moc aboutwidget.moc kecdialog.moc moduleiconview.moc moduleIface.moc dockcontainer.moc moduleinfo.moc quickhelp.moc searchwidget.moc main.moc indexwidget.moc helpwidget.moc modules.moc
- @echo 'creating kcontrol_la.all_cpp.cpp ...'; \
- rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \
+libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc
+ @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \
+ rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \
for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp ; do \
- echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \
done; \
- cat kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files > kcontrol_la.all_cpp.cpp; \
- rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files
+ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \
+ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp
+ -rm -f kcminit_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" all-am
+ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" install-am
+ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" all-am
+ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" install-am
+ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1400,39 +1468,39 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 37
+searchwidget.lo: searchwidget.moc
+toplevel.lo: toplevel.moc
+helpwidget.lo: helpwidget.moc
+indexwidget.o: indexwidget.moc
+moduleIface.lo: moduleIface.moc
+kcdialog.lo: kcdialog.moc
aboutwidget.lo: aboutwidget.moc
-moduleiconview.o: moduleiconview.moc
+indexwidget.lo: indexwidget.moc
+kecdialog.lo: kecdialog.moc
dockcontainer.o: dockcontainer.moc
-main.o: main.moc
-kcdialog.lo: kcdialog.moc
+proxywidget.o: proxywidget.moc
modulemenu.o: modulemenu.moc
-toplevel.o: toplevel.moc
-moduleinfo.lo: moduleinfo.moc
-indexwidget.o: indexwidget.moc
+moduletreeview.lo: moduletreeview.moc
+quickhelp.o: quickhelp.moc
+searchwidget.o: searchwidget.moc
+main.o: main.moc
+moduletreeview.o: moduletreeview.moc
dockcontainer.lo: dockcontainer.moc
-quickhelp.lo: quickhelp.moc
+kcdialog.o: kcdialog.moc
moduleIface.o: moduleIface.moc
kecdialog.o: kecdialog.moc
-proxywidget.o: proxywidget.moc
-moduleiconview.lo: moduleiconview.moc
-kcdialog.o: kcdialog.moc
-searchwidget.lo: searchwidget.moc
-quickhelp.o: quickhelp.moc
-searchwidget.o: searchwidget.moc
-main.lo: main.moc
-kcmshell.o: kcmshell.moc
-toplevel.lo: toplevel.moc
-aboutwidget.o: aboutwidget.moc
-modules.lo: modules.moc
-moduleIface.lo: moduleIface.moc
-kecdialog.lo: kecdialog.moc
proxywidget.lo: proxywidget.moc
+aboutwidget.o: aboutwidget.moc
+quickhelp.lo: quickhelp.moc
+main.lo: main.moc
+moduleiconview.lo: moduleiconview.moc
+toplevel.o: toplevel.moc
+helpwidget.o: helpwidget.moc
+moduleinfo.lo: moduleinfo.moc
+modules.o: modules.moc
kcmshell.lo: kcmshell.moc
+moduleiconview.o: moduleiconview.moc
+modules.lo: modules.moc
moduleinfo.o: moduleinfo.moc
-indexwidget.lo: indexwidget.moc
-helpwidget.lo: helpwidget.moc
-moduletreeview.lo: moduletreeview.moc
-moduletreeview.o: moduletreeview.moc
+kcmshell.o: kcmshell.moc
modulemenu.lo: modulemenu.moc
-modules.o: modules.moc
-helpwidget.o: helpwidget.moc

15
x11/kdebase3/patches/patch-ap
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcminit.cpp.orig Tue Feb 19 13:43:03 2002
+++ kcontrol/kcontrol/kcminit.cpp
@@ -59,7 +59,9 @@
return false;
}
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[]);
+
+int kdemain(int argc, char *argv[])
{
KLocale::setMainCatalogue("kcontrol");
KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),

14
x11/kdebase3/patches/patch-aq
View file

@ -1,14 +0,0 @@
$NetBSD: patch-aq,v 1.4 2003/08/02 19:33:22 mrg Exp $
--- kcontrol/kfontinst/kfontinst/Kfi.cpp.orig 2003-05-07 21:44:02.000000000 +1000
+++ kcontrol/kfontinst/kfontinst/Kfi.cpp 2003-08-03 04:01:19.000000000 +1000
@@ -37,7 +37,8 @@
#include <qfile.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <fstream.h>
+#include <fstream>
+using namespace std;
#include "kxftconfig.cpp" // CPD: Hack!!, this source file is located in kcontrol/fonts
CKfiMainWidget * CKfi::create(QWidget *parent)

15
x11/kdebase3/patches/patch-ar
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ar,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kcontrol/kcontrol/kcmshell.cpp.orig Sun Mar 3 00:23:50 2002
+++ kcontrol/kcontrol/kcmshell.cpp
@@ -129,7 +129,9 @@
}
-int main(int _argc, char *_argv[])
+extern "C" int kdemain(int _argc, char *_argv[]);
+
+int kdemain(int _argc, char *_argv[])
{
KAboutData aboutData( "kcmshell", I18N_NOOP("KDE Control Module"),
KCONTROL_VERSION,

14
x11/kdebase3/patches/patch-as
View file

@ -1,14 +0,0 @@
$NetBSD: patch-as,v 1.4 2003/08/02 19:33:22 mrg Exp $
--- kcontrol/kfontinst/kfontinst/StarOfficeConfig.cpp.orig 2003-05-07 21:44:02.000000000 +1000
+++ kcontrol/kfontinst/kfontinst/StarOfficeConfig.cpp 2003-08-03 04:04:00.000000000 +1000
@@ -34,7 +34,8 @@
#include "BufferedFile.h"
#include "KfiGlobal.h"
#include "Config.h"
-#include <fstream.h>
+#include <fstream>
+using namespace std;
#include <stdlib.h>
#include <string.h>
#include <qstring.h>

14
x11/kdebase3/patches/patch-at
View file

@ -1,14 +0,0 @@
$NetBSD: patch-at,v 1.4 2003/08/02 19:33:22 mrg Exp $
--- kdialog/kdialog.cpp.orig 2003-05-07 21:44:08.000000000 +1000
+++ kdialog/kdialog.cpp 2003-08-03 04:11:06.000000000 +1000
@@ -21,7 +21,8 @@
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include <qptrlist.h>
#include <qfile.h>

15
x11/kdebase3/patches/patch-au
View file

@ -1,15 +0,0 @@
$NetBSD: patch-au,v 1.3 2003/03/11 13:10:20 markd Exp $
--- kcontrol/kcontrol/main.cpp.orig Sun Sep 22 04:54:58 2002
+++ kcontrol/kcontrol/main.cpp
@@ -86,7 +86,9 @@ KControlApp::~KControlApp()
delete toplevel;
}
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[]);
+
+int kdemain(int argc, char *argv[])
{
KLocale::setMainCatalogue("kcontrol");
KAboutData aboutKControl( "kcontrol", I18N_NOOP("KDE Control Center"),

40
x11/kdebase3/patches/patch-av
View file

@ -1,40 +0,0 @@
$NetBSD: patch-av,v 1.2 2002/08/25 19:23:37 jlam Exp $
--- kdeprint/kjobviewer/Makefile.am.orig Sun Jul 8 10:31:24 2001
+++ kdeprint/kjobviewer/Makefile.am
@@ -1,15 +1,20 @@
INCLUDES = $(all_includes)
bin_PROGRAMS = kjobviewer
-lib_LTLIBRARIES = kjobviewer.la
+lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la
-kjobviewer_SOURCES = dummy.cpp
-kjobviewer_LDADD = kjobviewer.la
+kjobviewer_SOURCES = kjobviewer_main.cpp
+kjobviewer_LDADD = libkjobviewer_main.la
kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
+libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp
+libkjobviewer_main_la_METASOURCES = AUTO
+libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+kjobviewer_la_SOURCES = kjobviewer_main.cpp
kjobviewer_la_METASOURCES = AUTO
-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+kjobviewer_la_LIBADD = libkjobviewer_main.la
kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kjobviewer.h
@@ -21,9 +26,6 @@
desktop_DATA = kjobviewer.desktop
desktopdir = $(kde_appsdir)/Utilities
-
-dummy.cpp:
- echo > dummy.cpp
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot

215
x11/kdebase3/patches/patch-aw
View file

@ -1,215 +0,0 @@
$NetBSD: patch-aw,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kdeprint/kjobviewer/Makefile.in.orig 2004-01-02 14:05:57.000000000 +1300
+++ kdeprint/kjobviewer/Makefile.in
@@ -425,15 +425,20 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kjobviewer
-lib_LTLIBRARIES = kjobviewer.la
+lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la
-kjobviewer_SOURCES = dummy.cpp
-kjobviewer_LDADD = kjobviewer.la
+kjobviewer_SOURCES = kjobviewer_main.cpp
+kjobviewer_LDADD = libkjobviewer_main.la
kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
+libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp
+#>- libkjobviewer_main_la_METASOURCES = AUTO
+libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+kjobviewer_la_SOURCES = kjobviewer_main.cpp
#>- kjobviewer_la_METASOURCES = AUTO
-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+kjobviewer_la_LIBADD = libkjobviewer_main.la
kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kjobviewer.h
@@ -452,33 +457,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kjobviewer_la_DEPENDENCIES =
-am_kjobviewer_la_OBJECTS = kjobviewer.lo main.lo
+kjobviewer_la_DEPENDENCIES = libkjobviewer_main.la
+am_kjobviewer_la_OBJECTS = kjobviewer_main.lo
#>- kjobviewer_la_OBJECTS = $(am_kjobviewer_la_OBJECTS)
+#>+ 1
+kjobviewer_la_OBJECTS = kjobviewer_main.lo
+libkjobviewer_main_la_DEPENDENCIES =
+am_libkjobviewer_main_la_OBJECTS = kjobviewer.lo main.lo
+#>- libkjobviewer_main_la_OBJECTS = $(am_libkjobviewer_main_la_OBJECTS)
#>+ 4
-kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo
-kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo
-@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS)
+libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo
+libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo
+@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS)
bin_PROGRAMS = kjobviewer$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kjobviewer_OBJECTS = dummy.$(OBJEXT)
+am_kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT)
#>- kjobviewer_OBJECTS = $(am_kjobviewer_OBJECTS)
#>+ 1
-kjobviewer_OBJECTS = dummy.$(OBJEXT)
-kjobviewer_DEPENDENCIES = kjobviewer.la
+kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT)
+kjobviewer_DEPENDENCIES = libkjobviewer_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/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
+#>+ 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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -498,13 +511,14 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+DIST_SOURCES = $(kjobviewer_la_SOURCES) $(libkjobviewer_main_la_SOURCES) \
+ $(kjobviewer_SOURCES)
DATA = $(desktop_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+SOURCES = $(kjobviewer_la_SOURCES) $(libkjobviewer_main_la_SOURCES) $(kjobviewer_SOURCES)
#>- all: all-am
#>+ 1
@@ -551,6 +565,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)
@@ -590,8 +606,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@
distclean-depend:
@@ -731,7 +748,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kjobviewerui.rc cr32-app-kjobviewer.png cr16-app-kjobviewer.png kjobviewer.desktop
+KDE_DIST=cr32-app-kjobviewer.png Makefile.in.rej kjobviewerui.rc cr16-app-kjobviewer.png kjobviewer.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -872,9 +889,6 @@ uninstall-am: uninstall-kde-icons unins
uninstall-libLTLIBRARIES uninstall-rcDATA
-dummy.cpp:
- echo > dummy.cpp
-
messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot
# Tell versions [3.59,3.63) of GNU make to not export all variables.
@@ -888,8 +902,14 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h
#>+ 1
mocs: kjobviewer.moc
#>+ 3
+kjobviewer.moc: $(srcdir)/kjobviewer.h
+ $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc
+
+#>+ 1
+mocs: kjobviewer.moc
+#>+ 3
clean-metasources:
- -rm -f kjobviewer.moc
+ -rm -f kjobviewer.moc kjobviewer.moc
#>+ 2
docs-am:
@@ -913,33 +933,33 @@ force-reedit:
#>+ 11
-kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer.moc
- @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \
- rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \
+libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer.moc
+ @echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \
+ rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \
for file in kjobviewer.cpp main.cpp ; do \
- echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \
done; \
- cat kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files > kjobviewer_la.all_cpp.cpp; \
- rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files
+ cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \
+ rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kjobviewer_la.all_cpp.cpp
+ -rm -f libkjobviewer_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am
+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" install-am
+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -949,5 +969,5 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 3
-kjobviewer.o: kjobviewer.moc
-kjobviewer.lo: kjobviewer.moc
+kjobviewer.o: kjobviewer.moc kjobviewer.moc
+kjobviewer.lo: kjobviewer.moc kjobviewer.moc

14
x11/kdebase3/patches/patch-ax
View file

@ -1,14 +0,0 @@
$NetBSD: patch-ax,v 1.4 2003/08/02 19:33:23 mrg Exp $
--- kioslave/man/man2html.cpp.orig 2002-10-28 01:22:07.000000000 +1100
+++ kioslave/man/man2html.cpp 2003-08-03 04:29:18.000000000 +1000
@@ -105,7 +105,8 @@
#include <stdio.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

15
x11/kdebase3/patches/patch-ay
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ay,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- kdeprint/kjobviewer/main.cpp.orig Sat Dec 29 17:10:49 2001
+++ kdeprint/kjobviewer/main.cpp
@@ -33,7 +33,9 @@
};
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[]);
+
+int kdemain(int argc, char *argv[])
{
KAboutData aboutData("kjobviewer","KJobViewer","0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org");
aboutData.addAuthor("Michael Goffioul",0,"goffioul@imec.be");

44
x11/kdebase3/patches/patch-az
View file

@ -1,44 +0,0 @@
$NetBSD: patch-az,v 1.3 2003/03/11 13:10:21 markd Exp $
--- kdesktop/Makefile.am.orig Mon Sep 16 09:08:45 2002
+++ kdesktop/Makefile.am
@@ -1,10 +1,16 @@
## Makefile.am of kdebase/kdesktop
INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
+
+libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \
+ $(top_builddir)/kcontrol/background/libbgnd.la
+
kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
-kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
+kdesktop_la_LIBADD = libkdesktop_main.la
+
kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kdesktop_LDADD = kdesktop.la
+kdesktop_LDADD = libkdesktop_main.la
SUBDIRS = . lock pics patterns programs init kwebdesktop
@@ -12,15 +18,17 @@ SUBDIRS = . lock pics patterns programs
bin_PROGRAMS = kdesktop
bin_SCRIPTS = kdeeject
-lib_LTLIBRARIES = kdesktop.la
+lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la
-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
-kdesktop_SOURCES = dummy.cc
+kdesktop_la_SOURCES = kdesktop_main.cc
+
+kdesktop_SOURCES = kdesktop_main.cc
include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h

417
x11/kdebase3/patches/patch-ba
View file

@ -1,417 +0,0 @@
$NetBSD: patch-ba,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kdesktop/Makefile.in.orig 2004-01-02 14:05:57.000000000 +1300
+++ kdesktop/Makefile.in
@@ -424,10 +424,17 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes)
+
+libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \
+ $(top_builddir)/kcontrol/background/libbgnd.la
+
+
kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
-kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la
+kdesktop_la_LIBADD = libkdesktop_main.la
+
kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kdesktop_LDADD = kdesktop.la
+kdesktop_LDADD = libkdesktop_main.la
SUBDIRS = . lock pics patterns programs init kwebdesktop
@@ -435,22 +442,24 @@ SUBDIRS = . lock pics patterns programs
####### Files
bin_PROGRAMS = kdesktop
bin_SCRIPTS = kdeeject
-lib_LTLIBRARIES = kdesktop.la
+lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la
-#>- 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=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
-kdesktop_SOURCES = dummy.cc
+kdesktop_la_SOURCES = kdesktop_main.cc
+
+kdesktop_SOURCES = kdesktop_main.cc
include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h
@@ -473,27 +482,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)
+#>+ 1
+kdesktop_la_OBJECTS = kdesktop_main.lo
+libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \
+ $(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_cpp.lo kdesktop_la.all_cc.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)
PROGRAMS = $(bin_PROGRAMS)
-am_kdesktop_OBJECTS = dummy.$(OBJEXT)
+am_kdesktop_OBJECTS = kdesktop_main.$(OBJEXT)
#>- kdesktop_OBJECTS = $(am_kdesktop_OBJECTS)
#>+ 1
-kdesktop_OBJECTS = dummy.$(OBJEXT)
-kdesktop_DEPENDENCIES = kdesktop.la
+kdesktop_OBJECTS = kdesktop_main.$(OBJEXT)
+kdesktop_DEPENDENCIES = libkdesktop_main.la
SCRIPTS = $(bin_SCRIPTS)
@@ -501,25 +515,31 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
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_cpp.P $(DEPDIR)/kdesktop_la.all_cc.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 \
@@ -544,7 +564,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES)
+DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \
+ $(kdesktop_SOURCES)
DATA = $(autostart_DATA) $(menu_DATA)
HEADERS = $(include_HEADERS) $(noinst_HEADERS)
@@ -558,7 +579,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)
+SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -605,6 +626,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)
@@ -666,9 +689,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@
@@ -936,7 +960,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kdesktopbindings.cpp kdiconview.h kdesktop_custom_menu2 DESIGN kdesktop.desktop kdesktop_custom_menu1 kcustommenu.h kdeeject
+KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h kdiconview.h Makefile.in.rej kdesktopbindings.cpp kdeeject
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1111,32 +1135,6 @@ dummy.cc:
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 13
-KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false )
-KDesktopIface_skel.cc: KDesktopIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl
-KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false )
-KScreensaverIface_skel.cc: KScreensaverIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl
-KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false )
-KBackgroundIface_skel.cc: KBackgroundIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
-
-#>+ 3
-lockeng.moc: $(srcdir)/lockeng.h
- $(MOC) $(srcdir)/lockeng.h -o lockeng.moc
-
-#>+ 1
-mocs: lockeng.moc
-#>+ 3
-krootwm.moc: $(srcdir)/krootwm.h
- $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
-
-#>+ 1
-mocs: krootwm.moc
#>+ 3
xautolock.moc: $(srcdir)/xautolock.h
$(MOC) $(srcdir)/xautolock.h -o xautolock.moc
@@ -1144,11 +1142,11 @@ xautolock.moc: $(srcdir)/xautolock.h
#>+ 1
mocs: xautolock.moc
#>+ 3
-pixmapserver.moc: $(srcdir)/pixmapserver.h
- $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
+lockeng.moc: $(srcdir)/lockeng.h
+ $(MOC) $(srcdir)/lockeng.h -o lockeng.moc
#>+ 1
-mocs: pixmapserver.moc
+mocs: lockeng.moc
#>+ 3
bgmanager.moc: $(srcdir)/bgmanager.h
$(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc
@@ -1156,11 +1154,11 @@ bgmanager.moc: $(srcdir)/bgmanager.h
#>+ 1
mocs: bgmanager.moc
#>+ 3
-minicli.moc: $(srcdir)/minicli.h
- $(MOC) $(srcdir)/minicli.h -o minicli.moc
+kdiconview.moc: $(srcdir)/kdiconview.h
+ $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
#>+ 1
-mocs: minicli.moc
+mocs: kdiconview.moc
#>+ 3
desktop.moc: $(srcdir)/desktop.h
$(MOC) $(srcdir)/desktop.h -o desktop.moc
@@ -1168,11 +1166,11 @@ desktop.moc: $(srcdir)/desktop.h
#>+ 1
mocs: desktop.moc
#>+ 3
-kcustommenu.moc: $(srcdir)/kcustommenu.h
- $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
+pixmapserver.moc: $(srcdir)/pixmapserver.h
+ $(MOC) $(srcdir)/pixmapserver.h -o pixmapserver.moc
#>+ 1
-mocs: kcustommenu.moc
+mocs: pixmapserver.moc
#>+ 3
startupid.moc: $(srcdir)/startupid.h
$(MOC) $(srcdir)/startupid.h -o startupid.moc
@@ -1180,14 +1178,40 @@ startupid.moc: $(srcdir)/startupid.h
#>+ 1
mocs: startupid.moc
#>+ 3
-kdiconview.moc: $(srcdir)/kdiconview.h
- $(MOC) $(srcdir)/kdiconview.h -o kdiconview.moc
+kcustommenu.moc: $(srcdir)/kcustommenu.h
+ $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc
#>+ 1
-mocs: kdiconview.moc
+mocs: kcustommenu.moc
+#>+ 3
+minicli.moc: $(srcdir)/minicli.h
+ $(MOC) $(srcdir)/minicli.h -o minicli.moc
+
+#>+ 1
+mocs: minicli.moc
+#>+ 3
+krootwm.moc: $(srcdir)/krootwm.h
+ $(MOC) $(srcdir)/krootwm.h -o krootwm.moc
+
+#>+ 1
+mocs: krootwm.moc
+#>+ 13
+KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; false )
+KDesktopIface_skel.cc: KDesktopIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl
+KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; false )
+KScreensaverIface_skel.cc: KScreensaverIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl
+KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; false )
+KBackgroundIface_skel.cc: KBackgroundIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl
+
#>+ 3
clean-metasources:
- -rm -f lockeng.moc krootwm.moc xautolock.moc pixmapserver.moc bgmanager.moc minicli.moc desktop.moc kcustommenu.moc startupid.moc kdiconview.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:
@@ -1207,45 +1231,45 @@ force-reedit:
#>+ 11
-kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp desktop.moc minicli.moc lockeng.moc kcustommenu.moc krootwm.moc kdiconview.moc startupid.moc xautolock.moc bgmanager.moc pixmapserver.moc
- @echo 'creating kdesktop_la.all_cpp.cpp ...'; \
- rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.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
+ @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \
+ rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \
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; \
+ echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \
done; \
- cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \
- rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files
+ cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \
+ rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files
#>+ 11
-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 desktop.moc minicli.moc lockeng.moc kcustommenu.moc krootwm.moc kdiconview.moc startupid.moc xautolock.moc bgmanager.moc pixmapserver.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; \
+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 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; \
+ 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; \
- cat kdesktop_la.all_cc.final kdesktop_la.all_cc.files > kdesktop_la.all_cc.cc; \
- rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files
+ cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \
+ rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files
#>+ 3
clean-final:
- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc
+ -rm -f libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc
#>+ 2
final:
- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" all-am
+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" install-am
+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1255,23 +1279,23 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 21
-kcustommenu.lo: kcustommenu.moc
-lockeng.lo: lockeng.moc
-minicli.o: minicli.moc
-kdiconview.lo: kdiconview.moc
-desktop.lo: desktop.moc
-xautolock.o: xautolock.moc
-pixmapserver.o: pixmapserver.moc
-desktop.o: desktop.moc
+krootwm.lo: krootwm.moc
minicli.lo: minicli.moc
-bgmanager.o: bgmanager.moc
krootwm.o: krootwm.moc
-xautolock.lo: xautolock.moc
-bgmanager.lo: bgmanager.moc
-krootwm.lo: krootwm.moc
+pixmapserver.lo: pixmapserver.moc
+xautolock.o: xautolock.moc
lockeng.o: lockeng.moc
-kcustommenu.o: kcustommenu.moc
+bgmanager.lo: bgmanager.moc
startupid.o: startupid.moc
+xautolock.lo: xautolock.moc
+desktop.o: desktop.moc
+desktop.lo: desktop.moc
+kcustommenu.o: kcustommenu.moc
+lockeng.lo: lockeng.moc
startupid.lo: startupid.moc
+minicli.o: minicli.moc
+kdiconview.lo: kdiconview.moc
+pixmapserver.o: pixmapserver.moc
+kcustommenu.lo: kcustommenu.moc
kdiconview.o: kdiconview.moc
-pixmapserver.lo: pixmapserver.moc
+bgmanager.o: bgmanager.moc

45
x11/kdebase3/patches/patch-bb
View file

@ -1,35 +1,24 @@
$NetBSD: patch-bb,v 1.2 2002/08/25 19:23:38 jlam Exp $
$NetBSD: patch-bb,v 1.3 2004/02/04 14:25:59 markd Exp $
--- kdesktop/init.cc.orig Thu Oct 11 12:19:53 2001
--- kdesktop/init.cc.orig 2003-02-20 21:51:34.000000000 +1300
+++ kdesktop/init.cc
@@ -76,9 +76,13 @@
{
if (force || !QFile::exists(dir + "/.directory")) {
QCString cmd;
- cmd.sprintf( "cp %s %s/.directory",
+ QCString dest;
+ dest.sprintf( "%s/.directory", QFile::encodeName(dir).data() );
+ cmd.sprintf( "cp %s %s",
QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
- QFile::encodeName(dir).data() );
+ dest.data() );
+ system( cmd );
+ cmd.sprintf( "chmod u+w %s", dest.data() );
system( cmd );
@@ -81,6 +81,9 @@ static void copyDirectoryFile(const QStr
cmd += " ";
cmd += KProcess::quote(dir+"/.directory");
system( QFile::encodeName(cmd) );
+ cmd = "chmod u+w ";
+ cmd += KProcess::quote(dir+"/.directory");
+ system( QFile::encodeName(cmd) );
}
}
@@ -102,10 +106,13 @@
for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) {
QCString cmd = "cp '";
KDesktopFile desk( *it );
+ QCString dest = QFile::encodeName(desktopPath + desk.readName());
cmd += QFile::encodeName(*it);
cmd += "' '";
- cmd += QFile::encodeName(desktopPath + desk.readName());
+ cmd += dest;
cmd += "'";
+ system( cmd );
+ cmd = "chmod u+w '" + dest + "'";
@@ -107,6 +110,9 @@ void copyDesktopLinks()
cmd += " ";
cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName()));
system( cmd );
+ cmd = "chmod u+w ";
+ cmd += QFile::encodeName(KProcess::quote(desktopPath + desk.readName()));
+ system( cmd );
}
}

14
x11/kdebase3/patches/patch-bd
View file

@ -1,14 +0,0 @@
$NetBSD: patch-bd,v 1.4 2003/08/02 19:33:23 mrg Exp $
--- kioslave/imap4/mimehdrline.cc.orig 2002-02-13 04:40:26.000000000 +1100
+++ kioslave/imap4/mimehdrline.cc 2003-08-03 04:34:44.000000000 +1000
@@ -15,7 +15,8 @@
* *
***************************************************************************/
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include <ctype.h>
#include <stdlib.h>
#include <stdio.h>

15
x11/kdebase3/patches/patch-be
View file

@ -1,15 +0,0 @@
$NetBSD: patch-be,v 1.3 2003/01/02 09:12:34 skrll Exp $
--- kdesktop/main.cc.orig Mon Dec 16 02:43:09 2002
+++ kdesktop/main.cc
@@ -75,7 +75,9 @@ static void signalHandler(int sigId)
kapp->quit(); // turn catchable signals into clean shutdown
}
-int main( int argc, char **argv )
+extern "C" int kdemain( int, char ** );
+
+int kdemain( int argc, char **argv )
{
//setup signal handling
signal(SIGTERM, signalHandler);

32
x11/kdebase3/patches/patch-bf
View file

@ -1,32 +0,0 @@
$NetBSD: patch-bf,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/Makefile.am.orig Tue Feb 12 14:32:08 2002
+++ khotkeys/khotkeys/Makefile.am
@@ -2,12 +2,16 @@
bin_PROGRAMS = khotkeys
-lib_LTLIBRARIES = khotkeys.la
+lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la
-khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
-khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
+libkhotkeys_main_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_LDFLAGS = $(all_libraries)
+
+khotkeys_la_SOURCES = khotkeys_main.cpp
+khotkeys_la_LIBADD = libkhotkeys_main.la
khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
-khotkeys_SOURCES = dummy.cpp
-khotkeys_LDADD = khotkeys.la
+khotkeys_SOURCES = khotkeys_main.cpp
+khotkeys_LDADD = libkhotkeys_main.la
khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -20,5 +24,2 @@
METASOURCES = AUTO
-
-dummy.cpp:
- echo > dummy.cpp

226
x11/kdebase3/patches/patch-bg
View file

@ -1,226 +0,0 @@
$NetBSD: patch-bg,v 1.7 2004/01/15 10:15:14 markd Exp $
--- khotkeys/khotkeys/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ khotkeys/khotkeys/Makefile.in
@@ -426,16 +426,20 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
bin_PROGRAMS = khotkeys
-lib_LTLIBRARIES = khotkeys.la
+lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la
-#>- khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
+#>- libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
#>+ 1
-khotkeys_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp
-khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp
+libkhotkeys_main_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_LDFLAGS = $(all_libraries)
+
+khotkeys_la_SOURCES = khotkeys_main.cpp
+khotkeys_la_LIBADD = libkhotkeys_main.la
khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
-khotkeys_SOURCES = dummy.cpp
-khotkeys_LDADD = khotkeys.la
+khotkeys_SOURCES = khotkeys_main.cpp
+khotkeys_LDADD = libkhotkeys_main.la
khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH)
autostart_DATA = khotkeys.desktop
@@ -453,33 +457,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-khotkeys_la_DEPENDENCIES = ../shared/libshared.la
-am_khotkeys_la_OBJECTS = khotkeys.lo main.lo
+khotkeys_la_DEPENDENCIES = libkhotkeys_main.la
+am_khotkeys_la_OBJECTS = khotkeys_main.lo
#>- khotkeys_la_OBJECTS = $(am_khotkeys_la_OBJECTS)
+#>+ 1
+khotkeys_la_OBJECTS = khotkeys_main.lo
+libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la
+am_libkhotkeys_main_la_OBJECTS = khotkeys.lo main.lo
+#>- libkhotkeys_main_la_OBJECTS = $(am_libkhotkeys_main_la_OBJECTS)
#>+ 4
-khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo
-khotkeys_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo
-@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS)
+libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo
+libkhotkeys_main_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo
+@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS)
bin_PROGRAMS = khotkeys$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_khotkeys_OBJECTS = dummy.$(OBJEXT)
+am_khotkeys_OBJECTS = khotkeys_main.$(OBJEXT)
#>- khotkeys_OBJECTS = $(am_khotkeys_OBJECTS)
#>+ 1
-khotkeys_OBJECTS = dummy.$(OBJEXT)
-khotkeys_DEPENDENCIES = khotkeys.la
+khotkeys_OBJECTS = khotkeys_main.$(OBJEXT)
+khotkeys_DEPENDENCIES = libkhotkeys_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/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
+#>+ 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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -499,13 +511,14 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+DIST_SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) \
+ $(khotkeys_SOURCES)
DATA = $(autostart_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) $(khotkeys_SOURCES)
#>- all: all-am
#>+ 1
@@ -552,6 +565,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)
@@ -591,8 +606,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@
distclean-depend:
@@ -714,7 +730,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=khkglobalaccel.h khkglobalaccel.cpp khotkeys.desktop
+KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -849,19 +865,10 @@ uninstall-am: uninstall-autostartDATA un
uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES
-
-dummy.cpp:
- echo > dummy.cpp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 5
-khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
-khotkeys_skel.cpp: khotkeys.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
-
#>+ 3
khotkeys.moc: $(srcdir)/khotkeys.h
$(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc
@@ -874,6 +881,12 @@ khkglobalaccel.moc: $(srcdir)/khkglobala
#>+ 1
mocs: khkglobalaccel.moc
+#>+ 5
+khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
+khotkeys_skel.cpp: khotkeys.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
+
#>+ 3
clean-metasources:
-rm -f khotkeys.moc khkglobalaccel.moc
@@ -894,33 +907,33 @@ force-reedit:
#>+ 11
-khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc
- @echo 'creating khotkeys_la.all_cpp.cpp ...'; \
- rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \
+libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc
+ @echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \
+ rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \
for file in khotkeys.cpp main.cpp khotkeys_skel.cpp ; do \
- echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \
done; \
- cat khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files > khotkeys_la.all_cpp.cpp; \
- rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files
+ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \
+ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f khotkeys_la.all_cpp.cpp
+ -rm -f libkhotkeys_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" install-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -930,7 +943,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-khotkeys.o: khotkeys.moc
-khkglobalaccel.o: khkglobalaccel.moc
-khkglobalaccel.lo: khkglobalaccel.moc
khotkeys.lo: khotkeys.moc
+khkglobalaccel.lo: khkglobalaccel.moc
+khkglobalaccel.o: khkglobalaccel.moc
+khotkeys.o: khotkeys.moc

14
x11/kdebase3/patches/patch-bh
View file

@ -1,14 +0,0 @@
$NetBSD: patch-bh,v 1.4 2003/08/02 19:33:24 mrg Exp $
--- kioslave/imap4/mimeio.cc.orig 2001-03-01 04:53:29.000000000 +1100
+++ kioslave/imap4/mimeio.cc 2003-08-03 04:36:05.000000000 +1000
@@ -15,7 +15,8 @@
* *
***************************************************************************/
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include "mimeio.h"

15
x11/kdebase3/patches/patch-bi
View file

@ -1,15 +0,0 @@
$NetBSD: patch-bi,v 1.2 2002/08/25 19:23:38 jlam Exp $
--- khotkeys/khotkeys/main.cpp.orig Tue Feb 12 14:32:08 2002
+++ khotkeys/khotkeys/main.cpp
@@ -29,7 +29,9 @@
int khotkeys_screen_number = 0;
-int main( int argc, char** argv )
+extern "C" int kdemain( int, char**);
+
+int kdemain( int argc, char** argv )
{ // no need to i18n these, no GUI
{
// multiheaded hotkeys

33
x11/kdebase3/patches/patch-bj
View file

@ -1,33 +0,0 @@
$NetBSD: patch-bj,v 1.3 2003/03/11 13:10:21 markd Exp $
--- kicker/Makefile.am.orig Tue Jul 2 06:53:58 2002
+++ kicker/Makefile.am
@@ -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 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 \
ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO)
-kicker_la_SOURCES = dummy.cpp
-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries)
+libkicker_main_la_SOURCES = dummy.cpp
+libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-kicker_LDADD = kicker.la
-kicker_SOURCES = dummy_la.cpp
+kicker_la_LIBADD = libkicker_main.la
+kicker_la_SOURCES = kicker_main.cpp
+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

163
x11/kdebase3/patches/patch-bk
View file

@ -1,163 +0,0 @@
$NetBSD: patch-bk,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kicker/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ kicker/Makefile.in
@@ -427,19 +427,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 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 \
ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO)
-kicker_la_SOURCES = dummy.cpp
-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries)
+libkicker_main_la_SOURCES = dummy.cpp
+libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
-kicker_LDADD = kicker.la
-kicker_SOURCES = dummy_la.cpp
+kicker_la_LIBADD = libkicker_main.la
+kicker_la_SOURCES = kicker_main.cpp
+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
@@ -457,28 +461,37 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kicker_la_DEPENDENCIES = core/libkicker_core.la \
+kicker_la_DEPENDENCIES = libkicker_main.la
+am_kicker_la_OBJECTS = kicker_main.lo
+#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS)
+#>+ 1
+kicker_la_OBJECTS = kicker_main.lo
+libkicker_main_la_DEPENDENCIES = core/libkicker_core.la \
buttons/libkicker_buttons.la ui/libkicker_ui.la \
share/libkickermain.la
-am_kicker_la_OBJECTS = dummy.lo
-#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS)
+am_libkicker_main_la_OBJECTS = dummy.lo
+#>- libkicker_main_la_OBJECTS = $(am_libkicker_main_la_OBJECTS)
#>+ 1
-kicker_la_OBJECTS = dummy.lo
+libkicker_main_la_OBJECTS = dummy.lo
bin_PROGRAMS = kicker$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kicker_OBJECTS = dummy_la.$(OBJEXT)
+am_kicker_OBJECTS = kicker_main.$(OBJEXT)
#>- kicker_OBJECTS = $(am_kicker_OBJECTS)
#>+ 1
-kicker_OBJECTS = dummy_la.$(OBJEXT)
-kicker_DEPENDENCIES = kicker.la
+kicker_OBJECTS = kicker_main.$(OBJEXT)
+kicker_DEPENDENCIES = libkicker_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/dummy_la.Po
-#>+ 2
-@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)
@@ -498,7 +511,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES)
+DIST_SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) \
+ $(kicker_SOURCES)
DATA = $(autostart_DATA) $(config_DATA) $(update_DATA)
@@ -509,7 +523,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES)
+SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) $(kicker_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -554,11 +568,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)
-@KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
+kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
+#>- libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+#>+ 2
+@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)
@@ -599,7 +615,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_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)
@@ -826,7 +843,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kickerrc.upd panel.desktop kicker-3.1-properSizeSetting.pl kcmkicker.desktop
+KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop Makefile.in.rej kickerrc.upd panel.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -998,17 +1015,17 @@ dummy.cpp dummy_la.cpp:
.NOEXPORT:
#>+ 8
-kicker.la.closure: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES)
- @echo "int main() {return 0;}" > kicker_la_closure.cpp
- @$(LTCXXCOMPILE) -c kicker_la_closure.cpp
- $(CXXLINK) kicker_la_closure.lo $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS)
- @rm -f kicker_la_closure.* kicker.la.closure
- @echo "timestamp" > kicker.la.closure
+libkicker_main.la.closure: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES)
+ @echo "int main() {return 0;}" > libkicker_main_la_closure.cpp
+ @$(LTCXXCOMPILE) -c libkicker_main_la_closure.cpp
+ $(CXXLINK) libkicker_main_la_closure.lo $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS)
+ @rm -f libkicker_main_la_closure.* libkicker_main.la.closure
+ @echo "timestamp" > libkicker_main.la.closure
#>+ 3
clean-closures:
- -rm -f kicker.la.closure
+ -rm -f libkicker_main.la.closure
#>+ 2
docs-am:

13
x11/kdebase3/patches/patch-bl
View file

@ -1,13 +0,0 @@
$NetBSD: patch-bl,v 1.3 2003/03/11 13:10:21 markd Exp $
--- kicker/applets/launcher/Makefile.am.orig Fri Jan 3 17:42:28 2003
+++ kicker/applets/launcher/Makefile.am
@@ -14,7 +14,7 @@ lnk_DATA = quicklauncher.desktop
EXTRA_DIST = $(lnk_DATA)
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

80
x11/kdebase3/patches/patch-bm
View file

@ -1,80 +0,0 @@
$NetBSD: patch-bm,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kicker/applets/launcher/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ kicker/applets/launcher/Makefile.in
@@ -438,7 +438,7 @@ lnk_DATA = quicklauncher.desktop
EXTRA_DIST = $(lnk_DATA)
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
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-launcher_panelapplet_la_DEPENDENCIES = ../../kicker.la
+launcher_panelapplet_la_DEPENDENCIES = ../../libkicker_main.la
am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \
quickaddappsmenu.lo
#>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS)
@@ -675,7 +675,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=quicklauncher.desktop
+KDE_DIST=Makefile.in.rej quicklauncher.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -836,20 +836,20 @@ quickaddappsmenu.moc: $(srcdir)/quickadd
#>+ 1
mocs: quickaddappsmenu.moc
#>+ 3
-quickbutton.moc: $(srcdir)/quickbutton.h
- $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
-
-#>+ 1
-mocs: quickbutton.moc
-#>+ 3
quicklauncher.moc: $(srcdir)/quicklauncher.h
$(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc
#>+ 1
mocs: quicklauncher.moc
#>+ 3
+quickbutton.moc: $(srcdir)/quickbutton.h
+ $(MOC) $(srcdir)/quickbutton.h -o quickbutton.moc
+
+#>+ 1
+mocs: quickbutton.moc
+#>+ 3
clean-metasources:
- -rm -f quickaddappsmenu.moc quickbutton.moc quicklauncher.moc
+ -rm -f quickaddappsmenu.moc quicklauncher.moc quickbutton.moc
#>+ 3
clean-closures:
@@ -866,7 +866,7 @@ force-reedit:
#>+ 11
-launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quickbutton.moc quickaddappsmenu.moc quicklauncher.moc
+launcher_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/quicklauncher.cpp $(srcdir)/quickbutton.cpp $(srcdir)/quickaddappsmenu.cpp quicklauncher.moc quickaddappsmenu.moc quickbutton.moc
@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; \
@@ -902,9 +902,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
-quicklauncher.lo: quicklauncher.moc
quicklauncher.o: quicklauncher.moc
-quickbutton.o: quickbutton.moc
quickaddappsmenu.lo: quickaddappsmenu.moc
+quickbutton.o: quickbutton.moc
quickaddappsmenu.o: quickaddappsmenu.moc
+quicklauncher.lo: quicklauncher.moc
quickbutton.lo: quickbutton.moc

15
x11/kdebase3/patches/patch-bn
View file

@ -1,15 +0,0 @@
$NetBSD: patch-bn,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/core/main.cpp.orig Wed Feb 27 16:10:06 2002
+++ kicker/core/main.cpp
@@ -59,7 +59,9 @@
QApplication::exit();
}
-int main( int argc, char ** argv )
+extern "C" int kdemain(int, char **);
+
+int kdemain( int argc, char ** argv )
{
{
QCString multiHead = getenv("KDE_MULTIHEAD");

13
x11/kdebase3/patches/patch-bo
View file

@ -1,13 +0,0 @@
$NetBSD: patch-bo,v 1.3 2003/03/11 13:10:22 markd Exp $
--- kicker/extensions/childpanel/Makefile.am.orig Fri Jan 3 17:42:34 2003
+++ kicker/extensions/childpanel/Makefile.am
@@ -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 = -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

31
x11/kdebase3/patches/patch-bp
View file

@ -1,31 +0,0 @@
$NetBSD: patch-bp,v 1.5 2004/01/15 10:15:14 markd Exp $
--- kicker/extensions/childpanel/Makefile.in.orig 2003-12-17 14:22:07.000000000 +1300
+++ kicker/extensions/childpanel/Makefile.in
@@ -431,7 +431,7 @@ kde_module_LTLIBRARIES = childpanel_pane
childpanel_panelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp
#>- childpanel_panelextension_la_METASOURCES = AUTO
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
@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-childpanel_panelextension_la_DEPENDENCIES = ../../kicker.la
+childpanel_panelextension_la_DEPENDENCIES = ../../libkicker_main.la
am_childpanel_panelextension_la_OBJECTS = childpanelextension.lo
#>- childpanel_panelextension_la_OBJECTS = \
#>- $(am_childpanel_panelextension_la_OBJECTS)
@@ -666,7 +666,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=childpanelextension.desktop
+KDE_DIST=Makefile.in.rej childpanelextension.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

59
x11/kdebase3/patches/patch-br
View file

@ -1,59 +0,0 @@
$NetBSD: patch-br,v 1.2 2002/08/25 19:23:39 jlam Exp $
--- kicker/proxy/Makefile.am.orig Wed Feb 13 10:18:52 2002
+++ kicker/proxy/Makefile.am
@@ -1,26 +1,33 @@
INCLUDES = -I$(srcdir)/../share $(all_includes)
-CLEANFILES = dummy.cpp
-
bin_PROGRAMS = appletproxy extensionproxy
-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
+lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \
+ libextensionproxy_main.la extensionproxy.la
+
+libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libappletproxy_main_la_SOURCES = appletproxy.cpp
+libappletproxy_main_la_METASOURCES = appletproxy.moc
+libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-appletproxy_la_SOURCES = appletproxy.cpp
-appletproxy_la_METASOURCES = appletproxy.moc
+appletproxy_la_LIBADD = libappletproxy_main.la
+appletproxy_la_SOURCES = appletproxy_main.cpp
appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-appletproxy_LDADD = appletproxy.la
-appletproxy_SOURCES = dummy.cpp
+appletproxy_LDADD = libappletproxy_main.la
+appletproxy_SOURCES = appletproxy_main.cpp
appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-extensionproxy_la_SOURCES = extensionproxy.cpp
-extensionproxy_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libextensionproxy_main_la_SOURCES = extensionproxy.cpp
+libextensionproxy_main_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+extensionproxy_la_LIBADD = libextensionproxy_main.la
+extensionproxy_la_SOURCES = extensionproxy_main.cpp
extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-extensionproxy_LDADD = extensionproxy.la
-extensionproxy_SOURCES = dummy.cpp
+extensionproxy_LDADD = libextensionproxy_main.la
+extensionproxy_SOURCES = extensionproxy_main.cpp
extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = appletproxy.h extensionproxy.h
@@ -28,7 +35,3 @@
messages:
$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
$(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot
-
-dummy.cpp:
- echo > dummy.cpp
-

210
x11/kdebase3/patches/patch-bs
View file

@ -1,210 +0,0 @@
$NetBSD: patch-bs,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kicker/proxy/Makefile.in.orig 2004-01-02 14:05:59.000000000 +1300
+++ kicker/proxy/Makefile.in
@@ -424,27 +424,35 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
INCLUDES = -I$(srcdir)/../share $(all_includes)
-CLEANFILES = dummy.cpp
-
bin_PROGRAMS = appletproxy extensionproxy
-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
+lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \
+ libextensionproxy_main.la extensionproxy.la
+
-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-appletproxy_la_SOURCES = appletproxy.cpp
-#>- appletproxy_la_METASOURCES = appletproxy.moc
+libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libappletproxy_main_la_SOURCES = appletproxy.cpp
+#>- libappletproxy_main_la_METASOURCES = appletproxy.moc
+libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+appletproxy_la_LIBADD = libappletproxy_main.la
+appletproxy_la_SOURCES = appletproxy_main.cpp
appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-appletproxy_LDADD = appletproxy.la
-appletproxy_SOURCES = dummy.cpp
+appletproxy_LDADD = libappletproxy_main.la
+appletproxy_SOURCES = appletproxy_main.cpp
appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-extensionproxy_la_SOURCES = extensionproxy.cpp
-#>- extensionproxy_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libextensionproxy_main_la_SOURCES = extensionproxy.cpp
+#>- libextensionproxy_main_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+extensionproxy_la_LIBADD = libextensionproxy_main.la
+extensionproxy_la_SOURCES = extensionproxy_main.cpp
extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-extensionproxy_LDADD = extensionproxy.la
-extensionproxy_SOURCES = dummy.cpp
+extensionproxy_LDADD = libextensionproxy_main.la
+extensionproxy_SOURCES = extensionproxy_main.cpp
extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = appletproxy.h extensionproxy.h
@@ -455,38 +463,57 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-appletproxy_la_DEPENDENCIES = ../share/libkickermain.la
-am_appletproxy_la_OBJECTS = appletproxy.lo
+appletproxy_la_DEPENDENCIES = libappletproxy_main.la
+am_appletproxy_la_OBJECTS = appletproxy_main.lo
#>- appletproxy_la_OBJECTS = $(am_appletproxy_la_OBJECTS)
#>+ 1
-appletproxy_la_OBJECTS = appletproxy.lo
-extensionproxy_la_DEPENDENCIES = ../share/libkickermain.la
-am_extensionproxy_la_OBJECTS = extensionproxy.lo
+appletproxy_la_OBJECTS = appletproxy_main.lo
+extensionproxy_la_DEPENDENCIES = libextensionproxy_main.la
+am_extensionproxy_la_OBJECTS = extensionproxy_main.lo
#>- extensionproxy_la_OBJECTS = $(am_extensionproxy_la_OBJECTS)
#>+ 1
-extensionproxy_la_OBJECTS = extensionproxy.lo
+extensionproxy_la_OBJECTS = extensionproxy_main.lo
+libappletproxy_main_la_DEPENDENCIES = ../share/libkickermain.la
+am_libappletproxy_main_la_OBJECTS = appletproxy.lo
+#>- libappletproxy_main_la_OBJECTS = $(am_libappletproxy_main_la_OBJECTS)
+#>+ 1
+libappletproxy_main_la_OBJECTS = appletproxy.lo
+libextensionproxy_main_la_DEPENDENCIES = ../share/libkickermain.la
+am_libextensionproxy_main_la_OBJECTS = extensionproxy.lo
+#>- libextensionproxy_main_la_OBJECTS = \
+#>- $(am_libextensionproxy_main_la_OBJECTS)
+#>+ 1
+libextensionproxy_main_la_OBJECTS = extensionproxy.lo
bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_appletproxy_OBJECTS = dummy.$(OBJEXT)
+am_appletproxy_OBJECTS = appletproxy_main.$(OBJEXT)
#>- appletproxy_OBJECTS = $(am_appletproxy_OBJECTS)
#>+ 1
-appletproxy_OBJECTS = dummy.$(OBJEXT)
-appletproxy_DEPENDENCIES = appletproxy.la
-am_extensionproxy_OBJECTS = dummy.$(OBJEXT)
+appletproxy_OBJECTS = appletproxy_main.$(OBJEXT)
+appletproxy_DEPENDENCIES = libappletproxy_main.la
+am_extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT)
#>- extensionproxy_OBJECTS = $(am_extensionproxy_OBJECTS)
#>+ 1
-extensionproxy_OBJECTS = dummy.$(OBJEXT)
-extensionproxy_DEPENDENCIES = extensionproxy.la
+extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT)
+extensionproxy_DEPENDENCIES = libextensionproxy_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/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
+#>+ 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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -507,11 +534,13 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
- $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+ $(libappletproxy_main_la_SOURCES) \
+ $(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) \
+ $(extensionproxy_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(libappletproxy_main_la_SOURCES) $(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
#>- all: all-am
#>+ 1
@@ -560,6 +589,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)
+libappletproxy_main.la: $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_DEPENDENCIES)
+ $(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)
@@ -603,8 +636,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@
distclean-depend:
-rm -rf ./$(DEPDIR)
@@ -705,7 +741,12 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 4
+KDE_DIST=Makefile.in.rej
+
+DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
top_distdir = ../..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
@@ -762,7 +803,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -841,9 +881,6 @@ uninstall-am: uninstall-binPROGRAMS unin
messages:
$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
$(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.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:
@@ -895,7 +932,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-appletproxy.lo: appletproxy.moc
-extensionproxy.lo: extensionproxy.moc
appletproxy.o: appletproxy.moc
+appletproxy.lo: appletproxy.moc
extensionproxy.o: extensionproxy.moc
+extensionproxy.lo: extensionproxy.moc

15
x11/kdebase3/patches/patch-bt
View file

@ -1,15 +0,0 @@
$NetBSD: patch-bt,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/appletproxy.cpp.orig Wed May 8 19:21:58 2002
+++ kicker/proxy/appletproxy.cpp
@@ -67,7 +67,9 @@
{ 0, 0, 0}
};
-int main( int argc, char ** argv )
+extern "C" int kdemain( int, char **);
+
+int kdemain( int argc, char ** argv )
{
KAboutData aboutData( "appletproxy", I18N_NOOP("Panel applet proxy.")
, "v0.1.0"

15
x11/kdebase3/patches/patch-bv
View file

@ -1,15 +0,0 @@
$NetBSD: patch-bv,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- kicker/proxy/extensionproxy.cpp.orig Wed May 8 19:21:58 2002
+++ kicker/proxy/extensionproxy.cpp
@@ -54,7 +54,9 @@
{ 0, 0, 0}
};
-int main( int argc, char ** argv )
+extern "C" int kdemain( int, char **);
+
+int kdemain( int argc, char ** argv )
{
KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.")
, "v0.1.0"

8
x11/kdebase3/patches/patch-bx
View file

@ -1,9 +1,9 @@
$NetBSD: patch-bx,v 1.3 2003/07/08 14:05:07 markd Exp $
$NetBSD: patch-bx,v 1.4 2004/02/04 14:25:59 markd Exp $
--- kioslave/info/kde-info2html.conf.orig Wed Aug 2 11:07:17 2000
--- kioslave/info/kde-info2html.conf.orig 2003-08-15 02:43:26.000000000 +1200
+++ kioslave/info/kde-info2html.conf
@@ -22,6 +22,7 @@
"/usr/share/info",
@@ -31,6 +31,7 @@ our @INFODIR = (
"/usr/info",
"/usr/lib/info",
# "/usr/lib/teTeX/info",
+ "@LOCALBASE@/info",

42
x11/kdebase3/patches/patch-by
View file

@ -1,42 +0,0 @@
$NetBSD: patch-by,v 1.3 2003/03/11 13:10:22 markd Exp $
--- klipper/Makefile.am.orig Tue Jan 14 12:39:15 2003
+++ klipper/Makefile.am
@@ -1,26 +1,27 @@
INCLUDES= $(all_includes)
bin_PROGRAMS = klipper
-lib_LTLIBRARIES = klipper.la
+lib_LTLIBRARIES = libklipper_main.la klipper.la
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
-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
-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
-klipper_SOURCES = dummy.cpp
+klipper_LDADD = libklipper_main.la
+klipper_SOURCES = klipper_main.cpp
klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-klipper_panelapplet_la_LIBADD = klipper.la
+klipper_panelapplet_la_LIBADD = libklipper_main.la
klipper_panelapplet_la_SOURCES = applet.cpp applet.skel
klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version
-
appsdir = $(kde_appsdir)/Utilities
apps_DATA = klipper.desktop

313
x11/kdebase3/patches/patch-bz
View file

@ -1,313 +0,0 @@
$NetBSD: patch-bz,v 1.9 2004/01/15 10:15:14 markd Exp $
--- klipper/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300
+++ klipper/Makefile.in
@@ -425,27 +425,29 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = klipper
-lib_LTLIBRARIES = klipper.la
+lib_LTLIBRARIES = libklipper_main.la klipper.la
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
#>+ 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
-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
-klipper_SOURCES = dummy.cpp
+klipper_LDADD = libklipper_main.la
+klipper_SOURCES = klipper_main.cpp
klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-klipper_panelapplet_la_LIBADD = klipper.la
+klipper_panelapplet_la_LIBADD = libklipper_main.la
#>- klipper_panelapplet_la_SOURCES = applet.cpp applet.skel
#>+ 1
klipper_panelapplet_la_SOURCES=applet.cpp applet_skel.cpp
@@ -472,17 +474,12 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-klipper_la_DEPENDENCIES =
-am_klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
- configdialog.lo
+klipper_la_DEPENDENCIES = libklipper_main.la
+am_klipper_la_OBJECTS = klipper_main.lo
#>- klipper_la_OBJECTS = $(am_klipper_la_OBJECTS)
-#>+ 5
-klipper_la_final_OBJECTS = klipper_la.all_cpp.lo
-klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
- configdialog.lo toplevel_skel.lo
-@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS)
-klipper_panelapplet_la_DEPENDENCIES = klipper.la
+#>+ 1
+klipper_la_OBJECTS = klipper_main.lo
+klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la
am_klipper_panelapplet_la_OBJECTS = applet.lo
#>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS)
#>+ 4
@@ -490,31 +487,44 @@ 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
+#>- libklipper_main_la_OBJECTS = $(am_libklipper_main_la_OBJECTS)
+#>+ 5
+libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo
+libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
+ configdialog.lo toplevel_skel.lo
+@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS)
bin_PROGRAMS = klipper$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_klipper_OBJECTS = dummy.$(OBJEXT)
+am_klipper_OBJECTS = klipper_main.$(OBJEXT)
#>- klipper_OBJECTS = $(am_klipper_OBJECTS)
#>+ 1
-klipper_OBJECTS = dummy.$(OBJEXT)
-klipper_DEPENDENCIES = klipper.la
+klipper_OBJECTS = klipper_main.$(OBJEXT)
+klipper_DEPENDENCIES = libklipper_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/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) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -535,11 +545,11 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
- $(klipper_SOURCES)
+ $(libklipper_main_la_SOURCES) $(klipper_SOURCES)
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)
+SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_main_la_SOURCES) $(klipper_SOURCES)
#>- all: all-am
#>+ 1
@@ -616,6 +626,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)
@@ -657,7 +669,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@
@@ -835,7 +848,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=klipperrc.upd cr64-app-klipper.png urlgrabber.h cr22-app-klipper.png toplevel.h configdialog.h cr16-app-klipper.png klipper-kde31.sh cr128-app-klipper.png klippershortcuts.upd klipper.desktop applet.h cr32-app-klipper.png klipperrc.desktop cr48-app-klipper.png klipper-1-2.pl klipperbindings.cpp version.h
+KDE_DIST=applet.h cr128-app-klipper.png cr22-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 Makefile.in.rej klipperrc.upd urlgrabber.h klipperrc.desktop klippershortcuts.upd
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -895,7 +908,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -1005,6 +1017,12 @@ dummy.cpp:
.NOEXPORT:
#>+ 5
+applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; 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 ; false )
toplevel_skel.cpp: toplevel.kidl
@@ -1017,11 +1035,11 @@ urlgrabber.moc: $(srcdir)/urlgrabber.h
#>+ 1
mocs: urlgrabber.moc
#>+ 3
-configdialog.moc: $(srcdir)/configdialog.h
- $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
+toplevel.moc: $(srcdir)/toplevel.h
+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
#>+ 1
-mocs: configdialog.moc
+mocs: toplevel.moc
#>+ 3
applet.moc: $(srcdir)/applet.h
$(MOC) $(srcdir)/applet.h -o applet.moc
@@ -1029,26 +1047,20 @@ applet.moc: $(srcdir)/applet.h
#>+ 1
mocs: applet.moc
#>+ 3
-toplevel.moc: $(srcdir)/toplevel.h
- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+configdialog.moc: $(srcdir)/configdialog.h
+ $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
#>+ 1
-mocs: toplevel.moc
-#>+ 5
-applet.kidl: $(srcdir)/applet.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/applet.h > applet.kidl || ( rm -f applet.kidl ; false )
-applet_skel.cpp: applet.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub applet.kidl
-
+mocs: configdialog.moc
#>+ 3
clean-metasources:
- -rm -f urlgrabber.moc configdialog.moc applet.moc toplevel.moc
+ -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc
#>+ 5
clean-idl:
-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:
@@ -1084,18 +1096,6 @@ force-reedit:
#>+ 11
-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc configdialog.moc toplevel.moc
- @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; \
@@ -1107,22 +1107,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\"" >> libklipper_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \
+ 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 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)" 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)" 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)" 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)" 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
@@ -1132,11 +1144,11 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 9
-applet.lo: applet.moc
-urlgrabber.lo: urlgrabber.moc
urlgrabber.o: urlgrabber.moc
-toplevel.lo: toplevel.moc
-configdialog.lo: configdialog.moc
toplevel.o: toplevel.moc
+urlgrabber.lo: urlgrabber.moc
+toplevel.lo: toplevel.moc
+applet.lo: applet.moc
applet.o: applet.moc
+configdialog.lo: configdialog.moc
configdialog.o: configdialog.moc

15
x11/kdebase3/patches/patch-cb
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cb,v 1.2 2002/08/25 19:23:40 jlam Exp $
--- klipper/main.cpp.orig Wed Feb 20 21:50:04 2002
+++ klipper/main.cpp
@@ -23,7 +23,9 @@
static const char *description =
I18N_NOOP("KDE Cut & Paste history utility");
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[]);
+
+int kdemain(int argc, char *argv[])
{
KAboutData aboutData("klipper", I18N_NOOP("Klipper"),
klipper_version, description, KAboutData::License_Artistic,

30
x11/kdebase3/patches/patch-cc
View file

@ -1,30 +0,0 @@
$NetBSD: patch-cc,v 1.3 2003/03/11 13:10:23 markd Exp $
--- kmenuedit/Makefile.am.orig Mon Sep 16 09:08:52 2002
+++ kmenuedit/Makefile.am
@@ -1,17 +1,19 @@
INCLUDES = $(all_includes)
bin_PROGRAMS = kmenuedit
-lib_LTLIBRARIES = kmenuedit.la
+lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la
-CLEANFILES = dummy.cpp
+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_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
-kmenuedit_SOURCES = dummy.cpp
-kmenuedit_LDADD = kmenuedit.la
+kmenuedit_SOURCES = kmenuedit_main.cpp
+kmenuedit_LDADD = libkmenuedit_main.la
kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h

279
x11/kdebase3/patches/patch-cd
View file

@ -1,279 +0,0 @@
$NetBSD: patch-cd,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kmenuedit/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300
+++ kmenuedit/Makefile.in
@@ -425,17 +425,19 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kmenuedit
-lib_LTLIBRARIES = kmenuedit.la
+lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la
-CLEANFILES = dummy.cpp
+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_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
-kmenuedit_SOURCES = dummy.cpp
-kmenuedit_LDADD = kmenuedit.la
+kmenuedit_SOURCES = kmenuedit_main.cpp
+kmenuedit_LDADD = libkmenuedit_main.la
kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h
@@ -460,45 +462,55 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kmenuedit_la_DEPENDENCIES =
-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)
-#>+ 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 = basictab.lo treeview.lo \
+ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \
+ khotkeys.lo
+#>- libkmenuedit_main_la_OBJECTS = $(am_libkmenuedit_main_la_OBJECTS)
+#>+ 6
+libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo
+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)
PROGRAMS = $(bin_PROGRAMS)
-am_kmenuedit_OBJECTS = dummy.$(OBJEXT)
+am_kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT)
#>- kmenuedit_OBJECTS = $(am_kmenuedit_OBJECTS)
#>+ 1
-kmenuedit_OBJECTS = dummy.$(OBJEXT)
-kmenuedit_DEPENDENCIES = kmenuedit.la
+kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT)
+kmenuedit_DEPENDENCIES = libkmenuedit_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/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)/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
@@ -520,7 +532,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
+DIST_SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) \
+ $(kmenuedit_SOURCES)
DATA = $(apps_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
@@ -533,7 +546,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
+SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) $(kmenuedit_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -580,6 +593,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)
@@ -621,9 +636,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@
@@ -835,7 +851,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=cr48-app-kmenuedit.png cr16-app-kmenuedit.png kmenueditui.rc uninstall.desktop cr32-app-kmenuedit.png kmenuedit.desktop
+KDE_DIST=cr32-app-kmenuedit.png cr16-app-kmenuedit.png cr48-app-kmenuedit.png kmenuedit.desktop Makefile.in.rej kmenueditui.rc uninstall.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -909,7 +925,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -1014,11 +1029,11 @@ dummy.cpp:
.NOEXPORT:
#>+ 3
-desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h
- $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc
+basictab.moc: $(srcdir)/basictab.h
+ $(MOC) $(srcdir)/basictab.h -o basictab.moc
#>+ 1
-mocs: desktopfileeditor.moc
+mocs: basictab.moc
#>+ 3
treeview.moc: $(srcdir)/treeview.h
$(MOC) $(srcdir)/treeview.h -o treeview.moc
@@ -1026,18 +1041,18 @@ treeview.moc: $(srcdir)/treeview.h
#>+ 1
mocs: treeview.moc
#>+ 3
-basictab.moc: $(srcdir)/basictab.h
- $(MOC) $(srcdir)/basictab.h -o basictab.moc
-
-#>+ 1
-mocs: basictab.moc
-#>+ 3
menueditview.moc: $(srcdir)/menueditview.h
$(MOC) $(srcdir)/menueditview.h -o menueditview.moc
#>+ 1
mocs: menueditview.moc
#>+ 3
+desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h
+ $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc
+
+#>+ 1
+mocs: desktopfileeditor.moc
+#>+ 3
kmenuedit.moc: $(srcdir)/kmenuedit.h
$(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc
@@ -1045,7 +1060,7 @@ kmenuedit.moc: $(srcdir)/kmenuedit.h
mocs: kmenuedit.moc
#>+ 3
clean-metasources:
- -rm -f desktopfileeditor.moc treeview.moc basictab.moc menueditview.moc kmenuedit.moc
+ -rm -f basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc
#>+ 2
docs-am:
@@ -1072,33 +1087,33 @@ force-reedit:
#>+ 11
-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 desktopfileeditor.moc treeview.moc kmenuedit.moc menueditview.moc basictab.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)/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 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; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \
done; \
- cat kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files > kmenuedit_la.all_cpp.cpp; \
- rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files
+ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \
+ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kmenuedit_la.all_cpp.cpp
+ -rm -f libkmenuedit_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1108,13 +1123,13 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 11
-desktopfileeditor.lo: desktopfileeditor.moc
+basictab.lo: basictab.moc
menueditview.lo: menueditview.moc
+menueditview.o: menueditview.moc
kmenuedit.lo: kmenuedit.moc
+treeview.o: treeview.moc
+desktopfileeditor.lo: desktopfileeditor.moc
kmenuedit.o: kmenuedit.moc
-desktopfileeditor.o: desktopfileeditor.moc
-treeview.lo: treeview.moc
-basictab.lo: basictab.moc
basictab.o: basictab.moc
-treeview.o: treeview.moc
-menueditview.o: menueditview.moc
+treeview.lo: treeview.moc
+desktopfileeditor.o: desktopfileeditor.moc

15
x11/kdebase3/patches/patch-cf
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cf,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- kmenuedit/main.cpp.orig Mon Feb 11 20:09:39 2002
+++ kmenuedit/main.cpp
@@ -31,7 +31,9 @@
static const char *description = I18N_NOOP("KDE Menu editor");
static const char *version = "0.4";
-int main( int argc, char **argv )
+extern "C" int kdemain( int argc, char **argv );
+
+int kdemain( int argc, char **argv )
{
KAboutData aboutData("kmenuedit", I18N_NOOP("KDE Menu Editor"),
version, description, KAboutData::License_GPL,

51
x11/kdebase3/patches/patch-cg
View file

@ -1,51 +0,0 @@
$NetBSD: patch-cg,v 1.3 2003/03/11 13:10:23 markd Exp $
--- konqueror/Makefile.am.orig Fri Jan 17 07:40:04 2003
+++ konqueror/Makefile.am
@@ -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
-lib_LTLIBRARIES = konqueror.la
+lib_LTLIBRARIES = libkonqueror_main.la konqueror.la
konqdatadir = $(kde_datadir)/konqueror
konqdata_DATA = konqueror.rc
@@ -22,7 +22,7 @@ include_HEADERS = KonquerorIface.h
bin_PROGRAMS = konqueror
-konqueror_la_SOURCES = konq_main.cc \
+libkonqueror_main_la_SOURCES = konq_main.cc \
KonquerorIface.cc KonquerorIface.skel \
KonqMainWindowIface.cc KonqMainWindowIface.skel \
KonqViewIface.cc KonqViewIface.skel \
@@ -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
+
+konqueror_la_SOURCES = konqueror_main.cc
konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konqueror_la_LIBADD = ../libkonq/libkonq.la
+konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la
-konqueror_SOURCES = dummy.cc
-konqueror_LDADD = konqueror.la
+konqueror_SOURCES = konqueror_main.cc
+konqueror_LDADD = libkonqueror_main.la
konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries)
# Hmm, this experiment of a static konq failed, don't trust it...
@@ -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
-
-dummy.cc:
- echo > dummy.cc
messages: rc.cpp
$(EXTRACTRC) *.rc */*.rc >> rc.cpp

447
x11/kdebase3/patches/patch-ch
View file

@ -1,447 +0,0 @@
$NetBSD: patch-ch,v 1.7 2004/01/15 10:15:14 markd Exp $
--- konqueror/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300
+++ konqueror/Makefile.in
@@ -429,7 +429,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
-lib_LTLIBRARIES = konqueror.la
+lib_LTLIBRARIES = libkonqueror_main.la konqueror.la
konqdatadir = $(kde_datadir)/konqueror
konqdata_DATA = konqueror.rc
@@ -446,7 +446,7 @@ include_HEADERS = KonquerorIface.h
bin_PROGRAMS = konqueror
-#>- konqueror_la_SOURCES = konq_main.cc \
+#>- libkonqueror_main_la_SOURCES = konq_main.cc \
#>- KonquerorIface.cc KonquerorIface.skel \
#>- KonqMainWindowIface.cc KonqMainWindowIface.skel \
#>- KonqViewIface.cc KonqViewIface.skel \
@@ -461,7 +461,7 @@ bin_PROGRAMS = konqueror
#>- konq_browseriface.cc \
#>- delayedinitializer.cc
#>+ 14
-konqueror_la_SOURCES=konq_main.cc \
+libkonqueror_main_la_SOURCES=konq_main.cc \
KonquerorIface.cc \
KonqMainWindowIface.cc \
KonqViewIface.cc \
@@ -484,11 +484,15 @@ noinst_HEADERS = KonqMainWindowIface.h K
konq_view.h konq_viewmgr.h version.h
+libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
+libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la
+
+konqueror_la_SOURCES = konqueror_main.cc
konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konqueror_la_LIBADD = ../libkonq/libkonq.la
+konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la
-konqueror_SOURCES = dummy.cc
-konqueror_LDADD = konqueror.la
+konqueror_SOURCES = konqueror_main.cc
+konqueror_LDADD = libkonqueror_main.la
konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries)
data_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop
@@ -514,32 +518,37 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la
-am_konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \
+konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la
+am_konqueror_la_OBJECTS = konqueror_main.lo
+#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS)
+#>+ 1
+konqueror_la_OBJECTS = konqueror_main.lo
+libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la
+am_libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \
KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \
konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \
konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \
konq_factory.lo konq_combo.lo konq_browseriface.lo \
delayedinitializer.lo
-#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS)
+#>- libkonqueror_main_la_OBJECTS = $(am_libkonqueror_main_la_OBJECTS)
#>+ 9
-konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo
-konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \
+libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo
+libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \
KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \
konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \
konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \
konq_factory.lo konq_combo.lo konq_browseriface.lo \
delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo
-@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS)
bin_PROGRAMS = konqueror$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_konqueror_OBJECTS = dummy.$(OBJEXT)
+am_konqueror_OBJECTS = konqueror_main.$(OBJEXT)
#>- konqueror_OBJECTS = $(am_konqueror_OBJECTS)
#>+ 1
-konqueror_OBJECTS = dummy.$(OBJEXT)
-konqueror_DEPENDENCIES = konqueror.la
+konqueror_OBJECTS = konqueror_main.$(OBJEXT)
+konqueror_DEPENDENCIES = libkonqueror_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@@ -548,7 +557,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 \
@@ -559,13 +568,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 \
@@ -576,12 +587,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 \
@@ -592,7 +605,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)
@@ -612,7 +627,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES)
+DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \
+ $(konqueror_SOURCES)
DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \
$(data5_DATA) $(kde_apps_DATA) $(kde_services_DATA) \
$(konqdata_DATA)
@@ -628,7 +644,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
@@ -675,6 +691,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)
@@ -718,7 +736,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@
@@ -732,6 +749,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)
@@ -1066,7 +1085,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kfmclient_html.desktop kfmclient.desktop IDEAS kfmclient_dir.desktop profile_filepreview.desktop uninstall.desktop konqueror_config.desktop DESIGN konqueror.rc profile_midnightcommander.desktop profile_webbrowsing.desktop profile_filemanagement.desktop Home.desktop konqbrowser.desktop konquerorsu.desktop konqfilemgr.desktop kfmclient_war.desktop convert_kdelnk.sh konqueror.desktop DESIGN_config
+KDE_DIST=DESIGN konqfilemgr.desktop convert_kdelnk.sh DESIGN_config profile_midnightcommander.desktop konqueror_config.desktop konqueror.rc konqbrowser.desktop profile_filemanagement.desktop Makefile.in.rej kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop uninstall.desktop IDEAS konqueror.desktop profile_filepreview.desktop Home.desktop konquerorsu.desktop kfmclient_war.desktop profile_webbrowsing.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1248,9 +1267,6 @@ uninstall-info: uninstall-info-recursive
#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la
#konqueror_static_LDFLAGS = $(all_libraries) -static
-dummy.cc:
- echo > dummy.cc
-
messages: rc.cpp
$(EXTRACTRC) *.rc */*.rc >> rc.cpp
$(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp
@@ -1271,32 +1287,24 @@ uninstall-local:
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 13
-KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
-KonquerorIface_skel.cc: KonquerorIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl
-KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false )
-KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl
-KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false )
-KonqViewIface_skel.cc: KonqViewIface.kidl
- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl
+#>+ 3
+konq_view.moc: $(srcdir)/konq_view.h
+ $(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+#>+ 1
+mocs: konq_view.moc
#>+ 3
-konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
- $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
+konq_browseriface.moc: $(srcdir)/konq_browseriface.h
+ $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
#>+ 1
-mocs: konq_viewmgr.moc
+mocs: konq_browseriface.moc
#>+ 3
-konq_view.moc: $(srcdir)/konq_view.h
- $(MOC) $(srcdir)/konq_view.h -o konq_view.moc
+konq_misc.moc: $(srcdir)/konq_misc.h
+ $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
#>+ 1
-mocs: konq_view.moc
+mocs: konq_misc.moc
#>+ 3
delayedinitializer.moc: $(srcdir)/delayedinitializer.h
$(MOC) $(srcdir)/delayedinitializer.h -o delayedinitializer.moc
@@ -1304,23 +1312,23 @@ delayedinitializer.moc: $(srcdir)/delaye
#>+ 1
mocs: delayedinitializer.moc
#>+ 3
-konq_combo.moc: $(srcdir)/konq_combo.h
- $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc
-
-#>+ 1
-mocs: konq_combo.moc
-#>+ 3
konq_mainwindow.moc: $(srcdir)/konq_mainwindow.h
$(MOC) $(srcdir)/konq_mainwindow.h -o konq_mainwindow.moc
#>+ 1
mocs: konq_mainwindow.moc
#>+ 3
-konq_run.moc: $(srcdir)/konq_run.h
- $(MOC) $(srcdir)/konq_run.h -o konq_run.moc
+konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h
+ $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc
#>+ 1
-mocs: konq_run.moc
+mocs: konq_profiledlg.moc
+#>+ 3
+konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h
+ $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc
+
+#>+ 1
+mocs: konq_viewmgr.moc
#>+ 3
konq_actions.moc: $(srcdir)/konq_actions.h
$(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc
@@ -1328,11 +1336,11 @@ konq_actions.moc: $(srcdir)/konq_actions
#>+ 1
mocs: konq_actions.moc
#>+ 3
-konq_misc.moc: $(srcdir)/konq_misc.h
- $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc
+konq_combo.moc: $(srcdir)/konq_combo.h
+ $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc
#>+ 1
-mocs: konq_misc.moc
+mocs: konq_combo.moc
#>+ 3
konq_guiclients.moc: $(srcdir)/konq_guiclients.h
$(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc
@@ -1340,26 +1348,34 @@ konq_guiclients.moc: $(srcdir)/konq_guic
#>+ 1
mocs: konq_guiclients.moc
#>+ 3
-konq_browseriface.moc: $(srcdir)/konq_browseriface.h
- $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc
+konq_run.moc: $(srcdir)/konq_run.h
+ $(MOC) $(srcdir)/konq_run.h -o konq_run.moc
#>+ 1
-mocs: konq_browseriface.moc
+mocs: konq_run.moc
#>+ 3
konq_frame.moc: $(srcdir)/konq_frame.h
$(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc
#>+ 1
mocs: konq_frame.moc
-#>+ 3
-konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h
- $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc
+#>+ 13
+KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
+KonquerorIface_skel.cc: KonquerorIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl
+KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; false )
+KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl
+KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; false )
+KonqViewIface_skel.cc: KonqViewIface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl
-#>+ 1
-mocs: konq_profiledlg.moc
#>+ 3
clean-metasources:
- -rm -f konq_viewmgr.moc konq_view.moc delayedinitializer.moc konq_combo.moc konq_mainwindow.moc konq_run.moc konq_actions.moc konq_misc.moc konq_guiclients.moc konq_browseriface.moc konq_frame.moc konq_profiledlg.moc
+ -rm -f konq_view.moc konq_browseriface.moc konq_misc.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc
#>+ 6
clean-idl:
@@ -1379,33 +1395,33 @@ force-reedit:
#>+ 11
-konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_viewmgr.moc konq_combo.moc konq_view.moc konq_run.moc konq_browseriface.moc konq_misc.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_guiclients.moc konq_profiledlg.moc
- @echo 'creating konqueror_la.all_cc.cc ...'; \
- rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \
+libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konq_view.moc konq_browseriface.moc konq_misc.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc
+ @echo 'creating libkonqueror_main_la.all_cc.cc ...'; \
+ rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \
for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc ; do \
- echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \
+ echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \
done; \
- cat konqueror_la.all_cc.final konqueror_la.all_cc.files > konqueror_la.all_cc.cc; \
- rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files
+ cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \
+ rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files
#>+ 3
clean-final:
- -rm -f konqueror_la.all_cc.cc
+ -rm -f libkonqueror_main_la.all_cc.cc
#>+ 2
final:
- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am
+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am
+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1415,27 +1431,27 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 25
-konq_browseriface.lo: konq_browseriface.moc
konq_frame.lo: konq_frame.moc
+konq_view.lo: konq_view.moc
+konq_profiledlg.o: konq_profiledlg.moc
+konq_view.o: konq_view.moc
+konq_browseriface.lo: konq_browseriface.moc
konq_browseriface.o: konq_browseriface.moc
+konq_misc.o: konq_misc.moc
konq_combo.lo: konq_combo.moc
-konq_combo.o: konq_combo.moc
+konq_actions.o: konq_actions.moc
+delayedinitializer.o: delayedinitializer.moc
konq_profiledlg.lo: konq_profiledlg.moc
-konq_mainwindow.o: konq_mainwindow.moc
-konq_misc.o: konq_misc.moc
-konq_view.lo: konq_view.moc
-delayedinitializer.lo: delayedinitializer.moc
-konq_viewmgr.o: konq_viewmgr.moc
-konq_view.o: konq_view.moc
konq_run.lo: konq_run.moc
-konq_actions.lo: konq_actions.moc
-konq_viewmgr.lo: konq_viewmgr.moc
-konq_mainwindow.lo: konq_mainwindow.moc
-konq_run.o: konq_run.moc
-konq_misc.lo: konq_misc.moc
+delayedinitializer.lo: delayedinitializer.moc
+konq_guiclients.lo: konq_guiclients.moc
konq_frame.o: konq_frame.moc
+konq_misc.lo: konq_misc.moc
+konq_run.o: konq_run.moc
+konq_viewmgr.o: konq_viewmgr.moc
+konq_combo.o: konq_combo.moc
konq_guiclients.o: konq_guiclients.moc
-delayedinitializer.o: delayedinitializer.moc
-konq_actions.o: konq_actions.moc
-konq_guiclients.lo: konq_guiclients.moc
-konq_profiledlg.o: konq_profiledlg.moc
+konq_mainwindow.lo: konq_mainwindow.moc
+konq_mainwindow.o: konq_mainwindow.moc
+konq_viewmgr.lo: konq_viewmgr.moc
+konq_actions.lo: konq_actions.moc

39
x11/kdebase3/patches/patch-ci
View file

@ -1,39 +0,0 @@
$NetBSD: patch-ci,v 1.3 2003/03/11 13:10:23 markd Exp $
--- 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
INCLUDES= -I.. $(all_includes)
+libkfmclient_main_la_LDFLAGS = $(all_libraries)
+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_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 @@ METASOURCES = AUTO
KonquerorIface_DIR = $(srcdir)/..
KDesktopIface_DIR = $(top_srcdir)/kdesktop
-kfmclient_SOURCES = dummy.cc
+kfmclient_SOURCES = kfmclient_main.cc
kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kfmclient_LDADD = kfmclient.la
-
-dummy.cc:
- echo > dummy.cc
+kfmclient_LDADD = libkfmclient_main.la
messages:
$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot

238
x11/kdebase3/patches/patch-cj
View file

@ -1,238 +0,0 @@
$NetBSD: patch-cj,v 1.7 2004/01/15 10:15:14 markd Exp $
--- konqueror/client/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300
+++ konqueror/client/Makefile.in
@@ -425,14 +425,18 @@ x_libraries = @x_libraries@
AM_CPPFLAGS = -DQT_NO_CAST_ASCII
bin_PROGRAMS = kfmclient
-lib_LTLIBRARIES = kfmclient.la
+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la
INCLUDES = -I.. $(all_includes)
-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
-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_KIO)
+#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
#>+ 1
-kfmclient_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc
+libkfmclient_main_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc
+
+kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kfmclient_la_LIBADD = libkfmclient_main.la
+kfmclient_la_SOURCES = kfmclient_main.cc
noinst_HEADERS = kfmclient.h
#>- METASOURCES = AUTO
@@ -440,9 +444,9 @@ noinst_HEADERS = kfmclient.h
KonquerorIface_DIR = $(srcdir)/..
KDesktopIface_DIR = $(top_srcdir)/kdesktop
-kfmclient_SOURCES = dummy.cc
+kfmclient_SOURCES = kfmclient_main.cc
kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-kfmclient_LDADD = kfmclient.la
+kfmclient_LDADD = libkfmclient_main.la
subdir = konqueror/client
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -450,30 +454,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kfmclient_la_DEPENDENCIES =
-am_kfmclient_la_OBJECTS = kfmclient.lo
+kfmclient_la_DEPENDENCIES = libkfmclient_main.la
+am_kfmclient_la_OBJECTS = kfmclient_main.lo
#>- kfmclient_la_OBJECTS = $(am_kfmclient_la_OBJECTS)
+#>+ 1
+kfmclient_la_OBJECTS = kfmclient_main.lo
+libkfmclient_main_la_DEPENDENCIES =
+am_libkfmclient_main_la_OBJECTS = kfmclient.lo
+#>- libkfmclient_main_la_OBJECTS = $(am_libkfmclient_main_la_OBJECTS)
#>+ 4
-kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo
-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo
-@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS)
+libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo
+libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo
+@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS)
bin_PROGRAMS = kfmclient$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kfmclient_OBJECTS = dummy.$(OBJEXT)
+am_kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
#>- kfmclient_OBJECTS = $(am_kfmclient_OBJECTS)
#>+ 1
-kfmclient_OBJECTS = dummy.$(OBJEXT)
-kfmclient_DEPENDENCIES = kfmclient.la
+kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
+kfmclient_DEPENDENCIES = libkfmclient_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/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
+#>+ 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
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -493,11 +508,12 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+DIST_SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) \
+ $(kfmclient_SOURCES)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) $(kfmclient_SOURCES)
#>- all: all-am
#>+ 1
@@ -544,6 +560,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)
@@ -583,8 +601,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@
distclean-depend:
-rm -rf ./$(DEPDIR)
@@ -685,7 +704,12 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+#>+ 4
+KDE_DIST=Makefile.in.rej
+
+DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+
top_distdir = ../..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
@@ -817,15 +841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
uninstall-libLTLIBRARIES
-dummy.cc:
- echo > dummy.cc
-
messages:
$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+#>+ 3
+kfmclient.moc: $(srcdir)/kfmclient.h
+ $(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
+
+#>+ 1
+mocs: kfmclient.moc
#>+ 9
KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES)
$(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false )
@@ -837,12 +864,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl
$(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl
#>+ 3
-kfmclient.moc: $(srcdir)/kfmclient.h
- $(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc
-
-#>+ 1
-mocs: kfmclient.moc
-#>+ 3
clean-metasources:
-rm -f kfmclient.moc
@@ -863,33 +884,33 @@ force-reedit:
#>+ 11
-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient.moc
- @echo 'creating kfmclient_la.all_cc.cc ...'; \
- rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \
- echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \
+libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient.moc
+ @echo 'creating libkfmclient_main_la.all_cc.cc ...'; \
+ rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \
for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc ; do \
- echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \
+ echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \
done; \
- cat kfmclient_la.all_cc.final kfmclient_la.all_cc.files > kfmclient_la.all_cc.cc; \
- rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files
+ cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \
+ rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files
#>+ 3
clean-final:
- -rm -f kfmclient_la.all_cc.cc
+ -rm -f libkfmclient_main_la.all_cc.cc
#>+ 2
final:
- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am
+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" install-am
+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -899,8 +920,8 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 6
-kfmclient.lo: kfmclient.moc
+$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h
KDesktopIface_stub.cc: KDesktopIface_stub.h
-kfmclient.o: kfmclient.moc
KonquerorIface_stub.cc: KonquerorIface_stub.h
-$(srcdir)/kfmclient.cc: KonquerorIface_stub.h KDesktopIface_stub.h
+kfmclient.lo: kfmclient.moc
+kfmclient.o: kfmclient.moc

15
x11/kdebase3/patches/patch-ck
View file

@ -1,15 +0,0 @@
$NetBSD: patch-ck,v 1.2 2002/08/25 19:23:41 jlam Exp $
--- konqueror/client/kfmclient.cc.orig Wed May 8 19:22:30 2002
+++ konqueror/client/kfmclient.cc
@@ -58,7 +58,9 @@
{0,0,0}
};
-int main( int argc, char **argv )
+extern "C" int kdemain( int argc, char **argv );
+
+int kdemain( int argc, char **argv )
{
KCmdLineArgs::init(argc, argv, appName, description, version, false);

36
x11/kdebase3/patches/patch-cm
View file

@ -1,36 +0,0 @@
$NetBSD: patch-cm,v 1.3 2003/03/11 13:10:24 markd Exp $
--- konqueror/keditbookmarks/Makefile.am.orig Sun Oct 27 11:06:42 2002
+++ konqueror/keditbookmarks/Makefile.am
@@ -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 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 $(LIB_KHTML)
+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la
keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
bin_PROGRAMS = keditbookmarks
-keditbookmarks_SOURCES = dummy.cpp
-keditbookmarks_LDADD = keditbookmarks.la
+keditbookmarks_SOURCES = keditbookmarks_main.cpp
+keditbookmarks_LDADD = libkeditbookmarks_main.la
keditbookmarks_LDFLAGS = $(all_libraries)
-
-dummy.cpp:
- echo > dummy.cpp
rcdir = $(kde_datadir)/keditbookmarks
rc_DATA = keditbookmarksui.rc

262
x11/kdebase3/patches/patch-cn
View file

@ -1,262 +0,0 @@
$NetBSD: patch-cn,v 1.7 2004/01/15 10:15:14 markd Exp $
--- konqueror/keditbookmarks/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300
+++ konqueror/keditbookmarks/Makefile.in
@@ -426,20 +426,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all
#>- METASOURCES = AUTO
-lib_LTLIBRARIES = keditbookmarks.la
+lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la
-#>- 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 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 $(LIB_KHTML)
+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la
keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
bin_PROGRAMS = keditbookmarks
-keditbookmarks_SOURCES = dummy.cpp
-keditbookmarks_LDADD = keditbookmarks.la
+keditbookmarks_SOURCES = keditbookmarks_main.cpp
+keditbookmarks_LDADD = libkeditbookmarks_main.la
keditbookmarks_LDFLAGS = $(all_libraries)
rcdir = $(kde_datadir)/keditbookmarks
@@ -453,37 +457,50 @@ 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 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)
+#>+ 1
+keditbookmarks_la_OBJECTS = keditbookmarks_main.lo
+libkeditbookmarks_main_la_DEPENDENCIES = \
+ $(top_builddir)/libkonq/libkonq.la
+am_libkeditbookmarks_main_la_OBJECTS = main.lo items.lo toplevel.lo \
+ favicons.lo commands.lo
+#>- libkeditbookmarks_main_la_OBJECTS = \
+#>- $(am_libkeditbookmarks_main_la_OBJECTS)
#>+ 5
-keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.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 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)
PROGRAMS = $(bin_PROGRAMS)
-am_keditbookmarks_OBJECTS = dummy.$(OBJEXT)
+am_keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
#>- keditbookmarks_OBJECTS = $(am_keditbookmarks_OBJECTS)
#>+ 1
-keditbookmarks_OBJECTS = dummy.$(OBJEXT)
-keditbookmarks_DEPENDENCIES = keditbookmarks.la
+keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
+keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/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) \
@@ -504,11 +521,12 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+DIST_SOURCES = $(keditbookmarks_la_SOURCES) \
+ $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES)
DATA = $(rc_DATA)
DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+SOURCES = $(keditbookmarks_la_SOURCES) $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES)
#>- all: all-am
#>+ 1
@@ -555,6 +573,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)
@@ -595,9 +615,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)/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@
@@ -720,7 +741,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=commands.h toplevel.h cr32-app-keditbookmarks.png uninstall.desktop favicons.h cr64-app-keditbookmarks.png keditbookmarksui.rc cr48-app-keditbookmarks.png cr16-app-keditbookmarks.png kinsertionsort.h cr128-app-keditbookmarks.png
+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 Makefile.in.rej cr16-app-keditbookmarks.png uninstall.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -860,9 +881,6 @@ uninstall-am: uninstall-kde-icons unins
uninstall-libLTLIBRARIES uninstall-rcDATA
-dummy.cpp:
- echo > dummy.cpp
-
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop
@@ -870,18 +888,12 @@ install-data-local: uninstall.desktop
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 5
-toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; false )
-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
+favicons.moc: $(srcdir)/favicons.h
+ $(MOC) $(srcdir)/favicons.h -o favicons.moc
#>+ 1
-mocs: toplevel.moc
+mocs: favicons.moc
#>+ 3
commands.moc: $(srcdir)/commands.h
$(MOC) $(srcdir)/commands.h -o commands.moc
@@ -889,14 +901,20 @@ commands.moc: $(srcdir)/commands.h
#>+ 1
mocs: commands.moc
#>+ 3
-favicons.moc: $(srcdir)/favicons.h
- $(MOC) $(srcdir)/favicons.h -o favicons.moc
+toplevel.moc: $(srcdir)/toplevel.h
+ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
#>+ 1
-mocs: favicons.moc
+mocs: toplevel.moc
+#>+ 5
+toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; 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 favicons.moc
+ -rm -f favicons.moc commands.moc toplevel.moc
#>+ 4
clean-idl:
@@ -934,33 +952,33 @@ force-reedit:
#>+ 11
-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 commands.moc toplevel.moc favicons.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)/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 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; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \
done; \
- cat keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files > keditbookmarks_la.all_cpp.cpp; \
- rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files
+ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \
+ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f keditbookmarks_la.all_cpp.cpp
+ -rm -f libkeditbookmarks_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" install-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -971,8 +989,8 @@ kde-rpo-clean:
#>+ 7
toplevel.o: toplevel.moc
-favicons.lo: favicons.moc
-favicons.o: favicons.moc
-commands.o: commands.moc
commands.lo: commands.moc
toplevel.lo: toplevel.moc
+commands.o: commands.moc
+favicons.o: favicons.moc
+favicons.lo: favicons.moc

15
x11/kdebase3/patches/patch-cp
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cp,v 1.3 2003/03/11 13:10:24 markd Exp $
--- konqueror/keditbookmarks/main.cpp.orig Tue Nov 5 04:45:04 2002
+++ konqueror/keditbookmarks/main.cpp
@@ -110,7 +110,9 @@ int askUser(KApplication &app, QString e
}
}
-int main(int argc, char ** argv)
+extern "C" int kdemain(int, char **);
+
+int kdemain(int argc, char ** argv)
{
KLocale::setMainCatalogue("konqueror");
KAboutData aboutData("keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.1",

15
x11/kdebase3/patches/patch-cq
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cq,v 1.2 2002/08/25 19:23:42 jlam Exp $
--- konqueror/konq_main.cc.orig Fri Jan 11 15:29:36 2002
+++ konqueror/konq_main.cc
@@ -44,7 +44,9 @@
{ 0, 0, 0}
};
-int main( int argc, char **argv )
+extern "C" int kdemain( int, char **);
+
+int kdemain( int argc, char **argv )
{
KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() );

66
x11/kdebase3/patches/patch-cs
View file

@ -1,66 +0,0 @@
$NetBSD: patch-cs,v 1.5 2003/05/22 02:42:50 markd Exp $
--- konsole/konsole/Makefile.am.orig Wed May 7 23:44:16 2003
+++ konsole/konsole/Makefile.am
@@ -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 = 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
@@ -34,26 +34,34 @@ libkonsolepart_la_LDFLAGS = $(all_librar
libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS)
# kwrited kdeinit module
-kwrited_la_SOURCES = kwrited.cpp
-kwrited_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_SOURCES = kwrited.cpp
+libkwrited_main_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_LDFLAGS = $(all_libraries)
+
+kwrited_la_SOURCES = kwrited_main.cpp
+kwrited_la_LIBADD = libkwrited_main.la
kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
# kwrited executable
-kwrited_SOURCES = dummy.cpp
-kwrited_LDADD = kwrited.la
+kwrited_SOURCES = kwrited_main.cpp
+kwrited_LDADD = libkwrited_main.la
kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# konsole kdeinit module
-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_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+
+konsole_la_SOURCES = konsole_main.cpp
konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konsole_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+konsole_la_LIBADD = libkonsole_main.la
# konsole executable
-konsole_SOURCES = dummy.cpp
-konsole_LDADD = konsole.la $(LIB_KDEPRINT)
+konsole_SOURCES = konsole_main.cpp
+konsole_LDADD = libkonsole_main.la
konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# 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
-
-dummy.cpp:
- echo > dummy.cpp
# setting up x-application/konsole as a special mimetype
mimedir = $(kde_mimedir)/application

494
x11/kdebase3/patches/patch-ct
View file

@ -1,494 +0,0 @@
$NetBSD: patch-ct,v 1.8 2004/01/15 10:15:14 markd Exp $
--- konsole/konsole/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300
+++ konsole/konsole/Makefile.in
@@ -439,7 +439,7 @@ INCLUDES = -I. $(all_includes)
# you can add here more. This one gets installed
bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole
-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
@@ -474,30 +474,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar
libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS)
# kwrited kdeinit module
-kwrited_la_SOURCES = kwrited.cpp
-kwrited_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_SOURCES = kwrited.cpp
+libkwrited_main_la_LIBADD = libkonsolepart.la
+libkwrited_main_la_LDFLAGS = $(all_libraries)
+
+kwrited_la_SOURCES = kwrited_main.cpp
+kwrited_la_LIBADD = libkwrited_main.la
kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version
# kwrited executable
-kwrited_SOURCES = dummy.cpp
-kwrited_LDADD = kwrited.la
+kwrited_SOURCES = kwrited_main.cpp
+kwrited_LDADD = libkwrited_main.la
kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH)
# konsole kdeinit module
-#>- 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_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+
+konsole_la_SOURCES = konsole_main.cpp
konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version
-konsole_la_LIBADD = $(LIB_KDEPRINT) $(LIBUTIL) $(XTESTLIB)
+konsole_la_LIBADD = libkonsole_main.la
# konsole executable
-konsole_SOURCES = dummy.cpp
-konsole_LDADD = konsole.la $(LIB_KDEPRINT)
+konsole_SOURCES = konsole_main.cpp
+konsole_LDADD = libkonsole_main.la
konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -533,27 +541,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)
-#>+ 8
-konsole_la_final_OBJECTS = konsole_la.all_cpp.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
-am_kwrited_la_OBJECTS = kwrited.lo
+#>+ 1
+konsole_la_OBJECTS = konsole_main.lo
+kwrited_la_DEPENDENCIES = libkwrited_main.la
+am_kwrited_la_OBJECTS = kwrited_main.lo
#>- kwrited_la_OBJECTS = $(am_kwrited_la_OBJECTS)
#>+ 1
-kwrited_la_OBJECTS = kwrited.lo
+kwrited_la_OBJECTS = kwrited_main.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)
+#>+ 8
+libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.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 \
@@ -566,25 +579,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)
+libkwrited_main_la_DEPENDENCIES = libkonsolepart.la
+am_libkwrited_main_la_OBJECTS = kwrited.lo
+#>- libkwrited_main_la_OBJECTS = $(am_libkwrited_main_la_OBJECTS)
+#>+ 1
+libkwrited_main_la_OBJECTS = kwrited.lo
bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \
kwrited$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_konsole_OBJECTS = dummy.$(OBJEXT)
+am_konsole_OBJECTS = konsole_main.$(OBJEXT)
#>- konsole_OBJECTS = $(am_konsole_OBJECTS)
#>+ 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_DEPENDENCIES =
-am_kwrited_OBJECTS = dummy.$(OBJEXT)
+am_kwrited_OBJECTS = kwrited_main.$(OBJEXT)
#>- kwrited_OBJECTS = $(am_kwrited_OBJECTS)
#>+ 1
-kwrited_OBJECTS = dummy.$(OBJEXT)
-kwrited_DEPENDENCIES = kwrited.la
+kwrited_OBJECTS = kwrited_main.$(OBJEXT)
+kwrited_DEPENDENCIES = libkwrited_main.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
@@ -593,44 +611,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) \
@@ -659,14 +689,15 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \
- $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) \
+ $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) \
+ $(libkwrited_main_la_SOURCES) $(konsole_SOURCES) \
$(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
DATA = $(data_DATA) $(mime_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
+SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES)
#>- all: all-am
#>+ 1
@@ -743,11 +774,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)
+libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS)
#>- libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES)
#>+ 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 $(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)
@@ -800,16 +835,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@
@@ -984,7 +1022,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=MakeDefaults konsole_part.h x-konsole.desktop sessioniface.h konsolerc konsoleiface.h
+KDE_DIST=konsoleiface.h konsole_part.h Makefile.in.rej x-konsole.desktop konsolerc sessioniface.h MakeDefaults
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1155,23 +1193,16 @@ messages: rc.cpp
$(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot
rm -f schemas.cpp
rm -f tips.cpp
-
-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:
-#>+ 9
-konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; 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 ; false )
-sessioniface_skel.cpp: sessioniface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
+#>+ 3
+konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
+ $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
+#>+ 1
+mocs: konsolebookmarkmenu.moc
#>+ 3
TEWidget.moc: $(srcdir)/TEWidget.h
$(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc
@@ -1179,17 +1210,11 @@ TEWidget.moc: $(srcdir)/TEWidget.h
#>+ 1
mocs: TEWidget.moc
#>+ 3
-TEmuVt102.moc: $(srcdir)/TEmuVt102.h
- $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
-
-#>+ 1
-mocs: TEmuVt102.moc
-#>+ 3
-session.moc: $(srcdir)/session.h
- $(MOC) $(srcdir)/session.h -o session.moc
+TEmulation.moc: $(srcdir)/TEmulation.h
+ $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
#>+ 1
-mocs: session.moc
+mocs: TEmulation.moc
#>+ 3
kwrited.moc: $(srcdir)/kwrited.h
$(MOC) $(srcdir)/kwrited.h -o kwrited.moc
@@ -1209,17 +1234,23 @@ konsole_part.moc: $(srcdir)/konsole_part
#>+ 1
mocs: konsole_part.moc
#>+ 3
-TEmulation.moc: $(srcdir)/TEmulation.h
- $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc
+konsole.moc: $(srcdir)/konsole.h
+ $(MOC) $(srcdir)/konsole.h -o konsole.moc
#>+ 1
-mocs: TEmulation.moc
+mocs: konsole.moc
#>+ 3
-konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
- $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
+session.moc: $(srcdir)/session.h
+ $(MOC) $(srcdir)/session.h -o session.moc
#>+ 1
-mocs: konsolebookmarkhandler.moc
+mocs: session.moc
+#>+ 3
+TEmuVt102.moc: $(srcdir)/TEmuVt102.h
+ $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc
+
+#>+ 1
+mocs: TEmuVt102.moc
#>+ 3
konsole_child.moc: $(srcdir)/konsole_child.h
$(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc
@@ -1227,17 +1258,21 @@ konsole_child.moc: $(srcdir)/konsole_chi
#>+ 1
mocs: konsole_child.moc
#>+ 3
-konsole.moc: $(srcdir)/konsole.h
- $(MOC) $(srcdir)/konsole.h -o konsole.moc
+konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h
+ $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc
#>+ 1
-mocs: konsole.moc
-#>+ 3
-konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h
- $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc
+mocs: konsolebookmarkhandler.moc
+#>+ 9
+konsoleiface.kidl: $(srcdir)/konsoleiface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/konsoleiface.h > konsoleiface.kidl || ( rm -f konsoleiface.kidl ; 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 ; false )
+sessioniface_skel.cpp: sessioniface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub sessioniface.kidl
-#>+ 1
-mocs: konsolebookmarkmenu.moc
#>+ 8
libkonsolepart.la.closure: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES)
@echo "int main() {return 0;}" > libkonsolepart_la_closure.cpp
@@ -1249,7 +1284,7 @@ libkonsolepart.la.closure: $(libkonsolep
#>+ 3
clean-metasources:
- -rm -f TEWidget.moc TEmuVt102.moc session.moc kwrited.moc TEPty.moc konsole_part.moc TEmulation.moc konsolebookmarkhandler.moc konsole_child.moc konsole.moc konsolebookmarkmenu.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:
@@ -1274,19 +1309,19 @@ force-reedit:
#>+ 11
-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 session.moc TEmuVt102.moc TEWidget.moc TEPty.moc TEmulation.moc konsolebookmarkhandler.moc konsole_child.moc konsole.moc konsolebookmarkmenu.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)/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 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; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_cpp.final; \
done; \
- cat konsole_la.all_cpp.final konsole_la.all_cpp.files > konsole_la.all_cpp.cpp; \
- rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files
+ cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \
+ 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 session.moc TEmuVt102.moc TEWidget.moc konsole_part.moc TEPty.moc TEmulation.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; \
@@ -1299,20 +1334,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir)
#>+ 3
clean-final:
- -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)" 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)" 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)" 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)" 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
@@ -1323,24 +1358,24 @@ kde-rpo-clean:
#>+ 23
konsole.o: konsole.moc
-kwrited.lo: kwrited.moc
-TEmuVt102.o: TEmuVt102.moc
-session.lo: session.moc
-TEPty.lo: TEPty.moc
+konsole_child.lo: konsole_child.moc
konsolebookmarkhandler.lo: konsolebookmarkhandler.moc
session.o: session.moc
-TEmulation.lo: TEmulation.moc
-TEWidget.lo: TEWidget.moc
-konsolebookmarkmenu.lo: konsolebookmarkmenu.moc
-kwrited.o: kwrited.moc
-konsolebookmarkmenu.o: konsolebookmarkmenu.moc
konsole.lo: konsole.moc
+TEWidget.lo: TEWidget.moc
+TEmulation.o: TEmulation.moc
konsolebookmarkhandler.o: konsolebookmarkhandler.moc
-konsole_child.lo: konsole_child.moc
+TEmuVt102.o: TEmuVt102.moc
+konsolebookmarkmenu.lo: konsolebookmarkmenu.moc
+TEmuVt102.lo: TEmuVt102.moc
+TEPty.lo: TEPty.moc
+session.lo: session.moc
+TEmulation.lo: TEmulation.moc
+TEPty.o: TEPty.moc
konsole_part.lo: konsole_part.moc
-TEmulation.o: TEmulation.moc
+konsole_part.o: konsole_part.moc
+kwrited.o: kwrited.moc
konsole_child.o: konsole_child.moc
+kwrited.lo: kwrited.moc
TEWidget.o: TEWidget.moc
-TEPty.o: TEPty.moc
-TEmuVt102.lo: TEmuVt102.moc
-konsole_part.o: konsole_part.moc
+konsolebookmarkmenu.o: konsolebookmarkmenu.moc

15
x11/kdebase3/patches/patch-cv
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cv,v 1.2 2002/08/25 19:23:43 jlam Exp $
--- konsole/konsole/kwrited.cpp.orig Wed May 8 19:22:40 2002
+++ konsole/konsole/kwrited.cpp
@@ -90,7 +90,9 @@
::exit(0);
}
-int main(int argc, char* argv[])
+extern "C" int kdemain(int, char*[]);
+
+int kdemain(int argc, char* argv[])
{
KLocale::setMainCatalogue("konsole");
KCmdLineArgs::init(argc, argv, "kwrited",

15
x11/kdebase3/patches/patch-cx
View file

@ -1,15 +0,0 @@
$NetBSD: patch-cx,v 1.4 2003/09/17 23:18:58 markd Exp $
--- konsole/konsole/main.cpp.orig 2003-09-01 23:32:01.000000000 +1200
+++ konsole/konsole/main.cpp
@@ -126,7 +126,9 @@ public:
extern void TEPtyInit();
/* --| main |------------------------------------------------------ */
-int main(int argc, char* argv[])
+extern "C" int kdemain(int, char*[]);
+
+int kdemain(int argc, char* argv[])
{
setgid(getgid()); setuid(getuid()); // drop privileges

38
x11/kdebase3/patches/patch-cy
View file

@ -1,38 +0,0 @@
$NetBSD: patch-cy,v 1.3 2003/03/11 13:10:24 markd Exp $
--- ksmserver/Makefile.am.orig Tue Jul 2 06:54:12 2002
+++ ksmserver/Makefile.am
@@ -20,18 +20,21 @@ SUBDIRS = .
INCLUDES= $(all_includes)
bin_PROGRAMS = ksmserver
-lib_LTLIBRARIES = ksmserver.la
+lib_LTLIBRARIES = libksmserver_main.la ksmserver.la
noinst_HEADERS = global.h server.h shutdown.h
ksmserver_la_METASOURCES = AUTO
# Order is important for --enable-final!
-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 KSMServerInterface.skel
+ksmserver_la_SOURCES = ksmserver_main.cpp
+ksmserver_SOURCES = ksmserver_main.cpp
+libksmserver_main_la_LDFLAGS = $(all_libraries)
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-ksmserver_la_LIBADD = $(LIB_KDEUI)
-ksmserver_LDADD = ksmserver.la
+libksmserver_main_la_LIBADD = $(LIB_KDEUI)
+ksmserver_la_LIBADD = libksmserver_main.la
+ksmserver_LDADD = libksmserver_main.la
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
@@ -47,6 +50,3 @@ testsh_LDADD = $(LIB_KDEUI) shutdown.lo
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot
-
-dummy.cpp:
- echo > dummy.cpp

235
x11/kdebase3/patches/patch-cz
View file

@ -1,235 +0,0 @@
$NetBSD: patch-cz,v 1.7 2004/01/15 10:15:14 markd Exp $
--- ksmserver/Makefile.in.orig 2004-01-02 14:06:02.000000000 +1300
+++ ksmserver/Makefile.in
@@ -445,20 +445,23 @@ SUBDIRS = .
INCLUDES = $(all_includes)
bin_PROGRAMS = ksmserver
-lib_LTLIBRARIES = ksmserver.la
+lib_LTLIBRARIES = libksmserver_main.la ksmserver.la
noinst_HEADERS = global.h server.h shutdown.h
#>- ksmserver_la_METASOURCES = AUTO
# Order is important for --enable-final!
-#>- 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 KSMServerInterface_skel.cpp
+ksmserver_la_SOURCES = ksmserver_main.cpp
+ksmserver_SOURCES = ksmserver_main.cpp
+libksmserver_main_la_LDFLAGS = $(all_libraries)
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-ksmserver_la_LIBADD = $(LIB_KDEUI)
-ksmserver_LDADD = ksmserver.la
+libksmserver_main_la_LIBADD = $(LIB_KDEUI)
+ksmserver_la_LIBADD = libksmserver_main.la
+ksmserver_LDADD = libksmserver_main.la
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
@@ -477,23 +480,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-ksmserver_la_DEPENDENCIES =
-am_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
+ksmserver_la_DEPENDENCIES = libksmserver_main.la
+am_ksmserver_la_OBJECTS = ksmserver_main.lo
#>- ksmserver_la_OBJECTS = $(am_ksmserver_la_OBJECTS)
+#>+ 1
+ksmserver_la_OBJECTS = ksmserver_main.lo
+libksmserver_main_la_DEPENDENCIES =
+am_libksmserver_main_la_OBJECTS = main.lo server.lo shutdown.lo
+#>- 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 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 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)
PROGRAMS = $(bin_PROGRAMS)
-am_ksmserver_OBJECTS = dummy.$(OBJEXT)
+am_ksmserver_OBJECTS = ksmserver_main.$(OBJEXT)
#>- ksmserver_OBJECTS = $(am_ksmserver_OBJECTS)
#>+ 1
-ksmserver_OBJECTS = dummy.$(OBJEXT)
-ksmserver_DEPENDENCIES = ksmserver.la
+ksmserver_OBJECTS = ksmserver_main.$(OBJEXT)
+ksmserver_DEPENDENCIES = libksmserver_main.la
am_testsh_OBJECTS = test.$(OBJEXT)
#>- testsh_OBJECTS = $(am_testsh_OBJECTS)
#>+ 1
@@ -503,14 +511,17 @@ testsh_DEPENDENCIES = shutdown.lo
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/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)/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)/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
@@ -532,8 +543,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) \
- $(testsh_SOURCES)
+DIST_SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) \
+ $(ksmserver_SOURCES) $(testsh_SOURCES)
DATA = $(pics_DATA) $(update_DATA)
HEADERS = $(noinst_HEADERS)
@@ -546,7 +557,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES)
+SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -593,6 +604,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)
@@ -635,7 +648,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@
@@ -848,7 +862,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=ksmserver.upd shutdownkonq.png LICENSE move_session_config.sh configure.in.in KSMServerInterface.h
+KDE_DIST=configure.in.in KSMServerInterface.h LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1009,34 +1023,31 @@ uninstall-info: uninstall-info-recursive
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.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:
-#>+ 5
-KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; 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
+#>+ 1
+mocs: server.moc
#>+ 3
shutdown.moc: $(srcdir)/shutdown.h
$(MOC) $(srcdir)/shutdown.h -o shutdown.moc
#>+ 1
mocs: shutdown.moc
-#>+ 3
-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 ; false )
+KSMServerInterface_skel.cpp: KSMServerInterface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl
-#>+ 1
-mocs: server.moc
#>+ 3
clean-metasources:
- -rm -f shutdown.moc server.moc
+ -rm -f server.moc shutdown.moc
#>+ 4
clean-idl:
@@ -1054,33 +1065,33 @@ force-reedit:
#>+ 11
-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 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 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; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksmserver_main_la.all_cpp.final; \
done; \
- cat ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files > ksmserver_la.all_cpp.cpp; \
- rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files
+ 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
#>+ 3
clean-final:
- -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)" 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)" 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)" 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)" 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

15
x11/kdebase3/patches/patch-db
View file

@ -1,15 +0,0 @@
$NetBSD: patch-db,v 1.2 2002/08/25 19:23:44 jlam Exp $
--- ksmserver/main.cpp.orig Sun Jan 20 18:26:13 2002
+++ ksmserver/main.cpp
@@ -159,7 +159,9 @@
}
}
-int main( int argc, char* argv[] )
+extern "C" int kdemain( int, char* [] );
+
+int kdemain( int argc, char* argv[] )
{
sanity_check(argc, argv);

42
x11/kdebase3/patches/patch-dg
View file

@ -1,42 +0,0 @@
$NetBSD: patch-dg,v 1.3 2003/03/11 13:10:27 markd Exp $
--- kwin/Makefile.am.orig Tue Jul 2 06:54:15 2002
+++ kwin/Makefile.am
@@ -3,13 +3,17 @@ INCLUDES = $(all_includes)
SUBDIRS = . kcmkwin pics clients
bin_PROGRAMS = kwin
-lib_LTLIBRARIES = kwin.la
+lib_LTLIBRARIES = libkwin.la kwin.la
# workspace.cpp has to be first in order not to break --enable-final
-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)
+libkwin_la_LDFLAGS = $(all_libraries)
+
+kwin_la_SOURCES = kwin_main.cpp
+kwin_la_LIBADD = libkwin.la
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h
@@ -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_LDFLAGS = $(all_libraries) $(KDE_RPATH)
KDE_ICON = kwin
@@ -34,7 +38,6 @@ data_DATA= eventsrc
sounddir= $(kde_sounddir)
sound_DATA = pop.wav
-
update_DATA = kwin.upd pluginlibFix.pl
updatedir = $(kde_datadir)/kconf_update

323
x11/kdebase3/patches/patch-dh
View file

@ -1,323 +0,0 @@
$NetBSD: patch-dh,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kwin/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300
+++ kwin/Makefile.in
@@ -428,18 +428,22 @@ INCLUDES = $(all_includes)
SUBDIRS = . kcmkwin pics clients
bin_PROGRAMS = kwin
-lib_LTLIBRARIES = kwin.la
+lib_LTLIBRARIES = libkwin.la kwin.la
# workspace.cpp has to be first in order not to break --enable-final
-#>- 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 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)
+libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+libkwin_la_LDFLAGS = $(all_libraries)
+
+kwin_la_SOURCES = kwin_main.cpp
+kwin_la_LIBADD = libkwin.la
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h
@@ -448,7 +452,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_LDFLAGS = $(all_libraries) $(KDE_RPATH)
KDE_ICON = kwin
@@ -459,7 +463,6 @@ data_DATA = eventsrc
sounddir = $(kde_sounddir)
sound_DATA = pop.wav
-
update_DATA = kwin.upd pluginlibFix.pl
updatedir = $(kde_datadir)/kconf_update
subdir = kwin
@@ -469,18 +472,23 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kwin_la_DEPENDENCIES =
-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)
+#>+ 1
+kwin_la_OBJECTS = kwin_main.lo
+libkwin_la_DEPENDENCIES =
+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
-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 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)
@@ -488,33 +496,33 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT)
#>- kwin_OBJECTS = $(am_kwin_OBJECTS)
#>+ 1
kwin_OBJECTS = kwin_main.$(OBJEXT)
-kwin_DEPENDENCIES = kwin.la
+kwin_DEPENDENCIES = libkwin.la
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
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)
@@ -534,7 +542,7 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES)
DATA = $(data_DATA) $(sound_DATA) $(update_DATA)
HEADERS = $(include_HEADERS) $(kwininclude_HEADERS)
@@ -548,7 +556,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \
Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -595,6 +603,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)
@@ -638,6 +648,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@
@@ -909,7 +920,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=stdclient_bitmaps.h pluginlibFix.pl pop.wav cr16-app-kwin.png kwinbindings.cpp cr48-app-kwin.png LICENSE plugins.h placement.h atoms.h popupinfo.h kwin.upd eventsrc NEWCOLORSCHEME.README events.h main.h cr32-app-kwin.png killwindow.h tabbox.h
+KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h Makefile.in.rej NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1087,24 +1098,30 @@ messages:
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 5
-KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false )
-KWinInterface_skel.cpp: KWinInterface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+#>+ 3
+workspace.moc: $(srcdir)/workspace.h
+ $(MOC) $(srcdir)/workspace.h -o workspace.moc
+#>+ 1
+mocs: workspace.moc
#>+ 3
-tabbox.moc: $(srcdir)/tabbox.h
- $(MOC) $(srcdir)/tabbox.h -o tabbox.moc
+client.moc: $(srcdir)/client.h
+ $(MOC) $(srcdir)/client.h -o client.moc
#>+ 1
-mocs: tabbox.moc
+mocs: client.moc
#>+ 3
-workspace.moc: $(srcdir)/workspace.h
- $(MOC) $(srcdir)/workspace.h -o workspace.moc
+options.moc: $(srcdir)/options.h
+ $(MOC) $(srcdir)/options.h -o options.moc
#>+ 1
-mocs: workspace.moc
+mocs: options.moc
+#>+ 3
+tabbox.moc: $(srcdir)/tabbox.h
+ $(MOC) $(srcdir)/tabbox.h -o tabbox.moc
+
+#>+ 1
+mocs: tabbox.moc
#>+ 3
popupinfo.moc: $(srcdir)/popupinfo.h
$(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc
@@ -1118,26 +1135,20 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h
#>+ 1
mocs: kwinbutton.moc
#>+ 3
-client.moc: $(srcdir)/client.h
- $(MOC) $(srcdir)/client.h -o client.moc
-
-#>+ 1
-mocs: client.moc
-#>+ 3
plugins.moc: $(srcdir)/plugins.h
$(MOC) $(srcdir)/plugins.h -o plugins.moc
#>+ 1
mocs: plugins.moc
-#>+ 3
-options.moc: $(srcdir)/options.h
- $(MOC) $(srcdir)/options.h -o options.moc
+#>+ 5
+KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false )
+KWinInterface_skel.cpp: KWinInterface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
-#>+ 1
-mocs: options.moc
#>+ 3
clean-metasources:
- -rm -f tabbox.moc workspace.moc popupinfo.moc kwinbutton.moc client.moc plugins.moc options.moc
+ -rm -f workspace.moc client.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc plugins.moc
#>+ 4
clean-idl:
@@ -1169,33 +1180,33 @@ force-reedit:
#>+ 11
-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 workspace.moc tabbox.moc kwinbutton.moc popupinfo.moc plugins.moc client.moc options.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)/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 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; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \
done; \
- cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \
- rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files
+ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \
+ rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kwin_la.all_cpp.cpp
+ -rm -f libkwin_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1205,17 +1216,17 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 15
-popupinfo.lo: popupinfo.moc
+workspace.o: workspace.moc
options.lo: options.moc
-popupinfo.o: popupinfo.moc
-plugins.lo: plugins.moc
-kwinbutton.lo: kwinbutton.moc
tabbox.o: tabbox.moc
-workspace.o: workspace.moc
-client.o: client.moc
+popupinfo.lo: popupinfo.moc
options.o: options.moc
-plugins.o: plugins.moc
-client.lo: client.moc
-kwinbutton.o: kwinbutton.moc
+kwinbutton.lo: kwinbutton.moc
tabbox.lo: tabbox.moc
+kwinbutton.o: kwinbutton.moc
+client.o: client.moc
+plugins.o: plugins.moc
workspace.lo: workspace.moc
+client.lo: client.moc
+popupinfo.o: popupinfo.moc
+plugins.lo: plugins.moc

13
x11/kdebase3/patches/patch-di
View file

@ -1,13 +0,0 @@
$NetBSD: patch-di,v 1.2 2002/08/25 19:23:45 jlam Exp $
--- kwin/clients/b2/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/b2/Makefile.am
@@ -6,7 +6,7 @@
kde_module_LTLIBRARIES = kwin_b2.la
kwin_b2_la_SOURCES = b2client.cpp
-kwin_b2_la_LIBADD = ../../kwin.la
+kwin_b2_la_LIBADD = ../../libkwin.la
kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-dj
View file

@ -1,31 +0,0 @@
$NetBSD: patch-dj,v 1.5 2003/05/22 02:42:51 markd Exp $
--- kwin/clients/b2/Makefile.in.orig Tue May 13 23:08:02 2003
+++ kwin/clients/b2/Makefile.in
@@ -428,7 +428,7 @@ SUBDIRS = . config
kde_module_LTLIBRARIES = kwin_b2.la
kwin_b2_la_SOURCES = b2client.cpp
-kwin_b2_la_LIBADD = ../../kwin.la
+kwin_b2_la_LIBADD = ../../libkwin.la
kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_b2_la_DEPENDENCIES = ../../kwin.la
+kwin_b2_la_DEPENDENCIES = ../../libkwin.la
am_kwin_b2_la_OBJECTS = b2client.lo
#>- kwin_b2_la_OBJECTS = $(am_kwin_b2_la_OBJECTS)
#>+ 1
@@ -737,7 +737,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=bitmaps.h b2.desktop
+KDE_DIST=b2.desktop bitmaps.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-dk
View file

@ -1,13 +0,0 @@
$NetBSD: patch-dk,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/default/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/default/Makefile.am
@@ -6,7 +6,7 @@
kde_module_LTLIBRARIES = kwin_default.la
kwin_default_la_SOURCES = kdedefault.cpp
-kwin_default_la_LIBADD = ../../kwin.la
+kwin_default_la_LIBADD = ../../libkwin.la
kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

29
x11/kdebase3/patches/patch-dl
View file

@ -1,29 +0,0 @@
$NetBSD: patch-dl,v 1.4 2003/03/11 13:10:27 markd Exp $
--- kwin/clients/default/Makefile.in.orig Fri Jan 17 09:03:11 2003
+++ kwin/clients/default/Makefile.in
@@ -292,7 +292,7 @@ SUBDIRS = . config
kde_module_LTLIBRARIES = kwin_default.la
kwin_default_la_SOURCES = kdedefault.cpp
-kwin_default_la_LIBADD = ../../kwin.la
+kwin_default_la_LIBADD = ../../libkwin.la
kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -303,7 +303,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_default_la_DEPENDENCIES = ../../kwin.la
+kwin_default_la_DEPENDENCIES = ../../libkwin.la
am_kwin_default_la_OBJECTS = kdedefault.lo
#>- kwin_default_la_OBJECTS = $(am_kwin_default_la_OBJECTS)
#>+ 1
@@ -729,5 +729,5 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 3
-kdedefault.lo: kdedefault.moc
kdedefault.o: kdedefault.moc
+kdedefault.lo: kdedefault.moc

13
x11/kdebase3/patches/patch-dm
View file

@ -1,13 +0,0 @@
$NetBSD: patch-dm,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/icewm/Makefile.am.orig Tue Feb 19 16:56:14 2002
+++ kwin/clients/icewm/Makefile.am
@@ -5,7 +5,7 @@
kde_module_LTLIBRARIES = kwin_icewm.la
kwin_icewm_la_SOURCES = icewm.cpp
-kwin_icewm_la_LIBADD = ../../kwin.la
+kwin_icewm_la_LIBADD = ../../libkwin.la
kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-dn
View file

@ -1,31 +0,0 @@
$NetBSD: patch-dn,v 1.5 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/icewm/Makefile.in.orig 2003-12-17 14:22:30.000000000 +1300
+++ kwin/clients/icewm/Makefile.in
@@ -429,7 +429,7 @@ SUBDIRS = . config icewm-themes
kde_module_LTLIBRARIES = kwin_icewm.la
kwin_icewm_la_SOURCES = icewm.cpp
-kwin_icewm_la_LIBADD = ../../kwin.la
+kwin_icewm_la_LIBADD = ../../libkwin.la
kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_icewm_la_DEPENDENCIES = ../../kwin.la
+kwin_icewm_la_DEPENDENCIES = ../../libkwin.la
am_kwin_icewm_la_OBJECTS = icewm.lo
#>- kwin_icewm_la_OBJECTS = $(am_kwin_icewm_la_OBJECTS)
#>+ 1
@@ -738,7 +738,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=icewm.desktop
+KDE_DIST=Makefile.in.rej icewm.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-do
View file

@ -1,13 +0,0 @@
$NetBSD: patch-do,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kde1/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kde1/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_kde1.la
kwin_kde1_la_SOURCES = kde1client.cpp
-kwin_kde1_la_LIBADD = ../../kwin.la
+kwin_kde1_la_LIBADD = ../../libkwin.la
kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

38
x11/kdebase3/patches/patch-dp
View file

@ -1,38 +0,0 @@
$NetBSD: patch-dp,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/kde1/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300
+++ kwin/clients/kde1/Makefile.in
@@ -428,7 +428,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_kde1.la
kwin_kde1_la_SOURCES = kde1client.cpp
-kwin_kde1_la_LIBADD = ../../kwin.la
+kwin_kde1_la_LIBADD = ../../libkwin.la
kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -444,7 +444,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_kde1_la_DEPENDENCIES = ../../kwin.la
+kwin_kde1_la_DEPENDENCIES = ../../libkwin.la
am_kwin_kde1_la_OBJECTS = kde1client.lo
#>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS)
#>+ 1
@@ -659,7 +659,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kde1.desktop kde1client_bitmaps.h
+KDE_DIST=Makefile.in.rej kde1client_bitmaps.h kde1.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -852,5 +852,5 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 3
-kde1client.lo: kde1client.moc
kde1client.o: kde1client.moc
+kde1client.lo: kde1client.moc

13
x11/kdebase3/patches/patch-dq
View file

@ -1,13 +0,0 @@
$NetBSD: patch-dq,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kstep/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kstep/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_kstep.la
kwin_kstep_la_SOURCES = nextclient.cpp
-kwin_kstep_la_LIBADD = ../../kwin.la
+kwin_kstep_la_LIBADD = ../../libkwin.la
kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-dr
View file

@ -1,31 +0,0 @@
$NetBSD: patch-dr,v 1.5 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/kstep/Makefile.in.orig 2003-12-17 14:22:31.000000000 +1300
+++ kwin/clients/kstep/Makefile.in
@@ -428,7 +428,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_kstep.la
kwin_kstep_la_SOURCES = nextclient.cpp
-kwin_kstep_la_LIBADD = ../../kwin.la
+kwin_kstep_la_LIBADD = ../../libkwin.la
kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_kstep_la_DEPENDENCIES = ../../kwin.la
+kwin_kstep_la_DEPENDENCIES = ../../libkwin.la
am_kwin_kstep_la_OBJECTS = nextclient.lo
#>- kwin_kstep_la_OBJECTS = $(am_kwin_kstep_la_OBJECTS)
#>+ 1
@@ -660,7 +660,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kstep.desktop
+KDE_DIST=Makefile.in.rej kstep.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-ds
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ds,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/kwmtheme/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/kwmtheme/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_kwmtheme.la
kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-kwin_kwmtheme_la_LIBADD = ../../kwin.la
+kwin_kwmtheme_la_LIBADD = ../../libkwin.la
kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

22
x11/kdebase3/patches/patch-dt
View file

@ -1,22 +0,0 @@
$NetBSD: patch-dt,v 1.4 2003/03/11 13:10:28 markd Exp $
--- kwin/clients/kwmtheme/Makefile.in.orig Fri Jan 17 09:03:11 2003
+++ kwin/clients/kwmtheme/Makefile.in
@@ -290,7 +290,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_kwmtheme.la
kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-kwin_kwmtheme_la_LIBADD = ../../kwin.la
+kwin_kwmtheme_la_LIBADD = ../../libkwin.la
kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -301,7 +301,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_kwmtheme_la_DEPENDENCIES = ../../kwin.la
+kwin_kwmtheme_la_DEPENDENCIES = ../../libkwin.la
am_kwin_kwmtheme_la_OBJECTS = kwmthemeclient.lo
#>- kwin_kwmtheme_la_OBJECTS = $(am_kwin_kwmtheme_la_OBJECTS)
#>+ 1

13
x11/kdebase3/patches/patch-du
View file

@ -1,13 +0,0 @@
$NetBSD: patch-du,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/laptop/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/laptop/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_laptop.la
kwin_laptop_la_SOURCES = laptopclient.cpp
-kwin_laptop_la_LIBADD = ../../kwin.la
+kwin_laptop_la_LIBADD = ../../libkwin.la
kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

22
x11/kdebase3/patches/patch-dv
View file

@ -1,22 +0,0 @@
$NetBSD: patch-dv,v 1.4 2003/03/11 13:10:28 markd Exp $
--- kwin/clients/laptop/Makefile.in.orig Fri Jan 17 09:03:12 2003
+++ kwin/clients/laptop/Makefile.in
@@ -290,7 +290,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_laptop.la
kwin_laptop_la_SOURCES = laptopclient.cpp
-kwin_laptop_la_LIBADD = ../../kwin.la
+kwin_laptop_la_LIBADD = ../../libkwin.la
kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_laptop_la_DEPENDENCIES = ../../kwin.la
+kwin_laptop_la_DEPENDENCIES = ../../libkwin.la
am_kwin_laptop_la_OBJECTS = laptopclient.lo
#>- kwin_laptop_la_OBJECTS = $(am_kwin_laptop_la_OBJECTS)
#>+ 1

13
x11/kdebase3/patches/patch-dw
View file

@ -1,13 +0,0 @@
$NetBSD: patch-dw,v 1.2 2002/08/25 19:23:46 jlam Exp $
--- kwin/clients/modernsystem/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/modernsystem/Makefile.am
@@ -7,7 +7,7 @@
kde_module_LTLIBRARIES = kwin_modernsys.la
kwin_modernsys_la_SOURCES = modernsys.cpp
-kwin_modernsys_la_LIBADD = ../../kwin.la
+kwin_modernsys_la_LIBADD = ../../libkwin.la
kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-dx
View file

@ -1,31 +0,0 @@
$NetBSD: patch-dx,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/modernsystem/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300
+++ kwin/clients/modernsystem/Makefile.in
@@ -432,7 +432,7 @@ SUBDIRS = config
kde_module_LTLIBRARIES = kwin_modernsys.la
kwin_modernsys_la_SOURCES = modernsys.cpp
-kwin_modernsys_la_LIBADD = ../../kwin.la
+kwin_modernsys_la_LIBADD = ../../libkwin.la
kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -449,7 +449,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_modernsys_la_DEPENDENCIES = ../../kwin.la
+kwin_modernsys_la_DEPENDENCIES = ../../libkwin.la
am_kwin_modernsys_la_OBJECTS = modernsys.lo
#>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS)
#>+ 1
@@ -741,7 +741,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=buttondata.h modernsystem.desktop btnhighcolor.h
+KDE_DIST=btnhighcolor.h modernsystem.desktop Makefile.in.rej buttondata.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-dy
View file

@ -1,13 +0,0 @@
$NetBSD: patch-dy,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/quartz/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/quartz/Makefile.am
@@ -6,7 +6,7 @@
kde_module_LTLIBRARIES = kwin_quartz.la
kwin_quartz_la_SOURCES = quartz.cpp
-kwin_quartz_la_LIBADD = ../../kwin.la
+kwin_quartz_la_LIBADD = ../../libkwin.la
kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-dz
View file

@ -1,31 +0,0 @@
$NetBSD: patch-dz,v 1.5 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/quartz/Makefile.in.orig 2003-12-17 14:22:32.000000000 +1300
+++ kwin/clients/quartz/Makefile.in
@@ -430,7 +430,7 @@ SUBDIRS = . config
kde_module_LTLIBRARIES = kwin_quartz.la
kwin_quartz_la_SOURCES = quartz.cpp
-kwin_quartz_la_LIBADD = ../../kwin.la
+kwin_quartz_la_LIBADD = ../../libkwin.la
kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -447,7 +447,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_quartz_la_DEPENDENCIES = ../../kwin.la
+kwin_quartz_la_DEPENDENCIES = ../../libkwin.la
am_kwin_quartz_la_OBJECTS = quartz.lo
#>- kwin_quartz_la_OBJECTS = $(am_kwin_quartz_la_OBJECTS)
#>+ 1
@@ -739,7 +739,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=quartz.desktop
+KDE_DIST=Makefile.in.rej quartz.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-ea
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ea,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/redmond/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/redmond/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_redmond.la
kwin_redmond_la_SOURCES = redmond.cpp
-kwin_redmond_la_LIBADD = ../../kwin.la
+kwin_redmond_la_LIBADD = ../../libkwin.la
kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

31
x11/kdebase3/patches/patch-eb
View file

@ -1,31 +0,0 @@
$NetBSD: patch-eb,v 1.5 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/redmond/Makefile.in.orig 2003-12-17 14:22:33.000000000 +1300
+++ kwin/clients/redmond/Makefile.in
@@ -428,7 +428,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_redmond.la
kwin_redmond_la_SOURCES = redmond.cpp
-kwin_redmond_la_LIBADD = ../../kwin.la
+kwin_redmond_la_LIBADD = ../../libkwin.la
kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_redmond_la_DEPENDENCIES = ../../kwin.la
+kwin_redmond_la_DEPENDENCIES = ../../libkwin.la
am_kwin_redmond_la_OBJECTS = redmond.lo
#>- kwin_redmond_la_OBJECTS = $(am_kwin_redmond_la_OBJECTS)
#>+ 1
@@ -660,7 +660,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=redmond.desktop
+KDE_DIST=Makefile.in.rej redmond.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)

13
x11/kdebase3/patches/patch-ec
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ec,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/riscos/Makefile.am.orig Tue Feb 19 16:56:15 2002
+++ kwin/clients/riscos/Makefile.am
@@ -12,7 +12,7 @@
StickyButton.cpp \
HelpButton.cpp \
Static.cpp
-kwin_riscos_la_LIBADD = ../../kwin.la
+kwin_riscos_la_LIBADD = ../../libkwin.la
kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

137
x11/kdebase3/patches/patch-ed
View file

@ -1,137 +0,0 @@
$NetBSD: patch-ed,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/riscos/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300
+++ kwin/clients/riscos/Makefile.in
@@ -437,7 +437,7 @@ StickyButton.cpp \
HelpButton.cpp \
Static.cpp
-kwin_riscos_la_LIBADD = ../../kwin.la
+kwin_riscos_la_LIBADD = ../../libkwin.la
kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -464,7 +464,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_riscos_la_DEPENDENCIES = ../../kwin.la
+kwin_riscos_la_DEPENDENCIES = ../../libkwin.la
am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \
LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \
HelpButton.lo Static.lo
@@ -713,7 +713,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=Palette.h riscos.desktop
+KDE_DIST=riscos.desktop Palette.h Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -862,18 +862,18 @@ kwin_riscos.la.closure: $(kwin_riscos_la
#>+ 3
-StickyButton.moc: $(srcdir)/StickyButton.h
- $(MOC) $(srcdir)/StickyButton.h -o StickyButton.moc
-
-#>+ 1
-mocs: StickyButton.moc
-#>+ 3
Button.moc: $(srcdir)/Button.h
$(MOC) $(srcdir)/Button.h -o Button.moc
#>+ 1
mocs: Button.moc
#>+ 3
+StickyButton.moc: $(srcdir)/StickyButton.h
+ $(MOC) $(srcdir)/StickyButton.h -o StickyButton.moc
+
+#>+ 1
+mocs: StickyButton.moc
+#>+ 3
LowerButton.moc: $(srcdir)/LowerButton.h
$(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc
@@ -886,18 +886,6 @@ IconifyButton.moc: $(srcdir)/IconifyButt
#>+ 1
mocs: IconifyButton.moc
#>+ 3
-MaximiseButton.moc: $(srcdir)/MaximiseButton.h
- $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc
-
-#>+ 1
-mocs: MaximiseButton.moc
-#>+ 3
-CloseButton.moc: $(srcdir)/CloseButton.h
- $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc
-
-#>+ 1
-mocs: CloseButton.moc
-#>+ 3
Manager.moc: $(srcdir)/Manager.h
$(MOC) $(srcdir)/Manager.h -o Manager.moc
@@ -910,8 +898,20 @@ HelpButton.moc: $(srcdir)/HelpButton.h
#>+ 1
mocs: HelpButton.moc
#>+ 3
+CloseButton.moc: $(srcdir)/CloseButton.h
+ $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc
+
+#>+ 1
+mocs: CloseButton.moc
+#>+ 3
+MaximiseButton.moc: $(srcdir)/MaximiseButton.h
+ $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc
+
+#>+ 1
+mocs: MaximiseButton.moc
+#>+ 3
clean-metasources:
- -rm -f StickyButton.moc Button.moc LowerButton.moc IconifyButton.moc MaximiseButton.moc CloseButton.moc Manager.moc HelpButton.moc
+ -rm -f Button.moc StickyButton.moc LowerButton.moc IconifyButton.moc Manager.moc HelpButton.moc CloseButton.moc MaximiseButton.moc
#>+ 3
clean-closures:
@@ -928,7 +928,7 @@ force-reedit:
#>+ 11
-kwin_riscos_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Button.cpp $(srcdir)/CloseButton.cpp $(srcdir)/IconifyButton.cpp $(srcdir)/LowerButton.cpp $(srcdir)/Manager.cpp $(srcdir)/MaximiseButton.cpp $(srcdir)/StickyButton.cpp $(srcdir)/HelpButton.cpp $(srcdir)/Static.cpp StickyButton.moc IconifyButton.moc MaximiseButton.moc Manager.moc CloseButton.moc Button.moc LowerButton.moc HelpButton.moc
+kwin_riscos_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Button.cpp $(srcdir)/CloseButton.cpp $(srcdir)/IconifyButton.cpp $(srcdir)/LowerButton.cpp $(srcdir)/Manager.cpp $(srcdir)/MaximiseButton.cpp $(srcdir)/StickyButton.cpp $(srcdir)/HelpButton.cpp $(srcdir)/Static.cpp LowerButton.moc StickyButton.moc Button.moc Manager.moc IconifyButton.moc HelpButton.moc CloseButton.moc MaximiseButton.moc
@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; \
@@ -964,19 +964,19 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 17
-HelpButton.o: HelpButton.moc
-LowerButton.lo: LowerButton.moc
-StickyButton.o: StickyButton.moc
+HelpButton.lo: HelpButton.moc
StickyButton.lo: StickyButton.moc
-LowerButton.o: LowerButton.moc
+StickyButton.o: StickyButton.moc
Button.o: Button.moc
+LowerButton.lo: LowerButton.moc
+Button.lo: Button.moc
+MaximiseButton.o: MaximiseButton.moc
IconifyButton.lo: IconifyButton.moc
-CloseButton.o: CloseButton.moc
+MaximiseButton.lo: MaximiseButton.moc
+HelpButton.o: HelpButton.moc
+Manager.o: Manager.moc
+LowerButton.o: LowerButton.moc
+CloseButton.lo: CloseButton.moc
IconifyButton.o: IconifyButton.moc
-MaximiseButton.o: MaximiseButton.moc
Manager.lo: Manager.moc
-CloseButton.lo: CloseButton.moc
-Button.lo: Button.moc
-HelpButton.lo: HelpButton.moc
-Manager.o: Manager.moc
-MaximiseButton.lo: MaximiseButton.moc
+CloseButton.o: CloseButton.moc

13
x11/kdebase3/patches/patch-ee
View file

@ -1,13 +0,0 @@
$NetBSD: patch-ee,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/system/Makefile.am.orig Tue Feb 19 16:56:16 2002
+++ kwin/clients/system/Makefile.am
@@ -4,7 +4,7 @@
kde_module_LTLIBRARIES = kwin_system.la
kwin_system_la_SOURCES = systemclient.cpp
-kwin_system_la_LIBADD = ../../kwin.la
+kwin_system_la_LIBADD = ../../libkwin.la
kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

29
x11/kdebase3/patches/patch-ef
View file

@ -1,29 +0,0 @@
$NetBSD: patch-ef,v 1.4 2003/03/11 13:10:28 markd Exp $
--- kwin/clients/system/Makefile.in.orig Fri Jan 17 09:03:12 2003
+++ kwin/clients/system/Makefile.in
@@ -290,7 +290,7 @@ INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_system.la
kwin_system_la_SOURCES = systemclient.cpp
-kwin_system_la_LIBADD = ../../kwin.la
+kwin_system_la_LIBADD = ../../libkwin.la
kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_system_la_DEPENDENCIES = ../../kwin.la
+kwin_system_la_DEPENDENCIES = ../../libkwin.la
am_kwin_system_la_OBJECTS = systemclient.lo
#>- kwin_system_la_OBJECTS = $(am_kwin_system_la_OBJECTS)
#>+ 1
@@ -676,5 +676,5 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 3
-systemclient.o: systemclient.moc
systemclient.lo: systemclient.moc
+systemclient.o: systemclient.moc

13
x11/kdebase3/patches/patch-eg
View file

@ -1,13 +0,0 @@
$NetBSD: patch-eg,v 1.2 2002/08/25 19:23:47 jlam Exp $
--- kwin/clients/web/Makefile.am.orig Tue Feb 19 16:56:16 2002
+++ kwin/clients/web/Makefile.am
@@ -21,7 +21,7 @@
WebButtonMaximize.h \
WebButtonSticky.h
-kwin_web_la_LIBADD = ../../kwin.la
+kwin_web_la_LIBADD = ../../libkwin.la
kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO

150
x11/kdebase3/patches/patch-eh
View file

@ -1,150 +0,0 @@
$NetBSD: patch-eh,v 1.6 2004/01/15 10:15:14 markd Exp $
--- kwin/clients/web/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300
+++ kwin/clients/web/Makefile.in
@@ -447,7 +447,7 @@ noinst_HEADERS = \
WebButtonSticky.h
-kwin_web_la_LIBADD = ../../kwin.la
+kwin_web_la_LIBADD = ../../libkwin.la
kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
#>- METASOURCES = AUTO
@@ -461,7 +461,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES)
-kwin_web_la_DEPENDENCIES = ../../kwin.la
+kwin_web_la_DEPENDENCIES = ../../libkwin.la
am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \
WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \
WebButtonMaximize.lo WebButtonSticky.lo
@@ -709,7 +709,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=web.desktop
+KDE_DIST=web.desktop Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -858,29 +858,35 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC
#>+ 3
+WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h
+ $(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc
+
+#>+ 1
+mocs: WebButtonSticky.moc
+#>+ 3
WebButtonClose.moc: $(srcdir)/WebButtonClose.h
$(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc
#>+ 1
mocs: WebButtonClose.moc
#>+ 3
-WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
- $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
+Web.moc: $(srcdir)/Web.h
+ $(MOC) $(srcdir)/Web.h -o Web.moc
#>+ 1
-mocs: WebButtonIconify.moc
+mocs: Web.moc
#>+ 3
-WebButton.moc: $(srcdir)/WebButton.h
- $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
+WebButtonLower.moc: $(srcdir)/WebButtonLower.h
+ $(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc
#>+ 1
-mocs: WebButton.moc
+mocs: WebButtonLower.moc
#>+ 3
-WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h
- $(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc
+WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h
+ $(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc
#>+ 1
-mocs: WebButtonSticky.moc
+mocs: WebButtonHelp.moc
#>+ 3
WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h
$(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc
@@ -888,26 +894,20 @@ WebButtonMaximize.moc: $(srcdir)/WebButt
#>+ 1
mocs: WebButtonMaximize.moc
#>+ 3
-WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h
- $(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc
-
-#>+ 1
-mocs: WebButtonHelp.moc
-#>+ 3
-Web.moc: $(srcdir)/Web.h
- $(MOC) $(srcdir)/Web.h -o Web.moc
+WebButton.moc: $(srcdir)/WebButton.h
+ $(MOC) $(srcdir)/WebButton.h -o WebButton.moc
#>+ 1
-mocs: Web.moc
+mocs: WebButton.moc
#>+ 3
-WebButtonLower.moc: $(srcdir)/WebButtonLower.h
- $(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc
+WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h
+ $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc
#>+ 1
-mocs: WebButtonLower.moc
+mocs: WebButtonIconify.moc
#>+ 3
clean-metasources:
- -rm -f WebButtonClose.moc WebButtonIconify.moc WebButton.moc WebButtonSticky.moc WebButtonMaximize.moc WebButtonHelp.moc Web.moc WebButtonLower.moc
+ -rm -f WebButtonSticky.moc WebButtonClose.moc Web.moc WebButtonLower.moc WebButtonHelp.moc WebButtonMaximize.moc WebButton.moc WebButtonIconify.moc
#>+ 3
clean-closures:
@@ -924,7 +924,7 @@ force-reedit:
#>+ 11
-kwin_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonClose.moc WebButtonIconify.moc WebButton.moc WebButtonSticky.moc WebButtonMaximize.moc WebButtonHelp.moc Web.moc WebButtonLower.moc
+kwin_web_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Web.cpp $(srcdir)/WebButton.cpp $(srcdir)/WebButtonClose.cpp $(srcdir)/WebButtonHelp.cpp $(srcdir)/WebButtonIconify.cpp $(srcdir)/WebButtonLower.cpp $(srcdir)/WebButtonMaximize.cpp $(srcdir)/WebButtonSticky.cpp WebButtonSticky.moc Web.moc WebButtonHelp.moc WebButtonLower.moc WebButtonMaximize.moc WebButton.moc WebButtonIconify.moc WebButtonClose.moc
@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; \
@@ -960,19 +960,19 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 17
-WebButtonMaximize.o: WebButtonMaximize.moc
-WebButtonLower.lo: WebButtonLower.moc
-WebButton.lo: WebButton.moc
+WebButtonMaximize.lo: WebButtonMaximize.moc
+WebButtonClose.lo: WebButtonClose.moc
+WebButtonSticky.o: WebButtonSticky.moc
+Web.o: Web.moc
+WebButtonClose.o: WebButtonClose.moc
WebButtonIconify.lo: WebButtonIconify.moc
-WebButtonHelp.lo: WebButtonHelp.moc
Web.lo: Web.moc
-WebButtonClose.lo: WebButtonClose.moc
+WebButtonLower.o: WebButtonLower.moc
WebButtonHelp.o: WebButtonHelp.moc
+WebButton.o: WebButton.moc
WebButtonIconify.o: WebButtonIconify.moc
-WebButtonClose.o: WebButtonClose.moc
-WebButtonLower.o: WebButtonLower.moc
-WebButtonSticky.o: WebButtonSticky.moc
+WebButton.lo: WebButton.moc
+WebButtonMaximize.o: WebButtonMaximize.moc
+WebButtonHelp.lo: WebButtonHelp.moc
+WebButtonLower.lo: WebButtonLower.moc
WebButtonSticky.lo: WebButtonSticky.moc
-WebButtonMaximize.lo: WebButtonMaximize.moc
-Web.o: Web.moc
-WebButton.o: WebButton.moc

Some files were not shown because too many files have changed in this diff Show more