diff --git a/x11-terms/wezterm/Manifest b/x11-terms/wezterm/Manifest index 4ce2e98be..82d2a35fd 100644 --- a/x11-terms/wezterm/Manifest +++ b/x11-terms/wezterm/Manifest @@ -1,2 +1,3 @@ -DIST wezterm-20240203-110809-5046fc22-src.tar.gz 41444064 BLAKE2B cf5fcd17d122a1f9d856f491f3e0bf365070ee1aca0c2876b6ebd3ca1fd3187d924f561651a5a6e4d5246169c06fb675a5ff98b345a72e3a159e293502d8ad3c SHA512 2413e1537ed4cf699f0754d76f35cd679591e4e215e782fab61f5bd7c4615e3916398e16709445406ef241e3fb721111daed917c546abb1f5130109b40bb2774 -DIST wezterm-20240203-funtoo-crates-bundle-edb626b0cfa9b7fa25599ef2c7cc56d58798a871027391943321d609eacb451080a02b7a01ca1e9667074aff88592394fa6e63d0d05f7b7c0bfb9b4e25dfdc94.tar.gz 141952147 BLAKE2B fe9a21aa8b70a7665c74588662112bc2f189d45a23b4fc54012250e2e5aff64cd3562ed4569ca63f7b349d4a579b2a01445b4fc5101734a96a08f5a78c1a1b84 SHA512 45223a3f96923c3275c8d7ebaebe2b9e06890a467853edc0cad60b81a19ee3330f8e5b1892e25c9489954c01eae353c5b9789e287808e362e48b24ba1c274c2f +DIST wezterm-20240203-5046fc2.tar.gz 82166699 BLAKE2B 9b4d247d6a4fad4bd87183d81b87cf34b23a8c8ee1231e7b58d70b44a07b8784e20a7efe4920c51b0c64aa55568db1fa9f608f1c50edbb1f141fb9a3d634931c SHA512 e46e22f6bba1b4430cbfc9924851a532a06a4a62e12236ea3179600f3ab7d5cd3d93eb339e2623085f990c6b83399279da724f3ff7566984a098f59d3b0757e6 +DIST wezterm-20240203-mark-gitsubmodules-bundle-5046fc2.tar.xz 24510664 BLAKE2B 67203e25cce52b5e05ed914ed74e150e6a05bdb61fd1a47625535b3d6b328f1e835a2b962a4586f68bcef1c5adbdff5f7a519055ed63a27f587b2dd17b47f501 SHA512 f8c8481d0124f4d7acf9b08daa0a923737e4f89fae7b39323e4ae09eedcabc17e42827ff6007c95da4a8f1ba192bdd555bc1677d43d21a338786f25e595832c9 +DIST wezterm-20240203-mark-rust-bundle-5046fc2.tar.xz 141859812 BLAKE2B bb304530f44413ab619e9d9ad90c323bbe149e16aa956cd737cde988d10eaabe3ad625796d0d53ab0129875dc2dd7d37e5c5c1999c429cd8964b16b67703cd94 SHA512 fb3933a9af0fe36cf1ffeb584bc373bcac9ea95f2016bf5d03b36d786741d9146e8049c468937326317ee8326f5f8768dfeee1a7a1814b71a128c18516703164 diff --git a/x11-terms/wezterm/files/wezterm-rust-1.85.patch b/x11-terms/wezterm/files/wezterm-rust-1.85.patch new file mode 100644 index 000000000..7eb064096 --- /dev/null +++ b/x11-terms/wezterm/files/wezterm-rust-1.85.patch @@ -0,0 +1,71 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 58f7820..e3ed7e6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1340,9 +1340,9 @@ checksum = "5729f5117e208430e437df2f4843f5e5952997175992d1414f94c57d61e270b4" + + [[package]] + name = "deranged" +-version = "0.3.11" ++version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" + dependencies = [ + "powerfmt", + "serde", +@@ -3648,6 +3648,12 @@ dependencies = [ + "num-traits", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-derive" + version = "0.3.3" +@@ -5554,12 +5560,13 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" + dependencies = [ + "deranged", + "itoa", ++ "num-conv", + "powerfmt", + "serde", + "time-core", +@@ -5568,9 +5575,9 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.2" ++version = "0.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" ++checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + + [[package]] + name = "time-funcs" +@@ -5589,10 +5596,11 @@ dependencies = [ + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" + dependencies = [ ++ "num-conv", + "time-core", + ] + diff --git a/x11-terms/wezterm/wezterm-20240203-r1.ebuild b/x11-terms/wezterm/wezterm-20240203-r1.ebuild new file mode 100644 index 000000000..0f9ea6c33 --- /dev/null +++ b/x11-terms/wezterm/wezterm-20240203-r1.ebuild @@ -0,0 +1,84 @@ +# Distributed under the terms of the GNU General Public License v2 +# Autogen by MARK Devkit + +EAPI=7 +QA_FLAGS_IGNORED="usr/bin/.*" +inherit bash-completion-r1 cargo desktop + +DESCRIPTION="A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust" +HOMEPAGE="https://github.com/wezterm/wezterm" +SRC_URI=" +https://api.github.com/repos/wezterm/wezterm/tarball/20240203-110809-5046fc22 -> wezterm-20240203-5046fc2.tar.gz +mirror://macaroni/wezterm-20240203-mark-rust-bundle-5046fc2.tar.xz -> wezterm-20240203-mark-rust-bundle-5046fc2.tar.xz +mirror://macaroni/wezterm-20240203-mark-gitsubmodules-bundle-5046fc2.tar.xz -> wezterm-20240203-mark-gitsubmodules-bundle-5046fc2.tar.xz" +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB" +SLOT="0" +KEYWORDS="*" +PATCHES=( + "${FILESDIR}/wezterm-rust-1.85.patch" +) +IUSE="wayland +X" +REQUIRED_USE="|| ( wayland X )" +BDEPEND="dev-util/cmake + dev-vcs/git + virtual/pkgconfig + virtual/rust + +" +RDEPEND="dev-libs/openssl + media-libs/fontconfig + media-libs/mesa[X?,wayland?] + x11-libs/libxkbcommon[X,wayland?] + sys-apps/dbus + wayland? ( dev-libs/wayland ) + X? ( + x11-themes/hicolor-icon-theme + x11-libs/libX11 + x11-libs/libxkbcommon + x11-libs/libxcb:=[xkb] + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + x11-themes/xcursor-themes + ) + +" +DEPEND="${RDEPEND} +" +src_unpack() { + cargo_src_unpack + rm -rf ${S} + mv ${WORKDIR}/wezterm-* ${S} || die +} +# https://wezfurlong.org/wezterm/install/source.html +src_configure() { + if use X ; then + cargo_src_configure --no-default-features --features vendored-fonts + fi +} +src_install() { + exeinto /usr/bin + doexe target/release/wezterm + doexe target/release/wezterm-gui + doexe target/release/wezterm-mux-server + doexe target/release/strip-ansi-escapes + newbashcomp assets/shell-completion/bash wezterm + insinto /usr/share/fish/vendor_completions.d/ + doins assets/shell-completion/fish + insinto /usr/share/zsh/site-functions + doins assets/shell-completion/zsh + newmenu assets/wezterm.desktop org.wezfurlong.wezterm.desktop + newicon assets/icon/wezterm-icon.svg org.wezfurlong.wezterm.svg + insinto /usr/share/metainfo + newins assets/wezterm.appdata.xml org.wezfurlong.wezterm.appdata.xml +} +pkg_postinst() { + xdg_icon_cache_update +} +pkg_postrm() { + xdg_icon_cache_update +} + + +# vim: filetype=ebuild diff --git a/x11-terms/wezterm/wezterm-20240203.ebuild b/x11-terms/wezterm/wezterm-20240203.ebuild deleted file mode 100644 index 551892de4..000000000 --- a/x11-terms/wezterm/wezterm-20240203.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 cargo desktop - -DESCRIPTION="A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust" -HOMEPAGE="https://github.com/wez/wezterm" -SRC_URI="https://github.com/wezterm/wezterm/releases/download/20240203-110809-5046fc22/wezterm-20240203-110809-5046fc22-src.tar.gz -> wezterm-20240203-110809-5046fc22-src.tar.gz -https://distfiles.macaronios.org/45/22/3a/45223a3f96923c3275c8d7ebaebe2b9e06890a467853edc0cad60b81a19ee3330f8e5b1892e25c9489954c01eae353c5b9789e287808e362e48b24ba1c274c2f -> wezterm-20240203-funtoo-crates-bundle-edb626b0cfa9b7fa25599ef2c7cc56d58798a871027391943321d609eacb451080a02b7a01ca1e9667074aff88592394fa6e63d0d05f7b7c0bfb9b4e25dfdc94.tar.gz" - -LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB" -SLOT="0" -KEYWORDS="*" -IUSE="wayland +X" - -REQUIRED_USE="|| ( wayland X )" - -# https://github.com/wez/wezterm/blob/main/get-deps -DEPEND=" - dev-libs/openssl - media-libs/fontconfig - media-libs/mesa[X?,wayland?] - x11-libs/libxkbcommon[X,wayland?] - sys-apps/dbus - wayland? ( dev-libs/wayland ) - X? ( - x11-themes/hicolor-icon-theme - x11-libs/libX11 - x11-libs/libxkbcommon - x11-libs/libxcb:=[xkb] - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - x11-themes/xcursor-themes - ) -" -BDEPEND=" - dev-util/cmake - dev-vcs/git - virtual/pkgconfig - virtual/rust -" -RDEPEND="${DEPEND}" - -QA_FLAGS_IGNORED=" - usr/bin/.* -" - -src_unpack() { - cargo_src_unpack - rm -rf ${S} - mv ${WORKDIR}/wezterm-* ${S} || die -} - -# https://wezfurlong.org/wezterm/install/source.html -src_configure() { - if use X ; then - cargo_src_configure --no-default-features --features vendored-fonts - fi -} - -src_install() { - exeinto /usr/bin - doexe target/release/wezterm - doexe target/release/wezterm-gui - doexe target/release/wezterm-mux-server - doexe target/release/strip-ansi-escapes - - newbashcomp assets/shell-completion/bash wezterm - - insinto /usr/share/fish/vendor_completions.d/ - doins assets/shell-completion/fish - - insinto /usr/share/zsh/site-functions - doins assets/shell-completion/zsh - - newmenu assets/wezterm.desktop org.wezfurlong.wezterm.desktop - newicon assets/icon/wezterm-icon.svg org.wezfurlong.wezterm.svg - - insinto /usr/share/metainfo - newins assets/wezterm.appdata.xml org.wezfurlong.wezterm.appdata.xml -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} \ No newline at end of file