rpms/kdelibs/devel kdelibs-4.0.81-parallel_devel.patch, NONE, 1.1 kdelibs-4.0.82-proxy.patch, NONE, 1.1 kdelibs.spec, 1.329, 1.330 kdelibs-4.0.4-proxy.patch, 1.1, NONE kdelibs-4.0.80-khtml-stylesheet.patch, 1.1, NONE kdelibs-4.0.80-parallel_devel.patch, 1.1, NONE
Than Ngo (than)
fedora-extras-commits at redhat.com
Fri Jun 13 21:16:31 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9928
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.0.81-parallel_devel.patch kdelibs-4.0.82-proxy.patch
Removed Files:
kdelibs-4.0.4-proxy.patch
kdelibs-4.0.80-khtml-stylesheet.patch
kdelibs-4.0.80-parallel_devel.patch
Log Message:
4.0.82
kdelibs-4.0.81-parallel_devel.patch:
--- NEW FILE kdelibs-4.0.81-parallel_devel.patch ---
diff -up kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2008-06-12 22:12:53.000000000 +0200
+++ kdelibs-4.0.80/cmake/modules/FindKDE4Internal.cmake 2008-06-12 22:35:52.000000000 +0200
@@ -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
#
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
@@ -124,7 +124,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)
@@ -285,7 +285,7 @@ if (_kdeBootStrapping)
if (WIN32)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
# use automoc4 from kdesupport if it has been found
if(AUTOMOC4_EXECUTABLE)
@@ -295,10 +295,10 @@ if (_kdeBootStrapping)
endif(AUTOMOC4_EXECUTABLE)
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
else (WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
# use automoc4 from kdesupport if it has been found
if(AUTOMOC4_EXECUTABLE)
@@ -308,14 +308,14 @@ if (_kdeBootStrapping)
endif(AUTOMOC4_EXECUTABLE)
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
endif (WIN32)
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
# when building kdelibs, make the kcfg rules depend on the binaries...
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
if(AUTOMOC4_EXECUTABLE)
@@ -371,69 +371,69 @@ else (_kdeBootStrapping)
include(${kde_cmake_module_dir}/KDELibsDependencies.cmake)
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 )
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 )
+ find_library(KDE4_KDEUI_LIBRARY NAMES kdeui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDEUI_LIBS ${kdeui_LIB_DEPENDS} ${KDE4_KDEUI_LIBRARY} )
- find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KIO_LIBRARY NAMES kio PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KIO_LIBS ${kio_LIB_DEPENDS} ${KDE4_KIO_LIBRARY} )
- find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KPARTS_LIBRARY NAMES kparts PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KPARTS_LIBS ${kparts_LIB_DEPENDS} ${KDE4_KPARTS_LIBRARY} )
- find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KUTILS_LIBRARY NAMES kutils PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KUTILS_LIBS ${kutils_LIB_DEPENDS} ${KDE4_KUTILS_LIBRARY} )
- find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDE3SUPPORT_LIBRARY NAMES kde3support PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDE3SUPPORT_LIBS ${kde3support_LIB_DEPENDS} ${KDE4_KDE3SUPPORT_LIBRARY} )
- find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KFILE_LIBRARY NAMES kfile PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KFILE_LIBS ${kfile_LIB_DEPENDS} ${KDE4_KFILE_LIBRARY} )
- find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KHTML_LIBRARY NAMES khtml PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KHTML_LIBS ${khtml_LIB_DEPENDS} ${KDE4_KHTML_LIBRARY} )
- 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 )
set(KDE4_KNEWSTUFF2_LIBS ${knewstuff2_LIB_DEPENDS} ${KDE4_KNEWSTUFF2_LIBRARY} )
if (UNIX)
- find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KPTY_LIBRARY NAMES kpty PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KPTY_LIBS ${kpty_LIB_DEPENDS} ${KDE4_KPTY_LIBRARY} )
- find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDESU_LIBRARY NAMES kdesu PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDESU_LIBS ${kdesu_LIB_DEPENDS} ${KDE4_KDESU_LIBRARY} )
endif (UNIX)
- find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KDNSSD_LIBRARY NAMES kdnssd PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KDNSSD_LIBS ${kdnssd_LIB_DEPENDS} ${KDE4_KDNSSD_LIBRARY} )
- find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_SOLID_LIBRARY NAMES solid PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_SOLID_LIBS ${solid_LIB_DEPENDS} ${KDE4_SOLID_LIBRARY} )
- find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_THREADWEAVER_LIBRARY NAMES threadweaver PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_THREADWEAVER_LIBRARIES ${threadweaver_LIB_DEPENDS} ${KDE4_THREADWEAVER_LIBRARY} )
- find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KNOTIFYCONFIG_LIBRARY NAMES knotifyconfig PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KNOTIFYCONFIG_LIBS ${knotifyconfig_LIB_DEPENDS} ${KDE4_KNOTIFYCONFIG_LIBRARY} )
- find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KROSSCORE_LIBRARY NAMES krosscore PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KROSSCORE_LIBS ${krosscore_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBRARY} )
- find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KROSSUI_LIBRARY NAMES krossui PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KROSSUI_LIBS ${krossui_LIB_DEPENDS} ${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBRARY} )
- find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KTEXTEDITOR_LIBRARY NAMES ktexteditor PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KTEXTEDITOR_LIBS ${ktexteditor_LIB_DEPENDS} ${KDE4_KTEXTEDITOR_LIBRARY} )
# Can't do that, it's not always compiled.
@@ -452,8 +452,8 @@ else (_kdeBootStrapping)
# 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
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_KCFGC_EXECUTABLE NAME kconfig_compiler4 )
if (AUTOMOC4_EXECUTABLE)
set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}")
@@ -465,8 +465,8 @@ else (_kdeBootStrapping)
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
find_program(KDE4_MEINPROC_EXECUTABLE NAME meinproc4 )
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
- find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets )
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
# 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)
@@ -695,7 +695,8 @@ set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SY
"${_CMAKE_INSTALL_DIR}/bin"
"${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}
"${KDE4_LIB_INSTALL_DIR}"
"${_CMAKE_INSTALL_DIR}/lib"
"${CMAKE_INSTALL_PREFIX}/lib" )
@@ -1067,9 +1068,9 @@ macro (KDE4_PRINT_RESULTS)
endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Found KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+ message(STATUS "Found KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
else(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
endif(KDE4_KCFGC_EXECUTABLE)
if(KDE4_AUTOMOC_EXECUTABLE)
diff -up kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-06-01 08:12:31.000000000 +0200
+++ kdelibs-4.0.80/doc/api/doxygen-preprocess-kcfg.sh 2008-06-12 22:23:01.000000000 +0200
@@ -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-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-06-01 08:17:18.000000000 +0200
+++ kdelibs-4.0.80/kdecore/kconfig_compiler/checkkcfg.pl 2008-06-12 22:23:01.000000000 +0200
@@ -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-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-06-01 08:17:18.000000000 +0200
+++ kdelibs-4.0.80/kdecore/kconfig_compiler/CMakeLists.txt 2008-06-12 22:23:01.000000000 +0200
@@ -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-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-06-01 08:15:17.000000000 +0200
+++ kdelibs-4.0.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-06-12 22:23:01.000000000 +0200
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
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
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
# 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 )
diff -up kdelibs-4.0.80/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.0.80/kdewidgets/CMakeLists.txt
--- kdelibs-4.0.80/kdewidgets/CMakeLists.txt.parallel_devel 2008-06-01 08:14:41.000000000 +0200
+++ kdelibs-4.0.80/kdewidgets/CMakeLists.txt 2008-06-12 22:23:01.000000000 +0200
@@ -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
kdelibs-4.0.82-proxy.patch:
--- NEW FILE kdelibs-4.0.82-proxy.patch ---
diff -up kdelibs/kioslave/http/http.cpp.orig kdelibs/kioslave/http/http.cpp
--- kdelibs/kioslave/http/http.cpp.orig 2008-06-12 17:23:34.000000000 +0200
+++ kdelibs/kioslave/http/http.cpp 2008-06-12 17:36:29.000000000 +0200
@@ -43,6 +43,7 @@
#include <QtCore/QDate>
#include <QtDBus/QtDBus>
#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QHostInfo>
#include <kurl.h>
@@ -259,9 +260,11 @@ void HTTPProtocol::resetSessionSettings(
// Do not reset the URL on redirection if the proxy
// URL, username or password has not changed!
KUrl proxy ( config()->readEntry("UseProxy") );
+ QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy;
if ( m_strProxyRealm.isEmpty() || !proxy.isValid() ||
m_proxyURL.host() != proxy.host() ||
+ m_proxyURL.port() != proxy.port() ||
(!proxy.user().isNull() && proxy.user() != m_proxyURL.user()) ||
(!proxy.pass().isNull() && proxy.pass() != m_proxyURL.pass()) )
{
@@ -272,6 +275,21 @@ void HTTPProtocol::resetSessionSettings(
kDebug(7113) << "Using proxy:" << m_bUseProxy
<< "URL: " << m_proxyURL.url()
<< "Realm: " << m_strProxyRealm;
+
+ if ( m_bUseProxy )
+ {
+ if ( m_proxyURL.protocol() == "socks" )
+ proxyType = QNetworkProxy::Socks5Proxy;
+ else if ( isAutoSsl() )
+ proxyType = QNetworkProxy::HttpProxy;
+
+ m_request.proxyURL = proxy;
+ }
+ else
+ m_request.proxyURL = KUrl();
+
+ QNetworkProxy::setApplicationProxy(QNetworkProxy(proxyType,m_proxyURL.host(),m_proxyURL.port(),m_proxyURL.user(),m_proxyURL.pass()));
+
}
m_bPersistentProxyConnection = config()->readEntry("PersistentProxyConnection", false);
@@ -1903,7 +1921,7 @@ void HTTPProtocol::httpCheckConnection()
kDebug(7113) << "Connection lost!";
closeDown = true;
}
- else if ( m_request.method != HTTP_GET )
+ else if ( m_request.method != HTTP_GET && m_request.method != HTTP_POST )
{
closeDown = true;
}
@@ -1915,6 +1933,14 @@ void HTTPProtocol::httpCheckConnection()
m_state.passwd != m_request.passwd)
closeDown = true;
}
+ else if ( m_state.doProxy || m_request.doProxy )
+ {
+ if (m_state.proxyURL.host() != m_request.proxyURL.host() ||
+ m_state.proxyURL.port() != m_request.proxyURL.port() ||
+ m_state.proxyURL.user() != m_request.proxyURL.user() ||
+ m_state.proxyURL.pass() != m_request.proxyURL.pass())
+ closeDown = true;
+ }
else
{
// Keep the connection to the proxy.
@@ -1933,17 +1959,23 @@ void HTTPProtocol::httpCheckConnection()
m_state.user = m_request.user;
m_state.passwd = m_request.passwd;
m_state.doProxy = m_request.doProxy;
+ m_state.proxyURL = m_request.proxyURL;
}
bool HTTPProtocol::httpOpenConnection()
{
+ bool connResult;
kDebug(7113);
setBlocking( true );
- if ( !connectToHost(m_protocol, m_state.hostname, m_state.port ) )
- return false;
+ if ( m_state.doProxy && !isAutoSsl() && m_proxyURL.protocol() != "socks")
+ connResult = connectToHost(m_proxyURL.protocol(), m_proxyURL.host(), m_proxyURL.port() );
+ else
+ connResult = connectToHost(m_protocol, m_state.hostname, m_state.port );
+ if ( connResult )
+ {
#if 0 // QTcpSocket doesn't support this
// Set our special socket option!!
socket().setNoDelay(true);
@@ -1952,7 +1984,8 @@ bool HTTPProtocol::httpOpenConnection()
m_bFirstRequest = true;
connected();
- return true;
+ }
+ return connResult;
}
diff -up kdelibs/kioslave/http/http.h.orig kdelibs/kioslave/http/http.h
--- kdelibs/kioslave/http/http.h.orig 2008-06-12 17:36:35.000000000 +0200
+++ kdelibs/kioslave/http/http.h 2008-06-12 17:37:47.000000000 +0200
@@ -83,6 +83,7 @@ public:
QString user;
QString passwd;
bool doProxy;
+ KUrl proxyURL;
};
/** DAV-specific request elements for the current connection **/
@@ -145,6 +146,7 @@ public:
QString id;
DAVRequest davData;
bool doProxy;
+ KUrl proxyURL;
bool allowCompressedPage;
bool disablePassDlg;
bool bNoAuth; // Do not authenticate
Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- kdelibs.spec 30 May 2008 17:17:51 -0000 1.329
+++ kdelibs.spec 13 Jun 2008 21:15:44 -0000 1.330
@@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Libraries
-Version: 4.0.80
-Release: 2%{?dist}
+Version: 4.0.82
+Release: 1%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@@ -49,7 +49,7 @@
Source2: kde4.csh
# make -devel packages parallel-installable
-Patch0: kdelibs-4.0.80-parallel_devel.patch
+Patch0: kdelibs-4.0.81-parallel_devel.patch
# fix kde#149705
Patch2: kdelibs-3.95.0-kde149705.patch
# Hunspell support for K3Spell
@@ -75,12 +75,11 @@
Patch14: kdelibs-4.0.3-libexecdir.patch
# fix proxy support (#443931, kde#155707)
# patch by Sergey Saukh: http://bugs.kde.org/show_bug.cgi?id=155707#c46
-Patch15: kdelibs-4.0.4-proxy.patch
+Patch15: kdelibs-4.0.82-proxy.patch
# forward port kstandarddirs hack to search /etc/kde
Patch18: kdelibs-4.0.80-kstandarddirs.patch
-## upstream patches
-Patch100: kdelibs-4.0.80-khtml-stylesheet.patch
+# upstream patches
BuildRequires: qt4-devel >= 4.4.0
Requires: qt4 >= %{_qt4_version}
@@ -196,11 +195,10 @@
%patch12 -p1 -b .Administration-menu
%patch13 -p1 -b .fedora-buildtype
%patch14 -p1 -b .libexecdir
-%patch15 -p0 -b .proxy
+%patch15 -p1 -b .proxy
%patch18 -p1 -b .kstandarddirs
# upstream patches
-%patch100 -p1 -b .khtml-stylesheet
%build
@@ -366,6 +364,9 @@
%changelog
+* Fri Jun 13 2008 Than Ngo <than at redhat.com> 4.0.82-1
+- 4.0.82
+
* Fri May 30 2008 Than Ngo <than at redhat.com> 4.0.80-2
- fix #447965, order issue in kde path, thanks to Kevin
- backport patch to check html style version
--- kdelibs-4.0.4-proxy.patch DELETED ---
--- kdelibs-4.0.80-khtml-stylesheet.patch DELETED ---
--- kdelibs-4.0.80-parallel_devel.patch DELETED ---
More information about the fedora-extras-commits
mailing list