diff --git a/.gitignore b/.gitignore index 671d926..5ab60b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/libkscreen-0.9.0-20121228git.tar.gz -/libkscreen-0.0.71.tar.bz2 -/libkscreen-0.0.81.tar.bz2 -/libkscreen-0.0.92.tar.bz2 -/libkscreen-1.0.tar.bz2 -/libkscreen-1.0.1.tar.bz2 -/libkscreen-1.0.2.tar.xz +/libkscreen-1.0.4.tar.xz diff --git a/0001-fix-pkgconfig-Version.patch b/0001-fix-pkgconfig-Version.patch deleted file mode 100644 index 0428f36..0000000 --- a/0001-fix-pkgconfig-Version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f45dc4a373acf9ed5fed905df6deb709506d27e2 Mon Sep 17 00:00:00 2001 -From: Rex Dieter -Date: Mon, 25 Nov 2013 07:54:55 -0600 -Subject: [PATCH] fix pkgconfig Version: - ---- - src/kscreen.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kscreen.pc.in b/src/kscreen.pc.in -index 6f4bb39..2687d2e 100644 ---- a/src/kscreen.pc.in -+++ b/src/kscreen.pc.in -@@ -4,7 +4,7 @@ includedir=@CMAKE_INSTALL_PREFIX@/include - - 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} --- -1.8.4.2 - diff --git a/0002-keep-xrandroutput-cache-up-to-date.patch b/0002-keep-xrandroutput-cache-up-to-date.patch deleted file mode 100644 index bbf1fb2..0000000 --- a/0002-keep-xrandroutput-cache-up-to-date.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit de38db6b97264a82dca25f7e663ff2e8791bc804 -Author: Dan Vrátil -Date: Tue Apr 1 18:30:24 2014 +0200 - - Update XRandROutput after it's disabled so that cache is kept up-to-date - - After disabling an output, we have to force-update the XRandROutput, because right - after that we receive RRNotify_CRTCChange signal for that very output. This is - propagated to users (like KCM), which then call canBeApplied(). canBeApplied() - compares the KScreen::Config with the *outdated* XRandRConfig and that leads to - a crash (because the XRandRConfig still claims that the output is enabled). - - By updating the cache right after we disable the output, when KCM calls canBeApplied(), - it's Config is compared to an up-to-date Config and everything is fine. - - REVIEW: 117298 - -diff --git a/backends/xrandr/xrandrconfig.cpp b/backends/xrandr/xrandrconfig.cpp -index 04b37bd..c28250c 100644 ---- a/backends/xrandr/xrandrconfig.cpp -+++ b/backends/xrandr/xrandrconfig.cpp -@@ -507,6 +507,12 @@ bool XRandRConfig::disableOutput(Output* output) const - 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 --git a/libkscreen.spec b/libkscreen.spec index 6015168..6ea7927 100644 --- a/libkscreen.spec +++ b/libkscreen.spec @@ -1,7 +1,7 @@ Name: libkscreen Epoch: 1 -Version: 1.0.2 -Release: 3%{?dist} +Version: 1.0.4 +Release: 1%{?dist} Summary: Display configuration library License: GPLv2+ @@ -10,8 +10,6 @@ URL: https://projects.kde.org/projects/playground/libs/libkscreen Source0: http://download.kde.org/stable/libkscreen/%{version}/src/libkscreen-%{version}.tar.xz ## upstream patches -Patch0001: 0001-fix-pkgconfig-Version.patch -Patch0002: 0002-keep-xrandroutput-cache-up-to-date.patch BuildRequires: kdelibs4-devel BuildRequires: libXrandr-devel @@ -33,8 +31,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0001 -p1 -b .0001 -%patch0002 -p1 -b .0002 %build mkdir -p %{_target_platform} @@ -65,13 +61,16 @@ test "$(pkg-config --modversion kscreen)" = "%{version}" %{_kde4_libdir}/kde4/plugins/kscreen/ %files devel -%{_includedir}/kscreen/ +%{_kde4_includedir}/kscreen/ %{_kde4_libdir}/libkscreen.so %{_kde4_libdir}/cmake/LibKScreen/ %{_kde4_libdir}/pkgconfig/kscreen.pc %changelog +* Tue May 13 2014 Rex Dieter 1:1.0.4-1 +- 1.0.4 + * Tue Apr 22 2014 Daniel Vrátil - 1:1.0.2-3 - backport upstream crash fix - Resolves: rhbz#998395 rhbz#1004558 rhbz#1016769 rhbz#1023816 diff --git a/sources b/sources index 9e41aef..5cfecad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -39f5316ef4f9203dd7a42180edbab122 libkscreen-1.0.2.tar.xz +802ba357e1e802d6773405bc54b47145 libkscreen-1.0.4.tar.xz