[arch-commits] Commit in spectacle/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Thu Apr 28 20:54:19 UTC 2016
Date: Thursday, April 28, 2016 @ 22:54:19
Author: arojas
Revision: 266604
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
spectacle/repos/extra-i686/PKGBUILD
(from rev 266603, spectacle/trunk/PKGBUILD)
spectacle/repos/extra-i686/kdebug-362241.patch
(from rev 266603, spectacle/trunk/kdebug-362241.patch)
spectacle/repos/extra-x86_64/PKGBUILD
(from rev 266603, spectacle/trunk/PKGBUILD)
spectacle/repos/extra-x86_64/kdebug-362241.patch
(from rev 266603, spectacle/trunk/kdebug-362241.patch)
Deleted:
spectacle/repos/extra-i686/PKGBUILD
spectacle/repos/extra-i686/kdebug-362241.patch
spectacle/repos/extra-i686/spectacle.install
spectacle/repos/extra-x86_64/PKGBUILD
spectacle/repos/extra-x86_64/kdebug-362241.patch
spectacle/repos/extra-x86_64/spectacle.install
----------------------------------+
/PKGBUILD | 94 +++++++++++++++++++++++++++++++++
/kdebug-362241.patch | 104 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 48 -----------------
extra-i686/kdebug-362241.patch | 52 ------------------
extra-i686/spectacle.install | 12 ----
extra-x86_64/PKGBUILD | 48 -----------------
extra-x86_64/kdebug-362241.patch | 52 ------------------
extra-x86_64/spectacle.install | 12 ----
8 files changed, 198 insertions(+), 224 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-i686/PKGBUILD 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=spectacle
-pkgver=16.04.0
-pkgrel=2
-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)
-install=$pkgname.install
-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 266603, spectacle/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-04-28 20:54:19 UTC (rev 266604)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at 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
+}
+
Deleted: extra-i686/kdebug-362241.patch
===================================================================
--- extra-i686/kdebug-362241.patch 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-i686/kdebug-362241.patch 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,52 +0,0 @@
-From: Boudhayan Gupta <me at 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:
-
-
Copied: spectacle/repos/extra-i686/kdebug-362241.patch (from rev 266603, spectacle/trunk/kdebug-362241.patch)
===================================================================
--- extra-i686/kdebug-362241.patch (rev 0)
+++ extra-i686/kdebug-362241.patch 2016-04-28 20:54:19 UTC (rev 266604)
@@ -0,0 +1,52 @@
+From: Boudhayan Gupta <me at 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-i686/spectacle.install
===================================================================
--- extra-i686/spectacle.install 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-i686/spectacle.install 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-x86_64/PKGBUILD 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=spectacle
-pkgver=16.04.0
-pkgrel=2
-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)
-install=$pkgname.install
-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 266603, spectacle/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-04-28 20:54:19 UTC (rev 266604)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at 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
+}
+
Deleted: extra-x86_64/kdebug-362241.patch
===================================================================
--- extra-x86_64/kdebug-362241.patch 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-x86_64/kdebug-362241.patch 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,52 +0,0 @@
-From: Boudhayan Gupta <me at 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:
-
-
Copied: spectacle/repos/extra-x86_64/kdebug-362241.patch (from rev 266603, spectacle/trunk/kdebug-362241.patch)
===================================================================
--- extra-x86_64/kdebug-362241.patch (rev 0)
+++ extra-x86_64/kdebug-362241.patch 2016-04-28 20:54:19 UTC (rev 266604)
@@ -0,0 +1,52 @@
+From: Boudhayan Gupta <me at 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/spectacle.install
===================================================================
--- extra-x86_64/spectacle.install 2016-04-28 20:53:47 UTC (rev 266603)
+++ extra-x86_64/spectacle.install 2016-04-28 20:54:19 UTC (rev 266604)
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
More information about the arch-commits
mailing list