From ffd548b099c715ca0e169b2e33a41933620204e2 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 2 Mar 2022 01:54:23 +0000 Subject: Wed Mar 2 01:54:23 UTC 2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit a/lrzip-0.650-x86_64-1.txz: Upgraded. d/mercurial-6.1-x86_64-1.txz: Upgraded. l/nodejs-16.14.0-x86_64-1.txz: Added. Thanks to Audrius Kažukauskas, Ryan P.C. McQuen, and Willy Sudiarto Raharjo for the slackbuilds.org version of the build script. --- source/l/nodejs/nodejs.SlackBuild | 166 +++++++++++++++++++++ source/l/nodejs/slack-desc | 19 +++ source/x/FTBFSlog | 3 + source/x/x11/patch/igt-gpu-tools.patch | 2 + .../963917a3565466832a3b2fc22e9285d34a0bf944.patch | 36 +++++ source/xap/mozilla-firefox/build-deps.sh | 4 +- source/xap/mozilla-thunderbird/build-deps.sh | 4 +- 7 files changed, 230 insertions(+), 4 deletions(-) create mode 100755 source/l/nodejs/nodejs.SlackBuild create mode 100644 source/l/nodejs/slack-desc create mode 100644 source/x/x11/patch/igt-gpu-tools.patch create mode 100644 source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch (limited to 'source') diff --git a/source/l/nodejs/nodejs.SlackBuild b/source/l/nodejs/nodejs.SlackBuild new file mode 100755 index 000000000..7bff937a1 --- /dev/null +++ b/source/l/nodejs/nodejs.SlackBuild @@ -0,0 +1,166 @@ +#!/bin/bash + +# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Thanks to Audrius Kažukauskas, Ryan P.C. McQuen, and Willy Sudiarto Raharjo +# for the slackbuilds.org version of this script. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version, with the following exception: +# the text of the GPL license may be omitted. +# +# You may have received a copy of the GNU General Public License +# along with this program (most likely, a file named COPYING). If +# not, see . + + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=nodejs +SRCNAM=node +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev | tr -d v)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $SRCNAM-v${VERSION} +tar xvf $CWD/$SRCNAM-v${VERSION}.tar.?z || exit 1 +cd $SRCNAM-v${VERSION} || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +## Fix libdir for 64-bit: +sed -i "s|lib/|lib${LIBDIRSUFFIX}/|g" tools/install.py +sed -i "s/'lib'/'lib${LIBDIRSUFFIX}'/" lib/module.js +sed -i "s|\"lib\"|\"lib${LIBDIRSUFFIX}\"|" deps/npm/lib/npm.js + +# Not sure if this one is really needed. +#sed -i "s|math.h|cmath|" src/node_crypto.cc + +./configure \ + --prefix=/usr \ + --with-intl=system-icu \ + --shared-openssl \ + --shared-zlib \ + --shared-libuv \ + --experimental-http-parser \ + --shared-nghttp2 \ + --shared-cares \ + --shared-brotli || exit 1 +# --shared-v8 +# --shared-http-parser + +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Relocate manual pages: +if [ -d $PKG/usr/share/man ]; then + mv $PKG/usr/share/man $PKG/usr +fi + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Remove unneeded files: +find $PKG/usr \( -name '.git*' \) -exec rm -f {} \; + +# Set NODE_PATH to look for globally installed modules: +mkdir -p $PKG/etc/profile.d +cat > $PKG/etc/profile.d/${PKGNAM}.csh << EOF +#!/bin/csh +setenv NODE_PATH /usr/lib${LIBDIRSUFFIX}/node_modules +EOF +cat > $PKG/etc/profile.d/${PKGNAM}.sh << EOF +#!/bin/sh +export NODE_PATH=/usr/lib${LIBDIRSUFFIX}/node_modules +EOF +chmod 0755 $PKG/etc/profile.d/* + +# Symlink bash-completion if needed: +mkdir -p $PKG/usr/share/bash-completion/completions +if [ ! -r $PKG/usr/share/bash-completion/completions/npm -a -r $PKG/usr/lib${LIBDIRSUFFIX}/node_modules/npm/lib/utils/completion.sh ]; then + ( cd $PKG/usr/share/bash-completion/completions/npm ; ln -sf ../../../lib${LIBDIRSUFFIX}/node_modules/npm/lib/utils/completion.sh npm ) +fi + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS* BUILDING* CHANGELOG* CODE_OF_CONDUCT* CONTRIBUTING* GOVERNANCE* LICENSE* README* SECURITY* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a CHANGELOG, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGELOG ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG + touch -r CHANGELOG $DOCSDIR/CHANGELOG +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/nodejs/slack-desc b/source/l/nodejs/slack-desc new file mode 100644 index 000000000..f72ea08bb --- /dev/null +++ b/source/l/nodejs/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +nodejs: nodejs (JavaScript runtime environment) +nodejs: +nodejs: Node.js is an open-source, cross-platform, JavaScript runtime +nodejs: environment for easily building fast, scalable network applications. +nodejs: Node.js uses an event-driven, non-blocking I/O model that makes it +nodejs: lightweight and efficient, perfect for data-intensive real-time +nodejs: applications that run across distributed devices. +nodejs: +nodejs: Homepage: https://nodejs.org/ +nodejs: +nodejs: diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog index 859555ed5..0b15e38c0 100644 --- a/source/x/FTBFSlog +++ b/source/x/FTBFSlog @@ -1,3 +1,6 @@ +Wed Mar 2 01:27:59 UTC 2022 +x11/igt-gpu-tools: Patched for new meson. Thanks to nobodino. ++--------------------------+ Mon Feb 7 20:57:55 UTC 2022 All packages tested and found to compile properly. +--------------------------+ diff --git a/source/x/x11/patch/igt-gpu-tools.patch b/source/x/x11/patch/igt-gpu-tools.patch new file mode 100644 index 000000000..d55f9b922 --- /dev/null +++ b/source/x/x11/patch/igt-gpu-tools.patch @@ -0,0 +1,2 @@ +zcat $CWD/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch.gz | patch -p1 --verbose \ + || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch b/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch new file mode 100644 index 000000000..142e2fa44 --- /dev/null +++ b/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch @@ -0,0 +1,36 @@ +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 +From: Petri Latvala +Date: Thu, 28 Oct 2021 11:05:31 +0300 +Subject: [PATCH] lib/meson.build: Fix underscorify call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +f.underscorify() is correct, f.underscorify(f) is an error that later +meson versions don't like at all. + +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107 +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities") +Cc: Arkadiusz Hiler +Signed-off-by: Petri Latvala +Reviewed-by: José Roberto de Souza +--- + lib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/meson.build b/lib/meson.build +index c3080fc8..297b0ad2 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + + lib_intermediates = [] + foreach f: lib_sources +- name = f.underscorify(f) ++ name = f.underscorify() + lib = static_library('igt-' + name, + [ f, lib_version ], + include_directories: inc, +-- +GitLab + diff --git a/source/xap/mozilla-firefox/build-deps.sh b/source/xap/mozilla-firefox/build-deps.sh index af9d440e2..e70ed7b9d 100755 --- a/source/xap/mozilla-firefox/build-deps.sh +++ b/source/xap/mozilla-firefox/build-deps.sh @@ -36,6 +36,6 @@ if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt autoc else # We need to use the incredibly ancient autoconf-2.13 for this :/ ( cd $CWD/build-deps/autoconf ; ./autoconf.build ) || exit 1 - # And node.js... WHY - ( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 + ## And node.js... WHY + #( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 fi diff --git a/source/xap/mozilla-thunderbird/build-deps.sh b/source/xap/mozilla-thunderbird/build-deps.sh index 69d1a8b29..c1ad0491b 100755 --- a/source/xap/mozilla-thunderbird/build-deps.sh +++ b/source/xap/mozilla-thunderbird/build-deps.sh @@ -36,6 +36,6 @@ if /bin/ls build-deps*.txz 1> /dev/null 2> /dev/null ; then # use prebuilt autoc else # We need to use the incredibly ancient autoconf-2.13 for this :/ ( cd $CWD/build-deps/autoconf ; ./autoconf.build ) || exit 1 - # And node.js... WHY - ( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 + ## And node.js... WHY + #( cd $CWD/build-deps/nodejs ; ./nodejs.build ) || exit 1 fi -- cgit v1.2.3-65-gdbad