From 08acabdb059d4384102b1d5cd49649600b3ce413 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Sun, 4 Apr 2021 19:04:24 +0200
Subject: [PATCH] main/postmarketos-hidden-desktop-entries: modernize (MR 2093)

Use replaces="" to overwrite files in /usr/share/applications, instead
of creating files for /etc/skel/.local/share/applications. This way, we
can add new overrides when upgrading the package, not only initially
when creating the user's home dir from /etc/skel.

Remove v20.05 related comment, and "firefox-safe.desktop" override,
which is now "org.mozilla.firefox-safe.desktop".

Add org.gnome.Glade.desktop from glade, which gets pulled in by
libhandy1-dev (e.g. when installing makedepends for phosh). (Users who
really want to start glade on postmarketOS can either do it with the
command line, or uninstall postmarketos-hidden-desktop-entries, or
replace the file in /etc/ with the original .desktop entry. For everyone
else who just installed glade as makedepend, it removes one awkward
desktop launcher.)

I looked into modernizing this package to hide launchers that appeared
for GTK4 (issue 1029). However, this should be fixed in Alpine's gtk
package: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/20116
---
 .../APKBUILD                                  | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/main/postmarketos-hidden-desktop-entries/APKBUILD b/main/postmarketos-hidden-desktop-entries/APKBUILD
index 0baf65e57..e972d3ba3 100644
--- a/main/postmarketos-hidden-desktop-entries/APKBUILD
+++ b/main/postmarketos-hidden-desktop-entries/APKBUILD
@@ -1,35 +1,47 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-hidden-desktop-entries
-pkgver=1.3
+pkgver=2.0
 pkgrel=0
 pkgdesc="Hide useless .desktop icons (vim, htop, Firefox safe mode, ...)"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 source="nodisplay.desktop"
+options="!check"
+replaces="
+	eog
+	firefox
+	firefox-esr
+	glade
+	gnome-shell
+	gvim
+	htop
+	neovim
+	vim
+"
 
-# Find original .desktop files in /usr/share/applications
-# v20.05: must hide org.gnome.Cheese (doesn't have aports!12086)
+# Find original .desktop files in /usr/share/applications. Add original
+# providers of the .desktop file to replaces="" above. They can be found here:
+# https://pkgs.alpinelinux.org/contents?file=htop.desktop
 _hidden="
-	firefox-safe
 	htop
 	nvim
-	org.gnome.eog
 	org.gnome.Extensions
+	org.gnome.Glade
+	org.gnome.eog
 	org.mozilla.firefox-safe
 	vim
 	"
 
 package() {
-	local nodisplay="/usr/share/applications/nodisplay.desktop"
-	local local_dir="$pkgdir/etc/skel/.local/share/applications"
+	local dir="$pkgdir/usr/share/applications/"
 	local i
 
-	install -Dm644 "$srcdir/nodisplay.desktop" "$pkgdir/$nodisplay"
+	install -Dm644 "$srcdir/nodisplay.desktop" -t "$dir"
 
-	mkdir -p "$local_dir"
+	cd "$dir"
 	for i in $_hidden; do
-		ln -vs "$nodisplay" "$local_dir/$i.desktop"
+		ln -vs "nodisplay.desktop" "$i.desktop"
 	done
 }
 sha512sums="97b7aff6ff8f8451a654ae002500a4a56f289a2318ece759aa7705836e246a7fd33602a21bee48a8b2a1f6f513ac9835c039d75eb6c031cceea9b58dd2aeaea9  nodisplay.desktop"