diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-cn')
| -rw-r--r-- | x11/kdebase3/patches/patch-cn | 167 |
1 files changed, 83 insertions, 84 deletions
diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn index f6ff9aaa224..102cbccac21 100644 --- a/x11/kdebase3/patches/patch-cn +++ b/x11/kdebase3/patches/patch-cn @@ -1,8 +1,8 @@ -$NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ +$NetBSD: patch-cn,v 1.3 2003/01/02 09:12:35 skrll Exp $ ---- konqueror/keditbookmarks/Makefile.in.orig Mon May 13 23:57:51 2002 +--- konqueror/keditbookmarks/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ konqueror/keditbookmarks/Makefile.in -@@ -291,21 +291,26 @@ +@@ -290,21 +290,26 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all METASOURCES = AUTO @@ -36,7 +36,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) rcdir = $(kde_datadir)/keditbookmarks -@@ -320,23 +325,30 @@ +@@ -319,22 +324,29 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -51,16 +51,14 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ + $(top_builddir)/libkonq/libkonq.la +am_libkeditbookmarks_main_la_OBJECTS = main.lo toplevel.lo commands.lo +#>- libkeditbookmarks_main_la_OBJECTS = \ -+#>- $(am_libkeditbookmarks_main_la_OBJECTS) - #>+ 5 ++#>- $(am_libkeditbookmarks_main_la_OBJECTS) + #>+ 4 -keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo --keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo \ -- keditbookmarks_la_meta_unload.lo +-keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo -@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS) +libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo -+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo \ -+ libkeditbookmarks_main_la_meta_unload.lo ++libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo toplevel_skel.lo +@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS) bin_PROGRAMS = keditbookmarks$(EXEEXT) @@ -77,20 +75,34 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -344,8 +356,10 @@ +@@ -342,13 +354,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ -- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo +-#>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/keditbookmarks_la.all_cpp.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo $(DEPDIR)/dummy.Po \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/toplevel.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/commands.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libkeditbookmarks_main_la.all_cpp.P $(DEPDIR)/commands.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/commands.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/keditbookmarks_main.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -365,11 +379,12 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -369,11 +387,12 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -105,7 +117,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ #>- all: all-am #>+ 1 -@@ -418,6 +433,8 @@ +@@ -422,6 +441,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS) @@ -114,7 +126,7 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -453,7 +470,8 @@ +@@ -457,7 +478,8 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commands.Plo@am__quote@ @@ -124,16 +136,16 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ -@@ -548,7 +566,7 @@ +@@ -552,7 +574,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc +-KDE_DIST=toplevel.h keditbookmarks.desktop keditbookmarksui.rc hi32-app-keditbookmarks.png commands.h hi16-app-keditbookmarks.png kinsertionsort.h +KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -668,9 +686,6 @@ +@@ -672,9 +694,6 @@ uninstall-am: uninstall-kde-icons unins uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ uninstall-libLTLIBRARIES uninstall-rcDATA @@ -143,79 +155,55 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam 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: -@@ -720,28 +735,28 @@ - - - #>+ 12 --keditbookmarks_la_meta_unload.cpp: commands.moc toplevel.moc -- @echo 'creating keditbookmarks_la_meta_unload.cpp' -- @-rm -f keditbookmarks_la_meta_unload.cpp -+libkeditbookmarks_main_la_meta_unload.cpp: commands.moc toplevel.moc -+ @echo 'creating libkeditbookmarks_main_la_meta_unload.cpp' -+ @-rm -f libkeditbookmarks_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp ;\ -- cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '0};' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp ;\ -- echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp ;\ -- else echo > keditbookmarks_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ cat commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp ;\ -+ else echo > libkeditbookmarks_main_la_meta_unload.cpp; fi +@@ -686,16 +705,16 @@ toplevel_skel.cpp: toplevel.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl + #>+ 3 +-toplevel.moc: $(srcdir)/toplevel.h +- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc +- +-#>+ 3 + commands.moc: $(srcdir)/commands.h + $(MOC) $(srcdir)/commands.h -o commands.moc #>+ 3 - clean-moc-classes: -- -rm -f keditbookmarks_la_meta_unload.cpp -+ -rm -f libkeditbookmarks_main_la_meta_unload.cpp ++toplevel.moc: $(srcdir)/toplevel.h ++ $(MOC) $(srcdir)/toplevel.h -o toplevel.moc ++ ++#>+ 3 + clean-metasources: +- -rm -f toplevel.moc commands.moc ++ -rm -f commands.moc toplevel.moc + + #>+ 4 + clean-idl: +@@ -724,33 +743,33 @@ force-reedit: - #>+ 11 --keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp keditbookmarks_la_meta_unload.cpp commands.moc toplevel.moc -+keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp - @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ - rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ -- for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp keditbookmarks_la_meta_unload.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ - done; \ -@@ -749,11 +764,23 @@ - rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files #>+ 11 --keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp libkeditbookmarks_main_la_meta_unload.cpp commands.moc toplevel.moc +-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp toplevel.moc commands.moc +- @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \ +- rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \ ++libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp toplevel_skel.cpp commands.moc toplevel.moc + @echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \ + rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \ -+ for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp libkeditbookmarks_main_la_meta_unload.cpp ; do \ + for file in main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp ; do \ +- echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \ -+ done; \ -+ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ -+ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files -+ -+#>+ 11 -+keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp - @echo 'creating keditbookmarks.all_cpp.cpp ...'; \ - rm -f keditbookmarks.all_cpp.files keditbookmarks.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> keditbookmarks.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in keditbookmarks_main.cpp ; do \ - echo "#include \"$$file\"" >> keditbookmarks.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks.all_cpp.final; \ done; \ -@@ -762,20 +789,20 @@ +- cat keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files > keditbookmarks_la.all_cpp.cpp; \ +- rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files ++ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \ ++ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp -+ -rm -f keditbookmarks_la.all_cpp.cpp libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks.all_cpp.cpp +- -rm -f keditbookmarks_la.all_cpp.cpp ++ -rm -f libkeditbookmarks_main_la.all_cpp.cpp #>+ 2 final: @@ -235,4 +223,15 @@ $NetBSD: patch-cn,v 1.2 2002/08/25 19:23:42 jlam Exp $ + $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -760,7 +779,7 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 5 +-commands.o: commands.moc +-toplevel.lo: toplevel.moc +-commands.lo: commands.moc + toplevel.o: toplevel.moc ++commands.lo: commands.moc ++toplevel.lo: toplevel.moc ++commands.o: commands.moc |