diff options
Diffstat (limited to 'x11/kdelibs3/patches/patch-ab')
| -rw-r--r-- | x11/kdelibs3/patches/patch-ab | 148 |
1 files changed, 51 insertions, 97 deletions
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab index d66a06b3a4a..546117db720 100644 --- a/x11/kdelibs3/patches/patch-ab +++ b/x11/kdelibs3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ ---- arts/knotify/Makefile.in.orig Tue May 21 15:42:03 2002 +--- arts/knotify/Makefile.in.orig Tue Nov 26 08:57:39 2002 +++ arts/knotify/Makefile.in -@@ -267,17 +267,22 @@ +@@ -267,17 +267,22 @@ INCLUDES = -I$(includedir)/arts $(all_in ####### Files bin_PROGRAMS = knotify @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) check_PROGRAMS = knotifytest -@@ -295,24 +300,29 @@ +@@ -295,23 +300,28 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -45,15 +45,13 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ +libknotify_main_la_DEPENDENCIES = +am_libknotify_main_la_OBJECTS = knotify.lo +#>- libknotify_main_la_OBJECTS = $(am_libknotify_main_la_OBJECTS) - #>+ 5 + #>+ 4 -knotify_la_final_OBJECTS = knotify_la.all_cpp.lo --knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ -- knotify_la_meta_unload.lo +-knotify_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo -@KDE_USE_FINAL_FALSE@knotify_la_OBJECTS = $(knotify_la_nofinal_OBJECTS) -@KDE_USE_FINAL_TRUE@knotify_la_OBJECTS = $(knotify_la_final_OBJECTS) +libknotify_main_la_final_OBJECTS = libknotify_main_la.all_cpp.lo -+libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo \ -+ libknotify_main_la_meta_unload.lo ++libknotify_main_la_nofinal_OBJECTS = knotify.lo knotify_skel.lo +@KDE_USE_FINAL_FALSE@libknotify_main_la_OBJECTS = $(libknotify_main_la_nofinal_OBJECTS) +@KDE_USE_FINAL_TRUE@libknotify_main_la_OBJECTS = $(libknotify_main_la_final_OBJECTS) bin_PROGRAMS = knotify$(EXEEXT) @@ -71,18 +69,27 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ am_knotifytest_OBJECTS = knotifytest.$(OBJEXT) #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS) #>+ 1 -@@ -325,8 +335,8 @@ +@@ -324,13 +334,13 @@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ -- @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po -+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ -+ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po +-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-#>- @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po ++#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++#>- @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po + #>+ 5 +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/dummy.Po $(DEPDIR)/knotify.Plo \ +-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/knotifytest.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/libknotify_main_la.all_cpp.P $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/knotify.Plo $(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/knotify_main.Po $(DEPDIR)/knotifytest.Po + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) - #>+ 2 -@@ -346,14 +356,14 @@ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +@@ -351,14 +361,14 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -100,7 +107,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ #>- all: all-am #>+ 1 -@@ -402,6 +412,8 @@ +@@ -407,6 +417,8 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) @@ -109,7 +116,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -442,8 +454,9 @@ +@@ -447,8 +459,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -120,16 +127,7 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotifytest.Po@am__quote@ distclean-depend: -@@ -520,7 +533,7 @@ - - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 4 --KDE_DIST=README.knotify_and_arts knotify.desktop -+KDE_DIST=knotify.desktop README.knotify_and_arts - - DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) - -@@ -639,13 +652,14 @@ +@@ -644,13 +657,14 @@ uninstall-am: uninstall-binPROGRAMS unin messages: $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot @@ -145,9 +143,9 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ + $(MOC) $(srcdir)/knotify.h -o knotify.moc + #>+ 5 - knotify.kidl: $(srcdir)/knotify.h $(DCOPIDL_DEPENDENCIES) + knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false ) -@@ -658,7 +672,7 @@ +@@ -663,7 +677,7 @@ knotify.moc: $(srcdir)/knotify.h #>+ 3 clean-metasources: @@ -156,79 +154,33 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ #>+ 4 clean-idl: -@@ -676,28 +690,28 @@ - - - #>+ 12 --knotify_la_meta_unload.cpp: knotify.moc -- @echo 'creating knotify_la_meta_unload.cpp' -- @-rm -f knotify_la_meta_unload.cpp -+libknotify_main_la_meta_unload.cpp: knotify.moc -+ @echo 'creating libknotify_main_la_meta_unload.cpp' -+ @-rm -f libknotify_main_la_meta_unload.cpp - @if test ${kde_qtver} = 2; then \ -- echo 'static const char * _metalist_knotify_la[] = {' > knotify_la_meta_unload.cpp ;\ -- cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> knotify_la_meta_unload.cpp ;\ -- echo '0};' >> knotify_la_meta_unload.cpp ;\ -- echo '#include <kunload.h>' >> knotify_la_meta_unload.cpp ;\ -- echo '_UNLOAD(knotify_la)' >> knotify_la_meta_unload.cpp ;\ -- else echo > knotify_la_meta_unload.cpp; fi -+ echo 'static const char * _metalist_libknotify_main_la[] = {' > libknotify_main_la_meta_unload.cpp ;\ -+ cat knotify.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '0};' >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '#include <kunload.h>' >> libknotify_main_la_meta_unload.cpp ;\ -+ echo '_UNLOAD(libknotify_main_la)' >> libknotify_main_la_meta_unload.cpp ;\ -+ else echo > libknotify_main_la_meta_unload.cpp; fi +@@ -681,33 +695,33 @@ force-reedit: - #>+ 3 - clean-moc-classes: -- -rm -f knotify_la_meta_unload.cpp -+ -rm -f libknotify_main_la_meta_unload.cpp - - #>+ 11 --knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp knotify.moc -+knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp knotify.moc - @echo 'creating knotify_la.all_cpp.cpp ...'; \ - rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ -- for file in knotify.cpp knotify_skel.cpp knotify_la_meta_unload.cpp ; do \ -+ for file in knotify_main.cpp ; do \ - echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ - done; \ -@@ -705,11 +719,23 @@ - rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files - #>+ 11 --knotify.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp -+libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp knotify.moc +-knotify_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc +- @echo 'creating knotify_la.all_cpp.cpp ...'; \ +- rm -f knotify_la.all_cpp.files knotify_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> knotify_la.all_cpp.final; \ ++libknotify_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify.cpp knotify_skel.cpp knotify.moc + @echo 'creating libknotify_main_la.all_cpp.cpp ...'; \ + rm -f libknotify_main_la.all_cpp.files libknotify_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libknotify_main_la.all_cpp.final; \ -+ for file in knotify.cpp knotify_skel.cpp libknotify_main_la_meta_unload.cpp ; do \ + for file in knotify.cpp knotify_skel.cpp ; do \ +- echo "#include \"$$file\"" >> knotify_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libknotify_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libknotify_main_la.all_cpp.final; \ -+ done; \ -+ cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ -+ rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files -+ -+#>+ 11 -+knotify.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/knotify_main.cpp - @echo 'creating knotify.all_cpp.cpp ...'; \ - rm -f knotify.all_cpp.files knotify.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> knotify.all_cpp.final; \ -- for file in dummy.cpp ; do \ -+ for file in knotify_main.cpp ; do \ - echo "#include \"$$file\"" >> knotify.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> knotify.all_cpp.final; \ done; \ -@@ -730,20 +756,20 @@ +- cat knotify_la.all_cpp.final knotify_la.all_cpp.files > knotify_la.all_cpp.cpp; \ +- rm -f knotify_la.all_cpp.final knotify_la.all_cpp.files ++ cat libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files > libknotify_main_la.all_cpp.cpp; \ ++ rm -f libknotify_main_la.all_cpp.final libknotify_main_la.all_cpp.files #>+ 3 clean-final: -- -rm -f knotify_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp -+ -rm -f knotify_la.all_cpp.cpp libknotify_main_la.all_cpp.cpp knotify.all_cpp.cpp knotifytest.all_cpp.cpp +- -rm -f knotify_la.all_cpp.cpp ++ -rm -f libknotify_main_la.all_cpp.cpp #>+ 2 final: @@ -248,10 +200,12 @@ $NetBSD: patch-ab,v 1.2 2002/08/25 19:23:50 jlam Exp $ + $(MAKE) libknotify_main_la_OBJECTS="$(libknotify_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: - $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -753,4 +779,4 @@ + $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean +@@ -717,5 +731,5 @@ kde-rpo-clean: -rm -f *.rpo - #>+ 2 --$(srcdir)/knotify.cpp: knotify.moc -+$(srcdir)/knotify.cpp: knotify.moc knotify.moc + #>+ 3 +-knotify.o: knotify.moc +-knotify.lo: knotify.moc ++knotify.lo: knotify.moc knotify.moc ++knotify.o: knotify.moc knotify.moc |