pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/kdenetwork3 Update to KDE 3.1.5.
details: https://anonhg.NetBSD.org/pkgsrc/rev/83a534e3d4ac
branches: trunk
changeset: 466319:83a534e3d4ac
user: markd <markd%pkgsrc.org@localhost>
date: Thu Jan 15 11:24:07 2004 +0000
description:
Update to KDE 3.1.5.
Changes:
* kmail: Fixed problem with external filters dropping last character of
mail
* kmail: Detect when another KMail instance is already running
* kaddressbook: Fix problem with import of Netscape addressbooks
diffstat:
net/kdenetwork3/Makefile | 6 +-
net/kdenetwork3/PLIST | 3 +-
net/kdenetwork3/distinfo | 10 +-
net/kdenetwork3/patches/patch-aa | 8 +-
net/kdenetwork3/patches/patch-af | 363 +++++++++++++++++++-------------------
5 files changed, 193 insertions(+), 197 deletions(-)
diffs (truncated from 750 to 300 lines):
diff -r 518560561cde -r 83a534e3d4ac net/kdenetwork3/Makefile
--- a/net/kdenetwork3/Makefile Thu Jan 15 11:12:40 2004 +0000
+++ b/net/kdenetwork3/Makefile Thu Jan 15 11:24:07 2004 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:50 reed Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/15 11:24:07 markd Exp $
-DISTNAME= kdenetwork-3.1.4
-PKGREVISION= 1
+DISTNAME= kdenetwork-3.1.5
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
-PKGREVISION= 1
.include "../../meta-pkgs/kde3/Makefile.kde3"
diff -r 518560561cde -r 83a534e3d4ac net/kdenetwork3/PLIST
--- a/net/kdenetwork3/PLIST Thu Jan 15 11:12:40 2004 +0000
+++ b/net/kdenetwork3/PLIST Thu Jan 15 11:24:07 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/07/30 13:58:36 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/01/15 11:24:07 markd Exp $
bin/dsirc
bin/kdict
bin/kget
@@ -276,6 +276,7 @@
share/kde/applnk/Utilities/kmailcvt.desktop
share/kde/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
share/kde/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
+share/kde/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
share/kde/apps/kconf_update/kmail-pgpidentity.pl
share/kde/apps/kconf_update/kmail-upd-identities.pl
share/kde/apps/kconf_update/kmail.upd
diff -r 518560561cde -r 83a534e3d4ac net/kdenetwork3/distinfo
--- a/net/kdenetwork3/distinfo Thu Jan 15 11:12:40 2004 +0000
+++ b/net/kdenetwork3/distinfo Thu Jan 15 11:24:07 2004 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2003/09/17 23:28:28 markd Exp $
+$NetBSD: distinfo,v 1.18 2004/01/15 11:24:07 markd Exp $
-SHA1 (kdenetwork-3.1.4.tar.bz2) = 4fd70fc999cef1e22d01cc152274b61ae1e07ec2
-Size (kdenetwork-3.1.4.tar.bz2) = 4989720 bytes
-SHA1 (patch-aa) = 204586688b36ea3374abdc73e5c819b5c020b1c8
+SHA1 (kdenetwork-3.1.5.tar.bz2) = c446d71538bfa96280b0956aff529040be6eb96b
+Size (kdenetwork-3.1.5.tar.bz2) = 4994154 bytes
+SHA1 (patch-aa) = 1f0e8209896385f3b921eb64563afa669531fece
SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855
SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2
SHA1 (patch-ae) = 8b58afa071bd3f47577e5aeb46210ae77690b8bb
-SHA1 (patch-af) = 2c7bc0c148c2b45f9edef02e879833a196689609
+SHA1 (patch-af) = c7c41172e3b61b60d105e995f4e5bd29ec09b27f
SHA1 (patch-ag) = 41838a86a06877deb2635470a79aeb104cd56474
SHA1 (patch-ai) = 90a97f8354c477ddb1d4600e715520adde329417
SHA1 (patch-aj) = 89dc1011d79e22103c03f128afd4fb1d66083187
diff -r 518560561cde -r 83a534e3d4ac net/kdenetwork3/patches/patch-aa
--- a/net/kdenetwork3/patches/patch-aa Thu Jan 15 11:12:40 2004 +0000
+++ b/net/kdenetwork3/patches/patch-aa Thu Jan 15 11:24:07 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.8 2003/09/17 23:28:29 markd Exp $
+$NetBSD: patch-aa,v 1.9 2004/01/15 11:24:07 markd Exp $
---- configure.orig 2003-09-11 03:38:40.000000000 +1200
+--- configure.orig 2003-12-17 13:51:48.000000000 +1300
+++ configure
-@@ -28622,65 +28622,6 @@ _ACEOF
+@@ -28439,65 +28439,6 @@ _ACEOF
- echo "$as_me:$LINENO: checking sizeof(size_t) == sizeof(unsigned long)" >&5
-echo $ECHO_N "checking sizeof(size_t) == sizeof(unsigned long)... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
+-/* #line $LINENO "configure" */
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
diff -r 518560561cde -r 83a534e3d4ac net/kdenetwork3/patches/patch-af
--- a/net/kdenetwork3/patches/patch-af Thu Jan 15 11:12:40 2004 +0000
+++ b/net/kdenetwork3/patches/patch-af Thu Jan 15 11:24:07 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2003/07/30 13:58:37 markd Exp $
+$NetBSD: patch-af,v 1.7 2004/01/15 11:24:07 markd Exp $
---- ksirc/Makefile.in.orig 2003-07-15 22:08:06.000000000 +1200
+--- ksirc/Makefile.in.orig 2003-12-29 11:25:32.000000000 +1300
+++ ksirc/Makefile.in
-@@ -303,13 +303,13 @@ testview_SOURCES = kstextviewtest.cpp
+@@ -304,13 +304,13 @@ testview_SOURCES = kstextviewtest.cpp
testview_LDADD = kstextview.lo $(LIB_KDEUI)
testview_LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -18,7 +18,7 @@
#>- toplevel.cpp \
#>- charSelector.cpp \
#>- chanButtons.cpp \
-@@ -342,7 +342,7 @@ noinst_PROGRAMS = getdate
+@@ -343,7 +343,7 @@ noinst_PROGRAMS = getdate
#>- kstextview.cpp \
#>- colorpicker.cpp
#>+ 32
@@ -27,7 +27,7 @@
toplevel.cpp \
charSelector.cpp \
chanButtons.cpp \
-@@ -377,8 +377,11 @@ ksirc_la_SOURCES=\
+@@ -378,8 +378,11 @@ ksirc_la_SOURCES=\
# the library search path
@@ -40,7 +40,7 @@
all_ksirc_libraries = \
./KSPrefs/libksprefs.la \
-@@ -389,10 +392,10 @@ all_ksirc_libraries = \
+@@ -390,10 +393,10 @@ all_ksirc_libraries = \
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
@@ -54,7 +54,7 @@
ksirc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
getdate_SOURCES = getdate.c
-@@ -451,9 +454,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -453,9 +456,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -71,7 +71,7 @@
ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -462,10 +470,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe
+@@ -464,10 +472,10 @@ am_ksirc_la_OBJECTS = toplevel.lo charSe
baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
logfile.lo kstextview.lo colorpicker.lo
@@ -85,7 +85,7 @@
ksirc.lo alistbox.lo ahistlineedit.lo iocontroller.lo \
NewWindowDialog.lo messageReceiver.lo ioBroadcast.lo \
ksircprocess.lo servercontroller.lo FilterRuleEditor.lo \
-@@ -474,8 +482,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c
+@@ -476,8 +484,8 @@ ksirc_la_nofinal_OBJECTS = toplevel.lo c
baserules.lo chanparser.lo objFinder.lo displayMgrSDI.lo \
displayMgrMDI.lo mditoplevel.lo ksopts.lo topic.lo ksview.lo \
logfile.lo kstextview.lo colorpicker.lo FilterRuleWidget.lo
@@ -96,7 +96,7 @@
bin_PROGRAMS = ksirc$(EXEEXT)
check_PROGRAMS = testview$(EXEEXT)
noinst_PROGRAMS = getdate$(EXEEXT)
-@@ -488,11 +496,11 @@ getdate_OBJECTS = getdate.$(OBJEXT)
+@@ -490,11 +498,11 @@ getdate_OBJECTS = getdate.$(OBJEXT)
getdate_LDADD = $(LDADD)
getdate_DEPENDENCIES =
getdate_LDFLAGS =
@@ -111,7 +111,7 @@
am_testview_OBJECTS = kstextviewtest.$(OBJEXT)
#>- testview_OBJECTS = $(am_testview_OBJECTS)
#>+ 1
-@@ -515,11 +523,13 @@ am__depfiles_maybe = depfiles
+@@ -517,11 +525,13 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \
@@ -126,7 +126,7 @@
#>- @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \
-@@ -532,8 +542,8 @@ am__depfiles_maybe = depfiles
+@@ -534,8 +544,8 @@ am__depfiles_maybe = depfiles
#>- @AMDEP_TRUE@ ./$(DEPDIR)/ssfepromptdata.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/topic.Plo ./$(DEPDIR)/toplevel.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/usercontrolmenu.Plo
@@ -137,7 +137,7 @@
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/NewWindowDialog.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ahistlineedit.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/alistbox.Plo ./$(DEPDIR)/baserules.Plo \
-@@ -544,11 +554,13 @@ am__depfiles_maybe = depfiles
+@@ -546,11 +556,13 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \
@@ -152,7 +152,7 @@
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \
-@@ -572,11 +584,13 @@ am__depfiles_maybe = depfiles
+@@ -574,11 +586,13 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialog.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dccDialogData.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/displayMgrMDI.Plo \
@@ -167,7 +167,7 @@
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ksircprocess.Plo ./$(DEPDIR)/ksopts.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextview.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kstextviewtest.Po \
-@@ -615,8 +629,8 @@ CXXLD = $(CXX)
+@@ -617,8 +631,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -178,7 +178,7 @@
DATA = $(apps_DATA) $(conf_DATA) $(misc_DATA)
HEADERS = $(noinst_HEADERS)
-@@ -629,7 +643,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -631,7 +645,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
@@ -187,7 +187,7 @@
#>- all: all-recursive
#>+ 1
-@@ -676,6 +690,8 @@ clean-libLTLIBRARIES:
+@@ -678,6 +692,8 @@ clean-libLTLIBRARIES:
done
ksirc.la: $(ksirc_la_OBJECTS) $(ksirc_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(ksirc_la_LDFLAGS) $(ksirc_la_OBJECTS) $(ksirc_la_LIBADD) $(LIBS)
@@ -196,7 +196,7 @@
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
-@@ -768,7 +784,6 @@ distclean-compile:
+@@ -770,7 +786,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dccDialogData.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrMDI.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/displayMgrSDI.Plo@am__quote@
@@ -204,7 +204,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioBroadcast.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioDCC.Plo@am__quote@
-@@ -777,6 +792,8 @@ distclean-compile:
+@@ -779,6 +794,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ioNotify.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iocontroller.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksirc.Plo@am__quote@
@@ -213,16 +213,16 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksircprocess.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ksopts.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstextview.Plo@am__quote@
-@@ -1045,7 +1062,7 @@ distclean-tags:
+@@ -1053,7 +1070,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
--KDE_DIST=sirc.help.gz eventsrc displayMgrMDI.h Artistic default.pl kstextview.h charSelector.h relnotes filters.pl openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg dccDialog.dlg
chanButtons.h topic.h ksircrc ksirc.pl stringparserstate.h FilterRuleEditor.dlg ksirc.desktop FAQ logfile.h colorpicker.h dsirc mditoplevel.h version.h
+-KDE_DIST=ksirc.desktop openksircproc.dlg kstextview.h FilterRuleWidget.ui mditoplevel.h stringparserstate.h dsirc Artistic sirc.help.gz filters.pl colorpicker.h ksircrc FilterRuleEditor.dlg
eventsrc relnotes dccDialog.dlg charSelector.h displayMgrMDI.h FAQ chanButtons.h ksirc.pl logfile.h servercontroller.dlg default.pl topic.h version.h
+KDE_DIST=FilterRuleEditor.dlg stringparserstate.h FAQ mditoplevel.h Makefile.in.rej ksircrc FilterRuleWidget.ui charSelector.h kstextview.h default.pl sirc.help.gz dsirc filters.pl
openksircproc.dlg Artistic logfile.h servercontroller.dlg topic.h displayMgrMDI.h chanButtons.h ksirc.pl ksirc.desktop version.h relnotes eventsrc dccDialog.dlg colorpicker.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-@@ -1221,64 +1238,58 @@ messages: rc.cpp
+@@ -1229,76 +1246,58 @@ messages: rc.cpp
$(EXTRACTRC) KSOpenkSirc/*.ui >> rc.cpp
$(EXTRACTRC) KSPrefs/*.ui >> rc.cpp
$(XGETTEXT) *.cpp */*.cpp -o $(podir)/ksirc.pot
@@ -244,208 +244,210 @@
-
-FilterRuleWidget.h: $(srcdir)/FilterRuleWidget.ui
- $(UIC) -o FilterRuleWidget.h $(srcdir)/FilterRuleWidget.ui
-+#>+ 3
+-
+-FilterRuleWidget.moc: FilterRuleWidget.h
+- $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc
+-
+ #>+ 3
+-kstextview.moc: $(srcdir)/kstextview.h
+- $(MOC) $(srcdir)/kstextview.h -o kstextview.moc
+iocontroller.moc: $(srcdir)/iocontroller.h
+ $(MOC) $(srcdir)/iocontroller.h -o iocontroller.moc
--FilterRuleWidget.moc: FilterRuleWidget.h
-- $(MOC) FilterRuleWidget.h -o FilterRuleWidget.moc
-+#>+ 1
+ #>+ 1
+-mocs: kstextview.moc
+mocs: iocontroller.moc
-+#>+ 3
+ #>+ 3
+-ksview.moc: $(srcdir)/ksview.h
+- $(MOC) $(srcdir)/ksview.h -o ksview.moc
+charSelector.moc: $(srcdir)/charSelector.h
+ $(MOC) $(srcdir)/charSelector.h -o charSelector.moc
-+#>+ 1
+ #>+ 1
+-mocs: ksview.moc
+mocs: charSelector.moc
#>+ 3
--ksircprocess.moc: $(srcdir)/ksircprocess.h
-- $(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
+-toplevel.moc: $(srcdir)/toplevel.h
+- $(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ioLAG.moc: $(srcdir)/ioLAG.h
+ $(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
#>+ 1
--mocs: ksircprocess.moc
+-mocs: toplevel.moc
+mocs: ioLAG.moc
Home |
Main Index |
Thread Index |
Old Index