diff options
| author | skrll <skrll@pkgsrc.org> | 2002-05-31 13:18:33 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2002-05-31 13:18:33 +0000 |
| commit | db2931e6846f397e8cf34c91dde38f1c17e85f4d (patch) | |
| tree | e26d0d0bfc650cb8794437a4c3b930a828585d70 /x11/kdebase3/patches | |
| parent | c8cb7c7f48bc88db873d07dfa06d78470fcc9596 (diff) | |
| download | pkgsrc-db2931e6846f397e8cf34c91dde38f1c17e85f4d.tar.gz | |
Initial import of a kdebase3 pkg
Diffstat (limited to 'x11/kdebase3/patches')
120 files changed, 7791 insertions, 0 deletions
diff --git a/x11/kdebase3/patches/patch-aa b/x11/kdebase3/patches/patch-aa new file mode 100644 index 00000000000..fa232174f45 --- /dev/null +++ b/x11/kdebase3/patches/patch-aa @@ -0,0 +1,38 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:18:39 skrll Exp $ + +--- configure.orig Mon May 13 23:58:21 2002 ++++ configure +@@ -25606,7 +25606,24 @@ + (exit $ac_status); }; }; then + + ac_cv_have_dpms="-lXdpms" +- ++ ++ lib=Xdpms ++ shared_lib_found=no ++ for i in ${LDFLAGS}; do ++ case "$i" in ++ -L*) ++ dir=`echo $i | sed "s,^-L,,"` ++ if [ -e $dir/lib${lib}.so ] || ++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then ++ shared_lib_found=yes ++ break; ++ fi ++ esac ++ done ++ if [ "$shared_lib_found" = "no" ]; then ++ eval "ac_cv_have_dpms=no" ++ fi ++ + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 +@@ -28793,6 +28810,7 @@ + case "$host" in + *-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;; + *-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; ++ *-*-netbsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;; + *-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;; + *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;; + *) ksysguardd_compile=no; UNAME='' ;; diff --git a/x11/kdebase3/patches/patch-ab b/x11/kdebase3/patches/patch-ab new file mode 100644 index 00000000000..c6e72026595 --- /dev/null +++ b/x11/kdebase3/patches/patch-ab @@ -0,0 +1,56 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $ + +--- kate/app/Makefile.am.orig Thu Jan 10 17:03:37 2002 ++++ kate/app/Makefile.am +@@ -1,29 +1,35 @@ +-lib_LTLIBRARIES = kate.la kwrite.la ++lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la + bin_PROGRAMS = kate kwrite + +-kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ +- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ +- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ +- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ +- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp ++libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ ++ kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ ++ katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ ++ katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ ++ kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ ++ kategrepdialog.cpp katefiledialog.cpp + +-kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kate_la_SOURCES = dummy_main.cpp ++kate_la_LIBADD = libkate_main.la + kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp +-kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la ++libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp ++libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la ++libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kwrite_la_SOURCES = dummy_main.cpp ++kwrite_la_LIBADD = libkwrite_main.la + kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kate_SOURCES = dummy.cpp +-kate_LDADD = kate.la ++kate_SOURCES = dummy_main.cpp ++kate_LDADD = libkate_main.la + kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) + +-kwrite_SOURCES = dummy.cpp +-kwrite_LDADD = kwrite.la ++kwrite_SOURCES = dummy_main.cpp ++kwrite_LDADD = libkwrite_main.la + kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) +- +-dummy.cpp: +- echo > dummy.cpp + + INCLUDES= -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) + diff --git a/x11/kdebase3/patches/patch-ac b/x11/kdebase3/patches/patch-ac new file mode 100644 index 00000000000..e6e4ead25a3 --- /dev/null +++ b/x11/kdebase3/patches/patch-ac @@ -0,0 +1,400 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $ + +--- kate/app/Makefile.in.orig Mon May 13 23:57:35 2002 ++++ kate/app/Makefile.in +@@ -287,35 +287,45 @@ + x_includes = @x_includes@ + x_libraries = @x_libraries@ + +-lib_LTLIBRARIES = kate.la kwrite.la ++lib_LTLIBRARIES = libkate_main.la kate.la libkwrite_main.la kwrite.la + bin_PROGRAMS = kate kwrite + +-#>- kate_la_SOURCES = kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ +-#>- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ +-#>- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ +-#>- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ +-#>- kateappIface.skel kateIface.skel kategrepdialog.cpp katefiledialog.cpp +-#>+ 5 +-kate_la_SOURCES=kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp \ +- kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp \ +- katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp \ +- kateviewmanager.cpp kateviewspace.cpp katemain.cpp \ +- kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp ++#>- libkate_main_la_SOURCES = kateapp.cpp kateconfigdialog.cpp \ ++#>- kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ ++#>- katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ ++#>- katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ ++#>- kateviewspace.cpp katemain.cpp kateappIface.skel kateIface.skel \ ++#>- kategrepdialog.cpp katefiledialog.cpp ++#>+ 6 ++libkate_main_la_SOURCES=kateapp.cpp kateconfigdialog.cpp \ ++ kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp \ ++ katefilelist.cpp katefileselector.cpp katemainwindow.cpp \ ++ katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp \ ++ kateviewspace.cpp katemain.cpp \ ++ kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp ++ + ++libkate_main_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++libkate_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-kate_la_LIBADD = ../interfaces/libkateinterfaces.la -lkscript ++kate_la_SOURCES = dummy_main.cpp ++kate_la_LIBADD = libkate_main.la + kate_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kwrite_la_SOURCES = kwritemain.cpp katefiledialog.cpp +-kwrite_la_LIBADD = ../interfaces/libkateinterfaces.la ++libkwrite_main_la_SOURCES = kwritemain.cpp katefiledialog.cpp ++libkwrite_main_la_LIBADD = ../interfaces/libkateinterfaces.la ++libkwrite_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++kwrite_la_SOURCES = dummy_main.cpp ++kwrite_la_LIBADD = libkwrite_main.la + kwrite_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-kate_SOURCES = dummy.cpp +-kate_LDADD = kate.la ++kate_SOURCES = dummy_main.cpp ++kate_LDADD = libkate_main.la + kate_LDFLAGS = $(KDE_RPATH) $(all_libraries) + +-kwrite_SOURCES = dummy.cpp +-kwrite_LDADD = kwrite.la ++kwrite_SOURCES = dummy_main.cpp ++kwrite_LDADD = libkwrite_main.la + kwrite_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + INCLUDES = -DKATEPART_NOT_INSTALLED -I../interfaces $(all_includes) +@@ -327,47 +337,57 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kate_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +-am_kate_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ ++kate_la_DEPENDENCIES = libkate_main.la ++am_kate_la_OBJECTS = dummy_main.lo ++#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) ++#>+ 1 ++kate_la_OBJECTS = dummy_main.lo ++kwrite_la_DEPENDENCIES = libkwrite_main.la ++am_kwrite_la_OBJECTS = dummy_main.lo ++#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) ++#>+ 1 ++kwrite_la_OBJECTS = dummy_main.lo ++libkate_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la ++am_libkate_main_la_OBJECTS = kateapp.lo kateconfigdialog.lo \ + kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ + katefilelist.lo katefileselector.lo katemainwindow.lo \ + katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ + kateviewspace.lo katemain.lo kategrepdialog.lo \ + katefiledialog.lo +-#>- kate_la_OBJECTS = $(am_kate_la_OBJECTS) ++#>- libkate_main_la_OBJECTS = $(am_libkate_main_la_OBJECTS) + #>+ 10 +-kate_la_final_OBJECTS = kate_la.all_cpp.lo +-kate_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ ++libkate_main_la_final_OBJECTS = libkate_main_la.all_cpp.lo ++libkate_main_la_nofinal_OBJECTS = kateapp.lo kateconfigdialog.lo \ + kateconfigplugindialogpage.lo kateconsole.lo katedocmanager.lo \ + katefilelist.lo katefileselector.lo katemainwindow.lo \ + katepluginmanager.lo katesplitter.lo kateviewmanager.lo \ + kateviewspace.lo katemain.lo kategrepdialog.lo \ + katefiledialog.lo kateappIface_skel.lo kateIface_skel.lo \ +- kate_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kate_la_OBJECTS = $(kate_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kate_la_OBJECTS = $(kate_la_final_OBJECTS) +-kwrite_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la +-am_kwrite_la_OBJECTS = kwritemain.lo katefiledialog.lo +-#>- kwrite_la_OBJECTS = $(am_kwrite_la_OBJECTS) ++ libkate_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkate_main_la_OBJECTS = $(libkate_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkate_main_la_OBJECTS = $(libkate_main_la_final_OBJECTS) ++libkwrite_main_la_DEPENDENCIES = ../interfaces/libkateinterfaces.la ++am_libkwrite_main_la_OBJECTS = kwritemain.lo katefiledialog.lo ++#>- libkwrite_main_la_OBJECTS = $(am_libkwrite_main_la_OBJECTS) + #>+ 5 +-kwrite_la_final_OBJECTS = kwrite_la.all_cpp.lo +-kwrite_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ +- kwrite_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kwrite_la_OBJECTS = $(kwrite_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kwrite_la_OBJECTS = $(kwrite_la_final_OBJECTS) ++libkwrite_main_la_final_OBJECTS = libkwrite_main_la.all_cpp.lo ++libkwrite_main_la_nofinal_OBJECTS = kwritemain.lo katefiledialog.lo \ ++ libkwrite_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkwrite_main_la_OBJECTS = $(libkwrite_main_la_final_OBJECTS) + bin_PROGRAMS = kate$(EXEEXT) kwrite$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kate_OBJECTS = dummy.$(OBJEXT) ++am_kate_OBJECTS = dummy_main.$(OBJEXT) + #>- kate_OBJECTS = $(am_kate_OBJECTS) + #>+ 1 +-kate_OBJECTS = dummy.$(OBJEXT) +-kate_DEPENDENCIES = kate.la +-am_kwrite_OBJECTS = dummy.$(OBJEXT) ++kate_OBJECTS = dummy_main.$(OBJEXT) ++kate_DEPENDENCIES = libkate_main.la ++am_kwrite_OBJECTS = dummy_main.$(OBJEXT) + #>- kwrite_OBJECTS = $(am_kwrite_OBJECTS) + #>+ 1 +-kwrite_OBJECTS = dummy.$(OBJEXT) +-kwrite_DEPENDENCIES = kwrite.la ++kwrite_OBJECTS = dummy_main.$(OBJEXT) ++kwrite_DEPENDENCIES = libkwrite_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -375,7 +395,8 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kateapp.Plo \ ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy_main.Plo $(DEPDIR)/dummy_main.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/kateapp.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kateconfigdialog.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kateconfigplugindialogpage.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kateconsole.Plo \ +@@ -409,10 +430,11 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) \ +- $(kwrite_SOURCES) ++DIST_SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) \ ++ $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) \ ++ $(kate_SOURCES) $(kwrite_SOURCES) + DIST_COMMON = Makefile.am Makefile.in +-SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) ++SOURCES = $(kate_la_SOURCES) $(kwrite_la_SOURCES) $(libkate_main_la_SOURCES) $(libkwrite_main_la_SOURCES) $(kate_SOURCES) $(kwrite_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -463,6 +485,10 @@ + $(CXXLINK) -rpath $(libdir) $(kate_la_LDFLAGS) $(kate_la_OBJECTS) $(kate_la_LIBADD) $(LIBS) + kwrite.la: $(kwrite_la_OBJECTS) $(kwrite_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kwrite_la_LDFLAGS) $(kwrite_la_OBJECTS) $(kwrite_la_LIBADD) $(LIBS) ++libkate_main.la: $(libkate_main_la_OBJECTS) $(libkate_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkate_main_la_LDFLAGS) $(libkate_main_la_OBJECTS) $(libkate_main_la_LIBADD) $(LIBS) ++libkwrite_main.la: $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkwrite_main_la_LDFLAGS) $(libkwrite_main_la_OBJECTS) $(libkwrite_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -500,7 +526,8 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateapp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kateconfigplugindialogpage.Plo@am__quote@ +@@ -575,7 +602,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=katemain.cpp katefileselector.h katemainwindow.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateconfigplugindialogpage.h kateappIface.h kateviewmanager.cpp katemain.h kateconfigdialog.h katefilelist.cpp katedocmanager.h kateIface.h kateviewspace.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katepluginmanager.cpp ++KDE_DIST=katemain.cpp katefileselector.h kateIface.h katemainwindow.cpp kateviewspace.cpp kateapp.h katefiledialog.h katesplitter.h kwritemain.h kategrepdialog.cpp kateappIface.h kateconfigplugindialogpage.h kateviewmanager.cpp kategrepdialog.h kateviewspace.h katesplitter.cpp katemain.h katefilelist.cpp kateconfigdialog.h katefileselector.cpp katepluginmanager.h kateconsole.h kateconsole.cpp katefilelist.h katemainwindow.h kateviewmanager.h katedocmanager.cpp katedocmanager.h katepluginmanager.cpp kateconfigplugindialogpage.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -689,23 +716,10 @@ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-info-am uninstall-libLTLIBRARIES + +- +-dummy.cpp: +- echo > dummy.cpp + # 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: + +-#>+ 9 +-kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) +-kateappIface_skel.cpp: kateappIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl +-kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) +-kateIface_skel.cpp: kateIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl +- + #>+ 3 + kateviewmanager.moc: $(srcdir)/kateviewmanager.h + $(MOC) $(srcdir)/kateviewmanager.h -o kateviewmanager.moc +@@ -766,6 +780,16 @@ + katepluginmanager.moc: $(srcdir)/katepluginmanager.h + $(MOC) $(srcdir)/katepluginmanager.h -o katepluginmanager.moc + ++#>+ 9 ++kateappIface.kidl: $(srcdir)/kateappIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/kateappIface.h > kateappIface.kidl || ( rm -f kateappIface.kidl ; /bin/false ) ++kateappIface_skel.cpp: kateappIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateappIface.kidl ++kateIface.kidl: $(srcdir)/kateIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/kateIface.h > kateIface.kidl || ( rm -f kateIface.kidl ; /bin/false ) ++kateIface_skel.cpp: kateIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub kateIface.kidl ++ + #>+ 3 + clean-metasources: + -rm -f kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc +@@ -787,41 +811,41 @@ + + + #>+ 12 +-kate_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc +- @echo 'creating kate_la_meta_unload.cpp' +- @-rm -f kate_la_meta_unload.cpp ++libkate_main_la_meta_unload.cpp: katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc ++ @echo 'creating libkate_main_la_meta_unload.cpp' ++ @-rm -f libkate_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kate_la[] = {' > kate_la_meta_unload.cpp ;\ +- cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kate_la_meta_unload.cpp ;\ +- echo '0};' >> kate_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kate_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kate_la)' >> kate_la_meta_unload.cpp ;\ +- else echo > kate_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkate_main_la[] = {' > libkate_main_la_meta_unload.cpp ;\ ++ cat katefilelist.moc katefileselector.moc katesplitter.moc kateviewmanager.moc katemainwindow.moc kateconfigplugindialogpage.moc kateconfigdialog.moc kateapp.moc kateviewspace.moc katefiledialog.moc kateconsole.moc kategrepdialog.moc katedocmanager.moc katepluginmanager.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkate_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkate_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkate_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkate_main_la)' >> libkate_main_la_meta_unload.cpp ;\ ++ else echo > libkate_main_la_meta_unload.cpp; fi + + + #>+ 12 +-kwrite_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc +- @echo 'creating kwrite_la_meta_unload.cpp' +- @-rm -f kwrite_la_meta_unload.cpp ++libkwrite_main_la_meta_unload.cpp: kwritemain.moc katefiledialog.moc ++ @echo 'creating libkwrite_main_la_meta_unload.cpp' ++ @-rm -f libkwrite_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwrite_la[] = {' > kwrite_la_meta_unload.cpp ;\ +- cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrite_la_meta_unload.cpp ;\ +- echo '0};' >> kwrite_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kwrite_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kwrite_la)' >> kwrite_la_meta_unload.cpp ;\ +- else echo > kwrite_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkwrite_main_la[] = {' > libkwrite_main_la_meta_unload.cpp ;\ ++ cat kwritemain.moc katefiledialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkwrite_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkwrite_main_la)' >> libkwrite_main_la_meta_unload.cpp ;\ ++ else echo > libkwrite_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kate_la_meta_unload.cpp kwrite_la_meta_unload.cpp ++ -rm -f libkate_main_la_meta_unload.cpp libkwrite_main_la_meta_unload.cpp + + #>+ 11 +-kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc ++kate_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp kateviewmanager.moc katesplitter.moc katefileselector.moc katefilelist.moc kateconfigdialog.moc kateconfigplugindialogpage.moc katemainwindow.moc kateapp.moc kwritemain.moc kateviewspace.moc katefiledialog.moc katedocmanager.moc kategrepdialog.moc kateconsole.moc katepluginmanager.moc + @echo 'creating kate_la.all_cpp.cpp ...'; \ + rm -f kate_la.all_cpp.files kate_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kate_la.all_cpp.final; \ +- for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp kate_la_meta_unload.cpp ; do \ ++ for file in dummy_main.cpp ; do \ + echo "#include \"$$file\"" >> kate_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate_la.all_cpp.final; \ + done; \ +@@ -829,11 +853,11 @@ + rm -f kate_la.all_cpp.final kate_la.all_cpp.files + + #>+ 11 +-kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp kwrite_la_meta_unload.cpp ++kwrite_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp + @echo 'creating kwrite_la.all_cpp.cpp ...'; \ + rm -f kwrite_la.all_cpp.files kwrite_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrite_la.all_cpp.final; \ +- for file in kwritemain.cpp katefiledialog.cpp kwrite_la_meta_unload.cpp ; do \ ++ for file in dummy_main.cpp ; do \ + echo "#include \"$$file\"" >> kwrite_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite_la.all_cpp.final; \ + done; \ +@@ -841,11 +865,35 @@ + rm -f kwrite_la.all_cpp.final kwrite_la.all_cpp.files + + #>+ 11 +-kate.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkate_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kateapp.cpp $(srcdir)/kateconfigdialog.cpp $(srcdir)/kateconfigplugindialogpage.cpp $(srcdir)/kateconsole.cpp $(srcdir)/katedocmanager.cpp $(srcdir)/katefilelist.cpp $(srcdir)/katefileselector.cpp $(srcdir)/katemainwindow.cpp $(srcdir)/katepluginmanager.cpp $(srcdir)/katesplitter.cpp $(srcdir)/kateviewmanager.cpp $(srcdir)/kateviewspace.cpp $(srcdir)/katemain.cpp $(srcdir)/kategrepdialog.cpp $(srcdir)/katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp ++ @echo 'creating libkate_main_la.all_cpp.cpp ...'; \ ++ rm -f libkate_main_la.all_cpp.files libkate_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkate_main_la.all_cpp.final; \ ++ for file in kateapp.cpp kateconfigdialog.cpp kateconfigplugindialogpage.cpp kateconsole.cpp katedocmanager.cpp katefilelist.cpp katefileselector.cpp katemainwindow.cpp katepluginmanager.cpp katesplitter.cpp kateviewmanager.cpp kateviewspace.cpp katemain.cpp kategrepdialog.cpp katefiledialog.cpp kateappIface_skel.cpp kateIface_skel.cpp libkate_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkate_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkate_main_la.all_cpp.final; \ ++ done; \ ++ cat libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files > libkate_main_la.all_cpp.cpp; \ ++ rm -f libkate_main_la.all_cpp.final libkate_main_la.all_cpp.files ++ ++#>+ 11 ++libkwrite_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwritemain.cpp $(srcdir)/katefiledialog.cpp libkwrite_main_la_meta_unload.cpp ++ @echo 'creating libkwrite_main_la.all_cpp.cpp ...'; \ ++ rm -f libkwrite_main_la.all_cpp.files libkwrite_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkwrite_main_la.all_cpp.final; \ ++ for file in kwritemain.cpp katefiledialog.cpp libkwrite_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkwrite_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrite_main_la.all_cpp.final; \ ++ done; \ ++ cat libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files > libkwrite_main_la.all_cpp.cpp; \ ++ rm -f libkwrite_main_la.all_cpp.final libkwrite_main_la.all_cpp.files ++ ++#>+ 11 ++kate.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp + @echo 'creating kate.all_cpp.cpp ...'; \ + rm -f kate.all_cpp.files kate.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kate.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in dummy_main.cpp ; do \ + echo "#include \"$$file\"" >> kate.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kate.all_cpp.final; \ + done; \ +@@ -853,11 +901,11 @@ + rm -f kate.all_cpp.final kate.all_cpp.files + + #>+ 11 +-kwrite.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kwrite.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy_main.cpp + @echo 'creating kwrite.all_cpp.cpp ...'; \ + rm -f kwrite.all_cpp.files kwrite.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrite.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in dummy_main.cpp ; do \ + echo "#include \"$$file\"" >> kwrite.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrite.all_cpp.final; \ + done; \ +@@ -866,20 +914,20 @@ + + #>+ 3 + clean-final: +- -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp ++ -rm -f kate_la.all_cpp.cpp kwrite_la.all_cpp.cpp libkate_main_la.all_cpp.cpp libkwrite_main_la.all_cpp.cpp kate.all_cpp.cpp kwrite.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" all-am ++ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kate_la_OBJECTS="$(kate_la_final_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_final_OBJECTS)" install-am ++ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_final_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kate_la_OBJECTS="$(kate_la_nofinal_OBJECTS)" kwrite_la_OBJECTS="$(kwrite_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkate_main_la_OBJECTS="$(libkate_main_la_nofinal_OBJECTS)" libkwrite_main_la_OBJECTS="$(libkwrite_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ad b/x11/kdebase3/patches/patch-ad new file mode 100644 index 00000000000..91af47b3c0d --- /dev/null +++ b/x11/kdebase3/patches/patch-ad @@ -0,0 +1,11 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $ + +--- kate/app/dummy_main.cpp.orig Thu May 30 09:59:32 2002 ++++ kate/app/dummy_main.cpp +@@ -0,0 +1,6 @@ ++extern "C" { int kdemain(int, char *[]); } ++ ++int main(int c, char *v[]) ++{ ++ return kdemain(c,v); ++} diff --git a/x11/kdebase3/patches/patch-ae b/x11/kdebase3/patches/patch-ae new file mode 100644 index 00000000000..0624a646591 --- /dev/null +++ b/x11/kdebase3/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:18:40 skrll Exp $ + +--- kate/app/katemain.cpp.orig Sun Feb 24 23:16:06 2002 ++++ kate/app/katemain.cpp +@@ -36,7 +36,9 @@ + { 0,0,0 } + }; + +-int main( int argc, char **argv ) ++extern "C" int kdemain( int argc, char **argv ); ++ ++int kdemain( int argc, char **argv ) + { + KAboutData *data = new KAboutData ("kate", I18N_NOOP("Kate"), "2.0", + I18N_NOOP( "Kate - KDE Advanced Text Editor" ), KAboutData::License_GPL, diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af new file mode 100644 index 00000000000..9a2deb29d01 --- /dev/null +++ b/x11/kdebase3/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kate/app/kwritemain.cpp.orig Wed May 8 19:20:50 2002 ++++ kate/app/kwritemain.cpp +@@ -510,7 +510,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int argc, char **argv); ++ ++int kdemain(int argc, char **argv) + { + KLocale::setMainCatalogue("kate"); //lukas: set this to have the kwritepart translated using kate message catalog + diff --git a/x11/kdebase3/patches/patch-ag b/x11/kdebase3/patches/patch-ag new file mode 100644 index 00000000000..30f66ed8ae0 --- /dev/null +++ b/x11/kdebase3/patches/patch-ag @@ -0,0 +1,33 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kate_main.cpp.orig Thu May 30 09:59:34 2002 ++++ kate_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah new file mode 100644 index 00000000000..c882d2be643 --- /dev/null +++ b/x11/kdebase3/patches/patch-ah @@ -0,0 +1,38 @@ +$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/access/Makefile.am.orig Wed May 8 19:20:50 2002 ++++ kcontrol/access/Makefile.am +@@ -4,16 +4,20 @@ + + bin_PROGRAMS = kaccess + +-kaccess_SOURCES = dummy.cpp ++kaccess_SOURCES = kaccess_main.cpp + kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaccess_LDADD = kaccess.la ++kaccess_LDADD = libkaccess_main.la + + kde_module_LTLIBRARIES = kcm_access.la +-lib_LTLIBRARIES = kaccess.la ++lib_LTLIBRARIES = libkaccess_main.la kaccess.la + +-kaccess_la_SOURCES = kaccess.cpp main.cpp +-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kaccess_la_LIBADD = $(LIB_KDEUI) ++libkaccess_main_la_SOURCES = kaccess.cpp main.cpp ++libkaccess_main_la_LDFLAGS = $(all_libraries) ++libkaccess_main_la_LIBADD = $(LIB_KDEUI) ++ ++kaccess_la_SOURCES = kaccess_main.cpp ++kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version ++kaccess_la_LIBADD = libkaccess_main.la + + kcm_access_la_SOURCES = kcmaccess.cpp + kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +@@ -32,6 +36,3 @@ + messages: + $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot + $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai new file mode 100644 index 00000000000..e7540fc693b --- /dev/null +++ b/x11/kdebase3/patches/patch-ai @@ -0,0 +1,250 @@ +$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/access/Makefile.in.orig Mon May 13 23:57:36 2002 ++++ kcontrol/access/Makefile.in +@@ -292,16 +292,20 @@ + + bin_PROGRAMS = kaccess + +-kaccess_SOURCES = dummy.cpp ++kaccess_SOURCES = kaccess_main.cpp + kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kaccess_LDADD = kaccess.la ++kaccess_LDADD = libkaccess_main.la + + kde_module_LTLIBRARIES = kcm_access.la +-lib_LTLIBRARIES = kaccess.la ++lib_LTLIBRARIES = libkaccess_main.la kaccess.la + +-kaccess_la_SOURCES = kaccess.cpp main.cpp +-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kaccess_la_LIBADD = $(LIB_KDEUI) ++libkaccess_main_la_SOURCES = kaccess.cpp main.cpp ++libkaccess_main_la_LDFLAGS = $(all_libraries) ++libkaccess_main_la_LIBADD = $(LIB_KDEUI) ++ ++kaccess_la_SOURCES = kaccess_main.cpp ++kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version ++kaccess_la_LIBADD = libkaccess_main.la + + kcm_access_la_SOURCES = kcmaccess.cpp + kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined +@@ -319,15 +323,11 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-kaccess_la_DEPENDENCIES = +-am_kaccess_la_OBJECTS = kaccess.lo main.lo ++kaccess_la_DEPENDENCIES = libkaccess_main.la ++am_kaccess_la_OBJECTS = kaccess_main.lo + #>- kaccess_la_OBJECTS = $(am_kaccess_la_OBJECTS) +-#>+ 5 +-kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo +-kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo \ +- kaccess_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS) ++#>+ 1 ++kaccess_la_OBJECTS = kaccess_main.lo + kcm_access_la_DEPENDENCIES = + am_kcm_access_la_OBJECTS = kcmaccess.lo + #>- kcm_access_la_OBJECTS = $(am_kcm_access_la_OBJECTS) +@@ -337,14 +337,23 @@ + kcm_access_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@kcm_access_la_OBJECTS = $(kcm_access_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@kcm_access_la_OBJECTS = $(kcm_access_la_final_OBJECTS) ++libkaccess_main_la_DEPENDENCIES = ++am_libkaccess_main_la_OBJECTS = kaccess.lo main.lo ++#>- libkaccess_main_la_OBJECTS = $(am_libkaccess_main_la_OBJECTS) ++#>+ 5 ++libkaccess_main_la_final_OBJECTS = libkaccess_main_la.all_cpp.lo ++libkaccess_main_la_nofinal_OBJECTS = kaccess.lo main.lo \ ++ libkaccess_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_final_OBJECTS) + bin_PROGRAMS = kaccess$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kaccess_OBJECTS = dummy.$(OBJEXT) ++am_kaccess_OBJECTS = kaccess_main.$(OBJEXT) + #>- kaccess_OBJECTS = $(am_kaccess_OBJECTS) + #>+ 1 +-kaccess_OBJECTS = dummy.$(OBJEXT) +-kaccess_DEPENDENCIES = kaccess.la ++kaccess_OBJECTS = kaccess_main.$(OBJEXT) ++kaccess_DEPENDENCIES = libkaccess_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -352,8 +361,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kaccess.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kcmaccess.Plo $(DEPDIR)/main.Plo ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kaccess.Plo $(DEPDIR)/kaccess_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kaccess_main.Po $(DEPDIR)/kcmaccess.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -374,13 +384,13 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \ +- $(kaccess_SOURCES) ++ $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES) + DATA = $(data_DATA) $(services_DATA) + + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES) ++SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -453,6 +463,8 @@ + @KDE_USE_CLOSURE_TRUE@kcm_access.la: kcm_access.la.closure $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) + @KDE_USE_CLOSURE_FALSE@kcm_access.la: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(kcm_access_la_LDFLAGS) $(kcm_access_la_OBJECTS) $(kcm_access_la_LIBADD) $(LIBS) ++libkaccess_main.la: $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkaccess_main_la_LDFLAGS) $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -487,8 +499,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)/kaccess.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaccess_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kaccess_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmaccess.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + +@@ -583,7 +596,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kaccess.desktop kaccess.h configure.in.in kcmaccess.desktop ++KDE_DIST=configure.in.in kcmaccess.desktop kaccess.desktop kaccess.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -713,9 +726,6 @@ + messages: + $(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot + $(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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: +@@ -756,19 +766,6 @@ + + + #>+ 12 +-kaccess_la_meta_unload.cpp: kaccess.moc +- @echo 'creating kaccess_la_meta_unload.cpp' +- @-rm -f kaccess_la_meta_unload.cpp +- @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kaccess_la[] = {' > kaccess_la_meta_unload.cpp ;\ +- cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kaccess_la_meta_unload.cpp ;\ +- echo '0};' >> kaccess_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kaccess_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kaccess_la)' >> kaccess_la_meta_unload.cpp ;\ +- else echo > kaccess_la_meta_unload.cpp; fi +- +- +-#>+ 12 + kcm_access_la_meta_unload.cpp: kcmaccess.moc + @echo 'creating kcm_access_la_meta_unload.cpp' + @-rm -f kcm_access_la_meta_unload.cpp +@@ -781,16 +778,29 @@ + else echo > kcm_access_la_meta_unload.cpp; fi + + ++#>+ 12 ++libkaccess_main_la_meta_unload.cpp: kaccess.moc ++ @echo 'creating libkaccess_main_la_meta_unload.cpp' ++ @-rm -f libkaccess_main_la_meta_unload.cpp ++ @if test ${kde_qtver} = 2; then \ ++ echo 'static const char * _metalist_libkaccess_main_la[] = {' > libkaccess_main_la_meta_unload.cpp ;\ ++ cat kaccess.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkaccess_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkaccess_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkaccess_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkaccess_main_la)' >> libkaccess_main_la_meta_unload.cpp ;\ ++ else echo > libkaccess_main_la_meta_unload.cpp; fi ++ ++ + #>+ 3 + clean-moc-classes: +- -rm -f kaccess_la_meta_unload.cpp kcm_access_la_meta_unload.cpp ++ -rm -f kcm_access_la_meta_unload.cpp libkaccess_main_la_meta_unload.cpp + + #>+ 11 +-kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess_la_meta_unload.cpp kaccess.moc kcmaccess.moc ++kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp kaccess.moc kcmaccess.moc + @echo 'creating kaccess_la.all_cpp.cpp ...'; \ + rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \ +- for file in kaccess.cpp main.cpp kaccess_la_meta_unload.cpp ; do \ ++ for file in kaccess_main.cpp ; do \ + echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \ + done; \ +@@ -810,11 +820,23 @@ + rm -f kcm_access_la.all_cpp.final kcm_access_la.all_cpp.files + + #>+ 11 +-kaccess.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkaccess_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp libkaccess_main_la_meta_unload.cpp ++ @echo 'creating libkaccess_main_la.all_cpp.cpp ...'; \ ++ rm -f libkaccess_main_la.all_cpp.files libkaccess_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkaccess_main_la.all_cpp.final; \ ++ for file in kaccess.cpp main.cpp libkaccess_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkaccess_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_main_la.all_cpp.final; \ ++ done; \ ++ cat libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files > libkaccess_main_la.all_cpp.cpp; \ ++ rm -f libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files ++ ++#>+ 11 ++kaccess.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess_main.cpp + @echo 'creating kaccess.all_cpp.cpp ...'; \ + rm -f kaccess.all_cpp.files kaccess.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kaccess.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kaccess_main.cpp ; do \ + echo "#include \"$$file\"" >> kaccess.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess.all_cpp.final; \ + done; \ +@@ -823,20 +845,20 @@ + + #>+ 3 + clean-final: +- -rm -f kaccess_la.all_cpp.cpp kcm_access_la.all_cpp.cpp kaccess.all_cpp.cpp ++ -rm -f kaccess_la.all_cpp.cpp kcm_access_la.all_cpp.cpp libkaccess_main_la.all_cpp.cpp kaccess.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" all-am ++ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" install-am ++ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_final_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" install-am ++ $(MAKE) kcm_access_la_OBJECTS="$(kcm_access_la_nofinal_OBJECTS)" libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-aj b/x11/kdebase3/patches/patch-aj new file mode 100644 index 00000000000..807ff2da77a --- /dev/null +++ b/x11/kdebase3/patches/patch-aj @@ -0,0 +1,33 @@ +$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/access/kaccess_main.cpp.orig Thu May 30 09:59:35 2002 ++++ kcontrol/access/kaccess_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-ak b/x11/kdebase3/patches/patch-ak new file mode 100644 index 00000000000..3beaa509c19 --- /dev/null +++ b/x11/kdebase3/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/access/main.cpp.orig Mon Jan 7 10:39:46 2002 ++++ kcontrol/access/main.cpp +@@ -11,7 +11,9 @@ + "with disabilities."); + + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int, char *[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData about("kaccess", I18N_NOOP("KDE Accessibility Tool"), "0.1", + DESCRIPTION, KAboutData::License_QPL, diff --git a/x11/kdebase3/patches/patch-al b/x11/kdebase3/patches/patch-al new file mode 100644 index 00000000000..52754536bc4 --- /dev/null +++ b/x11/kdebase3/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/ebrowsing/Makefile.am.orig Tue Feb 19 13:43:23 2002 ++++ kcontrol/ebrowsing/Makefile.am +@@ -10,7 +10,7 @@ + + kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp + +-kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ++kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} + kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) + # Don't link this lib to the plugins. They are dlopened and linking to them + # results in crashes when closing kcmshell. diff --git a/x11/kdebase3/patches/patch-am b/x11/kdebase3/patches/patch-am new file mode 100644 index 00000000000..5898fb159ae --- /dev/null +++ b/x11/kdebase3/patches/patch-am @@ -0,0 +1,22 @@ +$NetBSD: patch-am,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/ebrowsing/Makefile.in.orig Mon May 13 23:57:37 2002 ++++ kcontrol/ebrowsing/Makefile.in +@@ -298,7 +298,7 @@ + + kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp + +-kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ++kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined ${KDE_RPATH} + kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) + + data_DATA = ebrowsing.desktop +@@ -549,7 +549,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=ebrowsing.desktop main.h filteropts.h ++KDE_DIST=main.h ebrowsing.desktop filteropts.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-an b/x11/kdebase3/patches/patch-an new file mode 100644 index 00000000000..2aeaf497ef4 --- /dev/null +++ b/x11/kdebase3/patches/patch-an @@ -0,0 +1,84 @@ +$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:18:42 skrll Exp $ + +--- kcontrol/kcontrol/Makefile.am.orig Wed May 8 19:21:01 2002 ++++ kcontrol/kcontrol/Makefile.am +@@ -22,41 +22,52 @@ + + SUBDIRS = . pics + +-CLEANFILES = dummy.cpp +- + bin_PROGRAMS = kcontrol kcmshell kcminit +-lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la +- +-kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ +- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ +- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ +- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ ++lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \ ++ libkcmshell_main.la kcmshell.la \ ++ libkcminit_main.la kcminit.la ++ ++libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ ++ searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ ++ proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ ++ global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ + kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel + +-kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcontrol_main_la_LDFLAGS = $(all_libraries) ++ ++kcontrol_la_SOURCES = kcontrol_main.cpp ++kcontrol_la_LIBADD = libkcontrol_main.la + kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ +- proxywidget.cpp kcdialog.cpp global.cpp \ +- kcdialog.skel +-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ ++ kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ ++ kcdialog.skel ++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcmshell_main_la_LDFLAGS = $(all_libraries) ++ ++kcmshell_la_SOURCES = kcmshell_main.cpp ++kcmshell_la_LIBADD = libkcmshell_main.la + kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version + ++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp ++libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcminit_main_la_LDFLAGS = $(all_libraries) + + kcminit_la_SOURCES = kcminit.cpp global.cpp +-kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++kcminit_la_LIBADD = libkcminit_main.la + kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kcontrol_SOURCES = dummy.cpp +-kcontrol_LDADD = kcontrol.la ++kcontrol_SOURCES = kcontrol_main.cpp ++kcontrol_LDADD = libkcontrol_main.la + kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + +-kcmshell_SOURCES = dummy.cpp +-kcmshell_LDADD = kcmshell.la ++kcmshell_SOURCES = kcmshell_main.cpp ++kcmshell_LDADD = libkcmshell_main.la + kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + +-kcminit_SOURCES = dummy.cpp +-kcminit_LDADD = kcminit.la ++kcminit_SOURCES = kcminit_main.cpp ++kcminit_LDADD = libkcminit_main.la + kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + + rcdir = $(kde_datadir)/kcontrol +@@ -71,6 +82,3 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-ao b/x11/kdebase3/patches/patch-ao new file mode 100644 index 00000000000..e2331adc5d7 --- /dev/null +++ b/x11/kdebase3/patches/patch-ao @@ -0,0 +1,489 @@ +$NetBSD: patch-ao,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/Makefile.in.orig Mon May 13 23:57:39 2002 ++++ kcontrol/kcontrol/Makefile.in +@@ -311,52 +311,65 @@ + + SUBDIRS = . pics + +-CLEANFILES = dummy.cpp +- + bin_PROGRAMS = kcontrol kcmshell kcminit +-lib_LTLIBRARIES = kcontrol.la kcmshell.la kcminit.la ++lib_LTLIBRARIES = libkcontrol_main.la kcontrol.la \ ++ libkcmshell_main.la kcmshell.la \ ++ libkcminit_main.la kcminit.la ++ + +-#>- kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ +-#>- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ +-#>- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ +-#>- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ ++#>- libkcontrol_main_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ ++#>- searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ ++#>- proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ ++#>- global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ + #>- kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface.skel + #>+ 5 +-kcontrol_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp \ +- helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp \ +- modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp \ +- quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ ++libkcontrol_main_la_SOURCES=main.cpp toplevel.cpp indexwidget.cpp \ ++ searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp \ ++ proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp \ ++ global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp \ + kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp + + +-kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcontrol_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcontrol_main_la_LDFLAGS = $(all_libraries) ++ ++kcontrol_la_SOURCES = kcontrol_main.cpp ++kcontrol_la_LIBADD = libkcontrol_main.la + kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-#>- kcmshell_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ +-#>- proxywidget.cpp kcdialog.cpp global.cpp \ ++#>- libkcmshell_main_la_SOURCES = kcmshell.cpp moduleinfo.cpp modloader.cpp \ ++#>- kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ + #>- kcdialog.skel + #>+ 3 +-kcmshell_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp \ +- proxywidget.cpp kcdialog.cpp global.cpp \ ++libkcmshell_main_la_SOURCES=kcmshell.cpp moduleinfo.cpp modloader.cpp \ ++ kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp \ + kcdialog_skel.cpp + +-kcmshell_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcmshell_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcmshell_main_la_LDFLAGS = $(all_libraries) ++ ++kcmshell_la_SOURCES = kcmshell_main.cpp ++kcmshell_la_LIBADD = libkcmshell_main.la + kcmshell_la_LDFLAGS = $(all_libraries) -module -avoid-version + ++libkcminit_main_la_SOURCES = kcminit.cpp global.cpp ++libkcminit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libkcminit_main_la_LDFLAGS = $(all_libraries) ++ + kcminit_la_SOURCES = kcminit.cpp global.cpp +-kcminit_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++kcminit_la_LIBADD = libkcminit_main.la + kcminit_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kcontrol_SOURCES = dummy.cpp +-kcontrol_LDADD = kcontrol.la ++kcontrol_SOURCES = kcontrol_main.cpp ++kcontrol_LDADD = libkcontrol_main.la + kcontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + +-kcmshell_SOURCES = dummy.cpp +-kcmshell_LDADD = kcmshell.la ++kcmshell_SOURCES = kcmshell_main.cpp ++kcmshell_LDADD = libkcmshell_main.la + kcmshell_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + +-kcminit_SOURCES = dummy.cpp +-kcminit_LDADD = kcminit.la ++kcminit_SOURCES = kcminit_main.cpp ++kcminit_LDADD = libkcminit_main.la + kcminit_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic + + rcdir = $(kde_datadir)/kcontrol +@@ -373,7 +386,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kcminit_la_DEPENDENCIES = ++kcminit_la_DEPENDENCIES = libkcminit_main.la + am_kcminit_la_OBJECTS = kcminit.lo global.lo + #>- kcminit_la_OBJECTS = $(am_kcminit_la_OBJECTS) + #>+ 4 +@@ -381,52 +394,70 @@ + kcminit_la_nofinal_OBJECTS = kcminit.lo global.lo + @KDE_USE_FINAL_FALSE@kcminit_la_OBJECTS = $(kcminit_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@kcminit_la_OBJECTS = $(kcminit_la_final_OBJECTS) +-kcmshell_la_DEPENDENCIES = +-am_kcmshell_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ +- kecdialog.lo proxywidget.lo kcdialog.lo global.lo ++kcmshell_la_DEPENDENCIES = libkcmshell_main.la ++am_kcmshell_la_OBJECTS = kcmshell_main.lo + #>- kcmshell_la_OBJECTS = $(am_kcmshell_la_OBJECTS) ++#>+ 1 ++kcmshell_la_OBJECTS = kcmshell_main.lo ++kcontrol_la_DEPENDENCIES = libkcontrol_main.la ++am_kcontrol_la_OBJECTS = kcontrol_main.lo ++#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) ++#>+ 1 ++kcontrol_la_OBJECTS = kcontrol_main.lo ++libkcminit_main_la_DEPENDENCIES = ++am_libkcminit_main_la_OBJECTS = kcminit.lo global.lo ++#>- libkcminit_main_la_OBJECTS = $(am_libkcminit_main_la_OBJECTS) ++#>+ 4 ++libkcminit_main_la_final_OBJECTS = libkcminit_main_la.all_cpp.lo ++libkcminit_main_la_nofinal_OBJECTS = kcminit.lo global.lo ++@KDE_USE_FINAL_FALSE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkcminit_main_la_OBJECTS = $(libkcminit_main_la_final_OBJECTS) ++libkcmshell_main_la_DEPENDENCIES = ++am_libkcmshell_main_la_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ ++ kecdialog.lo proxywidget.lo kcdialog.lo global.lo ++#>- libkcmshell_main_la_OBJECTS = $(am_libkcmshell_main_la_OBJECTS) + #>+ 6 +-kcmshell_la_final_OBJECTS = kcmshell_la.all_cpp.lo +-kcmshell_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ ++libkcmshell_main_la_final_OBJECTS = libkcmshell_main_la.all_cpp.lo ++libkcmshell_main_la_nofinal_OBJECTS = kcmshell.lo moduleinfo.lo modloader.lo \ + kecdialog.lo proxywidget.lo kcdialog.lo global.lo kcdialog_skel.lo \ +- kcmshell_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kcmshell_la_OBJECTS = $(kcmshell_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kcmshell_la_OBJECTS = $(kcmshell_la_final_OBJECTS) +-kcontrol_la_DEPENDENCIES = +-am_kcontrol_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ ++ libkcmshell_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkcmshell_main_la_OBJECTS = $(libkcmshell_main_la_final_OBJECTS) ++libkcontrol_main_la_DEPENDENCIES = ++am_libkcontrol_main_la_OBJECTS = main.lo toplevel.lo indexwidget.lo \ + searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ + proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ + global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ + kecdialog.lo kcrootonly.lo moduleIface.lo +-#>- kcontrol_la_OBJECTS = $(am_kcontrol_la_OBJECTS) ++#>- libkcontrol_main_la_OBJECTS = $(am_libkcontrol_main_la_OBJECTS) + #>+ 9 +-kcontrol_la_final_OBJECTS = kcontrol_la.all_cpp.lo +-kcontrol_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ ++libkcontrol_main_la_final_OBJECTS = libkcontrol_main_la.all_cpp.lo ++libkcontrol_main_la_nofinal_OBJECTS = main.lo toplevel.lo indexwidget.lo \ + searchwidget.lo helpwidget.lo moduleinfo.lo modules.lo \ + proxywidget.lo modloader.lo dockcontainer.lo aboutwidget.lo \ + global.lo quickhelp.lo moduletreeview.lo moduleiconview.lo \ + kecdialog.lo kcrootonly.lo moduleIface.lo moduleIface_skel.lo \ +- kcontrol_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kcontrol_la_OBJECTS = $(kcontrol_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kcontrol_la_OBJECTS = $(kcontrol_la_final_OBJECTS) ++ libkcontrol_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkcontrol_main_la_OBJECTS = $(libkcontrol_main_la_final_OBJECTS) + bin_PROGRAMS = kcontrol$(EXEEXT) kcmshell$(EXEEXT) kcminit$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kcminit_OBJECTS = dummy.$(OBJEXT) ++am_kcminit_OBJECTS = kcminit_main.$(OBJEXT) + #>- kcminit_OBJECTS = $(am_kcminit_OBJECTS) + #>+ 1 +-kcminit_OBJECTS = dummy.$(OBJEXT) +-kcminit_DEPENDENCIES = kcminit.la +-am_kcmshell_OBJECTS = dummy.$(OBJEXT) ++kcminit_OBJECTS = kcminit_main.$(OBJEXT) ++kcminit_DEPENDENCIES = libkcminit_main.la ++am_kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) + #>- kcmshell_OBJECTS = $(am_kcmshell_OBJECTS) + #>+ 1 +-kcmshell_OBJECTS = dummy.$(OBJEXT) +-kcmshell_DEPENDENCIES = kcmshell.la +-am_kcontrol_OBJECTS = dummy.$(OBJEXT) ++kcmshell_OBJECTS = kcmshell_main.$(OBJEXT) ++kcmshell_DEPENDENCIES = libkcmshell_main.la ++am_kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) + #>- kcontrol_OBJECTS = $(am_kcontrol_OBJECTS) + #>+ 1 +-kcontrol_OBJECTS = dummy.$(OBJEXT) +-kcontrol_DEPENDENCIES = kcontrol.la ++kcontrol_OBJECTS = kcontrol_main.$(OBJEXT) ++kcontrol_DEPENDENCIES = libkcontrol_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -435,13 +466,16 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/dummy.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/global.Plo $(DEPDIR)/helpwidget.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/indexwidget.Plo $(DEPDIR)/kcdialog.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kcminit.Plo $(DEPDIR)/kcmshell.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kcrootonly.Plo $(DEPDIR)/kecdialog.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/modloader.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/moduleIface.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/dockcontainer.Plo $(DEPDIR)/global.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/helpwidget.Plo $(DEPDIR)/indexwidget.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcdialog.Plo $(DEPDIR)/kcminit.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcminit_main.Po $(DEPDIR)/kcmshell.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcmshell_main.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kcontrol_main.Po $(DEPDIR)/kcrootonly.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kecdialog.Plo $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/modloader.Plo $(DEPDIR)/moduleIface.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/moduleiconview.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/moduleinfo.Plo $(DEPDIR)/modules.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/moduletreeview.Plo \ +@@ -467,8 +501,9 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) \ +- $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) \ +- $(kcontrol_SOURCES) ++ $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) \ ++ $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) \ ++ $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) + DATA = $(data_DATA) $(rc_DATA) + + +@@ -478,7 +513,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) ++SOURCES = $(kcminit_la_SOURCES) $(kcmshell_la_SOURCES) $(kcontrol_la_SOURCES) $(libkcminit_main_la_SOURCES) $(libkcmshell_main_la_SOURCES) $(libkcontrol_main_la_SOURCES) $(kcminit_SOURCES) $(kcmshell_SOURCES) $(kcontrol_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -531,6 +566,12 @@ + $(CXXLINK) -rpath $(libdir) $(kcmshell_la_LDFLAGS) $(kcmshell_la_OBJECTS) $(kcmshell_la_LIBADD) $(LIBS) + kcontrol.la: $(kcontrol_la_OBJECTS) $(kcontrol_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kcontrol_la_LDFLAGS) $(kcontrol_la_OBJECTS) $(kcontrol_la_LIBADD) $(LIBS) ++libkcminit_main.la: $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkcminit_main_la_LDFLAGS) $(libkcminit_main_la_OBJECTS) $(libkcminit_main_la_LIBADD) $(LIBS) ++libkcmshell_main.la: $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkcmshell_main_la_LDFLAGS) $(libkcmshell_main_la_OBJECTS) $(libkcmshell_main_la_LIBADD) $(LIBS) ++libkcontrol_main.la: $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkcontrol_main_la_LDFLAGS) $(libkcontrol_main_la_OBJECTS) $(libkcontrol_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -573,13 +614,17 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dockcontainer.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/global.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/helpwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/indexwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcminit.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcminit_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmshell_main.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcontrol_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcontrol_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcrootonly.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kecdialog.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +@@ -745,7 +790,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kcontrolui.rc indexwidget.h proxywidget.h dockcontainer.h aboutwidget.cpp modules.cpp main.h moduletreeview.h kecdialog.h moduleIface.h aboutwidget.h kcrootonly.cpp hi16-app-kcontrol.png toplevel.h kcdialog.cpp proxywidget.cpp modules.h moduleinfo.h kcmshell.h modulemenu.cpp modloader.h hi32-app-kcontrol.png modulemenu.h quickhelp.h searchwidget.h moduleiconview.cpp kcdialog.h hi48-app-kcontrol.png kcrootonly.h dockcontainer.cpp helpwidget.h moduleIface.cpp KControl.desktop moduletreeview.cpp version.h quickhelp.cpp moduleiconview.h global.h helpwidget.cpp ++KDE_DIST=kcontrolui.rc indexwidget.h hi32-app-kcontrol.png proxywidget.h dockcontainer.h modulemenu.h aboutwidget.cpp quickhelp.h searchwidget.h modules.cpp main.h kecdialog.cpp moduletreeview.h moduleiconview.cpp kcdialog.h kecdialog.h moduleIface.h searchwidget.cpp aboutwidget.h hi48-app-kcontrol.png hi16-app-kcontrol.png kcrootonly.cpp kcrootonly.h dockcontainer.cpp toplevel.h helpwidget.h moduleIface.cpp kcdialog.cpp KControl.desktop moduletreeview.cpp proxywidget.cpp modules.h version.h quickhelp.cpp moduleiconview.h moduleinfo.h global.h kcmshell.h helpwidget.cpp modulemenu.cpp modloader.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -807,7 +852,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -890,9 +934,6 @@ + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kcontrol.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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: +@@ -1016,34 +1057,34 @@ + + + #>+ 12 +-kcmshell_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc +- @echo 'creating kcmshell_la_meta_unload.cpp' +- @-rm -f kcmshell_la_meta_unload.cpp ++libkcmshell_main_la_meta_unload.cpp: kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc ++ @echo 'creating libkcmshell_main_la_meta_unload.cpp' ++ @-rm -f libkcmshell_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kcmshell_la[] = {' > kcmshell_la_meta_unload.cpp ;\ +- cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcmshell_la_meta_unload.cpp ;\ +- echo '0};' >> kcmshell_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kcmshell_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kcmshell_la)' >> kcmshell_la_meta_unload.cpp ;\ +- else echo > kcmshell_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkcmshell_main_la[] = {' > libkcmshell_main_la_meta_unload.cpp ;\ ++ cat kcmshell.moc moduleinfo.moc kecdialog.moc kcdialog.moc proxywidget.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkcmshell_main_la)' >> libkcmshell_main_la_meta_unload.cpp ;\ ++ else echo > libkcmshell_main_la_meta_unload.cpp; fi + + + #>+ 12 +-kcontrol_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc +- @echo 'creating kcontrol_la_meta_unload.cpp' +- @-rm -f kcontrol_la_meta_unload.cpp ++libkcontrol_main_la_meta_unload.cpp: indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc ++ @echo 'creating libkcontrol_main_la_meta_unload.cpp' ++ @-rm -f libkcontrol_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kcontrol_la[] = {' > kcontrol_la_meta_unload.cpp ;\ +- cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcontrol_la_meta_unload.cpp ;\ +- echo '0};' >> kcontrol_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kcontrol_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kcontrol_la)' >> kcontrol_la_meta_unload.cpp ;\ +- else echo > kcontrol_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkcontrol_main_la[] = {' > libkcontrol_main_la_meta_unload.cpp ;\ ++ cat indexwidget.moc main.moc moduleinfo.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modules.moc moduleiconview.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc quickhelp.moc dockcontainer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkcontrol_main_la)' >> libkcontrol_main_la_meta_unload.cpp ;\ ++ else echo > libkcontrol_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kcmshell_la_meta_unload.cpp kcontrol_la_meta_unload.cpp ++ -rm -f libkcmshell_main_la_meta_unload.cpp libkcontrol_main_la_meta_unload.cpp + + #>+ 11 + kcminit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp indexwidget.moc main.moc moduleinfo.moc kcmshell.moc helpwidget.moc toplevel.moc moduletreeview.moc kecdialog.moc modulemenu.moc modules.moc moduleiconview.moc kcdialog.moc searchwidget.moc moduleIface.moc aboutwidget.moc proxywidget.moc dockcontainer.moc quickhelp.moc +@@ -1058,11 +1099,11 @@ + rm -f kcminit_la.all_cpp.final kcminit_la.all_cpp.files + + #>+ 11 +-kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ++kcmshell_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp + @echo 'creating kcmshell_la.all_cpp.cpp ...'; \ + rm -f kcmshell_la.all_cpp.files kcmshell_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcmshell_la.all_cpp.final; \ +- for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp kcmshell_la_meta_unload.cpp ; do \ ++ for file in kcmshell_main.cpp ; do \ + echo "#include \"$$file\"" >> kcmshell_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell_la.all_cpp.final; \ + done; \ +@@ -1070,11 +1111,11 @@ + rm -f kcmshell_la.all_cpp.final kcmshell_la.all_cpp.files + + #>+ 11 +-kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ++kcontrol_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp + @echo 'creating kcontrol_la.all_cpp.cpp ...'; \ + rm -f kcontrol_la.all_cpp.files kcontrol_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcontrol_la.all_cpp.final; \ +- for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp kcontrol_la_meta_unload.cpp ; do \ ++ for file in kcontrol_main.cpp ; do \ + echo "#include \"$$file\"" >> kcontrol_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol_la.all_cpp.final; \ + done; \ +@@ -1082,11 +1123,47 @@ + rm -f kcontrol_la.all_cpp.final kcontrol_la.all_cpp.files + + #>+ 11 +-kcminit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkcminit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit.cpp $(srcdir)/global.cpp ++ @echo 'creating libkcminit_main_la.all_cpp.cpp ...'; \ ++ rm -f libkcminit_main_la.all_cpp.files libkcminit_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkcminit_main_la.all_cpp.final; \ ++ for file in kcminit.cpp global.cpp ; do \ ++ echo "#include \"$$file\"" >> libkcminit_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcminit_main_la.all_cpp.final; \ ++ done; \ ++ cat libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files > libkcminit_main_la.all_cpp.cpp; \ ++ rm -f libkcminit_main_la.all_cpp.final libkcminit_main_la.all_cpp.files ++ ++#>+ 11 ++libkcmshell_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modloader.cpp $(srcdir)/kecdialog.cpp $(srcdir)/proxywidget.cpp $(srcdir)/kcdialog.cpp $(srcdir)/global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ++ @echo 'creating libkcmshell_main_la.all_cpp.cpp ...'; \ ++ rm -f libkcmshell_main_la.all_cpp.files libkcmshell_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkcmshell_main_la.all_cpp.final; \ ++ for file in kcmshell.cpp moduleinfo.cpp modloader.cpp kecdialog.cpp proxywidget.cpp kcdialog.cpp global.cpp kcdialog_skel.cpp libkcmshell_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkcmshell_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcmshell_main_la.all_cpp.final; \ ++ done; \ ++ cat libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files > libkcmshell_main_la.all_cpp.cpp; \ ++ rm -f libkcmshell_main_la.all_cpp.final libkcmshell_main_la.all_cpp.files ++ ++#>+ 11 ++libkcontrol_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/indexwidget.cpp $(srcdir)/searchwidget.cpp $(srcdir)/helpwidget.cpp $(srcdir)/moduleinfo.cpp $(srcdir)/modules.cpp $(srcdir)/proxywidget.cpp $(srcdir)/modloader.cpp $(srcdir)/dockcontainer.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/global.cpp $(srcdir)/quickhelp.cpp $(srcdir)/moduletreeview.cpp $(srcdir)/moduleiconview.cpp $(srcdir)/kecdialog.cpp $(srcdir)/kcrootonly.cpp $(srcdir)/moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ++ @echo 'creating libkcontrol_main_la.all_cpp.cpp ...'; \ ++ rm -f libkcontrol_main_la.all_cpp.files libkcontrol_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkcontrol_main_la.all_cpp.final; \ ++ for file in main.cpp toplevel.cpp indexwidget.cpp searchwidget.cpp helpwidget.cpp moduleinfo.cpp modules.cpp proxywidget.cpp modloader.cpp dockcontainer.cpp aboutwidget.cpp global.cpp quickhelp.cpp moduletreeview.cpp moduleiconview.cpp kecdialog.cpp kcrootonly.cpp moduleIface.cpp moduleIface_skel.cpp libkcontrol_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkcontrol_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcontrol_main_la.all_cpp.final; \ ++ done; \ ++ cat libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files > libkcontrol_main_la.all_cpp.cpp; \ ++ rm -f libkcontrol_main_la.all_cpp.final libkcontrol_main_la.all_cpp.files ++ ++#>+ 11 ++kcminit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcminit_main.cpp + @echo 'creating kcminit.all_cpp.cpp ...'; \ + rm -f kcminit.all_cpp.files kcminit.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcminit.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kcminit_main.cpp ; do \ + echo "#include \"$$file\"" >> kcminit.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcminit.all_cpp.final; \ + done; \ +@@ -1094,11 +1171,11 @@ + rm -f kcminit.all_cpp.final kcminit.all_cpp.files + + #>+ 11 +-kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kcmshell.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmshell_main.cpp + @echo 'creating kcmshell.all_cpp.cpp ...'; \ + rm -f kcmshell.all_cpp.files kcmshell.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcmshell.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kcmshell_main.cpp ; do \ + echo "#include \"$$file\"" >> kcmshell.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcmshell.all_cpp.final; \ + done; \ +@@ -1106,11 +1183,11 @@ + rm -f kcmshell.all_cpp.final kcmshell.all_cpp.files + + #>+ 11 +-kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kcontrol.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcontrol_main.cpp + @echo 'creating kcontrol.all_cpp.cpp ...'; \ + rm -f kcontrol.all_cpp.files kcontrol.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kcontrol.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kcontrol_main.cpp ; do \ + echo "#include \"$$file\"" >> kcontrol.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcontrol.all_cpp.final; \ + done; \ +@@ -1119,20 +1196,20 @@ + + #>+ 3 + clean-final: +- -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp ++ -rm -f kcminit_la.all_cpp.cpp kcmshell_la.all_cpp.cpp kcontrol_la.all_cpp.cpp libkcminit_main_la.all_cpp.cpp libkcmshell_main_la.all_cpp.cpp libkcontrol_main_la.all_cpp.cpp kcminit.all_cpp.cpp kcmshell.all_cpp.cpp kcontrol.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" all-am ++ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_final_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_final_OBJECTS)" install-am ++ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_final_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_final_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_final_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" kcmshell_la_OBJECTS="$(kcmshell_la_nofinal_OBJECTS)" kcontrol_la_OBJECTS="$(kcontrol_la_nofinal_OBJECTS)" install-am ++ $(MAKE) kcminit_la_OBJECTS="$(kcminit_la_nofinal_OBJECTS)" libkcminit_main_la_OBJECTS="$(libkcminit_main_la_nofinal_OBJECTS)" libkcmshell_main_la_OBJECTS="$(libkcmshell_main_la_nofinal_OBJECTS)" libkcontrol_main_la_OBJECTS="$(libkcontrol_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ap b/x11/kdebase3/patches/patch-ap new file mode 100644 index 00000000000..7d22a3926d2 --- /dev/null +++ b/x11/kdebase3/patches/patch-ap @@ -0,0 +1,15 @@ +$NetBSD: patch-ap,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/kcminit.cpp.orig Tue Feb 19 13:43:03 2002 ++++ kcontrol/kcontrol/kcminit.cpp +@@ -59,7 +59,9 @@ + return false; + } + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KLocale::setMainCatalogue("kcontrol"); + KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"), diff --git a/x11/kdebase3/patches/patch-aq b/x11/kdebase3/patches/patch-aq new file mode 100644 index 00000000000..340fe44aa34 --- /dev/null +++ b/x11/kdebase3/patches/patch-aq @@ -0,0 +1,33 @@ +$NetBSD: patch-aq,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/kcminit_main.cpp.orig Thu May 30 09:59:38 2002 ++++ kcontrol/kcontrol/kcminit_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-ar b/x11/kdebase3/patches/patch-ar new file mode 100644 index 00000000000..939c248512e --- /dev/null +++ b/x11/kdebase3/patches/patch-ar @@ -0,0 +1,15 @@ +$NetBSD: patch-ar,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/kcmshell.cpp.orig Sun Mar 3 00:23:50 2002 ++++ kcontrol/kcontrol/kcmshell.cpp +@@ -129,7 +129,9 @@ + } + + +-int main(int _argc, char *_argv[]) ++extern "C" int kdemain(int _argc, char *_argv[]); ++ ++int kdemain(int _argc, char *_argv[]) + { + KAboutData aboutData( "kcmshell", I18N_NOOP("KDE Control Module"), + KCONTROL_VERSION, diff --git a/x11/kdebase3/patches/patch-as b/x11/kdebase3/patches/patch-as new file mode 100644 index 00000000000..5557d7a9a50 --- /dev/null +++ b/x11/kdebase3/patches/patch-as @@ -0,0 +1,33 @@ +$NetBSD: patch-as,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/kcmshell_main.cpp.orig Thu May 30 09:59:39 2002 ++++ kcontrol/kcontrol/kcmshell_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-at b/x11/kdebase3/patches/patch-at new file mode 100644 index 00000000000..1e2b2464f06 --- /dev/null +++ b/x11/kdebase3/patches/patch-at @@ -0,0 +1,33 @@ +$NetBSD: patch-at,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/kcontrol_main.cpp.orig Thu May 30 09:59:39 2002 ++++ kcontrol/kcontrol/kcontrol_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-au b/x11/kdebase3/patches/patch-au new file mode 100644 index 00000000000..0a3cf89be92 --- /dev/null +++ b/x11/kdebase3/patches/patch-au @@ -0,0 +1,15 @@ +$NetBSD: patch-au,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kcontrol/kcontrol/main.cpp.orig Wed May 8 19:21:01 2002 ++++ kcontrol/kcontrol/main.cpp +@@ -86,7 +86,9 @@ + delete toplevel; + } + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData( "kcontrol", I18N_NOOP("KDE Control Center"), + KCONTROL_VERSION, I18N_NOOP("The KDE Control Center"), KAboutData::License_GPL, diff --git a/x11/kdebase3/patches/patch-av b/x11/kdebase3/patches/patch-av new file mode 100644 index 00000000000..74ee8014abf --- /dev/null +++ b/x11/kdebase3/patches/patch-av @@ -0,0 +1,40 @@ +$NetBSD: patch-av,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdeprint/kjobviewer/Makefile.am.orig Sun Jul 8 10:31:24 2001 ++++ kdeprint/kjobviewer/Makefile.am +@@ -1,15 +1,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 +@@ -21,9 +26,6 @@ + + desktop_DATA = kjobviewer.desktop + desktopdir = $(kde_appsdir)/Utilities +- +-dummy.cpp: +- echo > dummy.cpp + + messages: rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/kjobviewer.pot 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 diff --git a/x11/kdebase3/patches/patch-ax b/x11/kdebase3/patches/patch-ax new file mode 100644 index 00000000000..e9b643274c6 --- /dev/null +++ b/x11/kdebase3/patches/patch-ax @@ -0,0 +1,33 @@ +$NetBSD: patch-ax,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdeprint/kjobviewer/kjobviewer_main.cpp.orig Thu May 30 09:59:42 2002 ++++ kdeprint/kjobviewer/kjobviewer_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-ay b/x11/kdebase3/patches/patch-ay new file mode 100644 index 00000000000..6df370e9d34 --- /dev/null +++ b/x11/kdebase3/patches/patch-ay @@ -0,0 +1,15 @@ +$NetBSD: patch-ay,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdeprint/kjobviewer/main.cpp.orig Sat Dec 29 17:10:49 2001 ++++ kdeprint/kjobviewer/main.cpp +@@ -33,7 +33,9 @@ + }; + + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData("kjobviewer","KJobViewer","0.1",I18N_NOOP("A print job viewer"),KAboutData::License_GPL,"(c) 2001, Michael Goffioul", 0, "http://printing.kde.org"); + aboutData.addAuthor("Michael Goffioul",0,"goffioul@imec.be"); diff --git a/x11/kdebase3/patches/patch-az b/x11/kdebase3/patches/patch-az new file mode 100644 index 00000000000..1a42bf4e69d --- /dev/null +++ b/x11/kdebase3/patches/patch-az @@ -0,0 +1,45 @@ +$NetBSD: patch-az,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdesktop/Makefile.am.orig Wed May 8 19:21:24 2002 ++++ kdesktop/Makefile.am +@@ -1,10 +1,16 @@ + ## Makefile.am of kdebase/kdesktop + + INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) ++ ++libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \ ++ $(top_builddir)/kcontrol/background/libbgnd.la ++ + kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la ++kdesktop_la_LIBADD = libkdesktop_main.la ++ + kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kdesktop_LDADD = kdesktop.la ++kdesktop_LDADD = libkdesktop_main.la + + SUBDIRS = . lock pics patterns programs init kwebdesktop + +@@ -12,15 +18,17 @@ + + bin_PROGRAMS = kdesktop kdmdesktop + bin_SCRIPTS = kdeeject +-lib_LTLIBRARIES = kdesktop.la ++lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la + +-kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ +- lockeng.cc KDesktopIface.skel \ ++libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ ++ desktop.cc main.cc lockeng.cc KDesktopIface.skel \ + bgmanager.cc init.cc KScreensaverIface.skel \ + minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ + startupid.cpp + +-kdesktop_SOURCES = dummy.cc ++kdesktop_la_SOURCES = kdesktop_main.cc ++ ++kdesktop_SOURCES = kdesktop_main.cc + + include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h + diff --git a/x11/kdebase3/patches/patch-ba b/x11/kdebase3/patches/patch-ba new file mode 100644 index 00000000000..396f03a040f --- /dev/null +++ b/x11/kdebase3/patches/patch-ba @@ -0,0 +1,324 @@ +$NetBSD: patch-ba,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdesktop/Makefile.in.orig Mon May 13 23:57:43 2002 ++++ kdesktop/Makefile.in +@@ -288,10 +288,17 @@ + x_libraries = @x_libraries@ + + INCLUDES = -I$(top_srcdir)/kcontrol/background -I$(top_srcdir)/libkonq $(all_includes) ++ ++libkdesktop_main_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) ++libkdesktop_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la \ ++ $(top_builddir)/kcontrol/background/libbgnd.la ++ ++ + kdesktop_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version +-kdesktop_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kcontrol/background/libbgnd.la ++kdesktop_la_LIBADD = libkdesktop_main.la ++ + kdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kdesktop_LDADD = kdesktop.la ++kdesktop_LDADD = libkdesktop_main.la + + SUBDIRS = . lock pics patterns programs init kwebdesktop + +@@ -299,22 +306,24 @@ + ####### Files + bin_PROGRAMS = kdesktop kdmdesktop + bin_SCRIPTS = kdeeject +-lib_LTLIBRARIES = kdesktop.la ++lib_LTLIBRARIES = libkdesktop_main.la kdesktop.la + +-#>- kdesktop_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ +-#>- lockeng.cc KDesktopIface.skel \ ++#>- libkdesktop_main_la_SOURCES = krootwm.cc xautolock.cc kdiconview.cc \ ++#>- desktop.cc main.cc lockeng.cc KDesktopIface.skel \ + #>- bgmanager.cc init.cc KScreensaverIface.skel \ + #>- minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \ + #>- startupid.cpp + #>+ 5 +-kdesktop_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc \ +- lockeng.cc \ ++libkdesktop_main_la_SOURCES=krootwm.cc xautolock.cc kdiconview.cc \ ++ desktop.cc main.cc lockeng.cc \ + bgmanager.cc init.cc \ + minicli.cpp pixmapserver.cc kcustommenu.cc \ + startupid.cpp KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc + + +-kdesktop_SOURCES = dummy.cc ++kdesktop_la_SOURCES = kdesktop_main.cc ++ ++kdesktop_SOURCES = kdesktop_main.cc + + include_HEADERS = KDesktopIface.h KScreensaverIface.h KBackgroundIface.h + +@@ -340,28 +349,33 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kdesktop_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ ++kdesktop_la_DEPENDENCIES = libkdesktop_main.la ++am_kdesktop_la_OBJECTS = kdesktop_main.lo ++#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) ++#>+ 1 ++kdesktop_la_OBJECTS = kdesktop_main.lo ++libkdesktop_main_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la \ + $(top_builddir)/kcontrol/background/libbgnd.la +-am_kdesktop_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ ++am_libkdesktop_main_la_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ + desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ + pixmapserver.lo kcustommenu.lo startupid.lo +-#>- kdesktop_la_OBJECTS = $(am_kdesktop_la_OBJECTS) ++#>- libkdesktop_main_la_OBJECTS = $(am_libkdesktop_main_la_OBJECTS) + #>+ 7 +-kdesktop_la_final_OBJECTS = kdesktop_la.all_cpp.lo kdesktop_la.all_cc.lo +-kdesktop_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ ++libkdesktop_main_la_final_OBJECTS = libkdesktop_main_la.all_cpp.lo libkdesktop_main_la.all_cc.lo ++libkdesktop_main_la_nofinal_OBJECTS = krootwm.lo xautolock.lo kdiconview.lo \ + desktop.lo main.lo lockeng.lo bgmanager.lo init.lo minicli.lo \ + pixmapserver.lo kcustommenu.lo startupid.lo KDesktopIface_skel.lo KScreensaverIface_skel.lo KBackgroundIface_skel.lo \ +- kdesktop_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kdesktop_la_OBJECTS = $(kdesktop_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kdesktop_la_OBJECTS = $(kdesktop_la_final_OBJECTS) ++ libkdesktop_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkdesktop_main_la_OBJECTS = $(libkdesktop_main_la_final_OBJECTS) + bin_PROGRAMS = kdesktop$(EXEEXT) kdmdesktop$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kdesktop_OBJECTS = dummy.$(OBJEXT) ++am_kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) + #>- kdesktop_OBJECTS = $(am_kdesktop_OBJECTS) + #>+ 1 +-kdesktop_OBJECTS = dummy.$(OBJEXT) +-kdesktop_DEPENDENCIES = kdesktop.la ++kdesktop_OBJECTS = kdesktop_main.$(OBJEXT) ++kdesktop_DEPENDENCIES = libkdesktop_main.la + am_kdmdesktop_OBJECTS = kdmdesktop.$(OBJEXT) + #>- kdmdesktop_OBJECTS = $(am_kdmdesktop_OBJECTS) + #>+ 5 +@@ -381,8 +395,9 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bgmanager.Plo $(DEPDIR)/desktop.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/init.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kcustommenu.Plo $(DEPDIR)/kdiconview.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/init.Plo $(DEPDIR)/kcustommenu.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kdesktop_main.Po $(DEPDIR)/kdiconview.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kdmdesktop.Po $(DEPDIR)/krootwm.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/lockeng.Plo $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/minicli.Plo $(DEPDIR)/pixmapserver.Plo \ +@@ -414,8 +429,8 @@ + CCLD = $(CC) + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DIST_SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) \ +- $(kdmdesktop_SOURCES) ++DIST_SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) \ ++ $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) + DATA = $(autostart_DATA) $(menu_DATA) + + HEADERS = $(include_HEADERS) $(noinst_HEADERS) +@@ -428,7 +443,7 @@ + DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) AUTHORS Makefile.am \ + Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kdesktop_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) ++SOURCES = $(kdesktop_la_SOURCES) $(libkdesktop_main_la_SOURCES) $(kdesktop_SOURCES) $(kdmdesktop_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -477,6 +492,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kdesktop.la: $(kdesktop_la_OBJECTS) $(kdesktop_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kdesktop_la_LDFLAGS) $(kdesktop_la_OBJECTS) $(kdesktop_la_LIBADD) $(LIBS) ++libkdesktop_main.la: $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkdesktop_main_la_LDFLAGS) $(libkdesktop_main_la_OBJECTS) $(libkdesktop_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -537,9 +554,10 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bgmanager.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktop.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/init.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcustommenu.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdesktop_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdesktop_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdiconview.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kdmdesktop.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/krootwm.Plo@am__quote@ +@@ -736,7 +754,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 pixmapserver.cc bgmanager.cc lockeng.cc DESIGN kcustommenu.h minicli.cpp kdiconview.h kdesktopbindings.cpp kcustommenu.cc kdmdesktop.h startupid.cpp init.cc kdeeject ++KDE_DIST=DESIGN kdesktop.desktop kdesktop_custom_menu1 kdesktop_custom_menu2 kcustommenu.h minicli.cpp kdiconview.h startupid.cpp init.cc pixmapserver.cc bgmanager.cc main.cc desktop.cc kdesktopbindings.cpp kdeeject lockeng.cc kcustommenu.cc kdmdesktop.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -890,20 +908,6 @@ + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + +-#>+ 13 +-KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) +-KDesktopIface_skel.cc: KDesktopIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl +-KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) +-KScreensaverIface_skel.cc: KScreensaverIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl +-KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) +-KBackgroundIface_skel.cc: KBackgroundIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl +- + #>+ 3 + xautolock.moc: $(srcdir)/xautolock.h + $(MOC) $(srcdir)/xautolock.h -o xautolock.moc +@@ -948,6 +952,20 @@ + krootwm.moc: $(srcdir)/krootwm.h + $(MOC) $(srcdir)/krootwm.h -o krootwm.moc + ++#>+ 13 ++KDesktopIface.kidl: $(srcdir)/KDesktopIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KDesktopIface.h > KDesktopIface.kidl || ( rm -f KDesktopIface.kidl ; /bin/false ) ++KDesktopIface_skel.cc: KDesktopIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KDesktopIface.kidl ++KScreensaverIface.kidl: $(srcdir)/KScreensaverIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KScreensaverIface.h > KScreensaverIface.kidl || ( rm -f KScreensaverIface.kidl ; /bin/false ) ++KScreensaverIface_skel.cc: KScreensaverIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KScreensaverIface.kidl ++KBackgroundIface.kidl: $(srcdir)/KBackgroundIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KBackgroundIface.h > KBackgroundIface.kidl || ( rm -f KBackgroundIface.kidl ; /bin/false ) ++KBackgroundIface_skel.cc: KBackgroundIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KBackgroundIface.kidl ++ + #>+ 3 + clean-metasources: + -rm -f xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +@@ -970,16 +988,16 @@ + + + #>+ 12 +-kdesktop_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +- @echo 'creating kdesktop_la_meta_unload.cc' +- @-rm -f kdesktop_la_meta_unload.cc ++libkdesktop_main_la_meta_unload.cc: lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc ++ @echo 'creating libkdesktop_main_la_meta_unload.cc' ++ @-rm -f libkdesktop_main_la_meta_unload.cc + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kdesktop_la[] = {' > kdesktop_la_meta_unload.cc ;\ +- cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kdesktop_la_meta_unload.cc ;\ +- echo '0};' >> kdesktop_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> kdesktop_la_meta_unload.cc ;\ +- echo '_UNLOAD(kdesktop_la)' >> kdesktop_la_meta_unload.cc ;\ +- else echo > kdesktop_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkdesktop_main_la[] = {' > libkdesktop_main_la_meta_unload.cc ;\ ++ cat lockeng.moc xautolock.moc bgmanager.moc kdiconview.moc desktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkdesktop_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkdesktop_main_la)' >> libkdesktop_main_la_meta_unload.cc ;\ ++ else echo > libkdesktop_main_la_meta_unload.cc; fi + + + #>+ 12 +@@ -997,26 +1015,14 @@ + + #>+ 3 + clean-moc-classes: +- -rm -f kdesktop_la_meta_unload.cc kdmdesktop_meta_unload.cc ++ -rm -f libkdesktop_main_la_meta_unload.cc kdmdesktop_meta_unload.cc + + #>+ 11 +-kdesktop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc +- @echo 'creating kdesktop_la.all_cpp.cpp ...'; \ +- rm -f kdesktop_la.all_cpp.files kdesktop_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cpp.final; \ +- for file in minicli.cpp startupid.cpp ; do \ +- echo "#include \"$$file\"" >> kdesktop_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cpp.final; \ +- done; \ +- cat kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files > kdesktop_la.all_cpp.cpp; \ +- rm -f kdesktop_la.all_cpp.final kdesktop_la.all_cpp.files +- +-#>+ 11 +-kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc ++kdesktop_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc xautolock.moc lockeng.moc bgmanager.moc kdiconview.moc desktop.moc kdmdesktop.moc pixmapserver.moc startupid.moc kcustommenu.moc minicli.moc krootwm.moc + @echo 'creating kdesktop_la.all_cc.cc ...'; \ + rm -f kdesktop_la.all_cc.files kdesktop_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kdesktop_la.all_cc.final; \ +- for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc kdesktop_la_meta_unload.cc ; do \ ++ for file in kdesktop_main.cc ; do \ + echo "#include \"$$file\"" >> kdesktop_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop_la.all_cc.final; \ + done; \ +@@ -1024,11 +1030,35 @@ + rm -f kdesktop_la.all_cc.final kdesktop_la.all_cc.files + + #>+ 11 +-kdesktop.all_cc.cc: $(srcdir)/Makefile.in dummy.cc ++libkdesktop_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/minicli.cpp $(srcdir)/startupid.cpp ++ @echo 'creating libkdesktop_main_la.all_cpp.cpp ...'; \ ++ rm -f libkdesktop_main_la.all_cpp.files libkdesktop_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cpp.final; \ ++ for file in minicli.cpp startupid.cpp ; do \ ++ echo "#include \"$$file\"" >> libkdesktop_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cpp.final; \ ++ done; \ ++ cat libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files > libkdesktop_main_la.all_cpp.cpp; \ ++ rm -f libkdesktop_main_la.all_cpp.final libkdesktop_main_la.all_cpp.files ++ ++#>+ 11 ++libkdesktop_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/krootwm.cc $(srcdir)/xautolock.cc $(srcdir)/kdiconview.cc $(srcdir)/desktop.cc $(srcdir)/main.cc $(srcdir)/lockeng.cc $(srcdir)/bgmanager.cc $(srcdir)/init.cc $(srcdir)/pixmapserver.cc $(srcdir)/kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ++ @echo 'creating libkdesktop_main_la.all_cc.cc ...'; \ ++ rm -f libkdesktop_main_la.all_cc.files libkdesktop_main_la.all_cc.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkdesktop_main_la.all_cc.final; \ ++ for file in krootwm.cc xautolock.cc kdiconview.cc desktop.cc main.cc lockeng.cc bgmanager.cc init.cc pixmapserver.cc kcustommenu.cc KDesktopIface_skel.cc KScreensaverIface_skel.cc KBackgroundIface_skel.cc libkdesktop_main_la_meta_unload.cc ; do \ ++ echo "#include \"$$file\"" >> libkdesktop_main_la.all_cc.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkdesktop_main_la.all_cc.final; \ ++ done; \ ++ cat libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files > libkdesktop_main_la.all_cc.cc; \ ++ rm -f libkdesktop_main_la.all_cc.final libkdesktop_main_la.all_cc.files ++ ++#>+ 11 ++kdesktop.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kdesktop_main.cc + @echo 'creating kdesktop.all_cc.cc ...'; \ + rm -f kdesktop.all_cc.files kdesktop.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kdesktop.all_cc.final; \ +- for file in dummy.cc ; do \ ++ for file in kdesktop_main.cc ; do \ + echo "#include \"$$file\"" >> kdesktop.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kdesktop.all_cc.final; \ + done; \ +@@ -1061,20 +1091,20 @@ + + #>+ 3 + clean-final: +- -rm -f kdesktop_la.all_cpp.cpp kdesktop_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc ++ -rm -f kdesktop_la.all_cc.cc libkdesktop_main_la.all_cpp.cpp libkdesktop_main_la.all_cc.cc kdesktop.all_cc.cc kdmdesktop.all_cpp.cpp kdmdesktop.all_cc.cc + + #>+ 2 + final: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_final_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kdesktop_la_OBJECTS="$(kdesktop_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am ++ $(MAKE) libkdesktop_main_la_OBJECTS="$(libkdesktop_main_la_nofinal_OBJECTS)" kdmdesktop_OBJECTS="$(kdmdesktop_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-bb b/x11/kdebase3/patches/patch-bb new file mode 100644 index 00000000000..144fbd0804d --- /dev/null +++ b/x11/kdebase3/patches/patch-bb @@ -0,0 +1,35 @@ +$NetBSD: patch-bb,v 1.1.1.1 2002/05/31 13:18:58 skrll Exp $ + +--- kdesktop/init.cc.orig Thu Oct 11 12:19:53 2001 ++++ kdesktop/init.cc +@@ -76,9 +76,13 @@ + { + if (force || !QFile::exists(dir + "/.directory")) { + QCString cmd; +- cmd.sprintf( "cp %s %s/.directory", ++ QCString dest; ++ dest.sprintf( "%s/.directory", QFile::encodeName(dir).data() ); ++ cmd.sprintf( "cp %s %s", + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), +- QFile::encodeName(dir).data() ); ++ dest.data() ); ++ system( cmd ); ++ cmd.sprintf( "chmod u+w %s", dest.data() ); + system( cmd ); + } + } +@@ -102,10 +106,13 @@ + for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++) { + QCString cmd = "cp '"; + KDesktopFile desk( *it ); ++ QCString dest = QFile::encodeName(desktopPath + desk.readName()); + cmd += QFile::encodeName(*it); + cmd += "' '"; +- cmd += QFile::encodeName(desktopPath + desk.readName()); ++ cmd += dest; + cmd += "'"; ++ system( cmd ); ++ cmd = "chmod u+w '" + dest + "'"; + system( cmd ); + } + } diff --git a/x11/kdebase3/patches/patch-bc b/x11/kdebase3/patches/patch-bc new file mode 100644 index 00000000000..17d9675356f --- /dev/null +++ b/x11/kdebase3/patches/patch-bc @@ -0,0 +1,21 @@ +$NetBSD: patch-bc,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kdesktop/kdeeject.orig Sat May 5 21:05:58 2001 ++++ kdesktop/kdeeject +@@ -1,6 +1,6 @@ + #!/bin/sh + # Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy) +-# Relies on the 'eject' program, 'cdcontrol' on *BSD ++# Relies on the 'eject' program, 'cdcontrol' on FreeBSD + # + # Copyright GPL v2 by David Faure <david@mandrakesoft.com> + # +@@ -13,7 +13,7 @@ + # I guess this is the reason for making this a kde app... + OS=`uname -s` + case "$OS" in +- *BSD) ++ FreeBSD) + dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'` + cdcontrol -f $dev eject >/dev/null 2>&1 + ;; diff --git a/x11/kdebase3/patches/patch-bd b/x11/kdebase3/patches/patch-bd new file mode 100644 index 00000000000..9c1299ae238 --- /dev/null +++ b/x11/kdebase3/patches/patch-bd @@ -0,0 +1,33 @@ +$NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kdesktop/kdesktop_main.cc.orig Thu May 30 09:59:45 2002 ++++ kdesktop/kdesktop_main.cc +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char **); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-be b/x11/kdebase3/patches/patch-be new file mode 100644 index 00000000000..70717a32da9 --- /dev/null +++ b/x11/kdebase3/patches/patch-be @@ -0,0 +1,15 @@ +$NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kdesktop/main.cc.orig Wed May 8 19:21:24 2002 ++++ kdesktop/main.cc +@@ -70,7 +70,9 @@ + KApplication::kApplication()->quit(); // turn catchable signals into clean shutdown + } + +-int main( int argc, char **argv ) ++extern "C" int kdemain( int, char ** ); ++ ++int kdemain( int argc, char **argv ) + { + //setup signal handling + signal(SIGTERM, signalHandler); diff --git a/x11/kdebase3/patches/patch-bf b/x11/kdebase3/patches/patch-bf new file mode 100644 index 00000000000..4f911b329b0 --- /dev/null +++ b/x11/kdebase3/patches/patch-bf @@ -0,0 +1,32 @@ +$NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- khotkeys/khotkeys/Makefile.am.orig Tue Feb 12 14:32:08 2002 ++++ khotkeys/khotkeys/Makefile.am +@@ -2,12 +2,16 @@ + + bin_PROGRAMS = khotkeys +-lib_LTLIBRARIES = khotkeys.la ++lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la + +-khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel +-khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA) ++libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel ++libkhotkeys_main_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA) ++libkhotkeys_main_la_LDFLAGS = $(all_libraries) ++ ++khotkeys_la_SOURCES = khotkeys_main.cpp ++khotkeys_la_LIBADD = libkhotkeys_main.la + khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-khotkeys_SOURCES = dummy.cpp +-khotkeys_LDADD = khotkeys.la ++khotkeys_SOURCES = khotkeys_main.cpp ++khotkeys_LDADD = libkhotkeys_main.la + khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +@@ -20,5 +24,2 @@ + + METASOURCES = AUTO +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-bg b/x11/kdebase3/patches/patch-bg new file mode 100644 index 00000000000..593450bf5c3 --- /dev/null +++ b/x11/kdebase3/patches/patch-bg @@ -0,0 +1,254 @@ +$NetBSD: patch-bg,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- khotkeys/khotkeys/Makefile.in.orig Mon May 13 23:57:45 2002 ++++ khotkeys/khotkeys/Makefile.in +@@ -290,16 +290,20 @@ + x_libraries = @x_libraries@ + + bin_PROGRAMS = khotkeys +-lib_LTLIBRARIES = khotkeys.la ++lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la + +-#>- khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel ++#>- libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel + #>+ 1 +-khotkeys_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp +-khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA) ++libkhotkeys_main_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp ++libkhotkeys_main_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA) ++libkhotkeys_main_la_LDFLAGS = $(all_libraries) ++ ++khotkeys_la_SOURCES = khotkeys_main.cpp ++khotkeys_la_LIBADD = libkhotkeys_main.la + khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-khotkeys_SOURCES = dummy.cpp +-khotkeys_LDADD = khotkeys.la ++khotkeys_SOURCES = khotkeys_main.cpp ++khotkeys_LDADD = libkhotkeys_main.la + khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + autostart_DATA = khotkeys.desktop +@@ -316,23 +320,28 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-khotkeys_la_DEPENDENCIES = ../shared/libshared.la +-am_khotkeys_la_OBJECTS = khotkeys.lo main.lo ++khotkeys_la_DEPENDENCIES = libkhotkeys_main.la ++am_khotkeys_la_OBJECTS = khotkeys_main.lo + #>- khotkeys_la_OBJECTS = $(am_khotkeys_la_OBJECTS) ++#>+ 1 ++khotkeys_la_OBJECTS = khotkeys_main.lo ++libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la ++am_libkhotkeys_main_la_OBJECTS = khotkeys.lo main.lo ++#>- libkhotkeys_main_la_OBJECTS = $(am_libkhotkeys_main_la_OBJECTS) + #>+ 5 +-khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo +-khotkeys_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo \ +- khotkeys_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS) ++libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo ++libkhotkeys_main_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo \ ++ libkhotkeys_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS) + bin_PROGRAMS = khotkeys$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_khotkeys_OBJECTS = dummy.$(OBJEXT) ++am_khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) + #>- khotkeys_OBJECTS = $(am_khotkeys_OBJECTS) + #>+ 1 +-khotkeys_OBJECTS = dummy.$(OBJEXT) +-khotkeys_DEPENDENCIES = khotkeys.la ++khotkeys_OBJECTS = khotkeys_main.$(OBJEXT) ++khotkeys_DEPENDENCIES = libkhotkeys_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -340,8 +349,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/khotkeys.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/khotkeys.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/khotkeys_main.Po $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -361,13 +371,14 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) ++DIST_SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) \ ++ $(khotkeys_SOURCES) + DATA = $(autostart_DATA) + + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES) ++SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) $(khotkeys_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -416,6 +427,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS) ++libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -450,8 +463,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)/khotkeys.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + + distclean-depend: +@@ -528,7 +542,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=khkglobalaccel.h khotkeys.desktop khkglobalaccel.cpp ++KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -643,19 +657,10 @@ + uninstall-am uninstall-autostartDATA uninstall-binPROGRAMS \ + uninstall-info-am uninstall-libLTLIBRARIES + +- +-dummy.cpp: +- echo > dummy.cpp + # 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: + +-#>+ 5 +-khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false ) +-khotkeys_skel.cpp: khotkeys.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl +- + #>+ 3 + khotkeys.moc: $(srcdir)/khotkeys.h + $(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc +@@ -664,6 +669,12 @@ + khkglobalaccel.moc: $(srcdir)/khkglobalaccel.h + $(MOC) $(srcdir)/khkglobalaccel.h -o khkglobalaccel.moc + ++#>+ 5 ++khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; /bin/false ) ++khotkeys_skel.cpp: khotkeys.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl ++ + #>+ 3 + clean-metasources: + -rm -f khotkeys.moc khkglobalaccel.moc +@@ -684,28 +695,28 @@ + + + #>+ 12 +-khotkeys_la_meta_unload.cpp: khotkeys.moc +- @echo 'creating khotkeys_la_meta_unload.cpp' +- @-rm -f khotkeys_la_meta_unload.cpp ++libkhotkeys_main_la_meta_unload.cpp: khotkeys.moc ++ @echo 'creating libkhotkeys_main_la_meta_unload.cpp' ++ @-rm -f libkhotkeys_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_khotkeys_la[] = {' > khotkeys_la_meta_unload.cpp ;\ +- cat khotkeys.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> khotkeys_la_meta_unload.cpp ;\ +- echo '0};' >> khotkeys_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> khotkeys_la_meta_unload.cpp ;\ +- echo '_UNLOAD(khotkeys_la)' >> khotkeys_la_meta_unload.cpp ;\ +- else echo > khotkeys_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkhotkeys_main_la[] = {' > libkhotkeys_main_la_meta_unload.cpp ;\ ++ cat khotkeys.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkhotkeys_main_la)' >> libkhotkeys_main_la_meta_unload.cpp ;\ ++ else echo > libkhotkeys_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f khotkeys_la_meta_unload.cpp ++ -rm -f libkhotkeys_main_la_meta_unload.cpp + + #>+ 11 +-khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp khotkeys.moc khkglobalaccel.moc ++khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp khotkeys.moc khkglobalaccel.moc + @echo 'creating khotkeys_la.all_cpp.cpp ...'; \ + rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \ +- for file in khotkeys.cpp main.cpp khotkeys_skel.cpp khotkeys_la_meta_unload.cpp ; do \ ++ for file in khotkeys_main.cpp ; do \ + echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \ + done; \ +@@ -713,11 +724,23 @@ + rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files + + #>+ 11 +-khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp ++ @echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \ ++ rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \ ++ for file in khotkeys.cpp main.cpp khotkeys_skel.cpp libkhotkeys_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \ ++ done; \ ++ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \ ++ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files ++ ++#>+ 11 ++khotkeys.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys_main.cpp + @echo 'creating khotkeys.all_cpp.cpp ...'; \ + rm -f khotkeys.all_cpp.files khotkeys.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> khotkeys.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in khotkeys_main.cpp ; do \ + echo "#include \"$$file\"" >> khotkeys.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys.all_cpp.final; \ + done; \ +@@ -726,20 +749,20 @@ + + #>+ 3 + clean-final: +- -rm -f khotkeys_la.all_cpp.cpp khotkeys.all_cpp.cpp ++ -rm -f khotkeys_la.all_cpp.cpp libkhotkeys_main_la.all_cpp.cpp khotkeys.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" install-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-bh b/x11/kdebase3/patches/patch-bh new file mode 100644 index 00000000000..16bb95af869 --- /dev/null +++ b/x11/kdebase3/patches/patch-bh @@ -0,0 +1,33 @@ +$NetBSD: patch-bh,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- khotkeys/khotkeys/khotkeys_main.cpp.orig Thu May 30 09:59:46 2002 ++++ khotkeys/khotkeys/khotkeys_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-bi b/x11/kdebase3/patches/patch-bi new file mode 100644 index 00000000000..2b6bdfc1fdd --- /dev/null +++ b/x11/kdebase3/patches/patch-bi @@ -0,0 +1,15 @@ +$NetBSD: patch-bi,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- khotkeys/khotkeys/main.cpp.orig Tue Feb 12 14:32:08 2002 ++++ khotkeys/khotkeys/main.cpp +@@ -29,7 +29,9 @@ + int khotkeys_screen_number = 0; + + +-int main( int argc, char** argv ) ++extern "C" int kdemain( int, char**); ++ ++int kdemain( int argc, char** argv ) + { // no need to i18n these, no GUI + { + // multiheaded hotkeys diff --git a/x11/kdebase3/patches/patch-bj b/x11/kdebase3/patches/patch-bj new file mode 100644 index 00000000000..9ae4361c532 --- /dev/null +++ b/x11/kdebase3/patches/patch-bj @@ -0,0 +1,33 @@ +$NetBSD: patch-bj,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/Makefile.am.orig Wed May 8 19:21:48 2002 ++++ kicker/Makefile.am +@@ -3,18 +3,22 @@ + SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data + + bin_PROGRAMS = kicker +-lib_LTLIBRARIES = kicker.la ++lib_LTLIBRARIES = libkicker_main.la kicker.la + + CLEANFILES = dummy.cpp + +-kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ ++libkicker_main_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ + ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO) + +-kicker_la_SOURCES = dummy.cpp +-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries) ++libkicker_main_la_SOURCES = dummy.cpp ++libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) + +-kicker_LDADD = kicker.la +-kicker_SOURCES = dummy.cpp ++kicker_la_LIBADD = libkicker_main.la ++kicker_la_SOURCES = kicker_main.cpp ++kicker_la_LDFLAGS = -module -avoid-version $(all_libraries) ++ ++kicker_LDADD = libkicker_main.la ++kicker_SOURCES = kicker_main.cpp + kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + autostart_DATA = panel.desktop diff --git a/x11/kdebase3/patches/patch-bk b/x11/kdebase3/patches/patch-bk new file mode 100644 index 00000000000..42b7f80ee4b --- /dev/null +++ b/x11/kdebase3/patches/patch-bk @@ -0,0 +1,199 @@ +$NetBSD: patch-bk,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/Makefile.in.orig Mon May 13 23:57:45 2002 ++++ kicker/Makefile.in +@@ -292,19 +292,23 @@ + SUBDIRS = share core ui buttons . proxy taskmanager taskbar applets extensions menuext data + + bin_PROGRAMS = kicker +-lib_LTLIBRARIES = kicker.la ++lib_LTLIBRARIES = libkicker_main.la kicker.la + + CLEANFILES = dummy.cpp + +-kicker_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ ++libkicker_main_la_LIBADD = core/libkicker_core.la buttons/libkicker_buttons.la \ + ui/libkicker_ui.la share/libkickermain.la $(LIB_KIO) + + +-kicker_la_SOURCES = dummy.cpp +-kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module $(all_libraries) ++libkicker_main_la_SOURCES = dummy.cpp ++libkicker_main_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) + +-kicker_LDADD = kicker.la +-kicker_SOURCES = dummy.cpp ++kicker_la_LIBADD = libkicker_main.la ++kicker_la_SOURCES = kicker_main.cpp ++kicker_la_LDFLAGS = -module -avoid-version $(all_libraries) ++ ++kicker_LDADD = libkicker_main.la ++kicker_SOURCES = kicker_main.cpp + kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + autostart_DATA = panel.desktop +@@ -315,21 +319,26 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kicker_la_DEPENDENCIES = core/libkicker_core.la \ ++kicker_la_DEPENDENCIES = libkicker_main.la ++am_kicker_la_OBJECTS = kicker_main.lo ++#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS) ++#>+ 1 ++kicker_la_OBJECTS = kicker_main.lo ++libkicker_main_la_DEPENDENCIES = core/libkicker_core.la \ + buttons/libkicker_buttons.la ui/libkicker_ui.la \ + share/libkickermain.la +-am_kicker_la_OBJECTS = dummy.lo +-#>- kicker_la_OBJECTS = $(am_kicker_la_OBJECTS) ++am_libkicker_main_la_OBJECTS = dummy.lo ++#>- libkicker_main_la_OBJECTS = $(am_libkicker_main_la_OBJECTS) + #>+ 1 +-kicker_la_OBJECTS = dummy.lo ++libkicker_main_la_OBJECTS = dummy.lo + bin_PROGRAMS = kicker$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kicker_OBJECTS = dummy.$(OBJEXT) ++am_kicker_OBJECTS = kicker_main.$(OBJEXT) + #>- kicker_OBJECTS = $(am_kicker_OBJECTS) + #>+ 1 +-kicker_OBJECTS = dummy.$(OBJEXT) +-kicker_DEPENDENCIES = kicker.la ++kicker_OBJECTS = kicker_main.$(OBJEXT) ++kicker_DEPENDENCIES = libkicker_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -337,7 +346,8 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/dummy.Po ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Plo $(DEPDIR)/kicker_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kicker_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -357,7 +367,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) ++DIST_SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) \ ++ $(kicker_SOURCES) + DATA = $(autostart_DATA) + + +@@ -367,7 +378,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = AUTHORS ChangeLog Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kicker_la_SOURCES) $(kicker_SOURCES) ++SOURCES = $(kicker_la_SOURCES) $(libkicker_main_la_SOURCES) $(kicker_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -414,11 +425,13 @@ + + clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +-#>- kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) +-#>+ 2 +-@KDE_USE_CLOSURE_TRUE@kicker.la: kicker.la.closure $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) +-@KDE_USE_CLOSURE_FALSE@kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) ++kicker.la: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS) ++#>- libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) ++#>+ 2 ++@KDE_USE_CLOSURE_TRUE@libkicker_main.la: libkicker_main.la.closure $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) ++@KDE_USE_CLOSURE_FALSE@libkicker_main.la: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -454,7 +467,8 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kicker_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kicker_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -738,17 +752,17 @@ + .NOEXPORT: + + #>+ 8 +-kicker.la.closure: $(kicker_la_OBJECTS) $(kicker_la_DEPENDENCIES) +- @echo "int main() {return 0;}" > kicker_la_closure.cpp +- @$(LTCXXCOMPILE) -c kicker_la_closure.cpp +- $(CXXLINK) kicker_la_closure.lo $(kicker_la_LDFLAGS) $(kicker_la_OBJECTS) $(kicker_la_LIBADD) $(LIBS) +- @rm -f kicker_la_closure.* kicker.la.closure +- @echo "timestamp" > kicker.la.closure ++libkicker_main.la.closure: $(libkicker_main_la_OBJECTS) $(libkicker_main_la_DEPENDENCIES) ++ @echo "int main() {return 0;}" > libkicker_main_la_closure.cpp ++ @$(LTCXXCOMPILE) -c libkicker_main_la_closure.cpp ++ $(CXXLINK) libkicker_main_la_closure.lo $(libkicker_main_la_LDFLAGS) $(libkicker_main_la_OBJECTS) $(libkicker_main_la_LIBADD) $(LIBS) ++ @rm -f libkicker_main_la_closure.* libkicker_main.la.closure ++ @echo "timestamp" > libkicker_main.la.closure + + + #>+ 3 + clean-closures: +- -rm -f kicker.la.closure ++ -rm -f libkicker_main.la.closure + + #>+ 2 + docs-am: +@@ -761,11 +775,11 @@ + + + #>+ 11 +-kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kicker_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp + @echo 'creating kicker_la.all_cpp.cpp ...'; \ + rm -f kicker_la.all_cpp.files kicker_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kicker_la.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kicker_main.cpp ; do \ + echo "#include \"$$file\"" >> kicker_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker_la.all_cpp.final; \ + done; \ +@@ -773,11 +787,23 @@ + rm -f kicker_la.all_cpp.final kicker_la.all_cpp.files + + #>+ 11 +-kicker.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkicker_main_la.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++ @echo 'creating libkicker_main_la.all_cpp.cpp ...'; \ ++ rm -f libkicker_main_la.all_cpp.files libkicker_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkicker_main_la.all_cpp.final; \ ++ for file in dummy.cpp ; do \ ++ echo "#include \"$$file\"" >> libkicker_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkicker_main_la.all_cpp.final; \ ++ done; \ ++ cat libkicker_main_la.all_cpp.final libkicker_main_la.all_cpp.files > libkicker_main_la.all_cpp.cpp; \ ++ rm -f libkicker_main_la.all_cpp.final libkicker_main_la.all_cpp.files ++ ++#>+ 11 ++kicker.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kicker_main.cpp + @echo 'creating kicker.all_cpp.cpp ...'; \ + rm -f kicker.all_cpp.files kicker.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kicker.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kicker_main.cpp ; do \ + echo "#include \"$$file\"" >> kicker.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kicker.all_cpp.final; \ + done; \ +@@ -786,7 +812,7 @@ + + #>+ 3 + clean-final: +- -rm -f kicker_la.all_cpp.cpp kicker.all_cpp.cpp ++ -rm -f kicker_la.all_cpp.cpp libkicker_main_la.all_cpp.cpp kicker.all_cpp.cpp + + #>+ 2 + final: diff --git a/x11/kdebase3/patches/patch-bl b/x11/kdebase3/patches/patch-bl new file mode 100644 index 00000000000..0dc1fddc509 --- /dev/null +++ b/x11/kdebase3/patches/patch-bl @@ -0,0 +1,13 @@ +$NetBSD: patch-bl,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/applets/launcher/Makefile.am.orig Tue Feb 26 16:58:10 2002 ++++ kicker/applets/launcher/Makefile.am +@@ -14,7 +14,7 @@ + EXTRA_DIST = $(lnk_DATA) + + launcher_panelapplet_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module +-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) ++launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) + + messages: + $(XGETTEXT) *.cpp *.h -o $(podir)/quicklauncher.pot diff --git a/x11/kdebase3/patches/patch-bm b/x11/kdebase3/patches/patch-bm new file mode 100644 index 00000000000..a5472dd64de --- /dev/null +++ b/x11/kdebase3/patches/patch-bm @@ -0,0 +1,21 @@ +$NetBSD: patch-bm,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/applets/launcher/Makefile.in.orig Mon May 13 23:57:45 2002 ++++ kicker/applets/launcher/Makefile.in +@@ -302,14 +302,14 @@ + EXTRA_DIST = $(lnk_DATA) + + launcher_panelapplet_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module +-launcher_panelapplet_la_LIBADD = ../../kicker.la $(LIB_KSYCOCA) $(LIB_KDEUI) ++launcher_panelapplet_la_LIBADD = ../../libkicker_main.la $(LIB_KSYCOCA) $(LIB_KDEUI) + subdir = kicker/applets/launcher + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-launcher_panelapplet_la_DEPENDENCIES = ../../kicker.la ++launcher_panelapplet_la_DEPENDENCIES = ../../libkicker_main.la + am_launcher_panelapplet_la_OBJECTS = quicklauncher.lo quickbutton.lo \ + quickaddappsmenu.lo + #>- launcher_panelapplet_la_OBJECTS = $(am_launcher_panelapplet_la_OBJECTS) diff --git a/x11/kdebase3/patches/patch-bn b/x11/kdebase3/patches/patch-bn new file mode 100644 index 00000000000..f36d1533fdd --- /dev/null +++ b/x11/kdebase3/patches/patch-bn @@ -0,0 +1,15 @@ +$NetBSD: patch-bn,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/core/main.cpp.orig Wed Feb 27 16:10:06 2002 ++++ kicker/core/main.cpp +@@ -59,7 +59,9 @@ + QApplication::exit(); + } + +-int main( int argc, char ** argv ) ++extern "C" int kdemain(int, char **); ++ ++int kdemain( int argc, char ** argv ) + { + { + QCString multiHead = getenv("KDE_MULTIHEAD"); diff --git a/x11/kdebase3/patches/patch-bo b/x11/kdebase3/patches/patch-bo new file mode 100644 index 00000000000..b4e48418030 --- /dev/null +++ b/x11/kdebase3/patches/patch-bo @@ -0,0 +1,13 @@ +$NetBSD: patch-bo,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/extensions/childpanel/Makefile.am.orig Tue Feb 26 17:04:57 2002 ++++ kicker/extensions/childpanel/Makefile.am +@@ -5,7 +5,7 @@ + childpanel_panelextension_la_SOURCES = childpanelextension.cpp childpanelextension.skel + childpanel_panelextension_la_METASOURCES = AUTO + childpanel_panelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module +-childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la ++childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker_main.la + + noinst_HEADERS = childpanelextension.h + diff --git a/x11/kdebase3/patches/patch-bp b/x11/kdebase3/patches/patch-bp new file mode 100644 index 00000000000..c9bac9d7585 --- /dev/null +++ b/x11/kdebase3/patches/patch-bp @@ -0,0 +1,22 @@ +$NetBSD: patch-bp,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/extensions/childpanel/Makefile.in.orig Mon May 13 23:57:46 2002 ++++ kicker/extensions/childpanel/Makefile.in +@@ -296,7 +296,7 @@ + childpanel_panelextension_la_SOURCES=childpanelextension.cpp childpanelextension_skel.cpp + #>- childpanel_panelextension_la_METASOURCES = AUTO + childpanel_panelextension_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -module +-childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../kicker.la ++childpanel_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ../../libkicker_main.la + + noinst_HEADERS = childpanelextension.h + +@@ -310,7 +310,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-childpanel_panelextension_la_DEPENDENCIES = ../../kicker.la ++childpanel_panelextension_la_DEPENDENCIES = ../../libkicker_main.la + am_childpanel_panelextension_la_OBJECTS = childpanelextension.lo + #>- childpanel_panelextension_la_OBJECTS = \ + #>- $(am_childpanel_panelextension_la_OBJECTS) diff --git a/x11/kdebase3/patches/patch-bq b/x11/kdebase3/patches/patch-bq new file mode 100644 index 00000000000..975db3337d9 --- /dev/null +++ b/x11/kdebase3/patches/patch-bq @@ -0,0 +1,33 @@ +$NetBSD: patch-bq,v 1.1.1.1 2002/05/31 13:18:59 skrll Exp $ + +--- kicker/kicker_main.cpp.orig Thu May 30 09:59:49 2002 ++++ kicker/kicker_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char **); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-br b/x11/kdebase3/patches/patch-br new file mode 100644 index 00000000000..f713852b02c --- /dev/null +++ b/x11/kdebase3/patches/patch-br @@ -0,0 +1,59 @@ +$NetBSD: patch-br,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/Makefile.am.orig Wed Feb 13 10:18:52 2002 ++++ kicker/proxy/Makefile.am +@@ -1,26 +1,33 @@ + INCLUDES = -I$(srcdir)/../share $(all_includes) + +-CLEANFILES = dummy.cpp +- + bin_PROGRAMS = appletproxy extensionproxy +-lib_LTLIBRARIES = appletproxy.la extensionproxy.la ++lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \ ++ libextensionproxy_main.la extensionproxy.la ++ ++libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la ++libappletproxy_main_la_SOURCES = appletproxy.cpp ++libappletproxy_main_la_METASOURCES = appletproxy.moc ++libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +-appletproxy_la_SOURCES = appletproxy.cpp +-appletproxy_la_METASOURCES = appletproxy.moc ++appletproxy_la_LIBADD = libappletproxy_main.la ++appletproxy_la_SOURCES = appletproxy_main.cpp + appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-appletproxy_LDADD = appletproxy.la +-appletproxy_SOURCES = dummy.cpp ++appletproxy_LDADD = libappletproxy_main.la ++appletproxy_SOURCES = appletproxy_main.cpp + appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +-extensionproxy_la_SOURCES = extensionproxy.cpp +-extensionproxy_la_METASOURCES = extensionproxy.moc ++libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la ++libextensionproxy_main_la_SOURCES = extensionproxy.cpp ++libextensionproxy_main_la_METASOURCES = extensionproxy.moc ++libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++extensionproxy_la_LIBADD = libextensionproxy_main.la ++extensionproxy_la_SOURCES = extensionproxy_main.cpp + extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-extensionproxy_LDADD = extensionproxy.la +-extensionproxy_SOURCES = dummy.cpp ++extensionproxy_LDADD = libextensionproxy_main.la ++extensionproxy_SOURCES = extensionproxy_main.cpp + extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = appletproxy.h extensionproxy.h +@@ -28,7 +35,3 @@ + messages: + $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot + $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot +- +-dummy.cpp: +- echo > dummy.cpp +- diff --git a/x11/kdebase3/patches/patch-bs b/x11/kdebase3/patches/patch-bs new file mode 100644 index 00000000000..aa67d33a4d0 --- /dev/null +++ b/x11/kdebase3/patches/patch-bs @@ -0,0 +1,351 @@ +$NetBSD: patch-bs,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/Makefile.in.orig Mon May 13 23:57:47 2002 ++++ kicker/proxy/Makefile.in +@@ -289,27 +289,35 @@ + + INCLUDES = -I$(srcdir)/../share $(all_includes) + +-CLEANFILES = dummy.cpp +- + bin_PROGRAMS = appletproxy extensionproxy +-lib_LTLIBRARIES = appletproxy.la extensionproxy.la ++lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \ ++ libextensionproxy_main.la extensionproxy.la ++ + +-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +-appletproxy_la_SOURCES = appletproxy.cpp +-#>- appletproxy_la_METASOURCES = appletproxy.moc ++libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la ++libappletproxy_main_la_SOURCES = appletproxy.cpp ++#>- libappletproxy_main_la_METASOURCES = appletproxy.moc ++libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++appletproxy_la_LIBADD = libappletproxy_main.la ++appletproxy_la_SOURCES = appletproxy_main.cpp + appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-appletproxy_LDADD = appletproxy.la +-appletproxy_SOURCES = dummy.cpp ++appletproxy_LDADD = libappletproxy_main.la ++appletproxy_SOURCES = appletproxy_main.cpp + appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la +-extensionproxy_la_SOURCES = extensionproxy.cpp +-#>- extensionproxy_la_METASOURCES = extensionproxy.moc ++libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la ++libextensionproxy_main_la_SOURCES = extensionproxy.cpp ++#>- libextensionproxy_main_la_METASOURCES = extensionproxy.moc ++libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) ++ ++extensionproxy_la_LIBADD = libextensionproxy_main.la ++extensionproxy_la_SOURCES = extensionproxy_main.cpp + extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version + +-extensionproxy_LDADD = extensionproxy.la +-extensionproxy_SOURCES = dummy.cpp ++extensionproxy_LDADD = libextensionproxy_main.la ++extensionproxy_SOURCES = extensionproxy_main.cpp + extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = appletproxy.h extensionproxy.h +@@ -319,37 +327,48 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-appletproxy_la_DEPENDENCIES = ../share/libkickermain.la +-am_appletproxy_la_OBJECTS = appletproxy.lo ++appletproxy_la_DEPENDENCIES = libappletproxy_main.la ++am_appletproxy_la_OBJECTS = appletproxy_main.lo + #>- appletproxy_la_OBJECTS = $(am_appletproxy_la_OBJECTS) +-#>+ 5 +-appletproxy_la_final_OBJECTS = appletproxy_la.all_cpp.lo +-appletproxy_la_nofinal_OBJECTS = appletproxy.lo \ +- appletproxy_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@appletproxy_la_OBJECTS = $(appletproxy_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@appletproxy_la_OBJECTS = $(appletproxy_la_final_OBJECTS) +-extensionproxy_la_DEPENDENCIES = ../share/libkickermain.la +-am_extensionproxy_la_OBJECTS = extensionproxy.lo ++#>+ 1 ++appletproxy_la_OBJECTS = appletproxy_main.lo ++extensionproxy_la_DEPENDENCIES = libextensionproxy_main.la ++am_extensionproxy_la_OBJECTS = extensionproxy_main.lo + #>- extensionproxy_la_OBJECTS = $(am_extensionproxy_la_OBJECTS) ++#>+ 1 ++extensionproxy_la_OBJECTS = extensionproxy_main.lo ++libappletproxy_main_la_DEPENDENCIES = ../share/libkickermain.la ++am_libappletproxy_main_la_OBJECTS = appletproxy.lo ++#>- libappletproxy_main_la_OBJECTS = $(am_libappletproxy_main_la_OBJECTS) ++#>+ 5 ++libappletproxy_main_la_final_OBJECTS = libappletproxy_main_la.all_cpp.lo ++libappletproxy_main_la_nofinal_OBJECTS = appletproxy.lo \ ++ libappletproxy_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libappletproxy_main_la_OBJECTS = $(libappletproxy_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libappletproxy_main_la_OBJECTS = $(libappletproxy_main_la_final_OBJECTS) ++libextensionproxy_main_la_DEPENDENCIES = ../share/libkickermain.la ++am_libextensionproxy_main_la_OBJECTS = extensionproxy.lo ++#>- libextensionproxy_main_la_OBJECTS = \ ++#>- $(am_libextensionproxy_main_la_OBJECTS) + #>+ 5 +-extensionproxy_la_final_OBJECTS = extensionproxy_la.all_cpp.lo +-extensionproxy_la_nofinal_OBJECTS = extensionproxy.lo \ +- extensionproxy_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@extensionproxy_la_OBJECTS = $(extensionproxy_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@extensionproxy_la_OBJECTS = $(extensionproxy_la_final_OBJECTS) ++libextensionproxy_main_la_final_OBJECTS = libextensionproxy_main_la.all_cpp.lo ++libextensionproxy_main_la_nofinal_OBJECTS = extensionproxy.lo \ ++ libextensionproxy_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libextensionproxy_main_la_OBJECTS = $(libextensionproxy_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libextensionproxy_main_la_OBJECTS = $(libextensionproxy_main_la_final_OBJECTS) + bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_appletproxy_OBJECTS = dummy.$(OBJEXT) ++am_appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) + #>- appletproxy_OBJECTS = $(am_appletproxy_OBJECTS) + #>+ 1 +-appletproxy_OBJECTS = dummy.$(OBJEXT) +-appletproxy_DEPENDENCIES = appletproxy.la +-am_extensionproxy_OBJECTS = dummy.$(OBJEXT) ++appletproxy_OBJECTS = appletproxy_main.$(OBJEXT) ++appletproxy_DEPENDENCIES = libappletproxy_main.la ++am_extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) + #>- extensionproxy_OBJECTS = $(am_extensionproxy_OBJECTS) + #>+ 1 +-extensionproxy_OBJECTS = dummy.$(OBJEXT) +-extensionproxy_DEPENDENCIES = extensionproxy.la ++extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT) ++extensionproxy_DEPENDENCIES = libextensionproxy_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -357,8 +376,12 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo $(DEPDIR)/dummy.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/appletproxy.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/appletproxy_main.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/extensionproxy_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -379,11 +402,13 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \ +- $(appletproxy_SOURCES) $(extensionproxy_SOURCES) ++ $(libappletproxy_main_la_SOURCES) \ ++ $(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) \ ++ $(extensionproxy_SOURCES) + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) ++SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(libappletproxy_main_la_SOURCES) $(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -434,6 +459,10 @@ + $(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS) + extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS) ++libappletproxy_main.la: $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libappletproxy_main_la_LDFLAGS) $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_LIBADD) $(LIBS) ++libextensionproxy_main.la: $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libextensionproxy_main_la_LDFLAGS) $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -472,8 +501,11 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/appletproxy_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extensionproxy_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -576,7 +608,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -646,9 +677,6 @@ + messages: + $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot + $(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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: +@@ -676,41 +704,41 @@ + + + #>+ 12 +-appletproxy_la_meta_unload.cpp: appletproxy.moc +- @echo 'creating appletproxy_la_meta_unload.cpp' +- @-rm -f appletproxy_la_meta_unload.cpp ++libappletproxy_main_la_meta_unload.cpp: appletproxy.moc ++ @echo 'creating libappletproxy_main_la_meta_unload.cpp' ++ @-rm -f libappletproxy_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_appletproxy_la[] = {' > appletproxy_la_meta_unload.cpp ;\ +- cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> appletproxy_la_meta_unload.cpp ;\ +- echo '0};' >> appletproxy_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> appletproxy_la_meta_unload.cpp ;\ +- echo '_UNLOAD(appletproxy_la)' >> appletproxy_la_meta_unload.cpp ;\ +- else echo > appletproxy_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libappletproxy_main_la[] = {' > libappletproxy_main_la_meta_unload.cpp ;\ ++ cat appletproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libappletproxy_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libappletproxy_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libappletproxy_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libappletproxy_main_la)' >> libappletproxy_main_la_meta_unload.cpp ;\ ++ else echo > libappletproxy_main_la_meta_unload.cpp; fi + + + #>+ 12 +-extensionproxy_la_meta_unload.cpp: extensionproxy.moc +- @echo 'creating extensionproxy_la_meta_unload.cpp' +- @-rm -f extensionproxy_la_meta_unload.cpp ++libextensionproxy_main_la_meta_unload.cpp: extensionproxy.moc ++ @echo 'creating libextensionproxy_main_la_meta_unload.cpp' ++ @-rm -f libextensionproxy_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_extensionproxy_la[] = {' > extensionproxy_la_meta_unload.cpp ;\ +- cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> extensionproxy_la_meta_unload.cpp ;\ +- echo '0};' >> extensionproxy_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> extensionproxy_la_meta_unload.cpp ;\ +- echo '_UNLOAD(extensionproxy_la)' >> extensionproxy_la_meta_unload.cpp ;\ +- else echo > extensionproxy_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libextensionproxy_main_la[] = {' > libextensionproxy_main_la_meta_unload.cpp ;\ ++ cat extensionproxy.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libextensionproxy_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libextensionproxy_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libextensionproxy_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libextensionproxy_main_la)' >> libextensionproxy_main_la_meta_unload.cpp ;\ ++ else echo > libextensionproxy_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f appletproxy_la_meta_unload.cpp extensionproxy_la_meta_unload.cpp ++ -rm -f libappletproxy_main_la_meta_unload.cpp libextensionproxy_main_la_meta_unload.cpp + + #>+ 11 +-appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp appletproxy_la_meta_unload.cpp appletproxy.moc ++appletproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp + @echo 'creating appletproxy_la.all_cpp.cpp ...'; \ + rm -f appletproxy_la.all_cpp.files appletproxy_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> appletproxy_la.all_cpp.final; \ +- for file in appletproxy.cpp appletproxy_la_meta_unload.cpp ; do \ ++ for file in appletproxy_main.cpp ; do \ + echo "#include \"$$file\"" >> appletproxy_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy_la.all_cpp.final; \ + done; \ +@@ -718,11 +746,11 @@ + rm -f appletproxy_la.all_cpp.final appletproxy_la.all_cpp.files + + #>+ 11 +-extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp extensionproxy_la_meta_unload.cpp extensionproxy.moc ++extensionproxy_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp + @echo 'creating extensionproxy_la.all_cpp.cpp ...'; \ + rm -f extensionproxy_la.all_cpp.files extensionproxy_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> extensionproxy_la.all_cpp.final; \ +- for file in extensionproxy.cpp extensionproxy_la_meta_unload.cpp ; do \ ++ for file in extensionproxy_main.cpp ; do \ + echo "#include \"$$file\"" >> extensionproxy_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy_la.all_cpp.final; \ + done; \ +@@ -730,11 +758,35 @@ + rm -f extensionproxy_la.all_cpp.final extensionproxy_la.all_cpp.files + + #>+ 11 +-appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libappletproxy_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy.cpp libappletproxy_main_la_meta_unload.cpp appletproxy.moc ++ @echo 'creating libappletproxy_main_la.all_cpp.cpp ...'; \ ++ rm -f libappletproxy_main_la.all_cpp.files libappletproxy_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libappletproxy_main_la.all_cpp.final; \ ++ for file in appletproxy.cpp libappletproxy_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libappletproxy_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libappletproxy_main_la.all_cpp.final; \ ++ done; \ ++ cat libappletproxy_main_la.all_cpp.final libappletproxy_main_la.all_cpp.files > libappletproxy_main_la.all_cpp.cpp; \ ++ rm -f libappletproxy_main_la.all_cpp.final libappletproxy_main_la.all_cpp.files ++ ++#>+ 11 ++libextensionproxy_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy.cpp libextensionproxy_main_la_meta_unload.cpp extensionproxy.moc ++ @echo 'creating libextensionproxy_main_la.all_cpp.cpp ...'; \ ++ rm -f libextensionproxy_main_la.all_cpp.files libextensionproxy_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libextensionproxy_main_la.all_cpp.final; \ ++ for file in extensionproxy.cpp libextensionproxy_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libextensionproxy_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libextensionproxy_main_la.all_cpp.final; \ ++ done; \ ++ cat libextensionproxy_main_la.all_cpp.final libextensionproxy_main_la.all_cpp.files > libextensionproxy_main_la.all_cpp.cpp; \ ++ rm -f libextensionproxy_main_la.all_cpp.final libextensionproxy_main_la.all_cpp.files ++ ++#>+ 11 ++appletproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/appletproxy_main.cpp + @echo 'creating appletproxy.all_cpp.cpp ...'; \ + rm -f appletproxy.all_cpp.files appletproxy.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> appletproxy.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in appletproxy_main.cpp ; do \ + echo "#include \"$$file\"" >> appletproxy.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> appletproxy.all_cpp.final; \ + done; \ +@@ -742,11 +794,11 @@ + rm -f appletproxy.all_cpp.final appletproxy.all_cpp.files + + #>+ 11 +-extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++extensionproxy.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/extensionproxy_main.cpp + @echo 'creating extensionproxy.all_cpp.cpp ...'; \ + rm -f extensionproxy.all_cpp.files extensionproxy.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> extensionproxy.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in extensionproxy_main.cpp ; do \ + echo "#include \"$$file\"" >> extensionproxy.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> extensionproxy.all_cpp.final; \ + done; \ +@@ -755,20 +807,20 @@ + + #>+ 3 + clean-final: +- -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp ++ -rm -f appletproxy_la.all_cpp.cpp extensionproxy_la.all_cpp.cpp libappletproxy_main_la.all_cpp.cpp libextensionproxy_main_la.all_cpp.cpp appletproxy.all_cpp.cpp extensionproxy.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" all-am ++ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_final_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_final_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_final_OBJECTS)" install-am ++ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_final_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_nofinal_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) appletproxy_la_OBJECTS="$(appletproxy_la_nofinal_OBJECTS)" extensionproxy_la_OBJECTS="$(extensionproxy_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libappletproxy_main_la_OBJECTS="$(libappletproxy_main_la_nofinal_OBJECTS)" libextensionproxy_main_la_OBJECTS="$(libextensionproxy_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-bt b/x11/kdebase3/patches/patch-bt new file mode 100644 index 00000000000..1bf274ffd96 --- /dev/null +++ b/x11/kdebase3/patches/patch-bt @@ -0,0 +1,15 @@ +$NetBSD: patch-bt,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/appletproxy.cpp.orig Wed May 8 19:21:58 2002 ++++ kicker/proxy/appletproxy.cpp +@@ -67,7 +67,9 @@ + { 0, 0, 0} + }; + +-int main( int argc, char ** argv ) ++extern "C" int kdemain( int, char **); ++ ++int kdemain( int argc, char ** argv ) + { + KAboutData aboutData( "appletproxy", I18N_NOOP("Panel applet proxy.") + , "v0.1.0" diff --git a/x11/kdebase3/patches/patch-bu b/x11/kdebase3/patches/patch-bu new file mode 100644 index 00000000000..7f09b8dde46 --- /dev/null +++ b/x11/kdebase3/patches/patch-bu @@ -0,0 +1,33 @@ +$NetBSD: patch-bu,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/appletproxy_main.cpp.orig Thu May 30 09:59:50 2002 ++++ kicker/proxy/appletproxy_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-bv b/x11/kdebase3/patches/patch-bv new file mode 100644 index 00000000000..7a97a701f42 --- /dev/null +++ b/x11/kdebase3/patches/patch-bv @@ -0,0 +1,15 @@ +$NetBSD: patch-bv,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/extensionproxy.cpp.orig Wed May 8 19:21:58 2002 ++++ kicker/proxy/extensionproxy.cpp +@@ -54,7 +54,9 @@ + { 0, 0, 0} + }; + +-int main( int argc, char ** argv ) ++extern "C" int kdemain( int, char **); ++ ++int kdemain( int argc, char ** argv ) + { + KAboutData aboutData( "extensionproxy", I18N_NOOP("Panel extension proxy.") + , "v0.1.0" diff --git a/x11/kdebase3/patches/patch-bw b/x11/kdebase3/patches/patch-bw new file mode 100644 index 00000000000..7896239388e --- /dev/null +++ b/x11/kdebase3/patches/patch-bw @@ -0,0 +1,33 @@ +$NetBSD: patch-bw,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kicker/proxy/extensionproxy_main.cpp.orig Thu May 30 09:59:50 2002 ++++ kicker/proxy/extensionproxy_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-bx b/x11/kdebase3/patches/patch-bx new file mode 100644 index 00000000000..2d9e02ebde7 --- /dev/null +++ b/x11/kdebase3/patches/patch-bx @@ -0,0 +1,12 @@ +$NetBSD: patch-bx,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kioslave/info/kde-info2html.conf.orig Wed Aug 2 11:07:17 2000 ++++ kioslave/info/kde-info2html.conf +@@ -22,6 +22,7 @@ + "/usr/share/info", + "/usr/lib/info", + # "/usr/lib/teTeX/info", ++ "/usr/pkg/info", + "/usr/local/info", + "/usr/local/lib/info", + "/usr/X11R6/info", diff --git a/x11/kdebase3/patches/patch-by b/x11/kdebase3/patches/patch-by new file mode 100644 index 00000000000..63a14655c70 --- /dev/null +++ b/x11/kdebase3/patches/patch-by @@ -0,0 +1,40 @@ +$NetBSD: patch-by,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- klipper/Makefile.am.orig Fri Mar 1 09:59:20 2002 ++++ klipper/Makefile.am +@@ -1,25 +1,26 @@ + INCLUDES= $(all_includes) + + bin_PROGRAMS = klipper +-lib_LTLIBRARIES = klipper.la ++lib_LTLIBRARIES = libklipper_main.la klipper.la + kde_module_LTLIBRARIES = klipper_panelapplet.la + +-CLEANFILES = dummy.cpp ++libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel + +-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel ++libklipper_main_la_METASOURCES = AUTO ++libklipper_main_la_LDFLAGS = $(all_libraries) + +-klipper_la_METASOURCES = AUTO ++klipper_la_LIBADD = libklipper_main.la ++klipper_la_SOURCES = klipper_main.cpp + klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-klipper_LDADD = klipper.la $(LIB_KSYCOCA) +-klipper_SOURCES = dummy.cpp ++klipper_LDADD = libklipper_main.la ++klipper_SOURCES = klipper_main.cpp + klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-klipper_panelapplet_la_LIBADD = klipper.la ++klipper_panelapplet_la_LIBADD = libklipper_main.la + klipper_panelapplet_la_SOURCES = applet.cpp + klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version +- + + appsdir = $(kde_appsdir)/Utilities + apps_DATA = klipper.desktop diff --git a/x11/kdebase3/patches/patch-bz b/x11/kdebase3/patches/patch-bz new file mode 100644 index 00000000000..d50a56373bd --- /dev/null +++ b/x11/kdebase3/patches/patch-bz @@ -0,0 +1,260 @@ +$NetBSD: patch-bz,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- klipper/Makefile.in.orig Mon May 13 23:57:48 2002 ++++ klipper/Makefile.in +@@ -290,24 +290,26 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = klipper +-lib_LTLIBRARIES = klipper.la ++lib_LTLIBRARIES = libklipper_main.la klipper.la + kde_module_LTLIBRARIES = klipper_panelapplet.la + +-CLEANFILES = dummy.cpp +- +-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) +-#>- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel ++libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA) ++#>- libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel + #>+ 1 +-klipper_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ++libklipper_main_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp ++ ++#>- libklipper_main_la_METASOURCES = AUTO ++libklipper_main_la_LDFLAGS = $(all_libraries) + +-#>- klipper_la_METASOURCES = AUTO ++klipper_la_LIBADD = libklipper_main.la ++klipper_la_SOURCES = klipper_main.cpp + klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-klipper_LDADD = klipper.la $(LIB_KSYCOCA) +-klipper_SOURCES = dummy.cpp ++klipper_LDADD = libklipper_main.la ++klipper_SOURCES = klipper_main.cpp + klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +-klipper_panelapplet_la_LIBADD = klipper.la ++klipper_panelapplet_la_LIBADD = libklipper_main.la + klipper_panelapplet_la_SOURCES = applet.cpp + klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version + +@@ -333,18 +335,12 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) + +-klipper_la_DEPENDENCIES = +-am_klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ +- configdialog.lo ++klipper_la_DEPENDENCIES = libklipper_main.la ++am_klipper_la_OBJECTS = klipper_main.lo + #>- klipper_la_OBJECTS = $(am_klipper_la_OBJECTS) +-#>+ 6 +-klipper_la_final_OBJECTS = klipper_la.all_cpp.lo +-klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ +- configdialog.lo toplevel_skel.lo \ +- klipper_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS) +-klipper_panelapplet_la_DEPENDENCIES = klipper.la ++#>+ 1 ++klipper_la_OBJECTS = klipper_main.lo ++klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la + am_klipper_panelapplet_la_OBJECTS = applet.lo + #>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS) + #>+ 5 +@@ -353,14 +349,25 @@ + klipper_panelapplet_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@klipper_panelapplet_la_OBJECTS = $(klipper_panelapplet_la_final_OBJECTS) ++libklipper_main_la_DEPENDENCIES = ++am_libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ ++ configdialog.lo ++#>- libklipper_main_la_OBJECTS = $(am_libklipper_main_la_OBJECTS) ++#>+ 6 ++libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo ++libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \ ++ configdialog.lo toplevel_skel.lo \ ++ libklipper_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS) + bin_PROGRAMS = klipper$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_klipper_OBJECTS = dummy.$(OBJEXT) ++am_klipper_OBJECTS = klipper_main.$(OBJEXT) + #>- klipper_OBJECTS = $(am_klipper_OBJECTS) + #>+ 1 +-klipper_OBJECTS = dummy.$(OBJEXT) +-klipper_DEPENDENCIES = klipper.la ++klipper_OBJECTS = klipper_main.$(OBJEXT) ++klipper_DEPENDENCIES = libklipper_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -369,7 +376,8 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -391,12 +399,12 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \ +- $(klipper_SOURCES) ++ $(libklipper_main_la_SOURCES) $(klipper_SOURCES) + DATA = $(appl_DATA) $(apps_DATA) $(autostart_DATA) $(dockicon_DATA) \ + $(update_DATA) + + DIST_COMMON = Makefile.am Makefile.in +-SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(klipper_SOURCES) ++SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_main_la_SOURCES) $(klipper_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -466,6 +474,8 @@ + $(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS) + klipper_panelapplet.la: $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_DEPENDENCIES) + $(CXXLINK) -rpath $(kde_moduledir) $(klipper_panelapplet_la_LDFLAGS) $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_LIBADD) $(LIBS) ++libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -502,7 +512,8 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/applet.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/configdialog.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/toplevel.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/urlgrabber.Plo@am__quote@ +@@ -649,7 +660,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=applet.h hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop klipperrc.desktop klipper_dock.png hi48-app-klipper.png version.h configdialog.h ++KDE_DIST=applet.h klipper_dock.png hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp version.h configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -698,7 +709,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -863,19 +873,6 @@ + + + #>+ 12 +-klipper_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc +- @echo 'creating klipper_la_meta_unload.cpp' +- @-rm -f klipper_la_meta_unload.cpp +- @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp ;\ +- cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp ;\ +- echo '0};' >> klipper_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp ;\ +- echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp ;\ +- else echo > klipper_la_meta_unload.cpp; fi +- +- +-#>+ 12 + klipper_panelapplet_la_meta_unload.cpp: applet.moc + @echo 'creating klipper_panelapplet_la_meta_unload.cpp' + @-rm -f klipper_panelapplet_la_meta_unload.cpp +@@ -888,16 +885,29 @@ + else echo > klipper_panelapplet_la_meta_unload.cpp; fi + + ++#>+ 12 ++libklipper_main_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc ++ @echo 'creating libklipper_main_la_meta_unload.cpp' ++ @-rm -f libklipper_main_la_meta_unload.cpp ++ @if test ${kde_qtver} = 2; then \ ++ echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp ;\ ++ cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp ;\ ++ else echo > libklipper_main_la_meta_unload.cpp; fi ++ ++ + #>+ 3 + clean-moc-classes: +- -rm -f klipper_la_meta_unload.cpp klipper_panelapplet_la_meta_unload.cpp ++ -rm -f klipper_panelapplet_la_meta_unload.cpp libklipper_main_la_meta_unload.cpp + + #>+ 11 +-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp klipper_la_meta_unload.cpp urlgrabber.moc toplevel.moc applet.moc configdialog.moc ++klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp + @echo 'creating klipper_la.all_cpp.cpp ...'; \ + rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \ +- for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp klipper_la_meta_unload.cpp ; do \ ++ for file in klipper_main.cpp ; do \ + echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \ + done; \ +@@ -917,11 +927,23 @@ + rm -f klipper_panelapplet_la.all_cpp.final klipper_panelapplet_la.all_cpp.files + + #>+ 11 +-klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp libklipper_main_la_meta_unload.cpp urlgrabber.moc toplevel.moc applet.moc configdialog.moc ++ @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \ ++ rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \ ++ for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp libklipper_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \ ++ done; \ ++ cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \ ++ rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files ++ ++#>+ 11 ++klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp + @echo 'creating klipper.all_cpp.cpp ...'; \ + rm -f klipper.all_cpp.files klipper.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> klipper.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in klipper_main.cpp ; do \ + echo "#include \"$$file\"" >> klipper.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \ + done; \ +@@ -930,20 +952,20 @@ + + #>+ 3 + clean-final: +- -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp klipper.all_cpp.cpp ++ -rm -f klipper_la.all_cpp.cpp klipper_panelapplet_la.all_cpp.cpp libklipper_main_la.all_cpp.cpp klipper.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" all-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" install-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_final_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" all-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" install-am ++ $(MAKE) klipper_panelapplet_la_OBJECTS="$(klipper_panelapplet_la_nofinal_OBJECTS)" libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ca b/x11/kdebase3/patches/patch-ca new file mode 100644 index 00000000000..2504ecb4d7a --- /dev/null +++ b/x11/kdebase3/patches/patch-ca @@ -0,0 +1,33 @@ +$NetBSD: patch-ca,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- klipper/klipper_main.cpp.orig Thu May 30 09:59:52 2002 ++++ klipper/klipper_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cb b/x11/kdebase3/patches/patch-cb new file mode 100644 index 00000000000..9cd640a4f8d --- /dev/null +++ b/x11/kdebase3/patches/patch-cb @@ -0,0 +1,15 @@ +$NetBSD: patch-cb,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- klipper/main.cpp.orig Wed Feb 20 21:50:04 2002 ++++ klipper/main.cpp +@@ -23,7 +23,9 @@ + static const char *description = + I18N_NOOP("KDE Cut & Paste history utility"); + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData aboutData("klipper", I18N_NOOP("Klipper"), + klipper_version, description, KAboutData::License_Artistic, diff --git a/x11/kdebase3/patches/patch-cc b/x11/kdebase3/patches/patch-cc new file mode 100644 index 00000000000..2edd78934ef --- /dev/null +++ b/x11/kdebase3/patches/patch-cc @@ -0,0 +1,30 @@ +$NetBSD: patch-cc,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kmenuedit/Makefile.am.orig Thu Jun 7 15:26:30 2001 ++++ kmenuedit/Makefile.am +@@ -1,17 +1,18 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmenuedit +-lib_LTLIBRARIES = kmenuedit.la ++lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la + +-CLEANFILES = dummy.cpp ++libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libkmenuedit_main_la_LDFLAGS = $(all_libraries) + +-kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp +- +-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++kmenuedit_la_SOURCES = kmenuedit_main.cpp ++kmenuedit_la_LIBADD = libkmenuedit_main.la + kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmenuedit_SOURCES = dummy.cpp +-kmenuedit_LDADD = kmenuedit.la ++kmenuedit_SOURCES = kmenuedit_main.cpp ++kmenuedit_LDADD = libkmenuedit_main.la + kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h diff --git a/x11/kdebase3/patches/patch-cd b/x11/kdebase3/patches/patch-cd new file mode 100644 index 00000000000..925ccd838f3 --- /dev/null +++ b/x11/kdebase3/patches/patch-cd @@ -0,0 +1,240 @@ +$NetBSD: patch-cd,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kmenuedit/Makefile.in.orig Mon May 13 23:57:48 2002 ++++ kmenuedit/Makefile.in +@@ -290,17 +290,18 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = kmenuedit +-lib_LTLIBRARIES = kmenuedit.la ++lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la + +-CLEANFILES = dummy.cpp ++libkmenuedit_main_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ++libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libkmenuedit_main_la_LDFLAGS = $(all_libraries) + +-kmenuedit_la_SOURCES = namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp +- +-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++kmenuedit_la_SOURCES = kmenuedit_main.cpp ++kmenuedit_la_LIBADD = libkmenuedit_main.la + kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-kmenuedit_SOURCES = dummy.cpp +-kmenuedit_LDADD = kmenuedit.la ++kmenuedit_SOURCES = kmenuedit_main.cpp ++kmenuedit_LDADD = libkmenuedit_main.la + kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h namedlg.h khotkeys.h +@@ -324,27 +325,32 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kmenuedit_la_DEPENDENCIES = +-am_kmenuedit_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ ++kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la ++am_kmenuedit_la_OBJECTS = kmenuedit_main.lo ++#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) ++#>+ 1 ++kmenuedit_la_OBJECTS = kmenuedit_main.lo ++libkmenuedit_main_la_DEPENDENCIES = ++am_libkmenuedit_main_la_OBJECTS = namedlg.lo basictab.lo treeview.lo \ + desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ + khotkeys.lo +-#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS) ++#>- libkmenuedit_main_la_OBJECTS = $(am_libkmenuedit_main_la_OBJECTS) + #>+ 7 +-kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo +-kmenuedit_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ ++libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo ++libkmenuedit_main_la_nofinal_OBJECTS = namedlg.lo basictab.lo treeview.lo \ + desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \ + khotkeys.lo \ +- kmenuedit_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS) ++ libkmenuedit_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS) + bin_PROGRAMS = kmenuedit$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kmenuedit_OBJECTS = dummy.$(OBJEXT) ++am_kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) + #>- kmenuedit_OBJECTS = $(am_kmenuedit_OBJECTS) + #>+ 1 +-kmenuedit_OBJECTS = dummy.$(OBJEXT) +-kmenuedit_DEPENDENCIES = kmenuedit.la ++kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT) ++kmenuedit_DEPENDENCIES = libkmenuedit_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -353,10 +359,12 @@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/basictab.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo $(DEPDIR)/dummy.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/desktopfileeditor.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/khotkeys.Plo $(DEPDIR)/kmenuedit.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/menueditview.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/namedlg.Plo $(DEPDIR)/treeview.Plo ++ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kmenuedit_main.Po $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/menueditview.Plo $(DEPDIR)/namedlg.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/treeview.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -376,7 +384,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) ++DIST_SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) \ ++ $(kmenuedit_SOURCES) + DATA = $(apps_DATA) $(rc_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -388,7 +397,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES) ++SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) $(kmenuedit_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -437,6 +446,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS) ++libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -473,9 +484,10 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basictab.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/desktopfileeditor.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/khotkeys.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmenuedit_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/menueditview.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/namedlg.Plo@am__quote@ +@@ -632,7 +644,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kmenueditui.rc hi32-app-kmenuedit.png hi16-app-kmenuedit.png kmenuedit.desktop hi48-app-kmenuedit.png ++KDE_DIST=hi32-app-kmenuedit.png kmenuedit.desktop hi16-app-kmenuedit.png kmenueditui.rc hi48-app-kmenuedit.png + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -694,7 +706,6 @@ + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -833,28 +844,28 @@ + + + #>+ 12 +-kmenuedit_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc +- @echo 'creating kmenuedit_la_meta_unload.cpp' +- @-rm -f kmenuedit_la_meta_unload.cpp ++libkmenuedit_main_la_meta_unload.cpp: basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc ++ @echo 'creating libkmenuedit_main_la_meta_unload.cpp' ++ @-rm -f libkmenuedit_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kmenuedit_la[] = {' > kmenuedit_la_meta_unload.cpp ;\ +- cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kmenuedit_la_meta_unload.cpp ;\ +- echo '0};' >> kmenuedit_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kmenuedit_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kmenuedit_la)' >> kmenuedit_la_meta_unload.cpp ;\ +- else echo > kmenuedit_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkmenuedit_main_la[] = {' > libkmenuedit_main_la_meta_unload.cpp ;\ ++ cat basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkmenuedit_main_la)' >> libkmenuedit_main_la_meta_unload.cpp ;\ ++ else echo > libkmenuedit_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kmenuedit_la_meta_unload.cpp ++ -rm -f libkmenuedit_main_la_meta_unload.cpp + + #>+ 11 +-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp kmenuedit_la_meta_unload.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc ++kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc + @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \ + rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \ +- for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp kmenuedit_la_meta_unload.cpp ; do \ ++ for file in kmenuedit_main.cpp ; do \ + echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \ + done; \ +@@ -862,11 +873,23 @@ + rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files + + #>+ 11 +-kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/namedlg.cpp $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ++ @echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \ ++ rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \ ++ for file in namedlg.cpp basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp libkmenuedit_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \ ++ done; \ ++ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \ ++ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files ++ ++#>+ 11 ++kmenuedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmenuedit_main.cpp + @echo 'creating kmenuedit.all_cpp.cpp ...'; \ + rm -f kmenuedit.all_cpp.files kmenuedit.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kmenuedit.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kmenuedit_main.cpp ; do \ + echo "#include \"$$file\"" >> kmenuedit.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit.all_cpp.final; \ + done; \ +@@ -875,20 +898,20 @@ + + #>+ 3 + clean-final: +- -rm -f kmenuedit_la.all_cpp.cpp kmenuedit.all_cpp.cpp ++ -rm -f kmenuedit_la.all_cpp.cpp libkmenuedit_main_la.all_cpp.cpp kmenuedit.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ce b/x11/kdebase3/patches/patch-ce new file mode 100644 index 00000000000..92504fca83e --- /dev/null +++ b/x11/kdebase3/patches/patch-ce @@ -0,0 +1,33 @@ +$NetBSD: patch-ce,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kmenuedit/kmenuedit_main.cpp.orig Thu May 30 09:59:53 2002 ++++ kmenuedit/kmenuedit_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cf b/x11/kdebase3/patches/patch-cf new file mode 100644 index 00000000000..10b141748da --- /dev/null +++ b/x11/kdebase3/patches/patch-cf @@ -0,0 +1,15 @@ +$NetBSD: patch-cf,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- kmenuedit/main.cpp.orig Mon Feb 11 20:09:39 2002 ++++ kmenuedit/main.cpp +@@ -31,7 +31,9 @@ + static const char *description = I18N_NOOP("KDE Menu editor"); + static const char *version = "0.4"; + +-int main( int argc, char **argv ) ++extern "C" int kdemain( int argc, char **argv ); ++ ++int kdemain( int argc, char **argv ) + { + KAboutData aboutData("kmenuedit", I18N_NOOP("KDE Menu Editor"), + version, description, KAboutData::License_GPL, diff --git a/x11/kdebase3/patches/patch-cg b/x11/kdebase3/patches/patch-cg new file mode 100644 index 00000000000..9d20d5eb5e0 --- /dev/null +++ b/x11/kdebase3/patches/patch-cg @@ -0,0 +1,51 @@ +$NetBSD: patch-cg,v 1.1.1.1 2002/05/31 13:19:01 skrll Exp $ + +--- konqueror/Makefile.am.orig Wed May 8 19:22:28 2002 ++++ konqueror/Makefile.am +@@ -5,7 +5,7 @@ + #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar + SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar + +-lib_LTLIBRARIES = konqueror.la ++lib_LTLIBRARIES = libkonqueror_main.la konqueror.la + + konqdatadir = $(kde_datadir)/konqueror + konqdata_DATA = konqueror.rc +@@ -22,7 +22,7 @@ + + bin_PROGRAMS = konqueror + +-konqueror_la_SOURCES = konq_main.cc \ ++libkonqueror_main_la_SOURCES = konq_main.cc \ + KonquerorIface.cc KonquerorIface.skel \ + KonqMainWindowIface.cc KonqMainWindowIface.skel \ + KonqViewIface.cc KonqViewIface.skel \ +@@ -37,11 +37,15 @@ + konq_browseriface.cc \ + delayedinitializer.cc + ++libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version ++libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la ++ ++konqueror_la_SOURCES = konqueror_main.cc + konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version +-konqueror_la_LIBADD = ../libkonq/libkonq.la ++konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la + +-konqueror_SOURCES = dummy.cc +-konqueror_LDADD = konqueror.la ++konqueror_SOURCES = konqueror_main.cc ++konqueror_LDADD = libkonqueror_main.la + konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + # Hmm, this experiment of a static konq failed, don't trust it... +@@ -55,9 +59,6 @@ + #konqueror_static_SOURCES = dummy.cc + #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la + #konqueror_static_LDFLAGS = $(all_libraries) -static +- +-dummy.cc: +- echo > dummy.cc + + messages: rc.cpp + $(EXTRACTRC) *.rc */*.rc >> rc.cpp diff --git a/x11/kdebase3/patches/patch-ch b/x11/kdebase3/patches/patch-ch new file mode 100644 index 00000000000..c9310dcce0b --- /dev/null +++ b/x11/kdebase3/patches/patch-ch @@ -0,0 +1,319 @@ +$NetBSD: patch-ch,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/Makefile.in.orig Mon May 13 23:57:50 2002 ++++ konqueror/Makefile.in +@@ -294,7 +294,7 @@ + #SUBDIRS = . kfmexec client iconview dirtree listview keditbookmarks shellcmdplugin about pics sidebar + SUBDIRS = . kfmexec client iconview listview keditbookmarks shellcmdplugin about pics sidebar + +-lib_LTLIBRARIES = konqueror.la ++lib_LTLIBRARIES = libkonqueror_main.la konqueror.la + + konqdatadir = $(kde_datadir)/konqueror + konqdata_DATA = konqueror.rc +@@ -311,7 +311,7 @@ + + bin_PROGRAMS = konqueror + +-#>- konqueror_la_SOURCES = konq_main.cc \ ++#>- libkonqueror_main_la_SOURCES = konq_main.cc \ + #>- KonquerorIface.cc KonquerorIface.skel \ + #>- KonqMainWindowIface.cc KonqMainWindowIface.skel \ + #>- KonqViewIface.cc KonqViewIface.skel \ +@@ -326,7 +326,7 @@ + #>- konq_browseriface.cc \ + #>- delayedinitializer.cc + #>+ 14 +-konqueror_la_SOURCES=konq_main.cc \ ++libkonqueror_main_la_SOURCES=konq_main.cc \ + KonquerorIface.cc \ + KonqMainWindowIface.cc \ + KonqViewIface.cc \ +@@ -342,11 +342,15 @@ + delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc + + ++libkonqueror_main_la_LDFLAGS = $(all_libraries) -module -avoid-version ++libkonqueror_main_la_LIBADD = ../libkonq/libkonq.la ++ ++konqueror_la_SOURCES = konqueror_main.cc + konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version +-konqueror_la_LIBADD = ../libkonq/libkonq.la ++konqueror_la_LIBADD = libkonqueror_main.la ../libkonq/libkonq.la + +-konqueror_SOURCES = dummy.cc +-konqueror_LDADD = konqueror.la ++konqueror_SOURCES = konqueror_main.cc ++konqueror_LDADD = libkonqueror_main.la + konqueror_LDFLAGS = $(KDE_RPATH) $(all_libraries) + + data_DATA = konquerorsu.desktop kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop +@@ -368,33 +372,38 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-konqueror_la_DEPENDENCIES = ../libkonq/libkonq.la +-am_konqueror_la_OBJECTS = konq_main.lo KonquerorIface.lo \ ++konqueror_la_DEPENDENCIES = libkonqueror_main.la ../libkonq/libkonq.la ++am_konqueror_la_OBJECTS = konqueror_main.lo ++#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) ++#>+ 1 ++konqueror_la_OBJECTS = konqueror_main.lo ++libkonqueror_main_la_DEPENDENCIES = ../libkonq/libkonq.la ++am_libkonqueror_main_la_OBJECTS = konq_main.lo KonquerorIface.lo \ + KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ + konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ + konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ + konq_factory.lo konq_combo.lo konq_browseriface.lo \ + delayedinitializer.lo +-#>- konqueror_la_OBJECTS = $(am_konqueror_la_OBJECTS) ++#>- libkonqueror_main_la_OBJECTS = $(am_libkonqueror_main_la_OBJECTS) + #>+ 10 +-konqueror_la_final_OBJECTS = konqueror_la.all_cc.lo +-konqueror_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ ++libkonqueror_main_la_final_OBJECTS = libkonqueror_main_la.all_cc.lo ++libkonqueror_main_la_nofinal_OBJECTS = konq_main.lo KonquerorIface.lo \ + KonqMainWindowIface.lo KonqViewIface.lo konq_mainwindow.lo \ + konq_guiclients.lo konq_run.lo konq_view.lo konq_viewmgr.lo \ + konq_misc.lo konq_frame.lo konq_actions.lo konq_profiledlg.lo \ + konq_factory.lo konq_combo.lo konq_browseriface.lo \ + delayedinitializer.lo KonquerorIface_skel.lo KonqMainWindowIface_skel.lo KonqViewIface_skel.lo \ +- konqueror_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@konqueror_la_OBJECTS = $(konqueror_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@konqueror_la_OBJECTS = $(konqueror_la_final_OBJECTS) ++ libkonqueror_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkonqueror_main_la_OBJECTS = $(libkonqueror_main_la_final_OBJECTS) + bin_PROGRAMS = konqueror$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_konqueror_OBJECTS = dummy.$(OBJEXT) ++am_konqueror_OBJECTS = konqueror_main.$(OBJEXT) + #>- konqueror_OBJECTS = $(am_konqueror_OBJECTS) + #>+ 1 +-konqueror_OBJECTS = dummy.$(OBJEXT) +-konqueror_DEPENDENCIES = konqueror.la ++konqueror_OBJECTS = konqueror_main.$(OBJEXT) ++konqueror_DEPENDENCIES = libkonqueror_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -405,7 +414,7 @@ + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/KonqMainWindowIface.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/KonqViewIface.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/KonquerorIface.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo $(DEPDIR)/dummy.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/delayedinitializer.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konq_actions.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konq_browseriface.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konq_combo.Plo $(DEPDIR)/konq_factory.Plo \ +@@ -416,7 +425,9 @@ + @AMDEP_TRUE@ $(DEPDIR)/konq_misc.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konq_profiledlg.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konq_run.Plo $(DEPDIR)/konq_view.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo ++ @AMDEP_TRUE@ $(DEPDIR)/konq_viewmgr.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/konqueror_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -436,7 +447,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) ++DIST_SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) \ ++ $(konqueror_SOURCES) + DATA = $(data_DATA) $(data2_DATA) $(data3_DATA) $(data4_DATA) \ + $(kdelnk_DATA) $(konqdata_DATA) + +@@ -450,7 +462,7 @@ + DIST_COMMON = $(include_HEADERS) AUTHORS ChangeLog Makefile.am \ + Makefile.in TODO + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(konqueror_la_SOURCES) $(konqueror_SOURCES) ++SOURCES = $(konqueror_la_SOURCES) $(libkonqueror_main_la_SOURCES) $(konqueror_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -499,6 +511,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + konqueror.la: $(konqueror_la_OBJECTS) $(konqueror_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(konqueror_la_LDFLAGS) $(konqueror_la_OBJECTS) $(konqueror_la_LIBADD) $(LIBS) ++libkonqueror_main.la: $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkonqueror_main_la_LDFLAGS) $(libkonqueror_main_la_OBJECTS) $(libkonqueror_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -537,7 +551,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonqViewIface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/KonquerorIface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/delayedinitializer.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_actions.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_browseriface.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_combo.Plo@am__quote@ +@@ -551,6 +564,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_run.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_view.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konq_viewmgr.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konqueror_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konqueror_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -788,7 +803,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=konq_misc.h konq_browseriface.h DESIGN_config delayedinitializer.cc konq_viewmgr.h konq_mainwindow.h kfmclient_dir.desktop kfmclient_html.desktop kfmclient.desktop konq_view.h konq_actions.h konq_guiclients.cc Home.desktop konq_profiledlg.h DESIGN convert_kdelnk.sh profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror.rc profile_filemanagement.desktop konq_misc.cc konq_frame.cc KonqMainWindowIface.cc IDEAS konqueror.desktop konq_run.cc konq_run.h konq_main.h konquerorsu.desktop KonqViewIface.cc konq_viewmgr.cc konqfilemgr.desktop delayedinitializer.h konqbrowser.desktop konq_actions.cc konq_profiledlg.cc konq_factory.cc profile_filepreview.desktop KonquerorIface.cc konq_openurlrequest.h profile_webbrowsing.desktop konq_view.cc konqueror_config.desktop konq_guiclients.h konq_mainwindow.cc KonqMainWindowIface.h konq_frame.h konq_factory.h version.h konq_combo.h KonqViewIface.h ++KDE_DIST=konq_viewmgr.cc DESIGN konqfilemgr.desktop convert_kdelnk.sh konq_misc.h konq_view.cc konq_browseriface.h delayedinitializer.h DESIGN_config profile_midnightcommander.desktop konq_browseriface.cc konq_combo.cc konqueror_config.desktop konqueror.rc konqbrowser.desktop delayedinitializer.cc konq_guiclients.h konq_viewmgr.h profile_filemanagement.desktop konq_mainwindow.h kfmclient_dir.desktop konq_misc.cc kfmclient_html.desktop kfmclient.desktop konq_view.h konq_mainwindow.cc konq_actions.cc konq_frame.cc konq_actions.h KonqMainWindowIface.cc KonqMainWindowIface.h IDEAS konqueror.desktop konq_frame.h konq_profiledlg.cc konq_factory.h konq_run.cc version.h konq_run.h konq_factory.cc konq_combo.h konq_main.h konq_guiclients.cc profile_filepreview.desktop Home.desktop KonquerorIface.cc konquerorsu.desktop KonqViewIface.cc konq_profiledlg.h konq_openurlrequest.h profile_webbrowsing.desktop KonqViewIface.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -946,9 +961,6 @@ + #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la + #konqueror_static_LDFLAGS = $(all_libraries) -static + +-dummy.cc: +- echo > dummy.cc +- + messages: rc.cpp + $(EXTRACTRC) *.rc */*.rc >> rc.cpp + $(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp +@@ -977,20 +989,6 @@ + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + +-#>+ 13 +-KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) +-KonquerorIface_skel.cc: KonquerorIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl +-KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) +-KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl +-KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) +-KonqViewIface_skel.cc: KonqViewIface.kidl +- $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl +- + #>+ 3 + konq_view.moc: $(srcdir)/konq_view.h + $(MOC) $(srcdir)/konq_view.h -o konq_view.moc +@@ -1035,6 +1033,20 @@ + konq_frame.moc: $(srcdir)/konq_frame.h + $(MOC) $(srcdir)/konq_frame.h -o konq_frame.moc + ++#>+ 13 ++KonquerorIface.kidl: $(srcdir)/KonquerorIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) ++KonquerorIface_skel.cc: KonquerorIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonquerorIface.kidl ++KonqMainWindowIface.kidl: $(srcdir)/KonqMainWindowIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KonqMainWindowIface.h > KonqMainWindowIface.kidl || ( rm -f KonqMainWindowIface.kidl ; /bin/false ) ++KonqMainWindowIface_skel.cc: KonqMainWindowIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqMainWindowIface.kidl ++KonqViewIface.kidl: $(srcdir)/KonqViewIface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KonqViewIface.h > KonqViewIface.kidl || ( rm -f KonqViewIface.kidl ; /bin/false ) ++KonqViewIface_skel.cc: KonqViewIface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-stub KonqViewIface.kidl ++ + #>+ 3 + clean-metasources: + -rm -f konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc +@@ -1057,28 +1069,28 @@ + + + #>+ 12 +-konqueror_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc +- @echo 'creating konqueror_la_meta_unload.cc' +- @-rm -f konqueror_la_meta_unload.cc ++libkonqueror_main_la_meta_unload.cc: konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc ++ @echo 'creating libkonqueror_main_la_meta_unload.cc' ++ @-rm -f libkonqueror_main_la_meta_unload.cc + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_konqueror_la[] = {' > konqueror_la_meta_unload.cc ;\ +- cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konqueror_la_meta_unload.cc ;\ +- echo '0};' >> konqueror_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> konqueror_la_meta_unload.cc ;\ +- echo '_UNLOAD(konqueror_la)' >> konqueror_la_meta_unload.cc ;\ +- else echo > konqueror_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkonqueror_main_la[] = {' > libkonqueror_main_la_meta_unload.cc ;\ ++ cat konq_view.moc konq_browseriface.moc konq_profiledlg.moc konq_mainwindow.moc delayedinitializer.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_frame.moc konq_run.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkonqueror_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkonqueror_main_la)' >> libkonqueror_main_la_meta_unload.cc ;\ ++ else echo > libkonqueror_main_la_meta_unload.cc; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f konqueror_la_meta_unload.cc ++ -rm -f libkonqueror_main_la_meta_unload.cc + + #>+ 11 +-konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc ++konqueror_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc konq_view.moc konq_browseriface.moc delayedinitializer.moc konq_mainwindow.moc konq_profiledlg.moc konq_viewmgr.moc konq_actions.moc konq_combo.moc konq_guiclients.moc konq_run.moc konq_frame.moc + @echo 'creating konqueror_la.all_cc.cc ...'; \ + rm -f konqueror_la.all_cc.files konqueror_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> konqueror_la.all_cc.final; \ +- for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc konqueror_la_meta_unload.cc ; do \ ++ for file in konqueror_main.cc ; do \ + echo "#include \"$$file\"" >> konqueror_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror_la.all_cc.final; \ + done; \ +@@ -1086,11 +1098,23 @@ + rm -f konqueror_la.all_cc.final konqueror_la.all_cc.files + + #>+ 11 +-konqueror.all_cc.cc: $(srcdir)/Makefile.in dummy.cc ++libkonqueror_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konq_main.cc $(srcdir)/KonquerorIface.cc $(srcdir)/KonqMainWindowIface.cc $(srcdir)/KonqViewIface.cc $(srcdir)/konq_mainwindow.cc $(srcdir)/konq_guiclients.cc $(srcdir)/konq_run.cc $(srcdir)/konq_view.cc $(srcdir)/konq_viewmgr.cc $(srcdir)/konq_misc.cc $(srcdir)/konq_frame.cc $(srcdir)/konq_actions.cc $(srcdir)/konq_profiledlg.cc $(srcdir)/konq_factory.cc $(srcdir)/konq_combo.cc $(srcdir)/konq_browseriface.cc $(srcdir)/delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ++ @echo 'creating libkonqueror_main_la.all_cc.cc ...'; \ ++ rm -f libkonqueror_main_la.all_cc.files libkonqueror_main_la.all_cc.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkonqueror_main_la.all_cc.final; \ ++ for file in konq_main.cc KonquerorIface.cc KonqMainWindowIface.cc KonqViewIface.cc konq_mainwindow.cc konq_guiclients.cc konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc konq_frame.cc konq_actions.cc konq_profiledlg.cc konq_factory.cc konq_combo.cc konq_browseriface.cc delayedinitializer.cc KonquerorIface_skel.cc KonqMainWindowIface_skel.cc KonqViewIface_skel.cc libkonqueror_main_la_meta_unload.cc ; do \ ++ echo "#include \"$$file\"" >> libkonqueror_main_la.all_cc.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonqueror_main_la.all_cc.final; \ ++ done; \ ++ cat libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files > libkonqueror_main_la.all_cc.cc; \ ++ rm -f libkonqueror_main_la.all_cc.final libkonqueror_main_la.all_cc.files ++ ++#>+ 11 ++konqueror.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/konqueror_main.cc + @echo 'creating konqueror.all_cc.cc ...'; \ + rm -f konqueror.all_cc.files konqueror.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> konqueror.all_cc.final; \ +- for file in dummy.cc ; do \ ++ for file in konqueror_main.cc ; do \ + echo "#include \"$$file\"" >> konqueror.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konqueror.all_cc.final; \ + done; \ +@@ -1099,20 +1123,20 @@ + + #>+ 3 + clean-final: +- -rm -f konqueror_la.all_cc.cc konqueror.all_cc.cc ++ -rm -f konqueror_la.all_cc.cc libkonqueror_main_la.all_cc.cc konqueror.all_cc.cc + + #>+ 2 + final: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" all-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_final_OBJECTS)" install-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) konqueror_la_OBJECTS="$(konqueror_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonqueror_main_la_OBJECTS="$(libkonqueror_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ci b/x11/kdebase3/patches/patch-ci new file mode 100644 index 00000000000..c22372824d5 --- /dev/null +++ b/x11/kdebase3/patches/patch-ci @@ -0,0 +1,39 @@ +$NetBSD: patch-ci,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/client/Makefile.am.orig Wed Aug 9 18:10:36 2000 ++++ konqueror/client/Makefile.am +@@ -1,12 +1,16 @@ + AM_CPPFLAGS = -DQT_NO_CAST_ASCII + + bin_PROGRAMS = kfmclient +-lib_LTLIBRARIES = kfmclient.la ++lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la + + INCLUDES= -I.. $(all_includes) ++libkfmclient_main_la_LDFLAGS = $(all_libraries) ++libkfmclient_main_la_LIBADD = $(LIB_KFILE) ++libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub ++ + kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kfmclient_la_LIBADD = $(LIB_KFILE) +-kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub ++kfmclient_la_LIBADD = libkfmclient_main.la ++kfmclient_la_SOURCES = kfmclient_main.cc + + noinst_HEADERS = kfmclient.h + METASOURCES = AUTO +@@ -14,12 +18,9 @@ + KonquerorIface_DIR = $(srcdir)/.. + KDesktopIface_DIR = $(top_srcdir)/kdesktop + +-kfmclient_SOURCES = dummy.cc ++kfmclient_SOURCES = kfmclient_main.cc + kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kfmclient_LDADD = kfmclient.la +- +-dummy.cc: +- echo > dummy.cc ++kfmclient_LDADD = libkfmclient_main.la + + messages: + $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot diff --git a/x11/kdebase3/patches/patch-cj b/x11/kdebase3/patches/patch-cj new file mode 100644 index 00000000000..99e685722df --- /dev/null +++ b/x11/kdebase3/patches/patch-cj @@ -0,0 +1,248 @@ +$NetBSD: patch-cj,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/client/Makefile.in.orig Mon May 13 23:57:50 2002 ++++ konqueror/client/Makefile.in +@@ -290,14 +290,18 @@ + AM_CPPFLAGS = -DQT_NO_CAST_ASCII + + bin_PROGRAMS = kfmclient +-lib_LTLIBRARIES = kfmclient.la ++lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la + + INCLUDES = -I.. $(all_includes) +-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kfmclient_la_LIBADD = $(LIB_KFILE) +-#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub ++libkfmclient_main_la_LDFLAGS = $(all_libraries) ++libkfmclient_main_la_LIBADD = $(LIB_KFILE) ++#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub + #>+ 1 +-kfmclient_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc ++libkfmclient_main_la_SOURCES=kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc ++ ++kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version ++kfmclient_la_LIBADD = libkfmclient_main.la ++kfmclient_la_SOURCES = kfmclient_main.cc + + noinst_HEADERS = kfmclient.h + #>- METASOURCES = AUTO +@@ -305,32 +309,37 @@ + KonquerorIface_DIR = $(srcdir)/.. + KDesktopIface_DIR = $(top_srcdir)/kdesktop + +-kfmclient_SOURCES = dummy.cc ++kfmclient_SOURCES = kfmclient_main.cc + kfmclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kfmclient_LDADD = kfmclient.la ++kfmclient_LDADD = libkfmclient_main.la + subdir = konqueror/client + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kfmclient_la_DEPENDENCIES = +-am_kfmclient_la_OBJECTS = kfmclient.lo ++kfmclient_la_DEPENDENCIES = libkfmclient_main.la ++am_kfmclient_la_OBJECTS = kfmclient_main.lo + #>- kfmclient_la_OBJECTS = $(am_kfmclient_la_OBJECTS) ++#>+ 1 ++kfmclient_la_OBJECTS = kfmclient_main.lo ++libkfmclient_main_la_DEPENDENCIES = ++am_libkfmclient_main_la_OBJECTS = kfmclient.lo ++#>- libkfmclient_main_la_OBJECTS = $(am_libkfmclient_main_la_OBJECTS) + #>+ 5 +-kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo +-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ +- kfmclient_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS) ++libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo ++libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \ ++ libkfmclient_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS) + bin_PROGRAMS = kfmclient$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kfmclient_OBJECTS = dummy.$(OBJEXT) ++am_kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) + #>- kfmclient_OBJECTS = $(am_kfmclient_OBJECTS) + #>+ 1 +-kfmclient_OBJECTS = dummy.$(OBJEXT) +-kfmclient_DEPENDENCIES = kfmclient.la ++kfmclient_OBJECTS = kfmclient_main.$(OBJEXT) ++kfmclient_DEPENDENCIES = libkfmclient_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -338,7 +347,9 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kfmclient.Plo ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kfmclient.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kfmclient_main.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -358,11 +369,12 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) ++DIST_SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) \ ++ $(kfmclient_SOURCES) + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in +-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES) ++SOURCES = $(kfmclient_la_SOURCES) $(libkfmclient_main_la_SOURCES) $(kfmclient_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -411,6 +423,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kfmclient.la: $(kfmclient_la_OBJECTS) $(kfmclient_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kfmclient_la_LDFLAGS) $(kfmclient_la_OBJECTS) $(kfmclient_la_LIBADD) $(LIBS) ++libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -445,8 +459,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)/kfmclient.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kfmclient_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kfmclient_main.Po@am__quote@ + + distclean-depend: + -rm -rf $(DEPDIR) +@@ -615,15 +630,16 @@ + uninstall-info-am uninstall-libLTLIBRARIES + + +-dummy.cc: +- echo > dummy.cc +- + messages: + $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot + # 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: + ++#>+ 3 ++kfmclient.moc: $(srcdir)/kfmclient.h ++ $(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc ++ + #>+ 9 + KonquerorIface.kidl: $(srcdir)/../KonquerorIface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/../KonquerorIface.h > KonquerorIface.kidl || ( rm -f KonquerorIface.kidl ; /bin/false ) +@@ -635,10 +651,6 @@ + $(DCOPIDL2CPP) --c++-suffix cc --no-signals --no-skel KDesktopIface.kidl + + #>+ 3 +-kfmclient.moc: $(srcdir)/kfmclient.h +- $(MOC) $(srcdir)/kfmclient.h -o kfmclient.moc +- +-#>+ 3 + clean-metasources: + -rm -f kfmclient.moc + +@@ -659,28 +671,28 @@ + + + #>+ 12 +-kfmclient_la_meta_unload.cc: kfmclient.moc +- @echo 'creating kfmclient_la_meta_unload.cc' +- @-rm -f kfmclient_la_meta_unload.cc ++libkfmclient_main_la_meta_unload.cc: kfmclient.moc ++ @echo 'creating libkfmclient_main_la_meta_unload.cc' ++ @-rm -f libkfmclient_main_la_meta_unload.cc + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc ;\ +- cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc ;\ +- echo '0};' >> kfmclient_la_meta_unload.cc ;\ +- echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc ;\ +- echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc ;\ +- else echo > kfmclient_la_meta_unload.cc; fi ++ echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc ;\ ++ cat kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '0};' >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc ;\ ++ echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc ;\ ++ else echo > libkfmclient_main_la_meta_unload.cc; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kfmclient_la_meta_unload.cc ++ -rm -f libkfmclient_main_la_meta_unload.cc + + #>+ 11 +-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc kfmclient.moc ++kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc kfmclient.moc + @echo 'creating kfmclient_la.all_cc.cc ...'; \ + rm -f kfmclient_la.all_cc.files kfmclient_la.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kfmclient_la.all_cc.final; \ +- for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \ ++ for file in kfmclient_main.cc ; do \ + echo "#include \"$$file\"" >> kfmclient_la.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient_la.all_cc.final; \ + done; \ +@@ -688,11 +700,23 @@ + rm -f kfmclient_la.all_cc.final kfmclient_la.all_cc.files + + #>+ 11 +-kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc ++libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ++ @echo 'creating libkfmclient_main_la.all_cc.cc ...'; \ ++ rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \ ++ for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ; do \ ++ echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \ ++ done; \ ++ cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files > libkfmclient_main_la.all_cc.cc; \ ++ rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files ++ ++#>+ 11 ++kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc + @echo 'creating kfmclient.all_cc.cc ...'; \ + rm -f kfmclient.all_cc.files kfmclient.all_cc.final; \ + echo "#define KDE_USE_FINAL 1" >> kfmclient.all_cc.final; \ +- for file in dummy.cc ; do \ ++ for file in kfmclient_main.cc ; do \ + echo "#include \"$$file\"" >> kfmclient.all_cc.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kfmclient.all_cc.final; \ + done; \ +@@ -701,20 +725,20 @@ + + #>+ 3 + clean-final: +- -rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc ++ -rm -f kfmclient_la.all_cc.cc libkfmclient_main_la.all_cc.cc kfmclient.all_cc.cc + + #>+ 2 + final: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" install-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-ck b/x11/kdebase3/patches/patch-ck new file mode 100644 index 00000000000..9a5b5f54522 --- /dev/null +++ b/x11/kdebase3/patches/patch-ck @@ -0,0 +1,15 @@ +$NetBSD: patch-ck,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/client/kfmclient.cc.orig Wed May 8 19:22:30 2002 ++++ konqueror/client/kfmclient.cc +@@ -58,7 +58,9 @@ + {0,0,0} + }; + +-int main( int argc, char **argv ) ++extern "C" int kdemain( int argc, char **argv ); ++ ++int kdemain( int argc, char **argv ) + { + KCmdLineArgs::init(argc, argv, appName, description, version, false); + diff --git a/x11/kdebase3/patches/patch-cl b/x11/kdebase3/patches/patch-cl new file mode 100644 index 00000000000..c8e03ad5de0 --- /dev/null +++ b/x11/kdebase3/patches/patch-cl @@ -0,0 +1,33 @@ +$NetBSD: patch-cl,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/client/kfmclient_main.cc.orig Thu May 30 09:59:56 2002 ++++ konqueror/client/kfmclient_main.cc +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cm b/x11/kdebase3/patches/patch-cm new file mode 100644 index 00000000000..0500a1f7c0b --- /dev/null +++ b/x11/kdebase3/patches/patch-cm @@ -0,0 +1,39 @@ +$NetBSD: patch-cm,v 1.1.1.1 2002/05/31 13:19:17 skrll Exp $ + +--- konqueror/keditbookmarks/Makefile.am.orig Sun Mar 3 04:35:00 2002 ++++ konqueror/keditbookmarks/Makefile.am +@@ -2,23 +2,25 @@ + + METASOURCES = AUTO + +-lib_LTLIBRARIES = keditbookmarks.la ++lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la + +-keditbookmarks_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp ++libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp ++ ++keditbookmarks_la_SOURCES = keditbookmarks_main.cpp + kbookmarklistener_DIR = $(top_srcdir)/libkonq + +-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ++libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) ++libkeditbookmarks_main_la_METASOURCES = AUTO ++ ++keditbookmarks_la_LIBADD = libkeditbookmarks_main.la + keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version +-keditbookmarks_la_METASOURCES = AUTO + + bin_PROGRAMS = keditbookmarks + +-keditbookmarks_SOURCES = dummy.cpp +-keditbookmarks_LDADD = keditbookmarks.la ++keditbookmarks_SOURCES = keditbookmarks_main.cpp ++keditbookmarks_LDADD = libkeditbookmarks_main.la + keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) +- +-dummy.cpp: +- echo > dummy.cpp + + rcdir = $(kde_datadir)/keditbookmarks + rc_DATA = keditbookmarksui.rc diff --git a/x11/kdebase3/patches/patch-cn b/x11/kdebase3/patches/patch-cn new file mode 100644 index 00000000000..49d2c51f1fc --- /dev/null +++ b/x11/kdebase3/patches/patch-cn @@ -0,0 +1,238 @@ +$NetBSD: patch-cn,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konqueror/keditbookmarks/Makefile.in.orig Mon May 13 23:57:51 2002 ++++ konqueror/keditbookmarks/Makefile.in +@@ -291,21 +291,26 @@ + + METASOURCES = AUTO + +-lib_LTLIBRARIES = keditbookmarks.la ++lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la + +-#>- keditbookmarks_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp ++#>- libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp toplevel.skel commands.cpp + #>+ 1 +-keditbookmarks_la_SOURCES=main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp ++libkeditbookmarks_main_la_SOURCES=main.cpp toplevel.cpp commands.cpp toplevel_skel.cpp ++ ++keditbookmarks_la_SOURCES = keditbookmarks_main.cpp + kbookmarklistener_DIR = $(top_srcdir)/libkonq + +-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ++libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la ++libkeditbookmarks_main_la_LDFLAGS = $(all_libraries) ++#>- libkeditbookmarks_main_la_METASOURCES = AUTO ++ ++keditbookmarks_la_LIBADD = libkeditbookmarks_main.la + keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version +-#>- keditbookmarks_la_METASOURCES = AUTO + + bin_PROGRAMS = keditbookmarks + +-keditbookmarks_SOURCES = dummy.cpp +-keditbookmarks_LDADD = keditbookmarks.la ++keditbookmarks_SOURCES = keditbookmarks_main.cpp ++keditbookmarks_LDADD = libkeditbookmarks_main.la + keditbookmarks_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + rcdir = $(kde_datadir)/keditbookmarks +@@ -320,23 +325,30 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-keditbookmarks_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la +-am_keditbookmarks_la_OBJECTS = main.lo toplevel.lo commands.lo ++keditbookmarks_la_DEPENDENCIES = libkeditbookmarks_main.la ++am_keditbookmarks_la_OBJECTS = keditbookmarks_main.lo + #>- keditbookmarks_la_OBJECTS = $(am_keditbookmarks_la_OBJECTS) ++#>+ 1 ++keditbookmarks_la_OBJECTS = keditbookmarks_main.lo ++libkeditbookmarks_main_la_DEPENDENCIES = \ ++ $(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 +-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 +-@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 ++@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) + PROGRAMS = $(bin_PROGRAMS) + +-am_keditbookmarks_OBJECTS = dummy.$(OBJEXT) ++am_keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) + #>- keditbookmarks_OBJECTS = $(am_keditbookmarks_OBJECTS) + #>+ 1 +-keditbookmarks_OBJECTS = dummy.$(OBJEXT) +-keditbookmarks_DEPENDENCIES = keditbookmarks.la ++keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT) ++keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -344,8 +356,10 @@ + 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 + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -365,11 +379,12 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) ++DIST_SOURCES = $(keditbookmarks_la_SOURCES) \ ++ $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES) + DATA = $(data_DATA) $(rc_DATA) + + DIST_COMMON = Makefile.am Makefile.in +-SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES) ++SOURCES = $(keditbookmarks_la_SOURCES) $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -418,6 +433,8 @@ + -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) ++libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -453,7 +470,8 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/commands.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keditbookmarks_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keditbookmarks_main.Po@am__quote@ + @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 @@ + + #>- 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=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 @@ + uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \ + uninstall-libLTLIBRARIES uninstall-rcDATA + +- +-dummy.cpp: +- echo > dummy.cpp + # 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 + + + #>+ 3 + clean-moc-classes: +- -rm -f keditbookmarks_la_meta_unload.cpp ++ -rm -f libkeditbookmarks_main_la_meta_unload.cpp + + #>+ 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 ++ @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 \ ++ 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 @@ + + #>+ 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 + + #>+ 2 + final: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" install-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-co b/x11/kdebase3/patches/patch-co new file mode 100644 index 00000000000..422ba7316b5 --- /dev/null +++ b/x11/kdebase3/patches/patch-co @@ -0,0 +1,33 @@ +$NetBSD: patch-co,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konqueror/keditbookmarks/keditbookmarks_main.cpp.orig Thu May 30 09:59:58 2002 ++++ konqueror/keditbookmarks/keditbookmarks_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cp b/x11/kdebase3/patches/patch-cp new file mode 100644 index 00000000000..a9354050631 --- /dev/null +++ b/x11/kdebase3/patches/patch-cp @@ -0,0 +1,15 @@ +$NetBSD: patch-cp,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konqueror/keditbookmarks/main.cpp.orig Wed May 8 19:22:33 2002 ++++ konqueror/keditbookmarks/main.cpp +@@ -32,7 +32,9 @@ + { 0, 0, 0} + }; + +-int main(int argc, char ** argv) ++extern "C" int kdemain(int, char **); ++ ++int kdemain(int argc, char ** argv) + { + KLocale::setMainCatalogue("konqueror"); + KAboutData aboutData( "keditbookmarks", I18N_NOOP("KEditBookmarks"), "1.0", diff --git a/x11/kdebase3/patches/patch-cq b/x11/kdebase3/patches/patch-cq new file mode 100644 index 00000000000..6acb0b2d7a4 --- /dev/null +++ b/x11/kdebase3/patches/patch-cq @@ -0,0 +1,15 @@ +$NetBSD: patch-cq,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konqueror/konq_main.cc.orig Fri Jan 11 15:29:36 2002 ++++ konqueror/konq_main.cc +@@ -44,7 +44,9 @@ + { 0, 0, 0} + }; + +-int main( int argc, char **argv ) ++extern "C" int kdemain( int, char **); ++ ++int kdemain( int argc, char **argv ) + { + KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); + diff --git a/x11/kdebase3/patches/patch-cr b/x11/kdebase3/patches/patch-cr new file mode 100644 index 00000000000..5680866c4ca --- /dev/null +++ b/x11/kdebase3/patches/patch-cr @@ -0,0 +1,33 @@ +$NetBSD: patch-cr,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konqueror/konqueror_main.cc.orig Thu May 30 10:00:00 2002 ++++ konqueror/konqueror_main.cc +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs new file mode 100644 index 00000000000..41ddc0d3b33 --- /dev/null +++ b/x11/kdebase3/patches/patch-cs @@ -0,0 +1,68 @@ +$NetBSD: patch-cs,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/Makefile.am.orig Wed May 8 19:22:37 2002 ++++ konsole/konsole/Makefile.am +@@ -12,7 +12,8 @@ + + # you can add here more. This one gets installed + bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole +-lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la ++lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ ++ libkonsole_main.la konsole.la + # libkonsolepart is a part, but konsole.la links directly to it, so we can't + # install it under kde_module + +@@ -32,24 +33,34 @@ + libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@ + + # kwrited kdeinit module +-kwrited_la_SOURCES = kwrited.cpp +-kwrited_la_LIBADD = libkonsolepart.la ++libkwrited_main_la_SOURCES = kwrited.cpp ++libkwrited_main_la_LIBADD = libkonsolepart.la ++libkwrited_main_la_LDFLAGS = $(all_libraries) ++ ++kwrited_la_SOURCES = kwrited_main.cpp ++kwrited_la_LIBADD = libkwrited_main.la + kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # kwrited executable +-kwrited_SOURCES = dummy.cpp +-kwrited_LDADD = kwrited.la ++kwrited_SOURCES = kwrited_main.cpp ++kwrited_LDADD = libkwrited_main.la + kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + # konsole kdeinit module +-konsole_la_SOURCES = main.cpp konsole.cpp +-konsole_la_LIBADD = libkonsolepart.la ++libkonsole_main_la_SOURCES = main.cpp konsole.cpp ++libkonsole_main_la_LIBADD = libkonsolepart.la ++libkonsole_main_la_LDFLAGS = $(all_libraries) ++ ++konsole_la_SOURCES = konsole_main.cpp ++konsole_la_LIBADD = libkonsole_main.la + konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # konsole executable - has all the sources, doesn't link kparts, saves startup time +-konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ +- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ +- konsole_wcwidth.cpp ++konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ ++ session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ ++ TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ ++ konsole_wcwidth.cpp konsole_main.cpp ++ + konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ + konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) + +@@ -91,9 +102,6 @@ + $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot + rm -f schemas.cpp + rm -f tips.cpp +- +-dummy.cpp: +- echo > dummy.cpp + + konsole.lo: konsole.o + diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct new file mode 100644 index 00000000000..b7799652f48 --- /dev/null +++ b/x11/kdebase3/patches/patch-ct @@ -0,0 +1,434 @@ +$NetBSD: patch-ct,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/Makefile.in.orig Mon May 13 23:57:52 2002 ++++ konsole/konsole/Makefile.in +@@ -304,7 +304,9 @@ + + # you can add here more. This one gets installed + bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole +-lib_LTLIBRARIES = libkonsolepart.la kwrited.la konsole.la ++lib_LTLIBRARIES = libkonsolepart.la libkwrited_main.la kwrited.la \ ++ libkonsole_main.la konsole.la ++ + + # libkonsolepart is a part, but konsole.la links directly to it, so we can't + # install it under kde_module +@@ -337,28 +339,39 @@ + libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@ + + # kwrited kdeinit module +-kwrited_la_SOURCES = kwrited.cpp +-kwrited_la_LIBADD = libkonsolepart.la ++libkwrited_main_la_SOURCES = kwrited.cpp ++libkwrited_main_la_LIBADD = libkonsolepart.la ++libkwrited_main_la_LDFLAGS = $(all_libraries) ++ ++kwrited_la_SOURCES = kwrited_main.cpp ++kwrited_la_LIBADD = libkwrited_main.la + kwrited_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # kwrited executable +-kwrited_SOURCES = dummy.cpp +-kwrited_LDADD = kwrited.la ++kwrited_SOURCES = kwrited_main.cpp ++kwrited_LDADD = libkwrited_main.la + kwrited_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + # konsole kdeinit module +-konsole_la_SOURCES = main.cpp konsole.cpp +-konsole_la_LIBADD = libkonsolepart.la ++libkonsole_main_la_SOURCES = main.cpp konsole.cpp ++libkonsole_main_la_LIBADD = libkonsolepart.la ++libkonsole_main_la_LDFLAGS = $(all_libraries) ++ ++konsole_la_SOURCES = konsole_main.cpp ++konsole_la_LIBADD = libkonsole_main.la + konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version + + # konsole executable - has all the sources, doesn't link kparts, saves startup time +-#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ +-#>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ +-#>- konsole_wcwidth.cpp +-#>+ 3 +-konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ +- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ +- konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ++#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ ++#>- session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ ++#>- TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ ++#>- konsole_wcwidth.cpp konsole_main.cpp ++#>+ 4 ++konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ ++ session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ ++ TEHistory.cpp keytrans.cpp \ ++ konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp ++ + + konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ + konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) +@@ -392,24 +405,25 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-konsole_la_DEPENDENCIES = libkonsolepart.la +-am_konsole_la_OBJECTS = main.lo konsole.lo ++konsole_la_DEPENDENCIES = libkonsole_main.la ++am_konsole_la_OBJECTS = konsole_main.lo + #>- konsole_la_OBJECTS = $(am_konsole_la_OBJECTS) +-#>+ 5 +-konsole_la_final_OBJECTS = konsole_la.all_cpp.lo +-konsole_la_nofinal_OBJECTS = main.lo konsole.lo \ +- konsole_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@konsole_la_OBJECTS = $(konsole_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@konsole_la_OBJECTS = $(konsole_la_final_OBJECTS) +-kwrited_la_DEPENDENCIES = libkonsolepart.la +-am_kwrited_la_OBJECTS = kwrited.lo ++#>+ 1 ++konsole_la_OBJECTS = konsole_main.lo ++kwrited_la_DEPENDENCIES = libkwrited_main.la ++am_kwrited_la_OBJECTS = kwrited_main.lo + #>- kwrited_la_OBJECTS = $(am_kwrited_la_OBJECTS) ++#>+ 1 ++kwrited_la_OBJECTS = kwrited_main.lo ++libkonsole_main_la_DEPENDENCIES = libkonsolepart.la ++am_libkonsole_main_la_OBJECTS = main.lo konsole.lo ++#>- libkonsole_main_la_OBJECTS = $(am_libkonsole_main_la_OBJECTS) + #>+ 5 +-kwrited_la_final_OBJECTS = kwrited_la.all_cpp.lo +-kwrited_la_nofinal_OBJECTS = kwrited.lo \ +- kwrited_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kwrited_la_OBJECTS = $(kwrited_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kwrited_la_OBJECTS = $(kwrited_la_final_OBJECTS) ++libkonsole_main_la_final_OBJECTS = libkonsole_main_la.all_cpp.lo ++libkonsole_main_la_nofinal_OBJECTS = main.lo konsole.lo \ ++ libkonsole_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkonsole_main_la_OBJECTS = $(libkonsole_main_la_final_OBJECTS) + libkonsolepart_la_DEPENDENCIES = + am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ + schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ +@@ -423,6 +437,15 @@ + libkonsolepart_la_meta_unload.lo + @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) ++libkwrited_main_la_DEPENDENCIES = libkonsolepart.la ++am_libkwrited_main_la_OBJECTS = kwrited.lo ++#>- libkwrited_main_la_OBJECTS = $(am_libkwrited_main_la_OBJECTS) ++#>+ 5 ++libkwrited_main_la_final_OBJECTS = libkwrited_main_la.all_cpp.lo ++libkwrited_main_la_nofinal_OBJECTS = kwrited.lo \ ++ libkwrited_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkwrited_main_la_OBJECTS = $(libkwrited_main_la_final_OBJECTS) + bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ + kwrited$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) +@@ -431,7 +454,7 @@ + konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ + TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ + TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ +- konsole_wcwidth.$(OBJEXT) ++ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) + #>- konsole_OBJECTS = $(am_konsole_OBJECTS) + #>+ 9 + konsole_final_OBJECTS = konsole.all_cpp.o +@@ -439,7 +462,7 @@ + konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ + TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ + TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ +- konsole_wcwidth.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ ++ konsole_wcwidth.$(OBJEXT) konsole_main.$(OBJEXT) konsoleiface_skel.$(OBJEXT) sessioniface_skel.$(OBJEXT) \ + konsole_meta_unload.o + @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) + @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) +@@ -450,11 +473,11 @@ + konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) + konsole_grantpty_LDADD = $(LDADD) + konsole_grantpty_DEPENDENCIES = +-am_kwrited_OBJECTS = dummy.$(OBJEXT) ++am_kwrited_OBJECTS = kwrited_main.$(OBJEXT) + #>- kwrited_OBJECTS = $(am_kwrited_OBJECTS) + #>+ 1 +-kwrited_OBJECTS = dummy.$(OBJEXT) +-kwrited_DEPENDENCIES = kwrited.la ++kwrited_OBJECTS = kwrited_main.$(OBJEXT) ++kwrited_DEPENDENCIES = libkwrited_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -469,15 +492,19 @@ + @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ + @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ + @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/keytrans.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/keytrans.Po $(DEPDIR)/konsole.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/konsole.Po $(DEPDIR)/konsole_grantpty.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/keytrans.Plo $(DEPDIR)/keytrans.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/konsole.Plo $(DEPDIR)/konsole.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/konsole_grantpty.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/konsole_main.Po \ + @AMDEP_TRUE@ $(DEPDIR)/konsole_part.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/konsole_wcwidth.Po $(DEPDIR)/kwrited.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/main.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/schema.Plo $(DEPDIR)/schema.Po \ +- @AMDEP_TRUE@ $(DEPDIR)/session.Plo $(DEPDIR)/session.Po ++ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kwrited_main.Po $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/main.Po $(DEPDIR)/schema.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/schema.Po $(DEPDIR)/session.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/session.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -506,14 +533,15 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \ +- $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) \ ++ $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) \ ++ $(libkwrited_main_la_SOURCES) $(konsole_SOURCES) \ + $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) + DATA = $(data_DATA) $(mime_DATA) + + HEADERS = $(noinst_HEADERS) + + DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in +-SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsolepart_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) ++SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) $(libkonsole_main_la_SOURCES) $(libkonsolepart_la_SOURCES) $(libkwrited_main_la_SOURCES) $(konsole_SOURCES) $(konsole_grantpty_SOURCES) $(kwrited_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -564,11 +592,15 @@ + $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) + kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) ++libkonsole_main.la: $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkonsole_main_la_LDFLAGS) $(libkonsole_main_la_OBJECTS) $(libkonsole_main_la_LIBADD) $(LIBS) + #>- libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) + #>+ 2 + @KDE_USE_CLOSURE_TRUE@libkonsolepart.la: libkonsolepart.la.closure $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) + @KDE_USE_CLOSURE_FALSE@libkonsolepart.la: $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkonsolepart_la_LDFLAGS) $(libkonsolepart_la_OBJECTS) $(libkonsolepart_la_LIBADD) $(LIBS) ++libkwrited_main.la: $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkwrited_main_la_LDFLAGS) $(libkwrited_main_la_OBJECTS) $(libkwrited_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -623,16 +655,19 @@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmuVt102.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keytrans.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/keytrans.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_grantpty.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_part.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_wcwidth.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/konsole_wcwidth.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwrited_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/schema.Plo@am__quote@ +@@ -750,7 +785,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=konsoleiface.h konsole_wcwidth.cpp MakeDefaults TEHistory.cpp TEScreen.cpp TEmulation.cpp sessioniface.h keytrans.cpp x-konsole.desktop konsolerc konsole_part.h ++KDE_DIST=TEWidget.cpp keytrans.cpp konsoleiface.h konsole_part.h konsole_wcwidth.cpp x-konsole.desktop session.cpp konsolerc sessioniface.h MakeDefaults TEHistory.cpp TEScreen.cpp TEmuVt102.cpp TEmulation.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -892,9 +927,6 @@ + rm -f schemas.cpp + rm -f tips.cpp + +-dummy.cpp: +- echo > dummy.cpp +- + konsole.lo: konsole.o + # 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. +@@ -978,29 +1010,16 @@ + + + #>+ 12 +-konsole_la_meta_unload.cpp: konsole.moc +- @echo 'creating konsole_la_meta_unload.cpp' +- @-rm -f konsole_la_meta_unload.cpp +- @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_konsole_la[] = {' > konsole_la_meta_unload.cpp ;\ +- cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> konsole_la_meta_unload.cpp ;\ +- echo '0};' >> konsole_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> konsole_la_meta_unload.cpp ;\ +- echo '_UNLOAD(konsole_la)' >> konsole_la_meta_unload.cpp ;\ +- else echo > konsole_la_meta_unload.cpp; fi +- +- +-#>+ 12 +-kwrited_la_meta_unload.cpp: kwrited.moc +- @echo 'creating kwrited_la_meta_unload.cpp' +- @-rm -f kwrited_la_meta_unload.cpp ++libkonsole_main_la_meta_unload.cpp: konsole.moc ++ @echo 'creating libkonsole_main_la_meta_unload.cpp' ++ @-rm -f libkonsole_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwrited_la[] = {' > kwrited_la_meta_unload.cpp ;\ +- cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwrited_la_meta_unload.cpp ;\ +- echo '0};' >> kwrited_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kwrited_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kwrited_la)' >> kwrited_la_meta_unload.cpp ;\ +- else echo > kwrited_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkonsole_main_la[] = {' > libkonsole_main_la_meta_unload.cpp ;\ ++ cat konsole.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkonsole_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkonsole_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkonsole_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkonsole_main_la)' >> libkonsole_main_la_meta_unload.cpp ;\ ++ else echo > libkonsole_main_la_meta_unload.cpp; fi + + + #>+ 12 +@@ -1017,6 +1036,19 @@ + + + #>+ 12 ++libkwrited_main_la_meta_unload.cpp: kwrited.moc ++ @echo 'creating libkwrited_main_la_meta_unload.cpp' ++ @-rm -f libkwrited_main_la_meta_unload.cpp ++ @if test ${kde_qtver} = 2; then \ ++ echo 'static const char * _metalist_libkwrited_main_la[] = {' > libkwrited_main_la_meta_unload.cpp ;\ ++ cat kwrited.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwrited_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkwrited_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkwrited_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkwrited_main_la)' >> libkwrited_main_la_meta_unload.cpp ;\ ++ else echo > libkwrited_main_la_meta_unload.cpp; fi ++ ++ ++#>+ 12 + konsole_meta_unload.cpp: TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc + @echo 'creating konsole_meta_unload.cpp' + @-rm -f konsole_meta_unload.cpp +@@ -1031,14 +1063,14 @@ + + #>+ 3 + clean-moc-classes: +- -rm -f konsole_la_meta_unload.cpp kwrited_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp konsole_meta_unload.cpp ++ -rm -f libkonsole_main_la_meta_unload.cpp libkonsolepart_la_meta_unload.cpp libkwrited_main_la_meta_unload.cpp konsole_meta_unload.cpp + + #>+ 11 +-konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp konsole_la_meta_unload.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc ++konsole_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/konsole_main.cpp konsole_part.moc konsole.moc TEWidget.moc TEmulation.moc session.moc TEmuVt102.moc kwrited.moc TEPty.moc + @echo 'creating konsole_la.all_cpp.cpp ...'; \ + rm -f konsole_la.all_cpp.files konsole_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> konsole_la.all_cpp.final; \ +- for file in main.cpp konsole.cpp konsole_la_meta_unload.cpp ; do \ ++ for file in konsole_main.cpp ; do \ + echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ + done; \ +@@ -1046,11 +1078,11 @@ + rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files + + #>+ 11 +-kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp kwrited_la_meta_unload.cpp ++kwrited_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp + @echo 'creating kwrited_la.all_cpp.cpp ...'; \ + rm -f kwrited_la.all_cpp.files kwrited_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrited_la.all_cpp.final; \ +- for file in kwrited.cpp kwrited_la_meta_unload.cpp ; do \ ++ for file in kwrited_main.cpp ; do \ + echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ + done; \ +@@ -1058,6 +1090,18 @@ + rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files + + #>+ 11 ++libkonsole_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/konsole.cpp libkonsole_main_la_meta_unload.cpp ++ @echo 'creating libkonsole_main_la.all_cpp.cpp ...'; \ ++ rm -f libkonsole_main_la.all_cpp.files libkonsole_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkonsole_main_la.all_cpp.final; \ ++ for file in main.cpp konsole.cpp libkonsole_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkonsole_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkonsole_main_la.all_cpp.final; \ ++ done; \ ++ cat libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files > libkonsole_main_la.all_cpp.cpp; \ ++ rm -f libkonsole_main_la.all_cpp.final libkonsole_main_la.all_cpp.files ++ ++#>+ 11 + libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp libkonsolepart_la_meta_unload.cpp + @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ + rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ +@@ -1070,11 +1114,23 @@ + rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files + + #>+ 11 +-konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ++libkwrited_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited.cpp libkwrited_main_la_meta_unload.cpp ++ @echo 'creating libkwrited_main_la.all_cpp.cpp ...'; \ ++ rm -f libkwrited_main_la.all_cpp.files libkwrited_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkwrited_main_la.all_cpp.final; \ ++ for file in kwrited.cpp libkwrited_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkwrited_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwrited_main_la.all_cpp.final; \ ++ done; \ ++ cat libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files > libkwrited_main_la.all_cpp.cpp; \ ++ rm -f libkwrited_main_la.all_cpp.final libkwrited_main_la.all_cpp.files ++ ++#>+ 11 ++konsole.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/main.cpp $(srcdir)/konsole.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp + @echo 'creating konsole.all_cpp.cpp ...'; \ + rm -f konsole.all_cpp.files konsole.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> konsole.all_cpp.final; \ +- for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ ++ for file in TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp konsole_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> konsole.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ + done; \ +@@ -1082,11 +1138,11 @@ + rm -f konsole.all_cpp.final konsole.all_cpp.files + + #>+ 11 +-kwrited.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++kwrited.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwrited_main.cpp + @echo 'creating kwrited.all_cpp.cpp ...'; \ + rm -f kwrited.all_cpp.files kwrited.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwrited.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kwrited_main.cpp ; do \ + echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ + done; \ +@@ -1095,20 +1151,20 @@ + + #>+ 3 + clean-final: +- -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp ++ -rm -f konsole_la.all_cpp.cpp kwrited_la.all_cpp.cpp libkonsole_main_la.all_cpp.cpp libkonsolepart_la.all_cpp.cpp libkwrited_main_la.all_cpp.cpp konsole.all_cpp.cpp kwrited.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_final_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_final_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_final_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_final_OBJECTS)" konsole_OBJECTS="$(konsole_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) konsole_la_OBJECTS="$(konsole_la_nofinal_OBJECTS)" kwrited_la_OBJECTS="$(kwrited_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am ++ $(MAKE) libkonsole_main_la_OBJECTS="$(libkonsole_main_la_nofinal_OBJECTS)" libkonsolepart_la_OBJECTS="$(libkonsolepart_la_nofinal_OBJECTS)" libkwrited_main_la_OBJECTS="$(libkwrited_main_la_nofinal_OBJECTS)" konsole_OBJECTS="$(konsole_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-cu b/x11/kdebase3/patches/patch-cu new file mode 100644 index 00000000000..79659ecd527 --- /dev/null +++ b/x11/kdebase3/patches/patch-cu @@ -0,0 +1,33 @@ +$NetBSD: patch-cu,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/konsole_main.cpp.orig Thu May 30 10:00:02 2002 ++++ konsole/konsole/konsole_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cv b/x11/kdebase3/patches/patch-cv new file mode 100644 index 00000000000..d9af9620723 --- /dev/null +++ b/x11/kdebase3/patches/patch-cv @@ -0,0 +1,15 @@ +$NetBSD: patch-cv,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/kwrited.cpp.orig Wed May 8 19:22:40 2002 ++++ konsole/konsole/kwrited.cpp +@@ -90,7 +90,9 @@ + ::exit(0); + } + +-int main(int argc, char* argv[]) ++extern "C" int kdemain(int, char*[]); ++ ++int kdemain(int argc, char* argv[]) + { + KLocale::setMainCatalogue("konsole"); + KCmdLineArgs::init(argc, argv, "kwrited", diff --git a/x11/kdebase3/patches/patch-cw b/x11/kdebase3/patches/patch-cw new file mode 100644 index 00000000000..b047719b533 --- /dev/null +++ b/x11/kdebase3/patches/patch-cw @@ -0,0 +1,33 @@ +$NetBSD: patch-cw,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/kwrited_main.cpp.orig Thu May 30 10:00:03 2002 ++++ konsole/konsole/kwrited_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-cx b/x11/kdebase3/patches/patch-cx new file mode 100644 index 00000000000..ff0800ab0ef --- /dev/null +++ b/x11/kdebase3/patches/patch-cx @@ -0,0 +1,15 @@ +$NetBSD: patch-cx,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- konsole/konsole/main.cpp.orig Wed May 8 19:22:40 2002 ++++ konsole/konsole/main.cpp +@@ -110,7 +110,9 @@ + + + /* --| main |------------------------------------------------------ */ +-int main(int argc, char* argv[]) ++extern "C" int kdemain(int, char*[]); ++ ++int kdemain(int argc, char* argv[]) + { + setgid(getgid()); setuid(getuid()); // drop privileges + diff --git a/x11/kdebase3/patches/patch-cy b/x11/kdebase3/patches/patch-cy new file mode 100644 index 00000000000..a2b759a6a1c --- /dev/null +++ b/x11/kdebase3/patches/patch-cy @@ -0,0 +1,38 @@ +$NetBSD: patch-cy,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksmserver/Makefile.am.orig Wed May 8 19:22:50 2002 ++++ ksmserver/Makefile.am +@@ -20,18 +20,21 @@ + INCLUDES= $(all_includes) + + bin_PROGRAMS = ksmserver +-lib_LTLIBRARIES = ksmserver.la ++lib_LTLIBRARIES = libksmserver_main.la ksmserver.la + noinst_HEADERS = global.h server.h shutdown.h + + ksmserver_la_METASOURCES = AUTO + # Order is important for --enable-final! +-ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp +-ksmserver_SOURCES = dummy.cpp ++libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp ++ksmserver_la_SOURCES = ksmserver_main.cpp ++ksmserver_SOURCES = ksmserver_main.cpp + ++libksmserver_main_la_LDFLAGS = $(all_libraries) + ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module + ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-ksmserver_la_LIBADD = $(LIB_KDEUI) +-ksmserver_LDADD = ksmserver.la ++libksmserver_main_la_LIBADD = $(LIB_KDEUI) ++ksmserver_la_LIBADD = libksmserver_main.la ++ksmserver_LDADD = libksmserver_main.la + + picsdir = $(kde_datadir)/ksmserver/pics + pics_DATA = shutdownkonq.png +@@ -48,6 +51,3 @@ + + messages: + $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-cz b/x11/kdebase3/patches/patch-cz new file mode 100644 index 00000000000..2f21b1b7f55 --- /dev/null +++ b/x11/kdebase3/patches/patch-cz @@ -0,0 +1,235 @@ +$NetBSD: patch-cz,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksmserver/Makefile.in.orig Mon May 13 23:57:53 2002 ++++ ksmserver/Makefile.in +@@ -309,18 +309,21 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = ksmserver +-lib_LTLIBRARIES = ksmserver.la ++lib_LTLIBRARIES = libksmserver_main.la ksmserver.la + noinst_HEADERS = global.h server.h shutdown.h + + #>- ksmserver_la_METASOURCES = AUTO + # Order is important for --enable-final! +-ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp +-ksmserver_SOURCES = dummy.cpp ++libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp ++ksmserver_la_SOURCES = ksmserver_main.cpp ++ksmserver_SOURCES = ksmserver_main.cpp + ++libksmserver_main_la_LDFLAGS = $(all_libraries) + ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module + ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-ksmserver_la_LIBADD = $(LIB_KDEUI) +-ksmserver_LDADD = ksmserver.la ++libksmserver_main_la_LIBADD = $(LIB_KDEUI) ++ksmserver_la_LIBADD = libksmserver_main.la ++ksmserver_LDADD = libksmserver_main.la + + picsdir = $(kde_datadir)/ksmserver/pics + pics_DATA = shutdownkonq.png +@@ -339,24 +342,29 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-ksmserver_la_DEPENDENCIES = +-am_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo ++ksmserver_la_DEPENDENCIES = libksmserver_main.la ++am_ksmserver_la_OBJECTS = ksmserver_main.lo + #>- ksmserver_la_OBJECTS = $(am_ksmserver_la_OBJECTS) ++#>+ 1 ++ksmserver_la_OBJECTS = ksmserver_main.lo ++libksmserver_main_la_DEPENDENCIES = ++am_libksmserver_main_la_OBJECTS = main.lo server.lo shutdown.lo ++#>- libksmserver_main_la_OBJECTS = $(am_libksmserver_main_la_OBJECTS) + #>+ 5 +-ksmserver_la_final_OBJECTS = ksmserver_la.all_cpp.lo +-ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \ +- ksmserver_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@ksmserver_la_OBJECTS = $(ksmserver_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@ksmserver_la_OBJECTS = $(ksmserver_la_final_OBJECTS) ++libksmserver_main_la_final_OBJECTS = libksmserver_main_la.all_cpp.lo ++libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \ ++ libksmserver_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_final_OBJECTS) + bin_PROGRAMS = ksmserver$(EXEEXT) + check_PROGRAMS = testsh$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_ksmserver_OBJECTS = dummy.$(OBJEXT) ++am_ksmserver_OBJECTS = ksmserver_main.$(OBJEXT) + #>- ksmserver_OBJECTS = $(am_ksmserver_OBJECTS) + #>+ 1 +-ksmserver_OBJECTS = dummy.$(OBJEXT) +-ksmserver_DEPENDENCIES = ksmserver.la ++ksmserver_OBJECTS = ksmserver_main.$(OBJEXT) ++ksmserver_DEPENDENCIES = libksmserver_main.la + am_testsh_OBJECTS = test.$(OBJEXT) shutdown.$(OBJEXT) + #>- testsh_OBJECTS = $(am_testsh_OBJECTS) + #>+ 5 +@@ -373,7 +381,8 @@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \ ++@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +@@ -395,8 +404,8 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) \ +- $(testsh_SOURCES) ++DIST_SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) \ ++ $(ksmserver_SOURCES) $(testsh_SOURCES) + DATA = $(pics_DATA) $(update_DATA) + + HEADERS = $(noinst_HEADERS) +@@ -408,7 +417,7 @@ + uninstall-recursive check-recursive installcheck-recursive + DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES) ++SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -457,6 +466,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + ksmserver.la: $(ksmserver_la_OBJECTS) $(ksmserver_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(ksmserver_la_LDFLAGS) $(ksmserver_la_OBJECTS) $(ksmserver_la_LIBADD) $(LIBS) ++libksmserver_main.la: $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libksmserver_main_la_LDFLAGS) $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -497,7 +508,8 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksmserver_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksmserver_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shutdown.Plo@am__quote@ +@@ -655,7 +667,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=move_session_config.sh ksmserver.upd shutdownkonq.png configure.in.in LICENSE ++KDE_DIST=ksmserver configure.in.in LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png dummy.cpp + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -796,9 +808,6 @@ + + messages: + $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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: +@@ -826,16 +835,16 @@ + + + #>+ 12 +-ksmserver_la_meta_unload.cpp: server.moc shutdown.moc +- @echo 'creating ksmserver_la_meta_unload.cpp' +- @-rm -f ksmserver_la_meta_unload.cpp ++libksmserver_main_la_meta_unload.cpp: server.moc shutdown.moc ++ @echo 'creating libksmserver_main_la_meta_unload.cpp' ++ @-rm -f libksmserver_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_ksmserver_la[] = {' > ksmserver_la_meta_unload.cpp ;\ +- cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksmserver_la_meta_unload.cpp ;\ +- echo '0};' >> ksmserver_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> ksmserver_la_meta_unload.cpp ;\ +- echo '_UNLOAD(ksmserver_la)' >> ksmserver_la_meta_unload.cpp ;\ +- else echo > ksmserver_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libksmserver_main_la[] = {' > libksmserver_main_la_meta_unload.cpp ;\ ++ cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libksmserver_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libksmserver_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libksmserver_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libksmserver_main_la)' >> libksmserver_main_la_meta_unload.cpp ;\ ++ else echo > libksmserver_main_la_meta_unload.cpp; fi + + + #>+ 12 +@@ -853,14 +862,14 @@ + + #>+ 3 + clean-moc-classes: +- -rm -f ksmserver_la_meta_unload.cpp testsh_meta_unload.cpp ++ -rm -f libksmserver_main_la_meta_unload.cpp testsh_meta_unload.cpp + + #>+ 11 +-ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp ksmserver_la_meta_unload.cpp server.moc shutdown.moc ++ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp server.moc shutdown.moc + @echo 'creating ksmserver_la.all_cpp.cpp ...'; \ + rm -f ksmserver_la.all_cpp.files ksmserver_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> ksmserver_la.all_cpp.final; \ +- for file in main.cpp server.cpp shutdown.cpp ksmserver_la_meta_unload.cpp ; do \ ++ for file in ksmserver_main.cpp ; do \ + echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \ + done; \ +@@ -868,11 +877,23 @@ + rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files + + #>+ 11 +-ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp libksmserver_main_la_meta_unload.cpp ++ @echo 'creating libksmserver_main_la.all_cpp.cpp ...'; \ ++ rm -f libksmserver_main_la.all_cpp.files libksmserver_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libksmserver_main_la.all_cpp.final; \ ++ for file in main.cpp server.cpp shutdown.cpp libksmserver_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libksmserver_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksmserver_main_la.all_cpp.final; \ ++ done; \ ++ cat libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files > libksmserver_main_la.all_cpp.cpp; \ ++ rm -f libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files ++ ++#>+ 11 ++ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp + @echo 'creating ksmserver.all_cpp.cpp ...'; \ + rm -f ksmserver.all_cpp.files ksmserver.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> ksmserver.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in ksmserver_main.cpp ; do \ + echo "#include \"$$file\"" >> ksmserver.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver.all_cpp.final; \ + done; \ +@@ -893,20 +914,20 @@ + + #>+ 3 + clean-final: +- -rm -f ksmserver_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp ++ -rm -f ksmserver_la.all_cpp.cpp libksmserver_main_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am ++ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-da b/x11/kdebase3/patches/patch-da new file mode 100644 index 00000000000..7e962e31905 --- /dev/null +++ b/x11/kdebase3/patches/patch-da @@ -0,0 +1,33 @@ +$NetBSD: patch-da,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksmserver/ksmserver_main.cpp.orig Thu May 30 10:00:04 2002 ++++ ksmserver/ksmserver_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-db b/x11/kdebase3/patches/patch-db new file mode 100644 index 00000000000..9e22434c472 --- /dev/null +++ b/x11/kdebase3/patches/patch-db @@ -0,0 +1,15 @@ +$NetBSD: patch-db,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksmserver/main.cpp.orig Sun Jan 20 18:26:13 2002 ++++ ksmserver/main.cpp +@@ -159,7 +159,9 @@ + } + } + +-int main( int argc, char* argv[] ) ++extern "C" int kdemain( int, char* [] ); ++ ++int kdemain( int argc, char* argv[] ) + { + sanity_check(argc, argv); + diff --git a/x11/kdebase3/patches/patch-dc b/x11/kdebase3/patches/patch-dc new file mode 100644 index 00000000000..afbb5bde21f --- /dev/null +++ b/x11/kdebase3/patches/patch-dc @@ -0,0 +1,16 @@ +$NetBSD: patch-dc,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig Fri Dec 28 09:48:05 2001 ++++ ksysguard/ksysguardd/FreeBSD/CPU.c +@@ -19,7 +19,11 @@ + */ + + #include <sys/dkstat.h> ++#ifdef __NetBSD__ ++#include <sys/sched.h> /* CPUSTATES */ ++#else + #include <devstat.h> ++#endif + #include <fcntl.h> + #include <kvm.h> + #include <nlist.h> diff --git a/x11/kdebase3/patches/patch-dd b/x11/kdebase3/patches/patch-dd new file mode 100644 index 00000000000..1771716e172 --- /dev/null +++ b/x11/kdebase3/patches/patch-dd @@ -0,0 +1,86 @@ +$NetBSD: patch-dd,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Sep 14 22:11:20 2001 ++++ ksysguard/ksysguardd/FreeBSD/Memory.c +@@ -32,7 +32,12 @@ + #include <sys/types.h> + #include <sys/vmmeter.h> + #include <unistd.h> ++/* Everything post 1.5.x uses uvm/uvm_* includes */ ++#if __NetBSD_Version__ >= 105010000 ++#include <uvm/uvm_param.h> ++#else + #include <vm/vm_param.h> ++#endif + + #include "Command.h" + #include "Memory.h" +@@ -82,15 +87,25 @@ + struct vmtotal p; + FILE *file; + char buf[256]; ++ int rc; ++#ifndef __NetBSD__ + struct kvm_swap kswap[16]; + int i, swap_count, hlen, pagesize = getpagesize(); + long blocksize; ++#endif + + len = sizeof (Total); ++#ifdef __NetBSD__ ++ mib[0] = CTL_HW; ++ mib[1] = HW_PHYSMEM; ++ sysctl(mib, sizeof(mib), &Total, &len, NULL, 0); ++#else + sysctlbyname("hw.physmem", &Total, &len, NULL, 0); ++#endif + Total /= 1024; + + /* Borrowed from pstat */ ++#ifndef __NetBSD__ + swap_count = kvm_getswapinfo(kd, kswap, 16, SWIF_DEV_PREFIX); + getbsize(&hlen, &blocksize); + +@@ -101,24 +116,42 @@ + SUsed = CONVERT(kswap[0].ksw_used); + SFree = CONVERT(kswap[0].ksw_total - kswap[0].ksw_used); + } ++#endif + ++#ifdef __NetBSD__ ++ /* NetBSD doesn't know about vfs.bufspace */ ++ Buffers = -1; ++#else + len = sizeof (Buffers); + if ((sysctlbyname("vfs.bufspace", &Buffers, &len, NULL, 0) == -1) || !len) + Buffers = 0; /* Doesn't work under FreeBSD v2.2.x */ ++#endif + Buffers /= 1024; + + ++#ifdef __NetBSD__ ++ /* NetBSD doesn't know about vm.stats */ ++ Cached = -1; ++#else + len = sizeof (Cached); + if ((sysctlbyname("vm.stats.vm.v_cache_count", &Cached, &len, NULL, 0) == -1) || !len) + Cached = 0; /* Doesn't work under FreeBSD v2.2.x */ ++#endif + Cached *= getpagesize() / 1024; + + ++#ifdef __NetBSD__ ++ /* No idea where to get them right now. ++ * I don't want to start kmem-digging... */ ++ MFree = -1; ++ Used = -1; ++#else + /* initializes the pointer to the vmmeter struct */ + len = sizeof (p); + sysctlbyname("vm.vmmeter", &p, &len, NULL, 0); + MFree = p.t_free * getpagesize() / 1024; + Used = p.t_arm * getpagesize() / 1024 + Buffers + Cached; ++#endif + + return 0; + } diff --git a/x11/kdebase3/patches/patch-de b/x11/kdebase3/patches/patch-de new file mode 100644 index 00000000000..b7f7bd97854 --- /dev/null +++ b/x11/kdebase3/patches/patch-de @@ -0,0 +1,42 @@ +$NetBSD: patch-de,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001 ++++ ksysguard/ksysguardd/FreeBSD/apm.c +@@ -20,7 +20,13 @@ + */ + + #include <fcntl.h> ++#if defined(__NetBSD__) ++#include <machine/apmvar.h> ++#include <sys/ioctl.h> ++#include <unistd.h> ++#else + #include <machine/apm_bios.h> ++#endif + #include <stdio.h> + + #include "Command.h" +@@ -62,13 +68,22 @@ + int + updateApm(void) + { +- struct apm_info info; + int retval; ++#if defined(__NetBSD__) ++ struct apm_power_info info; ++ ++ retval = ioctl(ApmFD, APM_IOC_GETPOWER, &info); ++ ++ BattFill = info.battery_life; ++ BattTime = info.minutes_left; ++#else ++ struct apm_info info; + + retval = ioctl(ApmFD, APMIO_GETINFO, &info); + + BattFill = info.ai_batt_life; + BattTime = info.ai_batt_time; ++#endif + + return retval; + } diff --git a/x11/kdebase3/patches/patch-df b/x11/kdebase3/patches/patch-df new file mode 100644 index 00000000000..963355fe143 --- /dev/null +++ b/x11/kdebase3/patches/patch-df @@ -0,0 +1,67 @@ +$NetBSD: patch-df,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- ksysguard/ksysguardd/FreeBSD/netdev.c.orig Tue Sep 18 15:03:53 2001 ++++ ksysguard/ksysguardd/FreeBSD/netdev.c +@@ -20,4 +20,11 @@ + */ + ++#if defined(__NetBSD__) ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <ifaddrs.h> ++#include <net/if.h> ++#include <string.h> ++#else + #include <fcntl.h> + #include <sys/socket.h> +@@ -30,4 +37,5 @@ + #include <sys/types.h> + #include <unistd.h> ++#endif + + +@@ -84,4 +92,16 @@ + { + int counter = 0; ++ ++#if defined(__NetBSD__) ++ struct ifaddrs *ifap, *ifa; ++ ++ if (getifaddrs(&ifap) != 0) ++ return 0; ++ ++ for (ifa = ifap; ifa; ifa=ifa->ifa_next) { ++ if (ifa->ifa_flags & IFF_UP) ++ counter++; ++ } ++#else + int name[6]; + int num_iface, i; +@@ -105,4 +125,5 @@ + counter++; + } ++#endif + + return counter; +@@ -175,4 +196,15 @@ + void updateNetDev(void) + { ++#if defined(__NetBSD__) ++ struct ifaddrs *ifap, *ifa; ++ ++ if (getifaddrs(&ifap) != 0) ++ return; ++ ++ for (ifa = ifap; ifa; ifa=ifa->ifa_next) { ++ if (ifa->ifa_flags & IFF_UP) ++ ; ++ } ++#else + int name[6]; + int num_iface, i; +@@ -209,4 +241,5 @@ + } + } ++#endif + } + diff --git a/x11/kdebase3/patches/patch-dg b/x11/kdebase3/patches/patch-dg new file mode 100644 index 00000000000..a43468d73e7 --- /dev/null +++ b/x11/kdebase3/patches/patch-dg @@ -0,0 +1,42 @@ +$NetBSD: patch-dg,v 1.1.1.1 2002/05/31 13:19:18 skrll Exp $ + +--- kwin/Makefile.am.orig Wed May 8 19:23:01 2002 ++++ kwin/Makefile.am +@@ -3,13 +3,17 @@ + SUBDIRS = . kcmkwin pics clients + + bin_PROGRAMS = kwin +-lib_LTLIBRARIES = kwin.la ++lib_LTLIBRARIES = libkwin.la kwin.la + + # workspace.cpp has to be first in order not to break --enable-final +-kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ ++libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ + tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ + killwindow.cpp kwinbutton.cpp +-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) ++libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) ++libkwin_la_LDFLAGS = $(all_libraries) ++ ++kwin_la_SOURCES = kwin_main.cpp ++kwin_la_LIBADD = libkwin.la + kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version + + include_HEADERS = KWinInterface.h +@@ -18,7 +22,7 @@ + kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h + + kwin_SOURCES = kwin_main.cpp +-kwin_LDADD = kwin.la ++kwin_LDADD = libkwin.la + kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + KDE_ICON = kwin +@@ -34,7 +38,6 @@ + + sounddir= $(kde_sounddir) + sound_DATA = pop.wav +- + update_DATA = kwin.upd pluginlibFix.pl + updatedir = $(kde_datadir)/kconf_update + diff --git a/x11/kdebase3/patches/patch-dh b/x11/kdebase3/patches/patch-dh new file mode 100644 index 00000000000..1b1a0f868ce --- /dev/null +++ b/x11/kdebase3/patches/patch-dh @@ -0,0 +1,263 @@ +$NetBSD: patch-dh,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/Makefile.in.orig Mon May 13 23:57:54 2002 ++++ kwin/Makefile.in +@@ -293,18 +293,22 @@ + SUBDIRS = . kcmkwin pics clients + + bin_PROGRAMS = kwin +-lib_LTLIBRARIES = kwin.la ++lib_LTLIBRARIES = libkwin.la kwin.la + + # workspace.cpp has to be first in order not to break --enable-final +-#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ ++#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ + #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ + #>- killwindow.cpp kwinbutton.cpp + #>+ 3 +-kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ ++libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ + tabbox.cpp options.cpp plugins.cpp events.cpp \ + killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp + +-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) ++libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) ++libkwin_la_LDFLAGS = $(all_libraries) ++ ++kwin_la_SOURCES = kwin_main.cpp ++kwin_la_LIBADD = libkwin.la + kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version + + include_HEADERS = KWinInterface.h +@@ -313,7 +317,7 @@ + kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h + + kwin_SOURCES = kwin_main.cpp +-kwin_LDADD = kwin.la ++kwin_LDADD = libkwin.la + kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + KDE_ICON = kwin +@@ -324,7 +328,6 @@ + + sounddir = $(kde_sounddir) + sound_DATA = pop.wav +- + update_DATA = kwin.upd pluginlibFix.pl + updatedir = $(kde_datadir)/kconf_update + subdir = kwin +@@ -333,17 +336,24 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kwin_la_DEPENDENCIES = +-am_kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ +- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo ++kwin_la_DEPENDENCIES = libkwin.la ++am_kwin_la_OBJECTS = kwin_main.lo + #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) +-#>+ 6 +-kwin_la_final_OBJECTS = kwin_la.all_cpp.lo +-kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ +- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ +- kwin_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) ++#>+ 1 ++kwin_la_OBJECTS = kwin_main.lo ++libkwin_la_DEPENDENCIES = ++am_libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ ++ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ ++ kwinbutton.lo ++#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) ++#>+ 7 ++libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo ++libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ ++ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ ++ kwinbutton.lo KWinInterface_skel.lo \ ++ libkwin_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) + bin_PROGRAMS = kwin$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +@@ -351,7 +361,7 @@ + #>- kwin_OBJECTS = $(am_kwin_OBJECTS) + #>+ 1 + kwin_OBJECTS = kwin_main.$(OBJEXT) +-kwin_DEPENDENCIES = kwin.la ++kwin_DEPENDENCIES = libkwin.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -361,10 +371,10 @@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo ++ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -384,7 +394,7 @@ + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) ++DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) + DATA = $(data_DATA) $(sound_DATA) $(update_DATA) + + HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) +@@ -397,7 +407,7 @@ + DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ + Makefile.am Makefile.in + DIST_SUBDIRS = $(SUBDIRS) +-SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) ++SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) + + #>- all: all-recursive + #>+ 1 +@@ -446,6 +456,8 @@ + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) ++libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -484,6 +496,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/events.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/killwindow.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwinbutton.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ +@@ -694,7 +707,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=NEWCOLORSCHEME.README plugins.cpp stdclient_bitmaps.h kwin.upd options.cpp tabbox.h hi48-app-kwin.png pluginlibFix.pl LICENSE main.h hi32-app-kwin.png pop.wav kwinbutton.cpp events.cpp plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc killwindow.cpp tabbox.cpp hi16-app-kwin.png ++KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -851,12 +864,6 @@ + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: + +-#>+ 5 +-KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) +- $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) +-KWinInterface_skel.cpp: KWinInterface.kidl +- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl +- + #>+ 3 + workspace.moc: $(srcdir)/workspace.h + $(MOC) $(srcdir)/workspace.h -o workspace.moc +@@ -881,6 +888,12 @@ + plugins.moc: $(srcdir)/plugins.h + $(MOC) $(srcdir)/plugins.h -o plugins.moc + ++#>+ 5 ++KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) ++ $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) ++KWinInterface_skel.cpp: KWinInterface.kidl ++ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl ++ + #>+ 3 + clean-metasources: + -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc +@@ -915,28 +928,28 @@ + + + #>+ 12 +-kwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc +- @echo 'creating kwin_la_meta_unload.cpp' +- @-rm -f kwin_la_meta_unload.cpp ++libkwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc ++ @echo 'creating libkwin_la_meta_unload.cpp' ++ @-rm -f libkwin_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ +- cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ +- echo '0};' >> kwin_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kwin_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ +- else echo > kwin_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ ++ cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ ++ echo '0};' >> libkwin_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkwin_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ ++ else echo > libkwin_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kwin_la_meta_unload.cpp ++ -rm -f libkwin_la_meta_unload.cpp + + #>+ 11 +-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc ++kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc + @echo 'creating kwin_la.all_cpp.cpp ...'; \ + rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ +- for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ ++ for file in kwin_main.cpp ; do \ + echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ + done; \ +@@ -944,6 +957,18 @@ + rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files + + #>+ 11 ++libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ++ @echo 'creating libkwin_la.all_cpp.cpp ...'; \ ++ rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ ++ for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ ++ done; \ ++ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ ++ rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files ++ ++#>+ 11 + kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp + @echo 'creating kwin.all_cpp.cpp ...'; \ + rm -f kwin.all_cpp.files kwin.all_cpp.final; \ +@@ -957,20 +982,20 @@ + + #>+ 3 + clean-final: +- -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp ++ -rm -f kwin_la.all_cpp.cpp libkwin_la.all_cpp.cpp kwin.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/x11/kdebase3/patches/patch-di b/x11/kdebase3/patches/patch-di new file mode 100644 index 00000000000..c941e333b2f --- /dev/null +++ b/x11/kdebase3/patches/patch-di @@ -0,0 +1,13 @@ +$NetBSD: patch-di,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/b2/Makefile.am.orig Tue Feb 19 16:56:14 2002 ++++ kwin/clients/b2/Makefile.am +@@ -6,7 +6,7 @@ + kde_module_LTLIBRARIES = kwin_b2.la + + kwin_b2_la_SOURCES = b2client.cpp +-kwin_b2_la_LIBADD = ../../kwin.la ++kwin_b2_la_LIBADD = ../../libkwin.la + kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dj b/x11/kdebase3/patches/patch-dj new file mode 100644 index 00000000000..95c66829738 --- /dev/null +++ b/x11/kdebase3/patches/patch-dj @@ -0,0 +1,22 @@ +$NetBSD: patch-dj,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/b2/Makefile.in.orig Mon May 13 23:57:54 2002 ++++ kwin/clients/b2/Makefile.in +@@ -294,7 +294,7 @@ + kde_module_LTLIBRARIES = kwin_b2.la + + kwin_b2_la_SOURCES = b2client.cpp +-kwin_b2_la_LIBADD = ../../kwin.la ++kwin_b2_la_LIBADD = ../../libkwin.la + kwin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -310,7 +310,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_b2_la_DEPENDENCIES = ../../kwin.la ++kwin_b2_la_DEPENDENCIES = ../../libkwin.la + am_kwin_b2_la_OBJECTS = b2client.lo + #>- kwin_b2_la_OBJECTS = $(am_kwin_b2_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-dk b/x11/kdebase3/patches/patch-dk new file mode 100644 index 00000000000..a9198c5ef5c --- /dev/null +++ b/x11/kdebase3/patches/patch-dk @@ -0,0 +1,13 @@ +$NetBSD: patch-dk,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/default/Makefile.am.orig Tue Feb 19 16:56:14 2002 ++++ kwin/clients/default/Makefile.am +@@ -6,7 +6,7 @@ + kde_module_LTLIBRARIES = kwin_default.la + + kwin_default_la_SOURCES = kdedefault.cpp +-kwin_default_la_LIBADD = ../../kwin.la ++kwin_default_la_LIBADD = ../../libkwin.la + kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dl b/x11/kdebase3/patches/patch-dl new file mode 100644 index 00000000000..9d5b5bec7f3 --- /dev/null +++ b/x11/kdebase3/patches/patch-dl @@ -0,0 +1,22 @@ +$NetBSD: patch-dl,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/default/Makefile.in.orig Mon May 13 23:57:54 2002 ++++ kwin/clients/default/Makefile.in +@@ -294,7 +294,7 @@ + kde_module_LTLIBRARIES = kwin_default.la + + kwin_default_la_SOURCES = kdedefault.cpp +-kwin_default_la_LIBADD = ../../kwin.la ++kwin_default_la_LIBADD = ../../libkwin.la + kwin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -305,7 +305,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_default_la_DEPENDENCIES = ../../kwin.la ++kwin_default_la_DEPENDENCIES = ../../libkwin.la + am_kwin_default_la_OBJECTS = kdedefault.lo + #>- kwin_default_la_OBJECTS = $(am_kwin_default_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-dm b/x11/kdebase3/patches/patch-dm new file mode 100644 index 00000000000..af723c401b5 --- /dev/null +++ b/x11/kdebase3/patches/patch-dm @@ -0,0 +1,13 @@ +$NetBSD: patch-dm,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/icewm/Makefile.am.orig Tue Feb 19 16:56:14 2002 ++++ kwin/clients/icewm/Makefile.am +@@ -5,7 +5,7 @@ + kde_module_LTLIBRARIES = kwin_icewm.la + + kwin_icewm_la_SOURCES = icewm.cpp +-kwin_icewm_la_LIBADD = ../../kwin.la ++kwin_icewm_la_LIBADD = ../../libkwin.la + kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dn b/x11/kdebase3/patches/patch-dn new file mode 100644 index 00000000000..078788c27ce --- /dev/null +++ b/x11/kdebase3/patches/patch-dn @@ -0,0 +1,22 @@ +$NetBSD: patch-dn,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/icewm/Makefile.in.orig Mon May 13 23:57:55 2002 ++++ kwin/clients/icewm/Makefile.in +@@ -294,7 +294,7 @@ + kde_module_LTLIBRARIES = kwin_icewm.la + + kwin_icewm_la_SOURCES = icewm.cpp +-kwin_icewm_la_LIBADD = ../../kwin.la ++kwin_icewm_la_LIBADD = ../../libkwin.la + kwin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -310,7 +310,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_icewm_la_DEPENDENCIES = ../../kwin.la ++kwin_icewm_la_DEPENDENCIES = ../../libkwin.la + am_kwin_icewm_la_OBJECTS = icewm.lo + #>- kwin_icewm_la_OBJECTS = $(am_kwin_icewm_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-do b/x11/kdebase3/patches/patch-do new file mode 100644 index 00000000000..ddb2d551513 --- /dev/null +++ b/x11/kdebase3/patches/patch-do @@ -0,0 +1,13 @@ +$NetBSD: patch-do,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kde1/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/kde1/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_kde1.la + + kwin_kde1_la_SOURCES = kde1client.cpp +-kwin_kde1_la_LIBADD = ../../kwin.la ++kwin_kde1_la_LIBADD = ../../libkwin.la + kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dp b/x11/kdebase3/patches/patch-dp new file mode 100644 index 00000000000..a8c49220cb2 --- /dev/null +++ b/x11/kdebase3/patches/patch-dp @@ -0,0 +1,31 @@ +$NetBSD: patch-dp,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kde1/Makefile.in.orig Mon May 13 23:57:56 2002 ++++ kwin/clients/kde1/Makefile.in +@@ -292,7 +292,7 @@ + kde_module_LTLIBRARIES = kwin_kde1.la + + kwin_kde1_la_SOURCES = kde1client.cpp +-kwin_kde1_la_LIBADD = ../../kwin.la ++kwin_kde1_la_LIBADD = ../../libkwin.la + kwin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -307,7 +307,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_kde1_la_DEPENDENCIES = ../../kwin.la ++kwin_kde1_la_DEPENDENCIES = ../../libkwin.la + am_kwin_kde1_la_OBJECTS = kde1client.lo + #>- kwin_kde1_la_OBJECTS = $(am_kwin_kde1_la_OBJECTS) + #>+ 5 +@@ -484,7 +484,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kde1.desktop kde1client_bitmaps.h ++KDE_DIST=kde1client_bitmaps.h kde1.desktop + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-dq b/x11/kdebase3/patches/patch-dq new file mode 100644 index 00000000000..ac3b88ef49e --- /dev/null +++ b/x11/kdebase3/patches/patch-dq @@ -0,0 +1,13 @@ +$NetBSD: patch-dq,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kstep/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/kstep/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_kstep.la + + kwin_kstep_la_SOURCES = nextclient.cpp +-kwin_kstep_la_LIBADD = ../../kwin.la ++kwin_kstep_la_LIBADD = ../../libkwin.la + kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dr b/x11/kdebase3/patches/patch-dr new file mode 100644 index 00000000000..fb1c2dfb202 --- /dev/null +++ b/x11/kdebase3/patches/patch-dr @@ -0,0 +1,22 @@ +$NetBSD: patch-dr,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kstep/Makefile.in.orig Mon May 13 23:57:56 2002 ++++ kwin/clients/kstep/Makefile.in +@@ -292,7 +292,7 @@ + kde_module_LTLIBRARIES = kwin_kstep.la + + kwin_kstep_la_SOURCES = nextclient.cpp +-kwin_kstep_la_LIBADD = ../../kwin.la ++kwin_kstep_la_LIBADD = ../../libkwin.la + kwin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -308,7 +308,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_kstep_la_DEPENDENCIES = ../../kwin.la ++kwin_kstep_la_DEPENDENCIES = ../../libkwin.la + am_kwin_kstep_la_OBJECTS = nextclient.lo + #>- kwin_kstep_la_OBJECTS = $(am_kwin_kstep_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-ds b/x11/kdebase3/patches/patch-ds new file mode 100644 index 00000000000..d30edb61d45 --- /dev/null +++ b/x11/kdebase3/patches/patch-ds @@ -0,0 +1,13 @@ +$NetBSD: patch-ds,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kwmtheme/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/kwmtheme/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_kwmtheme.la + + kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp +-kwin_kwmtheme_la_LIBADD = ../../kwin.la ++kwin_kwmtheme_la_LIBADD = ../../libkwin.la + kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dt b/x11/kdebase3/patches/patch-dt new file mode 100644 index 00000000000..dd8571f7533 --- /dev/null +++ b/x11/kdebase3/patches/patch-dt @@ -0,0 +1,22 @@ +$NetBSD: patch-dt,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/kwmtheme/Makefile.in.orig Mon May 13 23:57:56 2002 ++++ kwin/clients/kwmtheme/Makefile.in +@@ -293,7 +293,7 @@ + kde_module_LTLIBRARIES = kwin_kwmtheme.la + + kwin_kwmtheme_la_SOURCES = kwmthemeclient.cpp +-kwin_kwmtheme_la_LIBADD = ../../kwin.la ++kwin_kwmtheme_la_LIBADD = ../../libkwin.la + kwin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -304,7 +304,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_kwmtheme_la_DEPENDENCIES = ../../kwin.la ++kwin_kwmtheme_la_DEPENDENCIES = ../../libkwin.la + am_kwin_kwmtheme_la_OBJECTS = kwmthemeclient.lo + #>- kwin_kwmtheme_la_OBJECTS = $(am_kwin_kwmtheme_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-du b/x11/kdebase3/patches/patch-du new file mode 100644 index 00000000000..c4123e3bf17 --- /dev/null +++ b/x11/kdebase3/patches/patch-du @@ -0,0 +1,13 @@ +$NetBSD: patch-du,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/laptop/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/laptop/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_laptop.la + + kwin_laptop_la_SOURCES = laptopclient.cpp +-kwin_laptop_la_LIBADD = ../../kwin.la ++kwin_laptop_la_LIBADD = ../../libkwin.la + kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dv b/x11/kdebase3/patches/patch-dv new file mode 100644 index 00000000000..6c7d5e25728 --- /dev/null +++ b/x11/kdebase3/patches/patch-dv @@ -0,0 +1,22 @@ +$NetBSD: patch-dv,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/laptop/Makefile.in.orig Mon May 13 23:57:56 2002 ++++ kwin/clients/laptop/Makefile.in +@@ -292,7 +292,7 @@ + kde_module_LTLIBRARIES = kwin_laptop.la + + kwin_laptop_la_SOURCES = laptopclient.cpp +-kwin_laptop_la_LIBADD = ../../kwin.la ++kwin_laptop_la_LIBADD = ../../libkwin.la + kwin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -308,7 +308,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_laptop_la_DEPENDENCIES = ../../kwin.la ++kwin_laptop_la_DEPENDENCIES = ../../libkwin.la + am_kwin_laptop_la_OBJECTS = laptopclient.lo + #>- kwin_laptop_la_OBJECTS = $(am_kwin_laptop_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-dw b/x11/kdebase3/patches/patch-dw new file mode 100644 index 00000000000..16c7195d2e6 --- /dev/null +++ b/x11/kdebase3/patches/patch-dw @@ -0,0 +1,13 @@ +$NetBSD: patch-dw,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/modernsystem/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/modernsystem/Makefile.am +@@ -7,7 +7,7 @@ + kde_module_LTLIBRARIES = kwin_modernsys.la + + kwin_modernsys_la_SOURCES = modernsys.cpp +-kwin_modernsys_la_LIBADD = ../../kwin.la ++kwin_modernsys_la_LIBADD = ../../libkwin.la + kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dx b/x11/kdebase3/patches/patch-dx new file mode 100644 index 00000000000..23d075d1d98 --- /dev/null +++ b/x11/kdebase3/patches/patch-dx @@ -0,0 +1,31 @@ +$NetBSD: patch-dx,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/modernsystem/Makefile.in.orig Mon May 13 23:57:56 2002 ++++ kwin/clients/modernsystem/Makefile.in +@@ -296,7 +296,7 @@ + kde_module_LTLIBRARIES = kwin_modernsys.la + + kwin_modernsys_la_SOURCES = modernsys.cpp +-kwin_modernsys_la_LIBADD = ../../kwin.la ++kwin_modernsys_la_LIBADD = ../../libkwin.la + kwin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -312,7 +312,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_modernsys_la_DEPENDENCIES = ../../kwin.la ++kwin_modernsys_la_DEPENDENCIES = ../../libkwin.la + am_kwin_modernsys_la_OBJECTS = modernsys.lo + #>- kwin_modernsys_la_OBJECTS = $(am_kwin_modernsys_la_OBJECTS) + #>+ 5 +@@ -555,7 +555,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=buttondata.h btnhighcolor.h modernsystem.desktop ++KDE_DIST=btnhighcolor.h buttondata.h modernsystem.desktop + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-dy b/x11/kdebase3/patches/patch-dy new file mode 100644 index 00000000000..45880515e90 --- /dev/null +++ b/x11/kdebase3/patches/patch-dy @@ -0,0 +1,13 @@ +$NetBSD: patch-dy,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/quartz/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/quartz/Makefile.am +@@ -6,7 +6,7 @@ + kde_module_LTLIBRARIES = kwin_quartz.la + + kwin_quartz_la_SOURCES = quartz.cpp +-kwin_quartz_la_LIBADD = ../../kwin.la ++kwin_quartz_la_LIBADD = ../../libkwin.la + kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-dz b/x11/kdebase3/patches/patch-dz new file mode 100644 index 00000000000..f9400e10fea --- /dev/null +++ b/x11/kdebase3/patches/patch-dz @@ -0,0 +1,22 @@ +$NetBSD: patch-dz,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/quartz/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kwin/clients/quartz/Makefile.in +@@ -294,7 +294,7 @@ + kde_module_LTLIBRARIES = kwin_quartz.la + + kwin_quartz_la_SOURCES = quartz.cpp +-kwin_quartz_la_LIBADD = ../../kwin.la ++kwin_quartz_la_LIBADD = ../../libkwin.la + kwin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -310,7 +310,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_quartz_la_DEPENDENCIES = ../../kwin.la ++kwin_quartz_la_DEPENDENCIES = ../../libkwin.la + am_kwin_quartz_la_OBJECTS = quartz.lo + #>- kwin_quartz_la_OBJECTS = $(am_kwin_quartz_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-ea b/x11/kdebase3/patches/patch-ea new file mode 100644 index 00000000000..431413a0e83 --- /dev/null +++ b/x11/kdebase3/patches/patch-ea @@ -0,0 +1,13 @@ +$NetBSD: patch-ea,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/redmond/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/redmond/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_redmond.la + + kwin_redmond_la_SOURCES = redmond.cpp +-kwin_redmond_la_LIBADD = ../../kwin.la ++kwin_redmond_la_LIBADD = ../../libkwin.la + kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-eb b/x11/kdebase3/patches/patch-eb new file mode 100644 index 00000000000..2c87032d196 --- /dev/null +++ b/x11/kdebase3/patches/patch-eb @@ -0,0 +1,22 @@ +$NetBSD: patch-eb,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/redmond/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kwin/clients/redmond/Makefile.in +@@ -292,7 +292,7 @@ + kde_module_LTLIBRARIES = kwin_redmond.la + + kwin_redmond_la_SOURCES = redmond.cpp +-kwin_redmond_la_LIBADD = ../../kwin.la ++kwin_redmond_la_LIBADD = ../../libkwin.la + kwin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -308,7 +308,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_redmond_la_DEPENDENCIES = ../../kwin.la ++kwin_redmond_la_DEPENDENCIES = ../../libkwin.la + am_kwin_redmond_la_OBJECTS = redmond.lo + #>- kwin_redmond_la_OBJECTS = $(am_kwin_redmond_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-ec b/x11/kdebase3/patches/patch-ec new file mode 100644 index 00000000000..70bc2057449 --- /dev/null +++ b/x11/kdebase3/patches/patch-ec @@ -0,0 +1,13 @@ +$NetBSD: patch-ec,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/riscos/Makefile.am.orig Tue Feb 19 16:56:15 2002 ++++ kwin/clients/riscos/Makefile.am +@@ -12,7 +12,7 @@ + StickyButton.cpp \ + HelpButton.cpp \ + Static.cpp +-kwin_riscos_la_LIBADD = ../../kwin.la ++kwin_riscos_la_LIBADD = ../../libkwin.la + kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-ed b/x11/kdebase3/patches/patch-ed new file mode 100644 index 00000000000..6014d36f826 --- /dev/null +++ b/x11/kdebase3/patches/patch-ed @@ -0,0 +1,31 @@ +$NetBSD: patch-ed,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/riscos/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kwin/clients/riscos/Makefile.in +@@ -302,7 +302,7 @@ + HelpButton.cpp \ + Static.cpp + +-kwin_riscos_la_LIBADD = ../../kwin.la ++kwin_riscos_la_LIBADD = ../../libkwin.la + kwin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -328,7 +328,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_riscos_la_DEPENDENCIES = ../../kwin.la ++kwin_riscos_la_DEPENDENCIES = ../../libkwin.la + am_kwin_riscos_la_OBJECTS = Button.lo CloseButton.lo IconifyButton.lo \ + LowerButton.lo Manager.lo MaximiseButton.lo StickyButton.lo \ + HelpButton.lo Static.lo +@@ -522,7 +522,7 @@ + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=Palette.h riscos.desktop ++KDE_DIST=riscos.desktop Palette.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + diff --git a/x11/kdebase3/patches/patch-ee b/x11/kdebase3/patches/patch-ee new file mode 100644 index 00000000000..d5b20a1c86e --- /dev/null +++ b/x11/kdebase3/patches/patch-ee @@ -0,0 +1,13 @@ +$NetBSD: patch-ee,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/system/Makefile.am.orig Tue Feb 19 16:56:16 2002 ++++ kwin/clients/system/Makefile.am +@@ -4,7 +4,7 @@ + kde_module_LTLIBRARIES = kwin_system.la + + kwin_system_la_SOURCES = systemclient.cpp +-kwin_system_la_LIBADD = ../../kwin.la ++kwin_system_la_LIBADD = ../../libkwin.la + kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + METASOURCES = AUTO diff --git a/x11/kdebase3/patches/patch-ef b/x11/kdebase3/patches/patch-ef new file mode 100644 index 00000000000..877681938e9 --- /dev/null +++ b/x11/kdebase3/patches/patch-ef @@ -0,0 +1,22 @@ +$NetBSD: patch-ef,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/system/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kwin/clients/system/Makefile.in +@@ -292,7 +292,7 @@ + kde_module_LTLIBRARIES = kwin_system.la + + kwin_system_la_SOURCES = systemclient.cpp +-kwin_system_la_LIBADD = ../../kwin.la ++kwin_system_la_LIBADD = ../../libkwin.la + kwin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + + #>- METASOURCES = AUTO +@@ -308,7 +308,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_system_la_DEPENDENCIES = ../../kwin.la ++kwin_system_la_DEPENDENCIES = ../../libkwin.la + am_kwin_system_la_OBJECTS = systemclient.lo + #>- kwin_system_la_OBJECTS = $(am_kwin_system_la_OBJECTS) + #>+ 5 diff --git a/x11/kdebase3/patches/patch-eg b/x11/kdebase3/patches/patch-eg new file mode 100644 index 00000000000..1defdf9deee --- /dev/null +++ b/x11/kdebase3/patches/patch-eg @@ -0,0 +1,13 @@ +$NetBSD: patch-eg,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/web/Makefile.am.orig Tue Feb 19 16:56:16 2002 ++++ kwin/clients/web/Makefile.am +@@ -21,7 +21,7 @@ + WebButtonMaximize.h \ + WebButtonSticky.h + +-kwin_web_la_LIBADD = ../../kwin.la ++kwin_web_la_LIBADD = ../../libkwin.la + kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + METASOURCES = AUTO + diff --git a/x11/kdebase3/patches/patch-eh b/x11/kdebase3/patches/patch-eh new file mode 100644 index 00000000000..cf9103acc48 --- /dev/null +++ b/x11/kdebase3/patches/patch-eh @@ -0,0 +1,22 @@ +$NetBSD: patch-eh,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kwin/clients/web/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kwin/clients/web/Makefile.in +@@ -312,7 +312,7 @@ + WebButtonSticky.h + + +-kwin_web_la_LIBADD = ../../kwin.la ++kwin_web_la_LIBADD = ../../libkwin.la + kwin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module + #>- METASOURCES = AUTO + +@@ -325,7 +325,7 @@ + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(kde_module_LTLIBRARIES) + +-kwin_web_la_DEPENDENCIES = ../../kwin.la ++kwin_web_la_DEPENDENCIES = ../../libkwin.la + am_kwin_web_la_OBJECTS = Web.lo WebButton.lo WebButtonClose.lo \ + WebButtonHelp.lo WebButtonIconify.lo WebButtonLower.lo \ + WebButtonMaximize.lo WebButtonSticky.lo diff --git a/x11/kdebase3/patches/patch-ei b/x11/kdebase3/patches/patch-ei new file mode 100644 index 00000000000..25e080fd8f4 --- /dev/null +++ b/x11/kdebase3/patches/patch-ei @@ -0,0 +1,42 @@ +$NetBSD: patch-ei,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kxkb/Makefile.am.orig Wed May 8 19:23:13 2002 ++++ kxkb/Makefile.am +@@ -3,11 +3,11 @@ + + bin_PROGRAMS = kxkb + +-kxkb_SOURCES = dummy.cpp ++kxkb_SOURCES = kxkb_main.cpp + kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kxkb_LDADD = kxkb.la ++kxkb_LDADD = libkxkb_main.la + +-lib_LTLIBRARIES = kxkb.la ++lib_LTLIBRARIES = libkxkb_main.la kxkb.la + kde_module_LTLIBRARIES = kcm_keyboard.la + + kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp +@@ -15,9 +15,13 @@ + kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) + +-kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_LDFLAGS = $(all_libraries) ++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++ ++kxkb_la_SOURCES = kxkb_main.cpp + kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++kxkb_la_LIBADD = libkxkb_main.la + + data_DATA = keyboard.desktop + datadir = $(kde_appsdir)/Settings/Peripherals +@@ -32,6 +36,3 @@ + messages: + $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot + $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot +- +-dummy.cpp: +- echo > dummy.cpp diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej new file mode 100644 index 00000000000..03b0056e3d0 --- /dev/null +++ b/x11/kdebase3/patches/patch-ej @@ -0,0 +1,243 @@ +$NetBSD: patch-ej,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kxkb/Makefile.in.orig Mon May 13 23:57:57 2002 ++++ kxkb/Makefile.in +@@ -292,11 +292,11 @@ + + bin_PROGRAMS = kxkb + +-kxkb_SOURCES = dummy.cpp ++kxkb_SOURCES = kxkb_main.cpp + kxkb_LDFLAGS = $(all_libraries) $(KDE_RPATH) +-kxkb_LDADD = kxkb.la ++kxkb_LDADD = libkxkb_main.la + +-lib_LTLIBRARIES = kxkb.la ++lib_LTLIBRARIES = libkxkb_main.la kxkb.la + kde_module_LTLIBRARIES = kcm_keyboard.la + + kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp +@@ -304,9 +304,13 @@ + kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined + kcm_keyboard_la_LIBADD = @XTESTLIB@ $(LIB_KFILE) + +-kxkb_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_SOURCES = rules.cpp kxkb.cpp extension.cpp pixmap.cpp ++libkxkb_main_la_LDFLAGS = $(all_libraries) ++libkxkb_main_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++ ++kxkb_la_SOURCES = kxkb_main.cpp + kxkb_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kxkb_la_LIBADD = -lX11 -lXext $(LIB_KDEUI) ++kxkb_la_LIBADD = libkxkb_main.la + + data_DATA = keyboard.desktop + +@@ -327,23 +331,28 @@ + kcm_keyboard_la_meta_unload.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 = +-am_kxkb_la_OBJECTS = rules.lo kxkb.lo extension.lo pixmap.lo ++kxkb_la_DEPENDENCIES = libkxkb_main.la ++am_kxkb_la_OBJECTS = kxkb_main.lo + #>- kxkb_la_OBJECTS = $(am_kxkb_la_OBJECTS) ++#>+ 1 ++kxkb_la_OBJECTS = kxkb_main.lo ++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 +-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 +-@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 ++@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) + PROGRAMS = $(bin_PROGRAMS) + +-am_kxkb_OBJECTS = dummy.$(OBJEXT) ++am_kxkb_OBJECTS = kxkb_main.$(OBJEXT) + #>- kxkb_OBJECTS = $(am_kxkb_OBJECTS) + #>+ 1 +-kxkb_OBJECTS = dummy.$(OBJEXT) +-kxkb_DEPENDENCIES = kxkb.la ++kxkb_OBJECTS = kxkb_main.$(OBJEXT) ++kxkb_DEPENDENCIES = libkxkb_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -351,10 +360,10 @@ + 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 + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -375,11 +384,11 @@ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ +- $(kxkb_SOURCES) ++ $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) + DATA = $(data_DATA) $(services_DATA) + + DIST_COMMON = Makefile.am Makefile.in TODO +-SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(kxkb_SOURCES) ++SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) $(libkxkb_main_la_SOURCES) $(kxkb_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -452,6 +461,8 @@ + $(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) ++libkxkb_main.la: $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkxkb_main_la_LDFLAGS) $(libkxkb_main_la_OBJECTS) $(libkxkb_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -486,11 +497,12 @@ + distclean-compile: + -rm -f *.tab.c + +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/extension.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmlayout.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcmmisc.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kxkb_main.Po@am__quote@ + @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 @@ + + #>- 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=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) + +@@ -722,9 +734,6 @@ + messages: + $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot + $(XGETTEXT) $(kcm_keyboard_la_SOURCES) kxkbbindings.cpp -o $(podir)/kcmlayout.pot +- +-dummy.cpp: +- echo > dummy.cpp + # 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 @@ + 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 ++ @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 \ ++ 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 @@ + + #>+ 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 + + #>+ 2 + final: +- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" all-am ++ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_final_OBJECTS)" install-am ++ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_final_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" all-am ++ $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" libkxkb_main_la_OBJECTS="$(libkxkb_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kcm_keyboard_la_OBJECTS="$(kcm_keyboard_la_nofinal_OBJECTS)" kxkb_la_OBJECTS="$(kxkb_la_nofinal_OBJECTS)" install-am ++ $(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 diff --git a/x11/kdebase3/patches/patch-ek b/x11/kdebase3/patches/patch-ek new file mode 100644 index 00000000000..5624f5dd5ad --- /dev/null +++ b/x11/kdebase3/patches/patch-ek @@ -0,0 +1,15 @@ +$NetBSD: patch-ek,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kxkb/kxkb.cpp.orig Sat Mar 2 22:03:52 2002 ++++ kxkb/kxkb.cpp +@@ -483,7 +483,9 @@ + const char * DESCRIPTION = + I18N_NOOP("A utility to switch keyboard maps."); + +-int main(int argc, char *argv[]) ++extern "C" int kdemain(int argc, char *argv[]); ++ ++int kdemain(int argc, char *argv[]) + { + KAboutData about("kxkb", I18N_NOOP("KDE Keyboard Tool"), "0.6", + DESCRIPTION, KAboutData::License_LGPL, diff --git a/x11/kdebase3/patches/patch-el b/x11/kdebase3/patches/patch-el new file mode 100644 index 00000000000..f58fb0b3637 --- /dev/null +++ b/x11/kdebase3/patches/patch-el @@ -0,0 +1,33 @@ +$NetBSD: patch-el,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- kxkb/kxkb_main.cpp.orig Thu May 30 10:00:15 2002 ++++ kxkb/kxkb_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-em b/x11/kdebase3/patches/patch-em new file mode 100644 index 00000000000..95503708c36 --- /dev/null +++ b/x11/kdebase3/patches/patch-em @@ -0,0 +1,28 @@ +$NetBSD: patch-em,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- legacyimport/Makefile.am.orig Wed May 16 02:41:36 2001 ++++ legacyimport/Makefile.am +@@ -1,14 +1,18 @@ + INCLUDES = $(all_includes) + + bin_PROGRAMS = klegacyimport +-lib_LTLIBRARIES = klegacyimport.la ++lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la + +-klegacyimport_la_SOURCES = legacyimport.cpp +-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libklegacyimport_main_la_SOURCES = legacyimport.cpp ++libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE) ++libklegacyimport_main_la_LDFLAGS = $(all_libraries) ++ ++klegacyimport_la_SOURCES = klegacyimport_main.cpp ++klegacyimport_la_LIBADD = libklegacyimport_main.la + klegacyimport_la_LDFLAGS = $(all_libraries) -module -avoid-version + +-klegacyimport_SOURCES = dummy.cpp +-klegacyimport_LDADD = klegacyimport.la ++klegacyimport_SOURCES = klegacyimport_main.cpp ++klegacyimport_LDADD = libklegacyimport_main.la + klegacyimport_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + noinst_HEADERS = legacyimport.h diff --git a/x11/kdebase3/patches/patch-en b/x11/kdebase3/patches/patch-en new file mode 100644 index 00000000000..eafc0a8bcbb --- /dev/null +++ b/x11/kdebase3/patches/patch-en @@ -0,0 +1,33 @@ +$NetBSD: patch-en,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- legacyimport/klegacyimport_main.cpp.orig Thu May 30 10:00:16 2002 ++++ legacyimport/klegacyimport_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/x11/kdebase3/patches/patch-eo b/x11/kdebase3/patches/patch-eo new file mode 100644 index 00000000000..607acd48197 --- /dev/null +++ b/x11/kdebase3/patches/patch-eo @@ -0,0 +1,15 @@ +$NetBSD: patch-eo,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- legacyimport/legacyimport.cpp.orig Sat Jan 5 13:21:31 2002 ++++ legacyimport/legacyimport.cpp +@@ -161,7 +161,9 @@ + kapp->quit(); + } + +-int main(int argc, char **argv) ++extern "C" int kdemain(int, char **); ++ ++int kdemain(int argc, char **argv) + { + KAboutData aboutData("klegacyimport", I18N_NOOP("KLegacyImport"), + "v0.1", I18N_NOOP("Importer for legacy themes"), diff --git a/x11/kdebase3/patches/patch-ep b/x11/kdebase3/patches/patch-ep new file mode 100644 index 00000000000..a4145f3dbdd --- /dev/null +++ b/x11/kdebase3/patches/patch-ep @@ -0,0 +1,53 @@ +$NetBSD: patch-ep,v 1.1.1.1 2002/05/31 13:19:19 skrll Exp $ + +--- startkde.orig Wed May 8 22:08:15 2002 ++++ startkde +@@ -17,7 +17,7 @@ + # + # * Then ksmserver is started which in turn starts + # 1) the window manager (kwin) +-# 2) everything in $KDEDIR/share/autostart (kdesktop, kicker, etc.) ++# 2) everything in $KDEDIR/share/kde/autostart (kdesktop, kicker, etc.) + # 3) the rest of the session. + + # Set a left cursor instead of the standard X11 "X" cursor, since I've heard +@@ -56,15 +56,15 @@ + # Where X is the original font database that was set up before this script + # runs. + +-usr_odir=$kdehome/share/fonts/override +-usr_fdir=$kdehome/share/fonts ++usr_odir=$kdehome/share/kde/fonts/override ++usr_fdir=$kdehome/share/kde/fonts + if test -n "$KDEDIRS"; then + kdedirs_first=`echo $KDEDIRS|sed -e 's/:.*//'` +- sys_odir=$kdedirs_first/share/fonts/override +- sys_fdir=$kdedirs_first/share/fonts ++ sys_odir=$kdedirs_first/share/kde/fonts/override ++ sys_fdir=$kdedirs_first/share/kde/fonts + else +- sys_odir=$KDEDIR/share/fonts/override +- sys_fdir=$KDEDIR/share/fonts ++ sys_odir=$KDEDIR/share/kde/fonts/override ++ sys_fdir=$KDEDIR/share/kde/fonts + fi + + # We run mkfontdir on the user's font dirs (if we have permission) to pick +@@ -79,7 +79,7 @@ + + # + # Add any user-installed font directories to the X font path +-kde_fontsdir=$kdehome/share/fonts ++kde_fontsdir=$kdehome/share/kde/fonts + kde_fontpaths=$kde_fontsdir/fontpaths + + if test -r $kde_fontpaths ; then +@@ -115,7 +115,7 @@ + dcopserver_shutdown + + # run KPersonalizer before the session, if this is the first login +-grep 'FirstLogin=false' $kdehome/share/config/kpersonalizerrc >/dev/null 2>/dev/null ++grep 'FirstLogin=false' $kdehome/share/kde/config/kpersonalizerrc >/dev/null 2>/dev/null + if test $? -ne 0; then + # start only dcopserver, don't start whole kdeinit (takes too long) + dcopserver |