Hello community, here is the log from the commit of package kjs for openSUSE:Factory checked in at 2014-05-14 20:27:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kjs (Old) and /work/SRC/openSUSE:Factory/.kjs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kjs" Changes: -------- --- /work/SRC/openSUSE:Factory/kjs/kjs.changes 2014-04-02 17:22:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kjs.new/kjs.changes 2014-05-14 20:27:35.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 4 01:41:17 UTC 2014 - [email protected] + +- Update to 4.99.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta2.php + +------------------------------------------------------------------- Old: ---- kjs-4.98.0.tar.xz New: ---- kjs-4.99.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kjs.spec ++++++ --- /var/tmp/diff_new_pack.fHeS1W/_old 2014-05-14 20:27:36.000000000 +0200 +++ /var/tmp/diff_new_pack.fHeS1W/_new 2014-05-14 20:27:36.000000000 +0200 @@ -18,10 +18,10 @@ %define sonum 5 Name: kjs -Version: 4.98.0 +Version: 4.99.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.12 +BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pcre-devel @@ -109,8 +109,7 @@ %dir %{_kf5_includedir}/*/ %{_kf5_includedir}/*/ %{_kf5_includedir}/*.h -%dir %{_kf5_datadir}/kjs -%{_kf5_datadir}/kjs/create_hash_table +%{_kf5_datadir}/kjs/ %{_kf5_mkspecsdir}/qt_KJSApi.pri %{_kf5_mkspecsdir}/qt_KJS.pri ++++++ kjs-4.98.0.tar.xz -> kjs-4.99.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/CMakeLists.txt new/kjs-4.99.0/CMakeLists.txt --- old/kjs-4.98.0/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/CMakeLists.txt 2014-05-04 21:00:16.000000000 +0200 @@ -3,7 +3,7 @@ project(KJS) # ECM setup -find_package(ECM 0.0.12 REQUIRED NO_MODULE) +find_package(ECM 0.0.13 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(FeatureSummary) @@ -12,7 +12,7 @@ include(ECMSetupVersion) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "4.98.0") +set(KF5_VERSION "4.99.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KJS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h" @@ -64,7 +64,7 @@ install(EXPORT KF5JSTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5JSTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjs_version.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR} COMPONENT Devel ) if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/KF5JSConfig.cmake.in new/kjs-4.99.0/KF5JSConfig.cmake.in --- old/kjs-4.98.0/KF5JSConfig.cmake.in 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/KF5JSConfig.cmake.in 2014-05-04 21:00:16.000000000 +0200 @@ -3,6 +3,6 @@ find_dependency(Qt5Core @REQUIRED_QT_VERSION@) set(KJS_HAVE_PCRE_REGEX "@PCRE_FOUND@") -set(KJS_CREATE_HASH_TABLE "${PACKAGE_PREFIX_DIR}/@DATA_INSTALL_DIR@/kjs/create_hash_table") +set(KJS_CREATE_HASH_TABLE "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kjs/create_hash_table") include("${CMAKE_CURRENT_LIST_DIR}/KF5JSTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/kjs.yaml new/kjs-4.99.0/kjs.yaml --- old/kjs-4.98.0/kjs.yaml 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/kjs.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -tier: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/metainfo.yaml new/kjs-4.99.0/metainfo.yaml --- old/kjs-4.98.0/metainfo.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kjs-4.99.0/metainfo.yaml 2014-05-04 21:00:16.000000000 +0200 @@ -0,0 +1,9 @@ +maintainer: buschinski +description: Support for JS scripting in applications +tier: 1 +type: functional +platforms: + - name: All +portingAid: true +deprecated: true +release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/src/kjs/CMakeLists.txt new/kjs-4.99.0/src/kjs/CMakeLists.txt --- old/kjs-4.98.0/src/kjs/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/src/kjs/CMakeLists.txt 2014-05-04 21:00:16.000000000 +0200 @@ -197,7 +197,7 @@ SOVERSION ${KJS_SOVERSION} EXPORT_NAME JS ) -install(TARGETS KF5JS EXPORT KF5JSTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5JS EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### kjs - basic shell ############### @@ -211,7 +211,7 @@ target_link_libraries(kjs_bin KF5JS) -install(TARGETS kjs_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kjs_bin ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ########### KDE-specific API ############## @@ -245,7 +245,7 @@ # # ${CMAKE_CURRENT_BINARY_DIR}/global.h # -# DESTINATION ${INCLUDE_INSTALL_DIR}/kjs COMPONENT Devel ) +# DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/kjs COMPONENT Devel ) install(FILES array_instance.h array_object.h @@ -306,12 +306,12 @@ value.h operations.h ${CMAKE_CURRENT_BINARY_DIR}/global.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kjs + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/kjs COMPONENT Devel ) -install(FILES create_hash_table DESTINATION ${DATA_INSTALL_DIR}/kjs/ ) +install(FILES create_hash_table DESTINATION ${KF5_DATA_INSTALL_DIR}/kjs/ ) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KJS LIB_NAME KF5JS DEPS "core" FILENAME_VAR PRI_FILENAME) +ecm_generate_pri_file(BASE_NAME KJS LIB_NAME KF5JS DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KJS) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/src/kjs/api/CMakeLists.txt new/kjs-4.99.0/src/kjs/api/CMakeLists.txt --- old/kjs-4.98.0/src/kjs/api/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/src/kjs/api/CMakeLists.txt 2014-05-04 21:00:16.000000000 +0200 @@ -18,7 +18,7 @@ SOVERSION ${KJS_SOVERSION} EXPORT_NAME JSApi ) -install(TARGETS KF5JSApi EXPORT KF5JSTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS KF5JSApi EXPORT KF5JSTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kjsapi_export.h @@ -27,8 +27,8 @@ kjsobject.h kjsprototype.h kjsarguments.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kjs) + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/kjs) include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KJSApi LIB_NAME KF5JSApi DEPS "core" FILENAME_VAR PRI_FILENAME) +ecm_generate_pri_file(BASE_NAME KJSApi LIB_NAME KF5JSApi DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KF5_INCLUDE_INSTALL_DIR}/KJSApi) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/src/kjs/date_object.cpp new/kjs-4.99.0/src/kjs/date_object.cpp --- old/kjs-4.98.0/src/kjs/date_object.cpp 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/src/kjs/date_object.cpp 2014-05-04 21:00:16.000000000 +0200 @@ -62,10 +62,11 @@ #if PLATFORM(WIN_OS) #include <windows.h> +#if COMPILER(MSVC) #define copysign(x, y) _copysign(x, y) #define snprintf _snprintf +#endif #if !COMPILER(GCC) -#define isfinite(x) _finite(x) #ifndef strncasecmp #define strncasecmp(x, y, z) strnicmp(x, y, z) #endif @@ -812,7 +813,7 @@ if (id == SetYear || id == SetMilliSeconds || id == SetSeconds || id == SetMinutes || id == SetHours || id == SetDate || id == SetMonth || id == SetFullYear) { - result = jsNumber(isnan(ms) ? ms : timeClip(makeTime(&t, ms, utc))); + result = jsNumber(isNaN(ms) ? ms : timeClip(makeTime(&t, ms, utc))); thisDateObj->setInternalValue(result); } @@ -1551,7 +1552,7 @@ double timeClip(double t) { - if (isnan(t) || isInf(t)) { + if (isNaN(t) || isInf(t)) { return NaN; } double at = fabs(t); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/src/kjs/internal.cpp new/kjs-4.99.0/src/kjs/internal.cpp --- old/kjs-4.98.0/src/kjs/internal.cpp 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/src/kjs/internal.cpp 2014-05-04 21:00:16.000000000 +0200 @@ -49,7 +49,7 @@ namespace KJS { -#if PLATFORM(WIN_OS) +#if COMPILER(MSVC) #define copysign _copysign #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/src/wtf/CMakeLists.txt new/kjs-4.99.0/src/wtf/CMakeLists.txt --- old/kjs-4.98.0/src/wtf/CMakeLists.txt 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/src/wtf/CMakeLists.txt 2014-05-04 21:00:16.000000000 +0200 @@ -7,7 +7,7 @@ #add_library(wtf SHARED ${wtf_LIB_SRCS}) #set_target_properties(wtf PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) -#install(TARGETS wtf ${INSTALL_TARGETS_DEFAULT_ARGS} ) +#install(TARGETS wtf ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) install(FILES AlwaysInline.h @@ -38,6 +38,6 @@ UnusedParam.h Vector.h VectorTraits.h - DESTINATION ${INCLUDE_INSTALL_DIR}/wtf + DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/wtf COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kjs-4.98.0/tests/testkjs.cpp new/kjs-4.99.0/tests/testkjs.cpp --- old/kjs-4.98.0/tests/testkjs.cpp 2014-03-28 19:17:11.000000000 +0100 +++ new/kjs-4.99.0/tests/testkjs.cpp 2014-05-04 21:00:16.000000000 +0200 @@ -40,7 +40,7 @@ #include "protect.h" -#if PLATFORM(WIN_OS) +#if COMPILER(MSVC) #include <windows.h> #include <timeapi.h> #if HAVE_CRTDBG_H @@ -48,6 +48,20 @@ #endif #endif +#if PLATFORM(WIN_OS) && ! COMPILER(MSVC) +#ifndef timersub +# define timersub(a, b, result) \ + do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ + } while (0) +#endif +#endif + using namespace KJS; using namespace WTF; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
