kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/kdelibs2/patches/patch-au

146 lines
9.6 KiB
Text
Raw Normal View History

Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc.
2001-10-16 00:45:55 +02:00
Cannot strip away RCS IDs, please handle manually!
$NetBSD: patch-au,v 1.3 2001/10/15 22:46:23 skrll Exp $
--- kio/Makefile.in.orig Wed Sep 12 06:10:12 2001
+++ kio/Makefile.in
@@ -2 +2 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -4 +4 @@
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -287 +287 @@
-lib_LTLIBRARIES = libkio.la libksycoca.la kio_uiserver.la
+lib_LTLIBRARIES = libkio.la libksycoca.la libkio_uiserver_main.la kio_uiserver.la
@@ -311,2 +311,2 @@
-kio_uiserver_SOURCES = dummy.cpp
-kio_uiserver_LDADD = kio_uiserver.la
+kio_uiserver_SOURCES = kio_uiserver_main.cpp
+kio_uiserver_LDADD = libkio_uiserver_main.la
@@ -315 +315 @@
-#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp
+#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub renamedlg.cpp skipdlg.cpp
@@ -317 +317 @@
-kio_uiserver_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
+libkio_uiserver_main_la_SOURCES=uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
@@ -319 +319,5 @@
-kio_uiserver_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
+libkio_uiserver_main_la_LIBADD = libksycoca.la ../kssl/libkssl.la ../kdesu/libkdesu.la
+libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
+
+kio_uiserver_la_SOURCES = kio_uiserver_main.cpp
+kio_uiserver_la_LIBADD = libkio_uiserver_main.la
@@ -399 +403 @@
-kio_uiserver_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \
+libkio_uiserver_main_la_DEPENDENCIES = libksycoca.la ../kssl/libkssl.la \
@@ -401 +405 @@
-#>- kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
+#>- libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
@@ -403,5 +407,9 @@
-kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo
-kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \
-kio_uiserver_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS)
+libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo
+libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo \
+libkio_uiserver_main_la_meta_unload.lo
+@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS)
+kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la
+#>- kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
+#>+ 1
+kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
@@ -411 +419 @@
-#>- kio_uiserver_OBJECTS = dummy.$(OBJEXT)
+#>- kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT)
@@ -413,2 +421,2 @@
-kio_uiserver_OBJECTS = dummy.$(OBJEXT)
-kio_uiserver_DEPENDENCIES = kio_uiserver.la
+kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT)
+kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la
@@ -445 +453 @@
-KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kscan.desktop kio_uiserver.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD
+KDE_DIST=DESIGN.metadata kcomprfilter.desktop application.desktop kioslave.upd proxytype.pl DESIGN configure.in.in DESIGN.krun rlogin.protocol kurifilterplugin.desktop lex.l kio_uiserver.desktop kscan.desktop ktypecode.h useragent.pl kmailservice.protocol yacc.y kservicegroupfactory.h design.h telnet.protocol magic DESKTOP_ENTRY_STANDARD
@@ -452,2 +460,2 @@
-SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES)
-OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS)
+SOURCES = $(libkio_la_SOURCES) $(libksycoca_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES)
+OBJECTS = $(libkio_la_OBJECTS) $(libksycoca_la_OBJECTS) $(libkio_uiserver_main_la_OBJECTS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_OBJECTS) $(kmailservice_OBJECTS)
@@ -551,0 +560,3 @@
+libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS)
+
@@ -755 +766 @@
- test "$$subdir" = "." && dot_seen=yes; \
+ test "$$subdir" != "." || dot_seen=yes; \
@@ -813,11 +823,0 @@
-#>- @for file in $(DISTFILES); do \
-#>- d=$(srcdir); \
-#>- if test -d $$d/$$file; then \
-#>- cp -pr $$/$$file $(distdir)/$$file; \
-#>- else \
-#>- test -f $(distdir)/$$file \
-#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-#>- || cp -p $$d/$$file $(distdir)/$$file || :; \
-#>- fi; \
-#>- done
-#>+ 10
@@ -958,3 +957,0 @@
-dummy.cpp: uiserver.kidl
- echo > dummy.cpp
-
@@ -1176,8 +1173,8 @@
-kio_uiserver_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc
- @echo 'creating kio_uiserver_la_meta_unload.cpp'
- @-rm -f kio_uiserver_la_meta_unload.cpp
- @echo 'static const char * _metalist_kio_uiserver_la[] = {' > kio_uiserver_la_meta_unload.cpp
- @cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kio_uiserver_la_meta_unload.cpp
- @echo '0};' >> kio_uiserver_la_meta_unload.cpp
- @echo '#include <kunload.h>' >> kio_uiserver_la_meta_unload.cpp
- @echo '_UNLOAD(kio_uiserver_la)' >> kio_uiserver_la_meta_unload.cpp
+libkio_uiserver_main_la_meta_unload.cpp: renamedlg.moc uiserver.moc skipdlg.moc
+ @echo 'creating libkio_uiserver_main_la_meta_unload.cpp'
+ @-rm -f libkio_uiserver_main_la_meta_unload.cpp
+ @echo 'static const char * _metalist_libkio_uiserver_main_la[] = {' > libkio_uiserver_main_la_meta_unload.cpp
+ @cat renamedlg.moc uiserver.moc skipdlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkio_uiserver_main_la_meta_unload.cpp
+ @echo '0};' >> libkio_uiserver_main_la_meta_unload.cpp
+ @echo '#include <kunload.h>' >> libkio_uiserver_main_la_meta_unload.cpp
+ @echo '_UNLOAD(libkio_uiserver_main_la)' >> libkio_uiserver_main_la_meta_unload.cpp
@@ -1188 +1185 @@
- -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp kio_uiserver_la_meta_unload.cpp
+ -rm -f libkio_la_meta_unload.cpp libksycoca_la_meta_unload.cpp libkio_uiserver_main_la_meta_unload.cpp
@@ -1215 +1212,13 @@
-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp
+libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp
+ @echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \
+ rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \
+ for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp libkio_uiserver_main_la_meta_unload.cpp ; do \
+ echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \
+ done; \
+ cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \
+ rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files
+
+#>+ 11
+kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp
@@ -1219 +1228 @@
- for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp kio_uiserver_la_meta_unload.cpp ; do \
+ for file in kio_uiserver_main.cpp ; do \
@@ -1227 +1236 @@
-kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+kio_uiserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kio_uiserver_main.cpp
@@ -1231 +1240 @@
- for file in dummy.cpp ; do \
+ for file in kio_uiserver_main.cpp ; do \
@@ -1252 +1261 @@
- -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp
+ -rm -f libkio_la.all_cpp.cpp libksycoca_la.all_cpp.cpp libkio_uiserver_main_la.all_cpp.cpp kio_uiserver_la.all_cpp.cpp kio_uiserver.all_cpp.cpp kmailservice.all_cpp.cpp
@@ -1256 +1265 @@
- $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am
+ $(MAKE) libkio_la_OBJECTS="$(libkio_la_final_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_final_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am
@@ -1259 +1268 @@
- $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkio_la_OBJECTS="$(libkio_la_nofinal_OBJECTS)" libksycoca_la_OBJECTS="$(libksycoca_la_nofinal_OBJECTS)" libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am
Reference in a new issue Copy permalink