April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit kf5umbrella for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kf5umbrella for openSUSE:Factory checked in at 2014-04-02 17:22:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5umbrella (Old) and /work/SRC/openSUSE:Factory/.kf5umbrella.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kf5umbrella" Changes: -------- --- /work/SRC/openSUSE:Factory/kf5umbrella/kf5umbrella.changes 2014-03-10 12:18:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kf5umbrella.new/kf5umbrella.changes 2014-04-02 17:22:09.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:35 UTC 2014 - hrvoje.senjan(a)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: ---- kf5umbrella-4.97.0.tar.xz New: ---- kf5umbrella-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf5umbrella.spec ++++++ --- /var/tmp/diff_new_pack.eOvd7k/_old 2014-04-02 17:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.eOvd7k/_new 2014-04-02 17:22:10.000000000 +0200 @@ -17,10 +17,10 @@ Name: kf5umbrella -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: kf5-filesystem BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 ++++++ kf5umbrella-4.97.0.tar.xz -> kf5umbrella-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kf5umbrella-4.97.0/CMakeLists.txt new/kf5umbrella-4.98.0/CMakeLists.txt --- old/kf5umbrella-4.97.0/CMakeLists.txt 2014-03-01 12:50:45.000000000 +0100 +++ new/kf5umbrella-4.98.0/CMakeLists.txt 2014-03-28 19:16:46.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.12) -find_package(ECM 0.0.11 REQUIRED CONFIG) +find_package(ECM 0.0.12 REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${ECM_KDE_MODULE_DIR}) @@ -10,7 +10,7 @@ include(CMakePackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") write_basic_package_version_file( "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigVersion.cmake" VERSION ${KF5_VERSION} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kemoticons for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kemoticons for openSUSE:Factory checked in at 2014-04-02 17:22:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kemoticons (Old) and /work/SRC/openSUSE:Factory/.kemoticons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kemoticons" Changes: -------- --- /work/SRC/openSUSE:Factory/kemoticons/kemoticons.changes 2014-03-10 12:18:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kemoticons.new/kemoticons.changes 2014-04-02 17:22:08.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:34 UTC 2014 - hrvoje.senjan(a)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: ---- kemoticons-4.97.0.tar.xz New: ---- kemoticons-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kemoticons.spec ++++++ --- /var/tmp/diff_new_pack.OP98VB/_old 2014-04-02 17:22:09.000000000 +0200 +++ /var/tmp/diff_new_pack.OP98VB/_new 2014-04-02 17:22:09.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Emoticons5 Name: kemoticons -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: karchive-devel >= %{_kf5_version} BuildRequires: kconfig-devel >= %{_kf5_version} @@ -94,6 +94,7 @@ %{_kf5_servicesdir}/emoticonstheme_pidgin.desktop %{_kf5_servicesdir}/emoticonstheme_xmpp.desktop %{_kf5_servicetypesdir}/kemoticonsTheme.desktop +%{_kf5_datadir}/emoticons/ %files devel %defattr(-,root,root) ++++++ kemoticons-4.97.0.tar.xz -> kemoticons-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/CMakeLists.txt new/kemoticons-4.98.0/CMakeLists.txt --- old/kemoticons-4.97.0/CMakeLists.txt 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -2,7 +2,7 @@ project(KEmoticons) -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} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -19,7 +19,7 @@ include(ECMGenerateHeaders) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KEMOTICONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kemoticons_version.h" @@ -39,6 +39,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) add_subdirectory(src) +add_subdirectory(themes) add_subdirectory(autotests) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/CMakeLists.txt new/kemoticons-4.98.0/autotests/CMakeLists.txt --- old/kemoticons-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -12,3 +12,6 @@ kemoticons_unit_tests(kemoticontest) +target_compile_definitions(kemoticontest PRIVATE + LOCAL_THEMES_DIR="${KEmoticons_SOURCE_DIR}/themes") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/kemoticontest.cpp new/kemoticons-4.98.0/autotests/kemoticontest.cpp --- old/kemoticons-4.97.0/autotests/kemoticontest.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/kemoticontest.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -3,6 +3,7 @@ Copyright (c) 2004 by Richard Smith <kde(a)metafoo.co.uk> Copyright (c) 2005 by Duncan Mac-Vicar <duncan(a)kde.org> + Copyright (c) 2014 by Alex Merry <alex.merry(a)kde.org> Kopete (c) 2002-2005 by the Kopete developers <kopete-devel(a)kde.org> @@ -16,17 +17,16 @@ ************************************************************************* */ -#include "kemoticontest.h" - #include <QTest> #include <QDir> #include <QFile> +#include <QStandardPaths> #include <QTextStream> #include <QDebug> #include <kemoticons.h> -QTEST_MAIN(KEmoticonTest) +static const char * default_theme = "Glass"; /* There are three sets of tests, the Kopete 0.7 baseline with tests that were @@ -35,65 +35,112 @@ The second set are those known to work in the current codebase. The last set is the set with tests that are known to fail right now. - the name convention is working|broken-number.input|output + the name convention is (working|broken)-number.input|output */ -void KEmoticonTest::testEmoticonParser() +class KEmoticonTest : public QObject { - KEmoticonsTheme emo = KEmoticons().theme("kde4"); - QString basePath = QFINDTESTDATA("emoticon-parser-testcases"); - QVERIFY(!basePath.isEmpty()); - QDir testCasesDir(basePath); - - QStringList inputFileNames = testCasesDir.entryList(QStringList(QLatin1String("*.input"))); - Q_FOREACH (const QString &fileName, inputFileNames) { - // qDebug() << "testcase: " << fileName; - QString outputFileName = fileName; - outputFileName.replace("input", "output"); - // open the input file - QFile inputFile(basePath + QString::fromLatin1("/") + fileName); - QFile expectedFile(basePath + QString::fromLatin1("/") + outputFileName); - // check if the expected output file exists - // if it doesn't, skip the testcase + Q_OBJECT + +private Q_SLOTS: + void initTestCase() + { + QStandardPaths::setTestModeEnabled(true); + QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + + QString destThemePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + QDir themeDir(destThemePath); + if (themeDir.exists()) { + QVERIFY(themeDir.removeRecursively()); + } + QVERIFY(themeDir.mkpath(".")); + + QDir sourceThemeDir(QFile::decodeName(LOCAL_THEMES_DIR) + QLatin1String("/") + default_theme); + QVERIFY(sourceThemeDir.exists()); + + foreach (QString fileName, sourceThemeDir.entryList(QDir::Files)) { + QVERIFY(QFile::copy(sourceThemeDir.filePath(fileName), + themeDir.filePath(fileName))); + } + + // check it can actually be found + themePath = QStandardPaths::locate( + QStandardPaths::GenericDataLocation, + QString::fromLatin1("emoticons/") + default_theme, + QStandardPaths::LocateDirectory); + QVERIFY2(!themePath.isEmpty(), qPrintable(themePath)); + // testEmoticonParser() wants a trailing / + themePath += "/"; + } + + void cleanupTestCase() + { + QString dataPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); + QString themePath = dataPath + QLatin1String("/emoticons/") + QLatin1String(default_theme); + QDir themeDir(themePath); + QVERIFY(themeDir.removeRecursively()); + } + + void testEmoticonParser_data() + { + QTest::addColumn<QString>("inputFileName"); + QTest::addColumn<QString>("outputFileName"); + QTest::addColumn<bool>("xfail"); + + QString basePath = QFINDTESTDATA("emoticon-parser-testcases"); + QVERIFY(!basePath.isEmpty()); + QDir testCasesDir(basePath); + + QStringList inputFileNames = testCasesDir.entryList(QStringList(QLatin1String("*.input"))); + Q_FOREACH (const QString &fileName, inputFileNames) { + QString outputFileName = fileName; + outputFileName.replace("input", "output"); + QTest::newRow(qPrintable(fileName.left(fileName.lastIndexOf('.')))) + << basePath + QString::fromLatin1("/") + fileName + << basePath + QString::fromLatin1("/") + outputFileName + << (fileName.section("-", 0, 0) == QLatin1String("broken")); + } + } + + void testEmoticonParser() + { + KEmoticonsTheme emo = KEmoticons().theme(default_theme); + + QFETCH(QString, inputFileName); + QFETCH(QString, outputFileName); + QFETCH(bool, xfail); + + QFile inputFile(inputFileName); + QFile expectedFile(outputFileName); if (! expectedFile.exists()) { QSKIP("Warning! expected output for testcase not found. Skiping testcase"); - continue; - } - if (inputFile.open(QIODevice::ReadOnly) && expectedFile.open(QIODevice::ReadOnly)) { + } else if (inputFile.open(QIODevice::ReadOnly) && expectedFile.open(QIODevice::ReadOnly)) { const QString inputData = QString::fromLatin1(inputFile.readAll().constData()); const QString expectedData = QString::fromLatin1(expectedFile.readAll().constData()); inputFile.close(); expectedFile.close(); - const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "emoticons/kde4/smile.png").remove("smile.png"); - if (path.isEmpty()) { - QSKIP("Emoticons not installed, skipping. kdebase-runtime needed."); - } - - QString result = emo.parseEmoticons(inputData, KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML).replace(path, QString()); - - // qDebug() << "Parse result: " << result; + QString result = emo.parseEmoticons(inputData, + KEmoticonsTheme::RelaxedParse | KEmoticonsTheme::SkipHTML); + result.replace(themePath, QString()); - // HACK to know the test case we applied, concatenate testcase name to both - // input and expected string. WIll remove when I can add some sort of metadata - // to a CHECK so debug its origin testcase - //result = fileName + QString::fromLatin1(": ") + result; - //expectedData = fileName + QString::fromLatin1(": ") + expectedData; - // if the test case begins with broken, we expect it to fail, then use XFAIL - // otherwise use CHECK - if (fileName.section("-", 0, 0) == QString::fromLatin1("broken")) { - // qDebug() << "checking known-broken testcase: " << fileName; - QEXPECT_FAIL("", "Checking know-broken testcase", Continue); + if (xfail) { + QEXPECT_FAIL("", "Checking known-broken testcase", Continue); QCOMPARE(result, expectedData); } else { - // qDebug() << "checking known-working testcase: " << fileName; QCOMPARE(result, expectedData); } } else { QSKIP("Warning! can't open testcase files. Skiping testcase"); - continue; } } -} +private: + QString themePath; +}; + +QTEST_MAIN(KEmoticonTest) + +#include <kemoticontest.moc> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/autotests/kemoticontest.h new/kemoticons-4.98.0/autotests/kemoticontest.h --- old/kemoticons-4.97.0/autotests/kemoticontest.h 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/autotests/kemoticontest.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -/* - Tests for Kopete::Message::parseEmoticons - - Copyright (c) 2004 by Richard Smith <kde(a)metafoo.co.uk> - Copyright (c) 2005 by Duncan Mac-Vicar <duncan(a)kde.org> - Copyright (c) 2006 by Michael Larouche <larouche(a)kde.org> - - Kopete (c) 2002-2006 by the Kopete developers <kopete-devel(a)kde.org> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#ifndef KEMOTICON_TEST_H -#define KEMOTICON_TEST_H - -#include <QObject> - -/** - * QTestLib automatic test to test Emoticon parsing. - */ -class KEmoticonTest : public QObject -{ - Q_OBJECT -private Q_SLOTS: - void testEmoticonParser(); -}; - -#endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/core/kemoticons.cpp new/kemoticons-4.98.0/src/core/kemoticons.cpp --- old/kemoticons-4.97.0/src/core/kemoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/core/kemoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -29,6 +29,7 @@ #include <kpluginloader.h> #include <kconfiggroup.h> +#include <ksharedconfig.h> #include <ktar.h> #include <kzip.h> @@ -139,7 +140,7 @@ QString KEmoticons::currentThemeName() { KConfigGroup config(KSharedConfig::openConfig("kdeglobals"), "Emoticons"); - QString name = config.readEntry("emoticonsTheme", "kde4"); + QString name = config.readEntry("emoticonsTheme", "Glass"); return name; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/adium/adium_emoticons.cpp new/kemoticons-4.98.0/src/providers/adium/adium_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/adium/adium_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/adium/adium_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -21,6 +21,7 @@ #include <QtCore/QFile> #include <QtCore/QDir> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QDebug> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/kde/kde_emoticons.cpp new/kemoticons-4.98.0/src/providers/kde/kde_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/kde/kde_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/kde/kde_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QImageReader> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/pidgin/pidgin_emoticons.cpp new/kemoticons-4.98.0/src/providers/pidgin/pidgin_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/pidgin/pidgin_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/pidgin/pidgin_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -23,6 +23,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <kpluginfactory.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/src/providers/xmpp/xmpp_emoticons.cpp new/kemoticons-4.98.0/src/providers/xmpp/xmpp_emoticons.cpp --- old/kemoticons-4.97.0/src/providers/xmpp/xmpp_emoticons.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/src/providers/xmpp/xmpp_emoticons.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -22,6 +22,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtCore/QFileInfo> +#include <QtCore/QStandardPaths> #include <QImageReader> #include <QMimeDatabase> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/tests/main.cpp new/kemoticons-4.98.0/tests/main.cpp --- old/kemoticons-4.97.0/tests/main.cpp 2014-03-01 12:50:43.000000000 +0100 +++ new/kemoticons-4.98.0/tests/main.cpp 2014-03-29 08:16:54.000000000 +0100 @@ -57,7 +57,7 @@ comboBox = new QComboBox; emoticonTheme = emoticons.theme(); - // Theme list is repeating three times the same two themes: "Oxygen" and "kde4" + // Theme list is repeating three times the same two themes: "Oxygen" and "Glass" qDebug() << "Theme list: " << emoticons.themeList(); // Theme name is empty!! qDebug() << "Theme name: " << emoticonTheme.themeName(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/themes/CMakeLists.txt new/kemoticons-4.98.0/themes/CMakeLists.txt --- old/kemoticons-4.97.0/themes/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-4.98.0/themes/CMakeLists.txt 2014-03-29 08:16:54.000000000 +0100 @@ -0,0 +1,9 @@ +install( + DIRECTORY + Glass + DESTINATION + ${SHARE_INSTALL_PREFIX}/emoticons/ + FILES_MATCHING + PATTERN "*.png" + PATTERN "emoticons.xml" +) Files old/kemoticons-4.97.0/themes/Glass/angry.png and new/kemoticons-4.98.0/themes/Glass/angry.png differ Files old/kemoticons-4.97.0/themes/Glass/bat.png and new/kemoticons-4.98.0/themes/Glass/bat.png differ Files old/kemoticons-4.97.0/themes/Glass/beer.png and new/kemoticons-4.98.0/themes/Glass/beer.png differ Files old/kemoticons-4.97.0/themes/Glass/biggrin.png and new/kemoticons-4.98.0/themes/Glass/biggrin.png differ Files old/kemoticons-4.97.0/themes/Glass/cake.png and new/kemoticons-4.98.0/themes/Glass/cake.png differ Files old/kemoticons-4.97.0/themes/Glass/camera.png and new/kemoticons-4.98.0/themes/Glass/camera.png differ Files old/kemoticons-4.97.0/themes/Glass/cat.png and new/kemoticons-4.98.0/themes/Glass/cat.png differ Files old/kemoticons-4.97.0/themes/Glass/clock.png and new/kemoticons-4.98.0/themes/Glass/clock.png differ Files old/kemoticons-4.97.0/themes/Glass/cocktail.png and new/kemoticons-4.98.0/themes/Glass/cocktail.png differ Files old/kemoticons-4.97.0/themes/Glass/confused.png and new/kemoticons-4.98.0/themes/Glass/confused.png differ Files old/kemoticons-4.97.0/themes/Glass/cry.png and new/kemoticons-4.98.0/themes/Glass/cry.png differ Files old/kemoticons-4.97.0/themes/Glass/cup.png and new/kemoticons-4.98.0/themes/Glass/cup.png differ Files old/kemoticons-4.97.0/themes/Glass/dog.png and new/kemoticons-4.98.0/themes/Glass/dog.png differ Files old/kemoticons-4.97.0/themes/Glass/email.png and new/kemoticons-4.98.0/themes/Glass/email.png differ Files old/kemoticons-4.97.0/themes/Glass/embarassed.png and new/kemoticons-4.98.0/themes/Glass/embarassed.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kemoticons-4.97.0/themes/Glass/emoticons.xml new/kemoticons-4.98.0/themes/Glass/emoticons.xml --- old/kemoticons-4.97.0/themes/Glass/emoticons.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/kemoticons-4.98.0/themes/Glass/emoticons.xml 2014-03-29 08:16:54.000000000 +0100 @@ -0,0 +1,185 @@ +<?xml version="1.0"?> +<messaging-emoticon-map > + +<emoticon file="angry"> + <string>:-@</string> + <string>:@</string> + <string>>:-(</string> + <string>>:(</string> +</emoticon> + +<emoticon file="bat"> + <string>:-[</string> + <string>:[</string> +</emoticon> + +<emoticon file="beer"> + <string>(B)</string> + <string>(b)</string> +</emoticon> + +<emoticon file="cake"> + <string>(^)</string> +</emoticon> + +<emoticon file="camera"> + <string>(P)</string> + <string>(p)</string> +</emoticon> + +<emoticon file="cat"> + <string>(@)</string> +</emoticon> + +<emoticon file="clock"> + <string>(O)</string> + <string>(o)</string> +</emoticon> + +<emoticon file="cocktail"> + <string>(D)</string> + <string>(d)</string> +</emoticon> + +<emoticon file="confused"> + <string>:-S</string> + <string>:S</string> + <string>:-s</string> + <string>:s</string> +</emoticon> + +<emoticon file="cry"> + <string>:'(</string> + <string>:'-(</string> + <string>;-(</string> + <string>;(</string> +</emoticon> + +<emoticon file="cup"> + <string>(C)</string> + <string>(c)</string> +</emoticon> + +<emoticon file="dog"> + <string>(&)</string> +</emoticon> + +<emoticon file="embarassed"> + <string>:-$</string> + <string>:$</string> +</emoticon> + +<emoticon file="email"> + <string>(E)</string> + <string>(e)</string> +</emoticon> + +<emoticon file="film"> + <string>(~)</string> +</emoticon> + +<emoticon file="kiss"> + <string>(K)</string> + <string>(k)</string> + <string>:-X</string> + <string>:X</string> + <string>:-x</string> + <string>:x</string> +</emoticon> + +<emoticon file="lightbulb"> + <string>(I)</string> + <string>(i)</string> +</emoticon> + +<emoticon file="love"> + <string>(L)</string> + <string>(l)</string> +</emoticon> + +<emoticon file="note"> + <string>(8)</string> +</emoticon> + +<emoticon file="omg"> + <string>:-O</string> + <string>:O</string> + <string>:-o</string> + <string>:o</string> +</emoticon> + +<emoticon file="phone"> + <string>(T)</string> + <string>(t)</string> +</emoticon> + +<emoticon file="present"> + <string>(G)</string> + <string>(g)</string> +</emoticon> + +<emoticon file="rose"> + <string>(F)</string> + <string>(f)</string> +</emoticon> + +<emoticon file="sad"> + <string>:-(</string> + <string>:(</string> +</emoticon> + +<emoticon file="shade"> + <string>(H)</string> + <string>(h)</string> + <string>8-)</string> + <string>8)</string> +</emoticon> + +<emoticon file="smile"> + <string>:-)</string> + <string>:)</string> + <string>:o)</string> +</emoticon> + +<emoticon file="star"> + <string>(*)</string> +</emoticon> + +<emoticon file="teeth"> + <string>:-D</string> + <string>:D</string> +</emoticon> + +<emoticon file="thumbs_down"> + <string>(N)</string> + <string>(n)</string> +</emoticon> + +<emoticon file="thumbs_up"> + <string>(Y)</string> + <string>(y)</string> +</emoticon> + +<emoticon file="tongue"> + <string>:-P</string> + <string>:P</string> + <string>:-p</string> + <string>:p</string> +</emoticon> + +<emoticon file="unlove"> + <string>(U)</string> + <string>(u)</string> +</emoticon> + +<emoticon file="wilted_rose"> + <string>(W)</string> + <string>(w)</string> +</emoticon> + +<emoticon file="wink"> + <string>;-)</string> + <string>;)</string> +</emoticon> + +</messaging-emoticon-map> Files old/kemoticons-4.97.0/themes/Glass/film.png and new/kemoticons-4.98.0/themes/Glass/film.png differ Files old/kemoticons-4.97.0/themes/Glass/foot_in_mouth.png and new/kemoticons-4.98.0/themes/Glass/foot_in_mouth.png differ Files old/kemoticons-4.97.0/themes/Glass/innocent.png and new/kemoticons-4.98.0/themes/Glass/innocent.png differ Files old/kemoticons-4.97.0/themes/Glass/kiss.png and new/kemoticons-4.98.0/themes/Glass/kiss.png differ Files old/kemoticons-4.97.0/themes/Glass/lightbulb.png and new/kemoticons-4.98.0/themes/Glass/lightbulb.png differ Files old/kemoticons-4.97.0/themes/Glass/love.png and new/kemoticons-4.98.0/themes/Glass/love.png differ Files old/kemoticons-4.97.0/themes/Glass/note.png and new/kemoticons-4.98.0/themes/Glass/note.png differ Files old/kemoticons-4.97.0/themes/Glass/oh.png and new/kemoticons-4.98.0/themes/Glass/oh.png differ Files old/kemoticons-4.97.0/themes/Glass/omg.png and new/kemoticons-4.98.0/themes/Glass/omg.png differ Files old/kemoticons-4.97.0/themes/Glass/phone.png and new/kemoticons-4.98.0/themes/Glass/phone.png differ Files old/kemoticons-4.97.0/themes/Glass/present.png and new/kemoticons-4.98.0/themes/Glass/present.png differ Files old/kemoticons-4.97.0/themes/Glass/rose.png and new/kemoticons-4.98.0/themes/Glass/rose.png differ Files old/kemoticons-4.97.0/themes/Glass/sad.png and new/kemoticons-4.98.0/themes/Glass/sad.png differ Files old/kemoticons-4.97.0/themes/Glass/shade.png and new/kemoticons-4.98.0/themes/Glass/shade.png differ Files old/kemoticons-4.97.0/themes/Glass/sleep.png and new/kemoticons-4.98.0/themes/Glass/sleep.png differ Files old/kemoticons-4.97.0/themes/Glass/smile.png and new/kemoticons-4.98.0/themes/Glass/smile.png differ Files old/kemoticons-4.97.0/themes/Glass/star.png and new/kemoticons-4.98.0/themes/Glass/star.png differ Files old/kemoticons-4.97.0/themes/Glass/teeth.png and new/kemoticons-4.98.0/themes/Glass/teeth.png differ Files old/kemoticons-4.97.0/themes/Glass/thumbs_down.png and new/kemoticons-4.98.0/themes/Glass/thumbs_down.png differ Files old/kemoticons-4.97.0/themes/Glass/thumbs_up.png and new/kemoticons-4.98.0/themes/Glass/thumbs_up.png differ Files old/kemoticons-4.97.0/themes/Glass/tongue.png and new/kemoticons-4.98.0/themes/Glass/tongue.png differ Files old/kemoticons-4.97.0/themes/Glass/undecided.png and new/kemoticons-4.98.0/themes/Glass/undecided.png differ Files old/kemoticons-4.97.0/themes/Glass/unhappy.png and new/kemoticons-4.98.0/themes/Glass/unhappy.png differ Files old/kemoticons-4.97.0/themes/Glass/unlove.png and new/kemoticons-4.98.0/themes/Glass/unlove.png differ Files old/kemoticons-4.97.0/themes/Glass/wilted_rose.png and new/kemoticons-4.98.0/themes/Glass/wilted_rose.png differ Files old/kemoticons-4.97.0/themes/Glass/wink.png and new/kemoticons-4.98.0/themes/Glass/wink.png differ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdoctools for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdoctools for openSUSE:Factory checked in at 2014-04-02 17:21:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdoctools (Old) and /work/SRC/openSUSE:Factory/.kdoctools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdoctools" Changes: -------- --- /work/SRC/openSUSE:Factory/kdoctools/kdoctools.changes 2014-03-10 12:17:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdoctools.new/kdoctools.changes 2014-04-02 17:22:07.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:33 UTC 2014 - hrvoje.senjan(a)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: ---- kdoctools-4.97.0.tar.xz New: ---- kdoctools-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdoctools.spec ++++++ --- /var/tmp/diff_new_pack.4e3mPS/_old 2014-04-02 17:22:08.000000000 +0200 +++ /var/tmp/diff_new_pack.4e3mPS/_new 2014-04-02 17:22:08.000000000 +0200 @@ -17,12 +17,12 @@ Name: kdoctools -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: karchive-devel >= %{_kf5_version} BuildRequires: kf5-filesystem ++++++ kdoctools-4.97.0.tar.xz -> kdoctools-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/CMakeLists.txt new/kdoctools-4.98.0/CMakeLists.txt --- old/kdoctools-4.97.0/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/CMakeLists.txt 2014-03-28 19:16:42.000000000 +0100 @@ -3,7 +3,7 @@ project(KDocTools) # ECM setup -find_package(ECM 0.0.11 REQUIRED NO_MODULE) +find_package(ECM 0.0.12 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(FeatureSummary) @@ -11,7 +11,7 @@ include(ECMMarkNonGuiExecutable) include(ECMPackageConfigHelpers) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDOCTOOLS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdoctools_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5DocToolsConfigVersion.cmake" @@ -42,7 +42,7 @@ ) -find_package(DocBookXML4 "4.2") +find_package(DocBookXML4 "4.5") set_package_properties(DocBookXML4 PROPERTIES TYPE REQUIRED @@ -57,7 +57,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) -set(_kdeBootStrapping TRUE) +set(_kdoctoolsBootStrapping TRUE) set(KDOCTOOLS_CUSTOMIZATION_DIR "${CMAKE_CURRENT_BINARY_DIR}/src/customization/") if (WIN32) set(KDOCTOOLS_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc5 ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/KF5DocToolsMacros.cmake new/kdoctools-4.98.0/KF5DocToolsMacros.cmake --- old/kdoctools-4.97.0/KF5DocToolsMacros.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/KF5DocToolsMacros.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -35,12 +35,17 @@ set(KDOCTOOLS_MEINPROC_EXECUTABLE ${KDOCTOOLS_SERIALIZE_TOOL} ${KDOCTOOLS_MEINPROC_EXECUTABLE}) endif(KDOCTOOLS_SERIALIZE_TOOL) +macro(_SUGGEST_TARGET_NAME _out) + string(REPLACE "${CMAKE_SOURCE_DIR}/" "" ${_out} "${CMAKE_CURRENT_SOURCE_DIR}") + string(REGEX REPLACE "[^0-9a-zA-Z]" "-" ${_out} "${${_out}}") +endmacro() + macro (KDOCTOOLS_CREATE_HANDBOOK _docbook) get_filename_component(_input ${_docbook} ABSOLUTE) set(_doc ${CMAKE_CURRENT_BINARY_DIR}/index.cache.bz2) #Bootstrap - if (_kdeBootStrapping) + if (_kdoctoolsBootStrapping) set(_bootstrapOption "--srcdir=${KDocTools_BINARY_DIR}/src") else () set(_bootstrapOption) @@ -50,8 +55,8 @@ file(GLOB _docs *.docbook) # if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) # set(KDOCTOOLS_MEINPROC_EXECUTABLE meinproc5) # endif (CMAKE_CROSSCOMPILING) @@ -60,7 +65,8 @@ DEPENDS ${_docs} ${_ssheet} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + + _suggest_target_name(_targ) set(_targ "${_targ}-handbook") add_custom_target(${_targ} ALL DEPENDS ${_doc}) @@ -118,7 +124,7 @@ string(REGEX REPLACE "/man-" "/" _outdoc ${_doc}) #Bootstrap - if (_kdeBootStrapping) + if (_kdoctoolsBootStrapping) set(_bootstrapOption "--srcdir=${KDocTools_BINARY_DIR}/src") else () set(_bootstrapOption) @@ -126,8 +132,8 @@ set(_ssheet "${KDOCTOOLS_CUSTOMIZATION_DIR}/kde-include-man.xsl") # if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) # set(KDOCTOOLS_MEINPROC_EXECUTABLE meinproc5) # endif (CMAKE_CROSSCOMPILING) @@ -135,7 +141,7 @@ COMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --stylesheet ${_ssheet} --check ${_bootstrapOption} ${_input} DEPENDS ${_input} ${_ssheet} ) - get_filename_component(_targ ${CMAKE_CURRENT_SOURCE_DIR} NAME) + _suggest_target_name(_targ) set(_targ "${_targ}-manpage-${_base}") add_custom_target(${_targ} ALL DEPENDS "${_outdoc}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake new/kdoctools-4.98.0/cmake/FindDocBookXML4.cmake --- old/kdoctools-4.97.0/cmake/FindDocBookXML4.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/cmake/FindDocBookXML4.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ # Try to find DocBook XML 4.x DTD. -# By default it will find version 4.2. A different version can be specified +# By default it will find version 4.5. A different version can be specified # as parameter for find_package(). # Once done, it will define: # @@ -16,7 +16,7 @@ if (NOT DocBookXML_FIND_VERSION) - set(DocBookXML_FIND_VERSION "4.2") + set(DocBookXML_FIND_VERSION "4.5") endif () set (DocBookXML4_DTD_VERSION ${DocBookXML_FIND_VERSION} @@ -70,12 +70,4 @@ REQUIRED_VARS DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION FOUND_VAR DocBookXML4_FOUND) -#maintain backwards compatibility -# legacy version -locate_version ("4.2" DOCBOOKXML_CURRENTDTD_DIR) -if (DOCBOOKXML_CURRENTDTD_DIR) - set(DOCBOOKXML_FOUND "TRUE") - set(DOCBOOKXML_CURRENTDTD_VERSION "4.2") -endif () - mark_as_advanced (DocBookXML4_DTD_DIR DocBookXML4_DTD_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/common/kde-localised.css.template new/kdoctools-4.98.0/common/kde-localised.css.template --- old/kdoctools-4.97.0/common/kde-localised.css.template 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/common/kde-localised.css.template 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -/* - KDE CSS for <**languagecountry**> HTML documentation (all media types). - Copyright (C) 2000 <**authorname**> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - Send comments, suggestions, etc. to <**authorcontactdetails**>. -*/ - -/* - These settings will override kde-default.css. - - Any updates should be validated, e.g. http://jigsaw.w3.org/css-validator/ - - Check out http://www.richinstyle.com/ where many of the declarations and - setup in the KDE CSS are obtained from. In fact, do not change anything - without checking so on those pages whether it is wise to do. -*/ - -:lg(**language**) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/checkXML5/man-checkXML5.1.docbook new/kdoctools-4.98.0/docs/checkXML5/man-checkXML5.1.docbook --- old/kdoctools-4.97.0/docs/checkXML5/man-checkXML5.1.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/checkXML5/man-checkXML5.1.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/kf5options/man-kf5options.7.docbook new/kdoctools-4.98.0/docs/kf5options/man-kf5options.7.docbook --- old/kdoctools-4.97.0/docs/kf5options/man-kf5options.7.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/kf5options/man-kf5options.7.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/meinproc5/man-meinproc5.8.docbook new/kdoctools-4.98.0/docs/meinproc5/man-meinproc5.8.docbook --- old/kdoctools-4.97.0/docs/meinproc5/man-meinproc5.8.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/meinproc5/man-meinproc5.8.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> @@ -61,7 +61,6 @@ <arg choice="opt">KDE-options</arg> <arg choice="opt">--cache<replaceable> file</replaceable></arg> <arg choice="opt">--check</arg> -<arg choice="opt">--htdig</arg> <arg choice="opt">--srcdir</arg> <arg choice="opt">--param <replaceable>key</replaceable>=<replaceable>value</replaceable></arg> @@ -182,13 +181,6 @@ </listitem> </varlistentry> -<varlistentry> -<term><option>--htdig</option></term> -<listitem> -<para>Create a ht://dig compatible index</para> -</listitem> -</varlistentry> - <varlistentry> <term><option>-o</option>, <option>--output</option><parameter> file</parameter></term> <listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/docs/qt5options/man-qt5options.7.docbook new/kdoctools-4.98.0/docs/qt5options/man-qt5options.7.docbook --- old/kdoctools-4.97.0/docs/qt5options/man-qt5options.7.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/docs/qt5options/man-qt5options.7.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/CMakeLists.txt new/kdoctools-4.98.0/src/CMakeLists.txt --- old/kdoctools-4.97.0/src/CMakeLists.txt 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/CMakeLists.txt 2014-03-28 19:16:42.000000000 +0100 @@ -1,6 +1,6 @@ include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} ) -set (_custom_dtd_kdex "customization/dtd/kdex.dtd") +set (_custom_dtd_kdex "customization/dtd/kdedbx45.dtd") configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} ) # WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable # see the .xsl.cmake files for a more verbose explanation below @@ -8,12 +8,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} DESTINATION ${DATA_INSTALL_DIR}/kdoctools5/customization/dtd ) else() + get_filename_component(NORMALIZED_DTD_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization/dtd" ABSOLUTE) # file(RELATIVE_PATH ...) returns wrong values for paths containing /../ (it doesn't normalize the path) # To work around this we make sure the variable passed has all /../ elements # removed using get_filename_component(... ABSOLUTE) install(CODE - "get_filename_component(NORMALIZED_INSTALL_PATH \"${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/kdoctools5/customization/dtd\" ABSOLUTE) - file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") + "file(RELATIVE_PATH DocBookXML4_DTD_DIR \"${NORMALIZED_DTD_INSTALL_PATH}\" \"${DocBookXML4_DTD_DIR}\") configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex}.install)" ) get_filename_component(_custom_dtd_kdex_name ${_custom_dtd_kdex} NAME) @@ -23,8 +23,16 @@ # needed by KIO, need to export it add_library(KF5XsltKde STATIC xslt.cpp xslt_kde.cpp) add_library(KF5::XsltKde ALIAS KF5XsltKde) -target_link_libraries(KF5XsltKde Qt5::Core KF5::Archive) -set_target_properties(KF5XsltKde PROPERTIES EXPORT_NAME XsltKde) +target_link_libraries(KF5XsltKde + PUBLIC + Qt5::Core + PRIVATE + KF5::Archive +) +set_target_properties(KF5XsltKde PROPERTIES + POSITION_INDEPENDENT_CODE TRUE + EXPORT_NAME XsltKde +) target_include_directories(KF5XsltKde INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/XsltKde>") @@ -39,8 +47,8 @@ # The cross compiling parts are commented out on purpose. Alex if (CMAKE_CROSSCOMPILING) -# set(IMPORT_MEINPROC4_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc4Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") -# include(${IMPORT_MEINPROC4_EXECUTABLE}) +# set(IMPORT_MEINPROC5_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportMeinProc5Executable.cmake" CACHE FILEPATH "Point it to the export file of meinproc5 from a native build") +# include(${IMPORT_MEINPROC5_EXECUTABLE}) else () set_source_files_properties(xslt.cpp PROPERTIES COMPILE_FLAGS -DSIMPLE_XSLT ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ca/user.entities new/kdoctools-4.98.0/src/customization/ca/user.entities --- old/kdoctools-4.97.0/src/customization/ca/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ca/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -18,14 +18,6 @@ <!ENTITY etc "<abbrev>etc.</abbrev>"> <!ENTITY IGU "<acronym>IGU</acronym>"> <!ENTITY Intro "<keycap>Retorn</keycap>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Les icones del &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "Menú <guimenu>K</guimenu>"> <!ENTITY Maj "<keycap>Majús.</keycap>"> <!ENTITY partman "<application>Gestor de particions del KDE</application>">  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/catalog.xml new/kdoctools-4.98.0/src/customization/catalog.xml --- old/kdoctools-4.97.0/src/customization/catalog.xml 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/catalog.xml 2014-03-28 19:16:42.000000000 +0100 @@ -31,10 +31,10 @@  -  +  - <public publicId="-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" - uri="dtd/kdex.dtd"/> + <public publicId="-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" + uri="dtd/kdedbx45.dtd"/> <public publicId="-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" uri="dtd/rdbhier2.elements"/> <public publicId="-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/da/user.entities new/kdoctools-4.98.0/src/customization/da/user.entities --- old/kdoctools-4.97.0/src/customization/da/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/da/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -35,13 +35,6 @@ <!ENTITY ie "<abbrev>dvs.</abbrev>"> <!ENTITY infocenter "<application>Infocenter</application>"> <!ENTITY kcontrolcenter "<application>&kde;'s kontrolcenter</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-ikon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu>-menu"> <!ENTITY LMB "<mousebutton>venstre</mousebutton> museknap"> <!ENTITY MMB "<mousebutton>midterste</mousebutton> museknap"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/de/user.entities new/kdoctools-4.98.0/src/customization/de/user.entities --- old/kdoctools-4.97.0/src/customization/de/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/de/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -22,13 +22,6 @@ <!ENTITY kcontrolcenter "<application>&kde;-Kontrollzentrum</application>"> <!ENTITY kde "K-Arbeitsumgebung" > <!ENTITY khelpcenter-de "<application>&kde;-Hilfezentrum</application>" > -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-Symbol von &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>-Symbol"> <!ENTITY kmenu "<guimenu>K</guimenu>-Menü">  <!ENTITY kwm "<application>kwm</application>"> <!ENTITY LMB "<mousebutton>linke</mousebutton> Maustaste"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/dtd/kdedbx45.dtd.cmake new/kdoctools-4.98.0/src/customization/dtd/kdedbx45.dtd.cmake --- old/kdoctools-4.97.0/src/customization/dtd/kdedbx45.dtd.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/dtd/kdedbx45.dtd.cmake 2014-03-28 19:16:42.000000000 +0100 @@ -0,0 +1,129 @@ + + + + + + + + + +<!ENTITY % ho ""> +<!ENTITY % ubiq.inclusion ""> +<!ENTITY % beginpage.exclusion ""> + + +<!ENTITY % rdbpool PUBLIC + "-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" + "rdbpool.elements" > +<!ENTITY % dbpool.redecl.module "INCLUDE" > + + +<!ENTITY % rdbhier2 PUBLIC + "-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" + "rdbhier2.elements" > +<!ENTITY % dbhier.redecl2.module "INCLUDE" > + + + + + +<!ENTITY copy "(c)">  +<!ENTITY trade "[tm]">  +<!ENTITY reg "(R)">  + + + + + + +<!ENTITY % DocBookDTD PUBLIC + "-//OASIS//DTD DocBook XML V4.5//EN" + "@DocBookXML4_DTD_DIR@/docbookx.dtd" > +%DocBookDTD; + + + + + + + +<!ENTITY % kde.modifications PUBLIC + "-//KDE//ELEMENTS DocBook XML Modifications V1.1//EN" + "modifications.elements" > +%kde.modifications; + + + + + + + +<!ENTITY % kde.general.entities PUBLIC + "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.2//EN" + "../entities/general.entities" > +%kde.general.entities; + +<!ENTITY % kde.i18n.entities PUBLIC + "-//KDE//ENTITIES DocBook XML Localisation Entity Declarations V1.0//EN" + "../entities/l10n.entities" > +%kde.i18n.entities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake new/kdoctools-4.98.0/src/customization/dtd/kdex.dtd.cmake --- old/kdoctools-4.97.0/src/customization/dtd/kdex.dtd.cmake 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/dtd/kdex.dtd.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,129 +0,0 @@ - - - - - - - - - -<!ENTITY % ho ""> -<!ENTITY % ubiq.inclusion ""> -<!ENTITY % beginpage.exclusion ""> - - -<!ENTITY % rdbpool PUBLIC - "-//KDE//ELEMENTS DocBook XML Pool Redeclarations V1.1//EN" - "rdbpool.elements" > -<!ENTITY % dbpool.redecl.module "INCLUDE" > - - -<!ENTITY % rdbhier2 PUBLIC - "-//KDE//ELEMENTS DocBook XML Hierarchy Redeclarations 2 V1.0//EN" - "rdbhier2.elements" > -<!ENTITY % dbhier.redecl2.module "INCLUDE" > - - - - - -<!ENTITY copy "(c)">  -<!ENTITY trade "[tm]">  -<!ENTITY reg "(R)">  - - - - - - -<!ENTITY % DocBookDTD PUBLIC - "-//OASIS//DTD DocBook XML V4.2//EN" - "@DocBookXML4_DTD_DIR@/docbookx.dtd" > -%DocBookDTD; - - - - - - - -<!ENTITY % kde.modifications PUBLIC - "-//KDE//ELEMENTS DocBook XML Modifications V1.1//EN" - "modifications.elements" > -%kde.modifications; - - - - - - - -<!ENTITY % kde.general.entities PUBLIC - "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.2//EN" - "../entities/general.entities" > -%kde.general.entities; - -<!ENTITY % kde.i18n.entities PUBLIC - "-//KDE//ENTITIES DocBook XML Localisation Entity Declarations V1.0//EN" - "../entities/l10n.entities" > -%kde.i18n.entities; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/el/user.entities new/kdoctools-4.98.0/src/customization/el/user.entities --- old/kdoctools-4.97.0/src/customization/el/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/el/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>δηλ.</abbrev>"> <!ENTITY infocenter "<application>Κέντρο πληροφοριών</application>"> <!ENTITY kcontrolcenter "<application>Κέντρο ελέγχου του &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>αριστερό</mousebutton> κλικ ποντικιού"> <!ENTITY MMB "<mousebutton>μεσαίο</mousebutton> κλικ ποντικιού"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/en/user.entities new/kdoctools-4.98.0/src/customization/en/user.entities --- old/kdoctools-4.97.0/src/customization/en/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/en/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY infocenter "<application>Info Center</application>"> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/en-GB/user.entities new/kdoctools-4.98.0/src/customization/en-GB/user.entities --- old/kdoctools-4.97.0/src/customization/en-GB/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/en-GB/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY kcontrolcenter "<application>&kde; Control Centre</application>"> <!ENTITY khelpcenter "<application>KHelpCentre</application>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/eo/user.entities new/kdoctools-4.98.0/src/customization/eo/user.entities --- old/kdoctools-4.97.0/src/customization/eo/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/eo/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,13 +19,6 @@ <!ENTITY kcc "<application>Stircentro de KDE</application>" > <!ENTITY kcontrolcenter "<application>Stircentro de &kde;</application>"> <!ENTITY khelpcenter "<application>Helpcentro</application>" > -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>La ikono K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kmenu "menuo <guimenu>K</guimenu>"> <!ENTITY LMB "<mousebutton>musbutono maldekstra</mousebutton>"> <!ENTITY MMB "<mousebutton>musbutono meza</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/es/user.entities new/kdoctools-4.98.0/src/customization/es/user.entities --- old/kdoctools-4.97.0/src/customization/es/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/es/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -22,13 +22,6 @@ <!ENTITY kcc "<application>Centro de control de KDE</application>" > <!ENTITY kcontrolcenter "<application>Centro de control de &kde;</application>"> <!ENTITY khelpcenter "<application>Centro de ayuda</application>" > -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>El icono K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kiosktool "<application>Herramienta de administración KIOSK</application>"> <!ENTITY konversation "<application>Konversation</application>"> <!ENTITY kubuntu "<application>Kubuntu</application>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/et/user.entities new/kdoctools-4.98.0/src/customization/et/user.entities --- old/kdoctools-4.97.0/src/customization/et/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/et/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -37,14 +37,6 @@ <!ENTITY infocenter "<application>Infokeskus</application>"> <!ENTITY kcontrolcenter "<application>&kde; juhtimiskeskus</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde; K-ikoon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menüü"> <!ENTITY dpi '<acronym>dpi</acronym>'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/fr/user.entities new/kdoctools-4.98.0/src/customization/fr/user.entities --- old/kdoctools-4.97.0/src/customization/fr/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/fr/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -401,14 +401,6 @@ <!ENTITY SE "système d'exploitation">  <!ENTITY Tab "<keycap>Tab</keycap>">  -<!ENTITY iconek "icône <guiicon> -<inlinemediaobject> - <objectinfo><title>Icône K de &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"> <!ENTITY menuk "menu <guimenu>K</guimenu>"> <!ENTITY partman "Gestionnaire de partitions de &kde;">  <!ENTITY krfb_fr "Partage de bureau">  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/gl/user.entities new/kdoctools-4.98.0/src/customization/gl/user.entities --- old/kdoctools-4.97.0/src/customization/gl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/gl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -30,13 +30,6 @@ <!ENTITY Shift "<keycap>Maiúsc</keycap>"> <!ENTITY systemsettings "<application>Configuración do Sistema</application>"> <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>O ícone K de &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kmenu "menú <guimenu>K</guimenu>"> <!ENTITY kinfocenter "<application>Centro de información do KDE</application>" > <!ENTITY ksystemlog "<application>KSystemLog</application>" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/htdig_index.xsl new/kdoctools-4.98.0/src/customization/htdig_index.xsl --- old/kdoctools-4.97.0/src/customization/htdig_index.xsl 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/htdig_index.xsl 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -<?xml version='1.0'?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version='1.0'> - -<xsl:template match="*"> -  - <xsl:apply-templates/> -</xsl:template> - -<xsl:template match="keywordset/keyword"> - <entry header="10"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="book/title|bookinfo/title|abstract"> - <entry header="5"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="chapter/title"> - <entry header="4"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="sect1/title"> - <entry header="3"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="sect*/title|emphasis"> - <entry header="2"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="application|guilabel|guiicon|menuchoice|guibutton|guisubmenu|guimenuitem|term|guimenu|literal|acronym"> - <entry header="1"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="book"> - <entry header="0"> - <xsl:apply-templates/> - </entry> -</xsl:template> - -<xsl:template match="date|releaseinfo|anchor|imagedata"> -</xsl:template> - -</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/it/user.entities new/kdoctools-4.98.0/src/customization/it/user.entities --- old/kdoctools-4.97.0/src/customization/it/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/it/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "cioè"> <!ENTITY infocenter "<application>Centro d'informazione</application>"> <!ENTITY kcontrolcenter "<application>Centro di controllo di &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>icona K di &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY LMB "tasto <mousebutton>sinistro</mousebutton> del mouse"> <!ENTITY MMB "tasto <mousebutton>centrale</mousebutton> del mouse"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ko/user.entities new/kdoctools-4.98.0/src/customization/ko/user.entities --- old/kdoctools-4.97.0/src/customization/ko/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ko/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -18,14 +18,6 @@ <!ENTITY FAQ '<acronym>FAQ</acronym>'> <!ENTITY infocenter "<application>정보 센터</application>"> <!ENTITY kcontrolcenter "<application>&kde; 제어판</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;의 K 아이콘</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> 아이콘"> <!ENTITY kmenu "<guimenu>K</guimenu> 메뉴"> <!ENTITY LMB "<mousebutton>왼쪽</mousebutton> 마우스 단추"> <!ENTITY MMB "<mousebutton>가운데</mousebutton> 마우스 단추"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nds/user.entities new/kdoctools-4.98.0/src/customization/nds/user.entities --- old/kdoctools-4.97.0/src/customization/nds/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nds/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -36,13 +36,6 @@ <!ENTITY kcontrolcenter "<application>&kde;-Kuntrullzentrum</application>"> <!ENTITY kde "K-Schriefdischümgeven" > <!ENTITY khelpcenter-de "<application>&kde;-Hülpzentrum</application>" > -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-Symbool vun &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>-Symbool"> <!ENTITY kmenu "<guimenu>K</guimenu>-Menü">  <!ENTITY kwm "<application>kwm</application>"> <!ENTITY LMB "<mousebutton>linke</mousebutton> Muusknoop"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nl/user.entities new/kdoctools-4.98.0/src/customization/nl/user.entities --- old/kdoctools-4.97.0/src/customization/nl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -141,14 +141,6 @@ <!ENTITY Ctrl "<keycap>Ctrl</keycap>"> <!ENTITY enz "<abbrev>enz.</abbrev>"> <!ENTITY etc "<abbrev>etc.</abbrev>">  -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-pictogram</title></objectinfo> - <imageobject><imagedata fileref='icon-file-to-be-filled-in' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"> <!ENTITY kmenu "<guimenu>K</guimenu>-menu"> <!ENTITY LMB "<mousebutton>linkermuisknop</mousebutton>"> <!ENTITY MMB "<mousebutton>middelstemuisknop</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/nn/user.entities new/kdoctools-4.98.0/src/customization/nn/user.entities --- old/kdoctools-4.97.0/src/customization/nn/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/nn/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -40,14 +40,6 @@ <!ENTITY ie "<abbrev>dvs.</abbrev>"> <!ENTITY infocenter "<application>Infosenter</application>"> <!ENTITY kcontrolcenter "<application>&kde; Kontrollsenter</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Ikonet til &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> meny"> <!ENTITY LGPL "Lesser General Public License"> <!ENTITY LMB "<mousebutton>venstre</mousebutton> museknapp"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pl/user.entities new/kdoctools-4.98.0/src/customization/pl/user.entities --- old/kdoctools-4.97.0/src/customization/pl/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pl/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,15 +19,6 @@ <!ENTITY Shift "<keycap>Shift</keycap>">  <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>Ikona K &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon>"> - <!ENTITY akregator-mianownik '<application>Akregator</application>'> <!ENTITY akregator-dopelniacz '<application>Akregatora</application>'> <!ENTITY akregator-celownik '<application>Akregatorowi</application>'> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pt/user.entities new/kdoctools-4.98.0/src/customization/pt/user.entities --- old/kdoctools-4.97.0/src/customization/pt/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pt/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -30,12 +30,5 @@ <!ENTITY OS "sistema operativo"> <!ENTITY Shift "<keycap>Shift</keycap>"> <!ENTITY Tab "<keycap>Tab</keycap>"> -<!ENTITY kicon '<guiicon> -<inlinemediaobject> - <objectinfo><title>O ícone K do &kde;</title></objectinfo> - <imageobject><imagedata fileref="common/kmenu.png" format="PNG"/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> - </guiicon> icon'> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY kinfocenter "<application>Centro de Informação do KDE</application>" > diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/pt-BR/user.entities new/kdoctools-4.98.0/src/customization/pt-BR/user.entities --- old/kdoctools-4.97.0/src/customization/pt-BR/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/pt-BR/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "isto é"> <!ENTITY infocenter "<application>Centro de informação</application>"> <!ENTITY kcontrolcenter "<application>Centro de Controle do &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>Ícone K do &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "menu <guimenu>K</guimenu>"> <!ENTITY BEM "botão <mousebutton>esquerdo</mousebutton> do mouse">  <!ENTITY LMB "botão <mousebutton>esquerdo</mousebutton> do mouse"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ro/entities/underLGPL.docbook new/kdoctools-4.98.0/src/customization/ro/entities/underLGPL.docbook --- old/kdoctools-4.97.0/src/customization/ro/entities/underLGPL.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ro/entities/underLGPL.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,3 +1,3 @@ -<para>Acest program este licen�iat sub termenii <ulink -url="common/lgpl-license.html">Licen�ei Publice Generale Permisive GNU</ulink> +<para>Acest program este licenţiat sub termenii <ulink +url="common/lgpl-license.html">Licenţei Publice Generale Permisive GNU</ulink> (GNU Lesser General Public License).</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/ru/user.entities new/kdoctools-4.98.0/src/customization/ru/user.entities --- old/kdoctools-4.97.0/src/customization/ru/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/ru/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -21,14 +21,6 @@ (you may adapt the entity's name to transliterated Russian as well) --> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-нопка</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu>-меню"> <!ENTITY Shift "<keycap>Shift</keycap>"> <!ENTITY Alt "<keycap>Alt</keycap>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/sk/user.entities new/kdoctools-4.98.0/src/customization/sk/user.entities --- old/kdoctools-4.97.0/src/customization/sk/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/sk/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -13,12 +13,5 @@ <!ENTITY Alt "<keycap>Alt</keycap>"> <!ENTITY Esc "<keycap>Esc</keycap>"> <!ENTITY Backspace "<keycap>Backspace</keycap>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>veľké K</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> - </inlinemediaobject> - </guiicon>-Symbol"> <!ENTITY kmenu "<guimenu>K</guimenu> menu">  \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/sq/user.entities new/kdoctools-4.98.0/src/customization/sq/user.entities --- old/kdoctools-4.97.0/src/customization/sq/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/sq/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>i.e.</abbrev>"> <!ENTITY infocenter "<application>Info Center</application>"> <!ENTITY kcontrolcenter "<application>&kde; Control Center</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menu"> <!ENTITY LMB "<mousebutton>left</mousebutton> mouse button"> <!ENTITY MMB "<mousebutton>middle</mousebutton> mouse button"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/th/user.entities new/kdoctools-4.98.0/src/customization/th/user.entities --- old/kdoctools-4.97.0/src/customization/th/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/th/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>คือ</abbrev>"> <!ENTITY infocenter "<application>ศูนย์ข้อมูล</application>"> <!ENTITY kcontrolcenter "<application>ศูนย์ควบคุม &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'s K-icon</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "เมนู <guimenu>K</guimenu>"> <!ENTITY LMB "ปุ่มเมาส์<mousebutton>ซ้าย</mousebutton>"> <!ENTITY MMB "ปุ่มเมาส์<mousebutton>กลาง</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underArtisticLicense.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underArtisticLicense.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underArtisticLicense.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underArtisticLicense.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m <ulink -url="common/artistic-license.html">Sanatsal Lisans</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým <ulink +url="common/artistic-license.html">Sanatsal Lisans</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underBSDLicense.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underBSDLicense.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underBSDLicense.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underBSDLicense.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m, <ulink -url="common/bsd-license.html">BSD Lisans�</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým, <ulink +url="common/bsd-license.html">BSD Lisansý</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/underX11License.docbook new/kdoctools-4.98.0/src/customization/tr/entities/underX11License.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/underX11License.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/underX11License.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,2 +1,2 @@ -<para>Bu yaz�l�m <ulink -url="common/x11-license.html">X11 Lisans�</ulink> alt�nda da��t�lmaktad�r.</para> +<para>Bu yazýlým <ulink +url="common/x11-license.html">X11 Lisansý</ulink> altýnda daðýtýlmaktadýr.</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/entities/update-doc.docbook new/kdoctools-4.98.0/src/customization/tr/entities/update-doc.docbook --- old/kdoctools-4.97.0/src/customization/tr/entities/update-doc.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/entities/update-doc.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,4 +1,4 @@ - +adresine bakarak daha yeni bir sürümün olup olmadýðýný kontrol edin.</para> --> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/tr/user.entities new/kdoctools-4.98.0/src/customization/tr/user.entities --- old/kdoctools-4.97.0/src/customization/tr/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/tr/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY ie "başka bir deyişle"> <!ENTITY kcontrolcenter "<application>&kde; Denetim Merkezi</application>"> <!ENTITY khelpcenter "<application>KDE Yardım Merkezi</application>"> -<!ENTITY kicon " -<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde;'nin K-simgesi</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K</guimenu> menü"> <!ENTITY LMB "farenin <mousebutton>sol</mousebutton> tuşu"> <!ENTITY MMB "farenin <mousebutton>orta</mousebutton> tuşu"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/uk/user.entities new/kdoctools-4.98.0/src/customization/uk/user.entities --- old/kdoctools-4.97.0/src/customization/uk/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/uk/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -19,14 +19,6 @@ <!ENTITY ie "<abbrev>тобто</abbrev>"> <!ENTITY infocenter "<application>Центр довідки</application>"> <!ENTITY kcontrolcenter "<application>Центр керування &kde;</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>K-піктограма &kde;</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> <!ENTITY kmenu "<guimenu>K-меню</guimenu>"> <!ENTITY LMB "<mousebutton>ліва</mousebutton> кнопка мишки"> <!ENTITY MMB "<mousebutton>середня</mousebutton> кнопка мишки"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/zh-CN/user.entities new/kdoctools-4.98.0/src/customization/zh-CN/user.entities --- old/kdoctools-4.97.0/src/customization/zh-CN/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/zh-CN/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -8,30 +8,22 @@ <!ENTITY Alt "<keycap>Alt</keycap>"> <!ENTITY Backspace "<keycap>Backspace</keycap>"> -<!ENTITY cdrom '<hardware>CD-ROM ��</hardware>'> +<!ENTITY cdrom '<hardware>CD-ROM 驱动器</hardware>'> <!ENTITY Ctrl "<keycap>Ctrl</keycap>"> <!ENTITY dpi '<acronym>dpi</acronym>'> -<!ENTITY eg "<abbrev>��</abbrev>"> +<!ENTITY eg "<abbrev>如</abbrev>"> <!ENTITY Enter "<keycap>Enter</keycap>"> <!ENTITY Esc "<keycap>Esc</keycap>"> -<!ENTITY etc "<abbrev>�ȵ�</abbrev>"> -<!ENTITY FAQ '��'> +<!ENTITY etc "<abbrev>等等</abbrev>"> +<!ENTITY FAQ '常见问题解答'> <!ENTITY ie "<abbrev>i.e.</abbrev>"> -<!ENTITY infocenter "<application>��Ϣ��</application>"> -<!ENTITY kcontrolcenter "<application>&kde; ��</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>&kde; �� K ͼ��</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> icon"> -<!ENTITY kmenu "<guimenu>K</guimenu> �˵�"> -<!ENTITY LMB "��<mousebutton>��</mousebutton>��"> -<!ENTITY MMB "��<mousebutton>��</mousebutton>��"> -<!ENTITY OS "��ϵͳ"> -<!ENTITY RMB "��<mousebutton>��</mousebutton>��"> +<!ENTITY infocenter "<application>信息中心</application>"> +<!ENTITY kcontrolcenter "<application>&kde; 控制中心</application>"> +<!ENTITY kmenu "<guimenu>K</guimenu> 菜单"> +<!ENTITY LMB "鼠标<mousebutton>左</mousebutton>键"> +<!ENTITY MMB "鼠标<mousebutton>中</mousebutton>键"> +<!ENTITY OS "操作系统"> +<!ENTITY RMB "鼠标<mousebutton>右</mousebutton>键"> <!ENTITY Shift "<keycap>Shift</keycap>"> -<!ENTITY systemtray "<application>ϵͳ��</application>"> +<!ENTITY systemtray "<application>系统托盘</application>"> <!ENTITY Tab "<keycap>Tab</keycap>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/customization/zh-TW/user.entities new/kdoctools-4.98.0/src/customization/zh-TW/user.entities --- old/kdoctools-4.97.0/src/customization/zh-TW/user.entities 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/customization/zh-TW/user.entities 2014-03-28 19:16:42.000000000 +0100 @@ -20,14 +20,6 @@ <!ENTITY infocenter "<application>KDE 資訊中心</application>"> <!ENTITY kcontrolcenter "<application>KDE 控制中心</application>"> <!ENTITY khelpcenter "<application>KDE 輔助中心</application>"> -<!ENTITY kicon "<guiicon> -<inlinemediaobject> - <objectinfo><title>KDE 的 K 圖示</title></objectinfo> - <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject> - <textobject><phrase>K</phrase></textobject> -</inlinemediaobject> -</guiicon> 圖示"> <!ENTITY kmenu "<guimenu>K</guimenu> 選單"> <!ENTITY LMB "滑鼠<mousebutton>左鍵</mousebutton>"> <!ENTITY MMB "滑鼠<mousebutton>中鍵</mousebutton>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/man-template.docbook new/kdoctools-4.98.0/src/man-template.docbook --- old/kdoctools-4.97.0/src/man-template.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/man-template.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/meinproc.cpp new/kdoctools-4.98.0/src/meinproc.cpp --- old/kdoctools-4.97.0/src/meinproc.cpp 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/meinproc.cpp 2014-03-28 19:16:42.000000000 +0100 @@ -4,6 +4,7 @@ #include "meinproc_common.h" #include <QCoreApplication> +#include <QtCore/QDebug> #include <QtCore/QString> #include <QtCore/QFile> #include <QtCore/QDir> @@ -44,6 +45,8 @@ typedef QList<MyPair> PairList; +#define DIE(x) do { qCritical() << "Error:" << x; exit(1); } while (0) + void parseEntry(PairList &list, xmlNodePtr cur, int base) { if (!cur) { @@ -105,7 +108,6 @@ parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("stylesheet"), QCoreApplication::translate("main", "Stylesheet to use"), QStringLiteral("xsl"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("stdout"), QCoreApplication::translate("main", "Output whole document to stdout"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("o") << QStringLiteral("output"), QCoreApplication::translate("main", "Output whole document to file"), QStringLiteral("file"))); - parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("htdig"), QCoreApplication::translate("main", "Create a ht://dig compatible index"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("check"), QCoreApplication::translate("main", "Check the document for validity"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("cache"), QCoreApplication::translate("main", "Create a cache file for the document"), QStringLiteral("file"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("srcdir"), QCoreApplication::translate("main", "Set the srcdir, for kdelibs"), QStringLiteral("dir"))); @@ -131,21 +133,23 @@ const QString checkFilename = parser.positionalArguments().first(); CheckFileResult ckr = checkFile(checkFilename); - if (ckr != CheckFileSuccess) { - if (ckr == CheckFileDoesNotExist) { - qWarning() << "File '" << checkFilename << "' does not exist."; - } else if (ckr == CheckFileIsNotFile) { - qWarning() << "'" << checkFilename << "' is not a file."; - } else if (ckr == CheckFileIsNotReadable) { - qWarning() << "File '" << checkFilename << "' is not readable."; - } - return (2); + switch (ckr) { + case CheckFileSuccess: + break; + case CheckFileDoesNotExist: + DIE("File" << checkFilename << "does not exist."); + case CheckFileIsNotFile: + DIE(checkFilename << "is not a file."); + case CheckFileIsNotReadable: + DIE("File" << checkFilename << "is not readable."); } if (parser.isSet(QStringLiteral("check"))) { - - QByteArray catalogs; - catalogs += getKDocToolsCatalogs().join(" ").toLocal8Bit(); + QStringList lst = getKDocToolsCatalogs(); + if (lst.isEmpty()) { + DIE("Could not find kdoctools catalogs"); + } + QByteArray catalogs = lst.join(" ").toLocal8Bit(); QString exe; #if defined( XMLLINT ) exe = QStringLiteral(XMLLINT); @@ -155,11 +159,13 @@ } CheckResult cr = check(checkFilename, exe, catalogs); - if (cr != CheckSuccess) { - if (cr == CheckNoXmllint) { - qWarning() << "couldn't find xmllint"; - } - return 1; + switch (cr) { + case CheckSuccess: + break; + case CheckNoXmllint: + DIE("Could not find xmllint"); + case CheckNoOut: + DIE("`xmllint --noout` outputted text"); } } @@ -167,16 +173,6 @@ xmlLoadExtDtdDefaultValue = 1; QVector<const char *> params; -#ifndef Q_OS_WIN - // libxslt parses the path given to outputFile as XPath expression which fails - // see libxslt/xsltEvalUserParams - // this parameter is used only by share/kdoctools5/docbook/xsl/html/math.xsl - // and is not supported on windows yet - if (parser.isSet(QStringLiteral("output"))) { - params.append(qstrdup("outputFile")); - params.append(qstrdup(parser.value(QStringLiteral("output")).toLocal8Bit().constData())); - } -#endif { const QStringList paramList = parser.values(QStringLiteral("param")); QStringList::ConstIterator it = paramList.constBegin(); @@ -185,8 +181,7 @@ const QString tuple = *it; const int ch = tuple.indexOf(QLatin1Char('=')); if (ch == -1) { - qWarning() << "Key-Value tuple '" << tuple << "' lacks a '='!"; - return (2); + DIE("Key-Value tuple" << tuple << "lacks a '='!"); } params.append(qstrdup(tuple.left(ch).toUtf8().constData())); params.append(qstrdup(tuple.mid(ch + 1).toUtf8().constData())); @@ -194,16 +189,15 @@ } params.append(NULL); - bool index = parser.isSet(QStringLiteral("htdig")); QString tss = parser.value(QStringLiteral("stylesheet")); if (tss.isEmpty()) { tss = QStringLiteral("customization/kde-chunk.xsl"); } - if (index) { - tss = QStringLiteral("customization/htdig_index.xsl"); - } - tss = locateFileInDtdResource(tss); + QString tssPath = locateFileInDtdResource(tss); + if (tssPath.isEmpty()) { + DIE("Unable to find the stylesheet named" << tss << "in dtd resources"); + } #ifndef MEINPROC_NO_KARCHIVE const QString cache = parser.value(QStringLiteral("cache")); #else @@ -215,59 +209,21 @@ const bool usingOutput = parser.isSet(QStringLiteral("output")); const QString outputOption = parser.value(QStringLiteral("output")); - if (index) { - xsltStylesheetPtr style_sheet = - xsltParseStylesheetFile((const xmlChar *)tss.toLatin1().data()); - - if (style_sheet != NULL) { - - xmlDocPtr doc = xmlParseFile(QFile::encodeName(checkFilename).constData()); - - xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, &params[0]); - - xmlFreeDoc(doc); - xsltFreeStylesheet(style_sheet); - if (res != NULL) { - xmlNodePtr cur = xmlDocGetRootElement(res); - if (!cur || xmlStrcmp(cur->name, (const xmlChar *) "entry")) { - fprintf(stderr, "document of the wrong type, root node != entry"); - xmlFreeDoc(res); - return (1); - } - PairList list; - parseEntry(list, cur, 0); - int wi = 0; - for (PairList::ConstIterator it = list.constBegin(); it != list.constEnd(); - ++it, ++wi) - fprintf(stdout, "w\t%s\t%d\t%d\n", (*it).word.toUtf8().data(), - 1000 * wi / list.count(), (*it).base); - - xmlFreeDoc(res); - } else { - qWarning() << "couldn't parse document " << checkFilename; - } - } else { - qWarning() << "couldn't parse style sheet " << tss; - } - - } else { - QString output = transform(checkFilename, tss, params); - if (output.isEmpty()) { - fprintf(stderr, "unable to parse %s\n", checkFilename.toLocal8Bit().data()); - return (1); - } + QString output = transform(checkFilename, tssPath, params); + if (output.isEmpty()) { + DIE("Unable to parse" << checkFilename); + } #ifndef MEINPROC_NO_KARCHIVE - if (!cache.isEmpty()) { - if (!saveToCache(output, cache)) { - qWarning() << QCoreApplication::translate("main", "Could not write to cache file %1.").arg(cache); - } - goto end; + if (!cache.isEmpty()) { + if (!saveToCache(output, cache)) { + qWarning() << QCoreApplication::translate("main", "Could not write to cache file %1.").arg(cache); } + goto end; + } #endif - doOutput(output, usingStdOut, usingOutput, outputOption, true /* replaceCharset */); - } + doOutput(output, usingStdOut, usingOutput, outputOption, true /* replaceCharset */); #ifndef MEINPROC_NO_KARCHIVE end: #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/template.docbook new/kdoctools-4.98.0/src/template.docbook --- old/kdoctools-4.97.0/src/template.docbook 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/template.docbook 2014-03-28 19:16:42.000000000 +0100 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ +<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [  <!ENTITY kmyapplication "<application>KMyApp</application>"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/xslt.cpp new/kdoctools-4.98.0/src/xslt.cpp --- old/kdoctools-4.97.0/src/xslt.cpp 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/xslt.cpp 2014-03-28 19:16:42.000000000 +0100 @@ -145,7 +145,7 @@ defaultEntityLoader = xmlGetExternalEntityLoader(); xmlSetExternalEntityLoader(xsltprocExternalEntityLoader); - replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.2")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); + replaceURLList[QLatin1String("http://www.oasis-open.org/docbook/xml/4.5")] = QString("file:///%1").arg(DOCBOOK_XML_CURRDTD); } #endif @@ -373,48 +373,61 @@ QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option) { + const QStringList lst = locateFilesInDtdResource(file, option); + return lst.isEmpty() ? QString() : lst.first(); +} + +QStringList locateFilesInDtdResource(const QString &file, const QStandardPaths::LocateOptions option) +{ QFileInfo info(file); if (info.exists() && info.isAbsolute()) { - return file; + return QStringList() << file; } const QString srcdir = s_dtdDirs()->srcdir; if (!srcdir.isEmpty()) { const QString test = srcdir + QLatin1Char('/') + file; if (QFile::exists(test)) { - return test; + return QStringList() << test; } - qDebug() << "Could not locate file:" << file; - return QString(); + qDebug() << "Could not locate file" << file << "in" << srcdir; + return QStringList(); } - const QString result = QStandardPaths::locate(QStandardPaths::GenericDataLocation, + // Using locateAll() is necessary to be able to find all catalogs when + // running in environments where every repository is installed in its own + // prefix. + // This is the case on build.kde.org where kde4support installs catalogs + // in a different prefix than kdoctools. + const QStringList result = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kdoctools5/") + file, option); if (result.isEmpty()) { - qDebug() << "Could not locate file:" << file; + qDebug() << "Could not locate file" << file << "in standard dirs"; } return result; } QStringList getKDocToolsCatalogs() { - // find all catalogs as catalog*.xml, and add them to the list, - // starting from catalog.xml (the main one). - const QString customizationDirName = locateFileInDtdResource(QStringLiteral("customization"), - QStandardPaths::LocateDirectory); - if (customizationDirName.isEmpty()) { + // Find all catalogs as catalog*.xml, and add them to the list, starting + // from catalog.xml (the main one). + QStringList dirNames = locateFilesInDtdResource(QStringLiteral("customization"), + QStandardPaths::LocateDirectory); + if (dirNames.isEmpty()) { return QStringList(); } - QDir customizationDir = QDir(customizationDirName); - const QStringList catalogFileFilters(QStringLiteral("catalog*.xml")); - const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters, - QDir::Files | QDir::NoSymLinks, QDir::Name); QStringList catalogFiles; - foreach (const QFileInfo &fileInfo, catalogInfoFiles) { - const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); - if (fileInfo.fileName() == QStringLiteral("catalog.xml")) { - catalogFiles.prepend(fullFileName); - } else { - catalogFiles.append(fullFileName); + foreach (const QString &customizationDirName, dirNames) { + QDir customizationDir = QDir(customizationDirName); + const QStringList catalogFileFilters(QStringLiteral("catalog*.xml")); + const QFileInfoList catalogInfoFiles = customizationDir.entryInfoList(catalogFileFilters, + QDir::Files | QDir::NoSymLinks, QDir::Name); + foreach (const QFileInfo &fileInfo, catalogInfoFiles) { + const QString fullFileName = QUrl::fromLocalFile(fileInfo.absoluteFilePath()).toEncoded(); + if (fileInfo.fileName() == QStringLiteral("catalog.xml")) { + catalogFiles.prepend(fullFileName); + } else { + catalogFiles.append(fullFileName); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdoctools-4.97.0/src/xslt.h new/kdoctools-4.98.0/src/xslt.h --- old/kdoctools-4.97.0/src/xslt.h 2014-03-01 15:42:39.000000000 +0100 +++ new/kdoctools-4.98.0/src/xslt.h 2014-03-28 19:16:42.000000000 +0100 @@ -18,6 +18,7 @@ void setupStandardDirs(const QString &srcdir = QString()); QString locateFileInDtdResource(const QString &file, const QStandardPaths::LocateOptions option=QStandardPaths::LocateFile); +QStringList locateFilesInDtdResource(const QString &file, const QStandardPaths::LocateOptions option=QStandardPaths::LocateFile); QStringList getKDocToolsCatalogs(); #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdnssd-framework for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdnssd-framework for openSUSE:Factory checked in at 2014-04-02 17:21:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdnssd-framework (Old) and /work/SRC/openSUSE:Factory/.kdnssd-framework.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdnssd-framework" Changes: -------- --- /work/SRC/openSUSE:Factory/kdnssd-framework/kdnssd-framework.changes 2014-03-28 16:24:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdnssd-framework.new/kdnssd-framework.changes 2014-04-02 17:22:06.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:32 UTC 2014 - hrvoje.senjan(a)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: ---- kdnssd-framework-4.97.0.tar.xz New: ---- kdnssd-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdnssd-framework.spec ++++++ --- /var/tmp/diff_new_pack.VawhRQ/_old 2014-04-02 17:22:06.000000000 +0200 +++ /var/tmp/diff_new_pack.VawhRQ/_new 2014-04-02 17:22:06.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5DNSSD5 Name: kdnssd-framework -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRequires: avahi-compat-mDNSResponder-devel BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.11 +BuildRequires: extra-cmake-modules >= 0.0.12 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 @@ -31,7 +31,7 @@ License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source0: kdnssd-framework-%{version}.tar.xz +Source0: kdnssd-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -64,7 +64,7 @@ centralized infrastructure. Development files. %prep -%setup -q +%setup -q -n kdnssd-%{version} %build %cmake_kf5 -d build ++++++ kdnssd-framework-4.97.0.tar.xz -> kdnssd-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdnssd-framework-4.97.0/.reviewboardrc new/kdnssd-4.98.0/.reviewboardrc --- old/kdnssd-framework-4.97.0/.reviewboardrc 2014-03-01 12:50:39.000000000 +0100 +++ new/kdnssd-4.98.0/.reviewboardrc 2014-03-28 19:16:38.000000000 +0100 @@ -1,4 +1,4 @@ REVIEWBOARD_URL = "https://git.reviewboard.kde.org" -REPOSITORY = 'git://anongit.kde.org/kdnssd-framework' +REPOSITORY = 'git://anongit.kde.org/kdnssd' BRANCH = 'master' TARGET_GROUPS = 'kdeframeworks' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdnssd-framework-4.97.0/CMakeLists.txt new/kdnssd-4.98.0/CMakeLists.txt --- old/kdnssd-framework-4.97.0/CMakeLists.txt 2014-03-01 12:50:39.000000000 +0100 +++ new/kdnssd-4.98.0/CMakeLists.txt 2014-03-28 19:16:38.000000000 +0100 @@ -2,14 +2,14 @@ project(KDNSSD) -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} ${CMAKE_SOURCE_DIR}/cmake/modules) #TODO: remove cmake/modules when extra-cmake-modules is done include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") set(REQUIRED_QT_VERSION "5.2.0") find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdnssd-framework-4.97.0/kdnssd-framework.yaml new/kdnssd-4.98.0/kdnssd-framework.yaml --- old/kdnssd-framework-4.97.0/kdnssd-framework.yaml 2014-03-01 12:50:39.000000000 +0100 +++ new/kdnssd-4.98.0/kdnssd-framework.yaml 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -tier: 2 - -# KDNSSD can use either Avahi or DNSSD. If it is compiled with DNSSD, it -# requires kconfig. This might not be detected when diagrams are generated -# if the system generating the diagrams have Avahi installed, that is why -# we hardcode the kconfig dependency here -framework-dependencies: - - kconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdnssd-framework-4.97.0/kdnssd.yaml new/kdnssd-4.98.0/kdnssd.yaml --- old/kdnssd-framework-4.97.0/kdnssd.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/kdnssd-4.98.0/kdnssd.yaml 2014-03-28 19:16:38.000000000 +0100 @@ -0,0 +1,8 @@ +tier: 2 + +# KDNSSD can use either Avahi or DNSSD. If it is compiled with DNSSD, it +# requires kconfig. This might not be detected when diagrams are generated +# if the system generating the diagrams have Avahi installed, that is why +# we hardcode the kconfig dependency here +framework-dependencies: + - kconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdnssd-framework-4.97.0/src/Messages.sh new/kdnssd-4.98.0/src/Messages.sh --- old/kdnssd-framework-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdnssd-4.98.0/src/Messages.sh 2014-03-28 19:16:38.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/kdnssd5.pot -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesu for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdesu for openSUSE:Factory checked in at 2014-04-02 17:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesu (Old) and /work/SRC/openSUSE:Factory/.kdesu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesu" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesu/kdesu.changes 2014-03-10 12:18:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesu.new/kdesu.changes 2014-04-02 17:22:04.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:30 UTC 2014 - hrvoje.senjan(a)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: ---- kdesu-4.97.0.tar.xz New: ---- kdesu-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesu.spec ++++++ --- /var/tmp/diff_new_pack.pBw1Fm/_old 2014-04-02 17:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.pBw1Fm/_new 2014-04-02 17:22:04.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Su5 Name: kdesu -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 @@ -85,6 +85,7 @@ %doc COPYING* README* %{_kf5_libdir}/libKF5Su.so.* %{_kf5_libexecdir}/kdesu_stub +%{_kf5_libexecdir}/kdesud %files devel %defattr(-,root,root) ++++++ kdesu-4.97.0.tar.xz -> kdesu-4.98.0.tar.xz ++++++ ++++ 1742 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdewebkit for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdewebkit for openSUSE:Factory checked in at 2014-04-02 17:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdewebkit (Old) and /work/SRC/openSUSE:Factory/.kdewebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdewebkit" Changes: -------- --- /work/SRC/openSUSE:Factory/kdewebkit/kdewebkit.changes 2014-03-10 12:18:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdewebkit.new/kdewebkit.changes 2014-04-02 17:22:05.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:31 UTC 2014 - hrvoje.senjan(a)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: ---- kdewebkit-4.97.0.tar.xz New: ---- kdewebkit-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebkit.spec ++++++ --- /var/tmp/diff_new_pack.XJVt25/_old 2014-04-02 17:22:05.000000000 +0200 +++ /var/tmp/diff_new_pack.XJVt25/_new 2014-04-02 17:22:05.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5WebKit5 Name: kdewebkit -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: kbookmarks-devel >= %{_kf5_version} BuildRequires: kcompletion-devel >= %{_kf5_version} ++++++ kdewebkit-4.97.0.tar.xz -> kdewebkit-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/CMakeLists.txt new/kdewebkit-4.98.0/CMakeLists.txt --- old/kdewebkit-4.97.0/CMakeLists.txt 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/CMakeLists.txt 2014-03-28 19:16:37.000000000 +0100 @@ -2,7 +2,7 @@ project(KDEWebKit) -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}) @@ -18,7 +18,7 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDEWEBKIT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdewebkit_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5WebKitConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kgraphicswebview.h new/kdewebkit-4.98.0/src/kgraphicswebview.h --- old/kdewebkit-4.97.0/src/kgraphicswebview.h 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kgraphicswebview.h 2014-03-28 19:16:37.000000000 +0100 @@ -34,12 +34,13 @@ template<class T> class KWebViewPrivate; /** - * @short A re-implementation of QGraphicsWebView that provides KDE integration. + * @short A re-implementation of QGraphicsWebView that provides KDE Frameworks + * integration. * * This is a drop-in replacement for QGraphicsWebView that provides full KDE - * integration through the use of @ref KWebPage. It also provides signals that - * capture middle, shift and ctrl mouse clicks on links and URL pasting from the - * selection clipboard. + * frameworks integration through the use of @ref KWebPage. It also provides + * signals that capture middle, shift and ctrl mouse clicks on links and URL + * pasting from the selection clipboard. * * The specific functionality provided by this class (over and above what * would be acheived by using KWebPage with a QGraphicsWebView) is that @@ -61,9 +62,9 @@ * Constructs a KGraphicsWebView object with parent @p parent. * * Set @p createCustomPage to false to prevent the creation of a - * @ref KWebPage object for KDE integration. Doing so allows you to - * avoid unnecessary object creation and deletion if you are going to - * use a subclass of KWebPage. + * @ref KWebPage object for KDE frameworks integration. Doing so allows you + * to avoid unnecessary object creation and deletion if you are going to use + * a subclass of KWebPage. * * @param parent the parent object * @param createCustomPage if @c true, the view's page is set to an @@ -149,8 +150,8 @@ * Emitted when a link is clicked with the left mouse button while SHIFT is * held down. * - * A KDE user would typically expect this to result in the triggering of a - * "save link as" action. + * A user of Plasma Desktop would typically expect this to result in the + * triggering of a "save link as" action. * * @param url the URL of the clicked link */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kwebpage.cpp new/kdewebkit-4.98.0/src/kwebpage.cpp --- old/kdewebkit-4.97.0/src/kwebpage.cpp 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kwebpage.cpp 2014-03-28 19:16:37.000000000 +0100 @@ -606,7 +606,7 @@ } } if (!downloadResource(replyUrl, suggestedFileName, d->windowWidget())) { - break; + return true; // file dialog was cancelled, stop here } } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kwebpage.h new/kdewebkit-4.98.0/src/kwebpage.h --- old/kdewebkit-4.97.0/src/kwebpage.h 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kwebpage.h 2014-03-28 19:16:37.000000000 +0100 @@ -39,13 +39,13 @@ } /** - * @short An enhanced QWebPage that provides integration into the KDE environment. + * @short An enhanced QWebPage that provides integration with KDE Frameworks. * * This is a convenience class that provides full integration with KDE - * technologies such as KIO for network request handling, KCookiejar for cookie - * handling, KParts for embedding non-html content and KWallet for storing - * form data. It also sets standard icons for many of the actions provided by - * QWebPage. + * frameworks technologies such as KIO for network request handling, KCookiejar + * for cookie handling, KParts for embedding non-html content and KWallet for + * storing form data. It also sets standard icons for many of the actions + * provided by QWebPage. * * Most of this integration happens behind the scenes. If you want KWallet * integration, however, you will have to provide a mechanism for deciding @@ -145,11 +145,11 @@ /** * The wallet integration manager. * - * If you wish to use KDE wallet integration, you will have to connect to + * If you wish to use KWallet integration, you will have to connect to * signals emitted by this object and react accordingly. See KWebWallet * for more information. * - * @return the wallet integration manager, or 0 if KDE wallet integration + * @return the wallet integration manager, or 0 if KWallet integration * is disabled */ KWebWallet *wallet() const; @@ -205,9 +205,9 @@ * This slot first prompts the user where to save the requested resource * and then downloads it using KIO. * - * In KDE 4.8 and higher, if @p reply contains a QObject property called - * "DownloadManagerExe", then an attempt will be made to the command - * specified by that property to download the specified resource. + * If @p reply contains a QObject property called "DownloadManagerExe", then + * an attempt will be made to the command specified by that property to + * download the specified resource. * * If the "DownloadManagerExe" property is not defined or the command * specified by it could not be successfully executed, then the user will @@ -309,8 +309,8 @@ /** * @reimp * - * This function is re-implemented to provide KDE user-agent management - * integration through KProtocolManager. + * This function is re-implemented to provide KIO user-agent management + * integration with KProtocolManager. * * If a special user-agent has been configured for the host indicated by * @p url, that user-agent will be returned. Otherwise, QWebPage's @@ -339,9 +339,9 @@ /** * Attempts to handle @p reply and returns true on success, false otherwise. * - * In KDE 4.8 and higher, if @p reply contains a QObject property called - * "DownloadManagerExe", then an attempt will be made to let the command - * specified by that property to download the requested resource. + * If @p reply contains a QObject property called "DownloadManagerExe", then + * an attempt will be made to let the command specified by that property to + * download the requested resource. * * If the "DownloadManagerExe" property is not defined or the command * specified by it could not be successfully executed, then the user will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kwebpluginfactory.h new/kdewebkit-4.98.0/src/kwebpluginfactory.h --- old/kdewebkit-4.97.0/src/kwebpluginfactory.h 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kwebpluginfactory.h 2014-03-28 19:16:37.000000000 +0100 @@ -33,7 +33,7 @@ } /** - * @short A QWebPluginFactory with integration into the KDE environment. + * @short A QWebPluginFactory that is integrated with KDE frameworks. * * This class will attempt to find a KPart to satisfy a plugin request. * @@ -98,7 +98,7 @@ /** * Returns true if the given mime-type is excluded from being used to create - * a web plugin using KDE's trader. + * a web plugin using KService's trader. * * Currently this function only returns true for mimetypes 'x-java', * 'x-shockwave-flash', and 'futuresplash' in the 'application' category @@ -111,7 +111,7 @@ /** * Returns an instance of the service associated with @p mimeType. * - * This function uses KDE's trader to create an instance of the service + * This function uses KService's trader to create an instance of the service * associated with the given parameters. The parameters are the <param> * tags of the HTML object. The name and the value attributes of these * tags are specified by the @p argumentNames and @p argumentValues diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kwebview.h new/kdewebkit-4.98.0/src/kwebview.h --- old/kdewebkit-4.97.0/src/kwebview.h 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kwebview.h 2014-03-28 19:16:37.000000000 +0100 @@ -34,9 +34,10 @@ template<class T> class KWebViewPrivate; /** - * @short A re-implementation of QWebView that provides KDE integration. + * @short A re-implementation of QWebView that provides integration with KDE + * frameworks. * - * This is a drop-in replacement for QWebView that provides full KDE + * This is a drop-in replacement for QWebView that provides full KDE frameworks * integration through @ref KWebPage as well as additional signals that * capture middle, shift and ctrl mouse clicks on links and URL pasting * from the selection clipboard. @@ -62,9 +63,9 @@ * Constructs a KWebView object with parent @p parent. * * Set @p createCustomPage to false to prevent the creation of a - * @ref KWebPage object for KDE integration. Doing so allows you to - * avoid unnecessary object creation and deletion if you are going to - * use a subclass of KWebPage. + * @ref KWebPage object for KDE frameworks integration. Doing so allows you + * to avoid unnecessary object creation and deletion if you are going to use + * a subclass of KWebPage. * * @param parent the parent object * @param createCustomPage if @c true, the view's page is set to an @@ -150,8 +151,8 @@ * Emitted when a link is clicked with the left mouse button while SHIFT is * held down. * - * A KDE user would typically expect this to result in the triggering of a - * "save link as" action. + * A user of Plasma desktop would typically expect this to result in the + * triggering of a "save link as" action. * * @param url the URL of the clicked link */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdewebkit-4.97.0/src/kwebwallet.h new/kdewebkit-4.98.0/src/kwebwallet.h --- old/kdewebkit-4.97.0/src/kwebwallet.h 2014-03-01 12:50:37.000000000 +0100 +++ new/kdewebkit-4.98.0/src/kwebwallet.h 2014-03-28 19:16:37.000000000 +0100 @@ -36,7 +36,7 @@ class QWebPage; /** - * @short A class that provides KDE wallet integration for QWebFrame. + * @short A class that provides KWallet integration for QWebFrame. * * Normally, you will use this class via KWebPage. In this case, you need to * connect to the saveFormDataRequested signal and call either @@ -95,7 +95,7 @@ * * @p parent is usually the QWebPage this wallet is being used for. * - * The @p wid parameter is used to tell KDE's wallet manager which window + * The @p wid parameter is used to tell the KWallet manager which window * is requesting access to the wallet. * * @param parent the owner of this wallet -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdesignerplugin for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdesignerplugin for openSUSE:Factory checked in at 2014-04-02 17:21:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesignerplugin (Old) and /work/SRC/openSUSE:Factory/.kdesignerplugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesignerplugin" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesignerplugin/kdesignerplugin.changes 2014-03-28 16:22:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesignerplugin.new/kdesignerplugin.changes 2014-04-02 17:22:03.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:29 UTC 2014 - hrvoje.senjan(a)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: ---- kdesignerplugin-4.97.0.tar.xz New: ---- kdesignerplugin-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesignerplugin.spec ++++++ --- /var/tmp/diff_new_pack.KW57Gx/_old 2014-04-02 17:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.KW57Gx/_new 2014-04-02 17:22:04.000000000 +0200 @@ -17,10 +17,10 @@ Name: kdesignerplugin -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: kbookmarks-devel >= %{_kf5_version} BuildRequires: kcompletion-devel >= %{_kf5_version} ++++++ kdesignerplugin-4.97.0.tar.xz -> kdesignerplugin-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-4.97.0/CMakeLists.txt new/kdesignerplugin-4.98.0/CMakeLists.txt --- old/kdesignerplugin-4.97.0/CMakeLists.txt 2014-03-01 12:50:33.000000000 +0100 +++ new/kdesignerplugin-4.98.0/CMakeLists.txt 2014-03-28 19:16:33.000000000 +0100 @@ -2,7 +2,7 @@ project(KF5DesignerPlugin) -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}) @@ -19,7 +19,7 @@ TYPE OPTIONAL ) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") find_package(KF5CoreAddons ${KF5_VERSION} REQUIRED) find_package(KF5Config ${KF5_VERSION} REQUIRED) find_package(KF5DocTools ${KF5_VERSION} REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-4.97.0/docs/kgendesignerplugin/man-kgendesignerplugin.1.docbook new/kdesignerplugin-4.98.0/docs/kgendesignerplugin/man-kgendesignerplugin.1.docbook --- old/kdesignerplugin-4.97.0/docs/kgendesignerplugin/man-kgendesignerplugin.1.docbook 2014-03-01 12:50:33.000000000 +0100 +++ new/kdesignerplugin-4.98.0/docs/kgendesignerplugin/man-kgendesignerplugin.1.docbook 2014-03-28 19:16:33.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" -"dtd/kdex.dtd" [ +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" +"dtd/kdedbx45.dtd" [ <!ENTITY % English "INCLUDE"> ]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-4.97.0/src/CMakeLists.txt new/kdesignerplugin-4.98.0/src/CMakeLists.txt --- old/kdesignerplugin-4.97.0/src/CMakeLists.txt 2014-03-01 12:50:33.000000000 +0100 +++ new/kdesignerplugin-4.98.0/src/CMakeLists.txt 2014-03-28 19:16:33.000000000 +0100 @@ -13,8 +13,6 @@ KF5::CoreAddons # KMacroExpander ) -# "export" this target too so we can use the LOCATION property of the imported target in -# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex install(TARGETS kgendesignerplugin EXPORT KF5DesignerPluginTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-4.97.0/src/Messages.sh new/kdesignerplugin-4.98.0/src/Messages.sh --- old/kdesignerplugin-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdesignerplugin-4.98.0/src/Messages.sh 2014-03-28 19:16:33.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/kdesignerplugin5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesignerplugin-4.97.0/src/README new/kdesignerplugin-4.98.0/src/README --- old/kdesignerplugin-4.97.0/src/README 2014-03-01 12:50:33.000000000 +0100 +++ new/kdesignerplugin-4.98.0/src/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -KDE Custom Widgets for Qt Designer 2 -==================================== - - -Summary: -======== - -This directory contains KDE custom widgets for Qt Designer which comes with -Qt 4. Just make sure that QT_PLUGIN_PATH includes -$KDEDIR/lib/kde4/plugins . With the KDE build system nothing special -(i.e. editing the plugin path) is needed, as uic will automatically be -called with -L <path to the kdewidgets plugin> . - -This plugin uses the QWidget plugin API of Qt >= 4.0 -Don't expect it to work with any other versions of Qt. - - -Known Bugs: -=========== - -Designer crashes when using widgets that use the kapp pointer. - -HOWTO Add Widgets: -================== -Just add new widgets to kde.widgets like this: -[ClassName] -IncludeFile=myheader.h -IconSet=mycoolwidget.png -ToolTip=My Cool Widget -WhatsThis=Long description of my cool widget -ConstructorArgs=(parent, name, otherNeccessaryArg) -IsContainer=true -Group=MyWidgetCollection - -Everything but [ClassName] is optional. -IncludeFile defaults to classname.h (all lowercase) -IconSet defaults to classname.png (all lowercase) -ToolTip defaults to ClassName -WhatsThis defaults to ClassName -ConstructorArgs=(parent, name) -IsContainer defaults to false - note, any value except an empty one is - interpreted as true, even if the value - is "false" :) So, if the widget is not a - container, just omit this line. -Group defaults to "KDE" - -Don't forget to add an icon to the pics directory. Try to make it look similar to the other icons and be the same size. - -There are some global options that you can have. - -[Global] -Init=new InitCode(); -Destroy= delete object; -PluginName=MyPlugin - -PluginName overrides the passed in value at the command line and is optional. -Init and Destroy are both optional arguments that can be used for custom build -up and tear down code. - -Have fun! - - -Ian Reinhart Geiser <geiseri(a)kde.org> -Daniel Molkentin <molkentin(a)kde.org> -Malte Starostik <malte(a)kde.org> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeclarative for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdeclarative for openSUSE:Factory checked in at 2014-04-02 17:21:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdeclarative (Old) and /work/SRC/openSUSE:Factory/.kdeclarative.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdeclarative" Changes: -------- --- /work/SRC/openSUSE:Factory/kdeclarative/kdeclarative.changes 2014-03-10 12:17:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdeclarative.new/kdeclarative.changes 2014-04-02 17:22:01.000000000 +0200 @@ -1,0 +2,12 @@ +Sat Mar 29 19:47:28 UTC 2014 - hrvoje.senjan(a)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 +- Added kwidgetsaddons-devel, kwindowsystem-devel, kglobalaccel-devel, + kcoreaddons-devel and kguiaddons-devel BuildRequires, needed for + building components imported from plasma-framework + +------------------------------------------------------------------- Old: ---- kdeclarative-4.97.0.tar.xz New: ---- kdeclarative-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeclarative.spec ++++++ --- /var/tmp/diff_new_pack.Xb8ljf/_old 2014-04-02 17:22:02.000000000 +0200 +++ /var/tmp/diff_new_pack.Xb8ljf/_new 2014-04-02 17:22:02.000000000 +0200 @@ -18,16 +18,21 @@ %define lname libKF5Declarative5 Name: kdeclarative -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: kconfig-devel >= %{_kf5_version} +BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem +BuildRequires: kglobalaccel-devel >= %{_kf5_version} +BuildRequires: kguiaddons-devel >= %{_kf5_version} BuildRequires: ki18n-devel >= %{_kf5_version} BuildRequires: kiconthemes-devel >= %{_kf5_version} BuildRequires: kio-devel >= %{_kf5_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_version} BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0 @@ -80,6 +85,7 @@ %defattr(-,root,root) %doc COPYING* README* %{_kf5_libdir}/libKF5Declarative.so.* +%{_kf5_libdir}/qt5/qml/ %files devel %defattr(-,root,root) ++++++ kdeclarative-4.97.0.tar.xz -> kdeclarative-4.98.0.tar.xz ++++++ ++++ 8528 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdbusaddons for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

Hello community, here is the log from the commit of package kdbusaddons for openSUSE:Factory checked in at 2014-04-02 17:21:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdbusaddons (Old) and /work/SRC/openSUSE:Factory/.kdbusaddons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdbusaddons" Changes: -------- --- /work/SRC/openSUSE:Factory/kdbusaddons/kdbusaddons.changes 2014-03-10 12:17:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdbusaddons.new/kdbusaddons.changes 2014-04-02 17:21:59.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:26 UTC 2014 - hrvoje.senjan(a)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: ---- kdbusaddons-4.97.0.tar.xz New: ---- kdbusaddons-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbusaddons.spec ++++++ --- /var/tmp/diff_new_pack.pp6oLT/_old 2014-04-02 17:22:01.000000000 +0200 +++ /var/tmp/diff_new_pack.pp6oLT/_new 2014-04-02 17:22:01.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5DBusAddons5 Name: kdbusaddons -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: kf5-filesystem BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 ++++++ kdbusaddons-4.97.0.tar.xz -> kdbusaddons-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.97.0/CMakeLists.txt new/kdbusaddons-4.98.0/CMakeLists.txt --- old/kdbusaddons-4.97.0/CMakeLists.txt 2014-03-01 12:50:25.000000000 +0100 +++ new/kdbusaddons-4.98.0/CMakeLists.txt 2014-03-28 19:16:23.000000000 +0100 @@ -2,7 +2,7 @@ project(KDBusAddons) -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}) @@ -20,7 +20,7 @@ include(ECMGenerateHeaders) include(ECMMarkNonGuiExecutable) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KDBUSADDONS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdbusaddons_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdbusaddons-4.97.0/src/Messages.sh new/kdbusaddons-4.98.0/src/Messages.sh --- old/kdbusaddons-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbusaddons-4.98.0/src/Messages.sh 2014-03-28 19:16:23.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/kdbusaddons5.pot -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kcrash for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '14

02 Apr '14

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(a)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(a)cs.colorado.edu - Copyright (c) 2002 Dirk Mueller <mueller(a)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(a)courtesan.com> - Copyright (c) 2002 Dirk Mueller <mueller(a)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(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0