diff options
Diffstat (limited to 'x11/kdelibs3/patches/patch-bh')
| -rw-r--r-- | x11/kdelibs3/patches/patch-bh | 224 |
1 files changed, 0 insertions, 224 deletions
diff --git a/x11/kdelibs3/patches/patch-bh b/x11/kdelibs3/patches/patch-bh deleted file mode 100644 index 84da979f373..00000000000 --- a/x11/kdelibs3/patches/patch-bh +++ /dev/null @@ -1,224 +0,0 @@ -$NetBSD: patch-bh,v 1.7 2004/01/15 09:52:51 markd Exp $ - ---- kio/misc/Makefile.in.orig 2003-12-29 11:17:00.000000000 +1300 -+++ kio/misc/Makefile.in -@@ -399,17 +399,21 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir - - SUBDIRS = . ksendbugmail kpac kdesasl kssld kfile - --lib_LTLIBRARIES = kio_uiserver.la -+lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la - bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice - --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 - kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries) - --#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub -+#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub - #>+ 1 --kio_uiserver_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp --kio_uiserver_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_SOURCES=uiserver.cpp uiserver_skel.cpp observer_stub.cpp -+libkio_uiserver_main_la_LIBADD = $(LIB_KIO) -+libkio_uiserver_main_la_LDFLAGS = $(all_libraries) -+ -+kio_uiserver_la_SOURCES = kio_uiserver_main.cpp -+kio_uiserver_la_LIBADD = libkio_uiserver_main.la - kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version - - observer_DIR = $(top_srcdir)/kio/kio -@@ -438,23 +442,28 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = - LTLIBRARIES = $(lib_LTLIBRARIES) - --kio_uiserver_la_DEPENDENCIES = --am_kio_uiserver_la_OBJECTS = uiserver.lo -+kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la -+am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo - #>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS) -+#>+ 1 -+kio_uiserver_la_OBJECTS = kio_uiserver_main.lo -+libkio_uiserver_main_la_DEPENDENCIES = -+am_libkio_uiserver_main_la_OBJECTS = uiserver.lo -+#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS) - #>+ 4 --kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo --kio_uiserver_la_nofinal_OBJECTS = uiserver.lo uiserver_skel.lo observer_stub.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 uiserver_skel.lo observer_stub.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) - bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \ - ktelnetservice$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) - --am_kio_uiserver_OBJECTS = dummy.$(OBJEXT) -+am_kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT) - #>- kio_uiserver_OBJECTS = $(am_kio_uiserver_OBJECTS) - #>+ 1 --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 - am_kmailservice_OBJECTS = kmailservice.$(OBJEXT) - #>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS) - #>+ 1 -@@ -469,14 +478,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 \ -+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kio_uiserver_main.Plo \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - #>- @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo --#>+ 7 --@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ -+#>+ 11 -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P ./$(DEPDIR)/kio_uiserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo --@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kmailservice.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P ./$(DEPDIR)/kio_uiserver_main.Plo \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kio_uiserver_main.Po \ -+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmailservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktelnetservice.Po \ - @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/uiserver.Plo - -@@ -498,7 +513,8 @@ CXXLD = $(CXX) - #>+ 2 - CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ --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) - -@@ -512,7 +528,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) -+SOURCES = $(kio_uiserver_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES) - - #>- all: all-recursive - #>+ 1 -@@ -559,6 +575,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) -+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) - binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -@@ -604,7 +622,8 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kio_uiserver_main.Po@am__quote@ - @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@ -@@ -834,7 +853,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 kio_uiserver.desktop kmailservice.protocol rtsp.protocol telnet.protocol -+KDE_DIST=kio_uiserver.desktop rlogin.protocol Makefile.in.rej kmailservice.protocol telnet.protocol rtsp.protocol - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -1002,6 +1021,12 @@ dummy.cpp: uiserver.kidl - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: - -+#>+ 3 -+uiserver.moc: $(srcdir)/uiserver.h -+ $(MOC) $(srcdir)/uiserver.h -o uiserver.moc -+ -+#>+ 1 -+mocs: uiserver.moc - #>+ 9 - uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; false ) -@@ -1013,12 +1038,6 @@ observer_stub.h: observer.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl - - #>+ 3 --uiserver.moc: $(srcdir)/uiserver.h -- $(MOC) $(srcdir)/uiserver.h -o uiserver.moc -- --#>+ 1 --mocs: uiserver.moc --#>+ 3 - clean-metasources: - -rm -f uiserver.moc - -@@ -1039,33 +1058,33 @@ force-reedit: - - - #>+ 11 --kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc -- @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \ -- rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \ -+libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc -+ @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 uiserver_skel.cpp observer_stub.cpp ; do \ -- echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \ -+ 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 kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \ -- rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files -+ 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 - - #>+ 3 - clean-final: -- -rm -f kio_uiserver_la.all_cpp.cpp -+ -rm -f libkio_uiserver_main_la.all_cpp.cpp - - #>+ 2 - final: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am - #>+ 2 - final-install: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am - #>+ 2 - no-final: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am - #>+ 2 - no-final-install: -- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am -+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am - #>+ 3 - cvs-clean: - $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -1075,7 +1094,7 @@ kde-rpo-clean: - -rm -f *.rpo - - #>+ 5 -+$(srcdir)/uiserver.cpp: observer_stub.h - observer_stub.cpp: observer_stub.h - uiserver.lo: uiserver.moc - uiserver.o: uiserver.moc --$(srcdir)/uiserver.cpp: observer_stub.h |