From 4d190a87291ace8503ad92c6b049d14660a14c72 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Apr 2024 18:30:54 +0100 Subject: gentoo auto-resync : 07:04:2024 - 18:30:54 --- sys-apps/Manifest.gz | Bin 50848 -> 50845 bytes sys-apps/darwin-miscutils/Manifest | 11 +- .../darwin-miscutils/darwin-miscutils-12-r1.ebuild | 101 +++++++++ .../darwin-miscutils/darwin-miscutils-12.ebuild | 157 -------------- .../files/darwin-miscutils-12-md-modern-c.patch | 235 +++++++++++++++++++++ .../files/darwin-miscutils-12-md-register.patch | 14 -- .../files/darwin-miscutils-6-w64.patch | 17 -- sys-apps/darwin-miscutils/metadata.xml | 4 + sys-apps/gptfdisk/Manifest | 3 +- .../gptfdisk-1.0.10_utf16-to-utf8-conversion.patch | 19 ++ sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild | 61 ++++++ sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild | 60 ------ 12 files changed, 426 insertions(+), 256 deletions(-) create mode 100644 sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild delete mode 100644 sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild create mode 100644 sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch delete mode 100644 sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-register.patch delete mode 100644 sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch create mode 100644 sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch create mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild delete mode 100644 sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 03d74f12b305..43eac828a129 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/darwin-miscutils/Manifest b/sys-apps/darwin-miscutils/Manifest index a3910beee373..6461fbd0c44f 100644 --- a/sys-apps/darwin-miscutils/Manifest +++ b/sys-apps/darwin-miscutils/Manifest @@ -1,10 +1,7 @@ -AUX darwin-miscutils-12-md-register.patch 245 BLAKE2B 721b90f61f15757f7238e54ebd085e78bbd4e6c5b70b5245827567a71248772027fca1f2779a9011f4df3c2f3e2229d39da3c46db7d9f927fd3f27cf07245e23 SHA512 06d6d561bb2a8162b8e158d53e28f22716594376b6d943513c2dcb59c44061d1b65a2302988619f1f3f3b8544c3adc3b60d9dd3ec4bf3875ae4104136438f24f -AUX darwin-miscutils-6-w64.patch 584 BLAKE2B 00eeab82ac846718a03330bc2a6359e374967429598251c03fa4d952b4af6aa66e13f203f234e474c6d03c877a41264e47f6fbea1d2e51187eb630673293bdf9 SHA512 590b2af77934a66e1e41b2e22440038991ab258854b690d29527b84a06f0ffe1c19d5ff9022f024796c9cec84fefb80afc098749033dfd60ccda337f0059ce40 +AUX darwin-miscutils-12-md-modern-c.patch 7242 BLAKE2B c8887e52f0f2d16d3f17aff4c7f6844cd302b0f925721aba6e8abf8e7185c57e7b91774d33d79048d34e5a1bb4aad92a994d038e54ff4ec17a894963a72ef617 SHA512 26d77f8696203379aa767646fb9b9b67f1d3bf1c3eca991908b7498c37f3c87b07badb04980323450f1b9ad6fed7ea6ca7af1a272739e7c0efd6c57cd5646c32 DIST adv_cmds-md-147-compile.patch 5423 BLAKE2B f54aaaa8fcecb81fd8e628bcb384f537e572095b8210612c0748017f033e7bb6f9c5b1bd2c544fec23e8002a2ac7b99d840c85a8ca6faadac3b4da2edb77b459 SHA512 951e981b57e7d3d6ef51d638759559581dd4995ce66ec17bb2658f8a298683feb0842d10fd834b713ec39b2a0f671df56049b876d55f17bf1e988d76839fead1 DIST adv_cmds-md-147.1 3623 BLAKE2B 18b856770f0490ef241e19cc6f1661f6521bcc7f363bff41fbec548388d8f1e2d9e6aea879064cd3d7e7d16f8e0b2ff17ead990051a068a66f520a5ff504afa3 SHA512 459beb2b7c92b8718c76d744bbabf631bf8c329feb65c9434ce8a023c73ceac2d207c95e39c4b90b095a4724a74096a3d1bed9122883eb54e5311dfc64ffc718 DIST adv_cmds-md-147.c 25945 BLAKE2B 38af9e06e18a15cc74a81464a4c1ecdf98b800eb34f33f6ab6203b60540e693d459805432e51bae1008661aa566830c87357432428f62d8cbea9973b1e5fc59a SHA512 93e70f7d8697652b5a3c661975d21b51545d2eb07de64fd40524fcf0d5016dae9ae1dc63c4a85cb5ad455c8d1c246b7f5f2eac38226dcefbf4cab12b0b1c7592 -DIST developer_cmds-63.tar.gz 110662 BLAKE2B 383573203d124904d69e5dbc8f1c5e0aef1b5a2288e40449c8e95470b131c9dc1f181338c38f292a1bcc5a105a54010e23bc12e233d7a92d9c983eb975429474 SHA512 4f672835f0290feaf54c7c268b31774282325448f30c02e4f12ead84c41e15083784fac4c9c4916c098953bc61aa8f29bea24a7b51312428aa87448595be50a1 -DIST misc_cmds-34.tar.gz 124023 BLAKE2B 3c634ab540f4b1046e6abe05476a399ea00fd6d35d2d450f68cd7c3f52c8b9321039221659647b6623d5621af1789dba3798ec9f5cff8677653fbb3f295d1d1c SHA512 5e4040c49cc6aed8d4b471cc5d26d978717c9ad29315d40098090d0f7fee5a78289f2092fd6e8c7b7adea31b766cfefdef0da957b86ffb4e0781c13f4b5e4dbe -DIST shell_cmds-203.tar.gz 428799 BLAKE2B 54103daa8a8758dd34a66f9c34a5fa4cad2e6a2dd36ff838498d82179566eb95c25c49126341ac481889381c2d39ebea3bf57959bb943536a7ba8a90fcf96f67 SHA512 ba9b00d6681d286e6210d49d70e1f526e86b0a76ed794050e9cdbdb8c0cc30dbe82ee9cd908578ddabb19c53c8994f1b84650f08bfeb88ea9f77d4de942c1cb1 -EBUILD darwin-miscutils-12.ebuild 4377 BLAKE2B 2997dd12832e9ec457af0c49fc2376fa1bf91575948573067f95ead387b26150158db183415048484a7fa1a712c28da7c3ed7a00572735d1f29c54fe259e2f84 SHA512 10d52acb6c5e37e5febc5f17cf071f7c27c19ec87e93d1ae0683e967814f8574ec56f0f52a2800460dadb422ce526e338b072e49f120b36335a95088e57241c3 -MISC metadata.xml 248 BLAKE2B 92ffbf5df7cedae395e3af770765075073d9dd2ddcc887b34b1eca1997d449a5dc827cb3513863a21f26efebf75700fc87e1228c8614a47e951da4b270f264d4 SHA512 5dca2496f2ab8cbdb810fd11c488d84ab9822448794d7e6e3edbb1f71a9f1865248685e25d3e54524b43d781b8e073082773606f8e91943a71fd2bafe63f7b73 +DIST developer_cmds-63.tar.gz 110943 BLAKE2B 3dfa56406ca3bb3a56122c172151f20cdbf6191a1511e5cfe2db03bd133e565bee7ddd5cd7cbe34aa2e4513a21a8502d44d480f5bc20621cc615b2bc36f1b8c1 SHA512 c37dead04c6e4fb409704d206e5ad66c779917d21aa2930746ed1145be9a392db861f09feb9c97a2fc8c985cf6bce98ddb96fc2688bada1b21a3ac7abbb90f1f +EBUILD darwin-miscutils-12-r1.ebuild 2986 BLAKE2B 5a26cbcfb122e022fac9db40e3a25cb79746d399f3e8fe398e0394230d6fa2eb2e733694e111c4b9d374733440f94bf9b705854da1ac3acde83d1521f46f7cdc SHA512 6fbece42d9b4206f4877a04812e7fc9c919ce8decbfeda75b7128f2aae2ff0d356138b0b1d96ffbc678fcd3970c9655c7d3471ee1eac6ff0eb67b751947547b9 +MISC metadata.xml 423 BLAKE2B 0f41ccec91d62d1c14286a35462f66ba4d2b1f01f2b918d1acddffa86ace7b2b31c2243bfcbe0cf7dc35beb244c3cfc68f40a08483531e2e83e2af2a43c2830f SHA512 933a859ad2e024b3e9c43961894b6bbf5964eae8c9ca88c8f4c0be996a81438234c717e637f4ff05cddccb395375fcc25222ce166d813b29b2bbfbf3fb4c6608 diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild new file mode 100644 index 000000000000..c8f3e71d0567 --- /dev/null +++ b/sys-apps/darwin-miscutils/darwin-miscutils-12-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +# from DT 8.2.1 +DEV_VER=63 +# from 10.7.4 +MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530 + +DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13" +HOMEPAGE="https://github.com/apple-oss-distributions" +SRC_URI=" + https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.1 \ + -> adv_cmds-md-${MD_VER}.1 + https://github.com/apple-oss-distributions/adv_cmds/blob/c8dbac91aa855b2d05282f45709b318f8bc3693d/md/md.c \ + -> adv_cmds-md-${MD_VER}.c + https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch + https://github.com/apple-oss-distributions/developer_cmds/archive/refs/tags/developer_cmds-${DEV_VER}.tar.gz" +S="${WORKDIR}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos" + +# for ncal +DEPEND="" +RDEPEND="${DEPEND}" + +src_prepare() { + mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die + cd "${S}"/adv_cmds-${MD_VER} || die + cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die + cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die + eapply "${FILESDIR}"/${PN}-12-md-modern-c.patch + + cd "${S}" || die + eapply_user +} + +src_compile() { + local t + local TS + local flags=( + ${CFLAGS} + -I. + -D__FBSDID=__RCSID + -Du_int=uint32_t + -include stdint.h + ) + + # grobian 2024-04-07: + # removed most tools here that are provided by host as well, but + # newer versions, and they are in no way critical, but better + # figured out by Apple (e.g. tools like w/uptime and hostname) + # what's left here is developer tools that GCC interacts with + # tools from developer_cmds we could probably loose, but they've + # always worked up sofar, and they are needed on old targets + # (Darwin9) most likely, so keep them. md is just plain missing, so + # keep it in any case + + TS="${S}/developer_cmds-developer_cmds-${DEV_VER}" # new github archives + # only pick those tools that do not conflict (no ctags and indent) + # do not install lorder, mkdep and vgrind as they are a non-prefix-aware + # shell scripts + # don't install rpcgen, as it is heavily related to the OS it runs + # on (and this is the High Sierra version) + for t in asa unifdef what ; do + echo "in ${TS}/${t}:" + cd "${TS}/${t}" || die + edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c + done + + # provide this one for gcc-apple + TS="${S}/adv_cmds-${MD_VER}" + for t in md ; do + echo "in ${TS}/${t}:" + cd "${TS}/${t}" || die + edo $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c + done +} + +src_install() { + local t + local TS + mkdir -p "${ED}"/{,usr/}bin || die + + TS="${S}/developer_cmds-developer_cmds-${DEV_VER}" # new github archives + for t in asa unifdef what ; do + cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die + doman "${TS}/${t}/${t}.1" + done + + TS="${S}/adv_cmds-${MD_VER}" + for t in md ; do + cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ || die + doman "${TS}/${t}/${t}.1" + done +} diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild deleted file mode 100644 index 829ce1672016..000000000000 --- a/sys-apps/darwin-miscutils/darwin-miscutils-12.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs - -# from macOS 10.13 -MISC_VER=34 -SHELL_VER=203 -# from DT 8.2.1 -DEV_VER=63 -# from 10.7.4 -MD_VER=147 # adv_cmds-148 in 10.8 has no md, bug #428530 - -DESCRIPTION="Miscellaneous commands used on macOS, High Sierra 10.13" -HOMEPAGE="https://www.opensource.apple.com/" -SRC_URI="https://opensource.apple.com/tarballs/misc_cmds/misc_cmds-${MISC_VER}.tar.gz - https://opensource.apple.com/tarballs/shell_cmds/shell_cmds-${SHELL_VER}.tar.gz - https://opensource.apple.com/tarballs/developer_cmds/developer_cmds-${DEV_VER}.tar.gz - https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.c -> adv_cmds-md-${MD_VER}.c - https://opensource.apple.com/source/adv_cmds/adv_cmds-${MD_VER}/md/md.1 -> adv_cmds-md-${MD_VER}.1 - https://642666.bugs.gentoo.org/attachment.cgi?id=511988 -> adv_cmds-md-${MD_VER}-compile.patch" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~arm64-macos ~ppc-macos ~x64-macos" -IUSE="" - -# for ncal -DEPEND="sys-libs/ncurses:=" -RDEPEND="${DEPEND}" - -S=${WORKDIR} - -src_prepare() { - cd "${S}"/shell_cmds-${SHELL_VER} || die - eapply "${FILESDIR}"/${PN}-6-w64.patch - - mkdir -p "${S}"/adv_cmds-${MD_VER}/md || die - cd "${S}"/adv_cmds-${MD_VER} || die - cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.c md/md.c || die - cp "${DISTDIR}"/adv_cmds-md-${MD_VER}.1 md/md.1 || die - eapply "${DISTDIR}"/adv_cmds-md-${MD_VER}-compile.patch - eapply "${FILESDIR}"/${PN}-12-md-register.patch - - cd "${S}" - eapply_user -} - -src_compile() { - local flags=( - ${CFLAGS} - -I. - -D__FBSDID=__RCSID - -Du_int=uint32_t - -include stdint.h - ) - - v() { - echo "$*" - $@ - } - - local TS=${S}/misc_cmds-${MISC_VER} - # tsort is provided by coreutils - for t in leave units calendar; do - cd "${TS}/${t}" - echo "in ${TS}/${t}:" - v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die - done - # compile cal separately - cd "${TS}/ncal" - echo "in ${TS}/ncal:" - v $(tc-getCC) ${flags[@]} -c calendar.c || die - v $(tc-getCC) ${flags[@]} -c easter.c || die - v $(tc-getCC) ${flags[@]} -c ncal.c || die - v $(tc-getCC) -o cal ${LDFLAGS} -lncurses calendar.o easter.o ncal.o || die - - TS=${S}/shell_cmds-${SHELL_VER} - # only pick those tools not provided by coreutils, findutils - for t in \ - apply getopt hexdump hostname jot kill killall \ - lastcomm renice script shlock time whereis; - do - echo "in ${TS}/${t}:" - cd "${TS}/${t}" - v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die - done - cd "${TS}/w" - sed -i -e '/#include /d' w.c || die - echo "in ${TS}/w:" - v $(tc-getCC) ${flags[@]} -DHAVE_UTMPX=1 ${LDFLAGS} -lresolv -o w *.c || die - - TS=${S}/developer_cmds-${DEV_VER} - # only pick those tools that do not conflict (no ctags and indent) - # do not install lorder, mkdep and vgrind as they are a non-prefix-aware - # shell scripts - # don't install rpcgen, as it is heavily related to the OS it runs - # on (and this is the High Sierra version) - for t in asa unifdef what ; do - echo "in ${TS}/${t}:" - cd "${TS}/${t}" || die - v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die - done - - # provide this one for gcc-apple - TS=${S}/adv_cmds-${MD_VER} - for t in md ; do - echo "in ${TS}/${t}:" - cd "${TS}/${t}" || die - v $(tc-getCC) ${flags[@]} -o ${t} ${LDFLAGS} *.c || die - done -} - -src_install() { - mkdir -p "${ED}"/{,usr/}bin - - local TS=${S}/misc_cmds-${MISC_VER} - for t in leave units calendar ; do - cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ - doman "${TS}/${t}/${t}.1" - done - # copy cal separately - cp "${TS}/ncal/cal" "${ED}"/usr/bin/ncal - dosym ncal /usr/bin/cal - doman "${TS}/ncal/ncal.1" - dosym ncal.1 /usr/share/man/man1/cal.1 - - TS=${S}/shell_cmds-${SHELL_VER} - for t in \ - apply getopt hexdump hostname jot killall lastcomm \ - renice script shlock time w whereis; - do - cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ - [[ -f "${TS}/${t}/${t}.1" ]] && doman "${TS}/${t}/${t}.1" - [[ -f "${TS}/${t}/${t}.8" ]] && doman "${TS}/${t}/${t}.8" - done - cp "${TS}/w/w" "${ED}"/usr/bin/uptime - doman "${TS}/w/uptime.1" - for t in hostname kill; do - cp "${TS}/${t}/${t}" "${ED}"/bin/ - doman "${TS}/${t}/${t}.1" - done - - TS=${S}/developer_cmds-${DEV_VER} - for t in asa unifdef what ; do - cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ - doman "${TS}/${t}/${t}.1" - done - - TS=${S}/adv_cmds-${MD_VER} - for t in md ; do - cp "${TS}/${t}/${t}" "${ED}"/usr/bin/ - doman "${TS}/${t}/${t}.1" - done -} diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch new file mode 100644 index 000000000000..2e6dcdb50d4b --- /dev/null +++ b/sys-apps/darwin-miscutils/files/darwin-miscutils-12-md-modern-c.patch @@ -0,0 +1,235 @@ +md: bring up to date for modern C to allow Clang and recent GCC to compile + +Authors: +Michael Weiser, https://bugs.gentoo.org/642666 +Alexey Sokolov, https://bugs.gentoo.org/758167 +Fabian Groffen + +--- adv_cmds-147/md/md.c ++++ adv_cmds-147/md/md.c +@@ -78,6 +78,8 @@ + #include + #include + #include ++#include ++#include + + #define LINESIZE 65536 // NeXT_MOD + +@@ -100,6 +102,7 @@ + } dep_files[1000]; + int dep_file_index; + ++static int + qsort_strcmp(a, b) + struct dep *a, *b; + { +@@ -137,9 +140,15 @@ + + static void scan_mak(FILE *, FILE *, char *); + static void finish_mak(FILE *, FILE *); ++static int read_dep(char *); ++static void expunge_mak(FILE *, FILE *); ++static void skip_mak(FILE *, FILE *); ++static void output_dep(FILE *); ++static void parse_dep(); ++static void save_dot_o(); + +-main(argc,argv) +-register char **argv; ++int ++main(int argc, char** argv) + { + int size; + +@@ -152,7 +161,7 @@ + if (*token++ != '-' || !*token) + break; + else { register int flag; +- for ( ; flag = *token++ ; ) { ++ for ( ; (flag = *token++) ; ) { + switch (flag) { + case 'd': + delete++; +@@ -177,7 +186,7 @@ + expunge++; + break; + case 'D': +- for ( ; flag = *token++ ; ) ++ for ( ; (flag = *token++) ; ) + switch (flag) { + case 'c': + D_contents++; +@@ -211,10 +220,10 @@ + } + + if (!expunge && argc < 1) goto usage; +- if ((int) outfile && (int) makefile) /* not both */ ++ if (outfile && makefile) /* not both */ + goto usage; + +- if ((int) outfile) { ++ if (outfile) { + /* + * NeXT_MOD, For SGS stuff, in case still linked to master version + */ +@@ -227,7 +236,7 @@ + exit(1); + } else if (D_open) + printf("%s: opened outfile \"%s\"\n", name, outfile); +- } else if (mak = find_mak(makefile)) { ++ } else if ((mak = find_mak(makefile))) { + makout = temp_mak(); + out = makout; + if (expunge) +@@ -235,7 +244,7 @@ + else + skip_mak(mak, makout); + } else if (mak_eof && /* non existent file == mt file */ +- (int)(makout = temp_mak())) { /* but we need to be able */ ++ (makout = temp_mak()) != NULL) { /* but we need to be able */ + out = makout; /* to write here */ + } else if (makefile) { + fprintf(stderr, "%s: makefile \"%s\" can not be opened or stat'ed\n", +@@ -246,7 +255,7 @@ + for (; argc--; argv++) { + dep_file_index = 0; + +- if (size = read_dep(*argv)) { ++ if ((size = read_dep(*argv))) { + + save_dot_o(); + if (D_depend) printf("%s: dot_o = \"%s\"\n", name, dot_o); +@@ -269,8 +278,8 @@ + } + + +-read_dep(file) +-register char *file; ++int ++read_dep(char *file) + { + register int fd; + register int size; +@@ -294,7 +303,7 @@ + switch(statbuf.st_mode & S_IFMT) { + case S_IFREG: + if (D_time) +- printf("%s: file time = %d\n", name, statbuf.st_mtime); ++ printf("%s: file time = %ld\n", name, statbuf.st_mtime); + + if (statbuf.st_size > IObuffer) { + fprintf(stderr, "%s: file \"%s\" tooo big for IObuffer\n", +@@ -302,9 +311,9 @@ + goto out; + } else if (force) + break; +- else if ((int) mak && statbuf.st_mtime < makstat.st_mtime) { ++ else if (mak && statbuf.st_mtime < makstat.st_mtime) { + if (verbose || D_time) +- fprintf(stderr, "%s: skipping \"%s\" %d < %d \"%s\"\n", ++ fprintf(stderr, "%s: skipping \"%s\" %ld < %ld \"%s\"\n", + name, file, statbuf.st_mtime, makstat.st_mtime, + real_mak_name); + goto out; +@@ -345,6 +354,7 @@ + return 0; + } + ++static void + save_dot_o() + { + register char *cp = file_array; +@@ -355,6 +365,7 @@ + *svp = 0; + } + ++static void + parse_dep() + { + register char *lp = file_array; +@@ -381,7 +392,8 @@ + cp = dep_line; + lp[-1] = 0; + /* skip .o file name */ +- while ((c = *cp++) && c != ':'); if (!c) continue; ++ while ((c = *cp++) && c != ':'); ++ if (!c) continue; + next_filename: + i = 0; + abspath = 0; +@@ -415,7 +427,7 @@ + if (abspath) + *cp++ = '/'; + for (c=0; cprefix@gentoo.org Gentoo Prefix + + apple-oss-distributions/adv_cmds + apple-oss-distributions/developer_cmds + diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest index a3319e4f8ff6..69db74b2263e 100644 --- a/sys-apps/gptfdisk/Manifest +++ b/sys-apps/gptfdisk/Manifest @@ -1,9 +1,10 @@ +AUX gptfdisk-1.0.10_utf16-to-utf8-conversion.patch 687 BLAKE2B dbbd917aa52cd7386dda06c943dfdf207de9c7b4d1e3438f468cdab001199af3c5262ab06e9fdaae206da0e188e60c81fa869e3f0701bed1e893e6ea2c688769 SHA512 eb419d2837497a1345f8ec665b6daa6a65ab60da4cf5e361d97afa616795cd2515dc9e7d094ce92d4dc1d89e9781d050d0efc1fe5506679e71ecb6aebd30cef0 AUX gptfdisk-1.0.9-build_flags.patch 286 BLAKE2B d7d59cf82165de5863f4bde47a77cc37a0beb27a249e43f80389c41abceb2b4eaf35c72e196a5b67a60f3bd046c8802bf88292db3ce18eef0f7cd948f044c0e5 SHA512 f2b4717e9ada965a3fb1bf801c8ed1ec683425103933a85e95eef9adec9c174ef79d37a227491a892c11e707a1c3b9e59ef9d6e6adfda2009522715a0d9d7ae2 AUX gptfdisk-1.0.9-libuuid.patch 899 BLAKE2B 534038452a7184945486b8435099adf7f1992c4bb8618a0ed5432c7675eb653374b25417b2b21c8fc2ec0b0860303e054fb0dc71f880941712e6230ddb029358 SHA512 590b6e7c5b16762abffe68767f255414a56f7fbd691a47837a93b288bde5210a3ab4addf93725c313134c48e6d6bc69701ad3742455f48de793412616be51df3 AUX gptfdisk-1.0.9-musl-1.2.4.patch 819 BLAKE2B 79fde3617e158c1a43ac257e412e2c69cde0f6f7b4352a40fd82573d0f8585bbe1dadd323d6d5c717c0ea9e57abb67a71844648f34dd5586fbfc56c1179b30c9 SHA512 940f7f2647b9165404816d1c9e2d2c4d528a45645b5322b46ee3bba843b36acd088b47caad6348c46360107987cc8a3ab087cc6718e02aa46053abfb246b537e AUX gptfdisk-1.0.9-popt_segv.patch 671 BLAKE2B 1d46905caca1b7a403d1d200f5f0afa89953b86997f834df16002780d4371027bc34988c58b9a67e6b10a8978d4c99e93b2e711cbe00f5c49f3a868f708efc29 SHA512 b559c479dd2d62208b41a4ba3c6e68cf3e3b099d999bb8c2bbe251d77f217ccde28a44de0ca26c86004a6cecc17cf8360a120f3f1dd884ab4616c061110fde60 DIST gptfdisk-1.0.10.tar.gz 220787 BLAKE2B 9047bf68a2c5c254bda9b2815488963dc19a9415c90fbf4a127268a37fe8a545b7d45a333e356bd9da22e37ef649d9f60896ffedfdc35b60c7642a48e4ed2e5a SHA512 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2 -EBUILD gptfdisk-1.0.10.ebuild 1309 BLAKE2B 6bf8c39be4af989580f26d796d3b372d9b1debbae9028bc21f6d02e2af96cbbc1e0e2be5185317e425d982aa0f61bdf3062ec42cb84af9be7bafffcf63354c1f SHA512 1d25033877b832c807ea33a5150319e1977c2538cb46f8f9bf06fbb76ab8613a70d9bb0a35f151380c02ae04c87b9a7cbf47e38362312f7f83caca6b0332c8a6 +EBUILD gptfdisk-1.0.10-r1.ebuild 1368 BLAKE2B d6aaed1e4ea4050ce4b9dee85d6322b926cca47551230f3aacbb71b2d3b904909a2acc54583fe01ab3b3bff514ec3c891838c12170664a0a9d4b5936ff1cb1a5 SHA512 c48e238d0d5d0f2881cefc69cbfe2ec3edb0d29e7261a125cfedb4281122258415d16451ba4136eb9731ffc3fd4cda360c1f8ea7dbca3b6379c34d7379e94314 EBUILD gptfdisk-1.0.9-r3.ebuild 1446 BLAKE2B cc25c869453450c8ad4e446c43dfa8619fcd14e349fae2470c87cbfa03fda1cfbfa5a6ebb83291902068ce5fc8179d4bffc736013576a31ad51dfdd383478f0b SHA512 645a82351ed321544a8dfa2ad1a456fcfe9b9f3f194d1dd67963042fd840733426d90c898878fa094a6f89416f32d1a31771f2fc8d4e2d2e684d956509e153af MISC metadata.xml 324 BLAKE2B 71325b739cb7e216be64dfff099ebf3a3f24d8a714ce59838780b6944a65f7d9abdb9b0afb43c617364071778768a7d90da9ef8c7eb4c3bc0cd6b5dc9e04c773 SHA512 ad7457ef87228bef7db385c72bee2c9cf1f913cf261641582a57e4b72c05e7106ad39092c55e2aae1e4d92f86a0bf6f4537dd7de9fdd6e1dc64677b36df4a273 diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch new file mode 100644 index 000000000000..f30eb593799f --- /dev/null +++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.10_utf16-to-utf8-conversion.patch @@ -0,0 +1,19 @@ +From ade1729d1ca44b34678653fdf12e787e1afc5fd8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ulrich=20M=C3=BCller?= +Date: Wed, 13 Mar 2024 20:38:37 +0100 +Subject: [PATCH] gptpart.cc: Fix Unicode to UTF-8 conversion in GetDescription + +--- a/gptpart.cc ++++ b/gptpart.cc +@@ -131,7 +131,7 @@ string GPTPart::GetDescription(void) { + } // if + else { + utf8 += (char) ( 0xf0 | ( uni >> 18 ) ) ; +- utf8 += (char) ( 0xe0 | ( ( uni >> 12 ) & 0x3f ) ) ; ++ utf8 += (char) ( 0x80 | ( ( uni >> 12 ) & 0x3f ) ) ; + utf8 += (char) ( 0x80 | ( ( uni >> 6 ) & 0x3f ) ) ; + utf8 += (char) ( 0x80 | ( uni & 0x3f ) ) ; + } // if +-- +2.44.0 + diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild new file mode 100644 index 000000000000..e1986b2d8214 --- /dev/null +++ b/sys-apps/gptfdisk/gptfdisk-1.0.10-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="GPT partition table manipulator for Linux" +HOMEPAGE="https://www.rodsbooks.com/gdisk/" +SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="ncurses static" + +# libuuid from util-linux is required. +RDEPEND="!static? ( + dev-libs/popt + ncurses? ( sys-libs/ncurses:=[unicode(+)] ) + kernel_linux? ( sys-apps/util-linux ) + )" +DEPEND=" + ${RDEPEND} + static? ( + dev-libs/popt[static-libs(+)] + ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) + kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) + ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.9-build_flags.patch + "${FILESDIR}"/${PN}-1.0.10_utf16-to-utf8-conversion.patch +) + +src_prepare() { + default + + tc-export CXX PKG_CONFIG + + if ! use ncurses ; then + sed -i \ + -e '/^all:/s: cgdisk::' \ + Makefile || die + fi + + sed \ + -e '/g++/s:=:?=:g' \ + -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ + -i Makefile || die + + use static && append-ldflags -static +} + +src_install() { + dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts + doman *.8 + dodoc NEWS README +} diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild deleted file mode 100644 index 980f14022408..000000000000 --- a/sys-apps/gptfdisk/gptfdisk-1.0.10.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="GPT partition table manipulator for Linux" -HOMEPAGE="https://www.rodsbooks.com/gdisk/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="ncurses static" - -# libuuid from util-linux is required. -RDEPEND="!static? ( - dev-libs/popt - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - kernel_linux? ( sys-apps/util-linux ) - )" -DEPEND=" - ${RDEPEND} - static? ( - dev-libs/popt[static-libs(+)] - ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) - kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) - ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.0.9-build_flags.patch -) - -src_prepare() { - default - - tc-export CXX PKG_CONFIG - - if ! use ncurses ; then - sed -i \ - -e '/^all:/s: cgdisk::' \ - Makefile || die - fi - - sed \ - -e '/g++/s:=:?=:g' \ - -e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \ - -i Makefile || die - - use static && append-ldflags -static -} - -src_install() { - dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts - doman *.8 - dodoc NEWS README -} -- cgit v1.2.3