summaryrefslogtreecommitdiff
path: root/x11/kdelibs4/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdelibs4/files')
-rw-r--r--x11/kdelibs4/files/patch-CVE-2006-481114
-rw-r--r--x11/kdelibs4/files/patch-FindKDE4Internal.cmake104
-rw-r--r--x11/kdelibs4/files/patch-KDE4Defaults.cmake18
-rw-r--r--x11/kdelibs4/files/patch-cmake-modules-FindGettext.cmake29
-rw-r--r--x11/kdelibs4/files/patch-cmake-modules-FindQCA2.cmake11
-rw-r--r--x11/kdelibs4/files/patch-kcmshell-Makefile.in11
-rw-r--r--x11/kdelibs4/files/patch-kdecore-kpty.cpp35
-rw-r--r--x11/kdelibs4/files/patch-kdecore-kstartupinfo.cpp42
-rw-r--r--x11/kdelibs4/files/patch-kdeprint_cups_cupsdconf265
-rw-r--r--x11/kdelibs4/files/patch-kdeprint_cups_kmcupsmanager.cpp33
-rw-r--r--x11/kdelibs4/files/patch-kdeui-kactionclasses.cpp13
-rw-r--r--x11/kdelibs4/files/patch-kinit-start_kdeinit_wrapper.c11
-rw-r--r--x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp23
-rw-r--r--x11/kdelibs4/files/patch-kioslave_http-http.cc39
-rw-r--r--x11/kdelibs4/files/patch-kpty-kptydevice.cpp12
-rw-r--r--x11/kdelibs4/files/patch-mimetypes_application-Makefile.in20
16 files changed, 197 insertions, 283 deletions
diff --git a/x11/kdelibs4/files/patch-CVE-2006-4811 b/x11/kdelibs4/files/patch-CVE-2006-4811
deleted file mode 100644
index 8a9c8dfebb57..000000000000
--- a/x11/kdelibs4/files/patch-CVE-2006-4811
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: khtml/rendering/render_image.cpp
-===================================================================
---- khtml/rendering/render_image.cpp (revision 594232)
-+++ khtml/rendering/render_image.cpp (working copy)
-@@ -294,7 +294,8 @@ void RenderImage::paint(PaintInfo& paint
- if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
- pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
- {
-- if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && intrinsicHeight())
-+ if (resizeCache.isNull() && cWidth > 0 && cHeight > 0 && intrinsicWidth() && intrinsicHeight()
-+ && cWidth < 4096 && cHeight < 4096)
- {
- QRect scaledrect(i->valid_rect());
- // kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
diff --git a/x11/kdelibs4/files/patch-FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-FindKDE4Internal.cmake
new file mode 100644
index 000000000000..466260ee1478
--- /dev/null
+++ b/x11/kdelibs4/files/patch-FindKDE4Internal.cmake
@@ -0,0 +1,104 @@
+--- ../cmake/modules/FindKDE4Internal.cmake.orig 2008-07-29 14:17:48.000000000 +0200
++++ ../cmake/modules/FindKDE4Internal.cmake 2008-07-29 14:31:16.000000000 +0200
+@@ -380,62 +380,62 @@
+ set(KDE4_KDECORE_LIBS ${kdecore_LIB_DEPENDS} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
++ set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
++ set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
++ set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
++ set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
++ set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
++ set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
++ set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
++ set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} )
++ set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
++ set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ if (UNIX)
+ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} )
++ set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
++ set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+ endif (UNIX)
+
+ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
++ set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
++ set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
++ set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
++ set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
++ set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
++ set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+- set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
++ set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} ${KDE4_KDECORE_LIBRARY} )
+
+ # Can't do that, it's not always compiled.
+ #find_library(KDE4_KNEPOMUK_LIBRARY NAMES knepomuk PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+@@ -642,8 +642,8 @@
+ _set_fancy(XDG_MIME_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/mime/packages" "The install dir for the xdg mimetypes")
+
+ _set_fancy(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "The kde sysconfig install dir (default ${CMAKE_INSTALL_PREFIX}/etc)")
+- _set_fancy(MAN_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/man" "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
+- _set_fancy(INFO_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
++ _set_fancy(MAN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/man" "The kde man install dir (default ${SHARE_INSTALL_PREFIX}/man/)")
++ _set_fancy(INFO_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/info" "The kde info install dir (default ${SHARE_INSTALL_PREFIX}/info)")
+ _set_fancy(DBUS_INTERFACES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The kde dbus interfaces install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
+ _set_fancy(DBUS_SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/dbus-1/services" "The kde dbus services install dir (default ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
+
+@@ -1128,6 +1128,8 @@
+ message(FATAL_ERROR "ERROR: the installed kdelibs version ${KDEVERSION} is too old, at least version ${KDE_MIN_VERSION} is required")
+ endif (NOT KDE4_INSTALLED_VERSION_OK)
+
++link_directories(${KDE4_LIB_DIR})
++
+ if (NOT KDE4_KCFGC_EXECUTABLE)
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+ endif (NOT KDE4_KCFGC_EXECUTABLE)
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
new file mode 100644
index 000000000000..f684714eca37
--- /dev/null
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -0,0 +1,18 @@
+--- ../cmake/modules/KDE4Defaults.cmake.orig 2008-05-21 13:06:10.000000000 +0200
++++ ../cmake/modules/KDE4Defaults.cmake 2008-05-27 18:51:10.000000000 +0200
+@@ -29,11 +29,11 @@
+
+ # define the generic version of the libraries here
+ # this makes it easy to advance it when the next KDE release comes
+-set(GENERIC_LIB_VERSION "4.1.0")
+-set(GENERIC_LIB_SOVERSION "4")
++set(GENERIC_LIB_VERSION "5.0.0")
++set(GENERIC_LIB_SOVERSION "5")
+
+-set(KDE_NON_GENERIC_LIB_VERSION "5.1.0")
+-set(KDE_NON_GENERIC_LIB_SOVERSION "5")
++set(KDE_NON_GENERIC_LIB_VERSION "7.0.0")
++set(KDE_NON_GENERIC_LIB_SOVERSION "7")
+
+ # windows does not support LD_LIBRARY_PATH or similar
+ # all searchable directories has to be defined by the PATH environment var
diff --git a/x11/kdelibs4/files/patch-cmake-modules-FindGettext.cmake b/x11/kdelibs4/files/patch-cmake-modules-FindGettext.cmake
new file mode 100644
index 000000000000..4e8657ae7c19
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake-modules-FindGettext.cmake
@@ -0,0 +1,29 @@
+--- ../cmake/modules/FindGettext.cmake.orig 2008-07-11 18:32:43.000000000 +0200
++++ ../cmake/modules/FindGettext.cmake 2008-07-11 18:32:58.000000000 +0200
+@@ -26,13 +26,12 @@
+ include(CheckIncludeFiles)
+ include(CheckLibraryExists)
+ include(CheckFunctionExists)
+-
+- check_include_files(libintl.h HAVE_LIBINTL_H)
+-
+- set(GETTEXT_INCLUDE_DIR)
++
++ FIND_PATH(GETTEXT_INCLUDE_DIR libintl.h)
+ set(GETTEXT_LIBRARIES)
+
+- if (HAVE_LIBINTL_H)
++ if (GETTEXT_INCLUDE_DIR)
++ set(HAVE_LIBINTL_H TRUE)
+ check_function_exists(dgettext LIBC_HAS_DGETTEXT)
+ if (LIBC_HAS_DGETTEXT)
+ set(GETTEXT_SOURCE "built in libc")
+@@ -47,7 +46,7 @@
+ set(GETTEXT_FOUND TRUE)
+ endif (LIBINTL_HAS_DGETTEXT)
+ endif (LIBC_HAS_DGETTEXT)
+- endif (HAVE_LIBINTL_H)
++ endif (GETTEXT_INCLUDE_DIR)
+
+ if (GETTEXT_FOUND)
+ if (NOT Gettext_FIND_QUIETLY)
diff --git a/x11/kdelibs4/files/patch-cmake-modules-FindQCA2.cmake b/x11/kdelibs4/files/patch-cmake-modules-FindQCA2.cmake
new file mode 100644
index 000000000000..c6eb3c1959ed
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake-modules-FindQCA2.cmake
@@ -0,0 +1,11 @@
+--- ../cmake/modules/FindQCA2.cmake.orig 2008-07-11 14:15:58.000000000 +0200
++++ ../cmake/modules/FindQCA2.cmake 2008-07-11 14:16:35.000000000 +0200
+@@ -26,7 +26,7 @@
+ INCLUDE(UsePkgConfig)
+
+ IF (NOT WIN32)
+- PKGCONFIG(qca2 QCA2_INCLUDE_DIR _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)
++ PKGCONFIG(qca QCA2_INCLUDE_DIR _Qca2LinkDir _Qca2LinkFlags _Qca2Cflags)
+
+ set(QCA2_DEFINITIONS ${_Qca2Cflags})
+
diff --git a/x11/kdelibs4/files/patch-kcmshell-Makefile.in b/x11/kdelibs4/files/patch-kcmshell-Makefile.in
deleted file mode 100644
index d4142d7fa1e9..000000000000
--- a/x11/kdelibs4/files/patch-kcmshell-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcmshell/Makefile.in.orig Thu Sep 14 05:45:09 2006
-+++ kcmshell/Makefile.in Thu Sep 14 05:45:54 2006
-@@ -1033,7 +1033,7 @@
- echo 'extern "C" int kdemain(int argc, char* argv[]);' >> kcmshell_dummy.cpp; \
- echo 'extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> kcmshell_dummy.cpp
- kcmshell_LDFLAGS = $(KDE_RPATH) -no-undefined $(all_libraries)
--kcmshell_LDADD = libkdeinit_kcmshell.la
-+kcmshell_LDADD = libkdeinit_kcmshell.la -lintl
- kcmshell_DEPENDENCIES = libkdeinit_kcmshell.la
-
- #>+ 5
diff --git a/x11/kdelibs4/files/patch-kdecore-kpty.cpp b/x11/kdelibs4/files/patch-kdecore-kpty.cpp
deleted file mode 100644
index ec773d0c07c1..000000000000
--- a/x11/kdelibs4/files/patch-kdecore-kpty.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
---- kdecore/kpty.cpp
-+++ kdecore/kpty.cpp
-@@ -127,10 +127,15 @@
- #include <kdebug.h>
- #include <kstandarddirs.h> // locate
-
--// not defined on HP-UX for example
--#ifndef CTRL
--# define CTRL(x) ((x) & 037)
--#endif
-+#ifndef CINTR
-+#define CINTR 0x03
-+#endif
-+#ifndef CQUIT
-+#define CQUIT 0x1c
-+#endif
-+#ifndef CERASE
-+#define CERASE 0x7f
-+#endif
-
- #define TTY_GROUP "tty"
-
-@@ -333,9 +339,9 @@
- ttmode.c_iflag |= IUTF8;
- #endif
-
-- ttmode.c_cc[VINTR] = CTRL('C' - '@');
-- ttmode.c_cc[VQUIT] = CTRL('\\' - '@');
-- ttmode.c_cc[VERASE] = 0177;
-+ ttmode.c_cc[VINTR] = CINTR;
-+ ttmode.c_cc[VQUIT] = CQUIT;
-+ ttmode.c_cc[VERASE] = CERASE;
-
- _tcsetattr(d->slaveFd, &ttmode);
-
diff --git a/x11/kdelibs4/files/patch-kdecore-kstartupinfo.cpp b/x11/kdelibs4/files/patch-kdecore-kstartupinfo.cpp
deleted file mode 100644
index 62be701bb371..000000000000
--- a/x11/kdelibs4/files/patch-kdecore-kstartupinfo.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdecore/kstartupinfo.cpp 2007/10/08 11:32:36 722993
-+++ kdecore/kstartupinfo.cpp 2007/10/12 12:13:00 724472
-@@ -545,7 +545,7 @@
-
- void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
- {
-- long activate = true;
-+ bool activate = true;
- kapp->setStartupId( startup_id );
- if( window != NULL )
- {
-@@ -937,7 +937,7 @@
- #ifdef Q_WS_X11
- extern Time qt_x_user_time;
- #else
-- long qt_x_user_time = 0;
-+ unsigned long qt_x_user_time = 0;
- #endif
- QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
- .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
-@@ -1078,7 +1078,9 @@
- if( pos >= 0 )
- {
- bool ok;
-- long time = d->id.mid( pos + 5 ).toLong( &ok );
-+ unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
-+ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+ time = d->id.mid( pos + 5 ).toLong( &ok );
- if( ok )
- return time;
- }
-@@ -1093,7 +1095,9 @@
- if( pos2 >= 0 )
- {
- bool ok;
-- long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
-+ unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
-+ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
-+ time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
- if( ok )
- return time;
- }
diff --git a/x11/kdelibs4/files/patch-kdeprint_cups_cupsdconf2 b/x11/kdelibs4/files/patch-kdeprint_cups_cupsdconf2
deleted file mode 100644
index b38391e67123..000000000000
--- a/x11/kdelibs4/files/patch-kdeprint_cups_cupsdconf2
+++ /dev/null
@@ -1,65 +0,0 @@
---- kdeprint/cups/cupsdconf2/cupsddialog.cpp Tue Sep 11 09:26:39 2007
-+++ kdeprint/cups/cupsdconf2/cupsddialog.cpp Tue Sep 11 14:38:28 2007
-@@ -44,6 +44,7 @@
- #include <kio/passdlg.h>
- #include <kguiitem.h>
- #include <kprocess.h>
-+#include <qprocess.h>
-
- #include <signal.h>
- #include <cups/cups.h>
-@@ -69,24 +70,38 @@
-
- int getServerPid()
- {
-- QDir dir("/proc",QString::null,QDir::Name,QDir::Dirs);
-- for (uint i=0;i<dir.count();i++)
-- {
-- if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue;
-- QFile f("/proc/" + dir[i] + "/cmdline");
-- if (f.exists() && f.open(IO_ReadOnly))
-+ // /proc doesn't work the same in FreeBSD. The simplest way to get cupsd's pid is via pgrep.
-+ #if defined(__FreeBSD__)
-+ QProcess *proc = new QProcess();
-+ proc->addArgument("pgrep");
-+ proc->addArgument("cupsd");
-+ proc->start();
-+ while (proc->isRunning()); //Wait for process to exit
-+ QString pidString = proc->readLineStdout();
-+ bool ok;
-+ int pid = pidString.toInt(&ok);
-+ if (ok) return pid;
-+ return (-1);
-+ #else
-+ QDir dir("/proc",QString::null,QDir::Name,QDir::Dirs);
-+ for (uint i=0;i<dir.count();i++)
- {
-- QTextStream t(&f);
-- QString line;
-- t >> line;
-- f.close();
-- if (line.right(5) == "cupsd" ||
-- line.right(6).left(5) == "cupsd") // second condition for 2.4.x kernels
-- // which add a null byte at the end
-- return dir[i].toInt();
-+ if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue;
-+ QFile f("/proc/" + dir[i] + "/cmdline");
-+ if (f.exists() && f.open(IO_ReadOnly))
-+ {
-+ QTextStream t(&f);
-+ QString line;
-+ t >> line;
-+ f.close();
-+ if (line.right(5) == "cupsd" ||
-+ line.right(6).left(5) == "cupsd") // second condition for 2.4.x kernels
-+ // which add a null byte at the end
-+ return dir[i].toInt();
-+ }
- }
-- }
-- return (-1);
-+ return (-1);
-+ #endif
- }
-
- const char* getPassword(const char*)
diff --git a/x11/kdelibs4/files/patch-kdeprint_cups_kmcupsmanager.cpp b/x11/kdelibs4/files/patch-kdeprint_cups_kmcupsmanager.cpp
deleted file mode 100644
index 89396ce0ae0a..000000000000
--- a/x11/kdelibs4/files/patch-kdeprint_cups_kmcupsmanager.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- kdeprint/cups/kmcupsmanager.cpp.orig Wed Jan 26 11:58:07 2005
-+++ kdeprint/cups/kmcupsmanager.cpp Wed Jan 26 12:09:45 2005
-@@ -100,10 +100,10 @@
- {
- QString d = cupsInstallDir();
- if (d.isEmpty())
-- d = "/usr";
-+ d = "%%LOCALBASE%%";
- d.append("/share/cups/model");
- // raw foomatic support
-- d.append(":/usr/share/foomatic/db/source");
-+ d.append(":%%LOCALBASE%%/share/foomatic/db/source");
- return d;
- }
-
-@@ -553,7 +553,7 @@
- {
- QStringList comps = QStringList::split('/', drname, false);
- QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-- QString PATH = getenv("PATH") + QString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-+ QString PATH = getenv("PATH") + QString::fromLatin1(":%%LOCALBASE%%/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
- QString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
- if (exe.isEmpty())
- {
-@@ -844,7 +844,7 @@
- {
- QString path = cupsInstallDir();
- if (path.isEmpty())
-- path = "/usr/share/cups";
-+ path = "%%LOCALBASE%%/share/cups";
- else
- path += "/share/cups";
- CupsAddSmb::exportDest(m_currentprinter->printerName(), path);
diff --git a/x11/kdelibs4/files/patch-kdeui-kactionclasses.cpp b/x11/kdelibs4/files/patch-kdeui-kactionclasses.cpp
deleted file mode 100644
index caee9f862c62..000000000000
--- a/x11/kdelibs4/files/patch-kdeui-kactionclasses.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdeui/kactionclasses.cpp 2007/10/08 11:32:36 722993
-+++ kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528
-@@ -667,8 +667,8 @@
- KToolBar* bar = static_cast<KToolBar*>( widget );
- int id_ = KAction::getToolButtonID();
- bar->insertCombo( comboItems(), id_, isEditable(),
-- SIGNAL( activated( int ) ), this,
-- SLOT( slotActivated( int ) ), isEnabled(),
-+ SIGNAL( activated( const QString & ) ), this,
-+ SLOT( slotActivated( const QString & ) ), isEnabled(),
- toolTip(), -1, index );
-
- QComboBox *cb = bar->getCombo( id_ );
diff --git a/x11/kdelibs4/files/patch-kinit-start_kdeinit_wrapper.c b/x11/kdelibs4/files/patch-kinit-start_kdeinit_wrapper.c
deleted file mode 100644
index 396ca8af4ff2..000000000000
--- a/x11/kdelibs4/files/patch-kinit-start_kdeinit_wrapper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kinit/start_kdeinit_wrapper.c.orig 2007-10-29 22:49:04.000000000 +0100
-+++ kinit/start_kdeinit_wrapper.c 2007-10-29 22:49:21.000000000 +0100
-@@ -85,7 +85,7 @@
- if(argc == 0)
- return 1;
- argv[0] = "start_kdeinit";
-- execv("start_kdeinit",argv);
-+ execvp("start_kdeinit",argv);
- perror("start_kdeinit");
- return 1;
- }
diff --git a/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
new file mode 100644
index 000000000000..d570729d5339
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kio-kio-kdirwatch.cpp
@@ -0,0 +1,23 @@
+--- ../kio/kio/kdirwatch.cpp.orig 2008-06-29 18:29:43.000000000 +0200
++++ ../kio/kio/kdirwatch.cpp 2008-06-30 00:40:46.000000000 +0200
+@@ -124,7 +124,11 @@
+ m_nfsPollInterval = config.readEntry("NFSPollInterval", 5000);
+ m_PollInterval = config.readEntry("PollInterval", 500);
+
++#ifdef Q_OS_FREEBSD
++ QString method = config.readEntry("PreferredMethod", "Stat");
++#else
+ QString method = config.readEntry("PreferredMethod", "inotify");
++#endif
+ if (method == "Fam")
+ {
+ m_preferredMethod = Fam;
+@@ -154,7 +158,7 @@
+
+ #ifdef HAVE_FAM
+ // It's possible that FAM server can't be started
+- if (FAMOpen(&fc) ==0) {
++ if (m_preferredMethod == Fam && FAMOpen(&fc) ==0) {
+ availableMethods << "FAM";
+ use_fam=true;
+ sn = new QSocketNotifier( FAMCONNECTION_GETFD(&fc),
diff --git a/x11/kdelibs4/files/patch-kioslave_http-http.cc b/x11/kdelibs4/files/patch-kioslave_http-http.cc
deleted file mode 100644
index 73929be6efcf..000000000000
--- a/x11/kdelibs4/files/patch-kioslave_http-http.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- kioslave/http/http.cc 2007/09/26 17:08:43 717341
-+++ kioslave/http/http.cc 2007/10/17 04:11:51 726097
-@@ -3409,10 +3409,6 @@
-
- } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
-
-- // Send the current response before processing starts or it
-- // might never get sent...
-- forwardHttpResponseHeader();
--
- // Now process the HTTP/1.1 upgrade
- QStringList::Iterator opt = upgradeOffers.begin();
- for( ; opt != upgradeOffers.end(); ++opt) {
-@@ -3818,6 +3814,10 @@
- mimeType( m_strMimeType );
- }
-
-+ // Do not move send response header before any redirection as it seems
-+ // to screw up some sites. See BR# 150904.
-+ forwardHttpResponseHeader();
-+
- if (m_request.method == HTTP_HEAD)
- return true;
-
-@@ -3830,10 +3830,10 @@
- // Check...
- createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
- if (!m_request.fcache)
-- {
-- m_request.bCachedWrite = false; // Error creating cache entry.
-- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-- }
-+ {
-+ m_request.bCachedWrite = false; // Error creating cache entry.
-+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
-+ }
- m_request.expireDate = expireDate;
- m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
- }
diff --git a/x11/kdelibs4/files/patch-kpty-kptydevice.cpp b/x11/kdelibs4/files/patch-kpty-kptydevice.cpp
new file mode 100644
index 000000000000..bde5029cef92
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kpty-kptydevice.cpp
@@ -0,0 +1,12 @@
+--- ../kpty/kptydevice.cpp.orig 2008-07-14 10:04:55.000000000 -0400
++++ ../kpty/kptydevice.cpp 2008-07-14 10:05:24.000000000 -0400
+@@ -265,7 +265,8 @@
+ #else
+ int available;
+ #endif
+- if (!::ioctl(q->masterFd(), FIONREAD, (char *) &available)) {
++ //if (!::ioctl(q->masterFd(), FIONREAD, (char *) &available)) {
++ if (!::ioctl(q->masterFd(), TIOCOUTQ, (char *) &available)) {
+ char *ptr = readBuffer.reserve(available);
+ NO_INTR(readBytes, read(q->masterFd(), ptr, available));
+ if (readBytes < 0) {
diff --git a/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in
deleted file mode 100644
index 27490412a187..000000000000
--- a/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- mimetypes/application/Makefile.in.orig Wed Feb 21 14:03:14 2007
-+++ mimetypes/application/Makefile.in Wed Feb 21 14:03:30 2007
-@@ -533,7 +533,7 @@
- vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \
- vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \
- vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \
-- x-xliff.desktop x-7z.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \
-+ x-xliff.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \
- xsd.desktop relaxng.desktop \
- vnd.oasis.opendocument.graphics-template.desktop \
- vnd.oasis.opendocument.graphics.desktop \
-@@ -765,7 +765,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-7z.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop
-+KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-sharedlib.desktop x-compress.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop x-lha.desktop Makefile.in x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop x-kde-wallet.desktop uninstall.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-pkcs12.desktop x-afm.desktop x-executable-script.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop smil.desktop x-kcsrc.desktop x-msdos-program.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-trash.desktop x-shockwave-flash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-font-ghostscript.desktop x-python.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop x-kword.desktop vnd.sun.xml.draw.template.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-zoo.desktop x-core.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop vnd.sun.xml.writer.desktop postscript.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop vnd.stardivision.writer-global.desktop x-applixgraphics.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop octet-stream.desktop x-magicpoint.desktop x-rar-compressed.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-font-speedo.desktop x-linguist.desktop
-
- #>+ 2
- docs-am:
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 07:00:55 +0000