April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit frameworkintegration 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 frameworkintegration for openSUSE:Factory checked in at 2014-04-02 17:21:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2014-03-10 12:18:19.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-04-02 17:21:45.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:19 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: ---- frameworkintegration-4.97.0.tar.xz New: ---- frameworkintegration-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.TE0t96/_old 2014-04-02 17:21:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TE0t96/_new 2014-04-02 17:21:46.000000000 +0200 @@ -18,10 +18,10 @@ %define lname libKF5Style5 Name: frameworkintegration -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: kconfigwidgets-devel >= %{_kf5_version} ++++++ frameworkintegration-4.97.0.tar.xz -> frameworkintegration-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/CMakeLists.txt new/frameworkintegration-4.98.0/CMakeLists.txt --- old/frameworkintegration-4.97.0/CMakeLists.txt 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/CMakeLists.txt 2014-03-28 19:15:59.000000000 +0100 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -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 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" @@ -34,6 +34,13 @@ find_package(KF5Notifications ${KF5_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) +find_package(OxygenFont 0.4) + +set_package_properties(OxygenFont PROPERTIES + PURPOSE "Default font for KDE Applications" + TYPE RUNTIME +) + add_subdirectory(src) add_subdirectory(autotests) add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/autotests/CMakeLists.txt new/frameworkintegration-4.98.0/autotests/CMakeLists.txt --- old/frameworkintegration-4.97.0/autotests/CMakeLists.txt 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/autotests/CMakeLists.txt 2014-03-28 19:15:59.000000000 +0100 @@ -19,7 +19,7 @@ add_executable(${_testname} ${_testname}.cpp ${ARGN}) add_test(frameworkintegration-${_testname} ${_testname}) ecm_mark_as_test(${_testname}) - target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::Style KF5::KIOFileWidgets KF5::I18n) + target_link_libraries(${_testname} Qt5::Test Qt5::DBus KF5::ConfigWidgets KF5::ConfigCore KF5::IconThemes KF5::Style KF5::KIOFileWidgets KF5::I18n KF5::Notifications) endmacro() frameworkintegration_tests( @@ -28,6 +28,7 @@ ../src/platformtheme/kfontsettingsdata.cpp ../src/platformtheme/khintssettings.cpp ../src/platformtheme/kdeplatformfiledialoghelper.cpp + ../src/platformtheme/kdeplatformsystemtrayicon.cpp ) frameworkintegration_tests( @@ -38,3 +39,7 @@ frameworkintegration_tests( kstyle_unittest ) + +frameworkintegration_tests( + kfiledialog_unittest +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/autotests/kfiledialog_unittest.cpp new/frameworkintegration-4.98.0/autotests/kfiledialog_unittest.cpp --- old/frameworkintegration-4.97.0/autotests/kfiledialog_unittest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-4.98.0/autotests/kfiledialog_unittest.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -0,0 +1,69 @@ +/* This file is part of the KDE libraries + * Copyright 2014 Dominik Haumann <dhaumann(a)kde.org> + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License or ( at + * your option ) version 3 or, at the discretion of KDE e.V. ( which shall + * act as a proxy as in section 14 of the GPLv3 ), any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#include <QTest> +#include <QFileDialog> + +#include <QDebug> + +class KFileDialog_UnitTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void initTestCase() + { + } + + void cleanupTestCase() + { + } + + void testSetNameFilters() + { + QFileDialog dialog; + + QStringList nameFilterList = QStringList() << "c (*.cpp)" << "h (*.h)"; + dialog.setNameFilters(nameFilterList); + QCOMPARE(dialog.nameFilters(), nameFilterList); + } + + void testSelectNameFilter() + { + QFileDialog dialog; + + QStringList nameFilterList = QStringList() << "c (*.cpp)" << "h (*.h)"; + dialog.setNameFilters(nameFilterList); + QCOMPARE(dialog.nameFilters(), nameFilterList); + + QString selectNameFilter("h (*.h)"); + dialog.selectNameFilter(selectNameFilter); + QEXPECT_FAIL("", "Does currently not work. Works, once the dialog gets shown, though.", Continue); + QCOMPARE(dialog.selectedNameFilter(), selectNameFilter); + + dialog.show(); + QCOMPARE(dialog.selectedNameFilter(), selectNameFilter); + } + +}; + +QTEST_MAIN(KFileDialog_UnitTest) + +#include "kfiledialog_unittest.moc" + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/autotests/kfontsettingsdata_unittest.cpp new/frameworkintegration-4.98.0/autotests/kfontsettingsdata_unittest.cpp --- old/frameworkintegration-4.97.0/autotests/kfontsettingsdata_unittest.cpp 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/autotests/kfontsettingsdata_unittest.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -51,7 +51,10 @@ QFile::copy(CONFIGFILE, configPath); } -Q_COREAPP_STARTUP_FUNCTION(prepareEnvironment); +// Run prepareEnvironment before qApp is created! slightly incorrect, QFile::encodeName can be wrong then. +// But we can't use Q_COREAPP_STARTUP_FUNCTION because the platform theme ends up being created +// first, with the wrong environment. +Q_CONSTRUCTOR_FUNCTION(prepareEnvironment); class KFontSettingsData_UnitTest : public QWidget { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/Messages.sh new/frameworkintegration-4.98.0/src/Messages.sh --- old/frameworkintegration-4.97.0/src/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/Messages.sh 2014-03-28 19:15:59.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. +$XGETTEXT `find . -name \*.cpp -o -name \*.h -name \*.qml` -o $podir/frameworkintegration5.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/CMakeLists.txt new/frameworkintegration-4.98.0/src/platformtheme/CMakeLists.txt --- old/frameworkintegration-4.97.0/src/platformtheme/CMakeLists.txt 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/CMakeLists.txt 2014-03-28 19:15:59.000000000 +0100 @@ -4,6 +4,7 @@ kfontsettingsdata.cpp khintssettings.cpp kdeplatformfiledialoghelper.cpp + kdeplatformsystemtrayicon.cpp main.cpp ) @@ -23,6 +24,7 @@ KF5::IconThemes KF5::KIOFileWidgets KF5::I18n + KF5::Notifications ) install(TARGETS KDEPlatformTheme DESTINATION ${QT_PLUGIN_INSTALL_DIR}/platformthemes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformfiledialoghelper.cpp new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformfiledialoghelper.cpp --- old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformfiledialoghelper.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -173,6 +173,9 @@ QStringList nameFilters = options()->nameFilters(); if (!nameFilters.isEmpty()) { m_dialog->m_fileWidget->setFilter(qt2KdeFilter(nameFilters)); + if (!options()->initiallySelectedNameFilter().isEmpty()) { + selectNameFilter(options()->initiallySelectedNameFilter()); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformsystemtrayicon.cpp new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformsystemtrayicon.cpp --- old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformsystemtrayicon.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -0,0 +1,327 @@ +/* This file is part of the KDE libraries + * Copyright 2014 Martin Gräßlin <mgraesslin(a)kde.org> + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License or ( at + * your option ) version 3 or, at the discretion of KDE e.V. ( which shall + * act as a proxy as in section 14 of the GPLv3 ), any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#include "kdeplatformsystemtrayicon.h" +#include <kstatusnotifieritem.h> +#include <QAction> +#include <QIcon> +#include <QMenu> +#include <QRect> +#include <QApplication> + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) +SystemTrayMenu::SystemTrayMenu() + : QPlatformMenu() + , m_tag(0) + , m_menu(new QMenu()) +{ + connect(m_menu.data(), &QMenu::aboutToShow, this, &QPlatformMenu::aboutToShow); + connect(m_menu.data(), &QMenu::aboutToHide, this, &QPlatformMenu::aboutToHide); +} + +SystemTrayMenu::~SystemTrayMenu() +{ +} + +QPlatformMenuItem *SystemTrayMenu::createMenuItem() const +{ + return new SystemTrayMenuItem(); +} + +void SystemTrayMenu::insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) +{ + if (SystemTrayMenuItem *ours = qobject_cast<SystemTrayMenuItem*>(menuItem)) { + bool inserted = false; + if (SystemTrayMenuItem *oursBefore = qobject_cast<SystemTrayMenuItem*>(before)) { + for (auto it = m_items.begin(); it != m_items.end(); ++it) { + if (*it == oursBefore) { + m_items.insert(it, ours); + m_menu->insertAction(oursBefore->action(), ours->action()); + inserted = true; + break; + } + } + } + if (!inserted) { + m_items.append(ours); + m_menu->addAction(ours->action()); + } + } +} + +QPlatformMenuItem *SystemTrayMenu::menuItemAt(int position) const +{ + if (position < m_items.size()) { + return m_items.at(position); + } + return Q_NULLPTR; +} + +QPlatformMenuItem *SystemTrayMenu::menuItemForTag(quintptr tag) const +{ + auto it = std::find_if(m_items.constBegin(), m_items.constEnd(), [tag](SystemTrayMenuItem *item) { + return item->tag() == tag; + }); + if (it != m_items.constEnd()) { + return *it; + } + return Q_NULLPTR; +} + +void SystemTrayMenu::removeMenuItem(QPlatformMenuItem *menuItem) +{ + if (SystemTrayMenuItem *ours = qobject_cast<SystemTrayMenuItem*>(menuItem)) { + m_items.removeOne(ours); + m_menu->removeAction(ours->action()); + } +} + +void SystemTrayMenu::setEnabled(bool enabled) +{ + m_menu->setEnabled(enabled); +} + +void SystemTrayMenu::setIcon(const QIcon &icon) +{ + m_menu->setIcon(icon); +} + +void SystemTrayMenu::setTag(quintptr tag) +{ + m_tag = tag; +} + +void SystemTrayMenu::setText(const QString &text) +{ + m_menu->setTitle(text); +} + +void SystemTrayMenu::setVisible(bool visible) +{ + m_menu->setVisible(visible); +} + +void SystemTrayMenu::syncMenuItem(QPlatformMenuItem *menuItem) +{ + Q_UNUSED(menuItem) + // nothing to do +} + +void SystemTrayMenu::syncSeparatorsCollapsible(bool enable) +{ + m_menu->setSeparatorsCollapsible(enable); +} + +quintptr SystemTrayMenu::tag() const +{ + return m_tag; +} + +QMenu *SystemTrayMenu::menu() const +{ + return m_menu.data(); +} + +SystemTrayMenuItem::SystemTrayMenuItem() + : QPlatformMenuItem() + , m_tag(0) + , m_menu(Q_NULLPTR) + , m_action(new QAction(this)) +{ + connect(m_action, &QAction::triggered, this, &QPlatformMenuItem::activated); + connect(m_action, &QAction::hovered, this, &QPlatformMenuItem::hovered); +} + +SystemTrayMenuItem::~SystemTrayMenuItem() +{ +} + +void SystemTrayMenuItem::setCheckable(bool checkable) +{ + m_action->setCheckable(checkable); +} + +void SystemTrayMenuItem::setChecked(bool isChecked) +{ + m_action->setChecked(isChecked); +} + +void SystemTrayMenuItem::setEnabled(bool enabled) +{ + m_action->setEnabled(enabled); +} + +void SystemTrayMenuItem::setFont(const QFont &font) +{ + m_action->setFont(font); +} + +void SystemTrayMenuItem::setIcon(const QIcon &icon) +{ + m_action->setIcon(icon); +} + +void SystemTrayMenuItem::setIsSeparator(bool isSeparator) +{ + m_action->setSeparator(isSeparator); +} + +void SystemTrayMenuItem::setMenu(QPlatformMenu *menu) +{ + m_menu = menu; +} + +void SystemTrayMenuItem::setRole(QPlatformMenuItem::MenuRole role) +{ + Q_UNUSED(role) +} + +void SystemTrayMenuItem::setShortcut(const QKeySequence &shortcut) +{ + m_action->setShortcut(shortcut); +} + +void SystemTrayMenuItem::setTag(quintptr tag) +{ + m_tag = tag; +} + +void SystemTrayMenuItem::setText(const QString &text) +{ + m_action->setText(text); +} + +void SystemTrayMenuItem::setVisible(bool isVisible) +{ + m_action->setVisible(isVisible); +} + +quintptr SystemTrayMenuItem::tag() const +{ + return m_tag; +} + +QAction *SystemTrayMenuItem::action() const +{ + return m_action; +} +#endif + +KDEPlatformSystemTrayIcon::KDEPlatformSystemTrayIcon() + : QPlatformSystemTrayIcon() + , m_sni(Q_NULLPTR) +{ +} + +KDEPlatformSystemTrayIcon::~KDEPlatformSystemTrayIcon() +{ +} + +void KDEPlatformSystemTrayIcon::init() +{ + if (!m_sni) { + m_sni = new KStatusNotifierItem(); + m_sni->setTitle(QApplication::applicationDisplayName()); + connect(m_sni, &KStatusNotifierItem::activateRequested, [this](bool active, const QPoint &pos) { + Q_UNUSED(active) + Q_UNUSED(pos) + emit activated(QPlatformSystemTrayIcon::Trigger); + }); + connect(m_sni, &KStatusNotifierItem::secondaryActivateRequested, [this](const QPoint &pos) { + Q_UNUSED(pos) + emit activated(QPlatformSystemTrayIcon::Context); + }); + } +} + +void KDEPlatformSystemTrayIcon::cleanup() +{ + delete m_sni; + m_sni = Q_NULLPTR; +} + +void KDEPlatformSystemTrayIcon::updateIcon(const QIcon &icon) +{ + if (!m_sni) { + return; + } + if (icon.name().isEmpty()) { + m_sni->setIconByPixmap(icon); + m_sni->setToolTipIconByPixmap(icon); + } else { + m_sni->setIconByName(icon.name()); + m_sni->setToolTipIconByName(icon.name()); + } +} + +void KDEPlatformSystemTrayIcon::updateToolTip(const QString &tooltip) +{ + if (!m_sni) { + return; + } + m_sni->setToolTipTitle(tooltip); +} + +void KDEPlatformSystemTrayIcon::updateMenu(QPlatformMenu *menu) +{ +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) + if (!m_sni) { + return; + } + if (SystemTrayMenu *ourMenu = qobject_cast<SystemTrayMenu*>(menu)) { + m_sni->setContextMenu(ourMenu->menu()); + } +#else + Q_UNUSED(menu) +#endif +} + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) +QPlatformMenu *KDEPlatformSystemTrayIcon::createMenu() const +{ + return new SystemTrayMenu(); +} +#endif + +QRect KDEPlatformSystemTrayIcon::geometry() const +{ + // StatusNotifierItem doesn't provide the geometry + return QRect(); +} + +void KDEPlatformSystemTrayIcon::showMessage(const QString &msg, const QString &title, + const QIcon &icon, MessageIcon iconType, int secs) +{ + Q_UNUSED(iconType) + if (!m_sni) { + return; + } + m_sni->showMessage(title, msg, icon.themeName(), secs); +} + +bool KDEPlatformSystemTrayIcon::isSystemTrayAvailable() const +{ + // TODO: check on DBus + return true; +} + +bool KDEPlatformSystemTrayIcon::supportsMessages() const +{ + return true; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformsystemtrayicon.h new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformsystemtrayicon.h --- old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformsystemtrayicon.h 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformsystemtrayicon.h 2014-03-28 19:15:59.000000000 +0100 @@ -0,0 +1,115 @@ +/* This file is part of the KDE libraries + * Copyright 2014 Martin Gräßlin <mgraesslin(a)kde.org> + * + * This library is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2 of the License or ( at + * your option ) version 3 or, at the discretion of KDE e.V. ( which shall + * act as a proxy as in section 14 of the GPLv3 ), any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; see the file COPYING.LIB. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ +#ifndef KDEPLATFORMSYSTEMTRAYICON_H +#define KDEPLATFORMSYSTEMTRAYICON_H + +#include <qpa/qplatformmenu.h> +#include <qpa/qplatformsystemtrayicon.h> + +class KStatusNotifierItem; +class SystemTrayMenuItem; +class QAction; +class QMenu; + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) +class SystemTrayMenu : public QPlatformMenu +{ + Q_OBJECT +public: + SystemTrayMenu(); + ~SystemTrayMenu() Q_DECL_OVERRIDE; + void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; + QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; + QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; + void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; + void setEnabled(bool enabled) Q_DECL_OVERRIDE; + void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; + void setTag(quintptr tag) Q_DECL_OVERRIDE; + void setText(const QString &text) Q_DECL_OVERRIDE; + void setVisible(bool visible) Q_DECL_OVERRIDE; + void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; + void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE; + quintptr tag() const Q_DECL_OVERRIDE; + QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE; + + QMenu *menu() const; + +private: + quintptr m_tag; + QScopedPointer<QMenu> m_menu; + QList<SystemTrayMenuItem*> m_items; +}; + +class SystemTrayMenuItem : public QPlatformMenuItem +{ + Q_OBJECT +public: + SystemTrayMenuItem(); + ~SystemTrayMenuItem() Q_DECL_OVERRIDE; + void setCheckable(bool checkable) Q_DECL_OVERRIDE; + void setChecked(bool isChecked) Q_DECL_OVERRIDE; + void setEnabled(bool enabled) Q_DECL_OVERRIDE; + void setFont(const QFont &font) Q_DECL_OVERRIDE; + void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; + void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE; + void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; + void setRole(MenuRole role) Q_DECL_OVERRIDE; + void setShortcut(const QKeySequence &shortcut) Q_DECL_OVERRIDE; + void setTag(quintptr tag) Q_DECL_OVERRIDE; + void setText(const QString &text) Q_DECL_OVERRIDE; + void setVisible(bool isVisible) Q_DECL_OVERRIDE; + quintptr tag() const Q_DECL_OVERRIDE; + + QAction *action() const; + +private: + quintptr m_tag; + QPlatformMenu *m_menu; + QAction *m_action; +}; +#endif + +class KDEPlatformSystemTrayIcon : public QPlatformSystemTrayIcon +{ +public: + KDEPlatformSystemTrayIcon(); + ~KDEPlatformSystemTrayIcon() Q_DECL_OVERRIDE; + + void init() Q_DECL_OVERRIDE; + void cleanup() Q_DECL_OVERRIDE; + void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE; + void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE; + void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; + QRect geometry() const Q_DECL_OVERRIDE; + void showMessage(const QString &msg, const QString &title, + const QIcon &icon, MessageIcon iconType, int secs) Q_DECL_OVERRIDE; + + bool isSystemTrayAvailable() const Q_DECL_OVERRIDE; + bool supportsMessages() const Q_DECL_OVERRIDE; + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)) + QPlatformMenu *createMenu() const Q_DECL_OVERRIDE; +#endif + +private: + KStatusNotifierItem *m_sni; +}; + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformtheme.cpp new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformtheme.cpp --- old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformtheme.cpp 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformtheme.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -23,6 +23,7 @@ #include "kfontsettingsdata.h" #include "khintssettings.h" #include "kdeplatformfiledialoghelper.h" +#include "kdeplatformsystemtrayicon.h" #include <QCoreApplication> #include <QFont> @@ -211,3 +212,8 @@ return 0; } } + +QPlatformSystemTrayIcon *KdePlatformTheme::createPlatformSystemTrayIcon() const +{ + return new KDEPlatformSystemTrayIcon; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformtheme.h new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformtheme.h --- old/frameworkintegration-4.97.0/src/platformtheme/kdeplatformtheme.h 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kdeplatformtheme.h 2014-03-28 19:15:59.000000000 +0100 @@ -46,6 +46,8 @@ virtual QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const; virtual bool usePlatformNativeDialog(DialogType type) const; + virtual QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + private: void loadSettings(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/kfontsettingsdata.cpp new/frameworkintegration-4.98.0/src/platformtheme/kfontsettingsdata.cpp --- old/frameworkintegration-4.97.0/src/platformtheme/kfontsettingsdata.cpp 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/kfontsettingsdata.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -52,12 +52,12 @@ static const char DefaultFont[] = "Sans Serif"; static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = { - { GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif }, - { GeneralId, "fixed", "Monospace", 9, -1, QFont::TypeWriter }, - { GeneralId, "toolBarFont", DefaultFont, 8, -1, QFont::SansSerif }, - { GeneralId, "menuFont", DefaultFont, 9, -1, QFont::SansSerif }, - { "WM", "activeFont", DefaultFont, 8, -1, QFont::SansSerif }, - { GeneralId, "taskbarFont", DefaultFont, 9, -1, QFont::SansSerif }, + { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif }, + { GeneralId, "fixed", "Oxygen Mono", 9, -1, QFont::TypeWriter }, + { GeneralId, "toolBarFont", DefaultFont, 9, -1, QFont::SansSerif }, + { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif }, + { "WM", "activeFont", DefaultFont, 10, -1, QFont::SansSerif }, + { GeneralId, "taskbarFont", DefaultFont, 10, -1, QFont::SansSerif }, { GeneralId, "smallestReadableFont", DefaultFont, 8, -1, QFont::SansSerif } }; @@ -71,7 +71,7 @@ cachedFont->setStyleHint(fontData.StyleHint); if (!mKdeGlobals) { - mKdeGlobals = KSharedConfig::openConfig("kdeglobals"); + mKdeGlobals = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); } const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/khintssettings.cpp new/frameworkintegration-4.98.0/src/platformtheme/khintssettings.cpp --- old/frameworkintegration-4.97.0/src/platformtheme/khintssettings.cpp 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/khintssettings.cpp 2014-03-28 19:15:59.000000000 +0100 @@ -44,21 +44,21 @@ KHintsSettings::KHintsSettings() : QObject(0) { - KSharedConfig::Ptr ptr = KSharedConfig::openConfig("kdeglobals"); - KConfigGroup cg(ptr, "KDE"); + mKdeGlobals = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + KConfigGroup cg(mKdeGlobals, "KDE"); m_hints[QPlatformTheme::CursorFlashTime] = qBound(200, cg.readEntry("CursorBlinkRate", 1000), 2000); m_hints[QPlatformTheme::MouseDoubleClickInterval] = cg.readEntry("DoubleClickInterval", 400); m_hints[QPlatformTheme::StartDragDistance] = cg.readEntry("StartDragDist", 10); m_hints[QPlatformTheme::StartDragTime] = cg.readEntry("StartDragTime", 500); - KConfigGroup cgToolbar(ptr, "Toolbar style"); + KConfigGroup cgToolbar(mKdeGlobals, "Toolbar style"); m_hints[QPlatformTheme::ToolButtonStyle] = toolButtonStyle(cgToolbar); - KConfigGroup cgToolbarIcon(ptr, "MainToolbarIcons"); + KConfigGroup cgToolbarIcon(mKdeGlobals, "MainToolbarIcons"); m_hints[QPlatformTheme::ToolBarIconSize] = cgToolbarIcon.readEntry("Size", 22); m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = cg.readEntry("SingleClick", true); - KConfigGroup cgIcons(ptr, "Icons"); + KConfigGroup cgIcons(mKdeGlobals, "Icons"); m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "oxygen"); m_hints[QPlatformTheme::SystemIconFallbackThemeName] = "hicolor"; m_hints[QPlatformTheme::IconThemeSearchPaths] = xdgIconThemePaths(); @@ -131,9 +131,8 @@ void KHintsSettings::toolbarStyleChanged() { - KSharedConfig::Ptr ptr = KSharedConfig::openConfig("kdeglobals"); - ptr->reparseConfiguration(); - KConfigGroup cg(ptr, "Toolbar style"); + mKdeGlobals->reparseConfiguration(); + KConfigGroup cg(mKdeGlobals, "Toolbar style"); m_hints[QPlatformTheme::ToolButtonStyle] = toolButtonStyle(cg); //from gtksymbol.cpp @@ -149,9 +148,8 @@ void KHintsSettings::slotNotifyChange(int type, int arg) { - KSharedConfig::Ptr ptr = KSharedConfig::openConfig("kdeglobals"); - ptr->reparseConfiguration(); - KConfigGroup cg(ptr, "KDE"); + mKdeGlobals->reparseConfiguration(); + KConfigGroup cg(mKdeGlobals, "KDE"); switch (type) { case PaletteChanged: { @@ -205,8 +203,7 @@ { KIconLoader::Group iconGroup = (KIconLoader::Group) group; if (iconGroup != KIconLoader::MainToolbar) { - KSharedConfig::Ptr ptr = KSharedConfig::openConfig("kdeglobals"); - KConfigGroup cgIcons(ptr, "Icons"); + KConfigGroup cgIcons(mKdeGlobals, "Icons"); m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "oxygen"); return; } @@ -273,6 +270,5 @@ qDeleteAll(m_palettes); m_palettes.clear(); - KSharedConfig::Ptr globals = KSharedConfig::openConfig("kdeglobals"); - m_palettes[QPlatformTheme::SystemPalette] = new QPalette(KColorScheme::createApplicationPalette(globals)); + m_palettes[QPlatformTheme::SystemPalette] = new QPalette(KColorScheme::createApplicationPalette(mKdeGlobals)); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-4.97.0/src/platformtheme/khintssettings.h new/frameworkintegration-4.98.0/src/platformtheme/khintssettings.h --- old/frameworkintegration-4.97.0/src/platformtheme/khintssettings.h 2014-03-01 12:50:02.000000000 +0100 +++ new/frameworkintegration-4.98.0/src/platformtheme/khintssettings.h 2014-03-28 19:15:59.000000000 +0100 @@ -25,6 +25,7 @@ #include <QVariant> #include <qpa/qplatformtheme.h> +#include <ksharedconfig.h> class KConfigGroup; @@ -80,6 +81,7 @@ QStringList xdgIconThemePaths() const; QHash<QPlatformTheme::Palette, QPalette *> m_palettes; QHash<QPlatformTheme::ThemeHint, QVariant> m_hints; + KSharedConfigPtr mKdeGlobals; }; #endif //KHINTS_SETTINGS_H -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit attica-qt5 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 attica-qt5 for openSUSE:Factory checked in at 2014-04-02 17:21:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/attica-qt5 (Old) and /work/SRC/openSUSE:Factory/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "attica-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/attica-qt5/attica-qt5.changes 2014-03-10 12:18:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.attica-qt5.new/attica-qt5.changes 2014-04-02 17:21:44.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Mar 29 19:47:18 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: ---- attica-4.97.0.tar.xz New: ---- attica-4.98.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ attica-qt5.spec ++++++ --- /var/tmp/diff_new_pack.XLK26z/_old 2014-04-02 17:21:45.000000000 +0200 +++ /var/tmp/diff_new_pack.XLK26z/_new 2014-04-02 17:21:45.000000000 +0200 @@ -21,7 +21,7 @@ %define _libname KF5Attica Name: attica-qt5 -Version: 4.97.0 +Version: 4.98.0 Release: 0 Summary: Open Collaboration Service client library License: LGPL-2.1+ @@ -30,7 +30,7 @@ Source: %{rname}-%{version}.tar.xz Source99: baselibs.conf 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 ++++++ attica-4.97.0.tar.xz -> attica-4.98.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/attica-4.97.0/CMakeLists.txt new/attica-4.98.0/CMakeLists.txt --- old/attica-4.97.0/CMakeLists.txt 2014-03-01 12:50:48.000000000 +0100 +++ new/attica-4.98.0/CMakeLists.txt 2014-03-28 19:17:59.000000000 +0100 @@ -3,7 +3,7 @@ project(Attica) # ECM setup -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}) include(FeatureSummary) @@ -15,7 +15,7 @@ include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) -set(KF5_VERSION "4.97.0") +set(KF5_VERSION "4.98.0") ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX ATTICA -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kf5-filesystem 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 kf5-filesystem for openSUSE:Factory checked in at 2014-04-02 17:21:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kf5-filesystem (Old) and /work/SRC/openSUSE:Factory/.kf5-filesystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kf5-filesystem" Changes: -------- --- /work/SRC/openSUSE:Factory/kf5-filesystem/kf5-filesystem.changes 2014-03-10 12:17:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kf5-filesystem.new/kf5-filesystem.changes 2014-04-02 17:21:42.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Mar 29 20:20:58 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Bump to 4.98.0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kf5-filesystem.spec ++++++ --- /var/tmp/diff_new_pack.FQntcw/_old 2014-04-02 17:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.FQntcw/_new 2014-04-02 17:21:43.000000000 +0200 @@ -18,7 +18,7 @@ Name: kf5-filesystem Url: http://www.kde.org -Version: 4.97.0 +Version: 4.98.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KF5 Directory Layout ++++++ macros.kf5 ++++++ --- /var/tmp/diff_new_pack.FQntcw/_old 2014-04-02 17:21:43.000000000 +0200 +++ /var/tmp/diff_new_pack.FQntcw/_new 2014-04-02 17:21:43.000000000 +0200 @@ -25,7 +25,7 @@ %_kf5_servicetypesdir %{_kf5_sharedir}/kde5/servicetypes %_kf5_htmldir %{_kf5_sharedir}/doc/HTML -%_kf5_version 4.97.0 +%_kf5_version 4.98.0 %_kf5_build_type release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit extra-cmake-modules 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 extra-cmake-modules for openSUSE:Factory checked in at 2014-04-02 17:21:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old) and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "extra-cmake-modules" Changes: -------- --- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes 2014-03-10 12:17:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.extra-cmake-modules.new/extra-cmake-modules.changes 2014-04-02 17:21:40.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Mar 29 19:57:28 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.0.12 + * Buildsystem improvements + +------------------------------------------------------------------- Old: ---- extra-cmake-modules-0.0.11.tar.xz New: ---- extra-cmake-modules-0.0.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extra-cmake-modules.spec ++++++ --- /var/tmp/diff_new_pack.FvLcY6/_old 2014-04-02 17:21:41.000000000 +0200 +++ /var/tmp/diff_new_pack.FvLcY6/_new 2014-04-02 17:21:41.000000000 +0200 @@ -21,7 +21,7 @@ License: BSD-3-Clause Group: Development/Tools/Other Url: https://projects.kde.org/projects/kdesupport/extra-cmake-modules -Version: 0.0.11 +Version: 0.0.12 Release: 0 Source0: %{name}-%{version}.tar.xz BuildArch: noarch ++++++ extra-cmake-modules-0.0.11.tar.xz -> extra-cmake-modules-0.0.12.tar.xz ++++++ ++++ 1958 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 glucat 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 glucat for openSUSE:Factory checked in at 2014-04-02 17:20:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glucat (Old) and /work/SRC/openSUSE:Factory/.glucat.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glucat" Changes: -------- --- /work/SRC/openSUSE:Factory/glucat/glucat.changes 2013-08-01 15:35:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glucat.new/glucat.changes 2014-04-02 17:20:16.000000000 +0200 @@ -1,0 +2,27 @@ +Mon Mar 31 09:42:12 UTC 2014 - badshah400(a)gmail.com + +- Update to version 0.7.2: + + When used with PyClical now generates IPython notebooks + + The Pyclical tutorials are now accompanied by corresponding + IPython notebooks. + + The nork() function in matrix.h and matrix_imp.h is now + accompanied by the signed_perm_nork() function, which is + faster for the case used by fast<>() in matrix_mult_imp.h + + Use of the Boost pool allocator with framed_multi<> is now + optional, controlled via the new symbol + _GLUCAT_USE_BOOST_POOL_ALLOC + + GluCat compiles cleanly with g++ 4.8: does not trigger the + "unused local typedefs" warning caused by the addition of + -Wunused-local-typedefs to -Wall in g++ 4.8. See + http://gcc.gnu.org/ml/gcc-patches/2011-07/msg02460.html + http://gcc.gnu.org/ml/gcc-patches/2012-05/msg01388.html + + Also compiles cleanly and builds correctly with clang++ 3.4 +- Drop glucat-build-with-updated-boost.patch: incorporated + upstream +- Implement a %check section with included tests +- Drop conditionals solely relevant to end-of-life openSUSE + versions +- Do not package unnecessary INSTALL file +- Update year in specfile COPYRIGHT. + +------------------------------------------------------------------- Old: ---- glucat-0.7.1.tar.gz glucat-build-with-updated-boost.patch New: ---- glucat-0.7.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glucat.spec ++++++ --- /var/tmp/diff_new_pack.E1M6Fp/_old 2014-04-02 17:20:17.000000000 +0200 +++ /var/tmp/diff_new_pack.E1M6Fp/_new 2014-04-02 17:20:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package glucat # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: glucat -Version: 0.7.1 +Version: 0.7.2 Release: 0 Summary: Library of C++ templates implementing universal Clifford algebras License: LGPL-3.0 @@ -25,8 +25,6 @@ Url: http://glucat.sourceforge.net/ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Patch0: glucat-fix-32bit-build.patch -#PATCH-FIX-UPSTREAM glucat-build-with-updated-boost.patch badshah400(a)gmail.com -- Fix building with updated boost; patch came from upstream -Patch1: glucat-build-with-updated-boost.patch BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: python-Cython @@ -74,24 +72,22 @@ %ifarch i586 ppc %patch0 -p1 %endif -%patch1 -p1 + %build -# Parallel make fails for openSUSE 11.4 and lower -%configure --prefix=%{buildroot}%{_prefix}/ +%configure --prefix=%{buildroot}%{_prefix} -%if 0%{?suse_version} >= 1210 make %{?_smp_mflags} -%else -make -%endif %install make DESTDIR=%{buildroot} install +%check +./test/test.sh + %files devel %defattr(-,root,root) %{_includedir}/%{name}/ -%doc AUTHORS INSTALL ChangeLog README COPYING TODO +%doc AUTHORS ChangeLog README COPYING TODO %files -n python-glucat %defattr(-,root,root) ++++++ glucat-0.7.1.tar.gz -> glucat-0.7.2.tar.gz ++++++ ++++ 177071 lines of diff (skipped) ++++++ glucat-fix-32bit-build.patch ++++++ --- /var/tmp/diff_new_pack.E1M6Fp/_old 2014-04-02 17:20:18.000000000 +0200 +++ /var/tmp/diff_new_pack.E1M6Fp/_new 2014-04-02 17:20:18.000000000 +0200 @@ -1,13 +1,13 @@ -Index: glucat-0.7.0/glucat/framed_multi_imp.h +Index: glucat-0.7.2/glucat/framed_multi_imp.h =================================================================== ---- glucat-0.7.0.orig/glucat/framed_multi_imp.h -+++ glucat-0.7.0/glucat/framed_multi_imp.h -@@ -215,7 +215,7 @@ namespace glucat +--- glucat-0.7.2.orig/glucat/framed_multi_imp.h ++++ glucat-0.7.2/glucat/framed_multi_imp.h +@@ -217,7 +217,7 @@ namespace glucat const Scalar_T eps = std::numeric_limits<Scalar_T>::epsilon(); const Scalar_T tol = traits_t::abs(val_norm * eps * eps); #if defined(_GLUCAT_MAP_IS_HASH) - const size_t max_size = std::min(algebra_dim, matrix::nnz(val.m_matrix)); + const size_t max_size = std::min<size_t>(algebra_dim, matrix::nnz(val.m_matrix)); *this = multivector_t(_GLUCAT_HASH_SIZE_T(max_size)); - #endif + #endif for (set_value_t -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-transformers 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 ghc-transformers for openSUSE:Factory checked in at 2014-04-02 17:20:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-transformers (Old) and /work/SRC/openSUSE:Factory/.ghc-transformers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-transformers" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-transformers/ghc-transformers.changes 2013-08-01 15:34:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-transformers.new/ghc-transformers.changes 2014-04-02 17:20:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Oct 31 17:47:52 UTC 2013 - peter.trommler(a)ohm-hochschule.de + +- regenerate spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-transformers.spec ++++++ --- /var/tmp/diff_new_pack.XHKbVX/_old 2014-04-02 17:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.XHKbVX/_new 2014-04-02 17:20:05.000000000 +0200 @@ -18,40 +18,50 @@ %global pkg_name transformers -%global common_summary Haskell concrete functor and monad transformers library - -%global common_description A portable library of functor and monad transformers, inspired by the paper "Functional Programming with Overloading and Higher-Order Polymorphism", by Mark P Jones, in Advanced School of Functional Programming, 1995 (http://web.cecs.pdx.edu/~mpj/pubs/springschool.html). - Name: ghc-transformers Version: 0.3.0.0 Release: 0 -Summary: %{common_summary} +Summary: Concrete functor and monad transformers License: BSD-3-Clause Group: System/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# BEGIN cabal2spec Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_na… -ExclusiveArch: %{ix86} x86_64 %{ghc_arches} +BuildRoot: %{_tmppath}/%{name}-%{version}-build + BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros -# END cabal2spec %description -%{common_description} +A portable library of functor and monad transformers, inspired by the paper +\"Functional Programming with Overloading and Higher-Order Polymorphism\", by +Mark P Jones, in /Advanced School of Functional Programming/, 1995 +(<http://web.cecs.pdx.edu/~mpj/pubs/springschool.html>). + +This package contains: + +* the monad transformer class (in "Control.Monad.Trans.Class") + +* concrete functor and monad transformers, each with associated operations and +functions to lift operations associated with other transformers. + +It can be used on its own in portable Haskell code, or with the monad classes +in the @mtl@ or @monads-tf@ packages, which automatically lift operations +introduced by monad transformers through other transformers. + %package devel Summary: Haskell %{pkg_name} library development files -Group: Development/Languages/Other -Requires: ghc-compiler -Requires(post): ghc-compiler -Requires(postun): ghc-compiler +Group: Development/Libraries/Other +Provides: %{name}-static = %{version}-%{release} +Requires: ghc-compiler = %{ghc_version} +Requires(post): ghc-compiler = %{ghc_version} +Requires(postun): ghc-compiler = %{ghc_version} Requires: %{name} = %{version}-%{release} %description devel -%{common_description} -This package contains the development files. +This package provides the Haskell %{pkg_name} library development files. + %prep %setup -q -n %{pkg_name}-%{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 caribou 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 caribou for openSUSE:Factory checked in at 2014-04-02 17:19:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caribou (Old) and /work/SRC/openSUSE:Factory/.caribou.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "caribou" Changes: -------- --- /work/SRC/openSUSE:Factory/caribou/caribou.changes 2013-12-02 09:38:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caribou.new/caribou.changes 2014-04-02 17:19:52.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Mar 14 14:39:42 UTC 2014 - mgorse(a)suse.com + +- Move caribou schema and keyboard layout files to a caribou-common + package. They are required by libcaribou, which is used by + gnome-shell if the on-screen keyboard is enabled. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caribou.spec ++++++ --- /var/tmp/diff_new_pack.y9L0NB/_old 2014-04-02 17:19:52.000000000 +0200 +++ /var/tmp/diff_new_pack.y9L0NB/_new 2014-04-02 17:19:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package caribou # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -103,6 +103,7 @@ %package -n libcaribou0 Summary: On-screen Keyboard for GNOME -- Library Group: System/Libraries +Requires: %{name}-common >= %{version} %description -n libcaribou0 Caribou is a text entry and UI navigation application being developed @@ -110,6 +111,16 @@ for Caribou is to create a usable solution for people whose primary way of accessing a computer is a switch device. +%package common +Summary: On-screen Keyboard for GNOME -- Common data files +Group: System/Libraries + +%description common +Caribou is a text entry and UI navigation application being developed +as an alternative to the Gnome On-screen Keyboard. The overarching goal +for Caribou is to create a usable solution for people whose primary way +of accessing a computer is a switch device. + %package -n typelib-1_0-Caribou-1_0 Summary: On-screen Keyboard for GNOME -- Introspection bindings Group: System/Libraries @@ -174,10 +185,8 @@ %{_bindir}/caribou-preferences %{python_sitelib}/caribou/ %{_datadir}/antler/ -%{_datadir}/caribou/ %{_datadir}/dbus-1/services/org.gnome.Caribou.Antler.service %{_datadir}/glib-2.0/schemas/org.gnome.antler.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.caribou.gschema.xml %{_libexecdir}/antler-keyboard %{_sysconfdir}/xdg/autostart/caribou-autostart.desktop @@ -199,6 +208,11 @@ %defattr(-, root, root) %{_libdir}/libcaribou.so.* +%files common +%defattr(-, root, root) +%{_datadir}/caribou/ +%{_datadir}/glib-2.0/schemas/org.gnome.caribou.gschema.xml + %files -n typelib-1_0-Caribou-1_0 %defattr(-, root, root) %{_libdir}/girepository-1.0/Caribou-1.0.typelib -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ghc-blaze-html 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 ghc-blaze-html for openSUSE:Factory checked in at 2014-04-02 17:19:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-blaze-html (Old) and /work/SRC/openSUSE:Factory/.ghc-blaze-html.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-blaze-html" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-blaze-html.new/ghc-blaze-html.changes 2014-04-02 17:19:31.000000000 +0200 @@ -0,0 +1,38 @@ +------------------------------------------------------------------- +Mon Oct 21 14:45:53 UTC 2013 - sbahling(a)suse.com + +- spec file: Add %defattr(-,root,root,-) to %files devel section + +------------------------------------------------------------------- +Wed May 15 14:25:47 UTC 2013 - peter.trommler(a)ohm-hochschule.de + +- update to 0.6.1.1 from upstream (no changelog) +* base, keygen, and source elements are considered leaf elements +* dependencies for test framework adjusted + +------------------------------------------------------------------- +Wed Oct 3 07:20:49 UTC 2012 - peter.trommler(a)ohm-hochschule.de + +- update to 0.5.1.0 from upstream (no changelog) + +------------------------------------------------------------------- +Wed Jul 4 17:18:33 UTC 2012 - peter.trommler(a)ohm-hochschule.de + +- update to 0.5.0.0 from upstream (no changelog) + +------------------------------------------------------------------- +Tue Jun 5 16:55:36 UTC 2012 - peter.trommler(a)ohm-hochschule.de + +- cabal2spec 0.25.5 template for spec file +- required for ghc-rpm-macros 0.90 + +------------------------------------------------------------------- +Fri Mar 16 13:58:23 UTC 2012 - peter.trommler(a)ohm-hochschule.de + +- added BuildRoof fo SLE_11_SP1/2 + +------------------------------------------------------------------- +Fri Mar 2 16:19:12 UTC 2012 - peter.trommler(a)ohm-hochschule.de + +- initial packaging + New: ---- blaze-html-0.6.1.1.tar.gz ghc-blaze-html.changes ghc-blaze-html.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-blaze-html.spec ++++++ # # spec file for package ghc-blaze-html # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %global pkg_name blaze-html Name: ghc-blaze-html Version: 0.6.1.1 Release: 0 Summary: A blazingly fast HTML combinator library for Haskell License: BSD-3-Clause Group: System/Libraries Url: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_na… BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-text-devel # End cabal-rpm deps %description A blazingly fast HTML combinator library for the Haskell programming language. The Text.Blaze module is a good starting point, as well as this tutorial: <http://jaspervdj.be/blaze/tutorial.html>. %package devel Summary: Haskell %{pkg_name} library development files Group: Development/Libraries/Other Requires: ghc-compiler Requires(post): ghc-compiler Requires(postun): ghc-compiler Requires: %{name} = %{version}-%{release} %description devel A blazingly fast HTML combinator library for the Haskell programming language. The Text.Blaze module is a good starting point, as well as this tutorial: <http://jaspervdj.be/blaze/tutorial.html>. %prep %setup -q -n %{pkg_name}-%{version} %build %ghc_lib_build %install %ghc_lib_install %post devel %ghc_pkg_recache %postun devel %ghc_pkg_recache %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE %files devel -f %{name}-devel.files %defattr(-,root,root,-) %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autofs 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 autofs for openSUSE:Factory checked in at 2014-04-02 17:19:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autofs" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2014-03-26 16:40:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2014-04-02 17:19:22.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 25 11:23:27 UTC 2014 - werner(a)suse.de + +- Avoid bad timings and timeouts if a shutdown was done by a remote + user via su and with autofs based home directory + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.service ++++++ --- /var/tmp/diff_new_pack.EEHiE8/_old 2014-04-02 17:19:23.000000000 +0200 +++ /var/tmp/diff_new_pack.EEHiE8/_new 2014-04-02 17:19:23.000000000 +0200 @@ -1,6 +1,8 @@ [Unit] Description=Automounts filesystems on demand -After=network.target remote-fs.target ypbind.service +Documentation=man:automount(8) man:autofs(5) +After=network.target remote-fs.target nss-lookup.target nss-user-lookup.target +Before=systemd-logind.service [Service] Type=forking -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aranym 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 aranym for openSUSE:Factory checked in at 2014-04-02 17:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aranym (Old) and /work/SRC/openSUSE:Factory/.aranym.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aranym" Changes: -------- --- /work/SRC/openSUSE:Factory/aranym/aranym.changes 2014-01-07 14:32:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aranym.new/aranym.changes 2014-04-02 17:19:18.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 30 19:27:48 UTC 2014 - schwab(a)linux-m68k.org + +- lilo-load-to-fastram.patch: implement [LILO] LoadToFastRAM + +------------------------------------------------------------------- New: ---- lilo-load-to-fastram.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aranym.spec ++++++ --- /var/tmp/diff_new_pack.zhXAaM/_old 2014-04-02 17:19:19.000000000 +0200 +++ /var/tmp/diff_new_pack.zhXAaM/_new 2014-04-02 17:19:19.000000000 +0200 @@ -41,6 +41,7 @@ Patch3: fpu-fbccl.patch Patch4: no-map-32bit.patch Patch5: fpu-nan-bits.patch +Patch6: lilo-load-to-fastram.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -78,6 +79,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # Don't remove -g from CFLAGS sed -i -e 's,/-g,/-:,' configure.ac configure ++++++ lilo-load-to-fastram.patch ++++++ Index: aranym-0.9.15/src/bootos_linux.cpp =================================================================== --- aranym-0.9.15.orig/src/bootos_linux.cpp +++ aranym-0.9.15/src/bootos_linux.cpp @@ -409,9 +409,10 @@ int LinuxBootOs::checkKernel(void) Elf32_Ehdr *kexec_elf; /* header of kernel executable */ Elf32_Phdr *kernel_phdrs; unsigned long min_addr=0xffffffff, max_addr=0; - unsigned long kernel_size, mem_ptr; + unsigned long kernel_size, mem_ptr, kernel_offset; int i; const char *kname, *kernel_name="vmlinux"; + bool load_to_fastram = bx_options.lilo.load_to_fastram && FastRAMSize > 0; kexec_elf = (Elf32_Ehdr *) kernel; if (memcmp( &kexec_elf->e_ident[EI_MAG0], ELFMAG, SELFMAG ) == 0) { @@ -475,6 +476,10 @@ int LinuxBootOs::checkKernel(void) kernel_size = max_addr - min_addr; D(bug("lilo: kernel_size=%lu",kernel_size)); + if (load_to_fastram) + kernel_offset = FastRAMBase; + else + kernel_offset = 0; mem_ptr = KERNEL_START; for (i=0; i<SDL_SwapBE16(kexec_elf->e_phnum); i++) { unsigned long segment_length; @@ -490,21 +495,29 @@ int LinuxBootOs::checkKernel(void) } segment_ptr = SDL_SwapBE32(kernel_phdrs[i].p_vaddr)-PAGE_SIZE; - memcpy(((char *)RAMBaseHost) + mem_ptr + segment_ptr, ((char *) kexec_elf) + segment_offset, segment_length); + if (load_to_fastram) + memcpy(FastRAMBaseHost + mem_ptr + segment_ptr, (char *) kexec_elf + segment_offset, segment_length); + else + memcpy(RAMBaseHost + mem_ptr + segment_ptr, (char *) kexec_elf + segment_offset, segment_length); - D(bug("lilo: Copied segment %d: 0x%08x,0x%08x at 0x%08x",i,segment_offset,segment_length,mem_ptr+segment_ptr)); + D(bug("lilo: Copied segment %d: 0x%08x,0x%08x at 0x%08x",i,segment_offset,segment_length,kernel_offset+mem_ptr+segment_ptr)); } /*--- Copy the ramdisk after kernel (and reserved bootinfo) ---*/ if (ramdisk && ramdisk_length) { unsigned long rd_start; unsigned long rd_len; + unsigned long rd_offset; + if (load_to_fastram) + rd_offset = KERNEL_START + kernel_size + MAX_BI_SIZE; + else + rd_offset = 0; rd_len = ramdisk_length - RAMDISK_FS_START; - if (FastRAMSize>rd_len) { + if (FastRAMSize > rd_offset + rd_len) { /* Load in FastRAM */ - rd_start = FastRAMBase; - memcpy(FastRAMBaseHost, ((unsigned char *)ramdisk) + RAMDISK_FS_START, rd_len); + rd_start = FastRAMBase + rd_offset; + memcpy(FastRAMBaseHost + rd_offset, (unsigned char *)ramdisk + RAMDISK_FS_START, rd_len); } else { /* Load in ST-RAM */ rd_start = RAMSize - rd_len; @@ -519,7 +532,7 @@ int LinuxBootOs::checkKernel(void) for (i=0; i<16; i++) { uint32 *tmp; - tmp = (uint32 *)(((unsigned char *)FastRAMBaseHost) /*+ rd_start*/ + 512); + tmp = (uint32 *)((unsigned char *)FastRAMBaseHost + rd_offset + 512); D(bug("lilo: ramdisk[%d]=0x%08x",i, SDL_SwapBE32(tmp[i]))); } #endif @@ -557,10 +570,14 @@ int LinuxBootOs::checkKernel(void) bi.mch_type = SDL_SwapBE32(ATARI_MACH_AB40); bi.num_memory=0; - ADD_CHUNK(0, RAMSize); + /* If loading to FastRAM switch the order of ST and Fast RAM */ + if (!load_to_fastram) + ADD_CHUNK(0, RAMSize); if (FastRAMSize>0) { ADD_CHUNK(FastRAMBase, FastRAMSize); } + if (load_to_fastram) + ADD_CHUNK(0, RAMSize); bi.num_memory=SDL_SwapBE32(bi.num_memory); if (!create_bootinfo()) { @@ -569,24 +586,30 @@ int LinuxBootOs::checkKernel(void) } /*--- Copy boot info in RAM ---*/ - memcpy(RAMBaseHost + KERNEL_START + kernel_size, &bi_union.record, bi_size); - D(bug("lilo: bootinfo at 0x%08x",KERNEL_START + kernel_size)); + if (load_to_fastram) + memcpy(FastRAMBaseHost + KERNEL_START + kernel_size, &bi_union.record, bi_size); + else + memcpy(RAMBaseHost + KERNEL_START + kernel_size, &bi_union.record, bi_size); + D(bug("lilo: bootinfo at 0x%08x", kernel_offset + KERNEL_START + kernel_size)); for (i=0; i<16; i++) { uint32 *tmp; - tmp = (uint32 *)(((unsigned char *)RAMBaseHost) + KERNEL_START + kernel_size); + if (load_to_fastram) + tmp = (uint32 *)((unsigned char *)FastRAMBaseHost + KERNEL_START + kernel_size); + else + tmp = (uint32 *)((unsigned char *)RAMBaseHost + KERNEL_START + kernel_size); D(bug("lilo: bi_union.record[%d]=0x%08x",i, SDL_SwapBE32(tmp[i]))); } /*--- Init SP & PC ---*/ uint32 *tmp = (uint32 *)RAMBaseHost; - tmp[0] = SDL_SwapBE32(KERNEL_START); /* SP */ + tmp[0] = SDL_SwapBE32(kernel_offset + KERNEL_START); /* SP */ tmp[1] = SDL_SwapBE32(0x00e00000); /* PC = ROMBase */ - ROMBaseHost[4] = KERNEL_START >> 24; - ROMBaseHost[5] = KERNEL_START >> 16; - ROMBaseHost[6] = KERNEL_START >> 8; - ROMBaseHost[7] = KERNEL_START & 0xff; + ROMBaseHost[4] = (kernel_offset + KERNEL_START) >> 24; + ROMBaseHost[5] = (kernel_offset + KERNEL_START) >> 16; + ROMBaseHost[6] = (kernel_offset + KERNEL_START) >> 8; + ROMBaseHost[7] = (kernel_offset + KERNEL_START) & 0xff; D(bug("lilo: ok")); Index: aranym-0.9.15/src/include/parameters.h =================================================================== --- aranym-0.9.15.orig/src/include/parameters.h +++ aranym-0.9.15/src/include/parameters.h @@ -155,6 +155,7 @@ typedef struct { char kernel[512]; /* /path/to/vmlinux[.gz] */ char args[512]; /* command line arguments for kernel */ char ramdisk[512]; /* /path/to/ramdisk[.gz] */ + bool load_to_fastram; /* load kernel to Fast RAM */ } bx_lilo_options_t; // Midi options Index: aranym-0.9.15/src/parameters.cpp =================================================================== --- aranym-0.9.15.orig/src/parameters.cpp +++ aranym-0.9.15/src/parameters.cpp @@ -595,6 +595,7 @@ struct Config_Tag lilo_conf[]={ { "Kernel", Path_Tag, &LILO(kernel), sizeof(LILO(kernel)), 0}, { "Args", String_Tag, &LILO(args), sizeof(LILO(args)), 0}, { "Ramdisk", Path_Tag, &LILO(ramdisk), sizeof(LILO(ramdisk)), 0}, + { "LoadToFastRam", Bool_Tag, &LILO(load_to_fastram), 0, 0}, { NULL , Error_Tag, NULL, 0, 0 } }; @@ -603,6 +604,7 @@ void preset_lilo() safe_strncpy(LILO(kernel), "linux.bin", sizeof(LILO(kernel))); safe_strncpy(LILO(args), "root=/dev/ram video=atafb:vga16", sizeof(LILO(args))); safe_strncpy(LILO(ramdisk), "root.bin", sizeof(LILO(ramdisk))); + LILO(load_to_fastram) = false; } void postload_lilo() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0