diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-aw')
| -rw-r--r-- | x11/kdebase3/patches/patch-aw | 250 |
1 files changed, 250 insertions, 0 deletions
diff --git a/x11/kdebase3/patches/patch-aw b/x11/kdebase3/patches/patch-aw new file mode 100644 index 00000000000..7f1daec47c6 --- /dev/null +++ b/x11/kdebase3/patches/patch-aw @@ -0,0 +1,250 @@ +$NetBSD: patch-aw,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdeprint/kjobviewer/Makefile.in.orig Mon May 13 23:57:42 2002 ++++ kdeprint/kjobviewer/Makefile.in +@@ -290,15 +290,20 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kjobviewer +-lib_LTLIBRARIES = kjobviewer.la ++lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la + +-kjobviewer_SOURCES = dummy.cpp +-kjobviewer_LDADD = kjobviewer.la ++kjobviewer_SOURCES = kjobviewer_main.cpp ++kjobviewer_LDADD = libkjobviewer_main.la + kjobviewer_LDFLAGS = $(KDE_RPATH) $(all_libraries) + +-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp ++libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp ++#>- libkjobviewer_main_la_METASOURCES = AUTO ++libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) ++libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kjobviewer_la_SOURCES = kjobviewer_main.cpp + #>- kjobviewer_la_METASOURCES = AUTO +-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI) ++kjobviewer_la_LIBADD = libkjobviewer_main.la + kjobviewer_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = kjobviewer.h +@@ -316,23 +321,28 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kjobviewer_la_DEPENDENCIES = +-am_kjobviewer_la_OBJECTS = kjobviewer.lo main.lo ++kjobviewer_la_DEPENDENCIES = libkjobviewer_main.la ++am_kjobviewer_la_OBJECTS = kjobviewer_main.lo + #>- kjobviewer_la_OBJECTS = $(am_kjobviewer_la_OBJECTS) ++#>+ 1 ++kjobviewer_la_OBJECTS = kjobviewer_main.lo ++libkjobviewer_main_la_DEPENDENCIES = ++am_libkjobviewer_main_la_OBJECTS = kjobviewer.lo main.lo ++#>- libkjobviewer_main_la_OBJECTS = $(am_libkjobviewer_main_la_OBJECTS) + #>+ 5 +-kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo +-kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ +- kjobviewer_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS) ++libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo ++libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \ ++ libkjobviewer_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS) + bin_PROGRAMS = kjobviewer$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kjobviewer_OBJECTS = dummy.$(OBJEXT) ++am_kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) + #>- kjobviewer_OBJECTS = $(am_kjobviewer_OBJECTS) + #>+ 1 +-kjobviewer_OBJECTS = dummy.$(OBJEXT) +-kjobviewer_DEPENDENCIES = kjobviewer.la ++kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT) ++kjobviewer_DEPENDENCIES = libkjobviewer_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -340,8 +350,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kjobviewer.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kjobviewer.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kjobviewer_main.Po $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -361,13 +372,14 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) ++DIST_SOURCES = $(kjobviewer_la_SOURCES) $(libkjobviewer_main_la_SOURCES) \ ++ $(kjobviewer_SOURCES) + DATA = $(desktop_DATA) $(rc_DATA) + + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES) ++SOURCES = $(kjobviewer_la_SOURCES) $(libkjobviewer_main_la_SOURCES) $(kjobviewer_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -416,6 +428,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kjobviewer.la: $(kjobviewer_la_OBJECTS) $(kjobviewer_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kjobviewer_la_LDFLAGS) $(kjobviewer_la_OBJECTS) $(kjobviewer_la_LIBADD) $(LIBS) ++libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -450,8 +464,9 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kjobviewer.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kjobviewer_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kjobviewer_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + + distclean-depend: +@@ -545,7 +560,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png ++KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -666,9 +681,6 @@ + uninstall-info-am uninstall-libLTLIBRARIES uninstall-rcDATA + + +-dummy.cpp: +- echo > dummy.cpp +- + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. +@@ -680,8 +692,12 @@ + $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc + + #>+ 3 ++kjobviewer.moc: $(srcdir)/kjobviewer.h ++ $(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f kjobviewer.moc ++ -rm -f kjobviewer.moc kjobviewer.moc + + #>+ 2 + docs-am: +@@ -705,28 +721,28 @@ + + + #>+ 12 +-kjobviewer_la_meta_unload.cpp: kjobviewer.moc +- @echo 'creating kjobviewer_la_meta_unload.cpp' +- @-rm -f kjobviewer_la_meta_unload.cpp ++libkjobviewer_main_la_meta_unload.cpp: kjobviewer.moc ++ @echo 'creating libkjobviewer_main_la_meta_unload.cpp' ++ @-rm -f libkjobviewer_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp ;\ +- cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp ;\ +- echo '0};' >> kjobviewer_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp ;\ +- else echo > kjobviewer_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp ;\ ++ cat kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp ;\ ++ else echo > libkjobviewer_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kjobviewer_la_meta_unload.cpp ++ -rm -f libkjobviewer_main_la_meta_unload.cpp + + #>+ 11 +-kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp kjobviewer.moc ++kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp kjobviewer.moc + @echo 'creating kjobviewer_la.all_cpp.cpp ...'; \ + rm -f kjobviewer_la.all_cpp.files kjobviewer_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kjobviewer_la.all_cpp.final; \ +- for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \ ++ for file in kjobviewer_main.cpp ; do \ + echo "#include \"$$file\"" >> kjobviewer_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer_la.all_cpp.final; \ + done; \ +@@ -734,11 +750,23 @@ + rm -f kjobviewer_la.all_cpp.final kjobviewer_la.all_cpp.files + + #>+ 11 +-kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp libkjobviewer_main_la_meta_unload.cpp kjobviewer.moc ++ @echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \ ++ rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \ ++ for file in kjobviewer.cpp main.cpp libkjobviewer_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \ ++ done; \ ++ cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files > libkjobviewer_main_la.all_cpp.cpp; \ ++ rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files ++ ++#>+ 11 ++kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp + @echo 'creating kjobviewer.all_cpp.cpp ...'; \ + rm -f kjobviewer.all_cpp.files kjobviewer.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kjobviewer.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kjobviewer_main.cpp ; do \ + echo "#include \"$$file\"" >> kjobviewer.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kjobviewer.all_cpp.final; \ + done; \ +@@ -747,20 +775,20 @@ + + #>+ 3 + clean-final: +- -rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp ++ -rm -f kjobviewer_la.all_cpp.cpp libkjobviewer_main_la.all_cpp.cpp kjobviewer.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" install-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -770,4 +798,4 @@ + -rm -f *.rpo + + #>+ 2 +-$(srcdir)/kjobviewer.cpp: kjobviewer.moc ++$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc |