diff options
| author | markd <markd> | 2004-01-15 10:15:14 +0000 |
|---|---|---|
| committer | markd <markd> | 2004-01-15 10:15:14 +0000 |
| commit | 439058179d733390485fa0558784734693dd28ab (patch) | |
| tree | c0dfb461d10a080f6e0860f374324085c582bf8e /x11 | |
| parent | cc0734d04437a3c2e49607aaff5206ccdecdd46b (diff) | |
| download | pkgsrc-439058179d733390485fa0558784734693dd28ab.tar.gz | |
Update to KDE-3.1.5.
Changes:
* konqueror: Fixed "Location bar forgets what you type if you dont press
enter and change tabs"
* konqueror: Fixed "tabs resize (shrink) when clicked on while loading"
* konqueror: Don't show hardcoded shortcuts in tab context menu
* konqueror: Made "Detach Tab" create new konqueror window of proper size
* konqueror: Set location bar URL for new tabs immediately
* konsole: Fixed "List Sessions" feature.
Also add a kdm rc.d script (from Julio M. Merino Vidal)
Diffstat (limited to 'x11')
37 files changed, 1279 insertions, 1264 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 6deedee9c52..bea7409ca04 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.34 2004/01/03 18:49:59 reed Exp $ +# $NetBSD: Makefile,v 1.35 2004/01/15 10:15:14 markd Exp $ -DISTNAME= kdebase-3.1.4 -PKGREVISION= 3 +DISTNAME= kdebase-3.1.5 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop @@ -24,6 +23,8 @@ CONFIGURE_ARGS+= --without-java REPLACE_PERL= kcontrol/fileshare/fileshareset +RCD_SCRIPTS= kdm + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" @@ -157,5 +158,6 @@ post-install: .include "../../meta-pkgs/kde3/buildlink2.mk" .include "../../x11/qt3-tools/buildlink2.mk" .include "../../x11/kdelibs3/buildlink2.mk" +.include "../../mk/kerberos.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index f0f4df80344..0c21e629294 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2003/05/22 02:42:45 markd Exp $ +@comment $NetBSD: PLIST,v 1.12 2004/01/15 10:15:14 markd Exp $ bin/appletproxy bin/chooser bin/drkonqi @@ -64,6 +64,7 @@ bin/kwrited bin/kxkb bin/startkde etc/ksysguarddrc +etc/rc.d/kdm include/KBackgroundIface.h include/KDesktopIface.h include/KScreensaverIface.h diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index b84de0be378..3de4a21db2b 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,26 +1,26 @@ -$NetBSD: distinfo,v 1.38 2003/11/08 13:13:49 jdolecek Exp $ +$NetBSD: distinfo,v 1.39 2004/01/15 10:15:14 markd Exp $ -SHA1 (kdebase-3.1.4.tar.bz2) = 8f6e69ee4a34fdfb5b5d090ef9a4125d7936a7c4 -Size (kdebase-3.1.4.tar.bz2) = 15192052 bytes +SHA1 (kdebase-3.1.5.tar.bz2) = 489f802e2558db2025ca59ca888286a026bf2552 +Size (kdebase-3.1.5.tar.bz2) = 15163007 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b Size (Daemon.README) = 2191 bytes -SHA1 (patch-aa) = 55f763bd8ecbb1eadaeb4fb6982a35fce43ce1a5 +SHA1 (patch-aa) = 89cc384b677d1d6c9ef8282d1bd4b8d184d8191e SHA1 (patch-ab) = ef34628c73aaf9704bf06d92db6086bac3da5b44 -SHA1 (patch-ac) = 08793eed3b396839abf2b8ff3d52caafa3a9c59d +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) = 4a210a71c4830f5a3dd6545c4a106e8bff8caba7 +SHA1 (patch-ai) = 8294023f053c2689eddffbf01d32c335f536fb16 SHA1 (patch-aj) = 87e9ada51ab2d584cd3af40cc5772d52f7357429 SHA1 (patch-ak) = 19ce7c8ec8726e7e97011d322b98ca67974e51b0 SHA1 (patch-al) = 20d1860d839b90e73577e5c05f38753a45beed6c -SHA1 (patch-am) = e8e7f42749eeebc57f0d4e13fc44dbcd08f5f65c +SHA1 (patch-am) = 4acb2c8548b064ab472d6545b8f16cf8476404c2 SHA1 (patch-an) = 36bc6f26f108830290fd107f94892b32f5975a24 -SHA1 (patch-ao) = 62ea78c61d9e259a23aa8575b45bcfa5fed69b18 +SHA1 (patch-ao) = c31c60390af7f121cab70ad3a8717a43adf26b1d SHA1 (patch-ap) = 0ca89f037da734856e4ba7156b6fcbb68aaeb8b2 SHA1 (patch-aq) = e8a32080b981b8bc732cb76c060fb6b6cc0db5db SHA1 (patch-ar) = 994458dd8a423d4098abbc5ce7c8ca212aee0a3d @@ -28,92 +28,91 @@ SHA1 (patch-as) = 6c1dbaa28f0e650979a3a79c8be30ddb1e0876a9 SHA1 (patch-at) = 2f747db0e1102ff219d1723598cbe4a6e78c0cbb SHA1 (patch-au) = 53228332fc535b161bae0985b09141dfa062a25f SHA1 (patch-av) = 244206ebd238d2df3e2acdfd5b6819ff46becd5d -SHA1 (patch-aw) = 129011c80dadcfe63eb74cb5bd59da5554fc34d7 +SHA1 (patch-aw) = 473ced4a3db648f915015ad4a8ebb35de0a1c99e SHA1 (patch-ax) = 27d74a4893edfa60bbfd1d2b7a993b7a3b236282 SHA1 (patch-ay) = fb41177da4b3bbefd02c56cd34a9e6049f4c8ce2 SHA1 (patch-az) = 76629061210b9800da5267104085acc0cb521d81 -SHA1 (patch-ba) = e1057d92ed873e84ad6121322fa2f8f969a05e9e +SHA1 (patch-ba) = f8b87788ca6aca5e2f9706f3c9b5ff7a08723bbe SHA1 (patch-bb) = dc7f8209712d34f757a9573017142d7c671df10a SHA1 (patch-bc) = 2d54d0700b30f5471eb60d104148ecf5ac835f58 SHA1 (patch-bd) = 1e13d72ec5fa3bc08641f24c999dbc0e33ab11b0 SHA1 (patch-be) = b1e13c107d045fe79088feccc665f77c8d255786 SHA1 (patch-bf) = 1b218b34aa4b64d115bb1270783197e827725fb5 -SHA1 (patch-bg) = e7f2975e44eec92e508c27c4c4bbf8ce9258cb2d +SHA1 (patch-bg) = 310a3d1b91b510223c15ac79d4536c67df7cb207 SHA1 (patch-bh) = 7cc29ef896f3337cee768439904f9adfeef792fe SHA1 (patch-bi) = 1a8f2f79a24f2ba75accf83252677b830afde164 SHA1 (patch-bj) = 53e4391ff75aa2766c9b4e0d7a4796b355af8081 -SHA1 (patch-bk) = 270f5362478c4b71740a53c900e21c05e123efd5 +SHA1 (patch-bk) = 80ed1bd3ef30aecbe15dfaf572dbc6755ff3325d SHA1 (patch-bl) = 6761e02d32c7afdf02f4717ee0b4875fc07c6aab -SHA1 (patch-bm) = adab3f3d8d395aadd4404f6e2395507f030dd7f3 +SHA1 (patch-bm) = 79a9fd0d6731b3023363486c085ffd7b398012fd SHA1 (patch-bn) = b33aa4f73315a93506b36a20be2a3cabfcdd16ef SHA1 (patch-bo) = 5c0e1a396882d5436093d2597a4797a4414ead66 -SHA1 (patch-bp) = 1b51f504e3a0c72b4af9386813f767cc7957e90b -SHA1 (patch-bq) = 188150254df32941fc1f37be34336ac7d8401ebe +SHA1 (patch-bp) = b6bf3872aa3a4a7bd69a0bb7ecc31f349daf6ac1 SHA1 (patch-br) = 778a94f6e7e5900c3036ed0e9c8fd92a78b13c21 -SHA1 (patch-bs) = cd8eedc75f703010da01351daee4efdb8e8ad740 +SHA1 (patch-bs) = fba91b1e399d9285751b90311888b7369b76289f SHA1 (patch-bt) = 724c0c7aa50b5f600746a86e744b44501207939a SHA1 (patch-bv) = 0664e2420988fa50c1d96dfea09c121c89c70e16 SHA1 (patch-bx) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9 SHA1 (patch-by) = fcfca10f504c1ac9b0bb136bb941a8ab2899087b -SHA1 (patch-bz) = 87b82a90ac371949240f6dc68bc143666c1b356e +SHA1 (patch-bz) = 58a28f1c7204b7e179cbd2412319057d62ea5aa4 SHA1 (patch-cb) = 39f6feb39dbacb5a193ab7b20b365576a5bec43b SHA1 (patch-cc) = 30af57e7c59c8484e6b562664e0cb5e32c36e144 -SHA1 (patch-cd) = 99838c42b20df7558df003bb34b736ae1e5d8f74 +SHA1 (patch-cd) = 65fdd27e126a8a9f0466236d78622cc938e8a952 SHA1 (patch-cf) = f5448151bc1ca0afaceb6aac5ab0865b2a1c8c1e SHA1 (patch-cg) = b0a395b6c57e527da07f36256f2771d8ede58ac5 -SHA1 (patch-ch) = e8ec78e6c10c363211f0faf16bed06a765cbac73 +SHA1 (patch-ch) = 2169262518f56002e67c78e6e4501f59522dcbc5 SHA1 (patch-ci) = 91a906ab0cdc12e0610e9920facdb100903426d4 -SHA1 (patch-cj) = b0991467eeb3c170e5172ea31c5cf75fc2d45766 +SHA1 (patch-cj) = 77665b0fcccff0456cb07c51d1843674123bf765 SHA1 (patch-ck) = b3e6e7ab1a2217a757842cc05aaa94301b74a0dd SHA1 (patch-cm) = 71ec2ce962ac46f6a9d9634001c7492d383b69ec -SHA1 (patch-cn) = 61d8b8f99505eaf8e42dfdf8ce2d3fd0622309b4 +SHA1 (patch-cn) = 479c9eb941526beaf69841f7cb76db9f5c2dcb8c SHA1 (patch-cp) = e2a5a664b0ae0b582bf90253e3f0c91d68cdab9f SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f SHA1 (patch-cs) = 40fd36127054b092bb9a18f1f989060e9a0df018 -SHA1 (patch-ct) = ee9cdc12d3e7c75ab0be238dbe53b785ad725e11 +SHA1 (patch-ct) = 6b61eccce2bd22842568b6faebff52b9239974c4 SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf SHA1 (patch-cx) = 5e44d311404a839ab30c45d7a9ba764197a96b4b SHA1 (patch-cy) = fa472a641904f1c9fbb15240e12708aa3d935f80 -SHA1 (patch-cz) = f74d50e90acab6a9da6e95266f78fd38657ce0a8 +SHA1 (patch-cz) = 3807ed902aa07bd1c28ccdedb61b38db2cd5e394 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dg) = 900ce410b99912583ab0620d20b2e0d597f7c3a4 -SHA1 (patch-dh) = 6d3d963900e31e4359c526c4efc17103973cd799 +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) = 76e7a0dec98f63cc8e9addc4a3fdd0f07710110f +SHA1 (patch-dn) = 6ea2c644d31eca109c4657ab64c0e2f56ba2d0a5 SHA1 (patch-do) = b8712d7d7b242896f034f147969721d4cc0d50e9 -SHA1 (patch-dp) = f75bb540aa59c0df3a89b837ae93c62815f56d43 +SHA1 (patch-dp) = 2c5c9461b53b43e0c25069b54e709218896565ab SHA1 (patch-dq) = d354ec69536f68253597fc6912c8ffc5e5d19796 -SHA1 (patch-dr) = 5edc88e7e28731d85442bf4a26b95ab2ca2eca0a +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) = f1b7b494ead663b0995ab97b1334f6c49bfbe69b +SHA1 (patch-dx) = 7e9f24f67b44a542b6346bd80f159539014864b4 SHA1 (patch-dy) = c80bae613812210e1e0fbc29c767b476f925cf9c -SHA1 (patch-dz) = 01b735d0aed64b2a046cd6bea8c7387a9bcefafc +SHA1 (patch-dz) = 0f3d737904114f906d33f42a50b6969a293d13c8 SHA1 (patch-ea) = 87e6214840bcdb98da2a3b1deb648c56c9833714 -SHA1 (patch-eb) = 2f1778a43bf5c64d3265380e0c7211d6b8279da2 +SHA1 (patch-eb) = 473b4f0111d5a86249371d51ef671a2bcbfead73 SHA1 (patch-ec) = 8c9d6be582eb92ad720bf02aace5660e1c6c0dec -SHA1 (patch-ed) = 7dd9f659d5b361daa1849ae0f06449985cfde74d +SHA1 (patch-ed) = 0f5968e790d547b9b41d12fbb7ea99e0454636e5 SHA1 (patch-ee) = 9311858579184fc50cd1345b251607cd14e3dff3 SHA1 (patch-ef) = edef4f29fa65a51986306055a24fcccf7739bdef SHA1 (patch-eg) = d427baa1251f4252c4012ed8dc8567e72c5d3610 -SHA1 (patch-eh) = 0b1987583255018fdbc4b844b81715197f938bbf +SHA1 (patch-eh) = ab160ddc92d4dd601b89a5b7e43e1427549f00df SHA1 (patch-ei) = f1a9d5155af533f3628f9e3ea68f62384f3febe7 -SHA1 (patch-ej) = 3dea867394534af3902fa6654de7ca8e9b97137b +SHA1 (patch-ej) = eaac77fe210920a5729fc71eae8b0e979ebfec74 SHA1 (patch-ek) = 774406667b24eeaa1539f58207354662de4cba94 SHA1 (patch-em) = 75fa7c78bbe6aec49745d4988ddc82c46ab16efd SHA1 (patch-eo) = d62ed8023ced4637a874b8c5ee3fcd8cac49a3e1 SHA1 (patch-ep) = 6762a5d93ea1d0c4ba7ef0b447eb1e3fb3deac82 -SHA1 (patch-eq) = 917ad364f7b1d4779d8972d78ceba0a966812077 +SHA1 (patch-eq) = 527bdbb2ad75b6bdb6633f3f432136fa01b81950 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380 SHA1 (patch-es) = efe9aed66ab85970629bfd9c444b28282cc9db32 -SHA1 (patch-et) = 4a70d356cf351e67bf0b8bb62b0d7522b00a14cd +SHA1 (patch-et) = 610488a6c7b006e632c9faab7fe7ecf1473c95cf SHA1 (patch-eu) = 142d526643d21f02b349e4128dec3c44c7aece93 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5 @@ -121,3 +120,4 @@ SHA1 (patch-ex) = 989581c86846b7eede2221cb3c4e896f40ad17d5 SHA1 (patch-fa) = fc8d6f0e22548e86ad4d9f328a657c86ea9f51c4 SHA1 (patch-fb) = 5f6895322c186813c43a3426dfe4d57a17090346 SHA1 (patch-fc) = 8bdc76aa9c34e270de2fba14213db0c179c5cd31 +SHA1 (patch-fd) = 0005eaf7eaecb6377da5342c27effd798f425c95 diff --git a/x11/kdebase3/files/kdm.sh b/x11/kdebase3/files/kdm.sh new file mode 100644 index 00000000000..fe3c00869d9 --- /dev/null +++ b/x11/kdebase3/files/kdm.sh @@ -0,0 +1,26 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: kdm.sh,v 1.1 2004/01/15 10:15:14 markd Exp $ +# + +# PROVIDE: kdm +# REQUIRE: DAEMON LOGIN wscons +# KEYWORD: shutdown + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="kdm" +rcvar=$name +command="@PREFIX@/bin/${name}" +pidfile="/var/run/xdm.pid" +required_files="@PREFIX@/share/kde/config/kdm/kdmrc" + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + run_rc_command "$1" +else + echo -n " ${name}" + ${command} ${kdm_flags} ${command_args} +fi diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa index f4ac7833a9a..5e40637c8be 100644 --- a/x11/kdebase3/patches/patch-aa +++ b/x11/kdebase3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $ +$NetBSD: patch-aa,v 1.11 2004/01/15 10:15:14 markd Exp $ ---- configure.orig 2003-09-10 17:00:30.000000000 +0200 -+++ configure 2003-11-04 14:33:06.000000000 +0100 -@@ -23166,7 +23166,7 @@ +--- configure.orig 2003-12-17 14:22:44.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 @@ -11,14 +11,14 @@ $NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $ kde_cv_uic_plugins=yes fi fi -@@ -31619,63 +31619,6 @@ +@@ -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" +-/* #line $LINENO "configure" */ -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext @@ -75,7 +75,7 @@ $NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $ 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 -@@ -33816,6 +33759,23 @@ +@@ -33636,6 +33579,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_cv_have_dpms="-lXdpms" @@ -99,7 +99,7 @@ $NetBSD: patch-aa,v 1.10 2003/11/08 13:13:49 jdolecek Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -38765,6 +38725,7 @@ +@@ -38585,6 +38545,7 @@ fi case "$UNAME" in Linux) LIBHOSTS="$LIBSENSORS" ;; FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;; diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac index f5696a5d413..95484a924a6 100644 --- a/x11/kdebase3/patches/patch-ac +++ b/x11/kdebase3/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-ac,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kate/app/Makefile.in.orig 2003-07-15 22:03:17.000000000 +1200 +--- kate/app/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300 +++ kate/app/Makefile.in -@@ -421,7 +421,7 @@ target_os = @target_os@ +@@ -422,7 +422,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ x_includes = @x_includes@ x_libraries = @x_libraries@ @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ bin_PROGRAMS = kate kwrite #>- libkateinterfaces_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ -@@ -441,20 +441,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp +@@ -442,20 +442,28 @@ libkateinterfaces_la_SOURCES=kateapp.cpp libkateinterfaces_la_LIBADD = ../interfaces/libkateinterfacesprivate.la -lkscript ../lib/libkmultitabbar.la libkateinterfaces_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version @@ -48,7 +48,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) #>- METASOURCES = AUTO -@@ -466,19 +474,21 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -468,19 +476,21 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ libkateinterfaces_la_DEPENDENCIES = \ ../interfaces/libkateinterfacesprivate.la \ ../lib/libkmultitabbar.la -@@ -501,25 +511,35 @@ libkateinterfaces_la_nofinal_OBJECTS = k +@@ -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) @@ -124,7 +124,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kactionselector.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateapp.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kateconfigdialog.Plo \ -@@ -542,8 +562,8 @@ am__depfiles_maybe = depfiles +@@ -544,8 +564,8 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritedialogs.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kwritemain.Plo #>+ 47 @@ -135,7 +135,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ @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 \ -@@ -565,8 +585,8 @@ am__depfiles_maybe = depfiles +@@ -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 @@ -146,7 +146,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ @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 \ -@@ -608,10 +628,10 @@ CXXLD = $(CXX) +@@ -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) \ @@ -160,7 +160,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-am #>+ 1 -@@ -660,8 +680,12 @@ kate.la: $(kate_la_OBJECTS) $(kate_la_DE +@@ -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) @@ -173,7 +173,7 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -704,8 +728,8 @@ mostlyclean-compile: +@@ -706,8 +730,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -184,16 +184,16 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ @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@ -@@ -829,7 +853,7 @@ distclean-tags: +@@ -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=katefiledialog.h katemailfilesdialog.h kateapp.h katepluginmanager.h katefileselector.h katedocmanager.h kateviewspace.h katemain.h kateconfigplugindialogpage.h katesplitter.h kactionselector.h kateconfigdialog.h katemainwindow.h kwritemain.h kbookmarkhandler.h kateviewmanager.h kateIface.h katefilelist.h kwritedialogs.h kateconsole.h katedockcontainer.h kategrepdialog.h +-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) -@@ -967,28 +991,28 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -968,46 +992,40 @@ uninstall-am: uninstall-binPROGRAMS unin dummy_kate_la.cpp: echo > dummy_kate_la.cpp @@ -208,32 +208,41 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ .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 + + #>+ 1 +-mocs: kateconsole.moc +mocs: katefilelist.moc -+#>+ 3 - kateconfigdialog.moc: $(srcdir)/kateconfigdialog.h - $(MOC) $(srcdir)/kateconfigdialog.h -o kateconfigdialog.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: kateconfigdialog.moc +-mocs: katefiledialog.moc ++mocs: kateconfigdialog.moc #>+ 3 --kateconsole.moc: $(srcdir)/kateconsole.h -- $(MOC) $(srcdir)/kateconsole.h -o kateconsole.moc +-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: kateconsole.moc +-mocs: katesplitter.moc +mocs: kateconfigplugindialogpage.moc #>+ 3 - katemainwindow.moc: $(srcdir)/katemainwindow.h - $(MOC) $(srcdir)/katemainwindow.h -o katemainwindow.moc -@@ -996,41 +1020,41 @@ katemainwindow.moc: $(srcdir)/katemainwi +-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: katemainwindow.moc +-mocs: katepluginmanager.moc ++mocs: katemainwindow.moc #>+ 3 -katedocmanager.moc: $(srcdir)/katedocmanager.h - $(MOC) $(srcdir)/katedocmanager.h -o katedocmanager.moc @@ -244,148 +253,154 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ -mocs: katedocmanager.moc +mocs: katemailfilesdialog.moc #>+ 3 --kategrepdialog.moc: $(srcdir)/kategrepdialog.h -- $(MOC) $(srcdir)/kategrepdialog.h -o kategrepdialog.moc -+kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h -+ $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc - + kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h + $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc +@@ -1015,17 +1033,11 @@ kbookmarkhandler.moc: $(srcdir)/kbookmar #>+ 1 --mocs: kategrepdialog.moc -+mocs: kbookmarkhandler.moc + mocs: kbookmarkhandler.moc #>+ 3 --kwritemain.moc: $(srcdir)/kwritemain.h -- $(MOC) $(srcdir)/kwritemain.h -o kwritemain.moc +-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: kwritemain.moc +-mocs: katemainwindow.moc +mocs: kactionselector.moc #>+ 3 --kateviewspace.moc: $(srcdir)/kateviewspace.h -- $(MOC) $(srcdir)/kateviewspace.h -o kateviewspace.moc -+katedockcontainer.moc: $(srcdir)/katedockcontainer.h -+ $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc - + katedockcontainer.moc: $(srcdir)/katedockcontainer.h + $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc +@@ -1033,71 +1045,77 @@ katedockcontainer.moc: $(srcdir)/katedoc #>+ 1 --mocs: kateviewspace.moc -+mocs: katedockcontainer.moc + mocs: katedockcontainer.moc #>+ 3 --kbookmarkhandler.moc: $(srcdir)/kbookmarkhandler.h -- $(MOC) $(srcdir)/kbookmarkhandler.h -o kbookmarkhandler.moc +-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: kbookmarkhandler.moc +-mocs: kateviewmanager.moc +mocs: kategrepdialog.moc #>+ 3 --katefiledialog.moc: $(srcdir)/katefiledialog.h -- $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc +-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: katefiledialog.moc +-mocs: katemailfilesdialog.moc +mocs: kateconsole.moc #>+ 3 - katefileselector.moc: $(srcdir)/katefileselector.h - $(MOC) $(srcdir)/katefileselector.h -o katefileselector.moc -@@ -1038,29 +1062,23 @@ katefileselector.moc: $(srcdir)/katefile +-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: katefileselector.moc +-mocs: kwritemain.moc ++mocs: katefileselector.moc #>+ 3 --katedockcontainer.moc: $(srcdir)/katedockcontainer.h -- $(MOC) $(srcdir)/katedockcontainer.h -o katedockcontainer.moc -- --#>+ 1 --mocs: katedockcontainer.moc --#>+ 3 --katepluginmanager.moc: $(srcdir)/katepluginmanager.h -- $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc +-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: katepluginmanager.moc +-mocs: kateviewspace.moc +mocs: katesplitter.moc #>+ 3 --katemailfilesdialog.moc: $(srcdir)/katemailfilesdialog.h -- $(MOC) $(srcdir)/katemailfilesdialog.h -o katemailfilesdialog.moc +-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: katemailfilesdialog.moc +-mocs: kateapp.moc +mocs: kateviewmanager.moc #>+ 3 --katefilelist.moc: $(srcdir)/katefilelist.h -- $(MOC) $(srcdir)/katefilelist.h -o katefilelist.moc +-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: katefilelist.moc +-mocs: kwritedialogs.moc +mocs: kwritemain.moc #>+ 3 - kateapp.moc: $(srcdir)/kateapp.h - $(MOC) $(srcdir)/kateapp.h -o kateapp.moc -@@ -1068,29 +1086,29 @@ kateapp.moc: $(srcdir)/kateapp.h +-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: kateapp.moc +-mocs: kactionselector.moc ++mocs: kateapp.moc #>+ 3 --katesplitter.moc: $(srcdir)/katesplitter.h -- $(MOC) $(srcdir)/katesplitter.h -o katesplitter.moc +-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: katesplitter.moc +-mocs: kateconfigdialog.moc +mocs: kateviewspace.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 +katefiledialog.moc: $(srcdir)/katefiledialog.h + $(MOC) $(srcdir)/katefiledialog.h -o katefiledialog.moc #>+ 1 --mocs: kateviewmanager.moc +-mocs: kategrepdialog.moc +mocs: katefiledialog.moc #>+ 3 --kactionselector.moc: $(srcdir)/kactionselector.h -- $(MOC) $(srcdir)/kactionselector.h -o kactionselector.moc +-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: kactionselector.moc +-mocs: katefilelist.moc +mocs: katedocmanager.moc #>+ 3 --kateconfigplugindialogpage.moc: $(srcdir)/kateconfigplugindialogpage.h -- $(MOC) $(srcdir)/kateconfigplugindialogpage.h -o kateconfigplugindialogpage.moc +-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: kateconfigplugindialogpage.moc +-mocs: katefileselector.moc +mocs: katepluginmanager.moc - #>+ 3 - kwritedialogs.moc: $(srcdir)/kwritedialogs.h - $(MOC) $(srcdir)/kwritedialogs.h -o kwritedialogs.moc -@@ -1105,7 +1123,7 @@ kateIface_skel.cpp: kateIface.kidl ++#>+ 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 kateconfigdialog.moc kateconsole.moc katemainwindow.moc katedocmanager.moc kategrepdialog.moc kwritemain.moc kateviewspace.moc kbookmarkhandler.moc katefiledialog.moc katefileselector.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc kwritedialogs.moc +- -rm -f 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: -@@ -1123,19 +1141,7 @@ force-reedit: +@@ -1124,19 +1142,7 @@ force-reedit: #>+ 11 --kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/kwritedialogs.cpp kwritemain.moc katefiledialog.moc kwritedialogs.moc +-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; \ @@ -397,12 +412,12 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ - rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files - -#>+ 11 --libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp kateconfigdialog.moc katemainwindow.moc kateconsole.moc katedocmanager.moc kategrepdialog.moc kateviewspace.moc kbookmarkhandler.moc katefileselector.moc katefiledialog.moc katedockcontainer.moc katepluginmanager.moc katemailfilesdialog.moc katefilelist.moc kateapp.moc katesplitter.moc kateviewmanager.moc kactionselector.moc kateconfigplugindialogpage.moc +-libkateinterfaces_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp $(srcdir)/katemailfilesdialog.cpp $(srcdir)/kbookmarkhandler.cpp $(srcdir)/kactionselector.cpp $(srcdir)/katedockcontainer.cpp kateIface_skel.cpp 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; \ -@@ -1146,22 +1152,34 @@ libkateinterfaces_la.all_cpp.cpp: $(srcd +@@ -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 @@ -442,76 +457,77 @@ $NetBSD: patch-ac,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1171,43 +1189,43 @@ kde-rpo-clean: +@@ -1172,43 +1190,43 @@ kde-rpo-clean: -rm -f *.rpo #>+ 41 --kategrepdialog.o: kategrepdialog.moc --kateapp.o: kateapp.moc +-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 -+kateapp.lo: kateapp.moc -+katemainwindow.lo: katemainwindow.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 --kactionselector.o: kactionselector.moc --kategrepdialog.lo: kategrepdialog.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 --katefileselector.lo: katefileselector.moc - kwritemain.o: kwritemain.moc --kwritedialogs.lo: kwritedialogs.moc --kateconfigplugindialogpage.lo: kateconfigplugindialogpage.moc --katedockcontainer.lo: katedockcontainer.moc --kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc --katefileselector.o: katefileselector.moc --katefiledialog.o: katefiledialog.moc --kateconsole.o: kateconsole.moc -+katemailfilesdialog.lo: katemailfilesdialog.moc + 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 --kateviewmanager.o: kateviewmanager.moc --katemainwindow.lo: katemainwindow.moc ++kactionselector.lo: kactionselector.moc +katesplitter.lo: katesplitter.moc +kateconfigplugindialogpage.o: kateconfigplugindialogpage.moc +kwritemain.lo: kwritemain.moc - kwritedialogs.o: kwritedialogs.moc ++kwritedialogs.o: kwritedialogs.moc +kwritedialogs.lo: kwritedialogs.moc +kategrepdialog.o: kategrepdialog.moc -+kateviewspace.o: kateviewspace.moc -+katepluginmanager.lo: katepluginmanager.moc - kateconfigdialog.o: kateconfigdialog.moc --kwritemain.lo: kwritemain.moc --kateviewmanager.lo: kateviewmanager.moc --katefiledialog.lo: katefiledialog.moc - katedockcontainer.o: katedockcontainer.moc --kbookmarkhandler.lo: kbookmarkhandler.moc + 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 + katepluginmanager.o: katepluginmanager.moc +kateconsole.o: kateconsole.moc +kategrepdialog.lo: kategrepdialog.moc +katefilelist.o: katefilelist.moc - katemainwindow.o: katemainwindow.moc --katedocmanager.lo: katedocmanager.moc -+kateviewmanager.o: kateviewmanager.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 --katepluginmanager.lo: katepluginmanager.moc --katemailfilesdialog.o: katemailfilesdialog.moc --katemailfilesdialog.lo: katemailfilesdialog.moc --katefilelist.lo: katefilelist.moc --katepluginmanager.o: katepluginmanager.moc --kateviewspace.o: kateviewspace.moc ++kateconfigdialog.lo: kateconfigdialog.moc + katefileselector.lo: katefileselector.moc +-kategrepdialog.o: kategrepdialog.moc -kateviewspace.lo: kateviewspace.moc --katefilelist.o: katefilelist.moc --kateapp.lo: kateapp.moc -+katefileselector.lo: katefileselector.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 diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai index fc251a7c7cb..4f956be042f 100644 --- a/x11/kdebase3/patches/patch-ai +++ b/x11/kdebase3/patches/patch-ai @@ -1,8 +1,8 @@ -$NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-ai,v 1.8 2004/01/15 10:15:14 markd Exp $ ---- kcontrol/access/Makefile.in.orig 2003-07-15 22:03:17.000000000 +1200 +--- kcontrol/access/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300 +++ kcontrol/access/Makefile.in -@@ -427,16 +427,20 @@ INCLUDES = $(all_includes) +@@ -428,16 +428,20 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kaccess @@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -@@ -454,37 +458,48 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -456,37 +460,48 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -92,7 +92,7 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -506,13 +521,13 @@ CXXLD = $(CXX) +@@ -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) \ @@ -108,7 +108,7 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ #>- all: all-am #>+ 1 -@@ -592,6 +607,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc +@@ -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) @@ -117,7 +117,7 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -631,8 +648,9 @@ mostlyclean-compile: +@@ -633,8 +650,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -128,16 +128,16 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmaccess.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ -@@ -773,7 +791,7 @@ distclean-tags: +@@ -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=kaccess.h configure.in.in kcmaccess.desktop kaccess.desktop +-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) -@@ -924,25 +942,22 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -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 @@ -147,38 +147,7 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: - - #>+ 3 --kcmaccess.moc: $(srcdir)/kcmaccess.h -- $(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc -- --#>+ 1 --mocs: kcmaccess.moc --#>+ 3 - kaccess.moc: $(srcdir)/kaccess.h - $(MOC) $(srcdir)/kaccess.h -o kaccess.moc - - #>+ 1 - mocs: kaccess.moc -+#>+ 3 -+kcmaccess.moc: $(srcdir)/kcmaccess.h -+ $(MOC) $(srcdir)/kcmaccess.h -o kcmaccess.moc -+ -+#>+ 1 -+mocs: kcmaccess.moc - #>+ 8 - kcm_access.la.closure: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) - @echo "int main() {return 0;}" > kcm_access_la_closure.cpp -@@ -954,7 +969,7 @@ kcm_access.la.closure: $(kcm_access_la_O - - #>+ 3 - clean-metasources: -- -rm -f kcmaccess.moc kaccess.moc -+ -rm -f kaccess.moc kcmaccess.moc - - #>+ 3 - clean-closures: -@@ -971,33 +986,33 @@ force-reedit: +@@ -972,33 +987,33 @@ force-reedit: #>+ 11 @@ -225,12 +194,13 @@ $NetBSD: patch-ai,v 1.7 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1007,7 +1022,7 @@ kde-rpo-clean: +@@ -1008,7 +1023,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 -+kcmaccess.lo: kcmaccess.moc +-kcmaccess.o: kcmaccess.moc +-kaccess.o: kaccess.moc + kcmaccess.lo: kcmaccess.moc kaccess.lo: kaccess.moc - kcmaccess.o: kcmaccess.moc - kaccess.o: kaccess.moc --kcmaccess.lo: kcmaccess.moc ++kcmaccess.o: kcmaccess.moc ++kaccess.o: kaccess.moc diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am index a2de8d01c01..770f9a69945 100644 --- a/x11/kdebase3/patches/patch-am +++ b/x11/kdebase3/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.5 2003/05/22 02:42:47 markd Exp $ +$NetBSD: patch-am,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kcontrol/ebrowsing/Makefile.in.orig Tue May 13 23:07:53 2003 +--- kcontrol/ebrowsing/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300 +++ kcontrol/ebrowsing/Makefile.in -@@ -430,7 +430,7 @@ INCLUDES = -I$(srcdir)/plugins/ikws $(al +@@ -432,7 +432,7 @@ INCLUDES = -I$(srcdir)/plugins/ikws $(al kde_module_LTLIBRARIES = kcm_kurifilt.la kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp @@ -11,12 +11,22 @@ $NetBSD: patch-am,v 1.5 2003/05/22 02:42:47 markd Exp $ kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) data_DATA = ebrowsing.desktop -@@ -736,7 +736,7 @@ distclean-tags: +@@ -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 main.h ebrowsing.desktop -+KDE_DIST=ebrowsing.desktop filteropts.h main.h +-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 diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao index dd1ae609c46..6ca8cbae68e 100644 --- a/x11/kdebase3/patches/patch-ao +++ b/x11/kdebase3/patches/patch-ao @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-ao,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kcontrol/kcontrol/Makefile.in.orig 2003-07-15 22:03:19.000000000 +1200 +--- kcontrol/kcontrol/Makefile.in.orig 2004-01-02 14:05:56.000000000 +1300 +++ kcontrol/kcontrol/Makefile.in -@@ -446,52 +446,65 @@ INCLUDES = $(all_includes) +@@ -447,52 +447,65 @@ INCLUDES = $(all_includes) SUBDIRS = . pics @@ -95,7 +95,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic rccontroldir = $(kde_datadir)/kcontrol -@@ -510,7 +523,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -512,7 +525,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -104,7 +104,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ am_kcminit_la_OBJECTS = kcminit.lo global.lo #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) #>+ 4 -@@ -518,60 +531,84 @@ kcminit_la_final_OBJECTS = kcminit_la.al +@@ -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) @@ -214,7 +214,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kecdialog.Plo ./$(DEPDIR)/main.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/modloader.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/moduleIface.Plo \ -@@ -582,13 +619,19 @@ am__depfiles_maybe = depfiles +@@ -584,13 +621,19 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/quickhelp.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/searchwidget.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/toplevel.Plo @@ -238,7 +238,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ @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 \ -@@ -600,11 +643,17 @@ am__depfiles_maybe = depfiles +@@ -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 \ @@ -258,7 +258,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ @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 \ -@@ -635,8 +684,9 @@ CXXLD = $(CXX) +@@ -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) \ @@ -270,7 +270,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ DATA = $(data_DATA) $(rccontrol_DATA) $(rcinfo_DATA) -@@ -647,7 +697,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -649,7 +699,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -279,7 +279,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -698,6 +748,12 @@ kcmshell.la: $(kcmshell_la_OBJECTS) $(kc +@@ -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) @@ -292,7 +292,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -745,13 +801,17 @@ distclean-compile: +@@ -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@ @@ -311,16 +311,16 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ @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@ -@@ -985,7 +1045,7 @@ distclean-tags: +@@ -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=cr32-app-kcontrol.png cr48-app-kcontrol.png kcdialog.h proxywidget.h quickhelp.h KControl_NoDisplay.desktop cr64-app-kcontrol.png aboutwidget.h global.h toplevel.h modulemenu.h modulemenu.cpp kinfocenterui.rc kcontrolui.rc kcmshell.h kinfocenter.desktop helpwidget.h main.h moduleinfo.h moduletreeview.h searchwidget.h moduleiconview.h dockcontainer.h kecdialog.h cr16-app-kcontrol.png version.h cr128-app-kcontrol.png indexwidget.h KControl.desktop moduleIface.h modules.h modloader.h kcrootonly.h +-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) -@@ -1059,7 +1119,6 @@ install-strip: +@@ -1067,7 +1127,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -328,7 +328,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -1164,49 +1223,34 @@ install-data-local: KControl_NoDisplay.d +@@ -1172,67 +1231,58 @@ install-data-local: KControl_NoDisplay.d messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot @@ -340,181 +340,172 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ .NOEXPORT: #>+ 3 --moduleinfo.moc: $(srcdir)/moduleinfo.h -- $(MOC) $(srcdir)/moduleinfo.h -o moduleinfo.moc +-kcmshell.moc: $(srcdir)/kcmshell.h +- $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc - -#>+ 1 --mocs: moduleinfo.moc +-mocs: kcmshell.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 ++indexwidget.moc: $(srcdir)/indexwidget.h ++ $(MOC) $(srcdir)/indexwidget.h -o indexwidget.moc #>+ 1 - mocs: indexwidget.moc +-mocs: proxywidget.moc ++mocs: indexwidget.moc #>+ 3 --moduleiconview.moc: $(srcdir)/moduleiconview.h -- $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc -- --#>+ 1 --mocs: moduleiconview.moc --#>+ 3 --dockcontainer.moc: $(srcdir)/dockcontainer.h -- $(MOC) $(srcdir)/dockcontainer.h -o dockcontainer.moc +-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: dockcontainer.moc +-mocs: moduletreeview.moc +mocs: main.moc #>+ 3 --aboutwidget.moc: $(srcdir)/aboutwidget.h -- $(MOC) $(srcdir)/aboutwidget.h -o aboutwidget.moc +-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: aboutwidget.moc +-mocs: toplevel.moc +mocs: moduleinfo.moc #>+ 3 --proxywidget.moc: $(srcdir)/proxywidget.h -- $(MOC) $(srcdir)/proxywidget.h -o proxywidget.moc +-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: proxywidget.moc +-mocs: aboutwidget.moc +mocs: kcmshell.moc #>+ 3 - helpwidget.moc: $(srcdir)/helpwidget.h - $(MOC) $(srcdir)/helpwidget.h -o helpwidget.moc -@@ -1214,17 +1258,29 @@ helpwidget.moc: $(srcdir)/helpwidget.h +-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: helpwidget.moc +-mocs: kecdialog.moc ++mocs: helpwidget.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 +toplevel.moc: $(srcdir)/toplevel.h + $(MOC) $(srcdir)/toplevel.h -o toplevel.moc #>+ 1 --mocs: quickhelp.moc +-mocs: moduleiconview.moc +mocs: toplevel.moc #>+ 3 --main.moc: $(srcdir)/main.h -- $(MOC) $(srcdir)/main.h -o main.moc +-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: main.moc +-mocs: moduleIface.moc +mocs: moduletreeview.moc -+#>+ 3 + #>+ 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 + + #>+ 1 +-mocs: dockcontainer.moc +mocs: kecdialog.moc -+#>+ 3 -+modulemenu.moc: $(srcdir)/modulemenu.h -+ $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc -+ -+#>+ 1 -+mocs: modulemenu.moc #>+ 3 - modules.moc: $(srcdir)/modules.h - $(MOC) $(srcdir)/modules.h -o modules.moc -@@ -1232,53 +1288,53 @@ modules.moc: $(srcdir)/modules.h + modulemenu.moc: $(srcdir)/modulemenu.h + $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc +@@ -1240,17 +1290,17 @@ modulemenu.moc: $(srcdir)/modulemenu.h #>+ 1 - mocs: modules.moc + mocs: modulemenu.moc #>+ 3 --kcdialog.moc: $(srcdir)/kcdialog.h -- $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc -+moduleiconview.moc: $(srcdir)/moduleiconview.h -+ $(MOC) $(srcdir)/moduleiconview.h -o moduleiconview.moc +-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: kcdialog.moc -+mocs: moduleiconview.moc +-mocs: moduleinfo.moc ++mocs: modules.moc #>+ 3 --moduletreeview.moc: $(srcdir)/moduletreeview.h -- $(MOC) $(srcdir)/moduletreeview.h -o moduletreeview.moc -+kcdialog.moc: $(srcdir)/kcdialog.h -+ $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc +-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: moduletreeview.moc -+mocs: kcdialog.moc +-mocs: quickhelp.moc ++mocs: moduleiconview.moc #>+ 3 --kecdialog.moc: $(srcdir)/kecdialog.h -- $(MOC) $(srcdir)/kecdialog.h -o kecdialog.moc -+searchwidget.moc: $(srcdir)/searchwidget.h -+ $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc - + kcdialog.moc: $(srcdir)/kcdialog.h + $(MOC) $(srcdir)/kcdialog.h -o kcdialog.moc +@@ -1264,29 +1314,35 @@ searchwidget.moc: $(srcdir)/searchwidget #>+ 1 --mocs: kecdialog.moc -+mocs: searchwidget.moc + mocs: searchwidget.moc #>+ 3 --toplevel.moc: $(srcdir)/toplevel.h -- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc +-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: toplevel.moc +-mocs: modules.moc +mocs: moduleIface.moc #>+ 3 --modulemenu.moc: $(srcdir)/modulemenu.h -- $(MOC) $(srcdir)/modulemenu.h -o modulemenu.moc +-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: modulemenu.moc +-mocs: helpwidget.moc +mocs: aboutwidget.moc #>+ 3 --kcmshell.moc: $(srcdir)/kcmshell.h -- $(MOC) $(srcdir)/kcmshell.h -o kcmshell.moc +-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: kcmshell.moc +-mocs: indexwidget.moc +mocs: proxywidget.moc #>+ 3 --moduleIface.moc: $(srcdir)/moduleIface.h -- $(MOC) $(srcdir)/moduleIface.h -o moduleIface.moc +-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: moduleIface.moc +-mocs: main.moc +mocs: dockcontainer.moc - #>+ 3 --searchwidget.moc: $(srcdir)/searchwidget.h -- $(MOC) $(srcdir)/searchwidget.h -o searchwidget.moc ++#>+ 3 +quickhelp.moc: $(srcdir)/quickhelp.h + $(MOC) $(srcdir)/quickhelp.h -o quickhelp.moc - - #>+ 1 --mocs: searchwidget.moc ++ ++#>+ 1 +mocs: quickhelp.moc #>+ 5 kcdialog.kidl: $(srcdir)/kcdialog.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/kcdialog.h > kcdialog.kidl || ( rm -f kcdialog.kidl ; false ) -@@ -1293,7 +1349,7 @@ moduleIface_skel.cpp: moduleIface.kidl +@@ -1301,7 +1357,7 @@ moduleIface_skel.cpp: moduleIface.kidl #>+ 3 clean-metasources: -- -rm -f moduleinfo.moc indexwidget.moc moduleiconview.moc dockcontainer.moc aboutwidget.moc proxywidget.moc helpwidget.moc quickhelp.moc main.moc modules.moc kcdialog.moc moduletreeview.moc kecdialog.moc toplevel.moc modulemenu.moc kcmshell.moc moduleIface.moc searchwidget.moc +- -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: -@@ -1344,45 +1400,57 @@ kcminit_la.all_cpp.cpp: $(srcdir)/Makefi +@@ -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 kecdialog.moc kcdialog.moc moduleinfo.moc proxywidget.moc kcmshell.moc +-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; \ @@ -546,7 +537,7 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ + 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 indexwidget.moc dockcontainer.moc moduleiconview.moc helpwidget.moc kecdialog.moc moduletreeview.moc searchwidget.moc moduleinfo.moc aboutwidget.moc proxywidget.moc quickhelp.moc main.moc modules.moc toplevel.moc moduleIface.moc +-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; \ @@ -589,60 +580,52 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1392,39 +1460,39 @@ kde-rpo-clean: +@@ -1400,39 +1468,39 @@ kde-rpo-clean: -rm -f *.rpo #>+ 37 --quickhelp.o: quickhelp.moc +searchwidget.lo: searchwidget.moc - toplevel.lo: toplevel.moc --moduletreeview.lo: moduletreeview.moc --main.lo: main.moc --kcmshell.lo: kcmshell.moc --kcdialog.lo: kcdialog.moc --searchwidget.o: searchwidget.moc --modulemenu.lo: modulemenu.moc --moduleinfo.lo: moduleinfo.moc --dockcontainer.o: dockcontainer.moc --moduleiconview.o: moduleiconview.moc --modules.o: modules.moc --proxywidget.lo: proxywidget.moc --kcmshell.o: kcmshell.moc --dockcontainer.lo: dockcontainer.moc --quickhelp.lo: quickhelp.moc --indexwidget.o: indexwidget.moc --kcdialog.o: kcdialog.moc - helpwidget.lo: helpwidget.moc --modulemenu.o: modulemenu.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 - indexwidget.lo: indexwidget.moc --helpwidget.o: helpwidget.moc --moduleinfo.o: moduleinfo.moc --aboutwidget.o: aboutwidget.moc +-kcdialog.lo: kcdialog.moc ++proxywidget.o: proxywidget.moc + modulemenu.o: modulemenu.moc -toplevel.o: toplevel.moc --moduleIface.o: moduleIface.moc --moduletreeview.o: moduletreeview.moc - kecdialog.lo: kecdialog.moc --searchwidget.lo: searchwidget.moc -+dockcontainer.o: dockcontainer.moc - proxywidget.o: proxywidget.moc --moduleIface.lo: moduleIface.moc --moduleiconview.lo: moduleiconview.moc -+modulemenu.o: modulemenu.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 + dockcontainer.lo: dockcontainer.moc +-quickhelp.lo: quickhelp.moc +kcdialog.o: kcdialog.moc -+moduleIface.o: moduleIface.moc + moduleIface.o: moduleIface.moc kecdialog.o: kecdialog.moc -+proxywidget.lo: proxywidget.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 @@ -651,9 +634,15 @@ $NetBSD: patch-ao,v 1.6 2003/07/30 13:34:59 markd Exp $ +helpwidget.o: helpwidget.moc +moduleinfo.lo: moduleinfo.moc +modules.o: modules.moc -+kcmshell.lo: kcmshell.moc + kcmshell.lo: kcmshell.moc +moduleiconview.o: moduleiconview.moc - modules.lo: modules.moc -+moduleinfo.o: moduleinfo.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 + modulemenu.lo: modulemenu.moc +-modules.o: modules.moc +-helpwidget.o: helpwidget.moc diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw index acf7c9181c2..93a95ece267 100644 --- a/x11/kdebase3/patches/patch-aw +++ b/x11/kdebase3/patches/patch-aw @@ -1,8 +1,8 @@ -$NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-aw,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kdeprint/kjobviewer/Makefile.in.orig 2003-07-15 22:03:29.000000000 +1200 +--- kdeprint/kjobviewer/Makefile.in.orig 2004-01-02 14:05:57.000000000 +1300 +++ kdeprint/kjobviewer/Makefile.in -@@ -424,15 +424,20 @@ x_libraries = @x_libraries@ +@@ -425,15 +425,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kjobviewer @@ -28,7 +28,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kjobviewer.h -@@ -450,33 +455,41 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -452,33 +457,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -86,7 +86,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -496,13 +509,14 @@ CXXLD = $(CXX) +@@ -498,13 +511,14 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -103,7 +103,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-am #>+ 1 -@@ -549,6 +563,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -112,7 +112,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -588,8 +604,9 @@ mostlyclean-compile: +@@ -590,8 +606,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -123,16 +123,16 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -729,7 +746,7 @@ distclean-tags: +@@ -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 cr16-app-kjobviewer.png cr32-app-kjobviewer.png kjobviewer.desktop +-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) -@@ -871,9 +888,6 @@ uninstall-am: uninstall-kde-icons unins +@@ -872,9 +889,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-libLTLIBRARIES uninstall-rcDATA @@ -142,7 +142,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. -@@ -887,8 +901,14 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h +@@ -888,8 +902,14 @@ kjobviewer.moc: $(srcdir)/kjobviewer.h #>+ 1 mocs: kjobviewer.moc #>+ 3 @@ -158,7 +158,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 2 docs-am: -@@ -912,33 +932,33 @@ force-reedit: +@@ -913,33 +933,33 @@ force-reedit: #>+ 11 @@ -205,7 +205,7 @@ $NetBSD: patch-aw,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -948,5 +968,5 @@ kde-rpo-clean: +@@ -949,5 +969,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba index 422a227444c..e821a917ede 100644 --- a/x11/kdebase3/patches/patch-ba +++ b/x11/kdebase3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-ba,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kdesktop/Makefile.in.orig 2003-07-15 22:03:30.000000000 +1200 +--- kdesktop/Makefile.in.orig 2004-01-02 14:05:57.000000000 +1300 +++ kdesktop/Makefile.in -@@ -423,10 +423,17 @@ x_includes = @x_includes@ +@@ -424,10 +424,17 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) @@ -22,7 +22,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ SUBDIRS = . lock pics patterns programs init kwebdesktop -@@ -434,22 +441,24 @@ SUBDIRS = . lock pics patterns programs +@@ -435,22 +442,24 @@ SUBDIRS = . lock pics patterns programs ####### Files bin_PROGRAMS = kdesktop bin_SCRIPTS = kdeeject @@ -51,7 +51,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h -@@ -471,27 +480,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -473,27 +482,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -72,7 +72,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ + minicli.lo pixmapserver.lo kcustommenu.lo startupid.lo +#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) #>+ 6 --kdesktop_la_final_OBJECTS = kdesktop_la.all_cc.lo kdesktop_la.all_cpp.lo +-kdesktop_la_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 @@ -98,7 +98,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ SCRIPTS = $(bin_SCRIPTS) -@@ -499,25 +513,31 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$( +@@ -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 \ @@ -114,7 +114,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/pixmapserver.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/startupid.Plo ./$(DEPDIR)/xautolock.Plo -#>+ 17 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KDesktopIface_skel.P $(DEPDIR)/KScreensaverIface_skel.P $(DEPDIR)/KBackgroundIface_skel.P $(DEPDIR)/kdesktop_la.all_cc.P $(DEPDIR)/kdesktop_la.all_cpp.P ./$(DEPDIR)/bgmanager.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@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 @@ -138,7 +138,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ @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 \ -@@ -542,7 +562,8 @@ CXXLD = $(CXX) +@@ -544,7 +564,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -148,7 +148,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ DATA = $(autostart_DATA) $(menu_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -556,7 +577,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -558,7 +579,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -157,7 +157,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -603,6 +624,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -166,7 +166,7 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -664,9 +687,10 @@ distclean-compile: +@@ -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@ @@ -178,16 +178,16 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ @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@ -@@ -928,7 +952,7 @@ distclean-tags: +@@ -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=kcustommenu.h kdesktopbindings.cpp DESIGN kdesktop.desktop kdesktop_custom_menu1 kdiconview.h kdeeject kdesktop_custom_menu2 +-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) -@@ -1103,44 +1127,30 @@ dummy.cc: +@@ -1111,32 +1135,6 @@ dummy.cc: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -205,80 +205,89 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ -KBackgroundIface_skel.cc: KBackgroundIface.kidl - $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl - - #>+ 3 +-#>+ 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 -+xautolock.moc: $(srcdir)/xautolock.h -+ $(MOC) $(srcdir)/xautolock.h -o xautolock.moc - - #>+ 1 +- +-#>+ 1 -mocs: krootwm.moc -+mocs: xautolock.moc #>+ 3 --minicli.moc: $(srcdir)/minicli.h -- $(MOC) $(srcdir)/minicli.h -o minicli.moc + xautolock.moc: $(srcdir)/xautolock.h + $(MOC) $(srcdir)/xautolock.h -o xautolock.moc +@@ -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: minicli.moc +-mocs: pixmapserver.moc +mocs: lockeng.moc #>+ 3 --startupid.moc: $(srcdir)/startupid.h -- $(MOC) $(srcdir)/startupid.h -o startupid.moc -+bgmanager.moc: $(srcdir)/bgmanager.h -+ $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc - + bgmanager.moc: $(srcdir)/bgmanager.h + $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc +@@ -1156,11 +1154,11 @@ bgmanager.moc: $(srcdir)/bgmanager.h #>+ 1 --mocs: startupid.moc -+mocs: bgmanager.moc + mocs: bgmanager.moc #>+ 3 --lockeng.moc: $(srcdir)/lockeng.h -- $(MOC) $(srcdir)/lockeng.h -o lockeng.moc +-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: lockeng.moc +-mocs: minicli.moc +mocs: kdiconview.moc #>+ 3 desktop.moc: $(srcdir)/desktop.h $(MOC) $(srcdir)/desktop.h -o desktop.moc -@@ -1154,32 +1164,46 @@ pixmapserver.moc: $(srcdir)/pixmapserver +@@ -1168,11 +1166,11 @@ desktop.moc: $(srcdir)/desktop.h #>+ 1 - mocs: pixmapserver.moc + mocs: desktop.moc #>+ 3 -+startupid.moc: $(srcdir)/startupid.h -+ $(MOC) $(srcdir)/startupid.h -o startupid.moc -+ -+#>+ 1 -+mocs: startupid.moc -+#>+ 3 - kcustommenu.moc: $(srcdir)/kcustommenu.h - $(MOC) $(srcdir)/kcustommenu.h -o kcustommenu.moc +-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: 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 -+minicli.moc: $(srcdir)/minicli.h -+ $(MOC) $(srcdir)/minicli.h -o minicli.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 --xautolock.moc: $(srcdir)/xautolock.h -- $(MOC) $(srcdir)/xautolock.h -o xautolock.moc ++#>+ 3 +krootwm.moc: $(srcdir)/krootwm.h + $(MOC) $(srcdir)/krootwm.h -o krootwm.moc - - #>+ 1 --mocs: xautolock.moc --#>+ 3 --bgmanager.moc: $(srcdir)/bgmanager.h -- $(MOC) $(srcdir)/bgmanager.h -o bgmanager.moc ++ ++#>+ 1 +mocs: krootwm.moc +#>+ 13 +KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOP_DEPENDENCIES) @@ -293,64 +302,60 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ + $(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 - --#>+ 1 --mocs: bgmanager.moc ++ #>+ 3 clean-metasources: -- -rm -f krootwm.moc minicli.moc startupid.moc lockeng.moc desktop.moc pixmapserver.moc kcustommenu.moc kdiconview.moc xautolock.moc bgmanager.moc +- -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: -@@ -1199,45 +1223,45 @@ force-reedit: +@@ -1207,45 +1231,45 @@ force-reedit: #>+ 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 minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc -- @echo 'creating kdesktop_la.all_cc.cc ...'; \ -- rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ -- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ -- for file in 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; \ +-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 \ + 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_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 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_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp minicli.moc krootwm.moc kdiconview.moc kcustommenu.moc pixmapserver.moc startupid.moc lockeng.moc bgmanager.moc xautolock.moc desktop.moc -- @echo 'creating kdesktop_la.all_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; \ -- 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; \ +-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 \ + 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_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 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_cc.cc kdesktop_la.all_cpp.cpp +- -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 @@ -372,40 +377,41 @@ $NetBSD: patch-ba,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1247,23 +1271,23 @@ kde-rpo-clean: +@@ -1255,23 +1279,23 @@ kde-rpo-clean: -rm -f *.rpo #>+ 21 --kdiconview.o: kdiconview.moc --lockeng.o: lockeng.moc - krootwm.lo: krootwm.moc --pixmapserver.lo: pixmapserver.moc +-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 -+minicli.lo: minicli.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 --minicli.o: minicli.moc --pixmapserver.o: pixmapserver.moc ++xautolock.o: xautolock.moc + lockeng.o: lockeng.moc -kcustommenu.o: kcustommenu.moc --desktop.lo: desktop.moc -+lockeng.o: lockeng.moc +bgmanager.lo: bgmanager.moc -+startupid.o: startupid.moc - xautolock.lo: xautolock.moc --startupid.lo: startupid.moc --lockeng.lo: lockeng.moc - desktop.o: desktop.moc --minicli.lo: minicli.moc --startupid.o: startupid.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 + startupid.lo: startupid.moc +minicli.o: minicli.moc - kdiconview.lo: kdiconview.moc ++kdiconview.lo: kdiconview.moc +pixmapserver.o: pixmapserver.moc - kcustommenu.lo: kcustommenu.moc -+kdiconview.o: kdiconview.moc ++kcustommenu.lo: kcustommenu.moc + kdiconview.o: kdiconview.moc +-pixmapserver.lo: pixmapserver.moc +bgmanager.o: bgmanager.moc diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg index 0c2950e8974..f6bdf63dce6 100644 --- a/x11/kdebase3/patches/patch-bg +++ b/x11/kdebase3/patches/patch-bg @@ -1,8 +1,8 @@ -$NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-bg,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- khotkeys/khotkeys/Makefile.in.orig 2003-07-15 22:03:33.000000000 +1200 +--- khotkeys/khotkeys/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300 +++ khotkeys/khotkeys/Makefile.in -@@ -425,16 +425,20 @@ x_includes = @x_includes@ +@@ -426,16 +426,20 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ bin_PROGRAMS = khotkeys @@ -29,7 +29,7 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = khotkeys.desktop -@@ -451,33 +455,41 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -453,33 +457,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -87,7 +87,7 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -497,13 +509,14 @@ CXXLD = $(CXX) +@@ -499,13 +511,14 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -104,7 +104,7 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-am #>+ 1 -@@ -550,6 +563,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -113,7 +113,7 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -589,8 +604,9 @@ mostlyclean-compile: +@@ -591,8 +606,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,16 +124,16 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ distclean-depend: -@@ -712,7 +728,7 @@ distclean-tags: +@@ -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.cpp khotkeys.desktop khkglobalaccel.h +-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) -@@ -848,34 +864,31 @@ uninstall-am: uninstall-autostartDATA un +@@ -849,19 +865,10 @@ uninstall-am: uninstall-autostartDATA un uninstall-binPROGRAMS uninstall-info-am \ uninstall-libLTLIBRARIES @@ -149,37 +149,24 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ - $(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 - -+#>+ 1 -+mocs: khotkeys.moc +- #>+ 3 - khkglobalaccel.moc: $(srcdir)/khkglobalaccel.h - $(MOC) $(srcdir)/khkglobalaccel.h -o khkglobalaccel.moc + khotkeys.moc: $(srcdir)/khotkeys.h + $(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc +@@ -874,6 +881,12 @@ khkglobalaccel.moc: $(srcdir)/khkglobala #>+ 1 mocs: khkglobalaccel.moc --#>+ 3 --khotkeys.moc: $(srcdir)/khotkeys.h -- $(MOC) $(srcdir)/khotkeys.h -o khotkeys.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 - --#>+ 1 --mocs: khotkeys.moc ++ #>+ 3 clean-metasources: -- -rm -f khkglobalaccel.moc khotkeys.moc -+ -rm -f khotkeys.moc khkglobalaccel.moc - - #>+ 4 - clean-idl: -@@ -893,33 +906,33 @@ force-reedit: + -rm -f khotkeys.moc khkglobalaccel.moc +@@ -894,33 +907,33 @@ force-reedit: #>+ 11 @@ -226,11 +213,14 @@ $NetBSD: patch-bg,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -930,6 +943,6 @@ kde-rpo-clean: +@@ -930,7 +943,7 @@ kde-rpo-clean: + -rm -f *.rpo #>+ 5 - khotkeys.lo: khotkeys.moc -khotkeys.o: khotkeys.moc - khkglobalaccel.lo: khkglobalaccel.moc - khkglobalaccel.o: khkglobalaccel.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 diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk index fa75ce26ced..c7e25f91568 100644 --- a/x11/kdebase3/patches/patch-bk +++ b/x11/kdebase3/patches/patch-bk @@ -1,8 +1,8 @@ -$NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ +$NetBSD: patch-bk,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kicker/Makefile.in.orig Tue May 13 23:07:57 2003 +--- kicker/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300 +++ kicker/Makefile.in -@@ -425,19 +425,23 @@ INCLUDES = $(all_includes) +@@ -427,19 +427,23 @@ INCLUDES = $(all_includes) SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data bin_PROGRAMS = kicker @@ -32,7 +32,7 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) autostart_DATA = panel.desktop -@@ -455,28 +459,37 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -457,28 +461,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -80,7 +80,7 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -496,7 +509,8 @@ CXXLD = $(CXX) +@@ -498,7 +511,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -90,7 +90,7 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ DATA = $(autostart_DATA) $(config_DATA) $(update_DATA) -@@ -507,7 +521,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -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) @@ -99,7 +99,7 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -552,11 +566,13 @@ clean-libLTLIBRARIES: +@@ -554,11 +568,13 @@ clean-libLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done @@ -117,7 +117,7 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -597,7 +613,8 @@ distclean-compile: +@@ -599,7 +615,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@ @@ -127,16 +127,16 @@ $NetBSD: patch-bk,v 1.5 2003/05/22 02:42:49 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -824,7 +841,7 @@ distclean-tags: +@@ -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=kcmkicker.desktop panel.desktop kicker-3.1-properSizeSetting.pl kickerrc.upd -+KDE_DIST=kicker-3.1-properSizeSetting.pl kcmkicker.desktop kickerrc.upd panel.desktop +-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) -@@ -996,17 +1013,17 @@ dummy.cpp dummy_la.cpp: +@@ -998,17 +1015,17 @@ dummy.cpp dummy_la.cpp: .NOEXPORT: #>+ 8 diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm index 2763a82bf02..37e13f72d0c 100644 --- a/x11/kdebase3/patches/patch-bm +++ b/x11/kdebase3/patches/patch-bm @@ -1,16 +1,17 @@ -$NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-bm,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kicker/applets/launcher/Makefile.in.orig 2003-07-15 22:03:33.000000000 +1200 +--- kicker/applets/launcher/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300 +++ kicker/applets/launcher/Makefile.in -@@ -437,14 +437,14 @@ lnk_DATA = quicklauncher.desktop +@@ -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 - CONFIG_HEADER = $(top_builddir)/config.h +@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -19,7 +20,7 @@ $NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \ quickaddappsmenu.lo #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS) -@@ -673,7 +673,7 @@ distclean-tags: +@@ -675,7 +675,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -28,9 +29,9 @@ $NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -829,12 +829,6 @@ launcher_panelapplet.la.closure: $(launc - - +@@ -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 @@ -38,10 +39,9 @@ $NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ -#>+ 1 -mocs: quickbutton.moc -#>+ 3 - quickaddappsmenu.moc: $(srcdir)/quickaddappsmenu.h - $(MOC) $(srcdir)/quickaddappsmenu.h -o quickaddappsmenu.moc + quicklauncher.moc: $(srcdir)/quicklauncher.h + $(MOC) $(srcdir)/quicklauncher.h -o quicklauncher.moc -@@ -847,8 +841,14 @@ quicklauncher.moc: $(srcdir)/quicklaunch #>+ 1 mocs: quicklauncher.moc #>+ 3 @@ -52,12 +52,12 @@ $NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ +mocs: quickbutton.moc +#>+ 3 clean-metasources: -- -rm -f quickbutton.moc quickaddappsmenu.moc quicklauncher.moc +- -rm -f quickaddappsmenu.moc quickbutton.moc quicklauncher.moc + -rm -f quickaddappsmenu.moc quicklauncher.moc quickbutton.moc #>+ 3 clean-closures: -@@ -865,7 +865,7 @@ force-reedit: +@@ -866,7 +866,7 @@ force-reedit: #>+ 11 @@ -66,16 +66,15 @@ $NetBSD: patch-bm,v 1.6 2003/07/30 13:34:59 markd Exp $ @echo 'creating launcher_panelapplet_la.all_cpp.cpp ...'; \ rm -f launcher_panelapplet_la.all_cpp.files launcher_panelapplet_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> launcher_panelapplet_la.all_cpp.final; \ -@@ -901,9 +901,9 @@ kde-rpo-clean: +@@ -902,9 +902,9 @@ kde-rpo-clean: -rm -f *.rpo #>+ 7 -quicklauncher.lo: quicklauncher.moc -+quicklauncher.o: quicklauncher.moc + quicklauncher.o: quicklauncher.moc +-quickbutton.o: quickbutton.moc quickaddappsmenu.lo: quickaddappsmenu.moc --quickbutton.lo: quickbutton.moc - quickbutton.o: quickbutton.moc --quicklauncher.o: quicklauncher.moc ++quickbutton.o: quickbutton.moc quickaddappsmenu.o: quickaddappsmenu.moc +quicklauncher.lo: quicklauncher.moc -+quickbutton.lo: quickbutton.moc + quickbutton.lo: quickbutton.moc diff --git a/x11/kdebase3/patches/patch-bp b/x11/kdebase3/patches/patch-bp index 5ff92d57fce..aef7861d9d0 100644 --- a/x11/kdebase3/patches/patch-bp +++ b/x11/kdebase3/patches/patch-bp @@ -1,8 +1,8 @@ -$NetBSD: patch-bp,v 1.4 2003/03/11 13:10:22 markd Exp $ +$NetBSD: patch-bp,v 1.5 2004/01/15 10:15:14 markd Exp $ ---- kicker/extensions/childpanel/Makefile.in.orig Fri Jan 17 09:03:08 2003 +--- kicker/extensions/childpanel/Makefile.in.orig 2003-12-17 14:22:07.000000000 +1300 +++ kicker/extensions/childpanel/Makefile.in -@@ -293,7 +293,7 @@ kde_module_LTLIBRARIES = childpanel_pane +@@ -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) @@ -11,7 +11,7 @@ $NetBSD: patch-bp,v 1.4 2003/03/11 13:10:22 markd Exp $ noinst_HEADERS = childpanelextension.h -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,10 +20,12 @@ $NetBSD: patch-bp,v 1.4 2003/03/11 13:10:22 markd Exp $ am_childpanel_panelextension_la_OBJECTS = childpanelextension.lo #>- childpanel_panelextension_la_OBJECTS = \ #>- $(am_childpanel_panelextension_la_OBJECTS) -@@ -708,5 +708,5 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -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) - #>+ 3 --childpanelextension.lo: childpanelextension.moc - childpanelextension.o: childpanelextension.moc -+childpanelextension.lo: childpanelextension.moc diff --git a/x11/kdebase3/patches/patch-bq b/x11/kdebase3/patches/patch-bq deleted file mode 100644 index 333f130ecd7..00000000000 --- a/x11/kdebase3/patches/patch-bq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bq,v 1.4 2003/08/02 19:33:24 mrg Exp $ - ---- kwin/clients/keramik/embedtool.cpp.orig 2003-08-03 04:58:02.000000000 +1000 -+++ kwin/clients/keramik/embedtool.cpp 2003-08-03 04:56:41.000000000 +1000 -@@ -28,7 +28,8 @@ - #include <qfileinfo.h> - #include <qdatetime.h> - --#include <iostream.h> -+#include <iostream> -+using namespace std; - - static int primes[] = { - 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs index d9f54bd6363..c2e06ac6971 100644 --- a/x11/kdebase3/patches/patch-bs +++ b/x11/kdebase3/patches/patch-bs @@ -1,8 +1,8 @@ -$NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ +$NetBSD: patch-bs,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kicker/proxy/Makefile.in.orig Tue May 13 23:07:58 2003 +--- kicker/proxy/Makefile.in.orig 2004-01-02 14:05:59.000000000 +1300 +++ kicker/proxy/Makefile.in -@@ -422,27 +422,35 @@ x_includes = @x_includes@ +@@ -424,27 +424,35 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/../share $(all_includes) @@ -13,15 +13,15 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ +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 ++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 @@ -51,7 +51,7 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = appletproxy.h extensionproxy.h -@@ -453,38 +461,57 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -455,38 +463,57 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -126,7 +126,7 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -505,11 +532,13 @@ CXXLD = $(CXX) +@@ -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) \ @@ -142,7 +142,7 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ #>- all: all-am #>+ 1 -@@ -558,6 +587,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS +@@ -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) @@ -153,7 +153,7 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -601,8 +634,11 @@ distclean-compile: +@@ -603,8 +636,11 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy.Plo@am__quote@ @@ -166,7 +166,21 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -761,7 +797,6 @@ install-strip: +@@ -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: @@ -174,7 +188,7 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -840,9 +875,6 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -841,9 +881,6 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot @@ -184,12 +198,13 @@ $NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -890,7 +922,7 @@ kde-rpo-clean: +@@ -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 ++extensionproxy.lo: extensionproxy.moc diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz index 0c0f318ea28..706272f0044 100644 --- a/x11/kdebase3/patches/patch-bz +++ b/x11/kdebase3/patches/patch-bz @@ -1,8 +1,8 @@ -$NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-bz,v 1.9 2004/01/15 10:15:14 markd Exp $ ---- klipper/Makefile.in.orig 2003-07-15 22:03:37.000000000 +1200 +--- klipper/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300 +++ klipper/Makefile.in -@@ -424,27 +424,29 @@ x_libraries = @x_libraries@ +@@ -425,27 +425,29 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klipper @@ -42,7 +42,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ #>- klipper_panelapplet_la_SOURCES = applet.cpp applet.skel #>+ 1 klipper_panelapplet_la_SOURCES=applet.cpp applet_skel.cpp -@@ -470,17 +472,12 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -472,17 +474,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -65,7 +65,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ am_klipper_panelapplet_la_OBJECTS = applet.lo #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) #>+ 4 -@@ -488,31 +485,44 @@ klipper_panelapplet_la_final_OBJECTS = k +@@ -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) @@ -125,7 +125,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -533,11 +543,11 @@ CXXLD = $(CXX) +@@ -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) \ @@ -139,7 +139,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ #>- all: all-am #>+ 1 -@@ -614,6 +624,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip +@@ -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) @@ -148,7 +148,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -655,7 +667,8 @@ distclean-compile: +@@ -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@ @@ -158,16 +158,16 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ @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@ -@@ -833,7 +846,7 @@ distclean-tags: +@@ -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=toplevel.h cr64-app-klipper.png klipperrc.desktop klipperbindings.cpp cr48-app-klipper.png klipper.desktop cr22-app-klipper.png cr32-app-klipper.png urlgrabber.h klipperrc.upd klipper-kde31.sh cr128-app-klipper.png configdialog.h cr16-app-klipper.png klipper-1-2.pl version.h klippershortcuts.upd applet.h +-KDE_DIST=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) -@@ -894,7 +907,6 @@ install-strip: +@@ -895,7 +908,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -175,7 +175,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -1004,18 +1016,18 @@ dummy.cpp: +@@ -1005,6 +1017,12 @@ dummy.cpp: .NOEXPORT: #>+ 5 @@ -188,36 +188,42 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ 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 - +@@ -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 -- --#>+ 1 --mocs: configdialog.moc --#>+ 3 - urlgrabber.moc: $(srcdir)/urlgrabber.h - $(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc - -@@ -1033,21 +1045,21 @@ applet.moc: $(srcdir)/applet.h ++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 -+#>+ 3 -+configdialog.moc: $(srcdir)/configdialog.h -+ $(MOC) $(srcdir)/configdialog.h -o configdialog.moc - -+#>+ 1 +- +mocs: configdialog.moc #>+ 3 clean-metasources: -- -rm -f configdialog.moc urlgrabber.moc toplevel.moc applet.moc +- -rm -f urlgrabber.moc configdialog.moc applet.moc toplevel.moc + -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc #>+ 5 @@ -230,7 +236,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ #>+ 2 docs-am: -@@ -1083,18 +1095,6 @@ force-reedit: +@@ -1084,18 +1096,6 @@ force-reedit: #>+ 11 @@ -249,7 +255,7 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ 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; \ -@@ -1106,22 +1106,34 @@ klipper_panelapplet_la.all_cpp.cpp: $(sr +@@ -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 @@ -289,19 +295,19 @@ $NetBSD: patch-bz,v 1.8 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1131,11 +1143,11 @@ kde-rpo-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 -+urlgrabber.o: urlgrabber.moc -+toplevel.o: toplevel.moc - urlgrabber.lo: urlgrabber.moc -configdialog.lo: configdialog.moc + toplevel.o: toplevel.moc ++urlgrabber.lo: urlgrabber.moc +toplevel.lo: toplevel.moc - applet.lo: applet.moc ++applet.lo: applet.moc applet.o: applet.moc +configdialog.lo: configdialog.moc configdialog.o: configdialog.moc --urlgrabber.o: urlgrabber.moc --toplevel.o: toplevel.moc diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd index 764aea58434..a0f4290986e 100644 --- a/x11/kdebase3/patches/patch-cd +++ b/x11/kdebase3/patches/patch-cd @@ -1,8 +1,8 @@ -$NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ +$NetBSD: patch-cd,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kmenuedit/Makefile.in.orig 2003-07-15 22:03:38.000000000 +1200 +--- kmenuedit/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300 +++ kmenuedit/Makefile.in -@@ -424,17 +424,19 @@ x_libraries = @x_libraries@ +@@ -425,17 +425,19 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = kmenuedit @@ -28,7 +28,7 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h -@@ -458,45 +460,55 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -460,45 +462,55 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -104,7 +104,7 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo -@@ -518,7 +530,8 @@ CXXLD = $(CXX) +@@ -520,7 +532,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -114,7 +114,7 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) -@@ -531,7 +544,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -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) @@ -123,7 +123,7 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -578,6 +591,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -132,7 +132,7 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -619,9 +634,10 @@ distclean-compile: +@@ -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@ @@ -144,16 +144,16 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ @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@ -@@ -827,7 +843,7 @@ distclean-tags: +@@ -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 uninstall.desktop kmenuedit.desktop cr16-app-kmenuedit.png kmenueditui.rc cr32-app-kmenuedit.png +-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) -@@ -901,7 +917,6 @@ install-strip: +@@ -909,7 +925,6 @@ install-strip: mostlyclean-generic: clean-generic: @@ -161,55 +161,60 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) -@@ -1006,12 +1021,6 @@ dummy.cpp: +@@ -1014,11 +1029,11 @@ dummy.cpp: .NOEXPORT: #>+ 3 --menueditview.moc: $(srcdir)/menueditview.h -- $(MOC) $(srcdir)/menueditview.h -o menueditview.moc -- --#>+ 1 --mocs: menueditview.moc --#>+ 3 - basictab.moc: $(srcdir)/basictab.h - $(MOC) $(srcdir)/basictab.h -o basictab.moc +-desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h +- $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc ++basictab.moc: $(srcdir)/basictab.h ++ $(MOC) $(srcdir)/basictab.h -o basictab.moc -@@ -1024,11 +1033,11 @@ treeview.moc: $(srcdir)/treeview.h #>+ 1 - mocs: treeview.moc +-mocs: desktopfileeditor.moc ++mocs: basictab.moc #>+ 3 --kmenuedit.moc: $(srcdir)/kmenuedit.h -- $(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc -+menueditview.moc: $(srcdir)/menueditview.h -+ $(MOC) $(srcdir)/menueditview.h -o menueditview.moc - + treeview.moc: $(srcdir)/treeview.h + $(MOC) $(srcdir)/treeview.h -o treeview.moc +@@ -1026,18 +1041,18 @@ treeview.moc: $(srcdir)/treeview.h #>+ 1 --mocs: kmenuedit.moc -+mocs: menueditview.moc + mocs: treeview.moc #>+ 3 - desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h - $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc -@@ -1036,8 +1045,14 @@ desktopfileeditor.moc: $(srcdir)/desktop +-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: desktopfileeditor.moc + mocs: menueditview.moc #>+ 3 -+kmenuedit.moc: $(srcdir)/kmenuedit.h -+ $(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc ++desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h ++ $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc + +#>+ 1 -+mocs: kmenuedit.moc ++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 menueditview.moc basictab.moc treeview.moc kmenuedit.moc desktopfileeditor.moc +- -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: -@@ -1064,33 +1079,33 @@ force-reedit: +@@ -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 menueditview.moc treeview.moc basictab.moc desktopfileeditor.moc kmenuedit.moc +-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp 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; \ @@ -252,23 +257,23 @@ $NetBSD: patch-cd,v 1.6 2003/07/30 13:34:59 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1100,13 +1115,13 @@ kde-rpo-clean: +@@ -1108,13 +1123,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 --basictab.o: basictab.moc +-desktopfileeditor.lo: desktopfileeditor.moc +basictab.lo: basictab.moc -+menueditview.lo: menueditview.moc - menueditview.o: menueditview.moc --treeview.lo: treeview.moc --treeview.o: treeview.moc --desktopfileeditor.o: desktopfileeditor.moc + menueditview.lo: menueditview.moc ++menueditview.o: menueditview.moc kmenuedit.lo: kmenuedit.moc +treeview.o: treeview.moc - desktopfileeditor.lo: desktopfileeditor.moc --basictab.lo: basictab.moc ++desktopfileeditor.lo: desktopfileeditor.moc kmenuedit.o: kmenuedit.moc --menueditview.lo: menueditview.moc -+basictab.o: basictab.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 diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch index b0248ebbb2d..a355a31daba 100644 --- a/x11/kdebase3/patches/patch-ch +++ b/x11/kdebase3/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-ch,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- konqueror/Makefile.in.orig 2003-07-15 22:03:39.000000000 +1200 +--- konqueror/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300 +++ konqueror/Makefile.in -@@ -428,7 +428,7 @@ INCLUDES = -I$(top_srcdir)/libkonq -I$(t +@@ -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 @@ -11,7 +11,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ konqdatadir = $(kde_datadir)/konqueror konqdata_DATA = konqueror.rc -@@ -445,7 +445,7 @@ include_HEADERS = KonquerorIface.h +@@ -446,7 +446,7 @@ include_HEADERS = KonquerorIface.h bin_PROGRAMS = konqueror @@ -20,7 +20,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- KonquerorIface.cc KonquerorIface.skel \ #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ #>- KonqViewIface.cc KonqViewIface.skel \ -@@ -460,7 +460,7 @@ bin_PROGRAMS = konqueror +@@ -461,7 +461,7 @@ bin_PROGRAMS = konqueror #>- konq_browseriface.cc \ #>- delayedinitializer.cc #>+ 14 @@ -29,7 +29,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ KonquerorIface.cc \ KonqMainWindowIface.cc \ KonqViewIface.cc \ -@@ -483,11 +483,15 @@ noinst_HEADERS = KonqMainWindowIface.h K +@@ -484,11 +484,15 @@ noinst_HEADERS = KonqMainWindowIface.h K konq_view.h konq_viewmgr.h version.h @@ -48,7 +48,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) data_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop kfmclient_war.desktop -@@ -512,32 +516,37 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -514,32 +518,37 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -96,7 +96,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@ -546,7 +555,7 @@ am__depfiles_maybe = depfiles +@@ -548,7 +557,7 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonqViewIface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/KonquerorIface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/delayedinitializer.Plo \ @@ -105,7 +105,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_browseriface.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_combo.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/konq_factory.Plo \ -@@ -557,13 +566,15 @@ am__depfiles_maybe = depfiles +@@ -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 \ @@ -125,7 +125,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ @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 \ -@@ -574,12 +585,14 @@ am__depfiles_maybe = depfiles +@@ -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 \ @@ -142,7 +142,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ @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 \ -@@ -590,7 +603,9 @@ am__depfiles_maybe = depfiles +@@ -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 \ @@ -153,7 +153,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -610,7 +625,8 @@ CXXLD = $(CXX) +@@ -612,7 +627,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -163,7 +163,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ $(data5_DATA) $(kde_apps_DATA) $(kde_services_DATA) \ $(konqdata_DATA) -@@ -626,7 +642,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -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) @@ -172,7 +172,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -673,6 +689,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -181,7 +181,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -716,7 +734,6 @@ distclean-compile: +@@ -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@ @@ -189,7 +189,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ @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@ -@@ -730,6 +747,8 @@ distclean-compile: +@@ -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@ @@ -198,16 +198,16 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -1058,7 +1077,7 @@ distclean-tags: +@@ -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=profile_midnightcommander.desktop profile_webbrowsing.desktop kfmclient_war.desktop konqfilemgr.desktop kfmclient_dir.desktop DESIGN profile_filepreview.desktop kfmclient_html.desktop konqueror.desktop konqbrowser.desktop uninstall.desktop convert_kdelnk.sh IDEAS konqueror.rc profile_filemanagement.desktop DESIGN_config konquerorsu.desktop Home.desktop kfmclient.desktop konqueror_config.desktop +-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) -@@ -1240,9 +1259,6 @@ uninstall-info: uninstall-info-recursive +@@ -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 @@ -217,7 +217,7 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ messages: rc.cpp $(EXTRACTRC) *.rc */*.rc >> rc.cpp $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp -@@ -1263,26 +1279,24 @@ uninstall-local: +@@ -1271,32 +1287,24 @@ uninstall-local: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -241,53 +241,62 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ +#>+ 1 +mocs: konq_view.moc #>+ 3 --konq_profiledlg.moc: $(srcdir)/konq_profiledlg.h -- $(MOC) $(srcdir)/konq_profiledlg.h -o konq_profiledlg.moc +-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_profiledlg.moc +-mocs: konq_viewmgr.moc +mocs: konq_browseriface.moc -+#>+ 3 + #>+ 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 + + #>+ 1 +-mocs: konq_view.moc +mocs: konq_misc.moc #>+ 3 delayedinitializer.moc: $(srcdir)/delayedinitializer.h $(MOC) $(srcdir)/delayedinitializer.h -o delayedinitializer.moc -@@ -1296,35 +1310,35 @@ konq_mainwindow.moc: $(srcdir)/konq_main +@@ -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_actions.moc: $(srcdir)/konq_actions.h -- $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc +-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_actions.moc +-mocs: konq_run.moc +mocs: konq_profiledlg.moc - #>+ 3 --konq_frame.moc: $(srcdir)/konq_frame.h -- $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc ++#>+ 3 +konq_viewmgr.moc: $(srcdir)/konq_viewmgr.h + $(MOC) $(srcdir)/konq_viewmgr.h -o konq_viewmgr.moc - - #>+ 1 --mocs: konq_frame.moc ++ ++#>+ 1 +mocs: konq_viewmgr.moc #>+ 3 --konq_browseriface.moc: $(srcdir)/konq_browseriface.h -- $(MOC) $(srcdir)/konq_browseriface.h -o konq_browseriface.moc -+konq_actions.moc: $(srcdir)/konq_actions.h -+ $(MOC) $(srcdir)/konq_actions.h -o konq_actions.moc - + 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_browseriface.moc -+mocs: konq_actions.moc + mocs: konq_actions.moc #>+ 3 -konq_misc.moc: $(srcdir)/konq_misc.h - $(MOC) $(srcdir)/konq_misc.h -o konq_misc.moc @@ -298,38 +307,29 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ -mocs: konq_misc.moc +mocs: konq_combo.moc #>+ 3 --konq_view.moc: $(srcdir)/konq_view.h -- $(MOC) $(srcdir)/konq_view.h -o konq_view.moc -+konq_guiclients.moc: $(srcdir)/konq_guiclients.h -+ $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc - + 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_view.moc -+mocs: konq_guiclients.moc + mocs: konq_guiclients.moc #>+ 3 - konq_run.moc: $(srcdir)/konq_run.h - $(MOC) $(srcdir)/konq_run.h -o konq_run.moc -@@ -1332,26 +1346,28 @@ konq_run.moc: $(srcdir)/konq_run.h +-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_run.moc +-mocs: konq_browseriface.moc ++mocs: konq_run.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_guiclients.moc: $(srcdir)/konq_guiclients.h -- $(MOC) $(srcdir)/konq_guiclients.h -o konq_guiclients.moc -+konq_frame.moc: $(srcdir)/konq_frame.h -+ $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc + konq_frame.moc: $(srcdir)/konq_frame.h + $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc #>+ 1 --mocs: konq_guiclients.moc + mocs: konq_frame.moc -#>+ 3 --konq_combo.moc: $(srcdir)/konq_combo.h -- $(MOC) $(srcdir)/konq_combo.h -o konq_combo.moc -+mocs: konq_frame.moc +-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 ) @@ -345,19 +345,19 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl -#>+ 1 --mocs: konq_combo.moc +-mocs: konq_profiledlg.moc #>+ 3 clean-metasources: -- -rm -f konq_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_view.moc konq_run.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc +- -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: -@@ -1371,33 +1387,33 @@ force-reedit: +@@ -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_profiledlg.moc delayedinitializer.moc konq_mainwindow.moc konq_actions.moc konq_frame.moc konq_browseriface.moc konq_misc.moc konq_run.moc konq_view.moc konq_viewmgr.moc konq_guiclients.moc konq_combo.moc +-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; \ @@ -400,48 +400,48 @@ $NetBSD: patch-ch,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1407,27 +1423,27 @@ kde-rpo-clean: +@@ -1415,27 +1431,27 @@ kde-rpo-clean: -rm -f *.rpo #>+ 25 --konq_guiclients.lo: konq_guiclients.moc --konq_run.o: konq_run.moc --konq_mainwindow.lo: konq_mainwindow.moc --konq_combo.o: konq_combo.moc --konq_viewmgr.o: konq_viewmgr.moc --konq_run.lo: konq_run.moc --konq_profiledlg.lo: konq_profiledlg.moc --konq_frame.o: konq_frame.moc --konq_guiclients.o: konq_guiclients.moc - konq_frame.lo: konq_frame.moc --konq_misc.o: konq_misc.moc --delayedinitializer.o: delayedinitializer.moc --konq_profiledlg.o: konq_profiledlg.moc -konq_browseriface.lo: konq_browseriface.moc - konq_view.lo: konq_view.moc --konq_viewmgr.lo: konq_viewmgr.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_view.o: konq_view.moc +konq_browseriface.lo: konq_browseriface.moc -+konq_browseriface.o: konq_browseriface.moc + konq_browseriface.o: konq_browseriface.moc +konq_misc.o: konq_misc.moc -+konq_combo.lo: konq_combo.moc - konq_actions.o: konq_actions.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_run.lo: konq_run.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_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 + 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 --delayedinitializer.lo: delayedinitializer.moc --konq_combo.lo: konq_combo.moc --konq_browseriface.o: konq_browseriface.moc ++konq_mainwindow.o: konq_mainwindow.moc +konq_viewmgr.lo: konq_viewmgr.moc - konq_actions.lo: konq_actions.moc ++konq_actions.lo: konq_actions.moc diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj index 4356d4e59a1..9f1bba6070b 100644 --- a/x11/kdebase3/patches/patch-cj +++ b/x11/kdebase3/patches/patch-cj @@ -1,8 +1,8 @@ -$NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-cj,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- konqueror/client/Makefile.in.orig 2003-07-15 22:03:39.000000000 +1200 +--- konqueror/client/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300 +++ konqueror/client/Makefile.in -@@ -424,14 +424,18 @@ x_libraries = @x_libraries@ +@@ -425,14 +425,18 @@ x_libraries = @x_libraries@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII bin_PROGRAMS = kfmclient @@ -26,7 +26,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ noinst_HEADERS = kfmclient.h #>- METASOURCES = AUTO -@@ -439,39 +443,50 @@ noinst_HEADERS = kfmclient.h +@@ -440,9 +444,9 @@ noinst_HEADERS = kfmclient.h KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop @@ -36,8 +36,9 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ -kfmclient_LDADD = kfmclient.la +kfmclient_LDADD = libkfmclient_main.la subdir = konqueror/client + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs - CONFIG_HEADER = $(top_builddir)/config.h +@@ -450,30 +454,41 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -92,7 +93,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -491,11 +506,12 @@ CXXLD = $(CXX) +@@ -493,11 +508,12 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -107,7 +108,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- all: all-am #>+ 1 -@@ -542,6 +558,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -116,7 +117,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -581,8 +599,9 @@ mostlyclean-compile: +@@ -583,8 +601,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -127,7 +128,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -683,7 +702,12 @@ GTAGS: +@@ -685,7 +704,12 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -141,7 +142,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -@@ -816,15 +840,18 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -817,15 +841,18 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-libLTLIBRARIES @@ -163,7 +164,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 9 KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; false ) -@@ -836,12 +863,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl +@@ -837,12 +864,6 @@ KDesktopIface_stub.h: KDesktopIface.kidl $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl #>+ 3 @@ -176,7 +177,7 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ clean-metasources: -rm -f kfmclient.moc -@@ -862,33 +883,33 @@ force-reedit: +@@ -863,33 +884,33 @@ force-reedit: #>+ 11 @@ -223,14 +224,15 @@ $NetBSD: patch-cj,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -898,8 +919,8 @@ kde-rpo-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 -+KonquerorIface_stub.cc: KonquerorIface_stub.h - kfmclient.lo: kfmclient.moc - kfmclient.o: kfmclient.moc --KonquerorIface_stub.cc: KonquerorIface_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 diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn index 32fc2282399..1cba15af9f6 100644 --- a/x11/kdebase3/patches/patch-cn +++ b/x11/kdebase3/patches/patch-cn @@ -1,8 +1,8 @@ -$NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-cn,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig 2003-07-15 22:03:40.000000000 +1200 +--- konqueror/keditbookmarks/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300 +++ konqueror/keditbookmarks/Makefile.in -@@ -425,20 +425,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all +@@ -426,20 +426,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all #>- METASOURCES = AUTO @@ -33,7 +33,7 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ keditbookmarks_LDFLAGS = $(all_libraries) rcdir = $(kde_datadir)/keditbookmarks -@@ -451,37 +455,50 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -453,37 +457,50 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -99,7 +99,7 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -502,11 +519,12 @@ CXXLD = $(CXX) +@@ -504,11 +521,12 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -114,7 +114,7 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- all: all-am #>+ 1 -@@ -553,6 +571,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -123,7 +123,7 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -593,9 +613,10 @@ distclean-compile: +@@ -595,9 +615,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Plo@am__quote@ @@ -135,16 +135,16 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@ -@@ -718,7 +739,7 @@ distclean-tags: +@@ -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=toplevel.h cr48-app-keditbookmarks.png cr128-app-keditbookmarks.png cr32-app-keditbookmarks.png uninstall.desktop cr64-app-keditbookmarks.png keditbookmarksui.rc favicons.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h +-KDE_DIST=commands.h 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) -@@ -859,9 +880,6 @@ uninstall-am: uninstall-kde-icons unins +@@ -860,9 +881,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-libLTLIBRARIES uninstall-rcDATA @@ -154,7 +154,7 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ install-data-local: uninstall.desktop $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop -@@ -869,12 +887,6 @@ install-data-local: uninstall.desktop +@@ -870,18 +888,12 @@ install-data-local: uninstall.desktop # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -165,46 +165,47 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl - #>+ 3 - favicons.moc: $(srcdir)/favicons.h - $(MOC) $(srcdir)/favicons.h -o favicons.moc -@@ -882,20 +894,26 @@ favicons.moc: $(srcdir)/favicons.h +-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: favicons.moc +-mocs: toplevel.moc ++mocs: favicons.moc #>+ 3 -+commands.moc: $(srcdir)/commands.h -+ $(MOC) $(srcdir)/commands.h -o commands.moc -+ -+#>+ 1 -+mocs: commands.moc -+#>+ 3 - toplevel.moc: $(srcdir)/toplevel.h - $(MOC) $(srcdir)/toplevel.h -o toplevel.moc + commands.moc: $(srcdir)/commands.h + $(MOC) $(srcdir)/commands.h -o commands.moc +@@ -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: toplevel.moc --#>+ 3 --commands.moc: $(srcdir)/commands.h -- $(MOC) $(srcdir)/commands.h -o commands.moc +-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 - --#>+ 1 --mocs: commands.moc ++ #>+ 3 clean-metasources: -- -rm -f favicons.moc toplevel.moc commands.moc +- -rm -f toplevel.moc commands.moc favicons.moc + -rm -f favicons.moc commands.moc toplevel.moc #>+ 4 clean-idl: -@@ -933,33 +951,33 @@ force-reedit: +@@ -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 favicons.moc toplevel.moc commands.moc +-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/items.cpp $(srcdir)/toplevel.cpp $(srcdir)/favicons.cpp $(srcdir)/commands.cpp toplevel_skel.cpp 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; \ @@ -247,17 +248,15 @@ $NetBSD: patch-cn,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -969,9 +987,9 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -971,8 +989,8 @@ kde-rpo-clean: #>+ 7 -+toplevel.o: toplevel.moc -+commands.lo: commands.moc -+toplevel.lo: toplevel.moc - commands.o: commands.moc + toplevel.o: toplevel.moc -favicons.lo: favicons.moc - favicons.o: favicons.moc --toplevel.lo: toplevel.moc --commands.lo: commands.moc --toplevel.o: toplevel.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 diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct index 5a34b27cd72..5df58308723 100644 --- a/x11/kdebase3/patches/patch-ct +++ b/x11/kdebase3/patches/patch-ct @@ -1,8 +1,8 @@ -$NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-ct,v 1.8 2004/01/15 10:15:14 markd Exp $ ---- konsole/konsole/Makefile.in.orig 2003-07-15 22:03:42.000000000 +1200 +--- konsole/konsole/Makefile.in.orig 2004-01-02 14:06:01.000000000 +1300 +++ konsole/konsole/Makefile.in -@@ -438,7 +438,7 @@ INCLUDES = -I. $(all_includes) +@@ -439,7 +439,7 @@ INCLUDES = -I. $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole @@ -11,7 +11,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ # libkonsolepart is a part, but konsole.la links directly to it, so we can't -@@ -473,30 +473,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar +@@ -474,30 +474,38 @@ libkonsolepart_la_LDFLAGS = $(all_librar libkonsolepart_la_LIBADD = $(LIBUTIL) $(XTESTLIB) $(LIB_KPARTS) # kwrited kdeinit module @@ -59,7 +59,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -531,27 +539,32 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -533,27 +541,32 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -110,7 +110,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ libkonsolepart_la_DEPENDENCIES = am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ -@@ -564,25 +577,30 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt +@@ -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) @@ -147,7 +147,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@ -591,44 +609,56 @@ am__depfiles_maybe = depfiles +@@ -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 \ @@ -215,7 +215,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/schema.Plo ./$(DEPDIR)/session.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -657,14 +687,15 @@ CXXLD = $(CXX) +@@ -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) \ @@ -233,7 +233,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ #>- all: all-am #>+ 1 -@@ -741,11 +772,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons +@@ -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) @@ -249,7 +249,7 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -798,16 +833,19 @@ distclean-compile: +@@ -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@ @@ -270,16 +270,16 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ @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@ -@@ -982,7 +1020,7 @@ distclean-tags: +@@ -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=x-konsole.desktop sessioniface.h MakeDefaults konsole_part.h konsolerc konsoleiface.h +-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) -@@ -1154,29 +1192,16 @@ messages: rc.cpp +@@ -1155,23 +1193,16 @@ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot rm -f schemas.cpp rm -f tips.cpp @@ -299,90 +299,80 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ - $(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 --kwrited.moc: $(srcdir)/kwrited.h -- $(MOC) $(srcdir)/kwrited.h -o kwrited.moc ++#>+ 3 +konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h + $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc - #>+ 1 --mocs: kwrited.moc ++#>+ 1 +mocs: konsolebookmarkmenu.moc #>+ 3 TEWidget.moc: $(srcdir)/TEWidget.h $(MOC) $(srcdir)/TEWidget.h -o TEWidget.moc -@@ -1184,35 +1209,35 @@ TEWidget.moc: $(srcdir)/TEWidget.h +@@ -1179,17 +1210,11 @@ TEWidget.moc: $(srcdir)/TEWidget.h #>+ 1 mocs: TEWidget.moc #>+ 3 --konsole_child.moc: $(srcdir)/konsole_child.h -- $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc +-TEmuVt102.moc: $(srcdir)/TEmuVt102.h +- $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc - -#>+ 1 --mocs: konsole_child.moc +-mocs: TEmuVt102.moc -#>+ 3 - TEmulation.moc: $(srcdir)/TEmulation.h - $(MOC) $(srcdir)/TEmulation.h -o TEmulation.moc +-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: TEmulation.moc +-mocs: session.moc ++mocs: TEmulation.moc #>+ 3 --konsolebookmarkhandler.moc: $(srcdir)/konsolebookmarkhandler.h -- $(MOC) $(srcdir)/konsolebookmarkhandler.h -o konsolebookmarkhandler.moc -+kwrited.moc: $(srcdir)/kwrited.h -+ $(MOC) $(srcdir)/kwrited.h -o kwrited.moc - + kwrited.moc: $(srcdir)/kwrited.h + $(MOC) $(srcdir)/kwrited.h -o kwrited.moc +@@ -1209,17 +1234,23 @@ konsole_part.moc: $(srcdir)/konsole_part #>+ 1 --mocs: konsolebookmarkhandler.moc -+mocs: kwrited.moc + mocs: konsole_part.moc #>+ 3 --konsole.moc: $(srcdir)/konsole.h -- $(MOC) $(srcdir)/konsole.h -o konsole.moc -+TEPty.moc: $(srcdir)/TEPty.h -+ $(MOC) $(srcdir)/TEPty.h -o TEPty.moc +-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: konsole.moc -+mocs: TEPty.moc +-mocs: TEmulation.moc ++mocs: konsole.moc #>+ 3 --konsolebookmarkmenu.moc: $(srcdir)/konsolebookmarkmenu.h -- $(MOC) $(srcdir)/konsolebookmarkmenu.h -o konsolebookmarkmenu.moc -+konsole_part.moc: $(srcdir)/konsole_part.h -+ $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc +-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: konsolebookmarkmenu.moc -+mocs: konsole_part.moc +-mocs: konsolebookmarkhandler.moc ++mocs: session.moc +#>+ 3 -+konsole.moc: $(srcdir)/konsole.h -+ $(MOC) $(srcdir)/konsole.h -o konsole.moc ++TEmuVt102.moc: $(srcdir)/TEmuVt102.h ++ $(MOC) $(srcdir)/TEmuVt102.h -o TEmuVt102.moc + +#>+ 1 -+mocs: konsole.moc ++mocs: TEmuVt102.moc #>+ 3 - session.moc: $(srcdir)/session.h - $(MOC) $(srcdir)/session.h -o session.moc -@@ -1226,17 +1251,27 @@ TEmuVt102.moc: $(srcdir)/TEmuVt102.h + 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: TEmuVt102.moc + mocs: konsole_child.moc #>+ 3 --konsole_part.moc: $(srcdir)/konsole_part.h -- $(MOC) $(srcdir)/konsole_part.h -o konsole_part.moc -+konsole_child.moc: $(srcdir)/konsole_child.h -+ $(MOC) $(srcdir)/konsole_child.h -o konsole_child.moc - - #>+ 1 --mocs: konsole_part.moc -+mocs: konsole_child.moc - #>+ 3 --TEPty.moc: $(srcdir)/TEPty.h -- $(MOC) $(srcdir)/TEPty.h -o TEPty.moc +-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: TEPty.moc +-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) @@ -393,24 +383,26 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ + $(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 -@@ -1248,7 +1283,7 @@ libkonsolepart.la.closure: $(libkonsolep +@@ -1249,7 +1284,7 @@ libkonsolepart.la.closure: $(libkonsolep #>+ 3 clean-metasources: -- -rm -f kwrited.moc TEWidget.moc konsole_child.moc TEmulation.moc konsolebookmarkhandler.moc konsole.moc konsolebookmarkmenu.moc session.moc TEmuVt102.moc konsole_part.moc TEPty.moc +- -rm -f 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: -@@ -1273,19 +1308,19 @@ force-reedit: +@@ -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 TEWidget.moc konsole_child.moc konsolebookmarkhandler.moc TEmulation.moc konsole.moc konsolebookmarkmenu.moc TEmuVt102.moc session.moc TEPty.moc +-konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsolebookmarkhandler.cpp $(srcdir)/konsolebookmarkmenu.cpp $(srcdir)/konsole_child.cpp konsoleiface_skel.cpp sessioniface_skel.cpp 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; \ @@ -430,12 +422,12 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ + rm -f libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files #>+ 11 --libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp TEWidget.moc TEmulation.moc TEmuVt102.moc session.moc konsole_part.moc TEPty.moc +-libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp 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; \ -@@ -1298,20 +1333,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) +@@ -1299,20 +1334,20 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) #>+ 3 clean-final: @@ -461,44 +453,42 @@ $NetBSD: patch-ct,v 1.7 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1321,25 +1356,25 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -1323,24 +1358,24 @@ kde-rpo-clean: #>+ 23 -+konsole.o: konsole.moc - konsole_child.lo: konsole_child.moc + konsole.o: konsole.moc -kwrited.lo: kwrited.moc -TEmuVt102.o: TEmuVt102.moc --TEWidget.o: TEWidget.moc -session.lo: session.moc --konsole_child.o: konsole_child.moc -TEPty.lo: TEPty.moc -+konsolebookmarkhandler.lo: konsolebookmarkhandler.moc ++konsole_child.lo: konsole_child.moc + konsolebookmarkhandler.lo: konsolebookmarkhandler.moc session.o: session.moc - konsole.lo: konsole.moc --konsolebookmarkhandler.lo: konsolebookmarkhandler.moc -TEmulation.lo: TEmulation.moc --konsole.o: konsole.moc +-TEWidget.lo: TEWidget.moc +-konsolebookmarkmenu.lo: konsolebookmarkmenu.moc +-kwrited.o: kwrited.moc -konsolebookmarkmenu.o: konsolebookmarkmenu.moc --TEPty.o: TEPty.moc --TEmuVt102.lo: TEmuVt102.moc + konsole.lo: konsole.moc +TEWidget.lo: TEWidget.moc - TEmulation.o: TEmulation.moc -+konsolebookmarkhandler.o: konsolebookmarkhandler.moc ++TEmulation.o: TEmulation.moc + konsolebookmarkhandler.o: konsolebookmarkhandler.moc +-konsole_child.lo: konsole_child.moc +TEmuVt102.o: TEmuVt102.moc - konsolebookmarkmenu.lo: konsolebookmarkmenu.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 --kwrited.o: kwrited.moc --TEWidget.lo: TEWidget.moc --konsolebookmarkhandler.o: konsolebookmarkhandler.moc - konsole_part.o: konsole_part.moc +-TEmulation.o: TEmulation.moc ++konsole_part.o: konsole_part.moc +kwrited.o: kwrited.moc -+konsole_child.o: konsole_child.moc + konsole_child.o: konsole_child.moc +kwrited.lo: kwrited.moc -+TEWidget.o: TEWidget.moc + TEWidget.o: TEWidget.moc +-TEPty.o: TEPty.moc +-TEmuVt102.lo: TEmuVt102.moc +-konsole_part.o: konsole_part.moc +konsolebookmarkmenu.o: konsolebookmarkmenu.moc diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz index f08cbafff09..c88d5788a6c 100644 --- a/x11/kdebase3/patches/patch-cz +++ b/x11/kdebase3/patches/patch-cz @@ -1,8 +1,8 @@ -$NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-cz,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- ksmserver/Makefile.in.orig 2003-07-15 22:03:43.000000000 +1200 +--- ksmserver/Makefile.in.orig 2004-01-02 14:06:02.000000000 +1300 +++ ksmserver/Makefile.in -@@ -444,20 +444,23 @@ SUBDIRS = . +@@ -445,20 +445,23 @@ SUBDIRS = . INCLUDES = $(all_includes) bin_PROGRAMS = ksmserver @@ -32,7 +32,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ picsdir = $(kde_datadir)/ksmserver/pics pics_DATA = shutdownkonq.png -@@ -475,23 +478,28 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -477,23 +480,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -70,7 +70,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ am_testsh_OBJECTS = test.$(OBJEXT) #>- testsh_OBJECTS = $(am_testsh_OBJECTS) #>+ 1 -@@ -501,14 +509,17 @@ testsh_DEPENDENCIES = shutdown.lo +@@ -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 @@ -92,7 +92,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ @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 -@@ -530,8 +541,8 @@ CXXLD = $(CXX) +@@ -532,8 +543,8 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -103,7 +103,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ DATA = $(pics_DATA) $(update_DATA) HEADERS = $(noinst_HEADERS) -@@ -544,7 +555,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -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) @@ -112,7 +112,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -591,6 +602,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -121,7 +121,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -633,7 +646,8 @@ mostlyclean-compile: +@@ -635,7 +648,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -131,16 +131,16 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ @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@ -@@ -840,7 +854,7 @@ distclean-tags: +@@ -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=move_session_config.sh shutdownkonq.png ksmserver.upd LICENSE KSMServerInterface.h configure.in.in +-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) -@@ -1001,34 +1015,31 @@ uninstall-info: uninstall-info-recursive +@@ -1009,34 +1023,31 @@ uninstall-info: uninstall-info-recursive messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot @@ -186,7 +186,7 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 4 clean-idl: -@@ -1046,33 +1057,33 @@ force-reedit: +@@ -1054,33 +1065,33 @@ force-reedit: #>+ 11 @@ -233,13 +233,3 @@ $NetBSD: patch-cz,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1082,7 +1093,7 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 5 --server.lo: server.moc -+server.o: server.moc - shutdown.lo: shutdown.moc -+server.lo: server.moc - shutdown.o: shutdown.moc --server.o: server.moc diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh index 3b9f6f2e0e4..29d33e669d5 100644 --- a/x11/kdebase3/patches/patch-dh +++ b/x11/kdebase3/patches/patch-dh @@ -1,8 +1,8 @@ -$NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-dh,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kwin/Makefile.in.orig 2003-07-15 22:03:46.000000000 +1200 +--- kwin/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/Makefile.in -@@ -427,18 +427,22 @@ INCLUDES = $(all_includes) +@@ -428,18 +428,22 @@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin @@ -29,7 +29,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -@@ -447,7 +451,7 @@ kwinincludedir = $(includedir)/kwin +@@ -448,7 +452,7 @@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp @@ -38,7 +38,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin -@@ -458,7 +462,6 @@ data_DATA = eventsrc +@@ -459,7 +463,6 @@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav @@ -46,7 +46,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin -@@ -467,18 +470,23 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -469,18 +472,23 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -77,7 +77,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -486,33 +494,33 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) +@@ -488,33 +496,33 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) @@ -128,7 +128,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -532,7 +540,7 @@ CXXLD = $(CXX) +@@ -534,7 +542,7 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -137,7 +137,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) -@@ -546,7 +554,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -548,7 +556,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) @@ -146,7 +146,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -593,6 +601,8 @@ clean-libLTLIBRARIES: +@@ -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) @@ -155,7 +155,7 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -636,6 +646,7 @@ distclean-compile: +@@ -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@ @@ -163,16 +163,16 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ @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@ -@@ -901,7 +912,7 @@ distclean-tags: +@@ -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 NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h kwin.upd pop.wav cr16-app-kwin.png pluginlibFix.pl placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h cr48-app-kwin.png tabbox.h +-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) -@@ -1079,12 +1090,12 @@ messages: +@@ -1087,24 +1098,30 @@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -188,54 +188,70 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ +#>+ 1 +mocs: workspace.moc #>+ 3 - client.moc: $(srcdir)/client.h - $(MOC) $(srcdir)/client.h -o client.moc -@@ -1092,18 +1103,6 @@ client.moc: $(srcdir)/client.h +-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: client.moc +-mocs: tabbox.moc ++mocs: client.moc #>+ 3 --plugins.moc: $(srcdir)/plugins.h -- $(MOC) $(srcdir)/plugins.h -o plugins.moc -- --#>+ 1 --mocs: plugins.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: workspace.moc +-mocs: client.moc -#>+ 3 - options.moc: $(srcdir)/options.h - $(MOC) $(srcdir)/options.h -o options.moc + plugins.moc: $(srcdir)/plugins.h + $(MOC) $(srcdir)/plugins.h -o plugins.moc -@@ -1128,8 +1127,20 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h #>+ 1 - mocs: kwinbutton.moc - #>+ 3 -+plugins.moc: $(srcdir)/plugins.h -+ $(MOC) $(srcdir)/plugins.h -o plugins.moc -+ -+#>+ 1 -+mocs: plugins.moc + 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 -+ -+#>+ 3 + +-#>+ 1 +-mocs: options.moc + #>+ 3 clean-metasources: -- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc +- -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: -@@ -1161,33 +1172,33 @@ force-reedit: +@@ -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 client.moc workspace.moc plugins.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc +-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp 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; \ @@ -278,29 +294,30 @@ $NetBSD: patch-dh,v 1.6 2003/07/30 13:35:00 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1197,17 +1208,17 @@ kde-rpo-clean: +@@ -1205,17 +1216,17 @@ kde-rpo-clean: -rm -f *.rpo #>+ 15 +-popupinfo.lo: popupinfo.moc +workspace.o: workspace.moc -+options.lo: options.moc -+tabbox.o: tabbox.moc -+popupinfo.lo: popupinfo.moc -+options.o: options.moc - kwinbutton.lo: kwinbutton.moc - tabbox.lo: tabbox.moc --options.o: options.moc --client.lo: client.moc --client.o: client.moc --options.lo: options.moc - kwinbutton.o: kwinbutton.moc --tabbox.o: tabbox.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 ++plugins.o: plugins.moc workspace.lo: workspace.moc --popupinfo.lo: popupinfo.moc +client.lo: client.moc +popupinfo.o: popupinfo.moc - plugins.lo: plugins.moc ++plugins.lo: plugins.moc diff --git a/x11/kdebase3/patches/patch-dn b/x11/kdebase3/patches/patch-dn index 9eda35b8e32..96b9ac69573 100644 --- a/x11/kdebase3/patches/patch-dn +++ b/x11/kdebase3/patches/patch-dn @@ -1,8 +1,8 @@ -$NetBSD: patch-dn,v 1.4 2003/03/11 13:10:27 markd Exp $ +$NetBSD: patch-dn,v 1.5 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/icewm/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/clients/icewm/Makefile.in.orig 2003-12-17 14:22:30.000000000 +1300 +++ kwin/clients/icewm/Makefile.in -@@ -291,7 +291,7 @@ SUBDIRS = . config icewm-themes +@@ -429,7 +429,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin_icewm.la kwin_icewm_la_SOURCES = icewm.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dn,v 1.4 2003/03/11 13:10:27 markd Exp $ kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -307,7 +307,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -446,7 +446,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,10 +20,12 @@ $NetBSD: patch-dn,v 1.4 2003/03/11 13:10:27 markd Exp $ am_kwin_icewm_la_OBJECTS = icewm.lo #>- kwin_icewm_la_OBJECTS = $(am_kwin_icewm_la_OBJECTS) #>+ 1 -@@ -763,5 +763,5 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -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) - #>+ 3 --icewm.o: icewm.moc - icewm.lo: icewm.moc -+icewm.o: icewm.moc diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp index 3156e717a82..f332a8e4236 100644 --- a/x11/kdebase3/patches/patch-dp +++ b/x11/kdebase3/patches/patch-dp @@ -1,8 +1,8 @@ -$NetBSD: patch-dp,v 1.5 2003/05/22 02:42:51 markd Exp $ +$NetBSD: patch-dp,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/kde1/Makefile.in.orig Tue May 13 23:08:02 2003 +--- kwin/clients/kde1/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/clients/kde1/Makefile.in -@@ -426,7 +426,7 @@ INCLUDES = $(all_includes) +@@ -428,7 +428,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kde1.la kwin_kde1_la_SOURCES = kde1client.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dp,v 1.5 2003/05/22 02:42:51 markd Exp $ kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -442,7 +442,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -444,7 +444,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,16 +20,16 @@ $NetBSD: patch-dp,v 1.5 2003/05/22 02:42:51 markd Exp $ am_kwin_kde1_la_OBJECTS = kde1client.lo #>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS) #>+ 1 -@@ -657,7 +657,7 @@ distclean-tags: +@@ -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=kde1client_bitmaps.h kde1.desktop ++KDE_DIST=Makefile.in.rej kde1client_bitmaps.h kde1.desktop DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -849,5 +849,5 @@ kde-rpo-clean: +@@ -852,5 +852,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdebase3/patches/patch-dr b/x11/kdebase3/patches/patch-dr index a658737b95f..005221944c1 100644 --- a/x11/kdebase3/patches/patch-dr +++ b/x11/kdebase3/patches/patch-dr @@ -1,8 +1,8 @@ -$NetBSD: patch-dr,v 1.4 2003/03/11 13:10:28 markd Exp $ +$NetBSD: patch-dr,v 1.5 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/kstep/Makefile.in.orig Fri Jan 17 09:03:11 2003 +--- kwin/clients/kstep/Makefile.in.orig 2003-12-17 14:22:31.000000000 +1300 +++ kwin/clients/kstep/Makefile.in -@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) +@@ -428,7 +428,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_kstep.la kwin_kstep_la_SOURCES = nextclient.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dr,v 1.4 2003/03/11 13:10:28 markd Exp $ kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,10 +20,12 @@ $NetBSD: patch-dr,v 1.4 2003/03/11 13:10:28 markd Exp $ am_kwin_kstep_la_OBJECTS = nextclient.lo #>- kwin_kstep_la_OBJECTS = $(am_kwin_kstep_la_OBJECTS) #>+ 1 -@@ -676,5 +676,5 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -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) - #>+ 3 --nextclient.o: nextclient.moc - nextclient.lo: nextclient.moc -+nextclient.o: nextclient.moc diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx index 2aa254b120a..05160c8de0b 100644 --- a/x11/kdebase3/patches/patch-dx +++ b/x11/kdebase3/patches/patch-dx @@ -1,8 +1,8 @@ -$NetBSD: patch-dx,v 1.5 2003/05/22 02:42:51 markd Exp $ +$NetBSD: patch-dx,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/modernsystem/Makefile.in.orig Tue May 13 23:08:02 2003 +--- kwin/clients/modernsystem/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/clients/modernsystem/Makefile.in -@@ -430,7 +430,7 @@ SUBDIRS = config +@@ -432,7 +432,7 @@ SUBDIRS = config kde_module_LTLIBRARIES = kwin_modernsys.la kwin_modernsys_la_SOURCES = modernsys.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dx,v 1.5 2003/05/22 02:42:51 markd Exp $ kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -447,7 +447,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -449,7 +449,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,19 +20,12 @@ $NetBSD: patch-dx,v 1.5 2003/05/22 02:42:51 markd Exp $ am_kwin_modernsys_la_OBJECTS = modernsys.lo #>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS) #>+ 1 -@@ -739,7 +739,7 @@ distclean-tags: +@@ -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=modernsystem.desktop btnhighcolor.h buttondata.h -+KDE_DIST=btnhighcolor.h buttondata.h modernsystem.desktop +-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) -@@ -953,5 +953,5 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 3 --modernsys.o: modernsys.moc - modernsys.lo: modernsys.moc -+modernsys.o: modernsys.moc diff --git a/x11/kdebase3/patches/patch-dz b/x11/kdebase3/patches/patch-dz index 8879616aae8..f205896e105 100644 --- a/x11/kdebase3/patches/patch-dz +++ b/x11/kdebase3/patches/patch-dz @@ -1,8 +1,8 @@ -$NetBSD: patch-dz,v 1.4 2003/03/11 13:10:28 markd Exp $ +$NetBSD: patch-dz,v 1.5 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/quartz/Makefile.in.orig Fri Jan 17 09:03:12 2003 +--- kwin/clients/quartz/Makefile.in.orig 2003-12-17 14:22:32.000000000 +1300 +++ kwin/clients/quartz/Makefile.in -@@ -292,7 +292,7 @@ SUBDIRS = . config +@@ -430,7 +430,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin_quartz.la kwin_quartz_la_SOURCES = quartz.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-dz,v 1.4 2003/03/11 13:10:28 markd Exp $ kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -308,7 +308,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -447,7 +447,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,10 +20,12 @@ $NetBSD: patch-dz,v 1.4 2003/03/11 13:10:28 markd Exp $ am_kwin_quartz_la_OBJECTS = quartz.lo #>- kwin_quartz_la_OBJECTS = $(am_kwin_quartz_la_OBJECTS) #>+ 1 -@@ -764,5 +764,5 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -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) - #>+ 3 --quartz.o: quartz.moc - quartz.lo: quartz.moc -+quartz.o: quartz.moc diff --git a/x11/kdebase3/patches/patch-eb b/x11/kdebase3/patches/patch-eb index e3c23bec7e2..8de41f830a3 100644 --- a/x11/kdebase3/patches/patch-eb +++ b/x11/kdebase3/patches/patch-eb @@ -1,8 +1,8 @@ -$NetBSD: patch-eb,v 1.4 2003/03/11 13:10:28 markd Exp $ +$NetBSD: patch-eb,v 1.5 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/redmond/Makefile.in.orig Fri Jan 17 09:03:12 2003 +--- kwin/clients/redmond/Makefile.in.orig 2003-12-17 14:22:33.000000000 +1300 +++ kwin/clients/redmond/Makefile.in -@@ -290,7 +290,7 @@ INCLUDES = $(all_includes) +@@ -428,7 +428,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_redmond.la kwin_redmond_la_SOURCES = redmond.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-eb,v 1.4 2003/03/11 13:10:28 markd Exp $ kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -306,7 +306,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -445,7 +445,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,10 +20,12 @@ $NetBSD: patch-eb,v 1.4 2003/03/11 13:10:28 markd Exp $ am_kwin_redmond_la_OBJECTS = redmond.lo #>- kwin_redmond_la_OBJECTS = $(am_kwin_redmond_la_OBJECTS) #>+ 1 -@@ -676,5 +676,5 @@ kde-rpo-clean: - -rm -f *.rpo +@@ -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) - #>+ 3 --redmond.lo: redmond.moc - redmond.o: redmond.moc -+redmond.lo: redmond.moc diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed index e0387f3d03c..d4b07a2feb6 100644 --- a/x11/kdebase3/patches/patch-ed +++ b/x11/kdebase3/patches/patch-ed @@ -1,8 +1,8 @@ -$NetBSD: patch-ed,v 1.5 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-ed,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/riscos/Makefile.in.orig 2003-07-15 22:03:50.000000000 +1200 +--- kwin/clients/riscos/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/clients/riscos/Makefile.in -@@ -436,7 +436,7 @@ StickyButton.cpp \ +@@ -437,7 +437,7 @@ StickyButton.cpp \ HelpButton.cpp \ Static.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-ed,v 1.5 2003/07/30 13:35:00 markd Exp $ kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -462,7 +462,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -464,7 +464,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,131 +20,118 @@ $NetBSD: patch-ed,v 1.5 2003/07/30 13:35:00 markd Exp $ am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ HelpButton.lo Static.lo -@@ -711,7 +711,7 @@ distclean-tags: +@@ -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=riscos.desktop Palette.h +-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) -@@ -861,11 +861,11 @@ kwin_riscos.la.closure: $(kwin_riscos_la +@@ -862,18 +862,18 @@ kwin_riscos.la.closure: $(kwin_riscos_la #>+ 3 --LowerButton.moc: $(srcdir)/LowerButton.h -- $(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc -+Button.moc: $(srcdir)/Button.h -+ $(MOC) $(srcdir)/Button.h -o Button.moc +-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: LowerButton.moc -+mocs: Button.moc + mocs: Button.moc #>+ 3 - StickyButton.moc: $(srcdir)/StickyButton.h - $(MOC) $(srcdir)/StickyButton.h -o StickyButton.moc -@@ -873,44 +873,44 @@ StickyButton.moc: $(srcdir)/StickyButton ++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: StickyButton.moc + mocs: IconifyButton.moc #>+ 3 -MaximiseButton.moc: $(srcdir)/MaximiseButton.h - $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc -+LowerButton.moc: $(srcdir)/LowerButton.h -+ $(MOC) $(srcdir)/LowerButton.h -o LowerButton.moc - - #>+ 1 +- +-#>+ 1 -mocs: MaximiseButton.moc -+mocs: LowerButton.moc - #>+ 3 --HelpButton.moc: $(srcdir)/HelpButton.h -- $(MOC) $(srcdir)/HelpButton.h -o HelpButton.moc -+IconifyButton.moc: $(srcdir)/IconifyButton.h -+ $(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc - - #>+ 1 --mocs: HelpButton.moc -+mocs: IconifyButton.moc - #>+ 3 --Button.moc: $(srcdir)/Button.h -- $(MOC) $(srcdir)/Button.h -o Button.moc -+Manager.moc: $(srcdir)/Manager.h -+ $(MOC) $(srcdir)/Manager.h -o Manager.moc - - #>+ 1 --mocs: Button.moc -+mocs: Manager.moc - #>+ 3 +-#>+ 3 -CloseButton.moc: $(srcdir)/CloseButton.h - $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc -+HelpButton.moc: $(srcdir)/HelpButton.h -+ $(MOC) $(srcdir)/HelpButton.h -o HelpButton.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: CloseButton.moc -+mocs: HelpButton.moc + mocs: HelpButton.moc #>+ 3 --Manager.moc: $(srcdir)/Manager.h -- $(MOC) $(srcdir)/Manager.h -o Manager.moc +CloseButton.moc: $(srcdir)/CloseButton.h + $(MOC) $(srcdir)/CloseButton.h -o CloseButton.moc - - #>+ 1 --mocs: Manager.moc ++ ++#>+ 1 +mocs: CloseButton.moc - #>+ 3 --IconifyButton.moc: $(srcdir)/IconifyButton.h -- $(MOC) $(srcdir)/IconifyButton.h -o IconifyButton.moc ++#>+ 3 +MaximiseButton.moc: $(srcdir)/MaximiseButton.h + $(MOC) $(srcdir)/MaximiseButton.h -o MaximiseButton.moc - - #>+ 1 --mocs: IconifyButton.moc ++ ++#>+ 1 +mocs: MaximiseButton.moc - #>+ 3 ++#>+ 3 clean-metasources: -- -rm -f LowerButton.moc StickyButton.moc MaximiseButton.moc HelpButton.moc Button.moc CloseButton.moc Manager.moc IconifyButton.moc +- -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: -@@ -927,7 +927,7 @@ force-reedit: +@@ -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 Manager.moc IconifyButton.moc LowerButton.moc MaximiseButton.moc HelpButton.moc Button.moc CloseButton.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 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; \ -@@ -963,19 +963,19 @@ kde-rpo-clean: +@@ -964,19 +964,19 @@ kde-rpo-clean: -rm -f *.rpo #>+ 17 --Manager.lo: Manager.moc +-HelpButton.o: HelpButton.moc -LowerButton.lo: LowerButton.moc --IconifyButton.lo: IconifyButton.moc --IconifyButton.o: IconifyButton.moc --CloseButton.o: CloseButton.moc --Manager.o: Manager.moc - HelpButton.lo: HelpButton.moc --Button.lo: Button.moc --MaximiseButton.lo: MaximiseButton.moc --LowerButton.o: LowerButton.moc +-StickyButton.o: StickyButton.moc ++HelpButton.lo: HelpButton.moc StickyButton.lo: StickyButton.moc --MaximiseButton.o: MaximiseButton.moc --Button.o: Button.moc - StickyButton.o: StickyButton.moc -+Button.o: Button.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 + IconifyButton.lo: IconifyButton.moc +-CloseButton.o: CloseButton.moc +MaximiseButton.lo: MaximiseButton.moc - HelpButton.o: HelpButton.moc ++HelpButton.o: HelpButton.moc +Manager.o: Manager.moc +LowerButton.o: LowerButton.moc - CloseButton.lo: CloseButton.moc -+IconifyButton.o: IconifyButton.moc -+Manager.lo: Manager.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 diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh index dbb7e413435..7a4b0bcc399 100644 --- a/x11/kdebase3/patches/patch-eh +++ b/x11/kdebase3/patches/patch-eh @@ -1,8 +1,8 @@ -$NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $ +$NetBSD: patch-eh,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/web/Makefile.in.orig 2003-07-15 22:03:50.000000000 +1200 +--- kwin/clients/web/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/clients/web/Makefile.in -@@ -446,7 +446,7 @@ noinst_HEADERS = \ +@@ -447,7 +447,7 @@ noinst_HEADERS = \ WebButtonSticky.h @@ -11,7 +11,7 @@ $NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $ kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module #>- METASOURCES = AUTO -@@ -459,7 +459,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -461,7 +461,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,7 +20,7 @@ $NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $ am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ WebButtonMaximize.lo WebButtonSticky.lo -@@ -707,7 +707,7 @@ distclean-tags: +@@ -709,7 +709,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -29,27 +29,21 @@ $NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -857,56 +857,56 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC +@@ -858,29 +858,35 @@ kwin_web.la.closure: $(kwin_web_la_OBJEC #>+ 3 --WebButtonLower.moc: $(srcdir)/WebButtonLower.h -- $(MOC) $(srcdir)/WebButtonLower.h -o WebButtonLower.moc +WebButtonSticky.moc: $(srcdir)/WebButtonSticky.h + $(MOC) $(srcdir)/WebButtonSticky.h -o WebButtonSticky.moc - - #>+ 1 --mocs: WebButtonLower.moc ++ ++#>+ 1 +mocs: WebButtonSticky.moc - #>+ 3 --WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h -- $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc -+WebButtonClose.moc: $(srcdir)/WebButtonClose.h -+ $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc ++#>+ 3 + WebButtonClose.moc: $(srcdir)/WebButtonClose.h + $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc #>+ 1 --mocs: WebButtonMaximize.moc -+mocs: WebButtonClose.moc + mocs: WebButtonClose.moc #>+ 3 -WebButtonIconify.moc: $(srcdir)/WebButtonIconify.h - $(MOC) $(srcdir)/WebButtonIconify.h -o WebButtonIconify.moc @@ -69,83 +63,88 @@ $NetBSD: patch-eh,v 1.5 2003/07/30 13:35:00 markd Exp $ -mocs: WebButton.moc +mocs: WebButtonLower.moc #>+ 3 --Web.moc: $(srcdir)/Web.h -- $(MOC) $(srcdir)/Web.h -o Web.moc +-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: Web.moc +-mocs: WebButtonSticky.moc +mocs: WebButtonHelp.moc #>+ 3 --WebButtonClose.moc: $(srcdir)/WebButtonClose.h -- $(MOC) $(srcdir)/WebButtonClose.h -o WebButtonClose.moc -+WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h -+ $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc - + WebButtonMaximize.moc: $(srcdir)/WebButtonMaximize.h + $(MOC) $(srcdir)/WebButtonMaximize.h -o WebButtonMaximize.moc +@@ -888,26 +894,20 @@ WebButtonMaximize.moc: $(srcdir)/WebButt #>+ 1 --mocs: WebButtonClose.moc -+mocs: WebButtonMaximize.moc + mocs: WebButtonMaximize.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: 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: WebButtonSticky.moc +-mocs: Web.moc +mocs: WebButton.moc #>+ 3 --WebButtonHelp.moc: $(srcdir)/WebButtonHelp.h -- $(MOC) $(srcdir)/WebButtonHelp.h -o WebButtonHelp.moc +-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: WebButtonHelp.moc +-mocs: WebButtonLower.moc +mocs: WebButtonIconify.moc #>+ 3 clean-metasources: -- -rm -f WebButtonLower.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc +- -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: -@@ -923,7 +923,7 @@ force-reedit: +@@ -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 WebButtonLower.moc Web.moc WebButtonClose.moc WebButtonSticky.moc WebButtonHelp.moc WebButtonMaximize.moc WebButtonIconify.moc WebButton.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 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; \ -@@ -959,19 +959,19 @@ kde-rpo-clean: +@@ -960,19 +960,19 @@ kde-rpo-clean: -rm -f *.rpo #>+ 17 --WebButtonSticky.o: WebButtonSticky.moc --WebButtonClose.o: WebButtonClose.moc --WebButtonLower.lo: WebButtonLower.moc --WebButton.o: WebButton.moc - WebButtonMaximize.lo: WebButtonMaximize.moc -WebButtonMaximize.o: WebButtonMaximize.moc --Web.lo: Web.moc --Web.o: Web.moc - WebButtonClose.lo: WebButtonClose.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 -+Web.lo: Web.moc - WebButtonLower.o: WebButtonLower.moc -+WebButtonHelp.o: WebButtonHelp.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 - WebButton.lo: WebButton.moc --WebButtonSticky.lo: WebButtonSticky.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 --WebButtonHelp.o: WebButtonHelp.moc ++WebButtonHelp.lo: WebButtonHelp.moc +WebButtonLower.lo: WebButtonLower.moc -+WebButtonSticky.lo: WebButtonSticky.moc + WebButtonSticky.lo: WebButtonSticky.moc +-WebButtonMaximize.lo: WebButtonMaximize.moc +-Web.o: Web.moc +-WebButton.o: WebButton.moc diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index c49e1e1a9d4..c562fbf52e2 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,8 +1,8 @@ -$NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ +$NetBSD: patch-ej,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kxkb/Makefile.in.orig Tue May 13 23:08:03 2003 +--- kxkb/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kxkb/Makefile.in -@@ -429,11 +429,11 @@ KDE_OPTIONS = nofinal +@@ -431,11 +431,11 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb @@ -17,7 +17,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ kde_module_LTLIBRARIES = kcm_keyboard.la #>- kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui -@@ -442,9 +442,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay +@@ -444,9 +444,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile @@ -33,7 +33,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ data_DATA = keyboard.desktop data2_DATA = keyboard_layout.desktop -@@ -464,31 +468,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc +@@ -466,31 +470,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc #>- kcm_keyboard_la_OBJECTS = $(am_kcm_keyboard_la_OBJECTS) #>+ 1 kcm_keyboard_la_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo kcmmiscwidget.lo @@ -83,7 +83,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -510,7 +521,7 @@ CXXLD = $(CXX) +@@ -512,7 +523,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ @@ -92,7 +92,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ DATA = $(data_DATA) $(data2_DATA) $(services_DATA) -@@ -521,7 +532,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -523,7 +534,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -101,7 +101,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -601,6 +612,8 @@ clean-libLTLIBRARIES: +@@ -603,6 +614,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) @@ -110,7 +110,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -640,11 +653,12 @@ mostlyclean-compile: +@@ -642,11 +655,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,16 +124,16 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Plo@am__quote@ -@@ -873,7 +887,7 @@ distclean-tags: +@@ -875,7 +889,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp keyboard_layout.desktop LICENSE kcmlayout.h configure.in.in kcmmiscwidget.ui kxkb.desktop -+KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h +-KDE_DIST=kxkb.desktop rules.h extension.h keyboard.desktop keyboard_layout.desktop kcmmisc.h uninstall.desktop kcmmiscwidget.ui LICENSE kxkb.h kcmlayout.h configure.in.in kxkbbindings.cpp pixmap.h ++KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE Makefile.in.rej keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1049,9 +1063,6 @@ install-data-local: uninstall.desktop +@@ -1051,9 +1065,6 @@ install-data-local: uninstall.desktop messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot @@ -143,24 +143,24 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -1136,13 +1147,13 @@ kde-rpo-clean: +@@ -1144,13 +1155,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 +-kcmmisc.lo: kcmmisc.moc -$(srcdir)/rules.cpp: kcmmiscwidget.h --kcmlayout.lo: kcmlayout.moc -kxkb.o: kxkb.moc -kcmlayout.o: kcmlayout.moc +$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h -+$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h - $(srcdir)/pixmap.cpp: kcmmiscwidget.h --kcmmisc.lo: kcmmisc.moc + $(srcdir)/kcmmisc.cpp: kcmmiscwidget.h +-kcmlayout.lo: kcmlayout.moc ++$(srcdir)/pixmap.cpp: kcmmiscwidget.h kxkb.lo: kxkb.moc --$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h +-$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +kcmlayout.o: kcmlayout.moc +kcmlayout.lo: kcmlayout.moc +kxkb.o: kxkb.moc +$(srcdir)/rules.cpp: kcmmiscwidget.h kcmmisc.o: kcmmisc.moc --$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +-$(srcdir)/pixmap.cpp: kcmmiscwidget.h +kcmmisc.lo: kcmmisc.moc diff --git a/x11/kdebase3/patches/patch-eq b/x11/kdebase3/patches/patch-eq index b1da69311d5..224077e7125 100644 --- a/x11/kdebase3/patches/patch-eq +++ b/x11/kdebase3/patches/patch-eq @@ -1,8 +1,8 @@ -$NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ +$NetBSD: patch-eq,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- legacyimport/Makefile.in.orig Tue May 13 23:08:03 2003 +--- legacyimport/Makefile.in.orig 2004-01-02 14:06:05.000000000 +1300 +++ legacyimport/Makefile.in -@@ -423,14 +423,18 @@ x_libraries = @x_libraries@ +@@ -425,14 +425,18 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) bin_PROGRAMS = klegacyimport @@ -26,7 +26,7 @@ $NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = legacyimport.h -@@ -447,27 +451,35 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -449,27 +453,35 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -71,7 +71,7 @@ $NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/legacyimport.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -488,13 +500,14 @@ CXXLD = $(CXX) +@@ -490,13 +502,14 @@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @@ -88,7 +88,7 @@ $NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ #>- all: all-am #>+ 1 -@@ -541,6 +554,8 @@ clean-libLTLIBRARIES: +@@ -543,6 +556,8 @@ clean-libLTLIBRARIES: done klegacyimport.la: $(klegacyimport_la_OBJECTS) $(klegacyimport_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(klegacyimport_la_LDFLAGS) $(klegacyimport_la_OBJECTS) $(klegacyimport_la_LIBADD) $(LIBS) @@ -97,7 +97,7 @@ $NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -580,7 +595,8 @@ mostlyclean-compile: +@@ -582,7 +597,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -107,19 +107,12 @@ $NetBSD: patch-eq,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/legacyimport.Plo@am__quote@ distclean-depend: -@@ -702,7 +718,7 @@ distclean-tags: +@@ -704,7 +720,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=configure.in.in klegacyimport.desktop -+KDE_DIST=klegacyimport.desktop configure.in.in dummy.cpp +-KDE_DIST=klegacyimport.desktop configure.in.in ++KDE_DIST=klegacyimport.desktop configure.in.in Makefile.in.rej dummy.cpp DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -883,5 +899,5 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 3 --legacyimport.lo: legacyimport.moc - legacyimport.o: legacyimport.moc -+legacyimport.lo: legacyimport.moc diff --git a/x11/kdebase3/patches/patch-et b/x11/kdebase3/patches/patch-et index cc22099fbf6..e48fd04aaf8 100644 --- a/x11/kdebase3/patches/patch-et +++ b/x11/kdebase3/patches/patch-et @@ -1,8 +1,8 @@ -$NetBSD: patch-et,v 1.5 2003/05/22 02:42:52 markd Exp $ +$NetBSD: patch-et,v 1.6 2004/01/15 10:15:14 markd Exp $ ---- kwin/clients/keramik/Makefile.in.orig Tue May 13 23:08:02 2003 +--- kwin/clients/keramik/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/clients/keramik/Makefile.in -@@ -435,7 +435,7 @@ embedtool_LDFLAGS = $(all_libraries) $(K +@@ -437,7 +437,7 @@ embedtool_LDFLAGS = $(all_libraries) $(K kde_module_LTLIBRARIES = kwin_keramik.la kwin_keramik_la_SOURCES = keramik.cpp @@ -11,7 +11,7 @@ $NetBSD: patch-et,v 1.5 2003/05/22 02:42:52 markd Exp $ kwin_keramik_la_COMPILE_FIRST = tiles.h kwin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -@@ -453,7 +453,7 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -455,7 +455,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) @@ -20,12 +20,12 @@ $NetBSD: patch-et,v 1.5 2003/05/22 02:42:52 markd Exp $ am_kwin_keramik_la_OBJECTS = keramik.lo #>- kwin_keramik_la_OBJECTS = $(am_kwin_keramik_la_OBJECTS) #>+ 1 -@@ -764,7 +764,7 @@ distclean-tags: +@@ -766,7 +766,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=keramik.h keramik.desktop configure.in.in -+KDE_DIST=keramik.desktop keramik.h configure.in.in +-KDE_DIST=keramik.desktop configure.in.in keramik.h ++KDE_DIST=Makefile.in.rej keramik.desktop keramik.h configure.in.in DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) diff --git a/x11/kdebase3/patches/patch-fd b/x11/kdebase3/patches/patch-fd new file mode 100644 index 00000000000..a9c1c010c52 --- /dev/null +++ b/x11/kdebase3/patches/patch-fd @@ -0,0 +1,14 @@ +$NetBSD: patch-fd,v 1.3 2004/01/15 10:15:14 markd Exp $ + +--- kdm/kfrontend/kdm_greet.c.orig 2003-05-07 23:44:08.000000000 +1200 ++++ kdm/kfrontend/kdm_greet.c +@@ -41,8 +41,8 @@ + #include <errno.h> + #include <sys/stat.h> + +-#if defined(HAVE_XTEST) || defined(HAVE_XKB) + # include <X11/Xlib.h> ++#if defined(HAVE_XTEST) || defined(HAVE_XKB) + # include <X11/keysym.h> + #endif + |