Tue May 12 12:13:27 UTC 2009

Author: than

Update of /cvs/extras/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9244

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.3-strcasestr-glibc2.9.patch 
Removed Files:
	kdelibs-4.0.85-libexecdir.patch 
	kdelibs-4.1.96-AllowExternalPaths.patch 
	kdelibs-4.1.96-cmake.patch kdelibs-4.2.0-gcc44-misc.patch 
	kdelibs-4.2.0-gcc44-workaround.patch 
	kdelibs-4.2.0-kjs-gcc44-crash.patch 
	kdelibs-4.2.2-bidi-kde#189161.patch 
	kdelibs-4.2.2-kde#180785-2.patch 
	kdelibs-4.2.2-kde#180785.patch kdelibs-4.2.2-kio_http.patch 
	kdelibs-4.2.2-kjob.patch kdelibs-4.2.2-plasma-focus.patch 
Log Message:
4.3 beta1


kdelibs-4.2.3-strcasestr-glibc2.9.patch:

--- NEW FILE kdelibs-4.2.3-strcasestr-glibc2.9.patch ---
--- kdelibs/cmake/modules/CheckCXXSymbolExists.cmake	(Revision 0)
+++ kdelibs/cmake/modules/CheckCXXSymbolExists.cmake	(Revision 963449)
@@ -0,0 +1,71 @@
+# - Check if the symbol exists in include files, in C++ mode
+# Forked off cmake's CheckSymbolExists.cmake
+# CHECK_CXX_SYMBOL_EXISTS(SYMBOL FILES VARIABLE)
+#
+#  SYMBOL   - symbol
+#  FILES    - include files to check
+#  VARIABLE - variable to return result
+#
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+MACRO(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
+  IF("${VARIABLE}" MATCHES "^${VARIABLE}$")
+    SET(CMAKE_CONFIGURABLE_FILE_CONTENT "/* */\n")
+    SET(MACRO_CHECK_SYMBOL_EXISTS_FLAGS ${CMAKE_REQUIRED_FLAGS})
+    IF(CMAKE_REQUIRED_LIBRARIES)
+      SET(CHECK_SYMBOL_EXISTS_LIBS 
+        "-DLINK_LIBRARIES:STRING=${CMAKE_REQUIRED_LIBRARIES}")
+    ELSE(CMAKE_REQUIRED_LIBRARIES)
+      SET(CHECK_SYMBOL_EXISTS_LIBS)
+    ENDIF(CMAKE_REQUIRED_LIBRARIES)
+    IF(CMAKE_REQUIRED_INCLUDES)
+      SET(CMAKE_SYMBOL_EXISTS_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    ELSE(CMAKE_REQUIRED_INCLUDES)
+      SET(CMAKE_SYMBOL_EXISTS_INCLUDES)
+    ENDIF(CMAKE_REQUIRED_INCLUDES)
+    FOREACH(FILE ${FILES})
+      SET(CMAKE_CONFIGURABLE_FILE_CONTENT
+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}#include <${FILE}>\n")
+    ENDFOREACH(FILE)
+    SET(CMAKE_CONFIGURABLE_FILE_CONTENT
+      "${CMAKE_CONFIGURABLE_FILE_CONTENT}\nvoid cmakeRequireSymbol(int dummy,...){(void)dummy;}\nint main()\n{\n#ifndef ${SYMBOL}\n  cmakeRequireSymbol(0,&${SYMBOL});\n#endif\n  return 0;\n}\n")
+
+    CONFIGURE_FILE("${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" @ONLY)
+
+    MESSAGE(STATUS "Looking for ${SYMBOL}")
+    TRY_COMPILE(${VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      CMAKE_FLAGS 
+      -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_SYMBOL_EXISTS_FLAGS}
+      "${CHECK_SYMBOL_EXISTS_LIBS}"
+      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+      OUTPUT_VARIABLE OUTPUT)
+    IF(${VARIABLE})
+      MESSAGE(STATUS "Looking for ${SYMBOL} - found")
+      SET(${VARIABLE} 1 CACHE INTERNAL "Have symbol ${SYMBOL}")
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log 
+        "Determining if the ${SYMBOL} "
+        "exist passed with the following output:\n"
+        "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+    ELSE(${VARIABLE})
+      MESSAGE(STATUS "Looking for ${SYMBOL} - not found.")
+      SET(${VARIABLE} "" CACHE INTERNAL "Have symbol ${SYMBOL}")
+      FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log 
+        "Determining if the ${SYMBOL} "
+        "exist failed with the following output:\n"
+        "${OUTPUT}\nFile ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx:\n"
+        "${CMAKE_CONFIGURABLE_FILE_CONTENT}\n")
+    ENDIF(${VARIABLE})
+  ENDIF("${VARIABLE}" MATCHES "^${VARIABLE}$")
+ENDMACRO(CHECK_CXX_SYMBOL_EXISTS)
--- kdelibs/ConfigureChecks.cmake	(Revision 963448)
+++ kdelibs/ConfigureChecks.cmake	(Revision 963449)
@@ -6,6 +6,7 @@
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
+include(CheckCXXSymbolExists)
 include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckPrototypeExists)
@@ -230,7 +231,15 @@
 check_function_exists(random     HAVE_RANDOM)            # kdecore/fakes.c
 check_function_exists(strlcpy    HAVE_STRLCPY)           # kdecore/fakes.c
 check_function_exists(strlcat    HAVE_STRLCAT)           # kdecore/fakes.c
-check_function_exists(strcasestr HAVE_STRCASESTR)        # kdecore/fakes.c
+check_cxx_symbol_exists(__CORRECT_ISO_CPP_STRING_H_PROTO "string.h" HAVE_STRCASESTR_OVERLOAD) # glibc-2.9 strangeness
+if (HAVE_STRCASESTR_OVERLOAD)
+  message(STATUS "string.h defines __CORRECT_ISO_CPP_STRING_H_PROTO")
+  set(HAVE_STRCASESTR 1)
+  set(HAVE_STRCASESTR_PROTO 1)
+else()
+  check_function_exists(strcasestr HAVE_STRCASESTR)        # kdecore/fakes.c
+  check_prototype_exists(strcasestr string.h          HAVE_STRCASESTR_PROTO)
+endif()
 check_function_exists(setenv     HAVE_SETENV)            # kdecore/fakes.c
 check_function_exists(seteuid    HAVE_SETEUID)           # kdecore/fakes.c
 check_function_exists(setmntent  HAVE_SETMNTENT)         # solid, kio, kdecore
@@ -243,7 +252,6 @@
 check_prototype_exists(mkdtemp "stdlib.h;unistd.h"  HAVE_MKDTEMP_PROTO)
 check_prototype_exists(mkstemp "stdlib.h;unistd.h"  HAVE_MKSTEMP_PROTO)
 check_prototype_exists(strlcat string.h             HAVE_STRLCAT_PROTO)
-check_prototype_exists(strcasestr string.h          HAVE_STRCASESTR_PROTO)
 check_prototype_exists(strlcpy string.h             HAVE_STRLCPY_PROTO)
 check_prototype_exists(random stdlib.h              HAVE_RANDOM_PROTO)
 check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/extras/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- kdelibs.spec	29 Apr 2009 23:50:34 -0000	1.475
+++ kdelibs.spec	12 May 2009 12:12:57 -0000	1.476
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
-Version: 4.2.2
-Release: 14%{?dist}
+Version: 4.2.85
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -55,7 +55,7 @@ Source2: kde4.csh
 # make -devel packages parallel-installable
 Patch0: kdelibs-4.1.96-parallel_devel.patch
 # fix kde#149705
-Patch2: kdelibs-4.1.82-kde149705.patch
+Patch2: kdelibs-4.2.85-kde149705.patch
 # Hunspell support for K3Spell
 # http://fedoraproject.org/wiki/Releases/FeatureDictionary
 # http://bugs.kde.org/show_bug.cgi?id=154561
@@ -74,27 +74,16 @@ Patch10: kdelibs-4.1.72-no-cache-kdeglob
 Patch11: kdelibs-4.1.72-policykit-workaround.patch
 Patch12: kdelibs-4.1.0-xdg-menu.patch
 # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
-Patch14: kdelibs-4.0.85-libexecdir.patch
+Patch14: kdelibs-4.2.85-libexecdir.patch
 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
 Patch18: kdelibs-4.1.72-kstandarddirs.patch
 Patch20: kdelibs-4.1.70-cmake.patch
-Patch22: kdelibs-4.1.96-cmake.patch
-Patch23: kdelibs-4.2.0-gcc44-workaround.patch
-# disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
-Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
-Patch25: kdelibs-4.2.0-gcc44-misc.patch
 
 # upstream
 # 4.2 branch
-Patch100: kdelibs-4.2.2-kio_http.patch
-Patch101: kdelibs-4.2.2-kjob.patch
-Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
-Patch103: kdelibs-4.2.2-kde#180785.patch
-Patch104: kdelibs-4.2.2-kde#180785-2.patch
-Patch105: kdelibs-4.2.2-plasma-focus.patch
+Patch100: kdelibs-4.2.3-strcasestr-glibc2.9.patch
 
 # 4.3 branch
-Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -170,7 +159,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %if "%{name}" != "kdelibs4"
 Obsoletes: kdelibs4-devel < %{version}-%{release}
 Provides:  kdelibs4-devel = %{version}-%{release}
-%{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
 %endif
 Requires: cmake >= 2.6.2-3
 Requires: automoc4 >= 0.9.88
@@ -219,28 +207,17 @@ format for easy browsing.
 %patch8 -p1 -b .all-css
 %patch9 -p1 -b .branding
 sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
-%patch10 -p1 -b .no-cache-kdeglobals-paths
 %patch11 -p1 -b .policykit
 %patch12 -p1 -b .Administration-menu
 %patch14 -p1 -b .libexecdir
 %patch18 -p1 -b .kstandarddirs
 %patch20 -p1 -b .xxcmake
-%patch22 -p1 -b .kdepimlibs-cmake
-%patch23 -p1 -b .gcc44
-%patch24 -p1 -b .kjs-gcc44-crash
-%patch25 -p1 -b .gcc44-misc
 
 # upstream patches
 # 4.2
-%patch100 -p0 -b .kio_http
-%patch101 -p0 -b .kjob
-%patch102 -p4 -b .bidi-kde#189161
-%patch103 -p4 -b .kde#180785
-%patch104 -p4 -b .kde#180785-2
-%patch105 -p1 -b .kickoff-focus
+%patch100 -p1 -b .strcasestr-glibc2.9
 
 # 4.3
-%patch200 -p1 -b .AllowExternalPaths
 
 
 %build
@@ -423,6 +400,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May 12 2009 Than Ngo <than at redhat.com> 4.2.85-1
+- KDE-4.3 beta1 (4.2.85)
+
 * Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-14
 - -devel: Provides: kdelibs4-devel%%{?_isa} ...
 


--- kdelibs-4.0.85-libexecdir.patch DELETED ---


--- kdelibs-4.1.96-AllowExternalPaths.patch DELETED ---


--- kdelibs-4.1.96-cmake.patch DELETED ---


--- kdelibs-4.2.0-gcc44-misc.patch DELETED ---


--- kdelibs-4.2.0-gcc44-workaround.patch DELETED ---


--- kdelibs-4.2.0-kjs-gcc44-crash.patch DELETED ---


--- kdelibs-4.2.2-bidi-kde#189161.patch DELETED ---


--- kdelibs-4.2.2-kde#180785-2.patch DELETED ---


--- kdelibs-4.2.2-kde#180785.patch DELETED ---


--- kdelibs-4.2.2-kio_http.patch DELETED ---


--- kdelibs-4.2.2-kjob.patch DELETED ---


--- kdelibs-4.2.2-plasma-focus.patch DELETED ---


