flatpak: Use drop-in flatpakrepo for system-wide remotes

flatpak/meson.build

@@ -1,3 +1,5 @@
+subdir('remotes.d')
+
 install_data(
     'appcenter.preinstall',
     install_dir: datadir / 'flatpak' / 'preinstall.d'

flatpak/remotes.d/appcenter.flatpakrepo

@@ -0,0 +1,8 @@
+[Flatpak Repo]
+Title=AppCenter
+Url=https://flatpak.elementary.io/repo
+Homepage=https://appcenter.elementary.io/
+Icon=https://flatpak.elementary.io/icon.svg
+Comment=The open source, pay-what-you-want app store from elementary
+Description=Reviewed and curated by elementary to ensure a native, privacy-respecting, and secure experience
+GPGKey=mQENBFcRRNIBCADrEnIR91b2vX6BrAAYqDRTKZeFdMFG7StSqFo3lZH2KFd7KBeBxYWnU3V/xJQ+1lFujo+na6z7L9qBrtikYdIn9Mc3eSyw/fli1FkMuoFmdMtj6k1Fz+NEM0dSrELavBMPzXb4kjF8ZGKneR35v4Y3RP+lvZDiumZpvFzTzU0ARURkxH3NbYiX0mki75gy+EHwCReSPjBxK94+sQRoClJdrQbFaHtXDqfh2XVQMm2NnmJaf2RbMFo75zEoxHzYbnByWdR/Xh6uhlSyDaBY0O0f1c3ycGn7UT+7CAdGka6Gu2VZUXEHGLZS4otVhtoyga+kGaiJ7SYRSQzd0S/xPPxtABEBAAGwDAAAZ3BnAQAAAAAAALQoZWxlbWVudGFyeSBidWlsZHMgPGJ1aWxkc0BlbGVtZW50YXJ5LmlvPrAMAABncGcCAAAAAAAAiQE3BBMBCQAhBQJXEUTSAhsDBQsJCAcDBRUJCggLBRYDAgEAAh4BAheAAAoJEKdPc+/+cLkc38EH/0HhrXZUIldxyQv4RckOAhzsWSRa6Xv1Hf7Ws5FIqZXNmP5q63rYHRoSKCejaUFqQ0wixZrw+QhKvZXrbHkVDVC8NtbrZ4rk66w12XtbaJtBZBUncgmPFKQwznOy5M20PMCqNQEpMshI/H1VyxKDpG7I0UCVF0v+knaEUnlYrrQ3sI08tGL3pVDFcXF+R+U4yX15mTBlMbRlHn90WkQ10evZJhY3+1Jr9gIolbHp3aq3x0S52UEbG25TQJTZeSflU5SpL3MF4r1nsJVVGji/BzxaPXdpMSG3sRtsi8J7sJn2r0hSVeDWHpkj0ipepSVWyNz/s8/lPO1TjK/Cn7i9A6OwBgADZ3BnALkBDQRXEUTSAQgAvA3oZ7rN1iE8M3Q91HW37lBV+EtagirJUa6+m2ovPfa6TnOPsygSY8EiMPKB8rDxVRk32XnzwNl3MCmW0YjN1S2sdFv8YnPXLzXKJWYqTaCNdgJPhFz+LdgPmuW2kHH3ENZ8kOBKeVJdQ+UCxZkEdJZVhnsIP60pHpS2l8oMGZYkwtRpe6BDtJMlpgUVWK1jJrf/Uj/JA62+rpvAl27TxdZgpsmYNaOpg9gumV8aGtUk4l6X0NjSkKaka7m2BULAHotYOAK18D0z7wsslGbSfCYKNKsXKoUbX9fpxjxPUprMHQJ7NAefDgfieDImFmBpcSXEbznUzt5vgSKyHGNsuwARAQABiQEfBBgBCQAJBQJXEUTSAhsMAAoJEKdPc+/+cLkceJAH/0XPU2fz+aiph4ltt9nvdkY/iqFJ4/ng2pYjz9K9e8JWu65EBBkUn3J80cVwMTcCvZduDyMHizobPilHUyWAdwXtLXgLTY5TRfkdHQTKVhFqq/LrprUBRoAJQfTbL6XdCX8Dy7q899yaiHsBJd1IzEBiKpfTOc1RmVt/tvaG0+WhBRe/aHu5wnKkfExLdsW8mDrNUnDykTj50Cki1kfFvLWlSLz6wlXyqG1U1aB+nEM7d1/r/joFsoYft2TTscNi0HvxY8U1mNSD5H7IXK1ecGT53fSclPPkrVd5+F4YBpd9FIy7LBnLhfK0F4aBe7iTLPiYJ7TUpIez3k7ubRGGBZiwBgADZ3BnAA==

flatpak/remotes.d/flathub.flatpakrepo

@@ -0,0 +1,8 @@
+[Flatpak Repo]
+Title=Flathub
+Url=https://dl.flathub.org/repo/
+Homepage=https://flathub.org/
+Icon=https://dl.flathub.org/repo/logo.svg
+Comment=Central repository of Flatpak applications
+Description=Central repository of Flatpak applications
+GPGKey=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

flatpak/remotes.d/meson.build

@@ -0,0 +1,12 @@
+repo_files = [
+    'appcenter.flatpakrepo',
+    'flathub.flatpakrepo',
+]
+
+# Install system-wide remotes
+foreach repo_file : repo_files
+    install_data(
+        repo_file,
+        install_dir: datadir / 'flatpak' / 'remotes.d'
+    )
+endforeach

skel/meson.build

@@ -2,12 +2,6 @@ skeldir = sysconfdir / 'skel'
 
 # AppCenter Flatpak Remote
 if get_option('appcenter-flatpak')
-    # remote for system-wide installation
-    install_subdir(
-        'flatpak',
-        install_dir: sharedstatedir
-    )
-    # remote for per-user installation
     install_subdir(
         'flatpak',
         install_dir: skeldir / '.local' / 'share'