Hello community, here is the log from the commit of package libkscreen for openSUSE:Factory checked in at 2013-08-02 15:24:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-08 11:56:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes 2013-08-02 15:24:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 1 21:07:01 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to version 1.0.1: + * Bugfix release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkscreen-1.0.tar.bz2 New: ---- libkscreen-1.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen.spec ++++++ --- /var/tmp/diff_new_pack.ILfQtO/_old 2013-08-02 15:24:25.000000000 +0200 +++ /var/tmp/diff_new_pack.ILfQtO/_new 2013-08-02 15:24:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libkscreen # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -14,15 +14,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + +# %define soversion 1 Name: libkscreen -Version: 1.0 +Version: 1.0.1 Release: 0 -License: GPL-2.0+ Summary: KDE's screen management library -Url: http://www.kde.org +License: GPL-2.0+ Group: System/GUI/KDE -Source: http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 +Url: http://www.kde.org +Source: http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.bz2 BuildRequires: libkde4-devel >= 4.7.0 BuildRequires: libqjson-devel >= 0.8.1 BuildRequires: pkgconfig(xcb) @@ -30,11 +33,11 @@ BuildRequires: pkgconfig(xcb-renderutil) Provides: libkscreen-plugin BuildRoot: %{_tmppath}/%{name}-%{version}-build + %description Dynamic display management library for KDE %package devel -License: GPL-2.0+ Summary: KDE's screen management library (development package) Group: Development/Libraries/C and C++ Requires: %{name}%{soversion} = %{version} @@ -43,7 +46,6 @@ Development files belonging to libkscreen, dynamic display management in KDE %package -n %{name}%{soversion} -License: GPL-2.0+ Summary: KDE's screen management library Group: System/GUI/KDE Recommends: libkscreen-plugin ++++++ libkscreen-1.0.tar.bz2 -> libkscreen-1.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/CMakeLists.txt new/libkscreen-1.0.1/CMakeLists.txt --- old/libkscreen-1.0/CMakeLists.txt 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/CMakeLists.txt 2013-08-01 17:44:13.000000000 +0200 @@ -1,7 +1,7 @@ project(libkscreen) set(libkscreen_VERSION_MAJOR 1) set(libkscreen_VERSION_MINOR 0) -set(libkscreen_VERSION_RELEASE 0) +set(libkscreen_VERSION_RELEASE 1) set(libkscreen_VERSION "${libkscreen_VERSION_MAJOR}.${libkscreen_VERSION_MINOR}.${libkscreen_VERSION_RELEASE}") cmake_minimum_required(VERSION 2.8.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/backends/xrandr/xrandrconfig.cpp new/libkscreen-1.0.1/backends/xrandr/xrandrconfig.cpp --- old/libkscreen-1.0/backends/xrandr/xrandrconfig.cpp 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/backends/xrandr/xrandrconfig.cpp 2013-08-01 17:44:13.000000000 +0200 @@ -122,7 +122,8 @@ XRandROutput *currentOutput = m_outputs.value(output->id()); currentOutput->update(currentOutput->isPrimary() ? XRandROutput::SetPrimary : XRandROutput::UnsetPrimary); - if (output->isPrimary()) { + //Only set the output as primary if it is enabled. + if (output->isPrimary() && output->isEnabled()) { primaryOutput = currentOutput->id(); } @@ -161,7 +162,10 @@ } } - QSize size = output->mode(currentOutput->currentModeId())->size(); + XRandRMode* currentMode = currentOutput->currentMode(); + Q_ASSERT_X(currentMode, "applyKScreenConfig", "currentOutput has returned a null XRandRMode*"); + + QSize size = currentMode->size(); int x, y; @@ -231,6 +235,9 @@ //If there is nothing to do, not even bother if (toDisable.isEmpty() && toEnable.isEmpty() && toChange.isEmpty()) { + if (newSize != m_screen->currentSize()) { + setScreenSize(newSize); + } return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/backends/xrandr/xrandrmode.cpp new/libkscreen-1.0.1/backends/xrandr/xrandrmode.cpp --- old/libkscreen-1.0/backends/xrandr/xrandrmode.cpp 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/backends/xrandr/xrandrmode.cpp 2013-08-01 17:44:13.000000000 +0200 @@ -48,4 +48,9 @@ return kscreenMode; } +QSize XRandRMode::size() const +{ + return m_size; +} + #include "xrandrmode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/backends/xrandr/xrandrmode.h new/libkscreen-1.0.1/backends/xrandr/xrandrmode.h --- old/libkscreen-1.0/backends/xrandr/xrandrmode.h 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/backends/xrandr/xrandrmode.h 2013-08-01 17:44:13.000000000 +0200 @@ -45,6 +45,7 @@ KScreen::Mode* toKScreenMode(KScreen::Output *parent); + QSize size() const; private: int m_id; QString m_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/backends/xrandr/xrandroutput.cpp new/libkscreen-1.0.1/backends/xrandr/xrandroutput.cpp --- old/libkscreen-1.0/backends/xrandr/xrandroutput.cpp 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/backends/xrandr/xrandroutput.cpp 2013-08-01 17:44:13.000000000 +0200 @@ -87,6 +87,16 @@ return m_currentMode; } +XRandRMode* XRandROutput::currentMode() const +{ + int modeId = m_currentMode.toInt(); + if (!m_modes.contains(modeId)) { + return 0; + } + + return m_modes[modeId]; +} + KScreen::Output::Rotation XRandROutput::rotation() const { return m_rotation; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/backends/xrandr/xrandroutput.h new/libkscreen-1.0.1/backends/xrandr/xrandroutput.h --- old/libkscreen-1.0/backends/xrandr/xrandroutput.h 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/backends/xrandr/xrandroutput.h 2013-08-01 17:44:13.000000000 +0200 @@ -81,6 +81,7 @@ bool isPrimary() const; QPoint position() const; QString currentModeId() const; + XRandRMode* currentMode() const; KScreen::Output::Rotation rotation() const; inline bool isHorizontal() const { return ((m_rotation == KScreen::Output::None) || (m_rotation == KScreen::Output::Inverted)); } KScreen::Edid* edid() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/cmake/modules/COPYING-CMAKE-SCRIPTS new/libkscreen-1.0.1/cmake/modules/COPYING-CMAKE-SCRIPTS --- old/libkscreen-1.0/cmake/modules/COPYING-CMAKE-SCRIPTS 1970-01-01 01:00:00.000000000 +0100 +++ new/libkscreen-1.0.1/cmake/modules/COPYING-CMAKE-SCRIPTS 2013-08-01 17:44:13.000000000 +0200 @@ -0,0 +1,22 @@ +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-1.0/src/configmonitor.h new/libkscreen-1.0.1/src/configmonitor.h --- old/libkscreen-1.0/src/configmonitor.h 2013-06-16 17:54:26.000000000 +0200 +++ new/libkscreen-1.0.1/src/configmonitor.h 2013-08-01 17:44:13.000000000 +0200 @@ -28,7 +28,6 @@ #include "config.h" #include "kscreen_export.h" -class AbstractBackend; namespace KScreen { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
