head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.52 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.50 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.48 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.46 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.44 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.42 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.40 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.38 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.36 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.34 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.32 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.30 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.28 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.26 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.24 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.22 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.20 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.8.0.18 pkgsrc-2006Q1-base:1.8 pkgsrc-2005Q4:1.8.0.16 pkgsrc-2005Q4-base:1.8 pkgsrc-2005Q3:1.8.0.14 pkgsrc-2005Q3-base:1.8 pkgsrc-2005Q2:1.8.0.12 pkgsrc-2005Q2-base:1.8 pkgsrc-2005Q1:1.8.0.10 pkgsrc-2005Q1-base:1.8 pkgsrc-2004Q4:1.8.0.8 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.6 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.8.0.4 pkgsrc-2004Q2-base:1.8 pkgsrc-2004Q1:1.8.0.2 pkgsrc-2004Q1-base:1.8 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6-1:1.3.0.2 netbsd-1-6-1-base:1.3 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2004.02.04.14.25.59; author markd; state dead; branches; next 1.7; 1.7 date 2004.01.15.10.15.14; author markd; state Exp; branches; next 1.6; 1.6 date 2003.07.30.13.35.00; author markd; state Exp; branches; next 1.5; 1.5 date 2003.05.22.02.42.51; author markd; state Exp; branches; next 1.4; 1.4 date 2003.03.11.13.10.27; author markd; state Exp; branches; next 1.3; 1.3 date 2003.01.02.09.12.35; author skrll; state Exp; branches; next 1.2; 1.2 date 2002.08.25.19.23.45; author jlam; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.19.19; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.19.19; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.19.19; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.19.05.50; author jlam; state Exp; branches; next ; desc @@ 1.8 log @Update to KDE-3.2 Changes: Base Kate * Moving KATE view management over to KMDI Joseph Wenninger * Basic project managment Christoph Cullmann KControl * Xinerama KControl module, enhanced KDE Xinerama and dual-head support George Staikos * add/update control module for configuring per-domain settings. See Bug 49145. Leo Savernik * Support for per-style configuration settings in the style control center module, a module for Keramik Maksim Orlovich * Add support for installing/removing- and switching Xcursor themes to the mouse KControl module Fredrik Hoeglund * Font installer - create fonts:/ ioslave, and modify KControl module to use this. See http://members.lycos.co.uk/cpdrummond for (old) screenshots/download Craig Drummond KHotKeys * Update to version 2.0, which includes more features like mouse gestures. Lubos Lunak KWin * Full support for latest NETWM spec version in KWin, and seamless usage of other compliant window managers with KDE. Lubos Lunak * New API for window decoration plugins. Lubos Lunak * Focus stealing prevention. Lubos Lunak * Add an option to allow wide borders to some of the window decoration styles Gunnar Schmi DT Kicker * Make addition of non-KDE applications to Kicker easier Alexander Kellett * Enable backgrounds for child panels and all applets, allow for colorization of background pixmaps Aaron J. Seigo * Allow applets to export a menu to the handle Aaron J. Seigo * User defined plain colors for tiles Aaron J. Seigo * Make the panel transparent. Zack Rusin * Add an option to the RMB-menu and to the "Advanced Options" in kcontrol to enable/disable the panel handle when "Custom" size is selected. KDM * More sophisticated session definitions, common with GDM Oswald Buddenhagen * Pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen Various (kwin, kdesktop, kcontrol, ksmserver) * Optimally support the X Resize and Rotate extension. Hamish Rodda All KDE applications (kdebase/kdenetwork/kdepim/kdegraphics,...) * No absolute paths to user home directories in KDE config files. This allows to support roaming users. Helge Deller Konsole * Add a better interface to konsolepart for other apps. Dominique Devriese * Added "Set Selection End" to right mouse button menu. * Column text selecting when Ctrl and Alt are pressed * Uses now KTabWidget, allows tab context menus and more Stephan Binner * Utilize KNotify (e.g. passive popup) for "Activity", "Bell", "Shell Exit" and "Silence" events * ZModem up- and download (requires rzsz) Waldo Bastian * Make bidi rendering (for RTL languages) configurable. Meni Livne KEditBookmarks * Export to HTML and printing of bookmark collection. Alexander Kellett * Recursive favicon updates in bookmark editor. Alexander Kellett * Field for incremental searching on titles. Alexander Kellett * Opera and Internet Explorer bookmark collection exporting. Alexander Kellett * Bookmark editor now includes an extra pane to allow title/url editing without use of context menu / keyboard shortcuts. Alexander Kellett * More detailed bookmark access information (last viewed, first seen, view counts). Alexander Kellett * Recursive - entire collection, per folder - alphabetical sorting Alexander Kellett Konqueror * Enhanced Konqueror statusbar and kpart statusbar extension. Statusbar notifications for secure connections, wallet, js errors. David Faure, George Staikos * Bookmarklets support in the form of a "Mini-tools" konq-plugin Alexander Kellett * Addition of an advanced Add Bookmark dialog. Alexander Kellett * Read-only bookmark menu includes. Alexander Kellett * Ability to select which items should be shown in the bookmark bar. Alexander Kellett * Servicemenu improvements: placed in a common Actions submenu, allow grouping into submenus, allow for separators, allow simple mimetype globbing Aaron J. Seigo * Bookmarking of all loaded tabs as a folder. Alexander Kellett * Lightweight bookmark editing from within bookmarks menu via context menu. Alexander Kellett * New sidebar module: Web. Implements sidebar modules similar to those introduced in Netscape 6/Mozilla. George Staikos * Konqueror "preloading", often reducing Konqueror startup time. Lubos Lunak * Spellchecking in text forms and spelling highlighting Scott Wheeler, Don Sanders Tabbed Browsing * "New Tab" and "Close Tab" buttons besides the tab bar Stephan Binner * Loading/read state indication by tab color Stephan Binner * Drag and drop support from/to tabs and to empty tab bar space Stephan Binner * Allow to reorder tabs with pressed middle mouse button Stephan Binner * Middle mouse button on tabs or empty tab bar space opens clipboard content Stephan Binner * Support for opening external URLs and popups in new tabs Stephan Binner * Optional permanent close buttons within tabs and permanent shown tab bar Stephan Binner KHTML part * KHTML: Implement caret mode. This is a prerequisite for designmode. See Bug 48302. Leo Savernik * KHTML: add infrastructure for per-domain settings. See Bug 49145. Leo Savernik * better support for samba shares through libsmbclient of samba 3.0 Stephan Kulow KIO Slaves * kio_smtp: SMTP pipelining support for faster submission, esp. over high-latency links. Marc Mutz KDesktop * Added GUI for "Mouse wheel over desktop switches desktop" option. * Make screen savers capable of being DPMS aware, so they can be disabled when watching a movie or TV if the app sets up X DPMS appropriately. Gregor Jasny * Screen locker: pluggable greeter input methods; better architectural compliance with PAM's input model. Oswald Buddenhagen * Shadow behind the text of the desktop icons, for more readability Laur Ivan * E-mail addresses entered in "Run Command..." (Alt-F2) will start mailer. Waldo Bastian * Numeric expression in "Run Command..." (Alt-F2) is evaluated. Waldo Bastian @ text @$NetBSD: patch-dh,v 1.7 2004/01/15 10:15:14 markd Exp $ --- kwin/Makefile.in.orig 2004-01-02 14:06:04.000000000 +1300 +++ kwin/Makefile.in @@@@ -428,18 +428,22 @@@@ INCLUDES = $(all_includes) SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin -lib_LTLIBRARIES = kwin.la +lib_LTLIBRARIES = libkwin.la kwin.la # workspace.cpp has to be first in order not to break --enable-final -#>- kwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ +#>- libkwin_la_SOURCES = workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ #>- popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ #>- killwindow.cpp kwinbutton.cpp #>+ 3 -kwin_la_SOURCES=workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ +libkwin_la_SOURCES=workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp \ popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp \ killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp -kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LDFLAGS = $(all_libraries) + +kwin_la_SOURCES = kwin_main.cpp +kwin_la_LIBADD = libkwin.la kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h @@@@ -448,7 +452,7 @@@@ kwinincludedir = $(includedir)/kwin kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp -kwin_LDADD = kwin.la +kwin_LDADD = libkwin.la kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin @@@@ -459,7 +463,6 @@@@ data_DATA = eventsrc sounddir = $(kde_sounddir) sound_DATA = pop.wav - update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin @@@@ -469,18 +472,23 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kwin_la_DEPENDENCIES = -am_kwin_la_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ +kwin_la_DEPENDENCIES = libkwin.la +am_kwin_la_OBJECTS = kwin_main.lo +#>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) +#>+ 1 +kwin_la_OBJECTS = kwin_main.lo +libkwin_la_DEPENDENCIES = +am_libkwin_la_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ main.lo popupinfo.lo tabbox.lo options.lo plugins.lo events.lo \ killwindow.lo kwinbutton.lo -#>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) +#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) #>+ 6 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo +libkwin_la_nofinal_OBJECTS = workspace.lo placement.lo atoms.lo client.lo \ main.lo popupinfo.lo tabbox.lo options.lo plugins.lo events.lo \ killwindow.lo kwinbutton.lo KWinInterface_skel.lo -@@KDE_USE_FINAL_FALSE@@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) +@@KDE_USE_FINAL_FALSE@@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@@@ -488,33 +496,33 @@@@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) -kwin_DEPENDENCIES = kwin.la +kwin_DEPENDENCIES = libkwin.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/admin/depcomp am__depfiles_maybe = depfiles #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ -#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/workspace.Plo +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo #>+ 15 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/workspace.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P ./$(DEPDIR)/atoms.Plo ./$(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/events.Plo ./$(DEPDIR)/killwindow.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Po ./$(DEPDIR)/kwinbutton.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/options.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/placement.Plo ./$(DEPDIR)/plugins.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/popupinfo.Plo ./$(DEPDIR)/tabbox.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/workspace.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwin_main.Plo ./$(DEPDIR)/kwin_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kwinbutton.Plo ./$(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/options.Plo ./$(DEPDIR)/placement.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/plugins.Plo ./$(DEPDIR)/popupinfo.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/tabbox.Plo ./$(DEPDIR)/workspace.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -534,7 +542,7 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) +DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) @@@@ -548,7 +556,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) +SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -595,6 +603,8 @@@@ clean-libLTLIBRARIES: done kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) +libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -638,6 +648,7 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/client.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/events.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/killwindow.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kwin_main.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kwin_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kwinbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -909,7 +920,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=stdclient_bitmaps.h pluginlibFix.pl pop.wav cr16-app-kwin.png kwinbindings.cpp cr48-app-kwin.png LICENSE plugins.h placement.h atoms.h popupinfo.h kwin.upd eventsrc NEWCOLORSCHEME.README events.h main.h cr32-app-kwin.png killwindow.h tabbox.h +KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h Makefile.in.rej NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -1087,24 +1098,30 @@@@ messages: # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 5 -KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false ) -KWinInterface_skel.cpp: KWinInterface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl +#>+ 3 +workspace.moc: $(srcdir)/workspace.h + $(MOC) $(srcdir)/workspace.h -o workspace.moc +#>+ 1 +mocs: workspace.moc #>+ 3 -tabbox.moc: $(srcdir)/tabbox.h - $(MOC) $(srcdir)/tabbox.h -o tabbox.moc +client.moc: $(srcdir)/client.h + $(MOC) $(srcdir)/client.h -o client.moc #>+ 1 -mocs: tabbox.moc +mocs: client.moc #>+ 3 -workspace.moc: $(srcdir)/workspace.h - $(MOC) $(srcdir)/workspace.h -o workspace.moc +options.moc: $(srcdir)/options.h + $(MOC) $(srcdir)/options.h -o options.moc #>+ 1 -mocs: workspace.moc +mocs: options.moc +#>+ 3 +tabbox.moc: $(srcdir)/tabbox.h + $(MOC) $(srcdir)/tabbox.h -o tabbox.moc + +#>+ 1 +mocs: tabbox.moc #>+ 3 popupinfo.moc: $(srcdir)/popupinfo.h $(MOC) $(srcdir)/popupinfo.h -o popupinfo.moc @@@@ -1118,26 +1135,20 @@@@ kwinbutton.moc: $(srcdir)/kwinbutton.h #>+ 1 mocs: kwinbutton.moc #>+ 3 -client.moc: $(srcdir)/client.h - $(MOC) $(srcdir)/client.h -o client.moc - -#>+ 1 -mocs: client.moc -#>+ 3 plugins.moc: $(srcdir)/plugins.h $(MOC) $(srcdir)/plugins.h -o plugins.moc #>+ 1 mocs: plugins.moc -#>+ 3 -options.moc: $(srcdir)/options.h - $(MOC) $(srcdir)/options.h -o options.moc +#>+ 5 +KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; false ) +KWinInterface_skel.cpp: KWinInterface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl -#>+ 1 -mocs: options.moc #>+ 3 clean-metasources: - -rm -f tabbox.moc workspace.moc popupinfo.moc kwinbutton.moc client.moc plugins.moc options.moc + -rm -f workspace.moc client.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc plugins.moc #>+ 4 clean-idl: @@@@ -1169,33 +1180,33 @@@@ force-reedit: #>+ 11 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc tabbox.moc kwinbutton.moc popupinfo.moc plugins.moc client.moc options.moc - @@echo 'creating kwin_la.all_cpp.cpp ...'; \ - rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ +libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc popupinfo.moc plugins.moc + @@echo 'creating libkwin_la.all_cpp.cpp ...'; \ + rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ for file in workspace.cpp placement.cpp atoms.cpp client.cpp main.cpp popupinfo.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ - echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ done; \ - cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \ - rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files + cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files #>+ 3 clean-final: - -rm -f kwin_la.all_cpp.cpp + -rm -f libkwin_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -1205,17 +1216,17 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 15 -popupinfo.lo: popupinfo.moc +workspace.o: workspace.moc options.lo: options.moc -popupinfo.o: popupinfo.moc -plugins.lo: plugins.moc -kwinbutton.lo: kwinbutton.moc tabbox.o: tabbox.moc -workspace.o: workspace.moc -client.o: client.moc +popupinfo.lo: popupinfo.moc options.o: options.moc -plugins.o: plugins.moc -client.lo: client.moc -kwinbutton.o: kwinbutton.moc +kwinbutton.lo: kwinbutton.moc tabbox.lo: tabbox.moc +kwinbutton.o: kwinbutton.moc +client.o: client.moc +plugins.o: plugins.moc workspace.lo: workspace.moc +client.lo: client.moc +popupinfo.o: popupinfo.moc +plugins.lo: plugins.moc @ 1.7 log @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) @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update kdebase to 3.1.3. Changes: * kate: Make saving of remote files during shutdown work. * kcontrol/colors: Don't reset widget selection dropdown when selecting a different theme * kcontrol/filetypes: Fixed removing of mimetypes specified by a .kdelnk file * kcontrol/input: fix application of large & white cursors * kcontrol/services: don't show kxmlrpcd, kalarmd and kwrited if they're not installed * kdesud: support empty passwords * kdm: Fix i18n support for the GuiStyle and ColorScheme combos * kdm: don't reset local Xserver if termination is requsted * keditbookmarks: Various bufixes * kio_sftp: Support OpenSSH 3.6+ * kio_sftp: Support older sftp protocol revisions * kio_smb: Huge update for samba 3.0. * kicker: Improve icon scaling in service menus * kicker: "Terminal Sessions" special button supports sessions with dots in filename * kicker: "Terminal Sessions" special button with same sort order as the one in Konsole. * kicker: Fix mimetype resolution in the quickbrowser * kicker: Fixes for stuck tooltips * kicker: Do not create local directories for .desktop files used in service buttons if no needed * kicker: Fix apply button not working for quickstart menu entries settings * kicker: Fix hide button preference effects reversed * kicker:Various fixes for recent apps history * kicker/minipager: don't show redundant tooltips when the page already shows names * konsole: Added Ctrl+Shift+N as alternate default shortcut for "New Session". * konsole: Fixed fixed-width with proportional-font drawing routine. * konsole: Fixed problems with mouse and paste support and detached windows. * konsole: Let new color schemes take effect once kcmkonsole tells to do so. * konsole: Wheel mouse fixes for Mode_Mouse1000. * konqueror: Flicker fixes inside the iconview * konqueror: Fix for inter-process copy-past with the listview * konqueror: Make sure the tab close button is properly enabled when a 2nd tab is first open through context menu entries * konqueror: Made Ctrl+Enter for new tab in URL combo working again. * konqueror: Various sidebar fixes * konqueror: make sure that the location label truly disappears when disabled * konqueror: konqueror warning for repeated POSTs * konqueror: Konqueror crash when dragging image from about:konqueror * konqueror: Improve tracking of listviewitems so that we don't crash when they get deleted somewhat unexpectedly * konqueror: Don't crash when updating toolbars without a part load * konqueror: Properly handle 'stop' when still listing the directory in the info list view * konqueror: Efficiency fix: make sure only one konqueror instance saves the history when it changes * konqueror: Don't use deleted KFileItems. * Don't crash when doing a copy w/o a currentItem * konqueror: Stop activity when the user tries hard to enter a URL * konqueror: Properly calculate column indices for the meta info listview * konqueror: Hide the find part on a second click on its toolbar button * konqueror: Handle _top/_blank, and so on, case-insensitively * libkonq: make sure KFileTip does not hold on to stale file items * libkonq: precaution: make sure that no preview jobs hold on to icon view's items when it's cleared * libkonq: fixes to cut-and-paste * libkonq: network-friendlier paste button state polling * kwin: Fix deactivation of window when loosing focus * kwin: New windows are drawn above open menus * kwin: Some non-resizable windows can still be resized * kwin: Fixes for click raise * kwin: If a window is hover-unshaded, then it's not shaded for the outside world * kwin: Keramik decoration: Properly detect XShape on Solaris * nsplugins: Fix relative URLs. @ text @d3 1 a3 1 --- kwin/Makefile.in.orig 2003-07-15 22:03:46.000000000 +1200 d5 1 a5 1 @@@@ -427,18 +427,22 @@@@ INCLUDES = $(all_includes) d32 1 a32 1 @@@@ -447,7 +451,7 @@@@ kwinincludedir = $(includedir)/kwin d41 1 a41 1 @@@@ -458,7 +462,6 @@@@ data_DATA = eventsrc d49 1 a49 1 @@@@ -467,18 +470,23 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d80 1 a80 1 @@@@ -486,33 +494,33 @@@@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) d131 1 a131 1 @@@@ -532,7 +540,7 @@@@ CXXLD = $(CXX) d140 1 a140 1 @@@@ -546,7 +554,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d149 1 a149 1 @@@@ -593,6 +601,8 @@@@ clean-libLTLIBRARIES: d158 1 a158 1 @@@@ -636,6 +646,7 @@@@ distclean-compile: d166 1 a166 1 @@@@ -901,7 +912,7 @@@@ distclean-tags: d170 1 a170 1 -KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h kwin.upd pop.wav cr16-app-kwin.png pluginlibFix.pl placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h cr48-app-kwin.png tabbox.h d175 1 a175 1 @@@@ -1079,12 +1090,12 @@@@ messages: d191 5 a195 3 client.moc: $(srcdir)/client.h $(MOC) $(srcdir)/client.h -o client.moc @@@@ -1092,18 +1103,6 @@@@ client.moc: $(srcdir)/client.h d197 2 a198 1 mocs: client.moc a199 6 -plugins.moc: $(srcdir)/plugins.h - $(MOC) $(srcdir)/plugins.h -o plugins.moc - -#>+ 1 -mocs: plugins.moc -#>+ 3 d202 21 d225 1 a225 1 -mocs: workspace.moc d227 2 a228 2 options.moc: $(srcdir)/options.h $(MOC) $(srcdir)/options.h -o options.moc a229 1 @@@@ -1128,8 +1127,20 @@@@ kwinbutton.moc: $(srcdir)/kwinbutton.h d231 4 a234 7 mocs: kwinbutton.moc #>+ 3 +plugins.moc: $(srcdir)/plugins.h + $(MOC) $(srcdir)/plugins.h -o plugins.moc + +#>+ 1 +mocs: plugins.moc d240 4 a243 2 + +#>+ 3 d245 1 a245 1 - -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc d250 1 a250 1 @@@@ -1161,33 +1172,33 @@@@ force-reedit: d254 1 a254 1 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/placement.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/popupinfo.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc popupinfo.moc kwinbutton.moc d297 1 a297 1 @@@@ -1197,17 +1208,17 @@@@ kde-rpo-clean: d301 1 d303 7 a309 2 +options.lo: options.moc +tabbox.o: tabbox.moc d311 5 a315 2 +options.o: options.moc kwinbutton.lo: kwinbutton.moc d317 1 a317 8 -options.o: options.moc -client.lo: client.moc -client.o: client.moc -options.lo: options.moc kwinbutton.o: kwinbutton.moc -tabbox.o: tabbox.moc -popupinfo.o: popupinfo.moc -workspace.o: workspace.moc d319 1 a319 1 plugins.o: plugins.moc a320 1 -popupinfo.lo: popupinfo.moc d323 1 a323 1 plugins.lo: plugins.moc @ 1.5 log @Update KDE to 3.1.2. Changes: kdelibs: * https authentication through proxy fixed. * KZip failed for some .zip archives. * Fixed a bug in socket code that made KDEPrint crash. * kspell: Support for Hebrew spell checking using hspell (requires hspell 0.5). kdebase: * kwin: Alt+Tab works while drag'n'drop (unless the application also grabs keyboard). * kio_smtp: Doesn't eat 100% CPU when connection breaks and fixed a confusing error message when AUTH failed ("Unknown Command" vs. "Authorization failed") * kscreensaver: Fixed issue where kdesktop_lock would stay running indefinitely in the background if it could not grab the keyboard/mouse, preventing the screen from being locked manually. * kscreensaver: Screensavers are now stopped when asking for the password [#56803] * kio_smb: Several bugfixes for the smbro-ioslave. * kdesktop: fixed minicli layout problem with Qt 3.1.2 * kdm: fixed incorrect user window width with Qt 3.1.2 * Konqueror: Create DCOP interface for mainwindow when object begins to exist. * Konqueror: Fixed tab open delays when it can't reach website. * Konsole: Don't flicker when selecting entire lines. * Konsole: Crash, selection and sort fixes in schema and session editors. * Konsole: Fixed mouse-wheel in mouse mode. * Konsole: Allow programs to resize windows if enabled. * Konsole: Keep output steady when triple-click selecting. * Konsole: Added "Print" menu command. * kicker: Fixed kasbar only drawing last icon from a group. @ text @d3 1 a3 1 --- kwin/Makefile.in.orig Tue May 13 23:08:02 2003 d5 1 a5 1 @@@@ -426,18 +426,22 @@@@ INCLUDES = $(all_includes) d32 1 a32 1 @@@@ -446,7 +450,7 @@@@ kwinincludedir = $(includedir)/kwin d41 1 a41 1 @@@@ -457,7 +461,6 @@@@ data_DATA = eventsrc d166 1 a166 1 @@@@ -907,7 +918,7 @@@@ distclean-tags: d171 1 a171 1 +KDE_DIST=pluginlibFix.pl kwin.upd plugins.h placement.h LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp pop.wav stdclient_bitmaps.h events.h cr16-app-kwin.png atoms.h eventsrc d175 1 a175 1 @@@@ -1085,25 +1096,15 @@@@ messages: d181 1 a181 1 - $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) d188 2 d193 3 a195 1 d200 2 d206 2 d212 3 a214 3 @@@@ -1120,8 +1121,18 @@@@ kwinbutton.moc: $(srcdir)/kwinbutton.h $(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc d219 2 d223 1 a223 1 + $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) d234 1 a234 1 @@@@ -1153,33 +1164,33 @@@@ force-reedit: d281 1 a281 1 @@@@ -1189,17 +1200,17 @@@@ kde-rpo-clean: @ 1.4 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: General New default widget style: Keramik New default icon theme: Crystal Created and enhanced framework to effectively disable certain features of the GUI, like for example shell access, disallowing to select custom wall papers. "Kiosk mode" Usability improvements: Kicker: Context menu, applet menus, wording and panel feature consistency improved Kicker: Redesigned control module. KCalc: Usability Improvements. KSnapshot: Usability Improvements. KsCD: User Interface Improvements in configuration and information dialogs kdelibs Extended the DCOP commandline client to enable nonGUI applications (such as shell scripts) to use DCOP send DCOP messages to multiple users and/or sessions concurrently Added to notification dialog to allow applications to configure their notifications with a common GUI. Added "Open File", "Open Destination" and "Keep window open" to download progress dialog. KDatePicker has now week number display and selection. Added KLocale support for setting/retrieving the first day of a week Support for "Multimedia keys" on your keyboard. Added on-demand icon loading support to improve startup performance of applications. KHTML: Improvements to printing support. Page Info and Frame info dialog. Auto-Scroll support of webpages using Shift combined with arrow keys. Many, many Bugfixes and improvements. Small codebase merges with Safari. The main merge is planned for a future release however, as it requires more testing. KIO: Modified thumbnail ioslave that can extract a thumbnail from the file directly if it contains one, rather than generating one itself. Added fish:// protocol slave, which can access remote filesystems via SSH and SCP Cleanups and Corrections in smtp:// protocol slave. Activated rtsp:// protocol slave. Added support for Public Key Authentication and interopability with newer versions of OpenSSH to sftp:// protocol slave. KSSL: SSL certificate policies can now be configured based on the host name @ text @d3 1 a3 1 --- kwin/Makefile.in.orig Fri Jan 17 09:03:11 2003 d5 1 a5 1 @@@@ -290,18 +290,22 @@@@ INCLUDES = $(all_includes) d32 1 a32 1 @@@@ -310,7 +314,7 @@@@ kwinincludedir = $(includedir)/kwin d41 1 a41 1 @@@@ -321,7 +325,6 @@@@ data_DATA = eventsrc d49 1 a49 1 @@@@ -330,18 +333,23 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d80 1 a80 1 @@@@ -349,7 +357,7 @@@@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) a86 1 DEFS = @@DEFS@@ d88 1 a88 1 @@@@ -360,26 +368,26 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d d131 2 a132 1 @@@@ -400,7 +408,7 @@@@ CXXLD = $(CXX) a134 1 CXXFLAGS = @@CXXFLAGS@@ d140 1 a140 1 @@@@ -413,7 +421,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d149 1 a149 1 @@@@ -460,6 +468,8 @@@@ clean-libLTLIBRARIES: d158 1 a158 1 @@@@ -503,6 +513,7 @@@@ distclean-compile: d166 2 a167 2 @@@@ -732,7 +743,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d170 2 a171 2 -KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h cr32-app-kwin.png eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp cr16-app-kwin.png pluginlibFix.pl tabbox.cpp placement.h plugins.h events.h kwinbindings.cpp LICENSE popupinfo.h options.cpp popupinfo.cpp kwinbutton.cpp cr48-app-kwin.png tabbox.h events.cpp +KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h placement.h options.cpp LICENSE killwindow.h cr32-app-kwin.png main.h popupinfo.h NEWCOLORSCHEME.README cr48-app-kwin.png tabbox.h kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h popupinfo.cpp events.h cr16-app-kwin.png atoms.h killwindow.cpp tabbox.cpp eventsrc d175 1 a175 1 @@@@ -895,25 +906,15 @@@@ messages: d204 1 a204 1 @@@@ -930,8 +931,18 @@@@ kwinbutton.moc: $(srcdir)/kwinbutton.h d224 1 a224 1 @@@@ -963,33 +974,33 @@@@ force-reedit: d271 1 a271 1 @@@@ -999,17 +1010,17 @@@@ kde-rpo-clean: @ 1.3 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- kwin/Makefile.in.orig Fri Dec 27 18:19:11 2002 d5 1 a5 1 @@@@ -292,18 +292,22 @@@@ INCLUDES = $(all_includes) d13 3 a15 3 -#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ +#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ d18 3 a20 3 -kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ +libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ tabbox.cpp options.cpp plugins.cpp events.cpp \ d32 1 a32 1 @@@@ -312,7 +316,7 @@@@ kwinincludedir = $(includedir)/kwin d36 2 a37 2 -kwin_LDADD = kwin.la +kwin_LDADD = libkwin.la d41 1 a41 1 @@@@ -323,7 +327,6 @@@@ data_DATA = eventsrc d49 1 a49 1 @@@@ -332,16 +335,23 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d54 1 a54 2 -am_kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo d57 1 a57 7 #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) -#>+ 5 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo -@@KDE_USE_FINAL_FALSE@@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) d61 4 a64 3 +am_libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo d66 3 a68 1 +#>+ 6 d70 5 a74 3 +libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo KWinInterface_skel.lo d80 1 a80 1 @@@@ -349,7 +359,7 @@@@ am_kwin_OBJECTS = kwin_main.$(OBJEXT) d89 40 a128 34 @@@@ -359,23 +369,23 @@@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ #>- @@AMDEP_TRUE@@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/workspace.Plo +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo #>+ 13 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/workspace.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/workspace.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo d132 1 a132 1 @@@@ -396,7 +406,7 @@@@ CXXLD = $(CXX) d141 1 a141 1 @@@@ -409,7 +419,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d150 2 a151 2 @@@@ -458,6 +468,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d156 1 d159 10 a168 11 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -496,6 +508,7 @@@@ distclean-compile: @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/client.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/events.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/killwindow.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwin_main.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwin_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwinbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -706,7 +719,7 @@@@ distclean-tags: d171 2 a172 2 -KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp pluginlibFix.pl tabbox.cpp hi16-app-kwin.png plugins.h events.h kwinbindings.cpp LICENSE hi48-app-kwin.png options.cpp kwinbutton.cpp hi32-app-kwin.png tabbox.h events.cpp +KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png d176 1 a176 1 @@@@ -863,25 +876,15 @@@@ messages: d205 1 a205 1 @@@@ -894,8 +897,18 @@@@ kwinbutton.moc: $(srcdir)/kwinbutton.h d220 2 a221 2 - -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc kwinbutton.moc + -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc d225 1 a225 1 @@@@ -927,33 +940,33 @@@@ force-reedit: d229 1 a229 1 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc kwinbutton.moc d233 1 a233 1 +libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc d237 1 a237 1 for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \ d272 1 a272 1 @@@@ -963,15 +976,15 @@@@ kde-rpo-clean: d275 8 a282 5 #>+ 13 -kwinbutton.lo: kwinbutton.moc kwinbutton.o: kwinbutton.moc -tabbox.lo: tabbox.moc -tabbox.o: tabbox.moc a284 1 workspace.o: workspace.moc d287 5 a292 3 +options.lo: options.moc +client.o: client.moc +tabbox.o: tabbox.moc d294 1 d296 1 a296 1 +options.o: options.moc a297 2 +kwinbutton.lo: kwinbutton.moc +tabbox.lo: tabbox.moc @ 1.2 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-dh,v 1.1.2.1 2002/06/23 19:05:50 jlam Exp $ d3 1 a3 1 --- kwin/Makefile.in.orig Mon May 13 23:57:54 2002 d5 1 a5 1 @@@@ -293,18 +293,22 @@@@ d15 2 a16 2 #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ #>- killwindow.cpp kwinbutton.cpp d32 1 a32 1 @@@@ -313,7 +317,7 @@@@ d41 1 a41 1 @@@@ -324,7 +328,6 @@@@ d49 1 a49 1 @@@@ -333,17 +336,24 @@@@ d59 1 a59 1 -#>+ 6 d62 1 a62 2 - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ - kwin_la_meta_unload.lo d72 1 a72 1 +#>+ 7 d76 1 a76 2 + kwinbutton.lo KWinInterface_skel.lo \ + libkwin_la_meta_unload.lo d82 1 a82 1 @@@@ -351,7 +361,7 @@@@ d91 1 a91 1 @@@@ -361,10 +371,10 @@@@ d93 33 a125 10 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/workspace.Plo + @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo d127 2 a128 3 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -384,7 +394,7 @@@@ d137 1 a137 1 @@@@ -397,7 +407,7 @@@@ d146 1 a146 1 @@@@ -446,6 +456,8 @@@@ d155 1 a155 1 @@@@ -484,6 +496,7 @@@@ d163 1 a163 1 @@@@ -694,7 +707,7 @@@@ d167 1 a167 1 -KDE_DIST=NEWCOLORSCHEME.README plugins.cpp stdclient_bitmaps.h kwin.upd options.cpp tabbox.h hi48-app-kwin.png pluginlibFix.pl LICENSE main.h hi32-app-kwin.png pop.wav kwinbutton.cpp events.cpp plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc killwindow.cpp tabbox.cpp hi16-app-kwin.png d172 1 a172 1 @@@@ -851,12 +864,6 @@@@ d177 1 a177 1 -KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) d181 15 d197 7 d205 3 a207 6 workspace.moc: $(srcdir)/workspace.h $(MOC) $(srcdir)/workspace.h -o workspace.moc @@@@ -881,6 +888,12 @@@@ plugins.moc: $(srcdir)/plugins.h $(MOC) $(srcdir)/plugins.h -o plugins.moc d209 1 a209 1 +KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) d214 1 a214 1 #>+ 3 d216 2 a217 2 -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc @@@@ -915,28 +928,28 @@@@ d219 3 a222 26 #>+ 12 -kwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc - @@echo 'creating kwin_la_meta_unload.cpp' - @@-rm -f kwin_la_meta_unload.cpp +libkwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc + @@echo 'creating libkwin_la_meta_unload.cpp' + @@-rm -f libkwin_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ - cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ - echo '0};' >> kwin_la_meta_unload.cpp ;\ - echo '#include ' >> kwin_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ - else echo > kwin_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ + cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ + echo '0};' >> libkwin_la_meta_unload.cpp ;\ + echo '#include ' >> libkwin_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ + else echo > libkwin_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kwin_la_meta_unload.cpp + -rm -f libkwin_la_meta_unload.cpp d225 5 a229 15 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc +kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc @@echo 'creating kwin_la.all_cpp.cpp ...'; \ rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ - for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ + for file in kwin_main.cpp ; do \ echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ done; \ @@@@ -944,6 +957,18 @@@@ rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files #>+ 11 +libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp d233 3 a235 1 + for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ d238 4 a241 2 + done; \ + cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ a242 6 + +#>+ 11 kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp @@echo 'creating kwin.all_cpp.cpp ...'; \ rm -f kwin.all_cpp.files kwin.all_cpp.final; \ @@@@ -957,20 +982,20 @@@@ d246 2 a247 2 - -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp + -rm -f kwin_la.all_cpp.cpp libkwin_la.all_cpp.cpp kwin.all_cpp.cpp d267 24 a290 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdebase3 pkg @ text @@ 1.1.1.1.2.1 log @file patch-dh was added on branch buildlink2 on 2002-06-23 19:05:50 +0000 @ text @d1 263 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 263 $NetBSD: patch-dh,v 1.1.1.1.2.1 2002/06/23 19:05:50 jlam Exp $ --- kwin/Makefile.in.orig Mon May 13 23:57:54 2002 +++ kwin/Makefile.in @@@@ -293,18 +293,22 @@@@ SUBDIRS = . kcmkwin pics clients bin_PROGRAMS = kwin -lib_LTLIBRARIES = kwin.la +lib_LTLIBRARIES = libkwin.la kwin.la # workspace.cpp has to be first in order not to break --enable-final -#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ +#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \ #>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \ #>- killwindow.cpp kwinbutton.cpp #>+ 3 -kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ +libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \ tabbox.cpp options.cpp plugins.cpp events.cpp \ killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp -kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA) +libkwin_la_LDFLAGS = $(all_libraries) + +kwin_la_SOURCES = kwin_main.cpp +kwin_la_LIBADD = libkwin.la kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h @@@@ -313,7 +317,7 @@@@ kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h kwin_SOURCES = kwin_main.cpp -kwin_LDADD = kwin.la +kwin_LDADD = libkwin.la kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH) KDE_ICON = kwin @@@@ -324,7 +328,6 @@@@ sounddir = $(kde_sounddir) sound_DATA = pop.wav - update_DATA = kwin.upd pluginlibFix.pl updatedir = $(kde_datadir)/kconf_update subdir = kwin @@@@ -333,17 +336,24 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kwin_la_DEPENDENCIES = -am_kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo +kwin_la_DEPENDENCIES = libkwin.la +am_kwin_la_OBJECTS = kwin_main.lo #>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS) -#>+ 6 -kwin_la_final_OBJECTS = kwin_la.all_cpp.lo -kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \ - options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo \ - kwin_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS) +#>+ 1 +kwin_la_OBJECTS = kwin_main.lo +libkwin_la_DEPENDENCIES = +am_libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo +#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS) +#>+ 7 +libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo +libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \ + tabbox.lo options.lo plugins.lo events.lo killwindow.lo \ + kwinbutton.lo KWinInterface_skel.lo \ + libkwin_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS) bin_PROGRAMS = kwin$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@@@ -351,7 +361,7 @@@@ #>- kwin_OBJECTS = $(am_kwin_OBJECTS) #>+ 1 kwin_OBJECTS = kwin_main.$(OBJEXT) -kwin_DEPENDENCIES = kwin.la +kwin_DEPENDENCIES = libkwin.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -361,10 +371,10 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \ @@AMDEP_TRUE@@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/workspace.Plo + @@AMDEP_TRUE@@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \ + @@AMDEP_TRUE@@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -384,7 +394,7 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) +DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) DATA = $(data_DATA) $(sound_DATA) $(update_DATA) HEADERS = $(include_HEADERS) $(kwininclude_HEADERS) @@@@ -397,7 +407,7 @@@@ DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \ Makefile.am Makefile.in DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES) +SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -446,6 +456,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS) +libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -484,6 +496,7 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/client.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/events.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/killwindow.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwin_main.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwin_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kwinbutton.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/main.Plo@@am__quote@@ @@@@ -694,7 +707,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=NEWCOLORSCHEME.README plugins.cpp stdclient_bitmaps.h kwin.upd options.cpp tabbox.h hi48-app-kwin.png pluginlibFix.pl LICENSE main.h hi32-app-kwin.png pop.wav kwinbutton.cpp events.cpp plugins.h killwindow.h kwinbindings.cpp events.h atoms.h eventsrc killwindow.cpp tabbox.cpp hi16-app-kwin.png +KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -851,12 +864,6 @@@@ # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -#>+ 5 -KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) - $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) -KWinInterface_skel.cpp: KWinInterface.kidl - $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl - #>+ 3 workspace.moc: $(srcdir)/workspace.h $(MOC) $(srcdir)/workspace.h -o workspace.moc @@@@ -881,6 +888,12 @@@@ plugins.moc: $(srcdir)/plugins.h $(MOC) $(srcdir)/plugins.h -o plugins.moc +#>+ 5 +KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOPIDL_DEPENDENCIES) + $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false ) +KWinInterface_skel.cpp: KWinInterface.kidl + $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl + #>+ 3 clean-metasources: -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc @@@@ -915,28 +928,28 @@@@ #>+ 12 -kwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc - @@echo 'creating kwin_la_meta_unload.cpp' - @@-rm -f kwin_la_meta_unload.cpp +libkwin_la_meta_unload.cpp: workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc + @@echo 'creating libkwin_la_meta_unload.cpp' + @@-rm -f libkwin_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kwin_la[] = {' > kwin_la_meta_unload.cpp ;\ - cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kwin_la_meta_unload.cpp ;\ - echo '0};' >> kwin_la_meta_unload.cpp ;\ - echo '#include ' >> kwin_la_meta_unload.cpp ;\ - echo '_UNLOAD(kwin_la)' >> kwin_la_meta_unload.cpp ;\ - else echo > kwin_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkwin_la[] = {' > libkwin_la_meta_unload.cpp ;\ + cat workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkwin_la_meta_unload.cpp ;\ + echo '0};' >> libkwin_la_meta_unload.cpp ;\ + echo '#include ' >> libkwin_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkwin_la)' >> libkwin_la_meta_unload.cpp ;\ + else echo > libkwin_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kwin_la_meta_unload.cpp + -rm -f libkwin_la_meta_unload.cpp #>+ 11 -kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc +kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc @@echo 'creating kwin_la.all_cpp.cpp ...'; \ rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \ - for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp kwin_la_meta_unload.cpp ; do \ + for file in kwin_main.cpp ; do \ echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \ done; \ @@@@ -944,6 +957,18 @@@@ rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files #>+ 11 +libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp + @@echo 'creating libkwin_la.all_cpp.cpp ...'; \ + rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \ + for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp libkwin_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \ + done; \ + cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \ + rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files + +#>+ 11 kwin.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kwin_main.cpp @@echo 'creating kwin.all_cpp.cpp ...'; \ rm -f kwin.all_cpp.files kwin.all_cpp.final; \ @@@@ -957,20 +982,20 @@@@ #>+ 3 clean-final: - -rm -f kwin_la.all_cpp.cpp kwin.all_cpp.cpp + -rm -f kwin_la.all_cpp.cpp libkwin_la.all_cpp.cpp kwin.all_cpp.cpp #>+ 2 final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am + $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @