summaryrefslogtreecommitdiff
path: root/x11/kdelibs3/patches
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2007-01-26 02:44:27 +0000
committermarkd <markd@pkgsrc.org>2007-01-26 02:44:27 +0000
commit51e129af59ddef78811970217f4b874f43ebe9e6 (patch)
tree535071a9651a1b5c6787c451f7c56db269426147 /x11/kdelibs3/patches
parent293b4eff65bb53bb07d5c7799779986f61fae7e1 (diff)
downloadpkgsrc-51e129af59ddef78811970217f4b874f43ebe9e6.tar.gz
Update to KDE 3.5.6
KHTML * Treat specific attribute values case-insensitively during style matching. With these changes, KHTML becomes the first rendering engine to thoroughly pass the 578 tests of the excellent Automated CSS3 Selectors Testsuite (http://www.css3.info/selectors-test). * Implement CSS3 extension text-overflow: ellipsis. * Implement overflow-x/y as many websites use it now. * Fix overflow sometimes not painted/repainted. * Fix incorrect margin for some tables. * Fix crashes on some AJAX pages. * Fix background no-repeat image wrapping. * Fix instanceof ecma operator not working on DOM objects. * Fix some pages appearing empty or missing content. * Fix table caption rendering on some pages. * Make innerText much faster fixing freezes on some web pages. * Fix crash on javascript manipulated tables. * Fix all links gettinh underlined while hovering over just one link on some malformed web pages. * Let floats overflow the left border when they should. * Fix cursor in input field not disappearing when setting focus to another input field. * Prevent crash-inducing recursion of detach due to blur events happening when widgets with focus get destroyed. * Fix border collapse not working in tables. * Fix &notin; displayed as &not;in;. * Make max-height and max-width: none work correctly. * Fix memory leak when using deleteRule. * Fix crash when resolving a stylesheet imported from external one. * Fix an infinite relayout on msdn. * Fix computed line-height beign incorrect. * Fix crash race on various sites with popup ads. * Reset hover text when mouse leaves khtml view. * Whenever the content changes, recheck if the mouse cursor shall show some other shape to correctly match it to the content below it. * Immediately redraw visited links with the respective color when the page got loaded and inserted into the history. * Fix tables sometimes intruding floats on dynamic restyle. * Fix conflicting priorities in font shorthand parsing leading to wrong line-height computation. * Do not crash when finding backwards. * Fix infinite recursion happening when changing style from overflow:scroll to auto. * Fix initial size of input type=FILE form control. * Make vertical-align text-top/bottom CSS 2.1 compliant. * Fix ecma alert() dialog formatting it's output as a single huge line without line breaks. Kate * Add actionscript highlighting. * Add some pseudo-elements that khtml supports, but FireFox doesn't. * Fix wrong indentation at top of source file in cstyle indenter. * Fix memory leaks and accessing uninitialized variable. * Fix endless loop in cstyle indenter. * Fix crash using comment commands. * Java Highlighting: Correctly highlight comments after import lines. kdefx * Change asterisks on passwords to bullets. kdeprint * Fix printing of files with accentuated characters in filename or in the path. * Fix showing names of non local files in kprinter. kio * Don't crash when creating a job for an invalid URL. * Hide the progress dialog while displaying the password dialog. * Fix wrong "Couldn't receive DCOP signal" errors on RMB menu. * Fix statusbar having more than one line. * Fix possible data loss when using kioexec. KJS * Properly propagate some exception values. * Fixed Number.toPrecision(n) calls on negative zero. * Allow changing the internal value of invalid dates. * Fix Unicode support in RegExp handling, and also be more robust vs. embedded nulls. Fixes problems with some cyrillic characters in gmail and makes google calendar somewhat work.
Diffstat (limited to 'x11/kdelibs3/patches')
-rw-r--r--x11/kdelibs3/patches/patch-ad26
-rw-r--r--x11/kdelibs3/patches/patch-ae58
-rw-r--r--x11/kdelibs3/patches/patch-an5
-rw-r--r--x11/kdelibs3/patches/patch-ar39
-rw-r--r--x11/kdelibs3/patches/patch-as22
5 files changed, 45 insertions, 105 deletions
diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad
index fae4abe247d..4aed35aa33a 100644
--- a/x11/kdelibs3/patches/patch-ad
+++ b/x11/kdelibs3/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.10 2006/11/20 09:38:15 markd Exp $
+$NetBSD: patch-ad,v 1.11 2007/01/26 02:44:28 markd Exp $
---- khtml/rendering/render_block.cpp.orig 2006-10-02 06:33:39.000000000 +1300
-+++ khtml/rendering/render_block.cpp
-@@ -711,7 +711,7 @@ void RenderBlock::layoutBlock(bool relay
- int toAdd = borderBottom() + paddingBottom();
- if (m_layer && style()->scrollsOverflow() && style()->height().isVariable())
- toAdd += m_layer->horizontalScrollbarHeight();
-- if ( hasOverhangingFloats() && !style()->scrollsOverflow() && (isFloatingOrPositioned() || flowAroundFloats()) )
-+ if ( hasOverhangingFloats() && (isFloatingOrPositioned() || flowAroundFloats()) )
- m_overflowHeight = m_height = floatBottom() + toAdd;
-
- int oldHeight = m_height;
+dont install hicolor/index.theme as hicolor-icon-theme pkg will
+
+--- pics/Makefile.in.orig 2007-01-19 15:41:52.000000000 +1300
++++ pics/Makefile.in
+@@ -515,7 +515,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-SUBDIRS = . hicolor crystalsvg emoticons
++SUBDIRS = . crystalsvg emoticons
+ INCLUDES = $(LIBART_CFLAGS) -I$(top_srcdir)/kdecore/svgicons -I$(top_srcdir)/kdefx $(all_includes)
+ @include_SVGICONS_TRUE@KSVGTOPNG = ksvgtopng
+ ksvgtopng_SOURCES = ksvgtopng.cpp
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index b4bed320aa4..ccf6313253f 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
+$NetBSD: patch-ae,v 1.9 2007/01/26 02:44:28 markd Exp $
---- configure.orig 2005-11-26 19:40:15.000000000 +1300
+--- configure.orig 2007-01-24 21:54:16.000000000 +1300
+++ configure
-@@ -7246,7 +7246,7 @@ darwin* | rhapsody*)
+@@ -8906,7 +8906,7 @@ darwin* | rhapsody*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -9985,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -11845,7 +11845,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10550,7 +10550,7 @@ kfreebsd*-gnu*)
+@@ -12410,7 +12410,7 @@ kfreebsd*-gnu*)
dynamic_linker='GNU ld.so'
;;
@@ -29,7 +29,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
-@@ -12903,7 +12903,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -14870,7 +14870,7 @@ if test -z "$aix_libpath"; then aix_libp
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -38,7 +38,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13614,7 +13614,7 @@ echo $ECHO_N "checking for $compiler opt
+@@ -15581,7 +15581,7 @@ echo $ECHO_N "checking for $compiler opt
;;
esac
;;
@@ -47,7 +47,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -14216,7 +14216,7 @@ kfreebsd*-gnu*)
+@@ -16183,7 +16183,7 @@ kfreebsd*-gnu*)
dynamic_linker='GNU ld.so'
;;
@@ -56,7 +56,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
-@@ -16742,7 +16742,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -18816,7 +18816,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -65,7 +65,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -17307,7 +17307,7 @@ kfreebsd*-gnu*)
+@@ -19381,7 +19381,7 @@ kfreebsd*-gnu*)
dynamic_linker='GNU ld.so'
;;
@@ -74,7 +74,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
-@@ -19035,7 +19035,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -21136,7 +21136,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -83,7 +83,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19600,7 +19600,7 @@ kfreebsd*-gnu*)
+@@ -21701,7 +21701,7 @@ kfreebsd*-gnu*)
dynamic_linker='GNU ld.so'
;;
@@ -92,7 +92,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
case $version_type in
-@@ -22841,7 +22841,7 @@ else
+@@ -25104,7 +25104,7 @@ else
linux*)
libltdl_cv_sys_dlopen_deplibs=yes
;;
@@ -101,7 +101,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
libltdl_cv_sys_dlopen_deplibs=yes
;;
solaris*)
-@@ -44967,7 +44967,7 @@ echo "$as_me: error: Fast malloc is not
+@@ -49610,7 +49610,7 @@ echo "$as_me: error: Fast malloc is not
esac
case $target_os in
linux*) ;;
@@ -110,7 +110,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
*)
if test "$kde_fast_malloc" = "notgiven"; then
kde_fast_malloc=no
-@@ -50643,7 +50643,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
+@@ -56249,7 +56249,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
gssapi_flavor=HEIMDAL
fi
else
@@ -119,7 +119,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
gssapi_incdir=NO
for i in $search_incs;
-@@ -50686,7 +50686,7 @@ done
+@@ -56292,7 +56292,7 @@ done
GSSAPI_LIBS="-L$gssapi_libdir "
test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
fi
@@ -128,7 +128,7 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
with_gssapi=FOUND
gssapi_flavor=HEIMDAL
break
-@@ -50730,7 +50730,7 @@ echo "${ECHO_T}searched but not found" >
+@@ -56336,7 +56336,7 @@ echo "${ECHO_T}searched but not found" >
GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
else
gssapi_flavor=HEIMDAL
@@ -137,45 +137,45 @@ $NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
fi
fi
if test "x$gssapi_flavor" = "xMIT" ; then
-@@ -50919,18 +50919,12 @@ _ACEOF
+@@ -56539,18 +56539,12 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <math.h>
--/* Override any gcc2 internal prototype to avoid an error. */
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
-char isinf ();
int
main ()
{
--isinf ();
-+isinf (0.0);
+-return isinf ();
++return isinf (0.0);
;
return 0;
}
-@@ -51141,18 +51135,12 @@ _ACEOF
+@@ -56800,18 +56794,12 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <math.h>
--/* Override any gcc2 internal prototype to avoid an error. */
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
-char isnan ();
int
main ()
{
--isnan ();
-+isnan (0.0);
+-return isnan ();
++return isnan (0.0);
;
return 0;
}
diff --git a/x11/kdelibs3/patches/patch-an b/x11/kdelibs3/patches/patch-an
index 122059563f8..f3a15b3b720 100644
--- a/x11/kdelibs3/patches/patch-an
+++ b/x11/kdelibs3/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.10 2005/12/29 23:41:42 markd Exp $
+$NetBSD: patch-an,v 1.11 2007/01/26 02:44:28 markd Exp $
--- kdecore/kstandarddirs.cpp.orig 2005-10-11 04:06:02.000000000 +1300
+++ kdecore/kstandarddirs.cpp
@@ -12,8 +12,7 @@ $NetBSD: patch-an,v 1.10 2005/12/29 23:41:42 markd Exp $
- return "share/doc/HTML/";
+ return "share/doc/kde/HTML/";
if (!strcmp(type, "icon"))
-- return "share/icons/";
-+ return "share/kde/icons/";
+ return "share/icons/";
if (!strcmp(type, "config"))
- return "share/config/";
+ return "share/kde/config/";
diff --git a/x11/kdelibs3/patches/patch-ar b/x11/kdelibs3/patches/patch-ar
deleted file mode 100644
index 518ed614159..00000000000
--- a/x11/kdelibs3/patches/patch-ar
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ar,v 1.6 2006/10/12 10:31:04 markd Exp $
-
---- kate/part/kateautoindent.cpp.orig 2006-10-02 23:46:55.000000000 +1300
-+++ kate/part/kateautoindent.cpp
-@@ -714,6 +714,7 @@ uint KateCSmartIndent::calcIndent(KateDo
- int parenCount = 0; // Possibly in a multiline for stmt. Used to skip ';' ...
- bool found = false;
- bool isSpecial = false;
-+ bool potentialAnchorSeen = false;
-
- //kdDebug(13030) << "calcIndent begin line:" << begin.line() << " col:" << begin.col() << endl;
-
-@@ -733,7 +734,7 @@ uint KateCSmartIndent::calcIndent(KateDo
- {
- QChar tc = textLine->getChar (pos);
- if ((tc == ';' || tc == ':' || tc == ',') && otherAnchor == -1 && parenCount <= 0)
-- otherAnchor = pos;
-+ otherAnchor = pos, potentialAnchorSeen = true;
- else if (tc == ')')
- parenCount++;
- else if (tc == '(')
-@@ -742,7 +743,7 @@ uint KateCSmartIndent::calcIndent(KateDo
- openCount--;
- else if (tc == '{')
- {
-- openCount++;
-+ openCount++, potentialAnchorSeen = true;
- if (openCount == 1)
- break;
- }
-@@ -826,7 +827,7 @@ uint KateCSmartIndent::calcIndent(KateDo
- }
-
- // treat beginning of document as anchor position
-- if (cur.line() == 0 && cur.col() == 0)
-+ if (cur.line() == 0 && cur.col() == 0 && potentialAnchorSeen)
- found = true;
-
- if (!found)
diff --git a/x11/kdelibs3/patches/patch-as b/x11/kdelibs3/patches/patch-as
deleted file mode 100644
index 80fc09a4644..00000000000
--- a/x11/kdelibs3/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.6 2006/10/12 10:31:04 markd Exp $
-
---- kdeprint/cups/kmcupsmanager.cpp.orig 2006-10-02 06:33:43.000000000 +1300
-+++ kdeprint/cups/kmcupsmanager.cpp
-@@ -920,7 +920,7 @@ void KMCupsManager::checkUpdatePossibleI
- kdDebug(500) << "Checking for update possible" << endl;
- delete m_socket;
- m_socket = new KNetwork::KBufferedSocket;
-- m_socket->setTimeout( 1 );
-+ m_socket->setTimeout( 1500 );
- connect( m_socket, SIGNAL( connected(const KResolverEntry&) ),
- SLOT( slotConnectionSuccess() ) );
- connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
-@@ -958,7 +958,7 @@ void KMCupsManager::slotConnectionSucces
-
- void KMCupsManager::slotAsyncConnect()
- {
-- kdDebug(500) << "Starting async connect" << endl;
-+ kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl;
- //m_socket->startAsyncConnect();
- if (CupsInfos::self()->host().startsWith("/"))
- m_socket->connect( QString(), CupsInfos::self()->host());