[arch-commits] Commit in kompare/repos/kde-unstable-x86_64 (3 files)

[Antonio Rojas]

    Date: Friday, April 3, 2020 @ 21:37:40
  Author: arojas
Revision: 379466

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  kompare/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 379464, kompare/kde-unstable/PKGBUILD)
Deleted:
  kompare/repos/kde-unstable-x86_64/PKGBUILD
  kompare/repos/kde-unstable-x86_64/kompare-qt5.15.patch

----------------------+
 PKGBUILD             |   75 ++++++++++++++++++++++---------------------------
 kompare-qt5.15.patch |   12 -------
 2 files changed, 35 insertions(+), 52 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-03 21:37:37 UTC (rev 379465)
+++ PKGBUILD	2020-04-03 21:37:40 UTC (rev 379466)
@@ -1,40 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kompare
-pkgver=20.03.80
-pkgrel=1
-pkgdesc='Graphical file differences tool'
-url='https://kde.org/applications/development/kompare/'
-arch=(x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdesdk)
-depends=(libkomparediff2 ktexteditor hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools)
-source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
-         kompare-qt5.15.patch)
-sha256sums=('2a3a25aa24eaa8e61ae7e4305cb628f053ee8c6b8579463106c30f4cc21521cd'
-            'SKIP'
-            '427ceeb4411355091b88ada2a8c900b45b94198ae6bb56a022efd53e7fe25a9e')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kompare-qt5.15.patch # Fix build with Qt 5.15
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kompare/repos/kde-unstable-x86_64/PKGBUILD (from rev 379464, kompare/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-03 21:37:40 UTC (rev 379466)
@@ -0,0 +1,35 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=20.03.90
+pkgrel=1
+pkgdesc='Graphical file differences tool'
+url='https://kde.org/applications/development/kompare/'
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdesdk)
+depends=(libkomparediff2 ktexteditor hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools)
+source=("https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+sha256sums=('8dc35f5a8981d4a72fe2a91736e166574fa62ea1aa2fc0a4987c0a8a12c7ba7d'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: kompare-qt5.15.patch
===================================================================
--- kompare-qt5.15.patch	2020-04-03 21:37:37 UTC (rev 379465)
+++ kompare-qt5.15.patch	2020-04-03 21:37:40 UTC (rev 379466)
@@ -1,12 +0,0 @@
-diff --git a/komparepart/kompareconnectwidget.cpp b/komparepart/kompareconnectwidget.cpp
-index 52e3d9d..b943456 100644
---- a/komparepart/kompareconnectwidget.cpp
-+++ b/komparepart/kompareconnectwidget.cpp
-@@ -21,6 +21,7 @@
- 
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QStyle>
- #include <QTimer>