diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-ej')
| -rw-r--r-- | x11/kdebase3/patches/patch-ej | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/x11/kdebase3/patches/patch-ej b/x11/kdebase3/patches/patch-ej index c49e1e1a9d4..c562fbf52e2 100644 --- a/x11/kdebase3/patches/patch-ej +++ b/x11/kdebase3/patches/patch-ej @@ -1,8 +1,8 @@ -$NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ +$NetBSD: patch-ej,v 1.7 2004/01/15 10:15:14 markd Exp $ ---- kxkb/Makefile.in.orig Tue May 13 23:08:03 2003 +--- kxkb/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kxkb/Makefile.in -@@ -429,11 +429,11 @@ KDE_OPTIONS = nofinal +@@ -431,11 +431,11 @@ KDE_OPTIONS = nofinal bin_PROGRAMS = kxkb @@ -17,7 +17,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ kde_module_LTLIBRARIES = kcm_keyboard.la #>- kcm_keyboard_la_SOURCES = rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp kcmmiscwidget.ui -@@ -442,9 +442,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay +@@ -444,9 +444,13 @@ kcm_keyboard_la_SOURCES=rules.cpp kcmlay kcm_keyboard_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_keyboard_la_LIBADD = $(XTESTLIB) $(LIB_KIO) -lxkbfile @@ -33,7 +33,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ data_DATA = keyboard.desktop data2_DATA = keyboard_layout.desktop -@@ -464,31 +468,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc +@@ -466,31 +470,38 @@ am_kcm_keyboard_la_OBJECTS = rules.lo kc #>- kcm_keyboard_la_OBJECTS = $(am_kcm_keyboard_la_OBJECTS) #>+ 1 kcm_keyboard_la_OBJECTS = rules.lo kcmlayout.lo pixmap.lo kcmmisc.lo kcmmiscwidget.lo @@ -83,7 +83,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/rules.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -@@ -510,7 +521,7 @@ CXXLD = $(CXX) +@@ -512,7 +523,7 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(kcm_keyboard_la_SOURCES) $(kxkb_la_SOURCES) \ @@ -92,7 +92,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ DATA = $(data_DATA) $(data2_DATA) $(services_DATA) -@@ -521,7 +532,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r +@@ -523,7 +534,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r check-recursive installcheck-recursive DIST_COMMON = Makefile.am Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) @@ -101,7 +101,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ #>- all: all-recursive #>+ 1 -@@ -601,6 +612,8 @@ clean-libLTLIBRARIES: +@@ -603,6 +614,8 @@ clean-libLTLIBRARIES: $(CXXLINK) -rpath $(kde_moduledir) $(kcm_keyboard_la_LDFLAGS) $(kcm_keyboard_la_OBJECTS) $(kcm_keyboard_la_LIBADD) $(LIBS) kxkb.la: $(kxkb_la_OBJECTS) $(kxkb_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kxkb_la_LDFLAGS) $(kxkb_la_OBJECTS) $(kxkb_la_LIBADD) $(LIBS) @@ -110,7 +110,7 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) -@@ -640,11 +653,12 @@ mostlyclean-compile: +@@ -642,11 +655,12 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -124,16 +124,16 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 markd Exp $ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixmap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rules.Plo@am__quote@ -@@ -873,7 +887,7 @@ distclean-tags: +@@ -875,7 +889,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 --KDE_DIST=extension.h rules.h keyboard.desktop pixmap.h kcmmisc.h uninstall.desktop kxkb.h kxkbbindings.cpp keyboard_layout.desktop LICENSE kcmlayout.h configure.in.in kcmmiscwidget.ui kxkb.desktop -+KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE keyboard.desktop uninstall.desktop rules.h +-KDE_DIST=kxkb.desktop rules.h extension.h keyboard.desktop keyboard_layout.desktop kcmmisc.h uninstall.desktop kcmmiscwidget.ui LICENSE kxkb.h kcmlayout.h configure.in.in kxkbbindings.cpp pixmap.h ++KDE_DIST=pixmap.h kxkb.h kcmmisc.h configure.in.in keyboard_layout.desktop kcmlayout.h kcmmiscwidget.ui kxkbbindings.cpp extension.h kxkb.desktop LICENSE Makefile.in.rej keyboard.desktop uninstall.desktop rules.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -1049,9 +1063,6 @@ install-data-local: uninstall.desktop +@@ -1051,9 +1065,6 @@ install-data-local: uninstall.desktop messages: rc.cpp $(XGETTEXT) $(kxkb_la_SOURCES) kxkbbindings.cpp -o $(podir)/kxkb.pot $(XGETTEXT) rules.cpp kcmlayout.cpp pixmap.cpp kcmmisc.cpp rc.cpp kxkbbindings.cpp -o $(podir)/kcmlayout.pot @@ -143,24 +143,24 @@ $NetBSD: patch-ej,v 1.6 2003/05/22 02:42:52 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: -@@ -1136,13 +1147,13 @@ kde-rpo-clean: +@@ -1144,13 +1155,13 @@ kde-rpo-clean: -rm -f *.rpo #>+ 11 +-kcmmisc.lo: kcmmisc.moc -$(srcdir)/rules.cpp: kcmmiscwidget.h --kcmlayout.lo: kcmlayout.moc -kxkb.o: kxkb.moc -kcmlayout.o: kcmlayout.moc +$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h -+$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h - $(srcdir)/pixmap.cpp: kcmmiscwidget.h --kcmmisc.lo: kcmmisc.moc + $(srcdir)/kcmmisc.cpp: kcmmiscwidget.h +-kcmlayout.lo: kcmlayout.moc ++$(srcdir)/pixmap.cpp: kcmmiscwidget.h kxkb.lo: kxkb.moc --$(srcdir)/kcmmisc.cpp: kcmmiscwidget.h +-$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +kcmlayout.o: kcmlayout.moc +kcmlayout.lo: kcmlayout.moc +kxkb.o: kxkb.moc +$(srcdir)/rules.cpp: kcmmiscwidget.h kcmmisc.o: kcmmisc.moc --$(srcdir)/kcmlayout.cpp: kcmmiscwidget.h +-$(srcdir)/pixmap.cpp: kcmmiscwidget.h +kcmmisc.lo: kcmmisc.moc |