May 2014 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2014-05-05 21:12:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2014-05-02 13:53:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2014-05-05 21:12:38.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 5 07:14:50 UTC 2014 - tchvatal(a)suse.com + +- Use correct paths for dicts locations. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.PFBxTE/_old 2014-05-05 21:12:44.000000000 +0200 +++ /var/tmp/diff_new_pack.PFBxTE/_new 2014-05-05 21:12:44.000000000 +0200 @@ -946,9 +946,9 @@ --with-jdk-home=$JAVA_HOME \ --with-beanshell-jar=%{_datadir}/java/bsh2/bsh.jar \ --with-ant-home=%{_datadir}/ant \ - --with-external-dict-dir=%{_datadir}/myspell \ - --with-external-hyph-dir=%{_datadir}/ooo/hyphen \ - --with-external-thes-dir=%{_datadir}/ooo/thesaurus \ + --with-external-dict-dir=%{_datadir}/hunspell \ + --with-external-hyph-dir=%{_datadir}/hyphen \ + --with-external-thes-dir=%{_datadir}/mythes \ --with-help \ --enable-odk \ --with-doxygen \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkscreen for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package libkscreen for openSUSE:Factory checked in at 2014-05-05 21:12:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkscreen (Old) and /work/SRC/openSUSE:Factory/.libkscreen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkscreen" Changes: -------- --- /work/SRC/openSUSE:Factory/libkscreen/libkscreen.changes 2014-05-02 13:59:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes 2014-05-05 21:12:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 4 19:20:47 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to version 1.0.3: + * Bugfix release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkscreen-1.0.2.tar.xz New: ---- libkscreen-1.0.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen.spec ++++++ --- /var/tmp/diff_new_pack.Orum7g/_old 2014-05-05 21:12:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Orum7g/_new 2014-05-05 21:12:21.000000000 +0200 @@ -19,7 +19,7 @@ # %define soversion 1 Name: libkscreen -Version: 1.0.2 +Version: 1.0.3 Release: 0 Summary: KDE's screen management library License: GPL-2.0+ ++++++ libkscreen-1.0.2.tar.xz -> libkscreen-1.0.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/fake/parser.cpp new/libkscreen-1.0.3/backends/fake/parser.cpp --- old/libkscreen-1.0.2/backends/fake/parser.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/fake/parser.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -69,6 +69,7 @@ screen->setMinSize(Parser::sizeFromJson(data["minSize"].toMap())); screen->setMaxSize(Parser::sizeFromJson(data["maxSize"].toMap())); screen->setCurrentSize(Parser::sizeFromJson(data["currentSize"].toMap())); + screen->setMaxActiveOutputsCount(data["maxActiveOutputsCount"].toInt()); return screen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr/xrandr.cpp new/libkscreen-1.0.3/backends/xrandr/xrandr.cpp --- old/libkscreen-1.0.2/backends/xrandr/xrandr.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr/xrandr.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -122,6 +122,9 @@ } else { RROutput primary = XRRGetOutputPrimary(XRandR::display(), XRandR::rootWindow()); xOutput->update((output == primary) ? XRandROutput::SetPrimary : XRandROutput::UnsetPrimary); + if (output == primary) { + s_internalConfig->m_primaryOutput = output; + } } KScreen::ConfigMonitor::instance()->notifyUpdate(); @@ -224,7 +227,7 @@ return result; } else { len = 0; - delete result; + delete[] result; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr/xrandrconfig.cpp new/libkscreen-1.0.3/backends/xrandr/xrandrconfig.cpp --- old/libkscreen-1.0.2/backends/xrandr/xrandrconfig.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr/xrandrconfig.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -35,6 +35,7 @@ XRandRConfig::XRandRConfig() : QObject() + , m_primaryOutput(-1) , m_screen(new XRandRScreen(this)) { XRRScreenResources* resources = XRandR::screenResources(); @@ -49,6 +50,9 @@ XRandROutput *output = createNewOutput(id, (id == primary)); m_outputs.insert(id, output); + if (id == primary) { + m_primaryOutput = output->id(); + } } XRRFreeScreenResources(resources); @@ -64,10 +68,14 @@ RROutput primary = XRRGetOutputPrimary(XRandR::display(), XRandR::rootWindow()); + m_primaryOutput = -1; XRandROutput::Map::Iterator iter; for (iter = m_outputs.begin(); iter != m_outputs.end(); ++iter) { XRandROutput *output = iter.value(); output->update((iter.key() == (int) primary) ? XRandROutput::SetPrimary : XRandROutput::UnsetPrimary); + if (iter.key() == (int) primary) { + m_primaryOutput = output->id(); + } } } @@ -82,11 +90,14 @@ primary = XRRGetOutputPrimary(XRandR::display(), XRandR::rootWindow()); XRandROutput *output = createNewOutput(id, (id == primary)); m_outputs.insert(id, output); + if (id == primary) { + m_primaryOutput = id; + } } XRandROutput* XRandRConfig::createNewOutput(RROutput id, bool primary) { - XRandROutput *xOutput = new XRandROutput(id, (id == primary), this); + XRandROutput *xOutput = new XRandROutput(id, primary, this); connect(xOutput, SIGNAL(outputRemoved(int)), SLOT(outputRemovedSlot(int))); return xOutput; @@ -114,6 +125,9 @@ config->setOutputs(kscreenOutputs); config->setScreen(m_screen->toKScreenScreen(config)); + if (m_primaryOutput != -1 && config->primaryOutput()->id() != m_primaryOutput) { + config->setPrimaryOutput(kscreenOutputs.value(m_primaryOutput)); + } return config; } @@ -142,6 +156,10 @@ } output->updateKScreenOutput(kscreenOutput); } + + if (config->primaryOutput()->id() != m_primaryOutput) { + config->setPrimaryOutput(config->output(m_primaryOutput)); + } } void XRandRConfig::applyKScreenConfig(KScreen::Config *config) @@ -507,6 +525,12 @@ 0, 0, None, RR_Rotate_0, NULL, 0); kDebug(dXndr()) << "XRRSetCrtcConfig() returned" << s; + + // Update the cached output now, otherwise we get RRNotify_CrtcChange notification + // for an outdated output, which can lead to a crash. + if (s == RRSetConfigSuccess) { + m_outputs.value(output->id())->update(); + } return (s == RRSetConfigSuccess); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr/xrandrconfig.h new/libkscreen-1.0.3/backends/xrandr/xrandrconfig.h --- old/libkscreen-1.0.2/backends/xrandr/xrandrconfig.h 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr/xrandrconfig.h 2014-05-04 19:25:33.000000000 +0200 @@ -46,6 +46,7 @@ void updateKScreenConfig(KScreen::Config *config) const; void applyKScreenConfig(KScreen::Config *config); + int m_primaryOutput; private: /** * We need to print stuff to discover the damn bug diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr/xrandroutput.cpp new/libkscreen-1.0.3/backends/xrandr/xrandroutput.cpp --- old/libkscreen-1.0.2/backends/xrandr/xrandroutput.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr/xrandroutput.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -116,7 +116,7 @@ quint8 *data = XRandR::outputEdid(m_id, len); if (data) { m_edid = new KScreen::Edid(data, len, 0); - delete data; + delete[] data; } else { m_edid = new KScreen::Edid(0, 0, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr/xrandrscreen.cpp new/libkscreen-1.0.3/backends/xrandr/xrandrscreen.cpp --- old/libkscreen-1.0.2/backends/xrandr/xrandrscreen.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr/xrandrscreen.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -60,6 +60,7 @@ kscreenScreen->setMaxSize(m_maxSize); kscreenScreen->setMinSize(m_minSize); kscreenScreen->setCurrentSize(m_currentSize); + kscreenScreen->setMaxActiveOutputsCount(XRandR::screenResources()->ncrtc); return kscreenScreen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/backends/xrandr1.1/xrandr11.cpp new/libkscreen-1.0.3/backends/xrandr1.1/xrandr11.cpp --- old/libkscreen-1.0.2/backends/xrandr1.1/xrandr11.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/backends/xrandr1.1/xrandr11.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -38,7 +38,7 @@ XRandR11::XRandR11(QObject* parent) : QObject(parent) , m_valid(false) - , m_x11Helper(new XRandRX11Helper()) + , m_x11Helper(0) , m_currentConfig(0) , m_currentTimestamp(0) { @@ -56,6 +56,8 @@ return; } + m_x11Helper = new XRandRX11Helper(); + connect(m_x11Helper, SIGNAL(outputsChanged()), SLOT(updateConfig())); m_valid = true; @@ -95,6 +97,7 @@ screen->setCurrentSize(QSize(xcbScreen->width_in_pixels, xcbScreen->height_in_pixels)); screen->setMaxSize(QSize(size->max_width, size->max_height)); screen->setMinSize(QSize(size->min_width, size->min_height)); + screen->setMaxActiveOutputsCount(1); config->setScreen(screen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/CMakeLists.txt new/libkscreen-1.0.3/src/CMakeLists.txt --- old/libkscreen-1.0.2/src/CMakeLists.txt 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/CMakeLists.txt 2014-05-04 19:25:33.000000000 +0200 @@ -30,7 +30,7 @@ screen.h config.h configmonitor.h - DESTINATION include/kscreen) + DESTINATION ${INCLUDE_INSTALL_DIR}/kscreen) if(NOT WIN32) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kscreen.pc.in ${CMAKE_CURRENT_BINARY_DIR}/kscreen.pc @ONLY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/config.cpp new/libkscreen-1.0.3/src/config.cpp --- old/libkscreen-1.0.2/src/config.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/config.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -31,11 +31,13 @@ public: Private(): valid(true), - screen(0) + screen(0), + primaryOutput(0) { } Private(const Private &other): - valid(other.valid) + valid(other.valid), + primaryOutput(other.primaryOutput) { screen = other.screen->clone(); Q_FOREACH (Output *otherOutput, other.outputs) { @@ -45,6 +47,7 @@ bool valid; Screen* screen; + Output* primaryOutput; OutputList outputs; }; @@ -83,30 +86,33 @@ QSize outputSize; Output* currentOutput = 0; OutputList outputs = config->outputs(); + int enabledOutputsCount = 0; Q_FOREACH(Output *output, outputs) { if (!output->isEnabled()) { continue; } + ++enabledOutputsCount; + currentOutput = currentConfig->output(output->id()); //If there is no such output if (!currentOutput) { - qWarning() << "The output:" << output->id() << "does not exists"; + qDebug() << "The output:" << output->id() << "does not exists"; return false; } //If the output is not connected if (!currentOutput->isConnected()) { - qWarning() << "The output:" << output->id() << "is not connected"; + qDebug() << "The output:" << output->id() << "is not connected"; return false; } //if there is no currentMode if (output->currentModeId().isEmpty()) { - qWarning() << "The output:" << output->id() << "has no currentModeId"; + qDebug() << "The output:" << output->id() << "has no currentModeId"; return false; } //If the mode is not found in the current output if (!currentOutput->mode(output->currentModeId())) { - qWarning() << "The output:" << output->id() << "has no mode:" << output->currentModeId(); + qDebug() << "The output:" << output->id() << "has no mode:" << output->currentModeId(); return false; } @@ -141,12 +147,18 @@ } } + const int maxEnabledOutputsCount = config->screen()->maxActiveOutputsCount(); + if (enabledOutputsCount > maxEnabledOutputsCount) { + qDebug() << "Too many active screens. Requested: " << enabledOutputsCount << ", Max: " << maxEnabledOutputsCount; + return false; + } + if (rect.width() > config->screen()->maxSize().width()) { - qWarning() << "The configuration has too much width:" << rect.width(); + qDebug() << "The configuration has too much width:" << rect.width(); return false; } if (rect.height() > config->screen()->maxSize().height()) { - qWarning() << "The configuration has too much height:" << rect.height(); + qDebug() << "The configuration has too much height:" << rect.height(); return false; } @@ -223,14 +235,27 @@ Output* Config::primaryOutput() const { + if (d->primaryOutput) { + return d->primaryOutput; + } + Q_FOREACH(Output* output, d->outputs) { if (output->isPrimary()) { - return output; + d->primaryOutput = output; + return d->primaryOutput; } } + return 0; } +void Config::setPrimaryOutput(Output* output) +{ + d->primaryOutput = output; + + Q_EMIT primaryOutputChanged(output); +} + void Config::addOutput(Output* output) { d->outputs.insert(output->id(), output); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/config.h new/libkscreen-1.0.3/src/config.h --- old/libkscreen-1.0.2/src/config.h 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/config.h 2014-05-04 19:25:33.000000000 +0200 @@ -53,6 +53,7 @@ QHash<int, Output*> outputs() const; QHash<int, Output*> connectedOutputs() const; Output* primaryOutput() const; + void setPrimaryOutput(Output *output); void addOutput(Output *output); void removeOutput(int outputId); void setOutputs(OutputList outputs); @@ -63,6 +64,7 @@ Q_SIGNALS: void outputAdded(Output *output); void outputRemoved(int outputId); + void primaryOutputChanged(KScreen::Output *output); private: Q_DISABLE_COPY(Config) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/kscreen.pc.in new/libkscreen-1.0.3/src/kscreen.pc.in --- old/libkscreen-1.0.2/src/kscreen.pc.in 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/kscreen.pc.in 2014-05-04 19:25:33.000000000 +0200 @@ -4,7 +4,7 @@ Name: kscreen Description: Qt Based library to manage screens with backends (xrandr, whatevercomesnext) -Version: @VERSION@ +Version: @libkscreen_VERSION@ Libs: -L${libdir} -lkscreen Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/output.cpp new/libkscreen-1.0.3/src/output.cpp --- old/libkscreen-1.0.2/src/output.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/output.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -31,6 +31,7 @@ public: Private(): id(0), + type(Unknown), rotation(None), connected(false), enabled(false), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/screen.cpp new/libkscreen-1.0.3/src/screen.cpp --- old/libkscreen-1.0.2/src/screen.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/screen.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -24,11 +24,13 @@ { public: Private(): - id(0) + id(0), + maxActiveOutputsCount(0) { } Private(const Private &other): id(other.id), + maxActiveOutputsCount(other.maxActiveOutputsCount), currentSize(other.currentSize), minSize(other.minSize), maxSize(other.maxSize) @@ -36,6 +38,7 @@ } int id; + int maxActiveOutputsCount; QSize currentSize; QSize minSize; QSize maxSize; @@ -111,6 +114,16 @@ d->minSize = minSize; } +int Screen::maxActiveOutputsCount() const +{ + return d->maxActiveOutputsCount; +} + +void Screen::setMaxActiveOutputsCount(int maxActiveOutputsCount) +{ + d->maxActiveOutputsCount = maxActiveOutputsCount; +} + } //KScreen namespace #include "screen.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/src/screen.h new/libkscreen-1.0.3/src/screen.h --- old/libkscreen-1.0.2/src/screen.h 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/src/screen.h 2014-05-04 19:25:33.000000000 +0200 @@ -35,6 +35,7 @@ Q_PROPERTY(QSize currentSize READ currentSize WRITE setCurrentSize NOTIFY currentSizeChanged) Q_PROPERTY(QSize minSize READ minSize CONSTANT) Q_PROPERTY(QSize maxSize READ maxSize CONSTANT) + Q_PROPERTY(int maxActiveOutputsCount READ maxActiveOutputsCount CONSTANT) explicit Screen(QObject *parent = 0); virtual ~Screen(); @@ -53,6 +54,9 @@ QSize maxSize() const; void setMaxSize(const QSize& maxSize); + int maxActiveOutputsCount() const; + void setMaxActiveOutputsCount(int maxActiveOutputsCount); + Q_SIGNALS: void currentSizeChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/multipleclone.json new/libkscreen-1.0.3/tests/configs/multipleclone.json --- old/libkscreen-1.0.2/tests/configs/multipleclone.json 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/multipleclone.json 2014-05-04 19:25:33.000000000 +0200 @@ -13,7 +13,8 @@ "currentSize" : { "width" : 1024, "height" : 768 - } + }, + "maxActiveOutputsCount": 2 }, "outputs" : [ @@ -120,4 +121,4 @@ "edid" : "AP///////wAQrBbwTExLQQ4WAQOANCB46h7Frk80sSYOUFSlSwCBgKlA0QBxTwEBAQEBAQEBKDyAoHCwI0AwIDYABkQhAAAaAAAA/wBGNTI1TTI0NUFLTEwKAAAA/ABERUxMIFUyNDEwCiAgAAAA/QA4TB5REQAKICAgICAgAToCAynxUJAFBAMCBxYBHxITFCAVEQYjCQcHZwMMABAAOC2DAQAA4wUDAQI6gBhxOC1AWCxFAAZEIQAAHgEdgBhxHBYgWCwlAAZEIQAAngEdAHJR0B4gbihVAAZEIQAAHowK0Iog4C0QED6WAAZEIQAAGAAAAAAAAAAAAAAAAAAAPg==" } ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/multipleoutput.json new/libkscreen-1.0.3/tests/configs/multipleoutput.json --- old/libkscreen-1.0.2/tests/configs/multipleoutput.json 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/multipleoutput.json 2014-05-04 19:25:33.000000000 +0200 @@ -13,7 +13,8 @@ "currentSize" : { "width" : 3200, "height" : 1880 - } + }, + "maxActiveOutputsCount": 2 }, "outputs" : [ @@ -119,4 +120,4 @@ "edid" : "AP///////wAQrBbwTExLQQ4WAQOANCB46h7Frk80sSYOUFSlSwCBgKlA0QBxTwEBAQEBAQEBKDyAoHCwI0AwIDYABkQhAAAaAAAA/wBGNTI1TTI0NUFLTEwKAAAA/ABERUxMIFUyNDEwCiAgAAAA/QA4TB5REQAKICAgICAgAToCAynxUJAFBAMCBxYBHxITFCAVEQYjCQcHZwMMABAAOC2DAQAA4wUDAQI6gBhxOC1AWCxFAAZEIQAAHgEdgBhxHBYgWCwlAAZEIQAAngEdAHJR0B4gbihVAAZEIQAAHowK0Iog4C0QED6WAAZEIQAAGAAAAAAAAAAAAAAAAAAAPg==" } ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/singleOutputWithoutPreferred.json new/libkscreen-1.0.3/tests/configs/singleOutputWithoutPreferred.json --- old/libkscreen-1.0.2/tests/configs/singleOutputWithoutPreferred.json 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/singleOutputWithoutPreferred.json 2014-05-04 19:25:33.000000000 +0200 @@ -13,7 +13,8 @@ "currentSize" : { "width" : 1280, "height" : 800 - } + }, + "maxActiveOutputsCount": 2 }, "outputs" : [ @@ -64,4 +65,4 @@ "edid" : "AP///////wBMLcMFMzJGRQkUAQMOMx14Ku6Ro1RMmSYPUFQjCACBAIFAgYCVAKlAswABAQEBAjqAGHE4LUBYLEUA/h8RAAAeAAAA/QA4PB5REQAKICAgICAgAAAA/ABTeW5jTWFzdGVyCiAgAAAA/wBIOU1aMzAyMTk2CiAgAC4=" } ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/singleoutput.json new/libkscreen-1.0.3/tests/configs/singleoutput.json --- old/libkscreen-1.0.2/tests/configs/singleoutput.json 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/singleoutput.json 2014-05-04 19:25:33.000000000 +0200 @@ -13,7 +13,8 @@ "currentSize" : { "width" : 1280, "height" : 800 - } + }, + "maxActiveOutputsCount": 2 }, "outputs" : [ @@ -64,4 +65,4 @@ "edid" : "AP///////wBMLcMFMzJGRQkUAQMOMx14Ku6Ro1RMmSYPUFQjCACBAIFAgYCVAKlAswABAQEBAjqAGHE4LUBYLEUA/h8RAAAeAAAA/QA4PB5REQAKICAgICAgAAAA/ABTeW5jTWFzdGVyCiAgAAAA/wBIOU1aMzAyMTk2CiAgAC4=" } ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/singleoutputBroken.json new/libkscreen-1.0.3/tests/configs/singleoutputBroken.json --- old/libkscreen-1.0.2/tests/configs/singleoutputBroken.json 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/singleoutputBroken.json 2014-05-04 19:25:33.000000000 +0200 @@ -13,7 +13,8 @@ "currentSize" : { "width" : 1280, "height" : 800 - } + }, + "maxActiveOutputsCount": 2 }, "outputs" : [ @@ -72,4 +73,4 @@ "edid" : "AP///////wBMLcMFMzJGRQkUAQMOMx14Ku6Ro1RMmSYPUFQjCACBAIFAgYCVAKlAswABAQEBAjqAGHE4LUBYLEUA/h8RAAAeAAAA/QA4PB5REQAKICAgICAgAAAA/ABTeW5jTWFzdGVyCiAgAAAA/wBIOU1aMzAyMTk2CiAgAC4=" } ] -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/configs/tooManyOutputs.json new/libkscreen-1.0.3/tests/configs/tooManyOutputs.json --- old/libkscreen-1.0.2/tests/configs/tooManyOutputs.json 1970-01-01 01:00:00.000000000 +0100 +++ new/libkscreen-1.0.3/tests/configs/tooManyOutputs.json 2014-05-04 19:25:33.000000000 +0200 @@ -0,0 +1,78 @@ +{ + "screen" : + { + "id" : 1, + "maxSize" : { + "width" : 8192, + "height" : 8192 + }, + "minSize" : { + "width" : 320, + "height" : 200 + }, + "currentSize" : { + "width" : 3200, + "height" : 1880 + }, + "maxActiveOutputsCount": 1 + }, + "outputs" : + [ + { + "id" : 1, + "name" : "LVDS1", + "type" : "LVDS", + "modes" : + [ + { + "id" : 3, + "name" : "1280x800", + "refreshRate" : 59.9, + "size" : { + "width" : 1280, + "height" : 800 + } + } + ], + "pos" : { + "x" : 0, + "y" : 0 + }, + "currentModeId" : 3, + "preferredModes" : [3], + "rotation" : 1, + "connected" : true, + "enabled" : true, + "primary" : true, + "edid" : "AP///////wBMLcMFMzJGRQkUAQMOMx14Ku6Ro1RMmSYPUFQjCACBAIFAgYCVAKlAswABAQEBAjqAGHE4LUBYLEUA/h8RAAAeAAAA/QA4PB5REQAKICAgICAgAAAA/ABTeW5jTWFzdGVyCiAgAAAA/wBIOU1aMzAyMTk2CiAgAC4=" + }, + { + "id" : 2, + "name" : "HDMI1", + "type" : "HDMI", + "modes" : + [ + { + "id" : 4, + "name" : "1920x1080", + "refreshRate" : 60, + "size" : { + "width" : 1920, + "height" : 1080 + } + } + ], + "pos" : { + "x" : 1280, + "y" : 0 + }, + "currentModeId" : 4, + "preferredModes" : [4], + "rotation" : 1, + "connected" : true, + "enabled" : true, + "primary" : false, + "edid" : "AP///////wAQrBbwTExLQQ4WAQOANCB46h7Frk80sSYOUFSlSwCBgKlA0QBxTwEBAQEBAQEBKDyAoHCwI0AwIDYABkQhAAAaAAAA/wBGNTI1TTI0NUFLTEwKAAAA/ABERUxMIFUyNDEwCiAgAAAA/QA4TB5REQAKICAgICAgAToCAynxUJAFBAMCBxYBHxITFCAVEQYjCQcHZwMMABAAOC2DAQAA4wUDAQI6gBhxOC1AWCxFAAZEIQAAHgEdgBhxHBYgWCwlAAZEIQAAngEdAHJR0B4gbihVAAZEIQAAHowK0Iog4C0QED6WAAZEIQAAGAAAAAAAAAAAAAAAAAAAPg==" + } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0.2/tests/testscreenconfig.cpp new/libkscreen-1.0.3/tests/testscreenconfig.cpp --- old/libkscreen-1.0.2/tests/testscreenconfig.cpp 2013-11-19 12:45:12.000000000 +0100 +++ new/libkscreen-1.0.3/tests/testscreenconfig.cpp 2014-05-04 19:25:33.000000000 +0200 @@ -181,6 +181,21 @@ QVERIFY(!Config::canBeApplied(brokenConfig)); primaryBroken->mode(QLatin1String("3"))->setSize(QSize(1280, 800)); QVERIFY(Config::canBeApplied(brokenConfig)); + + + path = TEST_DATA; + path.append("/tooManyOutputs.json"); + setenv("TEST_DATA", path, 1); + brokenConfig = Config::current(); + + int enabledOutputsCount = 0; + Q_FOREACH (Output *output, brokenConfig->outputs()) { + if (output->isEnabled()) { + ++enabledOutputsCount; + } + } + QVERIFY(brokenConfig->screen()->maxActiveOutputsCount() < enabledOutputsCount); + QVERIFY(!Config::canBeApplied(brokenConfig)); } QTEST_MAIN(testScreenConfig) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-05-05 21:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-04-26 19:35:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-05-05 21:11:20.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Apr 30 16:43:00 UTC 2014 - lbsousajr(a)gmail.com + +- Add new patches to make non-seat0 X servers work properly with + non-KMS video drivers: + + u_xfree86-allow-fallback-to-PCI-bus-probe-for-non-seat0-seats.patch + + u_xfree86-add-new-key-MatchSeat-to-xorg-conf.patch + + u_xfree86-add-short-description-about-MatchSeat-key-in-xorg-conf-man-page.patch + +------------------------------------------------------------------- +Mon Apr 28 09:02:06 UTC 2014 - sndirsch(a)suse.com + +- added missing pkgconfig(xf86dgaproto) BuildRequires + +------------------------------------------------------------------- +Sun Apr 27 23:55:29 UTC 2014 - stefan.bruens(a)rwth-aachen.de + +- N_fix_XWAYLAND_SCANNER_undefined.diff + * handle undefined XWAYLAND_SCANNER_RULES in configure; fix + compilation for openSUSE 12.3 + +------------------------------------------------------------------- New: ---- N_fix_XWAYLAND_SCANNER_undefined.diff u_xfree86-add-new-key-MatchSeat-to-xorg-conf.patch u_xfree86-add-short-description-about-MatchSeat-key-in-xorg-conf-man-page.patch u_xfree86-allow-fallback-to-PCI-bus-probe-for-non-seat0-seats.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.oTcNZp/_old 2014-05-05 21:11:22.000000000 +0200 +++ /var/tmp/diff_new_pack.oTcNZp/_new 2014-05-05 21:11:22.000000000 +0200 @@ -78,6 +78,7 @@ BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) >= 1.0.99.4 BuildRequires: pkgconfig(xextproto) >= 7.1.99 +BuildRequires: pkgconfig(xf86dgaproto) BuildRequires: pkgconfig(xf86driproto) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xfont) >= 1.4.2 @@ -137,6 +138,7 @@ Patch3: N_driver-autoconfig.diff Patch4: N_fix_fglrx_screendepth_issue.patch Patch6: N_fix-dpi-values.diff +Patch7: N_fix_XWAYLAND_SCANNER_undefined.diff Patch100: u_fbdevhw.diff Patch101: u_confine_to_shape.diff @@ -149,6 +151,9 @@ Patch106: u_exa-only-draw-valid-trapezoids.patch # PATCH-FIX-UPSTREAM u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch -- sent to ML 2014-02-24 Patch107: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch +Patch108: u_xfree86-allow-fallback-to-PCI-bus-probe-for-non-seat0-seats.patch +Patch109: u_xfree86-add-new-key-MatchSeat-to-xorg-conf.patch +Patch110: u_xfree86-add-short-description-about-MatchSeat-key-in-xorg-conf-man-page.patch Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch @@ -214,6 +219,7 @@ %patch3 -p0 %patch4 -p0 %patch6 -p0 +%patch7 -p0 # %patch100 %patch101 @@ -223,6 +229,9 @@ %patch105 -p1 %patch106 -p1 %patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 ### disabled for now #%patch162 -p1 ++++++ N_fix_XWAYLAND_SCANNER_undefined.diff ++++++ --- configure.ac_orig 2014-04-28 01:51:17.419311470 +0200 +++ configure.ac 2014-04-28 01:52:25.842088562 +0200 @@ -2458,7 +2458,8 @@ XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" AC_SUBST([XWAYLAND_LIBS]) AC_SUBST([XWAYLAND_SYS_LIBS]) - WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland']) + m4_ifdef([WAYLAND_SCANNER_RULES], + [WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland'])]) fi ++++++ u_xfree86-add-new-key-MatchSeat-to-xorg-conf.patch ++++++ >From c29952e77111d6da1ab12957f0207d59ae14c809 Mon Sep 17 00:00:00 2001 From: Oleg Samarin <osamarin68(a)gmail.com> Date: Thu, 3 Apr 2014 09:16:52 -0300 Subject: [PATCH v2 2/3] xfree86: add new key MatchSeat to xorg.conf sections "Device", "Screen", and "ServerLayout" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch introduces a new key MatchSeat in xorg.conf (also applies to any .conf file in xorg.conf.d). It will allow targeting a given "Device", "Screen", and/or "ServerLayout" section to a particular seat only (specified by option "-seat" in X server command line), so that other seats won't be affected. Without this patch, one needs to write a separate xorg.conf.custom file and pass it to X server via "-config" option, if one wants that these settings only apply for the right seat. However, in some cases, this solution is undesirable or even impossible (e.g. when using GDM, which doesn't allow X server command line customization). Example file (/etc/X11/xorg.conf.d/seat1.conf), which would be ignored by X server unless it was started with "-seat seat1" option: Section "Device" Identifier "card0" Driver "nvidia" Option "NoLogo" "True" MatchSeat "seat1" EndSection Signed-off-by: Oleg Samarin <osamarin68(a)gmail.com> Signed-off-by: Laércio de Sousa <lbsousajr(a)gmail.com> --- hw/xfree86/common/xf86Config.c | 34 +++++++++++++++++++++++++--------- hw/xfree86/parser/Device.c | 6 ++++++ hw/xfree86/parser/Layout.c | 6 ++++++ hw/xfree86/parser/Screen.c | 6 ++++++ hw/xfree86/parser/xf86Parser.h | 3 +++ hw/xfree86/parser/xf86tokens.h | 1 + 6 files changed, 47 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 542d5ab..5d17567 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -232,6 +232,17 @@ xf86ValidateFontPath(char *path) return tmp_path; } +#define FIND_SUITABLE(pointertype, listhead, ptr) \ + { \ + pointertype l, p; \ + \ + for (l = listhead, p = NULL; !p && l; l = (pointertype) l->list.next) { \ + if (! l->match_seat || SeatId && xf86nameCompare(l->match_seat, SeatId) == 0) \ + p = l; \ + } \ + ptr = p; \ + } + /* * use the datastructure that the parser provides and pick out the parts * that we need at this point @@ -1580,8 +1591,11 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout, * config file, or - if it is NULL - configScreen autogenerates one for * us */ if (!count) { + XF86ConfScreenPtr screen; + + FIND_SUITABLE (XF86ConfScreenPtr, xf86configptr->conf_screen_lst, screen); slp[0].screen = xnfcalloc(1, sizeof(confScreenRec)); - if (!configScreen(slp[0].screen, xf86configptr->conf_screen_lst, + if (!configScreen(slp[0].screen, screen, 0, X_CONFIG)) { free(slp[0].screen); free(slp); @@ -1821,7 +1835,7 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum, * set it to NULL so that the section can be autoconfigured later */ screenp->device = xnfcalloc(1, sizeof(GDevRec)); if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) { - conf_screen->scrn_device = xf86configptr->conf_device_lst; + FIND_SUITABLE (XF86ConfDevicePtr, xf86configptr->conf_device_lst, conf_screen->scrn_device); xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n" "\tUsing the first device section listed.\n", screenp->id); } @@ -2429,14 +2443,19 @@ xf86HandleConfigFile(Bool autoconfig) */ /* First check if a layout section is present, and if it is valid. */ + XF86ConfLayoutPtr layout; + + FIND_SUITABLE(XF86ConfLayoutPtr, xf86configptr->conf_layout_lst, layout); + if (layout == NULL || xf86ScreenName != NULL) { + XF86ConfScreenPtr screen; - if (xf86configptr->conf_layout_lst == NULL || xf86ScreenName != NULL) { if (xf86ScreenName == NULL) { xf86Msg(X_DEFAULT, "No Layout section. Using the first Screen section.\n"); } + FIND_SUITABLE (XF86ConfScreenPtr, xf86configptr->conf_screen_lst, screen); if (!configImpliedLayout(&xf86ConfigLayout, - xf86configptr->conf_screen_lst, + screen, xf86configptr)) { xf86Msg(X_ERROR, "Unable to determine the screen layout\n"); return CONFIG_PARSE_ERROR; @@ -2451,16 +2470,13 @@ xf86HandleConfigFile(Bool autoconfig) if (optlist && xf86FindOption(optlist, "defaultserverlayout")) dfltlayout = xf86SetStrOption(optlist, "defaultserverlayout", NULL); - if (!configLayout - (&xf86ConfigLayout, xf86configptr->conf_layout_lst, - dfltlayout)) { + if (!configLayout(&xf86ConfigLayout, layout, dfltlayout)) { xf86Msg(X_ERROR, "Unable to determine the screen layout\n"); return CONFIG_PARSE_ERROR; } } else { - if (!configLayout(&xf86ConfigLayout, xf86configptr->conf_layout_lst, - NULL)) { + if (!configLayout(&xf86ConfigLayout, layout, NULL)) { xf86Msg(X_ERROR, "Unable to determine the screen layout\n"); return CONFIG_PARSE_ERROR; } diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 073171f..d3ac293 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -71,6 +71,7 @@ xf86ConfigSymTabRec DeviceTab[] = { {RAMDAC, "ramdac"}, {DACSPEED, "dacspeed"}, {CLOCKS, "clocks"}, + {MATCHSEAT, "matchseat"}, {OPTION, "option"}, {VIDEORAM, "videoram"}, {BIOSBASE, "biosbase"}, @@ -216,6 +217,11 @@ xf86parseDeviceSection(void) Error(NUMBER_MSG, "TextClockFreq"); ptr->dev_textclockfreq = (int) (xf86_lex_val.realnum * 1000.0 + 0.5); break; + case MATCHSEAT: + if (xf86getSubToken(&(ptr->dev_comment)) != STRING) + Error(QUOTE_MSG, "MatchSeat"); + ptr->match_seat = xf86_lex_val.str; + break; case OPTION: ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst); break; diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 7be746f..994b31a 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -70,6 +70,7 @@ static xf86ConfigSymTabRec LayoutTab[] = { {ENDSECTION, "endsection"}, {SCREEN, "screen"}, {IDENTIFIER, "identifier"}, + {MATCHSEAT, "matchseat"}, {INACTIVE, "inactive"}, {INPUTDEVICE, "inputdevice"}, {OPTION, "option"}, @@ -109,6 +110,11 @@ xf86parseLayoutSection(void) ptr->lay_identifier = xf86_lex_val.str; has_ident = TRUE; break; + case MATCHSEAT: + if (xf86getSubToken(&(ptr->lay_comment)) != STRING) + Error(QUOTE_MSG, "MatchSeat"); + ptr->match_seat = xf86_lex_val.str; + break; case INACTIVE: { XF86ConfInactivePtr iptr; diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index fecd57c..0e9746a 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -198,6 +198,7 @@ xf86parseDisplaySubSection(void) static xf86ConfigSymTabRec ScreenTab[] = { {ENDSECTION, "endsection"}, {IDENTIFIER, "identifier"}, + {MATCHSEAT, "matchseat"}, {OBSDRIVER, "driver"}, {MDEVICE, "device"}, {MONITOR, "monitor"}, @@ -236,6 +237,11 @@ xf86parseScreenSection(void) Error(ONLY_ONE_MSG, "Identifier or Driver"); has_ident = TRUE; break; + case MATCHSEAT: + if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) + Error(QUOTE_MSG, "MatchSeat"); + ptr->match_seat = xf86_lex_val.str; + break; case OBSDRIVER: if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) Error(QUOTE_MSG, "Driver"); diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index 8f855ac..c95423a 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -224,6 +224,7 @@ typedef struct { int dev_screen; XF86OptionPtr dev_option_lst; char *dev_comment; + char *match_seat; } XF86ConfDeviceRec, *XF86ConfDevicePtr; typedef struct { @@ -275,6 +276,7 @@ typedef struct { XF86OptionPtr scrn_option_lst; char *scrn_comment; int scrn_virtualX, scrn_virtualY; + char *match_seat; } XF86ConfScreenRec, *XF86ConfScreenPtr; typedef struct { @@ -366,6 +368,7 @@ typedef struct { XF86ConfInactivePtr lay_inactive_lst; XF86ConfInputrefPtr lay_input_lst; XF86OptionPtr lay_option_lst; + char *match_seat; char *lay_comment; } XF86ConfLayoutRec, *XF86ConfLayoutPtr; diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index f751b7b..5c01ce7 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -87,6 +87,7 @@ typedef enum { VENDOR, DASH, COMMA, + MATCHSEAT, OPTION, COMMENT, -- 1.8.4.5 ++++++ u_xfree86-add-short-description-about-MatchSeat-key-in-xorg-conf-man-page.patch ++++++ >From 1387d26159b24119903a67ffb226b869729201b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <lbsousajr(a)gmail.com> Date: Thu, 3 Apr 2014 10:20:51 -0300 Subject: [PATCH v2 3/3] xfree86: add short description about MatchSeat key in xorg.conf man page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Laércio de Sousa <lbsousajr(a)gmail.com> --- hw/xfree86/man/xorg.conf.man | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man index 85f9f2e..c11372f 100644 --- a/hw/xfree86/man/xorg.conf.man +++ b/hw/xfree86/man/xorg.conf.man @@ -1374,6 +1374,14 @@ for the regular text mode. The frequency is specified in MHz. This is rarely used. .TP 7 +.BI "MatchSeat " "seat\-id" +Only apply this +.B Device +section if X server was started with +.B -seat +.I seat\-id +option. +.TP 7 .BI "Option \*qModeDebug\*q \*q" boolean \*q Enable printing of additional debugging information about modesetting to the server log. @@ -1896,6 +1904,14 @@ The only case where there is even a choice in this value is for depth 24, where some hardware supports both a packed 24 bit framebuffer layout and a sparse 32 bit framebuffer layout. .TP 7 +.BI "MatchSeat " "seat\-id" +Only apply this +.B Screen +section if X server was started with +.B -seat +.I seat\-id +option. +.TP 7 .B Options Various .B Option @@ -2291,6 +2307,14 @@ and the first two should normally be used to indicate the core pointer and core keyboard devices respectively. .RE .TP 7 +.BI "MatchSeat " "seat\-id" +Only apply this +.B ServerLayout +section if X server was started with +.B -seat +.I seat\-id +option. +.TP 7 .B Options In addition to the following, any option permitted in the .B ServerFlags -- 1.8.4.5 ++++++ u_xfree86-allow-fallback-to-PCI-bus-probe-for-non-seat0-seats.patch ++++++ >From 04ad4d4010a562a663ee3224b55d2b9c8468bd0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?La=C3=A9rcio=20de=20Sousa?= <lbsousajr(a)gmail.com> Date: Thu, 3 Apr 2014 09:14:36 -0300 Subject: [PATCH v2 1/3] xfree86: allow fallback to PCI bus probe for graphics devices on non-seat0 X servers (#66851) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently non-seat0 X servers only probe platform bus for graphics devices, which is OK for most KMS-compliant drivers. However, for non-KMS drivers (like NVIDIA proprietary ones), graphics devices can't be reached by platform bus probe, resulting in a "No devices detected" error. This patch allows a fallback to PCI bus probe for non-seat0 X servers in case no platform bus graphics device is found. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=66851 Signed-off-by: Laércio de Sousa <lbsousajr(a)gmail.com> --- hw/xfree86/common/xf86Bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 507c57d..b3b3f8c 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -81,7 +81,7 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only) if (drv->platformProbe != NULL) { foundScreen = xf86platformProbeDev(drv); } - if (ServerIsNotSeat0()) + if (ServerIsNotSeat0() && foundScreen) return foundScreen; #endif @@ -201,7 +201,7 @@ xf86BusProbe(void) { #ifdef XSERVER_PLATFORM_BUS xf86platformProbe(); - if (ServerIsNotSeat0()) + if (ServerIsNotSeat0() && xf86_num_platform_devices > 0) return; #endif #ifdef XSERVER_LIBPCIACCESS -- 1.8.4.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-libs for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at 2014-05-05 21:11:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-libs (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-libs" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-libs/xorg-x11-libs.changes 2014-01-13 16:53:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-libs.new/xorg-x11-libs.changes 2014-05-05 21:11:19.000000000 +0200 @@ -1,0 +2,12 @@ +Sat May 3 10:25:41 UTC 2014 - sndirsch(a)suse.com + +- removed requires to libWindowsWM-devel, which never has been + required by anyone on non-Windows platforms + +------------------------------------------------------------------- +Fri Apr 25 12:36:42 UTC 2014 - sndirsch(a)suse.com + +- xorg-x11-devel: remove requires to xorg-x11-proto-devel, which has + been replaced by pthread-stubs and numerous *proto packages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.WHUE4b/_old 2014-05-05 21:11:19.000000000 +0200 +++ /var/tmp/diff_new_pack.WHUE4b/_new 2014-05-05 21:11:19.000000000 +0200 @@ -55,7 +55,6 @@ Requires: libFS-devel Requires: libICE-devel Requires: libSM-devel -Requires: libWindowsWM-devel Requires: libX11-devel Requires: libXScrnSaver-devel Requires: libXTrap-devel @@ -108,7 +107,6 @@ Requires: xorg-x11-fonts-devel Requires: xorg-x11-libxcb-devel Requires: xorg-x11-libxkbfile-devel -Requires: xorg-x11-proto-devel Requires: xorg-x11-util-devel Requires: xorg-x11-xtrans-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fontsproto for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package fontsproto for openSUSE:Factory checked in at 2014-05-05 21:11:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontsproto (Old) and /work/SRC/openSUSE:Factory/.fontsproto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontsproto" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.fontsproto.new/fontsproto.changes 2014-05-05 21:11:17.000000000 +0200 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 30 15:08:39 UTC 2014 - sndirsch(a)suse.com + +- added COPYING to %doc + +------------------------------------------------------------------- +Wed Apr 23 13:59:02 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Created package fontsproto with initial version 2.1.3 + New: ---- fontsproto-2.1.3.tar.bz2 fontsproto.changes fontsproto.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontsproto.spec ++++++ # # spec file for package fontsproto # # 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/ # Name: fontsproto Version: 2.1.3 BuildRequires: pkg-config #BuildRequires: autoconf >= 2.60 #BuildRequires: automake #BuildRequires: libtool Url: http://xorg.freedesktop.org/ Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The X Protocol License: MIT Group: Development/Libraries/X11 #Source URL: http://xorg.freedesktop.org/releases/individual/proto/ Source: %{name}-%{version}.tar.bz2 %description The Fonts Protocol Headers for X development %package -n %{name}-devel Summary: The X Protocol Group: Development/Libraries/X11 # Added within the 13.2 Development Cycle Provides: xorg-x11-proto-devel://usr/%{_lib}/pkgconfig/fontsproto.pc %description -n %{name}-devel The Fonts Protocol Headers for X development %prep %setup -q %build #autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=/usr --libdir=%{_libdir} make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files -n %{name}-devel %defattr(-,root,root) %doc COPYING %doc /usr/share/doc/* %dir /usr/include/X11/fonts /usr/include/X11/fonts/*.h /usr/%{_lib}/pkgconfig/*.pc %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 xf86dgaproto for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package xf86dgaproto for openSUSE:Factory checked in at 2014-05-05 21:11:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86dgaproto (Old) and /work/SRC/openSUSE:Factory/.xf86dgaproto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86dgaproto" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.xf86dgaproto.new/xf86dgaproto.changes 2014-05-05 21:11:02.000000000 +0200 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 29 13:54:04 UTC 2014 - sndirsch(a)suse.com + +- added COPYING to %doc + +------------------------------------------------------------------- +Tue Apr 29 13:05:03 UTC 2014 - cfarrell(a)suse.com + +- license update: X11 + See COPYING + +------------------------------------------------------------------- +Thu Apr 24 18:59:21 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Created package xf86dgaproto with initial version 2.1 + New: ---- xf86dgaproto-2.1.tar.bz2 xf86dgaproto.changes xf86dgaproto.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86dgaproto.spec ++++++ # # spec file for package xf86dgaproto # # 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/ # Name: xf86dgaproto Version: 2.1 BuildRequires: pkg-config #BuildRequires: autoconf >= 2.60 #BuildRequires: automake #BuildRequires: libtool Url: http://xorg.freedesktop.org/ Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The X Protocol License: X11 Group: Development/Libraries/X11 #Source URL: http://xorg.freedesktop.org/releases/individual/proto/ Source: %{name}-%{version}.tar.bz2 %description The Xf86 DGA Protocol Headers for X development %package -n %{name}-devel Summary: The X Protocol Group: Development/Libraries/X11 # Added within the 13.2 Development Cycle Provides: xorg-x11-proto-devel://usr/%{_lib}/pkgconfig/xf86dgaproto.pc %description -n %{name}-devel The Xf86 DGA Protocol Headers for X development %prep %setup -q %build #autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=/usr --libdir=%{_libdir} make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files -n %{name}-devel %defattr(-,root,root) %doc COPYING %dir /usr/include/X11/extensions /usr/include/X11/extensions/*.h /usr/%{_lib}/pkgconfig/*.pc %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 xproxymngproto for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package xproxymngproto for openSUSE:Factory checked in at 2014-05-05 21:10:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xproxymngproto (Old) and /work/SRC/openSUSE:Factory/.xproxymngproto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xproxymngproto" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.xproxymngproto.new/xproxymngproto.changes 2014-05-05 21:10:54.000000000 +0200 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 29 13:33:41 UTC 2014 - sndirsch(a)suse.com + +- added COPYING to %doc + +------------------------------------------------------------------- +Tue Apr 29 12:37:56 UTC 2014 - cfarrell(a)suse.com + +- license update: X11 + See COPYING + +------------------------------------------------------------------- +Thu Apr 24 20:13:48 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Created package xproxymngproto with initial version 1.0.3 + New: ---- xproxymanagementprotocol-1.0.3.tar.bz2 xproxymngproto.changes xproxymngproto.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xproxymngproto.spec ++++++ # # spec file for package xproxymngproto # # 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/ # %define name_archive xproxymanagementprotocol Name: xproxymngproto Version: 1.0.3 BuildRequires: pkg-config #BuildRequires: autoconf >= 2.60 #BuildRequires: automake #BuildRequires: libtool Url: http://xorg.freedesktop.org/ Release: 0 BuildRoot: %{_tmppath}/%{name_archive}-%{version}-build Summary: The X Protocol License: X11 Group: Development/Libraries/X11 #Source URL: http://xorg.freedesktop.org/releases/individual/proto/ Source: %{name_archive}-%{version}.tar.bz2 %description The X Proxy Manager Protocol Headers for X development %package -n %{name}-devel Summary: The X Protocol Group: Development/Libraries/X11 # Added within the 13.2 Development Cycle Provides: xorg-x11-proto-devel://usr/%{_lib}/pkgconfig/xproxymngproto.pc %description -n %{name}-devel The X Proxy Manager Protocol Headers for X development %prep %setup -n %{name_archive}-%{version} -q %build #autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=/usr --libdir=%{_libdir} make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files -n %{name}-devel %defattr(-,root,root) %doc COPYING %doc /usr/share/doc/* %dir /usr/include/X11/PM /usr/include/X11/PM/*.h /usr/%{_lib}/pkgconfig/*.pc %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 xcmiscproto for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package xcmiscproto for openSUSE:Factory checked in at 2014-05-05 21:10:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xcmiscproto (Old) and /work/SRC/openSUSE:Factory/.xcmiscproto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xcmiscproto" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.xcmiscproto.new/xcmiscproto.changes 2014-05-05 21:10:46.000000000 +0200 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 29 13:23:11 UTC 2014 - sndirsch(a)suse.com + +- added COPYING to %doc + +------------------------------------------------------------------- +Tue Apr 29 12:21:44 UTC 2014 - cfarrell(a)suse.com + +- license update: X11 + See COPYING + +------------------------------------------------------------------- +Thu Apr 24 15:41:42 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Created package xcmiscproto with initial version 1.2.2 + New: ---- xcmiscproto-1.2.2.tar.bz2 xcmiscproto.changes xcmiscproto.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xcmiscproto.spec ++++++ # # spec file for package xcmiscproto # # 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/ # Name: xcmiscproto Version: 1.2.2 BuildRequires: pkg-config #BuildRequires: autoconf >= 2.60 #BuildRequires: automake #BuildRequires: libtool Url: http://xorg.freedesktop.org/ Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: The X Protocol License: X11 Group: Development/Libraries/X11 #Source URL: http://xorg.freedesktop.org/releases/individual/proto/ Source: %{name}-%{version}.tar.bz2 %description The Xc Misc Protocol Headers for X development %package -n %{name}-devel Summary: The X Protocol Group: Development/Libraries/X11 # Added within the 13.2 Development Cycle Provides: xorg-x11-proto-devel://usr/%{_lib}/pkgconfig/xcmiscproto.pc %description -n %{name}-devel The Xc Misc Protocol Headers for X development %prep %setup -q %build #autoreconf -fi ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --prefix=/usr --libdir=%{_libdir} make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files -n %{name}-devel %defattr(-,root,root) %doc COPYING %doc /usr/share/doc/* %dir /usr/include/X11/extensions/ /usr/include/X11/extensions/*.h /usr/%{_lib}/pkgconfig/*.pc %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 kvkbd for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package kvkbd for openSUSE:Factory checked in at 2014-05-05 21:10:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kvkbd (Old) and /work/SRC/openSUSE:Factory/.kvkbd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kvkbd" Changes: -------- --- /work/SRC/openSUSE:Factory/kvkbd/kvkbd.changes 2011-09-23 02:07:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kvkbd.new/kvkbd.changes 2014-05-05 21:10:06.000000000 +0200 @@ -1,0 +2,13 @@ +Sat May 3 20:11:29 UTC 2014 - asterios.dramis(a)gmail.com + +- Update to version 0.7.1: + # Continuation of kvkbd-kde4 package. + * Fix css install location. Login helper option is restored. + From version 0.7.0: + * Implemented themes and color styles. Dynamic detection of language was lost + during porting to KDE4 and now restored. --loginhelper is incomplete. +- Removed the following patches (fixed upstream): + * fix-loginhelper.diff + * kvkbd-link-x11.patch + +------------------------------------------------------------------- Old: ---- 94374-kvkbd-0.6.tar.gz debian.changelog debian.control debian.rules debian.series fix-loginhelper.diff kvkbd-link-x11.patch kvkbd.dsc New: ---- 56019-kvkbd-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvkbd.spec ++++++ --- /var/tmp/diff_new_pack.D312eB/_old 2014-05-05 21:10:08.000000000 +0200 +++ /var/tmp/diff_new_pack.D312eB/_new 2014-05-05 21:10:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kvkbd # -# Copyright (c) 2011 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 @@ -15,50 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: kvkbd -BuildRequires: libkde4-devel libxslt-devel -BuildRequires: update-desktop-files +Version: 0.7.1 +Release: 0 +Summary: Virtual keyboard for KDE License: GPL-2.0+ -Url: http://kde-apps.org/content/show.php/Kvkbd+-+KDE4?content=94374 Group: System/GUI/KDE +Url: http://kde-apps.org/content/show.php/Kvkbd?content=56019 +Source0: http://kde-apps.org/CONTENT/content-files/56019-%{name}-%{version}.tar.gz +BuildRequires: libkde4-devel +BuildRequires: libxslt-devel +BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: A virtual keyboard for KDE -Version: 0.6 -Release: 14 -Source: 94374-kvkbd-0.6.tar.gz -Patch1: fix-loginhelper.diff -Patch2: kvkbd-link-x11.patch %kde4_runtime_requires %description -Kvkbd is a virtual keyboard for KDE, it contains many features like system tray and dock support, autodetection and on the fly change of the keyboard layout, scripting with DBus, etc. +Kvkbd is a virtual keyboard for KDE, it contains many features like system tray +and dock support, autodetection and on the fly change of the keyboard layout, +scripting with DBus, etc. %prep -%setup -n %{name}-%{version} -q -%patch1 -%patch2 +%setup -q %build - %cmake_kde4 -d build - %make_jobs +%cmake_kde4 -d build +%make_jobs %install - cd build - %kde4_makeinstall - %suse_update_desktop_file kvkbd - %kde_post_install - -%clean -rm -rf $RPM_BUILD_ROOT +%kde4_makeinstall -C build +%kde_post_install %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog LICENSE TODO %{_kde4_bindir}/kvkbd %{_kde4_applicationsdir}/kvkbd.desktop %{_kde4_appsdir}/kvkbd -%lang(en) %{_kde4_docdir}/HTML/en/kvkbd +%doc %lang(en) %{_kde4_docdir}/HTML/en/kvkbd %changelog ++++++ 94374-kvkbd-0.6.tar.gz -> 56019-kvkbd-0.7.1.tar.gz ++++++ ++++ 7278 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 libxcb for openSUSE:Factory
by root＠hilbert.suse.de 05 May '14

05 May '14

Hello community, here is the log from the commit of package libxcb for openSUSE:Factory checked in at 2014-05-05 21:09:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxcb (Old) and /work/SRC/openSUSE:Factory/.libxcb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libxcb" Changes: -------- --- /work/SRC/openSUSE:Factory/libxcb/libxcb.changes 2014-04-26 19:34:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libxcb.new/libxcb.changes 2014-05-05 21:09:59.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 27 10:21:40 UTC 2014 - sndirsch(a)suse.com + +- added missing python-xcb-proto-devel >= 7.6_1.10.1 BuildRequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcb.spec ++++++ --- /var/tmp/diff_new_pack.d5cx1O/_old 2014-05-05 21:10:00.000000000 +0200 +++ /var/tmp/diff_new_pack.d5cx1O/_new 2014-05-05 21:10:00.000000000 +0200 @@ -49,6 +49,7 @@ %else BuildRequires: libxslt %endif +BuildRequires: python-xcb-proto-devel >= 7.6_1.10.1 %description The X protocol C-language Binding (XCB) is a replacement for Xlib -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0