* Fri May 2 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-1
- update to 4.0.72 (4.1 alpha 1) - parallel-devel patch ported by Lorenzo Villani <lvillani@binaryhelix.net> - update file list (Lorenzo Villani) - drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches - update xdg-menu (Administration menu) patch
This commit is contained in:
Kevin Kofler
parent
f668819923
commit
52ed5f7382
|
|
@ -1 +1 @@
|
|||
kdelibs-4.0.3.tar.bz2
|
||||
kdelibs-4.0.72.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,156 +0,0 @@
|
|||
Index: kdelibs/kdecore/kernel/kglobal.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kdecore/kernel/kglobal.cpp (Revision 791351)
|
||||
+++ kdelibs/kdecore/kernel/kglobal.cpp (Revision 791352)
|
||||
@@ -28,6 +28,12 @@
|
||||
#include "kglobal.h"
|
||||
#include "kglobal_p.h"
|
||||
|
||||
+#include <config.h>
|
||||
+
|
||||
+#ifdef HAVE_SYS_STAT_H
|
||||
+#include <sys/stat.h>
|
||||
+#endif
|
||||
+
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
@@ -64,6 +70,10 @@
|
||||
locale(0),
|
||||
charsets(0)
|
||||
{
|
||||
+ // the umask is read here before any threads are created to avoid race conditions
|
||||
+ mode_t tmp = 0;
|
||||
+ umsk = umask(tmp);
|
||||
+ umask(umsk);
|
||||
}
|
||||
|
||||
inline ~KGlobalPrivate()
|
||||
@@ -81,6 +91,7 @@
|
||||
KStringDict *stringDict;
|
||||
KLocale *locale;
|
||||
KCharsets *charsets;
|
||||
+ mode_t umsk;
|
||||
};
|
||||
|
||||
K_GLOBAL_STATIC(KGlobalPrivate, globalData)
|
||||
@@ -151,6 +162,12 @@
|
||||
return d->charsets;
|
||||
}
|
||||
|
||||
+mode_t KGlobal::umask()
|
||||
+{
|
||||
+ PRIVATE_DATA;
|
||||
+ return d->umsk;
|
||||
+}
|
||||
+
|
||||
KComponentData KGlobal::activeComponent()
|
||||
{
|
||||
PRIVATE_DATA;
|
||||
Index: kdelibs/kdecore/kernel/kglobal.h
|
||||
===================================================================
|
||||
--- kdelibs/kdecore/kernel/kglobal.h (Revision 791351)
|
||||
+++ kdelibs/kdecore/kernel/kglobal.h (Revision 791352)
|
||||
@@ -21,7 +21,9 @@
|
||||
|
||||
#include <kdecore_export.h>
|
||||
#include <QtCore/QAtomicPointer>
|
||||
+#include <sys/types.h>
|
||||
|
||||
+
|
||||
//
|
||||
// WARNING!!
|
||||
// This code uses undocumented Qt API
|
||||
@@ -354,6 +356,12 @@
|
||||
KDECORE_EXPORT KCharsets *charsets();
|
||||
|
||||
/**
|
||||
+ * Returns the umask of the process.
|
||||
+ * @return the umask of the process
|
||||
+ */
|
||||
+ KDECORE_EXPORT mode_t umask();
|
||||
+
|
||||
+ /**
|
||||
* Creates a static QString.
|
||||
*
|
||||
* To be used inside functions(!) like:
|
||||
Index: kdelibs/kdecore/io/ksavefile.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kdecore/io/ksavefile.cpp (Revision 791351)
|
||||
+++ kdelibs/kdecore/io/ksavefile.cpp (Revision 791352)
|
||||
@@ -119,6 +119,10 @@
|
||||
if (!fchown(tempFile.handle(), fi.ownerId(), fi.groupId()))
|
||||
tempFile.setPermissions(fi.permissions());
|
||||
}
|
||||
+ else {
|
||||
+ mode_t umsk = KGlobal::umask();
|
||||
+ fchmod(tempFile.handle(), 0666&(~umsk));
|
||||
+ }
|
||||
|
||||
//Open oursleves with the temporary file
|
||||
QFile::setFileName(tempFile.fileName());
|
||||
Index: kdelibs/kdecore/io/ktempdir.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kdecore/io/ktempdir.cpp (Revision 791351)
|
||||
+++ kdelibs/kdecore/io/ktempdir.cpp (Revision 791352)
|
||||
@@ -94,9 +94,7 @@
|
||||
d->tmpName = QFile::decodeName(realNameStr)+'/';
|
||||
kDebug(180) << "KTempDir: Temporary directory created :" << d->tmpName
|
||||
<< endl;
|
||||
- mode_t tmp = 0;
|
||||
- mode_t umsk = umask(tmp);
|
||||
- umask(umsk);
|
||||
+ mode_t umsk = KGlobal::umask();
|
||||
chmod(nme, mode&(~umsk));
|
||||
|
||||
// Success!
|
||||
Index: kdelibs/kdecore/kernel/kglobal.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kdecore/kernel/kglobal.cpp (Revision 793503)
|
||||
+++ kdelibs/kdecore/kernel/kglobal.cpp (Revision 793504)
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTextCodec>
|
||||
#include "kcmdlineargs.h"
|
||||
+#include <unistd.h> // umask
|
||||
|
||||
#ifndef NDEBUG
|
||||
#define MYASSERT(x) if (!x) \
|
||||
@@ -61,6 +62,7 @@
|
||||
Q_CONSTRUCTOR_FUNCTION(qrand)
|
||||
|
||||
typedef QSet<QString> KStringDict;
|
||||
+mode_t s_umsk;
|
||||
|
||||
class KGlobalPrivate
|
||||
{
|
||||
@@ -72,8 +74,8 @@
|
||||
{
|
||||
// the umask is read here before any threads are created to avoid race conditions
|
||||
mode_t tmp = 0;
|
||||
- umsk = umask(tmp);
|
||||
- umask(umsk);
|
||||
+ s_umsk = umask(tmp);
|
||||
+ umask(s_umsk);
|
||||
}
|
||||
|
||||
inline ~KGlobalPrivate()
|
||||
@@ -91,7 +93,6 @@
|
||||
KStringDict *stringDict;
|
||||
KLocale *locale;
|
||||
KCharsets *charsets;
|
||||
- mode_t umsk;
|
||||
};
|
||||
|
||||
K_GLOBAL_STATIC(KGlobalPrivate, globalData)
|
||||
@@ -164,8 +165,8 @@
|
||||
|
||||
mode_t KGlobal::umask()
|
||||
{
|
||||
- PRIVATE_DATA;
|
||||
- return d->umsk;
|
||||
+ // Don't use PRIVATE_DATA here. This is called by ~KGlobalPrivate -> ~KConfig -> sync -> KSaveFile, so there's no KGlobalPrivate anymore.
|
||||
+ return s_umsk;
|
||||
}
|
||||
|
||||
KComponentData KGlobal::activeComponent()
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- khtml/imload/decoders/pngloader.cpp
|
||||
+++ khtml/imload/decoders/pngloader.cpp
|
||||
@@ -109,6 +109,8 @@ private:
|
||||
|
||||
if (colorType == PNG_COLOR_TYPE_RGB)
|
||||
colorType = PNG_COLOR_TYPE_RGB_ALPHA; //Paranoia..
|
||||
+ else if (colorType == PNG_COLOR_TYPE_GRAY)
|
||||
+ colorType = PNG_COLOR_TYPE_GRAY_ALPHA;
|
||||
}
|
||||
|
||||
ImageFormat imFrm;
|
||||
@@ -192,6 +194,7 @@ private:
|
||||
{
|
||||
if (interlaced)
|
||||
{
|
||||
+ Q_ASSERT(pngReadStruct->row_info.pixel_depth <= depth * 8);
|
||||
requestScanline(rowNum, scanlineBuf);
|
||||
png_progressive_combine_row(pngReadStruct, scanlineBuf, data);
|
||||
notifyScanline(pass + 1, scanlineBuf);
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
Index: kdelibs/kinit/klauncher.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kinit/klauncher.cpp (Revision 792865)
|
||||
+++ kdelibs/kinit/klauncher.cpp (Revision 792866)
|
||||
@@ -231,16 +231,19 @@
|
||||
{
|
||||
#ifdef Q_WS_X11
|
||||
if( mCached_dpy != NULL )
|
||||
+ {
|
||||
XCloseDisplay( mCached_dpy );
|
||||
+ mCached_dpy = NULL;
|
||||
+ }
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
-KLauncher::destruct(int exit_code)
|
||||
+KLauncher::destruct()
|
||||
{
|
||||
if (QCoreApplication::instance()) ((KLauncher*)QCoreApplication::instance())->close();
|
||||
// We don't delete the app here, that's intentional.
|
||||
- ::_exit(exit_code);
|
||||
+ ::_exit(255);
|
||||
}
|
||||
|
||||
void KLauncher::setLaunchEnv(const QString &name, const QString &value)
|
||||
@@ -312,7 +315,7 @@
|
||||
kDebug(7016) << "Exiting on read_socket errno:" << errno;
|
||||
::signal( SIGHUP, SIG_IGN);
|
||||
::signal( SIGTERM, SIG_IGN);
|
||||
- destruct(255); // Exit!
|
||||
+ destruct(); // Exit!
|
||||
}
|
||||
requestData.resize(request_header.arg_length);
|
||||
result = read_socket(kdeinitSocket, (char *) requestData.data(),
|
||||
Index: kdelibs/kinit/klauncher_main.cpp
|
||||
===================================================================
|
||||
--- kdelibs/kinit/klauncher_main.cpp (Revision 792865)
|
||||
+++ kdelibs/kinit/klauncher_main.cpp (Revision 792866)
|
||||
@@ -35,13 +35,15 @@
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
#ifndef Q_WS_WIN
|
||||
+static int sigpipe[ 2 ];
|
||||
static void sig_handler(int sig_num)
|
||||
{
|
||||
// No recursion
|
||||
signal( SIGHUP, SIG_IGN);
|
||||
signal( SIGTERM, SIG_IGN);
|
||||
-fprintf(stderr, "klauncher: Exiting on signal %d\n", sig_num);
|
||||
- KLauncher::destruct(255);
|
||||
+ fprintf(stderr, "klauncher: Exiting on signal %d\n", sig_num);
|
||||
+ char tmp = 'x';
|
||||
+ write( sigpipe[ 1 ], &tmp, 1 );
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -103,6 +105,9 @@
|
||||
QDBusConnection::sessionBus().registerObject("/", launcher);
|
||||
|
||||
#ifndef Q_WS_WIN
|
||||
+ pipe( sigpipe );
|
||||
+ QSocketNotifier* signotif = new QSocketNotifier( sigpipe[ 0 ], QSocketNotifier::Read, launcher );
|
||||
+ QObject::connect( signotif, SIGNAL( activated( int )), launcher, SLOT( destruct()));
|
||||
KCrash::setEmergencySaveFunction(sig_handler);
|
||||
signal( SIGHUP, sig_handler);
|
||||
signal( SIGPIPE, SIG_IGN);
|
||||
Index: kdelibs/kinit/klauncher.h
|
||||
===================================================================
|
||||
--- kdelibs/kinit/klauncher.h (Revision 792865)
|
||||
+++ kdelibs/kinit/klauncher.h (Revision 792866)
|
||||
@@ -123,8 +123,10 @@
|
||||
~KLauncher();
|
||||
|
||||
void close();
|
||||
- static void destruct(int exit_code); // exit!
|
||||
|
||||
+public slots:
|
||||
+ void destruct(); // exit!
|
||||
+
|
||||
protected:
|
||||
void processDied(pid_t pid, long exitStatus);
|
||||
|
||||
|
|
@ -1,111 +1,21 @@
|
|||
diff -up kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh.parallel-devel 2007-07-26 05:40:17.000000000 -0500
|
||||
+++ kdelibs-3.95.0/doc/api/doxygen-preprocess-kcfg.sh 2007-11-04 15:47:59.000000000 -0600
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
|
||||
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
|
||||
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
|
||||
if test -z "$kcfg_compiler"; then
|
||||
- echo "kconfig_compiler not found!"
|
||||
+ echo "kconfig_compiler4 not found!"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt.parallel-devel 2007-10-03 05:49:47.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdecore/kconfig_compiler/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
|
||||
@@ -8,11 +8,11 @@ add_subdirectory( example )
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
||||
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
|
||||
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
|
||||
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
|
||||
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
diff -up kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl.parallel-devel 2006-10-25 21:25:48.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdecore/kconfig_compiler/checkkcfg.pl 2007-11-04 15:47:59.000000000 -0600
|
||||
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
||||
-$cmd = "./kconfig_compiler $file $kcfgc";
|
||||
+$cmd = "./kconfig_compiler4 $file $kcfgc";
|
||||
|
||||
#print "CMD $cmd\n";
|
||||
|
||||
if ( system( $cmd ) != 0 ) {
|
||||
- print STDERR "Unable to run kconfig_compiler\n";
|
||||
+ print STDERR "Unable to run kconfig_compiler4\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
diff -up kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-3.95.0/kdewidgets/CMakeLists.txt.parallel-devel 2007-10-03 05:50:13.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdewidgets/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
|
||||
@@ -16,22 +16,22 @@ include_directories(
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
||||
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
|
||||
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
||||
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
||||
|
||||
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
|
||||
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
||||
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
||||
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
|
||||
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
|
||||
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel 2007-10-23 03:39:11.000000000 -0500
|
||||
+++ kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake 2007-11-04 15:55:31.000000000 -0600
|
||||
Index: cmake/modules/FindKDE4Internal.cmake
|
||||
===================================================================
|
||||
--- cmake/modules/FindKDE4Internal.cmake (revision 801429)
|
||||
+++ cmake/modules/FindKDE4Internal.cmake (working copy)
|
||||
@@ -15,10 +15,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
#
|
||||
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
||||
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
|
||||
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable
|
||||
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
|
||||
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
|
||||
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
|
||||
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
|
||||
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
|
||||
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable
|
||||
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
|
||||
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
|
||||
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
|
||||
#
|
||||
# The following variables point to the location of the KDE libraries,
|
||||
# but shouldn't be used directly:
|
||||
@@ -121,7 +121,7 @@
|
||||
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
|
||||
#
|
||||
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
-# Use this to add widget description files for the makekdewidgets code generator
|
||||
+# Use this to add widget description files for the makekdewidgets4 code generator
|
||||
# for Qt Designer plugins.
|
||||
#
|
||||
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
||||
@@ -272,24 +272,24 @@ if (_kdeBootStrapping)
|
||||
@@ -274,24 +274,24 @@
|
||||
if (WIN32)
|
||||
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
|
||||
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
|
||||
|
|
@ -136,13 +46,14 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||
@@ -342,72 +342,72 @@ else (_kdeBootStrapping)
|
||||
# this file contains all dependencies of all libraries of kdelibs, Alex
|
||||
@@ -341,75 +341,75 @@
|
||||
include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
|
||||
|
||||
- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
|
||||
if (UNIX)
|
||||
- find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KDEFAKES_LIBRARY NAMES kdefakes PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
set(KDE4_KDEFAKES_LIBS ${kdefakes_LIB_DEPENDS} ${KDE4_KDEFAKES_LIBRARY} )
|
||||
endif (UNIX)
|
||||
|
||||
- find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KDECORE_LIBRARY NAMES kdecore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
|
|
@ -179,6 +90,9 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
- find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KJS_LIBRARY NAMES kjs PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
set(KDE4_KJS_LIBS ${kjs_LIB_DEPENDS} ${KDE4_KJS_LIBRARY} )
|
||||
- find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KJSAPI_LIBRARY NAMES kjsapi PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
set(KDE4_KJSAPI_LIBS ${kjsapi_LIB_DEPENDS} ${KDE4_KJSAPI_LIBRARY} )
|
||||
|
||||
- find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_library(KDE4_KNEWSTUFF2_LIBRARY NAMES knewstuff2 PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
|
||||
|
|
@ -231,7 +145,7 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
|
||||
|
||||
# Can't do that, it's not always compiled.
|
||||
@@ -426,8 +426,8 @@ else (_kdeBootStrapping)
|
||||
@@ -428,8 +428,8 @@
|
||||
|
||||
# at first look in LIBEXEC_INSTALL_DIR and no default paths,
|
||||
# if this didn't succeed, the second call makes cmake search again, but in the standard paths
|
||||
|
|
@ -242,7 +156,7 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
|
||||
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
|
||||
@@ -435,8 +435,8 @@ else (_kdeBootStrapping)
|
||||
@@ -437,8 +437,8 @@
|
||||
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
|
||||
|
||||
|
|
@ -253,17 +167,15 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
|
||||
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
|
||||
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -585,7 +585,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
|
||||
"${_CMAKE_INSTALL_DIR}/bin"
|
||||
@@ -660,6 +660,7 @@
|
||||
"${CMAKE_INSTALL_PREFIX}/bin" )
|
||||
|
||||
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
|
||||
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
|
||||
+ "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
|
||||
"${KDE4_LIB_INSTALL_DIR}"
|
||||
"${_CMAKE_INSTALL_DIR}/lib"
|
||||
"${CMAKE_INSTALL_PREFIX}/lib" )
|
||||
@@ -924,9 +925,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||
@@ -1052,9 +1053,9 @@
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
|
|
@ -275,10 +187,59 @@ diff -up kdelibs-3.95.0/cmake/modules/FindKDE4Internal.cmake.parallel-devel kdel
|
|||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(KDE4_AUTOMOC_EXECUTABLE)
|
||||
diff -up kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-devel 2007-10-03 05:50:15.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt 2007-11-04 15:47:59.000000000 -0600
|
||||
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
|
||||
Index: doc/api/doxygen-preprocess-kcfg.sh
|
||||
===================================================================
|
||||
--- doc/api/doxygen-preprocess-kcfg.sh (revision 801429)
|
||||
+++ doc/api/doxygen-preprocess-kcfg.sh (working copy)
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
|
||||
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
|
||||
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
|
||||
if test -z "$kcfg_compiler"; then
|
||||
- echo "kconfig_compiler not found!"
|
||||
+ echo "kconfig_compiler4 not found!"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
Index: kdewidgets/CMakeLists.txt
|
||||
===================================================================
|
||||
--- kdewidgets/CMakeLists.txt (revision 801429)
|
||||
+++ kdewidgets/CMakeLists.txt (working copy)
|
||||
@@ -16,22 +16,22 @@
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
||||
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS})
|
||||
|
||||
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
|
||||
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
|
||||
|
||||
-install(TARGETS makekdewidgets DESTINATION ${BIN_INSTALL_DIR} )
|
||||
+install(TARGETS makekdewidgets4 DESTINATION ${BIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
||||
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
||||
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
|
||||
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
|
||||
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
Index: kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
===================================================================
|
||||
--- kdeui/tests/kconfig_compiler/CMakeLists.txt (revision 801429)
|
||||
+++ kdeui/tests/kconfig_compiler/CMakeLists.txt (working copy)
|
||||
@@ -9,7 +9,7 @@
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
||||
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
|
||||
|
|
@ -287,3 +248,41 @@ diff -up kdelibs-3.95.0/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel-dev
|
|||
|
||||
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
||||
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
||||
Index: kdecore/kconfig_compiler/checkkcfg.pl
|
||||
===================================================================
|
||||
--- kdecore/kconfig_compiler/checkkcfg.pl (revision 801429)
|
||||
+++ kdecore/kconfig_compiler/checkkcfg.pl (working copy)
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
||||
-$cmd = "./kconfig_compiler $file $kcfgc";
|
||||
+$cmd = "./kconfig_compiler4 $file $kcfgc";
|
||||
|
||||
#print "CMD $cmd\n";
|
||||
|
||||
if ( system( $cmd ) != 0 ) {
|
||||
- print STDERR "Unable to run kconfig_compiler\n";
|
||||
+ print STDERR "Unable to run kconfig_compiler4\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
Index: kdecore/kconfig_compiler/CMakeLists.txt
|
||||
===================================================================
|
||||
--- kdecore/kconfig_compiler/CMakeLists.txt (revision 801429)
|
||||
+++ kdecore/kconfig_compiler/CMakeLists.txt (working copy)
|
||||
@@ -8,11 +8,11 @@
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
||||
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS})
|
||||
|
||||
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
|
||||
-install(TARGETS kconfig_compiler DESTINATION ${BIN_INSTALL_DIR} )
|
||||
+install(TARGETS kconfig_compiler4 DESTINATION ${BIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
|
@ -1,13 +1,15 @@
|
|||
--- kdelibs-4.0.2/kded/applications.menu.orig 2008-01-05 01:00:10.000000000 +0100
|
||||
+++ kdelibs-4.0.2/kded/applications.menu 2008-03-28 12:49:11.000000000 +0100
|
||||
@@ -31,12 +31,31 @@
|
||||
diff -ur kdelibs-4.0.72/kded/applications.menu kdelibs-4.0.72-xdg-menu/kded/applications.menu
|
||||
--- kdelibs-4.0.72/kded/applications.menu 2008-03-26 22:10:55.000000000 +0100
|
||||
+++ kdelibs-4.0.72-xdg-menu/kded/applications.menu 2008-05-02 02:49:25.000000000 +0200
|
||||
@@ -31,6 +31,7 @@
|
||||
<Category>Core</Category>
|
||||
<Not><Category>KDE</Category></Not>
|
||||
</And>
|
||||
+ <Category>X-Red-Hat-Base</Category>
|
||||
<!-- Don't list SUSE's YaST in here -->
|
||||
<Category>X-SuSE-YaST</Category>
|
||||
</Not>
|
||||
<Category>X-KDE-settings-hardware</Category>
|
||||
@@ -54,6 +55,24 @@
|
||||
</Include>
|
||||
</Menu>
|
||||
<Menu>
|
||||
|
|
@ -32,7 +34,7 @@
|
|||
<Name>Development</Name>
|
||||
<Directory>kde-development.directory</Directory>
|
||||
<Menu>
|
||||
@@ -341,7 +360,11 @@
|
||||
@@ -358,7 +377,11 @@
|
||||
<Name>Settingsmenu</Name>
|
||||
<Directory>kde-settingsmenu.directory</Directory>
|
||||
<Include>
|
||||
|
|
@ -45,7 +47,7 @@
|
|||
</Include>
|
||||
</Menu>
|
||||
<Menu>
|
||||
@@ -350,7 +373,9 @@
|
||||
@@ -367,7 +390,9 @@
|
||||
<Include>
|
||||
<And>
|
||||
<Category>System</Category>
|
||||
28
kdelibs.spec
28
kdelibs.spec
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.0.3
|
||||
Release: 7%{?dist}
|
||||
Version: 4.0.72
|
||||
Release: 1%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
|
|
@ -49,7 +49,7 @@ Source1: kde4.sh
|
|||
Source2: kde4.csh
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-3.95.0-parallel_devel.patch
|
||||
Patch0: kdelibs-4.0.72-parallel_devel.patch
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-3.95.0-kde149705.patch
|
||||
# Force Phonon to use the ALSA default device by default
|
||||
|
|
@ -74,19 +74,13 @@ Patch9: kdelibs-4.0.2-branding.patch
|
|||
Patch10: kdelibs-4.0.2-no-cache-kdeglobals-paths.patch
|
||||
# workaround for policykit
|
||||
Patch11: kdelibs-4.0.2-policykit-workaround.patch
|
||||
Patch12: kdelibs-4.x-xdg-menu.patch
|
||||
Patch12: kdelibs-4.0.72-xdg-menu.patch
|
||||
# Fedora build type - adds -DNDEBUG, removes -O2 -g (already in RPM_OPT_FLAGS)
|
||||
Patch13: kdelibs-4.0.3-fedora-buildtype.patch
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.0.3-libexecdir.patch
|
||||
# Buffer overflow in KHTML's image loader
|
||||
Patch15: kdelibs-4.0.3-khtml-security.patch
|
||||
|
||||
## upstream patches
|
||||
# based on SVN commit 793504 by dfaure
|
||||
# Move the umask value out of KConfigPrivate to avoid a crash on exit when ~KConfig calls sync.
|
||||
Patch100: kdelibs-4.0.3-kconfig_sync_crash.patch
|
||||
Patch101: kdelibs-4.0.3-klauncher-crash.patch
|
||||
|
||||
BuildRequires: qt4-devel >= 4.3.0
|
||||
Requires: qt4 >= %{_qt4_version}
|
||||
|
|
@ -186,7 +180,7 @@ format for easy browsing.
|
|||
%prep
|
||||
%setup -q -n kdelibs-%{version}
|
||||
|
||||
%patch0 -p1 -b .parallel_devel
|
||||
%patch0 -p0 -b .parallel_devel
|
||||
%patch2 -p1 -b .kde149705
|
||||
%patch4 -p1 -b .alsa-default
|
||||
%if 0%{?fedora} >= 9
|
||||
|
|
@ -204,10 +198,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
|
|||
%patch12 -p1 -b .Administration-menu
|
||||
%patch13 -p1 -b .fedora-buildtype
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch15 -p0 -b .khtml-security
|
||||
|
||||
%patch100 -p1 -b .kconfig_sync_crash
|
||||
%patch101 -p1 -b .klauncher-crash
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -310,6 +301,8 @@ rm -rf %{buildroot}
|
|||
%exclude %{_kde4_appsdir}/ksgmltools2/
|
||||
%{_kde4_configdir}/*
|
||||
%{_datadir}/dbus-1/interfaces/*
|
||||
%{_libdir}/kconf_update_bin/phonon_devicepreference_update
|
||||
%{_libdir}/kde4/plugins/script/*
|
||||
%{_kde4_datadir}/mime/packages/*
|
||||
%{_kde4_sharedir}/kde4/services/*
|
||||
%{_kde4_sharedir}/kde4/servicetypes/*
|
||||
|
|
@ -367,6 +360,13 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri May 2 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.0.72-1
|
||||
- update to 4.0.72 (4.1 alpha 1)
|
||||
- parallel-devel patch ported by Lorenzo Villani <lvillani@binaryhelix.net>
|
||||
- update file list (Lorenzo Villani)
|
||||
- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches
|
||||
- update xdg-menu (Administration menu) patch
|
||||
|
||||
* Tue Apr 22 2008 Lukáš Tinkl <ltinkl@redhat.com> - 4.0.3-7
|
||||
- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1,
|
||||
#443766: CVE-2008-1670)
|
||||
|
|
|
|||
Loading…
Reference in New Issue