rpms/kdelibs/devel kdelibs-4.0.72-parallel_devel.patch, NONE, 1.1 kdelibs-4.0.72-xdg-menu.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 kdelibs.spec, 1.311, 1.312 sources, 1.58, 1.59 kdelibs-3.95.0-parallel_devel.patch, 1.1, NONE kdelibs-4.0.3-kconfig_sync_crash.patch, 1.4, NONE kdelibs-4.0.3-khtml-security.patch, 1.1, NONE kdelibs-4.0.3-klauncher-crash.patch, 1.2, NONE kdelibs-4.x-xdg-menu.patch, 1.1, NONE
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Fri May 2 00:53:31 UTC 2008
- Previous message (by thread): rpms/telepathy-stream-engine/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 telepathy-stream-engine.spec, 1.9, 1.10
- Next message (by thread): rpms/kdelibs/devel kdelibs-4.0.72-parallel_devel.patch, 1.1, 1.2 kdelibs.spec, 1.312, 1.313
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12707/devel
Modified Files:
.cvsignore kdelibs.spec sources
Added Files:
kdelibs-4.0.72-parallel_devel.patch
kdelibs-4.0.72-xdg-menu.patch
Removed Files:
kdelibs-3.95.0-parallel_devel.patch
kdelibs-4.0.3-kconfig_sync_crash.patch
kdelibs-4.0.3-khtml-security.patch
kdelibs-4.0.3-klauncher-crash.patch kdelibs-4.x-xdg-menu.patch
Log Message:
* Fri May 2 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-1
- update to 4.0.72 (4.1 alpha 1)
- parallel-devel patch ported by Lorenzo Villani <lvillani at binaryhelix.net>
- update file list (Lorenzo Villani)
- drop upstreamed khtml-security, kconfig_sync_crash and klauncher-crash patches
- update xdg-menu (Administration menu) patch
kdelibs-4.0.72-parallel_devel.patch:
--- NEW FILE kdelibs-4.0.72-parallel_devel.patch ---
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
#
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
@@ -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
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc )
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 )
set(KDE4_AUTOMOC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kde4automoc.shell )
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_KCONFIG_COMPILER_DEP kconfig_compiler4)
set( _KDE4_AUTOMOC_EXECUTABLE_DEP kde4automoc)
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -341,75 +341,75 @@
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_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_PHONON_LIBRARY NAMES phonon PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_PHONON_LIBS ${phonon_LIB_DEPENDS} ${KDE4_PHONON_LIBRARY} )
- find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ find_library(KDE4_KAUDIODEVICELIST_LIBRARY NAMES kaudiodevicelist PATHS ${KDE4_LIB_INSTALL_DIR}/kde4/devel NO_DEFAULT_PATH )
set(KDE4_KAUDIODEVICELIST_LIBS ${kaudiodevicelist_LIB_DEPENDS} ${KDE4_KAUDIODEVICELIST_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.
@@ -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
- 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 )
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
find_program(KDE4_AUTOMOC_EXECUTABLE NAME kde4automoc )
@@ -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 )
- 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)
@@ -660,6 +660,7 @@
"${CMAKE_INSTALL_PREFIX}/bin" )
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" )
@@ -1052,9 +1053,9 @@
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)
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
- 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 )
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 ###############
kdelibs-4.0.72-xdg-menu.patch:
--- NEW FILE kdelibs-4.0.72-xdg-menu.patch ---
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>
<Category>X-KDE-settings-hardware</Category>
@@ -54,6 +55,24 @@
</Include>
</Menu>
<Menu>
+ <Name>System Settings</Name>
+ <Directory>SystemConfig.directory</Directory>
+ <Include>
+ <And>
+ <Category>System</Category>
+ <Category>Settings</Category>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ </And>
+ </Include>
+ <Menu>
+ <Name>Server</Name>
+ <Directory>ServerConfig.directory</Directory>
+ <Include>
+ <Category>X-Red-Hat-ServerConfig</Category>
+ </Include>
+ </Menu>
+ </Menu>
+ <Menu>
<Name>Development</Name>
<Directory>kde-development.directory</Directory>
<Menu>
@@ -358,7 +377,11 @@
<Name>Settingsmenu</Name>
<Directory>kde-settingsmenu.directory</Directory>
<Include>
- <Category>Settings</Category>
+ <And>
+ <Category>Settings</Category>
+ <Not><Category>System</Category></Not>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
+ </And>
</Include>
</Menu>
<Menu>
@@ -367,7 +390,9 @@
<Include>
<And>
<Category>System</Category>
+ <Not><Category>Settings</Category></Not>
<Not><Category>X-KDE-More</Category></Not>
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
</And>
</Include>
<Menu>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 28 Mar 2008 18:14:45 -0000 1.48
+++ .cvsignore 2 May 2008 00:52:55 -0000 1.49
@@ -1 +1 @@
-kdelibs-4.0.3.tar.bz2
+kdelibs-4.0.72.tar.bz2
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- kdelibs.spec 26 Apr 2008 23:16:21 -0000 1.311
+++ kdelibs.spec 2 May 2008 00:52:55 -0000 1.312
@@ -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 @@
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 @@
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 @@
%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 @@
%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 @@
%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 @@
%changelog
+* Fri May 2 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.0.72-1
+- update to 4.0.72 (4.1 alpha 1)
+- parallel-devel patch ported by Lorenzo Villani <lvillani at 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 at redhat.com> - 4.0.3-7
- fix buffer overflow in KHTML's image loader (KDE advisory 20080426-1,
#443766: CVE-2008-1670)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 28 Mar 2008 16:26:23 -0000 1.58
+++ sources 2 May 2008 00:52:55 -0000 1.59
@@ -1 +1 @@
-7ac2cb9fb2eb24ea6b9d4babfb906101 kdelibs-4.0.3.tar.bz2
+011b793d57a2f22f88b4f7e4eb418026 kdelibs-4.0.72.tar.bz2
--- kdelibs-3.95.0-parallel_devel.patch DELETED ---
--- kdelibs-4.0.3-kconfig_sync_crash.patch DELETED ---
--- kdelibs-4.0.3-khtml-security.patch DELETED ---
--- kdelibs-4.0.3-klauncher-crash.patch DELETED ---
--- kdelibs-4.x-xdg-menu.patch DELETED ---
- Previous message (by thread): rpms/telepathy-stream-engine/F-9 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 telepathy-stream-engine.spec, 1.9, 1.10
- Next message (by thread): rpms/kdelibs/devel kdelibs-4.0.72-parallel_devel.patch, 1.1, 1.2 kdelibs.spec, 1.312, 1.313
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list