diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-03-31 22:06:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-03-31 22:06:41 +0100 |
| commit | 9ab9a2c6661b7cb6bbaeeb3fbdfedd7546b0142f (patch) | |
| tree | 8e2efb08866063f75d3d4927f8ac76e6554d4704 /net-misc/nx | |
| parent | 569e3558cac0a0ecdc6b80debb515b5ed8515df9 (diff) | |
gentoo auto-resync : 31:03:2023 - 22:06:41
Diffstat (limited to 'net-misc/nx')
| -rw-r--r-- | net-misc/nx/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/nx/files/nx-3.5.99.26-which.patch | 33 | ||||
| -rw-r--r-- | net-misc/nx/nx-3.5.99.26.ebuild | 6 |
3 files changed, 38 insertions, 4 deletions
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest index 07b1905f4593..37a38f20beca 100644 --- a/net-misc/nx/Manifest +++ b/net-misc/nx/Manifest @@ -1,6 +1,7 @@ AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3 AUX nx-3.5.99.26-musl.patch 2203 BLAKE2B f4c43ed04ef6f35ef159ff30102cc6b52154e1a620a5a419f82e20f721f37832826ce0f8f141b6fdb6ce8a6814cd2fd5fec308c6f69f0b235b72578e67c1cbbd SHA512 f99052424faa49324aa79deeb92890e018872615c3d10bb0426e26487c3394201c6cb477628676583fda1794b1c980c07f31fdfe6379558694cce17734787131 AUX nx-3.5.99.26-riscv64-support.patch 2204 BLAKE2B a52c4bf54edb09a73d86ecaf6daf5aeff820493c927fb6277fac4d7f514117d2f55eb38bf81539af4b8793b439ff78772cda819979e0b144b69f0d272664ba90 SHA512 a7ebfd63a54436e61c895c43290f805833d1f704b1e17cdff6607239dc84cc08cd8bcab0a5e1154ffa8bde3d28e2482d9ecf9d6697c23df6f29797b7447fc052 +AUX nx-3.5.99.26-which.patch 1157 BLAKE2B 0118abda74ceffa96bbf7fc1518ca5073c3a51b4762ba5769e061878613e27491e01c1d9ba3ca632b4de1166fce345e55f6840daf27608ce627f0c58b2b869b0 SHA512 b31ea5a6cbf5f65ac9a15ce83e2181dd1c9783e8b0ac9af24260399539a9c93bd0466d10cd7cf1eddbc95edfb1a1f7bd403f4cf1ebc66816463a2252300f4835 DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211 -EBUILD nx-3.5.99.26.ebuild 3677 BLAKE2B a22f517cba122c5e2030922728ff5b727b6820ac3fe87ed884e6bc5cb1dd7381becb35a4f70a30176beddc7dc874ced3e1308412dc7420da7af0b71f719b7667 SHA512 7f1d62b0c5a86b5570e90a6faf53ab22aa68f9c0a733300f0e464fe22c423b5938e20843083d550c540f9ba02e30b2adade815483e5aba11a8e6c8ca26aae28d +EBUILD nx-3.5.99.26.ebuild 3716 BLAKE2B 8e3bf5d26aaebae96c9e4ffe4ace2ce9458e54a90695a1a523f7ef38b88f7dbda129f04b66473fac364c865ed50cae7581bb5b2d687509f777f61c95c2181e90 SHA512 01bc7a8947060f2af2a9a7392322384ed7cc1e4022f7d75ddec6042e2d54679ed663a2636395a1356a3fa58a1e8b1e49349a3679ac89bbb7343f0044cf081261 MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd diff --git a/net-misc/nx/files/nx-3.5.99.26-which.patch b/net-misc/nx/files/nx-3.5.99.26-which.patch new file mode 100644 index 000000000000..abc1f9e1a8d3 --- /dev/null +++ b/net-misc/nx/files/nx-3.5.99.26-which.patch @@ -0,0 +1,33 @@ +--- a/nx-X11/Makefile ++++ b/nx-X11/Makefile +@@ -70,7 +70,7 @@ + else \ + exit 0; \ + fi +- which $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) ++ command -v $(IMAKE) 1>/dev/null && $(IMAKE_CMD) $(MFLAGS) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + + # don't allow any default rules in this Makefile + .SUFFIXES: +--- a/nx-X11/extras/Mesa_6.4.2/bin/mklib ++++ b/nx-X11/extras/Mesa_6.4.2/bin/mklib +@@ -285,7 +285,7 @@ + # -linker was not specified, choose default linker now + if [ $CPLUSPLUS = 1 ] ; then + # determine linker and options for C++ code +- if [ `which c++` ] ; then ++ if [ `command -v c++` ] ; then + # use Sun c++ + LINK="c++" + elif [ `type g++` ] ; then +--- a/nx-X11/x-indent.sh ++++ b/nx-X11/x-indent.sh +@@ -2,7 +2,7 @@ + + # We want GNU indent, so first search for gindent to avoid /usr/bin/indent + # on the BSDs, which won't work for us +-INDENT=$(which gnuindent || which gindent || which indent) ++INDENT=$(command -v gnuindent || command -v gindent || command -v indent) + + if [ -z "${INDENT}" ] ; then + echo "Could not find indent, sorry..." >&2 diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild index 55392ed99c6b..5aa7cefa7174 100644 --- a/net-misc/nx/nx-3.5.99.26.ebuild +++ b/net-misc/nx/nx-3.5.99.26.ebuild @@ -14,9 +14,9 @@ SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc ~riscv x86" RDEPEND="dev-libs/libxml2 + media-libs/libjpeg-turbo:* >=media-libs/libpng-1.2.8:0= >=sys-libs/zlib-1.2.3 - virtual/jpeg:* x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage @@ -35,8 +35,7 @@ DEPEND="${RDEPEND} x11-base/xorg-proto x11-libs/libfontenc" -BDEPEND="sys-apps/which - virtual/pkgconfig +BDEPEND="virtual/pkgconfig x11-misc/gccmakedep x11-misc/imake" @@ -48,6 +47,7 @@ PATCHES=( # https://github.com/ArcticaProject/nx-libs/pull/1023 "${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch" "${FILESDIR}/${PN}-3.5.99.26-musl.patch" + "${FILESDIR}/${PN}-3.5.99.26-which.patch" ) src_prepare() { |