Hello community, here is the log from the commit of package kcrash for openSUSE:Factory checked in at 2014-04-02 17:21:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcrash (Old) and /work/SRC/openSUSE:Factory/.kcrash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kcrash" Changes: -------- --- /work/SRC/openSUSE:Factory/kcrash/kcrash.changes 2014-03-10 12:17:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kcrash.new/kcrash.changes 2014-04-02 17:21:58.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:26 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.98.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta1.php + +------------------------------------------------------------------- Old: ---- kcrash-4.97.0.tar.xz New: ---- kcrash-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcrash.spec ++++++ --- /var/tmp/diff_new_pack.AGT5Xw/_old 2014-04-02 17:21:59.000000000 +0200 +++ /var/tmp/diff_new_pack.AGT5Xw/_new 2014-04-02 17:21:59.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Crash5 Name: kcrash -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem ++++++ kcrash-4.97.0.tar.xz -> kcrash-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/CMakeLists.txt new/kcrash-4.98.0/CMakeLists.txt --- old/kcrash-4.97.0/CMakeLists.txt 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/CMakeLists.txt 2014-03-28 19:16:21.000000000 +0100 @@ -2,7 +2,7 @@ project(KCrash) -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) set(REQUIRED_QT_VERSION 5.2.0) @@ -22,7 +22,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCrash VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kcrash_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5CrashConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/README.md new/kcrash-4.98.0/README.md --- old/kcrash-4.97.0/README.md 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/README.md 2014-03-28 19:16:21.000000000 +0100 @@ -1,6 +1,6 @@ # KCrash -Gracefull handling of application crashes +Graceful handling of application crashes ## Introduction diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/src/CMakeLists.txt new/kcrash-4.98.0/src/CMakeLists.txt --- old/kcrash-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/src/CMakeLists.txt 2014-03-28 19:16:21.000000000 +0100 @@ -1,14 +1,6 @@ -include(CheckFunctionExists) -include(CheckIncludeFiles) -include(CheckPrototypeDefinition) - -check_function_exists(strlcpy HAVE_STRLCPY) -check_prototype_definition(strlcpy "unsigned long strlcpy(char*, const char*, unsigned long)" "0" string.h HAVE_STRLCPY_PROTO) -check_include_files(string.h HAVE_STRING_H) set(kcrash_SRCS kcrash.cpp - strlcpy-fake.c ) configure_file( @@ -16,11 +8,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/config-kcrash.h ) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config-strlcpy.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config-strlcpy.h -) - add_library(KF5Crash ${kcrash_SRCS}) generate_export_header(KF5Crash BASE_NAME KCrash) add_library(KF5::Crash ALIAS KF5Crash) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/src/Messages.sh new/kcrash-4.98.0/src/Messages.sh --- old/kcrash-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kcrash-4.98.0/src/Messages.sh 2014-03-28 19:16:21.000000000 +0100 @@ -0,0 +1,18 @@ +#!/bin/sh + +# Invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources. +# The results are stored in a pseudo .cpp file to be picked up by xgettext. +lst=`find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` +if [ -n "$lst" ] ; then + $EXTRACTRC $lst >> rc.cpp +fi + +# If your framework contains tips-of-the-day, call preparetips as well. +if [ -f "data/tips" ] ; then + ( cd data && $PREPARETIPS > ../tips.cpp ) +fi + +# Extract strings from all source files. +# If your framework depends on KI18n, use $XGETTEXT. If it uses Qt translation +# system, use $EXTRACT_TR_STRINGS. +$EXTRACT_TR_STRINGS `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/kcrash5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/src/config-strlcpy.h.cmake new/kcrash-4.98.0/src/config-strlcpy.h.cmake --- old/kcrash-4.97.0/src/config-strlcpy.h.cmake 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/src/config-strlcpy.h.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) Todd.Miller@cs.colorado.edu - Copyright (c) 2002 Dirk Mueller <mueller@kde.org> - The source code for strlcpy() and strlcat() is available free of charge and - under a BSD-style license as part of the OpenBSD operating system. -*/ - -#cmakedefine01 HAVE_STRLCPY_PROTO -#if ! HAVE_STRLCPY_PROTO -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcpy(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - -#cmakedefine01 HAVE_STRING_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/src/kcrash.cpp new/kcrash-4.98.0/src/kcrash.cpp --- old/kcrash-4.97.0/src/kcrash.cpp 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/src/kcrash.cpp 2014-03-28 19:16:21.000000000 +0100 @@ -25,7 +25,6 @@ #include "kcrash.h" #include <config-kcrash.h> -#include <config-strlcpy.h> #include <string.h> #include <signal.h> @@ -471,11 +470,11 @@ } } - char sidtxt[256]; - if (!KStartupInfo::startupId().isNull()) { + // make sure the constData() pointer remains valid when we call startProcess by making a copy + QByteArray startupId = KStartupInfo::startupId(); + if (!startupId.isNull()) { argv[i++] = "--startupid"; - strlcpy(sidtxt, KStartupInfo::startupId().constData(), sizeof(sidtxt)); - argv[i++] = sidtxt; + argv[i++] = startupId.constData(); } if (s_flags & SaferDialog) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcrash-4.97.0/src/strlcpy-fake.c new/kcrash-4.98.0/src/strlcpy-fake.c --- old/kcrash-4.97.0/src/strlcpy-fake.c 2014-03-01 12:50:23.000000000 +0100 +++ new/kcrash-4.98.0/src/strlcpy-fake.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -/* This file is part of the KDE libraries - Copyright (c) Todd C. Miller <Todd.Miller@courtesan.com> - Copyright (c) 2002 Dirk Mueller <mueller@kde.org> - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include <config-strlcpy.h> - -#ifndef HAVE_STRLCPY - -#if HAVE_STRING_H -#include <string.h> -#endif - -unsigned long strlcpy(char *d, const char *s, unsigned long bufsize) -{ - unsigned long len, ret = strlen(s); - - if (ret >= bufsize) { - if (bufsize) { - len = bufsize - 1; - memcpy(d, s, len); - d[len] = '\0'; - } - } else { - memcpy(d, s, ret + 1); - } - - return ret; -} -#endif /* !HAVE_STRLCPY */ - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de