From e7a842f406f07e8d01383b8ad9587b1826a80b14 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 2 Jun 2022 23:24:32 +0200
Subject: [PATCH] Update microg to 20220531

---
 package_fdroid.sh | 31 -------------------------------
 package_microg.sh | 37 ++++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 46 deletions(-)
 delete mode 100755 package_fdroid.sh

diff --git a/package_fdroid.sh b/package_fdroid.sh
deleted file mode 100755
index 4134462..0000000
--- a/package_fdroid.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-set -e
-
-dir=fdroid
-version_fdroid=1014050
-version_priv=2130
-version="$version_priv-$version_fdroid"
-
-rm -rf "$dir"
-mkdir -p "$dir"
-
-cat > "$dir/module.prop" << EOF
-id=fdroid
-name=FDroid with Privileged Extension
-version=$version
-versionCode=1
-author=me
-description=
-EOF
-
-install -D apk/android_vendor_partner_gms/FDroid/org.fdroid.fdroid_$version_fdroid.apk \
-    "$dir/system/app/FDroid/FDroid.apk"
-
-install -D apk/android_vendor_partner_gms/FDroidPrivilegedExtension/org.fdroid.fdroid.privileged_$version_priv.apk \
-    "$dir/system/priv-app/FDroidPrivilegedExtension/FDroidPrivilegedExtension.apk"
-install -D apk/android_vendor_partner_gms/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml \
-    "$dir/system/etc/permissions/privapp-permissions-org.fdroid.fdroid.privileged.xml"
-
-./package.sh "$dir"
-mv "$dir/package.zip" fdroid.zip
-rm -rf "$dir"
diff --git a/package_microg.sh b/package_microg.sh
index 5af0476..b55a5d4 100755
--- a/package_microg.sh
+++ b/package_microg.sh
@@ -2,44 +2,51 @@
 set -e
 
 dir=microg
-version_gms=214816046
-version_vending=22
-version_gsf=8
-version_nlp_ichnaea=20033
-version_nlp_nominatim=20042
-version="$version_gms"
+version=20220531
 
 rm -rf "$dir"
 mkdir -p "$dir"
 
 cat > "$dir/module.prop" << EOF
 id=microg
-name=microG services
+name=LineageOS for MicroG packages
 version=$version
 versionCode=1
 author=me
 description=
 EOF
 
-install -D apk/android_vendor_partner_gms/GmsCore/com.google.android.gms-$version_gms.apk \
+install -D apk/android_vendor_partner_gms/GmsCore/GmsCore.apk \
     "$dir/system/priv-app/GmsCore/GmsCore.apk"
 install -D apk/android_vendor_partner_gms/GmsCore/privapp-permissions-com.google.android.gms.xml \
     "$dir/system/etc/permissions/privapp-permissions-com.google.android.gms.xml"
+install -D apk/android_vendor_partner_gms/GmsCore/default-permissions-com.google.android.gms.xml \
+    "$dir/system/etc/default-permissions/default-permissions-com.google.android.gms.xml"
 install -D apk/android_vendor_partner_gms/GmsCore/sysconfig-com.google.android.gms.xml \
     "$dir/system/etc/sysconfig/sysconfig-com.google.android.gms.xml"
 
-install -D apk/android_vendor_partner_gms/FakeStore/com.android.vending-$version_vending.apk \
+install -D apk/android_vendor_partner_gms/GsfProxy/GsfProxy.apk \
+    "$dir/system/app/GsfProxy/GsfProxy.apk"
+
+install -D apk/android_vendor_partner_gms/FakeStore/FakeStore.apk \
     "$dir/system/priv-app/FakeStore/FakeStore.apk"
+install -D apk/android_vendor_partner_gms/FakeStore/default-permissions-com.android.vending.xml \
+    "$dir/system/etc/default-permissions/default-permissions-com.android.vending.xml"
 install -D apk/android_vendor_partner_gms/FakeStore/privapp-permissions-com.android.vending.xml \
     "$dir/system/etc/permissions/privapp-permissions-com.android.vending.xml"
 
-install -D apk/android_vendor_partner_gms/GsfProxy/com.google.android.gsf-$version_gsf.apk \
-    "$dir/system/app/GsfProxy/GsfProxy.apk"
+install -D apk/android_vendor_partner_gms/IchnaeaNlpBackend/IchnaeaNlpBackend.apk \
+    "$dir/system/app/IchnaeaNlpBackend/IchnaeaNlpBackend.apk"
+install -D apk/android_vendor_partner_gms/NominatimGeocoderBackend/NominatimGeocoderBackend.apk \
+    "$dir/system/app/NominatimGeocoderBackend/NominatimGeocoderBackend.apk"
+
+install -D apk/android_vendor_partner_gms/FDroid/FDroid.apk \
+    "$dir/system/app/FDroid/FDroid.apk"
 
-install -D apk/android_vendor_partner_gms/MozillaNlpBackend/org.microg.nlp.backend.ichnaea_$version_nlp_ichnaea.apk \
-    "$dir/system/app/MozillaNlpBackend/MozillaNlpBackend.apk"
-install -D apk/android_vendor_partner_gms/NominatimNlpBackend/org.microg.nlp.backend.nominatim_$version_nlp_nominatim.apk \
-    "$dir/system/app/NominatimNlpBackend/NominatimNlpBackend.apk"
+install -D apk/android_vendor_partner_gms/FDroidPrivilegedExtension/FDroidPrivilegedExtension.apk \
+    "$dir/system/priv-app/FDroidPrivilegedExtension/FDroidPrivilegedExtension.apk"
+install -D apk/android_vendor_partner_gms/FDroidPrivilegedExtension/privapp-permissions-org.fdroid.fdroid.privileged.xml \
+    "$dir/system/etc/permissions/privapp-permissions-org.fdroid.fdroid.privileged.xml"
 
 ./package.sh "$dir"
 mv "$dir/package.zip" microg.zip