[arch-commits] Commit in libkscreen/repos (6 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Mon May 12 02:55:11 UTC 2014
Date: Monday, May 12, 2014 @ 04:55:11
Author: andrea
Revision: 212291
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libkscreen/repos/extra-i686/PKGBUILD
(from rev 212290, libkscreen/trunk/PKGBUILD)
libkscreen/repos/extra-x86_64/PKGBUILD
(from rev 212290, libkscreen/trunk/PKGBUILD)
Deleted:
libkscreen/repos/extra-i686/PKGBUILD
libkscreen/repos/extra-i686/fix-crash.patch
libkscreen/repos/extra-x86_64/PKGBUILD
libkscreen/repos/extra-x86_64/fix-crash.patch
------------------------------+
/PKGBUILD | 66 +++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 38 -----------------------
extra-i686/fix-crash.patch | 53 --------------------------------
extra-x86_64/PKGBUILD | 38 -----------------------
extra-x86_64/fix-crash.patch | 53 --------------------------------
5 files changed, 66 insertions(+), 182 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-05-12 02:55:00 UTC (rev 212290)
+++ extra-i686/PKGBUILD 2014-05-12 02:55:11 UTC (rev 212291)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=libkscreen
-pkgver=1.0.3
-pkgrel=2
-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')
-
-prepare() {
- mkdir build
-
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/fix-crash.patch
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libkscreen/repos/extra-i686/PKGBUILD (from rev 212290, libkscreen/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-05-12 02:55:11 UTC (rev 212291)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=libkscreen
+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")
+md5sums=('802ba357e1e802d6773405bc54b47145')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/fix-crash.patch
===================================================================
--- extra-i686/fix-crash.patch 2014-05-12 02:55:00 UTC (rev 212290)
+++ extra-i686/fix-crash.patch 2014-05-12 02:55:11 UTC (rev 212291)
@@ -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;
- }
-
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-05-12 02:55:00 UTC (rev 212290)
+++ extra-x86_64/PKGBUILD 2014-05-12 02:55:11 UTC (rev 212291)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: birdflesh <antkoul at gmail dot com>
-
-pkgname=libkscreen
-pkgver=1.0.3
-pkgrel=2
-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')
-
-prepare() {
- mkdir build
-
- cd $pkgname-$pkgver
- patch -p1 -i "$srcdir"/fix-crash.patch
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: libkscreen/repos/extra-x86_64/PKGBUILD (from rev 212290, libkscreen/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-05-12 02:55:11 UTC (rev 212291)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: birdflesh <antkoul at gmail dot com>
+
+pkgname=libkscreen
+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")
+md5sums=('802ba357e1e802d6773405bc54b47145')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/fix-crash.patch
===================================================================
--- extra-x86_64/fix-crash.patch 2014-05-12 02:55:00 UTC (rev 212290)
+++ extra-x86_64/fix-crash.patch 2014-05-12 02:55:11 UTC (rev 212291)
@@ -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;
- }
-
-
More information about the arch-commits
mailing list