From 03b8e2675cc37a658728ea337fb039b8a62f86fb Mon Sep 17 00:00:00 2001 From: PktSurf Date: Sun, 12 Mar 2023 23:49:18 +0530 Subject: [PATCH] Split build() into prepbuilddir() and build() functions in base, xorg, gtk, extra and net subsection package build files Upgraded base/rust to 1.64.0 Added cbindgen 0.24.3 to base Upgraded base/gdbm to 1.23 Added -mno-outline-atomics as CXXFLAGS to fix build breakage in base/gpgme Fixed rc.gtk script in base/initfs Added preservestaticlibs to prevent static libraries from being discarded and upgraded base/libcap to 2.67 Upgraded base/nodejs to 18.14.2 Temporarily discarded unnecessary code and comments in installpkg script in base/pkgtools Added protobuf 3.14.0 to base Upgraded base/python3 to 3.9.16 Upgraded base/sccache to 0.3.3 Upgraded extra/abiword to 3.0.5 Added adafruit-io 2.7.0 to extra Added code to discard creation of systemd directory in extra/bluez Added code to discard /usr directory in extra/ffmpeg Removed unnecessary CFLAGS in extra/freerdp Upgraded extra/imagemagick to 7.1.0 Upgraded extra/vim to 9.0.1000 Added build option to disable linking against gtk2 in extra/xarchiver Upgraded heavybuilds/firefox to 102.8.0 ESR, discarded extraneous files that were part of it Upgraded net/fail2ban to 1.0.2 Discarded unnecessary CFLAGS in net/lynx Optimised build code in net/maccalc Fixed noautoconfsite variable and added --disable-xxhash build option to net/rsync Removed unnecessary CFLAGS in xorg/libtiff and xorg/libxklavier --- base/acl/acl.SMBuild | 4 +- base/acpid/acpid.SMBuild | 8 +- base/alsa-lib/alsa-lib.SMBuild | 7 +- base/alsa-plugins/alsa-plugins.SMBuild | 6 +- base/alsa-utils/alsa-utils.SMBuild | 4 +- base/argon2/argon2.SMBuild | 6 +- base/argp-standalone/argp-standalone.SMBuild | 4 +- base/asciidoc/asciidoc.SMBuild | 4 +- base/aspell/aspell.SMBuild | 4 +- base/aspell6/aspell6.SMBuild | 6 +- base/attr/attr.SMBuild | 5 +- base/autoconf/autoconf.SMBuild | 4 +- base/automake/automake.SMBuild | 4 +- base/bash-completion/bash-completion.SMBuild | 4 +- base/bash/bash.SMBuild | 4 +- base/bc/bc.SMBuild | 4 +- base/bison/bison.SMBuild | 6 +- base/boost/boost-execinfo.patch | 11 - base/boost/boost.SMBuild | 4 +- base/brotli/brotli.SMBuild | 4 +- base/bubblewrap/bubblewrap.SMBuild | 4 +- base/busybox/busybox.SMBuild | 4 +- base/bzip2/bzip2.SMBuild | 4 +- base/c-ares/c-ares.SMBuild | 4 +- base/ca-certificates/ca-certificates.SMBuild | 4 +- base/cbindgen/cbindgen.SMBuild | 30 ++ base/ccache/ccache.SMBuild | 4 +- base/chrony/chrony.SMBuild | 6 +- base/chrpath/chrpath.SMBuild | 6 +- base/cmake/cmake.SMBuild | 4 +- base/coreutils/coreutils.SMBuild | 4 +- base/cpio/cpio.SMBuild | 4 +- base/crda/crda.SMBuild | 4 +- base/cryptsetup/cryptsetup.SMBuild | 4 +- base/curl/curl.SMBuild | 6 +- base/cython/cython.SMBuild | 4 +- base/db/db.SMBuild | 8 +- base/dcron/dcron.SMBuild | 7 +- .../desktop-file-utils.SMBuild | 4 +- base/dialog/dialog.SMBuild | 4 +- base/diffutils/diffutils.SMBuild | 4 +- base/dmidecode/dmidecode.SMBuild | 4 +- base/dmraid/dmraid.SMBuild | 8 +- base/docbook/docbook.SMBuild | 4 +- base/dosfstools/dosfstools.SMBuild | 4 +- base/e2fsprogs/e2fsprogs.SMBuild | 4 +- base/ed/ed.SMBuild | 4 +- base/enchant/enchant.SMBuild | 4 +- base/enet/enet.SMBuild | 6 +- base/eudev/eudev.SMBuild | 4 +- base/exfat-utils/exfat-utils.SMBuild | 4 +- base/exiv2/exiv2.SMBuild | 4 +- base/expat/expat.SMBuild | 6 +- base/faad2/faad2.SMBuild | 4 +- base/fdk-aac/fdk-aac.SMBuild | 4 +- base/fftw/fftw.SMBuild | 4 +- base/file/file.SMBuild | 4 +- base/findutils/findutils.SMBuild | 4 +- base/flac/flac.SMBuild | 4 +- base/flex/flex.SMBuild | 5 +- base/fmt/fmt.SMBuild | 6 +- base/fribidi/fribidi.SMBuild | 4 +- base/fuse/fuse.SMBuild | 4 +- base/fuse3/fuse3.SMBuild | 4 +- base/gawk/gawk.SMBuild | 4 +- base/gdb/gdb.SMBuild | 4 +- base/gdbm/gdbm.SMBuild | 6 +- base/gettext/gettext.SMBuild | 6 +- base/giflib/giflib.SMBuild | 4 +- base/git/git.SMBuild | 6 +- base/glib/glib.SMBuild | 6 +- base/gloox/gloox.SMBuild | 4 +- base/gmime/gmime.SMBuild | 4 +- base/gmp/gmp.SMBuild | 4 +- base/gnu-efi/gnu-efi.SMBuild | 4 +- base/gnupg2/gnupg2.SMBuild | 4 +- base/gnutls/gnutls.SMBuild | 4 +- base/gperf/gperf.SMBuild | 4 +- base/gpgme/gpgme.SMBuild | 7 +- base/gptfdisk/gptfdisk.SMBuild | 6 +- base/grep/grep.SMBuild | 4 +- base/groff/groff.SMBuild | 4 +- base/gsl/gsl.SMBuild | 4 +- base/gstreamer/gstreamer.SMBuild | 4 +- base/gyp/gyp.SMBuild | 4 +- base/gzip/gzip.SMBuild | 8 +- base/haveged/haveged.SMBuild | 4 +- base/hdparm/hdparm.SMBuild | 4 +- base/highlight/highlight.SMBuild | 6 +- base/htop/htop.SMBuild | 19 +- base/hunspell/hunspell.SMBuild | 4 +- base/hyphen/hyphen.SMBuild | 4 +- base/i2c-tools/i2c-tools.SMBuild | 4 +- base/icu/icu.SMBuild | 6 +- base/id3lib/id3lib.SMBuild | 5 +- base/ijs/ijs.SMBuild | 4 +- base/iniparser/iniparser.SMBuild | 6 +- base/initfs/initfs.SMBuild | 6 +- base/initfs/initfs/etc/rc.d/rc.gtk.new | 92 +++-- base/intltool/intltool.SMBuild | 6 +- base/iptables/iptables.SMBuild | 4 +- base/iso-codes/iso-codes.SMBuild | 5 +- base/itstool/itstool.SMBuild | 4 +- base/jam/jam.SMBuild | 4 +- base/jansson/jansson.SMBuild | 4 +- base/jbig2dec/jbig2dec.SMBuild | 4 +- base/json-c/json-c.SMBuild | 4 +- base/json-glib/json-glib.SMBuild | 4 +- base/kbd/kbd.SMBuild | 5 +- base/kernel-headers/kernel-headers.SMBuild | 6 +- base/kernel-source/kernel-source.SMBuild | 4 +- base/keyutils/keyutils.SMBuild | 4 +- base/kmod/kmod.SMBuild | 4 +- base/lame/lame.SMBuild | 4 +- base/less/less.SMBuild | 4 +- base/libaio/libaio.SMBuild | 4 +- base/libao/libao.SMBuild | 4 +- base/libarchive/libarchive.SMBuild | 6 +- base/libasr/libasr.SMBuild | 4 +- base/libassuan/libassuan.SMBuild | 4 +- base/libatasmart/libatasmart.SMBuild | 6 +- base/libblockdev/libblockdev.SMBuild | 4 +- base/libbytesize/libbytesize.SMBuild | 4 +- base/libcap-ng/libcap-ng.SMBuild | 4 +- base/libcap/libcap.SMBuild | 21 +- base/libcap/libcap2-cap_names.h | 51 --- base/libcddb/libcddb.SMBuild | 4 +- .../libcdio-paranoia/libcdio-paranoia.SMBuild | 4 +- base/libcdio/libcdio.SMBuild | 4 +- base/libcroco/libcroco.SMBuild | 4 +- base/libcue/libcue.SMBuild | 6 +- base/libdaemon/libdaemon.SMBuild | 4 +- base/libelf-compat/libelf-compat.SMBuild | 4 +- base/libetpan/libetpan.SMBuild | 4 +- base/libevent/libevent.SMBuild | 4 +- base/libexif/libexif.SMBuild | 4 +- base/libffi/libffi.SMBuild | 4 +- base/libgc/libgc.SMBuild | 4 +- base/libgcrypt/libgcrypt.SMBuild | 4 +- base/libgit2/libgit2.SMBuild | 5 +- base/libgpg-error/libgpg-error.SMBuild | 5 +- base/libical/libical.SMBuild | 6 +- base/libid3tag/libid3tag.SMBuild | 4 +- base/libidn2/libidn2.SMBuild | 4 +- base/libjpeg-turbo/libjpeg-turbo.SMBuild | 4 +- base/libkate/libkate.SMBuild | 4 +- base/libksba/libksba.SMBuild | 4 +- base/libminizip/libminizip.SMBuild | 4 +- base/libmms/libmms.SMBuild | 4 +- base/libmnl/libmnl.SMBuild | 4 +- base/libmodplug/libmodplug.SMBuild | 4 +- base/libmtp/libmtp.SMBuild | 4 +- base/libmypaint/libmypaint.SMBuild | 4 +- .../libnetfilter-conntrack.SMBuild | 4 +- base/libnfnetlink/libnfnetlink.SMBuild | 4 +- base/libnfs/libnfs.SMBuild | 4 +- base/libnl/libnl.SMBuild | 4 +- base/libogg/libogg.SMBuild | 4 +- base/libopenal/libopenal.SMBuild | 4 +- base/libpcap/libpcap.SMBuild | 4 +- base/libplist/libplist.SMBuild | 5 +- base/libpng/libpng.SMBuild | 4 +- base/libpsl/libpsl.SMBuild | 4 +- .../libpthread-stubs/libpthread-stubs.SMBuild | 4 +- base/libqalculate/libqalculate.SMBuild | 7 +- base/libsamplerate/libsamplerate.SMBuild | 4 +- base/libseccomp/libseccomp.SMBuild | 4 +- base/libsecret/libsecret.SMBuild | 5 +- base/libshout/libshout.SMBuild | 4 +- base/libsndfile/libsndfile.SMBuild | 4 +- base/libsodium/libsodium.SMBuild | 4 +- base/libssh2/libssh2.SMBuild | 4 +- base/libtasn1/libtasn1.SMBuild | 4 +- base/libtheora/libtheora.SMBuild | 4 +- base/libtirpc/libtirpc.SMBuild | 4 +- base/libtool/libtool.SMBuild | 4 +- base/libtorrent/libtorrent.SMBuild | 5 +- base/libunistring/libunistring.SMBuild | 5 +- base/libusb/libusb.SMBuild | 5 +- base/libuv/libuv.SMBuild | 5 +- base/libvncserver/libvncserver.SMBuild | 4 +- base/libvorbis/libvorbis.SMBuild | 4 +- base/libvpx/libvpx.SMBuild | 6 +- base/libxml2/libxml2.SMBuild | 4 +- base/libxslt/libxslt.SMBuild | 4 +- base/libyaml/libyaml.SMBuild | 4 +- base/llvm/llvm.SMBuild | 12 +- base/lm-sensors/lm-sensors.SMBuild | 4 +- base/logrotate/logrotate.SMBuild | 6 +- base/lsof/lsof.SMBuild | 4 +- base/lua/lua.SMBuild | 6 +- base/lua53/lua53.SMBuild | 6 +- base/lvm/create-dm-run-dir.diff | 13 - base/lvm/lvm.SMBuild | 5 +- base/lz4/lz4.SMBuild | 6 +- base/lzip/lzip.SMBuild | 4 +- base/lzlib/lzlib.SMBuild | 6 +- base/lzo/lzo.SMBuild | 4 +- base/m4/m4.SMBuild | 4 +- base/make/make.SMBuild | 6 +- base/makeself/makeself.SMBuild | 4 +- base/man-pages/man-pages.SMBuild | 8 +- base/mandoc/mandoc.SMBuild | 6 +- base/mdadm/mdadm.SMBuild | 4 +- base/meson/meson.SMBuild | 6 +- base/miniupnpc/miniupnpc.SMBuild | 4 +- base/mksh/mksh.SMBuild | 4 +- base/mlocate/mlocate.SMBuild | 4 +- base/mozilla-nss/mozilla-nss.SMBuild | 4 +- base/mozjs/mozjs.SMBuild | 5 +- base/mpfr/mpfr.SMBuild | 4 +- base/mpg123/mpg123.SMBuild | 4 +- base/mtools/mtools.SMBuild | 4 +- base/musl/musl.SMBuild | 4 +- base/mypaint-brushes/mypaint-brushes.SMBuild | 4 +- base/nano/nano.SMBuild | 4 +- base/nasm/nasm.SMBuild | 4 +- base/ncdu/ncdu.SMBuild | 4 +- base/ndctl/ndctl.SMBuild | 4 +- base/neon/neon.SMBuild | 4 +- base/netbsd-curses/netbsd-curses.SMBuild | 4 +- base/nettle/nettle.SMBuild | 4 +- base/nghttp2/nghttp2.SMBuild | 4 +- base/ninja/ninja.SMBuild | 4 +- base/nodejs/nodejs.SMBuild | 17 +- base/npth/npth.SMBuild | 6 +- base/ntfs-3g/ntfs-3g.SMBuild | 4 +- base/oniguruma/oniguruma.SMBuild | 4 +- base/openssl/openssl.SMBuild | 6 +- base/opus/opus.SMBuild | 4 +- base/opusfile/opusfile.SMBuild | 4 +- base/p11-kit/p11-kit.SMBuild | 4 +- base/p7zip/p7zip.SMBuild | 4 +- base/parted/parted.SMBuild | 4 +- base/patch/patch.SMBuild | 4 +- base/pciutils/pciutils.SMBuild | 4 +- base/pcre/pcre.SMBuild | 6 +- base/pcre2/pcre2.SMBuild | 4 +- base/perl-modules/perl-modules.SMBuild | 5 +- base/perl/perl.SMBuild | 4 +- base/physfs/physfs.SMBuild | 4 +- base/pigz/pigz.SMBuild | 4 +- base/pkgconf/pkgconf.SMBuild | 6 +- base/pkgtools/pkgtools.SMBuild | 6 +- base/pkgtools/scripts/installpkg | 391 ++---------------- base/plzip/plzip.SMBuild | 4 +- base/pm-utils/pm-utils.SMBuild | 4 +- base/polkit/polkit.SMBuild | 4 +- base/popt/popt.SMBuild | 4 +- base/portaudio/portaudio.SMBuild | 4 +- base/procps-ng/procps-ng.SMBuild | 4 +- base/protobuf/protobuf.SMBuild | 34 ++ base/pv/pv.SMBuild | 4 +- base/pwgen/pwgen.SMBuild | 4 +- base/python-cheetah/python-cheetah.SMBuild | 4 +- base/python-click/python-click.SMBuild | 4 +- base/python-future/python-future.SMBuild | 4 +- .../python-importlib-metadata.SMBuild | 4 +- base/python-jinja2/python-jinja2.SMBuild | 4 +- base/python-joblib/python-joblib.SMBuild | 4 +- .../python-livereload.SMBuild | 4 +- base/python-lunr/python-lunr.SMBuild | 4 +- base/python-lxml/python-lxml.SMBuild | 5 +- base/python-m2crypto/python-m2crypto.SMBuild | 4 +- base/python-mako/python-mako.SMBuild | 4 +- base/python-markdown/python-markdown.SMBuild | 4 +- .../python-markupsafe.SMBuild | 4 +- base/python-mkdocs/python-mkdocs.SMBuild | 6 +- base/python-nltk/python-nltk.SMBuild | 4 +- base/python-pip/python-pip.SMBuild | 5 +- base/python-pyyaml/python-pyyaml.SMBuild | 4 +- base/python-regex/python-regex.SMBuild | 4 +- .../python-setuptools.SMBuild | 6 +- base/python-six/python-six.SMBuild | 4 +- base/python-tornado/python-tornado.SMBuild | 4 +- base/python-tqdm/python-tqdm.SMBuild | 4 +- .../python-typing-extensions.SMBuild | 4 +- base/python-typing/python-typing.SMBuild | 4 +- base/python-wheel/python-wheel.SMBuild | 4 +- base/python-zipp/python-zipp.SMBuild | 4 +- base/python3/python3.SMBuild | 17 +- base/qpdf/qpdf.SMBuild | 6 +- base/qrencode/qrencode.SMBuild | 4 +- base/readline/readline.SMBuild | 4 +- base/ruby/ruby.SMBuild | 4 +- ...to-work-when-cross-compiling-on-musl.patch | 45 -- ...ative-libraries-when-linking-static-.patch | 52 --- ...fer-libgcc_eh-over-libunwind-on-musl.patch | 63 --- ...rn-for-plugins-Don-t-assume-multilib.patch | 30 -- ...tes-are-unstable-Fix-test-when-rpath.patch | 24 -- ...nore-broken-and-non-applicable-tests.patch | 77 ---- ...k-stage2-tools-dynamically-to-libstd.patch | 31 -- ...e-debugger-scripts-to-usr-share-rust.patch | 37 -- ...kage-of-musl-libc-for-the-libc-crate.patch | 49 --- ...-against-host-target-LLVM-in-cross-s.patch | 31 -- .../{0001-Fix-LLVM-build.patch => 1.patch} | 8 +- ...l_root-from-musl-targets.patch => 2.patch} | 141 ++++--- base/rust/3.patch | 22 + ...16-do-not-copy-libunwind.patch => 4.patch} | 15 +- base/rust/5.patch | 28 ++ base/rust/6.patch | 29 ++ base/rust/7.patch | 31 ++ base/rust/8.patch | 74 ++++ base/rust/config.toml | 2 +- base/rust/disable_miri.patch | 164 -------- base/rust/rust.SMBuild | 63 ++- base/sbc/sbc.SMBuild | 4 +- base/sccache/sccache.SMBuild | 12 +- base/scons/scons.SMBuild | 6 +- base/sed/sed.SMBuild | 4 +- base/shellcheck-bin/shellcheck-bin.SMBuild | 4 +- base/signify/signify.SMBuild | 6 +- base/slapt-get/slapt-get.SMBuild | 8 +- base/smartmontools/smartmontools.SMBuild | 4 +- base/soxr/soxr.SMBuild | 4 +- base/speexdsp/speexdsp.SMBuild | 4 +- base/sqlite/sqlite.SMBuild | 4 +- base/strace/strace.SMBuild | 8 +- base/sudo/sudo.SMBuild | 6 +- base/swig/swig.SMBuild | 4 +- base/sysfsutils/sysfsutils.SMBuild | 6 +- base/sysklogd/sysklogd.SMBuild | 5 +- base/syslinux/syslinux.SMBuild | 5 +- base/sysstat/sysstat.SMBuild | 6 +- base/tar/tar.SMBuild | 6 +- base/tarlz/tarlz.SMBuild | 6 +- base/texinfo/texinfo.SMBuild | 4 +- base/time/time.SMBuild | 7 +- base/tofrodos/tofrodos.SMBuild | 4 +- base/toluapp/toluapp.SMBuild | 9 +- base/tree/tree.SMBuild | 4 +- base/twolame/twolame.SMBuild | 4 +- base/tzdb/tzdb.SMBuild | 4 +- base/unzip/unzip.SMBuild | 4 +- base/usbutils/usbutils.SMBuild | 4 +- base/util-linux/util-linux.SMBuild | 10 +- base/wavpack/wavpack.SMBuild | 4 +- .../wayland-protocols.SMBuild | 6 +- base/wayland/wayland.SMBuild | 4 +- base/which/which.SMBuild | 4 +- base/wireless-regdb/wireless-regdb.SMBuild | 6 +- base/woff2/woff2.SMBuild | 4 +- base/x264/x264.SMBuild | 4 +- base/xmlto/xmlto.SMBuild | 4 +- base/xz/xz.SMBuild | 6 +- base/yasm/yasm.SMBuild | 4 +- base/zip/zip.SMBuild | 4 +- base/zlib/zlib.SMBuild | 6 +- base/zsh/zsh.SMBuild | 4 +- base/zstd/zstd.SMBuild | 4 +- extra/abiword/abiword.SMBuild | 19 +- extra/abiword/musl-1.2.3.patch | 11 + extra/adafruit-io/adafruit-io.SMBuild | 27 ++ extra/audacious/audacious.SMBuild | 5 +- extra/blueman/blueman.SMBuild | 6 +- extra/bluez/bluez.SMBuild | 10 +- extra/calcurse/calcurse.SMBuild | 4 +- extra/cmatrix/cmatrix.SMBuild | 4 +- extra/cmus/cmus.SMBuild | 4 +- extra/dia/dia.SMBuild | 4 +- extra/dmenu/dmenu.SMBuild | 4 +- extra/dwm/dwm.SMBuild | 5 +- extra/feh/feh.SMBuild | 4 +- extra/ffmpeg/ffmpeg.SMBuild | 6 +- .../ffmpegthumbnailer.SMBuild | 6 +- extra/florence/florence.SMBuild | 4 +- extra/freerdp/freerdp.SMBuild | 5 +- extra/galculator/galculator.SMBuild | 8 +- extra/gnumeric/gnumeric.SMBuild | 6 +- extra/gpaint/gpaint.SMBuild | 4 +- extra/gtypist/gtypist.SMBuild | 4 +- extra/heimdall/heimdall.SMBuild | 4 +- extra/imagemagick/imagemagick.SMBuild | 14 +- extra/iotop/iotop.SMBuild | 8 +- extra/libass/libass.SMBuild | 4 +- extra/micro-tetris/micro-tetris.SMBuild | 4 +- extra/mplayer/mplayer.SMBuild | 8 +- extra/mpv/mpv.SMBuild | 6 +- extra/mtd-utils/mtd-utils.SMBuild | 5 +- extra/mtpaint/mtpaint.SMBuild | 7 +- extra/mupdf/mupdf.SMBuild | 6 +- extra/rdesktop/rdesktop.SMBuild | 6 +- extra/rxvt-unicode/rxvt-unicode.SMBuild | 8 +- extra/scrcpy/scrcpy.SMBuild | 4 +- extra/sdl/sdl.SMBuild | 5 +- extra/sdl2/sdl2.SMBuild | 4 +- extra/slock/slock.SMBuild | 4 +- extra/spacefm/spacefm.SMBuild | 4 +- extra/testdisk/testdisk.SMBuild | 4 +- extra/tmux/tmux.SMBuild | 4 +- extra/v4l-utils/v4l-utils.SMBuild | 6 +- extra/vim/vim.SMBuild | 30 +- extra/wxwidgets/wxwidgets.SMBuild | 4 +- extra/xarchiver/xarchiver.SMBuild | 10 +- extra/xscreensaver/xscreensaver.SMBuild | 4 +- .../adwaita-icon-theme.SMBuild | 4 +- gtk/at-spi2-atk/at-spi2-atk.SMBuild | 4 +- gtk/atk/atk.SMBuild | 4 +- gtk/atkmm/atkmm.SMBuild | 4 +- gtk/babl/babl.SMBuild | 4 +- gtk/cairo/cairo.SMBuild | 4 +- gtk/cairomm/cairomm.SMBuild | 4 +- .../clearlooks-phenix-theme.SMBuild | 4 +- gtk/dbus-glib/dbus-glib.SMBuild | 4 +- gtk/dconf-editor/dconf-editor.SMBuild | 4 +- gtk/fltk/fltk.SMBuild | 4 +- gtk/gcr/gcr.SMBuild | 4 +- gtk/gdk-pixbuf/gdk-pixbuf.SMBuild | 4 +- gtk/gegl/gegl.SMBuild | 4 +- gtk/glib-networking/glib-networking.SMBuild | 4 +- gtk/glibmm/glibmm.SMBuild | 4 +- gtk/gnome-desktop/gnome-desktop.SMBuild | 4 +- gtk/gnome-icon-theme/gnome-icon-theme.SMBuild | 4 +- .../gnome-themes-extra.SMBuild | 4 +- .../gobject-introspection.SMBuild | 4 +- gtk/goffice/goffice.SMBuild | 4 +- gtk/graphite2/graphite2.SMBuild | 4 +- .../gsettings-desktop-schemas.SMBuild | 4 +- gtk/gspell/gspell.SMBuild | 4 +- gtk/gst-plugins-bad/gst-plugins-bad.SMBuild | 4 +- gtk/gst-plugins-base/gst-plugins-base.SMBuild | 4 +- gtk/gst-plugins-good/gst-plugins-good.SMBuild | 4 +- gtk/gtk2/gtk2.SMBuild | 4 +- gtk/gtk3/gtk3.SMBuild | 4 +- gtk/gtkmm2/gtkmm2.SMBuild | 4 +- gtk/gtkmm3/gtkmm3.SMBuild | 4 +- gtk/gtksourceview/gtksourceview.SMBuild | 4 +- gtk/gtkspell/gtkspell.SMBuild | 4 +- gtk/harfbuzz/harfbuzz.SMBuild | 4 +- .../hicolor-icon-theme.SMBuild | 4 +- gtk/keybinder/keybinder.SMBuild | 4 +- gtk/libcanberra/libcanberra.SMBuild | 4 +- gtk/libdazzle/libdazzle.SMBuild | 4 +- gtk/libgd/libgd.SMBuild | 4 +- gtk/libgexiv2/libgexiv2.SMBuild | 6 +- gtk/libglade/libglade.SMBuild | 4 +- gtk/libgphoto2/libgphoto2.SMBuild | 4 +- gtk/libgsf/libgsf.SMBuild | 4 +- gtk/libmanette/libmanette.SMBuild | 4 +- gtk/libnotify/libnotify.SMBuild | 4 +- gtk/libportal/libportal.SMBuild | 4 +- gtk/libraqm/libraqm.SMBuild | 4 +- gtk/librsvg/librsvg.SMBuild | 4 +- gtk/libsigcpp/libsigcpp.SMBuild | 4 +- gtk/libsoup/libsoup.SMBuild | 6 +- gtk/libunique/libunique.SMBuild | 4 +- gtk/libwebp/libwebp.SMBuild | 4 +- gtk/libwnck2/libwnck2.SMBuild | 4 +- gtk/libwnck3/libwnck3.SMBuild | 4 +- gtk/openjpeg/openjpeg.SMBuild | 4 +- gtk/pango/pango.SMBuild | 4 +- gtk/pangomm/pangomm.SMBuild | 6 +- gtk/pinentry/pinentry.SMBuild | 4 +- gtk/py3cairo/py3cairo.SMBuild | 4 +- gtk/pygobject3/pygobject3.SMBuild | 4 +- gtk/rest/rest.SMBuild | 4 +- gtk/shared-mime-info/shared-mime-info.SMBuild | 4 +- gtk/wv/wv.SMBuild | 4 +- heavybuilds/firefox/firefox.SMBuild | 33 +- heavybuilds/firefox/fix-tools.patch | 13 - .../firefox/fix-webrtc-glibcisms.patch | 24 +- heavybuilds/firefox/mallinfo.patch | 32 +- .../firefox/sandbox-sched_setscheduler.patch | 15 +- heavybuilds/firefox/slack-desc | 19 - heavybuilds/firefox/slack-required | 24 -- net/aircrack-ng/aircrack-ng.SMBuild | 4 +- net/autossh/autossh.SMBuild | 4 +- net/bindutils/bindutils.SMBuild | 6 +- net/bwm-ng/bwm-ng.SMBuild | 4 +- net/cgit/cgit.SMBuild | 9 +- net/cifs-utils/cifs-utils.SMBuild | 4 +- net/comgt/comgt.SMBuild | 4 +- net/cups-filters/cups-filters.SMBuild | 4 +- net/cups/cups.SMBuild | 4 +- net/cyrus-sasl/cyrus-sasl.SMBuild | 4 +- net/darkhttpd/darkhttpd.SMBuild | 4 +- net/darkstat/darkstat.SMBuild | 6 +- net/dhcpcd/dhcpcd.SMBuild | 6 +- net/distcc/distcc.SMBuild | 8 +- net/dnsmasq/dnsmasq.SMBuild | 4 +- net/dovecot/dovecot.SMBuild | 4 +- net/dump1090/dump1090.SMBuild | 4 +- net/elinks/elinks.SMBuild | 6 +- net/ethtool/ethtool.SMBuild | 4 +- net/evince/evince.SMBuild | 6 +- net/fail2ban/fail2ban.SMBuild | 17 +- net/fcgi/fcgi.SMBuild | 6 +- net/fcgiwrap/fcgiwrap.SMBuild | 4 +- net/fping/fping.SMBuild | 4 +- net/geocode-glib/geocode-glib.SMBuild | 6 +- net/ghostscript/ghostscript.SMBuild | 4 +- net/hexchat/hexchat.SMBuild | 4 +- net/hostapd/hostapd.SMBuild | 4 +- net/hostname/hostname.SMBuild | 4 +- net/ifstat/ifstat.SMBuild | 8 +- net/iftop/iftop.SMBuild | 4 +- net/iperf/iperf.SMBuild | 4 +- net/iproute2/iproute2.SMBuild | 4 +- net/ipset/ipset.SMBuild | 4 +- net/iputils/iputils.SMBuild | 4 +- net/irssi/irssi.SMBuild | 5 +- net/iw/iw.SMBuild | 4 +- net/lftp/lftp.SMBuild | 4 +- net/libmicrohttpd/libmicrohttpd.SMBuild | 4 +- net/lynx/lynx.SMBuild | 5 +- net/maccalc/maccalc.SMBuild | 14 +- net/macchanger/macchanger.SMBuild | 4 +- net/mailcheck/mailcheck.SMBuild | 4 +- net/minicom/minicom.SMBuild | 4 +- net/minidlna/minidlna.SMBuild | 4 +- net/mktorrent/mktorrent.SMBuild | 4 +- net/motion/motion.SMBuild | 4 +- net/mtr/mtr.SMBuild | 6 +- net/mutt/mutt.SMBuild | 4 +- net/net-snmp/net-snmp.SMBuild | 4 +- net/netcat/netcat.SMBuild | 4 +- net/nfs-utils/nfs-utils.SMBuild | 4 +- net/nginx/nginx.SMBuild | 4 +- net/nload/nload.SMBuild | 4 +- net/nmap/nmap.SMBuild | 4 +- net/openntpd/openntpd.SMBuild | 4 +- net/openssh/openssh.SMBuild | 4 +- net/openvpn/openvpn.SMBuild | 4 +- net/php/php.SMBuild | 6 +- net/poppler-data/poppler-data.SMBuild | 8 +- net/poppler/poppler.SMBuild | 7 +- net/postfix/postfix.SMBuild | 9 +- net/ppp/ppp.SMBuild | 5 +- net/proftpd/proftpd.SMBuild | 4 +- net/redshift/redshift.SMBuild | 4 +- net/rp-pppoe/rp-pppoe.SMBuild | 4 +- net/rpcbind/rpcbind.SMBuild | 4 +- net/rrdtool/rrdtool.SMBuild | 4 +- net/rsync/rsync.SMBuild | 15 +- net/rtl-sdr/rtl-sdr.SMBuild | 4 +- net/rtorrent/rtorrent.SMBuild | 4 +- net/sane-backends/sane-backends.SMBuild | 4 +- net/sane-frontends/sane-frontends.SMBuild | 4 +- net/smstools/smstools.SMBuild | 20 +- net/sshfs/sshfs.SMBuild | 7 +- net/sylpheed/sylpheed.SMBuild | 4 +- net/tcpdump/tcpdump.SMBuild | 4 +- net/tor/tor.SMBuild | 4 +- net/traceroute/traceroute.SMBuild | 4 +- net/transmission/transmission.SMBuild | 4 +- net/uget/uget.SMBuild | 4 +- net/unbound/unbound.SMBuild | 4 +- net/vnstat/vnstat.SMBuild | 6 +- net/wavemon/wavemon.SMBuild | 4 +- net/weechat/weechat.SMBuild | 6 +- net/wget/wget.SMBuild | 4 +- net/whois/whois.SMBuild | 4 +- net/wireless-tools/wireless-tools.SMBuild | 6 +- net/wpa-supplicant/dbus.patch | 13 - net/wpa-supplicant/wpa-supplicant.SMBuild | 9 +- net/x11vnc/x11vnc.SMBuild | 4 +- net/x2x/x2x.SMBuild | 4 +- net/xdg-utils/xdg-utils.SMBuild | 4 +- net/znc/znc.SMBuild | 4 +- xfce/exo/exo.SMBuild | 4 +- .../faenza-icon-theme.SMBuild | 4 +- xfce/garcon/garcon.SMBuild | 4 +- xfce/libxfce4ui/libxfce4ui.SMBuild | 4 +- xfce/libxfce4util/libxfce4util.SMBuild | 4 +- xfce/mousepad/mousepad.SMBuild | 4 +- xfce/ristretto/ristretto.SMBuild | 4 +- .../thunar-archive-plugin.SMBuild | 6 +- xfce/thunar-volman/thunar-volman.SMBuild | 4 +- xfce/thunar/thunar.SMBuild | 4 +- xfce/tumbler/tumbler.SMBuild | 4 +- xfce/upower/upower.SMBuild | 4 +- xfce/vte5/vte5.SMBuild | 4 +- xfce/xfce4-appfinder/xfce4-appfinder.SMBuild | 4 +- .../xfce4-cpugraph-plugin.SMBuild | 4 +- .../xfce4-datetime-plugin.SMBuild | 4 +- xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild | 4 +- xfce/xfce4-dict/xfce4-dict.SMBuild | 4 +- .../xfce4-diskperf-plugin.SMBuild | 4 +- .../xfce4-fsguard-plugin.SMBuild | 4 +- .../xfce4-netload-plugin.SMBuild | 4 +- xfce/xfce4-notifyd/xfce4-notifyd.SMBuild | 4 +- xfce/xfce4-panel/xfce4-panel.SMBuild | 4 +- .../xfce4-power-manager.SMBuild | 4 +- .../xfce4-screenshooter.SMBuild | 4 +- .../xfce4-sensors-plugin.SMBuild | 4 +- xfce/xfce4-session/xfce4-session.SMBuild | 4 +- xfce/xfce4-settings/xfce4-settings.SMBuild | 4 +- .../xfce4-systemload-plugin.SMBuild | 4 +- .../xfce4-taskmanager.SMBuild | 4 +- xfce/xfce4-terminal/xfce4-terminal.SMBuild | 4 +- .../xfce4-wavelan-plugin.SMBuild | 4 +- .../xfce4-weather-plugin.SMBuild | 4 +- .../xfce4-whiskermenu-plugin.SMBuild | 6 +- xfce/xfconf/xfconf.SMBuild | 5 +- xfce/xfdesktop/xfdesktop.SMBuild | 5 +- xfce/xfwm4-themes/xfwm4-themes.SMBuild | 5 +- xfce/xfwm4/xfwm4.SMBuild | 5 +- xorg/at-spi2-core/at-spi2-core.SMBuild | 4 +- xorg/bdftopcf/bdftopcf.SMBuild | 6 +- xorg/dbus/dbus.SMBuild | 4 +- xorg/dconf/dconf.SMBuild | 6 +- .../dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild | 9 +- xorg/font-util/font-util.SMBuild | 6 +- xorg/fontconfig/fontconfig.SMBuild | 4 +- xorg/freeglut/freeglut.SMBuild | 7 +- xorg/freetype/freetype.SMBuild | 6 +- xorg/gccmakedep/gccmakedep.SMBuild | 6 +- xorg/glew/glew.SMBuild | 6 +- xorg/glu/glu.SMBuild | 4 +- xorg/iceauth/iceauth.SMBuild | 6 +- xorg/imake/imake.SMBuild | 6 +- xorg/imlib2/imlib2.SMBuild | 6 +- xorg/jasper/jasper.SMBuild | 4 +- xorg/lcms2/lcms2.SMBuild | 6 +- xorg/libdrm/libdrm.SMBuild | 4 +- xorg/libepoxy/libepoxy.SMBuild | 6 +- .../liberation-fonts-ttf.SMBuild | 4 +- xorg/libevdev/libevdev.SMBuild | 6 +- xorg/libfontenc/libfontenc.SMBuild | 4 +- xorg/libgudev/libgudev.SMBuild | 4 +- xorg/libice/libice.SMBuild | 6 +- xorg/libinput/libinput.SMBuild | 6 +- xorg/libpciaccess/libpciaccess.SMBuild | 4 +- xorg/libraw/libraw.SMBuild | 4 +- xorg/libsm/libsm.SMBuild | 6 +- xorg/libtiff/libtiff.SMBuild | 5 +- xorg/libvdpau/libvdpau.SMBuild | 6 +- xorg/libwacom/libwacom.SMBuild | 6 +- xorg/libx11/libx11.SMBuild | 6 +- xorg/libxau/libxau.SMBuild | 4 +- xorg/libxaw/libxaw.SMBuild | 4 +- xorg/libxaw3d/libxaw3d.SMBuild | 4 +- xorg/libxaw3dxft/libxaw3dxft.SMBuild | 4 +- xorg/libxcb/libxcb.SMBuild | 6 +- xorg/libxcomposite/libxcomposite.SMBuild | 4 +- xorg/libxcursor/libxcursor.SMBuild | 4 +- xorg/libxdamage/libxdamage.SMBuild | 4 +- xorg/libxdmcp/libxdmcp.SMBuild | 4 +- xorg/libxext/libxext.SMBuild | 4 +- xorg/libxfixes/libxfixes.SMBuild | 4 +- xorg/libxfont2/libxfont2.SMBuild | 4 +- xorg/libxft/libxft.SMBuild | 4 +- xorg/libxi/libxi.SMBuild | 4 +- xorg/libxinerama/libxinerama.SMBuild | 4 +- xorg/libxkbcommon/libxkbcommon.SMBuild | 5 +- xorg/libxkbfile/libxkbfile.SMBuild | 4 +- xorg/libxklavier/libxklavier.SMBuild | 6 +- xorg/libxmu/libxmu.SMBuild | 4 +- xorg/libxpm/libxpm.SMBuild | 4 +- xorg/libxpresent/libxpresent.SMBuild | 4 +- xorg/libxrandr/libxrandr.SMBuild | 4 +- xorg/libxrender/libxrender.SMBuild | 4 +- xorg/libxscrnsaver/libxscrnsaver.SMBuild | 4 +- xorg/libxshmfence/libxshmfence.SMBuild | 4 +- xorg/libxt/libxt.SMBuild | 4 +- xorg/libxtst/libxtst.SMBuild | 4 +- xorg/libxv/libxv.SMBuild | 4 +- xorg/libxxf86vm/libxxf86vm.SMBuild | 4 +- xorg/lndir/lndir.SMBuild | 6 +- xorg/makedepend/makedepend.SMBuild | 6 +- xorg/mesa-demos/mesa-demos.SMBuild | 6 +- xorg/mesa/mesa.SMBuild | 4 +- xorg/mkfontscale/mkfontscale.SMBuild | 6 +- xorg/mtdev/mtdev.SMBuild | 6 +- xorg/numlockx/numlockx.SMBuild | 6 +- xorg/pixman/pixman.SMBuild | 6 +- xorg/setxkbmap/setxkbmap.SMBuild | 6 +- xorg/spandsp/spandsp.SMBuild | 4 +- .../startup-notification.SMBuild | 6 +- xorg/terminus-font/terminus-font.SMBuild | 10 +- xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild | 4 +- xorg/twm/twm.SMBuild | 4 +- xorg/vala/vala.SMBuild | 6 +- xorg/xauth/xauth.SMBuild | 6 +- xorg/xbitmaps/xbitmaps.SMBuild | 4 +- xorg/xcalc/xcalc.SMBuild | 6 +- xorg/xcb-proto/xcb-proto.SMBuild | 4 +- xorg/xcb-util-cursor/xcb-util-cursor.SMBuild | 6 +- xorg/xcb-util-image/xcb-util-image.SMBuild | 6 +- .../xcb-util-keysyms/xcb-util-keysyms.SMBuild | 6 +- .../xcb-util-renderutil.SMBuild | 6 +- xorg/xcb-util-wm/xcb-util-wm.SMBuild | 6 +- xorg/xcb-util/xcb-util.SMBuild | 5 +- xorg/xclipboard/xclipboard.SMBuild | 6 +- xorg/xclock/xclock.SMBuild | 6 +- xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild | 6 +- xorg/xdg-user-dirs/xdg-user-dirs.SMBuild | 6 +- xorg/xev/xev.SMBuild | 6 +- .../xf86-input-evdev/xf86-input-evdev.SMBuild | 6 +- .../xf86-input-keyboard.SMBuild | 6 +- .../xf86-input-libinput.SMBuild | 6 +- .../xf86-input-mouse/xf86-input-mouse.SMBuild | 6 +- xorg/xf86-video-ati/xf86-video-ati.SMBuild | 6 +- .../xf86-video-dummy/xf86-video-dummy.SMBuild | 6 +- .../xf86-video-fbdev/xf86-video-fbdev.SMBuild | 7 +- .../xf86-video-fbturbo.SMBuild | 6 +- .../xf86-video-intel/xf86-video-intel.SMBuild | 6 +- xorg/xf86-video-vesa/xf86-video-vesa.SMBuild | 9 +- xorg/xfontsel/xfontsel.SMBuild | 4 +- xorg/xhost/xhost.SMBuild | 4 +- xorg/xinit/xinit.SMBuild | 4 +- xorg/xinput/xinput.SMBuild | 4 +- xorg/xkbcomp/xkbcomp.SMBuild | 4 +- .../xkeyboard-config/xkeyboard-config.SMBuild | 4 +- xorg/xmodmap/xmodmap.SMBuild | 4 +- xorg/xorg-cf-files/xorg-cf-files.SMBuild | 4 +- xorg/xorg-fonts/xorg-fonts.SMBuild | 6 +- xorg/xorg-macros/xorg-macros.SMBuild | 4 +- xorg/xorg-server/xorg-server.SMBuild | 4 +- xorg/xorgproto/xorgproto.SMBuild | 4 +- xorg/xrandr/xrandr.SMBuild | 4 +- xorg/xrdb/xrdb.SMBuild | 4 +- xorg/xset/xset.SMBuild | 4 +- xorg/xsetroot/xsetroot.SMBuild | 4 +- xorg/xtrans/xtrans.SMBuild | 4 +- xorg/xvinfo/xvinfo.SMBuild | 4 +- xorg/xwd/xwd.SMBuild | 4 +- 717 files changed, 2887 insertions(+), 2286 deletions(-) delete mode 100644 base/boost/boost-execinfo.patch create mode 100755 base/cbindgen/cbindgen.SMBuild delete mode 100644 base/libcap/libcap2-cap_names.h delete mode 100644 base/lvm/create-dm-run-dir.diff create mode 100755 base/protobuf/protobuf.SMBuild delete mode 100644 base/rust/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch delete mode 100644 base/rust/0003-Require-static-native-libraries-when-linking-static-.patch delete mode 100644 base/rust/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch delete mode 100644 base/rust/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch delete mode 100644 base/rust/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch delete mode 100644 base/rust/0008-Ignore-broken-and-non-applicable-tests.patch delete mode 100644 base/rust/0009-Link-stage2-tools-dynamically-to-libstd.patch delete mode 100644 base/rust/0010-Move-debugger-scripts-to-usr-share-rust.patch delete mode 100644 base/rust/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch delete mode 100644 base/rust/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch rename base/rust/{0001-Fix-LLVM-build.patch => 1.patch} (84%) rename base/rust/{0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch => 2.patch} (77%) create mode 100644 base/rust/3.patch rename base/rust/{00016-do-not-copy-libunwind.patch => 4.patch} (57%) create mode 100644 base/rust/5.patch create mode 100644 base/rust/6.patch create mode 100644 base/rust/7.patch create mode 100644 base/rust/8.patch delete mode 100644 base/rust/disable_miri.patch create mode 100644 extra/abiword/musl-1.2.3.patch create mode 100755 extra/adafruit-io/adafruit-io.SMBuild delete mode 100644 heavybuilds/firefox/fix-tools.patch delete mode 100644 heavybuilds/firefox/slack-desc delete mode 100644 heavybuilds/firefox/slack-required delete mode 100644 net/wpa-supplicant/dbus.patch diff --git a/base/acl/acl.SMBuild b/base/acl/acl.SMBuild index bd8a8cc..b169fd5 100755 --- a/base/acl/acl.SMBuild +++ b/base/acl/acl.SMBuild @@ -6,14 +6,16 @@ download="https://download.savannah.nongnu.org/releases/acl/acl-$version.tar.gz" requires="attr" desc="Tools and libraries for manipulating POSIX Access Control Lists" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/acpid/acpid.SMBuild b/base/acpid/acpid.SMBuild index 4dc5005..8909508 100755 --- a/base/acpid/acpid.SMBuild +++ b/base/acpid/acpid.SMBuild @@ -1,12 +1,12 @@ app=acpid version=2.0.32 build=1sml -homepage="http://sourceforge.net/projects/acpid2/" +homepage="https://sourceforge.net/projects/acpid2" download="" desc="Tools and daemon for implementing ACPI standard on Linux" requires="musl" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -35,4 +37,4 @@ build() { sha512sums=" 6b5ccc5ea460135b07a1ea894d0bc7200e24167669fdcf1aa9a9c49dc1b7c5cb4479ffb854b1d04cb8b25c55f4adf8dc7996d7899d5fe52c015259e7df84f314 acpid-2.0.32.tar.lz -" \ No newline at end of file +" diff --git a/base/alsa-lib/alsa-lib.SMBuild b/base/alsa-lib/alsa-lib.SMBuild index 6686c70..3689e38 100755 --- a/base/alsa-lib/alsa-lib.SMBuild +++ b/base/alsa-lib/alsa-lib.SMBuild @@ -6,16 +6,17 @@ download="" desc="Advanced Linux Sound Architecture provides audio and MIDI functionality for Linux" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions - applypatch $srcdir/remove-test.patch +} +build() { ./configure \ --prefix="" \ --disable-python \ @@ -37,7 +38,7 @@ build() { mkdir -p etc ; touch etc/asound.conf.new ) - if [ "$ARCH" = "aarch64" ]; then + if [ "$arch" = "aarch64" ]; then # Provide some sample conf files for using USB audio by overwriting the above file cp $srcdir/alsa.conf.rpi.usbaudio $pkg/share/alsa/alsa.conf.new cp $srcdir/asound.conf.rpi $pkg/etc/asound.conf.new diff --git a/base/alsa-plugins/alsa-plugins.SMBuild b/base/alsa-plugins/alsa-plugins.SMBuild index 71e0332..d746dfc 100755 --- a/base/alsa-plugins/alsa-plugins.SMBuild +++ b/base/alsa-plugins/alsa-plugins.SMBuild @@ -6,14 +6,16 @@ download="" desc="Plugins for ALSA" requires="alsa-lib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --libdir=/lib @@ -28,4 +30,4 @@ build() { sha512sums=" f6395a3753fcf2873d8aa54d9dd6f1a772b600de6a9ed9a36d7d64186d526ba1234dd957dd085f4c9ddad9ebf85440ef3c672c646b4e128607649262057b37d7 alsa-plugins-1.2.2.tar.lz -" \ No newline at end of file +" diff --git a/base/alsa-utils/alsa-utils.SMBuild b/base/alsa-utils/alsa-utils.SMBuild index 0e9e067..597df5d 100755 --- a/base/alsa-utils/alsa-utils.SMBuild +++ b/base/alsa-utils/alsa-utils.SMBuild @@ -6,14 +6,16 @@ download="" requires="netbsd-curses alsa-lib" desc="Userland utilities for ALSA" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/base/argon2/argon2.SMBuild b/base/argon2/argon2.SMBuild index cf4e16d..daad614 100755 --- a/base/argon2/argon2.SMBuild +++ b/base/argon2/argon2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/P-H-C/phc-winner-argon2/archive/refs/tags/$version. desc="A password hashing function written in C" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/" make OPTTARGET="none" LIBRARY_REL="lib" PREFIX="/" install DESTDIR=$pkg @@ -24,4 +26,4 @@ build() { sha512sums=" c79eb9f333f62f37d977aaf0ff9f09dd9d177727b91b0438ffbcec6e34150aebc8ae6c10bb10dbf122c9a4c59bee1feed6b946ba0c28f4f12faf6a847deb7c2d argon2-20190702.tar.lz -" \ No newline at end of file +" diff --git a/base/argp-standalone/argp-standalone.SMBuild b/base/argp-standalone/argp-standalone.SMBuild index 46163a8..6ea0dc6 100755 --- a/base/argp-standalone/argp-standalone.SMBuild +++ b/base/argp-standalone/argp-standalone.SMBuild @@ -7,7 +7,7 @@ desc="Hierarchical argument parsing library broken out of glibc" requires="musl" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { applypatch $srcdir/gnu89-inline.patch applypatch $srcdir/001-throw-in-funcdef.patch +} +build() { ./configure \ --prefix="" diff --git a/base/asciidoc/asciidoc.SMBuild b/base/asciidoc/asciidoc.SMBuild index bd296b1..c5a819e 100755 --- a/base/asciidoc/asciidoc.SMBuild +++ b/base/asciidoc/asciidoc.SMBuild @@ -6,14 +6,16 @@ download="" desc="Text document format for writing notes and documentation" requires="python3 libxslt docbook" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-"py3"-$version tar xf $srcdir/$app-"py3"-$version.tar.?z* cd $app-"py3"-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/aspell/aspell.SMBuild b/base/aspell/aspell.SMBuild index 33dabd6..0796234 100755 --- a/base/aspell/aspell.SMBuild +++ b/base/aspell/aspell.SMBuild @@ -5,14 +5,16 @@ homepage="http://aspell.net/" requires="gcc-libs netbsd-curses perl" desc="Spell checker for GNU Linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc/aspell \ diff --git a/base/aspell6/aspell6.SMBuild b/base/aspell6/aspell6.SMBuild index 39849fa..1a41717 100755 --- a/base/aspell6/aspell6.SMBuild +++ b/base/aspell6/aspell6.SMBuild @@ -6,14 +6,16 @@ download="" requires="aspell" desc="Dictionary files for aspell spelling checker" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version-2018.04.16-0.tar.bz2 cd "$app-$version-2018.04.16-0" fixbuilddirpermissions +} +build() { ./configure make @@ -26,4 +28,4 @@ build() { sha512sums=" 70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2 aspell6-en-2018.04.16-0.tar.bz2 -" \ No newline at end of file +" diff --git a/base/attr/attr.SMBuild b/base/attr/attr.SMBuild index a2e2acd..b6e8760 100755 --- a/base/attr/attr.SMBuild +++ b/base/attr/attr.SMBuild @@ -6,7 +6,7 @@ download="https://download.savannah.nongnu.org/releases/attr/attr-$version.src.t requires="musl" desc="Tools for manipulating extended attributes on filesystems" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,9 +17,10 @@ build() { sed -i 's@-o $(PKG_USER) -g $(PKG_GROUP)@@' include/buildmacros sed -i 's@CHOWN=_chown@CHOWN=true@' include/install-sh applypatch $srcdir/attr-cdefs.patch - make clean +} +build() { CFLAGS="-static" \ ./configure \ --prefix="" \ diff --git a/base/autoconf/autoconf.SMBuild b/base/autoconf/autoconf.SMBuild index 57965a2..daec6bc 100755 --- a/base/autoconf/autoconf.SMBuild +++ b/base/autoconf/autoconf.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/autoconf/autoconf-$version.tar.xz" requires="m4 perl perl-modules diffutils gawk" desc="m4 macros extension to produce scripts for software packaging" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/automake/automake.SMBuild b/base/automake/automake.SMBuild index 2eb937d..d6b037d 100755 --- a/base/automake/automake.SMBuild +++ b/base/automake/automake.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/automake/automake-$version.tar.xz" desc="GNU Makefile generator" requires="autoconf perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/bash-completion/bash-completion.SMBuild b/base/bash-completion/bash-completion.SMBuild index dbcb52e..9634e90 100755 --- a/base/bash-completion/bash-completion.SMBuild +++ b/base/bash-completion/bash-completion.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/scop/bash-completion/archive/refs/tags/$version.tar requires="bash" desc="Programmable completion for the bash shell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { # Thank you slackware applypatch $srcdir/fixup-sh-script-completions.diff +} +build() { ./configure \ --prefix="" diff --git a/base/bash/bash.SMBuild b/base/bash/bash.SMBuild index 2d41a29..b65635c 100755 --- a/base/bash/bash.SMBuild +++ b/base/bash/bash.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/bash/bash-$version.tar.gz" requires="netbsd-curses" desc="GNU Bourne-Again SHell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { bash_cv_getenv_redef=no \ bash_cv_sys_named_pipes=yes \ ac_cv_rl_version=5.0 \ diff --git a/base/bc/bc.SMBuild b/base/bc/bc.SMBuild index a7291f3..159f90c 100755 --- a/base/bc/bc.SMBuild +++ b/base/bc/bc.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/gavinhoward/bc/releases/download/$version/bc-$versi desc="Arbitrary precision numeric processing language" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { ./configure.sh -EHNG make all diff --git a/base/bison/bison.SMBuild b/base/bison/bison.SMBuild index 9c11cdf..87169da 100755 --- a/base/bison/bison.SMBuild +++ b/base/bison/bison.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/bison/bison-$version.tar.xz" desc="parser generator similar to yacc" requires="m4" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-nls @@ -26,4 +28,4 @@ build() { sha512sums=" dadc5e1ee532cfacb149c130131b66f36a0bcf724737870a0820bbf1508e1d2035c0e06dda94518a477c330ec7f56eb2fbde38f74155c741b23556eb0c3de42c bison-3.1.tar.lz -" \ No newline at end of file +" diff --git a/base/boost/boost-execinfo.patch b/base/boost/boost-execinfo.patch deleted file mode 100644 index 8e0d63d..0000000 --- a/base/boost/boost-execinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- boost_1_60_0.org/tools/build/src/engine/execunix.c 2013-01-04 09:45:43.165000002 +0000 -+++ boost_1_60_0/tools/build/src/engine/execunix.c 2013-01-04 09:46:20.095000004 +0000 -@@ -18,7 +18,7 @@ - #include - #include - --#if defined(sun) || defined(__sun) -+#if defined(sun) || defined(__sun) || defined(__GLIBC__) - #include - #endif - diff --git a/base/boost/boost.SMBuild b/base/boost/boost.SMBuild index afb1481..79025d8 100755 --- a/base/boost/boost.SMBuild +++ b/base/boost/boost.SMBuild @@ -7,14 +7,16 @@ download="https://boostorg.jfrog.io/artifactory/main/release/$version/source/boo requires="bzip2 zlib findutils python3 icu xz" desc="Huge collection of free peer-reviewed portable C++ source libraries" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app"_"$sversion" tar xf $srcdir/"$app"_"$sversion".tar.?z* cd "$app"_"$sversion" chown -R root.root . +} +build() { CC="$CC" \ ./bootstrap.sh \ --prefix="$pkg" --with-toolset=gcc --with-icu --with-python=python3 diff --git a/base/brotli/brotli.SMBuild b/base/brotli/brotli.SMBuild index b00ff79..fe49e00 100755 --- a/base/brotli/brotli.SMBuild +++ b/base/brotli/brotli.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/google/brotli/archive/refs/tags/v$version.tar.gz" requires="musl" desc="Lossless compression algorithm based on LZ77, Huffman coding and 2nd order context modeling" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./bootstrap ./configure \ diff --git a/base/bubblewrap/bubblewrap.SMBuild b/base/bubblewrap/bubblewrap.SMBuild index 54c8556..b2c5eb5 100755 --- a/base/bubblewrap/bubblewrap.SMBuild +++ b/base/bubblewrap/bubblewrap.SMBuild @@ -6,7 +6,7 @@ download="" desc="Unprivileged sandboxing tool to reduce attack surfaces" requires="libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/realpath-workaround.patch +} +build() { ./configure \ --prefix="" \ --with-priv-mode=setuid \ diff --git a/base/busybox/busybox.SMBuild b/base/busybox/busybox.SMBuild index 0e3f162..734e902 100755 --- a/base/busybox/busybox.SMBuild +++ b/base/busybox/busybox.SMBuild @@ -6,7 +6,7 @@ download="https://www.busybox.net/downloads/busybox-$version.tar.bz2" requires="musl" desc="Swiss army knife of embedded linux providing subsets of common UNIX utilities" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -19,7 +19,9 @@ build() { applypatch $srcdir/busybox-fdisk-sector-size.patch applypatch $srcdir/busybox-libbb-make-unicode-printable.patch applypatch $srcdir/busybox-ping.patch +} +build() { cp $srcdir/busybox.config .config make CC="$CC" diff --git a/base/bzip2/bzip2.SMBuild b/base/bzip2/bzip2.SMBuild index bed2efa..daba2e5 100755 --- a/base/bzip2/bzip2.SMBuild +++ b/base/bzip2/bzip2.SMBuild @@ -6,14 +6,16 @@ download="https://sourceware.org/pub/bzip2/bzip2-$version.tar.gz" requires="musl" desc="block-sorting file compressor based on Burrows-Wheeler text compression algorithm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # Prevent tests from running sed -i 's@all: libbz2.a bzip2 bzip2recover test@all: libbz2.a bzip2 bzip2recover@' Makefile diff --git a/base/c-ares/c-ares.SMBuild b/base/c-ares/c-ares.SMBuild index 77f9065..377f1bf 100755 --- a/base/c-ares/c-ares.SMBuild +++ b/base/c-ares/c-ares.SMBuild @@ -6,14 +6,16 @@ download="https://c-ares.haxx.se/download/c-ares-$version.tar.gz" desc="C library for asynchronous DNS requests including name resolves" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared diff --git a/base/ca-certificates/ca-certificates.SMBuild b/base/ca-certificates/ca-certificates.SMBuild index bc4b870..d6e88e9 100755 --- a/base/ca-certificates/ca-certificates.SMBuild +++ b/base/ca-certificates/ca-certificates.SMBuild @@ -5,7 +5,7 @@ homepage="https://ftp.debian.org/debian/pool/main/c/ca-certificates/" desc="PEM Files of CA Certificates" requires="musl curl" -build() { +prepbuilddir() { mkandenterbuilddir tar xf $srcdir/$app.tar.?z* @@ -14,7 +14,9 @@ build() { # Patch to remove incompatible arguments from run-parts applypatch $srcdir/fixup_update-ca-certificates.diff +} +build() { # Update to certdata.txt from $srcdir: xzcat $srcdir/certdata-${version}.txt.xz > mozilla/certdata.txt diff --git a/base/cbindgen/cbindgen.SMBuild b/base/cbindgen/cbindgen.SMBuild new file mode 100755 index 0000000..0ace755 --- /dev/null +++ b/base/cbindgen/cbindgen.SMBuild @@ -0,0 +1,30 @@ +app=cbindgen +version=0.24.3 +build=1sml +homepage="https://github.com/eqrion/cbindgen" +download="" +desc="Tool for generating Rust headers from C code" +requires="rust" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + RUSTONIG_DYNAMIC_LIBONIG=1 \ + cargo build --offline --release --target $arch-unknown-linux-musl $MAKEFLAGS + install -Dm 755 target/$arch-unknown-linux-musl/release/cbindgen $pkg/bin/cbindgen + + cp LICENSE $pkgdocs/ + + mkfinalpkg +} + +sha512sums=" +9bed6bb1d4f9829a94eadca36cb56e8d6a4065c632823fa910ef684708db9cf3983ab3b462dcf24f3291c689c2beac9a6ce6aad5682ebfbb86fe7259f6bcbd0c cbindgen-0.24.3.tar.lz +" diff --git a/base/ccache/ccache.SMBuild b/base/ccache/ccache.SMBuild index 69dac32..47c02a1 100755 --- a/base/ccache/ccache.SMBuild +++ b/base/ccache/ccache.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/ccache/ccache/releases/download/v$version/ccache-$v desc="Compiler cache to speed up re-compilation of C/C++ code by caching previous compiles" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" diff --git a/base/chrony/chrony.SMBuild b/base/chrony/chrony.SMBuild index c7d35b8..7717c15 100755 --- a/base/chrony/chrony.SMBuild +++ b/base/chrony/chrony.SMBuild @@ -6,14 +6,16 @@ download="https://download.tuxfamily.org/chrony/chrony-$version.tar.gz" desc="Lightweight program to maintain accuracy of the real time clock via NTP" requires="nettle libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ @@ -39,4 +41,4 @@ build() { sha512sums=" df1f75305eda70294d5217131a63a1f42fc5fd78fd5d73d53c930c81707e2a0750a137ccc739d111f398f0c49775c847b73b27e1f00931d7a174261eb253c409 chrony-4.2.tar.lz -" \ No newline at end of file +" diff --git a/base/chrpath/chrpath.SMBuild b/base/chrpath/chrpath.SMBuild index 1cf459a..4b637aa 100755 --- a/base/chrpath/chrpath.SMBuild +++ b/base/chrpath/chrpath.SMBuild @@ -6,14 +6,16 @@ download="https://alioth.debian.org/frs/download.php/latestfile/813/chrpath-$ver desc="Program to modify rpath aka dynamic library load path of binaries" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --mandir=/share/man @@ -28,4 +30,4 @@ build() { sha512sums=" 3af577da5a271fa7194135a328ab1b8e2ec185dd3d37938425b46ed77ea1deb813db5ac9fc4f045a45fb7a27194d4a5d6227f922b62980ffd46451b972c4fc5c chrpath-0.16.tar.lz -" \ No newline at end of file +" diff --git a/base/cmake/cmake.SMBuild b/base/cmake/cmake.SMBuild index 0ccc688..4d45a0d 100755 --- a/base/cmake/cmake.SMBuild +++ b/base/cmake/cmake.SMBuild @@ -6,14 +6,16 @@ download="https://cmake.org/files/v$version/cmake-$version.tar.gz" desc="Cross-platform, open-source make system" requires="gcc-libs openssl libunistring libidn2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { para="$(echo $MAKEFLAGS | sed 's/-j//')" ./bootstrap \ diff --git a/base/coreutils/coreutils.SMBuild b/base/coreutils/coreutils.SMBuild index f3bc849..b4c16c9 100755 --- a/base/coreutils/coreutils.SMBuild +++ b/base/coreutils/coreutils.SMBuild @@ -6,7 +6,7 @@ download="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz" desc="Core GNU utilities" requires="attr acl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/ls.patch +} +build() { FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$CFLAGS -static" \ ./configure \ diff --git a/base/cpio/cpio.SMBuild b/base/cpio/cpio.SMBuild index 110c89a..bb6d1b8 100755 --- a/base/cpio/cpio.SMBuild +++ b/base/cpio/cpio.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/cpio/cpio-$version.tar.gz" desc="Backup and archiving utility" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -fcommon" \ ./configure \ --prefix="" diff --git a/base/crda/crda.SMBuild b/base/crda/crda.SMBuild index 8256cea..f265267 100755 --- a/base/crda/crda.SMBuild +++ b/base/crda/crda.SMBuild @@ -5,7 +5,7 @@ homepage="https://wireless.wiki.kernel.org/en/developers/regulatory/crda" requires="libnl libgcrypt python-m2crypto" desc="Udev wrapper for communicating between kernel and userspace" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -20,7 +20,9 @@ build() { # Disable -Werror, just in case sed -i 's@-Werror@@g' Makefile +} +build() { make PREFIX="/" SBINDIR="/bin" make PREFIX="/" SBINDIR="/bin" install DESTDIR=$pkg diff --git a/base/cryptsetup/cryptsetup.SMBuild b/base/cryptsetup/cryptsetup.SMBuild index 3a6873f..197f5b5 100755 --- a/base/cryptsetup/cryptsetup.SMBuild +++ b/base/cryptsetup/cryptsetup.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/mbroz/cryptsetup/archive/refs/tags/v$mversion.tar.g desc="Utility for setting up encrypted filesystems" requires="popt util-linux libgpg-error libgcrypt lvm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/base/curl/curl.SMBuild b/base/curl/curl.SMBuild index 5234732..97666dc 100755 --- a/base/curl/curl.SMBuild +++ b/base/curl/curl.SMBuild @@ -7,14 +7,16 @@ desc="Command line URL data transfer tool" requires="zlib openssl brotli libssh2 libidn2 nghttp2 libunistring libpsl" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -44,4 +46,4 @@ build() { sha512sums=" f6cc99dd66d34392e149f99e97c4dfbcbd699e5bb104fa57d7c8be36547bd8c2ff0d64f76c806d1532632352a3251046a8fbbbdf91b5e1398061d38ffa7e0cda curl-7.88.1.tar.lz -" \ No newline at end of file +" diff --git a/base/cython/cython.SMBuild b/base/cython/cython.SMBuild index 49cd99c..b0d014e 100755 --- a/base/cython/cython.SMBuild +++ b/base/cython/cython.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.org/project/Cython" requires="python3 python-setuptools" desc="C-Extensions for Python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Cython-$version tar xf $srcdir/Cython-$version.tar.?z* cd Cython-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp COPYING.txt LICENSE.txt $pkgdocs/ diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild index 2a88638..4bdcb40 100755 --- a/base/db/db.SMBuild +++ b/base/db/db.SMBuild @@ -6,7 +6,7 @@ download="http://download.oracle.com/berkeley-db/db-$version.tar.gz" desc="Berkeley embedded database library" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,14 +14,16 @@ build() { cd $app-$version fixbuilddirpermissions + applypatch $srcdir/bdb-configure.patch +} + +build() { if [ "$arch" = "aarch64" ]; then db_atomic=gcc-builtin else db_atomic=x86/gcc-assembly fi - applypatch $srcdir/bdb-configure.patch - cd build_unix db_cv_clock_monotonic=yes \ diff --git a/base/dcron/dcron.SMBuild b/base/dcron/dcron.SMBuild index 707bbeb..21abf6d 100755 --- a/base/dcron/dcron.SMBuild +++ b/base/dcron/dcron.SMBuild @@ -6,7 +6,7 @@ download="http://www.jimpryor.net/linux/releases/dcron-$version.tar.gz" desc="Dillons Cron daemon" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { applypatch $srcdir/0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch applypatch $srcdir/0007-Update-main.c.patch applypatch $srcdir/crontab.c.O_EXCL.diff +} +build() { make PREFIX="" BINDIR=/bin SBINDIR=/bin CRONTAB_GROUP=root install -Dm 755 crond $pkg/bin/crond @@ -41,10 +43,11 @@ build() { mkfinalpkg } + sha512sums=" 19e645ecf073f38539cce45daf82e4d1eac58fbba514e18c9c4e8b9976dd9557ece7dcb2ad3c90bc0b05ec732f7fbb76617a97ec572cc28625398935734ac56a dcron-4.5.tar.lz 687ba63afc4bf6028a7a4f0debfcb8b8758aaacd1ddb317136d55dfae7c57c572d81edf340b4b36476280a38b71b740f23e9f56a02a95ebd0f0aacdcba735c59 0002-README-var-spool-cron-crontabs-root.patch faf6ecee8f678298b1a8cd27f42f42e3e3396062d73ea4bfff14f930ae71e99613354d9ec234407936e19c05b1de9cec46fffbf6df9ef71d4294d8b32bdad74d 0006-Fixed-a-bug-whereby-syncs-killed-all-waiting-jobs.patch 534628dfaad83a0d746731b67756fff3dd6a5b305efb07e00e3a7acb6bac9138e7ee3cae22d1314ee3041b22b9dd3574c1342e26af39198d6d0685964318876d 0007-Update-main.c.patch a56862ea0fc1aa2f5fa77c2d341c2e35bb5d2ac5d9942c3dee25662eac6c9078fdd293835ec471ece22b2add4ae21db596cb0d41fb765ee92fb9aa53a4252287 crontab.c.O_EXCL.diff -" \ No newline at end of file +" diff --git a/base/desktop-file-utils/desktop-file-utils.SMBuild b/base/desktop-file-utils/desktop-file-utils.SMBuild index 3348658..7abe7f8 100755 --- a/base/desktop-file-utils/desktop-file-utils.SMBuild +++ b/base/desktop-file-utils/desktop-file-utils.SMBuild @@ -5,7 +5,7 @@ homepage="https://www.freedesktop.org/wiki/Software/desktop-file-utils/" desc="Utilities for manipulating desktop files" requires="glib pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { # Thank you slackware applypatch $srcdir/desktop-file-utils.quiet.warnings.diff +} +build() { ./configure \ --prefix="" diff --git a/base/dialog/dialog.SMBuild b/base/dialog/dialog.SMBuild index a8c92ed..4d8c6c3 100755 --- a/base/dialog/dialog.SMBuild +++ b/base/dialog/dialog.SMBuild @@ -5,14 +5,16 @@ homepage="https://invisible-island.net/archives/dialog/" desc="display dialog boxes from shell scripts" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version-20170509.tar.?z cd "$app-$version-20170509" fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/base/diffutils/diffutils.SMBuild b/base/diffutils/diffutils.SMBuild index 1a943ff..8484317 100755 --- a/base/diffutils/diffutils.SMBuild +++ b/base/diffutils/diffutils.SMBuild @@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/diffutils/diffutils-$version.tar.xz" desc="Utilities to find and apply differences between files" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { for i in tests gnulib-tests doc ; do printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > "$i"/Makefile.in done +} +build() { CPPFLAGS="$($srcdir/gnulibfix lib)" \ LDFLAGS="-static" \ ./configure \ diff --git a/base/dmidecode/dmidecode.SMBuild b/base/dmidecode/dmidecode.SMBuild index d0ec52f..e3fd108 100755 --- a/base/dmidecode/dmidecode.SMBuild +++ b/base/dmidecode/dmidecode.SMBuild @@ -6,7 +6,7 @@ download="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$version desc="DMI table decoder" requires="musl" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install DESTDIR=$pkg prefix="" mandir="/share/man" sbindir="/bin" diff --git a/base/dmraid/dmraid.SMBuild b/base/dmraid/dmraid.SMBuild index 0388f69..7922334 100755 --- a/base/dmraid/dmraid.SMBuild +++ b/base/dmraid/dmraid.SMBuild @@ -6,7 +6,7 @@ download="https://people.redhat.com/~heinzm/sw/dmraid/src/dmiraid-$version.rc16- desc="Tool and a library to discover, configure and activate ATA RAID devices" requires="lvm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app @@ -21,6 +21,11 @@ build() { applypatch $srcdir/005-fix_isw_sectors_calculation.patch applypatch $srcdir/006-musl-libc.patch applypatch $srcdir/007-fix-loff_t-musl.patch +} + +build() { + + unset MAKEFLAGS CFLAGS CXXFLAGS ./configure \ --prefix="" \ @@ -32,7 +37,6 @@ build() { --disable-static_link \ $builddist - unset MAKEFLAGS CFLAGS CXXFLAGS make -j1 make install DESTDIR=$pkg diff --git a/base/docbook/docbook.SMBuild b/base/docbook/docbook.SMBuild index 61b07ef..9ff43b1 100755 --- a/base/docbook/docbook.SMBuild +++ b/base/docbook/docbook.SMBuild @@ -8,14 +8,16 @@ xslv="1.79.2" desc="DocBook DTD for XML" requires="libxslt libxml2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/docbook-xml-$docbookv.tar.?z* cd docbook-xml-$docbookv fixbuilddirpermissions +} +build() { xml_catalog="$pkg/etc/xml/catalog" xml_docbook="$pkg/etc/xml/docbook" diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild index 265b5f0..375316d 100755 --- a/base/dosfstools/dosfstools.SMBuild +++ b/base/dosfstools/dosfstools.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/dosfstools/dosfstools/releases/download/v$version/d desc="Tools for working with FAT filesystems" requires="eudev" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" \ diff --git a/base/e2fsprogs/e2fsprogs.SMBuild b/base/e2fsprogs/e2fsprogs.SMBuild index 35cbcf4..655690c 100755 --- a/base/e2fsprogs/e2fsprogs.SMBuild +++ b/base/e2fsprogs/e2fsprogs.SMBuild @@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprog desc="Utilities for working with ext 2, 3 and 4 filesystems" requires="util-linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { for i in misc/fsck.c misc/mke2fs.c e2fsck/unix.c ; do sed -i 's@sbin@bin@g' $i done diff --git a/base/ed/ed.SMBuild b/base/ed/ed.SMBuild index a4cae02..555c298 100755 --- a/base/ed/ed.SMBuild +++ b/base/ed/ed.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/ed/ed-$version.tar.lz" desc="Old-school POSIX-compliant text editor" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/enchant/enchant.SMBuild b/base/enchant/enchant.SMBuild index 38fc0f3..c0c1415 100755 --- a/base/enchant/enchant.SMBuild +++ b/base/enchant/enchant.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/AbiWord/$version/releases/download/v$version/enchan desc="spell checking library" requires="gcc-libs glib aspell hunspell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/enet/enet.SMBuild b/base/enet/enet.SMBuild index 5ad548d..ef8924d 100755 --- a/base/enet/enet.SMBuild +++ b/base/enet/enet.SMBuild @@ -6,14 +6,16 @@ download="http://enet.bespin.org/download/enet-$version.tar.gz" requires="musl" desc="simple and robust network communication layer over UDP" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no @@ -28,4 +30,4 @@ build() { sha512sums=" dd18c68e395aa8b259607179bfdf8e116276397f89da4473f9c94538bab8ce0036a416c5feb893e01b65f78f16ee1a0dd8959657325f29c5df352d9c69ae33a5 enet-1.3.15.tar.lz -" \ No newline at end of file +" diff --git a/base/eudev/eudev.SMBuild b/base/eudev/eudev.SMBuild index e13094c..56d6200 100755 --- a/base/eudev/eudev.SMBuild +++ b/base/eudev/eudev.SMBuild @@ -7,14 +7,16 @@ desc="Independent fork of udev dynamic device manager by Gentoo devs" requires="util-linux" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/base/exfat-utils/exfat-utils.SMBuild b/base/exfat-utils/exfat-utils.SMBuild index fd11d5b..e0df8b1 100755 --- a/base/exfat-utils/exfat-utils.SMBuild +++ b/base/exfat-utils/exfat-utils.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/relan/exfat/archive/refs/tags/v$version.tar.gz" desc="Utilities to create and manipulate Microsoft exFAT filesystems" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -std=c99" \ ./configure \ --prefix="" \ diff --git a/base/exiv2/exiv2.SMBuild b/base/exiv2/exiv2.SMBuild index 6f7f55e..49a7b92 100755 --- a/base/exiv2/exiv2.SMBuild +++ b/base/exiv2/exiv2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Exiv2/exiv2/releases/download/v$version/exiv2-$vers desc="C++ library and a utility to read and write Exif, IPTC and XMP image metadata" requires="gcc-libs expat zlib curl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/expat/expat.SMBuild b/base/expat/expat.SMBuild index dba3fc0..f2b8b55 100755 --- a/base/expat/expat.SMBuild +++ b/base/expat/expat.SMBuild @@ -6,14 +6,16 @@ build=1sml desc="C library for parsing XML" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 0fbd6e39cd318ed77363be0321e3f40002ac1c2e3f3f69c41de45afd94887d9ff6b0685f374649a50acd78eda8bfa8c52a98349f9845941790319d9fa5734088 expat-2.5.0.tar.lz -" \ No newline at end of file +" diff --git a/base/faad2/faad2.SMBuild b/base/faad2/faad2.SMBuild index 9a3d29c..e4d37f8 100755 --- a/base/faad2/faad2.SMBuild +++ b/base/faad2/faad2.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/knik0/faad2/archive/refs/tags/$mversion.tar.gz" desc="HE, LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/fdk-aac/fdk-aac.SMBuild b/base/fdk-aac/fdk-aac.SMBuild index 9189dd8..636de05 100755 --- a/base/fdk-aac/fdk-aac.SMBuild +++ b/base/fdk-aac/fdk-aac.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-$v desc="AAC audio encoding and decoding library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/fftw/fftw.SMBuild b/base/fftw/fftw.SMBuild index 61814ad..191a223 100755 --- a/base/fftw/fftw.SMBuild +++ b/base/fftw/fftw.SMBuild @@ -6,14 +6,16 @@ download="https://www.fftw.org/fftw-$version.tar.gz" desc="Collection of fast C routines for computing the Discrete Fourier Transform in multiple dimensions" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i 's@-mtune=native@$CFLAGS@g' configure # Default compile options diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild index 532ef34..47d44f1 100755 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -6,7 +6,7 @@ download="http://astron.com/pub/file/file-$version.tar.gz" desc="Utility to determine file types" requires="bzip2 zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/file.etc.file.diff applypatch $srcdir/file.short.diff +} +build() { # linking against libseccomp causes weird "Bad system call" issues CFLAGS="$CFLAGS --std=c99" \ ./configure \ diff --git a/base/findutils/findutils.SMBuild b/base/findutils/findutils.SMBuild index 7284c36..e619e09 100755 --- a/base/findutils/findutils.SMBuild +++ b/base/findutils/findutils.SMBuild @@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/findutils/findutils-$version.tar.gz" desc="POSIX-compliant utilities to locate files" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/findutils.no.default.options.warnings.diff applypatch $srcdir/mountlist.c.patch +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" \ diff --git a/base/flac/flac.SMBuild b/base/flac/flac.SMBuild index 6b432b7..5217899 100755 --- a/base/flac/flac.SMBuild +++ b/base/flac/flac.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.osuosl.org/pub/xiph/releases/flac/flac-$version.tar.xz" desc="Open-source lossless audio codec" requires="libogg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-sse diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild index 456204c..b1f9a04 100755 --- a/base/flex/flex.SMBuild +++ b/base/flex/flex.SMBuild @@ -6,16 +6,17 @@ download="https://github.com/westes/flex/archive/refs/tags/v$version.tar.gz" desc="fast lexical analyzer generator" requires="m4" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { unset CPPFLAGS - printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \ diff --git a/base/fmt/fmt.SMBuild b/base/fmt/fmt.SMBuild index c3711b9..e2a7f3c 100755 --- a/base/fmt/fmt.SMBuild +++ b/base/fmt/fmt.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/fmtlib/fmt/archive/refs/tags/$version.tar.gz" desc="Formatting library for C++" requires="musl gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ @@ -32,4 +34,4 @@ build() { sha512sums=" 3e67202ab0f91b7e26526bc632ddde063ab06d0029e34286ecf0321f7226dc2d5689a5c6aacb81d516e2c72206daf9cfb037a78cd5b0f472fadbb18934f0c424 fmt-8.1.0.tar.lz -" \ No newline at end of file +" diff --git a/base/fribidi/fribidi.SMBuild b/base/fribidi/fribidi.SMBuild index a097c98..53b1730 100755 --- a/base/fribidi/fribidi.SMBuild +++ b/base/fribidi/fribidi.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/fribidi/fribidi/releases/download/v$version/fribidi desc="Unicode BiDirectional algorithm library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/fuse/fuse.SMBuild b/base/fuse/fuse.SMBuild index c2626a8..26636df 100755 --- a/base/fuse/fuse.SMBuild +++ b/base/fuse/fuse.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libfuse/libfuse/releases/download/fuse-$version/fus desc="Interface to export virtual filesystem in userspace" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/base/fuse3/fuse3.SMBuild b/base/fuse3/fuse3.SMBuild index 62df0ef..160e32a 100755 --- a/base/fuse3/fuse3.SMBuild +++ b/base/fuse3/fuse3.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libfuse/libfuse/archive/refs/tags/fuse3-$version.ta desc="Filesystem in Userspace v3" requires="udev" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf fuse-$version tar xf $srcdir/fuse-$version.tar.?z* cd fuse-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild index 45b7ffa..4d0f3ba 100755 --- a/base/gawk/gawk.SMBuild +++ b/base/gawk/gawk.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gawk/gawk-$version.tar.xz" desc="POSIX-compliant pattern scanning and processing language" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -static" \ ./configure \ --prefix="" \ diff --git a/base/gdb/gdb.SMBuild b/base/gdb/gdb.SMBuild index 0604256..62de278 100755 --- a/base/gdb/gdb.SMBuild +++ b/base/gdb/gdb.SMBuild @@ -7,14 +7,16 @@ desc="GNU symbolic debugger" requires="gcc-libs netbsd-curses expat xz python3 gmp mpfr" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-werror \ diff --git a/base/gdbm/gdbm.SMBuild b/base/gdbm/gdbm.SMBuild index b56bc01..16e9235 100755 --- a/base/gdbm/gdbm.SMBuild +++ b/base/gdbm/gdbm.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gdbm/gdbm-$version.tar.gz" desc="set of database routines that work similar to the standard UNIX dbm routines" requires="readline" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-nls \ @@ -28,5 +30,5 @@ build() { } sha512sums=" -7e62e23fcec1351e0db6fa7a530711bd1fe8c01d72a8c69f178af2556bb9d47f4e37ea689a196e6e33d6c27b536bf9f8075f17c7e208e2892bc8d2add9e5331c gdbm-1.18.tar.lz +eee8e46baecaeb9e8e4844d7a941195bd9e85ac04133499634ea5a1de9a1eaa3dd80da9fdf92ba29f2b54c6960b5c6f3eaf96c09117c1128568722ddbb3104f8 gdbm-1.23.tar.lz " diff --git a/base/gettext/gettext.SMBuild b/base/gettext/gettext.SMBuild index 03f36d1..01cdda0 100755 --- a/base/gettext/gettext.SMBuild +++ b/base/gettext/gettext.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.xz" desc="Toolkit to internationalize messages given by shell scripts" requires="attr acl libxml2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/giflib/giflib.SMBuild b/base/giflib/giflib.SMBuild index 39fade9..eb116ca 100755 --- a/base/giflib/giflib.SMBuild +++ b/base/giflib/giflib.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/giflib/files/giflib-$version.tar.gz" desc="Library for manipulating GIF files" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/giflib-5.1.9-fix-missing-quantize-API-symbols.patch +} +build() { make CFLAGS="$CFLAGS" make install DESTDIR=$pkg PREFIX="/" diff --git a/base/git/git.SMBuild b/base/git/git.SMBuild index ebd6379..80bfc79 100755 --- a/base/git/git.SMBuild +++ b/base/git/git.SMBuild @@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/scm/git/git-$version.tar. desc="Fast, scalable, distributed revision control system" requires="curl openssl pcre asciidoc" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make CC="$CC" $MAKEFLAGS CFLAGS="$CFLAGS" \ prefix="/" gitexecdir="/lib/git-core" \ NO_TCLTK=1 NO_PYTHON=1 NO_EXPAT=1 NO_GETTEXT=1 \ @@ -31,4 +33,4 @@ build() { sha512sums=" a01b3c2a2aab6ad3e7604d3c15de3969249dae114dd5cc0505a534b1142b4342fc8160449d41dd6561b8fd4441a3b1de516d6b6d0cbf07fe0fd97dfcab8de2f9 git-2.30.8.tar.lz -" \ No newline at end of file +" diff --git a/base/glib/glib.SMBuild b/base/glib/glib.SMBuild index 1723684..4a904c1 100755 --- a/base/glib/glib.SMBuild +++ b/base/glib/glib.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/glib/2.66/glib-$version.tar.xz" desc="library of C routines" requires="libffi util-linux pcre python3 gettext meson" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. --prefix="/" \ @@ -33,4 +35,4 @@ build() { sha512sums=" 993853772132feb0844e868408fa0ee803d4dad5e0827ed6410105b8746c05440313a9514d3b8d87385fe5133aacc2ff1e3e6418c0ce69c8f69f2977733f623c glib-2.70.3.tar.lz -" \ No newline at end of file +" diff --git a/base/gloox/gloox.SMBuild b/base/gloox/gloox.SMBuild index 999218c..4477d81 100755 --- a/base/gloox/gloox.SMBuild +++ b/base/gloox/gloox.SMBuild @@ -6,7 +6,7 @@ download="https://camaya.net/download/gloox-$version.tar.bz2" desc="Rock-solid, full-featured Jabber/XMPP client library in C++" requires="gcc-libs libidn gnutls" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/gloox-musl.patch +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/gmime/gmime.SMBuild b/base/gmime/gmime.SMBuild index dc7a5ea..2608821 100755 --- a/base/gmime/gmime.SMBuild +++ b/base/gmime/gmime.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/jstedfast/gmime/archive/refs/tags/2.6.23.tar.gz" desc="Library to parse and create messages in MIME format" requires="netbsd-curses libffi glib util-linux pcre gpgme" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/gmp/gmp.SMBuild b/base/gmp/gmp.SMBuild index 5219d9b..574d86c 100755 --- a/base/gmp/gmp.SMBuild +++ b/base/gmp/gmp.SMBuild @@ -6,14 +6,16 @@ download="https://gmplib.org/download/gmp/gmp-$version.tar.lz" desc="GNU multiple precision arithmetic library" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --with-pic \ diff --git a/base/gnu-efi/gnu-efi.SMBuild b/base/gnu-efi/gnu-efi.SMBuild index d663b41..37b9e6e 100755 --- a/base/gnu-efi/gnu-efi.SMBuild +++ b/base/gnu-efi/gnu-efi.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/gnu-efi/files/gnu-efi-$version.tar.bz desc="library to develop applications using GNU toolchain and EFI dev environment" requires="libelf-compat" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make PREFIX="/" INSTALLROOT="$pkg" -j1 all install mkfinalpkg diff --git a/base/gnupg2/gnupg2.SMBuild b/base/gnupg2/gnupg2.SMBuild index 1f510b5..99cd2d4 100755 --- a/base/gnupg2/gnupg2.SMBuild +++ b/base/gnupg2/gnupg2.SMBuild @@ -6,14 +6,16 @@ download="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$version.tar.bz2" desc="The GNU Privacy Guard version 2.x" requires="bzip2 sqlite libassuan readline libksba libusb gnutls npth" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf gnupg-$version tar xf $srcdir/gnupg-$version.tar.?z* cd gnupg-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin diff --git a/base/gnutls/gnutls.SMBuild b/base/gnutls/gnutls.SMBuild index c5ca93b..7228681 100755 --- a/base/gnutls/gnutls.SMBuild +++ b/base/gnutls/gnutls.SMBuild @@ -6,14 +6,16 @@ download="https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$version.tar.xz" desc="GNU TLS 1.0 and SSL 3.0 implementation" requires="gcc-libs zlib gmp libidn libtasn1 nettle openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ --disable-openssl-compatibility \ diff --git a/base/gperf/gperf.SMBuild b/base/gperf/gperf.SMBuild index 47e3177..56bfd78 100755 --- a/base/gperf/gperf.SMBuild +++ b/base/gperf/gperf.SMBuild @@ -6,14 +6,16 @@ download="http://ftp.gnu.org/pub/gnu/gperf/gperf-$version.tar.gz" desc="perfect hash function generator in C++" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/gpgme/gpgme.SMBuild b/base/gpgme/gpgme.SMBuild index 1156745..6fb9e93 100755 --- a/base/gpgme/gpgme.SMBuild +++ b/base/gpgme/gpgme.SMBuild @@ -6,15 +6,18 @@ download="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2" desc="C language library to easily add crypto to a program" requires="gcc-libs libassuan libgpg-error" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # TODO: disable linking against qt5 + CXXFLAGS="$CXXFLAGS -mno-outline-atomics" \ ./configure \ --prefix="" \ --disable-static \ @@ -30,4 +33,4 @@ build() { sha512sums=" cf3e44b4f6ded9c486f37bafa3d059863a177f01d6e3a635abe90ce8af23a5f6ee86eee854c313e90c5506be9a78bee4e2ed3fa24faa887c8f8c19895613d0b1 gpgme-1.13.1.tar.lz -" \ No newline at end of file +" diff --git a/base/gptfdisk/gptfdisk.SMBuild b/base/gptfdisk/gptfdisk.SMBuild index 53d27eb..7860463 100755 --- a/base/gptfdisk/gptfdisk.SMBuild +++ b/base/gptfdisk/gptfdisk.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/gptfdisk/files/gptfdisk/$version/gptf desc="GPT fdisk utilities" requires="gcc-libs netbsd-curses popt util-linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i '/^#include /s|ncursesw/||' gptcurses.cc make @@ -29,4 +31,4 @@ build() { sha512sums=" 2e0ff7321c8083073b08abc49d8d22b14384c3bd80ed8c02f59a6a1ca77ac75623fed6b7c4c476fb6d54cb7f68af4e1c7b0bdd7592760d913c4d52580e394b05 gptfdisk-1.0.5.tar.lz -" \ No newline at end of file +" diff --git a/base/grep/grep.SMBuild b/base/grep/grep.SMBuild index bc9f55c..c5db6e0 100755 --- a/base/grep/grep.SMBuild +++ b/base/grep/grep.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/grep/grep-$version.tar.xz" desc="print lines matching a pattern" requires="pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -static" \ ./configure \ --prefix="" \ diff --git a/base/groff/groff.SMBuild b/base/groff/groff.SMBuild index c85bb36..90168ca 100755 --- a/base/groff/groff.SMBuild +++ b/base/groff/groff.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/groff/groff-$version.tar.gz" desc="GNU replacement for nroff and troff text formatters" requires="gcc-libs perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --without-x diff --git a/base/gsl/gsl.SMBuild b/base/gsl/gsl.SMBuild index 3bda820..d985c7b 100755 --- a/base/gsl/gsl.SMBuild +++ b/base/gsl/gsl.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gsl/gsl-$version.tar.gz" desc="Numerical library for C and C++ programmers written in ANSI C" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/gstreamer/gstreamer.SMBuild b/base/gstreamer/gstreamer.SMBuild index 1fa61f5..3fa330e 100755 --- a/base/gstreamer/gstreamer.SMBuild +++ b/base/gstreamer/gstreamer.SMBuild @@ -6,14 +6,16 @@ download="https://gstreamer.freedesktop.org/data/src/gstreamer/gstreamer-$versio desc="streaming multimedia framework" requires="glib pcre libffi zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ diff --git a/base/gyp/gyp.SMBuild b/base/gyp/gyp.SMBuild index 76ff105..886c419 100755 --- a/base/gyp/gyp.SMBuild +++ b/base/gyp/gyp.SMBuild @@ -5,7 +5,7 @@ homepage="https://gyp.gsrc.io/" desc="Meta-Build system that generates other build systems" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version"_caa60026" @@ -18,7 +18,9 @@ build() { applypatch $srcdir/gyp-python3.patch applypatch $srcdir/gyp-python38.patch applypatch $srcdir/gyp-python39.patch +} +build() { python3 setup.py install --prefix="" --root="$pkg" cp LICENSE $pkgdocs/ diff --git a/base/gzip/gzip.SMBuild b/base/gzip/gzip.SMBuild index e52c6e7..4173721 100755 --- a/base/gzip/gzip.SMBuild +++ b/base/gzip/gzip.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz" desc="GNU file compression utility" requires="less" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -26,5 +28,5 @@ build() { } sha512sums=" -09b441299039479488700b7ef267ab7f71268af0d648d32cf6b1efcac58e59f1f352fa9d4f95278e96a76dc21239be1a5acab319bc85a7501cf5d8573c83d857 gzip-1.12.tar.gz -" \ No newline at end of file +9c3f061844413ee2d382608dd9019813f78edc72bd75ab53f58c757d60859f9139b3850ccf1ed191a739f80836e9a6bfe734ec59ddba991a3ff3b322ec7e356d gzip-1.12.tar.lz +" diff --git a/base/haveged/haveged.SMBuild b/base/haveged/haveged.SMBuild index d69f1d5..760e011 100755 --- a/base/haveged/haveged.SMBuild +++ b/base/haveged/haveged.SMBuild @@ -6,14 +6,16 @@ download="http://www.issihosts.com/haveged/haveged-$version.tar.gz" desc="Entropy daemon especially suited for low-powered devices" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/base/hdparm/hdparm.SMBuild b/base/hdparm/hdparm.SMBuild index 9b87dc9..a652505 100755 --- a/base/hdparm/hdparm.SMBuild +++ b/base/hdparm/hdparm.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/hdparm/files/hdparm/hdparm-$version.t desc="Hard disk information utility" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install DESTDIR=$pkg mandir="/share/man" sbindir="/bin" diff --git a/base/highlight/highlight.SMBuild b/base/highlight/highlight.SMBuild index 52b7399..a9aa76b 100755 --- a/base/highlight/highlight.SMBuild +++ b/base/highlight/highlight.SMBuild @@ -6,14 +6,16 @@ download="http://www.andre-simon.de/zip/highlight-$version.tar.bz2" desc="Universal syntax highlighter" requires="gcc-libs musl lua53 readline netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install PREFIX="/" DESTDIR=$pkg @@ -24,4 +26,4 @@ build() { sha512sums=" 173f05bd89523a26f4e950c829b74b01128842e9dc92563a09a62d7d244dcf5b1787d127c0468512614588fa05b9a1bfa817c3a725946cf48a7661451a5a0dfe highlight-4.0.tar.lz -" \ No newline at end of file +" diff --git a/base/htop/htop.SMBuild b/base/htop/htop.SMBuild index 63671e4..a96ef01 100755 --- a/base/htop/htop.SMBuild +++ b/base/htop/htop.SMBuild @@ -1,23 +1,30 @@ app=htop version=3.2.2 -build=1sml +build=2sml homepage="https://htop.dev/" download="https://github.com/$app-dev/$app/archive/refs/tags/$version.tar.gz" desc="ncurses-based interactive process viewer written in C" -requires="netbsd-curses" +requires="netbsd-curses libcap lm-sensors" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { + +# enabling unicode causes this error: +# Meter.c:415:54: error: 'cchar_t' {aka 'const struct '} has no member named 'attr' ./configure \ --prefix="" \ --bindir=/bin \ - --disable-unicode + --disable-unicode \ + --enable-sensors \ + --enable-capabilities make make install DESTDIR=$pkg @@ -28,5 +35,5 @@ build() { } sha512sums=" -59f3f06677076262e25a478552e4438ce37028e2f064d3fb78653d3213b48ae4d78c7e0d62ee785a4ed3c6c99b7faafd9afab94c4350a4e5c5843cef81aaf489 htop-3.2.2.tar.xz -" \ No newline at end of file +ffe7566c048d82d56e5cc57d96d8fd3fe78c8e7e04815690dfe8ebeb1197f3ebff31d76176c96b671b5d71c659dc305c2ac11137bf6c2013ce85dbdcdd7b53e8 htop-3.2.2.tar.lz +" diff --git a/base/hunspell/hunspell.SMBuild b/base/hunspell/hunspell.SMBuild index 968bd08..d29311c 100755 --- a/base/hunspell/hunspell.SMBuild +++ b/base/hunspell/hunspell.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/hunspell/hunspell/files/2573619/hunspell-$version.t desc="Spell checker based on OpenOffice.org myspell library" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/hyphen/hyphen.SMBuild b/base/hyphen/hyphen.SMBuild index 9fb3984..cb1aee9 100755 --- a/base/hyphen/hyphen.SMBuild +++ b/base/hyphen/hyphen.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-$ver desc="TeX hyphenation library" requires="perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/i2c-tools/i2c-tools.SMBuild b/base/i2c-tools/i2c-tools.SMBuild index 38a9a21..1b3ecca 100755 --- a/base/i2c-tools/i2c-tools.SMBuild +++ b/base/i2c-tools/i2c-tools.SMBuild @@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tools desc="Utilties to read and program data from I2C-protocol based sensors" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install PREFIX="/" mandir="/share/man" DESTDIR="$pkg" sbindir="/bin" diff --git a/base/icu/icu.SMBuild b/base/icu/icu.SMBuild index 1ed2184..a7e7216 100755 --- a/base/icu/icu.SMBuild +++ b/base/icu/icu.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/unicode-org/icu/releases/download/release-72-1/icu4 desc="International Components for Unicode" requires="gcc-libs python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app" @@ -14,7 +14,9 @@ build() { tar xf $srcdir/icu4c-$sversion-src.tar.lz cd icu fixbuilddirpermissions +} +build() { cd source CFLAGS="$CFLAGS" \ ./configure \ @@ -34,4 +36,4 @@ build() { sha512sums=" 2d4b77236520b97135d540da6a672795d45f3bf2b0b5cc924d178491761e1f16de6fa8ab5ab9726d2f81ba214c670f2ca2d2c44b59eccda6e9500f97b2b48b30 icu4c-72_1-src.tar.lz -" \ No newline at end of file +" diff --git a/base/id3lib/id3lib.SMBuild b/base/id3lib/id3lib.SMBuild index 2cb030d..a697e05 100755 --- a/base/id3lib/id3lib.SMBuild +++ b/base/id3lib/id3lib.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/id3lib/files/id3lib/$version/id3lib-$ desc="ID3 tag manipulation library" requires="gcc-libs zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -25,8 +25,9 @@ build() { aclocal autoconf automake --add-missing --copy +} - # TODO: disable static libs generation +build() { ./configure \ --prefix="" \ $builddist diff --git a/base/ijs/ijs.SMBuild b/base/ijs/ijs.SMBuild index d246014..f59044f 100755 --- a/base/ijs/ijs.SMBuild +++ b/base/ijs/ijs.SMBuild @@ -6,14 +6,16 @@ download="https://www.openprinting.org/download/ijs/download/ijs-$version.tar.bz desc="print library for transmission of raster page images" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --mandir=/share/man \ diff --git a/base/iniparser/iniparser.SMBuild b/base/iniparser/iniparser.SMBuild index cc990b8..9c58c42 100755 --- a/base/iniparser/iniparser.SMBuild +++ b/base/iniparser/iniparser.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/ndevilla/iniparser/archive/refs/tags/v$version.tar. desc="Stand-alone ini file parsing library written in ANSI C" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 644 src/iniparser.h $pkg/include/iniparser.h @@ -31,4 +33,4 @@ build() { sha512sums=" 19780c1bd520a867bf68cb2c156257fb45355b1677e3bc601fea64b5edb01f6b351ce9f6f68f0db56f962a7cc25a3c64008501d137c7c4fb2192ffacfeac595a iniparser-4.1.tar.lz -" \ No newline at end of file +" diff --git a/base/initfs/initfs.SMBuild b/base/initfs/initfs.SMBuild index e3b40f0..38fab8a 100755 --- a/base/initfs/initfs.SMBuild +++ b/base/initfs/initfs.SMBuild @@ -7,10 +7,12 @@ desc="initfs - initial file system hierarchy creator" requires="musl" disablepkgsymlinks=1 -build() { +prepbuilddir() { arch=noarch mkandenterbuilddir +} +build() { cd $pkg tar xf $srcdir/$app.tar.lz @@ -26,4 +28,4 @@ build() { sha512sums=" 85da0195b5e58c2b01f6ab91ed7a15ebff783325b08c5ed10722e6576974c1cedf55767eb30ccf58f41fc6c88171810ee63a0d7c7d09eb925c0572802d7754de initfs.tar.lz -" \ No newline at end of file +" diff --git a/base/initfs/initfs/etc/rc.d/rc.gtk.new b/base/initfs/initfs/etc/rc.d/rc.gtk.new index 7eca5cb..faf68e0 100755 --- a/base/initfs/initfs/etc/rc.d/rc.gtk.new +++ b/base/initfs/initfs/etc/rc.d/rc.gtk.new @@ -1,48 +1,64 @@ -#!/bin/sh +#!/bin/bash # Thank you slackware -if [ -x /bin/fc-cache ]; then - echo "Updating X font indexes..." - /bin/fc-cache -f & -fi +waitfile="/tmp/updatinggtkfile" -if [ -x /bin/update-desktop-database ]; then - echo "Updating .desktop files..." - /bin/update-desktop-database -q /share/applications >/dev/null 2>&1 -fi +if [[ -f $waitfile ]] ; then -if find /share/icons -maxdepth 2 2> /dev/null | grep -q icon-theme.cache ; then - for theme_dir in /share/icons/* ; do - echo "Updating icon-theme.cache in ${theme_dir}..." - /bin/gtk-update-icon-cache -t -f ${theme_dir} >/dev/null 2>&1 - done -fi + until [[ ! -f $waitfile ]] ; do + echo "Waiting for previous GTK cache modules to finish updating" + sleep 2 + done -if [ -x /bin/update-mime-database ]; then - echo "Updating MIME database..." - /bin/update-mime-database -n /share/mime >/dev/null 2>&1 & -fi +else -# Update immodules cache at /lib/gtk-2.0/2.10.0/immodules.cache -if [ -x /bin/gtk-query-immodules-2.0 ]; then - echo "Updating GTK2 Immodules..." - /bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 & -fi + touch "$waitfile" -# Update immodules cache at /lib/gtk-3.0/3.0.0/immodules.cache -if [ -x /bin/gtk-query-immodules-3.0 ]; then - echo "Updating GTK3 Immodules..." - /bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 & -fi + if [ -x /bin/fc-cache ]; then + echo "Updating X font indexes..." + /bin/fc-cache -f & + fi -if [ -x /bin/gdk-pixbuf-query-loaders ]; then - echo "Updating GDK Pixbuf loaders..." - /bin/gdk-pixbuf-query-loaders --update-cache >/dev/null 2>&1 & -fi + if [ -x /bin/update-desktop-database ]; then + echo "Updating .desktop files..." + /bin/update-desktop-database -q /share/applications >/dev/null 2>&1 + fi -if [ -x /bin/glib-compile-schemas ]; then - echo "Compiling GSettings XML scheme files..." - /bin/glib-compile-schemas share/glib-2.0/schemas >/dev/null 2>&1 & -fi + if find /share/icons -maxdepth 2 2> /dev/null | grep -q icon-theme.cache ; then + for theme_dir in /share/icons/* ; do + echo "Updating icon-theme.cache in ${theme_dir}..." + /bin/gtk-update-icon-cache -t -f ${theme_dir} >/dev/null 2>&1 + done + fi - exit 0 + if [ -x /bin/update-mime-database ]; then + echo "Updating MIME database..." + /bin/update-mime-database -n /share/mime >/dev/null 2>&1 & + fi + + # Update immodules cache at /lib/gtk-2.0/2.10.0/immodules.cache + if [ -x /bin/gtk-query-immodules-2.0 ]; then + echo "Updating GTK2 Immodules..." + /bin/gtk-query-immodules-2.0 --update-cache > /dev/null 2>&1 & + fi + + # Update immodules cache at /lib/gtk-3.0/3.0.0/immodules.cache + if [ -x /bin/gtk-query-immodules-3.0 ]; then + echo "Updating GTK3 Immodules..." + /bin/gtk-query-immodules-3.0 --update-cache > /dev/null 2>&1 & + fi + + if [ -x /bin/gdk-pixbuf-query-loaders ]; then + echo "Updating GDK Pixbuf loaders..." + /bin/gdk-pixbuf-query-loaders --update-cache >/dev/null 2>&1 & + fi + + if [ -x /bin/glib-compile-schemas ]; then + echo "Compiling GSettings XML scheme files..." + /bin/glib-compile-schemas /share/glib-2.0/schemas >/dev/null 2>&1 & + fi + + rm -f "$waitfile" + + exit 0 +fi diff --git a/base/intltool/intltool.SMBuild b/base/intltool/intltool.SMBuild index a5f4574..3826167 100755 --- a/base/intltool/intltool.SMBuild +++ b/base/intltool/intltool.SMBuild @@ -6,7 +6,7 @@ download="https://launchpad.net/intltool/trunk/$version/+download/intltool-$vers desc="Utilities for translation support" requires="perl-modules" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/intltool-regex-warning.patch +} +build() { ./configure \ --prefix="" @@ -30,4 +32,4 @@ build() { sha512sums=" 508b0daa47fca109032336cf0211a6d2f38a867d7a9565d0b73fedb49090dbb0f92119a2c16499da63524fb29e454d6c7d2fab4fcef11417c7b139a0d1504cd0 intltool-0.51.0.tar.lz 2ca20ba6ff0492cd7c816cca4c17bbf11281ae4c24bb4f70cfa92826ff2127036b8a07de5a61765becfd0ff506ca092e05ecd7a02b796ba92745459786e7ba03 intltool-regex-warning.patch -" \ No newline at end of file +" diff --git a/base/iptables/iptables.SMBuild b/base/iptables/iptables.SMBuild index cbb4fad..88ca00f 100755 --- a/base/iptables/iptables.SMBuild +++ b/base/iptables/iptables.SMBuild @@ -6,14 +6,16 @@ download="https://www.netfilter.org/projects/iptables/files/iptables-$version.ta desc="IP packet filter administration tool" requires="libpcap libnfnetlink libnetfilter_conntrack" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/base/iso-codes/iso-codes.SMBuild b/base/iso-codes/iso-codes.SMBuild index a9226b5..6e7516d 100755 --- a/base/iso-codes/iso-codes.SMBuild +++ b/base/iso-codes/iso-codes.SMBuild @@ -6,17 +6,20 @@ download="http://anduin.linuxfromscratch.org/BLFS/iso-codes/iso-codes-$version.t desc="ISO standards collection like language, language script and curreny names" requires="gettext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # this software is so stupid, it doesn't make a basic msgfmt file check, # which is part of gettext. if [ ! -x /bin/msgfmt ]; then + echo "ERROR! msgfmt, part of gettext, not found!" exit 1 fi diff --git a/base/itstool/itstool.SMBuild b/base/itstool/itstool.SMBuild index 7115512..65fe77f 100755 --- a/base/itstool/itstool.SMBuild +++ b/base/itstool/itstool.SMBuild @@ -6,14 +6,16 @@ download="http://files.itstool.org/itstool/itstool-$version.tar.bz2" desc="Translate XML documents with PO files" requires="python3 docbook" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/jam/jam.SMBuild b/base/jam/jam.SMBuild index 171fd51..384db05 100755 --- a/base/jam/jam.SMBuild +++ b/base/jam/jam.SMBuild @@ -6,7 +6,7 @@ download="" desc="Program construction tool like make" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version mkdir $app-$version @@ -14,7 +14,9 @@ build() { unzip $srcdir/$app-$version.zip fixbuilddirpermissions +} +build() { make ./jam0 -sBINDIR=$pkg/bin install diff --git a/base/jansson/jansson.SMBuild b/base/jansson/jansson.SMBuild index ed68413..f160515 100755 --- a/base/jansson/jansson.SMBuild +++ b/base/jansson/jansson.SMBuild @@ -6,14 +6,16 @@ download="https://digip.org/jansson/releases/jansson-2.13.tar.bz2" desc="library for encoding, decoding and manipulating JSON data" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/jbig2dec/jbig2dec.SMBuild b/base/jbig2dec/jbig2dec.SMBuild index 2f26974..bd70ec5 100755 --- a/base/jbig2dec/jbig2dec.SMBuild +++ b/base/jbig2dec/jbig2dec.SMBuild @@ -5,14 +5,16 @@ homepage="https://jbig2dec.com/" desc="JBIG2 decoder" requires="zlib libpng" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/json-c/json-c.SMBuild b/base/json-c/json-c.SMBuild index bb741c4..a93c175 100755 --- a/base/json-c/json-c.SMBuild +++ b/base/json-c/json-c.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/json-c/json-c/archive/refs/tags/json-c-$version-201 desc="JSON library in C" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/json-glib/json-glib.SMBuild b/base/json-glib/json-glib.SMBuild index 1e9424f..136f6da 100755 --- a/base/json-glib/json-glib.SMBuild +++ b/base/json-glib/json-glib.SMBuild @@ -5,14 +5,16 @@ homepage="https://wiki.gnome.org/Projects/JsonGlib" desc="Library for serialization and deserialization of JSON data" requires="gcc-libs libffi pcre glib util-linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. --prefix="/" \ -Dintrospection=false diff --git a/base/kbd/kbd.SMBuild b/base/kbd/kbd.SMBuild index b35c792..c2a4d94 100755 --- a/base/kbd/kbd.SMBuild +++ b/base/kbd/kbd.SMBuild @@ -6,13 +6,16 @@ download="https://ftp.iij.ad.jp/pub/linux/kernel/linux/utils/kbd/kbd-$version.ta desc="utility to change console fonts and keyborad mappings" requires="busybox" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { cp $srcdir/config.h src/ cp $srcdir/config.h src/libkeymap/ diff --git a/base/kernel-headers/kernel-headers.SMBuild b/base/kernel-headers/kernel-headers.SMBuild index 4e0414c..1c523db 100755 --- a/base/kernel-headers/kernel-headers.SMBuild +++ b/base/kernel-headers/kernel-headers.SMBuild @@ -6,7 +6,7 @@ download="http://ftp.barfooze.de/pub/sabotage/tarballs/linux-headers-$version.ta desc="Musl-compatible header files for the Linux kernel" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf linux-headers-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/ptrace.h.patch +} +build() { make ARCH="$arch" prefix="/" DESTDIR=$pkg install cp -r generic/include $pkg/ @@ -25,4 +27,4 @@ build() { sha512sums=" 5a975ba49b577869f2338aa80f44efd4e94f76e5b4bda11a6a1761a6d646848fdeaad7c820339b2c1c20d55f9bbf0e686121d621ac1cfa1dfc6cd71a166ade3a linux-headers-4.19.88.tar.xz 185d627c8704cfdf423e7bcd16d54046d857457fd24ad087d6ad8cd768e5dcb9b8e19e688348afec233d54c5e85106e1d7246cd7cd0413865feb488d2ca64d7b ptrace.h.patch -" \ No newline at end of file +" diff --git a/base/kernel-source/kernel-source.SMBuild b/base/kernel-source/kernel-source.SMBuild index c25ea09..30fd882 100755 --- a/base/kernel-source/kernel-source.SMBuild +++ b/base/kernel-source/kernel-source.SMBuild @@ -6,13 +6,15 @@ homepage="https://www.kernel.org" desc="source code for the Linux kernel" aarchversion=5.4.51 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf linux-$version tar xf $srcdir/linux-$version.tar.?z* fixbuilddirpermissions +} +build() { if [ "$HOSTTYPE" = "x86_64" ] ; then zcat $srcdir/kernelconfig-huge-$version.gz > linux-$version/.config install -Dm 644 $srcdir/README $pkg/doc/$app-$version/README diff --git a/base/keyutils/keyutils.SMBuild b/base/keyutils/keyutils.SMBuild index 5ce9cc2..c7ffb68 100755 --- a/base/keyutils/keyutils.SMBuild +++ b/base/keyutils/keyutils.SMBuild @@ -5,14 +5,16 @@ homepage="http://people.redhat.com/~dhowells/keyutils/" desc="Kernel key management utilities" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make -j1 NO_ARLIB=1 \ LIBDIR=/lib \ USRLIBDIR=/lib \ diff --git a/base/kmod/kmod.SMBuild b/base/kmod/kmod.SMBuild index b5fb93d..db514e1 100755 --- a/base/kmod/kmod.SMBuild +++ b/base/kmod/kmod.SMBuild @@ -6,7 +6,7 @@ download="https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/kmod-$vers desc="Kernel module tools and library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/strndupa.patch +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/base/lame/lame.SMBuild b/base/lame/lame.SMBuild index 6daafb0..2024751 100755 --- a/base/lame/lame.SMBuild +++ b/base/lame/lame.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/lame/files/lame/$version/lame-$versio desc="MP3 compression and creation library" requires="netbsd-curses nasm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LIBS="-lcurses -lterminfo" \ ./configure \ --prefix="" \ diff --git a/base/less/less.SMBuild b/base/less/less.SMBuild index e140e29..c17112a 100755 --- a/base/less/less.SMBuild +++ b/base/less/less.SMBuild @@ -6,7 +6,7 @@ download="https://www.greenwoodsoftware.com/less/less-$version.tar.gz" desc="File pager similar to more" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/less.patch applypatch $srcdir/less-implicit.patch +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" \ diff --git a/base/libaio/libaio.SMBuild b/base/libaio/libaio.SMBuild index aec9005..3d9b97f 100755 --- a/base/libaio/libaio.SMBuild +++ b/base/libaio/libaio.SMBuild @@ -6,14 +6,16 @@ download="https://releases.pagure.org/libaio/libaio-$version.tar.gz" desc="Asynchronous I/O library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make prefix="$pkg" libdir=$pkg/lib install diff --git a/base/libao/libao.SMBuild b/base/libao/libao.SMBuild index 638362f..c5bb557 100755 --- a/base/libao/libao.SMBuild +++ b/base/libao/libao.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.xiph.org/releases/ao/libao-$version.tar.gz" desc="Audio Output library" requires="musl gcc-libs alsa-lib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/libarchive/libarchive.SMBuild b/base/libarchive/libarchive.SMBuild index 9ee2f93..745625c 100755 --- a/base/libarchive/libarchive.SMBuild +++ b/base/libarchive/libarchive.SMBuild @@ -6,14 +6,16 @@ download="https://www.libarchive.org/downloads/libarchive-$version.tar.gz" desc="archive reading library" requires="bzip2 expat zlib xz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --with-pic \ @@ -33,4 +35,4 @@ build() { sha512sums=" 59071e5d6e9a2cf661899d0610c4359c91590a313b46e16e7885e8d888b6b6ee3a3f6dc8ef431c02d6cc2615705479ecd2ae394da934f376d034a6e2def83849 libarchive-3.6.2.tar.lz -" \ No newline at end of file +" diff --git a/base/libasr/libasr.SMBuild b/base/libasr/libasr.SMBuild index aa93d80..227bd9a 100755 --- a/base/libasr/libasr.SMBuild +++ b/base/libasr/libasr.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/OpenSMTPD/libasr/archive/refs/tags/$version.tar.gz" desc="ASyncronous Resolver library" requires="musl openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libassuan/libassuan.SMBuild b/base/libassuan/libassuan.SMBuild index 03d6e3a..f23197d 100755 --- a/base/libassuan/libassuan.SMBuild +++ b/base/libassuan/libassuan.SMBuild @@ -6,14 +6,16 @@ download="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-$version.tar.bz2" desc="Interprocess Communication Library for GPG" requires="libgpg-error" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libatasmart/libatasmart.SMBuild b/base/libatasmart/libatasmart.SMBuild index ff874cf..037b0c4 100755 --- a/base/libatasmart/libatasmart.SMBuild +++ b/base/libatasmart/libatasmart.SMBuild @@ -6,14 +6,16 @@ download="https://0pointer.de/public/libatasmart-$version.tar.xz" desc="ATA S.M.A.R.T reading and parsing library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -28,4 +30,4 @@ build() { sha512sums=" 82244f9915ef15f9332a71ad945bcf6ce1c75a07f068d6ad925f6dcffbf7dc375e44a48f9705fbfa6ce6c8c3e10bfdc56f41a0d91670253f623421a916dfa343 libatasmart-0.19.tar.lz -" \ No newline at end of file +" diff --git a/base/libblockdev/libblockdev.SMBuild b/base/libblockdev/libblockdev.SMBuild index 2ff14b6..be74cb4 100755 --- a/base/libblockdev/libblockdev.SMBuild +++ b/base/libblockdev/libblockdev.SMBuild @@ -6,14 +6,16 @@ download="http://github.com/storaged-project/libblockdev/archive/refs/tags/2.26- desc="library for manipulating block devices" requires="libbytesize libyaml dmraid" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libbytesize/libbytesize.SMBuild b/base/libbytesize/libbytesize.SMBuild index ef65f06..40bf114 100755 --- a/base/libbytesize/libbytesize.SMBuild +++ b/base/libbytesize/libbytesize.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/storaged-project/libbytesize/archive/refs/tags/$ver desc="Library for working with big sizes in bytes" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions NOCONFIGURE=1 ./autogen.sh +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libcap-ng/libcap-ng.SMBuild b/base/libcap-ng/libcap-ng.SMBuild index d4ebe20..226380c 100755 --- a/base/libcap-ng/libcap-ng.SMBuild +++ b/base/libcap-ng/libcap-ng.SMBuild @@ -6,14 +6,16 @@ download="https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-$version.tar.gz" desc="Capabilities library and utilities" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no \ diff --git a/base/libcap/libcap.SMBuild b/base/libcap/libcap.SMBuild index 8e83fed..8a4168a 100755 --- a/base/libcap/libcap.SMBuild +++ b/base/libcap/libcap.SMBuild @@ -1,12 +1,13 @@ app=libcap -version=2.26 +version=2.67 build=1sml homepage="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/" download="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$version.tar.xz" desc="library to get/set POSIX capabilities" requires="musl" +preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,21 +15,22 @@ build() { cd $app-$version fixbuilddirpermissions - sed -i 's,BUILD_GPERF := ,BUILD_GPERF := no #,' Make.Rules + #sed -i 's,BUILD_GPERF := ,BUILD_GPERF := no #,' Make.Rules - cp $srcdir/libcap2-cap_names.h libcap/cap_names.h - touch libcap/cap_names.list.h libcap/_makenames libcap/cap_names.h + #cp $srcdir/libcap2-cap_names.h libcap/cap_names.h + #touch libcap/cap_names.list.h libcap/_makenames libcap/cap_names.h +} +build() { make prefix="" man_prefix=/share/man lib=lib CFLAGS="$CFLAGS" \ BUILD_CC="$CC" - make RAISE_SETFCAP=no FAKEROOT=$pkg prefix="" man_prefix=/share/man \ - SBINDIR=/bin lib=lib install + make FAKEROOT=$pkg prefix="" man_prefix=/share/man SBINDIR=/bin lib=lib install LIBDIR=$pkg/lib SBINDIR=$pkg/bin - LD_LIBRARY_PATH=${LIBDIR} ${SBINDIR}/setcap cap_setfacap=i ${SBINDIR}/setcap || echo "oops" + #LD_LIBRARY_PATH=${LIBDIR} ${SBINDIR}/setcap cap_setfacap=i ${SBINDIR}/setcap || echo "oops" cp License $pkgdocs/ @@ -36,6 +38,5 @@ build() { } sha512sums=" -e40340d6a10bb9e935c9112e6ec3274d2b7ce79e3da23bf49fa575b381a21678597a2a1a2dee5732590700634fca5fa18c68ea98e8558dfdd12397247b72c395 libcap-2.26.tar.lz -75e8856399e8007424c1130eecebc4db05abda0ece9fa7533ad674e8f67e34122036238cc950f93b7711877a9b5abab0c46c71253e0a06d8cd7558e149e1baf9 libcap2-cap_names.h +f5874540006c2a00e77bcaf55ac5f0c111f710a779e9bdbe8e4c165e729eb8709841819d6540cc86719d3246a9b8d44e3e035fcc1961378afd16fdbb3f47603c libcap-2.67.tar.lz " diff --git a/base/libcap/libcap2-cap_names.h b/base/libcap/libcap2-cap_names.h deleted file mode 100644 index b97c336..0000000 --- a/base/libcap/libcap2-cap_names.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * DO NOT EDIT: this file is generated automatically from - * - * - */ -#define __CAP_BITS 38 - -#ifdef LIBCAP_PLEASE_INCLUDE_ARRAY - char const *_cap_names[__CAP_BITS] = { - /* 0 */ "cap_chown", - /* 1 */ "cap_dac_override", - /* 2 */ "cap_dac_read_search", - /* 3 */ "cap_fowner", - /* 4 */ "cap_fsetid", - /* 5 */ "cap_kill", - /* 6 */ "cap_setgid", - /* 7 */ "cap_setuid", - /* 8 */ "cap_setpcap", - /* 9 */ "cap_linux_immutable", - /* 10 */ "cap_net_bind_service", - /* 11 */ "cap_net_broadcast", - /* 12 */ "cap_net_admin", - /* 13 */ "cap_net_raw", - /* 14 */ "cap_ipc_lock", - /* 15 */ "cap_ipc_owner", - /* 16 */ "cap_sys_module", - /* 17 */ "cap_sys_rawio", - /* 18 */ "cap_sys_chroot", - /* 19 */ "cap_sys_ptrace", - /* 20 */ "cap_sys_pacct", - /* 21 */ "cap_sys_admin", - /* 22 */ "cap_sys_boot", - /* 23 */ "cap_sys_nice", - /* 24 */ "cap_sys_resource", - /* 25 */ "cap_sys_time", - /* 26 */ "cap_sys_tty_config", - /* 27 */ "cap_mknod", - /* 28 */ "cap_lease", - /* 29 */ "cap_audit_write", - /* 30 */ "cap_audit_control", - /* 31 */ "cap_setfcap", - /* 32 */ "cap_mac_override", - /* 33 */ "cap_mac_admin", - /* 34 */ "cap_syslog", - /* 35 */ "cap_wake_alarm", - /* 36 */ "cap_block_suspend", - /* 37 */ "cap_audit_read", - }; -#endif /* LIBCAP_PLEASE_INCLUDE_ARRAY */ - -/* END OF FILE */ diff --git a/base/libcddb/libcddb.SMBuild b/base/libcddb/libcddb.SMBuild index 4cebbbf..d431d99 100755 --- a/base/libcddb/libcddb.SMBuild +++ b/base/libcddb/libcddb.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/libcddb/files/libcddb/$version/libcdd desc="library to access CDDB data from different protocols such as CDDBP, HTTP, SMTP" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libcdio-paranoia/libcdio-paranoia.SMBuild b/base/libcdio-paranoia/libcdio-paranoia.SMBuild index e688766..6b7c46b 100755 --- a/base/libcdio-paranoia/libcdio-paranoia.SMBuild +++ b/base/libcdio-paranoia/libcdio-paranoia.SMBuild @@ -6,14 +6,16 @@ homepage="https://www.gnu.org/software/libcdio/" desc="Supporting library to libcdio for CD-ROM access" requires="libcdio" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version$longversion tar xf $srcdir/$app-$version$longversion.tar.?z* cd $app-$version$longversion fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-cpp-progs \ diff --git a/base/libcdio/libcdio.SMBuild b/base/libcdio/libcdio.SMBuild index ab4dc1a..dc4d538 100755 --- a/base/libcdio/libcdio.SMBuild +++ b/base/libcdio/libcdio.SMBuild @@ -6,14 +6,16 @@ download="http://git.savannah.gnu.org/cgit/libcdio.git/snapshot/libcdio-release- desc="Library to access data from various CD-ROM image formats" requires="gcc-libs netbsd-curses libcddb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-vcd-info \ diff --git a/base/libcroco/libcroco.SMBuild b/base/libcroco/libcroco.SMBuild index 4570b1d..4c8bfbc 100755 --- a/base/libcroco/libcroco.SMBuild +++ b/base/libcroco/libcroco.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.gnome.org/GNOME/libcroco" desc="CSS2 parsing and manipulation library" requires="zlib pcre glib libxml2 xz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libcue/libcue.SMBuild b/base/libcue/libcue.SMBuild index 4822a9a..ffd2817 100755 --- a/base/libcue/libcue.SMBuild +++ b/base/libcue/libcue.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/lipnitsk/libcue/archive/refs/tags/v$version.tar.gz" desc="Library to parse and extract data from CUE sheets" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { mkdir -p smbuild && cd smbuild cmake .. \ diff --git a/base/libdaemon/libdaemon.SMBuild b/base/libdaemon/libdaemon.SMBuild index 5c2e9d4..3cad242 100755 --- a/base/libdaemon/libdaemon.SMBuild +++ b/base/libdaemon/libdaemon.SMBuild @@ -6,7 +6,7 @@ download="http://0pointer.de/lennart/projects/libdaemon/libdaemon-$version.tar.g desc="Lightweight library for writing Unix daemons" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/libdaemon-0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libelf-compat/libelf-compat.SMBuild b/base/libelf-compat/libelf-compat.SMBuild index 32eda41..ca76703 100755 --- a/base/libelf-compat/libelf-compat.SMBuild +++ b/base/libelf-compat/libelf-compat.SMBuild @@ -5,14 +5,16 @@ homepage="https://sourceware.org/elfutils/" desc="library for manipulating ELF headers" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { echo "CFLAGS += $CFLAGS -fPIC" > config.mak sed -i 's@HEADERS = src/libelf.h@HEADERS = src/libelf.h src/gelf.h@' Makefile diff --git a/base/libetpan/libetpan.SMBuild b/base/libetpan/libetpan.SMBuild index d8b0a07..3969d7b 100755 --- a/base/libetpan/libetpan.SMBuild +++ b/base/libetpan/libetpan.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/dinhvh/libetpan/archive/refs/tags/$version.tar.gz" desc="Middleware library providing various APIs to access mail" requires="gcc-libs db expat curl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libevent/libevent.SMBuild b/base/libevent/libevent.SMBuild index 65a52ba..34c771f 100755 --- a/base/libevent/libevent.SMBuild +++ b/base/libevent/libevent.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libevent/libevent/releases/download/release-$versio desc="event loop library" requires="openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app-$version-stable" tar xf $srcdir/$app-$version-stable.tar.?z cd "$app-$version-stable" fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libexif/libexif.SMBuild b/base/libexif/libexif.SMBuild index f2d29e1..844f45f 100755 --- a/base/libexif/libexif.SMBuild +++ b/base/libexif/libexif.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/libexif/libexif/releases/download/libexif-$mversion desc="Exchangeable Image File Format library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libffi/libffi.SMBuild b/base/libffi/libffi.SMBuild index fa27bcf..f4e1d5f 100755 --- a/base/libffi/libffi.SMBuild +++ b/base/libffi/libffi.SMBuild @@ -6,14 +6,16 @@ download="ftp://sourceware.org/pub/libffi/libffi-$version.tar.gz" desc="A Portable Foreign Function Interface Library" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libgc/libgc.SMBuild b/base/libgc/libgc.SMBuild index 5548785..43b9f16 100755 --- a/base/libgc/libgc.SMBuild +++ b/base/libgc/libgc.SMBuild @@ -6,14 +6,16 @@ download="https://www.hboehm.info/gc/gc_source/gc-$version.tar.gz" desc="Conservative garbage collector for C and C++" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf gc-$version tar xf $srcdir/gc-$version.tar.?z* cd gc-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-cplusplus \ diff --git a/base/libgcrypt/libgcrypt.SMBuild b/base/libgcrypt/libgcrypt.SMBuild index 3478d4e..b31403d 100755 --- a/base/libgcrypt/libgcrypt.SMBuild +++ b/base/libgcrypt/libgcrypt.SMBuild @@ -6,14 +6,16 @@ download="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$version.tar.bz2" desc="General purpose crypto library based on GnuPG" requires="libgpg-error" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared=yes \ diff --git a/base/libgit2/libgit2.SMBuild b/base/libgit2/libgit2.SMBuild index 3a7e79c..4c6a45b 100755 --- a/base/libgit2/libgit2.SMBuild +++ b/base/libgit2/libgit2.SMBuild @@ -6,13 +6,16 @@ download="https://github.com/libgit2/libgit2/releases/download/v1.0.1/libgit2-1. desc="C library for custom Git applications" requires="pcre libssh2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { mkdir -p smbuild && cd smbuild cmake .. \ diff --git a/base/libgpg-error/libgpg-error.SMBuild b/base/libgpg-error/libgpg-error.SMBuild index 1fdf827..29a74e9 100755 --- a/base/libgpg-error/libgpg-error.SMBuild +++ b/base/libgpg-error/libgpg-error.SMBuild @@ -6,13 +6,16 @@ download="https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-$version.ta desc="library that provides common error values and functions for all GnuPG components" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/base/libical/libical.SMBuild b/base/libical/libical.SMBuild index bd76fc1..a5d7a54 100755 --- a/base/libical/libical.SMBuild +++ b/base/libical/libical.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/libical/libical/archive/refs/tags/v$version.tar.gz" desc="iCAL calendaring and scheduling protocol implementation" requires="gcc-libs icu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { # Thanks gentoo linux applypatch $srcdir/icu-68.patch - +} + +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/libid3tag/libid3tag.SMBuild b/base/libid3tag/libid3tag.SMBuild index ab24be8..75bd08b 100755 --- a/base/libid3tag/libid3tag.SMBuild +++ b/base/libid3tag/libid3tag.SMBuild @@ -5,7 +5,7 @@ homepage="https://sourceforge.net/projects/mad/files/libid3tag/" desc="library for reading ID3 tags" requires="zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/CVE-2008-2109.patch +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libidn2/libidn2.SMBuild b/base/libidn2/libidn2.SMBuild index 958bb07..9692556 100755 --- a/base/libidn2/libidn2.SMBuild +++ b/base/libidn2/libidn2.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.com/libidn/libidn2" desc="GNU Internationalized Domain Name library" requires="libunistring" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libjpeg-turbo/libjpeg-turbo.SMBuild b/base/libjpeg-turbo/libjpeg-turbo.SMBuild index 4dabf28..1912b6f 100755 --- a/base/libjpeg-turbo/libjpeg-turbo.SMBuild +++ b/base/libjpeg-turbo/libjpeg-turbo.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/libjpeg-turbo/libjpeg-turbo" desc="JPEG library on steroids" requires="nasm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/libkate/libkate.SMBuild b/base/libkate/libkate.SMBuild index 7ce9550..791deac 100755 --- a/base/libkate/libkate.SMBuild +++ b/base/libkate/libkate.SMBuild @@ -5,7 +5,7 @@ homepage="https://wiki.xiph.org/OggKate" desc="Codec providing karaoke and text support in Ogg" requires="libogg libpng python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { libtoolize --copy --force aclocal automake --add-missing --copy --force-missing +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libksba/libksba.SMBuild b/base/libksba/libksba.SMBuild index f1abeae..ee24b49 100755 --- a/base/libksba/libksba.SMBuild +++ b/base/libksba/libksba.SMBuild @@ -5,14 +5,16 @@ homepage="https://gnupg.org/software/libksba/index.html" desc="X.509 & CMS library for S/MIME and TLS" requires="libgpg-error" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared=yes \ diff --git a/base/libminizip/libminizip.SMBuild b/base/libminizip/libminizip.SMBuild index ddb9a60..3c0272c 100755 --- a/base/libminizip/libminizip.SMBuild +++ b/base/libminizip/libminizip.SMBuild @@ -5,7 +5,7 @@ homepage="https://www.zlib.net" desc="Zip compression and decompression library" requires="zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf zlib-$version @@ -18,7 +18,9 @@ build() { aclocal autoconf automake --add-missing +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libmms/libmms.SMBuild b/base/libmms/libmms.SMBuild index dd0fd3c..26aa978 100755 --- a/base/libmms/libmms.SMBuild +++ b/base/libmms/libmms.SMBuild @@ -5,14 +5,16 @@ homepage="https://sourceforge.net/projects/libmms/" desc="Video library for parsing mms and mmsh video streams" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libmnl/libmnl.SMBuild b/base/libmnl/libmnl.SMBuild index 5517cd6..f7ec157 100755 --- a/base/libmnl/libmnl.SMBuild +++ b/base/libmnl/libmnl.SMBuild @@ -6,14 +6,16 @@ download="https://www.netfilter.org/pub/libmnl/libmnl-$version.tar.bz" desc="User-space library oriented to Netlink developers" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libmodplug/libmodplug.SMBuild b/base/libmodplug/libmodplug.SMBuild index 4277cc8..ca1f1f7 100755 --- a/base/libmodplug/libmodplug.SMBuild +++ b/base/libmodplug/libmodplug.SMBuild @@ -5,14 +5,16 @@ homepage="http://modplug-xmms.sourceforge.net/" desc="library for the modplug sound engine" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libmtp/libmtp.SMBuild b/base/libmtp/libmtp.SMBuild index 731cde0..3017e88 100755 --- a/base/libmtp/libmtp.SMBuild +++ b/base/libmtp/libmtp.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/libmtp/libmtp" desc="Library for communicating with MTP devices" requires="libgpg-error libgcrypt eudev libusb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libmypaint/libmypaint.SMBuild b/base/libmypaint/libmypaint.SMBuild index b6bff8b..472a5ca 100755 --- a/base/libmypaint/libmypaint.SMBuild +++ b/base/libmypaint/libmypaint.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/mypaint/libmypaint" desc="Library for making brushstrokes used by MyPaint and others" requires="glib json-c json-glib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-introspection diff --git a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild index 0470d66..a79e51d 100755 --- a/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild +++ b/base/libnetfilter-conntrack/libnetfilter-conntrack.SMBuild @@ -5,14 +5,16 @@ homepage="https://www.netfilter.org/projects/libnetfilter_conntrack/index.html" desc="Library for in-kernel connection tracking used by iptables and others" requires="libmnl libnfnetlink" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libnetfilter_conntrack-$version tar xf $srcdir/libnetfilter_conntrack-$version.tar.?z* cd libnetfilter_conntrack-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libnfnetlink/libnfnetlink.SMBuild b/base/libnfnetlink/libnfnetlink.SMBuild index 4b68b85..c7c95c6 100755 --- a/base/libnfnetlink/libnfnetlink.SMBuild +++ b/base/libnfnetlink/libnfnetlink.SMBuild @@ -5,7 +5,7 @@ homepage="https://www.netfilter.org/projects/libnfnetlink/index.html" desc="Library for netfilter kernel/userspace communications" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/musl-fix-includes.patch +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libnfs/libnfs.SMBuild b/base/libnfs/libnfs.SMBuild index f573c81..41fd918 100755 --- a/base/libnfs/libnfs.SMBuild +++ b/base/libnfs/libnfs.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/sahlberg/libnfs" desc="Client library for accessing NFS shares" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libnl/libnl.SMBuild b/base/libnl/libnl.SMBuild index f2f9f18..c2d2bc0 100755 --- a/base/libnl/libnl.SMBuild +++ b/base/libnl/libnl.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/thom311/libnl" desc="Netlink Protocol Library Suite version 3" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libogg/libogg.SMBuild b/base/libogg/libogg.SMBuild index 0b55710..a3a3522 100755 --- a/base/libogg/libogg.SMBuild +++ b/base/libogg/libogg.SMBuild @@ -5,14 +5,16 @@ homepage="https://xiph.org/ogg/" desc="Library for manipulating ogg bitstreams" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libopenal/libopenal.SMBuild b/base/libopenal/libopenal.SMBuild index 114d50e..b69a870 100755 --- a/base/libopenal/libopenal.SMBuild +++ b/base/libopenal/libopenal.SMBuild @@ -5,14 +5,16 @@ homepage="https://openal-soft.org/" desc="Cross-platform 3D audio API" requires="gcc-libs nettle libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf openal-soft-$version tar xf $srcdir/openal-soft-$version.tar.?z* cd openal-soft-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/libpcap/libpcap.SMBuild b/base/libpcap/libpcap.SMBuild index 8edffad..ed4b36c 100755 --- a/base/libpcap/libpcap.SMBuild +++ b/base/libpcap/libpcap.SMBuild @@ -6,14 +6,16 @@ download="https://www.tcpdump.org/release/libpcap-$version.tar.gz" desc="packet capture library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -D_BSD_SOURCE -DIPPROTO_HOPOPTS=0 -include limits.h" \ ac_cv_type_u_int64_t=yes \ ./configure \ diff --git a/base/libplist/libplist.SMBuild b/base/libplist/libplist.SMBuild index a1e80e3..c3a2230 100755 --- a/base/libplist/libplist.SMBuild +++ b/base/libplist/libplist.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/libimobiledevice/libplist/archive/refs/tags/$versio desc="A library for Apple Binary and XML Property Lists" requires="glib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,6 +15,9 @@ build() { fixbuilddirpermissions NOCONFIGURE=1 ./autogen.sh +} + +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libpng/libpng.SMBuild b/base/libpng/libpng.SMBuild index 1a2b4ca..eee516d 100755 --- a/base/libpng/libpng.SMBuild +++ b/base/libpng/libpng.SMBuild @@ -6,14 +6,16 @@ download="https://download.sourceforge.net/libpng/libpng-$version.tar.xz" desc="Portable Network Graphics library" requires="zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libpsl/libpsl.SMBuild b/base/libpsl/libpsl.SMBuild index fc6f864..c4af883 100755 --- a/base/libpsl/libpsl.SMBuild +++ b/base/libpsl/libpsl.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0 desc="Library for accessing and resolving uncommon domain name suffixes" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libpthread-stubs/libpthread-stubs.SMBuild b/base/libpthread-stubs/libpthread-stubs.SMBuild index b7d922c..ff6c2a4 100755 --- a/base/libpthread-stubs/libpthread-stubs.SMBuild +++ b/base/libpthread-stubs/libpthread-stubs.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.freedesktop.org/xorg/lib/pthread-stubs" desc="Library providing weak aliases for pthread functions" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/base/libqalculate/libqalculate.SMBuild b/base/libqalculate/libqalculate.SMBuild index 28d09c8..aa38ab1 100755 --- a/base/libqalculate/libqalculate.SMBuild +++ b/base/libqalculate/libqalculate.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Qalculate/libqalculate/releases/download/v$version/ desc="Provides functions for a multi-purpose calculator" requires="libxml2 curl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -26,7 +28,6 @@ build() { mkfinalpkg } - sha512sums=" 1a72e9338716481c882e108e9b2c148288dd7c507f353067a9b65d7cb962ac01876fe59b8b760a63cfc46349ccfc1d91ff39a0d6610f66439d7619cb2e648832 libqalculate-4.0.0.tar.lz -" \ No newline at end of file +" diff --git a/base/libsamplerate/libsamplerate.SMBuild b/base/libsamplerate/libsamplerate.SMBuild index 188e1ce..3e9063e 100755 --- a/base/libsamplerate/libsamplerate.SMBuild +++ b/base/libsamplerate/libsamplerate.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libsndfile/libsamplerate/archive/refs/tags/$version desc="library for performing sample rate conversion of audio data" requires="alsa-lib libsndfile libogg libvorbis flac" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libseccomp/libseccomp.SMBuild b/base/libseccomp/libseccomp.SMBuild index fb19a3c..40a1e32 100755 --- a/base/libseccomp/libseccomp.SMBuild +++ b/base/libseccomp/libseccomp.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/seccomp/libseccomp/releases/download/v$version/libs desc="library providing easy and independent interface to kernel syscall filtering mechanism" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libsecret/libsecret.SMBuild b/base/libsecret/libsecret.SMBuild index 9f86092..2adfcb3 100755 --- a/base/libsecret/libsecret.SMBuild +++ b/base/libsecret/libsecret.SMBuild @@ -6,13 +6,16 @@ download="https://download.gnome.org/sources/libsecret/0.20/libsecret-$version.t desc="GObject based library to access the Secret Service API" requires="libgcrypt glib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/base/libshout/libshout.SMBuild b/base/libshout/libshout.SMBuild index 2a4fd5b..2cd778d 100755 --- a/base/libshout/libshout.SMBuild +++ b/base/libshout/libshout.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.osuosl.org/pub/xiph/releases/libshout/libshout-$version.ta desc="icecast server library" requires="libtheora" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libsndfile/libsndfile.SMBuild b/base/libsndfile/libsndfile.SMBuild index dce3332..5ebaea2 100755 --- a/base/libsndfile/libsndfile.SMBuild +++ b/base/libsndfile/libsndfile.SMBuild @@ -6,14 +6,16 @@ download="http://www.mega-nerd.com/libsndfile/files/libsndfile-$version.tar.gz" desc="C library for reading and writing wav files" requires="alsa-lib libogg libvorbis" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libsodium/libsodium.SMBuild b/base/libsodium/libsodium.SMBuild index 30ca297..ba2a7e7 100755 --- a/base/libsodium/libsodium.SMBuild +++ b/base/libsodium/libsodium.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/jedisct1/libsodium/archive/refs/tags/$version.tar.g desc="easy-to-use crypto library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ac_cv_tls=__thread \ ax_cv_check_cflags___ftls_model_local_dynamic=no \ ./configure \ diff --git a/base/libssh2/libssh2.SMBuild b/base/libssh2/libssh2.SMBuild index dc329b9..9064bcd 100755 --- a/base/libssh2/libssh2.SMBuild +++ b/base/libssh2/libssh2.SMBuild @@ -6,14 +6,16 @@ download="https://www.libssh2.org/download/libssh2-$version.tar.gz" desc="SSH2 library" requires="zlib openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no diff --git a/base/libtasn1/libtasn1.SMBuild b/base/libtasn1/libtasn1.SMBuild index 9047f46..1085cc0 100755 --- a/base/libtasn1/libtasn1.SMBuild +++ b/base/libtasn1/libtasn1.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/libtasn1/libtasn1-$version.tar.gz" desc="Provides ASN.1 library used by GnuTLS and other crypto apps" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libtheora/libtheora.SMBuild b/base/libtheora/libtheora.SMBuild index 1e8a57f..eda4105 100755 --- a/base/libtheora/libtheora.SMBuild +++ b/base/libtheora/libtheora.SMBuild @@ -6,7 +6,7 @@ download="http://downloads.xiph.org/releases/theora/libtheora-$version.tar.bz2" desc="Theora video codec library" requires="libogg libvorbis" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/libpng16.patch +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libtirpc/libtirpc.SMBuild b/base/libtirpc/libtirpc.SMBuild index 3024d37..0a096ac 100755 --- a/base/libtirpc/libtirpc.SMBuild +++ b/base/libtirpc/libtirpc.SMBuild @@ -6,7 +6,7 @@ download="https://downloads.sourceforge.net/libtirpc/libtirpc-$version.tar.bz2" desc="Transport-Independent RPC library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/soname-suffix.patch +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libtool/libtool.SMBuild b/base/libtool/libtool.SMBuild index 31da679..892c074 100755 --- a/base/libtool/libtool.SMBuild +++ b/base/libtool/libtool.SMBuild @@ -6,14 +6,16 @@ download="https://mirror.squ.edu.om/gnu/libtool/libtool-$version.tar.xz" desc="Generic library support script" requires="musl m4" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libtorrent/libtorrent.SMBuild b/base/libtorrent/libtorrent.SMBuild index 96d4066..a87eccf 100755 --- a/base/libtorrent/libtorrent.SMBuild +++ b/base/libtorrent/libtorrent.SMBuild @@ -6,15 +6,16 @@ download="https://github.com/rakshasa/libtorrent/archive/refs/tags/v$version.tar desc="C++ torrent library with focus on high performance and good code" requires="gcc-libs zlib openssl" - -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-debug \ diff --git a/base/libunistring/libunistring.SMBuild b/base/libunistring/libunistring.SMBuild index a9852c5..8964e43 100755 --- a/base/libunistring/libunistring.SMBuild +++ b/base/libunistring/libunistring.SMBuild @@ -6,13 +6,16 @@ download="https://ftp.gnu.org/gnu/libunistring/libunistring-$version.tar.gz" desc="GNU Unicode string manipulating library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/base/libusb/libusb.SMBuild b/base/libusb/libusb.SMBuild index 039ebf1..39b7706 100755 --- a/base/libusb/libusb.SMBuild +++ b/base/libusb/libusb.SMBuild @@ -6,13 +6,16 @@ download="https://github.com/libusb/libusb/releases/download/v$version/libusb-$v desc="Library for userspace applications to access USB subsystem and devices" requires="eudev" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/base/libuv/libuv.SMBuild b/base/libuv/libuv.SMBuild index 9e93d16..8d1e3a8 100755 --- a/base/libuv/libuv.SMBuild +++ b/base/libuv/libuv.SMBuild @@ -6,13 +6,16 @@ download="https://github.com/libuv/libuv/archive/refs/tags/v$version.tar.gz" desc="multi-platform library with a focus on asychronous I/O" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-v"$version" tar xf $srcdir/$app-v"$version".tar.?z* cd $app-v"$version" fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/base/libvncserver/libvncserver.SMBuild b/base/libvncserver/libvncserver.SMBuild index 7ff77db..ae79a8c 100755 --- a/base/libvncserver/libvncserver.SMBuild +++ b/base/libvncserver/libvncserver.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/LibVNC/libvncserver/archive/refs/tags/LibVNCServer- desc="VNC server library for easy implementation of the VNC server" requires="zlib gmp libgcrypt libpng nettle gnutls libidn libtasn1 libjpeg-turbo" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/libvorbis/libvorbis.SMBuild b/base/libvorbis/libvorbis.SMBuild index 174938f..c54e0bf 100755 --- a/base/libvorbis/libvorbis.SMBuild +++ b/base/libvorbis/libvorbis.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-$version.tar desc="Ogg Vorbis library" requires="libogg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libvpx/libvpx.SMBuild b/base/libvpx/libvpx.SMBuild index e2df33a..cc491b4 100755 --- a/base/libvpx/libvpx.SMBuild +++ b/base/libvpx/libvpx.SMBuild @@ -6,16 +6,18 @@ download="https://github.com/webmproject/libvpx/archive/refs/tags/v$version.tar. desc="provides the WebM VP8/VP9 codec libraries" requires="gcc-libs nasm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - + sed -i 's/cp -p/cp/' build/make/Makefile +} +build() { ./configure \ --prefix="///" \ --enable-shared \ diff --git a/base/libxml2/libxml2.SMBuild b/base/libxml2/libxml2.SMBuild index d2b05a6..e72ff86 100755 --- a/base/libxml2/libxml2.SMBuild +++ b/base/libxml2/libxml2.SMBuild @@ -6,7 +6,7 @@ download="ftp://xmlsoft.org/libxml2/libxml2-$version.tar.gz" desc="XML parser library" requires="readline zlib xz python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { applypatch $srcdir/libxml2-2.9.8-python3-unicode-errors.patch applypatch $srcdir/revert-Make-xmlFreeNodeList-non-recursive.patch applypatch $srcdir/652dd12a858989b14eed4e84e453059cd3ba340e.diff +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/libxslt/libxslt.SMBuild b/base/libxslt/libxslt.SMBuild index 6e71f08..1df94d2 100755 --- a/base/libxslt/libxslt.SMBuild +++ b/base/libxslt/libxslt.SMBuild @@ -6,7 +6,7 @@ download="ftp://xmlsoft.org/libxslt/libxslt-$version.tar.gz" desc="XML transformation library" requires="libgcrypt python3 libxml2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { # Thank you Arch Linux applypatch $srcdir/0001-Make-generate-id-deterministic.patch applypatch $srcdir/0002-Fix-manpage.patch +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/libyaml/libyaml.SMBuild b/base/libyaml/libyaml.SMBuild index fd12461..130031f 100755 --- a/base/libyaml/libyaml.SMBuild +++ b/base/libyaml/libyaml.SMBuild @@ -6,14 +6,16 @@ download="http://pyyaml.org/download/libyaml/yaml-$version.tar.gz" desc="YAML 1.1 library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf yaml-$version tar xf $srcdir/yaml-$version.tar.?z* cd yaml-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/llvm/llvm.SMBuild b/base/llvm/llvm.SMBuild index 13bb6a3..3e1f60f 100755 --- a/base/llvm/llvm.SMBuild +++ b/base/llvm/llvm.SMBuild @@ -7,7 +7,7 @@ desc="LLVM compiler toolkit" requires="libffi libxml2 perl" #preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version.src @@ -15,9 +15,6 @@ build() { cd $app-$version.src fixbuilddirpermissions - # We don't need our optimisations for small builds - unset CFLAGS CXXFLAGS - # Set build targets if [ "$arch" = "x86_64" ] ; then buildtarget='X86;AMDGPU;BPF' @@ -44,7 +41,12 @@ build() { cp -r ../projects/libunwind/include/mach-o include/ rm -r ../projects/libunwind - +} + +build() { + # We don't need our optimisations for small builds + unset CFLAGS CXXFLAGS + cmake .. -G Ninja -Wno-dev \ -DCMAKE_BUILD_TYPE=MinSizeRel \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/lm-sensors/lm-sensors.SMBuild b/base/lm-sensors/lm-sensors.SMBuild index eb09718..3b74edf 100755 --- a/base/lm-sensors/lm-sensors.SMBuild +++ b/base/lm-sensors/lm-sensors.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/lm-sensors/lm-sensors/archive/V$mversion/lm-sensors desc="hardware sensors, voltages and fans monitoring package" requires="perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make PREFIX="" SBINDIR="/bin" BUILD_STATIC_LIB=0 make install PREFIX="" DESTDIR="$pkg" SBINDIR="/bin" MANDIR="/share/man" BUILD_STATIC_LIB=0 diff --git a/base/logrotate/logrotate.SMBuild b/base/logrotate/logrotate.SMBuild index b82fa81..5c6cd26 100755 --- a/base/logrotate/logrotate.SMBuild +++ b/base/logrotate/logrotate.SMBuild @@ -7,7 +7,7 @@ download="https://github.com/logrotate/logrotate/archive/refs/tags/r$mversion.ta desc="system log rotation tool, normally run as a daily cron job" requires="popt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { fixbuilddirpermissions ./autogen.sh +} +build() { ./configure \ --prefix="" \ --with-acl @@ -38,4 +40,4 @@ build() { sha512sums=" 91467fd4e48849b48ff9760ad0e4df9290c3dc56e733e8020fb58ec299a53cd0153b1fdfa0ae174beb9ea61a21c808b9edec9ea1d69b62a9e9efa9bce35c7673 logrotate-3.21.0.tar.gz -" \ No newline at end of file +" diff --git a/base/lsof/lsof.SMBuild b/base/lsof/lsof.SMBuild index 21be875..0e2a348 100755 --- a/base/lsof/lsof.SMBuild +++ b/base/lsof/lsof.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/lsof-org/lsof/archive/refs/tags/$version.tar.gz" desc="list info about files open by processes" requires="libtirpc" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./Configure -n linux make CC="$CC" LDFLAGS="-static" diff --git a/base/lua/lua.SMBuild b/base/lua/lua.SMBuild index 8123838..9acb876 100755 --- a/base/lua/lua.SMBuild +++ b/base/lua/lua.SMBuild @@ -6,14 +6,16 @@ download="https://www.lua.org/ftp/lua-$version.tar.gz" desc="a powerful, fast, light-weight, embeddable scripting language" requires="readline" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i "s@#define LUA_ROOT\t"'"/usr/local/"@#define LUA_ROOT "/"@' src/luaconf.h sed -i 's@INSTALL_TOP= /usr/local@INSTALL_TOP='"$dest"'@' Makefile @@ -44,4 +46,4 @@ build() { sha512sums=" 55973895c2dfd6e3b051ae1baec6c70760f7a63db464aa4801ece6ca465039beda7de1be7c0d40a3c0bf6de3f06cb3d9952822dcee32d9a03c60a44ab85a4a9d lua-5.1.5.tar.lz -" \ No newline at end of file +" diff --git a/base/lua53/lua53.SMBuild b/base/lua53/lua53.SMBuild index aa4b7f5..d433265 100755 --- a/base/lua53/lua53.SMBuild +++ b/base/lua53/lua53.SMBuild @@ -6,7 +6,7 @@ download="https://www.lua.org/ftp/lua-$version.tar.gz" desc="powerful, fast, light-weight, embeddable scripting language" requires="readline" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf lua-$version @@ -33,6 +33,10 @@ build() { -e '/^LUAC_T=/s,luac,&'"$V"',' \ src/Makefile +} + +build() { + make linux make install INSTALL_MAN="$pkg/share/man/man1" DESTDIR=$pkg diff --git a/base/lvm/create-dm-run-dir.diff b/base/lvm/create-dm-run-dir.diff deleted file mode 100644 index a0e0a54..0000000 --- a/base/lvm/create-dm-run-dir.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur LVM2.2.02.114.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.114/daemons/dmeventd/dmeventd.c ---- LVM2.2.02.114.orig/daemons/dmeventd/dmeventd.c 2014-11-28 17:07:42.000000000 -0600 -+++ LVM2.2.02.114/daemons/dmeventd/dmeventd.c 2014-12-08 22:46:58.702066654 -0600 -@@ -2176,6 +2176,9 @@ - if (_restart) - restart(); - -+ /* Create rundir */ -+ mkdir(DEFAULT_DM_RUN_DIR, 0700); -+ - #ifdef __linux__ - _systemd_activation = _systemd_handover(&fifos); - #endif diff --git a/base/lvm/lvm.SMBuild b/base/lvm/lvm.SMBuild index 60fe377..57fdc91 100755 --- a/base/lvm/lvm.SMBuild +++ b/base/lvm/lvm.SMBuild @@ -6,7 +6,7 @@ download="ftp://sources.redhat.com/pub/lvm2/releases/LVM$version.tgz" desc="Collection of logical volume utilities" requires="eudev util-linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf LVM-$version @@ -18,7 +18,9 @@ build() { applypatch $srcdir/mallinfo.patch applypatch $srcdir/lvm2-mlockall-config.patch applypatch $srcdir/lvm2-libdir-config.patch +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -48,5 +50,4 @@ sha512sums=" 33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 lvm2-libdir-config.patch d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e lvm2-mlockall-config.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch -8f14c75dd07cfd01e4ec0ce29a77b891257ce39b0a536b493b08bc85522aa7796cb1eb9a84c9c3b6ffa437b91a0bd45be94ab27f3b2c22d37e992a0433d02593 create-dm-run-dir.diff " diff --git a/base/lz4/lz4.SMBuild b/base/lz4/lz4.SMBuild index df567f2..653cad1 100755 --- a/base/lz4/lz4.SMBuild +++ b/base/lz4/lz4.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/lz4/lz4/archive/refs/tags/v$version.tar.gz" desc="lossless compression algorithm" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make -j1 \ CFLAGS="$CFLAGS" \ PREFIX="" \ @@ -28,4 +30,4 @@ build() { sha512sums=" b625dae04477982f89defce6e9a9c480d65a6814508d2d216ba8a23641bc2d95663d332c96bb5422af63501a35e012f06860cfcfe328f9a12e02ff84b8e4181a lz4-1.9.2.tar.lz -" \ No newline at end of file +" diff --git a/base/lzip/lzip.SMBuild b/base/lzip/lzip.SMBuild index 903d40d..0cb10c7 100755 --- a/base/lzip/lzip.SMBuild +++ b/base/lzip/lzip.SMBuild @@ -6,14 +6,16 @@ download="http://download.savannah.gnu.org/releases/lzip/lzip-$version.tar.gz" desc="drop-in replacement for gzip and bzip with emphasis on data recovery" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ CXXFLAGS="$CXXFLAGS -static" diff --git a/base/lzlib/lzlib.SMBuild b/base/lzlib/lzlib.SMBuild index a738f02..9b8d79a 100755 --- a/base/lzlib/lzlib.SMBuild +++ b/base/lzlib/lzlib.SMBuild @@ -6,14 +6,16 @@ download="http://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-$version.ta desc="lzip compression and decompression library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -29,4 +31,4 @@ build() { sha512sums=" 780531ddad16b907a80d417c65d0c1010b86943a600a69147f51884f3332483bd889dc31b4d7ce897a4ff53e71a5bc28fae7e5ef30e4408e7f3830ab8bdf94e1 lzlib-1.13.tar.lz -" \ No newline at end of file +" diff --git a/base/lzo/lzo.SMBuild b/base/lzo/lzo.SMBuild index dcbe24c..27bbf23 100755 --- a/base/lzo/lzo.SMBuild +++ b/base/lzo/lzo.SMBuild @@ -6,14 +6,16 @@ download="http://www.oberhumer.com/opensource/lzo/download/lzo-$version.tar.gz" desc="portable lossless data compression library written in ANSI C" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared=yes \ diff --git a/base/m4/m4.SMBuild b/base/m4/m4.SMBuild index 0743f84..193cb71 100755 --- a/base/m4/m4.SMBuild +++ b/base/m4/m4.SMBuild @@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/m4/m4-$version.tar.xz" desc="implementation of the UNIX macro processor" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/disable-mbrtowc-test.patch applypatch $srcdir/localename-test-fix.patch +} +build() { ./configure \ --prefix="" diff --git a/base/make/make.SMBuild b/base/make/make.SMBuild index 8e5e757..04c7c5f 100755 --- a/base/make/make.SMBuild +++ b/base/make/make.SMBuild @@ -7,7 +7,7 @@ desc="GNU make utility to maintain groups of programs" requires="musl" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/0001-src-main.c-main-SV-63307-Handle-SIGPIPE-as-a-fatal-s.patch +} +build() { ./configure \ --prefix="" \ --disable-nls \ @@ -31,6 +33,6 @@ build() { } sha512sums=" -4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f make-4.4.tar.gz +39c0ea12c423da056f00f537cfb350121cdcb72bd899899314e680ed640acc3f32cc2de4b9128e0a96aa47838fbe5277c00a14c54d67c06697df53d6303dc6ee make-4.4.tar.lz b5777e14e06d78bad4d6cb2729be3735af35db51fd97428f3950f64343d07b5a543444e672c7c8cce7458af836b947cc1d689c634b8939d1468ed61cf56e1e1f 0001-src-main.c-main-SV-63307-Handle-SIGPIPE-as-a-fatal-s.patch " diff --git a/base/makeself/makeself.SMBuild b/base/makeself/makeself.SMBuild index 42a61df..04441a4 100755 --- a/base/makeself/makeself.SMBuild +++ b/base/makeself/makeself.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/megastep/makeself/archive/refs/tags/release-$versio desc="shell script that generates a self-extractable compressed tar archive from a directory" requires="bash" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/bin cp makeself-header.sh makeself.sh makeself.lsm $pkg/bin/ install -Dm 644 makeself.1 $pkg/share/man/man1/makeself.1 diff --git a/base/man-pages/man-pages.SMBuild b/base/man-pages/man-pages.SMBuild index 540fb7a..e249d4b 100755 --- a/base/man-pages/man-pages.SMBuild +++ b/base/man-pages/man-pages.SMBuild @@ -4,16 +4,18 @@ build=1sml homepage="https://www.kernel.org/doc/man-pages/" download="https://cdn.kernel.org/pub/linux/docs/man-pages/man-pages-$version.tar.xz" desc="Linux man pages" -requires="musl" +requires="mandoc" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install prefix="" DESTDIR=$pkg # Provided by mandoc @@ -31,4 +33,4 @@ build() { sha512sums=" bd12fbf60c698fe6ea873e04d471414e369278c7f57574b02cd9c2519dec2aeb86a3208e4afd047b027f4e6b6c5250681ce037c373879a0ae0911c3c6563b6f4 man-pages-5.13.tar.lz -" \ No newline at end of file +" diff --git a/base/mandoc/mandoc.SMBuild b/base/mandoc/mandoc.SMBuild index c17aeff..fe82118 100755 --- a/base/mandoc/mandoc.SMBuild +++ b/base/mandoc/mandoc.SMBuild @@ -6,7 +6,7 @@ download="https://mandoc.bsd.lv/snapshots/mandoc-$version.tar.gz" desc="UNIX manpage compiler suite" requires="less zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -19,7 +19,9 @@ build() { applypatch $srcdir/shared-libmandoc.patch applypatch $srcdir/simplify-compat.patch applypatch $srcdir/outdated-warn-disable.patch +} +build() { cp $srcdir/configure.local configure.local ./configure @@ -46,4 +48,4 @@ cba0c95ebb290cdc33767f8ffe338171c8494924a8bd919ca5626cc0bddbcece5bddf0399136652f ced05e8b57fb9705c6d8d8570cd6b06ad187511a4c243ac2dbc34064aa164ca49e0c877160134161dcb98ebd5e61a5c23d5741f03ef95903ff56193dd07f36a1 outdated-warn-disable.patch b1bd2c197584948cc8bab2310e759b8942b9f9479254ffb5a8223cfa6ba03c9e1a4d402c5440b8d9f962be9a020287d3dd8556592c17f2b46f15f405d9d373cb shared-libmandoc.patch 0979e8ee20d6163669f7ab3ace1f959ba9d831c208785c3522261c72ddc2f60ce8420ed36ea963c46a72b9ffdbcb9199da436b13e14c0ca4d938351d170adfa7 simplify-compat.patch -" \ No newline at end of file +" diff --git a/base/mdadm/mdadm.SMBuild b/base/mdadm/mdadm.SMBuild index 6df8b03..24ea6e8 100755 --- a/base/mdadm/mdadm.SMBuild +++ b/base/mdadm/mdadm.SMBuild @@ -6,14 +6,16 @@ download="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/snapshot/mdadm-$v desc="utility to create, manage and monitor software RAID devices" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make STRIP= \ CHECK_RUN_DIR=0 \ CC="$CC -include sys/sysmacros.h" \ diff --git a/base/meson/meson.SMBuild b/base/meson/meson.SMBuild index 03a2c58..253e66a 100755 --- a/base/meson/meson.SMBuild +++ b/base/meson/meson.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/mesonbuild/meson/archive/refs/tags/$version.tar.gz" desc="next generation build system based on python3 and ninja" requires="python3 itstool ninja" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { python3 setup.py build python3 setup.py install --prefix="" --root="$pkg" @@ -25,4 +27,4 @@ build() { sha512sums=" 08d0d6dc1e9e5adf9a624969d575c25f96bac1bf3ab78d7914a7fe0984f31ef6ff4d1a3e6f11eeac2185d92bbb1ed801de2a0447d489f3946a62e108288b62e6 meson-0.63.2.tar.lz -" \ No newline at end of file +" diff --git a/base/miniupnpc/miniupnpc.SMBuild b/base/miniupnpc/miniupnpc.SMBuild index c1f0e76..ded14af 100755 --- a/base/miniupnpc/miniupnpc.SMBuild +++ b/base/miniupnpc/miniupnpc.SMBuild @@ -6,14 +6,16 @@ download="http://miniupnp.free.fr/files/download.php?file=miniupnpc-$version.tar desc="Client library to enable applications to access UPnP services on the network" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install INSTALLPREFIX="/" DESTDIR=$pkg LIBDIR=lib diff --git a/base/mksh/mksh.SMBuild b/base/mksh/mksh.SMBuild index 69d85aa..b57098c 100755 --- a/base/mksh/mksh.SMBuild +++ b/base/mksh/mksh.SMBuild @@ -7,14 +7,16 @@ download="http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-$sversion.tgz" desc="MirBSD Korn Shell, successor to the pdksh" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$sversion tar xf $srcdir/$app-$sversion.tgz cd "$app" fixbuilddirpermissions +} +build() { chmod +x Build.sh CFLAGS="-static -O3 -fPIC" ./Build.sh diff --git a/base/mlocate/mlocate.SMBuild b/base/mlocate/mlocate.SMBuild index 4cbaa42..505ff52 100755 --- a/base/mlocate/mlocate.SMBuild +++ b/base/mlocate/mlocate.SMBuild @@ -6,7 +6,7 @@ download="http://deb.debian.org/debian/pool/main/m/mlocate/mlocate_$version.orig desc="file and directory finder that aims to optimize find times using databases" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { sed -i '/^groupname /s/mlocate/locate/' Makefile.in autoreconf -vif +} +build() { ./configure \ --prefix="" diff --git a/base/mozilla-nss/mozilla-nss.SMBuild b/base/mozilla-nss/mozilla-nss.SMBuild index 444da32..6bd8ec3 100755 --- a/base/mozilla-nss/mozilla-nss.SMBuild +++ b/base/mozilla-nss/mozilla-nss.SMBuild @@ -8,7 +8,7 @@ requires="gyp" NJOBS="(echo $MAKEFLAGS | sed 's/-j//')" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf nss-$version rm -rf nspr-* @@ -18,7 +18,9 @@ build() { tar xf $srcdir/nspr-$nsprversion.tar.?z* mv nspr*/nspr . fixbuilddirpermissions +} +build() { # NSS doesn't like our ARM64-specific optimization C/CXXFLAGS if [ "$arch" == "aarch64" ] ; then unset CFLAGS CXXFLAGS diff --git a/base/mozjs/mozjs.SMBuild b/base/mozjs/mozjs.SMBuild index c6cda80..564cc8c 100755 --- a/base/mozjs/mozjs.SMBuild +++ b/base/mozjs/mozjs.SMBuild @@ -6,14 +6,13 @@ download="https://ftp.mozilla.org/pub/firefox/releases/"$version"esr/source/fire desc="Mozilla's JavaScript engine" requires="zip unzip yasm libevent zlib alsa-lib libpng libogg libvorbis icu libvpx hunspell python3 diffutils llvm imake libXt gtk2 dbus-glib ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf firefox-$version tar xf $srcdir/firefox-"$version"esr.source.tar.?z cd firefox-$version fixbuilddirpermissions - mkdir -p AC213 tar xf $srcdir/autoconf-2.13.tar.gz cd autoconf-2.13 @@ -27,7 +26,9 @@ build() { applypatch $srcdir/fd6847c9416f9eebde636e21d794d25d1be8791d.patch applypatch $srcdir/fix-musl-build.patch applypatch $srcdir/fix-rust-target.patch +} +build() { cd js/src export SHELL=/bin/sh export PYTHON=/bin/python3 diff --git a/base/mpfr/mpfr.SMBuild b/base/mpfr/mpfr.SMBuild index 92f231b..2456502 100755 --- a/base/mpfr/mpfr.SMBuild +++ b/base/mpfr/mpfr.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/mpfr/mpfr-$version.tar.xz" desc="Multiple-Precision Floating-Point Reliable Library" requires="gmp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/mpg123/mpg123.SMBuild b/base/mpg123/mpg123.SMBuild index a4e72d8..21c1ae7 100755 --- a/base/mpg123/mpg123.SMBuild +++ b/base/mpg123/mpg123.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.sourceforge.net/mpg123/mpg123-$version.tar.bz2" desc="MPEG audio player for UNIX" requires="gcc-libs alsa-lib portaudio" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/mtools/mtools.SMBuild b/base/mtools/mtools.SMBuild index e990501..c6fbda9 100755 --- a/base/mtools/mtools.SMBuild +++ b/base/mtools/mtools.SMBuild @@ -6,14 +6,16 @@ download="ftp://ftp.gnu.org/gnu/mtools/mtools-$version.tar.lz" desc="collection of utilities to access MS-DOS disks without mounting them" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --without-x diff --git a/base/musl/musl.SMBuild b/base/musl/musl.SMBuild index 7b7ff62..513b500 100755 --- a/base/musl/musl.SMBuild +++ b/base/musl/musl.SMBuild @@ -7,14 +7,16 @@ desc="Simple, fast and POSIX-compliant C library" requires="musl" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/mypaint-brushes/mypaint-brushes.SMBuild b/base/mypaint-brushes/mypaint-brushes.SMBuild index d910696..7598d95 100755 --- a/base/mypaint-brushes/mypaint-brushes.SMBuild +++ b/base/mypaint-brushes/mypaint-brushes.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Jehan/mypaint-brushes/archive/v$version/mypaint-bru desc="Brushes used by MyPaint and other software using libmypaint" requires="libmypaint" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/nano/nano.SMBuild b/base/nano/nano.SMBuild index d5492ba..ab9f33f 100755 --- a/base/nano/nano.SMBuild +++ b/base/nano/nano.SMBuild @@ -6,14 +6,16 @@ download="https://www.nano-editor.org/dist/v3/nano-$version.tar.xz" desc="Nano's ANOther editor, an enhanced free Pico clone" requires="file netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-nls diff --git a/base/nasm/nasm.SMBuild b/base/nasm/nasm.SMBuild index 774949a..5ae189e 100755 --- a/base/nasm/nasm.SMBuild +++ b/base/nasm/nasm.SMBuild @@ -6,14 +6,16 @@ download="https://www.nasm.us/pub/nasm/releasebuilds/$version/nasm-$version.tar. desc="Netwide assembler providing instruction mnemonics and syntax" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $hostdist diff --git a/base/ncdu/ncdu.SMBuild b/base/ncdu/ncdu.SMBuild index 7e354bc..31d9c59 100755 --- a/base/ncdu/ncdu.SMBuild +++ b/base/ncdu/ncdu.SMBuild @@ -6,14 +6,16 @@ download="https://dev.yorhel.nl/download/ncdu-$version.tar.gz" desc="disk usage viewer using netbsd-curses library" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin diff --git a/base/ndctl/ndctl.SMBuild b/base/ndctl/ndctl.SMBuild index ec19c1c..ee019a8 100755 --- a/base/ndctl/ndctl.SMBuild +++ b/base/ndctl/ndctl.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/pmem/ndctl/archive/refs/tags/v$version.tar.gz" desc="Library for managing the libnvdimm sub-system in the linux kernel" requires="util-linux json-c keyutils eudev kmod netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions NOCONFIGURE=1 ./autogen.sh +} +build() { ./configure \ --prefix="" \ --disable-docs \ diff --git a/base/neon/neon.SMBuild b/base/neon/neon.SMBuild index d0068b4..768aa84 100755 --- a/base/neon/neon.SMBuild +++ b/base/neon/neon.SMBuild @@ -6,14 +6,16 @@ download="https://notroj.github.io/neon/neon-$version.tar.gz" desc="HTTP and WebDav client library with a C interface" requires="expat zlib openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no \ diff --git a/base/netbsd-curses/netbsd-curses.SMBuild b/base/netbsd-curses/netbsd-curses.SMBuild index c44bada..2de5c9a 100755 --- a/base/netbsd-curses/netbsd-curses.SMBuild +++ b/base/netbsd-curses/netbsd-curses.SMBuild @@ -7,14 +7,16 @@ desc="drop-in replacement for the bloated ncurses library with wide character su requires="gcc-libs" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { cat << EOF > config.mak CC=gcc HOSTCC=gcc diff --git a/base/nettle/nettle.SMBuild b/base/nettle/nettle.SMBuild index 1e42b0a..0c02d85 100755 --- a/base/nettle/nettle.SMBuild +++ b/base/nettle/nettle.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/nettle/nettle-$version.tar.gz" desc="small cryptographic library designed to fit easily in any programming language" requires="gmp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/nghttp2/nghttp2.SMBuild b/base/nghttp2/nghttp2.SMBuild index d1836bd..6bb4754 100755 --- a/base/nghttp2/nghttp2.SMBuild +++ b/base/nghttp2/nghttp2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/nghttp2/nghttp2/releases/download/v$version/nghttp2 desc="framing layer of HTTP/2 web protocol implemented as a form of a reusable C library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-examples \ diff --git a/base/ninja/ninja.SMBuild b/base/ninja/ninja.SMBuild index 355755c..de7ef59 100755 --- a/base/ninja/ninja.SMBuild +++ b/base/ninja/ninja.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/ninja-build/ninja/archive/refs/tags/v$version.tar.g desc="small build system with a focus on speed" requires="gcc-libs python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/posix-fix.patch +} +build() { python ./configure.py --bootstrap install -Dm 755 ninja $pkg/bin/ninja diff --git a/base/nodejs/nodejs.SMBuild b/base/nodejs/nodejs.SMBuild index 0959536..ca37dd3 100755 --- a/base/nodejs/nodejs.SMBuild +++ b/base/nodejs/nodejs.SMBuild @@ -1,21 +1,24 @@ app=nodejs -version=16.4.2 +version=18.14.2 build=1sml homepage="https://nodejs.org/en/" desc="Asynchronous event-driven Javascript engine designed to build scalable network applications" requires="openssl" -build() { +prepbuilddir() { mkandenterbuilddir - rm -rf node-$version + rm -rf node-v"$version" - tar xf $srcdir/nodejs-$version.tar.?z* - cd node-$version + tar xf $srcdir/node-v"$version".tar.?z* + cd node-v"$version" fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ - --shared-zlib + --shared-zlib \ + --shared-openssl make make install DESTDIR=$pkg @@ -26,5 +29,5 @@ build() { } sha512sums=" -f20e92d1f163defa9fb4b7d5e3f4a73e1e993e9602d30b43564501a9fc96fadc8647775c42af3eb57e06600d7e5081af0fb525b76786724c71796befc64feb4a nodejs-16.4.2.tar.gz +44c874e47ffdd5a9068541eaf553ed3de0baa470f0016a601aae9e840d7baf82bcb4f6bc1f74cf06a4882c83f67e8a77f95d4c79993e70873760c0f51aff4593 node-v18.14.2.tar.gz " diff --git a/base/npth/npth.SMBuild b/base/npth/npth.SMBuild index cc6d8a5..694e285 100755 --- a/base/npth/npth.SMBuild +++ b/base/npth/npth.SMBuild @@ -6,14 +6,16 @@ download="https://gnupg.org/ftp/gcrypt/npth/npth-$version.tar.bz2" desc="Provides non-premptive priority-based scheduling for multiple threads in event-driven programs" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" db375a8a1cbb3b458d1bc57c35e08a4e7bca059d3bb22b55dd2530b074b1bc5870b29f3c8bd37a0ae836125fcfba382c791eb3bd994e8fb41d17e8c6d213496f npth-1.6.tar.lz -" \ No newline at end of file +" diff --git a/base/ntfs-3g/ntfs-3g.SMBuild b/base/ntfs-3g/ntfs-3g.SMBuild index 9daa05c..040c0f6 100755 --- a/base/ntfs-3g/ntfs-3g.SMBuild +++ b/base/ntfs-3g/ntfs-3g.SMBuild @@ -7,14 +7,16 @@ desc="NTFS read-write filesystem driver" requires="netbsd-curses util-linux fuse" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app"_ntfsprogs"-$version tar xf $srcdir/$app"_ntfsprogs"-$version.tgz cd $app"_ntfsprogs"-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ --sbindir=/bin \ diff --git a/base/oniguruma/oniguruma.SMBuild b/base/oniguruma/oniguruma.SMBuild index 145a0dc..8459376 100755 --- a/base/oniguruma/oniguruma.SMBuild +++ b/base/oniguruma/oniguruma.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/kkos/oniguruma/archive/refs/tags/v$version.tar.gz" desc="Regular expressions library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-posix-api \ diff --git a/base/openssl/openssl.SMBuild b/base/openssl/openssl.SMBuild index 7b8f8b6..b8b41ab 100755 --- a/base/openssl/openssl.SMBuild +++ b/base/openssl/openssl.SMBuild @@ -6,14 +6,16 @@ download="https://www.openssl.org/source/openssl-$version.tar.gz" desc="Commercial-grade, full-featured crypto library from OpenSSL Project that implements TLS and SSLv3" requires="perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { if [ "$arch" = "aarch64" ]; then cpuflag="linux-aarch64" elif [ "$arch" = "x86_64" ]; then @@ -35,4 +37,4 @@ build() { sha512sums=" f89af9fa565f77bc1d94b76e87b9ffa0d7e54f6f2c10363b428215ba0365b927ff2a6cd4dab39858b233c7dff02091b6b3643d23f4443299f72facab48d0ec2e openssl-1.1.1t.tar.lz -" \ No newline at end of file +" diff --git a/base/opus/opus.SMBuild b/base/opus/opus.SMBuild index b1aca7c..bc9f82f 100755 --- a/base/opus/opus.SMBuild +++ b/base/opus/opus.SMBuild @@ -6,14 +6,16 @@ download="https://archive.mozilla.org/pub/opus/opus-$version.tar.gz" desc="Open, royalty-free audio codec standardised by IETF" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/opusfile/opusfile.SMBuild b/base/opusfile/opusfile.SMBuild index 2690645..9663f3d 100755 --- a/base/opusfile/opusfile.SMBuild +++ b/base/opusfile/opusfile.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.xiph.org/releases/opus/opusfile-$version.tar.gz" desc="dependency for the opus audio library" requires="openssl libogg opus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/p11-kit/p11-kit.SMBuild b/base/p11-kit/p11-kit.SMBuild index 49d71fb..b7f479e 100755 --- a/base/p11-kit/p11-kit.SMBuild +++ b/base/p11-kit/p11-kit.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/p11-glue/p11-kit/archive/refs/tags/$version.tar.gz" desc="tools to load and enumerate PKCS#11 modules" requires="gcc-libs libffi libtasn1" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-nls diff --git a/base/p7zip/p7zip.SMBuild b/base/p7zip/p7zip.SMBuild index 30cf18f..efc720a 100755 --- a/base/p7zip/p7zip.SMBuild +++ b/base/p7zip/p7zip.SMBuild @@ -6,14 +6,16 @@ download="" desc="file archiver and a port of the 7z windows archive utility" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i -e 's/strip /#strip /' \ -e 's/chmod 555/chmod 755/' \ -e 's/chmod 444/chmod 644/' install.sh && make all3 OPTFLAGS="$CXXFLAGS" || true diff --git a/base/parted/parted.SMBuild b/base/parted/parted.SMBuild index 7946a4a..a55d515 100755 --- a/base/parted/parted.SMBuild +++ b/base/parted/parted.SMBuild @@ -7,7 +7,7 @@ desc="GNU disk partitioning tool" requires="eudev util-linux lvm" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/parted-3.2-xfs.patch +} +build() { CFLAGS="$CFLAGS -D_GNU_SOURCE -Dloff_t=off_t -include sys/sysmacros.h" \ ./configure \ --prefix="" \ diff --git a/base/patch/patch.SMBuild b/base/patch/patch.SMBuild index 12e5635..c0466d7 100755 --- a/base/patch/patch.SMBuild +++ b/base/patch/patch.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/patch/patch-$version.tar.xz" desc="Utility to apply a diff or patches file to an original file or files" requires="attr" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" diff --git a/base/pciutils/pciutils.SMBuild b/base/pciutils/pciutils.SMBuild index 54ea0b1..17ef05c 100755 --- a/base/pciutils/pciutils.SMBuild +++ b/base/pciutils/pciutils.SMBuild @@ -6,7 +6,7 @@ download="https://mj.ucw.cz/download/linux/pci/pciutils-$version.tar.gz" desc="PCI bus library and tools" requires="musl" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/pciutils-pread.patch +} +build() { make CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PREAD -fPIC" \ LDFLAGS="-llzma" \ PREFIX="/" \ diff --git a/base/pcre/pcre.SMBuild b/base/pcre/pcre.SMBuild index a6f4844..2f2b782 100755 --- a/base/pcre/pcre.SMBuild +++ b/base/pcre/pcre.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.pcre.org/pub/pcre/pcre-$version.tar.gz" desc="Perl-compatible regular expression library" requires="zlib bzip2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -34,4 +36,4 @@ build() { sha512sums=" 3364fad3a6dff8b97bbd712a9bbfec28813eb41af3dadde631b572a6bc0595feed2e02e3eeb6f0bddea09ad8802c97933949fdaf94ea258a575cbce1e1af815d pcre-8.44.tar.lz -" \ No newline at end of file +" diff --git a/base/pcre2/pcre2.SMBuild b/base/pcre2/pcre2.SMBuild index 47c7ef8..20b6e49 100755 --- a/base/pcre2/pcre2.SMBuild +++ b/base/pcre2/pcre2.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.pcre.org/pub/pcre/pcre2-$version.tar.gz" desc="Perl-compatible regular expression library v2" requires="gcc-libs zlib bzip2 readline" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-pcre2-16 \ diff --git a/base/perl-modules/perl-modules.SMBuild b/base/perl-modules/perl-modules.SMBuild index 2d902f2..87a9931 100755 --- a/base/perl-modules/perl-modules.SMBuild +++ b/base/perl-modules/perl-modules.SMBuild @@ -15,9 +15,12 @@ xmlparserver=2.44 xmlsimplever=2.22 parseyapp=1.21 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf DBI* HTML-Parser* Locale* URI* XML* +} + +build() { prepperlpackage() { fixbuilddirpermissions diff --git a/base/perl/perl.SMBuild b/base/perl/perl.SMBuild index a0d0453..5aa3569 100755 --- a/base/perl/perl.SMBuild +++ b/base/perl/perl.SMBuild @@ -6,14 +6,16 @@ download="https://www.cpan.org/src/5.0/perl-$version.tar.xz" desc="High-level, general-purpose, interpreted, dynamic programming language" requires="db" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # /usr/local/include directory, if it contains any headers, # might interfere with the compile because our GCC toolchain looks into that directory, in which case we abort. if [ -d /usr/local/include ] ; then diff --git a/base/physfs/physfs.SMBuild b/base/physfs/physfs.SMBuild index 3915d8b..43a1059 100755 --- a/base/physfs/physfs.SMBuild +++ b/base/physfs/physfs.SMBuild @@ -6,14 +6,16 @@ download="https://icculus.org/physfs/downloads/physfs-$version.tar.bz2" desc="Library to provide abstract access to various archives" requires="zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DPHYSFS_BUILD_SHARED=ON \ diff --git a/base/pigz/pigz.SMBuild b/base/pigz/pigz.SMBuild index 9e09fab..d53d751 100755 --- a/base/pigz/pigz.SMBuild +++ b/base/pigz/pigz.SMBuild @@ -6,14 +6,16 @@ download="https://www.zlib.net/pigz/pigz-$version.tar.gz" desc="Multi-threaded gzip alternative to minimise compression time" requires="zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make CFLAGS="$CFLAGS" mkdir -p $pkg/bin $pkg/share/man/man1 cp pigz unpigz $pkg/bin/ diff --git a/base/pkgconf/pkgconf.SMBuild b/base/pkgconf/pkgconf.SMBuild index c5785f4..b927967 100755 --- a/base/pkgconf/pkgconf.SMBuild +++ b/base/pkgconf/pkgconf.SMBuild @@ -6,14 +6,16 @@ download="https://distfiles.dereferenced.org/pkgconf/pkgconf-$version.tar.xz" desc="Drop-in replacement for the bloated pkg-config utility" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -31,4 +33,4 @@ build() { sha512sums=" 56c89550f4c3d4cf12587e6645ad107cbfe1a768cbb1668ee74f41305943227edabba781ccf15c5b48c811c0e8918538382d074d08b80b740aca6caec086654c pkgconf-1.7.3.tar.lz -" \ No newline at end of file +" diff --git a/base/pkgtools/pkgtools.SMBuild b/base/pkgtools/pkgtools.SMBuild index 7dcdc7b..370f1f4 100755 --- a/base/pkgtools/pkgtools.SMBuild +++ b/base/pkgtools/pkgtools.SMBuild @@ -7,11 +7,13 @@ desc="The Slackware package maintenance system, modified for SMLinux" requires="tar grep gawk sed bash util-linux coreutils" skipchecksum=1 -build() { +prepbuilddir() { ARCH=noarch mkandenterbuilddir rm -rf $app-$version +} +build() { # Install Slackware script manpages: ( cd $srcdir/manpages mkdir -p $pkg/share/man/man8 @@ -36,4 +38,4 @@ build() { } sha512sums=" -" \ No newline at end of file +" diff --git a/base/pkgtools/scripts/installpkg b/base/pkgtools/scripts/installpkg index 92f8d5e..4e1be07 100755 --- a/base/pkgtools/scripts/installpkg +++ b/base/pkgtools/scripts/installpkg @@ -1,69 +1,4 @@ -#!/bin/sh -# Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA -# Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2009, 2011 Patrick Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Sun Sep 6 21:58:36 BST 2009 -# Replaced usage of "cat" with STDIN redirection or file name parameters -# to speed up execution on ARM. -# Replaced pkgbase & package_name code with 'sed' script by Jim Hawkins. -# -# Sat Apr 25 21:18:53 UTC 2009 -# Converted to use new pkgbase() function to remove pathname and -# valid package extensions. -# -# Sat Apr 4 22:58:06 CDT 2009 -# Support additional compression formats if the supporting utilities exist: -# .tbz - bzip2 -# .tlz - lzip -# .txz - xz (also LZMA) -# And of course, .tgz (gzip) is not going anywhere. :-) -# Add command switches to determine the uncompressed package size even if -# that will slow things down, and to add the package's md5sum to the -# metadata stored in /var/log/packages/. -# -# Fri Dec 21 17:21:35 CST 2007 -# Added a patch from Johnny Morano to work around package removal issues -# caused by packages that do not comply with FHS combined with a grep -# regex error in installpkg. Any package with a single-letter top- -# level directory could not be removed. -# -# Shortened some of the top-line dialog output to avoid overflowing the -# textbox (needed as some of the packages, especially in X, have very -# long base package names now). -# -# Sun Nov 26 12:38:25 CST 1995 -# Added patch from Glenn Moloney to allow -# packages to be installed to directories other than /. -# -# Wed Mar 18 15:15:51 CST 1998 -# Changed $TMP directory to /var/log/setup/tmp, and chmod'ed it 700 to close -# some security holes. - -# A stronger formula is needed to regularize output that will be parsed. -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ - LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ - LC_IDENTIFICATION LC_ALL -LANG=C -export LANG +#!/bin/bash # Return a package name that has been stripped of the dirname portion # and any of the valid extensions (only): @@ -72,15 +7,6 @@ pkgbase() { echo "$1" | sed 's?.*/??;s/\.t[bglx]z$//' } -# If installpkg encounters a problem, it will return a non-zero error code. -# If it finds more than one problem (i.e. with a list of packages) you'll only -# hear about the most recent one. :) -# 1 = tar returned error code -# 2 = corrupt compression envelope -# 3 = does not end in .tgz -# 4 = no such file -# 5 = external compression utility missing -# 99 = user abort from menu mode EXITSTATUS=0 # Do not store md5sums by default: @@ -88,22 +14,7 @@ MD5SUM=0 # So that we know what to expect... umask 022 -TAR=tar-1.13 -$TAR --help 1> /dev/null 2> /dev/null -if [ ! $? = 0 ]; then - TAR=tar -fi -if [ ! "$(LC_MESSAGES=C $TAR --version)" = "tar (GNU tar) 1.13 - -Copyright (C) 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -Written by John Gilmore and Jay Fenlason." ]; then - echo "WARNING: pkgtools are unstable with tar > 1.13." - echo " You should provide a \"tar-1.13\" in your \$PATH." - sleep 5 -fi +TAR=tar usage() { cat << EOF @@ -112,76 +23,18 @@ Usage: installpkg [options] Installpkg is used to install a .t{gz,bz,lz,xz} package like this: installpkg slackware-package-1.0.0-i486-1.tgz (or .tbz, .tlz, .txz) -options: --warn (warn if files will be overwritten, but do not install) - --root /mnt (install someplace else, like /mnt) - --infobox (use dialog to draw an info box) - --terse (display a one-line short description for install) - --menu (confirm package installation with a menu, unless - the priority is [required] or ADD) - --ask (used with menu mode: always ask if a package should be - installed regardless of what the package's priority is) - --priority ADD|REC|OPT|SKP (provide a priority for the entire - package list to use instead of the priority in the - tagfile) - --tagfile /somedir/tagfile (specify a different file to use - for package priorities. The default is "tagfile" in - the package's directory) - --md5sum (record the package's md5sum in the metadata file) - +options: --root /mnt (install someplace else, like /mnt) EOF } -# Eliminate whitespace function: -crunch() { - while read FOO ; do - echo $FOO - done -} - # Strip version, architecture and build from the end of the name package_name() { pkgbase $1 | sed 's?-[^-]*-[^-]*-[^-]*$??' } # Parse options: -MODE=install # standard text-mode while [ 0 ]; do - if [ "$1" = "-warn" -o "$1" = "--warn" ]; then - MODE=warn - shift 1 - elif [ "$1" = "-md5sum" -o "$1" = "--md5sum" ]; then - MD5SUM=1 - shift 1 - elif [ "$1" = "-infobox" -o "$1" = "--infobox" ]; then - MODE=infobox - shift 1 - elif [ "$1" = "-terse" -o "$1" = "--terse" ]; then - MODE=terse - shift 1 - elif [ "$1" = "-menu" -o "$1" = "--menu" ]; then - MODE=menu - shift 1 - elif [ "$1" = "-ask" -o "$1" = "--ask" ]; then - ALWAYSASK="yes" - shift 1 - elif [ "$1" = "-tagfile" -o "$1" = "--tagfile" ]; then - if [ -r "$2" ]; then - USERTAGFILE="$2" - elif [ -r "$(pwd)/$2" ]; then - USERTAGFILE="$(pwd)/$2" - else - usage - exit - fi - shift 2 - elif [ "$1" = "-priority" -o "$1" = "--priority" ]; then - if [ "$2" = "" ]; then - usage - exit - fi - USERPRIORITY="$2" - shift 2 - elif [ "$1" = "-root" -o "$1" = "--root" ]; then + if [ "$1" = "-root" -o "$1" = "--root" ]; then if [ "$2" = "" ]; then usage exit @@ -219,64 +72,13 @@ if [ $# = 0 ]; then exit fi -# If -warn mode was requested, produce the output and then exit: -if [ "$MODE" = "warn" ]; then - while [ -f "$1" ]; do - mkdir -p $TMP/scan$$ - # Determine extension: - packageext="$( echo $1 | rev | cut -f 1 -d . | rev)" - # Determine compressor utility: - case $packageext in - 'tgz' ) - packagecompression=gzip - ;; - 'tbz' ) - packagecompression=bzip2 - ;; - 'tlz' ) - packagecompression=lzip - ;; - 'txz' ) - packagecompression=xz - ;; - esac - ( cd $TMP/scan$$ ; $packagecompression -dc | $TAR xf - install ) < $1 2> /dev/null - if [ -r $TMP/scan$$/install/doinst.sh ]; then - if grep ' rm -rf ' $TMP/scan$$/install/doinst.sh 1>/dev/null 2>/dev/null ; then - grep ' rm -rf ' $TMP/scan$$/install/doinst.sh > $TMP/scan$$/install/delete - for f in `cat $TMP/scan$$/install/delete | cut -f 3,7 -d ' ' | tr ' ' '/'`; do - f="/$f" - if [ -f "$f" -o -L "$f" ]; then - echo "$f" - fi - done - fi - if [ -d $TMP/scan$$ ]; then - ( cd $TMP/scan$$ ; rm -rf install ) 2> /dev/null - ( cd $TMP ; rmdir scan$$ ) 2> /dev/null - fi - fi - for f in `( $packagecompression -dc | $TAR tf - ) < $1 | grep -v 'drwx'`; do - f="/$f" - if [ -f "$f" -o -L "$f" ]; then - echo "$f" - fi - done - shift 1 - done - exit -fi - # Main loop: for package in $* ; do # Simple package integrity check: if [ ! -f $package ]; then - EXITSTATUS=4 - if [ "$MODE" = "install" ]; then - echo "Cannot install $package: file not found" - fi - continue; + echo "Cannot install $package: file not found" + exit 1 fi # "shortname" isn't really THAT short... @@ -288,11 +90,8 @@ for package in $* ; do # Reject package if it does not end in '.t{gz,bz,lz,xz}': if [ "$shortname" = "$(basename $package)" ]; then - EXITSTATUS=3 - if [ "$MODE" = "install" ]; then - echo "Cannot install $package: file does not end in .tgz, .tbz, .tlz, or .txz" - fi - continue; + echo "Cannot install $package: file does not end in .tgz, .tbz, .tlz, or .txz" + exit 1 fi # Determine extension: @@ -316,74 +115,22 @@ for package in $* ; do # Test presence of external compression utility: if ! $packagecompression --help 1> /dev/null 2> /dev/null ; then - EXITSTATUS=5 - if [ "$MODE" = "install" ]; then - echo "Cannot install $package: external compression utility $packagecompression missing" - fi - continue; - fi - - # Determine package's priority: - unset PRIORITY - if [ "$USERTAGFILE" = "" ]; then - TAGFILE="$packagedir/tagfile" - else - TAGFILE="$USERTAGFILE" - fi - if [ ! -r "$TAGFILE" ]; then - TAGFILE=/dev/null - fi - if grep "^$packagebase:" "$TAGFILE" | grep ADD > /dev/null 2> /dev/null ; then - PRIORITY="ADD" - elif grep "^$packagebase:" "$TAGFILE" | grep REC > /dev/null 2> /dev/null ; then - PRIORITY="REC" - elif grep "^$packagebase:" "$TAGFILE" | grep OPT > /dev/null 2> /dev/null ; then - PRIORITY="OPT" - elif grep "^$packagebase:" "$TAGFILE" | grep SKP > /dev/null 2> /dev/null ; then - PRIORITY="SKP" - fi - if [ "$PRIORITY" = "ADD" ]; then - PMSG="[ADD]" - elif [ "$PRIORITY" = "REC" ]; then - PMSG="[REC]" - elif [ "$PRIORITY" = "OPT" ]; then - PMSG="[OPT]" - elif [ "$PRIORITY" = "SKP" ]; then - PMSG="[SKP]" - else - PMSG="" - fi - - # If a tagfile wants this package to be skipped, do that now before - # wasting any more CPU on it: - if [ "$PRIORITY" = "SKP" -a ! "$ALWAYSASK" = "yes" ]; then - continue # next package + echo "Cannot install $package: external compression utility $packagecompression missing" + exit 1 fi # Figure out some package information, like the compressed and uncompressed # sizes, and where to find the package description: COMPRESSED="$(/bin/du -sh "$(readlink -f $package)" | cut -f 1)" - DESCRIPTION="" - # First check for .txt file next to the package, since this is faster: - if grep "^$packagebase:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then - DESCRIPTION="$packagedir/$shortname.txt" - elif grep "^$shortname:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then - DESCRIPTION="$packagedir/$shortname.txt" - fi # Test tarball integrity and get uncompressed package size: - if [ "$MODE" = "install" ]; then - echo "Verifying package $(basename $package)." - fi + echo "Verifying package $(basename $package)." cat $package | $packagecompression -dc | dd 2> $TMP/tmpsize$$ | $TAR tf - 1> $TMP/tmplist$$ 2> /dev/null TARERROR=$? if [ ! "$TARERROR" = "0" ]; then - EXITSTATUS=1 # tar file corrupt - if [ "$MODE" = "install" ]; then - echo "Unable to install $package: tar archive is corrupt (tar returned error code $TARERROR)" - fi + echo "Unable to install $package: tar archive is corrupt (tar returned error code $TARERROR)" rm -f $TMP/tmplist$$ $TMP/tmpsize$$ - continue + exit 1 fi UNCOMPRESSED="$(cat $TMP/tmpsize$$ | tail -n 1 | cut -f 1 -d ' ' | numfmt --to=iec)" rm -f $TMP/tmpsize$$ @@ -400,33 +147,9 @@ for package in $* ; do DESCRIPTION="$(echo $desc)" # Set a custom variable once we source the application build file SMLINUX_DESC=1 - elif grep "^$packagebase:" "$TMP/scan$$/install/slack-desc" 1> /dev/null 2> /dev/null ; then - DESCRIPTION="$TMP/scan$$/install/slack-desc" - elif grep "^$shortname:" "$TMP/scan$$/install/slack-desc" 1> /dev/null 2> /dev/null ; then - DESCRIPTION="$TMP/scan$$/install/slack-desc" fi fi - if [ "$DESCRIPTION" = "" ]; then - #echo "WARNING NO SLACK-DESC" - DESCRIPTION="/dev/null" - fi - - # Gather package infomation into a temporary file: - if [ -z "$SMLINUX_DESC" ] ; then - grep "^$packagebase:" $DESCRIPTION | cut -f 2- -d : | cut -b2- 1> $TMP/tmpmsg$$ 2> /dev/null - if [ "$shortname" != "$packagebase" ]; then - grep "^$shortname:" $DESCRIPTION | cut -f 2- -d : | cut -b2- 1>> $TMP/tmpmsg$$ 2> /dev/null - fi - - # Adjust the length here. This allows a slack-desc to be any size up to 13 lines instead of fixed at 11. - LENGTH=$(wc -l < $TMP/tmpmsg$$ ) - while [ $LENGTH -lt 12 ]; do - echo >> $TMP/tmpmsg$$ - LENGTH=$(expr $LENGTH + 1) - done - fi - echo "Size: Compressed: ${COMPRESSED}, uncompressed: ${UNCOMPRESSED}." >> $TMP/tmpmsg$$ # For recent versions of dialog it is necessary to add \n to the end of each line # or it will remove repeating spaces and mess up our careful formatting: @@ -449,49 +172,19 @@ EOF rm -f $TMP/controlns$$ mv $TMP/pasted$$ $TMP/tmpmsg$$ # Emit information to the console: - if [ "$MODE" = "install" ]; then - if [ "$PMSG" = "" ]; then - echo "Installing package $(basename $package):" - else - echo "Installing package $(basename $package) $PMSG:" - fi + if [ "$PMSG" = "" ]; then + echo "Installing package $(basename $package):" + else + echo "Installing package $(basename $package) $PMSG:" + fi - echo "PACKAGE DESCRIPTION:" - - # If SMLINUX_DESC is set, echo that description - if [ -n "$SMLINUX_DESC" ] && [ "$SMLINUX_DESC" == "1" ] ; then - echo "" - echo "<<<< $DESCRIPTION >>>>" - echo "" - elif [ -z "$SMLINUX_DESC" ]; then - grep "^$packagebase:" $DESCRIPTION | uniq | sed "s/^$packagebase:/#/g" - if [ "$shortname" != "$packagebase" ]; then - grep "^$shortname:" $DESCRIPTION | uniq | sed "s/^$shortname:/#/g" - fi - fi - elif [ "$MODE" = "terse" ]; then # emit a single description line - printf "%-72s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " ......................................................................")) | cut -b1-72)" "[${UNCOMPRESSED}]" | cut -b1-80 - elif [ "$MODE" = "infobox" ]; then # install infobox package - dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0 - elif [ "$MODE" = "menu" -a "$PRIORITY" = "ADD" -a ! "$ALWAYSASK" = "yes" ]; then # ADD overrides menu mode unless -ask was used - dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0 - elif [ "$MODE" = "menu" -a "$USERPRIORITY" = "ADD" ]; then # install no matter what $PRIORITY - dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0 - else # we must need a full menu: - dialog --title "Package Name: $shortname $PMSG" --menu "$(cat $TMP/tmpmsg$$)" 0 0 3 \ - "Yes" "Install package $shortname" \ - "No" "Do not install package $shortname" \ - "Quit" "Abort software installation completely" 2> $TMP/reply$$ - if [ ! $? = 0 ]; then - echo "No" > $TMP/reply$$ - fi - REPLY="$(cat $TMP/reply$$)" - rm -f $TMP/reply$$ $TMP/tmpmsg$$ - if [ "$REPLY" = "Quit" ]; then - exit 99 # EXIT STATUS 99 = ABORT! - elif [ "$REPLY" = "No" ]; then - continue # skip the package - fi + echo "PACKAGE DESCRIPTION:" + + # If SMLINUX_DESC is set, echo that description + if [ -n "$SMLINUX_DESC" ] && [ "$SMLINUX_DESC" == "1" ] ; then + echo "" + echo "<<<< $DESCRIPTION >>>>" + echo "" fi # Make sure there are no symbolic links sitting in the way of @@ -508,15 +201,9 @@ EOF echo "COMPRESSED PACKAGE SIZE: $COMPRESSED" >> $ADM_DIR/packages/$shortname echo "UNCOMPRESSED PACKAGE SIZE: $UNCOMPRESSED" >> $ADM_DIR/packages/$shortname echo "PACKAGE LOCATION: $package" >> $ADM_DIR/packages/$shortname - # Record the md5sum if that's a selected option: - if [ $MD5SUM = 1 ]; then - echo "PACKAGE MD5SUM: $(md5sum $package | cut -f 1 -d ' ')" >> $ADM_DIR/packages/$shortname - fi echo "PACKAGE DESCRIPTION:" >> $ADM_DIR/packages/$shortname if [ -n "$SMLINUX_DESC" ] ; then echo $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null - else - grep "^$packagebase:" $DESCRIPTION >> $ADM_DIR/packages/$shortname 2> /dev/null fi if [ "$shortname" != "$packagebase" ]; then if [ -n "$SMLINUX_DESC" ] ; then @@ -530,33 +217,15 @@ EOF if [ "$( grep '^\./' $TMP/$shortname | wc -l | tr -d ' ')" = "1" ]; then # Good. We have a package that meets the Slackware spec. cat $TMP/$shortname >> $ADM_DIR/packages/$shortname - else - # Some dumb bunny built a package with something other than makepkg. Bad! - # Oh well. Bound to happen. Par for the course. Fix it and move on... - echo "WARNING: Package has not been created with 'makepkg'" - echo './' >> $ADM_DIR/packages/$shortname - cat $TMP/$shortname >> $ADM_DIR/packages/$shortname fi rm -f $TMP/$shortname - # It's a good idea to make sure those newly installed libraries - # are properly activated for use: - if [ -x /sbin/ldconfig ]; then - /sbin/ldconfig - fi - if [ -f $ROOT/install/doinst.sh ]; then - if [ "$MODE" = "install" ]; then - echo "Executing install script for $(basename $package)." - fi + echo "Executing install script for $(basename $package)." # If bash is available, use sed to convert the install script to use pushd/popd # rather than spawning subshells which is slow on ARM. This will also speed up # install script processing on any platform. - if [ -x /bin/bash ]; then - ( cd $ROOT/ ; sed -e's?^( cd \([^;]*\);\(.*\) )$?pushd \1 \&\> /dev/null ; \2 ; popd \&\> /dev/null?g ' install/doinst.sh | /bin/bash ; ) - else - ( cd $ROOT/ ; sh install/doinst.sh ; ) - fi + ( cd $ROOT/ ; sh install/doinst.sh ; ) fi # Clean up the mess... if [ -d $ROOT/install ]; then @@ -573,10 +242,8 @@ EOF rm -rf "$TMP/scan$$" fi rm -f $TMP/tmpmsg$$ $TMP/reply$$ - if [ "$MODE" = "install" ]; then - echo "Package $(basename $package) installed." - echo - fi + echo "Package $(basename $package) installed." + echo done exit $EXITSTATUS diff --git a/base/plzip/plzip.SMBuild b/base/plzip/plzip.SMBuild index ffd30b6..b8478a6 100755 --- a/base/plzip/plzip.SMBuild +++ b/base/plzip/plzip.SMBuild @@ -6,14 +6,16 @@ download="http://download.savannah.gnu.org/releases/lzip/plzip/plzip-$version.ta desc="parallel lzip compressor" requires="gcc-libs lzlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ CXXFLAGS="$CXXFLAGS" diff --git a/base/pm-utils/pm-utils.SMBuild b/base/pm-utils/pm-utils.SMBuild index b3943c1..95e3ab9 100755 --- a/base/pm-utils/pm-utils.SMBuild +++ b/base/pm-utils/pm-utils.SMBuild @@ -6,14 +6,16 @@ download="https://pm-utils.freedesktop.org/releases/pm-utils-$version.tar.gz" desc="Power management utilities" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin diff --git a/base/polkit/polkit.SMBuild b/base/polkit/polkit.SMBuild index dffc9db..7f4ce9d 100755 --- a/base/polkit/polkit.SMBuild +++ b/base/polkit/polkit.SMBuild @@ -6,7 +6,7 @@ download="https://gitlab.freedesktop.org/polkit/polkit/-/archive/$version/polkit desc="Authentication framework to allow communication between unprivileged and privileged processes" requires="glib netbsd-curses expat libffi zlib dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/make-innetgr-optional.patch applypatch $srcdir/polkit-0.120-security_fix-1.patch +} +build() { ./configure \ --prefix="/" \ --disable-man-pages \ diff --git a/base/popt/popt.SMBuild b/base/popt/popt.SMBuild index bfeebe7..adcd835 100755 --- a/base/popt/popt.SMBuild +++ b/base/popt/popt.SMBuild @@ -6,7 +6,7 @@ download="http://rpm5.org/files/popt/popt-$version.tar.gz" desc="Command line parsing library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/portaudio/portaudio.SMBuild b/base/portaudio/portaudio.SMBuild index a26a560..e133d44 100755 --- a/base/portaudio/portaudio.SMBuild +++ b/base/portaudio/portaudio.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/portaudio/portaudio/" desc="Cross-platform audio I/O library" requires="gcc-libs alsa-lib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-cxx \ diff --git a/base/procps-ng/procps-ng.SMBuild b/base/procps-ng/procps-ng.SMBuild index c573294..80f9fbf 100755 --- a/base/procps-ng/procps-ng.SMBuild +++ b/base/procps-ng/procps-ng.SMBuild @@ -6,7 +6,7 @@ homepage="http://sourceforge.net/projects/procps-ng/" desc="Utilities for displaying process information" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/procps-ng-netbsd-curses.patch +} +build() { STRIP=false \ CPPFLAGS="$CFLAGS -DGLOB_TILDE=0 -DAF_INET6=10 -DAF_INET=2" \ ./configure \ diff --git a/base/protobuf/protobuf.SMBuild b/base/protobuf/protobuf.SMBuild new file mode 100755 index 0000000..f60e37f --- /dev/null +++ b/base/protobuf/protobuf.SMBuild @@ -0,0 +1,34 @@ +app=protobuf +version=3.14.0 +build=1sml +homepage="https://github.com/protocolbuffers/protobuf" +download="" +desc="Google data interchange format" +requires="zlib gcc-libs" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions + + ./autogen.sh +} + +build() { + ./configure \ + --prefix="" + + make + make install DESTDIR=$pkg + + cp LICENSE $pkgdocs/ + + mkfinalpkg +} + +sha512sums=" +9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11 protobuf-3.14.0.tar.gz +" diff --git a/base/pv/pv.SMBuild b/base/pv/pv.SMBuild index e29a235..7a7fa36 100755 --- a/base/pv/pv.SMBuild +++ b/base/pv/pv.SMBuild @@ -6,14 +6,16 @@ download="http://www.ivarch.com/programs/sources/pv-$version.tar.bz2" desc="Pipe Viewer for monitoring progress of data through pipeline" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/pwgen/pwgen.SMBuild b/base/pwgen/pwgen.SMBuild index 8b662a9..637531a 100755 --- a/base/pwgen/pwgen.SMBuild +++ b/base/pwgen/pwgen.SMBuild @@ -5,14 +5,16 @@ homepage="https://sourceforge.net/projects/pwgen" desc="A small tool to generate semi-random passwords" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/python-cheetah/python-cheetah.SMBuild b/base/python-cheetah/python-cheetah.SMBuild index 9d2c7a1..fd793f4 100755 --- a/base/python-cheetah/python-cheetah.SMBuild +++ b/base/python-cheetah/python-cheetah.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.org/project/Cheetah/" desc="Python-Powered Template Engine" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Cheetah3-$version.post2 tar xf $srcdir/Cheetah3-$version.post2.tar.?z* cd Cheetah3-$version.post2 fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-click/python-click.SMBuild b/base/python-click/python-click.SMBuild index 05313a9..f5db2ca 100755 --- a/base/python-click/python-click.SMBuild +++ b/base/python-click/python-click.SMBuild @@ -5,14 +5,16 @@ homepage="https://palletsprojects.com/p/click/" desc="Python cli interface toolkit" requires="python-jinja2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf click-$version tar xf $srcdir/click-$version.tar.?z* cd click-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.rst $pkgdocs/ diff --git a/base/python-future/python-future.SMBuild b/base/python-future/python-future.SMBuild index 83627b4..ce87cc4 100755 --- a/base/python-future/python-future.SMBuild +++ b/base/python-future/python-future.SMBuild @@ -5,14 +5,16 @@ homepage="https://python-future.org" desc="Easy, clean, reliable Python 2/3 compatibility toolkit" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf future-$version tar xf $srcdir/future-$version.tar.?z* cd future-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root="$pkg" cp LICENSE.txt $pkgdocs/ diff --git a/base/python-importlib-metadata/python-importlib-metadata.SMBuild b/base/python-importlib-metadata/python-importlib-metadata.SMBuild index 650979e..2dc3984 100755 --- a/base/python-importlib-metadata/python-importlib-metadata.SMBuild +++ b/base/python-importlib-metadata/python-importlib-metadata.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/python/importlib_metadata" desc="Python library to import metadata from a python package" requires="python-wheel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf importlib_metadata-$version tar xf $srcdir/importlib_metadata-$version.tar.?z* cd importlib_metadata-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-jinja2/python-jinja2.SMBuild b/base/python-jinja2/python-jinja2.SMBuild index 34be8c1..1d709e1 100755 --- a/base/python-jinja2/python-jinja2.SMBuild +++ b/base/python-jinja2/python-jinja2.SMBuild @@ -5,14 +5,16 @@ homepage="https://palletsprojects.com/p/jinja/" desc="Fast, expressive, extensible python template engine" requires="python-livereload" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Jinja2-$version tar xf $srcdir/Jinja2-$version.tar.?z* cd Jinja2-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.rst $pkgdocs/ diff --git a/base/python-joblib/python-joblib.SMBuild b/base/python-joblib/python-joblib.SMBuild index 2ecc7f4..ac74bb5 100755 --- a/base/python-joblib/python-joblib.SMBuild +++ b/base/python-joblib/python-joblib.SMBuild @@ -5,14 +5,16 @@ homepage="https://joblib.readthedocs.io" desc="Set of python tools to provide lightweight pipelining" requires="python-regex" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf joblib-$version tar xf $srcdir/joblib-$version.tar.?z* cd joblib-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.txt $pkgdocs/ diff --git a/base/python-livereload/python-livereload.SMBuild b/base/python-livereload/python-livereload.SMBuild index c77641b..babb58f 100755 --- a/base/python-livereload/python-livereload.SMBuild +++ b/base/python-livereload/python-livereload.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/lepture/python-livereload" requires="python-lunr" desc="Python tool to trigger script reloads when web documents are changed" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf livereload-$version tar xf $srcdir/livereload-$version.tar.?z* cd livereload-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-lunr/python-lunr.SMBuild b/base/python-lunr/python-lunr.SMBuild index 31957cd..384d1e0 100755 --- a/base/python-lunr/python-lunr.SMBuild +++ b/base/python-lunr/python-lunr.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/yeraydiazdiaz/lunr.py" desc="Python fork of lunr.js" requires="python-tornado" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf lunr-$version tar xf $srcdir/lunr-$version.tar.?z* cd lunr-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-lxml/python-lxml.SMBuild b/base/python-lxml/python-lxml.SMBuild index cc5fd03..94c24f8 100755 --- a/base/python-lxml/python-lxml.SMBuild +++ b/base/python-lxml/python-lxml.SMBuild @@ -5,13 +5,16 @@ homepage="https://lxml.de/" desc="Python library for processing HTML and XML documents" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf lxml-$version tar xf $srcdir/lxml-$version.tar.?z* cd lxml-$version + fixbuilddirpermissions +} +build() { python setup.py build python setup.py install --prefix="" --root=$pkg cp LICENSES.txt $pkgdocs/ diff --git a/base/python-m2crypto/python-m2crypto.SMBuild b/base/python-m2crypto/python-m2crypto.SMBuild index a441c06..85e7892 100755 --- a/base/python-m2crypto/python-m2crypto.SMBuild +++ b/base/python-m2crypto/python-m2crypto.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.com/m2crypto/m2crypto" desc="Cryptography toolkit for Python" requires="python3 swig" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf M2Crypto-$version tar xf $srcdir/M2Crypto-$version.tar.?z* cd M2Crypto-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root=$pkg cp CHANGES LICENCE $pkgdocs/ diff --git a/base/python-mako/python-mako.SMBuild b/base/python-mako/python-mako.SMBuild index 593fabf..fc5ab9b 100755 --- a/base/python-mako/python-mako.SMBuild +++ b/base/python-mako/python-mako.SMBuild @@ -5,14 +5,16 @@ homepage="http://www.makotemplates.org/" desc="Template library for compiling high performance python modules" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Mako-$version tar xf $srcdir/Mako-$version.tar.?z* cd Mako-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-markdown/python-markdown.SMBuild b/base/python-markdown/python-markdown.SMBuild index 8a9d0a1..3feee8a 100755 --- a/base/python-markdown/python-markdown.SMBuild +++ b/base/python-markdown/python-markdown.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/Python-Markdown/markdown" desc="Python Markdown Library" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Markdown-$version tar xf $srcdir/Markdown-$version.tar.?z* cd Markdown-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.md $pkgdocs/ diff --git a/base/python-markupsafe/python-markupsafe.SMBuild b/base/python-markupsafe/python-markupsafe.SMBuild index 28e0d33..3673633 100755 --- a/base/python-markupsafe/python-markupsafe.SMBuild +++ b/base/python-markupsafe/python-markupsafe.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.python.org/pypi/python-markupsafe" desc="Python library that implements unicode subclass for supporting HTML strings" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf MarkupSafe-$version tar xf $srcdir/MarkupSafe-$version.tar.?z* cd MarkupSafe-$version fixbuilddirpermissions +} +build() { python setup.py build python setup.py install --prefix="" --root=$pkg cp CHANGES.rst LICENSE.rst $pkgdocs/ diff --git a/base/python-mkdocs/python-mkdocs.SMBuild b/base/python-mkdocs/python-mkdocs.SMBuild index 71e6eab..e838356 100755 --- a/base/python-mkdocs/python-mkdocs.SMBuild +++ b/base/python-mkdocs/python-mkdocs.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/mkdocs/mkdocs" desc="Python markdown documentation generation toolkit" requires="python-six python-future python-markupsafe python-nltk" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf mkdocs-$version tar xf $srcdir/mkdocs-$version.tar.?z* cd mkdocs-$version fixbuilddirpermissions - +} + +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-nltk/python-nltk.SMBuild b/base/python-nltk/python-nltk.SMBuild index 0b3e0bc..9fe5082 100755 --- a/base/python-nltk/python-nltk.SMBuild +++ b/base/python-nltk/python-nltk.SMBuild @@ -5,14 +5,16 @@ homepage="https://www.nltk.org" desc="python natural language development toolkit" requires="python-joblib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf nltk-$version tar xf $srcdir/nltk-$version.tar.?z* cd nltk-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.txt $pkgdocs/ diff --git a/base/python-pip/python-pip.SMBuild b/base/python-pip/python-pip.SMBuild index 48791af..85ac066 100755 --- a/base/python-pip/python-pip.SMBuild +++ b/base/python-pip/python-pip.SMBuild @@ -6,16 +6,17 @@ download="https://github.com/pypa/pip/archive/refs/tags/$version.tar.gz" desc="Package installer for python" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf pip-$version tar xf $srcdir/pip-$version.tar.?z* cd pip-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root=$pkg - cp LICENSE.txt $pkgdocs/ mkfinalpkg diff --git a/base/python-pyyaml/python-pyyaml.SMBuild b/base/python-pyyaml/python-pyyaml.SMBuild index d9435c6..07ebe3b 100755 --- a/base/python-pyyaml/python-pyyaml.SMBuild +++ b/base/python-pyyaml/python-pyyaml.SMBuild @@ -5,14 +5,16 @@ homepage="https://pyyaml.org" desc="Next-generation YAML parser and emitter for python" requires="python-markdown" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf PyYAML-$version tar xf $srcdir/PyYAML-$version.tar.?z* cd PyYAML-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-regex/python-regex.SMBuild b/base/python-regex/python-regex.SMBuild index 8693535..3f94b6b 100755 --- a/base/python-regex/python-regex.SMBuild +++ b/base/python-regex/python-regex.SMBuild @@ -5,14 +5,16 @@ homepage="https://bitbucket.org/mrabarnett/mrab-regex" desc="Alternative to standard regex module supplied by python with additional features" requires="python-tqdm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf regex-$version tar xf $srcdir/regex-$version.tar.?z* cd regex-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.txt $pkgdocs/ diff --git a/base/python-setuptools/python-setuptools.SMBuild b/base/python-setuptools/python-setuptools.SMBuild index 650307c..81434e7 100755 --- a/base/python-setuptools/python-setuptools.SMBuild +++ b/base/python-setuptools/python-setuptools.SMBuild @@ -6,14 +6,16 @@ download="https://slackware.uk/slackware/slackware-15.0/source/d/python-setuptoo desc="python module installation helper" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf setuptools-$version tar xf $srcdir/setuptools-$version.tar.?z* cd setuptools-$version fixbuilddirpermissions - +} + +build() { # Discard Windows binaries rm -f setuptools/*.exe diff --git a/base/python-six/python-six.SMBuild b/base/python-six/python-six.SMBuild index 964032a..522cc7a 100755 --- a/base/python-six/python-six.SMBuild +++ b/base/python-six/python-six.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.python.org/pypi/python-six/" desc="Python 2 and 3 compatibility library" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf six-$version tar xf $srcdir/six-$version.tar.?z* cd six-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-tornado/python-tornado.SMBuild b/base/python-tornado/python-tornado.SMBuild index aee3e56..a947424 100755 --- a/base/python-tornado/python-tornado.SMBuild +++ b/base/python-tornado/python-tornado.SMBuild @@ -5,14 +5,16 @@ homepage="http://www.tornadoweb.org" desc="Python Web Framework and ASYNC Net Library" requires="python-pyyaml" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf tornado-$version tar xf $srcdir/tornado-$version.tar.?z* cd tornado-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-tqdm/python-tqdm.SMBuild b/base/python-tqdm/python-tqdm.SMBuild index c77be7c..51f0f25 100755 --- a/base/python-tqdm/python-tqdm.SMBuild +++ b/base/python-tqdm/python-tqdm.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/tqdm/tqdm" desc="Generate progress meter between loops in python programs" requires="python-zipp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf tqdm-$version tar xf $srcdir/tqdm-$version.tar.?z* cd tqdm-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENCE $pkgdocs/ diff --git a/base/python-typing-extensions/python-typing-extensions.SMBuild b/base/python-typing-extensions/python-typing-extensions.SMBuild index 1908a13..d40f52e 100755 --- a/base/python-typing-extensions/python-typing-extensions.SMBuild +++ b/base/python-typing-extensions/python-typing-extensions.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.org/project/typing-extensions/" desc="Python module providing backports and experimental cases from original typing module" requires="python-importlib-metadata" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf typing_extensions--$version tar xf $srcdir/typing_extensions-$version.tar.?z* cd typing_extensions-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-typing/python-typing.SMBuild b/base/python-typing/python-typing.SMBuild index d95ebdc..0f59b07 100755 --- a/base/python-typing/python-typing.SMBuild +++ b/base/python-typing/python-typing.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.org/project/typing/" desc="Python typing module" requires="python3 python-setuptools" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf typing-$version tar xf $srcdir/typing-$version.tar.?z* cd typing-$version fixbuilddirpermissions +} +build() { python setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python-wheel/python-wheel.SMBuild b/base/python-wheel/python-wheel.SMBuild index a22a845..8d92ff7 100755 --- a/base/python-wheel/python-wheel.SMBuild +++ b/base/python-wheel/python-wheel.SMBuild @@ -6,14 +6,16 @@ download="https://files.pythonhosted.org/packages/c0/6c/9f840c2e55b67b90745af06a desc="Python implementation of the python wheel packaging standard" requires="python-click" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf wheel-$version tar xf $srcdir/wheel-$version.tar.?z* cd wheel-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE.txt $pkgdocs/ diff --git a/base/python-zipp/python-zipp.SMBuild b/base/python-zipp/python-zipp.SMBuild index a3bbf12..3bfdacb 100755 --- a/base/python-zipp/python-zipp.SMBuild +++ b/base/python-zipp/python-zipp.SMBuild @@ -5,14 +5,16 @@ homepage="https://pypi.org/project/zipp/" desc="Pathlib-compatible Zipfile object wrapper for python" requires="python-typing-extensions" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf zipp-$version tar xf $srcdir/zipp-$version.tar.?z* cd zipp-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp LICENSE $pkgdocs/ diff --git a/base/python3/python3.SMBuild b/base/python3/python3.SMBuild index 18c021d..6ebb6f5 100755 --- a/base/python3/python3.SMBuild +++ b/base/python3/python3.SMBuild @@ -1,13 +1,13 @@ app=python3 -version=3.9.15 +version=3.9.16 build=1sml homepage="https://www.python.org/" download="https://www.python.org/ftp/python/$version/Python-$version.tar.xz" desc="object-oriented interpreted programming language" -requires="libffi expat file openssl sqlite" +requires="libffi expat file openssl sqlite libpng" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "Python-$version" @@ -20,10 +20,13 @@ build() { sed -i "s|^#.* /usr/local/bin/python|#!/bin/python3|" Lib/cgi.py find . -name "*.py" -exec \ sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/bin/env python3|" {} + +} +build() { LDFLAGS="-lncursesw -lterminfo" \ ./configure \ --prefix="/" \ + --bindir="/bin" \ --libdir="/lib" \ --with-system-expat \ --with-system-ffi \ @@ -43,12 +46,14 @@ build() { rm -rf "$pkg"/lib/python3.9/"$test" done - ( cd $pkg/bin ; ln -s python3 python ) + ( + cd $pkg/bin ; ln -s python3 python + ) mkfinalpkg } sha512sums=" -9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39 Python-3.9.15.tar.xz +b5fd0afe131c82bbce6ddf887c59eef6945910d6a9a2bc87c0927f4e4a096bf9ca4d25bcb729c40f6ebb8a65fbe8bf7b0b97a7c4a8c9e551240eb4f34b878653 Python-3.9.16.tar.xz 9abb510f769fee9c212be728f71802cdd3346b65f052dcc820686feee53a51ad106e4f34e439c5d9dd5da7a00559b07ad0fee4815ebd16fbfb170ba228fc37f5 musl-find_library.patch -" \ No newline at end of file +" diff --git a/base/qpdf/qpdf.SMBuild b/base/qpdf/qpdf.SMBuild index 8537e04..4630abe 100755 --- a/base/qpdf/qpdf.SMBuild +++ b/base/qpdf/qpdf.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/qpdf/qpdf/releases/download/v$version/qpdf-$version desc="Command-line tools and library for transforming PDF files" requires="gcc-libs pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/base/qrencode/qrencode.SMBuild b/base/qrencode/qrencode.SMBuild index f5ad609..f1a9cdf 100755 --- a/base/qrencode/qrencode.SMBuild +++ b/base/qrencode/qrencode.SMBuild @@ -6,14 +6,16 @@ download="https://fukuchi.org/works/qrencode/qrencode-$version.tar.bz2" desc="C library for encoding data in a QR Code symbol" requires="libpng" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/readline/readline.SMBuild b/base/readline/readline.SMBuild index 7d366ad..63d3c79 100755 --- a/base/readline/readline.SMBuild +++ b/base/readline/readline.SMBuild @@ -6,7 +6,7 @@ download="ftp://ftp.cwru.edu/pub/bash/readline-$version.tar.gz" desc="Line input library with editing features" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { for file in $srcdir/readline*-???.patch ; do cat $file | patch -p0 --verbose done +} +build() { ./configure \ --prefix="" \ --with-curses \ diff --git a/base/ruby/ruby.SMBuild b/base/ruby/ruby.SMBuild index 7e130c7..2c3b7b5 100755 --- a/base/ruby/ruby.SMBuild +++ b/base/ruby/ruby.SMBuild @@ -6,14 +6,16 @@ download="https://cache.ruby-lang.org/pub/ruby/3.0/ruby-$version.tar.gz" desc="Interpreted object-oriented scripting language" requires="gmp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/base/rust/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch b/base/rust/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch deleted file mode 100644 index f72bd0e..0000000 --- a/base/rust/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a78859bb6690e0ad285d1892d7a40796a40ac287 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 2 Dec 2017 17:25:44 -0600 -Subject: [PATCH 02/15] Allow rustdoc to work when cross-compiling on musl - -musl can't handle foreign-architecture libraries in LD_LIBRARY_PATH. ---- - src/bootstrap/bin/rustdoc.rs | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs -index cba17c8e6..45cbdd81b 100644 ---- a/src/bootstrap/bin/rustdoc.rs -+++ b/src/bootstrap/bin/rustdoc.rs -@@ -20,9 +20,6 @@ fn main() { - Err(_) => 0, - }; - -- let mut dylib_path = bootstrap::util::dylib_path(); -- dylib_path.insert(0, PathBuf::from(libdir.clone())); -- - let mut cmd = Command::new(rustdoc); - cmd.args(&args) - .arg("--sysroot") -@@ -35,7 +32,7 @@ fn main() { - .arg("dox") - .arg("--sysroot") - .arg(&sysroot) -- .env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap()); -+ .env(bootstrap::util::dylib_path_var(), PathBuf::from(libdir.clone())); - - // Force all crates compiled by this compiler to (a) be unstable and (b) - // allow the `rustc_private` feature to link to other unstable crates -@@ -83,7 +80,7 @@ fn main() { - eprintln!( - "rustdoc command: {:?}={:?} {:?}", - bootstrap::util::dylib_path_var(), -- env::join_paths(&dylib_path).unwrap(), -+ PathBuf::from(libdir.clone()), - cmd, - ); - eprintln!("sysroot: {:?}", sysroot); --- -2.26.2 - diff --git a/base/rust/0003-Require-static-native-libraries-when-linking-static-.patch b/base/rust/0003-Require-static-native-libraries-when-linking-static-.patch deleted file mode 100644 index 0fd1ca7..0000000 --- a/base/rust/0003-Require-static-native-libraries-when-linking-static-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From baa7ce46f19e3584d70e47c8df28c084e76446da Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sun, 3 May 2020 17:48:47 +0200 -Subject: [PATCH 03/15] Require static native libraries when linking static - executables - -On ELF targets like Linux, gcc/ld will create a dynamically-linked -executable without warning, even when passed `-static`, when asked to -link to a `.so`. Avoid this confusing and unintended behavior by always -using the static version of libraries when trying to link static -executables. - -Fixes #54243 ---- - src/librustc_codegen_ssa/back/link.rs | 18 ++++++++++++++---- - 1 file changed, 14 insertions(+), 4 deletions(-) - -diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs -index 8bc4e6442..52ff7a52e 100644 ---- a/compiler/rustc_codegen_ssa/src/back/link.rs -+++ b/compiler/rustc_codegen_ssa/src/back/link.rs -@@ -2081,8 +2081,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>( - } - } - --/// Link in all of our upstream crates' native dependencies. Remember that all of these upstream --/// native dependencies are all non-static dependencies. We've got two cases then: -+/// Link in all of our upstream crates' native dependencies. We have two cases: - /// - /// 1. The upstream crate is an rlib. In this case we *must* link in the native dependency because - /// the rlib is just an archive. -@@ -2015,7 +2013,19 @@ - continue; - } - match lib.kind { -- NativeLibKind::Dylib | NativeLibKind::Unspecified => cmd.link_dylib(name), -+ NativeLibKind::Dylib | NativeLibKind::Unspecified => { -+ // On some targets, like Linux, linking a static executable inhibits using -+ // dylibs at all. Force native libraries to be static, even if for example -+ // an upstream rlib was originally linked against a native shared library. -+ if crate_type == config::CrateType::Executable -+ && sess.crt_static(Some(crate_type)) -+ && !sess.target.options.crt_static_allows_dylibs -+ { -+ cmd.link_staticlib(name) -+ } else { -+ cmd.link_dylib(name) -+ } -+ }, - NativeLibKind::Framework => cmd.link_framework(name), - NativeLibKind::StaticNoBundle => { - // Link "static-nobundle" native libs only if the crate they originate from diff --git a/base/rust/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch b/base/rust/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch deleted file mode 100644 index 58ffd07..0000000 --- a/base/rust/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch +++ /dev/null @@ -1,63 +0,0 @@ -Additions for build.rs by q66, necessary for our musl setup. - -From 1eb558f246269606c6d8d73824ef6b44fa10764e Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 9 Sep 2017 00:14:16 -0500 -Subject: [PATCH 06/16] Prefer libgcc_eh over libunwind for musl - ---- - src/libunwind/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 9182e349b19..0377fbb58fc 100644 ---- a/library/unwind/src/lib.rs -+++ b/library/unwind/src/lib.rs -@@ -23,6 +23,6 @@ cfg_if::cfg_if! { - } - - #[cfg(target_env = "musl")] --#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))] -+#[link(name = "gcc_eh", cfg(target_feature = "crt-static"))] - #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] - extern {} -diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs -index f24d957..28828e5 100644 ---- a/library/unwind/build.rs -+++ b/library/unwind/build.rs -@@ -5,17 +5,12 @@ - let target = env::var("TARGET").expect("TARGET was not set"); - - if cfg!(feature = "llvm-libunwind") -- && ((target.contains("linux") && !target.contains("musl")) || target.contains("fuchsia")) -+ && (target.contains("linux") || target.contains("fuchsia")) - { - // Build the unwinding from libunwind C/C++ source code. - llvm_libunwind::compile(); - } else if target.contains("x86_64-fortanix-unknown-sgx") { - llvm_libunwind::compile(); -- } else if target.contains("linux") { -- // linking for Linux is handled in lib.rs -- if target.contains("musl") { -- llvm_libunwind::compile(); -- } - } else if target.contains("freebsd") { - println!("cargo:rustc-link-lib=gcc_s"); - } else if target.contains("rumprun") { -@@ -143,15 +138,6 @@ - cfg.file(root.join("src").join(src)); - } - -- if target_env == "musl" { -- // use the same C compiler command to compile C++ code so we do not need to setup the -- // C++ compiler env variables on the builders -- cfg.cpp(false); -- // linking for musl is handled in lib.rs -- cfg.cargo_metadata(false); -- println!("cargo:rustc-link-search=native={}", env::var("OUT_DIR").unwrap()); -- } -- - cfg.compile("unwind"); - } - } - diff --git a/base/rust/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch b/base/rust/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch deleted file mode 100644 index c80fe15..0000000 --- a/base/rust/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e44838dabefa1a62578895b4465717f7be8a7a86 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 6 Oct 2018 04:01:48 +0000 -Subject: [PATCH 06/15] test/use-extern-for-plugins: Don't assume multilib - ---- - src/test/run-make-fulldeps/use-extern-for-plugins/Makefile | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -index 838b1a27..94fa9f6d 100644 ---- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -+++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile -@@ -4,12 +4,7 @@ - # ignore-openbsd - # ignore-sunos - --HOST := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') --ifeq ($(findstring i686,$(HOST)),i686) --TARGET := $(subst i686,x86_64,$(HOST)) --else --TARGET := $(subst x86_64,i686,$(HOST)) --endif -+TARGET := $(shell $(RUSTC) -vV | grep 'host:' | sed 's/host: //') - - all: - $(RUSTC) foo.rs -C extra-filename=-host --- -2.26.2 - diff --git a/base/rust/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch b/base/rust/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch deleted file mode 100644 index 612f527..0000000 --- a/base/rust/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cde014a1108b7d1cea85100cad48b12297267405 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Mon, 17 Sep 2018 01:32:20 +0000 -Subject: [PATCH 07/15] test/sysroot-crates-are-unstable: Fix test when rpath - is disabled - -Without this environment var, the test can't run rustc to find -the sysroot path. ---- - .../run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -index a35174b3..9e770706 100644 ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -@@ -1,2 +1,4 @@ -+-include ../tools.mk -+ - all: -- '$(PYTHON)' test.py -+ env '$(HOST_RPATH_ENV)' '$(PYTHON)' test.py --- -2.26.2 diff --git a/base/rust/0008-Ignore-broken-and-non-applicable-tests.patch b/base/rust/0008-Ignore-broken-and-non-applicable-tests.patch deleted file mode 100644 index aa6e829..0000000 --- a/base/rust/0008-Ignore-broken-and-non-applicable-tests.patch +++ /dev/null @@ -1,77 +0,0 @@ -From c63745a2777648d530898bae5af9d25266472b05 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Sat, 21 Dec 2019 17:00:40 +0100 -Subject: [PATCH 08/15] Ignore broken and non-applicable tests - -c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 -env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) -long-linker-command-lines: takes >10 minutes to run (but still passes) -simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 -simd-intrinsic-generic-select.rs: broken on BE, #59356 -sparc-struct-abi: no sparc target -sysroot-crates-are-unstable: can't run rustc without RPATH ---- - src/test/codegen/sparc-struct-abi.rs | 1 + - src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile | 2 ++ - src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ - src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ - src/test/ui/env-funky-keys.rs | 1 + - src/test/ui/simd/simd-intrinsic-generic-bitmask.rs | 2 ++ - 6 files changed, 10 insertions(+) - -diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs -index 78e5b14a..6f93e932 100644 ---- a/src/test/codegen/sparc-struct-abi.rs -+++ b/src/test/codegen/sparc-struct-abi.rs -@@ -4,6 +4,7 @@ - - // only-sparc64 - // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib -+// ignore-test - #![feature(no_core, lang_items)] - #![no_core] - -diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -index f124ca2a..363b18f0 100644 ---- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -+++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -@@ -1,3 +1,5 @@ -+# ignore-aarch64 -+ - -include ../tools.mk - - all: -diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -index 5876fbc9..5f167ece 100644 ---- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -@@ -1,3 +1,5 @@ -+# ignore-test -+ - -include ../tools.mk - - all: -diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -index 9e770706..6d92ec5c 100644 ---- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -+++ b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile -@@ -1,3 +1,5 @@ -+# ignore-test -+ - -include ../tools.mk - - all: -diff --git a/src/test/ui/env-funky-keys.rs b/src/test/ui/env-funky-keys.rs -index c5c824ac..f3fe047a 100644 ---- a/src/test/ui/env-funky-keys.rs -+++ b/src/test/ui/env-funky-keys.rs -@@ -1,6 +1,7 @@ - // run-pass - // Ignore this test on Android, because it segfaults there. - -+// ignore-test - // ignore-android - // ignore-windows - // ignore-cloudabi no execve -2.26.2 - diff --git a/base/rust/0009-Link-stage2-tools-dynamically-to-libstd.patch b/base/rust/0009-Link-stage2-tools-dynamically-to-libstd.patch deleted file mode 100644 index 40f896b..0000000 --- a/base/rust/0009-Link-stage2-tools-dynamically-to-libstd.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f5dad49f112151bb0ee74570e971bd475cbec128 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 3 May 2020 18:00:09 +0200 -Subject: [PATCH 09/15] Link stage2 tools dynamically to libstd - -Replaces an older patch by Samuel Holland. The RUSTC_NO_PREFER_DYNAMIC -env var was removed and replaced with the following logic in builder.rs. - -The idea for this patch is to link stage2 tools dynamically as these will -be distributed (if built). Intermediate tools from previous stages will -be statically linked for convenience. ---- - src/bootstrap/builder.rs | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index eb0199fd..0ec7cbd8 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -1236,6 +1236,8 @@ impl<'a> Builder<'a> { - // linking all deps statically into the dylib. - if let Mode::Std | Mode::Rustc | Mode::Codegen = mode { - rustflags.arg("-Cprefer-dynamic"); -+ } else if stage >= 2 { -+ rustflags.arg("-Cprefer-dynamic"); - } - - // When building incrementally we default to a lower ThinLTO import limit --- -2.26.2 - diff --git a/base/rust/0010-Move-debugger-scripts-to-usr-share-rust.patch b/base/rust/0010-Move-debugger-scripts-to-usr-share-rust.patch deleted file mode 100644 index c9f5132..0000000 --- a/base/rust/0010-Move-debugger-scripts-to-usr-share-rust.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9b0c14783127e195d7bd54ca2c0c498a46714964 Mon Sep 17 00:00:00 2001 -From: Samuel Holland -Date: Mon, 17 Sep 2018 02:09:10 +0000 -Subject: [PATCH 10/15] Move debugger scripts to /usr/share/rust - ---- - src/bootstrap/dist.rs | 2 +- - src/etc/rust-gdb | 2 +- - src/etc/rust-lldb | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 8215211e..05a173b4 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -603,7 +603,7 @@ impl Step for DebuggerScripts { - fn run(self, builder: &Builder<'_>) { - let host = self.host; - let sysroot = self.sysroot; -- let dst = sysroot.join("lib/rustlib/etc"); -+ let dst = sysroot.join("share/rust"); - t!(fs::create_dir_all(&dst)); - let cp_debugger_script = |file: &str| { - builder.install(&builder.src.join("src/etc/").join(file), &dst, 0o644); -diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb -index 23ba93da..dc51b16c 100755 ---- a/src/etc/rust-gdb -+++ b/src/etc/rust-gdb -@@ -12,7 +12,7 @@ - - # Find out where the pretty printer Python module is - RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)" --GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc" -+GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/share/rust" - - # Run GDB with the additional arguments that load the pretty printers - # Set the environment variable `RUST_GDB` to overwrite the call to a diff --git a/base/rust/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/base/rust/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch deleted file mode 100644 index 3378ee3..0000000 --- a/base/rust/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e363a0e0ff7ffc8bd83f72ec1a20d289996b6370 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 3 May 2020 18:02:03 +0200 -Subject: [PATCH 12/15] Fix dynamic linkage of musl libc for the libc crate - ---- - vendor/libc/src/lib.rs | 1 + - vendor/libc/src/unix/mod.rs | 6 +++--- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/vendor/libc/src/lib.rs b/vendor/libc/src/lib.rs -index 6bb71c552..22060a8d7 100644 ---- a/vendor/libc/src/lib.rs -+++ b/vendor/libc/src/lib.rs -@@ -24,10 +24,7 @@ - #![deny(missing_copy_implementations, safe_packed_borrows)] - #![cfg_attr(not(feature = "rustc-dep-of-std"), no_std)] - #![cfg_attr(feature = "rustc-dep-of-std", no_core)] --#![cfg_attr( -- any(feature = "rustc-dep-of-std", target_os = "redox"), -- feature(static_nobundle) --)] -+#![cfg_attr(feature = "rustc-dep-of-std", feature(static_nobundle))] - #![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))] - - #[macro_use] -diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs -index 238da24b..ffb05ee7 100644 ---- a/vendor/libc/src/unix/mod.rs -+++ b/vendor/libc/src/unix/mod.rs -@@ -299,11 +299,11 @@ cfg_if! { - // cargo build, don't pull in anything extra as the libstd dep - // already pulls in all libs. - } else if #[cfg(target_env = "musl")] { -+ #[link(name = "c")] -+ extern {} - #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", kind = "static", -+ link(name = "gcc", kind = "static-nobundle", - cfg(target_feature = "crt-static")))] -- #[cfg_attr(feature = "rustc-dep-of-std", -- link(name = "c", cfg(not(target_feature = "crt-static"))))] - extern {} - } else if #[cfg(target_os = "emscripten")] { - #[link(name = "c")] -index 0b1496af..7f7e85a7 100644 --- -2.26.2 - diff --git a/base/rust/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch b/base/rust/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch deleted file mode 100644 index 692eb71..0000000 --- a/base/rust/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 07efbc3bdd67de4e13b0f3f4df853a9de0800ec3 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Sun, 3 May 2020 18:05:22 +0200 -Subject: [PATCH 14/15] Void: fix linkage against host/target LLVM in cross - setups - ---- - src/librustc_llvm/build.rs | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs -index 621363bed..01322e1d2 100644 ---- a/compiler/rustc_llvm/build.rs -+++ b/compiler/rustc_llvm/build.rs -@@ -242,9 +242,11 @@ fn main() { - for lib in output(&mut cmd).split_whitespace() { - if is_crossed { - if let Some(stripped) = lib.strip_prefix("-LIBPATH:") { -- println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); -+ println!("cargo:rustc-link-search=native={}{}", -+ env::var("XBPS_CROSS_BASE").unwrap(), stripped); - } else if let Some(stripped) = lib.strip_prefix("-L") { -- println!("cargo:rustc-link-search=native={}", stripped.replace(&host, &target)); -+ println!("cargo:rustc-link-search=native={}{}", -+ env::var("XBPS_CROSS_BASE").unwrap(), stripped); - } - } else if let Some(stripped) = lib.strip_prefix("-LIBPATH:") { - println!("cargo:rustc-link-search=native={}", stripped); --- -2.26.2 - diff --git a/base/rust/0001-Fix-LLVM-build.patch b/base/rust/1.patch similarity index 84% rename from base/rust/0001-Fix-LLVM-build.patch rename to base/rust/1.patch index 0da829a..6cf9c3a 100644 --- a/base/rust/0001-Fix-LLVM-build.patch +++ b/base/rust/1.patch @@ -1,4 +1,4 @@ -From 4443eca0d6b3ba599832b2f73a5350fdd0c90d10 Mon Sep 17 00:00:00 2001 +From 99a046adc7d1c7b2da3a31e077722ea69f84eeb6 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 8 Sep 2017 00:04:29 -0500 Subject: [PATCH 01/15] Fix LLVM build @@ -8,10 +8,10 @@ Subject: [PATCH 01/15] Fix LLVM build 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index a476d25f..c7e63990 100644 +index 4ac857b47..b603ae90a 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -768,7 +768,8 @@ impl Build { +@@ -1050,7 +1050,8 @@ impl Build { .args() .iter() .map(|s| s.to_string_lossy().into_owned()) @@ -22,5 +22,5 @@ index a476d25f..c7e63990 100644 // If we're compiling on macOS then we add a few unconditional flags -- -2.26.2 +2.37.2 diff --git a/base/rust/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch b/base/rust/2.patch similarity index 77% rename from base/rust/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch rename to base/rust/2.patch index 85a8806..c156945 100644 --- a/base/rust/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch +++ b/base/rust/2.patch @@ -1,8 +1,26 @@ +From 7219ba1c9accbad9b530d312fd9a9f69330c93da Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 3 May 2020 17:53:33 +0200 +Subject: [PATCH 02/15] Remove -nostdlib and musl_root from musl targets + +extended by various void contributors to match our musl setup +--- + compiler/rustc_target/src/spec/crt_objects.rs | 22 ---------- + .../rustc_target/src/spec/linux_musl_base.rs | 7 --- + config.toml.example | 8 ---- + src/bootstrap/cc_detect.rs | 25 +---------- + src/bootstrap/compile.rs | 43 +------------------ + src/bootstrap/config.rs | 9 ---- + src/bootstrap/configure.py | 28 ------------ + src/bootstrap/lib.rs | 19 -------- + src/bootstrap/sanity.rs | 23 ---------- + 9 files changed, 3 insertions(+), 181 deletions(-) + diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs -index 2fc9ab29f..276736159 100644 +index 52ac3622e..f35e5b9d8 100644 --- a/compiler/rustc_target/src/spec/crt_objects.rs +++ b/compiler/rustc_target/src/spec/crt_objects.rs -@@ -62,28 +62,6 @@ pub(super) fn all(obj: &str) -> CrtObjects { +@@ -63,28 +63,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects { ]) } @@ -32,7 +50,7 @@ index 2fc9ab29f..276736159 100644 new(&[ (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]), diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs -index 5038a967d..b3c0e5bc4 100644 +index 207a87ab0..88f807a58 100644 --- a/compiler/rustc_target/src/spec/linux_musl_base.rs +++ b/compiler/rustc_target/src/spec/linux_musl_base.rs @@ -1,16 +1,9 @@ @@ -42,7 +60,7 @@ index 5038a967d..b3c0e5bc4 100644 pub fn opts() -> TargetOptions { let mut base = super::linux_base::opts(); - base.env = "musl".to_string(); + base.env = "musl".into(); - base.pre_link_objects_fallback = crt_objects::pre_musl_fallback(); - base.post_link_objects_fallback = crt_objects::post_musl_fallback(); - base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); @@ -53,30 +71,29 @@ index 5038a967d..b3c0e5bc4 100644 base } diff --git a/config.toml.example b/config.toml.example -index 6e5584797..5be9882a8 100644 +index b3284050f..62ac07f87 100644 --- a/config.toml.example +++ b/config.toml.example -@@ -638,15 +638,6 @@ changelog-seen = 2 - # only use static libraries. If unset, the target's default linkage is used. - #crt-static = (bool) +@@ -523,14 +523,6 @@ changelog-seen = 2 + # supplementary build information, like distro-specific package versions. + #description = (string) -# The root location of the musl installation directory. The library directory -# will also need to contain libunwind.a for an unwinding implementation. Note -# that this option only makes sense for musl targets that produce statically -# linked binaries. --#musl-root = build.musl-root (path) +-# +-# Defaults to /usr on musl hosts. Has no default otherwise. +-#musl-root = (path) - --# The full path to the musl libdir. --#musl-libdir = musl-root/lib -- - # The root location of the `wasm32-wasi` sysroot. Only used for the - # `wasm32-wasi` target. If you are building wasm32-wasi target, make sure to - # create a `[target.wasm32-wasi]` section and move this field there. + # By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix + # platforms to ensure that the compiler is usable by default from the build + # directory (as it links to a number of dynamic libraries). This may not be diff --git a/src/bootstrap/cc_detect.rs b/src/bootstrap/cc_detect.rs -index e750c2963..f6ba3032b 100644 +index dca782c29..8eb35ea43 100644 --- a/src/bootstrap/cc_detect.rs +++ b/src/bootstrap/cc_detect.rs -@@ -98,7 +98,7 @@ pub fn find(build: &mut Build) { +@@ -97,7 +97,7 @@ pub fn find(build: &mut Build) { if let Some(cc) = config.and_then(|c| c.cc.as_ref()) { cfg.compiler(cc); } else { @@ -85,7 +102,7 @@ index e750c2963..f6ba3032b 100644 } let compiler = cfg.get_compiler(); -@@ -126,7 +126,7 @@ pub fn find(build: &mut Build) { +@@ -125,7 +125,7 @@ pub fn find(build: &mut Build) { cfg.compiler(cxx); true } else if build.hosts.contains(&target) || build.build == target { @@ -94,7 +111,7 @@ index e750c2963..f6ba3032b 100644 true } else { // Use an auto-detected compiler (or one configured via `CXX_target_triple` env vars). -@@ -157,7 +157,6 @@ fn set_compiler( +@@ -161,7 +161,6 @@ fn set_compiler( compiler: Language, target: TargetSelection, config: Option<&Target>, @@ -102,7 +119,7 @@ index e750c2963..f6ba3032b 100644 ) { match &*target.triple { // When compiling for android we may have the NDK configured in the -@@ -200,26 +199,6 @@ fn set_compiler( +@@ -204,26 +203,6 @@ fn set_compiler( } } @@ -130,13 +147,13 @@ index e750c2963..f6ba3032b 100644 } } diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index ee3527b6b..0a8b78327 100644 +index b4807d1ab..ce483bf6b 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs -@@ -179,34 +179,7 @@ fn copy_self_contained_objects( +@@ -200,39 +200,7 @@ fn copy_self_contained_objects( let mut target_deps = vec![]; - // Copies the CRT objects. + // Copies the libc and CRT objects. - // - // rustc historically provides a more self-contained installation for musl targets - // not requiring the presence of a native musl toolchain. For example, it can fall back @@ -147,7 +164,7 @@ index ee3527b6b..0a8b78327 100644 - let srcdir = builder.musl_libdir(target).unwrap_or_else(|| { - panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple) - }); -- for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] { +- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] { - copy_and_stamp( - builder, - &libdir_self_contained, @@ -164,12 +181,17 @@ index ee3527b6b..0a8b78327 100644 - builder.copy(&src, &target); - target_deps.push((target, DependencyType::TargetSelfContained)); - } +- +- if !target.starts_with("s390x") { +- let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained); +- target_deps.push((libunwind_path, DependencyType::TargetSelfContained)); +- } - } else if target.ends_with("-wasi") { + if target.ends_with("-wasi") { let srcdir = builder .wasi_root(target) .unwrap_or_else(|| { -@@ -288,15 +261,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car +@@ -316,15 +284,6 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car .arg("--manifest-path") .arg(builder.src.join("library/test/Cargo.toml")); @@ -186,10 +208,10 @@ index ee3527b6b..0a8b78327 100644 if let Some(p) = builder.wasi_root(target) { let root = format!("native={}/lib/wasm32-wasi", p.to_str().unwrap()); diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs -index 483816b98..7517d757c 100644 +index 146077419..18a764689 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs -@@ -165,7 +165,6 @@ pub struct Config { +@@ -186,7 +186,6 @@ pub struct Config { pub missing_tools: bool, // Fallback musl-root for all targets @@ -197,7 +219,7 @@ index 483816b98..7517d757c 100644 pub prefix: Option, pub sysconfdir: Option, pub datadir: Option, -@@ -291,8 +290,6 @@ pub struct Target { +@@ -400,8 +399,6 @@ pub struct Target { pub sanitizers: Option, pub profiler: Option, pub crt_static: Option, @@ -206,24 +228,24 @@ index 483816b98..7517d757c 100644 pub wasi_root: Option, pub qemu_rootfs: Option, pub no_std: bool, -@@ -481,7 +478,6 @@ struct Rust { - default_linker: Option, - channel: Option, - description: Option, -- musl_root: Option, - rpath: Option, - verbose_tests: Option, - optimize_tests: Option, -@@ -524,8 +520,6 @@ struct TomlTarget { - sanitizers: Option, - profiler: Option, - crt_static: Option, -- musl_root: Option, -- musl_libdir: Option, - wasi_root: Option, - qemu_rootfs: Option, - no_std: Option, -@@ -846,7 +840,6 @@ impl Config { +@@ -689,7 +686,6 @@ define_config! { + default_linker: Option = "default-linker", + channel: Option = "channel", + description: Option = "description", +- musl_root: Option = "musl-root", + rpath: Option = "rpath", + verbose_tests: Option = "verbose-tests", + optimize_tests: Option = "optimize-tests", +@@ -734,8 +730,6 @@ define_config! { + sanitizers: Option = "sanitizers", + profiler: Option = "profiler", + crt_static: Option = "crt-static", +- musl_root: Option = "musl-root", +- musl_libdir: Option = "musl-libdir", + wasi_root: Option = "wasi-root", + qemu_rootfs: Option = "qemu-rootfs", + no_std: Option = "no-std", +@@ -1107,7 +1101,6 @@ impl Config { set(&mut config.llvm_tools_enabled, rust.llvm_tools); config.rustc_parallel = rust.parallel_compiler.unwrap_or(false); config.rustc_default_linker = rust.default_linker; @@ -231,7 +253,7 @@ index 483816b98..7517d757c 100644 config.save_toolstates = rust.save_toolstates.map(PathBuf::from); set(&mut config.deny_warnings, flags.deny_warnings.or(rust.deny_warnings)); set(&mut config.backtrace_on_ice, rust.backtrace_on_ice); -@@ -892,8 +885,6 @@ impl Config { +@@ -1164,8 +1157,6 @@ impl Config { target.ranlib = cfg.ranlib.map(PathBuf::from); target.linker = cfg.linker.map(PathBuf::from); target.crt_static = cfg.crt_static; @@ -241,10 +263,10 @@ index 483816b98..7517d757c 100644 target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); target.sanitizers = cfg.sanitizers; diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py -index 999882a1c..7ccc2b73c 100755 +index 2fc036082..91737e0ea 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py -@@ -109,34 +109,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", +@@ -114,34 +114,6 @@ v("aarch64-linux-android-ndk", "target.aarch64-linux-android.android-ndk", "aarch64-linux-android NDK standalone path") v("x86_64-linux-android-ndk", "target.x86_64-linux-android.android-ndk", "x86_64-linux-android NDK standalone path") @@ -280,10 +302,10 @@ index 999882a1c..7ccc2b73c 100755 "rootfs in qemu testing, you probably don't want to use this") v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs", diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 24da44b93..c08bc6d94 100644 +index b603ae90a..0a7012dbd 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs -@@ -927,25 +927,6 @@ impl Build { +@@ -1153,25 +1153,6 @@ impl Build { } } @@ -310,10 +332,18 @@ index 24da44b93..c08bc6d94 100644 fn wasi_root(&self, target: TargetSelection) -> Option<&Path> { self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p) diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index ed0cbdf97..44937aed9 100644 +index 64c5dd7ae..b8f9104ea 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs -@@ -182,28 +182,6 @@ pub fn check(build: &mut Build) { +@@ -11,7 +11,6 @@ + use std::collections::HashMap; + use std::env; + use std::ffi::{OsStr, OsString}; +-use std::fs; + use std::path::PathBuf; + use std::process::Command; + +@@ -190,28 +189,6 @@ than building it. } } @@ -339,6 +369,9 @@ index ed0cbdf97..44937aed9 100644 - } - } - - if target.contains("msvc") { + if need_cmake && target.contains("msvc") { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual +-- +2.37.2 + diff --git a/base/rust/3.patch b/base/rust/3.patch new file mode 100644 index 0000000..2ca7ffe --- /dev/null +++ b/base/rust/3.patch @@ -0,0 +1,22 @@ +From d7d7fc24d1744a3db70a9fb010c31daa14a46df7 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Mon, 20 Dec 2021 00:55:18 +0100 +Subject: [PATCH 04/15] fix shebang on install-template.sh + +--- + src/tools/rust-installer/install-template.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/rust-installer/install-template.sh b/src/tools/rust-installer/install-template.sh +index e68be8911..beaa90f7b 100644 +--- a/src/tools/rust-installer/install-template.sh ++++ b/src/tools/rust-installer/install-template.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + # Copyright 2014 The Rust Project Developers. See the COPYRIGHT + # file at the top-level directory of this distribution and at + # http://rust-lang.org/COPYRIGHT. +-- +2.37.2 + diff --git a/base/rust/00016-do-not-copy-libunwind.patch b/base/rust/4.patch similarity index 57% rename from base/rust/00016-do-not-copy-libunwind.patch rename to base/rust/4.patch index 73c496a..92e0021 100644 --- a/base/rust/00016-do-not-copy-libunwind.patch +++ b/base/rust/4.patch @@ -1,18 +1,17 @@ -From 227096bde5283269aa1d1002860b6ec54d2cf284 Mon Sep 17 00:00:00 2001 -From: Johannes Brechtmann -Date: Sun, 22 Nov 2020 16:00:50 +0100 -Subject: [PATCH] Revert "Include libunwind in the rust-src component." +From 1335a445327a6605c5f933d9647b97e771089abd Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Mon, 20 Dec 2021 01:44:54 +0100 +Subject: [PATCH 05/15] do not install libunwind source (removed) -This reverts commit 9f27f3796d3487411ab035803a0757d69040649c. --- src/bootstrap/dist.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index b2a590307a2..020cd665a0e 100644 +index e7a077134..74e75df4b 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs -@@ -1016,7 +1016,7 @@ impl Step for Src { +@@ -804,7 +804,7 @@ impl Step for Src { copy_src_dirs( builder, &builder.src, @@ -22,5 +21,5 @@ index b2a590307a2..020cd665a0e 100644 // not needed and contains symlinks which rustup currently // chokes on when unpacking. -- -2.29.2 +2.37.2 diff --git a/base/rust/5.patch b/base/rust/5.patch new file mode 100644 index 0000000..198e4fc --- /dev/null +++ b/base/rust/5.patch @@ -0,0 +1,28 @@ +From c2de45cbdaee1a8c81b2d65f6bced1439a738e00 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Mon, 20 Dec 2021 01:48:49 +0100 +Subject: [PATCH 07/15] link stage 2 tools dynamically to libstd + +stage 2 tools are the ones that are distributed, and we distribute +them together with the rust libs so there is no need to worry +about unstable ABI +--- + src/bootstrap/builder.rs | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index 62b5416ce..554dd4188 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -2066,6 +2066,8 @@ impl<'a> Builder<'a> { + // linking all deps statically into the dylib. + if matches!(mode, Mode::Std | Mode::Rustc) { + rustflags.arg("-Cprefer-dynamic"); ++ } else if stage >= 2 { ++ rustflags.arg("-Cprefer-dynamic"); + } + + // When building incrementally we default to a lower ThinLTO import limit +-- +2.37.2 + diff --git a/base/rust/6.patch b/base/rust/6.patch new file mode 100644 index 0000000..f667662 --- /dev/null +++ b/base/rust/6.patch @@ -0,0 +1,29 @@ +From 5e9e5fa2b2aefefbdc00547d7f10ee92d9b3356a Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Tue, 21 Dec 2021 00:48:29 +0100 +Subject: [PATCH 09/15] do not export LD_LIBRARY_PATH + +--- + src/bootstrap/bootstrap.py | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py +index 40d478a17..3501fd901 100644 +--- a/src/bootstrap/bootstrap.py ++++ b/src/bootstrap/bootstrap.py +@@ -756,12 +756,6 @@ class RustBuild(object): + del env["CARGO_BUILD_TARGET"] + env["CARGO_TARGET_DIR"] = build_dir + env["RUSTC"] = self.rustc() +- env["LD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \ +- (os.pathsep + env["LD_LIBRARY_PATH"]) \ +- if "LD_LIBRARY_PATH" in env else "" +- env["DYLD_LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \ +- (os.pathsep + env["DYLD_LIBRARY_PATH"]) \ +- if "DYLD_LIBRARY_PATH" in env else "" + env["LIBRARY_PATH"] = os.path.join(self.bin_root(), "lib") + \ + (os.pathsep + env["LIBRARY_PATH"]) \ + if "LIBRARY_PATH" in env else "" +-- +2.37.2 + diff --git a/base/rust/7.patch b/base/rust/7.patch new file mode 100644 index 0000000..f2780ae --- /dev/null +++ b/base/rust/7.patch @@ -0,0 +1,31 @@ +From 7e100ca9dad23efa1aafccd8faf86ec5fa85c351 Mon Sep 17 00:00:00 2001 +From: q66 +Date: Sun, 3 May 2020 18:02:03 +0200 +Subject: [PATCH 10/15] Fix dynamic linkage of musl libc for the libc crate + +--- + vendor/libc/src/unix/mod.rs | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs +index ecee44411..7ae05f24e 100644 +--- a/vendor/libc/src/unix/mod.rs ++++ b/vendor/libc/src/unix/mod.rs +@@ -337,11 +337,11 @@ cfg_if! { + #[link(name = "c", cfg(not(target_feature = "crt-static")))] + extern {} + } else if #[cfg(target_env = "musl")] { ++ #[link(name = "c")] ++ extern {} + #[cfg_attr(feature = "rustc-dep-of-std", +- link(name = "c", kind = "static", modifiers = "-bundle", ++ link(name = "gcc", kind = "static", modifiers = "-bundle", + cfg(target_feature = "crt-static")))] +- #[cfg_attr(feature = "rustc-dep-of-std", +- link(name = "c", cfg(not(target_feature = "crt-static"))))] + extern {} + } else if #[cfg(target_os = "emscripten")] { + #[link(name = "c")] +-- +2.37.2 + diff --git a/base/rust/8.patch b/base/rust/8.patch new file mode 100644 index 0000000..2414d72 --- /dev/null +++ b/base/rust/8.patch @@ -0,0 +1,74 @@ +From 236c0272667d69380d03984cfa8bad44b033fd69 Mon Sep 17 00:00:00 2001 +From: Daniel Kolesa +Date: Tue, 21 Dec 2021 02:46:30 +0100 +Subject: [PATCH 13/15] allow specifying native sysroot to use for linkage + +This allows us to get around the linker attempting to use +incompatible libs. +--- + src/bootstrap/builder.rs | 4 ++++ + src/bootstrap/config.rs | 3 +++ + src/bootstrap/lib.rs | 4 ++++ + 3 files changed, 11 insertions(+) + +diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs +index 6a02a225c..483aa8818 100644 +--- a/src/bootstrap/builder.rs ++++ b/src/bootstrap/builder.rs +@@ -1708,6 +1708,10 @@ impl<'a> Builder<'a> { + } + } + ++ if let Some(sysroot) = self.native_sysroot(target) { ++ rustflags.arg(&format!("-Clink-args=--sysroot={}", sysroot.display())); ++ } ++ + if let Some(host_linker) = self.linker(compiler.host) { + cargo.env("RUSTC_HOST_LINKER", host_linker); + } +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index 18a764689..f8b9bbd96 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -395,6 +395,7 @@ pub struct Target { + pub ranlib: Option, + pub default_linker: Option, + pub linker: Option, ++ pub sysroot: Option, + pub ndk: Option, + pub sanitizers: Option, + pub profiler: Option, +@@ -723,6 +724,7 @@ define_config! { + ranlib: Option = "ranlib", + default_linker: Option = "default-linker", + linker: Option = "linker", ++ sysroot: Option = "sysroot", + llvm_config: Option = "llvm-config", + llvm_filecheck: Option = "llvm-filecheck", + llvm_libunwind: Option = "llvm-libunwind", +@@ -1156,6 +1158,7 @@ impl Config { + target.ar = cfg.ar.map(PathBuf::from); + target.ranlib = cfg.ranlib.map(PathBuf::from); + target.linker = cfg.linker.map(PathBuf::from); ++ target.sysroot = cfg.sysroot.map(PathBuf::from); + target.crt_static = cfg.crt_static; + target.wasi_root = cfg.wasi_root.map(PathBuf::from); + target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from); +diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs +index 0a7012dbd..cded50d20 100644 +--- a/src/bootstrap/lib.rs ++++ b/src/bootstrap/lib.rs +@@ -1152,6 +1152,10 @@ impl Build { + self.config.target_config.get(&target).and_then(|t| t.crt_static) + } + } ++ ++ fn native_sysroot(&self, target: TargetSelection) -> Option<&Path> { ++ self.config.target_config.get(&target).and_then(|c| c.sysroot.as_ref()).map(|p| &**p) ++ } + + /// Returns the sysroot for the wasi target, if defined + fn wasi_root(&self, target: TargetSelection) -> Option<&Path> { +-- +2.37.2 + diff --git a/base/rust/config.toml b/base/rust/config.toml index 8678838..dcba060 100644 --- a/base/rust/config.toml +++ b/base/rust/config.toml @@ -18,7 +18,7 @@ docs = false [install] prefix = "/" libdir = "lib" -mandir = "share" +mandir = "share/man" [rust] codegen-units = 0 diff --git a/base/rust/disable_miri.patch b/base/rust/disable_miri.patch deleted file mode 100644 index 73eec74..0000000 --- a/base/rust/disable_miri.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 601d24810e89efd42f7cd69d4a7ccecd4e35364d Mon Sep 17 00:00:00 2001 -From: Eric Huss -Date: Tue, 22 Jun 2021 22:10:25 -0700 -Subject: [PATCH 1/2] Don't dist miri on stable or beta. - ---- - src/bootstrap/dist.rs | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 71ed0af4a7c04..e0c33f7357741 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -1171,6 +1171,9 @@ impl Step for Miri { - } - - fn run(self, builder: &Builder<'_>) -> Option { -+ if !builder.build.unstable_features() { -+ return None; -+ } - let compiler = self.compiler; - let target = self.target; - assert!(builder.config.extended); - -From 6aa79a34d87252deaae11e75663e5740a22f14ea Mon Sep 17 00:00:00 2001 -From: Eric Huss -Date: Wed, 23 Jun 2021 07:03:42 -0700 -Subject: [PATCH 2/2] Comment and include rust-analyzer. - ---- - src/bootstrap/dist.rs | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index e0c33f7357741..19895baf08f16 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -1072,6 +1072,12 @@ impl Step for RustAnalyzer { - } - - fn run(self, builder: &Builder<'_>) -> Option { -+ // This prevents rust-analyzer from being built for "dist" or "install" -+ // on the stable/beta channels. It is a nightly-only tool and should -+ // not be included. -+ if !builder.build.unstable_features() { -+ return None; -+ } - let compiler = self.compiler; - let target = self.target; - assert!(builder.config.extended); -@@ -1171,6 +1177,9 @@ impl Step for Miri { - } - - fn run(self, builder: &Builder<'_>) -> Option { -+ // This prevents miri from being built for "dist" or "install" -+ // on the stable/beta channels. It is a nightly-only tool and should -+ // not be included. - if !builder.build.unstable_features() { - return None; - } -From f698cacc33f0c9148bb3bb7501087b0d37e837ec Mon Sep 17 00:00:00 2001 -From: Eric Huss -Date: Fri, 9 Jul 2021 10:01:23 -0700 -Subject: [PATCH 1/3] Fix rust-analyzer install when not available. - ---- - src/bootstrap/install.rs | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs -index 13ee909afd5e4..6f3054538a898 100644 ---- a/src/bootstrap/install.rs -+++ b/src/bootstrap/install.rs -@@ -165,10 +165,15 @@ install!((self, builder, _config), - } - }; - RustAnalyzer, "rust-analyzer", Self::should_build(_config), only_hosts: true, { -- let tarball = builder -- .ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target }) -- .expect("missing rust-analyzer"); -- install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball); -+ if let Some(tarball) = -+ builder.ensure(dist::RustAnalyzer { compiler: self.compiler, target: self.target }) -+ { -+ install_sh(builder, "rust-analyzer", self.compiler.stage, Some(self.target), &tarball); -+ } else { -+ builder.info( -+ &format!("skipping Install rust-analyzer stage{} ({})", self.compiler.stage, self.target), -+ ); -+ } - }; - Clippy, "clippy", Self::should_build(_config), only_hosts: true, { - let tarball = builder.ensure(dist::Clippy { compiler: self.compiler, target: self.target }); - -From 60ff731110815349dbc052c36e9cc50b9f12f32a Mon Sep 17 00:00:00 2001 -From: Eric Huss -Date: Sun, 11 Jul 2021 09:01:31 -0700 -Subject: [PATCH 2/3] Add comments why install steps should never fail. - ---- - src/bootstrap/install.rs | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs -index 6f3054538a898..2ac9d3dda206f 100644 ---- a/src/bootstrap/install.rs -+++ b/src/bootstrap/install.rs -@@ -139,11 +139,15 @@ macro_rules! install { - - install!((self, builder, _config), - Docs, "src/doc", _config.docs, only_hosts: false, { -+ // `expect` should be safe, only None when config.docs is false, -+ // which is guarded in `should_run` - let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); - install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); - }; - Std, "library/std", true, only_hosts: false, { - for target in &builder.targets { -+ // `expect` should be safe, only None when host != build, but this -+ // only runs when host == build - let tarball = builder.ensure(dist::Std { - compiler: self.compiler, - target: *target -@@ -217,6 +221,8 @@ install!((self, builder, _config), - } - }; - Analysis, "analysis", Self::should_build(_config), only_hosts: false, { -+ // `expect` should be safe, only None with host != build, but this -+ // only uses the `build` compiler - let tarball = builder.ensure(dist::Analysis { - // Find the actual compiler (handling the full bootstrap option) which - // produced the save-analysis data because that data isn't copied - -From 166c147c2727cd6d6ad4d39c40c51273b8a63c96 Mon Sep 17 00:00:00 2001 -From: Eric Huss -Date: Mon, 12 Jul 2021 13:29:47 -0700 -Subject: [PATCH 3/3] Provide a better error when `x.py install src/doc` - doesn't work. - ---- - src/bootstrap/install.rs | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs -index 2ac9d3dda206f..8a1b6df0dafe3 100644 ---- a/src/bootstrap/install.rs -+++ b/src/bootstrap/install.rs -@@ -139,10 +139,12 @@ macro_rules! install { - - install!((self, builder, _config), - Docs, "src/doc", _config.docs, only_hosts: false, { -- // `expect` should be safe, only None when config.docs is false, -- // which is guarded in `should_run` -- let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); -- install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); -+ if let Some(tarball) = builder.ensure(dist::Docs { host: self.target }) { -+ install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); -+ } else { -+ panic!("docs are not available to install, \ -+ check that `build.docs` is true in `config.toml`"); -+ } - }; - Std, "library/std", true, only_hosts: false, { - for target in &builder.targets { diff --git a/base/rust/rust.SMBuild b/base/rust/rust.SMBuild index 93d4c46..15df275 100755 --- a/base/rust/rust.SMBuild +++ b/base/rust/rust.SMBuild @@ -1,5 +1,5 @@ app=rust -version=1.53.0 +version=1.64.0 build=1sml homepage="https://rust-lang.org" download="https://static.rust-lang.org/dist/rustc-$version-src.tar.xz" @@ -8,7 +8,7 @@ requires="gcc-libs bash llvm clang gdb" # We don't want .rlib files to be removed preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf rustc-$version-src @@ -33,28 +33,21 @@ build() { cd ../../ fi - applypatch $srcdir/0001-Fix-LLVM-build.patch - applypatch $srcdir/00016-do-not-copy-libunwind.patch - applypatch $srcdir/0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch - applypatch $srcdir/0003-Require-static-native-libraries-when-linking-static-.patch - applypatch $srcdir/0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch - applypatch $srcdir/0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch - applypatch $srcdir/0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch - applypatch $srcdir/0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch - applypatch $srcdir/0008-Ignore-broken-and-non-applicable-tests.patch - applypatch $srcdir/0009-Link-stage2-tools-dynamically-to-libstd.patch - applypatch $srcdir/0010-Move-debugger-scripts-to-usr-share-rust.patch - applypatch $srcdir/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch - applypatch $srcdir/0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch - applypatch $srcdir/disable_miri.patch + applypatch $srcdir/1.patch + applypatch $srcdir/2.patch + applypatch $srcdir/3.patch + applypatch $srcdir/4.patch + applypatch $srcdir/5.patch + applypatch $srcdir/6.patch + applypatch $srcdir/7.patch + applypatch $srcdir/8.patch clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' vendor/$1/.cargo-checksum.json } - export RUST_BACKTRACE=1 - export PKG_CONFIG_ALLOW_CROSS=1 sed -i /LD_LIBRARY_PATH/d src/bootstrap/bootstrap.py + clear_vendor_checksums libc # We use our system's LLVM. Discard rust's own bundled LLVM directory @@ -67,10 +60,14 @@ build() { elif [ "$arch" = "x86_64" ] ; then sed -i 's@ARCH@x86_64@g' config.toml fi +} + +build() { + export RUST_BACKTRACE=1 # Go easy on the pi unset MAKEFLAGS - python3 ./x.py dist -v -j2 + python3 ./x.py dist -v -j4 DESTDIR="$pkg" python3 ./x.py install cp LICENSE* COPYRIGHT $pkgdocs/ @@ -87,21 +84,15 @@ build() { } sha512sums=" -ddd5fbd62242e7541245c0abd0ba76ac0197e8182ea425610da3e8be8700d6639763c4dadc699bfa29e1441e659de82fdfbe6e235efce29b9e28d0c8e9ad44f3 rust-1.53.0-aarch64-unknown-linux-musl.tar.gz -97d1c3c43f02a378ae2fba0148b6ec37c4c69756bb518c3e1624fa6c5dee9383925312d69ff4bde45a2c3a04a3ef6bb10ed0d2939a932b12cfbb507550cc3c4f rust-1.53.0-x86_64-unknown-linux-musl.tar.gz -e279491a6252b2a62a70c0352e4dd9603ffbb629231315572ef2eac4581ebad394076ff05da47ff71f488f1b84a783ac95b41665b3c85b524ecc8a4eccd7c4b0 rustc-1.53.0-src.tar.xz -3a2961af1f90f19f06cd079c051566952f7e347bd29dcb5f2b6ffe85d59e00f9de1eda4a5ddad7a5abd0ef85d5f8e7c5b2a143923cb286bff9369291e562856e 0001-Fix-LLVM-build.patch -165316d689dc664101a720af4baf5772159dc87459f3937488ceb1cfd4063b76bcb190046fe3927489b399f9815d24007845f4270d58fb06e4500d05cc39fa50 00016-do-not-copy-libunwind.patch -966a3f898d516b9e327a6caa2dcecb189f1af2ad2b606a4254452b7525b992d160fbb5acc5e6747dd8f572d6f055dded4d07b0e5680184af3f58c86ef434e6c7 0002-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch -4fc9d7ced03f0effb3bcce385fa1663d37ae9f271b79c8270fa442a6e9a2de3694246f3a95eaa0fb5177558c0f312e8df38ce514b69c889642b6895197e0b15f 0003-Require-static-native-libraries-when-linking-static-.patch -a9fd9de296f3c4a54534901d3b9912b1cafd0787ad2358e872a030393c7f9f6e57adf39f6a16699621389056edd8118dbb4e8071bce97906b1311b39ccec4098 0004-Remove-nostdlib-and-musl_root-from-musl-targets.patch -fa67468667903290b8e6d16d6777f80aac49d987e8e60c43f8302da77fa1e0e35c4d363d216867c79989c8c35d552c0d5dd6bce69734ed0ce75b4b67ca924953 0005-Prefer-libgcc_eh-over-libunwind-on-musl.patch -5798114c8eb1b914b7affe9925c477f5dcd135925ed925580b69811ca3249c40ca73731425b5e15322879817ad5cb17e19dc78748e993a6c56fa5570a44ce228 0006-test-use-extern-for-plugins-Don-t-assume-multilib.patch -7a559ce8f92f015cc5173fdf378e7e3b52052b7a0ea2604e851121bcdab098220c6cdba59980a087560865b339e761afa0570fefb63b0def5e45f512bb0d1a9e 0007-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch -1bd86522b04d95baa42aff5656cc12642f4772de021aa6b13fc809cca998ec2ac78b075f66c57c0a565804a14ad6f99f34fd9b3470198970c57b13b61e6bbcad 0008-Ignore-broken-and-non-applicable-tests.patch -ab7cea491237894bfa77e2a74ca27a3ff20c38c6428e853fa384e5ba511afe496f7ec3210048f26b393224c47414440c5e7beea0e480a471128b301515750196 0009-Link-stage2-tools-dynamically-to-libstd.patch -5ed3c48782f52e30180b0a012686a5dbea18bf69e053eefd4211fb077b2e5696b1e7031f6b37659cbdf78e9fa902abe36aeb384a3ff88f8ab2ba5ada7b32a3f9 0010-Move-debugger-scripts-to-usr-share-rust.patch -63701e7d8c5606abe94cba6d157a60682b67f6eb585f16dd543061229e5cfff777a675d984541398a4c0bf4d8f7a873428b9849ebcaa9acdc685c269b40c6a57 0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch -9d772f7d109becbae2fa007e350a4357b70afc13a6a2d9b64885cb0970742785cd4e770b28cdaa6a4314a7db0d44a91f0a95334c46b51591c89ad17cdc3e020b 0014-Void-fix-linkage-against-host-target-LLVM-in-cross-s.patch -70b12454888b80487b5819e03800c86ad978099f0b607e60b8e129f2388780068b11e79a0382a58af7a03f7c2e8bf28e1682edc1d55118ad4be8e72ddf011a59 disable_miri.patch +6276b72762a833c992326cb4f2fc09c55f621af1dccc793d0eb75840bc4b408697e95fa8140f0459514cfa7fdfbaa30e433c93f0475a790ff6170af6e8e696a3 rust-1.64.0-aarch64-unknown-linux-musl.tar.gz +5c1e2ec6060559970862384152d37a52ce5a81296506db7158945fc253d102550dfad49488bd8fc00dccd86c1ab06057046917eed1b11c21fbc3e7aca0bf57f8 rust-1.64.0-x86_64-unknown-linux-musl.tar.gz +6d1cc90bb73468b6f3118bc8f2c1177dd424fd8ebc27dcb9b61d14a14fa7b5fdec3d109a51ab725c5cfc2119f994a668b0ffd4d3bc7491928d3b7ba07f3e610a rustc-1.64.0-src.tar.lz +e4683f00c6c273dfd915bd4a3aa3e00ceb37633f8869f29faccee93b2e40def1b9733b67e1e57a632cc6aaf069fe36297109ab708122bffc432cfd34560854bb 1.patch +5b77f8b5505e7d1bc8225f8bde5fdfd67680fcb5e9774e77fc1842ca32c1042fe8e59e329fccc556e3805db3c0768c273fa17fc0446750503d4be53e92db8b71 2.patch +7309d2add788061f83e0e11a4cfa1433bcbbab4dc11584ae865c0fce36b9a97f5f553bcf6d4f8933e2734869b3c95edbe62950e5fe622165b922301187c31c50 3.patch +47dd902d06e10f39648e73098b01c5db7ff3f842c449e1b5bff5a403f75d6295144875e4b27af38746441e093906494e990da0242a6a8d245e7d83973bba62cd 4.patch +0b07980a5172178ae9249eb1ff3afe3ca62065049763eef14a8404d3c0c02a539f4b0f3c38eca07f631e9bafc4252da8241e0d0223e54213ac27573bb2ddc1c9 5.patch +bae78b62536a13d7ab3396bd69d162013a863ff86dee0e6be8d0b4d18dc5812812e15ac208b6ce5ceb5d71482e70befe13589cb92361daac49f718226bc3480f 6.patch +a38344aa316e4d459e4887b1f0bdfd7378930b3cc1209b36fdf8f4196352f5e7499c1ff03223d23567089e0485968cbc688ec82640ce34d4a3ff9240b4948074 7.patch +3c7e7cb9a3a1b483455096e31c071a746207e638dd9e7d6445c0a128d003a35fdfe974c5978e0fcefe3e7a2a13c8cc351b2c809d8b026ad7116a69a68285e02f 8.patch " diff --git a/base/sbc/sbc.SMBuild b/base/sbc/sbc.SMBuild index 09a0e6d..ff450c5 100755 --- a/base/sbc/sbc.SMBuild +++ b/base/sbc/sbc.SMBuild @@ -6,14 +6,16 @@ download="https://www.kernel.org/pub/linux/bluetooth/sbc-$version.tar.xz" desc="Bluetooth audio library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/sccache/sccache.SMBuild b/base/sccache/sccache.SMBuild index 9904b83..629265a 100755 --- a/base/sccache/sccache.SMBuild +++ b/base/sccache/sccache.SMBuild @@ -1,21 +1,23 @@ app=sccache -version=0.3.0 +version=0.3.3 build=1sml homepage="https://github.com/mozilla/sccache" download="https://github.com/mozilla/sccache/archive/refs/tags/v$version.tar.gz" desc="Compile caching tool like ccache which can also cache rust objects" requires="rust" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { cargo build \ - --release \ + --release --frozen \ --manifest-path Cargo.toml \ --features native-zlib @@ -26,5 +28,5 @@ build() { } sha512sums=" -5e2f49e9f96df71d14fc0c543ce783fe3065ac1932781b31cd3fc4000cbfd46b61066f0055f1aea45093611124515da238aeb8295c4ee9929c5bef2e5f4e2e38 sccache-0.3.0.tar.lz -" \ No newline at end of file +d8431cd99d657c749437fe5816dce7c416ef5c93bd7a75d020c7ab77593e87b9c4600d3c3d338cd1e6fc5cd3e7fe1b236eb073f90f73e2ea4a649d1a9ffab53e sccache-0.3.3.tar.lz +" diff --git a/base/scons/scons.SMBuild b/base/scons/scons.SMBuild index 9cfcbce..ca8f52a 100755 --- a/base/scons/scons.SMBuild +++ b/base/scons/scons.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/scons/files/scons/$version/scons-$ver desc="A software construction tool based on python" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { python3 setup.py build python3 setup.py install --prefix="" --root=$pkg @@ -28,4 +30,4 @@ build() { sha512sums=" b16ac16d2185ff1866833675ef05d31d9ed691c7f169ea1f7b0c6c7ae1fc4039a139866a8da5faa5bcc39cd1103d39ea97b3fa043f91f49f953fbefc992acb79 scons-3.1.2.tar.lz -" \ No newline at end of file +" diff --git a/base/sed/sed.SMBuild b/base/sed/sed.SMBuild index 8cf877f..2d84c72 100755 --- a/base/sed/sed.SMBuild +++ b/base/sed/sed.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/sed/sed-$version.tar.bz2" desc="GNU stream editor" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LDFLAGS="-static" \ ./configure \ --prefix="" diff --git a/base/shellcheck-bin/shellcheck-bin.SMBuild b/base/shellcheck-bin/shellcheck-bin.SMBuild index 9c42b3e..9ea2804 100755 --- a/base/shellcheck-bin/shellcheck-bin.SMBuild +++ b/base/shellcheck-bin/shellcheck-bin.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/koalaman/shellcheck/releases/download/v$version/she desc="Static Binary Of CLI Shell script analyzer" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf shellcheck-bins tar xf $srcdir/shellcheck-bins.tar.?z* cd shellcheck-bins fixbuilddirpermissions +} +build() { install -Dm 755 shellcheck.$arch $pkg/bin/shellcheck cp LICENSE.txt $pkgdocs/ diff --git a/base/signify/signify.SMBuild b/base/signify/signify.SMBuild index 8e75fea..d572596 100755 --- a/base/signify/signify.SMBuild +++ b/base/signify/signify.SMBuild @@ -7,14 +7,16 @@ download="https://github.com/aperezdc/signify/releases/download/v$version/signif desc="Tools to cryptographically sign and verify files from OpenBSD folks" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # We don't need a system-wide libbsd install because it would then get sucked # in by xorg and qt5-based applications. We'll keep it contained to the # signify source directory by modifying the pkgconfig path and CFLAGS and LDFLAGS. @@ -42,4 +44,4 @@ sha512sums=" b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9 libbsd-0.10.0.tar.xz 1bc9bb5eff5575af046978df34693a2e0a1d3c275d8cb88b38d42264a2b550e25cce4951b76ced97ac65ff7d32ccac52541dc05d75fae28907ab798aec73e58f signify-30.tar.lz 15d8eaa27c6e46862d8957341501c9f0dab254ed9652aca130c47b7478c025796d90b7ded10a74b69020c8da550b167a65b471b1c01d207abe0d281a785e6ffe sha2.h.patch -" \ No newline at end of file +" diff --git a/base/slapt-get/slapt-get.SMBuild b/base/slapt-get/slapt-get.SMBuild index c1b4c29..df8fbcf 100755 --- a/base/slapt-get/slapt-get.SMBuild +++ b/base/slapt-get/slapt-get.SMBuild @@ -5,18 +5,22 @@ homepage="https://github.com/jaos/slapt-get" desc="An apt-like front-end to Slackware's pkgtools" requires="curl libassuan" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 644 src/slapt.h $pkg/include/slapt.h + install -Dm 755 src/libslapt.so.0.11.1 $pkg/lib/libslapt.so.0.11.1 (cd $pkg/lib ; ln -s libslapt.so.0.11.1 libslapt.so) + install -Dm 755 slapt-get $pkg/bin/slapt-get install -Dm 644 doc/libslapt.3 $pkg/share/man/man3/libslapt.3 install -Dm 644 doc/slapt-get.8 $pkg/share/man/man8/slapt-get.8 @@ -30,4 +34,4 @@ build() { sha512sums=" da067237bfae0eb15edd0af96b366e044871d4c5b6a7d0839baaafc2ff9b0390df81c9ac414db93db15257c8331932dde6d9eb4340d281d04da6d55dbe682621 slapt-get-0.11.1.tar.lz -" \ No newline at end of file +" diff --git a/base/smartmontools/smartmontools.SMBuild b/base/smartmontools/smartmontools.SMBuild index 9bd6fe2..3664613 100755 --- a/base/smartmontools/smartmontools.SMBuild +++ b/base/smartmontools/smartmontools.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/smartmontools/files/smartmontools/$ve desc="monitoring utilities for hard drives using SMART protocol" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/base/soxr/soxr.SMBuild b/base/soxr/soxr.SMBuild index 852c815..6f2270c 100755 --- a/base/soxr/soxr.SMBuild +++ b/base/soxr/soxr.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/chirlu/soxr/archive/refs/tags/$version.tar.gz" desc="Audio library that outputs fast and high quality results for resampling ratio" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version-Source tar xf $srcdir/$app-$version-Source.tar.?z* cd $app-$version-Source fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/base/speexdsp/speexdsp.SMBuild b/base/speexdsp/speexdsp.SMBuild index 9f86941..b96340b 100755 --- a/base/speexdsp/speexdsp.SMBuild +++ b/base/speexdsp/speexdsp.SMBuild @@ -5,14 +5,16 @@ homepage="http://www.speex.org/" desc="Patent-free open-source DSP library" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/base/sqlite/sqlite.SMBuild b/base/sqlite/sqlite.SMBuild index 355725c..86b7fd8 100755 --- a/base/sqlite/sqlite.SMBuild +++ b/base/sqlite/sqlite.SMBuild @@ -6,14 +6,16 @@ download="https://www.sqlite.org/2020/sqlite-autoconf-$version.tar.gz" desc="Simple, self contained database engine" requires="readline zlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app-autoconf-$version" tar xf $srcdir/$app-autoconf-$version.tar.?z* cd "$app-autoconf-$version" fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-tcl \ diff --git a/base/strace/strace.SMBuild b/base/strace/strace.SMBuild index c0aa1fc..dedcf91 100755 --- a/base/strace/strace.SMBuild +++ b/base/strace/strace.SMBuild @@ -7,14 +7,16 @@ desc="linux system call tracing utility" requires="perl" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -30,4 +32,4 @@ build() { sha512sums=" fbf80024d05585535e8c9cf40fa3f033e219b666aaa72511d964aee83f0d1f61c44110194b4104c1ab637d8bac1d59dae4a429c7d7f17965159ad46b50172270 strace-6.1.tar.lz -" \ No newline at end of file +" diff --git a/base/sudo/sudo.SMBuild b/base/sudo/sudo.SMBuild index 45ef2a2..dc16f2b 100755 --- a/base/sudo/sudo.SMBuild +++ b/base/sudo/sudo.SMBuild @@ -7,14 +7,16 @@ desc="give limited root privileges to certain users" requires="zlib" noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -34,4 +36,4 @@ build() { sha512sums=" 27dbfbdaaefc4aef666bd205fe9386214c264c52f2133396bf8c8b7f5d2fefeab40b5a83ef80fe0cf1c1b434de4ef2aca358487f24d0663a5b7fd9e98dc3baed sudo-1.9.12p2.tar.lz -" \ No newline at end of file +" diff --git a/base/swig/swig.SMBuild b/base/swig/swig.SMBuild index c0a6686..48cbd94 100755 --- a/base/swig/swig.SMBuild +++ b/base/swig/swig.SMBuild @@ -6,14 +6,16 @@ download="http://prdownloads.sourceforge.net/swig/swig-$version.tar.gz" desc="Simplified Wrapper and Interface Generator" requires="gcc-libs pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc diff --git a/base/sysfsutils/sysfsutils.SMBuild b/base/sysfsutils/sysfsutils.SMBuild index 77984a7..3638e81 100755 --- a/base/sysfsutils/sysfsutils.SMBuild +++ b/base/sysfsutils/sysfsutils.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/linux-diag/files/sysfsutils/$version/ desc="Utilities for the sysfs filesystem" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --mandir=/share/man \ @@ -30,4 +32,4 @@ build() { sha512sums=" 4f55924b84d5215cbe105d6628acc5c7acdbbd078c5ae4a2738b9abc8bdfd94bede8cc53c48a167cad204eef4666f1cffea1c88d5d175e204dd570a7db5c9b67 sysfsutils-2.1.0.tar.lz -" \ No newline at end of file +" diff --git a/base/sysklogd/sysklogd.SMBuild b/base/sysklogd/sysklogd.SMBuild index 693a017..fe5d64d 100755 --- a/base/sysklogd/sysklogd.SMBuild +++ b/base/sysklogd/sysklogd.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/troglobit/sysklogd/archive/refs/tags/v1.5.0.tar.gz" desc="Linux system logging utilities" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,8 +17,9 @@ build() { # Use memmove() instead of strcpy() in syslogd.c applypatch $srcdir/use_memmove_not_strcpy.diff applypatch $srcdir/fix-includes.patch - sleep 1 +} +build() { make all syslog_tst CC="$CC -static" # install binaries diff --git a/base/syslinux/syslinux.SMBuild b/base/syslinux/syslinux.SMBuild index 4790db0..ae6e645 100755 --- a/base/syslinux/syslinux.SMBuild +++ b/base/syslinux/syslinux.SMBuild @@ -5,7 +5,7 @@ homepage="https://wiki.syslinux.org/wiki/index.php?title=The_Syslinux_Project" desc="Boot loader for the linux operating system which boots off of MS-DOS Windows FAT filesystem" requires="musl" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -13,6 +13,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { applypatch $srcdir/syslinux6-ext4_fix_64bit_feature.patch diff --git a/base/sysstat/sysstat.SMBuild b/base/sysstat/sysstat.SMBuild index 35b1020..4a6b115 100755 --- a/base/sysstat/sysstat.SMBuild +++ b/base/sysstat/sysstat.SMBuild @@ -6,7 +6,7 @@ download="http://pagesperso-orange.fr/sebastien.godard/sysstat-$version.tar.xz" desc="System performance monitoring tools" requires="musl kernel-headers" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { cd $app-$version rm -rf tests/root* fixbuilddirpermissions +} +build() { # One of the configure checks automatically adds "lib64" if the system is 64bit and causes some files # to be installed inside /lib64. We don't need that on musl. sed -i 's@lib64@lib@g' configure @@ -34,4 +36,4 @@ build() { sha512sums=" bcad825eb5405d8999f3212934b41a319ad49754312f168c3b58bf38aaeb17fbed8cf44f4c91eec410edfa31bc7b82c11b3e7dc23a8e310ecbb30a8e00bb1b3d sysstat-12.5.5.tar.lz -" \ No newline at end of file +" diff --git a/base/tar/tar.SMBuild b/base/tar/tar.SMBuild index 85fec4c..c7e5c6e 100755 --- a/base/tar/tar.SMBuild +++ b/base/tar/tar.SMBuild @@ -6,7 +6,7 @@ download="https://ftp.gnu.org/gnu/tar/tar-$version.tar.xz" desc="GNU archiving utility" requires="bzip2 gzip xz attr acl lzip plzip" -build() { +prepbuilddir() { mkandenterbuilddir tar xf $srcdir/$app-$version.tar.?z* @@ -15,7 +15,9 @@ build() { # The "A lone zero block at %s" messages also cause problems: applypatch $srcdir/tar.nolonezero.diff +} +build() { FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$CFLAGS -static" \ ./configure \ @@ -35,4 +37,4 @@ build() { sha512sums=" ea24e691caa5d6064d6be657f11f41ca607257b5eaa8b15225b6cbd3cb681881b0311082ad4d069277d04822ff03acc759f7c15b7f4689ef3ba6de5b8eaa2b23 tar-1.34.tar.lz 90b764cd2128d6c316a0cd9e24ae734ee94b1e2794e6cf724e60592d23ca6dac2d9a44552054610747cadd733263ee56971062f4201227bfda93966f287984bd tar.nolonezero.diff -" \ No newline at end of file +" diff --git a/base/tarlz/tarlz.SMBuild b/base/tarlz/tarlz.SMBuild index 4fb6186..1919a6b 100755 --- a/base/tarlz/tarlz.SMBuild +++ b/base/tarlz/tarlz.SMBuild @@ -6,17 +6,19 @@ download="http://download.savannah.gnu.org/releases/lzip/tarlz/tarlz-$version.ta desc="multi-threaded compression utility of tar and lzip" requires="gcc-libs lzlib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ - CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS" \ make make install DESTDIR=$pkg diff --git a/base/texinfo/texinfo.SMBuild b/base/texinfo/texinfo.SMBuild index f11910b..c041847 100755 --- a/base/texinfo/texinfo.SMBuild +++ b/base/texinfo/texinfo.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/texinfo/texinfo-$version.tar.xz" desc="GNU software documentation system" requires="netbsd-curses perl gzip" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-nls diff --git a/base/time/time.SMBuild b/base/time/time.SMBuild index 17bb664..cdd3656 100755 --- a/base/time/time.SMBuild +++ b/base/time/time.SMBuild @@ -6,17 +6,18 @@ download="https://ftp.gnu.org/gnu/time/time-$version.tar.gz" desc="command for measuring program resource use" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc + --prefix="" make make install DESTDIR=$pkg diff --git a/base/tofrodos/tofrodos.SMBuild b/base/tofrodos/tofrodos.SMBuild index 7c44f32..2a97d7a 100755 --- a/base/tofrodos/tofrodos.SMBuild +++ b/base/tofrodos/tofrodos.SMBuild @@ -6,14 +6,16 @@ download="https://tofrodos.sourceforge.io/download/tofrodos-$version.tar.gz" desc="Text file conversion utility to process UTF-8 and ASCII files between MSDOS and Unix formats" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app tar xf $srcdir/$app-$version.tar.?z* cd $app fixbuilddirpermissions +} +build() { cd src make install -Dm 755 fromdos $pkg/bin/fromdos diff --git a/base/toluapp/toluapp.SMBuild b/base/toluapp/toluapp.SMBuild index 156e4a6..51b2312 100755 --- a/base/toluapp/toluapp.SMBuild +++ b/base/toluapp/toluapp.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/LuaDist/toluapp/archive/refs/tags/$version.tar.gz" desc="tool to integrate C/C++ code with Lua" requires="lua" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ @@ -22,12 +24,11 @@ build() { make make install DESTDIR=$pkg - cd .. - cp README* $pkgdocs/ + cp ../README* $pkgdocs/ mkfinalpkg } sha512sums=" dcfbc7ebd80d4901f99a24499d67e2d5fdd2572b8313c5d53bc74c9fe7c77873c2a918ff170ea49fe994d3e31cee2e6ff5c54cbbca940a4c8212c7cd1067cd96 toluapp-1.0.93.tar.lz -" \ No newline at end of file +" diff --git a/base/tree/tree.SMBuild b/base/tree/tree.SMBuild index 42f5ab5..50defdb 100755 --- a/base/tree/tree.SMBuild +++ b/base/tree/tree.SMBuild @@ -6,14 +6,16 @@ download="http://mama.indstate.edu/users/ice/tree/src/tree-$version.tgz" desc="program to display a directory tree" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 tree $pkg/bin/tree install -Dm 644 doc/tree.1 $pkg/share/man/man1/tree.1 diff --git a/base/twolame/twolame.SMBuild b/base/twolame/twolame.SMBuild index e9725dc..1fb5fec 100755 --- a/base/twolame/twolame.SMBuild +++ b/base/twolame/twolame.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.sourceforge.net/twolame/twolame-$version.tar.gz" desc="Optimised MP2 audio encoder" requires="libsndfile flac" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/tzdb/tzdb.SMBuild b/base/tzdb/tzdb.SMBuild index 65bea20..2ea36f3 100755 --- a/base/tzdb/tzdb.SMBuild +++ b/base/tzdb/tzdb.SMBuild @@ -6,14 +6,16 @@ download="https://data.iana.org/time-zones/releases/tzdb-$version.tar.lz" desc="Time zone database from IANA" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install CC="$CC" \ DESTDIR=$pkg \ USRDIR="/" \ diff --git a/base/unzip/unzip.SMBuild b/base/unzip/unzip.SMBuild index aa71bc5..6521e41 100755 --- a/base/unzip/unzip.SMBuild +++ b/base/unzip/unzip.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/infozip/files/UnZip%206.x%20%28latest desc="Decompression and extraction utility for archives compressed in .zip format" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app$version" tar xf $srcdir/$app$version.tar.?z cd "$app$version" fixbuilddirpermissions +} +build() { make -f unix/Makefile flags \ CFLAGS_BZ="$CFLAGS" \ CC="$CC" STRIP=true LF2= diff --git a/base/usbutils/usbutils.SMBuild b/base/usbutils/usbutils.SMBuild index 632ab07..4e64e0e 100755 --- a/base/usbutils/usbutils.SMBuild +++ b/base/usbutils/usbutils.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/gregkh/usbutils/archive/refs/tags/v$version.tar.gz" desc="USB utilities for displaying detailed info about USB buses and devices in the system" requires="python3 libusb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/base/util-linux/util-linux.SMBuild b/base/util-linux/util-linux.SMBuild index a4e2260..437aaab 100755 --- a/base/util-linux/util-linux.SMBuild +++ b/base/util-linux/util-linux.SMBuild @@ -7,7 +7,7 @@ desc="A huge collection of essential utilities" requires="readline zlib xz kmod eudev" preservestaticlibs=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { # Thank you sabotage linux applypatch $srcdir/cal.patch +} +build() { CFLAGS="$CFLAGS -include sys/sysmacros.h" \ LDFLAGS="-lcurses -lterminfo" \ ./configure \ @@ -45,9 +47,9 @@ build() { # Replace dynamically-linked mount with statically-linked mount ( - cd $pkg/bin - mv mount.static mount - mv umount.static umount + cd $pkg/bin + mv mount.static mount + mv umount.static umount ) cp COPYING $pkgdocs/ diff --git a/base/wavpack/wavpack.SMBuild b/base/wavpack/wavpack.SMBuild index c4d5e0f..0f83ec8 100755 --- a/base/wavpack/wavpack.SMBuild +++ b/base/wavpack/wavpack.SMBuild @@ -6,14 +6,16 @@ download="https://www.wavpack.com/wavpack-$version.tar.xz" desc="Hybrid lossless wavefile compressor" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/base/wayland-protocols/wayland-protocols.SMBuild b/base/wayland-protocols/wayland-protocols.SMBuild index b89f447..4874112 100755 --- a/base/wayland-protocols/wayland-protocols.SMBuild +++ b/base/wayland-protocols/wayland-protocols.SMBuild @@ -6,14 +6,16 @@ download="https://wayland.freedesktop.org/releases/wayland-protocols-$version.ta desc="Specifications of extended wayland protocols" requires="wayland" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" @@ -28,4 +30,4 @@ build() { sha512sums=" 3df7015bae32665bdf7a454eec9707f532b4b22f65ba2e44c5097c135bd28f5fb83e3ae01dceaab8ee31e9369039c70ddc345c136ae1d06b7f76e74d3ded0a26 wayland-protocols-1.25.tar.lz -" \ No newline at end of file +" diff --git a/base/wayland/wayland.SMBuild b/base/wayland/wayland.SMBuild index dfb1e81..886013f 100755 --- a/base/wayland/wayland.SMBuild +++ b/base/wayland/wayland.SMBuild @@ -6,14 +6,16 @@ download="https://wayland.freedesktop.org/releases/wayland-$version.tar.xz" desc="Replacement for the Xorg server protocol" requires="expat libxml2 libffi" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/base/which/which.SMBuild b/base/which/which.SMBuild index 52e5f20..3e2e4f4 100755 --- a/base/which/which.SMBuild +++ b/base/which/which.SMBuild @@ -6,14 +6,16 @@ download="http://ftp.gnu.org/gnu/which/which-$version.tar.gz" desc="Shows the full path to shell commands" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="-O2 -static" \ ./configure \ --prefix="" diff --git a/base/wireless-regdb/wireless-regdb.SMBuild b/base/wireless-regdb/wireless-regdb.SMBuild index 4956b25..32d8fe3 100755 --- a/base/wireless-regdb/wireless-regdb.SMBuild +++ b/base/wireless-regdb/wireless-regdb.SMBuild @@ -6,14 +6,16 @@ download="http://ftp.iij.ad.jp/pub/linux/kernel/software/network/wireless-regdb/ desc="Regulatory database package for use by CRDA" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { install -Dm 644 regulatory.bin $pkg/lib/crda/regulatory.bin install -Dm 644 regulatory.db $pkg/lib/firmware/regulatory.db install -Dm 644 regulatory.db.p7s $pkg/lib/firmware/regulatory.db.p7s @@ -26,4 +28,4 @@ build() { sha512sums=" 38bb0af449b2fc63fecee6edf8c0326858e1b6ef8c34fb3eb87866c002146c29d4b0f4d2170eb6aa723b1942eba098a94e35756eee22087a6d53c0d9a97ef26d wireless-regdb-2019.06.03.tar.lz -" \ No newline at end of file +" diff --git a/base/woff2/woff2.SMBuild b/base/woff2/woff2.SMBuild index e078477..cdf8e7b 100755 --- a/base/woff2/woff2.SMBuild +++ b/base/woff2/woff2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/google/woff2/archive/v$version/woff2-$version.tar.g desc="Font compression and decompression library in C++" requires="gcc-libs brotli" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i "s/NOT BUILD_SHARED_LIBS/TRUE/" CMakeLists.txt mkdir -p smbuild && cd smbuild cmake .. -GNinja \ diff --git a/base/x264/x264.SMBuild b/base/x264/x264.SMBuild index 453c6b3..eb084ba 100755 --- a/base/x264/x264.SMBuild +++ b/base/x264/x264.SMBuild @@ -6,14 +6,16 @@ homepage="http://www.videolan.org/developers/x264.html" desc="free h264/avc encoder" requires="nasm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app-$longversion" tar xf $srcdir/$app-$longversion.tar.?z* cd "$app-$longversion" fixbuilddirpermissions +} +build() { # Let x264 use its own optimized -O3 -ffast-math compiler flags. unset CFLAGS CXXFLAGS diff --git a/base/xmlto/xmlto.SMBuild b/base/xmlto/xmlto.SMBuild index e1fd1f0..186377f 100755 --- a/base/xmlto/xmlto.SMBuild +++ b/base/xmlto/xmlto.SMBuild @@ -6,14 +6,16 @@ download="https://releases.pagure.org/xmlto/xmlto-$version.tar.bz2" desc="XML conversion tool" requires="libxslt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc diff --git a/base/xz/xz.SMBuild b/base/xz/xz.SMBuild index 84bda93..11ddf5d 100755 --- a/base/xz/xz.SMBuild +++ b/base/xz/xz.SMBuild @@ -6,14 +6,16 @@ download="https://tukaani.org/xz/xz-$version.tar.xz" desc="Compression utility based on the LZMA algorithm" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ @@ -31,4 +33,4 @@ build() { sha512sums=" f477f8a41cc3d88b0ffcac8d414721c7734bac2380c103261e5446067638e17e08b993d9bf221de1e09f69a89eca0a9cafd98f16be914a5cf3170a65d8fae937 xz-5.2.5.tar.lz -" \ No newline at end of file +" diff --git a/base/yasm/yasm.SMBuild b/base/yasm/yasm.SMBuild index d0b37ca..03cadcf 100755 --- a/base/yasm/yasm.SMBuild +++ b/base/yasm/yasm.SMBuild @@ -6,14 +6,16 @@ download="http://www.tortall.net/projects/yasm/releases/yasm-$version.tar.gz" desc="Complete rewrite of the NASM assembler" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/base/zip/zip.SMBuild b/base/zip/zip.SMBuild index 033337a..6a578b1 100755 --- a/base/zip/zip.SMBuild +++ b/base/zip/zip.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.sourceforge.net/infozip/zip$version.tar.gz" desc="Compression and file packaging utility" requires="bzip2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app$version" tar xf $srcdir/$app$version.tar.?z cd "$app$version" fixbuilddirpermissions +} +build() { make -f unix/Makefile generic_gcc \ CFLAGS="$CFLAGS" diff --git a/base/zlib/zlib.SMBuild b/base/zlib/zlib.SMBuild index e6509cf..f2687b1 100755 --- a/base/zlib/zlib.SMBuild +++ b/base/zlib/zlib.SMBuild @@ -6,14 +6,16 @@ download="https://www.zlib.net/zlib-$version.tar.gz" requires="musl" desc="General purpose thread safe data compression library" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 06b5cb2f477b5999d6f5016b545a8d534ff10c744cfdc2056c9ee873e0c9e9cf49a7218161f28929a8509cb290a1dc30240a04ef95380a16d92922d5e01edb49 zlib-1.2.13.tar.lz -" \ No newline at end of file +" diff --git a/base/zsh/zsh.SMBuild b/base/zsh/zsh.SMBuild index 85da809..a1dbb01 100755 --- a/base/zsh/zsh.SMBuild +++ b/base/zsh/zsh.SMBuild @@ -5,14 +5,16 @@ homepage="http://www.zsh.org" requires="netbsd-curses gdbm" desc="UNIX command interpreter shell that resembles the Korn shell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # relieve dependency on autoconf sed -i '/autoheader/d' Makefile.in diff --git a/base/zstd/zstd.SMBuild b/base/zstd/zstd.SMBuild index 288342c..87ad2f6 100755 --- a/base/zstd/zstd.SMBuild +++ b/base/zstd/zstd.SMBuild @@ -5,7 +5,7 @@ homepage="http://zstd.net" desc="Real-time compression algorithm providing high compression ratios" requires="gcc-libs zlib xz lz4" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/zstd.dont.link.pzstd.to.static.libzstd.a.diff +} +build() { make make -C contrib/pzstd diff --git a/extra/abiword/abiword.SMBuild b/extra/abiword/abiword.SMBuild index eeada76..85e668e 100755 --- a/extra/abiword/abiword.SMBuild +++ b/extra/abiword/abiword.SMBuild @@ -1,12 +1,12 @@ app=abiword -version=3.0.4 -build=2sml +version=3.0.5 +build=1sml homepage="https://www.abisource.com" download="https://www.abisource.com/downloads/abiword/$version/source/abiword-$version.tar.gz" desc="Opensource full-featured word processor" requires="desktop-file-utils enchant libical goffice libgsf librsvg libsoup wv gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,15 +14,19 @@ build() { cd $app-$version fixbuilddirpermissions + applypatch $srcdir/enchant_checker.cpp.patch + applypatch $srcdir/unixmouse.diff + applypatch $srcdir/musl-1.2.3.patch +} + +build() { + _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ freetranslation garble gdict gimp google hancom hrtext iscii kword \ latex loadbindings mht mif mswrite openwriter openxml opml paint \ passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \ xslfo" - applypatch $srcdir/enchant_checker.cpp.patch - applypatch $srcdir/unixmouse.diff - ./configure \ --prefix="" \ --enable-shared \ @@ -38,7 +42,8 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \ } sha512sums=" -d0a7fd6873862e4da9cd4ecc384b9cc8ec8f2bbf23bdec8c4c56fed16ca274fbecedf11dc80c6d835eaad8b316b143e3cb3adea162fc74984fa4725c906c5821 abiword-3.0.4.tar.lz +4c3f0c8fb67b7036946dd13d31ac6964379af4ee0d3ca8a69ed093be82a6411a29071856b4535c578864940773c8f280025384b738ea99aadce5d88095ee6d80 abiword-3.0.5.tar.lz 0163d3275a7f260431885d9ea20bcb0c2cd52e19a062141422187f4df2f51c9613a90f1b7151fd50e2c1b7f511b767f1a2082c30792e59939ab0f3cf1c8aca65 enchant_checker.cpp.patch +a4ee1de8df01a6570eb4d069a1b1abd38c39181020f862ce632ab5b863650a58fcaeadc4c988e7fcae3aade5841399d3d5d482d280d44a48286c24e3701e7969 musl-1.2.3.patch b8634c410485b2a5c8495bf5bcbdda027aca2e7028efc6ea06763d1df121409434cab53f370b55d409fb99e6dbb72819b99cb596ee735fe97aa235d0ed7b0124 unixmouse.diff " diff --git a/extra/abiword/musl-1.2.3.patch b/extra/abiword/musl-1.2.3.patch new file mode 100644 index 0000000..23c0603 --- /dev/null +++ b/extra/abiword/musl-1.2.3.patch @@ -0,0 +1,11 @@ +--- a/src/af/xap/xp/xap_Dialog.cpp ++++ b/src/af/xap/xp/xap_Dialog.cpp +@@ -267,7 +267,7 @@ + // This function constructs and returns the window name of a modeless dialog by + // concatenating the active frame with the dialog name + +- *pWindowName = (char) NULL; ++ *pWindowName = (char) 0; + UT_UTF8String wn = UT_UTF8String(pDialogName); + + XAP_Frame* pFrame = getActiveFrame(); diff --git a/extra/adafruit-io/adafruit-io.SMBuild b/extra/adafruit-io/adafruit-io.SMBuild new file mode 100755 index 0000000..38d3637 --- /dev/null +++ b/extra/adafruit-io/adafruit-io.SMBuild @@ -0,0 +1,27 @@ +app=adafruit-io +version=2.7.0 +build=1sml +homepage="https://pypi.org/project/typing/" +download="https://files.pythonhosted.org/packages/44/d0/7b8e112dfb593f2622dc43edbbea5a1007062ad2d75f330dec135faf6b98/adafruit-io-2.7.0.tar.gz" +desc="Python Adafruit module" +requires="python3 python-setuptools" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + python setup.py install --prefix="" --root=$pkg + cp LICENSE* $pkgdocs/ + + mkfinalpkg +} + +sha512sums=" +75f9561def65c31836dd336ffc8cdc4a0effe90a90b98d32c059667570618e8f46f5183bc2a8e8091e5c031cf9b2cbf590f6484b0f9ab4915bbc979051e99f80 adafruit-io-2.7.0.tar.lz +" diff --git a/extra/audacious/audacious.SMBuild b/extra/audacious/audacious.SMBuild index 6df6365..5a46681 100755 --- a/extra/audacious/audacious.SMBuild +++ b/extra/audacious/audacious.SMBuild @@ -2,18 +2,19 @@ app=audacious version=4.0.2 build=1sml homepage="http://www.audacious-media-player.org" -download="" desc="Lightweight, advanced audio player focused on audio quality" requires="desktop-file-utils unzip hicolor-icon-theme gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --with-buildstamp='SMLinux' \ diff --git a/extra/blueman/blueman.SMBuild b/extra/blueman/blueman.SMBuild index da3fa7a..2e13e7e 100755 --- a/extra/blueman/blueman.SMBuild +++ b/extra/blueman/blueman.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/blueman-project/blueman/archive/refs/tags/$version. desc="Graphical GTK+ Bluetooth Manager" requires="py3cairo pygobject3 cython" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -29,6 +31,8 @@ build() { cp COPYING $pkgdocs/ + [[ -d $pkg/usr/lib/systemd ]] && rm -r $pkg/usr + mkfinalpkg } diff --git a/extra/bluez/bluez.SMBuild b/extra/bluez/bluez.SMBuild index 71392c3..74cc9d4 100755 --- a/extra/bluez/bluez.SMBuild +++ b/extra/bluez/bluez.SMBuild @@ -1,12 +1,12 @@ app=bluez version=5.40 build=1sml -homepage="http://www.bluez.org" +homepage="https://www.bluez.org" download="" desc="Bluetooth libraries and utilities" requires="libical alsa-lib json-c glib eudev dbus icu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,11 +15,13 @@ build() { fixbuilddirpermissions applypatch $srcdir/bluez-5.30-obexd_without_systemd-1.patch - [ "$ARCH" = "aarch64" ] && applypatch $srcdir/bluez-5.40-rpi-fixes.patch + [ "$arch" = "aarch64" ] && applypatch $srcdir/bluez-5.40-rpi-fixes.patch sed -i -e 's|-lreadline|\0 -lncursesw|g' Makefile.{in,tools} autoreconf -vif +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -55,6 +57,8 @@ build() { fi install -Dm 755 $srcdir/rc.bluetooth $pkg/etc/rc.d/rc.bluetooth.new + + [[ -d $pkg/usr/lib/systemd ]] && rm -r $pkg/usr mkfinalpkg } diff --git a/extra/calcurse/calcurse.SMBuild b/extra/calcurse/calcurse.SMBuild index 7002e02..0738333 100755 --- a/extra/calcurse/calcurse.SMBuild +++ b/extra/calcurse/calcurse.SMBuild @@ -6,14 +6,16 @@ download="https://calcurse.org/files/calcurse-$version.tar.gz" desc="text-based calendar and scheduling application" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/extra/cmatrix/cmatrix.SMBuild b/extra/cmatrix/cmatrix.SMBuild index cc3c206..e70d544 100755 --- a/extra/cmatrix/cmatrix.SMBuild +++ b/extra/cmatrix/cmatrix.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/abishekvashok/cmatrix/archive/refs/tags/v$version.t desc="Terminal application that emulates The Matrix movie scroll lines on the screen" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions autoreconf -vif +} +build() { ./configure \ --prefix="" diff --git a/extra/cmus/cmus.SMBuild b/extra/cmus/cmus.SMBuild index 5774b67..53765aa 100755 --- a/extra/cmus/cmus.SMBuild +++ b/extra/cmus/cmus.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/cmus/cmus/archive/v$version.tar.gz" desc="Fast text-mode music player" requires="faad2 flac libao libsamplerate ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ prefix="" \ exampledir="/doc/$app-$version/examples" \ diff --git a/extra/dia/dia.SMBuild b/extra/dia/dia.SMBuild index 69d2f6a..3dfb506 100755 --- a/extra/dia/dia.SMBuild +++ b/extra/dia/dia.SMBuild @@ -6,7 +6,7 @@ download="https://download.gnome.org/sources/dia/0.97/dia-$version.tar.xz" desc="Diagram creation app written in GTK2" requires="gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { applypatch $srcdir/CVE-2019-19451.patch applypatch $srcdir/dia-unregister-import.patch applypatch $srcdir/isinf.patch +} +build() { ./configure \ --prefix="" \ --with-cairo \ diff --git a/extra/dmenu/dmenu.SMBuild b/extra/dmenu/dmenu.SMBuild index 69302ef..f8eecfa 100755 --- a/extra/dmenu/dmenu.SMBuild +++ b/extra/dmenu/dmenu.SMBuild @@ -6,14 +6,16 @@ download="https://dl.suckless.org/tools/dmenu-$version.tar.gz" desc="Dynamic menu for X" requires="libxext libxinerama" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg diff --git a/extra/dwm/dwm.SMBuild b/extra/dwm/dwm.SMBuild index 3a1128a..572efdd 100755 --- a/extra/dwm/dwm.SMBuild +++ b/extra/dwm/dwm.SMBuild @@ -6,7 +6,7 @@ download="https://dl.suckless.org/dwm/dwm-$version.tar.gz" desc="Suckless dynamic window manager" requires="libxinerama libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,6 +15,9 @@ build() { fixbuilddirpermissions sed -i "s@-Wno-deprecated-declarations -Os@-Wno-deprecated-declarations $CFLAGS@g" config.mk +} + +build() { make make install PREFIX="/" MANPREFIX=/share/man DESTDIR=$pkg diff --git a/extra/feh/feh.SMBuild b/extra/feh/feh.SMBuild index c3934c2..ab36156 100755 --- a/extra/feh/feh.SMBuild +++ b/extra/feh/feh.SMBuild @@ -6,14 +6,16 @@ homepage="https://feh.finalrewind.org/feh-$version.tar.bz2" desc="Fast and lightweight image viewer for X" requires="curl imlib2 libexif libxinerama libxt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -D_GNU_SOURCE -include string.h" \ make PREFIX="/" \ exif=1 help=1 diff --git a/extra/ffmpeg/ffmpeg.SMBuild b/extra/ffmpeg/ffmpeg.SMBuild index 31f8185..e157006 100755 --- a/extra/ffmpeg/ffmpeg.SMBuild +++ b/extra/ffmpeg/ffmpeg.SMBuild @@ -6,14 +6,16 @@ download="https://ffmpeg.org/releases/ffmpeg-$version.tar.xz" desc="Software to record, convert and stream audio and video" requires="libass libdrm freetype fribidi libmodplug opus lame mpg123 soxr libtheora libvorbis libvpx libxml2 libwebp wavpack sdl2 twolame librsvg libcdio openjpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ @@ -55,6 +57,8 @@ build() { make install DESTDIR=$pkg cp LICENSE.md COPYING* $pkgdocs/ + + [[ -d $pkg/usr/local/share/$app ]] && rm -r $pkg/usr mkfinalpkg } diff --git a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild index 60b2b86..3c74b85 100755 --- a/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild +++ b/extra/ffmpegthumbnailer/ffmpegthumbnailer.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/dirkvdb/ffmpegthumbnailer/archive/refs/tags/$versio desc="Utility to create video thumbnails for file managers" requires="cmake libpng libjpeg-turbo ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/extra/florence/florence.SMBuild b/extra/florence/florence.SMBuild index f643757..d60ceb0 100755 --- a/extra/florence/florence.SMBuild +++ b/extra/florence/florence.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.sourceforge.net/project/florence/florence/$version/f desc="Virtual keyboard for X" requires="glib libxext librsvg libxml2 dbus gtk3 zlib pango cairo gdk-pixbuf gstreamer" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --without-docs \ diff --git a/extra/freerdp/freerdp.SMBuild b/extra/freerdp/freerdp.SMBuild index 0cdf266..2e9b6de 100755 --- a/extra/freerdp/freerdp.SMBuild +++ b/extra/freerdp/freerdp.SMBuild @@ -6,16 +6,17 @@ download="https://pub.freerdp.com/releases/freerdp-$version.tar.gz" desc="Free implementation of the RDP protocol" requires="libusb alsa-lib ffmpeg gdk-pixbuf graphite2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf FreeRDP-$version tar xf $srcdir/FreeRDP-$version.tar.?z* cd FreeRDP-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild - export CFLAGS="$CFLAGS -D_GNU_SOURCE" cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ -DCMAKE_INSTALL_LIBDIR="lib" \ diff --git a/extra/galculator/galculator.SMBuild b/extra/galculator/galculator.SMBuild index d8c85ed..797c684 100755 --- a/extra/galculator/galculator.SMBuild +++ b/extra/galculator/galculator.SMBuild @@ -1,19 +1,21 @@ app=galculator version=2.1.4 build=2sml -homepage="http://galculator.mnim.org/" -download="http://galculator.mnim.org/downloads/galculator-$version.tar.bz2" +homepage="https://galculator.mnim.org/" +download="https://galculator.mnim.org/downloads/galculator-$version.tar.bz2" desc="GTK calculator for GNOME" requires="intltool gtk2 graphite2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-gtk3 \ diff --git a/extra/gnumeric/gnumeric.SMBuild b/extra/gnumeric/gnumeric.SMBuild index 9450e01..f1df796 100755 --- a/extra/gnumeric/gnumeric.SMBuild +++ b/extra/gnumeric/gnumeric.SMBuild @@ -6,16 +6,18 @@ download="https://download.gnome.org/sources/gnumeric/1.12/gnumeric-$version.tar desc="Spreadsheet application for GNOME" requires="perl intltool python3 gobject-introspection goffice " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ - --prefix="" \ + --prefix="/" \ --disable-introspection make diff --git a/extra/gpaint/gpaint.SMBuild b/extra/gpaint/gpaint.SMBuild index 8333cac..cc47f15 100755 --- a/extra/gpaint/gpaint.SMBuild +++ b/extra/gpaint/gpaint.SMBuild @@ -6,7 +6,7 @@ download="ftp://alpha.gnu.org/gnu/gpaint/gpaint-2-$version.tar.gz" desc="Simple and lightweight alternative to MS-paint written in GTK2" requires="gtk2 " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions sed -i 's/GTK_RESPONSE_DISCARD/GTK_RESPONSE_NO/' src/drawing.c +} +build() { ./configure \ --prefix="" \ --disable-nls diff --git a/extra/gtypist/gtypist.SMBuild b/extra/gtypist/gtypist.SMBuild index 41d4b8f..2675627 100755 --- a/extra/gtypist/gtypist.SMBuild +++ b/extra/gtypist/gtypist.SMBuild @@ -6,7 +6,7 @@ download="http://ftp.gnu.org/gnu/gtypist/gtypist-2.9.tar.xz" desc="Terminal-based universal typing tutor" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/ncurses.patch autoreconf -vif +} +build() { LDFLAGS="-lterminfo -lncurses" \ ./configure \ --prefix="" diff --git a/extra/heimdall/heimdall.SMBuild b/extra/heimdall/heimdall.SMBuild index 66878bb..953e692 100755 --- a/extra/heimdall/heimdall.SMBuild +++ b/extra/heimdall/heimdall.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Benjamin-Dobell/Heimdall/archive/refs/tags/v$versio desc="Cross-platform open-source tool suite to flash ROMs onto Samsung mobile devices" requires="gcc-libs libusb eudev" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf Heimdall-$version tar xf $srcdir/Heimdall-$version.tar.?z* cd Heimdall-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="/" \ diff --git a/extra/imagemagick/imagemagick.SMBuild b/extra/imagemagick/imagemagick.SMBuild index aa1dd71..bfb3aa9 100755 --- a/extra/imagemagick/imagemagick.SMBuild +++ b/extra/imagemagick/imagemagick.SMBuild @@ -1,19 +1,21 @@ app=imagemagick -version=7.0.8 +version=7.1.0 build=1sml -homepage="http://www.imagemagick.org/" +homepage="https://www.imagemagick.org/" download="" desc="Robust collection of image processing tools" requires="libtool libxml2 libpng fftw fontconfig libxext lcms2 glu pango libraqm librsvg libwebp openjpeg " -build() { +prepbuilddir() { mkandenterbuilddir - rm -rf ImageMagick-$version-14 + rm -rf ImageMagick-$version-62 - tar xf $srcdir/ImageMagick-$version-14.tar.?z* - cd ImageMagick-$version-14 + tar xf $srcdir/ImageMagick-$version-62.tar.?z* + cd ImageMagick-$version-62 fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --without-modules \ diff --git a/extra/iotop/iotop.SMBuild b/extra/iotop/iotop.SMBuild index 9062750..1097971 100755 --- a/extra/iotop/iotop.SMBuild +++ b/extra/iotop/iotop.SMBuild @@ -1,12 +1,12 @@ app=iotop version=0.6 build=2sml -homepage="http://guichaz.free.fr/iotop" -download="http://guichaz.free.fr/iotop/files/iotop-$version.tar.gz" +homepage="https://guichaz.free.fr/iotop" +download="https://guichaz.free.fr/iotop/files/iotop-$version.tar.gz" desc="Top-like I/O monitor written in python" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/fix-python.patch +} +build() { python3 setup.py build python3 setup.py install --prefix="" --root=$pkg diff --git a/extra/libass/libass.SMBuild b/extra/libass/libass.SMBuild index 85a3516..b0781ef 100755 --- a/extra/libass/libass.SMBuild +++ b/extra/libass/libass.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libass/libass/archive/refs/tags/$version.tar.gz" desc="Subtitle renderer for the ASS and SSA formats" requires="glib nasm fribidi fontconfig freetype harfbuzz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no \ diff --git a/extra/micro-tetris/micro-tetris.SMBuild b/extra/micro-tetris/micro-tetris.SMBuild index 5a8de67..356c3d3 100755 --- a/extra/micro-tetris/micro-tetris.SMBuild +++ b/extra/micro-tetris/micro-tetris.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/troglobit/tetris/archive/refs/tags/$version.tar.gz" desc="Small Tetris implementations utilising ANSI escape sequences" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf tetris-$version tar xf $srcdir/tetris-$version.tar.?z** cd tetris-$version fixbuilddirpermissions +} +build() { make make install DESTDIR=$pkg diff --git a/extra/mplayer/mplayer.SMBuild b/extra/mplayer/mplayer.SMBuild index 0d37719..0dad21f 100755 --- a/extra/mplayer/mplayer.SMBuild +++ b/extra/mplayer/mplayer.SMBuild @@ -1,19 +1,21 @@ app=mplayer version=20180720 build=1sml -homepage="http://www.mplayerhq.hu/" +homepage="https://www.mplayerhq.hu/" download="" desc="The Linux movie player with support for several dozen formats" requires="libpng zlib gnutls libjpeg-turbo giflib alsa-lib libcdio-paranoia freetype fontconfig fribidi bzip2 lzo libvorbis libtheora lame libass libogg mpg123 faad2 ffmpeg opus opusfile libxext libx11 libxv libvdpau libxinerama sdl mesa libopenal x264 gtk2 libidn libtasn1 nettle gmp expat e2fsprogs harfbuzz pcre libxcb libxdamage libdrm libffi libxrender libxscrnsaver" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf MPlayer-$version tar xf $srcdir/MPlayer-$version.tar.?z cd MPlayer-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --confdir=/etc/mplayer \ @@ -33,5 +35,5 @@ build() { } sha512sums=" -6d081ff29d4f6cbeef7692561b9eb4a1776efa74692a8b9338affac44d997d45e822a16a69e5abbcae46ef4a4b1f896f9f56b70eb90a53d82790c9c853e8496e MPlayer-20180720.tar.xz +bab689d4c794527875872001e4921efe9b642c472791d55bcae0231992796e4096c16db47acd40af7da057d5ecee90d4afc9c36c84671063d8f67c5c060bae91 MPlayer-20180720.tar.lz " diff --git a/extra/mpv/mpv.SMBuild b/extra/mpv/mpv.SMBuild index b164fa9..0052564 100755 --- a/extra/mpv/mpv.SMBuild +++ b/extra/mpv/mpv.SMBuild @@ -6,18 +6,20 @@ download="https://github.com/mpv-player/mpv/archive/refs/tags/v$version.tar.gz" desc="Movie player based on MPlayer and mplayer2" requires="ffmpeg gtk2 gdk-pixbuf harfbuzz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { zcat $srcdir/waf-2.0.9.gz > waf chmod +x waf - CXXFLAGS+=" -fPIC" + CXXFLAGS+="-fPIC" ./waf configure \ --prefix="" \ --confdir=/etc/mpv \ diff --git a/extra/mtd-utils/mtd-utils.SMBuild b/extra/mtd-utils/mtd-utils.SMBuild index 63ffaef..7432fd0 100755 --- a/extra/mtd-utils/mtd-utils.SMBuild +++ b/extra/mtd-utils/mtd-utils.SMBuild @@ -3,18 +3,19 @@ version=2.1.1 nandversion=1.5.2 build=1sml homepage="http://www.linux-mtd.infradead.org/" -download="" desc="A collection of utiltiies for dealing with memory technology and NAND devices" requires="lzo util-linux " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/extra/mtpaint/mtpaint.SMBuild b/extra/mtpaint/mtpaint.SMBuild index aee7ece..95e2fac 100755 --- a/extra/mtpaint/mtpaint.SMBuild +++ b/extra/mtpaint/mtpaint.SMBuild @@ -1,12 +1,12 @@ app=mtpaint version=3.40 build=1sml -homepage="http://mtpaint.sourceforge.net/" +homepage="https://mtpaint.sourceforge.net/" download="https://sourceforge.net/projects/mtpaint/files/mtpaint/3.40/mtpaint-$version.tar.bz2" desc="Paint program in GTK2" requires="giflib openjpeg gtk2 lcms2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,6 @@ build() { cd $app-$version fixbuilddirpermissions - # bring deprecated function call into conformance with libpng14 sed -i 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c @@ -25,7 +24,9 @@ build() { sed -i 's:DGifCloseFile(giffy):DGifCloseFile(giffy, NULL):g' src/png.c sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c +} +build() { ./configure \ --prefix="" diff --git a/extra/mupdf/mupdf.SMBuild b/extra/mupdf/mupdf.SMBuild index b2198b6..c2a38ba 100755 --- a/extra/mupdf/mupdf.SMBuild +++ b/extra/mupdf/mupdf.SMBuild @@ -6,7 +6,7 @@ download="https://mupdf.com/downloads/archive/mupdf-$version-source.tar.xz" desc="Lightweight PDF, CBZ, and XPS viewer and toolkit" requires="desktop-file-utils openssl jbig2dec libjpeg-turbo freetype libxext glu freeglut mesa harfbuzz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version-source @@ -16,7 +16,9 @@ build() { applypatch $srcdir/shared-lib.patch applypatch $srcdir/fix-big-endian.patch +} +build() { # We use system libraries, not the ones that come with the mupdf source for library in curl freeglut freetype harfbuzz jbig2dec \ libjpeg openjpeg zlib ; do @@ -45,7 +47,7 @@ build() { } sha512sums=" -39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5 mupdf-1.17.0-source.tar.xz +bdca3a2b9e6b1991ba0e280b37456033c5669a9b1ac54b1f64591ef9e79931aedc04883d939b7ad5ea1967a9f3f2f6ed2a467e1e9aa65b443968456463903043 mupdf-1.17.0-source.tar.lz 486d09df319050ddb33dbd1e2e0638a7bc6a3e188032a35b81119c45b0de911629b827b21aa47cde6669b66d73fb22cff54d190a8449151fdc27eace71beefbd fix-big-endian.patch 212ea566b6f1d60a1087054a8eb29d0d9ca08eef237219151fc4fe8880461cd86fcb03b0266a7347015af458b557dfd914e827f5ff8fee78e9e50c7f358fc8e0 shared-lib.patch " diff --git a/extra/rdesktop/rdesktop.SMBuild b/extra/rdesktop/rdesktop.SMBuild index af9db44..a860626 100755 --- a/extra/rdesktop/rdesktop.SMBuild +++ b/extra/rdesktop/rdesktop.SMBuild @@ -6,15 +6,17 @@ download="https://github.com/rdesktop/rdesktop/releases/download/v$version/rdesk desc="Remote Desktop Protocol (RDP) client to connect to Microsoft RDP Servers" requires="zlib nettle alsa-lib libao libsamplerate libxcursor xrandr libxrandr" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - ./bootstrap +} + +build() { ./configure \ --prefix="" \ --disable-credssp \ diff --git a/extra/rxvt-unicode/rxvt-unicode.SMBuild b/extra/rxvt-unicode/rxvt-unicode.SMBuild index 4824676..d3ac0cc 100755 --- a/extra/rxvt-unicode/rxvt-unicode.SMBuild +++ b/extra/rxvt-unicode/rxvt-unicode.SMBuild @@ -1,19 +1,21 @@ app=rxvt-unicode version=9.22 build=1sml -homepage="http://software.schmorp.de/pkg/rxvt-unicode.html" -download="http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-$version.tar.bz2" +homepage="https://software.schmorp.de/pkg/rxvt-unicode.html" +download="https://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-$version.tar.bz2" desc="Enhanced version of rxvt terminal emulator with full support for unicode and XFT" requires="gcc-libs netbsd-curses glib perl libxft startup-notification" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-everything \ diff --git a/extra/scrcpy/scrcpy.SMBuild b/extra/scrcpy/scrcpy.SMBuild index 54ca3fa..3a337c3 100755 --- a/extra/scrcpy/scrcpy.SMBuild +++ b/extra/scrcpy/scrcpy.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Genymobile/scrcpy/archive/refs/tags/v$version.tar.g desc="Lightweight display and control utility to interact with Android 5.1+ devices over USB or TCP/IP" requires="meson sdl2 ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p build/server && cd build cp $srcdir/scrcpy-server-v"$version".zip server/scrcpy-server meson .. \ diff --git a/extra/sdl/sdl.SMBuild b/extra/sdl/sdl.SMBuild index 70776c1..bcd6ed4 100755 --- a/extra/sdl/sdl.SMBuild +++ b/extra/sdl/sdl.SMBuild @@ -6,7 +6,7 @@ download="https://www.libsdl.org/release/SDL-$version.tar.gz" desc="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer" requires="alsa-lib libx11 libxext libxrender glu mesa" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf SDL-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/grabnotviewable.patch applypatch $srcdir/xdata32.patch +} +build() { ./configure \ --prefix="" \ --disable-nasm \ @@ -35,7 +37,6 @@ build() { make install DESTDIR=$pkg cp COPYING $pkgdocs/ - removestaticlibs mkfinalpkg } diff --git a/extra/sdl2/sdl2.SMBuild b/extra/sdl2/sdl2.SMBuild index efd23b4..9171e5d 100755 --- a/extra/sdl2/sdl2.SMBuild +++ b/extra/sdl2/sdl2.SMBuild @@ -6,7 +6,7 @@ download="https://www.libsdl.org/release/SDL2-$version.tar.gz" desc="C Library providing low-level I/O access to hardware devices via OpenGL and 2D framebuffer" requires="alsa-lib libx11 libxcursor libxext libxrender libxinerama mesa" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf SDL2-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/khronos.patch +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/extra/slock/slock.SMBuild b/extra/slock/slock.SMBuild index eb052eb..dba8fdc 100755 --- a/extra/slock/slock.SMBuild +++ b/extra/slock/slock.SMBuild @@ -6,7 +6,7 @@ download="https://dl.suckless.org/tools/slock-$version.tar.gz" desc="Simple X display locker" requires="libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { sed -i "s@-Wall -Os@-Wall $CFLAGS@g" config.mk sed -i "s@LDFLAGS = -s@LDFLAGS = @g" config.mk +} +build() { make make install PREFIX="/" DESTDIR=$pkg diff --git a/extra/spacefm/spacefm.SMBuild b/extra/spacefm/spacefm.SMBuild index 77d1afa..94829f9 100755 --- a/extra/spacefm/spacefm.SMBuild +++ b/extra/spacefm/spacefm.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/IgnorantGuru/spacefm/archive/refs/tags/$version.tar desc="Multi-panel tabbed file manager" requires="gcc-libs zlib netbsd-curses libidn libtasn1 gmp libjpeg-turbo gnutls eudev nettle openssl gtk2 ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/spacefm-include-sysmacros.patch +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/extra/testdisk/testdisk.SMBuild b/extra/testdisk/testdisk.SMBuild index e514a3c..8d3da8a 100755 --- a/extra/testdisk/testdisk.SMBuild +++ b/extra/testdisk/testdisk.SMBuild @@ -5,14 +5,16 @@ homepage="https://www.cgsecurity.org/wiki/TestDisk" desc="Data recovery software to recover lost files and partitions" requires="util-linux ntfs-3g" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version-WIP tar xf $srcdir/$app-$version-WIP.tar.?z* cd $app-$version-WIP fixbuilddirpermissions +} +build() { LIBS="-lncurses -lterminfo" \ ./configure \ --prefix="" \ diff --git a/extra/tmux/tmux.SMBuild b/extra/tmux/tmux.SMBuild index d737917..78d81fd 100755 --- a/extra/tmux/tmux.SMBuild +++ b/extra/tmux/tmux.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/tmux/tmux/archive/refs/tags/$version.tar.gz" desc="terminal multiplexer, alternative to GNU screen" requires="netbsd-curses libevent" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/extra/v4l-utils/v4l-utils.SMBuild b/extra/v4l-utils/v4l-utils.SMBuild index c4d614a..e3e1f44 100755 --- a/extra/v4l-utils/v4l-utils.SMBuild +++ b/extra/v4l-utils/v4l-utils.SMBuild @@ -6,7 +6,7 @@ download="https://linuxtv.org/downloads/v4l-utils/v4l-utils-$version.tar.bz2" desc="libraries and utilities for writing video applications" requires="gcc-libs argp-standalone hicolor-icon-theme libjpeg-turbo sdl2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,11 +16,13 @@ build() { applypatch $srcdir/getsubopt.patch applypatch $srcdir/types.patch +} +build() { CFLAGS="$CFLAGS -D__off_t=off_t" \ LIBS="-largp" \ ./configure \ - --prefix="" \ + --prefix="/" \ --sbindir=/bin \ --disable-static diff --git a/extra/vim/vim.SMBuild b/extra/vim/vim.SMBuild index baa238f..093dd5b 100755 --- a/extra/vim/vim.SMBuild +++ b/extra/vim/vim.SMBuild @@ -1,28 +1,24 @@ app=vim -version=8.1 +version=9.0.1000 build=1sml homepage="https://www.vim.org/" -download="ftp://ftp.vim.org/pub/vim/unix/vim-$version.tar.bz2" +download="https://github.com/vim/vim/archive/refs/tags/v$version.tar.gz" desc="Vi IMproved UNIX text editor" requires="netbsd-curses" +noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir - rm -rf "$app""81" + rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* - cd "$app""81" + cd $app-$version fixbuilddirpermissions +} - CPPFLAGS="$CFLAGS -include stdlib.h -DHAVE_SETENV -DHAVE_PUTENV" \ +build() { LIBS="-lcurses -lterminfo" \ LDFLAGS="-static" \ - vim_cv_toupper_broken=no \ - vim_cv_terminfo=yes \ - vim_cv_tty_group=world \ - vim_cv_getcwd_broken=no \ - vim_cv_stat_ignores_slash=no \ - vim_cv_memmove_handles_overlap=yes \ ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -35,13 +31,15 @@ build() { make -j1 STRIP=true VIMRCLOC="$pkg"/etc install DESTDIR="$pkg" cp *.md $pkgdocs/ - - cd $pkg/bin - ln -s vim vi + + ( + cd $pkg/bin + ln -s vim vi + ) mkfinalpkg } sha512sums=" -0cd68de074962116b222dcbe918f36647fc0edc4c6e1520ec07ad837c868f502bd3f3d5c875570076d52fc335196014a42d9d7d860396c1f4aaeaf1ae1024267 vim-8.1.tar.lz +487c42382235696aac57d2ad81431a7ad1db684063409c06e1ad73cb3f379e377a22841493e128ff4c4d32b88344b2eed076b8690e0a396f1c64466c26d78c52 vim-9.0.1000.tar.lz " diff --git a/extra/wxwidgets/wxwidgets.SMBuild b/extra/wxwidgets/wxwidgets.SMBuild index 92bda84..0e1e23f 100755 --- a/extra/wxwidgets/wxwidgets.SMBuild +++ b/extra/wxwidgets/wxwidgets.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxW desc="C++ library for writing for writing apps with single codebase" requires="gtk3 sdl2 libnotify" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf wxWidgets-$version tar xf $srcdir/wxWidgets-$version.tar.?z* cd wxWidgets-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --with-gtk=3 \ diff --git a/extra/xarchiver/xarchiver.SMBuild b/extra/xarchiver/xarchiver.SMBuild index 1db6f16..a5c3d5b 100755 --- a/extra/xarchiver/xarchiver.SMBuild +++ b/extra/xarchiver/xarchiver.SMBuild @@ -1,21 +1,23 @@ app=xarchiver version=0.5.4.14 -build=1sml -homepage="http://xarchiver.sourceforge.net/" +build=2sml +homepage="https://xarchiver.sourceforge.net/" desc="Archive manager for X with support for most common archive formats" requires="gdk-pixbuf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ - --enable-gtk2 + --disable-gtk2 make make install DESTDIR=$pkg diff --git a/extra/xscreensaver/xscreensaver.SMBuild b/extra/xscreensaver/xscreensaver.SMBuild index 2cb6817..1364951 100755 --- a/extra/xscreensaver/xscreensaver.SMBuild +++ b/extra/xscreensaver/xscreensaver.SMBuild @@ -6,14 +6,16 @@ download="https://www.jwz.org/xscreensaver/xscreensaver-$version.tar.gz" desc="Screensaver for Xorg" requires="gtk2 gdk-pixbuf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ --with-login-manager \ diff --git a/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild b/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild index 3bce2f8..72c7d48 100755 --- a/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild +++ b/gtk/adwaita-icon-theme/adwaita-icon-theme.SMBuild @@ -6,7 +6,7 @@ download="https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/archive/$version/a desc="Collection of default icons used by GTK+" requires="gtk2 gtk3 hicolor-icon-theme" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/inherit-hicolor-theme.diff +} +build() { ./configure \ --prefix="" diff --git a/gtk/at-spi2-atk/at-spi2-atk.SMBuild b/gtk/at-spi2-atk/at-spi2-atk.SMBuild index 352bbd0..ec7049c 100755 --- a/gtk/at-spi2-atk/at-spi2-atk.SMBuild +++ b/gtk/at-spi2-atk/at-spi2-atk.SMBuild @@ -5,14 +5,16 @@ homepage="https://wiki.gnome.org/Accessibility" desc="A GTK+ module that bridges ATK to D-Bus at-spi" requires="glib libx11 dbus at-spi2-core" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z** cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" diff --git a/gtk/atk/atk.SMBuild b/gtk/atk/atk.SMBuild index 4037703..f13466c 100755 --- a/gtk/atk/atk.SMBuild +++ b/gtk/atk/atk.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.gnome.org/GNOME/atk" desc="Interface definitions of accessibility infrastructure" requires="gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. --prefix="/" diff --git a/gtk/atkmm/atkmm.SMBuild b/gtk/atkmm/atkmm.SMBuild index 87931d3..98ee62f 100755 --- a/gtk/atkmm/atkmm.SMBuild +++ b/gtk/atkmm/atkmm.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/atkmm/-/archive/$version/atkmm-$version desc="C++ bindings for ATK" requires="perl atk glibmm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/babl/babl.SMBuild b/gtk/babl/babl.SMBuild index 4eef332..50b828a 100755 --- a/gtk/babl/babl.SMBuild +++ b/gtk/babl/babl.SMBuild @@ -6,14 +6,16 @@ download="https://download.gimp.org/pub/babl/0.1/babl-$version.tar.xz" desc="Dynamic, any to any, pixel format conversion library" requires="lcms2 vala gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # Fix when building with meson 0.63.2 sed -i 's@Description@description@' meson.build diff --git a/gtk/cairo/cairo.SMBuild b/gtk/cairo/cairo.SMBuild index 9412243..0bb5836 100755 --- a/gtk/cairo/cairo.SMBuild +++ b/gtk/cairo/cairo.SMBuild @@ -6,7 +6,7 @@ download="https://cairographics.org/releases/cairo-$version.tar.xz" desc="2D graphics library with support for multiple output devices" requires="glib expat util-linux lzo pixman dejavu-fonts-ttf libxext libxrender libxcb freetype" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { applypatch $srcdir/musl-stacksize.patch autoreconf -vif +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/gtk/cairomm/cairomm.SMBuild b/gtk/cairomm/cairomm.SMBuild index 749a371..006903f 100755 --- a/gtk/cairomm/cairomm.SMBuild +++ b/gtk/cairomm/cairomm.SMBuild @@ -6,14 +6,16 @@ download="https://cairographics.org/releases/cairomm-$version.tar.gz" desc="C++ bindings for Cairo" requires="cairo libsigcpp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/clearlooks-phenix-theme/clearlooks-phenix-theme.SMBuild b/gtk/clearlooks-phenix-theme/clearlooks-phenix-theme.SMBuild index 5eba8cf..ee598ad 100755 --- a/gtk/clearlooks-phenix-theme/clearlooks-phenix-theme.SMBuild +++ b/gtk/clearlooks-phenix-theme/clearlooks-phenix-theme.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/jpfleury/clearlooks-phenix/archive/refs/tags/$versi desc="Default theme for GNOME 2 and 3" requires="gtk2 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf clearlooks-phenix-$version tar xf $srcdir/clearlooks-phenix-$version.tar.?z* cd clearlooks-phenix-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/share/themes/Clearlooks-Phenix cp -r xfwm4 gtk* $pkg/share/themes/Clearlooks-Phenix/ diff --git a/gtk/dbus-glib/dbus-glib.SMBuild b/gtk/dbus-glib/dbus-glib.SMBuild index 5657f66..9521a61 100755 --- a/gtk/dbus-glib/dbus-glib.SMBuild +++ b/gtk/dbus-glib/dbus-glib.SMBuild @@ -6,14 +6,16 @@ download="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$version.tar desc="GLib bindings for DBUS" requires="glib python3 dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-gtk-doc-html=no \ diff --git a/gtk/dconf-editor/dconf-editor.SMBuild b/gtk/dconf-editor/dconf-editor.SMBuild index 82e1d7d..cc54dcd 100755 --- a/gtk/dconf-editor/dconf-editor.SMBuild +++ b/gtk/dconf-editor/dconf-editor.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/dconf-editor/-/archive/$version/dconf-e desc="Graphical editor for dconf written in GTK3" requires="graphite2 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/fltk/fltk.SMBuild b/gtk/fltk/fltk.SMBuild index 5ac390f..6c4e176 100755 --- a/gtk/fltk/fltk.SMBuild +++ b/gtk/fltk/fltk.SMBuild @@ -6,14 +6,16 @@ download="https://www.fltk.org/pub/fltk/$version/fltk-$version-2-source.tar.bz2" desc="Graphical user interface toolkit for X" requires="gcc-libs desktop-file-utils libjpeg-turbo libxcursor libxext fontconfig libxinerama glu shared-mime-info cairo" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app-$version-2" tar xf $srcdir/$app-$version-2-source.tar.?z* cd "$app-$version-2" fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-shared \ diff --git a/gtk/gcr/gcr.SMBuild b/gtk/gcr/gcr.SMBuild index 7e0161e..8714620 100755 --- a/gtk/gcr/gcr.SMBuild +++ b/gtk/gcr/gcr.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gcr/-/archive/$version/gcr-$version.tar desc="A library for bits of crypto UI and parsing" requires="gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-schemas-compile \ diff --git a/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild b/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild index 1eced5e..786ee1b 100755 --- a/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild +++ b/gtk/gdk-pixbuf/gdk-pixbuf.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/$version/gdk-pixbu desc="An image loading library for GTK" requires="glib libx11 shared-mime-info gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gegl/gegl.SMBuild b/gtk/gegl/gegl.SMBuild index 17afafe..52795de 100755 --- a/gtk/gegl/gegl.SMBuild +++ b/gtk/gegl/gegl.SMBuild @@ -6,7 +6,7 @@ download="https://slackware.uk/slackware/slackware64-current/source/l/gegl/gegl- desc="Graph based image processing framework" requires="json-glib gobject-introspection babl lcms2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/libraw-0.21.patch +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/glib-networking/glib-networking.SMBuild b/gtk/glib-networking/glib-networking.SMBuild index 292fbec..25a2b01 100755 --- a/gtk/glib-networking/glib-networking.SMBuild +++ b/gtk/glib-networking/glib-networking.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/glib-networking/-/archive/$version/glib desc="Network extensions for GLib" requires="ca-certificates glib gnutls p11-kit" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/glibmm/glibmm.SMBuild b/gtk/glibmm/glibmm.SMBuild index 1c76049..0c95afd 100755 --- a/gtk/glibmm/glibmm.SMBuild +++ b/gtk/glibmm/glibmm.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/glibmm/2.58/glibmm-$version.tar.xz" desc="C++ bindings for GLib" requires="perl-modules glib-networking libsigcpp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/gnome-desktop/gnome-desktop.SMBuild b/gtk/gnome-desktop/gnome-desktop.SMBuild index b7acf68..4abbcda 100755 --- a/gtk/gnome-desktop/gnome-desktop.SMBuild +++ b/gtk/gnome-desktop/gnome-desktop.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gnome-desktop/-/archive/$version/gnome- desc="Library with common API for various GNOME modules" requires="graphite2 libseccomp gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild b/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild index c1bff7d..a05d63d 100755 --- a/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild +++ b/gtk/gnome-icon-theme/gnome-icon-theme.SMBuild @@ -5,9 +5,11 @@ homepage="https://git.pktsurf.in/smlinux" desc="Fake theme package only containing pkgconfig file" requires="hicolor-icon-theme" -build() { +prepbuilddir() { mkandenterbuilddir +} +build() { install -Dm 0644 $srcdir/gnome-icon-theme.pc $pkg/lib/pkgconfig/gnome-icon-theme.pc mkfinalpkg diff --git a/gtk/gnome-themes-extra/gnome-themes-extra.SMBuild b/gtk/gnome-themes-extra/gnome-themes-extra.SMBuild index 71edee9..7828750 100755 --- a/gtk/gnome-themes-extra/gnome-themes-extra.SMBuild +++ b/gtk/gnome-themes-extra/gnome-themes-extra.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/gnome-themes-extra/$version/gnome-t desc="Default collection icons and theme bits used by GTK+ applications" requires="intltool gtk2 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/gobject-introspection/gobject-introspection.SMBuild b/gtk/gobject-introspection/gobject-introspection.SMBuild index 7442bac..3c804c6 100755 --- a/gtk/gobject-introspection/gobject-introspection.SMBuild +++ b/gtk/gobject-introspection/gobject-introspection.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gobject-introspection/-/archive/$versio desc="Introspection system for GObject-based libraries" requires="glib util-linux" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/goffice/goffice.SMBuild b/gtk/goffice/goffice.SMBuild index 713ad94..31fe105 100755 --- a/gtk/goffice/goffice.SMBuild +++ b/gtk/goffice/goffice.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/goffice/-/archive/GOFFICE_0_10_46/goffi desc="A GLib/GTK+ set of document-centric objects and charting library" requires="intltool libxslt libgsf gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/graphite2/graphite2.SMBuild b/gtk/graphite2/graphite2.SMBuild index 26a7d77..f5cf345 100755 --- a/gtk/graphite2/graphite2.SMBuild +++ b/gtk/graphite2/graphite2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/silnrsi/graphite/archive/refs/tags/$version.tar.gz" desc="Reimplementation of the SIL Graphite text processing engine" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ diff --git a/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild b/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild index 4a83b2b..18d5604 100755 --- a/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild +++ b/gtk/gsettings-desktop-schemas/gsettings-desktop-schemas.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/archive/$ve desc="Shared GSettings schemas for the desktop" requires="dconf gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -i -r 's:"(/system):"/org/gnome\1:g' schemas/*.in && mkdir smbuild && cd smbuild diff --git a/gtk/gspell/gspell.SMBuild b/gtk/gspell/gspell.SMBuild index 71998bf..1ba4e4d 100755 --- a/gtk/gspell/gspell.SMBuild +++ b/gtk/gspell/gspell.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gspell/-/archive/$version/gspell-$versi desc="Flexible API to implement spell checking in a GTK+ application" requires="iso-codes enchant libxml2 gobject-introspection gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild b/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild index afc983d..e59599b 100755 --- a/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild +++ b/gtk/gst-plugins-bad/gst-plugins-bad.SMBuild @@ -6,14 +6,16 @@ download="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad- desc="Multimedia graph framework containing restricted plugins" requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gst-plugins-base/gst-plugins-base.SMBuild b/gtk/gst-plugins-base/gst-plugins-base.SMBuild index 9e9a95f..153a6c1 100755 --- a/gtk/gst-plugins-base/gst-plugins-base.SMBuild +++ b/gtk/gst-plugins-base/gst-plugins-base.SMBuild @@ -6,14 +6,16 @@ download="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-bas desc="Multimedia graph framework containing base plugins" requires="alsa-lib libpng libjpeg-turbo libtheora opus gstreamer glu pango gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gst-plugins-good/gst-plugins-good.SMBuild b/gtk/gst-plugins-good/gst-plugins-good.SMBuild index 33c9a7f..192ff37 100755 --- a/gtk/gst-plugins-good/gst-plugins-good.SMBuild +++ b/gtk/gst-plugins-good/gst-plugins-good.SMBuild @@ -6,14 +6,16 @@ download="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-goo desc="Multimedia graph framework containing good plugins" requires="alsa-lib libpng libjpeg-turbo libtheora opus glu pango gtk3 gst-plugins-base" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gtk2/gtk2.SMBuild b/gtk/gtk2/gtk2.SMBuild index b2aee43..f66d6d5 100755 --- a/gtk/gtk2/gtk2.SMBuild +++ b/gtk/gtk2/gtk2.SMBuild @@ -6,7 +6,7 @@ download="https://gitlab.gnome.org/GNOME/gtk/-/archive/$version/gtk-$version.tar desc="GObject-based multi-platform GUI toolkit (legacy)" requires="desktop-file-utils fribidi libxcomposite libxcursor libxdamage libxi libxinerama libxcb libxrandr fontconfig freetype pango harfbuzz graphite2 cairo atk gdk-pixbuf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "gtk+-$version" @@ -17,7 +17,9 @@ build() { autoreconf applypatch $srcdir/gtk2-fixdso.patch applypatch $srcdir/xid-collision-debug.patch +} +build() { ./configure \ --prefix="" \ --libdir=/lib \ diff --git a/gtk/gtk3/gtk3.SMBuild b/gtk/gtk3/gtk3.SMBuild index 8048440..40d4881 100755 --- a/gtk/gtk3/gtk3.SMBuild +++ b/gtk/gtk3/gtk3.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gtk/-/archive/$version/gtk-$version.tar desc="GObject-based multi-platform GUI toolkit" requires="fribidi iso-codes wayland libxkbcommon libepoxy shared-mime-info cairo gobject-introspection atk pango gdk-pixbuf librsvg at-spi2-atk" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "gtk+-$version" tar xf $srcdir/gtk+-$version.tar.?z cd "gtk+-$version" fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/gtkmm2/gtkmm2.SMBuild b/gtk/gtkmm2/gtkmm2.SMBuild index 9482fa7..ffae6d0 100755 --- a/gtk/gtkmm2/gtkmm2.SMBuild +++ b/gtk/gtkmm2/gtkmm2.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/gtkmm/2.24/gtkmm-$version.tar.xz" desc="C++ bindings for GTK+ 2" requires="gtk2 atkmm pangomm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf gtkmm-$version tar xf $srcdir/gtkmm-$version.tar.?z cd gtkmm-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/gtkmm3/gtkmm3.SMBuild b/gtk/gtkmm3/gtkmm3.SMBuild index 5daf198..86d2776 100755 --- a/gtk/gtkmm3/gtkmm3.SMBuild +++ b/gtk/gtkmm3/gtkmm3.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/gtkmm/3.18/gtkmm-$version.tar.xz" desc="C++ bindings for GTK+ 3" requires="gtk3 atkmm pangomm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf gtkmm-$version tar xf $srcdir/gtkmm-$version.tar.?z* cd gtkmm-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/gtksourceview/gtksourceview.SMBuild b/gtk/gtksourceview/gtksourceview.SMBuild index f06680b..8bb5ba8 100755 --- a/gtk/gtksourceview/gtksourceview.SMBuild +++ b/gtk/gtksourceview/gtksourceview.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/gtksourceview/-/archive/$version/gtksou desc="A text widget adding syntax highlighting and more to GNOME" requires="libxml2 vala gobject-introspection gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-gtk-doc \ diff --git a/gtk/gtkspell/gtkspell.SMBuild b/gtk/gtkspell/gtkspell.SMBuild index 7211249..ccd8d19 100755 --- a/gtk/gtkspell/gtkspell.SMBuild +++ b/gtk/gtkspell/gtkspell.SMBuild @@ -6,7 +6,7 @@ download="https://gtkspell.sourceforge.net/download/gtkspell-$version.tar.gz" desc="Provides word-processor-style misspelling highlighting and replacement library for Gtk apps" requires="intltool enchant gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/enchant-2.diff +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/harfbuzz/harfbuzz.SMBuild b/gtk/harfbuzz/harfbuzz.SMBuild index 3047037..5ebab1d 100755 --- a/gtk/harfbuzz/harfbuzz.SMBuild +++ b/gtk/harfbuzz/harfbuzz.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$version.tar.gz desc="OpenType text shaping engine" requires="glib python3 icu pixman fontconfig libxcb libxext cairo gobject-introspection graphite2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -17,7 +17,9 @@ build() { # https://github.com/harfbuzz/harfbuzz/issues/2555 # https://github.com/harfbuzz/harfbuzz/commit/bb37df76949802214323d7cd5454cd19bfb73a00 applypatch $srcdir/harfbuzz-old-gcc-header.patch +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/hicolor-icon-theme/hicolor-icon-theme.SMBuild b/gtk/hicolor-icon-theme/hicolor-icon-theme.SMBuild index 75d894e..7b92fd5 100755 --- a/gtk/hicolor-icon-theme/hicolor-icon-theme.SMBuild +++ b/gtk/hicolor-icon-theme/hicolor-icon-theme.SMBuild @@ -6,14 +6,16 @@ download="https://icon-theme.freedesktop.org/releases/hicolor-icon-theme-$versio desc="Default fallback theme for implementations of the icon theme specification" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/keybinder/keybinder.SMBuild b/gtk/keybinder/keybinder.SMBuild index 9c28a5e..aeaffcd 100755 --- a/gtk/keybinder/keybinder.SMBuild +++ b/gtk/keybinder/keybinder.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/kupferlauncher/keybinder/archive/refs/tags/v$versio desc="Library for registering global keyboard shortcuts" requires="gobject-introspection gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-python \ diff --git a/gtk/libcanberra/libcanberra.SMBuild b/gtk/libcanberra/libcanberra.SMBuild index b21fab1..068bbf3 100755 --- a/gtk/libcanberra/libcanberra.SMBuild +++ b/gtk/libcanberra/libcanberra.SMBuild @@ -6,14 +6,16 @@ download="https://0pointer.de/lennart/projects/libcanberra/libcanberra-$version. desc="A small and lightweight implementation of the XDG Sound Theme Specification" requires="alsa-lib libtool libvorbis gtk2 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-oss \ diff --git a/gtk/libdazzle/libdazzle.SMBuild b/gtk/libdazzle/libdazzle.SMBuild index bf51fe3..356b21d 100755 --- a/gtk/libdazzle/libdazzle.SMBuild +++ b/gtk/libdazzle/libdazzle.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/libdazzle/-/archive/$version/libdazzle- desc="GNOME library for implementing fancy features in applications" requires="gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" diff --git a/gtk/libgd/libgd.SMBuild b/gtk/libgd/libgd.SMBuild index c2f4f01..d49b77e 100755 --- a/gtk/libgd/libgd.SMBuild +++ b/gtk/libgd/libgd.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/libgd/libgd/releases/download/gd-$version/libgd-$ve desc="Library for the dynamic creation of images by programmers" requires="bzip2 util-linux fontconfig openjpeg libx11 libxpm libwebp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/gtk/libgexiv2/libgexiv2.SMBuild b/gtk/libgexiv2/libgexiv2.SMBuild index 10e4304..17e0a83 100755 --- a/gtk/libgexiv2/libgexiv2.SMBuild +++ b/gtk/libgexiv2/libgexiv2.SMBuild @@ -6,14 +6,16 @@ download="https://slackware.uk/slackware/slackware-15.0/source/l/gexiv2/gexiv2-$ desc="GObject wrapper around Exiv2 library" requires="exiv2 glib gobject-introspection vala" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf gexiv2-$version tar xf $srcdir/gexiv2-$version.tar.?z* cd gexiv2-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" @@ -27,4 +29,4 @@ build() { } sha512sums=" d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50 gexiv2-0.14.0.tar.xz -" \ No newline at end of file +" diff --git a/gtk/libglade/libglade.SMBuild b/gtk/libglade/libglade.SMBuild index d04a1cf..ba43e6e 100755 --- a/gtk/libglade/libglade.SMBuild +++ b/gtk/libglade/libglade.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/libglade/2.6/libglade-$version.tar. desc="User Interface Builder for GTK+ applications" requires="libxml2 gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in ./configure \ diff --git a/gtk/libgphoto2/libgphoto2.SMBuild b/gtk/libgphoto2/libgphoto2.SMBuild index 4cd74d6..7eef2c2 100755 --- a/gtk/libgphoto2/libgphoto2.SMBuild +++ b/gtk/libgphoto2/libgphoto2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/gphoto/libgphoto2/archive/refs/tags/v$version.tar.g desc="Digital camera access library" requires="libexif libtool" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/gtk/libgsf/libgsf.SMBuild b/gtk/libgsf/libgsf.SMBuild index 4c38c92..0097848 100755 --- a/gtk/libgsf/libgsf.SMBuild +++ b/gtk/libgsf/libgsf.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/libgsf/-/archive/LIBGSF_1_14_45/libgsf- desc="An extensible I/O abstraction library for dealing with structured file formats" requires="bzip2 libxml2 unzip perl-modules gdk-pixbuf xz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/libmanette/libmanette.SMBuild b/gtk/libmanette/libmanette.SMBuild index 1e5506a..8a19aae 100755 --- a/gtk/libmanette/libmanette.SMBuild +++ b/gtk/libmanette/libmanette.SMBuild @@ -6,14 +6,16 @@ download="https://download-fallback.gnome.org/sources/libmanette/0.2/libmanette- desc="GObject game controller library for GNOME" requires="musl gobject-introspection libgudev" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/libnotify/libnotify.SMBuild b/gtk/libnotify/libnotify.SMBuild index 28dd968..c727da2 100755 --- a/gtk/libnotify/libnotify.SMBuild +++ b/gtk/libnotify/libnotify.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/libnotify/-/archive/$version/libnotify- desc="Library for sending desktop notifications" requires="xmlto gdk-pixbuf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no \ diff --git a/gtk/libportal/libportal.SMBuild b/gtk/libportal/libportal.SMBuild index c1fb0db..854b2b5 100755 --- a/gtk/libportal/libportal.SMBuild +++ b/gtk/libportal/libportal.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/flatpak/libportal/archive/refs/tags/$version.tar.gz desc="Flatpak portal API" requires="gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/libraqm/libraqm.SMBuild b/gtk/libraqm/libraqm.SMBuild index 2e04677..b120e04 100755 --- a/gtk/libraqm/libraqm.SMBuild +++ b/gtk/libraqm/libraqm.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/HOST-Oman/libraqm/archive/refs/tags/v$version.tar.g desc="A library that encapsulates the logic for complex text layout" requires="fribidi glib freetype graphite2 harfbuzz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-static=no \ diff --git a/gtk/librsvg/librsvg.SMBuild b/gtk/librsvg/librsvg.SMBuild index 9b98a21..5ce9786 100755 --- a/gtk/librsvg/librsvg.SMBuild +++ b/gtk/librsvg/librsvg.SMBuild @@ -6,14 +6,16 @@ download="https://download-fallback.gnome.org/sources/librsvg/2.40/librsvg-$vers desc="SVG rendering library" requires="libcroco dejavu-fonts-ttf vala pango gdk-pixbuf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/libsigcpp/libsigcpp.SMBuild b/gtk/libsigcpp/libsigcpp.SMBuild index 51c0dbb..c9bea7c 100755 --- a/gtk/libsigcpp/libsigcpp.SMBuild +++ b/gtk/libsigcpp/libsigcpp.SMBuild @@ -9,14 +9,16 @@ download="https://download.gnome.org/sources/libsigc++/2.9/libsigc%2B%2B-$versio desc="Typesafe callback system for standard C++" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $altername-$version tar xf $srcdir/$altername-$version.tar.?z cd $altername-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-documentation diff --git a/gtk/libsoup/libsoup.SMBuild b/gtk/libsoup/libsoup.SMBuild index 40bd08d..a94f5e9 100755 --- a/gtk/libsoup/libsoup.SMBuild +++ b/gtk/libsoup/libsoup.SMBuild @@ -6,14 +6,16 @@ download="https://slackware.uk/slackware/slackware-15.0/source/l/libsoup/libsoup desc="HTTP client/server library" requires="libxml2 gnutls sqlite brotli vala gobject-introspection glib-networking" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson setup \ --prefix="/" \ @@ -32,4 +34,4 @@ build() { sha512sums=" 2554f4f214536819d08bc5a0ebceca85fd339e6efcea8c2afc6559ade56118691fc48f226ed210988edc592b23fc8a9094b47fc22b4d028c0df23158c4086431 libsoup-2.74.2.tar.lz -" \ No newline at end of file +" diff --git a/gtk/libunique/libunique.SMBuild b/gtk/libunique/libunique.SMBuild index bfbb11b..f4b8cc5 100755 --- a/gtk/libunique/libunique.SMBuild +++ b/gtk/libunique/libunique.SMBuild @@ -6,7 +6,7 @@ download="https://download.gnome.org/sources/libunique/1.1/libunique-$version.ta desc="Library for writing single instance applications" requires="gtk2 graphite2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/libunique-1.1.6-G_CONST_RETURN.patch +} +build() { CFLAGS="$CFLAGS -Wno-deprecated-declarations" \ CXXFLAGS="$CFLAGS" \ ./configure \ diff --git a/gtk/libwebp/libwebp.SMBuild b/gtk/libwebp/libwebp.SMBuild index 910772b..af27c47 100755 --- a/gtk/libwebp/libwebp.SMBuild +++ b/gtk/libwebp/libwebp.SMBuild @@ -6,14 +6,16 @@ download="https://storage.googleapis.com/downloads.webmproject.org/releases/webp desc="WebP library and conversion tools" requires="giflib libpng zstd libtiff" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/libwnck2/libwnck2.SMBuild b/gtk/libwnck2/libwnck2.SMBuild index 450e22b..32eec0f 100755 --- a/gtk/libwnck2/libwnck2.SMBuild +++ b/gtk/libwnck2/libwnck2.SMBuild @@ -6,14 +6,16 @@ download="https://download-fallback.gnome.org/sources/libwnck/2.29/libwnck-$vers desc="Window Navigator Construction Kit" requires="intltool libxt startup-notification gobject-introspection gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libwnck-$version tar xf $srcdir/libwnck-$version.tar.?z* cd libwnck-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/gtk/libwnck3/libwnck3.SMBuild b/gtk/libwnck3/libwnck3.SMBuild index 25d6f97..ac26082 100755 --- a/gtk/libwnck3/libwnck3.SMBuild +++ b/gtk/libwnck3/libwnck3.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/libwnck/-/archive/$version/libwnck-$ver desc="Window Navigator Construction Kit" requires="startup-notification gobject-introspection gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libwnck-$version tar xf $srcdir/libwnck-$version.tar.?z cd libwnck-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/openjpeg/openjpeg.SMBuild b/gtk/openjpeg/openjpeg.SMBuild index ad783cf..c98ad3c 100755 --- a/gtk/openjpeg/openjpeg.SMBuild +++ b/gtk/openjpeg/openjpeg.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/uclouvain/openjpeg/archive/refs/tags/v$version.tar. desc="An open source JPEG 2000 codec" requires="libpng lcms2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/openjpeg2-remove-thirdparty.patch +} +build() { mkdir smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/gtk/pango/pango.SMBuild b/gtk/pango/pango.SMBuild index 3f91d50..7d3e1bc 100755 --- a/gtk/pango/pango.SMBuild +++ b/gtk/pango/pango.SMBuild @@ -6,14 +6,16 @@ download="https://download.gnome.org/sources/pango/1.50/pango-$version.tar.xz" desc="A library for layout and rendering of text" requires="fribidi libxft harfbuzz" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/gtk/pangomm/pangomm.SMBuild b/gtk/pangomm/pangomm.SMBuild index e10af09..9aaf689 100755 --- a/gtk/pangomm/pangomm.SMBuild +++ b/gtk/pangomm/pangomm.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/pangomm/-/archive/$version/pangomm-$ver desc="C++ API for pango" requires="pango glibmm cairomm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" @@ -28,4 +30,4 @@ build() { sha512sums=" 2a817b125e32daaf2bede971ffb5718e344bc140c8f86c6f66a143132679a77640fa9182c78c24ddb3207c6cc1b21d75d838c131bcfcec96673a0e496ca3f8b7 pangomm-2.46.3.tar.lz -" \ No newline at end of file +" diff --git a/gtk/pinentry/pinentry.SMBuild b/gtk/pinentry/pinentry.SMBuild index 10af16e..6d5ee9a 100755 --- a/gtk/pinentry/pinentry.SMBuild +++ b/gtk/pinentry/pinentry.SMBuild @@ -6,14 +6,16 @@ download="https://gnupg.org/ftp/gcrypt/pinentry/pinentry-$version.tar.bz2" desc="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" requires="netbsd-curses libassuan libcap libsecret gtk2 fltk p11-kit" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-pinentry-tty \ diff --git a/gtk/py3cairo/py3cairo.SMBuild b/gtk/py3cairo/py3cairo.SMBuild index db097ae..1e3fe25 100755 --- a/gtk/py3cairo/py3cairo.SMBuild +++ b/gtk/py3cairo/py3cairo.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/pygobject/pycairo/archive/refs/tags/v$version.tar.g desc="Python 3.x bindings for cairo" requires="python3 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf pycairo-$version tar xf $srcdir/pycairo-$version.tar.?z* cd pycairo-$version fixbuilddirpermissions +} +build() { python3 setup.py install --prefix="" --root=$pkg cp COPYING* $pkgdocs/ diff --git a/gtk/pygobject3/pygobject3.SMBuild b/gtk/pygobject3/pygobject3.SMBuild index cda3e73..6bf8a2a 100755 --- a/gtk/pygobject3/pygobject3.SMBuild +++ b/gtk/pygobject3/pygobject3.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/pygobject/-/archive/$version/pygobject- desc="Python Bindings for GLib, GObject, GIO and GTK+" requires="python3 gobject-introspection gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf PyGObject-$version tar xf $srcdir/PyGObject-$version.tar.?z* cd PyGObject-$version fixbuilddirpermissions +} +build() { mkdir smbuild && cd smbuild meson .. \ --prefix="/" diff --git a/gtk/rest/rest.SMBuild b/gtk/rest/rest.SMBuild index 78409bd..1225825 100755 --- a/gtk/rest/rest.SMBuild +++ b/gtk/rest/rest.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/librest/-/archive/$version/librest-$ver desc="Library for accessing RESTful web services" requires="glib libsoup libxml2 gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/gtk/shared-mime-info/shared-mime-info.SMBuild b/gtk/shared-mime-info/shared-mime-info.SMBuild index da88a00..4358bf1 100755 --- a/gtk/shared-mime-info/shared-mime-info.SMBuild +++ b/gtk/shared-mime-info/shared-mime-info.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/Release- desc="Freedesktop.org Shared MIME Info" requires="glib libxml2 xmlto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ac_cv_func_fdatasync=no \ ./configure \ --prefix="" \ diff --git a/gtk/wv/wv.SMBuild b/gtk/wv/wv.SMBuild index ced610e..f41bf5a 100755 --- a/gtk/wv/wv.SMBuild +++ b/gtk/wv/wv.SMBuild @@ -6,14 +6,16 @@ download="https://www.abisource.com/downloads/wv/$version/wv-$version.tar.gz" desc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats" requires="libgsf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ac_cv_path_mkdir="mkdir -p" \ ./configure \ --prefix="" \ diff --git a/heavybuilds/firefox/firefox.SMBuild b/heavybuilds/firefox/firefox.SMBuild index 1d04c80..1f100e7 100755 --- a/heavybuilds/firefox/firefox.SMBuild +++ b/heavybuilds/firefox/firefox.SMBuild @@ -1,12 +1,12 @@ app=firefox -version=91.11.0 +version=102.8.0 build=1sml homepage="http://www.mozilla.org/projects/firefox/" -download="https://archive.mozilla.org/pub/firefox/releases/91.11.0esr/source/firefox-91.11.0esr.source.tar.xz" +download="https://archive.mozilla.org/pub/firefox/releases/102.8.0esr/source/firefox-102.8.0esr.source.tar.xz" desc="Web browser from mozilla.org based on Gecko engine" requires="zip unzip yasm libevent alsa-lib libpng icu hunspell python3 diffutils llvm imake libxt gtk3 dbus-glib ffmpeg clang nodejs mozilla-nss lld" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -35,20 +35,22 @@ build() { applypatch $srcdir/disable-neon-in-aom.patch applypatch $srcdir/fix-arm-opus-include.patch applypatch $srcdir/fix-fortify-system-wrappers.patch - applypatch $srcdir/fix-tools.patch applypatch $srcdir/fix-webrtc-glibcisms.patch applypatch $srcdir/mallinfo.patch applypatch $srcdir/sandbox-fork.patch applypatch $srcdir/sandbox-largefile.patch applypatch $srcdir/sandbox-sched_setscheduler.patch applypatch $srcdir/symboltable.patch +} +build() { export SHELL=/bin/sh export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 - export MACH_USE_SYSTEM_PYTHON=1 + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none export USE_SHORT_LIBNAME=1 export RUST_TARGET="$arch-unknown-linux-musl" + # Thanks slackware. This reduces memory consumption issues when rust objects are compiled export RUSTFLAGS="-Cdebuginfo=0" @@ -74,14 +76,13 @@ build() { ../mach configure \ --prefix="" \ --libdir=/lib \ - --enable-alsa \ + --enable-audio-backends=alsa \ --enable-dbus \ --enable-hardening \ --enable-official-branding \ --enable-release \ --enable-application=browser \ --enable-default-toolkit=cairo-gtk3 \ - --disable-pulseaudio \ --disable-necko-wifi \ --disable-strip \ --disable-install-strip \ @@ -89,7 +90,6 @@ build() { --disable-updater \ --disable-rust-simd \ --disable-crashreporter \ - --disable-gold \ --disable-jemalloc \ --enable-optimize="-O2" \ --disable-profiling \ @@ -105,10 +105,12 @@ build() { --with-system-webp \ --with-system-nss \ --with-system-nspr \ - --with-clang-path=/bin/clang \ - --with-libclang-path=/lib \ --allow-addon-sideload \ - --enable-linker=lld + --enable-linker=lld \ + --disable-cargo-incremental \ + --without-wasm-sandboxed-libraries \ + --with-clang-path=/bin/clang \ + --with-libclang-path=/lib # For some reason, firefox compiler is not able to find critical GCC headers # for our supported architectures when using a custom toolchain like skarnet's. @@ -138,19 +140,18 @@ build() { sha512sums=" 602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad autoconf-2.13.tar.gz -bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96 firefox-91.11.0esr.source.tar.xz +93ea87997b66088b94c6e943b6e99e9a71d1908444d096c0f65b6876d2c584e55ff6120266f3851f986b664bd1f12fa31206b03479c2b751e7c3ca097ac14275 firefox-102.8.0esr.source.tar.xz 4e584621145cf8add069c6dac18e805b3274a1ee402d84e924df2341f7d3c5be261a93ef51283bacbd606f47fbdc628c4323ecc31efc5b403b8d224b18dc278f allow-custom-rust-vendor.patch b1cb2db3122634f66d2bae7066e76f2dcd455c464e021db4de3b0a08314df95cb667846081682db549dd2af8a00831cabe44a2420c66cdfb5e3b5fa7e6bd21d3 avoid-redefinition.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 55eab1a02e19a19a1ee0e36b11097ab48a44200e07e543d91469967206854f39709c7c0bc31855559528e64642d610868140e9533f1c0e3bebc953353c142fa8 disable-neon-in-aom.patch b88b312ec14330351fe2d3aef0aef9fa0d533f46dae7ddd1288aa79fc06e9c247147769369a11387988fa0685836135bbfc24000f30d263173361b9c0c5c3c39 fix-arm-opus-include.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch -a763228d0742be7323c7b2dafff173d48e261307372ed4445a8f1d583f0cebaf125b46d0abb1daa44bb03b1dafa8026d5215f5378f58b09b674f6f380ff5777f fix-tools.patch -47c2c2428c3598a42f6241705179642b3378a86ace39c8c3cbef4954e6d220b42e6c76f3d71731d65f67ce2c8597259122ac44bbd45e20993bb8bc70c0c8a010 fix-webrtc-glibcisms.patch -551676b1b2d5c34c6e66cdf52781e5f94807df1155dca5fc89b45936140368b40b374e209f18c085fd1c2034764d7eb64bd95ec8cd513f9bded43cd692cc9059 mallinfo.patch +305c874fdea3096e9c4c6aa6520ac64bb1c347c4b59db8360096646593fe684c3b5377874d91cecd33d56d1410b4714fbdea2b514923723ecbeff79d51265d9b fix-webrtc-glibcisms.patch +a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch 2518f2fc75b5db30058e0735f47d60fdf1e7adfaeee4b33fb2afb1bd9a616ce943fd88f4404d0802d4083703f4acf1d5ad42377218d025bc768807fbaf7e1609 sandbox-fork.patch 36ce3c2f97e4b53a627d3dba48a34921eb3fe7303524b8fe59033f3d159ea48bc90869fb555b1774b532f31e5b967fbf76d0305743f462cd9036f43cba7da044 sandbox-largefile.patch -db26757b2ebf9f567962e32294b4ae48b3a5d0378a7589dfe650fe3a179ff58befbab5082981c68e1c25fb9e56b2db1e4e510d4bca17c3e3aedbf9a2f21806eb sandbox-sched_setscheduler.patch +94433c5ffdbe579c456d95c5f053f61fcbab2f652fa90bc69dcc27d9a1507a8e5c677adeadae9a7a75cc9a55184c1040737f4dfd10b279c088ef016561e6f135 sandbox-sched_setscheduler.patch 7c8584c39c8d3d2c8b0bd430fea6d835359580419e6676d06d9f5973c43222de3f314d9f42ee6a492544af5882596dba20373d8fcad9c82d0ce454aa40066e9f symboltable.patch 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h " diff --git a/heavybuilds/firefox/fix-tools.patch b/heavybuilds/firefox/fix-tools.patch deleted file mode 100644 index 94de423..0000000 --- a/heavybuilds/firefox/fix-tools.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:09:40.980448579 +0100 -+++ b/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 -@@ -497,8 +501,10 @@ - ucontext_t sSyncUContext; - - void Registers::SyncPopulate() { -+#if defined(__GLIBC__) - if (!getcontext(&sSyncUContext)) { - PopulateRegsFromContext(*this, &sSyncUContext); - } -+#endif - } - #endif diff --git a/heavybuilds/firefox/fix-webrtc-glibcisms.patch b/heavybuilds/firefox/fix-webrtc-glibcisms.patch index 7533d94..4f9043b 100644 --- a/heavybuilds/firefox/fix-webrtc-glibcisms.patch +++ b/heavybuilds/firefox/fix-webrtc-glibcisms.patch @@ -1,20 +1,20 @@ ---- ./third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2018-05-09 23:48:44.677389171 +0200 -+++ ./third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2018-05-09 23:48:56.254373557 +0200 -@@ -14,7 +14,7 @@ - #ifndef __GLIBC_PREREQ - #define __GLIBC_PREREQ(a, b) 0 +--- a/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc ++++ b/third_party/libwebrtc/system_wrappers/source/cpu_features_linux.cc +@@ -18,7 +18,7 @@ + #define WEBRTC_GLIBC_PREREQ(a, b) 0 #endif --#if __GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) + +-#if WEBRTC_GLIBC_PREREQ(2, 16) ++#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16) #include #else - #include -@@ -32,7 +32,7 @@ + #include +@@ -40,7 +40,7 @@ int architecture = 0; - unsigned long hwcap = 0; + uint64_t hwcap = 0; const char* platform = NULL; --#if __GLIBC_PREREQ(2, 16) -+#if !__GLIBC__ || __GLIBC_PREREQ(2, 16) +-#if WEBRTC_GLIBC_PREREQ(2, 16) ++#if !__GLIBC__ || WEBRTC_GLIBC_PREREQ(2, 16) hwcap = getauxval(AT_HWCAP); platform = (const char*)getauxval(AT_PLATFORM); #else diff --git a/heavybuilds/firefox/mallinfo.patch b/heavybuilds/firefox/mallinfo.patch index 0d70430..7916a20 100644 --- a/heavybuilds/firefox/mallinfo.patch +++ b/heavybuilds/firefox/mallinfo.patch @@ -1,34 +1,20 @@ ---- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100 -+++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 -@@ -123,6 +123,7 @@ +diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp +index 865e1b5430..9a00dafecb 100644 +--- a/xpcom/base/nsMemoryReporterManager.cpp ++++ b/xpcom/base/nsMemoryReporterManager.cpp +@@ -124,6 +124,7 @@ static MOZ_MUST_USE nsresult ResidentUniqueDistinguishedAmount(int64_t* aN) { return GetProcSelfSmapsPrivate(aN); } - + +#ifdef __GLIBC__ # ifdef HAVE_MALLINFO # define HAVE_SYSTEM_HEAP_REPORTER 1 static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { -@@ -142,6 +143,7 @@ +@@ -143,6 +144,7 @@ static MOZ_MUST_USE nsresult SystemHeapSize(int64_t* aSizeOut) { return NS_OK; } # endif -+#endif // __GLIBC__ - ++#endif + #elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || \ defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -@@ -642,6 +644,7 @@ - return NS_OK; - } - -+#ifdef __GLIBC__ - # define HAVE_SYSTEM_HEAP_REPORTER 1 - // Windows can have multiple separate heaps. During testing there were multiple - // heaps present but the non-default ones had sizes no more than a few 10s of -@@ -698,6 +701,7 @@ - *aSizeOut = heapsSize; - return NS_OK; - } -+#endif // __GLIBC__ - - struct SegmentKind { - DWORD mState; diff --git a/heavybuilds/firefox/sandbox-sched_setscheduler.patch b/heavybuilds/firefox/sandbox-sched_setscheduler.patch index 1db645a..3163c9e 100644 --- a/heavybuilds/firefox/sandbox-sched_setscheduler.patch +++ b/heavybuilds/firefox/sandbox-sched_setscheduler.patch @@ -1,18 +1,11 @@ upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1657849 -diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp -index 27da4e7..5a607a4 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp -@@ -1455,6 +1455,7 @@ class GMPSandboxPolicy : public SandboxPolicyCommon { - return Trap(OpenTrap, mFiles); - - case __NR_brk: -+ case __NR_sched_setscheduler: - // Because Firefox on glibc resorts to the fallback implementation - // mentioned in bug 1576006, we must explicitly allow the get*id() - // functions in order to use NSS in the clearkey CDM. -@@ -1467,8 +1468,7 @@ class GMPSandboxPolicy : public SandboxPolicyCommon { +@@ -1694,10 +1694,10 @@ + return Allow(); + case __NR_sched_get_priority_min: case __NR_sched_get_priority_max: ++ case __NR_sched_setscheduler: return Allow(); case __NR_sched_getparam: - case __NR_sched_getscheduler: diff --git a/heavybuilds/firefox/slack-desc b/heavybuilds/firefox/slack-desc deleted file mode 100644 index 77f369e..0000000 --- a/heavybuilds/firefox/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler------------------------------------------------------| -firefox: firefox (Mozilla Firefox Web browser) -firefox: -firefox: This project is a redesign of the Mozilla browser component written -firefox: using the XUL user interface language. Firefox empowers you to -firefox: browse faster, more safely and more efficiently than with any other -firefox: browser. -firefox: -firefox: Visit the Mozilla Firefox project online: -firefox: http://www.mozilla.org/projects/firefox/ -firefox: -firefox: diff --git a/heavybuilds/firefox/slack-required b/heavybuilds/firefox/slack-required deleted file mode 100644 index 3922905..0000000 --- a/heavybuilds/firefox/slack-required +++ /dev/null @@ -1,24 +0,0 @@ -zip -unzip -yasm -libevent -zlib -alsa-lib -libpng -libogg -libvorbis -icu -libvpx -hunspell -python2 -diffutils -llvm -imake -libXt -gtk2 -dbus-glib -ffmpeg -clang -nodejs -mozilla-nss -lld diff --git a/net/aircrack-ng/aircrack-ng.SMBuild b/net/aircrack-ng/aircrack-ng.SMBuild index b5fbc54..fa68bea 100755 --- a/net/aircrack-ng/aircrack-ng.SMBuild +++ b/net/aircrack-ng/aircrack-ng.SMBuild @@ -6,14 +6,16 @@ download="https://download.aircrack-ng.org/aircrack-ng-$version.tar.gz" desc="Set of tools for auditing WiFi networks" requires="gcc-libs zlib openssl pcre sqlite libnl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin diff --git a/net/autossh/autossh.SMBuild b/net/autossh/autossh.SMBuild index fa7ce01..4cbc7a8 100755 --- a/net/autossh/autossh.SMBuild +++ b/net/autossh/autossh.SMBuild @@ -6,14 +6,16 @@ download="https://www.harding.motd.ca/autossh/autossh-$version.tgz" desc="Utility to automatically restart SSH sessions and tunnels" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tgz cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/bindutils/bindutils.SMBuild b/net/bindutils/bindutils.SMBuild index f095dc4..6a1073a 100755 --- a/net/bindutils/bindutils.SMBuild +++ b/net/bindutils/bindutils.SMBuild @@ -4,16 +4,18 @@ build=1sml homepage="https://www.isc.org/bind/" download="https://ftp.isc.org/isc/bind9/$version/bind-$version.tar.xz" desc="domain utility collection packaged separately from BIND source" -requires="libxml2 openssl libuv" +requires="libxml2 openssl libuv libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf bind-$version tar xf $srcdir/bind-$version.tar.?z cd bind-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/bwm-ng/bwm-ng.SMBuild b/net/bwm-ng/bwm-ng.SMBuild index eee03b1..1742144 100755 --- a/net/bwm-ng/bwm-ng.SMBuild +++ b/net/bwm-ng/bwm-ng.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/vgropp/bwm-ng/archive/refs/tags/v$version.tar.gz" desc="Console-based live network and disk io bandwidth monitor for Linux" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/001-Use-static-inline-instead-of-inline.patch +} +build() { ./configure \ --prefix="" \ --with-ncurses \ diff --git a/net/cgit/cgit.SMBuild b/net/cgit/cgit.SMBuild index f2babc0..badea33 100755 --- a/net/cgit/cgit.SMBuild +++ b/net/cgit/cgit.SMBuild @@ -7,7 +7,7 @@ download="https://git.zx2c4.com/cgit/snapshot/cgit-$version.tar.xz" desc="CGI web frontend for git repositories written in C" requires="zlib git" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,10 +15,13 @@ build() { cd $app-$version fixbuilddirpermissions - export NO_LUA=1 - export NO_REGEX=NeedsStartEnd [ -d git ] && rm -rf git tar -xf "$srcdir/git-$gitv.tar.lz" && mv git-$gitv git +} + +build() { + export NO_LUA=1 + export NO_REGEX=NeedsStartEnd make make install prefix="/" DESTDIR="$pkg" diff --git a/net/cifs-utils/cifs-utils.SMBuild b/net/cifs-utils/cifs-utils.SMBuild index 23624f6..8d3c73f 100755 --- a/net/cifs-utils/cifs-utils.SMBuild +++ b/net/cifs-utils/cifs-utils.SMBuild @@ -6,7 +6,7 @@ download="https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-$versi desc="Utilities for managing CIFS filesystems" requires="libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/musl-fix-includes.patch applypatch $srcdir/xattr_size_max.patch +} +build() { ./configure \ --prefix="" diff --git a/net/comgt/comgt.SMBuild b/net/comgt/comgt.SMBuild index 91b8a7c..01b2465 100755 --- a/net/comgt/comgt.SMBuild +++ b/net/comgt/comgt.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/comgt/files/comgt/$version/comgt.$ver desc="Utility to interact with 2G, 3G and LTE modems via standard AT command set" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app.$version" @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/002-termios.patch +} +build() { make mkdir -p $pkg/bin $pkg/etc/comgt/examples $pkg/share/man/man1 diff --git a/net/cups-filters/cups-filters.SMBuild b/net/cups-filters/cups-filters.SMBuild index 8fc2b8e..05b62fa 100755 --- a/net/cups-filters/cups-filters.SMBuild +++ b/net/cups-filters/cups-filters.SMBuild @@ -6,14 +6,16 @@ download="https://www.openprinting.org/download/cups-filters/cups-filters-$versi desc="Backends and filters for CUPS" requires="dejavu-fonts-ttf libwebp libidn libtasn1 nettle libjpeg-turbo gobject-introspection pcre netbsd-curses glib gmp gnutls zlib imagemagick lcms2 cups poppler qpdf python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/cups/cups.SMBuild b/net/cups/cups.SMBuild index 4bad139..0f550e4 100755 --- a/net/cups/cups.SMBuild +++ b/net/cups/cups.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/apple/cups/releases/download/release-$version/cups- desc="Common UNIX Printing System" requires="perl openssl gnutls dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version-source.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/cyrus-sasl/cyrus-sasl.SMBuild b/net/cyrus-sasl/cyrus-sasl.SMBuild index b5b1678..1205511 100755 --- a/net/cyrus-sasl/cyrus-sasl.SMBuild +++ b/net/cyrus-sasl/cyrus-sasl.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2 desc="API to provide authentication and authorization" requires="db" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/darkhttpd/darkhttpd.SMBuild b/net/darkhttpd/darkhttpd.SMBuild index d5ec811..e7d75f4 100755 --- a/net/darkhttpd/darkhttpd.SMBuild +++ b/net/darkhttpd/darkhttpd.SMBuild @@ -5,14 +5,16 @@ homepage="https://unix4lyfe.org/darkhttpd" desc="Simple, secure and lightweight HTTP server" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 darkhttpd $pkg/bin/darkhttpd diff --git a/net/darkstat/darkstat.SMBuild b/net/darkstat/darkstat.SMBuild index b633b6c..2d0c06f 100755 --- a/net/darkstat/darkstat.SMBuild +++ b/net/darkstat/darkstat.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/emikulic/darkstat/archive/refs/tags/3.0.721.tar.gz" desc="Gathers and displays network interface statistics over HTTP" requires="zlib libpcap libnl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions autoreconf -vi +} +build() { ./configure \ --prefix="" \ --sbindir=/bin @@ -30,4 +32,4 @@ build() { sha512sums=" 365adca40e70eb92f26698b1e6207ec21d708858788f10ce631d33031cc8a90556818d8a2e8a8296ac183b6fcfc4c7a0d42426d142bc218052cbd86b26aee0ec darkstat-3.0.721.tar.lz -" \ No newline at end of file +" diff --git a/net/dhcpcd/dhcpcd.SMBuild b/net/dhcpcd/dhcpcd.SMBuild index 7a33930..fc0393a 100755 --- a/net/dhcpcd/dhcpcd.SMBuild +++ b/net/dhcpcd/dhcpcd.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/NetworkConfiguration/dhcpcd/archive/refs/tags/dhcpc desc="RFC2131 and 1541-compliant DHCP client" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -36,4 +38,4 @@ build() { sha512sums=" 9095276a4492432dd8d7aef2e2a485137bc116240431f01a4d6bc27e484f56178462985485892b7869852f64983811042b636646364c82a3fe8fe84951739658 dhcpcd-9.1.4.tar.lz -" \ No newline at end of file +" diff --git a/net/distcc/distcc.SMBuild b/net/distcc/distcc.SMBuild index 2502a75..2425e7a 100755 --- a/net/distcc/distcc.SMBuild +++ b/net/distcc/distcc.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/distcc/distcc/releases/download/v$version/distcc-$v desc="Distributed C and C++ compiler daemon for parallel building" requires="popt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch - +} + +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -34,4 +36,4 @@ build() { sha512sums=" c2d7fd2baacee153f722e780b5dc3780eaf2903ceff22c3eb315905d425b984403e1abab540e8cd49829bc03a86ae984b62d31b9defb493adddac7b24f428b09 distcc-3.4.tar.lz 9bc411107021d5f621304a73b0bfdec387d1b33121a325503cf4c9c4046924338ee1b4ef093b517249c3df31cf69cd9f19377df2edd6e81be1dac50a5bd0f3d5 dcc_gcc_rewrite_fqn-avoid-heap-corruption.patch -" \ No newline at end of file +" diff --git a/net/dnsmasq/dnsmasq.SMBuild b/net/dnsmasq/dnsmasq.SMBuild index 67b2601..0c7f76f 100755 --- a/net/dnsmasq/dnsmasq.SMBuild +++ b/net/dnsmasq/dnsmasq.SMBuild @@ -6,14 +6,16 @@ download="https://thekelleys.org.uk/dnsmasq/dnsmasq-$version.tar.xz" desc="Lightweight DNS and DHCP server suitable for a small network" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { SM_BUILDOPTS="-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK" make COPTS="$SM_BUILDOPTS" make COPTS="$SM_BUILDOPTS" PREFIX="/" BINDIR="/bin" DESTDIR="$pkg" install diff --git a/net/dovecot/dovecot.SMBuild b/net/dovecot/dovecot.SMBuild index 5bb96e7..0ac9521 100755 --- a/net/dovecot/dovecot.SMBuild +++ b/net/dovecot/dovecot.SMBuild @@ -6,14 +6,16 @@ download="https://dovecot.org/releases/2.2/dovecot-$version.tar.gz" desc="Open-source IMAP and POP3 server written in C" requires="expat libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CPPFLAGS="$CFLAGS -D_GNU_SOURCE" \ lib_cv_va_copy=yes \ lib_cv___va_copy=no \ diff --git a/net/dump1090/dump1090.SMBuild b/net/dump1090/dump1090.SMBuild index 1ed1228..8411363 100755 --- a/net/dump1090/dump1090.SMBuild +++ b/net/dump1090/dump1090.SMBuild @@ -5,14 +5,16 @@ homepage="https://github.com/antirez/dump1090" desc="Mode S decoder specifically designed for RTLSDR devices" requires="eudev libusb rtl-sdr" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 dump1090 $pkg/bin/dump1090 diff --git a/net/elinks/elinks.SMBuild b/net/elinks/elinks.SMBuild index c153dda..f761b35 100755 --- a/net/elinks/elinks.SMBuild +++ b/net/elinks/elinks.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/rkd77/elinks/archive/refs/tags/v$version.tar.gz" desc="Full-featured text-mode web browser" requires="libidn expat zstd openssl lua53" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions ./autogen.sh +} +build() { ./configure \ --prefix="" \ --enable-cgi \ @@ -36,4 +38,4 @@ build() { sha512sums=" cb928671c922efed55ef2cc9e05c22dfb8d0a6787757d8f4d1373290c1c07670ba2cbbdad1092d6853fa9f4cee35eacbd901d9a8eac3d2e7b5a34baaa6b1105d elinks-0.15.0.tar.lz -" \ No newline at end of file +" diff --git a/net/ethtool/ethtool.SMBuild b/net/ethtool/ethtool.SMBuild index 07e623e..276fa8b 100755 --- a/net/ethtool/ethtool.SMBuild +++ b/net/ethtool/ethtool.SMBuild @@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/network/ethtool/ethtool-$ desc="Tool for examining and tuning a network interface" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin diff --git a/net/evince/evince.SMBuild b/net/evince/evince.SMBuild index 41475ba..0e9d974 100755 --- a/net/evince/evince.SMBuild +++ b/net/evince/evince.SMBuild @@ -6,16 +6,18 @@ download="https://download.gnome.org/sources/evince/3.35/evince-$version.tar.xz" desc="Gtk-based document viewer with support for multiple formats" requires="libarchive python3 gtk3 libsecret gspell gst-plugins-base" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ - --prefix="" \ + --prefix="/" \ --disable-nautilus \ --disable-static diff --git a/net/fail2ban/fail2ban.SMBuild b/net/fail2ban/fail2ban.SMBuild index 6200a0e..b706ff3 100755 --- a/net/fail2ban/fail2ban.SMBuild +++ b/net/fail2ban/fail2ban.SMBuild @@ -1,19 +1,21 @@ app=fail2ban -version=0.10.4 +version=1.0.2 build=1sml homepage="http://www.fail2ban.org/wiki/index.php/Main_Page" download="https://github.com/fail2ban/fail2ban/archive/refs/tags/$version.tar.gz" desc="Log-based intrusion detection and prevention system written in Python" -requires="python3" +requires="python3 iptables" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sh fail2ban-2to3 python setup.py install --prefix="" --root=$pkg @@ -31,7 +33,12 @@ build() { install -D -m 0644 $srcdir/paths-smlinux.conf $pkg/etc/fail2ban/paths-smlinux.conf.new rm -f $pkg/etc/fail2ban/paths-{arch,debian,fedora,freebsd,osx,opensuse}.conf.new - mkdir -p $pkg/var/{run,lib/fail2ban} + mkdir -p $pkg/var/{run,lib/fail2ban} $pkg/share/man/man1 + for man in fail2ban-client.1 fail2ban-regex.1 fail2ban-server.1 fail2ban.1 fail2ban-testcases.1 ; do + install -Dm 0644 man/$man $pkg/share/man/man1 + done + install -Dm 0644 man/jail.conf.5 $pkg/share/man/man5/jail.conf.5 + mv $pkg/usr/share/doc/$app/* $pkgdocs/ rm -r $pkg/usr @@ -39,6 +46,6 @@ build() { } sha512sums=" -7f07659c3d694cc5fa52a17aca20447f021766520e5234d3775edc0d51e5ff00507da3c76591b741d46b2452b3b9f14933802b9965fd6a9c7050cbacaa64cebb fail2ban-0.10.4.tar.lz +688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb fail2ban-1.0.2.tar.gz 89c6e4bbb1a01f3f7601372bbd49d72dd6a17a58503cce30f754110cdc8b55fc80dfa21b5e97a16525bd80c7cae961af5024e5cca45d922245eeefa83cb54ef2 jail.conf.patch " diff --git a/net/fcgi/fcgi.SMBuild b/net/fcgi/fcgi.SMBuild index 2ea3263..8a26435 100755 --- a/net/fcgi/fcgi.SMBuild +++ b/net/fcgi/fcgi.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/slackbuildsdirectlinks/files/fcgi/fcg desc="Simple server and library implementin Fast CGI" requires="gcc-libs" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,6 @@ build() { cd $app-$version fixbuilddirpermissions - applypatch $srcdir/fcgi-2.4.0-clientdata-pointer.patch applypatch $srcdir/fcgi-2.4.0-gcc44-fix-include.patch applypatch $srcdir/fcgi-2.4.0-html-updates.patch @@ -23,6 +22,9 @@ build() { touch INSTALL NEWS AUTHORS ChangeLog COPYING autoreconf -vif +} + +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/fcgiwrap/fcgiwrap.SMBuild b/net/fcgiwrap/fcgiwrap.SMBuild index 5f39182..ae94200 100755 --- a/net/fcgiwrap/fcgiwrap.SMBuild +++ b/net/fcgiwrap/fcgiwrap.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/gnosek/fcgiwrap/archive/refs/tags/$version.tar.gz" desc="Simple FastCGI wrapper for CGI scripts" requires="fcgi" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/fping/fping.SMBuild b/net/fping/fping.SMBuild index 82963b9..5cd5368 100755 --- a/net/fping/fping.SMBuild +++ b/net/fping/fping.SMBuild @@ -6,14 +6,16 @@ download="https://fping.org/dist/fping-$version.tar.gz" desc="Network ping utility with better performance than traditional ping" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/geocode-glib/geocode-glib.SMBuild b/net/geocode-glib/geocode-glib.SMBuild index 6762bb0..92b66d7 100755 --- a/net/geocode-glib/geocode-glib.SMBuild +++ b/net/geocode-glib/geocode-glib.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/geocode-glib/-/archive/$version/geocode desc="Library for geocoding aka finding latitude and longitude from address and reverse" requires="json-glib libsoup" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ @@ -29,5 +31,5 @@ build() { } sha512sums=" -ed2c8ad4bdb3851db64ec748ed66906f3cb13a0158176029ff856caba3ebbad4258228f2f53292d68b9929ba66d4e0656c21817c24f62d21fa78b523c3ecbcc3 geocode-glib-3.26.2.tar.lz +611afcfe4d424fc2e2436158f5dd5b357d9ccb78a71340a8d37499dc1d7e517a689f0373689783affc1e15e6f724df06b7d5d361a29ef5551226bcbe72307826 geocode-glib-3.26.2.tar.lz " diff --git a/net/ghostscript/ghostscript.SMBuild b/net/ghostscript/ghostscript.SMBuild index d45d509..1de2974 100755 --- a/net/ghostscript/ghostscript.SMBuild +++ b/net/ghostscript/ghostscript.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/downloa desc="Postscript and PDF interpreter" requires="expat zlib libpng libtiff libjpeg-turbo jbig2dec lcms2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { # get rid of in-tree lib copies rm -rf expat freetype lcms lcms2 jpeg libpng tiff lcms lcms2 cups/libs jbig2dec +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/hexchat/hexchat.SMBuild b/net/hexchat/hexchat.SMBuild index 780c585..331d09f 100755 --- a/net/hexchat/hexchat.SMBuild +++ b/net/hexchat/hexchat.SMBuild @@ -6,14 +6,16 @@ download="https://dl.hexchat.net/hexchat/hexchat-$version.tar.xz" desc="Modern GTK+ IRC client" requires="intltool iso-codes netbsd-curses perl glib desktop-file-utils enchant openssl libnotify libcanberra gtk2 dbus-glib python3 pango" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # Since we are using skarnet's toolchain and a custom gcc specs file, # this can cause errors because skarnet's toolchain also looks inside # /usr/local which we only use for occasional builds diff --git a/net/hostapd/hostapd.SMBuild b/net/hostapd/hostapd.SMBuild index 35c597a..fae50e2 100755 --- a/net/hostapd/hostapd.SMBuild +++ b/net/hostapd/hostapd.SMBuild @@ -6,7 +6,7 @@ download="https://w1.fi/releases/hostapd-$version.tar.gz" desc="User space daemon for wifi authentication" requires="libnl openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { applypatch $srcdir/02.patch applypatch $srcdir/03.patch applypatch $srcdir/CVE-2019-16275.patch +} +build() { cd hostapd cat $srcdir/hostapd.defconfig > .config diff --git a/net/hostname/hostname.SMBuild b/net/hostname/hostname.SMBuild index ed3debc..7701d6f 100755 --- a/net/hostname/hostname.SMBuild +++ b/net/hostname/hostname.SMBuild @@ -5,14 +5,16 @@ homepage="https://packages.debian.org/bullseye/hostname" desc="Hostname utility with extra features from Debian devs" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 hostname $pkg/bin/hostname install -Dm 644 hostname.1 $pkg/share/man/man1/hostname.1 diff --git a/net/ifstat/ifstat.SMBuild b/net/ifstat/ifstat.SMBuild index 13fbe14..9a612db 100755 --- a/net/ifstat/ifstat.SMBuild +++ b/net/ifstat/ifstat.SMBuild @@ -1,19 +1,21 @@ app=ifstat version=1.1 build=1sml -homepage="http://gael.roualland.free.fr/ifstat/" -download="http://gael.roualland.free.fr/ifstat/ifstat-$version.tar.gz" +homepage="https://gael.roualland.free.fr/ifstat/" +download="https://gael.roualland.free.fr/ifstat/ifstat-$version.tar.gz" desc="tiny real-time interface monitoring application" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/iftop/iftop.SMBuild b/net/iftop/iftop.SMBuild index e0a4688..6dc2f38 100755 --- a/net/iftop/iftop.SMBuild +++ b/net/iftop/iftop.SMBuild @@ -6,14 +6,16 @@ download="https://www.ex-parrot.com/pdw/iftop/download/iftop-$version.tar.gz" desc="Curses-based network interface monitoring application" requires="netbsd-curses libpcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/iperf/iperf.SMBuild b/net/iperf/iperf.SMBuild index 827e5f8..084563e 100755 --- a/net/iperf/iperf.SMBuild +++ b/net/iperf/iperf.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/esnet/iperf/archive/refs/tags/$version.tar.gz" desc="Network utility for measuring TCP and UDP bandwidth performance" requires="openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # With profiling enabled, the build fails with ld: Cannot find gcrt1.o: No such file or directory # https://github.com/esnet/iperf/issues/749 ./configure \ diff --git a/net/iproute2/iproute2.SMBuild b/net/iproute2/iproute2.SMBuild index 63740b1..2ef3a98 100755 --- a/net/iproute2/iproute2.SMBuild +++ b/net/iproute2/iproute2.SMBuild @@ -6,7 +6,7 @@ download="https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/iproute2- desc="Advanced IP routing utilities for the linux kernel" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/fix-install-errors.patch applypatch $srcdir/musl-fixes.patch +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/ipset/ipset.SMBuild b/net/ipset/ipset.SMBuild index a1ac42d..1f4f349 100755 --- a/net/ipset/ipset.SMBuild +++ b/net/ipset/ipset.SMBuild @@ -6,14 +6,16 @@ download="https://ipset.netfilter.org/ipset-$version.tar.bz2" desc="High-performance IP hashing and administration tool for kernel IP sets" requires="musl kernel-source" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # The kernel source directory requires the kernel build config file. # zcat /proc/config.gz > /share/linux-5.4.41 ./configure \ diff --git a/net/iputils/iputils.SMBuild b/net/iputils/iputils.SMBuild index c13a962..b97738d 100755 --- a/net/iputils/iputils.SMBuild +++ b/net/iputils/iputils.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/iputils/iputils/archive/refs/tags/$version.tar.gz" desc="Collection of common network tools" requires="libcap iptables" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/fix-defines.patch applypatch $srcdir/fix-init-of-cmsg.patch +} +build() { make CC="$CC" all USE_GCRYPT=no USE_CRYPTO=no USE_NETTLE=no USE_CAP=no USE_IDN=no for f in arping clockdiff ping rarpd rdisc tracepath traceroute6 tftpd ; do diff --git a/net/irssi/irssi.SMBuild b/net/irssi/irssi.SMBuild index dafb1b0..f917521 100755 --- a/net/irssi/irssi.SMBuild +++ b/net/irssi/irssi.SMBuild @@ -6,15 +6,16 @@ download="https://github.com/irssi/irssi/archive/refs/tags/$version.tar.gz" desc="Modular, expandable text-mode IRC client" requires="netbsd-curses glib openssl perl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} - +build() { LDFLAGS="-lcurses -lterminfo" \ ./configure \ --prefix="" diff --git a/net/iw/iw.SMBuild b/net/iw/iw.SMBuild index f038a3e..077b167 100755 --- a/net/iw/iw.SMBuild +++ b/net/iw/iw.SMBuild @@ -6,14 +6,16 @@ download="https://mirrors.edge.kernel.org/pub/software/network/iw/$version.tar.x desc="Tool for configuring Linux wireless devices" requires="libnl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install PREFIX="" SBINDIR=/bin MANDIR=/share/man DESTDIR="$pkg" diff --git a/net/lftp/lftp.SMBuild b/net/lftp/lftp.SMBuild index 68cf5ce..b472f43 100755 --- a/net/lftp/lftp.SMBuild +++ b/net/lftp/lftp.SMBuild @@ -6,14 +6,16 @@ download="https://lftp.yar.ru/ftp/lftp-$version.tar.xz" desc="Text-mode network utility with support for FTP, HTTP, SFTP, FISH and torrent protocols" requires="gcc-libs netbsd-curses readline expat gmp gnutls libtasn1 libidn nettle" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/net/libmicrohttpd/libmicrohttpd.SMBuild b/net/libmicrohttpd/libmicrohttpd.SMBuild index 4e66027..b3fc137 100755 --- a/net/libmicrohttpd/libmicrohttpd.SMBuild +++ b/net/libmicrohttpd/libmicrohttpd.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$version.tar.gz" desc="Compact C library providing implementation of the HTTP 1.0 and 1.1 web server" requires="curl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/net/lynx/lynx.SMBuild b/net/lynx/lynx.SMBuild index 3c31dd2..d8490e3 100755 --- a/net/lynx/lynx.SMBuild +++ b/net/lynx/lynx.SMBuild @@ -5,7 +5,7 @@ homepage="https://lynx.invisible-island.net" desc="A text-mode web browser" requires="zlib netbsd-curses openssl libidn" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version-dev @@ -16,8 +16,9 @@ build() { applypatch $srcdir/lynx-resize.patch sed -e 's;__DATE__;"01.01.18";' -e 's;__TIME__;"00:00:00";' -i src/LYMain.c sed -i 's/define ACCEPT_ALL_COOKIES FALSE/define ACCEPT_ALL_COOKIES TRUE/' userdefs.h +} - CFLAGS="$CFLAGS -D_GNU_SOURCE" \ +build() { LIBS="-lcurses -lterminfo -lz" \ ./configure \ --prefix="" \ diff --git a/net/maccalc/maccalc.SMBuild b/net/maccalc/maccalc.SMBuild index 55f0c26..e6de36c 100755 --- a/net/maccalc/maccalc.SMBuild +++ b/net/maccalc/maccalc.SMBuild @@ -6,20 +6,18 @@ download="https://github.com/openwrt/packages/raw/openwrt-21.02/net/maccalc/src/ desc="Utility to manipulate MAC addresses" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version mkdir -p $app-$version cd $app-$version +} - cp $srcdir/maccalc.c . - fixbuilddirpermissions - - gcc -Wall -o maccalc maccalc.c - install -Dm 755 maccalc $pkg/bin/maccalc - - cp $srcdir/LICENSE $pkgdocs/ +build() { + mkdir -p $pkg/bin + gcc -Wall -o $pkg/bin/maccalc $srcdir/maccalc.c + install -Dm 644 $srcdir/LICENSE $pkgdocs/LICENSE mkfinalpkg } diff --git a/net/macchanger/macchanger.SMBuild b/net/macchanger/macchanger.SMBuild index 688f7c6..26e9b10 100755 --- a/net/macchanger/macchanger.SMBuild +++ b/net/macchanger/macchanger.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/alobbs/macchanger/archive/refs/tags/$version.tar.gz desc="Utility for viewing and manipulating MAC addresses of network interfaces" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { # Thank you sabotage linux sed -i '/#include /a#include ' src/netinfo.c +} +build() { ./configure \ --prefix="" diff --git a/net/mailcheck/mailcheck.SMBuild b/net/mailcheck/mailcheck.SMBuild index bf7ccc9..dc44aea 100755 --- a/net/mailcheck/mailcheck.SMBuild +++ b/net/mailcheck/mailcheck.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/mailcheck/files/mailcheck/$version/ma desc="Utility to show read and unread emails inside user directories" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 mailcheck $pkg/bin/mailcheck install -Dm 644 mailcheckrc $pkg/etc/mailcheckrc diff --git a/net/minicom/minicom.SMBuild b/net/minicom/minicom.SMBuild index 3b8b6be..3b758da 100755 --- a/net/minicom/minicom.SMBuild +++ b/net/minicom/minicom.SMBuild @@ -6,7 +6,7 @@ download="https://salsa.debian.org/minicom-team/minicom/-/archive/v$version/mini desc="Text-mode utility for communicating with serial devices" requires="netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/fix-includes.patch +} +build() { ./configure \ --prefix="" diff --git a/net/minidlna/minidlna.SMBuild b/net/minidlna/minidlna.SMBuild index 7e4f2f6..d5349ca 100755 --- a/net/minidlna/minidlna.SMBuild +++ b/net/minidlna/minidlna.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/minidlna/files/minidlna/$version/mini desc="DLNA and UPnP server" requires="flac libexif libid3tag libjpeg-turbo libvorbis sqlite ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/10-minidlna-nfo.patch +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/mktorrent/mktorrent.SMBuild b/net/mktorrent/mktorrent.SMBuild index 84050e1..9c4bc06 100755 --- a/net/mktorrent/mktorrent.SMBuild +++ b/net/mktorrent/mktorrent.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/pobrn/mktorrent/archive/refs/tags/v$version.tar.gz" desc="Utility for creating torrent files used in bittorrent protocol" requires="openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/makefile.patch +} +build() { make install -Dm 755 mktorrent $pkg/bin/mktorrent diff --git a/net/motion/motion.SMBuild b/net/motion/motion.SMBuild index 0764f6d..660fe96 100755 --- a/net/motion/motion.SMBuild +++ b/net/motion/motion.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/Motion-Project/motion/archive/refs/tags/release-$ve desc="Software-based camera motion detection utility" requires="bzip2 zlib gnutls sqlite libidn libtasn1 nettle libmicrohttpd libxext dbus sdl2 libwebp ffmpeg" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-release-$version.tar.?z* cd "$app-release-$version" fixbuilddirpermissions +} +build() { # Building with mmal causes link errors with /opt/vc/lib/libvcsm.so, hence we disable it. ./configure \ --prefix="" \ diff --git a/net/mtr/mtr.SMBuild b/net/mtr/mtr.SMBuild index 9b14af6..055d184 100755 --- a/net/mtr/mtr.SMBuild +++ b/net/mtr/mtr.SMBuild @@ -4,16 +4,18 @@ build=1sml homepage="https://www.bitwizard.nl/mtr/" download="https://github.com/traviscross/mtr/archive/refs/tags/v$version.tar.gz" desc="Combined traceroute and ping utility for diagnosing networks problems" -requires="netbsd-curses gtk2" +requires="netbsd-curses libcap gtk2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin diff --git a/net/mutt/mutt.SMBuild b/net/mutt/mutt.SMBuild index aec065a..292be8c 100755 --- a/net/mutt/mutt.SMBuild +++ b/net/mutt/mutt.SMBuild @@ -6,14 +6,16 @@ download="http://ftp.mutt.org/pub/mutt/mutt-$version.tar.gz" desc="Advanced text-mode mail client" requires="netbsd-curses zlib libidn openssl cyrus-sasl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { LDFLAGS="-lterminfo" \ ./configure \ --prefix="" \ diff --git a/net/net-snmp/net-snmp.SMBuild b/net/net-snmp/net-snmp.SMBuild index be21d99..0e20e3a 100755 --- a/net/net-snmp/net-snmp.SMBuild +++ b/net/net-snmp/net-snmp.SMBuild @@ -8,7 +8,7 @@ requires="libpcap pcre python3" # net-snmp does not like our custom config.cache noautoconfsite=1 -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -19,7 +19,9 @@ build() { applypatch $srcdir/fix-includes.patch applypatch $srcdir/netsnmp-swinst-crash.patch applypatch $srcdir/report-empty-strings-correctly.patch +} +build() { ./configure \ --prefix="/" \ --sbindir=/bin \ diff --git a/net/netcat/netcat.SMBuild b/net/netcat/netcat.SMBuild index 56801da..e5a586b 100755 --- a/net/netcat/netcat.SMBuild +++ b/net/netcat/netcat.SMBuild @@ -6,7 +6,7 @@ download="https://salsa.debian.org/debian/netcat/-/archive/upstream/$version/net desc="Utility to read and write data across network connections" requires="openssl libpcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf nc-110 @@ -16,7 +16,9 @@ build() { applypatch $srcdir/nc-110-21.diff applypatch $srcdir/nc.diff +} +build() { make linux install -Dm 755 nc $pkg/bin/nc install -Dm 644 debian/nc.1 $pkg/share/man/man1/nc.1 diff --git a/net/nfs-utils/nfs-utils.SMBuild b/net/nfs-utils/nfs-utils.SMBuild index 7a2a0f2..f5d79d8 100755 --- a/net/nfs-utils/nfs-utils.SMBuild +++ b/net/nfs-utils/nfs-utils.SMBuild @@ -6,7 +6,7 @@ download="https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/$version/nfs desc="Network File System daemons and utilities" requires="libtirpc keyutils" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { applypatch $srcdir/musl-getservbyport.patch applypatch $srcdir/musl-svcgssd-sysconf.patch applypatch $srcdir/musl-time64.patch +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/nginx/nginx.SMBuild b/net/nginx/nginx.SMBuild index 5010c74..9dfe805 100755 --- a/net/nginx/nginx.SMBuild +++ b/net/nginx/nginx.SMBuild @@ -6,14 +6,16 @@ download="http://nginx.org/download/nginx-$version.tar.gz" desc="High-performance HTTP server with support for IMAP3 and POP3 proxies" requires="zlib pcre openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CC="$CC" \ ./configure \ --prefix="" \ diff --git a/net/nload/nload.SMBuild b/net/nload/nload.SMBuild index 50095b0..c120792 100755 --- a/net/nload/nload.SMBuild +++ b/net/nload/nload.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/nload/files/nload/$version/nload-$ver desc="Text-mode network traffic and bandwidth monitor" requires="gcc-libs netbsd-curses" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/net/nmap/nmap.SMBuild b/net/nmap/nmap.SMBuild index e06a788..210f271 100755 --- a/net/nmap/nmap.SMBuild +++ b/net/nmap/nmap.SMBuild @@ -6,14 +6,16 @@ download="https://nmap.org/dist/nmap-$version.tar.bz2" desc="Advanced network exploration and security auditing tool" requires="gcc-libs pcre libpcap openssl python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/openntpd/openntpd.SMBuild b/net/openntpd/openntpd.SMBuild index da951b0..a736e6d 100755 --- a/net/openntpd/openntpd.SMBuild +++ b/net/openntpd/openntpd.SMBuild @@ -6,14 +6,16 @@ download="https://cdn.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-$version.tar.gz" desc="Secure NTPD implementation from OpenBSD developers" requires="openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/net/openssh/openssh.SMBuild b/net/openssh/openssh.SMBuild index b83a5aa..81fb5e7 100755 --- a/net/openssh/openssh.SMBuild +++ b/net/openssh/openssh.SMBuild @@ -6,7 +6,7 @@ download="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version. desc="Client-server implementation of the SSH protocol suite" requires="zlib openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -18,7 +18,9 @@ build() { # prevent from installing some things (keysign and maybe others) setuid. sed -i 's@-m 4711@-m 0750@g' Makefile.in +} +build() { CFLAGS="$CFLAGS -D_BSD_SOURCE -DMISSING_FD_MASK -DMISSING_NFDBITS" \ ./configure \ --prefix="" \ diff --git a/net/openvpn/openvpn.SMBuild b/net/openvpn/openvpn.SMBuild index dc10f0c..6cd4d49 100755 --- a/net/openvpn/openvpn.SMBuild +++ b/net/openvpn/openvpn.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/OpenVPN/openvpn/archive/refs/tags/v$version.tar.gz" desc="Full-featured SSL-based VPN suite" requires="lzo lz4 openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/php/php.SMBuild b/net/php/php.SMBuild index 7950b57..9947bce 100755 --- a/net/php/php.SMBuild +++ b/net/php/php.SMBuild @@ -7,14 +7,16 @@ download="https://www.php.net/distributions/php-$version.tar.xz" desc="Scripting language suited for creating dynamic websites" requires="enchant libgd db gmp icu libsodium libxslt sqlite curl libtool pcre2 postfix aspell openssl oniguruma libffi bzip2 zlib libexif intltool readline libsodium mariadb libwebp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # Add the rrd graph module ( cd ext @@ -101,4 +103,4 @@ build() { sha512sums=" 213729a46f12230d24dbff2d99f298559269e1aabae748056d9ae16e8fad6081c86f886678a0d8d851c5109f2d523a9d6b84e57a7ec3b8f8899820d6222f1e4c php-7.4.33.tar.lz 28679ccead54806d1e92accc6f5ebab582a41db802f95797ddb43e3e15690889be3437f22e2a14939d217422ac2700ef90ae0a9b36244ddead3856343b3e09b4 rrd-2.0.3.tgz -" \ No newline at end of file +" diff --git a/net/poppler-data/poppler-data.SMBuild b/net/poppler-data/poppler-data.SMBuild index cacd245..b150f8c 100755 --- a/net/poppler-data/poppler-data.SMBuild +++ b/net/poppler-data/poppler-data.SMBuild @@ -6,20 +6,20 @@ download="https://poppler.freedesktop.org/poppler-data-$version.tar.gz" desc="Add-ons for the poppler PDF rendering library" requires="poppler" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { make prefix="" install DESTDIR="$pkg" cp COPYING* $pkgdocs/ - mkdir -p $pkg/lib/pkgconfig - ( cd $pkg ; mv share/pkgconfig/* lib/pkgconfig/ ) - mkfinalpkg } diff --git a/net/poppler/poppler.SMBuild b/net/poppler/poppler.SMBuild index 506483d..43bfaf9 100755 --- a/net/poppler/poppler.SMBuild +++ b/net/poppler/poppler.SMBuild @@ -6,13 +6,16 @@ download="https://poppler.freedesktop.org/poppler-$version.tar.xz" desc="PDF rendering library aimed at centralised code maintenance" requires="pkgconf gcc-libs libjpeg-turbo python3 curl lcms2 openjpeg icu cairo gtk2 gobject-introspection gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { applypatch $srcdir/poppler-segfault.patch @@ -38,4 +41,4 @@ build() { sha512sums=" 0d8c0fffe97809f20bb34f2139b2a7e28a16b05ba4d73904a8dcc0d351b9acc087d695d29e73bfb3b166840ee004e5497140b1299aa722ba3d460930f0a9019a poppler-0.57.0.tar.lz 1f42a769becbf4873efa27c970e57b44bb46efc1029e6deecf0a8bfba047f189ec65ae4346ea79ce15eebd10771c74ece408fe1956e4b3d27a578a045aa2451f poppler-segfault.patch -" +" \ No newline at end of file diff --git a/net/postfix/postfix.SMBuild b/net/postfix/postfix.SMBuild index 1778b8d..ab3a139 100755 --- a/net/postfix/postfix.SMBuild +++ b/net/postfix/postfix.SMBuild @@ -1,18 +1,21 @@ app=postfix version=3.4.9 build=1sml -homepage="http://www.postfix.org/" -download="http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-$version.tar.gz" +homepage="https://www.postfix.org/" +download="https://cdn.postfix.johnriley.me/mirrors/postfix-release/official/postfix-$version.tar.gz" desc="Fast, secure and easy-to-administer mail server" requires="pcre openssl sqlite db icu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { AUXLIBS="-lssl -lcrypto" \ CCARGS="-DNO_NIS -DNO_NISPLUS -DUSE_TLS" \ diff --git a/net/ppp/ppp.SMBuild b/net/ppp/ppp.SMBuild index 08441f8..6b3eb0a 100755 --- a/net/ppp/ppp.SMBuild +++ b/net/ppp/ppp.SMBuild @@ -6,13 +6,16 @@ download="https://github.com/ppp-project/ppp/archive/refs/tags/ppp-$version.tar. desc="PPP daemon for establishing connectivity over a network" requires="libpcap openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { applypatch $srcdir/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch applypatch $srcdir/fix-bound-check-eap.patch diff --git a/net/proftpd/proftpd.SMBuild b/net/proftpd/proftpd.SMBuild index ddac086..cd57657 100755 --- a/net/proftpd/proftpd.SMBuild +++ b/net/proftpd/proftpd.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/proftpd/proftpd/archive/refs/tags/v$version.tar.gz" desc="Secure and configurable FTP server" requires="attr netbsd-curses libcap" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/redshift/redshift.SMBuild b/net/redshift/redshift.SMBuild index 6d9aea6..e45c385 100755 --- a/net/redshift/redshift.SMBuild +++ b/net/redshift/redshift.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/jonls/redshift/releases/download/v$version/redshift desc="Tool to adjust colour temperature of computer screen based on users surroundings" requires="geoclue gtk3 libxcb libdrm libxxf86vm python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-drm \ diff --git a/net/rp-pppoe/rp-pppoe.SMBuild b/net/rp-pppoe/rp-pppoe.SMBuild index 9b83ec3..0459fa4 100755 --- a/net/rp-pppoe/rp-pppoe.SMBuild +++ b/net/rp-pppoe/rp-pppoe.SMBuild @@ -5,7 +5,7 @@ homepage="https://dianne.skoll.ca/projects/rp-pppoe/" desc="Client program for establishing connectivity over PPPoE" requires="ppp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/musl-fix.patch +} +build() { cd src ./configure \ diff --git a/net/rpcbind/rpcbind.SMBuild b/net/rpcbind/rpcbind.SMBuild index 1fee8c5..c66017e 100755 --- a/net/rpcbind/rpcbind.SMBuild +++ b/net/rpcbind/rpcbind.SMBuild @@ -6,7 +6,7 @@ download="https://sourceforge.net/projects/rpcbind/files/rpcbind/$version/rpcbin desc="Daemon to manage NFS and RPC connections" requires="bash libtirpc" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/0001-rpcinfo-Fix-stack-buffer-overflow.patch +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/net/rrdtool/rrdtool.SMBuild b/net/rrdtool/rrdtool.SMBuild index d272b2d..f92ecdf 100755 --- a/net/rrdtool/rrdtool.SMBuild +++ b/net/rrdtool/rrdtool.SMBuild @@ -6,14 +6,16 @@ download="https://oss.oetiker.ch/rrdtool/pub/rrdtool-$version.tar.gz" desc="Data logging and graphing application" requires="perl python3 lua" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/rsync/rsync.SMBuild b/net/rsync/rsync.SMBuild index a7ef39e..2bc3d27 100755 --- a/net/rsync/rsync.SMBuild +++ b/net/rsync/rsync.SMBuild @@ -1,24 +1,27 @@ app=rsync -version=3.1.2 +version=3.2.7 build=1sml -sm_noautoconfsite=1 +noautoconfsite=1 homepage="https://rsync.samba.org/" download="https://download.samba.org/pub/rsync/src/rsync-$version.tar.gz" desc="Tool to backup and synchronise files over a network" requires="acl attr popt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { CFLAGS="$CFLAGS -include sys/sysmacros.h" \ ./configure \ --prefix="" \ - --disable-locale + --disable-locale \ + --disable-xxhash make make install DESTDIR=$pkg @@ -29,5 +32,5 @@ build() { } sha512sums=" -0d608e8b4dd52a0944bbc5b3bf4bb53601fca036f4eeeb0132ca190abe8a1d8116ed30540f4d832376f8db184f1246c80e8201d8026c60e3f5e9e0553fdf8bb8 rsync-3.1.2.tar.lz +84cc595340543e3e895c99ec1eba8b5ca0264340ff293db1e1e07f415cdfd781d50f869a96c3e476910a7a32a836bbacc18285f4d6ccca56a4b8dd1cadc195f2 rsync-3.2.7.tar.lz " diff --git a/net/rtl-sdr/rtl-sdr.SMBuild b/net/rtl-sdr/rtl-sdr.SMBuild index bd79fdf..8bd56af 100755 --- a/net/rtl-sdr/rtl-sdr.SMBuild +++ b/net/rtl-sdr/rtl-sdr.SMBuild @@ -5,14 +5,16 @@ homepage="https://osmocom.org/projects/rtl-sdr/wiki/Rtl-sdr" desc="Programs and libraries for communicating with software-defined radios" requires="eudev libusb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/net/rtorrent/rtorrent.SMBuild b/net/rtorrent/rtorrent.SMBuild index a416b82..26931cb 100755 --- a/net/rtorrent/rtorrent.SMBuild +++ b/net/rtorrent/rtorrent.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/rakshasa/rtorrent/archive/refs/tags/v$version.tar.g desc="command-line bittorrent client" requires="gcc-libs netbsd-curses zlib openssl curl libtorrent" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { CXXFLAGS="$CFLAGS -lpthread" \ ./configure \ --prefix="" diff --git a/net/sane-backends/sane-backends.SMBuild b/net/sane-backends/sane-backends.SMBuild index 191f0df..9a435f1 100755 --- a/net/sane-backends/sane-backends.SMBuild +++ b/net/sane-backends/sane-backends.SMBuild @@ -6,7 +6,7 @@ download="https://gitlab.com/sane-project/backends/uploads/8bf1cae2e1803aefab9e5 desc="Tools and libraries to access data from image-scanning devices" requires="cairo curl glib libxml2 libpng libnl libjpeg-turbo openssl python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/sane-frontends-1.0.14-sane_cap_always_settable.diff +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/net/sane-frontends/sane-frontends.SMBuild b/net/sane-frontends/sane-frontends.SMBuild index 4d64205..677cc74 100755 --- a/net/sane-frontends/sane-frontends.SMBuild +++ b/net/sane-frontends/sane-frontends.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.com/sane-project/frontends/uploads/14e5c5a9205b10bd3df0 desc="Frontend for the SANE image scanning library" requires="sane-backends" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/smstools/smstools.SMBuild b/net/smstools/smstools.SMBuild index 5bca798..e39dd07 100755 --- a/net/smstools/smstools.SMBuild +++ b/net/smstools/smstools.SMBuild @@ -1,12 +1,12 @@ app=smstools version=3.1.21 build=1sml -homepage="http://smstools3.kekekasvi.com" -download="http://smstools3.kekekasvi.com/packages/smstools3-$version.tar.gz" +homepage="https://smstools3.kekekasvi.com" +download="https://smstools3.kekekasvi.com/packages/smstools3-$version.tar.gz" desc="SMS gateway software for sending and receiving SMSs from GSM modems and mobile phones" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "smstools3" @@ -15,20 +15,22 @@ build() { fixbuilddirpermissions applypatch $srcdir/fixups2.diff +} +build() { cd src make CC="$CC -static" - cp LICENSE $pkgdocs + cp ../LICENSE $pkgdocs # Add sample config files mkdir -p $pkg/etc/smsd - cat examples/smsd.conf.easy > $pkg/etc/smsd/smsd.conf.easy - cat examples/smsd.conf.full > $pkg/etc/smsd/smsd.conf.full - cat examples/smsd.conf.net > $pkg/etc/smsd/smsd.conf.net - cat examples/smsd.conf.non-root > $pkg/etc/smsd/smsd.conf.non-root + cat ../examples/smsd.conf.easy > $pkg/etc/smsd/smsd.conf.easy + cat ../examples/smsd.conf.full > $pkg/etc/smsd/smsd.conf.full + cat ../examples/smsd.conf.net > $pkg/etc/smsd/smsd.conf.net + cat ../examples/smsd.conf.non-root > $pkg/etc/smsd/smsd.conf.non-root - install -Dm 755 src/smsd $pkg/bin/smsd + install -Dm 755 smsd $pkg/bin/smsd # Fix some ownership/permissions mkdir -p $pkg/var/spool/sms diff --git a/net/sshfs/sshfs.SMBuild b/net/sshfs/sshfs.SMBuild index 8f7588c..3a05e10 100755 --- a/net/sshfs/sshfs.SMBuild +++ b/net/sshfs/sshfs.SMBuild @@ -6,17 +6,18 @@ download="https://github.com/libfuse/sshfs/archive/refs/tags/sshfs_$version.tar. desc="Network file system client to connect to SSH servers" requires="glib fuse pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc + --prefix="" make make install DESTDIR=$pkg diff --git a/net/sylpheed/sylpheed.SMBuild b/net/sylpheed/sylpheed.SMBuild index 7252afa..f6ff405 100755 --- a/net/sylpheed/sylpheed.SMBuild +++ b/net/sylpheed/sylpheed.SMBuild @@ -6,7 +6,7 @@ download="https://osdn.net/dl/sylpheed/sylpheed-$version.tar.xz" desc="Simple, lightweight email client based on GTK+" requires="openssl dbus-glib gtkspell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -16,7 +16,9 @@ build() { applypatch $srcdir/sylpheed-pop3-cram-md5.patch applypatch $srcdir/sylpheed-trayicon.patch +} +build() { ./configure \ --prefix="" \ --disable-nls diff --git a/net/tcpdump/tcpdump.SMBuild b/net/tcpdump/tcpdump.SMBuild index 72f76d2..a8ef578 100755 --- a/net/tcpdump/tcpdump.SMBuild +++ b/net/tcpdump/tcpdump.SMBuild @@ -6,14 +6,16 @@ download="https://www.tcpdump.org/release/tcpdump-$version.tar.gz" desc="Text-mode network monitoring and packet data acquisition tool" requires="libpcap openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ac_cv_linux_vers=3 \ ./configure \ --prefix="" \ diff --git a/net/tor/tor.SMBuild b/net/tor/tor.SMBuild index ba114db..9eda10a 100755 --- a/net/tor/tor.SMBuild +++ b/net/tor/tor.SMBuild @@ -6,14 +6,16 @@ download="https://archive.torproject.org/tor-package-archive/tor-$version.tar.gz desc="The second-generation onion router" requires="gcc-libs zlib libcap openssl libevent ca-certificates" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/traceroute/traceroute.SMBuild b/net/traceroute/traceroute.SMBuild index 233d9bb..0fc0f55 100755 --- a/net/traceroute/traceroute.SMBuild +++ b/net/traceroute/traceroute.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/traceroute/files/traceroute/tracerout desc="Utility to track route packets going through a network to a target host" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make make install prefix="/" DESTDIR=$pkg diff --git a/net/transmission/transmission.SMBuild b/net/transmission/transmission.SMBuild index 06f00cc..4f266c9 100755 --- a/net/transmission/transmission.SMBuild +++ b/net/transmission/transmission.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/transmission/transmission-releases/raw/master/trans desc="Torrent client with text-mode, remote, daemon and GTK+3" requires="intltool curl desktop-file-utils libevent miniupnpc libnotify hicolor-icon-theme gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/uget/uget.SMBuild b/net/uget/uget.SMBuild index 091c5b6..99e2bd7 100755 --- a/net/uget/uget.SMBuild +++ b/net/uget/uget.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/urlget/files/uget%20%28stable%29/$ver desc="Download manager written in GTK+3" requires="intltool curl gstreamer gtk3 libnotify" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/unbound/unbound.SMBuild b/net/unbound/unbound.SMBuild index aca4f38..f717379 100755 --- a/net/unbound/unbound.SMBuild +++ b/net/unbound/unbound.SMBuild @@ -6,14 +6,16 @@ download="https://www.nlnetlabs.nl/downloads/unbound/unbound-$version.tar.gz" desc="Validating, recursive, and caching DNSSEC resolver written in C" requires="expat openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/vnstat/vnstat.SMBuild b/net/vnstat/vnstat.SMBuild index bf21955..e2a60b2 100755 --- a/net/vnstat/vnstat.SMBuild +++ b/net/vnstat/vnstat.SMBuild @@ -6,14 +6,16 @@ download="https://humdi.net/vnstat/vnstat-$version.tar.gz" desc="Text-mode network traffic monitor and logger" requires="bash sqlite libgd" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ @@ -33,4 +35,4 @@ build() { sha512sums=" 73bcd991c8a5dbaf4ac2ae0758230ee14981dea18551cf3632fddd43d59245cf1f82245967ea095f1da803f7022665d96436488fe14a00823fc911ec0380a7a8 vnstat-2.10.tar.lz -" \ No newline at end of file +" diff --git a/net/wavemon/wavemon.SMBuild b/net/wavemon/wavemon.SMBuild index 822144e..6f72d7e 100755 --- a/net/wavemon/wavemon.SMBuild +++ b/net/wavemon/wavemon.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/uoaerg/wavemon/archive/refs/tags/v$version.tar.gz" desc="Text-mode 802.11 wireless network monitor" requires="netbsd-curses libcap libnl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # wavemon doesn't like our CFLAGS... unset CFLAGS diff --git a/net/weechat/weechat.SMBuild b/net/weechat/weechat.SMBuild index 63cdf22..345f75c 100755 --- a/net/weechat/weechat.SMBuild +++ b/net/weechat/weechat.SMBuild @@ -6,7 +6,7 @@ download="https://weechat.org/files/src/weechat-$version.tar.xz" desc="Fast, modular text-mode IRC client" requires="netbsd-curses openssl curl libidn libtasn1 nettle gmp gnutls libgcrypt aspell perl python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions ./autogen.sh +} +build() { LDFLAGS="-lcurses -lterminfo" \ ./configure \ --prefix="" \ @@ -31,4 +33,4 @@ build() { sha512sums=" f2fe125d03e9c8f8b5b03e2cdd340c6cd65c463187bd213c9128a3df19da56ae38f1a6d20a47c09606d1504448e3d554de042e33cc57b73753ce8491595ef516 weechat-3.8.tar.xz -" \ No newline at end of file +" diff --git a/net/wget/wget.SMBuild b/net/wget/wget.SMBuild index f862bca..c7f6911 100755 --- a/net/wget/wget.SMBuild +++ b/net/wget/wget.SMBuild @@ -6,14 +6,16 @@ download="https://ftp.gnu.org/gnu/wget/wget-$version.tar.gz" desc="Non-interactive network resource retriever" requires="zlib netbsd-curses openssl e2fsprogs pcre" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/net/whois/whois.SMBuild b/net/whois/whois.SMBuild index 512767e..2f0dee5 100755 --- a/net/whois/whois.SMBuild +++ b/net/whois/whois.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/rfc1036/whois/archive/refs/tags/v$version.tar.gz" desc="Improved whois directory client derived from BSD and RIPE whois programs" requires="perl libidn" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { make install -Dm 755 whois $pkg/bin/whois install -Dm 644 whois.conf $pkg/etc/whois.conf diff --git a/net/wireless-tools/wireless-tools.SMBuild b/net/wireless-tools/wireless-tools.SMBuild index c013d41..d7f85c3 100755 --- a/net/wireless-tools/wireless-tools.SMBuild +++ b/net/wireless-tools/wireless-tools.SMBuild @@ -7,7 +7,7 @@ download="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$versio desc="Set of tools allowing manipulation of wireless extensions" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$altname.$version" @@ -17,8 +17,10 @@ build() { applypatch $srcdir/wireless-tools-Makefile.patch applypatch $srcdir/wireless-tools-headers.patch +} - make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin"" +build() { + make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" make INSTALL_MAN="$pkg/share/man" INSTALL_DIR="$pkg/bin" install DESTDIR="$pkg" cp COPYING $pkgdocs/ diff --git a/net/wpa-supplicant/dbus.patch b/net/wpa-supplicant/dbus.patch deleted file mode 100644 index 0f340c9..0000000 --- a/net/wpa-supplicant/dbus.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c -index 45623f3..0fc3d08 100644 ---- a/wpa_supplicant/dbus/dbus_new_helpers.c -+++ b/wpa_supplicant/dbus/dbus_new_helpers.c -@@ -847,7 +847,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, - const struct wpa_dbus_property_desc *dsc; - int i = 0; - -- if (iface == NULL) -+ if (iface == NULL || path == NULL) - return; - - dbus_connection_get_object_path_data(iface->con, path, diff --git a/net/wpa-supplicant/wpa-supplicant.SMBuild b/net/wpa-supplicant/wpa-supplicant.SMBuild index 168b64f..c2405a5 100755 --- a/net/wpa-supplicant/wpa-supplicant.SMBuild +++ b/net/wpa-supplicant/wpa-supplicant.SMBuild @@ -7,7 +7,7 @@ download="https://w1.fi/releases/wpa_supplicant-$version.tar.gz" desc="WPA/WPA2/IEEE 802.1X Supplicant" requires="readline openssl libnl dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $sapp-$version @@ -17,8 +17,10 @@ build() { applypatch $srcdir/eloop.patch applypatch $srcdir/unsafe-renegotiation-1.patch - applypatch $srcdir/unsafe-renegotiation-1.patch + applypatch $srcdir/unsafe-renegotiation-2.patch +} +build() { cd wpa_supplicant ; cp $srcdir/config .config make LIBDIR=/lib BINDIR=/bin all eapol_test @@ -43,8 +45,7 @@ build() { sha512sums=" 021c2a48f45d39c1dc6557730be5debaee071bc0ff82a271638beee6e32314e353e49d39e2f0dc8dff6e094dcc7008cfe1c32d0c7a34a1a345a12a3f1c1e11a1 wpa_supplicant-2.10.tar.gz -dac56bc505a51167042ebe548f0e81a20a5578f753af9bb7ec3335a542d799c6e8739681ef7c8f7747a9bc954f8aa6f1a147250eacba17fd7fff80c4e53638ed dbus.patch 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232 eloop.patch 9528735924faf876a7094de46760605e5e66e265187421a668be06dbf03d7b4db6b84cbad793fcd6bd614e3ba540f82f1f80660d75e8a6070eeb7e9abb54ed28 unsafe-renegotiation-1.patch a92ba3ed3f41022a8af9396d2b703ee47f78aa05c1fddb42919a7fe6a6fad71e3515c63457e97e252ae0a32c6c34d67ea6efe0278df1e141cf36e650237e5295 unsafe-renegotiation-2.patch -" \ No newline at end of file +" diff --git a/net/x11vnc/x11vnc.SMBuild b/net/x11vnc/x11vnc.SMBuild index 35e54ea..3f00276 100755 --- a/net/x11vnc/x11vnc.SMBuild +++ b/net/x11vnc/x11vnc.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/LibVNC/x11vnc/archive/refs/tags/$version.tar.gz" desc="VNC server for real X displays" requires="expat nettle openssl libgcrypt libgpg-error libjpeg-turbo libvncserver libxdamage libxinerama libxrandr libxtst avahi" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/x2x/x2x.SMBuild b/net/x2x/x2x.SMBuild index 9d11e34..9ccebca 100755 --- a/net/x2x/x2x.SMBuild +++ b/net/x2x/x2x.SMBuild @@ -6,7 +6,7 @@ download="" desc="Utility that enables input devices on one X display to control another X display" requires="libx11 libxext libxi libxcb libxau libxdmcp libxtst" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions ./bootstrap.sh +} +build() { ./configure \ --prefix="" diff --git a/net/xdg-utils/xdg-utils.SMBuild b/net/xdg-utils/xdg-utils.SMBuild index 68c6a8c..e157a23 100755 --- a/net/xdg-utils/xdg-utils.SMBuild +++ b/net/xdg-utils/xdg-utils.SMBuild @@ -6,14 +6,16 @@ download="https://portland.freedesktop.org/download/xdg-utils-$version.tar.gz" desc="Command line tools that assist applications in desktop integration" requires="xmlto file docbook xset" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/net/znc/znc.SMBuild b/net/znc/znc.SMBuild index c78441d..c297a40 100755 --- a/net/znc/znc.SMBuild +++ b/net/znc/znc.SMBuild @@ -6,14 +6,16 @@ download="https://znc.in/releases/archive/znc-$version.tar.gz" desc="An advanced IRC bouncer" requires="gcc-libs zlib python3 openssl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/xfce/exo/exo.SMBuild b/xfce/exo/exo.SMBuild index 841b29b..4709f86 100755 --- a/xfce/exo/exo.SMBuild +++ b/xfce/exo/exo.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/exo-$version.tar.bz2" desc="Extension library for Xfce" requires="gtk3 libxfce4util libxfce4ui" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild b/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild index fadaab9..2c72bcd 100755 --- a/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild +++ b/xfce/faenza-icon-theme/faenza-icon-theme.SMBuild @@ -6,14 +6,16 @@ download="http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/faenza-icon desc="Theme pack for GNOME" requires="gtk2 gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/share/icons cp -r Faenza{,-Dark,-Darker,-Darkest,-Ambiance,-Radiance} $pkg/share/icons/ cp -r emesene $pkg/share/ diff --git a/xfce/garcon/garcon.SMBuild b/xfce/garcon/garcon.SMBuild index 4757353..798aca7 100755 --- a/xfce/garcon/garcon.SMBuild +++ b/xfce/garcon/garcon.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/garcon-0.8.0.tar.bz2" desc="Menu implementation for Xfce" requires="libxfce4ui" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/libxfce4ui/libxfce4ui.SMBuild b/xfce/libxfce4ui/libxfce4ui.SMBuild index 634959a..6244c01 100755 --- a/xfce/libxfce4ui/libxfce4ui.SMBuild +++ b/xfce/libxfce4ui/libxfce4ui.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/libxfce4ui-$version.tar.bz2" desc="Xfce widget library" requires="libsm libepoxy libxfce4util xfconf gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/libxfce4util/libxfce4util.SMBuild b/xfce/libxfce4util/libxfce4util.SMBuild index 4a1d169..59abd0f 100755 --- a/xfce/libxfce4util/libxfce4util.SMBuild +++ b/xfce/libxfce4util/libxfce4util.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/libxfce4util-$version.tar.bz2" desc="Basic non-GUI utility library for Xfce" requires="glib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sbindir=/bin \ diff --git a/xfce/mousepad/mousepad.SMBuild b/xfce/mousepad/mousepad.SMBuild index 7c1c028..258394b 100755 --- a/xfce/mousepad/mousepad.SMBuild +++ b/xfce/mousepad/mousepad.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-$version.tar.b desc="Fast, easy-to-use text editor for Xfce" requires="desktop-file-utils gspell" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/ristretto/ristretto.SMBuild b/xfce/ristretto/ristretto.SMBuild index 1f39244..6086252 100755 --- a/xfce/ristretto/ristretto.SMBuild +++ b/xfce/ristretto/ristretto.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-$version.ta desc="Lightweight image viewer for Xfce" requires="file libexif libxfce4ui tumbler xfconf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild b/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild index 0d8d605..50c8fbc 100755 --- a/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild +++ b/xfce/thunar-archive-plugin/thunar-archive-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/ desc="Plugin to create and extract archives in Thunar" requires="xfce4-dev-tools thunar" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - +} + +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xfce/thunar-volman/thunar-volman.SMBuild b/xfce/thunar-volman/thunar-volman.SMBuild index 62ce39a..a371e49 100755 --- a/xfce/thunar-volman/thunar-volman.SMBuild +++ b/xfce/thunar-volman/thunar-volman.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/thunar-volman-$version.tar.bz2" desc="Plugin to auto-manage removable devices in Thunar" requires="libxfce4ui thunar" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/thunar/thunar.SMBuild b/xfce/thunar/thunar.SMBuild index 885cd98..0827e6a 100755 --- a/xfce/thunar/thunar.SMBuild +++ b/xfce/thunar/thunar.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/thunar-$version.tar.bz2" desc="Modern file manager for Xfce Desktop Environment" requires="desktop-file-utils libexif libgudev libpng pcre libnotify libxfce4util libxfce4ui exo tumbler gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-gio-unix \ diff --git a/xfce/tumbler/tumbler.SMBuild b/xfce/tumbler/tumbler.SMBuild index 64daed2..b096f88 100755 --- a/xfce/tumbler/tumbler.SMBuild +++ b/xfce/tumbler/tumbler.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/tumbler-$version.tar.bz2" desc="Thumbnail generator" requires="glib gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/upower/upower.SMBuild b/xfce/upower/upower.SMBuild index 5cc9ceb..53642ab 100755 --- a/xfce/upower/upower.SMBuild +++ b/xfce/upower/upower.SMBuild @@ -6,14 +6,16 @@ download="https://upower.freedesktop.org/releases/upower-$version.tar.xz" desc="Abstraction layer for enumerating power devices" requires="pcre glib util-linux netbsd-curses libffi eudev libusb dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/vte5/vte5.SMBuild b/xfce/vte5/vte5.SMBuild index 245abad..013cc67 100755 --- a/xfce/vte5/vte5.SMBuild +++ b/xfce/vte5/vte5.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/vte/-/archive/$version/vte-$version.tar desc="GTK+ terminal widget library for use in writing terminal emulators" requires="gtk3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf vte-$version tar xf $srcdir/vte-$version.tar.?z* cd vte-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-vala=no \ diff --git a/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild b/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild index 6730d6d..a24393b 100755 --- a/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild +++ b/xfce/xfce4-appfinder/xfce4-appfinder.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfce4-appfinder-$version.tar.bz desc="Application finding widget for Xfce" requires="garcon libxfce4ui xfconf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild b/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild index 6d11040..9b9a9ad 100755 --- a/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild +++ b/xfce/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.2/x desc="Xfce Panel plugin to show graphically show CPU load" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild b/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild index 77f166a..1a1cd5b 100755 --- a/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild +++ b/xfce/xfce4-datetime-plugin/xfce4-datetime-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.8/x desc="Xfce panel plugin to show date and time" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild b/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild index 8c395e3..c60ce31 100755 --- a/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild +++ b/xfce/xfce4-dev-tools/xfce4-dev-tools.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfce4-dev-tools-$version.tar.bz desc="XFCE developer tools and macros" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-dict/xfce4-dict.SMBuild b/xfce/xfce4-dict/xfce4-dict.SMBuild index df86067..0e5c0ad 100755 --- a/xfce/xfce4-dict/xfce4-dict.SMBuild +++ b/xfce/xfce4-dict/xfce4-dict.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$version.t desc="Dictionary plugin for Xfce panel" requires="librsvg xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild b/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild index 48a1bf9..36bcbda 100755 --- a/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild +++ b/xfce/xfce4-diskperf-plugin/xfce4-diskperf-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/x desc="Xfce panel plugin to show disk and partition performance" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild b/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild index 2624934..d259a19 100755 --- a/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild +++ b/xfce/xfce4-fsguard-plugin/xfce4-fsguard-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-fsguard-plugin/1.1/xf desc="File system usage plugin for Xfce panel" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild b/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild index 3b7f8b7..3817d07 100755 --- a/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild +++ b/xfce/xfce4-netload-plugin/xfce4-netload-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.4/xf desc="Network load plugin for Xfce panel" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild b/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild index b64a734..1967e91 100755 --- a/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild +++ b/xfce/xfce4-notifyd/xfce4-notifyd.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/xfce4-notifyd/0.6/xfce4-notifyd-$ver desc="Notification daemon for the Xfce desktop" requires="libnotify libxfce4ui" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { sed -e "s/^systemd_user_in_files =.*/systemd_user_in_files =/" -i Makefile.in ./configure \ diff --git a/xfce/xfce4-panel/xfce4-panel.SMBuild b/xfce/xfce4-panel/xfce4-panel.SMBuild index 29f3d2e..e51776f 100755 --- a/xfce/xfce4-panel/xfce4-panel.SMBuild +++ b/xfce/xfce4-panel/xfce4-panel.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfce4-panel-$version.tar.bz2" desc="Panel for the Xfce Desktop Environment" requires="desktop-file-utils exo garcon libxfce4ui xfconf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --enable-gio-unix \ diff --git a/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild b/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild index 8b449d3..dfd3efd 100755 --- a/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild +++ b/xfce/xfce4-power-manager/xfce4-power-manager.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfce4-power-manager-$version.ta desc="Power manager for Xfce" requires="upower libnotify libxfce4ui xfce4-panel xfce4-notifyd" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-polkit \ diff --git a/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild b/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild index e992d7f..1441d2b 100755 --- a/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild +++ b/xfce/xfce4-screenshooter/xfce4-screenshooter.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screen desc="Program to take screenshots in Xfce" requires="libsoup xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild b/xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild index 4f7d09c..a5c54c7 100755 --- a/xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild +++ b/xfce/xfce4-sensors-plugin/xfce4-sensors-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.4/xf desc="Sensors plugin for XFCE panel" requires="lm-sensors xfce4-panel libnotify" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-session/xfce4-session.SMBuild b/xfce/xfce4-session/xfce4-session.SMBuild index 7a0a81b..7c2025a 100755 --- a/xfce/xfce4-session/xfce4-session.SMBuild +++ b/xfce/xfce4-session/xfce4-session.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfce4-session-$version.tar.bz2" desc="Xfce Session Manager" requires="libsm xinit xrdb libxfce4ui" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ --disable-static \ diff --git a/xfce/xfce4-settings/xfce4-settings.SMBuild b/xfce/xfce4-settings/xfce4-settings.SMBuild index 6526caa..ad288ac 100755 --- a/xfce/xfce4-settings/xfce4-settings.SMBuild +++ b/xfce/xfce4-settings/xfce4-settings.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-$ desc="Settings Manager for Xfce" requires="libnotify exo garcon libxfce4ui xfconf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { applypatch $srcdir/default-xsettings-xml.patch ./configure \ diff --git a/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild b/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild index 367c88b..e6d618d 100755 --- a/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild +++ b/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.3 desc="System load plugin for the Xfce panel" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild b/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild index 9e1ca49..d7337bc 100755 --- a/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild +++ b/xfce/xfce4-taskmanager/xfce4-taskmanager.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.5/xfce4-taskmana desc="Task manager for Xfce Desktop Environment" requires="libwnck3 libxmu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-terminal/xfce4-terminal.SMBuild b/xfce/xfce4-terminal/xfce4-terminal.SMBuild index ba328c5..61d59ca 100755 --- a/xfce/xfce4-terminal/xfce4-terminal.SMBuild +++ b/xfce/xfce4-terminal/xfce4-terminal.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$v desc="Modern terminal emulator for the Xfce Desktop Environment" requires="libxfce4ui vte5" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild b/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild index b067e64..2b4c297 100755 --- a/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild +++ b/xfce/xfce4-wavelan-plugin/xfce4-wavelan-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-wavelan-plugin/0.6/xf desc="Xfce panel plugin to display wifi connectivity monitor" requires="xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild b/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild index bb19b7a..f7dc1b1 100755 --- a/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild +++ b/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.11/x desc="Weather plugin for Xfce panel" requires="libsoup libxml2 xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild b/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild index 84aab37..ecd4efd 100755 --- a/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild +++ b/xfce/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.SMBuild @@ -6,14 +6,16 @@ download="https://gottcode.org/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin desc="Alternate application launcher for Xfce" requires="gtk3 garcon xfce4-panel" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version - tar xf $srcdir/$app-$version-src.tar.?z* + tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/xfce/xfconf/xfconf.SMBuild b/xfce/xfconf/xfconf.SMBuild index 3689fc5..62a5df0 100755 --- a/xfce/xfconf/xfconf.SMBuild +++ b/xfce/xfconf/xfconf.SMBuild @@ -6,13 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfconf-$version.tar.bz2" desc="Xfce configuration storage system" requires="libxfce4util gobject-introspection" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/xfce/xfdesktop/xfdesktop.SMBuild b/xfce/xfdesktop/xfdesktop.SMBuild index a8e2a10..989a9cb 100755 --- a/xfce/xfdesktop/xfdesktop.SMBuild +++ b/xfce/xfdesktop/xfdesktop.SMBuild @@ -6,13 +6,16 @@ download="https://archive.xfce.org/xfce/4.16/src/xfdesktop-$version.tar.bz2" desc="Xfce Desktop Manager" requires="exo garcon libxfce4ui thunar" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/xfce/xfwm4-themes/xfwm4-themes.SMBuild b/xfce/xfwm4-themes/xfwm4-themes.SMBuild index 253ae8e..05e687e 100755 --- a/xfce/xfwm4-themes/xfwm4-themes.SMBuild +++ b/xfce/xfwm4-themes/xfwm4-themes.SMBuild @@ -6,13 +6,16 @@ download="https://archive.xfce.org/src/art/xfwm4-themes/4.10/xfwm4-themes-$versi desc="Collection of Xfce Window Manager Themes" requires="xfwm4" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/xfce/xfwm4/xfwm4.SMBuild b/xfce/xfwm4/xfwm4.SMBuild index 47981ae..8944c6e 100755 --- a/xfce/xfwm4/xfwm4.SMBuild +++ b/xfce/xfwm4/xfwm4.SMBuild @@ -6,13 +6,16 @@ download="https://archive.xfce.org/src/xfce/xfwm4/4.16/xfwm4-$version.tar.bz2" desc="Xfce Window Manager" requires="libepoxy libxpresent libxfce4ui xfconf" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { # Results in faster window draw and less CPU on the pi if [ "$aarch" = "aarch64" ]; then diff --git a/xorg/at-spi2-core/at-spi2-core.SMBuild b/xorg/at-spi2-core/at-spi2-core.SMBuild index 1623ced..7758159 100755 --- a/xorg/at-spi2-core/at-spi2-core.SMBuild +++ b/xorg/at-spi2-core/at-spi2-core.SMBuild @@ -5,14 +5,16 @@ homepage="https://gitlab.gnome.org/GNOME/at-spi2-core" requires="libffi glib pcre dbus libx11 libxau libxdmcp" desc="Protocol definitions and daemon for D-Bus at-spi" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. --prefix="/" \ --sysconfdir=/etc diff --git a/xorg/bdftopcf/bdftopcf.SMBuild b/xorg/bdftopcf/bdftopcf.SMBuild index 196326d..7694c4c 100755 --- a/xorg/bdftopcf/bdftopcf.SMBuild +++ b/xorg/bdftopcf/bdftopcf.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/bdftopcf-$version. requires="xorgproto xorg-macros" desc="Convert X font from Bitmap Distribution Format to Portable Compiled Format" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 0314e2fe70cb7d85c56daa92cadf1d706d9f57d46cfd8222c093c6c508226dccfa1632a65d34215d366063abf28fcdf634fa5668e40225bd006c7bf83aa8326f bdftopcf-1.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/dbus/dbus.SMBuild b/xorg/dbus/dbus.SMBuild index a952c29..a476c05 100755 --- a/xorg/dbus/dbus.SMBuild +++ b/xorg/dbus/dbus.SMBuild @@ -6,7 +6,7 @@ download="https://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.gz" desc="Freedesktop.org message bus system" requires="netbsd-curses util-linux expat python3 xmlto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/dbus-allow-root-globally.diff +} +build() { ./configure \ --prefix="" \ --bindir=/bin \ diff --git a/xorg/dconf/dconf.SMBuild b/xorg/dconf/dconf.SMBuild index bd657bd..1a755b9 100755 --- a/xorg/dconf/dconf.SMBuild +++ b/xorg/dconf/dconf.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/dconf/-/archive/$version/dconf-$version requires="glib libffi python3 vala dbus " desc="low-level configuration system that serves as a backend for GLib" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -31,4 +33,4 @@ build() { sha512sums=" d916db40465e9c7ee115c516d1dd6fe9994434b74f6eb73c112f19ba6be6107f0d8eae1e47c46c710db9218a20cd809609747ef190a27123febf9780dbc12991 dconf-0.24.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild b/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild index eb38a7e..b04872e 100755 --- a/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild +++ b/xorg/dejavu-fonts-ttf/dejavu-fonts-ttf.SMBuild @@ -7,20 +7,23 @@ download="https://github.com/dejavu-fonts/dejavu-fonts/archive/refs/tags/version requires="fontconfig mkfontscale " desc="Font family based on the Bitstream Vera Fonts with a wider range of characters" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/share/fonts/TTF cp -a ttf/* $pkg/share/fonts/TTF/ cp LICENSE $pkgdocs/ mkdir -p $pkg/etc/fonts/conf.d - ( cd fontconfig + ( + cd fontconfig for file in * ; do cp -a $file $pkg/etc/fonts/conf.d/ done @@ -31,4 +34,4 @@ build() { sha512sums=" ab17cc07ffe4ae7e6e04706826bd8dc83983071d5ec20a40ad9dc5bafbb1d0f73d9f33928dc07a948dfa8c5bc4b61e52c24cbc1530f95e909e7071d4e8a89bf9 dejavu-fonts-ttf-2.37.tar.lz -" \ No newline at end of file +" diff --git a/xorg/font-util/font-util.SMBuild b/xorg/font-util/font-util.SMBuild index ff6d610..b40b2cf 100755 --- a/xorg/font-util/font-util.SMBuild +++ b/xorg/font-util/font-util.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/font/font-util-$versi requires="musl" desc="Xorg font utilities" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc @@ -28,4 +30,4 @@ build() { sha512sums=" 1c5bb3d974936be87d39a2e8191a9dd1dba609ea292f67d940ea4bf6ce4e5d0ccadcc2ea74ef372641426a47d8b3c6d33ce0a1c8376a471116c253afff98d4ce font-util-1.3.2.tar.lz -" \ No newline at end of file +" diff --git a/xorg/fontconfig/fontconfig.SMBuild b/xorg/fontconfig/fontconfig.SMBuild index 553b47b..ead0af9 100755 --- a/xorg/fontconfig/fontconfig.SMBuild +++ b/xorg/fontconfig/fontconfig.SMBuild @@ -6,14 +6,16 @@ download="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$ve desc="Library for configuring and customizing font access" requires="expat json-c freetype" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > test/Makefile.in ./configure \ diff --git a/xorg/freeglut/freeglut.SMBuild b/xorg/freeglut/freeglut.SMBuild index e10120e..1917415 100755 --- a/xorg/freeglut/freeglut.SMBuild +++ b/xorg/freeglut/freeglut.SMBuild @@ -6,14 +6,16 @@ download="https://prdownloads.sourceforge.net/freeglut/freeglut-$version.tar.gz" desc="Provides functionality for small OpenGL programs" requires="glu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_C_COMPILER="$CC" \ @@ -33,5 +35,4 @@ build() { sha512sums=" fddac6a7e16a52aafb5e1ab307014a103d29b239bd532ea04dd535432a10b8d47db3cd865793453edbef291994c02ea14d1e96ee284764bb37d7ea720517a9cc freeglut-3.4.0.tar.lz -ad3b5f66e316f56e5d52f373f92ca0699cedf1ec02517355b4a2b16c7a3506feef4e95f1e7705d151ec3a21162a6cd280de0429fd690f2ba710b07ce6da37306 gcc-10.patch -" +" \ No newline at end of file diff --git a/xorg/freetype/freetype.SMBuild b/xorg/freetype/freetype.SMBuild index 573c884..caf4618 100755 --- a/xorg/freetype/freetype.SMBuild +++ b/xorg/freetype/freetype.SMBuild @@ -6,14 +6,16 @@ download="https://downloads.sourceforge.net/freetype/freetype-$version.tar.bz2" desc="Font rasterization library" requires="bzip2 zlib libpng " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -29,4 +31,4 @@ build() { sha512sums=" c04ed27db9b37e4e0cfefc97df9f1923c3d1f9dffe122f09008b47ac1c57e3d0d1f2331a7a5f0ab7dbcffe5ff6ed24976f7537608e5a592a1e9ab5028ac82473 freetype-2.9.tar.lz -" \ No newline at end of file +" diff --git a/xorg/gccmakedep/gccmakedep.SMBuild b/xorg/gccmakedep/gccmakedep.SMBuild index 22044e1..46b34d8 100755 --- a/xorg/gccmakedep/gccmakedep.SMBuild +++ b/xorg/gccmakedep/gccmakedep.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/util/gccmakedep-$version.tar.gz" desc="Program to create dependencies in makefiles" requires="make" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 18ee3f8a8a8234c902bf82ea5209535d095c66b9e60e790136e330ade38012db5e93dcd565a280181dcdb30ac25e4d3dcde11f33d137e1d168e910653cde9cb0 gccmakedep-1.0.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/glew/glew.SMBuild b/xorg/glew/glew.SMBuild index f0cdf0b..6f22f36 100755 --- a/xorg/glew/glew.SMBuild +++ b/xorg/glew/glew.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/nigels-com/glew/archive/refs/tags/glew-$version.tar desc="The OpenGL Extension Wrangler Library" requires="mesa" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { # Remove the DOS linefeeds from config.guess TEMPFILE=$(mktemp) fromdos < config/config.guess ; rm -f $TEMPFILE @@ -27,4 +29,4 @@ build() { sha512sums=" 6259f4fe42ffecfa77ddca30f61f3bd009d94bb57634db32b494dafcf4f5f6129fae46ed3325b0cd0d7c6ed53a6ac2be53de2ab54c79525e0a5f98288cd89d12 glew-2.1.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/glu/glu.SMBuild b/xorg/glu/glu.SMBuild index 4b0e416..47a82eb 100755 --- a/xorg/glu/glu.SMBuild +++ b/xorg/glu/glu.SMBuild @@ -6,14 +6,16 @@ download="https://archive.mesa3d.org/glu/glu-$version.tar.xz" desc="Mesa OpenGL Utility library" requires="mesa glew" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/iceauth/iceauth.SMBuild b/xorg/iceauth/iceauth.SMBuild index 4f29169..f3073ee 100755 --- a/xorg/iceauth/iceauth.SMBuild +++ b/xorg/iceauth/iceauth.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/iceauth-$version.t desc="ICE authority file utility" requires="libice" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc @@ -28,4 +30,4 @@ build() { sha512sums=" d86d9ae5d749129a1b88adff1a7ab3f6f6884b12d97eb9e8799afc6b6cec6ecb5957de461b0c1014ab576f86d6ff7848225063cf11adc5d1dada2bb66ac05792 iceauth-1.0.8.tar.lz -" \ No newline at end of file +" diff --git a/xorg/imake/imake.SMBuild b/xorg/imake/imake.SMBuild index 568983d..93d16c0 100755 --- a/xorg/imake/imake.SMBuild +++ b/xorg/imake/imake.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/util/imake-$version.ta desc="X.Org imake program and related utilities" requires="perl xorgproto xorg-macros" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" a25f7c95336beab7717309c4ac81bb20a073aa2305c169760a64c06ee5956cdcfe79440c49ba1091a124bf26094c85c0f9c21861d2827d9d475a3a5c2de55ad9 imake-1.0.8.tar.lz -" \ No newline at end of file +" diff --git a/xorg/imlib2/imlib2.SMBuild b/xorg/imlib2/imlib2.SMBuild index 7cde95f..191cb56 100755 --- a/xorg/imlib2/imlib2.SMBuild +++ b/xorg/imlib2/imlib2.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/enlightenment/files/imlib2-src/$versi desc="General image handling library for X11 and Gtk" requires="bzip2 zlib libpng giflib libjpeg-turbo libxcb libxau freetype libxext libtiff" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 3409c93c37c11fd9ebfad98ffa2defc7d62efaba95c1f8193430f4dee14bdd27eccd224ee72312c26994dd171392afa5daf8de9007d45244179e15159a0537aa imlib2-1.5.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/jasper/jasper.SMBuild b/xorg/jasper/jasper.SMBuild index 9378d8b..c300e70 100755 --- a/xorg/jasper/jasper.SMBuild +++ b/xorg/jasper/jasper.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/jasper-software/jasper/archive/refs/tags/version-$v requires="cmake libjpeg-turbo libxmu glew freeglut" desc="free implementation of the JPEG-2000 standard" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild cmake .. \ -DCMAKE_INSTALL_PREFIX="" \ diff --git a/xorg/lcms2/lcms2.SMBuild b/xorg/lcms2/lcms2.SMBuild index 3fc33b9..55d73eb 100755 --- a/xorg/lcms2/lcms2.SMBuild +++ b/xorg/lcms2/lcms2.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/mm2/Little-CMS/archive/refs/tags/lcms$version.tar.g desc="Small-footprint color management engine, version 2" requires="libtiff" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc @@ -28,4 +30,4 @@ build() { sha512sums=" 8f2c11ed746408318dd904624688f92ec14f5c9910df6623671adaf61257c89a8be36479a8b7757451921208868c6ac3eb23f2988599810f05e97aa4f4c4a26c lcms2-2.9.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libdrm/libdrm.SMBuild b/xorg/libdrm/libdrm.SMBuild index 2cbc1aa..d3b7b8e 100755 --- a/xorg/libdrm/libdrm.SMBuild +++ b/xorg/libdrm/libdrm.SMBuild @@ -6,14 +6,16 @@ download="https://dri.freedesktop.org/libdrm/libdrm-$version.tar.xz" desc="Userspace interface to kernel DRM services" requires="libxslt libpciaccess" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ diff --git a/xorg/libepoxy/libepoxy.SMBuild b/xorg/libepoxy/libepoxy.SMBuild index ca7e0b8..5dc43a4 100755 --- a/xorg/libepoxy/libepoxy.SMBuild +++ b/xorg/libepoxy/libepoxy.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/anholt/libepoxy/archive/refs/tags/$version.tar.gz" desc="Library handling OpenGL function pointer management" requires="mesa" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. --prefix="/" @@ -27,4 +29,4 @@ build() { sha512sums=" 782ee08c51ba5393301b44f0d65bb029c1c1e7d97e7bd44e5f03aba94671f2fd26240e9e6214925a0103842d539d59d1aca9e3f298ab7689051024c42b5899eb libepoxy-1.5.4.tar.lz -" \ No newline at end of file +" diff --git a/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild b/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild index efab59b..f3a49fa 100755 --- a/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild +++ b/xorg/liberation-fonts-ttf/liberation-fonts-ttf.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/liberationfonts/liberation-fonts/archive/refs/tags/ desc="Font family which aims at metric compatibility with Arial, Times New Roman, and Courier New" requires="fontconfig mkfontscale" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/share/fonts/TTF cp -a *ttf $pkg/share/fonts/TTF/ diff --git a/xorg/libevdev/libevdev.SMBuild b/xorg/libevdev/libevdev.SMBuild index 7e15824..894ec91 100755 --- a/xorg/libevdev/libevdev.SMBuild +++ b/xorg/libevdev/libevdev.SMBuild @@ -6,14 +6,16 @@ download="https://freedesktop.org/software/libevdev/libevdev-$version.tar.xz" desc="Wrapper library for evdev devices" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ @@ -30,4 +32,4 @@ build() { sha512sums=" fe13a35b11647c53c4eb9e235f931934d06df84f6ca807e12a065ef1bc018dd31526e56f406488e27ff80dac949a780cf1db1255b3b48ce83ee29ec8589ec8d8 libevdev-1.9.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libfontenc/libfontenc.SMBuild b/xorg/libfontenc/libfontenc.SMBuild index 5f50dcf..290fca4 100755 --- a/xorg/libfontenc/libfontenc.SMBuild +++ b/xorg/libfontenc/libfontenc.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/libfontenc-$versi desc="X11 font encoding library" requires="zlib xorg-macros xorgproto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libgudev/libgudev.SMBuild b/xorg/libgudev/libgudev.SMBuild index ccc67ad..b9b0d83 100755 --- a/xorg/libgudev/libgudev.SMBuild +++ b/xorg/libgudev/libgudev.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/libgudev/-/archive/$version/libgudev-$v desc="GObject bindings for libudev" requires="glib git" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/libice/libice.SMBuild b/xorg/libice/libice.SMBuild index 94949d6..4159965 100755 --- a/xorg/libice/libice.SMBuild +++ b/xorg/libice/libice.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.t desc="X11 Inter-Client Exchange library" requires="xorgproto xorg-macros xtrans" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libICE-$version tar xf $srcdir/libICE-$version.tar.?z* cd libICE-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 1bd4aded1a065a138bc885048e80d6efe206dab39c40e0bfa56f6b3ccfc1c2fcf439aa1e0fdd0bdfad1c3e8dc7b464c93551178971649a94cfc70b35df6313d9 libICE-1.0.10.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libinput/libinput.SMBuild b/xorg/libinput/libinput.SMBuild index 337b7d7..8e1a604 100755 --- a/xorg/libinput/libinput.SMBuild +++ b/xorg/libinput/libinput.SMBuild @@ -6,14 +6,16 @@ download="https://freedesktop.org/software/libinput/libinput-$version.tar.xz" desc="Input device management and event handling library" requires="libevdev mtdev libwacom" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. \ --prefix="/" \ @@ -30,4 +32,4 @@ build() { sha512sums=" d86b483c043964dcc7075d0dd1e0cbdcc898629fb95555800e89edd2a4a6cdadccd953a072de368dfbc1acac3a2dfbe05e489b0a70315e07aa12547dc9b9909e libinput-1.19.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libpciaccess/libpciaccess.SMBuild b/xorg/libpciaccess/libpciaccess.SMBuild index e7787d8..3e53856 100755 --- a/xorg/libpciaccess/libpciaccess.SMBuild +++ b/xorg/libpciaccess/libpciaccess.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/libpciaccess-$ver desc="X11 PCI access library" requires="musl xorg-macros" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/libraw/libraw.SMBuild b/xorg/libraw/libraw.SMBuild index d230bf3..54d491c 100755 --- a/xorg/libraw/libraw.SMBuild +++ b/xorg/libraw/libraw.SMBuild @@ -5,7 +5,7 @@ homepage="https://www.libraw.org/" requires="gcc-libs libjpeg-turbo jasper lcms2" desc="library for decoding raw digital photos" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version-build @@ -13,7 +13,9 @@ build() { cd LibRaw-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/libsm/libsm.SMBuild b/xorg/libsm/libsm.SMBuild index ab6c569..e487753 100755 --- a/xorg/libsm/libsm.SMBuild +++ b/xorg/libsm/libsm.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/libSM-$version.ta desc="X11 Session Management library" requires="util-linux xorgproto xorg-macros xtrans libice" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libSM-$version tar xf $srcdir/libSM-$version.tar.?z* cd libSM-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" d798b55854518afc0aa874736ef52b41fa9d9df9d9758a1da7bc3504a6e5813caca2df0e9cdcd9aa531d19e5ab9754e1c14d12512a58baf63b392136c3161a40 libSM-1.2.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libtiff/libtiff.SMBuild b/xorg/libtiff/libtiff.SMBuild index 0c19443..3063221 100755 --- a/xorg/libtiff/libtiff.SMBuild +++ b/xorg/libtiff/libtiff.SMBuild @@ -6,15 +6,16 @@ download="https://download.osgeo.org/libtiff/tiff-$version.tar.gz" desc="Library for reading and writing TIFF files" requires="xz zlib libjpeg-turbo glu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "tiff-$version" tar xf $srcdir/tiff-$version.tar.?z* cd "tiff-$version" fixbuilddirpermissions +} - CFLAGS="$CFLAGS -D_GNU_SOURCE" \ +build() { ./configure \ --prefix="" \ --libdir="/lib" \ diff --git a/xorg/libvdpau/libvdpau.SMBuild b/xorg/libvdpau/libvdpau.SMBuild index feabe02..b384f37 100755 --- a/xorg/libvdpau/libvdpau.SMBuild +++ b/xorg/libvdpau/libvdpau.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/libvdpau-$vers desc="Nvidia VDPAU library" requires="libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 4179278fb6dd87b9511c274bc8f797a33dfb055427317c9cb34a6ae2ce9d98724cbed6e12fc731e3b21b73230426bd7830ddfc94f775e77efadea9c1e7e488eb libvdpau-1.1.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libwacom/libwacom.SMBuild b/xorg/libwacom/libwacom.SMBuild index 8fcaaf5..16f1a3e 100755 --- a/xorg/libwacom/libwacom.SMBuild +++ b/xorg/libwacom/libwacom.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/linuxwacom/libwacom/archive/refs/tags/libwacom-$ver desc="Library to identify Wacom tablets and their features" requires="glib libxml2" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 0ca1597be0919204fc71367f3af1153482b72e9457dc6f0b4c59dde52836dc12d78801b6bf61c4c460623de819ec501816eb49f379be8bca89a5d092c81b70a7 libwacom-0.29.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libx11/libx11.SMBuild b/xorg/libx11/libx11.SMBuild index 8589ff0..8f40f55 100755 --- a/xorg/libx11/libx11.SMBuild +++ b/xorg/libx11/libx11.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libX11-$version.tar.xz" desc="X11 client-side library" requires="xorgproto xorg-macros xtrans libxcb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libX11-$version tar xf $srcdir/libX11-$version.tar.?z* cd libX11-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 61b756de1f51292b71e55efe1b4c7a1fee27080c17ac68ce7312e6f0df19bf268a455fc19db8218a5e11c4838ebc9871aeed7f32c439c01bf5b849744ef35925 libX11-1.8.2.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libxau/libxau.SMBuild b/xorg/libxau/libxau.SMBuild index b1a4d9f..19fc6b0 100755 --- a/xorg/libxau/libxau.SMBuild +++ b/xorg/libxau/libxau.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXau-$version.tar.gz" desc="X11 authorisation library" requires="pkgconf xorgproto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXau-$version tar xf $srcdir/libXau-$version.tar.?z* cd libXau-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxaw/libxaw.SMBuild b/xorg/libxaw/libxaw.SMBuild index 881ff2e..c0207fe 100755 --- a/xorg/libxaw/libxaw.SMBuild +++ b/xorg/libxaw/libxaw.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXaw-$version.tar.bz2" desc="X11 Athena Widget library" requires="libxmu libxpm" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXaw-$version tar xf $srcdir/libXaw-$version.tar.?z* cd libXaw-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxaw3d/libxaw3d.SMBuild b/xorg/libxaw3d/libxaw3d.SMBuild index 264646f..50ab03a 100755 --- a/xorg/libxaw3d/libxaw3d.SMBuild +++ b/xorg/libxaw3d/libxaw3d.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXaw3d-$version.tar.bz2" desc="Three-D Athena widgets" requires="libxaw" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXaw3d-$version tar xf $srcdir/libXaw3d-$version.tar.?z* cd libXaw3d-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/xorg/libxaw3dxft/libxaw3dxft.SMBuild b/xorg/libxaw3dxft/libxaw3dxft.SMBuild index 667ef06..580ca7b 100755 --- a/xorg/libxaw3dxft/libxaw3dxft.SMBuild +++ b/xorg/libxaw3dxft/libxaw3dxft.SMBuild @@ -6,14 +6,16 @@ download="https://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/libXaw3dX desc="xaw3d library for xpaint" requires="libxmu libxpm libxaw3d" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXaw3dXft-$version tar xf $srcdir/libXaw3dXft-$version.tar.?z* cd libXaw3dXft-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxcb/libxcb.SMBuild b/xorg/libxcb/libxcb.SMBuild index ce0d5d2..4bd6b3c 100755 --- a/xorg/libxcb/libxcb.SMBuild +++ b/xorg/libxcb/libxcb.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libxcb-$version.tar.xz" desc="X11 client-side library" requires="python3 libxslt libxau libxdmcp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" \ --disable-static \ @@ -30,4 +32,4 @@ build() { sha512sums=" fcd3c6a07f04f5dde47102fe62455170f1b263f4478e196d47cd7796ad062220524034207b46cb53ab8b182c9c4d413738494c5b60d9c964a757764447c0982b libxcb-1.15.tar.lz -" \ No newline at end of file +" diff --git a/xorg/libxcomposite/libxcomposite.SMBuild b/xorg/libxcomposite/libxcomposite.SMBuild index 71e2daa..2cf6b4a 100755 --- a/xorg/libxcomposite/libxcomposite.SMBuild +++ b/xorg/libxcomposite/libxcomposite.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXcomposite-$version.tar.g desc="X11 Composite extension library" requires="libxfixes" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXcomposite-$version tar xf $srcdir/libXcomposite-$version.tar.?z* cd libXcomposite-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/libxcursor/libxcursor.SMBuild b/xorg/libxcursor/libxcursor.SMBuild index 0c6124b..538c7e1 100755 --- a/xorg/libxcursor/libxcursor.SMBuild +++ b/xorg/libxcursor/libxcursor.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXcursor-$version.tar.bz2" desc="X cursor management library" requires="libxfixes libxrender" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXcursor-$version tar xf $srcdir/libXcursor-$version.tar.?z* cd libXcursor-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxdamage/libxdamage.SMBuild b/xorg/libxdamage/libxdamage.SMBuild index 180c0fc..43b563c 100755 --- a/xorg/libxdamage/libxdamage.SMBuild +++ b/xorg/libxdamage/libxdamage.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXdamage-$version.tar.gz" desc="X11 damaged region extension library" requires="libxfixes" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXdamage-$version tar xf $srcdir/libXdamage-$version.tar.?z* cd libXdamage-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/libxdmcp/libxdmcp.SMBuild b/xorg/libxdmcp/libxdmcp.SMBuild index eb00233..44ba6be 100755 --- a/xorg/libxdmcp/libxdmcp.SMBuild +++ b/xorg/libxdmcp/libxdmcp.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXdmcp-$version.tar.bz2" desc="X11 Display Manager Control Protocol library" requires="xorgproto xorg-macros" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXdmcp-$version tar xf $srcdir/libXdmcp-$version.tar.?z* cd libXdmcp-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxext/libxext.SMBuild b/xorg/libxext/libxext.SMBuild index 4246b45..9e754a4 100755 --- a/xorg/libxext/libxext.SMBuild +++ b/xorg/libxext/libxext.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXext-$version.tar.bz2" desc="X11 miscellaneous extensions library" requires="libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXext-$version tar xf $srcdir/libXext-$version.tar.?z* cd libXext-$version fixbuilddirpermissions +} +build() { ac_cv_func__XEatDataWords=yes \ ./configure \ --prefix="" \ diff --git a/xorg/libxfixes/libxfixes.SMBuild b/xorg/libxfixes/libxfixes.SMBuild index a367044..a9655a6 100755 --- a/xorg/libxfixes/libxfixes.SMBuild +++ b/xorg/libxfixes/libxfixes.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXfixes-$version.tar.bz2" desc="X11 miscellaneous 'fixes' extension library" requires="libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXfixes-$version tar xf $srcdir/libXfixes-$version.tar.?z* cd libXfixes-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \ ./configure \ --prefix="" \ diff --git a/xorg/libxfont2/libxfont2.SMBuild b/xorg/libxfont2/libxfont2.SMBuild index 8008972..20024a9 100755 --- a/xorg/libxfont2/libxfont2.SMBuild +++ b/xorg/libxfont2/libxfont2.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXfont2-$version.tar.bz2" desc="X11 font rasterisation library" requires="xtrans libfontenc freetype" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXfont2-$version tar xf $srcdir/libXfont2-$version.tar.?z* cd libXfont2-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxft/libxft.SMBuild b/xorg/libxft/libxft.SMBuild index fa51304..81a05dc 100755 --- a/xorg/libxft/libxft.SMBuild +++ b/xorg/libxft/libxft.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXft-$version.tar.gz" desc="FreeType-based font drawing library for X" requires="fontconfig libxrender" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXft-$version tar xf $srcdir/libXft-$version.tar.?z* cd libXft-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxi/libxi.SMBuild b/xorg/libxi/libxi.SMBuild index 98befeb..7ba530b 100755 --- a/xorg/libxi/libxi.SMBuild +++ b/xorg/libxi/libxi.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXi-$version.tar.bz2" desc="X11 Input extension library" requires="xorgproto xorg-macros libxext libxfixes" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXi-$version tar xf $srcdir/libXi-$version.tar.?z* cd libXi-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxinerama/libxinerama.SMBuild b/xorg/libxinerama/libxinerama.SMBuild index f1cbabb..3ff5cff 100755 --- a/xorg/libxinerama/libxinerama.SMBuild +++ b/xorg/libxinerama/libxinerama.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXinerama-$version.tar.bz2 desc="X11 Xinerama extension library" requires="libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXinerama-$version tar xf $srcdir/libXinerama-$version.tar.?z* cd libXinerama-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \ ./configure \ --prefix="" \ diff --git a/xorg/libxkbcommon/libxkbcommon.SMBuild b/xorg/libxkbcommon/libxkbcommon.SMBuild index fdc31aa..3f8d79e 100755 --- a/xorg/libxkbcommon/libxkbcommon.SMBuild +++ b/xorg/libxkbcommon/libxkbcommon.SMBuild @@ -6,13 +6,16 @@ download="https://xkbcommon.org/download/libxkbcommon-$version.tar.xz" desc="Keymap handling library for toolkits and window systems" requires="libxml2 xkeyboard-config libxcb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/xorg/libxkbfile/libxkbfile.SMBuild b/xorg/libxkbfile/libxkbfile.SMBuild index 8688ca6..3298f2c 100755 --- a/xorg/libxkbfile/libxkbfile.SMBuild +++ b/xorg/libxkbfile/libxkbfile.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libxkbfile-$version.tar.bz2" desc="X11 keyboard file manipulation library" requires="libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxklavier/libxklavier.SMBuild b/xorg/libxklavier/libxklavier.SMBuild index 4db2314..26efa66 100755 --- a/xorg/libxklavier/libxklavier.SMBuild +++ b/xorg/libxklavier/libxklavier.SMBuild @@ -6,18 +6,18 @@ download="https://github.com/freedesktop/libxklavier/archive/refs/tags/libxklavi desc="High-level API for X Keyboard Extension" requires="glib intltool iso-codes libxml2 libxi libxkbfile libxfixes xkeyboard-config" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ - --sysconfdir=/etc \ - --localstatedir=/var \ --disable-static \ --with-xkb-base=/etc/X11/xkb diff --git a/xorg/libxmu/libxmu.SMBuild b/xorg/libxmu/libxmu.SMBuild index baa9fbe..5cf905e 100755 --- a/xorg/libxmu/libxmu.SMBuild +++ b/xorg/libxmu/libxmu.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXmu-$version.tar.bz2" desc="X11 miscellaneous micro-utility library" requires="libxext libxt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXmu-$version tar xf $srcdir/libXmu-$version.tar.?z* cd libXmu-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxpm/libxpm.SMBuild b/xorg/libxpm/libxpm.SMBuild index e1e66fe..06f1e69 100755 --- a/xorg/libxpm/libxpm.SMBuild +++ b/xorg/libxpm/libxpm.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXpm-$version.tar.bz2" desc="X11 pixmap library" requires="libxext libxt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXpm-$version tar xf $srcdir/libXpm-$version.tar.?z* cd libXpm-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxpresent/libxpresent.SMBuild b/xorg/libxpresent/libxpresent.SMBuild index aeecdbc..1d993aa 100755 --- a/xorg/libxpresent/libxpresent.SMBuild +++ b/xorg/libxpresent/libxpresent.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/xorg/lib/libxpresent/-/archive/libXpres desc="X Present Extension library" requires="libxfixes libxrandr" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxrandr/libxrandr.SMBuild b/xorg/libxrandr/libxrandr.SMBuild index 5a5e058..0c595ca 100755 --- a/xorg/libxrandr/libxrandr.SMBuild +++ b/xorg/libxrandr/libxrandr.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXrandr-$version.tar.bz2" desc="X11 RandR extension library" requires="libxext libxrender" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXrandr-$version tar xf $srcdir/libXrandr-$version.tar.?z* cd libXrandr-$version fixbuilddirpermissions +} +build() { ac_cv_func__XEatDataWords=yes \ ./configure \ --prefix="" \ diff --git a/xorg/libxrender/libxrender.SMBuild b/xorg/libxrender/libxrender.SMBuild index a8b07b0..1ae7875 100755 --- a/xorg/libxrender/libxrender.SMBuild +++ b/xorg/libxrender/libxrender.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXrender-$version.tar.bz2" desc="X Rendering Extension client library" requires="libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXrender-$version tar xf $srcdir/libXrender-$version.tar.?z* cd libXrender-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \ ./configure \ --prefix="" \ diff --git a/xorg/libxscrnsaver/libxscrnsaver.SMBuild b/xorg/libxscrnsaver/libxscrnsaver.SMBuild index 93973a5..2a9ceca 100755 --- a/xorg/libxscrnsaver/libxscrnsaver.SMBuild +++ b/xorg/libxscrnsaver/libxscrnsaver.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXScrnSaver-$version.tar.b desc="Xlib-based X11 Screen Saver extension client library" requires="libxcb libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxshmfence/libxshmfence.SMBuild b/xorg/libxshmfence/libxshmfence.SMBuild index 6f3d804..2dcbcf1 100755 --- a/xorg/libxshmfence/libxshmfence.SMBuild +++ b/xorg/libxshmfence/libxshmfence.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libxshmfence-$version.tar.bz desc="a library that exposes a event API on top of Linux futexes" requires="musl xorg-macros xorgproto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxt/libxt.SMBuild b/xorg/libxt/libxt.SMBuild index 11a582a..90fbd11 100755 --- a/xorg/libxt/libxt.SMBuild +++ b/xorg/libxt/libxt.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXt-$version.tar.bz2" desc="X11 toolkit intrinsics library" requires="libsm libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXt-$version tar xf $srcdir/libXt-$version.tar.?z* cd libXt-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxtst/libxtst.SMBuild b/xorg/libxtst/libxtst.SMBuild index f30eccd..96d8edd 100755 --- a/xorg/libxtst/libxtst.SMBuild +++ b/xorg/libxtst/libxtst.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXtst-$version.tar.bz2" desc="X11 Testing -- Resource extension library" requires="libxext libxfixes libxi" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXtst-$version tar xf $srcdir/libXtst-$version.tar.?z* cd libXtst-$version fixbuilddirpermissions +} +build() { CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \ ./configure \ --prefix="" \ diff --git a/xorg/libxv/libxv.SMBuild b/xorg/libxv/libxv.SMBuild index a60eaa3..1f9fb6e 100755 --- a/xorg/libxv/libxv.SMBuild +++ b/xorg/libxv/libxv.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXv-$version.tar.bz2" desc="X11 Video extension library" requires="libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXv-$version tar xf $srcdir/libXv-$version.tar.?z* cd libXv-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/libxxf86vm/libxxf86vm.SMBuild b/xorg/libxxf86vm/libxxf86vm.SMBuild index b8101a2..caab7ba 100755 --- a/xorg/libxxf86vm/libxxf86vm.SMBuild +++ b/xorg/libxxf86vm/libxxf86vm.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/lib/libXxf86vm-$version.tar.bz2" desc="X11 XFree86 video mode extension library" requires="libxext" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf libXxf86vm-$version tar xf $srcdir/libXxf86vm-$version.tar.?z* cd libXxf86vm-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static diff --git a/xorg/lndir/lndir.SMBuild b/xorg/lndir/lndir.SMBuild index 089be22..44f9267 100755 --- a/xorg/lndir/lndir.SMBuild +++ b/xorg/lndir/lndir.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/xorg/util/lndir/-/archive/lndir-$versio desc="create a shadow directory of symbolic links to another directory tree" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist @@ -28,4 +30,4 @@ build() { sha512sums=" 489cb6bb17db14f847c5ec87d2084f20121590a670f1842be537ca5040ca915e7c2855360687ac490f656133474b9e320c0418234fc108b4972b2cdc13261e50 lndir-1.0.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/makedepend/makedepend.SMBuild b/xorg/makedepend/makedepend.SMBuild index 3446721..7f7dc3f 100755 --- a/xorg/makedepend/makedepend.SMBuild +++ b/xorg/makedepend/makedepend.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/xorg/util/makedepend/-/archive/makedepe desc="Utility to parse C source files to make dependency lists for Makefiles" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" f0104c9dc11f43523f066bfbb995a0ec789638eb7546d84450970def7343ac0aa2b5290fd587fd8808fcfaa04a7192fc75305e3b7afaf62f87105fe40b5c5763 makedepend-1.0.6.tar.lz -" \ No newline at end of file +" diff --git a/xorg/mesa-demos/mesa-demos.SMBuild b/xorg/mesa-demos/mesa-demos.SMBuild index 350b257..c7a5e09 100755 --- a/xorg/mesa-demos/mesa-demos.SMBuild +++ b/xorg/mesa-demos/mesa-demos.SMBuild @@ -6,14 +6,16 @@ download="https://archive.mesa3d.org//demos/mesa-demos-$version.tar.bz2" desc="Mesa demo applications" requires="mesa glew freeglut" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-gles1 \ @@ -31,4 +33,4 @@ build() { sha512sums=" a8ba981e9840334bc7f0b07ef30ac35d0cb56a9947a37bcf8abbb13e60190247540154678ec9addd9a6a6a1e4de93f26dfbf38252188327356201dcc153b8a81 mesa-demos-8.4.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/mesa/mesa.SMBuild b/xorg/mesa/mesa.SMBuild index 5ac5997..770063f 100755 --- a/xorg/mesa/mesa.SMBuild +++ b/xorg/mesa/mesa.SMBuild @@ -6,14 +6,16 @@ download="https://archive.mesa3d.org/mesa-$version.tar.xz" desc="An open-source implementation of the OpenGL specification" requires="gcc-libs expat libxml2 llvm libdrm libx11 libxrandr libxdamage libxshmfence libxxf86vm libvdpau" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { if [ "$arch" = "aarch64" ]; then dridrivers="" galliumdrivers="swrast,v3d,vc4,kmsro" diff --git a/xorg/mkfontscale/mkfontscale.SMBuild b/xorg/mkfontscale/mkfontscale.SMBuild index 0efd67f..c9efbbc 100755 --- a/xorg/mkfontscale/mkfontscale.SMBuild +++ b/xorg/mkfontscale/mkfontscale.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/mkfontscale-$versi desc="Create an index of scalable font files for X" requires="libfontenc freetype" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 81012ec02eda1ae64f312f5658046f8ea16305cace5afb81dfd98150d8b177a91106caf509aaa37ea34fd07308d81c0352ab719ebd0c3b837f6e6031e1647d88 mkfontscale-1.2.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/mtdev/mtdev.SMBuild b/xorg/mtdev/mtdev.SMBuild index 24674a5..f9ad1f0 100755 --- a/xorg/mtdev/mtdev.SMBuild +++ b/xorg/mtdev/mtdev.SMBuild @@ -6,14 +6,16 @@ download="https://bitmath.org/code/mtdev/mtdev-$version.tar.bz2" desc="Library which transforms all variants of kernel MT events to the slotted type B protocol" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -29,4 +31,4 @@ build() { sha512sums=" f9a8548e2d2e7d372b170383d587f9e5b1ece02332fac96f36320c050d72b8c70147d59dfd9ef70cec0137734c6476a86e46aa504891cc313aa22505671b9b4c mtdev-1.1.5.tar.lz -" \ No newline at end of file +" diff --git a/xorg/numlockx/numlockx.SMBuild b/xorg/numlockx/numlockx.SMBuild index e8dedf3..d5e78c1 100755 --- a/xorg/numlockx/numlockx.SMBuild +++ b/xorg/numlockx/numlockx.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/rg3/numlockx/archive/refs/tags/$version.tar.gz" requires="libxtst" desc="Turns on the numlock key in X11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -28,4 +30,4 @@ build() { sha512sums=" 91a5636a0fe7d97635825f49d4ad7ec626207f47f28dd698aaa53672bf5b616f68ac3ef1b266a0d1634a89590dea1ff8210c9d377a88fc2c83a0e19b67cd9c64 numlockx-1.2.tar.lz -" \ No newline at end of file +" diff --git a/xorg/pixman/pixman.SMBuild b/xorg/pixman/pixman.SMBuild index 8eef139..e2436d5 100755 --- a/xorg/pixman/pixman.SMBuild +++ b/xorg/pixman/pixman.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/pixman-$version.t desc="The pixel-manipulation library for X and cairo" requires="libpng" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. --prefix="/" @@ -27,4 +29,4 @@ build() { sha512sums=" ce6b5e908670853e68292e933b0e223b8f0f416643a1c0ea5d6685270f3391418c4715379f476c595d8aadadf3b89aad5cdfe0ac4b7e87855c707a9bd68eeff6 pixman-0.40.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/setxkbmap/setxkbmap.SMBuild b/xorg/setxkbmap/setxkbmap.SMBuild index c07fc51..f3e20b2 100755 --- a/xorg/setxkbmap/setxkbmap.SMBuild +++ b/xorg/setxkbmap/setxkbmap.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/setxkbmap-$versio desc="Set the keyboard using the X Keyboard Extension" requires="libxkbfile" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 73a3909aab49b0e58509c244243d206e7a405ae97ca7aaf5f9da5a88e802108d9fc1769b0fea96580cd14236236a4e976745f437fa5c5bc0fea44cb5647ab144 setxkbmap-1.3.2.tar.lz -" \ No newline at end of file +" diff --git a/xorg/spandsp/spandsp.SMBuild b/xorg/spandsp/spandsp.SMBuild index a7bfdaa..945f16f 100755 --- a/xorg/spandsp/spandsp.SMBuild +++ b/xorg/spandsp/spandsp.SMBuild @@ -6,14 +6,16 @@ download="https://src.fedoraproject.org/lookaside/pkgs/spandsp/spandsp-0.0.6.tar desc="A DSP library for telephony" requires="zlib xz libjpeg-turbo zstd libtiff " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ diff --git a/xorg/startup-notification/startup-notification.SMBuild b/xorg/startup-notification/startup-notification.SMBuild index be65896..46cc704 100755 --- a/xorg/startup-notification/startup-notification.SMBuild +++ b/xorg/startup-notification/startup-notification.SMBuild @@ -6,14 +6,16 @@ download="https://www.freedesktop.org/software/startup-notification/releases/sta desc="Monitor and display application startup" requires="libx11 xcb-util" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static \ @@ -29,4 +31,4 @@ build() { sha512sums=" 0ac7c3776e6d53aef3e54b33fd68ab30c6e3adb353cb1f873592749603a4326c54d4ad6909df6e5eaa938046ff633dc6184551dce1b9fdaa398ebdc1a0512b5c startup-notification-0.12.tar.lz -" \ No newline at end of file +" diff --git a/xorg/terminus-font/terminus-font.SMBuild b/xorg/terminus-font/terminus-font.SMBuild index 29cdc8d..2ce4bcb 100755 --- a/xorg/terminus-font/terminus-font.SMBuild +++ b/xorg/terminus-font/terminus-font.SMBuild @@ -6,16 +6,18 @@ download="https://sourceforge.net/projects/terminus-font/files/terminus-font-$ve desc="a clean fixed width bitmap font" requires="python3 bdftopcf mkfontscale fontconfig" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version - - applypatch $srcdir/terminus-font.Makefile.paths.diff fixbuilddirpermissions + applypatch $srcdir/terminus-font.Makefile.paths.diff +} + +build() { make make install install-uni install-ref DESTDIR="$pkg" @@ -27,4 +29,4 @@ build() { sha512sums=" 381b9c7652d7f78633ea57e74c3819428fa6da786a83ed095061cee56422144ee1887a95ab22053b28201067cfdf47d1b2ab449f17228e7648d0df24d539eb72 terminus-font-4.40.tar.lz 193ef103fc11834fdaeae812f0b77d2604a7208cc8fd80f829595e6fc52389014159f3f970c5ff82c7edaef0d0478b26eac24636b4a842ef4d80759c188fb4e7 terminus-font.Makefile.paths.diff -" \ No newline at end of file +" diff --git a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild index 4eae011..697493f 100755 --- a/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild +++ b/xorg/ttf-indic-fonts/ttf-indic-fonts.SMBuild @@ -6,14 +6,16 @@ download="https://archive.ubuntu.com/ubuntu/pool/main/t/ttf-indic-fonts/ttf-indi desc="TTF fonts for Indic scripts" requires="fontconfig mkfontscale" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p $pkg/share/fonts/TTF cp -a */*.ttf $pkg/share/fonts/TTF/ diff --git a/xorg/twm/twm.SMBuild b/xorg/twm/twm.SMBuild index 79b2487..5452179 100755 --- a/xorg/twm/twm.SMBuild +++ b/xorg/twm/twm.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/twm-$version.tar. desc="standard window manager for the X window system" requires="e2fsprogs libxau libxdmcp libxmu " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/vala/vala.SMBuild b/xorg/vala/vala.SMBuild index ef0e299..00e962e 100755 --- a/xorg/vala/vala.SMBuild +++ b/xorg/vala/vala.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.gnome.org/GNOME/vala/-/archive/$version/vala-$version.t desc="Compiler for the GObject type system" requires="libxslt glib libx11 dbus" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-valadoc @@ -28,4 +30,4 @@ build() { sha512sums=" ead6b93be67fbff65fdd882a462bcbffec629ec6d37ddc06ea0937e2257dd6f9e4d54cccedd54ed269b7acb044f33877d8b9b80470c3cc56c016861bea8a6456 vala-0.54.6.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xauth/xauth.SMBuild b/xorg/xauth/xauth.SMBuild index eace9dc..1f97661 100755 --- a/xorg/xauth/xauth.SMBuild +++ b/xorg/xauth/xauth.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/xauth-$version.ta desc="X.Org authorization settings program" requires="libxau libxmu libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" f40188cae26239a9f5588b7eef862472c2ad819e6dc66290c0469d75f87b4959229258da7d2de6d69fd572ccf0e8ca6ca99f658f98b9ceb3cc80e8544345bd23 xauth-1.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xbitmaps/xbitmaps.SMBuild b/xorg/xbitmaps/xbitmaps.SMBuild index 6b80374..43cb1bb 100755 --- a/xorg/xbitmaps/xbitmaps.SMBuild +++ b/xorg/xbitmaps/xbitmaps.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/data/xbitmaps-$versio requires="xorg-macros" desc="X.org Bitmap files" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/xorg/xcalc/xcalc.SMBuild b/xorg/xcalc/xcalc.SMBuild index c7ad01b..eff1578 100755 --- a/xorg/xcalc/xcalc.SMBuild +++ b/xorg/xcalc/xcalc.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/xcalc-$version.ta desc="Scientific calculator for X" requires="libxaw " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 77fe2dad471c0b2a71d3e8bcd13e5109dbb5549ac24d366f54dfde72277dd2b907d21040fbd2b542013e6b4f1b5f5ac09b2b904b2000e804b9471dbb80b04952 xcalc-1.1.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-proto/xcb-proto.SMBuild b/xorg/xcb-proto/xcb-proto.SMBuild index 67d0750..c7c0fe4 100755 --- a/xorg/xcb-proto/xcb-proto.SMBuild +++ b/xorg/xcb-proto/xcb-proto.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/proto/xcb-proto-$vers desc="XML-XCB protocol descriptions" requires="python3" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="/" diff --git a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild index ebb617f..f8d11a0 100755 --- a/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild +++ b/xorg/xcb-util-cursor/xcb-util-cursor.SMBuild @@ -6,14 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-cursor-$version.tar.bz2" desc="XCB cursor library" requires="libxcb xcb-util-renderutil xcb-util-image" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" fed8ee4e3ad26ab46342340a1fd40aa3e3cac9d05e348dd99bf303abc05c737948f0ee29ca0e2cc74db18a53d1116d6b10c10bb0b1af9bbfb973ee0fa64fac76 xcb-util-cursor-0.1.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-util-image/xcb-util-image.SMBuild b/xorg/xcb-util-image/xcb-util-image.SMBuild index 399b1b0..943a9be 100755 --- a/xorg/xcb-util-image/xcb-util-image.SMBuild +++ b/xorg/xcb-util-image/xcb-util-image.SMBuild @@ -6,14 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-image-$version.tar.bz2" desc="Utility libraries for XC Binding" requires="libxcb xcb-util" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" d9aa282b2d68abf3a76deb7af33043f4ae3fd6ab2f3500876592e140d3abcc44679c6290d77557c587e5ac898f9b4f8e744517550ed820276f8df3213e7a3c58 xcb-util-image-0.4.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild index fe80559..6918c4a 100755 --- a/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild +++ b/xorg/xcb-util-keysyms/xcb-util-keysyms.SMBuild @@ -6,14 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-keysyms-$version.tar.bz2" desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" requires="libxcb xcb-util" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" 634f41649f842326f19162fa8524c8d95f434aec3c9cb1cbd750fbbdc27277397413c661ca85e1480ba063edb053a448bf4f8be62c2782843565bc32aee6fef5 xcb-util-keysyms-0.4.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild index a88816a..5725e24 100755 --- a/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild +++ b/xorg/xcb-util-renderutil/xcb-util-renderutil.SMBuild @@ -6,14 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-renderutil-$version.tar.bz2" desc="Utility libraries for XC Binding" requires="libxcb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" c083ebcba8fd39a326fffbc41c25a03e7305e2dfe7908f7956991ac1c856278402bb27b5cf36d972bc6af501f110aad1f3ef78c73db61b0f5ff13d5c7ad314c2 xcb-util-renderutil-0.3.9.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-util-wm/xcb-util-wm.SMBuild b/xorg/xcb-util-wm/xcb-util-wm.SMBuild index b540a80..ad41a8b 100755 --- a/xorg/xcb-util-wm/xcb-util-wm.SMBuild +++ b/xorg/xcb-util-wm/xcb-util-wm.SMBuild @@ -6,14 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-wm-$version.tar.bz2" desc="Utility libraries for XC Binding" requires="libxcb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-static @@ -28,4 +30,4 @@ build() { sha512sums=" d41ccc1f75652de204a3ac046fe8d93e98181899c67873b83396ed32972152216b6da5a60dc96dc24e8460fac76b962d845450531523c40174d57d303554f376 xcb-util-wm-0.4.1.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xcb-util/xcb-util.SMBuild b/xorg/xcb-util/xcb-util.SMBuild index ae3cad2..06b7fdd 100755 --- a/xorg/xcb-util/xcb-util.SMBuild +++ b/xorg/xcb-util/xcb-util.SMBuild @@ -6,13 +6,16 @@ download="https://xcb.freedesktop.org/dist/xcb-util-$version.tar.bz2" desc="Utility libraries for XC Binding" requires="gperf libxcb" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} + +build() { ./configure \ --prefix="" \ diff --git a/xorg/xclipboard/xclipboard.SMBuild b/xorg/xclipboard/xclipboard.SMBuild index 629ed66..1612470 100755 --- a/xorg/xclipboard/xclipboard.SMBuild +++ b/xorg/xclipboard/xclipboard.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xclipboard-$versio desc="X clipboard manager" requires="libxt libxmu libx11 libxaw " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" 6db9c329e771f1e3f61576e914e6504e02dd183e813003dd9ae78d4f8d952c30cfe4ddac452690c239b5af46a7b51a8b6a681a93e64fe1a285910ad45fdebc23 xclipboard-1.1.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xclock/xclock.SMBuild b/xorg/xclock/xclock.SMBuild index 90e9ca8..b2b72f3 100755 --- a/xorg/xclock/xclock.SMBuild +++ b/xorg/xclock/xclock.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xclock-$version.ta desc="X clock" requires="netbsd-curses expat e2fsprogs freetype fontconfig libxcb libxpm libice libxkbfile libxft libxaw" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" d843ab242d5d4de435d17ea18360fc1bda7b9af7c6e69db427ec3686e05f6cfa7205027011b1e55931b4b2d0792bab5f0986ccb7380bce3d537034daf3d1ac72 xclock-1.0.9.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild index ec92726..60c57bc 100755 --- a/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild +++ b/xorg/xdg-dbus-proxy/xdg-dbus-proxy.SMBuild @@ -6,7 +6,7 @@ download="https://github.com/flatpak/xdg-dbus-proxy/archive/refs/tags/$version.t desc="filtering proxy for D-Bus connections" requires="glib util-linux dbus " -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version @@ -15,7 +15,9 @@ build() { fixbuilddirpermissions applypatch $srcdir/musl-macros.patch +} +build() { ./configure \ --prefix="" \ --disable-man @@ -31,4 +33,4 @@ build() { sha512sums=" 23056cd8e4b08daff96372c0aa11831e9418e832cfb5e2ebd23fb0aef0de09a2603ccbc79d88e21beeae8e014139c47fb54ab70af2bfb2a00bec3c1960958abf xdg-dbus-proxy-0.1.2.tar.lz 96551f8a188ba42f44c31a3fb4ad5df5a993ea3742116dfd1b2f8fdddae6cfd68fa38a56c473c748b2fead681469a76b60b87b2ffa5fbf5a2583e9df1845e55c musl-macros.patch -" \ No newline at end of file +" diff --git a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild index 27e5fee..1439a41 100755 --- a/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild +++ b/xorg/xdg-user-dirs/xdg-user-dirs.SMBuild @@ -6,14 +6,16 @@ download="http://user-dirs.freedesktop.org/releases/xdg-user-dirs-$version.tar.g desc="Manage user directories like ~/Desktop and ~/Music" requires="musl docbook" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -29,4 +31,4 @@ build() { sha512sums=" fe7e34664183e2ce03c77a69155106f2127149f23b03941e8f626b211f74b09fb44ee31e73b7dea2f395b0d86b6654fb3a933442b3703cadd90e42d16d198c9d xdg-user-dirs-0.17.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xev/xev.SMBuild b/xorg/xev/xev.SMBuild index 11a0cdb..3068bb0 100755 --- a/xorg/xev/xev.SMBuild +++ b/xorg/xev/xev.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xev-$version.tar.b desc="Print contents of X events" requires="libxrandr libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" f26125da6684df598b47e33bbdcf559c09e1e1317a099c9e00c4541dc852d85930552f56222221ea2d8bfe29dd8be86bb9deac3c57be7aa8d183d25f8870f43a xev-1.2.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild index 42744fa..50f80ff 100755 --- a/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild +++ b/xorg/xf86-input-evdev/xf86-input-evdev.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-evd desc="X.org evdev input driver" requires="libevdev mtdev xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-selective-werror @@ -28,4 +30,4 @@ build() { sha512sums=" edc381bc6d78092cdcedbbe2b741f3a171a848f799825b18cb0920fcd48f1d7624be35264008691e3bd5956f95d043b83a15f58f2d670e352c0fb6cc8eb27cda xf86-input-evdev-2.10.6.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild index 0b2d36d..f2a5748 100755 --- a/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild +++ b/xorg/xf86-input-keyboard/xf86-input-keyboard.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-key desc="Xorg generic keyboard input driver" requires="libevdev mtdev xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --disable-selective-werror @@ -28,4 +30,4 @@ build() { sha512sums=" 6f3a6489f9465e629a082e35f987cbde10ee82b61f2098ab9d6e53e5733c03169a4b5f48af7f1870137e70f796424cd4a2d180571b3cba727d1d29e4a9ae4144 xf86-input-keyboard-1.9.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild index 3aae654..8477ec4 100755 --- a/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild +++ b/xorg/xf86-input-libinput/xf86-input-libinput.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-lib desc="Generic input driver for the X.Org server based on libinput" requires="libx11 libxi libinput xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" d6a600e21c7672a7e80834a020586f2fa2267eee78b07fea9fe5b729f9184cdb0cdd2871d81e0a1a0411c891cb89080339f8252f56722486640825900f0e05a5 xf86-input-libinput-0.30.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild index c349a4f..665807d 100755 --- a/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild +++ b/xorg/xf86-input-mouse/xf86-input-mouse.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-input-mou desc="Xorg generic mouse input driver" requires="libevdev mtdev xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc @@ -28,4 +30,4 @@ build() { sha512sums=" 2703f150dc214307a5cc8d27cf57a4a34a530cc3fe6c39b9e2b0371edcd7a9995e7b3ddd973fd3be135dc779769cd3f4e26ae42e85fdffafeaf721556e596329 xf86-input-mouse-1.9.3.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-video-ati/xf86-video-ati.SMBuild b/xorg/xf86-video-ati/xf86-video-ati.SMBuild index 51a2c5b..0371a5a 100755 --- a/xorg/xf86-video-ati/xf86-video-ati.SMBuild +++ b/xorg/xf86-video-ati/xf86-video-ati.SMBuild @@ -6,7 +6,7 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati desc="X.org ati video driver" requires="mesa xorg-server llvm" -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -14,7 +14,9 @@ build() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ @@ -30,4 +32,4 @@ build() { sha512sums=" f4bcb88be32001ed26dc6596ee5c507d1d60cd2fb40081c62724ecc345353da790b596be2f8834a0f914e0bced9f99eae829777d362f2b75cb3dcefdfe44865b xf86-video-ati-19.1.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild index 7291c72..1c69127 100755 --- a/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild +++ b/xorg/xf86-video-dummy/xf86-video-dummy.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-dum desc="dummy driver for Xorg required by VNC programs like x11vnc" requires="xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" @@ -27,4 +29,4 @@ build() { sha512sums=" a99e3a10c255e08e88697958bdfe38f3bd79b8dc72b177f6b4d98edc46c2e41b1deb2b1842ca1c4f8ded866fa195c9ab114f56b4b620b4998f97e049ccafe34b xf86-video-dummy-0.3.8.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild index 48ce979..1d800d7 100755 --- a/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild +++ b/xorg/xf86-video-fbdev/xf86-video-fbdev.SMBuild @@ -6,17 +6,18 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-fbd desc="X.org framebuffer video driver" requires="xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ - --sysconfdir=/etc \ --enable-pciaccess \ --disable-selective-werror @@ -30,4 +31,4 @@ build() { sha512sums=" dd8f1a60975b3ae41cb28fe530681d40769caf3bbcda07a1a6751962762dc7d08496c9117385b65028d4ce5c5d63871b82f30cdf5f18cb8ba1872481e49702d0 xf86-video-fbdev-0.5.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild index f4ce83c..332040e 100755 --- a/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild +++ b/xorg/xf86-video-fbturbo/xf86-video-fbturbo.SMBuild @@ -6,14 +6,16 @@ download="https://github.com/ssvb/xf86-video-fbturbo/archive/refs/tags/$version. desc="Xorg video driver for devices with ARM Allwinner SoCs and raspberry pi older models" requires="xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc @@ -28,4 +30,4 @@ build() { sha512sums=" a986179835d3f4998c07e51c5554563beab171d5fc8e8907ac9a6d5698e27243621d96710868ec714f4617abd3862d810d98d7641673fb8f1629d8e53a8bcaf1 xf86-video-fbturbo-0.4.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xf86-video-intel/xf86-video-intel.SMBuild b/xorg/xf86-video-intel/xf86-video-intel.SMBuild index 23cc1e8..c5988f5 100755 --- a/xorg/xf86-video-intel/xf86-video-intel.SMBuild +++ b/xorg/xf86-video-intel/xf86-video-intel.SMBuild @@ -7,7 +7,7 @@ desc="X.org Intel i810/i830/i915/945G/G965+ video drivers" requires="pixman libxv libxinerama libxtst libxrandr libxcursor xorg-server" sm_noautoconfsite=1 -build() { +prepbuilddir() { compileonlyfor x86_64 mkandenterbuilddir rm -rf $app-$version @@ -19,7 +19,9 @@ build() { applypatch $srcdir/git.patch autoreconf -vif +} +build() { ./configure \ --prefix="" \ --enable-xvmc \ @@ -38,4 +40,4 @@ build() { sha512sums=" c7d33a0efe36aa46f2d3ba8c3d48675492ded43515a4b015ec789f3a8ac72639690f11003372e4537a261cdaa602fc7600719c74134bbaeec60bdd5cdca345e5 xf86-video-intel-2.99.917.tar.lz 0fe4e455dcbc4ae6622dca483ef3ddc765c43009fdb0fef82bdaa835a737796a6caf8afa9c6630919f43c977a6f736770c3779f04d8c823da4fc9cee17d16f19 git.patch -" \ No newline at end of file +" diff --git a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild index 6d2c029..df6f6fb 100755 --- a/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild +++ b/xorg/xf86-video-vesa/xf86-video-vesa.SMBuild @@ -6,17 +6,18 @@ download="https://xorg.freedesktop.org/releases/individual/driver/xf86-video-ves desc="X.org vesa video driver" requires="xorg-server" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ - --prefix="" \ - --sysconfdir=/etc + --prefix="" make make install DESTDIR=$pkg @@ -28,4 +29,4 @@ build() { sha512sums=" 29aee5c6e8a0c066136c8a9e91f7eaadd52c906eba15fae64c5cb33d4288c6a324df3c11127bf5eaae4ae48dfbf523a1d086bde098b3079b9d77820b1b4b49ba xf86-video-vesa-2.4.0.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xfontsel/xfontsel.SMBuild b/xorg/xfontsel/xfontsel.SMBuild index 0a6506a..ef9015f 100755 --- a/xorg/xfontsel/xfontsel.SMBuild +++ b/xorg/xfontsel/xfontsel.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xfontsel-$version. desc="Point and click selection of X11 font names" requires="libxaw" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xhost/xhost.SMBuild b/xorg/xhost/xhost.SMBuild index 55530c1..6e7bae1 100755 --- a/xorg/xhost/xhost.SMBuild +++ b/xorg/xhost/xhost.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xhost-$version.tar desc="Server access control program for X" requires="libxmu libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xinit/xinit.SMBuild b/xorg/xinit/xinit.SMBuild index c96f85a..8510293 100755 --- a/xorg/xinit/xinit.SMBuild +++ b/xorg/xinit/xinit.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/xinit-$version.ta desc="X.Org initialisation program" requires="libx11 xorg-server xrdb xauth" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xinput/xinput.SMBuild b/xorg/xinput/xinput.SMBuild index df6b37c..83b4632 100755 --- a/xorg/xinput/xinput.SMBuild +++ b/xorg/xinput/xinput.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/xinput-$version.t desc="Small commandline tool to configure devices" requires="libxi libxinerama" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xkbcomp/xkbcomp.SMBuild b/xorg/xkbcomp/xkbcomp.SMBuild index 7f43c72..8acea79 100755 --- a/xorg/xkbcomp/xkbcomp.SMBuild +++ b/xorg/xkbcomp/xkbcomp.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xkbcomp-$version.t desc="X Keyboard description compiler" requires="libxkbfile" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xkeyboard-config/xkeyboard-config.SMBuild b/xorg/xkeyboard-config/xkeyboard-config.SMBuild index 73caae3..1042370 100755 --- a/xorg/xkeyboard-config/xkeyboard-config.SMBuild +++ b/xorg/xkeyboard-config/xkeyboard-config.SMBuild @@ -6,14 +6,16 @@ download="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/arc desc="X keyboard configuration files" requires="intltool libxslt xkbcomp" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/xorg/xmodmap/xmodmap.SMBuild b/xorg/xmodmap/xmodmap.SMBuild index 87bcff8..7965d74 100755 --- a/xorg/xmodmap/xmodmap.SMBuild +++ b/xorg/xmodmap/xmodmap.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/app/xmodmap-$version. desc="Utility for modifying keymaps and button mappings" requires="libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xorg-cf-files/xorg-cf-files.SMBuild b/xorg/xorg-cf-files/xorg-cf-files.SMBuild index 6515612..08827f3 100755 --- a/xorg/xorg-cf-files/xorg-cf-files.SMBuild +++ b/xorg/xorg-cf-files/xorg-cf-files.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/util/xorg-cf-files-$version.tar. desc="Default configuration files for Xorg" requires="xtrans mesa xorg-server xkeyboard-config libepoxy xcb-util xcb-util-image xcb-util-keysyms xcb-util-wm xcb-util-renderutil pixman libpciaccess" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xorg-fonts/xorg-fonts.SMBuild b/xorg/xorg-fonts/xorg-fonts.SMBuild index c72f476..0c39b44 100755 --- a/xorg/xorg-fonts/xorg-fonts.SMBuild +++ b/xorg/xorg-fonts/xorg-fonts.SMBuild @@ -5,10 +5,12 @@ homepage="https://xorg.freedesktop.org/" desc="Font collection that has historically been part of Xorg" requires="font-util" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version +} +build() { for font in font-arabic-misc \ font-adobe-100dpi font-adobe-75dpi \ font-bh-100dpi font-bh-75dpi \ @@ -78,4 +80,4 @@ ed315c357cc73b4f63e8b471c474404b98d4afb70ea9caf951d9daa5ae57106bcad2236e84d7bb5f e0d24a45ec2e573320fec5c55c005492a071eaf4ab43928c00c5cfc8b71450f1765176423921cfec5b31eae828ce5b69b7cad9794ed65262eec772e40545e7e7 font-sun-misc-1.0.3.tar.lz 5b154a73c8066df1034e5ac244bd6c6e4ce89ed996cad097510fbb7822d75d408005d444372d0c274981b733ab60871a9b0f239426c4c15c3a27ac1c10899449 font-winitzki-cyrillic-1.0.3.tar.lz 3aff37d6ecaebed9fe8fa2273cad3cf31ac434e19c86a1334a4b6d6642c7f3cdb992f19440b4dac584106b86b6f916bcc576fcc57238eb0034700e5c862e8603 font-xfree86-type1-1.0.4.tar.lz -" \ No newline at end of file +" diff --git a/xorg/xorg-macros/xorg-macros.SMBuild b/xorg/xorg-macros/xorg-macros.SMBuild index 1b509d0..8ed00d1 100755 --- a/xorg/xorg-macros/xorg-macros.SMBuild +++ b/xorg/xorg-macros/xorg-macros.SMBuild @@ -5,7 +5,7 @@ homepage="https://github.com/freedesktop/xorg-macros" desc="Provides macros pkg-config file to support Xorg installs" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf "$app" @@ -14,7 +14,9 @@ build() { fixbuilddirpermissions autoreconf -vif +} +build() { ./configure \ --prefix="" diff --git a/xorg/xorg-server/xorg-server.SMBuild b/xorg/xorg-server/xorg-server.SMBuild index 3699177..da4e634 100755 --- a/xorg/xorg-server/xorg-server.SMBuild +++ b/xorg/xorg-server/xorg-server.SMBuild @@ -6,14 +6,16 @@ download="https://www.x.org/releases/individual/xserver/xorg-server-$version.tar requires="eudev libgcrypt xtrans pixman libpciaccess libxv libxkbfile libxfont2 libxtst libxrender libxaw mesa " desc="Display server implementing the Xorg protocol" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ --sysconfdir=/etc \ diff --git a/xorg/xorgproto/xorgproto.SMBuild b/xorg/xorgproto/xorgproto.SMBuild index 7a16c87..2b32d13 100755 --- a/xorg/xorgproto/xorgproto.SMBuild +++ b/xorg/xorgproto/xorgproto.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/proto/xorgproto-$versi desc="Combined X.Org X11 Protocol headers" requires="musl" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { mkdir -p smbuild && cd smbuild meson .. --prefix="/" \ --datadir=/lib diff --git a/xorg/xrandr/xrandr.SMBuild b/xorg/xrandr/xrandr.SMBuild index e6361a3..3c98d76 100755 --- a/xorg/xrandr/xrandr.SMBuild +++ b/xorg/xrandr/xrandr.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xrandr-$version.ta desc="Primitive command line interface to RandR extension" requires="libxrandr libx11 libxau" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xrdb/xrdb.SMBuild b/xorg/xrdb/xrdb.SMBuild index ae567c2..302b4a3 100755 --- a/xorg/xrdb/xrdb.SMBuild +++ b/xorg/xrdb/xrdb.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xrdb-$version.tar. desc="X server resource database utility" requires="libxmu libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xset/xset.SMBuild b/xorg/xset/xset.SMBuild index 8f8579b..88ed578 100755 --- a/xorg/xset/xset.SMBuild +++ b/xorg/xset/xset.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xset-$version.tar. desc="User preference utility for X" requires="libxmu" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xsetroot/xsetroot.SMBuild b/xorg/xsetroot/xsetroot.SMBuild index a4376b1..84f3a3e 100755 --- a/xorg/xsetroot/xsetroot.SMBuild +++ b/xorg/xsetroot/xsetroot.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xsetroot-$version. desc="Classic X utility to set your root window background to a given pattern or color" requires="libxmu libxcursor libx11" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" \ $builddist diff --git a/xorg/xtrans/xtrans.SMBuild b/xorg/xtrans/xtrans.SMBuild index 385df53..57f60b0 100755 --- a/xorg/xtrans/xtrans.SMBuild +++ b/xorg/xtrans/xtrans.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/releases/individual/lib/xtrans-$version.t desc="X transport library" requires="libxml2 libxslt xmlto" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xvinfo/xvinfo.SMBuild b/xorg/xvinfo/xvinfo.SMBuild index 49fe41a..830182c 100755 --- a/xorg/xvinfo/xvinfo.SMBuild +++ b/xorg/xvinfo/xvinfo.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xvinfo-$version.ta desc="Outputs video adaptors capabilities that are accessible through the X-Video extension" requires="libxv" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix="" diff --git a/xorg/xwd/xwd.SMBuild b/xorg/xwd/xwd.SMBuild index a3f892b..06b3787 100755 --- a/xorg/xwd/xwd.SMBuild +++ b/xorg/xwd/xwd.SMBuild @@ -6,14 +6,16 @@ download="https://xorg.freedesktop.org/archive/individual/app/xwd-$version.tar.b desc="X Window System image dumping utility" requires="libxkbfile libxt" -build() { +prepbuilddir() { mkandenterbuilddir rm -rf $app-$version tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions +} +build() { ./configure \ --prefix=""