commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2015-10-12 10:00:56
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.changes2014-10-14
07:09:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2015-10-12 10:01:12.0 +0200
@@ -1,0 +2,9 @@
+Thu Oct 8 13:04:45 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Added patches from upstream:
+ 0001-Fix-crash-in-XRandr1.1-backend.patch (kde#341485)
+ 0002-Avoid-target-name-collision.patch
+ 0003-Fix-quoting-problems-with-D-depending-on-required-cm.patch
+ and 0004-Fix-building-apps-that-use-kscreen-and-which-fail-wi.patch
+
+---
New:
0001-Fix-crash-in-XRandr1.1-backend.patch
0002-Avoid-target-name-collision.patch
0003-Fix-quoting-problems-with-D-depending-on-required-cm.patch
0004-Fix-building-apps-that-use-kscreen-and-which-fail-wi.patch
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.OIVCb9/_old 2015-10-12 10:01:13.0 +0200
+++ /var/tmp/diff_new_pack.OIVCb9/_new 2015-10-12 10:01:13.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkscreen
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,14 @@
Group: System/GUI/KDE
Url:http://www.kde.org
Source:
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 0001-Fix-crash-in-XRandr1.1-backend.patch
+Patch0: 0001-Fix-crash-in-XRandr1.1-backend.patch
+# PATCH-FIX-UPSTREAM 0002-Avoid-target-name-collision.patch
+Patch1: 0002-Avoid-target-name-collision.patch
+# PATCH-FIX-UPSTREAM
0003-Fix-quoting-problems-with-D-depending-on-required-cm.patch
+Patch2: 0003-Fix-quoting-problems-with-D-depending-on-required-cm.patch
+# PATCH-FIX-UPSTREAM
0004-Fix-building-apps-that-use-kscreen-and-which-fail-wi.patch
+Patch3: 0004-Fix-building-apps-that-use-kscreen-and-which-fail-wi.patch
BuildRequires: libkde4-devel >= 4.7.0
BuildRequires: libqjson-devel >= 0.8.1
BuildRequires: pkgconfig(x11)
@@ -58,6 +66,10 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%cmake_kde4 -d build
++ 0001-Fix-crash-in-XRandr1.1-backend.patch ++
>From 257aae50cffbcedf488245c289b30c334c2d5cc0 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid
Date: Sat, 20 Dec 2014 00:23:53 +0100
Subject: [PATCH 1/4] Fix crash in XRandr1.1 backend
REVIEW: 121605
BUGS: 341485
---
backends/xrandr1.1/xrandr11.cpp | 4
1 file changed, 4 insertions(+)
diff --git a/backends/xrandr1.1/xrandr11.cpp b/backends/xrandr1.1/xrandr11.cpp
index
3136957d51075accde25d7d349f3145f2d22bc2d..c0380a6ab0269cf91582830ed7e6cfa6b4bf396d
100644
--- a/backends/xrandr1.1/xrandr11.cpp
+++ b/backends/xrandr1.1/xrandr11.cpp
@@ -90,6 +90,10 @@ KScreen::Config* XRandR11::config() const
ScreenInfo info(xcbScreen->root);
ScreenSize size(xcbScreen->root);
+if (info.isNull() || size.isNull()) {
+return 0;
+}
+
if (info->config_timestamp == m_currentTimestamp) {
return m_currentConfig;
}
--
2.6.0
++ 0002-Avoid-target-name-collision.patch ++
>From 7b48eb334c8f02185aad2a23021e6bcf78a03e51 Mon Sep 17 00:00:00 2001
From: Kevin Ottens
Date: Mon, 20 Jul 2015 18:32:26 +0200
Subject: [PATCH 2/4] Avoid target name collision
---
tests/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index
8372e77cb7314435bde93a33c04aa7c599cfe45a..1094aa35a89e3c5955ce287f60c68b0246c4a760
100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,7 +6,7 @@ macro(KSCREEN_TESTS)
include_directories(${QT_INCLUDES} ${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR} ${X11_Xrandr_INCLUDE_PATH})
kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc)
target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} kscreen)
-add_test(${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname})
+add_test(libkscreen-${_testname}
${CMAKE_CURRENT_BINARY_DIR}/${_testname})
endforeach(_testname)
endmacro(KSCREEN_TESTS)
--
2.6.0
++ 0003-Fix-quoting-problems-with-D-depending-on-required-cm
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2014-10-14 07:09:09
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.changes2014-05-15
21:31:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2014-10-14 07:09:16.0 +0200
@@ -1,0 +2,16 @@
+Tue Sep 30 22:50:23 UTC 2014 - crrodrig...@opensuse.org
+
+- Explicitly buildrequire needed x11 libraries, do not count
+ with them coming indirectly.
+
+---
+Mon Aug 4 19:56:24 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to version 1.0.5:
+ * Bugfix release:
+- Use a xcb private connection to query for xrandr version, kde#331784
+- Don't leave dangling pointer when primary output is removed
+- Fix crash in XRandR backend when primary output is not set,
+ kde#335366, kde#334598
+
+---
Old:
libkscreen-1.0.4.tar.xz
New:
libkscreen-1.0.5.tar.xz
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.nwq5Ew/_old 2014-10-14 07:09:17.0 +0200
+++ /var/tmp/diff_new_pack.nwq5Ew/_new 2014-10-14 07:09:17.0 +0200
@@ -19,7 +19,7 @@
#
%define soversion 1
Name: libkscreen
-Version:1.0.4
+Version:1.0.5
Release:0
Summary:KDE's screen management library
License:GPL-2.0+
@@ -28,9 +28,11 @@
Source:
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: libkde4-devel >= 4.7.0
BuildRequires: libqjson-devel >= 0.8.1
+BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-image)
BuildRequires: pkgconfig(xcb-renderutil)
+BuildRequires: pkgconfig(xrandr)
Provides: libkscreen-plugin
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++ libkscreen-1.0.4.tar.xz -> libkscreen-1.0.5.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkscreen-1.0.4/backends/xrandr/CMakeLists.txt
new/libkscreen-1.0.5/backends/xrandr/CMakeLists.txt
--- old/libkscreen-1.0.4/backends/xrandr/CMakeLists.txt 2014-05-11
03:17:35.0 +0200
+++ new/libkscreen-1.0.5/backends/xrandr/CMakeLists.txt 2014-08-03
23:14:49.0 +0200
@@ -23,6 +23,8 @@
${KDE4_KDEUI_LIBS}
${X11_Xrandr_LIB}
${X11_LIBRARIES}
+ ${XCB_RANDR_LIBRARIES}
+ ${XCB_XCB_LIBRARIES}
kscreen
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkscreen-1.0.4/backends/xrandr/xrandr.cpp
new/libkscreen-1.0.5/backends/xrandr/xrandr.cpp
--- old/libkscreen-1.0.4/backends/xrandr/xrandr.cpp 2014-05-11
03:17:35.0 +0200
+++ new/libkscreen-1.0.5/backends/xrandr/xrandr.cpp 2014-08-03
23:14:49.0 +0200
@@ -34,6 +34,8 @@
#include
#include
+#include
+
#include
Q_EXPORT_PLUGIN2(XRandR, XRandR)
@@ -55,25 +57,35 @@
, m_x11Helper(0)
, m_isValid(false)
{
-if (s_display == 0) {
-s_display = QX11Info::display();
-s_screen = DefaultScreen(s_display);
-s_rootWindow = XRootWindow(s_display, s_screen);
+// Use our own connection to make sure that we won't mess up Qt's
connection
+// if something goes wrong on our side.
+xcb_generic_error_t *error = 0;
+xcb_randr_query_version_reply_t* version;
+xcb_connection_t *connection = xcb_connect(0, 0);
+version = xcb_randr_query_version_reply(connection,
xcb_randr_query_version(connection, XCB_RANDR_MAJOR_VERSION,
XCB_RANDR_MINOR_VERSION), &error);
+xcb_disconnect(connection);
-XRRQueryExtension(s_display, &s_randrBase, &s_randrError);
+if (!version || error) {
+free(error);
+return;
}
-int majorVersion = 0, minorVersion = 0;
-XRRQueryVersion(s_display, &majorVersion, &minorVersion);
-
-if ((majorVersion > 1) || ((majorVersion == 1) && (minorVersion >= 2))) {
+if ((version->major_version > 1) || ((version->major_version == 1) &&
(version->minor_version >= 2))) {
m_isValid = true;
} else {
kDebug() << "XRandR extension not available or unsupported version";
return;
}
-XRandR::s_has_1_3 = (majorVersion > 1 || (majorVersion == 1 &&
minorVersion >= 3));
+if (s_displ
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2014-05-15 21:31:25
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.changes2014-05-05
21:12:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2014-05-15 21:31:26.0 +0200
@@ -1,0 +2,6 @@
+Tue May 13 01:48:50 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Update to version 1.0.4:
+ * Bugfix release, no changelog provided
+
+---
Old:
libkscreen-1.0.3.tar.xz
New:
libkscreen-1.0.4.tar.xz
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.OVye0O/_old 2014-05-15 21:31:27.0 +0200
+++ /var/tmp/diff_new_pack.OVye0O/_new 2014-05-15 21:31:27.0 +0200
@@ -19,7 +19,7 @@
#
%define soversion 1
Name: libkscreen
-Version:1.0.3
+Version:1.0.4
Release:0
Summary:KDE's screen management library
License:GPL-2.0+
++ libkscreen-1.0.3.tar.xz -> libkscreen-1.0.4.tar.xz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkscreen-1.0.3/CMakeLists.txt
new/libkscreen-1.0.4/CMakeLists.txt
--- old/libkscreen-1.0.3/CMakeLists.txt 2014-05-04 19:25:33.0 +0200
+++ new/libkscreen-1.0.4/CMakeLists.txt 2014-05-11 03:17:35.0 +0200
@@ -1,7 +1,7 @@
project(libkscreen)
set(libkscreen_VERSION_MAJOR 1)
set(libkscreen_VERSION_MINOR 0)
-set(libkscreen_VERSION_RELEASE 2)
+set(libkscreen_VERSION_RELEASE 4)
set(libkscreen_VERSION
"${libkscreen_VERSION_MAJOR}.${libkscreen_VERSION_MINOR}.${libkscreen_VERSION_RELEASE}")
add_definitions("-DLIBKSCREEN_VERSION=\\\"${libkscreen_VERSION}\\\"")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkscreen-1.0.3/backends/xrandr/xrandrconfig.cpp
new/libkscreen-1.0.4/backends/xrandr/xrandrconfig.cpp
--- old/libkscreen-1.0.3/backends/xrandr/xrandrconfig.cpp 2014-05-04
19:25:33.0 +0200
+++ new/libkscreen-1.0.4/backends/xrandr/xrandrconfig.cpp 2014-05-11
03:17:35.0 +0200
@@ -157,7 +157,7 @@
output->updateKScreenOutput(kscreenOutput);
}
-if (config->primaryOutput()->id() != m_primaryOutput) {
+if (!config->primaryOutput() || config->primaryOutput()->id() !=
m_primaryOutput) {
config->setPrimaryOutput(config->output(m_primaryOutput));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libkscreen-1.0.3/src/output.cpp
new/libkscreen-1.0.4/src/output.cpp
--- old/libkscreen-1.0.3/src/output.cpp 2014-05-04 19:25:33.0 +0200
+++ new/libkscreen-1.0.4/src/output.cpp 2014-05-11 03:17:35.0 +0200
@@ -425,7 +425,11 @@
QDebug operator<<(QDebug dbg, const KScreen::Output *output)
{
-dbg << "KScreen::Output(Id:" << output->id() <<", Name:" << output->name()
<< ")";
+if(output) {
+dbg << "KScreen::Output(Id:" << output->id() <<", Name:" <<
output->name() << ")";
+} else {
+dbg << "KScreen::Output(NULL)";
+}
return dbg;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkscreen for openSUSE:Factory
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.changes2014-05-02
13:59:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2014-05-05 21:12:20.0 +0200
@@ -1,0 +2,6 @@
+Sun May 4 19:20:47 UTC 2014 - hrvoje.sen...@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.0 +0200
+++ /var/tmp/diff_new_pack.Orum7g/_new 2014-05-05 21:12:21.0 +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.0 +0100
+++ new/libkscreen-1.0.3/backends/fake/parser.cpp 2014-05-04
19:25:33.0 +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.0 +0100
+++ new/libkscreen-1.0.3/backends/xrandr/xrandr.cpp 2014-05-04
19:25:33.0 +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.0 +0100
+++ new/libkscreen-1.0.3/backends/xrandr/xrandrconfig.cpp 2014-05-04
19:25:33.0 +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(
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2014-05-02 13:59:05
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.changes2013-11-26
14:40:37.0 +0100
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2014-05-02 13:59:07.0 +0200
@@ -1,0 +2,5 @@
+Thu May 1 23:04:00 UTC 2014 - hrvoje.sen...@gmail.com
+
+- Make sure that devel package requires libqjson-devel
+
+---
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.ajROsr/_old 2014-05-02 13:59:07.0 +0200
+++ /var/tmp/diff_new_pack.ajROsr/_new 2014-05-02 13:59:07.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libkscreen
#
-# 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
@@ -41,6 +41,7 @@
Summary:KDE's screen management library (development package)
Group: Development/Libraries/C and C++
Requires: %{name}%{soversion} = %{version}
+Requires: libqjson-devel >= 0.8.1
%description devel
Development files belonging to libkscreen, dynamic display management in KDE
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2013-11-26 14:40:36
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.changes2013-09-16
16:12:19.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2013-11-26 14:40:37.0 +0100
@@ -1,0 +2,8 @@
+Thu Nov 21 23:15:12 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Update to version 1.0.2:
+ * Bugfix release, no changelog provided
+- Dropped refresh-modes-when-currentModeId-points-to-unknown-mode.patch,
+ merged upstream
+
+---
Old:
libkscreen-1.0.1.tar.bz2
refresh-modes-when-currentModeId-points-to-unknown-mode.patch
New:
libkscreen-1.0.2.tar.xz
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.2p4ZOv/_old 2013-11-26 14:40:37.0 +0100
+++ /var/tmp/diff_new_pack.2p4ZOv/_new 2013-11-26 14:40:37.0 +0100
@@ -19,15 +19,13 @@
#
%define soversion 1
Name: libkscreen
-Version:1.0.1
+Version:1.0.2
Release:0
Summary:KDE's screen management library
License:GPL-2.0+
Group: System/GUI/KDE
Url:http://www.kde.org
-Source:
http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM
refresh-modes-when-currentModeId-points-to-unknown-mode.patch bnc#840446
kde#324625
-Patch0: refresh-modes-when-currentModeId-points-to-unknown-mode.patch
+Source:
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
BuildRequires: libkde4-devel >= 4.7.0
BuildRequires: libqjson-devel >= 0.8.1
BuildRequires: pkgconfig(xcb)
@@ -57,7 +55,6 @@
%prep
%setup -q
-%patch0 -p1
%build
%cmake_kde4 -d build
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2013-09-16 16:12:18
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.changes2013-08-02
15:24:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2013-09-16 16:12:19.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 15 19:54:44 UTC 2013 - jsl...@suse.com
+
+- refresh-modes-when-currentModeId-points-to-unknown-mode.patch:
+ Refresh modes when currentModeId points to unknown mode (bnc#840446)
+
+---
New:
refresh-modes-when-currentModeId-points-to-unknown-mode.patch
Other differences:
--
++ libkscreen.spec ++
--- /var/tmp/diff_new_pack.Mo5csm/_old 2013-09-16 16:12:21.0 +0200
+++ /var/tmp/diff_new_pack.Mo5csm/_new 2013-09-16 16:12:21.0 +0200
@@ -26,6 +26,8 @@
Group: System/GUI/KDE
Url:http://www.kde.org
Source:
http://download.kde.org/stable/%{name}/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM
refresh-modes-when-currentModeId-points-to-unknown-mode.patch bnc#840446
kde#324625
+Patch0: refresh-modes-when-currentModeId-points-to-unknown-mode.patch
BuildRequires: libkde4-devel >= 4.7.0
BuildRequires: libqjson-devel >= 0.8.1
BuildRequires: pkgconfig(xcb)
@@ -55,6 +57,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kde4 -d build
++ refresh-modes-when-currentModeId-points-to-unknown-mode.patch ++
commit 1d9ac012e857036bb8814cc84c9cf10bb57ca40c
Author: Dan Vrátil
Date: Mon Sep 9 18:43:56 2013 +0200
References: bnc#840446
Refresh modes when currentModeId points to unknown mode
Sometimes drivers insert or remove modes, so when currentModeId points to a
mode
that we don't have cached, we must refresh the local cache.
This also fixes a crash that occured when currentModeId would be pointing
to a
mode that we don't have (even after refreshing modes)
REVIEW: 112604
BUG: 323107
BUG: 324625
FIXED-IN: 1.0.2
diff --git a/backends/xrandr/xrandrconfig.cpp b/backends/xrandr/xrandrconfig.cpp
index ff20c79..52beac6 100644
--- a/backends/xrandr/xrandrconfig.cpp
+++ b/backends/xrandr/xrandrconfig.cpp
@@ -163,31 +163,54 @@ void XRandRConfig::applyKScreenConfig(KScreen::Config
*config)
}
XRandRMode* currentMode = currentOutput->currentMode();
-Q_ASSERT_X(currentMode, "applyKScreenConfig", "currentOutput has
returned a null XRandRMode*");
-QSize size = currentMode->size();
+// Current output mode can be unlisted - when output size changes to a
+// resolution that is not listed by xrandr, in some cases the driver
will
+// dynamically create a new mode, so we just need to update the list
+// of modes and try to get a mode matching currentModeId again.
+// In some cases however re-reading modes from xrandr won't help - in
that
+// case we fallback to doing nothing
+if (!currentMode) {
+XRROutputInfo *outputInfo = XRandR::XRROutput(currentOutput->id());
+currentOutput->updateModes(outputInfo);
+XRRFreeOutputInfo(outputInfo);
+currentMode = currentOutput->currentMode();
+}
-int x, y;
+if (currentMode) {
+const QSize size = currentMode->size();
+int x, y;
-//TODO: Move this code within libkscreen
-y = currentOutput->position().y();
-if (currentOutput->isHorizontal()) {
-y += size.height();
-} else {
-y += size.width();
-}
+//TODO: Move this code within libkscreen
+y = currentOutput->position().y();
+if (currentOutput->isHorizontal()) {
+y += size.height();
+} else {
+y += size.width();
+}
-x = currentOutput->position().x();
-if (currentOutput->isHorizontal()) {
-x += size.width();
-} else {
-x += size.height();
-}
+x = currentOutput->position().x();
+if (currentOutput->isHorizontal()) {
+x += size.width();
+} else {
+x += size.height();
+}
-if (x > newSize.width() || y > newSize.height()) {
-if (!toDisable.contains(output->id())) {
-kDebug(dXndr()) << "Output doesn't fit: " << x << "x" << y <<
newSize;
-toDisable.insert(output->id(), output);
+
commit libkscreen for openSUSE:Factory
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.changes2013-07-08
11:56:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2013-08-02 15:24:25.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.ILfQtO/_new 2013-08-02 15:24:25.0 +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.0 +0200
+++ new/libkscreen-1.0.1/CMakeLists.txt 2013-08-01 17:44:13.0 +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.0 +0200
+++ new/libkscreen-1.0.1/backends/xrandr/xrandrconfig.cpp 2013-08-01
17:44:13.0 +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() &&
commit libkscreen for openSUSE:Factory
Hello community,
here is the log from the commit of package libkscreen for openSUSE:Factory
checked in at 2013-07-08 11:56:39
Comparing /work/SRC/openSUSE:Factory/libkscreen (Old)
and /work/SRC/openSUSE:Factory/.libkscreen.new (New)
Package is "libkscreen"
Changes:
New Changes file:
--- /dev/null 2013-07-02 09:26:14.908030755 +0200
+++ /work/SRC/openSUSE:Factory/.libkscreen.new/libkscreen.changes
2013-07-08 11:56:41.0 +0200
@@ -0,0 +1,12 @@
+---
+Fri Jul 5 16:08:18 UTC 2013 - tittiatc...@gmail.com
+
+- Add COPYING license file to filelist
+
+---
+Mon Jun 17 16:50:44 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Initial package
+
+
+
New:
libkscreen-1.0.tar.bz2
libkscreen.changes
libkscreen.spec
Other differences:
--
++ libkscreen.spec ++
#
# spec file for package libkscreen
#
# Copyright (c) 2012 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 soversion 1
Name: libkscreen
Version:1.0
Release:0
License:GPL-2.0+
Summary:KDE's screen management library
Url:http://www.kde.org
Group: System/GUI/KDE
Source:
http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
BuildRequires: libkde4-devel >= 4.7.0
BuildRequires: libqjson-devel >= 0.8.1
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-image)
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}
%description devel
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
%description -n %{name}%{soversion}
Shared library for dynamic display management in KDE
%prep
%setup -q
%build
%cmake_kde4 -d build
%make_jobs
%install
pushd build
%kde4_makeinstall
popd
%kde_post_install
%post -n %{name}%{soversion} -p /sbin/ldconfig
%postun -n %{name}%{soversion} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc COPYING
%dir %{_kde4_modulesdir}/plugins/kscreen
%{_kde4_modulesdir}/plugins/kscreen/KSC_XRandR.so
%{_kde4_modulesdir}/plugins/kscreen/KSC_XRandR11.so
%files -n %{name}%{soversion}
%defattr(-,root,root)
%doc COPYING
%{_kde4_libdir}/%{name}.so.%{soversion}*
%files devel
%defattr(-,root,root)
%doc COPYING
%{_kde4_includedir}/kscreen/
%{_kde4_libdir}/%{name}.so
%{_kde4_libdir}/pkgconfig/kscreen.pc
%{_kde4_libdir}/cmake/LibKScreen/
%{_kde4_modulesdir}/plugins/kscreen/KSC_Fake.so
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
