author | Andrea Scarpino
<andrea@archlinux.org> 2014-05-12 02:55:00 UTC |
committer | Andrea Scarpino
<andrea@archlinux.org> 2014-05-12 02:55:00 UTC |
parent | 9ae9fdd4130c44294280a667afb3fb400b109f3d |
PKGBUILD | +4 | -9 |
fix-crash.patch | +0 | -53 |
diff --git a/PKGBUILD b/PKGBUILD index 467667a..3bbec86 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,24 +2,19 @@ # Contributor: birdflesh <antkoul at gmail dot com> pkgname=libkscreen -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="KDE's screen management library" arch=('i686' 'x86_64') url='https://projects.kde.org/libkscreen' license=('GPL') depends=('kdelibs' 'qjson') makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'fix-crash.patch') -md5sums=('7048db071d669193f8dafc9a1319998b' - 'fef9233861b848d569c015f6095d390a') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('802ba357e1e802d6773405bc54b47145') prepare() { mkdir build - - cd $pkgname-$pkgver - patch -p1 -i "$srcdir"/fix-crash.patch } build() { diff --git a/fix-crash.patch b/fix-crash.patch deleted file mode 100644 index a385edc..0000000 --- a/fix-crash.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Aleix Pol <aleixpol@kde.org> -Date: Mon, 05 May 2014 13:13:25 +0000 -Subject: Fix crash -X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=221dff2e2f9fbd1c18eae9b59f23b1dbbdb1870b ---- -Fix crash - -If we don't have a primary output, don't query it. Set a new primary -output instead. - -Reviewed by Alex Fiestas ---- - - ---- a/backends/xrandr/xrandrconfig.cpp -+++ b/backends/xrandr/xrandrconfig.cpp -@@ -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)); - } - } - -From: Aleix Pol <aleixpol@kde.org> -Date: Tue, 06 May 2014 13:55:16 +0000 -Subject: Don't crash when printing a null KScreen::Output* from qDebug -X-Git-Url: http://quickgit.kde.org/?p=libkscreen.git&a=commitdiff&h=31f07fd26e6091dfd37c54fef3352a95182e5bba ---- -Don't crash when printing a null KScreen::Output* from qDebug - -Reviewed by Alex Fiestas ---- - - ---- a/src/output.cpp -+++ b/src/output.cpp -@@ -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; - } - -