Date: Tuesday, May 10, 2016 @ 18:57:44
Author: arojas
Revision: 267510
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
spectacle/repos/extra-i686/PKGBUILD
(from rev 267509, spectacle/trunk/PKGBUILD)
spectacle/repos/extra-x86_64/PKGBUILD
(from rev 267509, spectacle/trunk/PKGBUILD)
Deleted:
spectacle/repos/extra-i686/PKGBUILD
spectacle/repos/extra-i686/kdebug-362241.patch
spectacle/repos/extra-x86_64/PKGBUILD
spectacle/repos/extra-x86_64/kdebug-362241.patch
----------------------------------+
/PKGBUILD | 74 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 47 -----------------------
extra-i686/kdebug-362241.patch | 52 --------------------------
extra-x86_64/PKGBUILD | 47 -----------------------
extra-x86_64/kdebug-362241.patch | 52 --------------------------
5 files changed, 74 insertions(+), 198 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-10 16:57:23 UTC (rev 267509)
+++ extra-i686/PKGBUILD 2016-05-10 16:57:44 UTC (rev 267510)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-
-pkgname=spectacle
-pkgver=16.04.0
-pkgrel=3
-pkgdesc="KDE screenshot capture utility"
-arch=(i686 x86_64)
-url='https://www.kde.org/applications/graphics/'
-license=(GPL)
-depends=(xcb-util-cursor libkscreen libkipi purpose)
-makedepends=(extra-cmake-modules kdoctools python)
-conflicts=(kdegraphics-ksnapshot kscreengenie)
-replaces=(kdegraphics-ksnapshot kscreengenie)
-groups=(kde-applications kdegraphics)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";
-
spectacle-hidpi.patch::"https://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=3d4dcacc&o=plain";
- kdebug-362241.patch)
-md5sums=('231a565255ff420b2a8b0974530b1c28'
- '53e7af8dd42eb968d642d110f0a69be1'
- '4cc380edb046432832fc6a3aeb926d82')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
-# Fix high DPI
- patch -p1 -i ../spectacle-hidpi.patch
-# Unbreak rectangular image grabs for nvidia users
http://bugs.kde.org/show_bug.cgi?id=362241
- patch -p1 -i ../kdebug-362241.patch
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
-
Copied: spectacle/repos/extra-i686/PKGBUILD (from rev 267509,
spectacle/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-10 16:57:44 UTC (rev 267510)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+
+pkgname=spectacle
+pkgver=16.04.1
+pkgrel=1
+pkgdesc="KDE screenshot capture utility"
+arch=(i686 x86_64)
+url='https://www.kde.org/applications/graphics/'
+license=(GPL)
+depends=(xcb-util-cursor libkscreen libkipi purpose)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdegraphics-ksnapshot kscreengenie)
+replaces=(kdegraphics-ksnapshot kscreengenie)
+groups=(kde-applications kdegraphics)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";)
+md5sums=('385471b28d5be50ff64ebe4315193833')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
+
Deleted: extra-i686/kdebug-362241.patch
===================================================================
--- extra-i686/kdebug-362241.patch 2016-05-10 16:57:23 UTC (rev 267509)
+++ extra-i686/kdebug-362241.patch 2016-05-10 16:57:44 UTC (rev 267510)
@@ -1,52 +0,0 @@
-From: Boudhayan Gupta <m...@baloneygeek.com>
-Date: Mon, 25 Apr 2016 18:27:49 +0000
-Subject: Unbreak rectangular image grabs for nvidia users.
-X-Git-Url:
http://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=abbbe6d13de870f9e9349acc2542cffc5d41b76d
----
-Unbreak rectangular image grabs for nvidia users.
-
-BUG: 362241
-FIXED-IN: 16.04.1
----
-
-
---- a/src/QuickEditor/QuickEditor.cpp
-+++ b/src/QuickEditor/QuickEditor.cpp
-@@ -138,23 +138,7 @@
- d->mGrabRect = QRect(x, y, width, height);
- SpectacleConfig::instance()->setCropRegion(d->mGrabRect);
-
-- QQuickItem *target = d->mQuickView->rootObject()->findChild<QQuickItem
*>(QStringLiteral("imageBackground"));
-- d->mCurrentGrabResult = target->grabToImage();
-- if (d->mCurrentGrabResult.isNull()) {
-- emit grabCancelled();
-- return;
-- }
--
-- connect(d->mCurrentGrabResult.data(), &QQuickItemGrabResult::ready, this,
&QuickEditor::grabReadyHandler);
-+ d->mQuickView->hide();
-+ emit grabDone(mImageStore->mPixmap.copy(d->mGrabRect), d->mGrabRect);
- }
-
--void QuickEditor::grabReadyHandler()
--{
-- Q_D(QuickEditor);
--
-- QImage croppedImage = d->mCurrentGrabResult->image().copy(d->mGrabRect);
-- QPixmap croppedPixmap = QPixmap::fromImage(croppedImage);
--
-- d->mQuickView->hide();
-- emit grabDone(croppedPixmap, d->mGrabRect);
--}
-
---- a/src/QuickEditor/QuickEditor.h
-+++ b/src/QuickEditor/QuickEditor.h
-@@ -39,7 +39,6 @@
- private slots:
-
- void acceptImageHandler(int x, int y, int width, int height);
-- void grabReadyHandler();
-
- private:
-
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-10 16:57:23 UTC (rev 267509)
+++ extra-x86_64/PKGBUILD 2016-05-10 16:57:44 UTC (rev 267510)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <aro...@archlinux.org>
-
-pkgname=spectacle
-pkgver=16.04.0
-pkgrel=3
-pkgdesc="KDE screenshot capture utility"
-arch=(i686 x86_64)
-url='https://www.kde.org/applications/graphics/'
-license=(GPL)
-depends=(xcb-util-cursor libkscreen libkipi purpose)
-makedepends=(extra-cmake-modules kdoctools python)
-conflicts=(kdegraphics-ksnapshot kscreengenie)
-replaces=(kdegraphics-ksnapshot kscreengenie)
-groups=(kde-applications kdegraphics)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";
-
spectacle-hidpi.patch::"https://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=3d4dcacc&o=plain";
- kdebug-362241.patch)
-md5sums=('231a565255ff420b2a8b0974530b1c28'
- '53e7af8dd42eb968d642d110f0a69be1'
- '4cc380edb046432832fc6a3aeb926d82')
-
-prepare() {
- mkdir -p build
-
- cd $pkgname-$pkgver
-# Fix high DPI
- patch -p1 -i ../spectacle-hidpi.patch
-# Unbreak rectangular image grabs for nvidia users
http://bugs.kde.org/show_bug.cgi?id=362241
- patch -p1 -i ../kdebug-362241.patch
-}
-
-build() {
- cd build
- cmake ../$pkgname-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
-
Copied: spectacle/repos/extra-x86_64/PKGBUILD (from rev 267509,
spectacle/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-10 16:57:44 UTC (rev 267510)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <aro...@archlinux.org>
+
+pkgname=spectacle
+pkgver=16.04.1
+pkgrel=1
+pkgdesc="KDE screenshot capture utility"
+arch=(i686 x86_64)
+url='https://www.kde.org/applications/graphics/'
+license=(GPL)
+depends=(xcb-util-cursor libkscreen libkipi purpose)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdegraphics-ksnapshot kscreengenie)
+replaces=(kdegraphics-ksnapshot kscreengenie)
+groups=(kde-applications kdegraphics)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz";)
+md5sums=('385471b28d5be50ff64ebe4315193833')
+
+prepare() {
+ mkdir -p build
+}
+
+build() {
+ cd build
+ cmake ../$pkgname-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
+
Deleted: extra-x86_64/kdebug-362241.patch
===================================================================
--- extra-x86_64/kdebug-362241.patch 2016-05-10 16:57:23 UTC (rev 267509)
+++ extra-x86_64/kdebug-362241.patch 2016-05-10 16:57:44 UTC (rev 267510)
@@ -1,52 +0,0 @@
-From: Boudhayan Gupta <m...@baloneygeek.com>
-Date: Mon, 25 Apr 2016 18:27:49 +0000
-Subject: Unbreak rectangular image grabs for nvidia users.
-X-Git-Url:
http://quickgit.kde.org/?p=spectacle.git&a=commitdiff&h=abbbe6d13de870f9e9349acc2542cffc5d41b76d
----
-Unbreak rectangular image grabs for nvidia users.
-
-BUG: 362241
-FIXED-IN: 16.04.1
----
-
-
---- a/src/QuickEditor/QuickEditor.cpp
-+++ b/src/QuickEditor/QuickEditor.cpp
-@@ -138,23 +138,7 @@
- d->mGrabRect = QRect(x, y, width, height);
- SpectacleConfig::instance()->setCropRegion(d->mGrabRect);
-
-- QQuickItem *target = d->mQuickView->rootObject()->findChild<QQuickItem
*>(QStringLiteral("imageBackground"));
-- d->mCurrentGrabResult = target->grabToImage();
-- if (d->mCurrentGrabResult.isNull()) {
-- emit grabCancelled();
-- return;
-- }
--
-- connect(d->mCurrentGrabResult.data(), &QQuickItemGrabResult::ready, this,
&QuickEditor::grabReadyHandler);
-+ d->mQuickView->hide();
-+ emit grabDone(mImageStore->mPixmap.copy(d->mGrabRect), d->mGrabRect);
- }
-
--void QuickEditor::grabReadyHandler()
--{
-- Q_D(QuickEditor);
--
-- QImage croppedImage = d->mCurrentGrabResult->image().copy(d->mGrabRect);
-- QPixmap croppedPixmap = QPixmap::fromImage(croppedImage);
--
-- d->mQuickView->hide();
-- emit grabDone(croppedPixmap, d->mGrabRect);
--}
-
---- a/src/QuickEditor/QuickEditor.h
-+++ b/src/QuickEditor/QuickEditor.h
-@@ -39,7 +39,6 @@
- private slots:
-
- void acceptImageHandler(int x, int y, int width, int height);
-- void grabReadyHandler();
-
- private:
-
-
