head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.22 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.20 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.18 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.16 pkgsrc-2011Q2-base:1.9 pkgsrc-2009Q4:1.9.0.14 pkgsrc-2009Q4-base:1.9 pkgsrc-2008Q4:1.9.0.12 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.10 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.8 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.6 pkgsrc-2008Q2-base:1.9 pkgsrc-2008Q1:1.9.0.4 pkgsrc-2008Q1-base:1.9 pkgsrc-2007Q4:1.9.0.2 pkgsrc-2007Q4-base:1.9 pkgsrc-2007Q3:1.8.0.12 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.10 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.8 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.6 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.4 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.2 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 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.1.1 buildlink2:1.1.1.1.0.2 pkg-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.9 date 2007.10.20.10.47.22; author markd; state dead; branches; next 1.8; 1.8 date 2006.05.09.12.48.13; author joerg; state Exp; branches; next 1.7; 1.7 date 2004.02.04.20.38.00; author markd; state dead; branches; next 1.6; 1.6 date 2004.01.15.11.12.40; author markd; state Exp; branches; next 1.5; 1.5 date 2003.07.30.14.24.50; author markd; state Exp; branches; next 1.4; 1.4 date 2003.05.22.02.57.14; author markd; state Exp; branches; next 1.3; 1.3 date 2003.03.11.13.22.31; author markd; state Exp; branches; next 1.2; 1.2 date 2003.01.02.09.12.29; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.05.31.13.42.36; author skrll; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.05.31.13.42.36; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.05.31.13.42.36; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.53.40; author jlam; state Exp; branches; next ; desc @@ 1.9 log @Update to KDE 3.5.8 kfloppy * Check all available densities instead of a hardcoded list. klaptopdaemon * Fix lock & hibernate allowing unauthorised access . @ text @$NetBSD: patch-af,v 1.8 2006/05/09 12:48:13 joerg Exp $ --- superkaramba/src/memsensor.h.orig 2006-05-09 10:22:30.000000000 +0000 +++ superkaramba/src/memsensor.h @@@@ -44,18 +44,17 @@@@ public: private: QString meminfo; void readValues(); -#if defined __FreeBSD__ || defined(Q_OS_NETBSD) +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) int pageshift; /* log base 2 of the pagesize */ QString sensorResult; int swapTotal; int swapUsed; -# if (defined(__FreeBSD__) && __FreeBSD_version < 500018) - KShellProcess ksp; - bool MaxSet; - -# elif defined __FreeBSD__ +# if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018 kvm_t *kd; kvm_swap swapinfo; +# elif defined(Q_OS_FREEBSD) + KShellProcess ksp; + bool MaxSet; # endif #endif @ 1.8 log @Fix build on DragonFly. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Update to KDE 3.2 Changes: Utilities KRegExpEditor * Create an application on its own from KRegExpEditor (several users have requested this) Jesper K. Pedersen * Add a verifier window where user can try his regular expression Jesper K. Pedersen * Add some warnings on invalid regular expressions (like $^) Jesper K. Pedersen * Ensure predefined regular expressions are correct i18n'ed Jesper K. Pedersen * Add support for Emacs style Regular Expression syntaxes Jesper K. Pedersen KJots * XMLUI-ify and improve the interface. Using a treeview for books and bookmarks for quick nav. Aaron J. Seigo * Printing and viewing of entire books. Aaron J. Seigo * Autosave. Aaron J. Seigo KMilo * NEW IN KDE: A generic framework to support special keyboards and hardware features, such as those found on laptops. George Staikos * KMilo support for PowerBooks via pbbuttonsd. George Staikos KLaptop * Full Linux ACPI support (suspend etc, throttling, performance profiles) Paul Campbell * Back panel brightness support for some laptops (Sony, Toshiba) Paul Campbell * Recode to run as a KDED daemon Paul Campbell * Better Thinkpad support Paul Campbell * Triggers from lid closure (suspend, powerdown etc) - on laptops with ACPI support Paul Campbell * Sony laptop extensions support (/dev/sonypi - scroll wheel, panel brightness) Paul Campbell * Added the ability to auto-disable suspend etc when the load average is high Paul Campbell * Display the state of individual batteries in ACPI systems Paul Campbell * Support for Linux kernel software suspend Paul Campbell * Added battery charged notification dialog Paul Campbell * Option to use blank screensaver when in battery mode George Staikos * Support for the Linux CPUFreq interface. Volker Krause Kgpg * NEW IN KDE: frontend for gpg. Jean-Baptiste Mardelle * Key editing in GUI (changing passphrase, trust, expiration) * Support for key groups * Speed up key manager * Gpg-agent support * Auto import missing signatures * improved editor (print, spell check, ...) * Manage photo id's * Revocation certificates (print, save) * Change dialogs to KBaseDialog for ui consistency * Implement the missing key editing commands in the GUI (adduid, deluid,..) * When encrypting a folder, give a choice of compression scheme (zip, tar,...) KHexEdit2 * NEW IN KDE: A hex edit widget library Friedrich W. H. Kossebau * move the lib of the new KHexEdit2 widget from kdenonbeta over to kdeutils/khexedit/lib Friedrich W. H. Kossebau * implement interfaces for the KBytesEdit widget part Friedrich W. H. Kossebau @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.6 2004/01/15 11:12:40 markd Exp $ d3 15 a17 139 --- kedit/Makefile.in.orig 2003-12-29 11:33:17.000000000 +1300 +++ kedit/Makefile.in @@@@ -282,16 +282,20 @@@@ x_libraries = @@x_libraries@@ INCLUDES = $(all_includes) bin_PROGRAMS = kedit -lib_LTLIBRARIES = kedit.la +lib_LTLIBRARIES = libkedit_main.la kedit.la -kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ +libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ mail.cpp optiondialog.cpp -kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LDFLAGS = $(all_libraries) -module -avoid-version + +kedit_la_SOURCES = kedit_main.cpp +kedit_la_LIBADD = libkedit_main.la kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version -kedit_SOURCES = dummy.cpp -kedit_LDADD = kedit.la +kedit_SOURCES = kedit_main.cpp +kedit_LDADD = libkedit_main.la kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kedit.h ktextfiledlg.h\ @@@@ -316,34 +320,44 @@@@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kedit_la_DEPENDENCIES = -am_kedit_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo +kedit_la_DEPENDENCIES = libkedit_main.la +am_kedit_la_OBJECTS = kedit_main.lo #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS) -#>+ 4 -kedit_la_final_OBJECTS = kedit_la.all_cpp.lo -kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo -@@KDE_USE_FINAL_FALSE@@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS) +#>+ 1 +kedit_la_OBJECTS = kedit_main.lo +libkedit_main_la_DEPENDENCIES = +am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo +#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS) +#>+ 5 +libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo +libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo +@@KDE_USE_FINAL_FALSE@@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS) bin_PROGRAMS = kedit$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kedit_OBJECTS = dummy.$(OBJEXT) +am_kedit_OBJECTS = kedit_main.$(OBJEXT) #>- kedit_OBJECTS = $(am_kedit_OBJECTS) #>+ 1 -kedit_OBJECTS = dummy.$(OBJEXT) -kedit_DEPENDENCIES = kedit.la +kedit_OBJECTS = kedit_main.$(OBJEXT) +kedit_DEPENDENCIES = libkedit_main.la 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)/kedit.Plo \ +#>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \ +#>- @@AMDEP_TRUE@@ ./$(DEPDIR)/kedit_main.Po \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \ #>- @@AMDEP_TRUE@@ ./$(DEPDIR)/optiondialog.Plo -#>+ 7 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \ +#>+ 9 +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libkedit_main_la.all_cpp.P ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kedit_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/optiondialog.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/kedit_main.Po \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \ @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/optiondialog.Plo @@@@ -365,7 +379,8 @@@@ CXXLD = $(CXX) #>+ 2 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ -DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES) +DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \ + $(kedit_SOURCES) DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) @@@@ -379,7 +394,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES) +SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) $(kedit_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -426,6 +441,8 @@@@ clean-libLTLIBRARIES: done kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS) +libkedit_main.la: $(libkedit_main_la_OBJECTS) $(libkedit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkedit_main_la_LDFLAGS) $(libkedit_main_la_OBJECTS) $(libkedit_main_la_LIBADD) $(LIBS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) @@@@ -465,8 +482,9 @@@@ 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)/kedit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kedit_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kedit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/ktextfiledlg.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/mail.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/optiondialog.Plo@@am__quote@@ @@@@ -678,7 +696,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=KEdit.desktop keditui.rc optionstate.h +KDE_DIST=KEdit.desktop keditui.rc Makefile.in.rej optionstate.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -838,19 +856,16 @@@@ uninstall-info: uninstall-info-recursive messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.pot d19 9 a27 91 -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: #>+ 3 -ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h - $(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc +optiondialog.moc: $(srcdir)/optiondialog.h + $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc #>+ 1 -mocs: ktextfiledlg.moc +mocs: optiondialog.moc #>+ 3 mail.moc: $(srcdir)/mail.h $(MOC) $(srcdir)/mail.h -o mail.moc @@@@ -858,11 +873,11 @@@@ mail.moc: $(srcdir)/mail.h #>+ 1 mocs: mail.moc #>+ 3 -optiondialog.moc: $(srcdir)/optiondialog.h - $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc +ktextfiledlg.moc: $(srcdir)/ktextfiledlg.h + $(MOC) $(srcdir)/ktextfiledlg.h -o ktextfiledlg.moc #>+ 1 -mocs: optiondialog.moc +mocs: ktextfiledlg.moc #>+ 3 kedit.moc: $(srcdir)/kedit.h $(MOC) $(srcdir)/kedit.h -o kedit.moc @@@@ -871,7 +886,7 @@@@ kedit.moc: $(srcdir)/kedit.h mocs: kedit.moc #>+ 3 clean-metasources: - -rm -f ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc + -rm -f optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc #>+ 2 docs-am: @@@@ -884,33 +899,33 @@@@ force-reedit: #>+ 11 -kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp ktextfiledlg.moc mail.moc optiondialog.moc kedit.moc - @@echo 'creating kedit_la.all_cpp.cpp ...'; \ - rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ +libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc + @@echo 'creating libkedit_main_la.all_cpp.cpp ...'; \ + rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \ for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \ - echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ - test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ + echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \ done; \ - cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \ - rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files + cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ + rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files #>+ 3 clean-final: - -rm -f kedit_la.all_cpp.cpp + -rm -f libkedit_main_la.all_cpp.cpp #>+ 2 final: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" all-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" install-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" all-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" install-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean @@@@ -920,11 +935,11 @@@@ kde-rpo-clean: -rm -f *.rpo a28 14 #>+ 9 -kedit.o: kedit.moc -ktextfiledlg.lo: ktextfiledlg.moc -ktextfiledlg.o: ktextfiledlg.moc optiondialog.o: optiondialog.moc +mail.lo: mail.moc optiondialog.lo: optiondialog.moc -kedit.lo: kedit.moc mail.o: mail.moc -mail.lo: mail.moc +kedit.lo: kedit.moc +ktextfiledlg.o: ktextfiledlg.moc +ktextfiledlg.lo: ktextfiledlg.moc +kedit.o: kedit.moc @ 1.6 log @Update to KDE 3.1.5. Changes: * kdf: Fixed mem leak * khexedit: Fixed 64 bit float big endian decoding * khexedit: Honour ignore case setting in find next (F3) * khexedit: Fix crash on systems which need strict alignments for double variables (HP-UX) @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update kdeutils to 3.1.3. Changes: * kcalc: ignore keypresses combined with alt, Meta or Control * kjots: Fix DnD issues * kedit: correct overwrite/insert handling * kedit: fix session management * ark: fix .rar archive handling. * klaptopdaemon: icon updates. * kdf: fix handling of mountpoints with whitespaces * build system fixes @ text @d3 1 a3 1 --- kedit/Makefile.in.orig 2003-07-15 22:19:24.000000000 +1200 d5 1 a5 1 @@@@ -281,16 +281,20 @@@@ x_libraries = @@x_libraries@@ d31 1 a31 1 @@@@ -314,34 +318,44 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d90 1 a90 1 @@@@ -363,7 +377,8 @@@@ CXXLD = $(CXX) d100 1 a100 1 @@@@ -377,7 +392,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d109 1 a109 1 @@@@ -424,6 +439,8 @@@@ clean-libLTLIBRARIES: d118 1 a118 1 @@@@ -463,8 +480,9 @@@@ mostlyclean-compile: d129 1 a129 1 @@@@ -670,7 +688,7 @@@@ distclean-tags: d133 1 a133 1 -KDE_DIST=optionstate.h keditui.rc KEdit.desktop d138 1 a138 1 @@@@ -830,14 +848,17 @@@@ uninstall-info: uninstall-info-recursive d150 2 d154 3 a156 2 + +#>+ 1 d158 1 a158 1 +#>+ 3 d161 1 a161 2 @@@@ -856,14 +877,8 @@@@ kedit.moc: $(srcdir)/kedit.h d163 1 a163 1 mocs: kedit.moc d167 4 a170 2 - -#>+ 1 d172 7 a178 1 -#>+ 3 d180 1 a180 1 - -rm -f mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc d185 1 a185 1 @@@@ -876,33 +891,33 @@@@ force-reedit: d189 1 a189 1 -kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp mail.moc kedit.moc ktextfiledlg.moc optiondialog.moc d232 2 a233 1 @@@@ -913,10 +928,10 @@@@ kde-rpo-clean: d236 3 a239 1 -mail.o: mail.moc d242 2 a243 4 +mail.o: mail.moc kedit.lo: kedit.moc -ktextfiledlg.lo: ktextfiledlg.moc ktextfiledlg.o: ktextfiledlg.moc d245 2 d248 1 a248 1 kedit.o: kedit.moc @ 1.4 log @Update KDE to 3.1.2. Changes: kdeartwork: * Fixed a potential printf() format string attack in the slideshow screensaver kdepim: * korganizer: Exchange plugin supports secure WebDAV. * korganizer: Fix timezone handling when timezone names are Unicode strings. kdeutils: * kedit: Save immediately when Settings/Save Settings is called. * khexedit: Fixed insertion of local files. @ text @d3 1 a3 1 --- kedit/Makefile.in.orig Thu May 8 00:08:45 2003 d5 1 a5 1 @@@@ -280,16 +280,20 @@@@ x_libraries = @@x_libraries@@ d31 1 a31 1 @@@@ -313,34 +317,44 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d90 1 a90 1 @@@@ -362,7 +376,8 @@@@ CXXLD = $(CXX) d100 1 a100 1 @@@@ -376,7 +391,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d109 1 a109 1 @@@@ -423,6 +438,8 @@@@ clean-libLTLIBRARIES: d118 1 a118 1 @@@@ -462,8 +479,9 @@@@ mostlyclean-compile: d129 1 a129 1 @@@@ -669,7 +687,7 @@@@ distclean-tags: d134 1 a134 1 +KDE_DIST=KEdit.desktop keditui.rc optionstate.h d138 1 a138 1 @@@@ -829,14 +847,15 @@@@ uninstall-info: uninstall-info-recursive d153 2 d159 3 a161 3 @@@@ -849,12 +868,8 @@@@ kedit.moc: $(srcdir)/kedit.h $(MOC) $(srcdir)/kedit.h -o kedit.moc d166 2 d175 1 a175 1 @@@@ -867,33 +882,33 @@@@ force-reedit: d222 1 a222 1 @@@@ -904,10 +919,10 @@@@ kde-rpo-clean: @ 1.3 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdeaddons NEW IN KDE: Noatun plugin to search for lyrics of the current song. kdeadmin kcmlinuz: is now a standalone application kcmlinuz: Added capability to search for configuration options kdeedu NEW IN KDE: Kiten, a Japanese Reference Tool. NEW IN KDE: FlashKard, a vocabulary tool. Is able to read KVTML files which were written by KVocTrain. NEW IN KDE: started a libkdeedu, which allows interopability and code sharing between KDE Educational applications. kdepim libkabc Plugin interface for resources and formats. Control module for configuring multiple resources. Optional directory resource which stores each entry as own file. LDAP resource. Optional binary storage format for better performance with large addressbooks. Completed support for vCard entities: sound, geo, key and some more. vCard 2.1 import. LDAP aware mail address input field. KAddressbook New card and icon views. Multiple configurable views. "kab-style" details view for selected entry. Customizable view filters. Customizable categories for addressbook entries. Support for transparently accessing multiple addressbooks. Redesigned entry editor widget. Printing option supporting two different styles. Optional embedded entry and ditribution list editor. "Jump bar" for quick alphabetical access of entries. Fetch addresses from LDAP servers, including support for multiple servers. Importing of vCard 2.1 files. Improved CSV import (including template for import from Outlook 2000). vCard export. KAlarm Added option to execute commands in alarms. Implemented daily, weekly, monthly and annual recurrences. Optionally play audio notification when an alarm triggers. KPilot Added time conduit VCal conduits (TODO and Calendar) have been improved to function properly. Addressbook conduit has been ported to use libkabc. KOrganizer General User definable templates for events and TODOs. Alarms for TODOs. Added support for automatic HTML export on save of a calendar file. Time table print view. New "location" attribute for events. Experimental "Get Hot New Stuff" button for downloading and uploading calendar files of common interest. Views Added new "Next 3 days" view. Added selection of time span for a new event in day and week views. Direct manipulation of priority, completion status and categories of TODOs by context menus added. Deletion of individual instances of recurring events. Rewritten month view. Coloring of events in month view based on categories. Coloring of due and overdue todos. Improved "What's Next" view. Configurable cell height in week and day views Group scheduling iMIP group scheduling functions for TODOs. Publishing of Free/Busy information by iMIP conformant email. Improved automatisation of group scheduling. Interopability and integration Support for "webcal" URLs in Konqueror (known from Apple iCal). Support for iCalendar based drag&drop. KOrganizer now shares the dialogs for categories with KAddressBook. Improved iCalendar conformance. Improved right-to-left languages support. Bug fixes for non-latin1 encodings. Plugins New plugin for importing Birthdays of contacts in the KDE address book. New plugin for accessing calendar data stored on an Exchange 2000 server. kdeutils Partially ACPI support in KLaptop. @ text @d3 1 a3 1 --- kedit/Makefile.in.orig Fri Jan 17 08:58:06 2003 d5 1 a5 1 @@@@ -256,16 +256,20 @@@@ x_libraries = @@x_libraries@@ d31 1 a31 1 @@@@ -289,22 +293,29 @@@@ CONFIG_HEADER = $(top_builddir)/config.h a68 1 DEFS = @@DEFS@@ a69 2 @@@@ -313,14 +324,17 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ d90 2 a91 1 @@@@ -343,7 +357,8 @@@@ CXXLD = $(CXX) a93 1 CXXFLAGS = @@CXXFLAGS@@ d100 1 a100 1 @@@@ -356,7 +371,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d109 1 a109 1 @@@@ -403,6 +418,8 @@@@ clean-libLTLIBRARIES: d118 1 a118 1 @@@@ -442,8 +459,9 @@@@ mostlyclean-compile: d129 2 a130 2 @@@@ -613,7 +631,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d138 1 a138 1 @@@@ -758,14 +776,15 @@@@ uninstall-info: uninstall-info-recursive d157 1 a157 1 @@@@ -778,12 +797,8 @@@@ kedit.moc: $(srcdir)/kedit.h d171 1 a171 1 @@@@ -796,33 +811,33 @@@@ force-reedit: d218 1 a218 1 @@@@ -833,10 +848,10 @@@@ kde-rpo-clean: @ 1.2 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 --- kedit/Makefile.in.orig Mon Dec 30 16:24:30 2002 d5 1 a5 1 @@@@ -236,16 +236,20 @@@@ x_libraries = @@x_libraries@@ d31 1 a31 1 @@@@ -269,22 +273,29 @@@@ CONFIG_HEADER = $(top_builddir)/config.h d71 1 a71 2 @@@@ -292,16 +303,16 @@@@ CPPFLAGS = @@CPPFLAGS@@ LDFLAGS = @@LDFLAGS@@ d74 20 a93 23 -#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ -#>- @@AMDEP_TRUE@@ $(DEPDIR)/optiondialog.Plo +#>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ +#>- @@AMDEP_TRUE@@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo #>+ 7 -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/optiondialog.Plo -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ -@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/optiondialog.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES = $(DEPDIR)/libkedit_main_la.all_cpp.P $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@ @@AMDEP_TRUE@@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ +@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@ @@AMDEP_TRUE@@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@@@ -322,7 +333,8 @@@@ CXXLD = $(CXX) d103 1 a103 1 @@@@ -335,7 +347,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r d112 2 a113 2 @@@@ -384,6 +396,8 @@@@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) d118 1 d121 1 a121 2 $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -418,8 +432,9 @@@@ mostlyclean-compile: d125 9 a133 9 -@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kedit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kedit_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kedit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/ktextfiledlg.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/mail.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/optiondialog.Plo@@am__quote@@ @@@@ -575,7 +590,7 @@@@ distclean-tags: d141 1 a141 1 @@@@ -714,14 +729,15 @@@@ uninstall-info: uninstall-info-recursive d160 1 a160 1 @@@@ -734,12 +750,8 @@@@ kedit.moc: $(srcdir)/kedit.h d174 1 a174 1 @@@@ -752,33 +764,33 @@@@ force-reedit: d221 1 a221 1 @@@@ -789,10 +801,10 @@@@ kde-rpo-clean: @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- kedit/Makefile.in.orig Wed May 8 21:11:41 2002 d5 1 a5 1 @@@@ -237,16 +237,20 @@@@ d14 1 a14 1 mail.cpp optiondialog.cpp d31 1 a31 1 @@@@ -270,23 +274,30 @@@@ d40 1 a40 1 -#>+ 5 d42 1 a42 2 -kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \ - kedit_la_meta_unload.lo d51 1 a51 1 +#>+ 6 d54 1 a54 2 + optiondialog.lo \ + libkedit_main_la_meta_unload.lo d71 1 a71 1 @@@@ -294,9 +305,9 @@@@ d75 20 a94 6 -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/optiondialog.Plo +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo d96 2 a97 3 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -316,7 +327,8 @@@@ d107 1 a107 1 @@@@ -329,7 +341,7 @@@@ d116 1 a116 1 @@@@ -378,6 +390,8 @@@@ d125 1 a125 1 @@@@ -412,8 +426,9 @@@@ d136 1 a136 1 @@@@ -569,7 +584,7 @@@@ d140 2 a141 2 -KDE_DIST=optionstate.h KEdit.desktop keditui.rc +KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h d145 1 a145 1 @@@@ -708,9 +723,6 @@@@ a154 1 @@@@ -746,28 +758,28 @@@@ d156 7 d164 2 a165 20 #>+ 12 -kedit_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc - @@echo 'creating kedit_la_meta_unload.cpp' - @@-rm -f kedit_la_meta_unload.cpp +libkedit_main_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc + @@echo 'creating libkedit_main_la_meta_unload.cpp' + @@-rm -f libkedit_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\ - cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\ - echo '0};' >> kedit_la_meta_unload.cpp ;\ - echo '#include ' >> kedit_la_meta_unload.cpp ;\ - echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\ - else echo > kedit_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\ + cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\ + echo '0};' >> libkedit_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkedit_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\ + else echo > libkedit_main_la_meta_unload.cpp; fi d167 8 d176 3 a178 4 #>+ 3 clean-moc-classes: - -rm -f kedit_la_meta_unload.cpp + -rm -f libkedit_main_la_meta_unload.cpp a179 13 #>+ 11 -kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc +kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc @@echo 'creating kedit_la.all_cpp.cpp ...'; \ rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ - for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \ + for file in kedit_main.cpp ; do \ echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ done; \ @@@@ -775,11 +787,23 @@@@ rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files d182 5 a186 2 -kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp d190 3 a192 1 + for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp libkedit_main_la_meta_unload.cpp ; do \ d195 4 a198 2 + done; \ + cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ a199 12 + +#>+ 11 +kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp @@echo 'creating kedit.all_cpp.cpp ...'; \ rm -f kedit.all_cpp.files kedit.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kedit_main.cpp ; do \ echo "#include \"$$file\"" >> kedit.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \ done; \ @@@@ -788,20 +812,20 @@@@ d203 2 a204 2 - -rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp + -rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.all_cpp.cpp d224 15 a238 1 $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @ 1.1.1.1 log @Initial import of the kdeutils pkg (in the right place this time.) @ text @@ 1.1.1.1.2.1 log @file patch-af was added on branch buildlink2 on 2002-06-23 18:53:40 +0000 @ text @d1 236 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 236 $NetBSD: patch-af,v 1.1.1.1.2.1 2002/06/23 18:53:40 jlam Exp $ --- kedit/Makefile.in.orig Wed May 8 21:11:41 2002 +++ kedit/Makefile.in @@@@ -237,16 +237,20 @@@@ INCLUDES = $(all_includes) bin_PROGRAMS = kedit -lib_LTLIBRARIES = kedit.la +lib_LTLIBRARIES = libkedit_main.la kedit.la -kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ +libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\ mail.cpp optiondialog.cpp -kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO) +libkedit_main_la_LDFLAGS = $(all_libraries) -module -avoid-version + +kedit_la_SOURCES = kedit_main.cpp +kedit_la_LIBADD = libkedit_main.la kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version -kedit_SOURCES = dummy.cpp -kedit_LDADD = kedit.la +kedit_SOURCES = kedit_main.cpp +kedit_LDADD = libkedit_main.la kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) noinst_HEADERS = kedit.h ktextfiledlg.h\ @@@@ -270,23 +274,30 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) -kedit_la_DEPENDENCIES = -am_kedit_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo +kedit_la_DEPENDENCIES = libkedit_main.la +am_kedit_la_OBJECTS = kedit_main.lo #>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS) -#>+ 5 -kedit_la_final_OBJECTS = kedit_la.all_cpp.lo -kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo \ - kedit_la_meta_unload.lo -@@KDE_USE_FINAL_FALSE@@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS) -@@KDE_USE_FINAL_TRUE@@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS) +#>+ 1 +kedit_la_OBJECTS = kedit_main.lo +libkedit_main_la_DEPENDENCIES = +am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo +#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS) +#>+ 6 +libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo +libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \ + optiondialog.lo \ + libkedit_main_la_meta_unload.lo +@@KDE_USE_FINAL_FALSE@@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS) +@@KDE_USE_FINAL_TRUE@@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS) bin_PROGRAMS = kedit$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -am_kedit_OBJECTS = dummy.$(OBJEXT) +am_kedit_OBJECTS = kedit_main.$(OBJEXT) #>- kedit_OBJECTS = $(am_kedit_OBJECTS) #>+ 1 -kedit_OBJECTS = dummy.$(OBJEXT) -kedit_DEPENDENCIES = kedit.la +kedit_OBJECTS = kedit_main.$(OBJEXT) +kedit_DEPENDENCIES = libkedit_main.la DEFS = @@DEFS@@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) @@@@ -294,9 +305,9 @@@@ LDFLAGS = @@LDFLAGS@@ LIBS = @@LIBS@@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kedit.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/ktextfiledlg.Plo $(DEPDIR)/mail.Plo \ - @@AMDEP_TRUE@@ $(DEPDIR)/optiondialog.Plo +@@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/kedit.Plo $(DEPDIR)/kedit_main.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/kedit_main.Po $(DEPDIR)/ktextfiledlg.Plo \ + @@AMDEP_TRUE@@ $(DEPDIR)/mail.Plo $(DEPDIR)/optiondialog.Plo #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) #>+ 2 @@@@ -316,7 +327,8 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@@ CXXFLAGS = @@CXXFLAGS@@ -DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES) +DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \ + $(kedit_SOURCES) DATA = $(apps_DATA) $(rc_DATA) HEADERS = $(noinst_HEADERS) @@@@ -329,7 +341,7 @@@@ DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ Makefile.in TODO DIST_SUBDIRS = $(SUBDIRS) -SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES) +SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) $(kedit_SOURCES) #>- all: all-recursive #>+ 1 @@@@ -378,6 +390,8 @@@@ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS) +libkedit_main.la: $(libkedit_main_la_OBJECTS) $(libkedit_main_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libkedit_main_la_LDFLAGS) $(libkedit_main_la_OBJECTS) $(libkedit_main_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @@@@ -412,8 +426,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)/kedit.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kedit_main.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kedit_main.Po@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/ktextfiledlg.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/mail.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/optiondialog.Plo@@am__quote@@ @@@@ -569,7 +584,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=optionstate.h KEdit.desktop keditui.rc +KDE_DIST=KEdit.desktop kedit keditui.rc dummy.cpp optionstate.h DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -708,9 +723,6 @@@@ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.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: @@@@ -746,28 +758,28 @@@@ #>+ 12 -kedit_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc - @@echo 'creating kedit_la_meta_unload.cpp' - @@-rm -f kedit_la_meta_unload.cpp +libkedit_main_la_meta_unload.cpp: optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc + @@echo 'creating libkedit_main_la_meta_unload.cpp' + @@-rm -f libkedit_main_la_meta_unload.cpp @@if test ${kde_qtver} = 2; then \ - echo 'static const char * _metalist_kedit_la[] = {' > kedit_la_meta_unload.cpp ;\ - cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kedit_la_meta_unload.cpp ;\ - echo '0};' >> kedit_la_meta_unload.cpp ;\ - echo '#include ' >> kedit_la_meta_unload.cpp ;\ - echo '_UNLOAD(kedit_la)' >> kedit_la_meta_unload.cpp ;\ - else echo > kedit_la_meta_unload.cpp; fi + echo 'static const char * _metalist_libkedit_main_la[] = {' > libkedit_main_la_meta_unload.cpp ;\ + cat optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkedit_main_la_meta_unload.cpp ;\ + echo '0};' >> libkedit_main_la_meta_unload.cpp ;\ + echo '#include ' >> libkedit_main_la_meta_unload.cpp ;\ + echo '_UNLOAD(libkedit_main_la)' >> libkedit_main_la_meta_unload.cpp ;\ + else echo > libkedit_main_la_meta_unload.cpp; fi #>+ 3 clean-moc-classes: - -rm -f kedit_la_meta_unload.cpp + -rm -f libkedit_main_la_meta_unload.cpp #>+ 11 -kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp kedit_la_meta_unload.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc +kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc @@echo 'creating kedit_la.all_cpp.cpp ...'; \ rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \ - for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp kedit_la_meta_unload.cpp ; do \ + for file in kedit_main.cpp ; do \ echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \ done; \ @@@@ -775,11 +787,23 @@@@ rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files #>+ 11 -kedit.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp +libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp $(srcdir)/libkedit_main_la_meta_unload.cpp + @@echo 'creating libkedit_main_la.all_cpp.cpp ...'; \ + rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \ + for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp libkedit_main_la_meta_unload.cpp ; do \ + echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \ + done; \ + cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \ + rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files + +#>+ 11 +kedit.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit_main.cpp @@echo 'creating kedit.all_cpp.cpp ...'; \ rm -f kedit.all_cpp.files kedit.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> kedit.all_cpp.final; \ - for file in dummy.cpp ; do \ + for file in kedit_main.cpp ; do \ echo "#include \"$$file\"" >> kedit.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit.all_cpp.final; \ done; \ @@@@ -788,20 +812,20 @@@@ #>+ 3 clean-final: - -rm -f kedit_la.all_cpp.cpp kedit.all_cpp.cpp + -rm -f kedit_la.all_cpp.cpp libkedit_main_la.all_cpp.cpp kedit.all_cpp.cpp #>+ 2 final: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" all-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" all-am #>+ 2 final-install: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" install-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" install-am #>+ 2 no-final: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" all-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" all-am #>+ 2 no-final-install: - $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" install-am + $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am #>+ 3 cvs-clean: $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean @