From da5a9261d22329b499517fbae2b715ed325c8092 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Mon, 18 Mar 2024 21:23:14 +0000 Subject: [PATCH] Tidy up patches, remove 2 obsolete ones --- .../0001-Remove-duplicated-props.patch | 2 +- .../0002-Add-Mulch-webview-signature.patch | 2 +- ...003-Disable-generated-kernel-headers.patch | 2 +- ...04-Add-additional-options-in-Voltage.patch | 2 +- .../0005-Add-GrapheneOS-Apps.patch | 2 +- ...ged-extensions-for-aurora-and-fdroid.patch | 2 +- ...eageOS-Aperture-to-GrapheneOS-Camera.patch | 22 ---------------- .../0008-Add-Trebuchet-launcher.patch | 26 ------------------- 8 files changed, 6 insertions(+), 54 deletions(-) delete mode 100644 patches/personal/platform_vendor_voltage/0007-Switch-LineageOS-Aperture-to-GrapheneOS-Camera.patch delete mode 100644 patches/personal/platform_vendor_voltage/0008-Add-Trebuchet-launcher.patch diff --git a/patches/personal/platform_vendor_voltage/0001-Remove-duplicated-props.patch b/patches/personal/platform_vendor_voltage/0001-Remove-duplicated-props.patch index 285d83f..0e82b0f 100644 --- a/patches/personal/platform_vendor_voltage/0001-Remove-duplicated-props.patch +++ b/patches/personal/platform_vendor_voltage/0001-Remove-duplicated-props.patch @@ -1,7 +1,7 @@ From 57bbe46aac2e83863ce71e371808a2fed5145257 Mon Sep 17 00:00:00 2001 From: ahnet-69 Date: Sun, 24 Dec 2023 11:45:59 +0500 -Subject: [PATCH 1/8] Remove duplicated props +Subject: [PATCH 1/6] Remove duplicated props --- config/common.mk | 7 +------ diff --git a/patches/personal/platform_vendor_voltage/0002-Add-Mulch-webview-signature.patch b/patches/personal/platform_vendor_voltage/0002-Add-Mulch-webview-signature.patch index 6fbabf8..e55b229 100644 --- a/patches/personal/platform_vendor_voltage/0002-Add-Mulch-webview-signature.patch +++ b/patches/personal/platform_vendor_voltage/0002-Add-Mulch-webview-signature.patch @@ -1,7 +1,7 @@ From cd3a315b5c25f0236bc8b9b4b2bb6bfb309c8a44 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Tue, 16 Jan 2024 18:34:12 +0000 -Subject: [PATCH 2/8] Add Mulch webview signature +Subject: [PATCH 2/6] Add Mulch webview signature --- .../base/packages/SystemUI/res/xml/config_webview_packages.xml | 3 +++ diff --git a/patches/personal/platform_vendor_voltage/0003-Disable-generated-kernel-headers.patch b/patches/personal/platform_vendor_voltage/0003-Disable-generated-kernel-headers.patch index befd9f2..a68c148 100644 --- a/patches/personal/platform_vendor_voltage/0003-Disable-generated-kernel-headers.patch +++ b/patches/personal/platform_vendor_voltage/0003-Disable-generated-kernel-headers.patch @@ -1,7 +1,7 @@ From 7f2e3b216182db76ee59c9816d90c783288b5210 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Mon, 22 Jan 2024 16:06:43 +0000 -Subject: [PATCH 3/8] Disable generated kernel headers +Subject: [PATCH 3/6] Disable generated kernel headers --- build/soong/Android.bp | 12 ------------ diff --git a/patches/personal/platform_vendor_voltage/0004-Add-additional-options-in-Voltage.patch b/patches/personal/platform_vendor_voltage/0004-Add-additional-options-in-Voltage.patch index cd9d37e..a0e7cbc 100644 --- a/patches/personal/platform_vendor_voltage/0004-Add-additional-options-in-Voltage.patch +++ b/patches/personal/platform_vendor_voltage/0004-Add-additional-options-in-Voltage.patch @@ -1,7 +1,7 @@ From 9a673ec1311460a0f44358f232b18fd3ad14219d Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Thu, 8 Feb 2024 21:35:29 +0000 -Subject: [PATCH 4/8] Add additional options in VoltageOS +Subject: [PATCH 4/6] Add additional options in VoltageOS --- .../Settings/res/values/voltage_config.xml | 26 +++++++++++++++++++ diff --git a/patches/personal/platform_vendor_voltage/0005-Add-GrapheneOS-Apps.patch b/patches/personal/platform_vendor_voltage/0005-Add-GrapheneOS-Apps.patch index 7ed4e0b..ad6212b 100644 --- a/patches/personal/platform_vendor_voltage/0005-Add-GrapheneOS-Apps.patch +++ b/patches/personal/platform_vendor_voltage/0005-Add-GrapheneOS-Apps.patch @@ -1,7 +1,7 @@ From f5edaa7ed2740249a7ad52b16de1edc3442c6543 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Tue, 13 Feb 2024 09:27:42 +0000 -Subject: [PATCH 5/8] Add GrapheneOS Apps +Subject: [PATCH 5/6] Add GrapheneOS Apps --- config/common.mk | 4 ++++ diff --git a/patches/personal/platform_vendor_voltage/0006-Add-privileged-extensions-for-aurora-and-fdroid.patch b/patches/personal/platform_vendor_voltage/0006-Add-privileged-extensions-for-aurora-and-fdroid.patch index d2b3b18..953d9b3 100644 --- a/patches/personal/platform_vendor_voltage/0006-Add-privileged-extensions-for-aurora-and-fdroid.patch +++ b/patches/personal/platform_vendor_voltage/0006-Add-privileged-extensions-for-aurora-and-fdroid.patch @@ -1,7 +1,7 @@ From 382e0aa115e602ffe525744415a2e03823da5e38 Mon Sep 17 00:00:00 2001 From: "Christopher A. Williamson" Date: Wed, 14 Feb 2024 22:44:39 +0000 -Subject: [PATCH 6/8] Add privileged extensions for aurora and fdroid +Subject: [PATCH 6/6] Add privileged extensions for aurora and fdroid --- config/common.mk | 5 +++++ diff --git a/patches/personal/platform_vendor_voltage/0007-Switch-LineageOS-Aperture-to-GrapheneOS-Camera.patch b/patches/personal/platform_vendor_voltage/0007-Switch-LineageOS-Aperture-to-GrapheneOS-Camera.patch deleted file mode 100644 index d492260..0000000 --- a/patches/personal/platform_vendor_voltage/0007-Switch-LineageOS-Aperture-to-GrapheneOS-Camera.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 5ef5a8094058b19a31e48d7fad581d55020e9959 Mon Sep 17 00:00:00 2001 -From: "Christopher A. Williamson" -Date: Mon, 19 Feb 2024 16:52:41 +0000 -Subject: [PATCH 7/8] Switch LineageOS Aperture to GrapheneOS Camera - ---- - config/common_full.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/common_full.mk b/config/common_full.mk -index 4a7147d..daee5e5 100644 ---- a/config/common_full.mk -+++ b/config/common_full.mk -@@ -5,5 +5,5 @@ PRODUCT_SIZE := full - - ifneq ($(PRODUCT_NO_CAMERA),true) - PRODUCT_PACKAGES += \ -- Aperture -+ Camera - endif --- -2.42.0 diff --git a/patches/personal/platform_vendor_voltage/0008-Add-Trebuchet-launcher.patch b/patches/personal/platform_vendor_voltage/0008-Add-Trebuchet-launcher.patch deleted file mode 100644 index 41984b7..0000000 --- a/patches/personal/platform_vendor_voltage/0008-Add-Trebuchet-launcher.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cb89cea42d61a7cde5e1d91e22cb9036c1cd5d5b Mon Sep 17 00:00:00 2001 -From: "Christopher A. Williamson" -Date: Wed, 6 Mar 2024 20:19:45 +0000 -Subject: [PATCH 8/8] Add Trebuchet launcher - ---- - config/common.mk | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/config/common.mk b/config/common.mk -index e7d936c..310d45a 100644 ---- a/config/common.mk -+++ b/config/common.mk -@@ -188,6 +188,10 @@ PRODUCT_PACKAGES += \ - PRODUCT_PACKAGES += \ - Apps - -+# Trebuchet -+PRODUCT_PACKAGES += \ -+ TrebuchetQuickStep -+ - # RRO - include vendor/voltage/config/rro_overlays.mk - --- -2.43.1