pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Update to KDE-3.1.5



details:   https://anonhg.NetBSD.org/pkgsrc/rev/999196666af3
branches:  trunk
changeset: 466301:999196666af3
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 15 09:52:51 2004 +0000

description:
Update to KDE-3.1.5

Changes:
* networking: Fix crash related to SOCKS
* kate: C syntax highlighting
* konqueror: Improved handling of long filenames in icon view.
* khtml: Minor rendering fixes
* khtml: Improved loading of large images
* java: Crash fix
* webdav: Fixed renaming of files via secure connection

diffstat:

 x11/kdelibs3/Makefile         |   11 +-
 x11/kdelibs3/PLIST            |    5 +-
 x11/kdelibs3/distinfo         |   26 +-
 x11/kdelibs3/patches/patch-ab |   28 +-
 x11/kdelibs3/patches/patch-af |   20 +-
 x11/kdelibs3/patches/patch-ag |   84 +++++-
 x11/kdelibs3/patches/patch-ap |   81 +++++--
 x11/kdelibs3/patches/patch-av |  475 +++++++++++++++++++++--------------------
 x11/kdelibs3/patches/patch-ba |   20 +-
 x11/kdelibs3/patches/patch-bh |   42 +-
 x11/kdelibs3/patches/patch-bn |   71 ++++-
 x11/kdelibs3/patches/patch-br |   67 ++++-
 x11/kdelibs3/patches/patch-cd |   75 +-----
 13 files changed, 550 insertions(+), 455 deletions(-)

diffs (truncated from 1998 to 300 lines):

diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/Makefile
--- a/x11/kdelibs3/Makefile     Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/Makefile     Thu Jan 15 09:52:51 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2004/01/12 09:46:05 cjep Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/15 09:52:51 markd Exp $
 
-DISTNAME=      kdelibs-3.1.4
-PKGREVISION=   3
+DISTNAME=      kdelibs-3.1.5
 CATEGORIES=    x11
 COMMENT=       Support libraries for the KDE integrated X11 desktop
 
@@ -147,3 +146,9 @@
 CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
 .  endif
 .endif
+
+.if ${OPSYS} == "SunOS"
+# We require use of a recent enough libbz2 to have the BZ2_ prefixes
+# so force this as configure gets this wrong on Solaris 9
+CONFIGURE_ENV+= ac_cv_lib_bzip2='no'
+.endif
diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/PLIST
--- a/x11/kdelibs3/PLIST        Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/PLIST        Thu Jan 15 09:52:51 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/07/30 13:16:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/01/15 09:52:51 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -3710,6 +3710,8 @@
 share/kde/mimelnk/application/x-compress.desktop
 share/kde/mimelnk/application/x-core.desktop
 share/kde/mimelnk/application/x-cpio.desktop
+share/kde/mimelnk/application/x-cue.desktop
+share/kde/mimelnk/application/x-dbase.desktop
 share/kde/mimelnk/application/x-designer.desktop
 share/kde/mimelnk/application/x-desktop.desktop
 share/kde/mimelnk/application/x-dvi.desktop
@@ -3725,6 +3727,7 @@
 share/kde/mimelnk/application/x-graphite.desktop
 share/kde/mimelnk/application/x-gzip.desktop
 share/kde/mimelnk/application/x-hancomword.desktop
+share/kde/mimelnk/application/x-iso.desktop
 share/kde/mimelnk/application/x-jar.desktop
 share/kde/mimelnk/application/x-java-applet.desktop
 share/kde/mimelnk/application/x-java.desktop
diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/distinfo     Thu Jan 15 09:52:51 2004 +0000
@@ -1,43 +1,43 @@
-$NetBSD: distinfo,v 1.28 2003/09/21 12:14:20 markd Exp $
+$NetBSD: distinfo,v 1.29 2004/01/15 09:52:51 markd Exp $
 
-SHA1 (kdelibs-3.1.4.tar.bz2) = 573a8cc045978edd8fb8cf10793b9eee7bcc6d63
-Size (kdelibs-3.1.4.tar.bz2) = 10537433 bytes
+SHA1 (kdelibs-3.1.5.tar.bz2) = ee6f3f60e66e82ed8b433a57e1c6c79c1a522b18
+Size (kdelibs-3.1.5.tar.bz2) = 10549741 bytes
 SHA1 (patch-aa) = 4e79f488d54f6b05a23951c6e206e6582ef2a2a7
-SHA1 (patch-ab) = 5b2188a3e4edd1f5eb0f3516f6a846e9a8c8c055
+SHA1 (patch-ab) = 7b71c198b0588c339a2dbfbcf5d2ea85f51d2420
 SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e
 SHA1 (patch-ad) = fc3a7b173dc93bad196fff3ddd9aef65c92dda64
 SHA1 (patch-ae) = 238f16203cd101a5944ff01aa965956392c5b16d
-SHA1 (patch-af) = 5b19804a42f5358f26ded54e9606efbc9a9a19b4
-SHA1 (patch-ag) = 2b0aac962badf6e57f7baafa9497e73be503af59
+SHA1 (patch-af) = 4986e0d064e57c2897972cf59df914c20451a2e4
+SHA1 (patch-ag) = 67f03f7cc7c705f62e7f293b3dedb532685a2372
 SHA1 (patch-ah) = 4c1cd440290d6e099e5bf03a6d19ab09af82cedd
 SHA1 (patch-aj) = 22a5b302970d76b745cb46ec69b65741461e05b3
 SHA1 (patch-ak) = c72a871cbcd343c86145e705dd93c00b82051d5b
 SHA1 (patch-al) = b1d460761ca0665178606989ab4f7427fd0cb901
 SHA1 (patch-an) = fe81b0dc9790c3b4ca4e71510db0939b3184f9ab
 SHA1 (patch-ao) = 6f7e381fd3d5c66e7d03ce28dd8e17d8af0608c2
-SHA1 (patch-ap) = d6bf9271eea905aadfcaa847f9c9363c81bc1df8
+SHA1 (patch-ap) = ea21692595d0b84366ebccc346c4772ba476a647
 SHA1 (patch-aq) = 69cd39a625654839c1e8358284df291f947682e5
 SHA1 (patch-as) = 08fdae42a30233d6a88806d2aaa4368cadd3a988
 SHA1 (patch-au) = 12a8a9613c2836077f29bb633db1c2489d3bb8a1
-SHA1 (patch-av) = f68e06883c6f1f8e49514c71e5c66cbbce28b805
+SHA1 (patch-av) = 72cc57b98d74386846a86893a1e710f8b6913811
 SHA1 (patch-aw) = 127a6d0175cb0acfd735f2f37a7973b2e0997620
 SHA1 (patch-ay) = 0bce01d2cafe991fa6fe07ddf9f2e6cec88df5f0
 SHA1 (patch-az) = 2d61015758a415eeafed9931da07c419b99cb710
-SHA1 (patch-ba) = 6ef0c507b513d332d4abaa24c20dd0a21272ce5c
+SHA1 (patch-ba) = bab79f14e1b756ba32c30c384a377136ecf2a6b1
 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
 SHA1 (patch-bd) = 4f4a1fc17108f539c3e459744ccc0dc6f71bb989
 SHA1 (patch-bg) = 456c9f128deaeefea448c038feeb256b8a9837bd
-SHA1 (patch-bh) = d2f2f4d506412d1f12dde4e2e6a0c88e82853eca
+SHA1 (patch-bh) = a835be74a386dd177189a9a5f36cfe8f65a5e759
 SHA1 (patch-bk) = 62b9f296f7e0a0001c38daf3d862b35ba055e7eb
 SHA1 (patch-bm) = 9b5326099e3006c491a90ac8ad8e5f5aa0eed945
-SHA1 (patch-bn) = 4840127102ac4e79481c09eb378b5af8df9a930b
+SHA1 (patch-bn) = 279687e99974d0f17752fa780bdb1cb23962c385
 SHA1 (patch-bo) = 5be3545572b4b9ba703f09fd65dfcd3357307e20
 SHA1 (patch-bq) = 24af1fd6fba160ccc293cb28dd7139b80c52eb87
-SHA1 (patch-br) = 7f9bb52a0181115a5c0bbea3b219441eb4d3d89e
+SHA1 (patch-br) = 3fa15ea8a562e58a5775ecd847461c29756c5c1b
 SHA1 (patch-bt) = 8849d373460f275ab8fdc736f558d8b8daa653a5
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
-SHA1 (patch-cd) = e9f1096e9c293c545a2121c73ceb238d98e9b486
+SHA1 (patch-cd) = 27f7358d40dd7f02ae877ab0ff501086006ec12a
 SHA1 (patch-ce) = 08e965336563bc818bbfd6dcef6b3bdbcfd89497
diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/patches/patch-ab
--- a/x11/kdelibs3/patches/patch-ab     Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/patches/patch-ab     Thu Jan 15 09:52:51 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2003/07/30 13:16:57 markd Exp $
+$NetBSD: patch-ab,v 1.7 2004/01/15 09:52:51 markd Exp $
 
---- arts/knotify/Makefile.in.orig      2003-07-16 12:59:51.000000000 +1200
+--- arts/knotify/Makefile.in.orig      2003-12-29 11:16:52.000000000 +1300
 +++ arts/knotify/Makefile.in
-@@ -379,17 +379,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
+@@ -380,17 +380,22 @@ INCLUDES = -I$(includedir)/arts $(all_in
  
  ####### Files
  bin_PROGRAMS = knotify
@@ -31,7 +31,7 @@
  knotify_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
  check_PROGRAMS = knotifytest
-@@ -407,23 +412,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -409,23 +414,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -69,7 +69,7 @@
  am_knotifytest_OBJECTS = knotifytest.$(OBJEXT)
  #>- knotifytest_OBJECTS = $(am_knotifytest_OBJECTS)
  #>+ 1
-@@ -433,12 +443,18 @@ knotifytest_DEPENDENCIES =
+@@ -435,12 +445,18 @@ knotifytest_DEPENDENCIES =
  DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
  am__depfiles_maybe = depfiles
@@ -92,7 +92,7 @@
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/knotifytest.Po
  
  #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -459,14 +475,14 @@ CXXLD = $(CXX)
+@@ -461,14 +477,14 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -110,7 +110,7 @@
  
  #>- all: all-am
  #>+ 1
-@@ -513,6 +529,8 @@ clean-libLTLIBRARIES:
+@@ -515,6 +531,8 @@ clean-libLTLIBRARIES:
        done
  knotify.la: $(knotify_la_OBJECTS) $(knotify_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(libdir) $(knotify_la_LDFLAGS) $(knotify_la_OBJECTS) $(knotify_la_LIBADD) $(LIBS)
@@ -119,7 +119,7 @@
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
  install-binPROGRAMS: $(bin_PROGRAMS)
        @$(NORMAL_INSTALL)
-@@ -562,8 +580,9 @@ mostlyclean-compile:
+@@ -564,8 +582,9 @@ mostlyclean-compile:
  distclean-compile:
        -rm -f *.tab.c
  
@@ -130,7 +130,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/knotifytest.Po@am__quote@
  
  distclean-depend:
-@@ -685,7 +704,7 @@ distclean-tags:
+@@ -687,7 +706,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
@@ -139,7 +139,7 @@
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -825,13 +844,16 @@ uninstall-am: uninstall-binPROGRAMS unin
+@@ -826,13 +845,16 @@ uninstall-am: uninstall-binPROGRAMS unin
  
  messages:
        $(XGETTEXT) knotify.cpp -o $(podir)/knotify.pot
@@ -159,7 +159,7 @@
  #>+ 5
  knotify.kidl: $(srcdir)/knotify.h $(DCOP_DEPENDENCIES)
        $(DCOPIDL) $(srcdir)/knotify.h > knotify.kidl || ( rm -f knotify.kidl ; false )
-@@ -846,7 +868,7 @@ knotify.moc: $(srcdir)/knotify.h
+@@ -847,7 +869,7 @@ knotify.moc: $(srcdir)/knotify.h
  mocs: knotify.moc
  #>+ 3
  clean-metasources:
@@ -168,7 +168,7 @@
  
  #>+ 4
  clean-idl:
-@@ -864,33 +886,33 @@ force-reedit:
+@@ -865,33 +887,33 @@ force-reedit:
  
  
  #>+ 11
@@ -215,11 +215,11 @@
  #>+ 3
  cvs-clean:
        $(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-@@ -900,5 +922,5 @@ kde-rpo-clean:
+@@ -901,5 +923,5 @@ kde-rpo-clean:
        -rm -f *.rpo
  
  #>+ 3
+-knotify.lo: knotify.moc 
 -knotify.o: knotify.moc 
--knotify.lo: knotify.moc 
 +knotify.lo: knotify.moc knotify.moc 
 +knotify.o: knotify.moc knotify.moc 
diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/patches/patch-af
--- a/x11/kdelibs3/patches/patch-af     Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/patches/patch-af     Thu Jan 15 09:52:51 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.3 2003/03/11 13:10:34 markd Exp $
+$NetBSD: patch-af,v 1.4 2004/01/15 09:52:51 markd Exp $
 
---- dcop/Makefile.am.orig      Mon Sep 16 09:12:54 2002
+--- dcop/Makefile.am.orig      2003-12-17 03:37:17.000000000 +1300
 +++ dcop/Makefile.am
-@@ -29,7 +29,7 @@
+@@ -29,7 +29,7 @@ INCLUDES=  $(all_includes)
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
@@ -11,7 +11,7 @@
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -45,13 +45,17 @@
+@@ -41,13 +41,17 @@ METASOURCES = AUTO
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
@@ -33,13 +33,13 @@
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -64,9 +68,6 @@
- testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
+@@ -61,9 +65,6 @@ testdcopc_LDADD =  KDE-ICE/libkICE.la $(
  
- EXTRA_DIST = HOWTO ICE
--
+ EXTRA_DIST = HOWTO ICE Mainpage.dox
+ 
 -dummy.cpp:
 -      echo > dummy.cpp
- 
+-
  DOXYGEN_REFERENCES = kdecore
- DOXYGEN_EXCLUDE = KDE-ICE/*
+ DOXYGEN_EXCLUDE = KDE-ICE
+ 
diff -r 608e64f78327 -r 999196666af3 x11/kdelibs3/patches/patch-ag
--- a/x11/kdelibs3/patches/patch-ag     Thu Jan 15 09:37:27 2004 +0000
+++ b/x11/kdelibs3/patches/patch-ag     Thu Jan 15 09:52:51 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2003/05/22 02:42:41 markd Exp $
+$NetBSD: patch-ag,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- dcop/Makefile.in.orig      Thu May  8 05:24:03 2003
+--- dcop/Makefile.in.orig      2003-12-29 11:16:52.000000000 +1300
 +++ dcop/Makefile.in
-@@ -404,7 +404,7 @@ INCLUDES = $(all_includes)
+@@ -406,7 +406,7 @@ INCLUDES = $(all_includes)
  bin_PROGRAMS = dcopserver dcopserver_shutdown
  check_PROGRAMS = testdcop testdcopc
  
@@ -11,7 +11,7 @@
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 5:0:1 -no-undefined $(all_libraries)
  
-@@ -420,13 +420,17 @@ noinst_HEADERS = version.h dcopglobal.h 
+@@ -418,13 +418,17 @@ noinst_HEADERS = version.h dcopglobal.h 
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopref.cpp dcopobject.cpp dcopclient.cpp
  
@@ -33,7 +33,7 @@
  
  dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
  
-@@ -448,14 +452,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -447,14 +451,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES = dcop-path.h
  LTLIBRARIES = $(lib_LTLIBRARIES)
  
@@ -52,7 +52,7 @@
  libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la
  am_libDCOP_la_OBJECTS = dcopstub.lo dcopref.lo dcopobject.lo \
        dcopclient.lo



Home | Main Index | Thread Index | Old Index