From 50bc7ed12a6c41a65dad61aa248c84a35fc73d95 Mon Sep 17 00:00:00 2001 From: augiedoggie Date: Mon, 24 Jan 2022 14:22:52 -0700 Subject: [PATCH] emacs: new icon and recipe cleanup (#6563) The new icon is a direct conversion of the upstream svg using icon-o-matic. ($sourceDir/etc/images/icons/hicolor/scalable/apps/emacs.svg) Restore some rm commands in INSTALL() to prune extra data files from the package. --- .../emacs/additional-files/emacs.rdef.in | 70 +++++++++++-------- app-editors/emacs/emacs-29.0.50~git.recipe | 10 ++- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/app-editors/emacs/additional-files/emacs.rdef.in b/app-editors/emacs/additional-files/emacs.rdef.in index 1631a3d89..d43493788 100644 --- a/app-editors/emacs/additional-files/emacs.rdef.in +++ b/app-editors/emacs/additional-files/emacs.rdef.in @@ -14,35 +14,43 @@ resource app_version { resource app_signature "application/x-vnd.GNU-emacs"; resource vector_icon { - $"6E6369660503953AC403703AA9010A0B1B6705FF0501060204CB45BFC3CB45B9" - $"4CCB45C63BBFADCB79C614CB79B946CB79B415BFC3B415C63BB415B94CBFADB4" - $"0DB946B40DC614B40D0204CB45BFC3CB45B94CCB45C63BBFADCB79C614CB79B9" - $"46CB79B415BFC3B415C63BB415B94CBFADB40DB946B40DC614B40D0204CB45BF" - $"C3CB45B94CCB45C63BBFADCB79C614CB79B946CB79B415BFC3B415C63BB415B9" - $"4CBFADB40DB946B40DC614B40D0204CB45BFC3CB45B94CCB45C63BBFADCB79C6" - $"14CB79B946CB79B415BFC3B415C63BB415B94CBFADB40DB946B40DC614B40D02" - $"1EBBB1C7FDBBB5C7FCBBB1C7FDBDF0C7F2BCACC80FBE73C7E7C1D7C764C064C7" - $"B6C1D7C764C48FC6AAC39CC703C58CC64DC654C58DC616C5FDC652C576C5F3C4" - $"F3C667C524C4C8C476C0BFC47EC36DC48CBDC6C464BC42C37EBCC8C3E4BBC0C3" - $"16BE2BC0F8BC01C1F6BF42C071C389BF78C389BF78C218BEC2BEDCBD3CBF69BD" - $"82BE60BD00BD6FBC36BD9ABCA5BD3EBBCCBE3DBB56BDE2BB71BF64BB02C27EBA" - $"C7C104BACDC33DBAC4C35BBAB8C35BBAB8C462BA8CC4C7B8BCC50FB9D8C486B7" - $"99C1EDB72AC331B6EFC0BC2BBDDDB837BDDDB837C16AB82FC246B89DC202B83E" - $"C26EB8D6C141B94AC234B923C039B975BE15B9A9BE15B9A9BC06B9C8BA24BAB6" - $"BA94B9CAB9DCBB50BAB4BC2DBA72BBD8BBCABD62BE5EBE84BD5BBE09BEBFBEB2" - $"BFDCBF09BFDCBF09BC96BEDBB8D6C105BA39BFDCB745C278BB2CC543B7F6C433" - $"BD12C5E4C0D7C5EFBE03C630C282C5D8C2CAC608C2C5C5E5C2D0C63AC06DC6DA" - $"C0F0C6B4BF1FC73A021EBBB1C7FDBBB5C7FCBBB1C7FDBDF0C7F2BCACC80FBE73" - $"C7E7C1D7C764C064C7B6C1D7C764C48FC6AAC39CC703C58CC64DC654C58DC616" - $"C5FDC652C576C5F3C4F3C667C524C4C8C476C0BFC47EC36DC48CBDC6C464BC42" - $"C37EBCC8C3E4BBC0C316BE2BC0F8BC01C1F6BF42C071C389BF78C389BF78C218" - $"BEC2BEDCBD3CBF69BD82BE60BD00BD6FBC36BD9ABCA5BD3EBBCCBE3DBB56BDE2" - $"BB71BF64BB02C27EBAC7C104BACDC33DBAC4C35BBAB8C35BBAB8C462BA8CC4C7" - $"B8BCC50FB9D8C486B799C1EDB72AC331B6EFC0BC2BBDDDB837BDDDB837C16AB8" - $"2FC246B89DC202B83EC26EB8D6C141B94AC234B923C039B975BE15B9A9BE15B9" - $"A9BC06B9C8BA24BAB6BA94B9CAB9DCBB50BAB4BC2DBA72BBD8BBCABD62BE5EBE" - $"84BD5BBE09BEBFBEB2BFDCBF09BFDCBF09BC96BEDBB8D6C105BA39BFDCB745C2" - $"78BB2CC543B7F6C433BD12C5E4C0D7C5EFBE03C630C282C5D8C2CAC608C2C5C5" - $"E5C2D0C63AC06DC6DAC0F0C6B4BF1FC73A060A010100000A0201011001178100" - $"040A000102000A0301031001178100040A030104000A040105100117800004" + $"6E63696607050501211F4666010A0B1B67020002033C731B3CFE37BD287A3C52" + $"5446EDA74B9059008381C5FF907E55B3FEFFA52ECBFD02000602BC1C86BC8C7B" + $"3C8C7BBC1C864BB18B46FBB400411F5DFF5B2A8505FF0500070407BF3FC460BF" + $"C5C460BFC5C45DBFC2C657C104C640C125C6A8C08ECA90BB3ACA6DBC61CA93BB" + $"21CA89BB06CA39BACFCA7ABB04CA16BAB3C9F3BA94C9F3BA94C926BAA1C46BBF" + $"BDC711BCA6C46BBFBD0606FF075DBFC85DBFC85DC643BFB2CB83C61CCB83B949" + $"CB83B416BFC8B416C643B416B94EBFB2B40EB949B40EC61CB40E5DBFC85DB94E" + $"5DBFC8BFC80606FF075DBFC85DBFC85DC643BFB2CB83C61CCB83B949CB83B416" + $"BFC8B416C643B416B94EBFB2B40EB949B40EC61CB40E5DBFC85DB94E5DBFC8BF" + $"C80606FF075DBFC85DBFC85DC643BFB2CB83C61CCB83B949CB83B416BFC8B416" + $"C643B416B94EBFB2B40EB949B40EC61CB40E5DBFC85DB94E5DBFC8BFC80606FF" + $"075DBFC85DBFC85DC643BFB2CB83C61CCB83B949CB83B416BFC8B416C643B416" + $"B94EBFB2B40EB949B40EC61CB40E5DBFC85DB94E5DBFC8BFC80220BBB5C805BB" + $"B5C805BBB5C805BDF4C7FBBCB0C817BE77C7EFC1DDC76DC069C7BEC1DDC76DC4" + $"96C6B2C3A3C70BC594C654C65CC594C61EC605C659C57DC5FAC4FAC66FC52CC4" + $"CFC47DC0C4C485C373C494BDCAC46BBC45C384BCCCC3EB36C31CBE30C0FEBC05" + $"C1FCBF47C077C38FBF7DC38FBF7DC21EBEC7BEE0BD41BF6EBD86BE64BD04BD73" + $"BC3ABD9EBCA8BD42BBD0BE42BB5ABDE6BB74BF69BB05C285BACAC109BAD0C343" + $"BAC7C362BABBC362BABBC469BA8FC4CEB8BEC516B9DBC48DB79BC1F3B72CC338" + $"B6F0C0C2B763BDE1B839BDE1B839C170B831C24CB8A0C208B841C274B8D8C147" + $"B94DC23AB925C03FB978BE19B9ACBE19B9ACBC0AB9CBBA27BAB9BA97B9CDB9DE" + $"BB53BAB7BC30BA75BBDBBBCDBD66BE62BE88BD5FBE0DBEC4BEB6BFE2BF0EBFE2" + $"BF0EBC9ABEE0B8D8C10BBA3CBFE2B746C27EBB30C54AB7F8C43ABD16C5ECC0DD" + $"C5F6BE07C637C288C5DFC2D0C610C2CCC5EDC2D6C641C072C6E2C0F5C6BCBF24" + $"C742BBB5C805BBB9C804BBB5C805BBB5C805BBB5C805BBB5C8050220BBB5C805" + $"BBB5C805BBB5C805BDF4C7FBBCB0C817BE77C7EFC1DDC76DC069C7BEC1DDC76D" + $"C496C6B2C3A3C70BC594C654C65CC594C61EC605C659C57DC5FAC4FAC66FC52C" + $"C4CFC47DC0C4C485C373C494BDCAC46BBC45C384BCCCC3EB36C31CBE30C0FEBC" + $"05C1FCBF47C077C38FBF7DC38FBF7DC21EBEC7BEE0BD41BF6EBD86BE64BD04BD" + $"73BC3ABD9EBCA8BD42BBD0BE42BB5ABDE6BB74BF69BB05C285BACAC109BAD0C3" + $"43BAC7C362BABBC362BABBC469BA8FC4CEB8BEC516B9DBC48DB79BC1F3B72CC3" + $"38B6F0C0C2B763BDE1B839BDE1B839C170B831C24CB8A0C208B841C274B8D8C1" + $"47B94DC23AB925C03FB978BE19B9ACBE19B9ACBC0AB9CBBA27BAB9BA97B9CDB9" + $"DEBB53BAB7BC30BA75BBDBBBCDBD66BE62BE88BD5FBE0DBEC4BEB6BFE2BF0EBF" + $"E2BF0EBC9ABEE0B8D8C10BBA3CBFE2B746C27EBB30C54AB7F8C43ABD16C5ECC0" + $"DDC5F6BE07C637C288C5DFC2D0C610C2CCC5EDC2D6C641C072C6E2C0F5C6BCBF" + $"24C742BBB5C805BBB9C804BBB5C805BBB5C805BBB5C805BBB5C805070A000100" + $"000A010101000A0201021001178100040A030103000A0401041001178100040A" + $"050105000A060106100117800004" }; diff --git a/app-editors/emacs/emacs-29.0.50~git.recipe b/app-editors/emacs/emacs-29.0.50~git.recipe index 9b486afde..38fbc9d37 100644 --- a/app-editors/emacs/emacs-29.0.50~git.recipe +++ b/app-editors/emacs/emacs-29.0.50~git.recipe @@ -13,7 +13,7 @@ news reader, debugger interface, calendar, and more. HOMEPAGE="https://gnu.org/s/emacs/" COPYRIGHT="2001-2022 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" srcGitRev="5d257a99b7a67ffb61b315480182593f48ceee5f" SOURCE_URI="https://github.com/emacs-mirror/emacs/archive/$srcGitRev.tar.gz" SOURCE_DIR="emacs-$srcGitRev" @@ -90,6 +90,7 @@ BUILD_PREREQUIRES=" cmd:find cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix + cmd:grep cmd:gzip cmd:install_info cmd:make @@ -124,6 +125,13 @@ INSTALL() make install + # cleanup files that aren't useful on Haiku + rm -rf \ + $dataDir/applications \ + $dataDir/icons \ + $dataDir/metainfo \ + $libDir/systemd + # rename ctags so that the official ctags can be installed alongside without conflicting mv $commandBinDir/ctags $commandBinDir/ctags.emacs