From 496fddb303e3d083d96717ab40d73654e3699563 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 11 Oct 2020 04:12:16 -0400
Subject: [PATCH] Replace calendar with Etar, and drop LocalCalendar

---
 Patches/Common/android_vendor_divested/packages.mk | 7 ++-----
 PrebuiltApps                                       | 2 +-
 Scripts/LineageOS-17.1/Patch.sh                    | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk
index d7e824b7..de84f14e 100644
--- a/Patches/Common/android_vendor_divested/packages.mk
+++ b/Patches/Common/android_vendor_divested/packages.mk
@@ -12,6 +12,7 @@ PRODUCT_PACKAGES += \
 
 # Replacements
 PRODUCT_PACKAGES += \
+    Etar \
     FennecDOS \
     FairEmail \
     OpenCamera \
@@ -19,12 +20,8 @@ PRODUCT_PACKAGES += \
     SimpleGallery \
     VanillaMusic
 
-# Others
-PRODUCT_PACKAGES += \
-    LocalCalendar
-
 # Notes
-# - Available (via PrebuiltApps submodule): K9Mail, NetMonitor, OpenKeychain, Orbot, Shelter, TalkBack, TorBrowser
+# - Available (via PrebuiltApps submodule): K9Mail, LocalCalendar, NetMonitor, OpenKeychain, Orbot, Shelter, TalkBack, TorBrowser
 # - Camera Choices: None (Camera2/Snap), OpenCamera
 # - Gallery Choices: None (AOSP/Lineage), SimpleGallery
 # - OpenKeychain inclusion is undecided yet
diff --git a/PrebuiltApps b/PrebuiltApps
index a4fce0e9..af6c4916 160000
--- a/PrebuiltApps
+++ b/PrebuiltApps
@@ -1 +1 @@
-Subproject commit a4fce0e963a497c6acb5e161842442d2e336810c
+Subproject commit af6c4916924861c2ea3de7e0fee6e1566e4a108a
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 6cf28eb4..6882868b 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -193,6 +193,7 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
 echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
 
 enter "vendor/divested";
+awk -i inplace '!/Etar/' packages.mk; #lineage-17.1 calendar is Etar fork
 if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi;
 if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi;
 echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All of our kernels have deny USB patch added