diff --git a/LICENSE b/LICENSE index 0ba36db5..feb546f8 100644 --- a/LICENSE +++ b/LICENSE @@ -11,6 +11,7 @@ Misc/ Patches/ Common/ android_external_hardened_malloc/ - MIT + android_external_noto_fonts/ - See LICENSE included (OFL) android_kernel_*/ - GPL-2.0-only android_vendor_divested/ default_wallpaper.png - Unsplash, Pawel Czerwinski diff --git a/Patches/Common/android_external_noto-fonts/LICENSE.Noto b/Patches/Common/android_external_noto-fonts/LICENSE.Noto new file mode 100644 index 00000000..d952d62c --- /dev/null +++ b/Patches/Common/android_external_noto-fonts/LICENSE.Noto @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Patches/Common/android_external_noto-fonts/Noto-COLRv1-noflags.ttf b/Patches/Common/android_external_noto-fonts/Noto-COLRv1-noflags.ttf new file mode 100644 index 00000000..daa7629e Binary files /dev/null and b/Patches/Common/android_external_noto-fonts/Noto-COLRv1-noflags.ttf differ diff --git a/Patches/Common/android_external_noto-fonts/NotoColorEmoji-noflags.ttf b/Patches/Common/android_external_noto-fonts/NotoColorEmoji-noflags.ttf new file mode 100644 index 00000000..cbb609e5 Binary files /dev/null and b/Patches/Common/android_external_noto-fonts/NotoColorEmoji-noflags.ttf differ diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index ce9ff1c1..3eb0f300 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -118,6 +118,10 @@ applyPatch "$DOS_PATCHES/android_external_libnfc-nci/343955.patch"; #n-asb-2022- applyPatch "$DOS_PATCHES/android_external_libnfc-nci/353760.patch"; #n-asb-2023-04 OOBW in nci_snd_set_routing_cmd() fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/other/NotoColorEmoji.ttf; +fi; + if enterAndClear "external/sonivox"; then applyPatch "$DOS_PATCHES/android_external_sonivox/317038.patch"; #n-asb-2021-10 Fix global buffer overflow in WT_InterpolateNoLoop fi; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index cec5ed5e..f7b3f967 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -117,6 +117,10 @@ fi; #fi; #fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "external/svox"; then git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles fi; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index a7f37073..9e1f6cd4 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -139,6 +139,10 @@ applyPatch "$DOS_PATCHES_COMMON/android_external_hardened_malloc/0002-Broken_Cam fi; fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "external/svox"; then git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 524ffedd..a75b5880 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -125,6 +125,10 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "external/svox"; then git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index eb91b677..0a05eeb6 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -122,6 +122,10 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index f4b51c08..cffd8e6f 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -120,6 +120,10 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2. fi; fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "external/SecureCamera"; then sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 5dfa2677..20d3cc79 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -122,6 +122,11 @@ sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requ fi; fi; +if enterAndClear "external/noto-fonts"; then +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/NotoColorEmoji-noflags.ttf" emoji-compat/font/NotoColorEmojiCompatLegacy.ttf; +cp -f "$DOS_PATCHES_COMMON/android_external_noto-fonts/Noto-COLRv1-noflags.ttf" emoji-compat/font/NotoColorEmojiCompat.ttf; +fi; + if enterAndClear "external/SecureCamera"; then sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '11iLOCAL_OVERRIDES_PACKAGES := Aperture Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others diff --git a/Scripts/Update_Commons.sh b/Scripts/Update_Commons.sh index d79623b7..6fb6d2f9 100644 --- a/Scripts/Update_Commons.sh +++ b/Scripts/Update_Commons.sh @@ -27,13 +27,17 @@ wget "https://raw.githubusercontent.com/GrapheneOS/platform_packages_apps_Dialer #LineageOS Contributors Cloud wget "https://github.com/LineageOS/android_packages_apps_LineageParts/raw/lineage-19.1/assets/contributors.db" -O ../Patches/Common/contributors.db; +#TODO: Noto Fonts for Emoji +#hhttps://github.com/googlefonts/noto-emoji +#Last: 2023/04/29 + #TODO: wireless-regdb #https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/ -#Last: 2023/04/04 +#Last: 2023/04/29 #TODO: MMS Configs #https://github.com/GrapheneOS/platform_packages_apps_Messaging -#Last: 2023/04/04 +#Last: 2023/04/29 #TODO: Carrier List, unused #https://android.googlesource.com/platform/packages/providers/TelephonyProvider/ diff --git a/fix_permissions.sh b/fix_permissions.sh index 8baf70b4..a2dc473e 100755 --- a/fix_permissions.sh +++ b/fix_permissions.sh @@ -21,6 +21,7 @@ setStrict Logs; setStrict Manifests; setStrict Misc; setStrict Patches/Common; +setRelaxed Patches/Common/android_external_noto-fonts; setRelaxed Patches/Common/android_timekeep_sepolicy; setRelaxed Patches/Common/android_vendor_divested; setStrict Patches/LineageOS-14.1;