[arch-commits] Commit in discover/trunk (PKGBUILD discover-appstream-0.10.3.patch)

2016-11-22 Thread Antonio Rojas 
Date: Tuesday, November 22, 2016 @ 16:40:47
  Author: arojas
Revision: 196540

Update to 5.8.4

Modified:
  discover/trunk/PKGBUILD
Deleted:
  discover/trunk/discover-appstream-0.10.3.patch

-+
 PKGBUILD|   16 --
 discover-appstream-0.10.3.patch |  256 --
 2 files changed, 5 insertions(+), 267 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-22 15:41:46 UTC (rev 196539)
+++ PKGBUILD2016-11-22 16:40:47 UTC (rev 196540)
@@ -2,8 +2,8 @@
 # Maintainer: Antonio Rojas  
 
 pkgname=discover
-pkgver=5.8.3
-pkgrel=2
+pkgver=5.8.4
+pkgrel=1
 pkgdesc='A collection of package management tools for KDE'
 arch=(i686 x86_64)
 url='https://projects.kde.org/projects/kde/workspace/discover'
@@ -13,19 +13,13 @@
 makedepends=(extra-cmake-modules python plasma-framework)
 conflicts=(muon)
 replaces=(muon)
-source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
-discover-appstream-0.10.3.patch)
-md5sums=('555043b0cdeb1cfdb00ee45ec5dec7c6'
- 'SKIP'
- 'da8766914efcb8fb248bcdf8f1c38396')
+source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
+md5sums=('d62450ff9da78fe5538f038721c21f12'
+ 'SKIP')
 validpgpkeys=(2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell 

 
 prepare() {
   mkdir -p build
-
-# Port to appstream-qt 0.10.3 API (Debian)
-  cd $pkgname-$pkgver
-  patch -p1 -i ../discover-appstream-0.10.3.patch
 }
 
 build() {

Deleted: discover-appstream-0.10.3.patch
===
--- discover-appstream-0.10.3.patch 2016-11-22 15:41:46 UTC (rev 196539)
+++ discover-appstream-0.10.3.patch 2016-11-22 16:40:47 UTC (rev 196540)
@@ -1,256 +0,0 @@
-commit 5748ab0d65df220ce1e084939b07e32c676f853b
-Author: Matthias Klumpp 
-Date:   Sat Nov 5 16:30:43 2016 +0100
-
-Make Discover compile with newer AppStreamQt releases
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48a9b77..c59d7ad 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,15 @@ if (NOT packagekitqt5_FOUND)
- find_package(KF5 REQUIRED IconThemes Notifications KIO)
- endif()
- endif()
--find_package(AppstreamQt 0.10)
-+
-+find_package(AppStreamQt 0.10)
-+set(AppStreamTarget "AppStreamQt")
-+if (NOT AppStreamQt_FOUND)
-+find_package(AppstreamQt 0.10)
-+set(AppStreamTarget "AppstreamQt")
-+set(AppStreamQt_FOUND TRUE)
-+endif()
-+
- find_package(KF5Attica 5.23)
- find_package(KF5NewStuff 5.23)
- 
-diff --git a/libdiscover/backends/CMakeLists.txt 
b/libdiscover/backends/CMakeLists.txt
-index 93497f6..8eb7365 100644
 a/libdiscover/backends/CMakeLists.txt
-+++ b/libdiscover/backends/CMakeLists.txt
-@@ -20,7 +20,7 @@ if(BODEGA_FOUND)
- add_subdirectory(BodegaBackend)
- endif()
- 
--if(packagekitqt5_FOUND AND AppstreamQt_FOUND)
-+if(packagekitqt5_FOUND AND AppStreamQt_FOUND)
- add_subdirectory(PackageKitBackend)
- endif()
- 
-diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp 
-b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
-index 658019f..5256db3 100644
 a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
-+++ b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
-@@ -19,8 +19,14 @@
-  ***/
- 
- #include "AppPackageKitResource.h"
-+#ifdef NEWAPPSTREAM
-+#include 
-+#include 
-+#include 
-+#else
- #include 
- #include 
-+#endif
- // #include 
- #include 
- #include 
-@@ -52,7 +58,23 @@ QString AppPackageKitResource::longDescription()
- QVariant AppPackageKitResource::icon() const
- {
- QIcon ret;
--
-+#ifdef NEWAPPSTREAM
-+const auto icons = m_appdata.icons();
-+if (icons.isEmpty()) {
-+ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
-+} else foreach(const AppStream::Icon , icons) {
-+switch(icon.kind()) {
-+case AppStream::Icon::KindLocal:
-+ret.addFile(icon.url().toLocalFile(), icon.size());
-+break;
-+case AppStream::Icon::KindCached:
-+ret.addFile(icon.url().toLocalFile(), icon.size());
-+break;
-+default:
-+break;
-+}
-+}
-+#else
- const auto icons = m_appdata.iconUrls();
- if (icons.isEmpty())
- return m_appdata.name();
-@@ -66,7 +88,7 @@ QVariant AppPackageKitResource::icon() const
- if (ret.isNull()) {
- ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
- }
--
-+#endif
- return ret;
- }
- 
-@@ -105,7 +127,11 @@ QString AppPackageKitResource::appstreamId() const
- 
- QUrl AppPackageKitResource::homepage()
- {
-+#ifdef NEWAPPSTREAM
-+return

[arch-commits] Commit in discover/trunk (PKGBUILD discover-appstream-0.10.3.patch)

2016-11-08 Thread Antonio Rojas 
Date: Tuesday, November 8, 2016 @ 12:32:41
  Author: arojas
Revision: 195135

appstream-qt 0.10.3 rebuild

Added:
  discover/trunk/discover-appstream-0.10.3.patch
Modified:
  discover/trunk/PKGBUILD

-+
 PKGBUILD|   13 +
 discover-appstream-0.10.3.patch |  256 ++
 2 files changed, 266 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-08 12:22:46 UTC (rev 195134)
+++ PKGBUILD2016-11-08 12:32:41 UTC (rev 195135)
@@ -8,17 +8,24 @@
 arch=(i686 x86_64)
 url='https://projects.kde.org/projects/kde/workspace/discover'
 license=(LGPL)
-depends=(packagekit-qt5 knewstuff kdeclarative qt5-graphicaleffects 
appstream-qt archlinux-appstream-data hicolor-icon-theme kirigami)
+depends=(packagekit-qt5 knewstuff kdeclarative qt5-graphicaleffects 
appstream-qt archlinux-appstream-data
+ hicolor-icon-theme kirigami)
 makedepends=(extra-cmake-modules python plasma-framework)
 conflicts=(muon)
 replaces=(muon)
-source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("http://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+discover-appstream-0.10.3.patch)
 md5sums=('555043b0cdeb1cfdb00ee45ec5dec7c6'
- 'SKIP')
+ 'SKIP'
+ 'da8766914efcb8fb248bcdf8f1c38396')
 validpgpkeys=(2D1D5B0588357787DE9EE225EC94D18F7F05997E) # Jonathan Riddell 

 
 prepare() {
   mkdir -p build
+
+# Port to appstream-qt 0.10.3 API (Debian)
+  cd $pkgname-$pkgver
+  patch -p1 -i ../discover-appstream-0.10.3.patch
 }
 
 build() {

Added: discover-appstream-0.10.3.patch
===
--- discover-appstream-0.10.3.patch (rev 0)
+++ discover-appstream-0.10.3.patch 2016-11-08 12:32:41 UTC (rev 195135)
@@ -0,0 +1,256 @@
+commit 5748ab0d65df220ce1e084939b07e32c676f853b
+Author: Matthias Klumpp 
+Date:   Sat Nov 5 16:30:43 2016 +0100
+
+Make Discover compile with newer AppStreamQt releases
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 48a9b77..c59d7ad 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -28,7 +28,15 @@ if (NOT packagekitqt5_FOUND)
+ find_package(KF5 REQUIRED IconThemes Notifications KIO)
+ endif()
+ endif()
+-find_package(AppstreamQt 0.10)
++
++find_package(AppStreamQt 0.10)
++set(AppStreamTarget "AppStreamQt")
++if (NOT AppStreamQt_FOUND)
++find_package(AppstreamQt 0.10)
++set(AppStreamTarget "AppstreamQt")
++set(AppStreamQt_FOUND TRUE)
++endif()
++
+ find_package(KF5Attica 5.23)
+ find_package(KF5NewStuff 5.23)
+ 
+diff --git a/libdiscover/backends/CMakeLists.txt 
b/libdiscover/backends/CMakeLists.txt
+index 93497f6..8eb7365 100644
+--- a/libdiscover/backends/CMakeLists.txt
 b/libdiscover/backends/CMakeLists.txt
+@@ -20,7 +20,7 @@ if(BODEGA_FOUND)
+ add_subdirectory(BodegaBackend)
+ endif()
+ 
+-if(packagekitqt5_FOUND AND AppstreamQt_FOUND)
++if(packagekitqt5_FOUND AND AppStreamQt_FOUND)
+ add_subdirectory(PackageKitBackend)
+ endif()
+ 
+diff --git a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp 
+b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+index 658019f..5256db3 100644
+--- a/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
 b/libdiscover/backends/PackageKitBackend/AppPackageKitResource.cpp
+@@ -19,8 +19,14 @@
+  ***/
+ 
+ #include "AppPackageKitResource.h"
++#ifdef NEWAPPSTREAM
++#include 
++#include 
++#include 
++#else
+ #include 
+ #include 
++#endif
+ // #include 
+ #include 
+ #include 
+@@ -52,7 +58,23 @@ QString AppPackageKitResource::longDescription()
+ QVariant AppPackageKitResource::icon() const
+ {
+ QIcon ret;
+-
++#ifdef NEWAPPSTREAM
++const auto icons = m_appdata.icons();
++if (icons.isEmpty()) {
++ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
++} else foreach(const AppStream::Icon , icons) {
++switch(icon.kind()) {
++case AppStream::Icon::KindLocal:
++ret.addFile(icon.url().toLocalFile(), icon.size());
++break;
++case AppStream::Icon::KindCached:
++ret.addFile(icon.url().toLocalFile(), icon.size());
++break;
++default:
++break;
++}
++}
++#else
+ const auto icons = m_appdata.iconUrls();
+ if (icons.isEmpty())
+ return m_appdata.name();
+@@ -66,7 +88,7 @@ QVariant AppPackageKitResource::icon() const
+ if (ret.isNull()) {
+ ret = QIcon::fromTheme(QStringLiteral("package-x-generic"));
+ }
+-
++#endif
+ return ret;
+ }
+ 
+@@ -105,7 +127,11 @@ QString AppPackageKitResource::appstreamId() const
+ 
+ QUrl