diff options
| author | Rasmus Thomsen <oss@cogitri.dev> | 2020-04-25 11:13:30 +0200 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-04-25 10:36:03 +0000 |
| commit | f1a5a01f99441188b62dce19e5a94fb44c8b4e7a (patch) | |
| tree | 315f57bab12a9dd209e6dc2acba0c27156950530 /community/gnome-software | |
| parent | 2128a12d985416db4134eafb7a4e1df7028e6623 (diff) | |
| download | aports-f1a5a01f99441188b62dce19e5a94fb44c8b4e7a.tar.bz2 aports-f1a5a01f99441188b62dce19e5a94fb44c8b4e7a.tar.xz | |
community/gnome-software: re-enable icons plugin
In the previous commit we fixed pixman, so we can enable the icon-plugin
again without GNOME Software crashing
Diffstat (limited to 'community/gnome-software')
| -rw-r--r-- | community/gnome-software/APKBUILD | 8 | ||||
| -rw-r--r-- | community/gnome-software/dont-build-icon-plugin.patch | 33 |
2 files changed, 3 insertions, 38 deletions
diff --git a/community/gnome-software/APKBUILD b/community/gnome-software/APKBUILD index 0a750bb61d..f369f7c0e4 100644 --- a/community/gnome-software/APKBUILD +++ b/community/gnome-software/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen <oss@cogitri.dev> pkgname=gnome-software pkgver=3.36.0 -pkgrel=3 +pkgrel=4 pkgdesc="Software lets you install and update applications and system extensions" url="https://wiki.gnome.org/Apps/Software" arch="all !s390x !mips !mips64" @@ -16,8 +16,7 @@ source="https://download.gnome.org/sources/gnome-software/${pkgver%.*}/gnome-sof 445.patch install-more-headers.patch bb7f58f5f88381857cd9b5dbe608e75d459873f1.patch - dont-build-icon-plugin.patch -" + " case "$CARCH" in x86*) makedepends="$makedepends fwupd-dev" ;; @@ -55,5 +54,4 @@ package() { sha512sums="3727b738b0f669018b4b9b2af11dd86a1af6d8da7632b88c6ac47ef97b97299abb0aec47a6de2dc7e6afa33ee153f9df30e63e5dc83652a5402d6444389024c9 gnome-software-3.36.0.tar.xz 2a8746ac0f948022b10fd29bcaf159d428954061d5ae19db86a09733f69901eda61e109ed4b3d3d484d91c182b2967e4b3bc11ce78774885bb9105a752c55c35 445.patch e7de617dbdecaa46fad25d8fe7d7ea5db324aaed73555bbe6814357b4ac3b787269653863679cff4318250dcc7729299b549f41220f441d9033a448af28da9dd install-more-headers.patch -ee1be703bd24aaa7ea81db990d9397172dbee32bc82447d7f87f22abe9bac686e82ad60c3d390da1b2812edf3ae7a5f08bb105dc486c31b831f8cc9cafaa5487 bb7f58f5f88381857cd9b5dbe608e75d459873f1.patch -9d366bb8fce0baecff2890e3a806855aabaf0cb5351ada73f350482ad4b3a2f523d12b61f53d1a816310447d3738b819df4b61ece79cf283720b7be0772ba398 dont-build-icon-plugin.patch" +ee1be703bd24aaa7ea81db990d9397172dbee32bc82447d7f87f22abe9bac686e82ad60c3d390da1b2812edf3ae7a5f08bb105dc486c31b831f8cc9cafaa5487 bb7f58f5f88381857cd9b5dbe608e75d459873f1.patch" diff --git a/community/gnome-software/dont-build-icon-plugin.patch b/community/gnome-software/dont-build-icon-plugin.patch deleted file mode 100644 index b92d6d6a0a..0000000000 --- a/community/gnome-software/dont-build-icon-plugin.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream: No -Reason: Software crashes somewhere in librsvg/cairo/pixman while loading -icons. This patch simply removes the icon loading for now, meaning we wont -have icons in Software, but at least it wont crash. This is just a workaround -for now, so Software doesn't crash for our users anymore. -diff --git a/plugins/core/meson.build b/plugins/core/meson.build -index 39630d1..5f6dcc2 100644 ---- a/plugins/core/meson.build -+++ b/plugins/core/meson.build -@@ -80,23 +80,6 @@ shared_module( - ] - ) - -- --shared_module( -- 'gs_plugin_icons', -- sources : 'gs-plugin-icons.c', -- include_directories : [ -- include_directories('../..'), -- include_directories('../../lib'), -- ], -- install : true, -- install_dir: plugin_dir, -- c_args : cargs, -- dependencies : plugin_libs, -- link_with : [ -- libgnomesoftware -- ] --) -- - shared_module( - 'gs_plugin_appstream', - sources : [ |