diff options
Diffstat (limited to 'x11/kdelibs3/patches/patch-ab')
| -rw-r--r-- | x11/kdelibs3/patches/patch-ab | 75 |
1 files changed, 39 insertions, 36 deletions
diff --git a/x11/kdelibs3/patches/patch-ab b/x11/kdelibs3/patches/patch-ab index 546117db720..be59560a8e2 100644 --- a/x11/kdelibs3/patches/patch-ab +++ b/x11/kdelibs3/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ +$NetBSD: patch-ab,v 1.4 2003/03/11 13:10:33 markd Exp $ ---- arts/knotify/Makefile.in.orig Tue Nov 26 08:57:39 2002 +--- arts/knotify/Makefile.in.orig Thu Jan 23 12:30:33 2003 +++ arts/knotify/Makefile.in -@@ -267,17 +267,22 @@ INCLUDES = -I$(includedir)/arts $(all_in +@@ -287,17 +287,22 @@ ####### Files bin_PROGRAMS = knotify @@ -13,9 +13,9 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ +#>- libknotify_main_la_SOURCES = knotify.cpp knotify.skel #>+ 1 -knotify_la_SOURCES=knotify.cpp knotify_skel.cpp --knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE) +-knotify_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) +libknotify_main_la_SOURCES=knotify.cpp knotify_skel.cpp -+libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) $(LIB_KDECORE) ++libknotify_main_la_LIBADD = -lsoundserver_idl -lqtmcop $(LIB_KDEUI) +libknotify_main_la_LDFLAGS = $(all_libraries) +#>- libknotify_main_la_METASOURCES = AUTO + @@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH) check_PROGRAMS = knotifytest -@@ -295,23 +300,28 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -315,23 +320,28 @@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -69,27 +69,30 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ am_knotifytest_OBJECTS = knotifytest.$(OBJEXT) #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS) #>+ 1 -@@ -324,13 +334,13 @@ CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ +@@ -345,12 +355,18 @@ 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 - #>+ 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 + am__depfiles_maybe = depfiles +-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/knotify.Plo \ ++#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/knotify.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ ++#>- @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ + #>- @AMDEP_TRUE@ ./$(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 \ ++#>+ 9 ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/knotify_skel.P $(DEPDIR)/libknotify_main_la.all_cpp.P ./$(DEPDIR)/knotify.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ + @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@DEP_FILES = $(DEPDIR)/knotify_skel.P ./$(DEPDIR)/knotify.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Plo \ ++@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotify_main.Po \ + @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/knotifytest.Po #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -@@ -351,14 +361,14 @@ CXXLD = $(CXX) +@@ -372,14 +388,14 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ @@ -107,27 +110,27 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ #>- all: all-am #>+ 1 -@@ -407,6 +417,8 @@ clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) +@@ -426,6 +442,8 @@ + done knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS) +libknotify_main.la: $(libknotify_main_la_OBJECTS) $(libknotify_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libknotify_main_la_LDFLAGS) $(libknotify_main_la_OBJECTS) $(libknotify_main_la_LIBADD) $(LIBS) + binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -447,8 +459,9 @@ mostlyclean-compile: +@@ -475,8 +493,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)/knotify.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotify_main.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotify_main.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/knotifytest.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotify_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@ distclean-depend: -@@ -644,13 +657,14 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -691,13 +710,14 @@ messages: $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot @@ -145,7 +148,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ #>+ 5 knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES) $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; /bin/false ) -@@ -663,7 +677,7 @@ knotify.moc: $(srcdir)/knotify.h +@@ -710,7 +730,7 @@ #>+ 3 clean-metasources: @@ -154,7 +157,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ #>+ 4 clean-idl: -@@ -681,33 +695,33 @@ force-reedit: +@@ -728,33 +748,33 @@ #>+ 11 @@ -201,7 +204,7 @@ $NetBSD: patch-ab,v 1.3 2003/01/02 09:12:38 skrll Exp $ #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean -@@ -717,5 +731,5 @@ kde-rpo-clean: +@@ -764,5 +784,5 @@ -rm -f *.rpo #>+ 3 |