diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-ej')
| -rw-r--r-- | x11/kdebase3/patches/patch-ej | 176 |
1 files changed, 72 insertions, 104 deletions
diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index 2e43c2d3c46..0b2e393d21a 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,8 +1,8 @@ -$NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ +$NetBSD: patch-ej,v 1.4 2003/01/02 09:12:36 skrll Exp $ ---- kxkb/Makefile.in.orig Tue Jun 25 19:31:39 2002 +--- kxkb/Makefile.in.orig Fri Dec 27 18:19:11 2002 +++ kxkb/Makefile.in -@@ -292,11 +292,11 @@ +@@ -291,11 +291,11 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kxkb @@ -17,7 +17,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ kde_module_LTLIBRARIES = kcm_keyboard.la kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp -@@ -304,9 +304,13 @@ +@@ -303,9 +303,13 @@ kcm_keyboard_la_SOURCES = rules.cpp kcml kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) @@ -33,8 +33,8 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ data_DATA = keyboard.desktop -@@ -327,23 +331,28 @@ - kcm_keyboard_la_meta_unload.lo +@@ -325,22 +329,27 @@ kcm_keyboard_la_final_OBJECTS = kcm_keyb + kcm_keyboard_la_nofinal_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo @KDE_USE_FINAL_FALSE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kcm_keyboard_la_OBJECTS = $(kcm_keyboard_la_final_OBJECTS) -kxkb_la_DEPENDENCIES = @@ -47,15 +47,13 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ +libkxkb_main_la_DEPENDENCIES = +am_libkxkb_main_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +#>- libkxkb_main_la_OBJECTS = $(am_libkxkb_main_la_OBJECTS) - #>+ 5 + #>+ 4 -kxkb_la_final_OBJECTS = kxkb_la.all_cpp.lo --kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -- kxkb_la_meta_unload.lo +-kxkb_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo -@KDE_USE_FINAL_FALSE@kxkb_la_OBJECTS = $(kxkb_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@kxkb_la_OBJECTS = $(kxkb_la_final_OBJECTS) +libkxkb_main_la_final_OBJECTS = libkxkb_main_la.all_cpp.lo -+libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo \ -+ libkxkb_main_la_meta_unload.lo ++libkxkb_main_la_nofinal_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo +@KDE_USE_FINAL_FALSE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libkxkb_main_la_OBJECTS = $(libkxkb_main_la_final_OBJECTS) bin_PROGRAMS = kxkb$(EXEEXT) @@ -72,22 +70,39 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -351,10 +360,10 @@ +@@ -348,19 +357,19 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/rules.Plo -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ -+ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/rules.Plo ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo + #>+ 9 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/kxkb_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/extension.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmlayout.Plo $(DEPDIR)/kcmmisc.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb.Plo $(DEPDIR)/pixmap.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/rules.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kcm_keyboard_la.all_cpp.P $(DEPDIR)/libkxkb_main_la.all_cpp.P $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/extension.Plo $(DEPDIR)/kcmlayout.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kcmmisc.Plo $(DEPDIR)/kxkb.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kxkb_main.Plo $(DEPDIR)/kxkb_main.Po \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/pixmap.Plo $(DEPDIR)/rules.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -375,11 +384,11 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -382,11 +391,11 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ @@ -101,7 +116,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ #>- all: all-am #>+ 1 -@@ -452,6 +461,8 @@ +@@ -459,6 +468,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) @@ -110,7 +125,7 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -486,11 +497,12 @@ +@@ -493,11 +504,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,25 +139,16 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/rules.Plo@am__quote@ -@@ -585,7 +597,7 @@ +@@ -592,7 +604,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=kcmmisc.h configure.in.in kxkbbindings.cpp pixmap.h keyboard.desktop LICENSE kcmlayout.h extension.h uninstall.desktop kxkb.h kxkb.desktop rules.h +-KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp LICENSE kcmlayout.h configure.in.in kxkb.desktop +KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in kcmlayout.h kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -672,7 +684,7 @@ - - #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES - #>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES -+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES - - install-info: install-info-am - -@@ -722,9 +734,6 @@ +@@ -729,9 +741,6 @@ install-data-local: uninstall.desktop messages: $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot @@ -152,84 +158,33 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 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: -@@ -782,21 +791,21 @@ - - - #>+ 12 --kxkb_la_meta_unload.cpp: kxkb.moc -- @echo 'creating kxkb_la_meta_unload.cpp' -- @-rm -f kxkb_la_meta_unload.cpp -+libkxkb_main_la_meta_unload.cpp: kxkb.moc -+ @echo 'creating libkxkb_main_la_meta_unload.cpp' -+ @-rm -f libkxkb_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_kxkb_la[] = {' > kxkb_la_meta_unload.cpp ;\ -- cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kxkb_la_meta_unload.cpp ;\ -- echo '0};' >> kxkb_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> kxkb_la_meta_unload.cpp ;\ -- echo '_UNLOAD(kxkb_la)' >> kxkb_la_meta_unload.cpp ;\ -- else echo > kxkb_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libkxkb_main_la[] = {' > libkxkb_main_la_meta_unload.cpp ;\ -+ cat kxkb.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libkxkb_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libkxkb_main_la)' >> libkxkb_main_la_meta_unload.cpp ;\ -+ else echo > libkxkb_main_la_meta_unload.cpp; fi - - - #>+ 3 - clean-moc-classes: -- -rm -f kcm_keyboard_la_meta_unload.cpp kxkb_la_meta_unload.cpp -+ -rm -f kcm_keyboard_la_meta_unload.cpp libkxkb_main_la_meta_unload.cpp - - #>+ 11 - kcm_keyboard_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kcmlayout.cpp $(srcdir)/pixmap.cpp $(srcdir)/kcmmisc.cpp kcm_keyboard_la_meta_unload.cpp kcmlayout.moc kxkb.moc kcmmisc.moc -@@ -811,11 +820,11 @@ +@@ -788,33 +797,33 @@ kcm_keyboard_la.all_cpp.cpp: $(srcdir)/M rm -f kcm_keyboard_la.all_cpp.final kcm_keyboard_la.all_cpp.files #>+ 11 --kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb_la_meta_unload.cpp -+kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb_la.all_cpp.cpp ...'; \ - rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ -- for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp kxkb_la_meta_unload.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ - done; \ -@@ -823,11 +832,23 @@ - rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files - - #>+ 11 --kxkb.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp libkxkb_main_la_meta_unload.cpp +-kxkb_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc +- @echo 'creating kxkb_la.all_cpp.cpp ...'; \ +- rm -f kxkb_la.all_cpp.files kxkb_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kxkb_la.all_cpp.final; \ ++libkxkb_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/rules.cpp $(srcdir)/kxkb.cpp $(srcdir)/extension.cpp $(srcdir)/pixmap.cpp kxkb.moc + @echo 'creating libkxkb_main_la.all_cpp.cpp ...'; \ + rm -f libkxkb_main_la.all_cpp.files libkxkb_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkxkb_main_la.all_cpp.final; \ -+ for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp libkxkb_main_la_meta_unload.cpp ; do \ + for file in rules.cpp kxkb.cpp extension.cpp pixmap.cpp ; do \ +- echo "#include \"$$file\"" >> kxkb_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkxkb_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxkb_main_la.all_cpp.final; \ -+ done; \ -+ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ -+ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files -+ -+#>+ 11 -+kxkb.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxkb_main.cpp - @echo 'creating kxkb.all_cpp.cpp ...'; \ - rm -f kxkb.all_cpp.files kxkb.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kxkb.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in kxkb_main.cpp ; do \ - echo "#include \"$$file\"" >> kxkb.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxkb.all_cpp.final; \ done; \ -@@ -836,20 +857,20 @@ +- cat kxkb_la.all_cpp.final kxkb_la.all_cpp.files > kxkb_la.all_cpp.cpp; \ +- rm -f kxkb_la.all_cpp.final kxkb_la.all_cpp.files ++ cat libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files > libkxkb_main_la.all_cpp.cpp; \ ++ rm -f libkxkb_main_la.all_cpp.final libkxkb_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp kxkb.all_cpp.cpp -+ -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp kxkb.all_cpp.cpp +- -rm -f kcm_keyboard_la.all_cpp.cpp kxkb_la.all_cpp.cpp ++ -rm -f kcm_keyboard_la.all_cpp.cpp libkxkb_main_la.all_cpp.cpp #>+ 2 final: @@ -249,4 +204,17 @@ $NetBSD: patch-ej,v 1.3 2002/08/25 19:23:48 jlam Exp $ + $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_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 +@@ -824,9 +833,9 @@ kde-rpo-clean: + -rm -f *.rpo + + #>+ 7 +-kcmmisc.lo: kcmmisc.moc + kxkb.lo: kxkb.moc ++kcmlayout.o: kcmlayout.moc + kcmlayout.lo: kcmlayout.moc +-kcmmisc.o: kcmmisc.moc + kxkb.o: kxkb.moc +-kcmlayout.o: kcmlayout.moc ++kcmmisc.o: kcmmisc.moc ++kcmmisc.lo: kcmmisc.moc |