diff options
Diffstat (limited to 'x11/kdelibs3/patches/patch-br')
| -rw-r--r-- | x11/kdelibs3/patches/patch-br | 67 |
1 files changed, 49 insertions, 18 deletions
diff --git a/x11/kdelibs3/patches/patch-br b/x11/kdelibs3/patches/patch-br index 4eb9ae06095..43dd90d3b57 100644 --- a/x11/kdelibs3/patches/patch-br +++ b/x11/kdelibs3/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ +$NetBSD: patch-br,v 1.6 2004/01/15 09:52:51 markd Exp $ ---- kioslave/http/kcookiejar/Makefile.in.orig Thu May 8 05:24:13 2003 +--- kioslave/http/kcookiejar/Makefile.in.orig 2003-12-29 11:17:01.000000000 +1300 +++ kioslave/http/kcookiejar/Makefile.in -@@ -381,13 +381,17 @@ INCLUDES = $(all_includes) +@@ -383,13 +383,17 @@ INCLUDES = $(all_includes) ####### Files bin_PROGRAMS = kcookiejar @@ -23,7 +23,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ #>- kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \ #>- kcookieserver.skel kcookiewin.cpp -@@ -398,8 +402,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp +@@ -400,8 +404,8 @@ kded_kcookiejar_la_SOURCES=kcookiejar.cp kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version kded_kcookiejar_la_LIBADD = $(LIB_KIO) @@ -34,7 +34,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ kcookiejar_LDFLAGS = $(all_libraries) $(KDE_RPATH) kded_DATA = kcookiejar.desktop -@@ -413,11 +417,11 @@ CONFIG_HEADER = $(top_builddir)/config.h +@@ -416,11 +420,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) @@ -49,7 +49,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ kded_kcookiejar_la_DEPENDENCIES = am_kded_kcookiejar_la_OBJECTS = kcookiejar.lo kcookieserver.lo \ kcookiewin.lo -@@ -428,26 +432,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco +@@ -431,26 +435,37 @@ kded_kcookiejar_la_nofinal_OBJECTS = kco kcookiewin.lo kcookieserver_skel.lo @KDE_USE_FINAL_FALSE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@kded_kcookiejar_la_OBJECTS = $(kded_kcookiejar_la_final_OBJECTS) @@ -94,7 +94,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookieserver.Plo \ @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcookiewin.Plo ./$(DEPDIR)/main.Plo -@@ -470,11 +485,11 @@ CXXLD = $(CXX) +@@ -473,11 +488,11 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kcookiejar_la_SOURCES) $(kded_kcookiejar_la_SOURCES) \ @@ -108,7 +108,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ #>- all: all-am #>+ 1 -@@ -551,6 +566,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) +@@ -554,6 +569,8 @@ kcookiejar.la: $(kcookiejar_la_OBJECTS) $(CXXLINK) -rpath $(libdir) $(kcookiejar_la_LDFLAGS) $(kcookiejar_la_OBJECTS) $(kcookiejar_la_LIBADD) $(LIBS) kded_kcookiejar.la: $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_DEPENDENCIES) $(CXXLINK) -rpath $(kde_moduledir) $(kded_kcookiejar_la_LDFLAGS) $(kded_kcookiejar_la_OBJECTS) $(kded_kcookiejar_la_LIBADD) $(LIBS) @@ -117,7 +117,7 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -590,8 +607,9 @@ mostlyclean-compile: +@@ -593,8 +610,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -128,16 +128,16 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookieserver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcookiewin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@ -@@ -733,7 +751,7 @@ distclean-tags: +@@ -736,7 +754,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=rfc2965 kcookiescfg.upd kcookieserver.h netscape_cookie_spec.html kcookiejar.h kcookiewin.h rfc2109 kcookiejar.desktop -+KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 kcookiejar.desktop kcookieserver.h kcookiejar.h +-KDE_DIST=kcookieserver.h netscape_cookie_spec.html kcookiejar.desktop kcookiewin.h rfc2965 kcookiescfg.upd rfc2109 kcookiejar.h ++KDE_DIST=kcookiewin.h netscape_cookie_spec.html kcookiescfg.upd rfc2965 rfc2109 Makefile.in.rej kcookiejar.desktop kcookieserver.h kcookiejar.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -878,9 +896,6 @@ uninstall-am: uninstall-binPROGRAMS unin +@@ -880,25 +898,22 @@ uninstall-am: uninstall-binPROGRAMS unin uninstall-kde_moduleLTLIBRARIES uninstall-kdedDATA \ uninstall-libLTLIBRARIES uninstall-updateDATA @@ -147,7 +147,38 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -919,7 +934,7 @@ force-reedit: + + #>+ 3 +-kcookiewin.moc: $(srcdir)/kcookiewin.h +- $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc +- +-#>+ 1 +-mocs: kcookiewin.moc +-#>+ 3 + kcookieserver.moc: $(srcdir)/kcookieserver.h + $(MOC) $(srcdir)/kcookieserver.h -o kcookieserver.moc + + #>+ 1 + mocs: kcookieserver.moc ++#>+ 3 ++kcookiewin.moc: $(srcdir)/kcookiewin.h ++ $(MOC) $(srcdir)/kcookiewin.h -o kcookiewin.moc ++ ++#>+ 1 ++mocs: kcookiewin.moc + #>+ 5 + kcookieserver.kidl: $(srcdir)/kcookieserver.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/kcookieserver.h > kcookieserver.kidl || ( rm -f kcookieserver.kidl ; false ) +@@ -907,7 +922,7 @@ kcookieserver_skel.cpp: kcookieserver.ki + + #>+ 3 + clean-metasources: +- -rm -f kcookiewin.moc kcookieserver.moc ++ -rm -f kcookieserver.moc kcookiewin.moc + + #>+ 4 + clean-idl: +@@ -925,7 +940,7 @@ force-reedit: #>+ 11 @@ -156,13 +187,13 @@ $NetBSD: patch-br,v 1.5 2003/05/22 02:42:43 markd Exp $ @echo 'creating kded_kcookiejar_la.all_cpp.cpp ...'; \ rm -f kded_kcookiejar_la.all_cpp.files kded_kcookiejar_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kded_kcookiejar_la.all_cpp.final; \ -@@ -955,7 +970,7 @@ kde-rpo-clean: +@@ -961,7 +976,7 @@ kde-rpo-clean: -rm -f *.rpo #>+ 5 -kcookiewin.lo: kcookiewin.moc --kcookieserver.lo: kcookieserver.moc +-kcookiewin.o: kcookiewin.moc kcookieserver.o: kcookieserver.moc - kcookiewin.o: kcookiewin.moc ++kcookiewin.o: kcookiewin.moc +kcookiewin.lo: kcookiewin.moc -+kcookieserver.lo: kcookieserver.moc + kcookieserver.lo: kcookieserver.moc |