diff options
Diffstat (limited to 'dev-vcs/git')
| -rw-r--r-- | dev-vcs/git/Manifest | 5 | ||||
| -rw-r--r-- | dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch | 39 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.48.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 1 |
4 files changed, 47 insertions, 2 deletions
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index 7594ba682771..1f96731c23b7 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -3,6 +3,7 @@ AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7 AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7 AUX git-2.46.2-unsafe-directory.patch 429 BLAKE2B 5e6be22e89250d434e0b62b27d90619a2d3379c2829dee9390d5e3413eb803a0547164e4e12c7f144812b394ee5238f9f1ee087f8c8f553766e473689ad2abda SHA512 8ad143cb0221c83d0c13606354e4c46f7169877a7d901cd1cd3f25e41efbc9ba57feaab626c6e1a19e9f52a084af629f9a2686eaaa76ec9e03569a1013087878 AUX git-2.48.0-doc-deps.patch 1431 BLAKE2B df7168b1098748ba0ae8e73f77b3dd3398478dd39aa4ed39f66568ef24a5c26c83132d7f4b5da23fe60c03a58be0126232d3bc7fdac61461bd8fc0d3d128e43c SHA512 bdee20f82d7b3ec8a91c1a62eda0f97d18ea28a7a1e48117b069fc49a039b00be900c3216fef1e71c3f588f490272fc8d5f0e6d1d116639abd8616d946c8315d +AUX git-2.48.1-macos-no-fsmonitor.patch 1328 BLAKE2B 3d126f9462d8ac7544c3c0780dba78cdd01dd95e286ee5dfe5dfbf8d3ba02aeb404bea0e2462f5de6270145a335d0f6cc2616eb7f9ffba49bafce0b3bd69a20d SHA512 70f9b98b89b5253211d32b0c1ba5826dbd2bcd4ce8d0315ff8404cb6361b09e8289eeafd6ed2c5798ca9b2cfea555114c7179716c76ed970de2664cb6ee19940 AUX git-2.48.1-parallel-build.patch 2869 BLAKE2B d159e1f81b44904b0a0aef8597026eb3ebd2d33b0bfc04145ae132619b3a3f856583f4e2a7e043adaf9daaf97a051cea5e3259d1b1c517c4807b71fe15553889 SHA512 c206756c19fc22832a20e869aa919a4d968275fc3a5e67e671cb5c4707a06958ddcc664ae1d630ac49a70562c04e60bd80a1f8748fbf24672e4b2e5a2b0c900a AUX git-daemon-r2.initd 378 BLAKE2B 1e4e553f550ee1cb428bec21dbaeede12daa87ef89664bfed0ab7c1ec15d32cf738f7adde23db7f76e9a7a2aeadc132affa3c42709e2ed789745240f8f72096b SHA512 a78043543e540a814eb1d1c76fbde7fd5cbc9f6dbe7486bc21a0cbb24a613f7a8661acb5460df474a7a0c5284b61bc9e700fa384163db6fc423645f699cc119a AUX git-daemon.confd 710 BLAKE2B aee2e1493bb67c09b87497724df90cb74e9a5a7f123101ae96374145eb81076cc2018e73141aa9dc8c4e50b7f1087e8265f4bcd56d761c60375607268d470437 SHA512 fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec @@ -20,9 +21,9 @@ DIST git-manpages-2.45.3.tar.xz 576480 BLAKE2B 61eeccea65dcae72e0151459ad4a225d4 DIST git-manpages-2.48.1.tar.xz 590608 BLAKE2B 54ff646cd1d5ce93e8e37eef4682e81a1c95f99903b2d760f70e51f2c9f02378f6de5464a5fcca24c08f8327ec114cdd1684eee07fd2512af7e9615c47104a99 SHA512 b086ac89e77b1af58beff26576fb5c3a1dfe8641315ab0b60819dcf0ba9e5be4173deaa77fa1f95d8594895a583ed629c469714b0a5e87fecd36e5be397ba8f5 EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179 EBUILD git-2.45.3.ebuild 16448 BLAKE2B 849adc38c76ee0dba0523cad77db4a06b74b891815555578dff3a40db29b91a17f2cdd6e0727cbf842781bb3f5c215cf880f7949f157fc2f9dfbd13afc2768b9 SHA512 f1ebde7f07478fd40aedc5eca9826e1fc4684f1f808dbd29e2cbdd620df130646a5acf5f54cf160b92bb4aa1fe31afddde3101814ebb9c4a5505021806f1d23b -EBUILD git-2.48.1.ebuild 11921 BLAKE2B 3cfe273d1d3f936bf515b9074ccbd6ec39ac64ce87c6614efba6c1be3e8ad7e5a1be0106440a385b12e43810caba18a820ba45b0d167b84a7bc1b98587d4c25a SHA512 f219819eb293a155bc2b8a36b691863a219a77313360d694b31ec50b7a455c3f0fc22cefb25409c2a845e1c02f85406ef20e7c11f9a90fd88be2c0bfc3f79e70 +EBUILD git-2.48.1.ebuild 12078 BLAKE2B 2ac2d37274f6cf7dab7ab2b3185442a06d77705921f1460e172b7c36a1f1894e25f980bad424397524ffd6314d921ea995973539fa38a0e8204d810e271a15c7 SHA512 a7281c6841465ca537dcf0a79c41cb5abca3f3875c261a083c628fef194bd556a22582441a0a3f9c2746087c4689c6b663bb96f593ff7e9d9fb5dee9b2c38fa0 EBUILD git-9999-r1.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06 EBUILD git-9999-r2.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06 -EBUILD git-9999-r3.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06 +EBUILD git-9999-r3.ebuild 11909 BLAKE2B f84e78cc57a931d46bf030f3841e21ab096a651499e7306e6df9cf747c8563a680bcb3559137fcd98bc5831c41850251fc77dee65707e08b91e65f66584a3a1c SHA512 7124b6a329846f44ca6690109534439ac7374a83c0abdb2b42c839ec902b735ac4cad087f8ac6b353a274e6e23f16192f63f14e1531452628ebadd59a3491d85 EBUILD git-9999.ebuild 11872 BLAKE2B 92a624df4df88a3643f8195d05e22cfbef5a06b65f9585b1f5321fb4445aaafbfbfa0671aa618ebe7c05ded4c2d494e876e87cc4f49c6b60118ce5b66e2cc711 SHA512 75275bb877781c96fbccf0c590d3001104137ee4683de16a6f5e8447e73adbaa867ae50bd70fe73e9ac28eaf83992abb03a3d7472ee59d5a4c536df2d86a2f06 MISC metadata.xml 2041 BLAKE2B 309964a6982f6f14cecc40b4021d96d2e28c49789480bc4037879375cb5277c2eb500ff36800657e783c36f541265db20b464fc39ce2ac39ff4cda881854662f SHA512 a8dd2f76985690cded8555a0b82e5004b4d93ccc45988fdc04ef8ed3e17ef73d2b83dc9fb6b913e5f9d2b78ebe715e9eb32bfce607318d0e8c0834987eabe5b6 diff --git a/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch b/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch new file mode 100644 index 000000000000..f1b89e736f46 --- /dev/null +++ b/dev-vcs/git/files/git-2.48.1-macos-no-fsmonitor.patch @@ -0,0 +1,39 @@ +meson.build: allow to disable fsmonitor backend for macOS + +Gentoo Prefix toolchain and setup does not enable CoreServices Framework +by default, so simply allow to disable the fsmonitor backend + +Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +--- a/meson.build ++++ b/meson.build +@@ -1117,11 +1117,13 @@ + endif + + fsmonitor_backend = '' +-if host_machine.system() == 'windows' +- fsmonitor_backend = 'win32' +-elif host_machine.system() == 'darwin' +- fsmonitor_backend = 'darwin' +- libgit_dependencies += dependency('CoreServices') ++if get_option('fsmonitor') ++ if host_machine.system() == 'windows' ++ fsmonitor_backend = 'win32' ++ elif host_machine.system() == 'darwin' ++ fsmonitor_backend = 'darwin' ++ libgit_dependencies += dependency('CoreServices') ++ endif + endif + if fsmonitor_backend != '' + libgit_c_args += '-DHAVE_FSMONITOR_DAEMON_BACKEND' +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -57,6 +57,8 @@ + # Build tweaks. + option('macos_use_homebrew_gettext', type: 'boolean', value: true, + description: 'Use gettext from Homebrew instead of the slightly-broken system-provided one.') ++option('fsmonitor', type: 'boolean', value: true, ++ description: 'Build fsmonitor backend on supported platforms.') + + # gitweb configuration. + option('gitweb_config', type: 'string', value: 'gitweb_config.perl') diff --git a/dev-vcs/git/git-2.48.1.ebuild b/dev-vcs/git/git-2.48.1.ebuild index 12b9dd2011c3..99cdc1b16654 100644 --- a/dev-vcs/git/git-2.48.1.ebuild +++ b/dev-vcs/git/git-2.48.1.ebuild @@ -150,6 +150,7 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}"/${PN}-2.48.0-doc-deps.patch "${FILESDIR}"/${PN}-2.48.1-parallel-build.patch + "${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch ) pkg_setup() { @@ -205,9 +206,12 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false ) + [[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false ) + # For non-live, we use a downloaded docs tarball instead. if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index f90f10f55f15..b9d2fdd44259 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -204,6 +204,7 @@ src_configure() { $(meson_feature perl) $(meson_feature perforce python) $(meson_use test tests) + -Dmacos_use_homebrew_gettext=false -Dperl_cpan_fallback=false ) |