[arch-commits] Commit in libkscreen/trunk (PKGBUILD fix-crash.patch)

[Andrea Scarpino]

    Date: Monday, May 12, 2014 @ 04:55:00
  Author: andrea
Revision: 212290

upgpkg: libkscreen 1.0.4-1

Upstream release

Modified:
  libkscreen/trunk/PKGBUILD
Deleted:
  libkscreen/trunk/fix-crash.patch

-----------------+
 PKGBUILD        |   13 ++++---------
 fix-crash.patch |   53 -----------------------------------------------------
 2 files changed, 4 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-12 00:43:52 UTC (rev 212289)
+++ PKGBUILD	2014-05-12 02:55:00 UTC (rev 212290)
@@ -3,8 +3,8 @@
 # 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'
@@ -11,16 +11,11 @@
 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() {

Deleted: fix-crash.patch
===================================================================
--- fix-crash.patch	2014-05-12 00:43:52 UTC (rev 212289)
+++ fix-crash.patch	2014-05-12 02:55:00 UTC (rev 212290)
@@ -1,53 +0,0 @@
-From: Aleix Pol <aleixpol at 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 at 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;
- }
- 
-