From 0305427f1899c6041af70be8b14aa6368c61c869 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Tue, 1 Dec 2020 15:04:44 +0000 Subject: [PATCH] removed extra/appstream --- ...001-Remove-Wno-error-deprecated-copy.patch | 25 -------- extra/appstream/PKGBUILD | 64 ------------------- extra/appstream/update-appstream-cache.hook | 17 ----- 3 files changed, 106 deletions(-) delete mode 100644 extra/appstream/0001-Remove-Wno-error-deprecated-copy.patch delete mode 100644 extra/appstream/PKGBUILD delete mode 100644 extra/appstream/update-appstream-cache.hook diff --git a/extra/appstream/0001-Remove-Wno-error-deprecated-copy.patch b/extra/appstream/0001-Remove-Wno-error-deprecated-copy.patch deleted file mode 100644 index 30bc11d78..000000000 --- a/extra/appstream/0001-Remove-Wno-error-deprecated-copy.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 05e37466a1836f074ebe7601b1874762fedb9d1e Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich -Date: Tue, 15 Oct 2019 20:42:47 -0600 -Subject: [PATCH] Remove -Wno-error=deprecated-copy - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 8556b544..36cef5ce 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ endif - - # a few compiler warning flags we always want enabled - add_global_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c') --add_global_arguments('-Wno-unused-parameter', '-Wno-error=deprecated-copy', language: 'cpp') -+add_global_arguments('-Wno-unused-parameter', language: 'cpp') - add_global_arguments('-DAS_COMPILATION', language : 'c') - - # --- -2.22.0 - diff --git a/extra/appstream/PKGBUILD b/extra/appstream/PKGBUILD deleted file mode 100644 index 3a8d5d0b4..000000000 --- a/extra/appstream/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# Maintainer: Antonio Rojas -# Contributor: Jameson Pugh -# Contributor: Tim Jester-Pfadt gmx.de> - -# ALARM: Kevin Mihelich -# - patch to remove invalid compiler option - -pkgbase=appstream -pkgname=(appstream appstream-qt) -pkgver=0.12.11 -pkgrel=1 -pkgdesc="Provides a standard for creating app stores across distributions" -arch=(x86_64) -url="https://distributions.freedesktop.org/wiki/AppStream" -license=(GPL) -depends=(libyaml libxml2 libstemmer glib2 lmdb libsoup) -makedepends=(meson xmlto gobject-introspection gtk-doc qt5-tools itstool vala gperf) -source=("https://www.freedesktop.org/software/appstream/releases/AppStream-$pkgver.tar.xz"{,.asc} - update-appstream-cache.hook - 0001-Remove-Wno-error-deprecated-copy.patch) -sha256sums=('194d871ae057c6bf2b5a95e98d77da2b0107996f593b2ac0b0b88fa8ba452f11' - 'SKIP' - '3a96a1479cfd18dad36c2ca3181aabe46af9bf772c00b965d86ec5f55cd0e0eb' - 'e4cfc8b0f72c6a659e70dbd7dc870431faa0cf3320a64c8ca4f0df3a5e13117e') -validpgpkeys=(D33A3F0CA16B0ACC51A60738494C8A5FBF4DECEB) # Matthias Klumpp - -prepare() { - mkdir -p build - - cd AppStream-$pkgver - patch -p1 -i ../0001-Remove-Wno-error-deprecated-copy.patch -} - -build() { - cd build - - meson ../AppStream-$pkgver \ - --prefix=/usr \ - -Dqt=true \ - -Dvapi=true - ninja -} - -package_appstream() { - cd build - - DESTDIR="$pkgdir" ninja install - -# provided by -qt subpackage - rm -r "$pkgdir"/usr/{include/AppStreamQt,lib/cmake,lib/libAppStreamQt.*} - - install -Dm644 "$srcdir"/update-appstream-cache.hook "$pkgdir"/usr/share/libalpm/hooks/update-appstream-cache.hook -} - -package_appstream-qt() { - pkgdesc='Qt5 interface for AppStream' - depends=(appstream qt5-base) - - cd build - DESTDIR="$pkgdir" ninja install - -# provided by appstream - rm -r "$pkgdir"{/etc,/usr/{bin,include/appstream,lib/{girepository-1.0,libappstream*,pkgconfig},share}} -} diff --git a/extra/appstream/update-appstream-cache.hook b/extra/appstream/update-appstream-cache.hook deleted file mode 100644 index d73dff8a7..000000000 --- a/extra/appstream/update-appstream-cache.hook +++ /dev/null @@ -1,17 +0,0 @@ -[Trigger] -Type = Path -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/share/app-info/* - -[Trigger] -Type = Package -Operation = Install -Operation = Upgrade -Target = appstream - -[Action] -Description = Updating the appstream cache... -When = PostTransaction -Exec = /usr/bin/appstreamcli refresh-cache --force