diff options
author | markd <markd@pkgsrc.org> | 2003-05-22 02:42:39 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2003-05-22 02:42:39 +0000 |
commit | 1ff6ba76b9d97f48bc322ebf6c1b004f118d83e9 (patch) | |
tree | 9c77e4c9570a525f51b31b04f034bc28feb6f6e1 /x11/kdelibs3 | |
parent | bae783175d26b98fa6f8c6bc4ed5b5154aafb3d9 (diff) | |
download | pkgsrc-1ff6ba76b9d97f48bc322ebf6c1b004f118d83e9.tar.gz |
Update KDE to 3.1.2.
Changes:
kdelibs:
* https authentication through proxy fixed.
* KZip failed for some .zip archives.
* Fixed a bug in socket code that made KDEPrint crash.
* kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5).
kdebase:
* kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard).
* kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error
message when AUTH failed ("Unknown Command" vs. "Authorization failed")
* kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in
the background if it could not grab the keyboard/mouse, preventing the screen from
being locked manually.
* kscreensaver: Screensavers are now stopped when asking for the password [#56803]
* kio_smb: Several bugfixes for the smbro-ioslave.
* kdesktop: fixed minicli layout problem with Qt 3.1.2
* kdm: fixed incorrect user window width with Qt 3.1.2
* Konqueror: Create DCOP interface for mainwindow when object begins to exist.
* Konqueror: Fixed tab open delays when it can't reach website.
* Konsole: Don't flicker when selecting entire lines.
* Konsole: Crash, selection and sort fixes in schema and session editors.
* Konsole: Fixed mouse-wheel in mouse mode.
* Konsole: Allow programs to resize windows if enabled.
* Konsole: Keep output steady when triple-click selecting.
* Konsole: Added "Print" menu command.
* kicker: Fixed kasbar only drawing last icon from a group.
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r-- | x11/kdelibs3/Makefile | 5 | ||||
-rw-r--r-- | x11/kdelibs3/buildlink2.mk | 4 | ||||
-rw-r--r-- | x11/kdelibs3/distinfo | 31 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-ab | 28 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-ag | 40 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-ak | 21 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-ap | 34 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-av | 40 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-ba | 20 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bd | 18 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bh | 36 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bm | 14 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-bn | 35 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-br | 37 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-cd | 63 | ||||
-rw-r--r-- | x11/kdelibs3/patches/patch-cf | 13 |
16 files changed, 213 insertions, 226 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index c208024004b..03fdde7795f 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2003/05/13 10:01:54 markd Exp $ +# $NetBSD: Makefile,v 1.28 2003/05/22 02:42:40 markd Exp $ -DISTNAME= kdelibs-3.1.1 -PKGREVISION= 2 +DISTNAME= kdelibs-3.1.2 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/buildlink2.mk b/x11/kdelibs3/buildlink2.mk index 87b32fb05fe..59bfa097e0f 100644 --- a/x11/kdelibs3/buildlink2.mk +++ b/x11/kdelibs3/buildlink2.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink2.mk,v 1.15 2003/05/04 12:56:09 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.16 2003/05/22 02:42:40 markd Exp $ .if !defined(KDELIBS3_BUILDLINK2_MK) KDELIBS3_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= kdelibs3 BUILDLINK_PKGBASE.kdelibs3?= kdelibs -BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.1.1nb2 +BUILDLINK_DEPENDS.kdelibs3?= kdelibs>=3.1.2 BUILDLINK_PKGSRCDIR.kdelibs3?= ../../x11/kdelibs3 .include "../../mk/bsd.prefs.mk" diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 4f9c623844c..3ff0bfd541f 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,43 +1,42 @@ -$NetBSD: distinfo,v 1.19 2003/05/13 10:01:54 markd Exp $ +$NetBSD: distinfo,v 1.20 2003/05/22 02:42:40 markd Exp $ -SHA1 (kdelibs-3.1.1.tar.bz2) = fa0c556b78ae1310f5fabae2187bd2187452c67e -Size (kdelibs-3.1.1.tar.bz2) = 10313173 bytes +SHA1 (kdelibs-3.1.2.tar.bz2) = ce1a18206590f8ab62f267efc90dd7083822de74 +Size (kdelibs-3.1.2.tar.bz2) = 10524265 bytes SHA1 (patch-aa) = 4e79f488d54f6b05a23951c6e206e6582ef2a2a7 -SHA1 (patch-ab) = 5dfc87cef8658fa0fffa1eae31c7b0ce39214bef +SHA1 (patch-ab) = 627d8a0fa59622c171ce28908e509f2e443c4a40 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d SHA1 (patch-af) = 5b19804a42f5358f26ded54e9606efbc9a9a19b4 -SHA1 (patch-ag) = 7f7de00427c0c6e8edc3e327fd057cc8028d61aa +SHA1 (patch-ag) = 2b0aac962badf6e57f7baafa9497e73be503af59 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3 -SHA1 (patch-ak) = 394ce880d50ad9ff661e6f7b3b4f48524a2b8988 +SHA1 (patch-ak) = c72a871cbcd343c86145e705dd93c00b82051d5b SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab SHA1 (patch-ao) = 6f7e381fd3d5c66e7d03ce28dd8e17d8af0608c2 -SHA1 (patch-ap) = 3674b75ab2baef292954156e7329557be2bb447b +SHA1 (patch-ap) = d6bf9271eea905aadfcaa847f9c9363c81bc1df8 SHA1 (patch-aq) = 69cd39a625654839c1e8358284df291f947682e5 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1 -SHA1 (patch-av) = 4ef7425f8e98459eea010738104250034c7bca3e +SHA1 (patch-av) = 4803053bfa1c5972e339b0c1613565544fcf2469 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0 SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710 -SHA1 (patch-ba) = 25485d5e1e6c903f7e0f477774d4c51ee718c6a3 +SHA1 (patch-ba) = 6ef0c507b513d332d4abaa24c20dd0a21272ce5c SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea -SHA1 (patch-bd) = 255b89f21188945a36c8bc9580f2cc17cd8c3504 +SHA1 (patch-bd) = 4f4a1fc17108f539c3e459744ccc0dc6f71bb989 SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd -SHA1 (patch-bh) = 368e98fe1172f0ff0c56abc2155f14126c95e2b7 +SHA1 (patch-bh) = a67593f15960dcde8565079cef12a0e4b503cc0d SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb -SHA1 (patch-bm) = ab8cddf24baf7ec9003d84abbde92bcbb8898ba9 -SHA1 (patch-bn) = 6487c68c425869168b732049f517cecd22472c73 +SHA1 (patch-bm) = 9b5326099e3006c491a90ac8ad8e5f5aa0eed945 +SHA1 (patch-bn) = 4840127102ac4e79481c09eb378b5af8df9a930b SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20 SHA1 (patch-bq) = 24af1fd6fba160ccc293cb28dd7139b80c52eb87 -SHA1 (patch-br) = 9fd3e2330fcdb593ba8394b29cba5ecf1367b379 +SHA1 (patch-br) = 7f9bb52a0181115a5c0bbea3b219441eb4d3d89e SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14 -SHA1 (patch-cd) = f0f3842175194fc582b93ae69ea65fe62ef3ac35 +SHA1 (patch-cd) = e9f1096e9c293c545a2121c73ceb238d98e9b486 SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497 -SHA1 (patch-cf) = 5ba068e87b44a6ed71033709fefaa53fc4a0bcd6 diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab index be59560a8e2..1829ea19d6d 100644 --- a/x11/kdelibs3/patches/patch-ab +++ b/x11/kdelibs3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ +$NetBSD: patch-ab,v 1.5 2003/05/22 02:42:41 markd Exp $ ---- arts/knotify/Makefile.in.orig Thu Jan 23 12:30:33 2003 +--- arts/knotify/Makefile.in.orig Thu May 8 05:24:03 2003 +++ arts/knotify/Makefile.in -@@ -287,17 +287,22 @@ +@@ -378,17 +378,22 @@ INCLUDES = -I$(includedir)/arts $(all_in ####### Files bin_PROGRAMS = knotify @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) check_PROGRAMS = knotifytest -@@ -315,23 +320,28 @@ +@@ -406,23 +411,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -69,8 +69,8 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ am_knotifytest_OBJECTS = knotifytest.$(OBJEXT) #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS) #>+ 1 -@@ -345,12 +355,18 @@ - LIBS = @LIBS@ +@@ -432,12 +442,18 @@ knotifytest_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \ @@ -92,10 +92,10 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -372,14 +388,14 @@ +@@ -458,14 +474,14 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(knotify_la_SOURCES) $(knotify_SOURCES) \ - $(knotifytest_SOURCES) +DIST_SOURCES = $(knotify_la_SOURCES) $(libknotify_main_la_SOURCES) \ @@ -110,7 +110,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ #>- all: all-am #>+ 1 -@@ -426,6 +442,8 @@ +@@ -512,6 +528,8 @@ clean-libLTLIBRARIES: done knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) @@ -119,7 +119,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -475,8 +493,9 @@ +@@ -561,8 +579,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -130,7 +130,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@ distclean-depend: -@@ -691,13 +710,14 @@ +@@ -824,13 +843,14 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot @@ -148,7 +148,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ #>+ 5 knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false ) -@@ -710,7 +730,7 @@ +@@ -843,7 +863,7 @@ knotify.moc: $(srcdir)/knotify.h #>+ 3 clean-metasources: @@ -157,7 +157,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ #>+ 4 clean-idl: -@@ -728,33 +748,33 @@ +@@ -861,33 +881,33 @@ force-reedit: #>+ 11 @@ -204,7 +204,7 @@ $NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -764,5 +784,5 @@ +@@ -897,5 +917,5 @@ kde-rpo-clean: -rm -f *.rpo #>+ 3 diff --git a/x11/kdelibs3/patches/patch-ag b/x11/kdelibs3/patches/patch-ag index b1cb2705e04..b1c6e515388 100644 --- a/x11/kdelibs3/patches/patch-ag +++ b/x11/kdelibs3/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ +$NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $ ---- dcop/Makefile.in.orig Thu Jan 23 12:30:33 2003 +--- dcop/Makefile.in.orig Thu May 8 05:24:03 2003 +++ dcop/Makefile.in -@@ -313,7 +313,7 @@ +@@ -404,7 +404,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = dcopserver dcopserver_shutdown check_PROGRAMS = testdcop testdcopc @@ -11,7 +11,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT) libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries) -@@ -329,13 +329,17 @@ +@@ -420,13 +420,17 @@ noinst_HEADERS = version.h dcopglobal.h # dcopstub needs to go first for --enable-final to work libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp @@ -33,7 +33,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ dcopserver_shutdown_SOURCES = dcopserver_shutdown.c -@@ -357,14 +361,11 @@ +@@ -448,14 +452,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = dcop-path.h LTLIBRARIES = $(lib_LTLIBRARIES) @@ -52,7 +52,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \ dcopclient.lo -@@ -375,15 +376,23 @@ +@@ -466,15 +467,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopclient.lo @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS) @@ -79,7 +79,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT) #>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS) #>+ 1 -@@ -415,25 +424,31 @@ +@@ -502,25 +511,31 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dcopc.Po ./$(DEPDIR)/dcopclient.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopobject.Plo ./$(DEPDIR)/dcopref.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/dcopserver.Plo \ @@ -119,9 +119,9 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -463,8 +478,9 @@ +@@ -548,8 +563,9 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \ - $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) \ - $(testdcop_SOURCES) $(testdcopc_SOURCES) @@ -131,16 +131,16 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ HEADERS = $(include_HEADERS) $(noinst_HEADERS) -@@ -475,7 +491,7 @@ - DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ - Makefile.in dcop-path.h.in +@@ -562,7 +578,7 @@ DIST_COMMON = $(include_HEADERS) $(noins + $(srcdir)/../admin/Doxyfile.am Makefile.am Makefile.in \ + dcop-path.h.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) +SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES) #>- all: all-recursive #>+ 1 -@@ -529,6 +545,8 @@ +@@ -616,6 +632,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS) @KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS) @@ -149,7 +149,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -589,10 +607,11 @@ +@@ -676,10 +694,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopobject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopref.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dcopserver.Plo@am__quote@ @@ -162,9 +162,9 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdcopc.Po@am__quote@ -@@ -905,9 +924,6 @@ - uninstall-info-am uninstall-info-recursive \ - uninstall-libLTLIBRARIES uninstall-local uninstall-recursive +@@ -1059,9 +1078,6 @@ uninstall-info: uninstall-info-recursive + uninstall-info-recursive uninstall-libLTLIBRARIES \ + uninstall-local uninstall-recursive - -dummy.cpp: @@ -172,7 +172,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ apidox-am-yes: @if test "$(subdir)" != "."; then \ $(mkinstalldirs) $(top_builddir)/apidocs/$(subdir) ;\ -@@ -1112,18 +1128,6 @@ +@@ -1266,18 +1282,6 @@ force-reedit: #>+ 11 @@ -191,7 +191,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopref.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopclient.cpp dcopclient.moc @echo 'creating libDCOP_la.all_cpp.cpp ...'; \ rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \ -@@ -1135,22 +1139,34 @@ +@@ -1289,22 +1293,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \ rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files @@ -231,7 +231,7 @@ $NetBSD: patch-ag,v 1.4 2003/03/11 13:10:35 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1160,9 +1176,9 @@ +@@ -1314,9 +1330,9 @@ kde-rpo-clean: -rm -f *.rpo #>+ 7 diff --git a/x11/kdelibs3/patches/patch-ak b/x11/kdelibs3/patches/patch-ak index 0e09ce82bf1..3eb9a86329d 100644 --- a/x11/kdelibs3/patches/patch-ak +++ b/x11/kdelibs3/patches/patch-ak @@ -1,8 +1,8 @@ -$NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ +$NetBSD: patch-ak,v 1.5 2003/05/22 02:42:41 markd Exp $ ---- kconf_update/Makefile.in.orig Thu Jan 23 12:30:34 2003 +--- kconf_update/Makefile.in.orig Thu May 8 05:24:04 2003 +++ kconf_update/Makefile.in -@@ -302,16 +302,20 @@ +@@ -393,16 +393,20 @@ x_libraries = @x_libraries@ INCLUDES = $(all_includes) @@ -28,7 +28,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- METASOURCES = AUTO subdir = kconf_update -@@ -320,19 +324,24 @@ +@@ -411,28 +415,35 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -57,10 +57,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ +kconf_update_OBJECTS = kconf_update_main.$(OBJEXT) +kconf_update_DEPENDENCIES = libkconf_update_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -341,11 +350,13 @@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ @@ -78,10 +75,10 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -366,9 +377,10 @@ +@@ -452,9 +463,10 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kconf_update_la_SOURCES) $(kconf_update_SOURCES) +DIST_SOURCES = $(kconf_update_la_SOURCES) \ + $(libkconf_update_main_la_SOURCES) $(kconf_update_SOURCES) @@ -91,7 +88,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- all: all-am #>+ 1 -@@ -415,6 +427,8 @@ +@@ -501,6 +513,8 @@ clean-libLTLIBRARIES: done kconf_update.la: $(kconf_update_la_OBJECTS) $(kconf_update_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kconf_update_la_LDFLAGS) $(kconf_update_la_OBJECTS) $(kconf_update_la_LIBADD) $(LIBS) @@ -100,7 +97,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -454,8 +468,9 @@ +@@ -540,8 +554,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -111,7 +108,7 @@ $NetBSD: patch-ak,v 1.4 2003/03/11 13:10:35 markd Exp $ distclean-depend: -rm -rf ./$(DEPDIR) -@@ -646,9 +661,6 @@ +@@ -779,9 +794,6 @@ uninstall-am: uninstall-binPROGRAMS unin # Internal # noinst_HEADERS = kconf_update.h diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap index 9322c74ac33..4fe16f5754b 100644 --- a/x11/kdelibs3/patches/patch-ap +++ b/x11/kdelibs3/patches/patch-ap @@ -1,8 +1,8 @@ -$NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ +$NetBSD: patch-ap,v 1.5 2003/05/22 02:42:41 markd Exp $ ---- kded/Makefile.in.orig Thu Jan 23 12:30:35 2003 +--- kded/Makefile.in.orig Thu May 8 05:24:05 2003 +++ kded/Makefile.in -@@ -303,18 +303,22 @@ +@@ -394,18 +394,22 @@ x_libraries = @x_libraries@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir) $(all_includes) @@ -32,7 +32,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ kbuildservicefactory.cpp \ kbuildservicegroupfactory.cpp \ kbuildimageiofactory.cpp \ -@@ -322,15 +326,19 @@ +@@ -413,15 +417,19 @@ kbuildsycoca_la_SOURCES = kbuildsycoca.c kctimefactory.cpp @@ -56,7 +56,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ kdontchangethehostname_LDFLAGS = $(all_libraries) $(KDE_RPATH) kdontchangethehostname_LDADD = $(LIB_KDECORE) -@@ -357,46 +365,56 @@ +@@ -448,46 +456,56 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -138,8 +138,8 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ am_kdontchangethehostname_OBJECTS = khostname.$(OBJEXT) #>- kdontchangethehostname_OBJECTS = $(am_kdontchangethehostname_OBJECTS) #>+ 1 -@@ -410,33 +428,39 @@ - LIBS = @LIBS@ +@@ -497,33 +515,39 @@ kdontchangethehostname_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po \ @@ -185,15 +185,15 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kdedmodule.Plo ./$(DEPDIR)/khostname.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -459,6 +483,7 @@ +@@ -545,6 +569,7 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kbuildsycoca_la_SOURCES) $(kded_la_SOURCES) \ + $(libkbuildsycoca_main_la_SOURCES) $(libkded_main_la_SOURCES) \ $(kbuildsycoca_SOURCES) $(kded_SOURCES) \ $(kdontchangethehostname_SOURCES) DATA = $(servicetype_DATA) $(update_DATA) -@@ -467,7 +492,7 @@ +@@ -553,7 +578,7 @@ HEADERS = $(include_HEADERS) $(noinst_HE DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in @@ -202,7 +202,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- all: all-am #>+ 1 -@@ -516,6 +541,10 @@ +@@ -602,6 +627,10 @@ kbuildsycoca.la: $(kbuildsycoca_la_OBJEC $(CXXLINK) -rpath $(libdir) $(kbuildsycoca_la_LDFLAGS) $(kbuildsycoca_la_OBJECTS) $(kbuildsycoca_la_LIBADD) $(LIBS) kded.la: $(kded_la_OBJECTS) $(kded_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kded_la_LDFLAGS) $(kded_la_OBJECTS) $(kded_la_LIBADD) $(LIBS) @@ -213,7 +213,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -561,15 +590,18 @@ +@@ -647,15 +676,18 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -233,8 +233,8 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kdedmodule.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khostname.Po@am__quote@ -@@ -696,7 +728,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -814,7 +846,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=DESIGN kded.upd kded.h kdedmodule.desktop README.kded HOWTO kctimefactory.h @@ -242,7 +242,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -821,9 +853,6 @@ +@@ -953,9 +985,6 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-info-am uninstall-libLTLIBRARIES \ uninstall-servicetypeDATA uninstall-updateDATA @@ -252,7 +252,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 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: -@@ -855,45 +884,45 @@ +@@ -987,45 +1016,45 @@ force-reedit: #>+ 11 @@ -319,7 +319,7 @@ $NetBSD: patch-ap,v 1.4 2003/03/11 13:10:35 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -904,8 +933,8 @@ +@@ -1036,8 +1065,8 @@ kde-rpo-clean: #>+ 7 kbuildsycoca.lo: kbuildsycoca.moc diff --git a/x11/kdelibs3/patches/patch-av b/x11/kdelibs3/patches/patch-av index 3e46869f3a3..6fde605c0f2 100644 --- a/x11/kdelibs3/patches/patch-av +++ b/x11/kdelibs3/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ +$NetBSD: patch-av,v 1.5 2003/05/22 02:42:41 markd Exp $ ---- kdeprint/management/Makefile.in.orig Thu Jan 23 12:30:35 2003 +--- kdeprint/management/Makefile.in.orig Thu May 8 05:24:06 2003 +++ kdeprint/management/Makefile.in -@@ -283,15 +283,19 @@ +@@ -374,15 +374,19 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdeprint -I$(top_builddir)/kdeprint -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir) $(all_includes) @@ -27,7 +27,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ kaddprinterwizard_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) libkdeprint_management_la_SOURCES = \ -@@ -336,11 +340,18 @@ +@@ -427,11 +431,18 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -49,7 +49,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ libkdeprint_management_la_DEPENDENCIES = ../libkdeprint.la am_libkdeprint_management_la_OBJECTS = kmdbcreator.lo kmdriverdb.lo \ kmdriverdbwidget.lo kmiconview.lo kminfopage.lo kmmainview.lo \ -@@ -385,11 +396,11 @@ +@@ -476,18 +487,20 @@ libkdeprint_management_la_nofinal_OBJECT bin_PROGRAMS = kaddprinterwizard$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -62,9 +62,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ +kaddprinterwizard_OBJECTS = kaddprinterwizard_main.$(OBJEXT) +kaddprinterwizard_DEPENDENCIES = libkaddprinterwizard_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -399,8 +410,10 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \ @@ -76,7 +74,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -447,10 +460,12 @@ +@@ -534,10 +547,12 @@ am__depfiles_maybe = depfiles #>- @AMDEP_TRUE@ ./$(DEPDIR)/networkscanner.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \ #>- @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo @@ -91,7 +89,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -498,8 +513,10 @@ +@@ -585,8 +600,10 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/pluginaction.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/sidepixmap.Plo ./$(DEPDIR)/smbview.Plo @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/cjanuswidget.Plo \ @@ -103,15 +101,15 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kiconselectaction.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigcommand.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmconfigdialog.Plo \ -@@ -567,6 +584,7 @@ +@@ -653,6 +670,7 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kaddprinterwizard_la_SOURCES) \ + $(libkaddprinterwizard_main_la_SOURCES) \ $(libkdeprint_management_la_SOURCES) \ $(kaddprinterwizard_SOURCES) DATA = $(dataicon_DATA) -@@ -575,7 +593,7 @@ +@@ -661,7 +679,7 @@ HEADERS = $(kdeprint_HEADERS) $(noinst_H DIST_COMMON = $(kdeprint_HEADERS) $(noinst_HEADERS) Makefile.am \ Makefile.in @@ -120,7 +118,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- all: all-am #>+ 1 -@@ -622,6 +640,8 @@ +@@ -708,6 +726,8 @@ clean-libLTLIBRARIES: done kaddprinterwizard.la: $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kaddprinterwizard_la_LDFLAGS) $(kaddprinterwizard_la_OBJECTS) $(kaddprinterwizard_la_LIBADD) $(LIBS) @@ -129,7 +127,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ #>- libkdeprint_management.la: $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) #>+ 2 @KDE_USE_CLOSURE_TRUE@libkdeprint_management.la: libkdeprint_management.la.closure $(libkdeprint_management_la_OBJECTS) $(libkdeprint_management_la_DEPENDENCIES) -@@ -667,9 +687,10 @@ +@@ -753,9 +773,10 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cjanuswidget.Plo@am__quote@ @@ -141,8 +139,8 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kiconselectaction.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigcommand.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmconfigdialog.Plo@am__quote@ -@@ -830,7 +851,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -948,7 +969,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=tileup.png tiledown.png side.png @@ -150,8 +148,8 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -953,9 +974,6 @@ - uninstall-dataiconDATA uninstall-info-am \ +@@ -1085,9 +1106,6 @@ uninstall-am: uninstall-binPROGRAMS unin + uninstall-binPROGRAMS uninstall-dataiconDATA uninstall-info-am \ uninstall-kdeprintHEADERS uninstall-libLTLIBRARIES - @@ -160,7 +158,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 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: -@@ -970,156 +988,156 @@ +@@ -1102,156 +1120,156 @@ libkdeprint_management.la.closure: $(lib #>+ 3 @@ -386,7 +384,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ #>+ 3 clean-closures: -@@ -1136,7 +1154,7 @@ +@@ -1268,7 +1286,7 @@ force-reedit: #>+ 11 @@ -395,7 +393,7 @@ $NetBSD: patch-av,v 1.4 2003/03/11 13:10:35 markd Exp $ @echo 'creating libkdeprint_management_la.all_cpp.cpp ...'; \ rm -f libkdeprint_management_la.all_cpp.files libkdeprint_management_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> libkdeprint_management_la.all_cpp.final; \ -@@ -1172,77 +1190,77 @@ +@@ -1304,77 +1322,77 @@ kde-rpo-clean: -rm -f *.rpo #>+ 75 diff --git a/x11/kdelibs3/patches/patch-ba b/x11/kdelibs3/patches/patch-ba index 89cc14f7181..c92bd4af4fd 100644 --- a/x11/kdelibs3/patches/patch-ba +++ b/x11/kdelibs3/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ +$NetBSD: patch-ba,v 1.5 2003/05/22 02:42:42 markd Exp $ ---- kinit/Makefile.in.orig Thu Jan 23 12:30:38 2003 +--- kinit/Makefile.in.orig Thu May 8 05:24:09 2003 +++ kinit/Makefile.in -@@ -340,8 +340,7 @@ +@@ -431,8 +431,7 @@ klauncher_la_LIBADD = $(LIB_KIO) klauncher_la_SOURCES = klauncher.cpp klauncher_main.cpp autostart.cpp klauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -12,7 +12,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ #>- METASOURCES = AUTO -@@ -390,11 +389,12 @@ +@@ -481,11 +480,12 @@ am_kioslave_OBJECTS = kioslave.$(OBJEXT) #>+ 1 kioslave_OBJECTS = kioslave.$(OBJEXT) kioslave_DEPENDENCIES = @@ -28,8 +28,8 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ am_kshell_OBJECTS = shell.$(OBJEXT) #>- kshell_OBJECTS = $(am_kshell_OBJECTS) #>+ 1 -@@ -421,28 +421,25 @@ - LIBS = @LIBS@ +@@ -508,28 +508,25 @@ lnusertemp_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/autostart.Plo ./$(DEPDIR)/dummy.Po \ @@ -70,7 +70,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -592,13 +589,13 @@ +@@ -678,13 +675,13 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autostart.Plo@am__quote@ @@ -85,8 +85,8 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setproctitle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrapper.Po@am__quote@ -@@ -751,7 +748,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -887,7 +884,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=README.DCOP LICENSE.setproctitle README.autostart README.wrapper startkde.example @@ -94,7 +94,7 @@ $NetBSD: patch-ba,v 1.4 2003/03/11 13:10:36 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -897,9 +894,6 @@ +@@ -1047,9 +1044,6 @@ uninstall-info: uninstall-info-recursive kwrapper.o: wrapper.c shell.o: wrapper.c diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd index c0c4b8dcc4f..af70ffe89e4 100644 --- a/x11/kdelibs3/patches/patch-bd +++ b/x11/kdelibs3/patches/patch-bd @@ -1,8 +1,8 @@ -$NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ +$NetBSD: patch-bd,v 1.7 2003/05/22 02:42:42 markd Exp $ ---- kio/kssl/kopenssl.cc.orig 2003-03-03 08:02:26.000000000 +1300 +--- kio/kssl/kopenssl.cc.orig Wed May 7 23:46:34 2003 +++ kio/kssl/kopenssl.cc -@@ -177,7 +177,7 @@ void KOpenSSLProxy::destroy() { +@@ -182,7 +182,7 @@ void KOpenSSLProxy::destroy() { _me = NULL; } @@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ #include <qdir.h> #include <qstring.h> #include <qstringlist.h> -@@ -240,26 +240,23 @@ KConfig *cfg; +@@ -245,26 +245,23 @@ KConfig *cfg; delete cfg; @@ -44,8 +44,8 @@ $NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux -@@ -294,10 +291,16 @@ KConfig *cfg; - << "libcrypto.so.0.9.6" +@@ -299,10 +296,16 @@ KConfig *cfg; + << "libcrypto.so.0" #endif ; +#endif @@ -61,7 +61,7 @@ $NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ for (QStringList::Iterator shit = libnamesc.begin(); shit != libnamesc.end(); ++shit) { -@@ -311,9 +314,9 @@ KConfig *cfg; +@@ -316,9 +319,9 @@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } @@ -72,7 +72,7 @@ $NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ if (_cryptoLib) { #ifdef KSSL_HAVE_SSL -@@ -413,16 +416,14 @@ KConfig *cfg; +@@ -418,16 +421,14 @@ KConfig *cfg; #endif } @@ -94,7 +94,7 @@ $NetBSD: patch-bd,v 1.6 2003/05/13 10:01:54 markd Exp $ for (QStringList::Iterator shit = libnamess.begin(); shit != libnamess.end(); ++shit) { -@@ -436,9 +437,9 @@ KConfig *cfg; +@@ -441,9 +442,9 @@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh index 124c15c9b1d..b20ac62ff15 100644 --- a/x11/kdelibs3/patches/patch-bh +++ b/x11/kdelibs3/patches/patch-bh @@ -1,8 +1,8 @@ -$NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ +$NetBSD: patch-bh,v 1.5 2003/05/22 02:42:42 markd Exp $ ---- kio/misc/Makefile.in.orig Thu Jan 23 12:30:39 2003 +--- kio/misc/Makefile.in.orig Thu May 8 05:24:11 2003 +++ kio/misc/Makefile.in -@@ -306,17 +306,21 @@ +@@ -397,17 +397,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile @@ -30,7 +30,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version observer_DIR = $(top_srcdir)/kio/kio -@@ -344,23 +348,28 @@ +@@ -435,23 +439,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -68,8 +68,8 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) #>+ 1 -@@ -379,14 +388,20 @@ - LIBS = @LIBS@ +@@ -466,14 +475,20 @@ ktelnetservice_DEPENDENCIES = + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ @@ -93,18 +93,18 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo -@@ -409,7 +424,8 @@ +@@ -495,7 +510,8 @@ CXXLD = $(CXX) + #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ -DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) \ +DIST_SOURCES = $(kio_uiserver_la_SOURCES) \ + $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) \ $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) DATA = $(kde_services_DATA) $(protocol_DATA) -@@ -422,7 +438,7 @@ - uninstall-recursive check-recursive installcheck-recursive +@@ -509,7 +525,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) @@ -112,7 +112,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -469,6 +485,8 @@ +@@ -556,6 +572,8 @@ clean-libLTLIBRARIES: done kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS) @@ -121,7 +121,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -514,7 +532,8 @@ +@@ -601,7 +619,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -131,8 +131,8 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmailservice.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktelnetservice.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uiserver.Plo@am__quote@ -@@ -702,7 +721,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -825,7 +844,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=rlogin.protocol telnet.protocol rtsp.protocol kmailservice.protocol kio_uiserver.desktop @@ -140,7 +140,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -855,6 +874,10 @@ +@@ -993,6 +1012,10 @@ dummy.cpp: uiserver.kidl # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: @@ -151,7 +151,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ #>+ 9 uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false ) -@@ -866,10 +889,6 @@ +@@ -1004,10 +1027,6 @@ observer_stub.h: observer.kidl $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl #>+ 3 @@ -162,7 +162,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ clean-metasources: -rm -f uiserver.moc -@@ -890,33 +909,33 @@ +@@ -1028,33 +1047,33 @@ force-reedit: #>+ 11 @@ -209,7 +209,7 @@ $NetBSD: patch-bh,v 1.4 2003/03/11 13:10:37 markd Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -926,7 +945,7 @@ +@@ -1064,7 +1083,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdelibs3/patches/patch-bm b/x11/kdelibs3/patches/patch-bm index 2f49801b9dc..614a47105d9 100644 --- a/x11/kdelibs3/patches/patch-bm +++ b/x11/kdelibs3/patches/patch-bm @@ -1,8 +1,8 @@ -$NetBSD: patch-bm,v 1.3 2003/03/11 13:10:38 markd Exp $ +$NetBSD: patch-bm,v 1.4 2003/05/22 02:42:42 markd Exp $ ---- kioslave/http/Makefile.am.orig Sun Oct 27 11:18:24 2002 +--- kioslave/http/Makefile.am.orig Wed May 7 23:46:34 2003 +++ kioslave/http/Makefile.am -@@ -9,7 +9,7 @@ +@@ -8,7 +8,7 @@ INCLUDES= -I$(top_srcdir)/interfaces $(a ####### Files bin_PROGRAMS = kio_http_cache_cleaner @@ -11,7 +11,7 @@ $NetBSD: patch-bm,v 1.3 2003/03/11 13:10:38 markd Exp $ kde_module_LTLIBRARIES = kio_http.la kio_http_la_SOURCES = http.cc httpfilter.cc -@@ -17,12 +17,15 @@ +@@ -16,12 +16,15 @@ kio_http_la_METASOURCES = AUTO kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ) kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) @@ -19,7 +19,7 @@ $NetBSD: patch-bm,v 1.3 2003/03/11 13:10:38 markd Exp $ -kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la +kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) + kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp -kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) @@ -28,10 +28,10 @@ $NetBSD: patch-bm,v 1.3 2003/03/11 13:10:38 markd Exp $ + +kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version + kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version $(all_libraries) noinst_HEADERS = http.h -@@ -30,6 +33,3 @@ +@@ -29,6 +32,3 @@ noinst_HEADERS = http.h kdelnkdir = $(kde_servicesdir) kdelnk_DATA = http_cache_cleaner.desktop http.protocol https.protocol \ webdav.protocol webdavs.protocol diff --git a/x11/kdelibs3/patches/patch-bn b/x11/kdelibs3/patches/patch-bn index 36d302f0722..7ce2c8315a2 100644 --- a/x11/kdelibs3/patches/patch-bn +++ b/x11/kdelibs3/patches/patch-bn @@ -1,8 +1,8 @@ -$NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ +$NetBSD: patch-bn,v 1.6 2003/05/22 02:42:42 markd Exp $ ---- kioslave/http/Makefile.in.orig Thu Jan 23 12:30:40 2003 +--- kioslave/http/Makefile.in.orig Thu May 8 05:24:13 2003 +++ kioslave/http/Makefile.in -@@ -293,7 +293,7 @@ +@@ -383,7 +383,7 @@ INCLUDES = -I$(top_srcdir)/interfaces $( ####### Files bin_PROGRAMS = kio_http_cache_cleaner @@ -11,7 +11,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ kde_module_LTLIBRARIES = kio_http.la kio_http_la_SOURCES = http.cc httpfilter.cc -@@ -301,12 +301,15 @@ +@@ -391,12 +391,15 @@ kio_http_la_SOURCES = http.cc httpfilter kio_http_la_LIBADD = $(LIB_KIO) $(LIBZ) kio_http_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) @@ -19,7 +19,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ -kio_http_cache_cleaner_LDADD = kio_http_cache_cleaner.la +kio_http_cache_cleaner_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_LDADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) + kio_http_cache_cleaner_LDFLAGS = $(KDE_RPATH) $(all_libraries) -kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp -kio_http_cache_cleaner_la_LIBADD = $(LIB_KIO) @@ -28,10 +28,10 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ + +kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner_main.cpp +kio_http_cache_cleaner_la_LIBADD = libkio_http_cache_cleaner_main.la - kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version + kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version $(all_libraries) noinst_HEADERS = http.h -@@ -329,20 +332,28 @@ +@@ -419,33 +422,47 @@ kio_http_la_final_OBJECTS = kio_http_la. kio_http_la_nofinal_OBJECTS = http.lo httpfilter.lo @KDE_USE_FINAL_FALSE@kio_http_la_OBJECTS = $(kio_http_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kio_http_la_OBJECTS = $(kio_http_la_final_OBJECTS) @@ -64,10 +64,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ +kio_http_cache_cleaner_OBJECTS = http_cache_cleaner_main.$(OBJEXT) +kio_http_cache_cleaner_DEPENDENCIES = libkio_http_cache_cleaner_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -350,15 +361,21 @@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/http.Plo \ @@ -92,7 +89,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/httpfilter.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -390,6 +407,7 @@ +@@ -468,6 +485,7 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kio_http_la_SOURCES) \ $(kio_http_cache_cleaner_la_SOURCES) \ @@ -100,8 +97,8 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ $(kio_http_cache_cleaner_SOURCES) DATA = $(kdelnk_DATA) -@@ -402,7 +420,7 @@ - uninstall-recursive check-recursive installcheck-recursive +@@ -481,7 +499,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r + check-recursive installcheck-recursive DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kio_http_la_SOURCES) $(kio_http_cache_cleaner_la_SOURCES) $(kio_http_cache_cleaner_SOURCES) @@ -109,7 +106,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -482,6 +500,8 @@ +@@ -561,6 +579,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kio_http_la_LDFLAGS) $(kio_http_la_OBJECTS) $(kio_http_la_LIBADD) $(LIBS) kio_http_cache_cleaner.la: $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kio_http_cache_cleaner_la_LDFLAGS) $(kio_http_cache_cleaner_la_OBJECTS) $(kio_http_cache_cleaner_la_LIBADD) $(LIBS) @@ -118,7 +115,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -521,9 +541,10 @@ +@@ -600,9 +620,10 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -130,8 +127,8 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/httpfilter.Plo@am__quote@ distclean-depend: -@@ -691,7 +712,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -821,7 +842,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=webdav.protocol http_cache_cleaner.desktop README.webdav rfc2817.txt THOUGHTS README.http_cache_cleaner webdavs.protocol rfc2617.txt rfc2818.txt rfc2616.txt http.protocol https.protocol httpfilter.h rfc3253.txt rfc2518.txt @@ -139,7 +136,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 markd Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -840,9 +861,6 @@ +@@ -985,9 +1006,6 @@ uninstall-info: uninstall-info-recursive uninstall-kdelnkDATA uninstall-libLTLIBRARIES \ uninstall-recursive @@ -149,7 +146,7 @@ $NetBSD: patch-bn,v 1.5 2003/03/11 13:10:38 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: -@@ -919,7 +937,7 @@ +@@ -1064,7 +1082,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br index 790c094c24a..4eb9ae06095 100644 --- a/x11/kdelibs3/patches/patch-br +++ b/x11/kdelibs3/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ +$NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ ---- kioslave/http/kcookiejar/Makefile.in.orig Thu Jan 23 12:30:40 2003 +--- kioslave/http/kcookiejar/Makefile.in.orig Thu May 8 05:24:13 2003 +++ kioslave/http/kcookiejar/Makefile.in -@@ -290,13 +290,17 @@ +@@ -381,13 +381,17 @@ INCLUDES = $(all_includes) ####### Files bin_PROGRAMS = kcookiejar @@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ #>- kcookieserver.skel kcookiewin.cpp -@@ -307,8 +311,8 @@ +@@ -398,8 +402,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_kcookiejar_la_LIBADD = $(LIB_KIO) @@ -34,7 +34,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) kded_DATA = kcookiejar.desktop -@@ -322,11 +326,11 @@ +@@ -413,11 +417,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -49,7 +49,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ kded_kcookiejar_la_DEPENDENCIES = am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \ kcookiewin.lo -@@ -337,14 +341,19 @@ +@@ -428,26 +432,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco kcookiewin.lo kcookieserver_skel.lo @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS) @@ -70,10 +70,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ +kcookiejar_OBJECTS = kcookiejar_main.$(OBJEXT) +kcookiejar_DEPENDENCIES = libkcookiejar_main.la - DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -353,14 +362,20 @@ - LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles -#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kcookiejar.Plo \ @@ -97,9 +94,9 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo -@@ -384,11 +399,11 @@ +@@ -470,11 +485,11 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ - CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) \ - $(kcookiejar_SOURCES) + $(libkcookiejar_main_la_SOURCES) $(kcookiejar_SOURCES) @@ -111,7 +108,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ #>- all: all-am #>+ 1 -@@ -465,6 +480,8 @@ +@@ -551,6 +566,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) $(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS) kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS) @@ -120,7 +117,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -504,8 +521,9 @@ +@@ -590,8 +607,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -131,16 +128,16 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookieserver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiewin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ -@@ -615,7 +633,7 @@ - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH +@@ -733,7 +751,7 @@ distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h kcookiewin.cpp kcookiewin.h rfc2109 kcookiejar.desktop -+KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h kcookiewin.cpp +-KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h kcookiewin.h rfc2109 kcookiejar.desktop ++KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -745,9 +763,6 @@ +@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \ uninstall-libLTLIBRARIES uninstall-updateDATA @@ -150,7 +147,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 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: -@@ -786,7 +801,7 @@ +@@ -919,7 +934,7 @@ force-reedit: #>+ 11 @@ -159,7 +156,7 @@ $NetBSD: patch-br,v 1.4 2003/03/11 13:10:38 markd Exp $ @echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \ rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \ -@@ -822,7 +837,7 @@ +@@ -955,7 +970,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd index aaf11a88291..388734c0bd1 100644 --- a/x11/kdelibs3/patches/patch-cd +++ b/x11/kdelibs3/patches/patch-cd @@ -1,9 +1,9 @@ -$NetBSD: patch-cd,v 1.4 2003/03/11 13:10:39 markd Exp $ +$NetBSD: patch-cd,v 1.5 2003/05/22 02:42:43 markd Exp $ ---- kdefx/Makefile.in.orig Thu Jan 23 12:30:35 2003 +--- kdefx/Makefile.in.orig Thu May 8 05:24:05 2003 +++ kdefx/Makefile.in -@@ -389,12 +389,15 @@ HEADERS = $(include_HEADERS) - DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in +@@ -476,12 +476,15 @@ DIST_COMMON = $(include_HEADERS) $(srcdi + Makefile.am Makefile.in SOURCES = $(libkdefx_la_SOURCES) +CXXCOMPILE_NOOPT=${CXXCOMPILE:-O%=} @@ -19,39 +19,52 @@ $NetBSD: patch-cd,v 1.4 2003/03/11 13:10:39 markd Exp $ $(srcdir)/Makefile.in: Makefile.am $(srcdir)/../admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) #>- cd $(top_srcdir) && \ #>- $(AUTOMAKE) --foreign kdefx/Makefile -@@ -471,6 +474,28 @@ distclean-depend: - @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ - @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ +@@ -574,6 +577,42 @@ distclean-depend: + @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cc.o: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cc.obj: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(CXXCOMPILE_NOOPT) -c -o $@ `cygpath -w $<` ++@am__fastdepCXX_TRUE@ if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ ++@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(CXXCOMPILE_NOOPT) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` + +.cc.lo: -+@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ -+@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ ++@am__fastdepCXX_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ ++@am__fastdepCXX_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \ ++@am__fastdepCXX_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ ++@am__fastdepCXX_TRUE@ fi ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + +.cpp.cc: + cp -f $< $@ + - CXXDEPMODE = @CXXDEPMODE@ - mostlyclean-libtool: -@@ -890,3 +915,6 @@ kde-rpo-clean: + -rm -f *.lo + +@@ -1025,3 +1064,5 @@ kde-rpo-clean: #>+ 3 kstyle.lo: kstyle.moc kstyle.o: kstyle.moc + +kpixmap.o: kpixmap.cc -+ diff --git a/x11/kdelibs3/patches/patch-cf b/x11/kdelibs3/patches/patch-cf deleted file mode 100644 index 04173e7c093..00000000000 --- a/x11/kdelibs3/patches/patch-cf +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-cf,v 1.1 2003/04/10 13:13:23 markd Exp $ - ---- kimgio/eps.cpp.orig Mon Mar 3 08:02:06 2003 -+++ kimgio/eps.cpp -@@ -99,7 +99,7 @@ void kimgio_eps_read (QImageIO *image) - tmp.setNum( wantedHeight ); - cmdBuf += "x"; - cmdBuf += tmp; -- cmdBuf += " -dNOPAUSE -sDEVICE=ppm -c " -+ cmdBuf += " -dSAFER -dPARANOIDSAFER -dNOPAUSE -sDEVICE=ppm -c " - "0 0 moveto " - "1000 0 lineto " - "1000 1000 lineto " |