kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/x11/kdebase3/patches/patch-cz
markd 1bf8a5c8a4 Update to KDE-3.1.5. 
Changes:
* konqueror: Fixed "Location bar forgets what you type if you dont press
  enter and change tabs"
* konqueror: Fixed "tabs resize (shrink) when clicked on while loading"
* konqueror: Don't show hardcoded shortcuts in tab context menu
* konqueror: Made "Detach Tab" create new konqueror window of proper size
* konqueror: Set location bar URL for new tabs immediately
* konsole: Fixed "List Sessions" feature.

Also add a kdm rc.d script (from Julio M. Merino Vidal)
2004-01-15 10:15:14 +00:00

235 lines
11 KiB
Text
Raw Blame History

$NetBSD: patch-cz,v 1.7 2004/01/15 10:15:14 markd Exp $
--- ksmserver/Makefile.in.orig 2004-01-02 14:06:02.000000000 +1300
+++ ksmserver/Makefile.in
@@ -445,20 +445,23 @@ SUBDIRS = .
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 KSMServerInterface.skel
+#>- libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp KSMServerInterface.skel
#>+ 1
-ksmserver_la_SOURCES=main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.cpp
-ksmserver_SOURCES = dummy.cpp
+libksmserver_main_la_SOURCES=main.cpp server.cpp shutdown.cpp KSMServerInterface_skel.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
@@ -477,23 +480,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
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)
#>+ 4
-ksmserver_la_final_OBJECTS = ksmserver_la.all_cpp.lo
-ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo KSMServerInterface_skel.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 KSMServerInterface_skel.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)
EXTRA_PROGRAMS = testsh$(EXEEXT)
bin_PROGRAMS = ksmserver$(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)
#>- testsh_OBJECTS = $(am_testsh_OBJECTS)
#>+ 1
@@ -503,14 +511,17 @@ testsh_DEPENDENCIES = shutdown.lo
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @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)/test.Po
-#>+ 7
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P $(DEPDIR)/ksmserver_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \
+#>+ 9
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P $(DEPDIR)/libksmserver_main_la.all_cpp.P ./$(DEPDIR)/ksmserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmserver_main.Po ./$(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KSMServerInterface_skel.P ./$(DEPDIR)/ksmserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksmserver_main.Po ./$(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/server.Plo ./$(DEPDIR)/shutdown.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/test.Po
@@ -532,8 +543,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-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)
@@ -546,7 +557,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
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
@@ -593,6 +604,8 @@ clean-libLTLIBRARIES:
done
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)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -635,7 +648,8 @@ mostlyclean-compile:
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@
@@ -848,7 +862,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=ksmserver.upd shutdownkonq.png LICENSE move_session_config.sh configure.in.in KSMServerInterface.h
+KDE_DIST=configure.in.in KSMServerInterface.h LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -1009,34 +1023,31 @@ uninstall-info: uninstall-info-recursive
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:
-#>+ 5
-KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; false )
-KSMServerInterface_skel.cpp: KSMServerInterface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl
+#>+ 3
+server.moc: $(srcdir)/server.h
+ $(MOC) $(srcdir)/server.h -o server.moc
+#>+ 1
+mocs: server.moc
#>+ 3
shutdown.moc: $(srcdir)/shutdown.h
$(MOC) $(srcdir)/shutdown.h -o shutdown.moc
#>+ 1
mocs: shutdown.moc
-#>+ 3
-server.moc: $(srcdir)/server.h
- $(MOC) $(srcdir)/server.h -o server.moc
+#>+ 5
+KSMServerInterface.kidl: $(srcdir)/KSMServerInterface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KSMServerInterface.h > KSMServerInterface.kidl || ( rm -f KSMServerInterface.kidl ; false )
+KSMServerInterface_skel.cpp: KSMServerInterface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KSMServerInterface.kidl
-#>+ 1
-mocs: server.moc
#>+ 3
clean-metasources:
- -rm -f shutdown.moc server.moc
+ -rm -f server.moc shutdown.moc
#>+ 4
clean-idl:
@@ -1054,33 +1065,33 @@ force-reedit:
#>+ 11
-ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp shutdown.moc server.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; \
+libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp KSMServerInterface_skel.cpp server.moc shutdown.moc
+ @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 KSMServerInterface_skel.cpp ; do \
- echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \
+ 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 ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files > ksmserver_la.all_cpp.cpp; \
- rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files
+ 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
#>+ 3
clean-final:
- -rm -f ksmserver_la.all_cpp.cpp
+ -rm -f libksmserver_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" all-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" install-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
Reference in a new issue View git blame Copy permalink