| index : packages | |
| Archlinux32 package modifications | gitolite user |
| summaryrefslogtreecommitdiff |
diff --git a/build-support/disabled/ant19/PKGBUILD b/build-support/disabled/ant19/PKGBUILD new file mode 100644 index 00000000..4f829a3b --- /dev/null +++ b/build-support/disabled/ant19/PKGBUILD @@ -0,0 +1,102 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> +# Contributor: Andrew Wright <andreww@photism.org> +# Contributor: Paul Mattal <paul@archlinux.org> + +pkgbase=ant19 +_pkgbase=ant +pkgname=('ant19' 'ant19-doc') +pkgver=1.9.15 +pkgrel=3 +pkgdesc='Java based build tool' +url='https://ant.apache.org/' +arch=('any') +license=('APACHE') +makedepends=('bash' 'bin32-jdk7' 'junit' 'java-hamcrest') +source=(https://www.apache.org/dist/ant/source/apache-${_pkgbase}-${pkgver}-src.tar.bz2{,.asc} + ant.conf + apache-ant-1.9.15-https-and-repo-urls.patch + NetRexx.zip::ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip) + +sha256sums=('7f7251009dc53e60afac47d0df6bd7e7d3cdba9fa7fec67b7a95412e8becdc8b' + 'SKIP' + '23bbef577b56d48adb1985dbd9795e5533146646f1e8bb879dd061a4014ffcf2' + 'fc8ed0be9586293a8a7f6cf8d245d1db56c43598b6a155ee27f7a4eeb59cafec' + '1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4') +validpgpkeys=( + 'CE8075A251547BEE249BC151A2115AE15F6B8B72' # Stefan Bodewig + '8DA70C00DF7AF1B0D2F9DC74DDBCC1270A29D081' # jaikiran@apache <jaikiran@apache.org> +) + +_replace_lib() { + # explicitly call rm to ensure we replace instead of add + rm "$2" + ln -s "$1" "$2" +} + +prepare() { + cd apache-${_pkgbase}-${pkgver} + patch -Np1 < $srcdir/apache-ant-1.9.15-https-and-repo-urls.patch + mkdir -p ~/.ant/tempcache + cp $srcdir/NetRexx.zip ~/.ant/tempcache/. + sed -i 's|/usr/bin/python|/usr/bin/python2|' src/script/runant.py +} + +build() { + cd apache-${_pkgbase}-${pkgver} + export JAVA_HOME=/usr/lib/jvm/java-7-jdk + ./bootstrap.sh + bootstrap/bin/ant -Ddest=optional -f fetch.xml + _replace_lib /usr/share/java/junit.jar lib/optional/junit-4.12.jar + _replace_lib /usr/share/java/hamcrest-core.jar lib/optional/hamcrest-core-1.3.jar + _replace_lib /usr/share/java/hamcrest-library.jar lib/optional/hamcrest-library-1.3.jar + bootstrap/bin/ant dist +} + +package_ant19() { + depends=('bin32-jdk7' 'bash') + optdepends=('junit: junit tasks' + 'java-hamcrest: junit tasks') + conflicts=('ant') + backup=('etc/ant.conf') + + cd apache-${_pkgbase}-${pkgver}/apache-${_pkgbase}-${pkgver} + local _ant_home=/usr/share/ant + + install -d "${pkgdir}${_ant_home}" + cp -Rp etc "${pkgdir}${_ant_home}" + + find bin -type f -a ! -name \*.bat -a ! -name \*.cmd \ + -exec install -Dm 755 {} -t "${pkgdir}${_ant_home}/bin" \; + install -d "${pkgdir}/usr/bin" + ln -s /usr/share/ant/bin/ant "${pkgdir}/usr/bin/ant" + + install -Dm 644 "${srcdir}/ant.conf" -t "${pkgdir}/etc" + install -Dm 644 lib/*.jar -t "${pkgdir}/usr/share/java/ant" + ln -s /usr/share/java/ant "${pkgdir}${_ant_home}/lib" + + install -Dm 644 ../{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_ant19-doc() { + pkgdesc='Apache Ant build tool documentation' + conflicts=('ant-doc') + + install -d "${pkgdir}/usr/share/doc/ant" + cp -r apache-${_pkgbase}-${pkgver}/apache-${_pkgbase}-${pkgver}/manual/* \ + "${pkgdir}/usr/share/doc/ant" +} + +# vim: ts=2 sw=2 et: + +# i486-specific +if [ "${CARCH}" = "i486" ]; then + _JARCH=i386 + _DOC_ARCH=x86 +fi + +# pentium4-specific +if [ "${CARCH}" = "pentium4" ]; then + _JARCH=i386 + _DOC_ARCH=x86 +fi diff --git a/build-support/disabled/ant19/ant.conf b/build-support/disabled/ant19/ant.conf new file mode 100644 index 00000000..63bf219a --- /dev/null +++ b/build-support/disabled/ant19/ant.conf @@ -0,0 +1,8 @@ +# Apache Ant start script configuration file +ANT_HOME=/usr/share/ant + +# Optional jars and their dependencies +OPT_JAR_LIST=/usr/share/java/junit.jar:/usr/share/java/hamcrest-core.jar +LOCALCLASSPATH=${OPT_JAR_LIST} + +# vim:ft=sh diff --git a/build-support/disabled/ant19/apache-ant-1.9.15-https-and-repo-urls.patch b/build-support/disabled/ant19/apache-ant-1.9.15-https-and-repo-urls.patch new file mode 100644 index 00000000..605b4f7b --- /dev/null +++ b/build-support/disabled/ant19/apache-ant-1.9.15-https-and-repo-urls.patch @@ -0,0 +1,73 @@ +diff -rauN apache-ant-1.9.15/fetch.xml apache-ant-1.9.15-https-and-repo-urls-patch/fetch.xml +--- apache-ant-1.9.15/fetch.xml 2020-05-10 15:42:29.000000000 +0200 ++++ apache-ant-1.9.15-https-and-repo-urls-patch/fetch.xml 2021-05-14 20:17:38.020978197 +0200 +@@ -329,19 +329,19 @@ + <f2 project="tomcat" archive="jasper-runtime"/> + <f2 project="javax.servlet" archive="servlet-api"/> + </target> +- ++<!-- + <target name="jai" + description="load Java Advanced Imaging" + depends="init"> + <f2 project="javax.media" archive="jai-core" id="jboss" +- repository="https://repository.jboss.org/nexus/content/groups/public/"/> ++ repository="http://mvnrepository.com/"/> + <f2 project="com.sun.media" archive="jai-codec" id="jboss" +- repository="https://repository.jboss.org/nexus/content/groups/public/"/> ++ repository="http://repository.jboss.org/nexus/content/groups/public/"/> + </target> +- ++--> + <target name="netrexx" + description="load NetRexx compiler" +- depends="init-no-m2,-setup-temp-cache,-fetch-netrexx,-fetch-netrexx-no-commons-net"> ++ depends="init-no-m2,-setup-temp-cache"> + <checksum file="${temp.dir}/NetRexx.zip" algorithm="SHA-256" property="${netrexx.sha256}" verifyProperty="netrexx.hash.matches"/> + <fail message="NetRexx.zip fetched via ftp has an unexpected SHA-256 checksum, the file may have been tampered with"> + <condition> +@@ -361,18 +361,22 @@ + + <available property="have.commons.net" classname="org.apache.commons.net.ftp.FTPClientConfig"/> + ++<!-- + <target name="-fetch-netrexx" if="have.commons.net"> + <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx" + filename="NetRexx.zip" localdir="${temp.dir}"/> + </target> ++--> + ++<!-- + <target name="-fetch-netrexx-no-commons-net" unless="have.commons.net"> + <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip" + dest="${temp.dir}/NetRexx.zip" skipexisting="true"/> + </target> ++--> + + <target name="all" + description="load all the libraries (except jython)" +- depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx"/> ++ depends="antunit,ivy,logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,netrexx"/> + + </project> +diff -rauN apache-ant-1.9.15/lib/libraries.properties apache-ant-1.9.15-https-and-repo-urls-patch/lib/libraries.properties +--- apache-ant-1.9.15/lib/libraries.properties 2020-05-10 15:42:29.000000000 +0200 ++++ apache-ant-1.9.15-https-and-repo-urls-patch/lib/libraries.properties 2021-05-14 20:06:47.150502384 +0200 +@@ -17,7 +17,7 @@ + + # If you change this, change the checksum to match + m2.version=2.1.3 +-m2.url=https://archive.apache.org/dist/maven/ant-tasks ++m2.url=http://archive.apache.org/dist/maven/ant-tasks + m2.artifact-name=maven-ant-tasks + m2.jar.name=${m2.artifact-name}-${m2.version}.jar + #this is the URL of the antlib library, that is pulled down for everything else. +@@ -26,7 +26,7 @@ + m2.sha1.checksum=b09be554228d66d208e5fef5266844aacf443abc + + # Repository to use by default for fetching dependencies. +-m2.repo=https://repo1.maven.org/maven2/ ++m2.repo=http://insecure.repo1.maven.org/maven2/ + + # hashes of libraries loaded over insecure connections + netrexx.sha256=1f99f054e9b1e412d29823088f3fa7cfce90a7af25d907a60a6d7908a6b97ea4 diff --git a/build-support/disabled/ghc90-bin/PKGBUILD b/build-support/disabled/ghc90-bin/PKGBUILD new file mode 100644 index 00000000..beb4c2bf --- /dev/null +++ b/build-support/disabled/ghc90-bin/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: Rudy Matela <rudy@matela.com.br> +# +# Contributor: Rudy Matela <rudy@matela.com.br> +# +# This package can coexist with the latest version of GHC. +# If you would like to compile GHC yourself (AUR: ghc9.0), +# you can use this to bootstrap compilation. +pkgname=ghc90-bin +pkgver=9.0.1 +pkgrel=1 +pkgdesc='Legacy binary GHC 9.0 installed on /usr/bin/ghc-9.0 (Feb/2021 - Feb/2021).' +arch=('i486' 'i686' 'pentium4') +url='http://www.haskell.org/ghc/' +license=('custom') +depends=('gcc' 'gmp' 'libffi' 'perl' 'ncurses5-compat-libs') +makedepends=( 'perl' 'libxslt' 'docbook-xsl') +checkdepends=('python2') +install='ghc.install' +options=('staticlibs') +provides=('ghc9.0') +conflicts=('ghc9.0') +source=("https://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-i386-deb9-linux.tar.xz") +noextract=("ghc-${pkgver}-${CARCH}-deb10-linux.tar.xz") +sha256sums=('880e37cea8328401bcfecfe4bb56eb85195f30135b140140b3f24094264f8ba5') + +prepare() { + # for some reason, bsdtar cannot unpack this file: + tar -xf "ghc-${pkgver}-i386-deb9-linux.tar.xz" + # see https://wiki.archlinux.org/index.php/PKGBUILD#noextract +} + +build() { + cd ghc-${pkgver} + + sed -i 's,"$bindir/ghc","$bindir/ghc-9.0",' utils/runghc/runghc.wrapper + + ./configure \ + --prefix=/usr \ + --docdir=/usr/share/doc/ghc-9.0 +} + +package() { + cd ghc-${pkgver} + + make DESTDIR=${pkgdir} install + + mv ${pkgdir}/usr/bin/ghc ${pkgdir}/usr/bin/ghc-9.0 + mv ${pkgdir}/usr/bin/ghci ${pkgdir}/usr/bin/ghci-9.0 + mv ${pkgdir}/usr/bin/ghc-pkg ${pkgdir}/usr/bin/ghc-pkg-9.0 + mv ${pkgdir}/usr/bin/haddock ${pkgdir}/usr/bin/haddock-ghc-9.0 + mv ${pkgdir}/usr/bin/hp2ps ${pkgdir}/usr/bin/hp2ps-ghc-9.0 + mv ${pkgdir}/usr/bin/hpc ${pkgdir}/usr/bin/hpc-ghc-9.0 + mv ${pkgdir}/usr/bin/hsc2hs ${pkgdir}/usr/bin/hsc2hs-ghc-9.0 + mv ${pkgdir}/usr/bin/runghc ${pkgdir}/usr/bin/runghc-9.0 + rm ${pkgdir}/usr/bin/runhaskell # use runghc-9.0 instead + + mv ${pkgdir}/usr/share/man/man1/ghc.1 ${pkgdir}/usr/share/man/man1/ghc-9.0 + + install -d ${pkgdir}/usr/share/licenses/ghc-9.0 + install -m644 LICENSE ${pkgdir}/usr/share/licenses/ghc-9.0 + + # for some reason I end up with the wrong LLVM target on IA-32, + # patch it + sed -i 's/,("LLVM target", ".*")/,("LLVM target", "i686-unknown-linux")/' ${pkgdir}/usr/lib/ghc-9.0.1/settings +} diff --git a/build-support/disabled/ghc90-bin/ghc.install b/build-support/disabled/ghc90-bin/ghc.install new file mode 100644 index 00000000..68eed631 --- /dev/null +++ b/build-support/disabled/ghc90-bin/ghc.install @@ -0,0 +1,10 @@ +pre_upgrade() { + echo '==> Unregistering cabalized packages...' + [[ -d /usr/share/haskell-ghc-9.0 ]] && find /usr/share/haskell-ghc-9.0 -maxdepth 2 -name 'unregister.sh' -exec {} \; + echo '==> Done.' +} + +post_upgrade() { + echo '==> All cabalized packages need to be reinstalled now.' + echo '==> See /usr/share/haskell-ghc-9.0/ and ghc-pkg-9.0 list --user for a tentative list of affected packages.' +} diff --git a/build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch b/build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch new file mode 100644 index 00000000..0a0b7f04 --- /dev/null +++ b/build-support/disabled/glib2/0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Fri, 7 Jan 2022 18:59:10 +0000 +Subject: [PATCH] glib-compile-schemas: Remove noisy deprecation warnings + +While the warnings are useful for developers, Arch Linux users also see +them when glib-compile-schemas gets run after upgrades, where they just +add noise. + +The alternative to this patch would be redirecting the compiler's stderr +to /dev/null, but that might also suppress more useful errors or +warnings we want users to see. +--- + gio/glib-compile-schemas.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c +index 04ef40457eba..e791ce254454 100644 +--- a/gio/glib-compile-schemas.c ++++ b/gio/glib-compile-schemas.c +@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + diff --git a/build-support/disabled/glib2/PKGBUILD b/build-support/disabled/glib2/PKGBUILD new file mode 100644 index 00000000..afe36dee --- /dev/null +++ b/build-support/disabled/glib2/PKGBUILD @@ -0,0 +1,138 @@ +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +# glib2 without introspection for bootstrapping + +pkgbase=glib2 +pkgname=( + glib2 + glib2-docs +) +pkgver=2.80.0 +pkgrel=3 +pkgdesc="Low level core library" +url="https://gitlab.gnome.org/GNOME/glib" +license=(LGPL-2.1-or-later) +arch=(x86_64 i486 i686 pentium4) +depends=( + libffi + libsysprof-capture + pcre2 + util-linux-libs + zlib +) +makedepends=( + dbus + gettext + git + gi-docgen + gobject-introspection + libelf + meson + python + python-docutils + python-packaging + shared-mime-info + util-linux +) +checkdepends=( + desktop-file-utils + glib2 +) +options=( + debug + staticlibs +) +source=( + "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$pkgver" + "git+https://gitlab.gnome.org/GNOME/gvdb.git" + 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + gio-querymodules.hook + glib-compile-schemas.hook +) +b2sums=('cc3a6a7a14fef1aabc08d3bdfe98f66e3ecf3591ac054d83aa9404c8c9cd72e690a4c26c16934700d067bb2cb3d58730387482032cd9ffa04b041869426165ba' + 'SKIP' + '94c73ca7070c239494873dd52d6ee09382bbb5b1201f7afd737cfa140b1a2fb0744b2c2831baf3943d1d072550c35888d21ce6f19f89481ff9d1a60d9a0b30e0' + '14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96' + 'acc2f474139e535f4bdd70ac22a9150f786b3395e679b14d0d3fbb9361d511bb1b5069d95b2a7ac9c0f3d901b03a0c037eb273446ba00764191b30a777bd2bc9') +validpgpkeys=( + 923B7025EE03C1C59F42684CF0942E894B2EAFA0 # Philip Withnall <pwithnall@gnome.org> +) + +prepare() { + cd glib + + # Suppress noise from glib-compile-schemas.hook + git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch + + git submodule init + git submodule set-url subprojects/gvdb "$srcdir/gvdb" + git -c protocol.file.allow=always submodule update +} + +build() { + local meson_options=( + --default-library both + -D glib_debug=disabled + -D documentation=true + -D introspection=disabled + -D man-pages=enabled + -D selinux=disabled + -D sysprof=enabled + ) + + # Produce more debug info: GLib has a lot of useful macros + CFLAGS+=" -g3" + CXXFLAGS+=" -g3" + + # use fat LTO objects for static libraries + CFLAGS+=" -ffat-lto-objects" + CXXFLAGS+=" -ffat-lto-objects" + + arch-meson glib build "${meson_options[@]}" + meson compile -C build +} + +check() { + meson test -C build --no-suite flaky --no-suite slow --print-errorlogs || true +} + +package_glib2() { + depends+=( + libffi.so + libmount.so + ) + provides+=(libg{lib,io,irepository,module,object,thread}-2.0.so) + optdepends=( + 'gvfs: most gio functionality' + 'libelf: gresource inspection tool' + 'python: gdbus-codegen, glib-genmarshal, glib-mkenums, gtester-report' + 'python-packaging: gdbus-codegen' + ) + + meson install -C build --destdir "$pkgdir" + + install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook + touch "$pkgdir/usr/lib/gio/modules/.keep" + + python -m compileall -d /usr/share/glib-2.0/codegen \ + "$pkgdir/usr/share/glib-2.0/codegen" + python -O -m compileall -d /usr/share/glib-2.0/codegen \ + "$pkgdir/usr/share/glib-2.0/codegen" + + # Split docs + mkdir -p docs/usr/share + mv {"$pkgdir",docs}/usr/share/doc +} + +package_glib2-docs() { + pkgdesc+=" - documentation" + depends=() + license+=(LicenseRef-Public-Domain) + + mv -t "$pkgdir" docs/* + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 glib/docs/reference/COPYING +} + +# vim:set sw=2 sts=-1 et: diff --git a/build-support/disabled/glib2/gio-querymodules.hook b/build-support/disabled/glib2/gio-querymodules.hook new file mode 100644 index 00000000..85781479 --- /dev/null +++ b/build-support/disabled/glib2/gio-querymodules.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/gio/modules/*.so + +[Action] +Description = Updating GIO module cache... +When = PostTransaction +Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules diff --git a/build-support/disabled/glib2/glib-compile-schemas.hook b/build-support/disabled/glib2/glib-compile-schemas.hook new file mode 100644 index 00000000..93d1ed53 --- /dev/null +++ b/build-support/disabled/glib2/glib-compile-schemas.hook @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/share/glib-2.0/schemas/*.xml +Target = usr/share/glib-2.0/schemas/*.override + +[Action] +Description = Compiling GSettings XML schema files... +When = PostTransaction +Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas diff --git a/build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc b/build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc new file mode 100644 index 00000000..55967633 --- /dev/null +++ b/build-support/disabled/glib2/keys/pgp/923B7025EE03C1C59F42684CF0942E894B2EAFA0.asc @@ -0,0 +1,436 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQSuBEwtmR0RDACIo0IbbU/kOUSPw4WdH0slQvdrPE00FSafHyupPuv0xrXGPmNp +HWdX9g+jAmDJBZL6bA6bKYwSmhvWtLrnzNvvm0zOz24YrH/94jdLSs3NLuzFG541 +pQVoSkmAyh8bGyA7wuw+hqrXdDmrMsgXuP05c5RyXtgOeaw52L5RE53GRX0fPQxb +nSuodtxJUBdLp4VMHOpUOiFs76fcLMLUp2KtbikccrnhEaVaLOg45DvqPEF10igS +ln4RSKJGh88v6v4/Eryy/3yx4yr5aToOIT01MYjRkkiQ4/2VtvFEiUmCEtwzH1L9 +/gRK/ic/2LT5Ve1bsHU5MUhkeLyShf6lIvnnPns1V90MAeqLYGxlpc5etOqprku9 +7Q2AN9/r8F+eGFmhFwxnB4hPaylfg2Lc6I0VLZaC+hn/ba1IHuzc2e/o+3YcC69u +UAuYceheDFa3VB9+bDYwHEwDTzgYq8pFBUtDD4CJWSUiZOgK6UEiJYxD1Ym79iJj +/S7p/ZY2sZ8Cq48BAJVGUC6L+pymbPonp1P/0RoxJnjFav0VcNxr1OTkIjYtC/9c +G2Ir5QDGw+2xJh06pC7HyURYy4Z2krG0V0T7wxlVNGXRdJ8KVdUEko7EhfWXC+/M ++qzkYyODv4wKBStMAM07Yle9u29PfMHsy/kdYXXWnuhlHfXKvV86bIpQobHRtWUM +x3LO73j5zlIy2U3wyHaYdznlijJ2oqSLhvdigFzMrCFgL2ub8Rg3hUhwJqpEKegM +IrZWaROoSAJAX/3cbG1j+c+rtC/1SkM+AzIs0xl3BHgjeqjOA+qQhi6Ch8DDvGK2 +ha9trZFihB9QZ8rR84Rbo8oTZwLiduSKtJccEP3N2PQMhJTXa3kGiKxZdVP5lCjc +5x23MrQD6vbp9vKlwXXh4CXdr0yvFglWzQ4ZDm7v50qNE3wf3N11T7FRXvVrXLWx +ouJp0CWAVULCU4GiyftbQ3+VWRyQfn68gfx7PaBRtLcKxsmJ8jR2VkxHTy8M9cGg +dBIirbAaEyneBb5HPhs1MeuWvxt6FZb2nhksZio1Dk3DXReTCz7M+T20YtpztasL +/A591wF9dJ31RmXT7pCF4rT1QIjX5aVFtF4csm774Yj2Mhw/naesSvzfCsHYGLJI +d/CIP3AuVd+ggEt3PfKCLZUEJj2QuEFpePR6YJio2S9h29SXf5VM3Qjnyon81oVm +a9mYeqWpt9W9n+edcf03xaChyBW9ji2/92ApHf7W7+7D5ZthpSyknsnQmi3KxAwa +gYwPVFoL08WLp6kUqnbdJhqXr/PXaQlFyfGquhRUeWIHsN3OsTNpi0Ieu8NIjRE4 +Fobsb53VkoY2kjvw+W8Yf+VHaW9YE3FsnCiHR/IHNAn9SNImxw1oEh3GnTW4dmuz +rDRzkGuqto1E8EedjeNRs0xGBT/RfHdHQWACu+0Y6MNY0wBqIe56pe8QV0Nkm7LB +KNWHk6yiUvc/ksQuK2WKXSsCEtR+zOKK+ecvcxbR3L1DDG/J4feuEhpNETTWKRqi +P0DKqTfWk8MbGdezaA+nhqD9UYLb0f36iLfujgdzJvLUa/MJvyMjEpkkIkdhqamZ +KrQlUGhpbGlwIFdpdGhuYWxsIDxwd2l0aG5hbGxAZ25vbWUub3JnPoiTBBMRCAA7 +FiEEkjtwJe4DwcWfQmhM8JQuiUsur6AFAmXqLGICGwMFCwkIBwICIgIGFQoJCAsC +BBYCAwECHgcCF4AACgkQ8JQuiUsur6DfqgD/eJj4Nypmg5CzXjlnsvf6o7MziYMI +CREnEOv5GlUZ7EoA/3Xa+FM85pPeixskfbXs4nd+6SQT1l8TiFfYUVF+/0+/tEJQ +aGlsaXAgV2l0aG5hbGwgKGh0dHBzOi8vZW5kbGVzc29zLm9yZy8pIDxwd2l0aG5h +bGxAZW5kbGVzc29zLm9yZz6IkAQTEQgAOBYhBJI7cCXuA8HFn0JoTPCULolLLq+g +BQJffjzhAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEPCULolLLq+glDsA +/R4RkhWJuOIbPWvv1flTofjAIx9ZFS3FchUxR8wG6y8MAP95Iu481k0J7zP+xkoP +3gtQpjleVrx8sj6znBAk3fO48rRAUGhpbGlwIFdpdGhuYWxsIChodHRwczovL2Vu +ZGxlc3Nvcy5jb20vKSA8d2l0aG5hbGxAZW5kbGVzc20uY29tPoh5BBMRCAAhBQJY +UB0QAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJEPCULolLLq+ga4MA+gMS +mVyAQxKBotWvvalxZyYUA1XHvEPzsezXC9IulYeiAQCFYM5t13bQ/B/2CsSO2pLt +901Kc0VOcl6Ld3sG6YvKBbQoUGhpbGlwIFdpdGhuYWxsIDxwaGlsaXBAdGVjbm9j +b2RlLmNvLnVrPoh9BBMRCAAlAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZ +AQUCV1amqwAKCRDwlC6JSy6voHVQAP9fn/pk7GxQQ1TCATDpr+prdZGm0wNYQkIq +ZOg6F8A5YgD+KxZ3pxurEdsMPjbx1QQwXy06c22df3oDADquLWPxa+q0KFBoaWxp +cCBXaXRobmFsbCA8cGhpbGlwQHdpdGhuYWxsLm9yZy51az6IegQTEQgAIgIbAwYL +CQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAldWpq8ACgkQ8JQuiUsur6C5CgD/QQKV +KhywU4BKjGYGcex8OyGyJPdSsnD4Zp76B9b91rYA/1IRW/MLEYkq/Q7VfZGmoZzF +ptNvGjDX3JXvAH1YwNnKtCxQaGlsaXAgV2l0aG5hbGwgPHBoaWxpcC53aXRobmFs +bEBjYW50YWIubmV0Poh6BBMRCAAiAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIX +gAUCV1amrwAKCRDwlC6JSy6voCjyAP0THfWdp9dGM9467poA4PgmSzQ3+mlrPXe+ +93fflk35fAD/fit9/oHLw+DFftK+2O05IIvNbr1gnhbdV7tbxZs1P8y0MVBoaWxp +cCBXaXRobmFsbCA8cGhpbGlwLndpdGhuYWxsQGNvbGxhYm9yYS5jby51az6IcQQw +EQgAGQUCWFAd5xIdIEVtcGxveW1lbnQgZW5kZWQACgkQ8JQuiUsur6AoIAD9E+er +71OpFHwFDqhkxkcLIqJFIKJRSq8AxdppkreVEGwA/3W6w094LzFVrHOIcoSjoO9s +IoOfRj8DdF27Myu5EJWvtC9QaGlsaXAgV2l0aG5hbGwgPHBoaWxpcC53aXRobmFs +bEBjb2xsYWJvcmEuY29tPohxBDARCAAZBQJYUB3nEh0gRW1wbG95bWVudCBlbmRl +ZAAKCRDwlC6JSy6voJRrAP9wZ4k73FjixpAWRiMBjUuohZozsZ8QGXVsne8M7ZgR +YQD9F98ZEp5MXKPfxplr3fARMVMc3BnvxjQz7WFvvLCiULi0J1BoaWxpcCBXaXRo +bmFsbCA8cGhpbGlwQG9jcHJvZHVjdHMuY29tPoiABDARCAAoBQJXZKEDIR0gRS1t +YWlsIGFkZHJlc3Mgbm8gbG9uZ2VyIGV4aXN0cwAKCRDwlC6JSy6voGFUAP9R6vet +UkXnPNTpo05X8rxYSIcBsyKc632+AJP8CBR8vQD+KMyq45BCX/brAQrB1NZuLx2g +YcmGfCaSigGNxQ8Sgz20IVBoaWxpcCBXaXRobmFsbCA8cHJ3MzVAY2FtLmFjLnVr +PoiABDARCAAoBQJXZKDsIR0gRS1tYWlsIGFkZHJlc3Mgbm8gbG9uZ2VyIGV4aXN0 +cwAKCRDwlC6JSy6voOxFAP4/UOYZ6LjwpQBcjj+Rg4Ezddp17H/4/LHkJ9koT+Dc +owD9G8NsSgl6oTk28fW5vwD9024Eci/QlBupd3N4mEr/4cPR/wAAL9v/AAAv1gEQ +AAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJRgABAQEASABIAAD/4Q6QRXhpZgAASUkq +AAgAAAALAA8BAgATAAAAkgAAABABAgARAAAApgAAABIBAwABAAAAAQAAABoBBQAB +AAAAuAAAABsBBQABAAAAwAAAACgBAwABAAAAAgAAADEBAgALAAAAyAAAADIBAgAU +AAAA1AAAABMCAwABAAAAAgAAAGmHBAABAAAARgIAAKXEBwBeAQAA6AAAABoEAABQ +RU5UQVggQ29ycG9yYXRpb24AAFBFTlRBWCBPcHRpbyBXMzAAAEgAAAABAAAASAAA +AAEAAABHSU1QIDIuNi4xAAAyMDA5OjAxOjA0IDExOjMzOjAxAFByaW50SU0AMDMw +MAAAIQABABYAFgACAAEAAAADANYAAAAHAAAAAAAIAAAAAAAJAAAAAAAKAAAAAAAL +AB4BAAAMAAAAAAANAAAAAAAOADYBAAAAAQUAAAABAf8AAAACAYMAAAADAYMAAAAE +AYMAAAAFAYMAAAAGAYMAAAAHAYODgwAQAYAAAAAAAgAAAAAHAgAAAAAIAgAAAAAJ +AgAAAAAKAgAAAAALAkYBAAANAgAAAAAAAwUAAAABA/8AAAACA4MAAAADA4MAAAAG +A4MAAAAQA4AAAAAJEQAAECcAAAsPAAAQJwAAlwUAABAnAACwCAAAECcAAAEcAAAQ +JwAAXgIAABAnAACLAAAAECcAAMsDAAAQJwAA5RsAABAnAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAHACaggUAAQAAAJwDAACdggUAAQAAAKQDAAAniAMAAQAAAJABAAAAkAcABAAA +ADAyMjADkAIAFAAAAKwDAAAEkAIAFAAAAMADAAABkQcABAAAAAECAwACkQUAAQAA +ANQDAAAEkgoAAQAAANwDAAAFkgUAAQAAAOQDAAAHkgMAAQAAAAUAAAAJkgMAAQAA +ABAAAAAKkgUAAQAAAOwDAAAAoAcABAAAADAxMDABoAMAAQAAAAEAAAACoAQAAQAA +AGwAAAADoAQAAQAAAJYAAAAFoAQAAQAAAPwDAAABpAMAAQAAAAAAAAACpAMAAQAA +AAAAAAADpAMAAQAAAAAAAAAEpAUAAQAAAPQDAAAFpAMAAQAAACYAAAAGpAMAAQAA +AAAAAAAIpAMAAQAAAAAAAAAJpAMAAQAAAAAAAAAKpAMAAQAAAAAAAAAMpAMAAQAA +AAIAAAAAAAAAAQAAAAoAAAAhAAAACgAAADIwMDk6MDE6MDQgMTE6MTA6MDMAMjAw +OTowMTowNCAxMToxMDowMwAEAAAAAQAAAAAAAAAKAAAAIgAAAAoAAAA/AAAACgAA +AGQAAABkAAAAAgABAAIABAAAAFI5OAACAAcABAAAADAxMDAAAAAABgADAQMAAQAA +AAYAAAAaAQUAAQAAAGgEAAAbAQUAAQAAAHAEAAAoAQMAAQAAAAIAAAABAgQAAQAA +AHgEAAACAgQAAQAAABAKAAAAAAAASAAAAAEAAABIAAAAAQAAAP/Y/+AAEEpGSUYA +AQEAAAEAAQAA/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwc +ICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEc +ITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy +MjIy/8AAEQgAbABNAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgME +BQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQy +gZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RV +VldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqy +s7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/E +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 +QoWjNoH2LflT0wDiOYezq+XOGn7Z +=Orfv +-----END PGP PUBLIC KEY BLOCK----- diff --git a/build-support/disabled/java/bin32-jdk6/PKGBUILD b/build-support/disabled/java/bin32-jdk6/PKGBUILD new file mode 100644 index 00000000..2bac2781 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/PKGBUILD @@ -0,0 +1,174 @@ +# Maintainer: +# Contributor: Felix Golatofski <contact@xdfr.de> +# Contributor: Det +# Contributor: Damian Nowak + +_pkgname=jdk +pkgname=bin32-jdk6 +_major=6 +_minor=45 +_build=b06 +pkgver=${_major}u${_minor} +pkgrel=6 +pkgdesc="Oracle Java $_major Development Kit (32-bit) (public release - end of support)" +arch=('x86_64' 'i486') +url="https://www.java.com/en/download/faq/java_$_major.xml" +license=('custom') +depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' + 'gcc-libs' 'libxrender' 'libxtst' 'nss' 'xdg-utils') +optdepends=('eclipse: "Oracle Java Mission Control" plugins for Eclipse' + 'alsa-lib: for basic sound support' + 'gtk2: for Gtk+ look and feel (desktop)') +provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major" + "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major") + +# Variables +DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u') +_jname=${_pkgname}${_major} +_jvmdir=/usr/lib32/jvm/java-$_major-$_pkgname + +backup=("etc/java-$_jname/i386/jvm.cfg" + "etc/java-$_jname/images/cursors/cursors.properties" + "etc/java-$_jname/management/jmxremote.access" + "etc/java-$_jname/management/management.properties" + "etc/java-$_jname/security/java.policy" + "etc/java-$_jname/security/java.security" + "etc/java-$_jname/security/javaws.policy" + "etc/java-$_jname/content-types.properties" + "etc/java-$_jname/flavormap.properties" + "etc/java-$_jname/fontconfig.properties.src" + "etc/java-$_jname/logging.properties" + "etc/java-$_jname/net.properties" + "etc/java-$_jname/psfont.properties.ja" + "etc/java-$_jname/psfontj2d.properties" + "etc/java-$_jname/sound.properties") +options=('!strip') # JDK debug-symbols +install=$pkgname.install +source=("https://download.oracle.com/otn/java/jdk/${pkgver}-${_build}/jdk-${pkgver}-linux-i586.bin" + "https://download.oracle.com/otn-pub/java/jce_policy/$_major/jce_policy-$_major.zip" + "jconsole32-$_jname.desktop" + "jmc32-$_jname.desktop" + "jvisualvm32-$_jname.desktop" + "policytool32-$_jname.desktop" + 'javaws-launcher') +sha256sums=('d53b5a2518d80e1d95565f0adda54eee229dc5f4a1d1a3c2f7bf5045b168a357' + 'd0c2258c3364120b4dbf7dd1655c967eee7057ac6ae6334b5ea8ceb8bafb9262' + '6195ce056e55247365b5cc2363e5e28f8bdb6842f65a41d37732279aee17ce57' + 'a10ec033765a0ecf1fdd8ef8dee3614391f8b3605bb8b4f0d957ff7c7c958563' + 'c7377ddaaee8579a230356e9878030a9f2a8cbcc5c2f89114d6244db051a0a01' + 'ce1ac5bf1fd639fe0e0fe08880e8eae5b2fbf6903a7c51ed8168aee8fd1ee66a' + '5a43bf54553ea39c147a67935d68646806a5053fefd527bd69c546f4c884402e') + +package() { + msg2 "Extracting the .bin" + rm -rf ${_pkgname}1.${_major}.0_${_minor} + sh $_pkgname-$pkgver-linux-i586.bin &>/dev/null + + cd ${_pkgname}1.${_major}.0_${_minor} + + msg2 "Creating directory structure..." + install -d "$pkgdir"/etc/.java/.systemPrefs + install -d "$pkgdir"/usr/lib32/jvm/java-$_major-$_pkgname/bin + install -d "$pkgdir"/usr/lib32/mozilla/plugins + install -d "$pkgdir"/usr/share/licenses/java${_major}-${_pkgname}32 + + msg2 "Removing redundancies..." + rm db/bin/*.bat + rm db/3RDPARTY + rm db/LICENSE + rm -r jre/lib/desktop/icons/HighContrast + rm -r jre/lib/desktop/icons/HighContrastInverse + rm -r jre/lib/desktop/icons/LowContrast + rm jre/lib/fontconfig.*.bfc + rm jre/lib/fontconfig.*.properties.src + rm -r jre/plugin/ + rm jre/*.txt + rm jre/COPYRIGHT + rm jre/LICENSE + rm jre/README + rm man/ja + + msg2 "Moving contents..." + mv * "$pkgdir"/$_jvmdir + + # Cd to the new playground + cd "$pkgdir"/$_jvmdir + + # javaws-launcher + install -m644 "$srcdir"/javaws-launcher bin/ + + msg2 "Fixing directory structure..." + # Replace duplicate binaries in bin/ with links to jre/bin/ + for i in $(ls jre/bin/); do + ln -sf "$_jvmdir/jre/bin/$i" "bin/$i" + done + + # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png) + for i in $(find jre/lib/desktop/ -type f); do + rename -- "." "32-$_jname." $i + done + + # Fix .desktop's + sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \ + -e "s|Name=JavaWS|Name=JavaWS $_major|" \ + -e "s|Name=.*|& (32-bit)|" \ + -e "s|Comment=Java|Comment=Java $_major|" \ + -e "s|Comment=.*|& (32-bit)|" \ + -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \ + -e "s|.png|32-$_jname.png|" \ + -i jre/lib/desktop/applications/* + + # Move .desktops + icons to /usr/share + mv jre/lib/desktop/* "$pkgdir"/usr/share/ + install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ + + # Move confs to /etc and link back to /usr: /usr/lib32/jvm/java-$_jname/jre/lib -> /etc + for new_etc_path in ${backup[@]}; do + # Old location + old_usr_path="jre/lib/${new_etc_path#*$_jname/}" + + # Move + install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path" + ln -sf "/$new_etc_path" "$old_usr_path" + done + + # Link NPAPI plugin + ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so "$pkgdir"/usr/lib32/mozilla/plugins/libnpjp2-$_jname.so + + # Replace JKS keystore with 'ca-certificates-java' + ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts + + # Suffix man pages + for i in $(find man/ -type f); do + mv "$i" "${i/.1}32-$_jname.1" + done + + # Move man pages + mv man/ja_JP.eucJP/ man/ja + mv man/ "$pkgdir"/usr/share + + # Move/link licenses + mv db/NOTICE COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java${_major}-${_pkgname}32/ + ln -sf /usr/share/licenses/java${_major}-${_pkgname}32/ "$pkgdir"/usr/share/licenses/$pkgname + + msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..." + # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for + # things like 256-bit AES. Enabled by default in OpenJDK: + # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html + # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html + install -m644 "$srcdir"/jce/*.jar jre/lib/security/ + install -Dm644 "$srcdir"/jce/README.txt \ + "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt + + msg2 "Enabling copy+paste in unsigned applets..." + # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: + # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java + # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html + _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy) + sed "$_line a\\\\n \ + // (AUR) Allow unsigned applets to read system clipboard, see:\n \ + // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \ + // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \ + permission java.awt.AWTPermission \"accessClipboard\";" \ + -i "$pkgdir"/etc/java-$_jname/security/java.policy +} diff --git a/build-support/disabled/java/bin32-jdk6/bin32-jdk6.install b/build-support/disabled/java/bin32-jdk6/bin32-jdk6.install new file mode 100644 index 00000000..3d623c37 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/bin32-jdk6.install @@ -0,0 +1,71 @@ +THIS_JAVA='java32-6-jdk' +NAME='32-bit JDK 6' + +all_off="$(tput sgr0)" +bold="${all_off}$(tput bold)" +blue="${bold}$(tput setaf 4)" +yellow="${bold}$(tput setaf 3)" + +note() { + printf "${blue}::${yellow} archlinux-java32:${bold} $1${all_off}\n" +} + +update_desktop() { + update-desktop-database -q + update-mime-database /usr/share/mime >/dev/null + xdg-icon-resource forceupdate &>/dev/null +} + +post_install() { + default=$(archlinux-java32 get) + case ${default} in + "") + archlinux-java32 set ${THIS_JAVA} + note "${NAME} ('${THIS_JAVA}') set as default Java environment." + ;; + ${THIS_JAVA}) + note "${NAME} ('${THIS_JAVA}') set as default Java environment." + ;; + *) + note "Default Java environment already set to '${default}'. + To use ${NAME} ('${THIS_JAVA}'), run: + # archlinux-java32 set ${THIS_JAVA} + For status, use: + $ archlinux-java32 status" + ;; + esac + + if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then + update-ca-trust + fi + + update_desktop +} + +post_upgrade() { + post_install +} + +pre_remove() { + default=$(archlinux-java32 get) + if [[ ${default} = ${THIS_JAVA} ]]; then + archlinux-java32 unset + fi +} + +post_remove() { + default=$(archlinux-java32 get) # reassign + if [[ ${default} ]]; then + note "Default Java environment is '${default}'." + else + archlinux-java32 fix + default=$(archlinux-java32 get) # re-reassign + if [[ ${default} ]]; then + note "Default Java environment left as '${default}'." + else + note "Java environment unset." + fi + fi + + update_desktop +} diff --git a/build-support/disabled/java/bin32-jdk6/javaws-launcher b/build-support/disabled/java/bin32-jdk6/javaws-launcher new file mode 100644 index 00000000..2831dfcb --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/javaws-launcher @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -z "$@" ]; then + exec javaws -viewer +else + exec javaws "$@" +fi diff --git a/build-support/disabled/java/bin32-jdk6/jconsole32-jdk6.desktop b/build-support/disabled/java/bin32-jdk6/jconsole32-jdk6.desktop new file mode 100644 index 00000000..07969d50 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/jconsole32-jdk6.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-6-jdk/bin/jconsole +Icon=sun-java32-jdk6 +Name=Java 6 Monitoring and Management Console (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk6/jmc32-jdk6.desktop b/build-support/disabled/java/bin32-jdk6/jmc32-jdk6.desktop new file mode 100644 index 00000000..9eb18b46 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/jmc32-jdk6.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-6-jdk/bin/jmc +Icon=sun-java32-jdk6 +Name=Java 6 Mission Control (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk6/jvisualvm32-jdk6.desktop b/build-support/disabled/java/bin32-jdk6/jvisualvm32-jdk6.desktop new file mode 100644 index 00000000..3c1f6a32 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/jvisualvm32-jdk6.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-6-jdk/bin/jvisualvm +GenericName=Java 6 Monitoring and Performance Monitoring Tool (32-bit) +Icon=sun-java32-jdk6 +Name=Java 6 VisualVM (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk6/policytool32-jdk6.desktop b/build-support/disabled/java/bin32-jdk6/policytool32-jdk6.desktop new file mode 100644 index 00000000..7b1295ef --- /dev/null +++ b/build-support/disabled/java/bin32-jdk6/policytool32-jdk6.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-6-jdk/jre/bin/policytool +Icon=sun-java32-jdk6 +Name=Java 6 Policy Settings (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/build-support/disabled/java/bin32-jdk7/.SRCINFO b/build-support/disabled/java/bin32-jdk7/.SRCINFO new file mode 100644 index 00000000..340404ab --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/.SRCINFO @@ -0,0 +1,60 @@ +pkgbase = bin32-jdk7 + pkgdesc = Oracle Java 7 Development Kit (32-bit) (public release - end of support) + pkgver = 7u80 + pkgrel = 2 + url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html + install = bin32-jdk7.install + arch = x86_64 + license = custom + depends = ca-certificates-java + depends = hicolor-icon-theme + depends = java32-environment-common + depends = java32-runtime-common + depends = lib32-gcc-libs + depends = lib32-libxrender + depends = lib32-libxtst + depends = lib32-nss + depends = xdg-utils + optdepends = eclipse: "Oracle Java Mission Control" plugins for Eclipse + optdepends = lib32-alsa-lib: for basic sound support + optdepends = lib32-gtk2: for Gtk+ look and feel (desktop) + provides = java32-runtime=7 + provides = java32-runtime-headless=7 + provides = java32-web-start=7 + provides = java32-environment=7 + provides = java32-runtime-jre=7 + provides = java32-runtime-headless-jre=7 + provides = java32-web-start-jre=7 + provides = java32-environment-jdk=7 + provides = java32-openjfx=7 + options = !strip + backup = etc/java32-jdk7/i386/jvm.cfg + backup = etc/java32-jdk7/images/cursors/cursors.properties + backup = etc/java32-jdk7/management/jmxremote.access + backup = etc/java32-jdk7/management/management.properties + backup = etc/java32-jdk7/security/java.policy + backup = etc/java32-jdk7/security/java.security + backup = etc/java32-jdk7/security/javaws.policy + backup = etc/java32-jdk7/content-types.properties + backup = etc/java32-jdk7/flavormap.properties + backup = etc/java32-jdk7/fontconfig.properties.src + backup = etc/java32-jdk7/logging.properties + backup = etc/java32-jdk7/net.properties + backup = etc/java32-jdk7/psfont.properties.ja + backup = etc/java32-jdk7/psfontj2d.properties + backup = etc/java32-jdk7/sound.properties + source = https://download.oracle.com/otn/java/jdk/7u80-b15/jdk-7u80-linux-i586.tar.gz + source = https://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip + source = jconsole32-jdk7.desktop + source = jmc32-jdk7.desktop + source = jvisualvm32-jdk7.desktop + source = policytool32-jdk7.desktop + md5sums = 02ec71669febecd92eb45c2810e6008a + md5sums = c47e997b90ddfd0d813a37ccc97fb933 + md5sums = 721fa304a1f1057c7079330308772ca4 + md5sums = 8a9ff08e43c75c4d7460790dff7dfd4a + md5sums = a16f78eb4c0002fc0e57d95ac9f503f3 + md5sums = 28afaff6decb032e3cce3d88f2fca0d7 + +pkgname = bin32-jdk7 + diff --git a/build-support/disabled/java/bin32-jdk7/PKGBUILD b/build-support/disabled/java/bin32-jdk7/PKGBUILD new file mode 100644 index 00000000..175da1bc --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/PKGBUILD @@ -0,0 +1,166 @@ +# Maintainer: +# Contributor: Felix Golatofski <contact@xdfr.de> +# Contributor: Det +# Contributor: Damian Nowak + +_pkgname=jdk +pkgname=bin32-jdk7 +_major=7 +_minor=80 +_build=b15 +pkgver=${_major}u${_minor} +pkgrel=2 +pkgdesc="Oracle Java $_major Development Kit (32-bit) (public release - end of support)" +arch=('x86_64' 'i486' 'i686' 'pentium4') +url='http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html' +license=('custom') +depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' + 'gcc-libs' 'libxrender' 'libxtst' 'nss' 'xdg-utils') +optdepends=('eclipse: "Oracle Java Mission Control" plugins for Eclipse' + 'lib-alsa-lib: for basic sound support' + 'lib-gtk2: for Gtk+ look and feel (desktop)') +provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major" + "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major" + "java-openjfx=$_major") + +# Variables +DLAGENTS=('https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u') +_jname=${_pkgname}${_major} +_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname + +backup=("etc/java-$_jname/i386/jvm.cfg" + "etc/java-$_jname/images/cursors/cursors.properties" + "etc/java-$_jname/management/jmxremote.access" + "etc/java-$_jname/management/management.properties" + "etc/java-$_jname/security/java.policy" + "etc/java-$_jname/security/java.security" + "etc/java-$_jname/security/javaws.policy" + "etc/java-$_jname/content-types.properties" + "etc/java-$_jname/flavormap.properties" + "etc/java-$_jname/fontconfig.properties.src" + "etc/java-$_jname/logging.properties" + "etc/java-$_jname/net.properties" + "etc/java-$_jname/psfont.properties.ja" + "etc/java-$_jname/psfontj2d.properties" + "etc/java-$_jname/sound.properties") +options=('!strip') # JDK debug-symbols +install=$pkgname.install +source=("https://download.oracle.com/otn/java/jdk/${pkgver}-${_build}/jdk-${pkgver}-linux-i586.tar.gz" + "https://download.oracle.com/otn-pub/java/jce/$_major/UnlimitedJCEPolicyJDK$_major.zip" + "jconsole32-$_jname.desktop" + "jmc32-$_jname.desktop" + "jvisualvm32-$_jname.desktop" + "policytool32-$_jname.desktop") +md5sums=('0811a4045714bd8f1e1577e318528597' + '5504e2d9029ee2c41730a228758c50e1' + '721fa304a1f1057c7079330308772ca4' + '8a9ff08e43c75c4d7460790dff7dfd4a' + 'a16f78eb4c0002fc0e57d95ac9f503f3' + '28afaff6decb032e3cce3d88f2fca0d7') + +package() { + cd ${_pkgname}1.${_major}.0_${_minor} + + msg2 "Creating directory structure..." + install -d "$pkgdir"/etc/.java/.systemPrefs + install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin + install -d "$pkgdir"/usr/lib/mozilla/plugins + install -d "$pkgdir"/usr/share/licenses/java${_major}-${_pkgname}32 + + msg2 "Removing redundancies..." + rm db/bin/*.bat + rm db/3RDPARTY + rm db/LICENSE + rm -r jre/lib/desktop/icons/HighContrast + rm -r jre/lib/desktop/icons/HighContrastInverse + rm -r jre/lib/desktop/icons/LowContrast + rm jre/lib/fontconfig.*.bfc + rm jre/lib/fontconfig.*.properties.src + rm -r jre/plugin/ + rm jre/*.txt + rm jre/COPYRIGHT + rm jre/LICENSE + rm jre/README + rm man/ja + + msg2 "Moving contents..." + mv * "$pkgdir"/$_jvmdir + + # Cd to the new playground + cd "$pkgdir"/$_jvmdir + + msg2 "Fixing directory structure..." + # Replace duplicate binaries in bin/ with links to jre/bin/ + for i in $(ls jre/bin/); do + ln -sf "$_jvmdir/jre/bin/$i" "bin/$i" + done + + # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png) + for i in $(find jre/lib/desktop/ -type f); do + rename -- "." "32-$_jname." $i + done + + # Fix .desktop's + sed -e '/JavaWS/!s|Name=Java|Name=Java '"$_major"'|' \ + -e "s|Name=JavaWS|Name=JavaWS $_major|" \ + -e "s|Name=.*|& (32-bit)|" \ + -e "s|Comment=Java|Comment=Java $_major|" \ + -e "s|Comment=.*|& (32-bit)|" \ + -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \ + -e "s|.png|32-$_jname.png|" \ + -i jre/lib/desktop/applications/* + + # Move .desktops + icons to /usr/share + mv jre/lib/desktop/* "$pkgdir"/usr/share/ + install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ + + # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc + for new_etc_path in ${backup[@]}; do + # Old location + old_usr_path="jre/lib/${new_etc_path#*$_jname/}" + + # Move + install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path" + ln -sf "/$new_etc_path" "$old_usr_path" + done + + # Link NPAPI plugin + ln -sf $_jvmdir/jre/lib/i386/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so + + # Replace JKS keystore with 'ca-certificates-java' + ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts + + # Suffix man pages + for i in $(find man/ -type f); do + mv "$i" "${i/.1}32-$_jname.1" + done + + # Move man pages + mv man/ja_JP.UTF-8/ man/ja + mv man/ "$pkgdir"/usr/share + + # Move/link licenses + mv db/NOTICE COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java${_major}-${_pkgname}32/ + ln -sf /usr/share/licenses/java${_major}-${_pkgname}32/ "$pkgdir"/usr/share/licenses/$pkgname + + msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..." + # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for + # things like 256-bit AES. Enabled by default in OpenJDK: + # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html + # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html + install -m644 "$srcdir"/UnlimitedJCEPolicy/*.jar jre/lib/security/ + install -Dm644 "$srcdir"/UnlimitedJCEPolicy/README.txt \ + "$pkgdir"/usr/share/doc/$pkgname/README_-_Java_JCE_Unlimited_Strength.txt + + msg2 "Enabling copy+paste in unsigned applets..." + # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: + # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java + # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html + _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy) + sed "$_line a\\\\n \ + // (AUR) Allow unsigned applets to read system clipboard, see:\n \ + // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \ + // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \ + permission java.awt.AWTPermission \"accessClipboard\";" \ + -i "$pkgdir"/etc/java-$_jname/security/java.policy +} diff --git a/build-support/disabled/java/bin32-jdk7/bin32-jdk7.install b/build-support/disabled/java/bin32-jdk7/bin32-jdk7.install new file mode 100644 index 00000000..7e849cbb --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/bin32-jdk7.install @@ -0,0 +1,71 @@ +THIS_JAVA='java32-7-jdk' +NAME='32-bit JDK 7' + +all_off="$(tput sgr0)" +bold="${all_off}$(tput bold)" +blue="${bold}$(tput setaf 4)" +yellow="${bold}$(tput setaf 3)" + +note() { + printf "${blue}::${yellow} archlinux-java32:${bold} $1${all_off}\n" +} + +update_desktop() { + update-desktop-database -q + update-mime-database /usr/share/mime >/dev/null + xdg-icon-resource forceupdate &>/dev/null +} + +post_install() { + default=$(archlinux-java32 get) + case ${default} in + "") + archlinux-java32 set ${THIS_JAVA} + note "${NAME} ('${THIS_JAVA}') set as default Java environment." + ;; + ${THIS_JAVA}) + note "${NAME} ('${THIS_JAVA}') set as default Java environment." + ;; + *) + note "Default Java environment already set to '${default}'. + To use ${NAME} ('${THIS_JAVA}'), run: + # archlinux-java32 set ${THIS_JAVA} + For status, use: + $ archlinux-java32 status" + ;; + esac + + if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then + update-ca-trust + fi + + update_desktop +} + +post_upgrade() { + post_install +} + +pre_remove() { + default=$(archlinux-java32 get) + if [[ ${default} = ${THIS_JAVA} ]]; then + archlinux-java32 unset + fi +} + +post_remove() { + default=$(archlinux-java32 get) # reassign + if [[ ${default} ]]; then + note "Default Java environment is '${default}'." + else + archlinux-java32 fix + default=$(archlinux-java32 get) # re-reassign + if [[ ${default} ]]; then + note "Default Java environment left as '${default}'." + else + note "Java environment unset." + fi + fi + + update_desktop +} diff --git a/build-support/disabled/java/bin32-jdk7/jconsole32-jdk7.desktop b/build-support/disabled/java/bin32-jdk7/jconsole32-jdk7.desktop new file mode 100644 index 00000000..8889e37e --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/jconsole32-jdk7.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-7-jdk/bin/jconsole +Icon=sun-java32-jdk7 +Name=Java 7 Monitoring and Management Console (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk7/jmc32-jdk7.desktop b/build-support/disabled/java/bin32-jdk7/jmc32-jdk7.desktop new file mode 100644 index 00000000..84217af1 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/jmc32-jdk7.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-7-jdk/bin/jmc +Icon=sun-java32-jdk7 +Name=Java 7 Mission Control (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk7/jvisualvm32-jdk7.desktop b/build-support/disabled/java/bin32-jdk7/jvisualvm32-jdk7.desktop new file mode 100644 index 00000000..2f9ee247 --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/jvisualvm32-jdk7.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-7-jdk/bin/jvisualvm +GenericName=Java 7 Monitoring and Performance Monitoring Tool (32-bit) +Icon=sun-java32-jdk7 +Name=Java 7 VisualVM (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Development;Java; diff --git a/build-support/disabled/java/bin32-jdk7/policytool32-jdk7.desktop b/build-support/disabled/java/bin32-jdk7/policytool32-jdk7.desktop new file mode 100644 index 00000000..03a3f03b --- /dev/null +++ b/build-support/disabled/java/bin32-jdk7/policytool32-jdk7.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=/usr/lib32/jvm/java32-7-jdk/jre/bin/policytool +Icon=sun-java32-jdk7 +Name=Java 7 Policy Settings (32-bit) +StartupNotify=true +Terminal=false +Type=Application +Categories=Settings;Java; diff --git a/build-support/disabled/libfm-extra/PKGBUILD b/build-support/disabled/libfm-extra/PKGBUILD new file mode 100644 index 00000000..3ee20db8 --- /dev/null +++ b/build-support/disabled/libfm-extra/PKGBUILD @@ -0,0 +1,33 @@ +# breaking the cycle with menu-cache on i486 +depends=(${depends[@]//menu-cache/}) +depends_i686+=(menu-cache) +depends_pentium4=("${depends_i686[@]}") + +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s|./configure|./configure --with-extra-only | + /mv.*\/usr\/bin/d + ' + )" + + eval "$( + declare -f package_libfm | \ + sed ' + s/mv\(.*\)/(mv\1) || true/ + ' + )" + eval "$( + declare -f package_libfm-gtk2 | \ + sed ' + s/mv\(.*\)/(mv\1) || true/ + ' + )" + eval "$( + declare -f package_libfm-gtk3 | \ + sed ' + s/mv\(.*\)/(mv\1) || true/ + ' + )" +fi diff --git a/build-support/disabled/libvips884/PKGBUILD b/build-support/disabled/libvips884/PKGBUILD new file mode 100644 index 00000000..c73ac6fb --- /dev/null +++ b/build-support/disabled/libvips884/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Felix Yan <felixonmars@archlinux.org> + +pkgname=libvips884 +pkgver=8.8.4 +pkgrel=1 +pkgdesc="A fast image processing library with low memory needs" +arch=(i486 i686 pentium4 'x86_64') +license=('LGPL') +url="https://libvips.github.io/libvips/" +depends=('cfitsio' 'fftw' 'imagemagick' 'libexif' 'libgsf' 'libheif' 'libimagequant' 'librsvg' + 'libwebp' 'libxml2' 'openexr' 'orc' 'pango' 'poppler-glib') +source=("https://github.com/libvips/libvips/releases/download/v$pkgver/vips-$pkgver.tar.gz") +sha512sums=('d65eb9ce009ee0d23e3cb958ed255414ca422c3db11362afb2cd88fe82062f2ed87ac1eb80993130c35fb8e70bb297faa9f12a37faa7f3628ea8df2a26112d11') + +build() { + cd vips-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd vips-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/build-support/disabled/mesa/mesa b/build-support/disabled/mesa/mesa new file mode 100644 index 00000000..81de2061 --- /dev/null +++ b/build-support/disabled/mesa/mesa @@ -0,0 +1,177 @@ +# disable openswf as it requires AVX, makes no sense with old CPUs +# disable every new software rasterizer and take the old ones +# see also FS32#39 +eval "$( + declare -f build | \ + sed ' + /arch-meson/s/\(gallium-drivers=.*\),swrast,swr/\1,swrast/ + /arch-meson/s/\(-D swr-arches=\)avx,avx2/\1/ + ' + declare -f package_mesa | \ + sed ' + s@_install fakeinstall/usr/lib/libswrAVX.*@#\0@g + ' +)" + +# See https://bugs.freedesktop.org/show_bug.cgi?id=93089 +# do not build/package vulkan on i486 +# do not build i915,i965 on i486 +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/-D gallium-omx=bellagio // + s/-D gallium-opencl=\S\+ // + s/-D osmesa=true /-D osmesa=false / + s/\(-D gallium-\S\+=\)enabled /\1disabled /g + s/\(-D gallium-nine=\)true /\1false /g + s/\(-D vulkan-drivers=\)\S\+ /\1 / + s/\(-D dri-drivers=\(\S\+,\)\?\)i915,/\1/ + s/\(-D dri-drivers=\(\S\+,\)\?\)i965,/\1/ + ' + declare -f package_mesa | \ + sed ' + \,rm .*/vulkan;,d + \,bellagio,d + \,fakeinstall/usr/lib/d3d,d + \,fakeinstall/usr/lib/libOSMesa\.so\*,d + \,fakeinstall/usr/lib/libxatracker\.so\*,d + ' + )" +else + eval "$( + declare -f package_vulkan-intel package_vulkan-radeon package_opencl-mesa package_libva-mesa-driver package_mesa-vdpau | \ + sed ' + /^\s*{\s*$/ a arch=('"$( + printf '%s\n' "${arch[@]}" | \ + grep -vxF 'i486' | \ + tr '\n' ' ' + )"') + ' + )" +fi + +# break cycle with conflicting installation files between mesa and libglvnd +# (indirect dependency via libva) +# i486-specific +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f package_mesa | \ + sed ' + $ i rm -rf $pkgdir/usr/include/EGL/egl.h \ + rm -rf $pkgdir/usr/include/EGL/eglext.h \ + rm -rf $pkgdir/usr/include/EGL/eglplatform.h \ + rm -rf $pkgdir/usr/include/GL/gl.h \ + rm -rf $pkgdir/usr/include/GL/glcorearb.h \ + rm -rf $pkgdir/usr/include/GL/glext.h \ + rm -rf $pkgdir/usr/include/GL/glx.h \ + rm -rf $pkgdir/usr/include/GL/glxext.h \ + rm -rf $pkgdir/usr/include/GLES2/gl2.h \ + rm -rf $pkgdir/usr/include/GLES2/gl2ext.h \ + rm -rf $pkgdir/usr/include/GLES2/gl2platform.h \ + rm -rf $pkgdir/usr/include/GLES3/gl3.h \ + rm -rf $pkgdir/usr/include/GLES3/gl31.h \ + rm -rf $pkgdir/usr/include/GLES3/gl32.h \ + rm -rf $pkgdir/usr/include/GLES3/gl3ext.h \ + rm -rf $pkgdir/usr/include/GLES3/gl3platform.h \ + rm -rf $pkgdir/usr/include/KHR/khrplatform.h \ + rm -rf $pkgdir/usr/lib/pkgconfig/egl.pc \ + rm -rf $pkgdir/usr/lib/pkgconfig/gl.pc \ + rm -rf $pkgdir/usr/lib/pkgconfig/glesv2.pc + ' + declare -f package_vulkan-mesa-layers | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_vulkan-swrast | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_vulkan-intel | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_vulkan-radeon | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_opencl-mesa | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_libva-mesa-driver | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_libva-mesa-vdpau | \ + sed ' + 3 i if false; then + $ i fi + ' + declare -f package_mesa-vdpau | \ + sed ' + 3 i if false; then + $ i fi + ' + ) + " +fi + +# add libdrm and libxshmfence explocitily for now, as deep down in th +# dependency tree as reasonable instead of patching all packages failing above +if [ "$CARCH" = 'i486' ]; then + depends+=(libdrm) + depends+=(libxshmfence) + depends+=(wayland) +fi + +# defaults changed to SSE2 enabled by default, disable it +if [ "$CARCH" = 'i686' -o "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/arch-meson /arch-meson -Dsse2=false / + ' + )" +fi + +# LTO on i486 results in out-of-memory +if [ "$CARCH" == 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/-D b_lto=true/-D b_lto=false/ + ' + )" +fi + +# libclc needs spirv-llvm-translator which throws heavily errors on 32-bit +# LLVM_SPIRV :: DebugInfo/X86/dbg-declare-alloca.ll +# LLVM_SPIRV :: DebugInfo/X86/dbg-declare-arg.ll +# LLVM_SPIRV :: DebugInfo/X86/dbg-value-const-byref.ll +# LLVM_SPIRV :: DebugInfo/X86/dw_op_minus_direct.ll +# LLVM_SPIRV :: DebugInfo/X86/dwarf-aranges-no-dwarf-labels.ll +# LLVM_SPIRV :: DebugInfo/X86/frame-register.ll +# LLVM_SPIRV :: DebugInfo/X86/this-stack_value.ll +# LLVM_SPIRV :: spirv-extensions-control.ll +# LLVM_SPIRV :: transcoding/SPV_KHR_integer_dot_product-sat.ll +# usually with segfaults in the middle of LLVM itself +# this might be hopeless to get working +makedepends=(${makedepends[@]//libclc/}) +eval "$( + declare -f build | \ + sed ' + s/-D gallium-opencl=icd/-D gallium-opencl=disabled/ + ' + declare -f package_opencl-mesa | \ + sed ' + 3 i if false; then + $ i fi + ' +)" diff --git a/build-support/disabled/python-no-opt-no-check/PKGBUILD b/build-support/disabled/python-no-opt-no-check/PKGBUILD new file mode 100644 index 00000000..357d41c1 --- /dev/null +++ b/build-support/disabled/python-no-opt-no-check/PKGBUILD @@ -0,0 +1,65 @@ +# tests run with -j4 per default effectively killing build slaves, +# forcing single threaded execution of tests + +eval "$( + declare -f build | \ + sed " + s/make /make EXTRATESTOPTS='-j 1' / + " +)" + +eval "$( + declare -f check | \ + sed " + s/ -m test.regrtest/ -m test.regrtest -j1/ + " +)" + +makedepends=(${makedepends[@]//xorg-server-xvfb/}) +makedepends_i686+=(xorg-server-xvfb) +makedepends_pentium4=("${makedepends_i686[@]}") + +# skip xvfb stuff on i486 +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + /export servernum=99/,/done/d + s/.*make/make/ + ' + )" + eval "$( + declare -f check | \ + sed ' + /export servernum=99/,/done/d + s/xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum"// + ' + )" +fi + +# ignore failing realtime scheduling test as the systemd-nspawn container +# lacks the SYS_NICE capability (at least, I think so) +# ERROR: test_sched_rr_get_interval (test.test_posix.PosixTester) +# Bonus points for finding the option to ignore single tests in test_posix +# test_gdb currently fails for unknown reasons, also not that important +# test_socket tests take more than 1.5 hours, so ignoring them +# Ignore test_cmath test_math test_turtle - they fail due to too low precision +# on i686 (all of them - really? - actually, I just checket test_cmath) +eval "$( + declare -f check | \ + sed " + /-uall/ s/;\?$/ -x test_posix -x test_gdb -x test_socket -x test_cmath -x test_math -x test_turtle \\|\\| true/g + " +)" + +# LTO, PDO takes too long +eval "$( + declare -f build | \ + sed " + s/--with-lto/--without-lto/ + s/--enable-optimizations/--disable-optimizations/ + " +)" + +# for now disable testing +unset check diff --git a/build-support/disabled/python-packaging-bootstrap/PKGBUILD b/build-support/disabled/python-packaging-bootstrap/PKGBUILD new file mode 100644 index 00000000..db4de3a4 --- /dev/null +++ b/build-support/disabled/python-packaging-bootstrap/PKGBUILD @@ -0,0 +1,44 @@ +# upstream git revision: a6efc98e6cda125be25a45410c45f87a8769ca76 + +# Maintainer: Erich Eckner <deep42thought at archlinux32 dot org> +# Contributor: Felix Yan <felixonmars@archlinux.org> + +# heavily borrowed from python-packagings PKGBUILD + +pkgbase=python-packaging-bootstrap +_pkgbase="${pkgbase%-*}" +pkgname=(python-packaging-bootstrap python2-packaging-bootstrap) +pkgver='20.9' +pkgrel='1' +pkgdesc="Core utilities for Python packages - bootstrap version" +arch=('any') +url="https://github.com/pypa/packaging" +license=('Apache') +makedepends=('python-dephell' 'python-setuptools' 'python2-setuptools' 'python-pyparsing' + 'python2-pyparsing') +source=("https://github.com/pypa/packaging/archive/$pkgver/$_pkgbase-$pkgver.tar.gz") +sha512sums=('fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b') + +build() { + cd packaging-$pkgver + python setup.py build + python2 setup.py build +} + +package_python-packaging-bootstrap() { + depends=('python-pyparsing' 'python-six') + provides=("python-packaging=$pkgver") + conflicts=('python-packaging') + + cd packaging-$pkgver + python setup.py install --root "$pkgdir" +} + +package_python2-packaging-bootstrap() { + depends=('python2-pyparsing' 'python2-six') + provides=("python2-packaging=$pkgver") + conflicts=('python2-packaging') + + cd packaging-$pkgver + python2 setup.py install --root "$pkgdir" +} diff --git a/build-support/disabled/python-pip-bootstrap/.SRCINFO b/build-support/disabled/python-pip-bootstrap/.SRCINFO deleted file mode 100644 index d88edfcc..00000000 --- a/build-support/disabled/python-pip-bootstrap/.SRCINFO +++ /dev/null @@ -1,21 +0,0 @@ -pkgbase = python-pip-bootstrap - pkgdesc = bootstap pip and setuptools for bootstrapping python - pkgver = 0.0.1 - pkgrel = 1 - url = https://bootstrap.pypa.io/ - arch = i486 - arch = i686 - arch = x86_64 - arch = armv6h - arch = armv7h - source = https://bootstrap.pypa.io/get-pip.py - sha512sums = 29971130c5d1d1baf2b51ef689b40c91fcd0d1e62de6f99d6abef6879684a59843be539cd112dfddc3637cc3d1a91c79f775d80f6aa2fe920252710d48d2934d - -pkgname = python-pip-bootstrap - install = install.sh - depends = python - -pkgname = python2-pip-bootstrap - install = install2.sh - depends = python2 - diff --git a/build-support/disabled/python-pip-bootstrap/PKGBUILD b/build-support/disabled/python-pip-bootstrap/PKGBUILD deleted file mode 100644 index f278e657..00000000 --- a/build-support/disabled/python-pip-bootstrap/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> - -pkgname=('python-pip-bootstrap' 'python2-pip-bootstrap') -pkgver='19.3.1' -pkgrel='1' -pkgdesc="bootstap pip and setuptools for bootstrapping python" -arch=('x86_64' 'armv6h' 'armv7h') -url="https://bootstrap.pypa.io/" -source=("get-pip-${pkgver}.py::https://bootstrap.pypa.io/get-pip.py") -sha512sums=('d8744fcfa4dce749675632be0691a5e9bdac95e34d5b787bca6e635e2d6a25badbeb0b5f5ff6af1beb879604bdf060829805622a835a4b579967d806d3a642b5') - -package_python-pip-bootstrap() { - provides=("python-pip=${pkgver}") - depends=('python') - install=install.sh - - mkdir -p "${pkgdir}/usr/bin" - cp "${srcdir}/get-pip-${pkgver}.py" "${pkgdir}/usr/bin/." -} - -package_python2-pip-bootstrap() { - provides=("python2-pip=${pkgver}") - depends=('python2') - install=install2.sh - - mkdir -p "${pkgdir}/usr/bin" - cp "${srcdir}/get-pip-${pkgver}.py" "${pkgdir}/usr/bin/get-pip2.py" -} diff --git a/build-support/disabled/python-pip-bootstrap/install.sh b/build-support/disabled/python-pip-bootstrap/install.sh deleted file mode 100644 index e81432e6..00000000 --- a/build-support/disabled/python-pip-bootstrap/install.sh +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Bootstrapping python pip, setuptools and wheel.." - python /usr/bin/get-pip.py -} diff --git a/build-support/disabled/python-pip-bootstrap/install2.sh b/build-support/disabled/python-pip-bootstrap/install2.sh deleted file mode 100644 index b6aa16fa..00000000 --- a/build-support/disabled/python-pip-bootstrap/install2.sh +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Bootstrapping python2 pip, setuptools and wheel.." - python2 /usr/bin/get-pip2.py -} diff --git a/build-support/disabled/python-setuptools-bootstrap/PKGBUILD b/build-support/disabled/python-setuptools-bootstrap/PKGBUILD new file mode 100644 index 00000000..8b46c9e3 --- /dev/null +++ b/build-support/disabled/python-setuptools-bootstrap/PKGBUILD @@ -0,0 +1,62 @@ +# upstream git revision: a6efc98e6cda125be25a45410c45f87a8769ca76 + +# Maintainer: Erich Eckner <arch32 at eckner dot net> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Felix Yan <felixonmars@archlinux.org> +# Contributor: Eli Schwartz <eschwartz@archlinux.org> + +# heavily borrowed from python-setuptools' PKGBUILD + +pkgname=python-setuptools-bootstrap +_pkgname="${pkgname%-*}" +pkgver='56.2.0' +pkgrel='2' +epoch='1' +pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages - bootstrap variant" +arch=('any') +license=('PSF') +url="https://pypi.org/project/setuptools/" +makedepends=('python' 'git') +source=("$_pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz") +sha512sums=('ff062db8adf4478bb55650e0c5ef162aed1e4de2b6dba8c0b6ea986b669ef2c8af126247f281feb749cd8a54c0bd9af54e99289073ab742b0d4e26a0208b963c') + +export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0 + +prepare() { + + # Remove post-release tag since we are using stable tags + sed -e '/tag_build = .post/d' \ + -e '/tag_date = 1/d' \ + -i setuptools-$pkgver/setup.cfg + + # 'Clean' installation is expected to fail since we removed bundled packages + sed -i '/^def test_clean_env_install/i import pytest\n\n@pytest.mark.xfail' setuptools-$pkgver/setuptools/tests/test_virtualenv.py + + # Tests failed. Importing an unbundled new setuptools in a virtualenv does not work, but this won't + # affect normal virtualenv usage (which don't have to import the unbundled setuptools in *current* + # dir. + sed -e '/^def test_pip_upgrade_from_source/i @pytest.mark.xfail' \ + -e '/^def test_test_command_install_requirements/i @pytest.mark.xfail' \ + -e '/^def test_no_missing_dependencies/i @pytest.mark.xfail' \ + -i setuptools-$pkgver/setuptools/tests/test_virtualenv.py + + cd "$srcdir"/setuptools-$pkgver + sed -i -e "s|^#\!.*/usr/bin/env python|#!/usr/bin/env python3|" setuptools/command/easy_install.py +} + +build() { + cd "$srcdir"/setuptools-$pkgver + python bootstrap.py + python setup.py build +} + +package() { + depends=("${_deps[@]/#/python-}") + provides=('python-distribute' "python-setuptools=${pkgver}") + replaces=('python-distribute') + + cd "$srcdir"/setuptools-$pkgver + # create directory before installing (otherwise installing fails) + mkdir build/scripts-3.10 + python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 --skip-build +} diff --git a/build-support/disabled/python-setuptools-egg-info-manually b/build-support/disabled/python-setuptools-egg-info-manually new file mode 100644 index 00000000..9320e0b6 --- /dev/null +++ b/build-support/disabled/python-setuptools-egg-info-manually @@ -0,0 +1,30 @@ +# create directory before installing (otherwise installing fails) +eval "$( + declare -f package | \ + sed ' + 4 i mkdir build/scripts-3.10 + ' +)" + +# ignore errors in tests, but execute the tests +eval "$( + declare -f check | \ + sed ' + s/\(python.*\)/\1 || true/ + ' +)" + +unset checkdepends +unset check + +# egg-infos are not installed correctly, create them before and install +# them manually +eval "$( + declare -f package | \ + sed ' + 6 i python setup.py egg_info \ + rm -rf "$pkgdir"/usr/lib/python3.10/site-packages/setuptools-57.4.0-py3.10.egg-info \ + mkdir "$pkgdir"/usr/lib/python3.10/site-packages/setuptools-57.4.0-py3.10.egg-info \ + cp -R setuptools.egg-info/* "$pkgdir"/usr/lib/python3.10/site-packages/setuptools-57.4.0-py3.10.egg-info/. + ' +)" diff --git a/build-support/disabled/python-six-nocheck/PKGBUILD b/build-support/disabled/python-six-nocheck/PKGBUILD new file mode 100644 index 00000000..4709e2ae --- /dev/null +++ b/build-support/disabled/python-six-nocheck/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Erich Eckner <deep42thought at archlinux32 dot org> +# Contributor: Felix Yan <felixonmars@archlinux.org> +# Contributor: Jelle van der Waa <jelle@vdwaa.nl> +# Contributer: Allan McRae <allan@archlinux.org> + +# heavily borrowed from python-six's PKGBUILD + +pkgbase=python-six-nocheck +pkgname=('python-six-nocheck') +pkgver=1.15.0 +pkgrel=3 +pkgdesc="Python 2 and 3 compatibility utilities" +arch=('any') +url="https://pypi.python.org/pypi/six/" +license=('MIT') +makedepends=('python-setuptools') +source=("https://pypi.io/packages/source/s/six/six-$pkgver.tar.gz") +sha512sums=('eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9') + +build() { + cp -a six-$pkgver{,-py2} +} + +package_python-six-nocheck() { + depends=('python') + provides=("python-six=$pkgver") + conflicts=('python-six') + + cd six-$pkgver + python setup.py install --root "$pkgdir" --optimize=1 + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/build-support/disabled/python-urllib3/PKGBUILD b/build-support/disabled/python-urllib3/PKGBUILD new file mode 100644 index 00000000..ab31fc8d --- /dev/null +++ b/build-support/disabled/python-urllib3/PKGBUILD @@ -0,0 +1,28 @@ +# for now ignore failing TLS tests (not really comforting from a security +# point of view, but it blocks stuff) +# FAILED test/contrib/test_pyopenssl.py::TestSSL::test_ssl_read_timeout - urlli... +# FAILED test/contrib/test_pyopenssl.py::TestSSL::test_ssl_failed_fingerprint_verification +# FAILED test/with_dummyserver/test_socketlevel.py::TestSSL::test_ssl_read_timeout + +eval "$( + declare -f check | \ + sed ' + s/python setup.py pytest/python setup.py pytest || true/ + ' +)" + +# breaking the cycle with python-spinx +makedepends=(${makedepends[@]/python-sphinx-furo}) +makedepends=(${makedepends[@]/python-sphinx}) +eval "$( + declare -f build | \ + sed ' + /make html/d + ' +)" +eval "$( + declare -f package_python-urllib3-doc | \ + sed ' + /cp.*_build\/html/d + ' +)" diff --git a/build-support/disabled/python310/PKGBUILD b/build-support/disabled/python310/PKGBUILD new file mode 100644 index 00000000..a15bcc7c --- /dev/null +++ b/build-support/disabled/python310/PKGBUILD @@ -0,0 +1,73 @@ +# tests run with -j4 per default effectively killing build slaves, +# forcing single threaded execution of tests + +eval "$( + declare -f build | \ + sed " + s/make /make EXTRATESTOPTS='-j 1' / + " +)" + +eval "$( + declare -f check | \ + sed " + s/ -m test.regrtest/ -m test.regrtest -j1/ + " +)" + +makedepends=(${makedepends[@]//xorg-server-xvfb/}) +makedepends_i686+=(xorg-server-xvfb) +makedepends_pentium4=("${makedepends_i686[@]}") + +# skip xvfb stuff on i486 +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + /export servernum=99/,/done/d + s/.*make/make/ + ' + )" + eval "$( + declare -f check | \ + sed ' + /export servernum=99/,/done/d + s/xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum"// + ' + )" +fi + +# ignore failing realtime scheduling test as the systemd-nspawn container +# lacks the SYS_NICE capability (at least, I think so) +# ERROR: test_sched_rr_get_interval (test.test_posix.PosixTester) +# Bonus points for finding the option to ignore single tests in test_posix +# test_gdb currently fails for unknown reasons, also not that important +# test_socket tests take more than 1.5 hours, so ignoring them +# Ignore test_cmath test_math test_turtle - they fail due to too low precision +# on i686 (all of them - really? - actually, I just checket test_cmath) +eval "$( + declare -f check | \ + sed " + /-uall/ s/;\?$/ -x test_posix -x test_gdb -x test_socket -x test_cmath -x test_math -x test_turtle \\|\\| true/g + " +)" + +# enable ensurepip +eval "$( + declare -f build | \ + sed " + s/--without-ensurepip/--with-ensurepip/ + " +)" + +# LTO, PDO takes too long +eval "$( + declare -f build | \ + sed " + s/--with-lto/--without-lto/ + s/--enable-optimizations/--disable-optimizations/ + " +)" + +# for now disable testing +unset check diff --git a/build-support/disabled/releng/archiso32-git/PKGBUILD b/build-support/disabled/releng/archiso32-git/PKGBUILD new file mode 100644 index 00000000..ee776241 --- /dev/null +++ b/build-support/disabled/releng/archiso32-git/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Sebastian Lau <lauseb644@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> + +_pkgname=archiso32 +pkgname="${_pkgname}-git" +pkgver=i686.33.2.g1e308c7 +pkgrel=1 +pkgdesc="Arch Linux 32 livecd/liveusb generation scripts" +arch=('any') +url="http://archlinux32.org" +license=('GPL') +depends=('libisoburn' 'squashfs-tools' 'btrfs-progs' 'dosfstools' 'lynx' 'arch-install-scripts') +optdepends=('qemu: quickly test isos') +makedepends=('git') +provides=('archiso') +conflicts=('archiso') +source=("git://github.com/archlinux32/${_pkgname}.git") +md5sums=('SKIP') + +pkgver() { + cd "${srcdir}/${_pkgname}" + git describe --long | sed 's/-/./g;s/v//' +} + +package() { + cd "${srcdir}/${_pkgname}" + + make DESTDIR="${pkgdir}/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/build-support/disabled/releng/asp32-git/PKGBUILD b/build-support/disabled/releng/asp32-git/PKGBUILD new file mode 100644 index 00000000..5eaa912e --- /dev/null +++ b/build-support/disabled/releng/asp32-git/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=asp32-git +pkgver=1 +pkgrel=1 +pkgdesc="Arch Linux build source file management tool (for Archlinux32)" +arch=(any) +url="https://git.archlinux32.org/archlinux32/asp32" +license=(MIT) +depends=(awk bash jq git libarchive) +conflicts=(asp) +makedepends=(asciidoc) +source=("git+https://git.archlinux32.org/archlinux32/asp32.git") +md5sums=('SKIP') + +build() { + make -C asp32 +} + +package() { + make -C asp32 PREFIX=/usr DESTDIR="$pkgdir" install + install -Dm644 asp32/LICENSE "$pkgdir/usr/share/licenses/asp/LICENSE" +} + +# vim: ft=sh syn=sh et diff --git a/build-support/disabled/rime-luna-pinyin-bootstrap/PKGBUILD b/build-support/disabled/rime-luna-pinyin-bootstrap/PKGBUILD new file mode 100644 index 00000000..0f663756 --- /dev/null +++ b/build-support/disabled/rime-luna-pinyin-bootstrap/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Felix Yan <felixonmars@archlinux.org> + +pkgname=rime-luna-pinyin-bootstrap +_pkgname=${pkgname%-*} +pkgver='0.0.0.20210303' +conflicts=(rime-luna-pinyin) +provides=("rime-luna-pinyin=$pkgver") +_commit=f1268e192ca88b9526467ce04ac3e47c837891ad +pkgrel='1' +pkgdesc="Luna pinyin for rime" +arch=('x86_64') +url="https://github.com/rime/rime-luna-pinyin" +license=('LGPL') +# dependency for reverse lookup +#depends=('rime-stroke') +makedepends=('librime' 'rime-prelude' 'rime-essay') +source=("https://github.com/rime/rime-luna-pinyin/archive/$_commit/rime-luna-pinyin-$_commit.tar.gz") +sha512sums=('5a4f91f04f807ba84650a52acf8f634382c32eb978e8895f97b05594ea90cf6771386bb80cda1b694905c50d64cf8b4e8514abb762c4d18035b73c67148339f9') + +prepare() { + cd $_pkgname-$_commit + # Link essentials + for _f in $(pacman -Qql rime-prelude rime-essay | grep -v "/$"); do ln -sf $_f; done +} + +build(){ + cd $_pkgname-$_commit + for _s in $(ls *.schema.yaml); do rime_deployer --compile $_s; done +} + +package() { + cd $_pkgname-$_commit + find . -type l -delete + rm build/*.txt + install -Dm644 *.yaml -t "$pkgdir"/usr/share/rime-data/ + install -Dm644 build/* -t "$pkgdir"/usr/share/rime-data/build/ +} diff --git a/build-support/disabled/rust-bin/PKGBUILD b/build-support/disabled/rust-bin/PKGBUILD index 125dac5f..d6610764 100644 --- a/build-support/disabled/rust-bin/PKGBUILD +++ b/build-support/disabled/rust-bin/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Andreas Baumann <mail@andreasbaumann.cc> pkgname=rust-bin -pkgver=1.38.0 +pkgver=1.57.0 pkgrel=1 pkgdesc='Binary precompiled packages for Rust' url='https://www.rust-lang.org/' @@ -15,11 +15,11 @@ source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-li source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) -sha256sums_x86_64=('cb573229bfd32928177c3835fdeb62d52da64806b844bc1095c6225b0665a1cb' +sha256sums_x86_64=('ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda' 'SKIP') -sha256sums_pentium4=('41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af' +sha256sums_pentium4=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa' 'SKIP') -sha256sums_i686=('41aed8a350e24a0cac1444ed99b3dd24a90bc581dd88cb420c6e547d6b5f57af' +sha256sums_i686=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa' 'SKIP') validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> @@ -27,8 +27,7 @@ validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag a case "${CARCH}" in x86_64) _ARCH='x86_64-unknown-linux-gnu';; - pentium4) _ARCH='i686-unknown-linux-gnu';; - i686) _ARCH='i686-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; esac package() { diff --git a/build-support/disabled/rust140/PKGBUILD b/build-support/disabled/rust140/PKGBUILD new file mode 100644 index 00000000..6d05c3a7 --- /dev/null +++ b/build-support/disabled/rust140/PKGBUILD @@ -0,0 +1,232 @@ +# Maintainer: Johannes Löthberg <johannes@kyriasis.com> +# Contributor: Alexander F Rødseth <xyproto@archlinux.org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: userwithuid <userwithuid@gmail.com> + +pkgname=('rust140' 'rust140-docs') +epoch=1 +pkgver=1.40.0 +pkgrel=1 + +_llvm_ver=9.0.1 + +pkgdesc='Systems programming language focused on safety, speed and concurrency' +url='https://www.rust-lang.org/' +arch=(i486 i686 pentium4 'x86_64') +license=('MIT' 'Apache') + +makedepends=('rust=1:1.39.0' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake') +checkdepends=('procps-ng' 'gdb') + +options=('!emptydirs') + +source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) + +sha256sums=('d2e8f931d16a0539faaaacd801e0d92c58df190269014b2360c6ab2a90ee3475' + 'SKIP' + 'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077' + 'SKIP') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> + 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> + +prepare() { + cd "rustc-$pkgver-src" + + cat >config.toml <<END +[llvm] +link-shared = true + +[build] +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +python = "/usr/bin/python" +extended = true +sanitizers = false +profiler = true +vendor = true + +[install] +prefix = "/usr" + +[rust] +# LLVM crashes when passing an object through ThinLTO twice. This is triggered when using rust +# code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 + +debuginfo-level = 2 + +channel = "stable" + +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" +END +} + +build() { + cd "rustc-$pkgver-src" + + export RUST_BACKTRACE=1 + export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" + + python ./x.py dist -j "$(nproc)" + DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" + + # move docs and lib32 libs out of the way for splitting + mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 + mv dest-rust/usr/share/doc dest-doc +} + +package_rust140() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt') + + cd "rustc-$pkgver-src" + + mv dest-rust/* "$pkgdir" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + # delete unnecesary files, e.g. components and manifest files only used for the uninstall script + cd "$pkgdir"/usr/lib/rustlib + rm components install.log manifest-* rust-installer-version uninstall.sh + + # rustbuild always installs copies of the shared libraries to /usr/lib, + # overwrite them with symlinks to the per-architecture versions + ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so + + install -d "$pkgdir"/usr/share/bash-completion + mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/ +} + +package_lib32-rust-libs() { + descriptino=('32-bit libraries for Rust') + depends=('lib32-gcc-libs') + provides=('lib32-rust') + conflicts=('lib32-rust') + replaces=('lib32-rust') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ + mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu + ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so +} + +package_rust140-docs() { + description=('Documentation for the Rust programming language') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/share/doc + mv dest-doc/* "$pkgdir"/usr/share/doc +} + +# vim:set ts=2 sw=2 et: +# enable i686-unknown-linux-gnu target +# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file +# +# Also trying to reduce memory usage by building with +# -debuginfo-level-std=1 +# see https://github.com/rust-lang/rust/issues/60294 + +source+=(config.toml.patch) +sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660') + +eval "$( + declare -f prepare | \ + sed ' + $ i patch -p1 -i "$srcdir/config.toml.patch" + ' +)" + +# stop insanity of nproc (see FS#62952) +eval "$( + declare -f build | \ + sed ' + s/-j"$(nproc)"/-j16/ + ' +)" + +if [ "${CARCH}" != 'pentium4' ]; then + eval "$( + declare -f prepare | \ + sed ' + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" + ' + )" +fi + +# Don't move lib32 support into rust32-lib, we are on 32-bit in the end +# and don't draw a symlink to 64-bit libraries (but to 32-bit instead) + +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -v '^lib32-rust-libs' + ) +) + +eval "$( + declare -f package_rust140 | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +eval "$( + declare -f build | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +# watch for files changing which need patching during the x.py craziness! +# currently this is duplicate U1024 and P1024 types (this is currently needed +# for i686 and 1.38.0) +source+=('watcher.sh') +sha256sums+=('c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594') + +if [ "${CARCH}" = "i686" ]; then + makedepends+=('inotify-tools' 'procps-ng') + + eval "$( + declare -f build | \ + sed ' + /\.\/x.py/ i \ + chmod u+x "$srcdir/watcher.sh" \ + "$srcdir/watcher.sh" "$srcdir" & \ + _kill_pid=$! \ + sleep 10 + /\.\/x.py/ a \ + kill $_kill_pid || true + ' + )" +fi + +# Enable on demand, if your previous rust is broken, see also build-support and AUR +# for rust-bin. +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust-bin') +sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad' + 'SKIP' + 'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077' + 'SKIP' + '42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660' + 'c91b55a428ef463fc1529724da0c7f3930bd9d4b32b4596a14be77cc3f1e0594') +groups+=(build-shims) diff --git a/build-support/disabled/rust140/config.toml.patch b/build-support/disabled/rust140/config.toml.patch new file mode 100644 index 00000000..8d0762cd --- /dev/null +++ b/build-support/disabled/rust140/config.toml.patch @@ -0,0 +1,26 @@ +diff -rauN a/config.toml b/config.toml +--- a/config.toml 2019-10-20 16:44:31.647900892 +0200 ++++ b/config.toml 2019-10-20 16:44:39.637875348 +0200 +@@ -2,7 +2,7 @@ + link-shared = true + + [build] +-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] ++target = ["i686-unknown-linux-gnu"] + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" + python = "/usr/bin/python" +@@ -21,11 +21,11 @@ + # https://github.com/rust-lang/rust/issues/54872 + codegen-units-std = 1 + +-debuginfo-level = 2 ++debuginfo-level = 0 + + channel = "stable" + + rpath = false + +-[target.x86_64-unknown-linux-gnu] ++[target.i686-unknown-linux-gnu] + llvm-config = "/usr/bin/llvm-config" diff --git a/build-support/disabled/rust140/watcher.sh b/build-support/disabled/rust140/watcher.sh new file mode 100755 index 00000000..98228b5d --- /dev/null +++ b/build-support/disabled/rust140/watcher.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +term() { + echo "--> Got SIGTERM" + echo "--> killing inotifywait with PID $inotifywait" + kill -TERM "$inotifywait" + sleep 10 + kill -9 "$inotifywait" +} + +srcdir="$1" + +trap term SIGTERM + +inotifywait -mr -e close_write --format %w%f $srcdir | while read -r FILE; do + case "$FILE" in + *consts.rs) + echo "--> patching $FILE" + sed -i '/pub type U1024/d;/pub type P1024/d' $FILE + echo "--> finished patching $FILE" + ;; + esac +done & +inotifywait=$(ps -ef | grep inotifywait | grep -v grep | tr -s ' ' | cut -d ' ' -f2) +echo "--> waiting for inotifywait $inotifywait" +wait "$inotifywait" +echo "--> watcher terminated" diff --git a/build-support/disabled/rust141/PKGBUILD b/build-support/disabled/rust141/PKGBUILD new file mode 100644 index 00000000..afa6ad96 --- /dev/null +++ b/build-support/disabled/rust141/PKGBUILD @@ -0,0 +1,218 @@ +# Maintainer: Johannes Löthberg <johannes@kyriasis.com> +# Contributor: Alexander F Rødseth <xyproto@archlinux.org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: userwithuid <userwithuid@gmail.com> + +pkgname=('rust141' 'rust141-docs') +epoch=1 +pkgver=1.41.0 +pkgrel=1 + +_llvm_ver=9.0.1 + +pkgdesc='Systems programming language focused on safety, speed and concurrency' +url='https://www.rust-lang.org/' +arch=(i486 i686 pentium4 'x86_64') +license=('MIT' 'Apache') + +makedepends=('rust140' "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake') +checkdepends=('procps-ng' 'gdb') + +options=('!emptydirs') + +source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) + +sha256sums=('5546822c09944c4d847968e9b7b3d0e299f143f307c00fa40e84a99fabf8d74b' + 'SKIP' + 'c2bfab95c9986318318363d7f371a85a95e333bc0b34fbfa52edbd3f5e3a9077' + 'SKIP') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> + 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> + +prepare() { + cd "rustc-$pkgver-src" + + cat >config.toml <<END +[llvm] +link-shared = true + +[build] +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +python = "/usr/bin/python" +extended = true +sanitizers = false +profiler = true +vendor = true + +[install] +prefix = "/usr" + +[rust] +# LLVM crashes when passing an object through ThinLTO twice. This is triggered when using rust +# code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 + +debuginfo-level = 2 + +channel = "stable" + +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" +END +} + +build() { + cd "rustc-$pkgver-src" + + export RUST_BACKTRACE=1 + export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" + + python ./x.py dist -j "$(nproc)" + DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" + + # move docs and lib32 libs out of the way for splitting + mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 + mv dest-rust/usr/share/doc dest-doc +} + +package_rust141() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt') + + cd "rustc-$pkgver-src" + + mv dest-rust/* "$pkgdir" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + # delete unnecesary files, e.g. components and manifest files only used for the uninstall script + cd "$pkgdir"/usr/lib/rustlib + rm components install.log manifest-* rust-installer-version uninstall.sh + + # rustbuild always installs copies of the shared libraries to /usr/lib, + # overwrite them with symlinks to the per-architecture versions + ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so + + install -d "$pkgdir"/usr/share/bash-completion + mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/ +} + +package_lib32-rust-libs() { + descriptino=('32-bit libraries for Rust') + depends=('lib32-gcc-libs') + provides=('lib32-rust') + conflicts=('lib32-rust') + replaces=('lib32-rust') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ + mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu + ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so +} + +package_rust141-docs() { + description=('Documentation for the Rust programming language') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/share/doc + mv dest-doc/* "$pkgdir"/usr/share/doc +} + +# vim:set ts=2 sw=2 et: +# enable i686-unknown-linux-gnu target +# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file +# +# Also trying to reduce memory usage by building with +# -debuginfo-level-std=1 +# see https://github.com/rust-lang/rust/issues/60294 + +source+=(config.toml.patch) +sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660') + +eval "$( + declare -f prepare | \ + sed ' + $ i patch -p1 -i "$srcdir/config.toml.patch" + ' +)" + +# stop insanity of nproc (see FS#62952) +eval "$( + declare -f build | \ + sed ' + s/-j"$(nproc)"/-j16/ + ' +)" + +if [ "${CARCH}" != 'pentium4' ]; then + eval "$( + declare -f prepare | \ + sed ' + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/src/librustc_target/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/a75a6025d7e3424edf9baf3039056c0f8eea157631a175d00ac5a218aa54b510/484bf8be15015b330fa9a97b6dabb8c7627e59d5cddb2dd0e83478749f8aabad/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" + ' + )" +fi + +# Don't move lib32 support into rust32-lib, we are on 32-bit in the end +# and don't draw a symlink to 64-bit libraries (but to 32-bit instead) + +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -v '^lib32-rust-libs' + ) +) + +eval "$( + declare -f package_rust141 | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +eval "$( + declare -f build | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +# work around P1024, U1024 typenum bug for old rust releases (bundled +# typenum version contains a buggy version) +if [ "${CARCH}" = "i686" ]; then + source+=('rustc-1.41.0-src-typenum-U1024.patch') + sha256sums+=('5e5ff622332c9f3fc00ef200d2d14de00e8973ea09a35cd42631ac46264a358a') + eval "$( + declare -f prepare | \ + sed ' + /}/ i \ + patch -Np1 < "$srcdir/rustc-1.41.0-src-typenum-U1024.patch" + ' + )" + +fi + +# Enable on demand, if your previous rust is broken, see also build-support and AUR +# for rust-bin. +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust-bin') +groups+=(build-shims) diff --git a/build-support/disabled/rust141/config.toml.patch b/build-support/disabled/rust141/config.toml.patch new file mode 100644 index 00000000..8d0762cd --- /dev/null +++ b/build-support/disabled/rust141/config.toml.patch @@ -0,0 +1,26 @@ +diff -rauN a/config.toml b/config.toml +--- a/config.toml 2019-10-20 16:44:31.647900892 +0200 ++++ b/config.toml 2019-10-20 16:44:39.637875348 +0200 +@@ -2,7 +2,7 @@ + link-shared = true + + [build] +-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] ++target = ["i686-unknown-linux-gnu"] + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" + python = "/usr/bin/python" +@@ -21,11 +21,11 @@ + # https://github.com/rust-lang/rust/issues/54872 + codegen-units-std = 1 + +-debuginfo-level = 2 ++debuginfo-level = 0 + + channel = "stable" + + rpath = false + +-[target.x86_64-unknown-linux-gnu] ++[target.i686-unknown-linux-gnu] + llvm-config = "/usr/bin/llvm-config" diff --git a/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch b/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch new file mode 100644 index 00000000..d1484d5c --- /dev/null +++ b/build-support/disabled/rust141/rustc-1.41.0-src-typenum-U1024.patch @@ -0,0 +1,20 @@ +diff -rauN rustc-1.41.0-src/vendor/typenum/build/main.rs rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs +--- rustc-1.41.0-src/vendor/typenum/build/main.rs 2020-01-27 18:21:02.000000000 +0100 ++++ rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs 2020-04-19 10:51:35.744658747 +0200 +@@ -77,7 +77,7 @@ + fn main() { + let highest: u64 = 1024; + +- let first2: u32 = (highest as f64).log(2.0) as u32 + 1; ++ let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1; + let first10: u32 = (highest as f64).log(10.0) as u32 + 1; + let uints = (0..(highest + 1)) + .chain((first2..64).map(|i| 2u64.pow(i))) +diff -rauN rustc-1.41.0-src/vendor/typenum/.cargo-checksum.json rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json +--- rustc-1.41.0-src/vendor/typenum/.cargo-checksum.json 2020-01-27 18:21:02.000000000 +0100 ++++ rustc-1.41.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json 2020-04-19 11:26:01.513478655 +0200 +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"44d33ee79a76a90a769096547ba4c7a5d3822afffeed025dfbcc5bb755227d52","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"38a90c85068bb6bba1d21e9d5976e693b9b868ed0c16b26986332d2ca1c01047","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} +\ No newline at end of file diff --git a/build-support/disabled/rust142/rustc-1.42.0-src-typenum-U1024.patch b/build-support/disabled/rust142/rustc-1.42.0-src-typenum-U1024.patch new file mode 100644 index 00000000..ea23980b --- /dev/null +++ b/build-support/disabled/rust142/rustc-1.42.0-src-typenum-U1024.patch @@ -0,0 +1,20 @@ +diff -rauN rustc-1.42.0-src/vendor/typenum/build/main.rs rustc-1.42.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs +--- rustc-1.42.0-src/vendor/typenum/build/main.rs 2020-03-10 01:00:21.000000000 +0100 ++++ rustc-1.42.0-src-typenum-U1024-patch/vendor/typenum/build/main.rs 2020-04-19 15:10:49.182384427 +0200 +@@ -77,7 +77,7 @@ + fn main() { + let highest: u64 = 1024; + +- let first2: u32 = (highest as f64).log(2.0) as u32 + 1; ++ let first2: u32 = (highest as f64).log(2.0).round() as u32 + 1; + let first10: u32 = (highest as f64).log(10.0) as u32 + 1; + let uints = (0..(highest + 1)) + .chain((first2..64).map(|i| 2u64.pow(i))) +diff -rauN rustc-1.42.0-src/vendor/typenum/.cargo-checksum.json rustc-1.42.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json +--- rustc-1.42.0-src/vendor/typenum/.cargo-checksum.json 2020-03-10 01:00:21.000000000 +0100 ++++ rustc-1.42.0-src-typenum-U1024-patch/vendor/typenum/.cargo-checksum.json 2020-04-19 15:11:32.195746987 +0200 +@@ -1 +1 @@ +-{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"44d33ee79a76a90a769096547ba4c7a5d3822afffeed025dfbcc5bb755227d52","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} +\ No newline at end of file ++{"files":{"CHANGELOG.md":"caf37574d41c38570e892c4fed38cbc2fd22794ec512949c1f0faad1d866fced","Cargo.toml":"58822547c70a09449e6a069e6c197423a9e471d993ebf4ea20101e042781edf7","LICENSE":"a825bd853ab71619a4923d7b4311221427848070ff44d990da39b0b274c1683f","README.md":"7a19a1fb2f219fbc270535e0fee2caa96968b976cd74d33d12e2f2ef436d0895","build/main.rs":"38a90c85068bb6bba1d21e9d5976e693b9b868ed0c16b26986332d2ca1c01047","build/op.rs":"a393b6818384a50688db8cb923891f86ccce39a9dccbf7c684efb9bef83b4acf","build/tests.rs":"a04fd3185ea8b19c36cb939178e5fedf16b4b36c2df0a2e79593339d998bd1ce","src/array.rs":"7243dbe44f3818c852c67bd0c3af14d57473fb9c3efda2c0d98251b3fe8b4d57","src/bit.rs":"023f9f6768331ac17de72b6248c6a9d6a7b856842f56067c9c1e04b729ed9e04","src/int.rs":"de4c49717a7a40572e579fad2380f29698c5571844ff1462e368531072dba55e","src/lib.rs":"2a58ff8553851eb6b9d7fa70315d688431dd0573f8491e53cfe799a092347b96","src/marker_traits.rs":"abf73f3930b5129d01aaa64c51275c4ca4ce0ef8961f7a9e744ee731d6308200","src/operator_aliases.rs":"43eb6a29dc0387ec329df5d9af0b4479a1301b3a9b2304c3b7b7d8c03e01ff5d","src/private.rs":"48c572aa27bd444062eadb4bd3f5ca38c1e6efb66bc074f38555499b33f0dcaf","src/type_operators.rs":"df9ef3ae2a69d56258db41f8166342a65f6e4085581709140719d1b7e3916bb9","src/uint.rs":"df4fdad3110a7e08fdc21e49f7e82fd525d6a78fcf904a766729aa47c0200727","tests/test.rs":"1e559fadf0af1a38d7049caef26e3a162c58ea5e024aa637299376d776986549"},"package":"612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"} +\ No newline at end of file diff --git a/build-support/disabled/rust148/PKGBUILD b/build-support/disabled/rust148/PKGBUILD new file mode 100644 index 00000000..9ed1cba8 --- /dev/null +++ b/build-support/disabled/rust148/PKGBUILD @@ -0,0 +1,203 @@ +# Maintainer: Johannes Löthberg <johannes@kyriasis.com> +# Contributor: Alexander F Rødseth <xyproto@archlinux.org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: userwithuid <userwithuid@gmail.com> + +pkgname=('rust148' 'rust148-docs') +epoch=1 +pkgver=1.48.0 +pkgrel=1 + +_llvm_ver=11.0.0 + +pkgdesc='Systems programming language focused on safety, speed and concurrency' +url='https://www.rust-lang.org/' +arch=(i486 i686 pentium4 'x86_64') +license=('MIT' 'Apache') + +makedepends=('rust=1:1.47.0' "llvm10-libs" "llvm=$_llvm_ver" 'libffi' 'perl' 'python' 'curl' 'cmake') +checkdepends=('procps-ng' 'gdb') + +options=('!emptydirs') + +source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + "https://github.com/llvm/llvm-project/releases/download/llvmorg-$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}) + +sha256sums=('0e763e6db47d5d6f91583284d2f989eacc49b84794d1443355b85c58d67ae43b' + 'SKIP' + '374aff82ff573a449f9aabbd330a5d0a441181c535a3599996127378112db234' + 'SKIP') +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A' # Tom Stellard <tstellar@redhat.com> + 'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org> + +prepare() { + cd "rustc-$pkgver-src" + + cat >config.toml <<END +[llvm] +link-shared = true + +[build] +target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +python = "/usr/bin/python" +extended = true +sanitizers = false +profiler = true +vendor = true + +[install] +prefix = "/usr" + +[rust] +# LLVM crashes when passing an object through ThinLTO twice. This is triggered when using rust +# code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 + +debuginfo-level = 2 + +channel = "stable" + +rpath = false + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" +END +} + +build() { + cd "rustc-$pkgver-src" + + export RUST_BACKTRACE=1 + export RUST_COMPILER_RT_ROOT="$srcdir/compiler-rt-$_llvm_ver.src" + + python ./x.py dist -j "$(nproc)" + DESTDIR="$PWD"/dest-rust python ./x.py install -j "$(nproc)" + + # move docs and lib32 libs out of the way for splitting + mv dest-rust/usr/lib/rustlib/i686-unknown-linux-gnu dest-i686 + mv dest-rust/usr/share/doc dest-doc +} + +package_rust148() { + depends=('gcc-libs' 'llvm-libs' 'curl' 'libssh2') + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + provides=('cargo' 'rustfmt') + conflicts=('cargo' 'rustfmt') + replaces=('cargo' 'rustfmt') + + cd "rustc-$pkgver-src" + + mv dest-rust/* "$pkgdir" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + # delete unnecesary files, e.g. components and manifest files only used for the uninstall script + cd "$pkgdir"/usr/lib/rustlib + rm components install.log manifest-* rust-installer-version uninstall.sh + + # rustbuild always installs copies of the shared libraries to /usr/lib, + # overwrite them with symlinks to the per-architecture versions + ln -srft "$pkgdir"/usr/lib x86_64-unknown-linux-gnu/lib/*.so + + install -d "$pkgdir"/usr/share/bash-completion + mv "$pkgdir"/etc/bash_completion.d/ "$pkgdir"/usr/share/bash-completion/completions/ +} + +package_lib32-rust-libs() { + descriptino=('32-bit libraries for Rust') + depends=('lib32-gcc-libs') + provides=('lib32-rust') + conflicts=('lib32-rust') + replaces=('lib32-rust') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/lib/rustlib/ "$pkgdir"/usr/lib32/ + mv dest-i686 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu + ln -srft "$pkgdir"/usr/lib32 "$pkgdir"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so +} + +package_rust148-docs() { + description=('Documentation for the Rust programming language') + + cd "rustc-$pkgver-src" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" LICENSE* + + install -d "$pkgdir"/usr/share/doc + mv dest-doc/* "$pkgdir"/usr/share/doc +} + +# vim:set ts=2 sw=2 et: +# enable i686-unknown-linux-gnu target +# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file +# +# Also trying to reduce memory usage by building with +# -debuginfo-level-std=1 +# see https://github.com/rust-lang/rust/issues/60294 + +source+=(config.toml.patch) +sha256sums+=('42e861ba90335d0e2e666e10b12d9ff85ea1bdb711176fb3c09e92375e193660') + +eval "$( + declare -f prepare | \ + sed ' + $ i patch -p1 -i "$srcdir/config.toml.patch" + ' +)" + +# stop insanity of nproc (see FS#62952) +eval "$( + declare -f build | \ + sed ' + s/-j"$(nproc)"/-j16/ + ' +)" + +if [ "${CARCH}" != 'pentium4' ]; then + eval "$( + declare -f prepare | \ + sed ' + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/src/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs" + $ i sed -i "s/30f6a25d37d536c5734b9a7e1e9cc34167a013c5e0c49c3fe0a26d76f2e1ae6c/412f837953e4cc32ff14195bf2da7eb61cb43d602fdc2db1099997d906070521/g" "$srcdir/rustc-$pkgver-src/vendor/rustc-ap-rustc_target/.cargo-checksum.json" + ' + )" +fi + +# Don't move lib32 support into rust32-lib, we are on 32-bit in the end +# and don't draw a symlink to 64-bit libraries (but to 32-bit instead) + +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -v '^lib32-rust-libs' + ) +) + +eval "$( + declare -f package_rust148 | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +eval "$( + declare -f build | \ + sed ' + /mv.*i686-unknown-linux-gnu.*/d + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +# Enable on demand, if your previous rust is broken, see also build-support and AUR +# for rust-bin. +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust-bin') +groups+=(build-shims) diff --git a/build-support/disabled/rust148/config.toml.patch b/build-support/disabled/rust148/config.toml.patch new file mode 100644 index 00000000..8d0762cd --- /dev/null +++ b/build-support/disabled/rust148/config.toml.patch @@ -0,0 +1,26 @@ +diff -rauN a/config.toml b/config.toml +--- a/config.toml 2019-10-20 16:44:31.647900892 +0200 ++++ b/config.toml 2019-10-20 16:44:39.637875348 +0200 +@@ -2,7 +2,7 @@ + link-shared = true + + [build] +-target = ["x86_64-unknown-linux-gnu", "i686-unknown-linux-gnu"] ++target = ["i686-unknown-linux-gnu"] + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" + python = "/usr/bin/python" +@@ -21,11 +21,11 @@ + # https://github.com/rust-lang/rust/issues/54872 + codegen-units-std = 1 + +-debuginfo-level = 2 ++debuginfo-level = 0 + + channel = "stable" + + rpath = false + +-[target.x86_64-unknown-linux-gnu] ++[target.i686-unknown-linux-gnu] + llvm-config = "/usr/bin/llvm-config" diff --git a/build-support/disabled/rust156-bin/PKGBUILD b/build-support/disabled/rust156-bin/PKGBUILD new file mode 100644 index 00000000..a60bcd82 --- /dev/null +++ b/build-support/disabled/rust156-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=rust156-bin +pkgver=1.56.0 +pkgrel=1 +pkgdesc='Binary precompiled packages for Rust' +url='https://www.rust-lang.org/' +arch=(x86_64 pentium4 i686) +license=('MIT' 'Apache') +provides=('rust' 'cargo') +conflicts=('rust' 'cargo') +options=('!emptydirs') + +source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc}) +source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) +source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) + +sha256sums_x86_64=('5189cd56447f9d56fcd7a1966efe5a8efd19843fdfd6bf9a23a9acbc57b5e3f9' + 'SKIP') +sha256sums_pentium4=('f5fa5686a79108959a2910c97cec7c642198efd2a617d7a1b6cfc97d33612fe0' + 'SKIP') +sha256sums_i686=('f5fa5686a79108959a2910c97cec7c642198efd2a617d7a1b6cfc97d33612fe0' + 'SKIP') + +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com> + +case "${CARCH}" in + x86_64) _ARCH='x86_64-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; +esac + +package() { + cd "rust-$pkgver-$_ARCH" + + ./install.sh --prefix=/usr --destdir="$pkgdir" +} diff --git a/build-support/disabled/rust157-bin/PKGBUILD b/build-support/disabled/rust157-bin/PKGBUILD new file mode 100644 index 00000000..01f3e801 --- /dev/null +++ b/build-support/disabled/rust157-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=rust157-bin +pkgver=1.57.0 +pkgrel=1 +pkgdesc='Binary precompiled packages for Rust' +url='https://www.rust-lang.org/' +arch=(x86_64 pentium4 i686) +license=('MIT' 'Apache') +provides=('rust' 'cargo') +conflicts=('rust' 'cargo') +options=('!emptydirs') + +source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc}) +source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) +source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) + +sha256sums_x86_64=('ea0253784b2e5c22659ff148d492a68d2e11da734491714ebc61cc93896efcda' + 'SKIP') +sha256sums_pentium4=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa' + 'SKIP') +sha256sums_i686=('7e4ac8ca2874897099a3ceb89039ceee170f474a98ee247589fd6bca8dda7cfa' + 'SKIP') + +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com> + +case "${CARCH}" in + x86_64) _ARCH='x86_64-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; +esac + +package() { + cd "rust-$pkgver-$_ARCH" + + ./install.sh --prefix=/usr --destdir="$pkgdir" +} diff --git a/build-support/disabled/rust159-bin/PKGBUILD b/build-support/disabled/rust159-bin/PKGBUILD new file mode 100644 index 00000000..205e3d61 --- /dev/null +++ b/build-support/disabled/rust159-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=rust159-bin +pkgver=1.59.0 +pkgrel=1 +pkgdesc='Binary precompiled packages for Rust' +url='https://www.rust-lang.org/' +arch=(x86_64 pentium4 i686) +license=('MIT' 'Apache') +provides=('rust' 'cargo') +conflicts=('rust' 'cargo') +options=('!emptydirs') + +source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc}) +source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) +source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) + +sha256sums_x86_64=('0c1c2da3fa26372e5178123aa5bb0fdcd4933fbad9bfb268ffbd71807182ecae' + 'SKIP') +sha256sums_pentium4=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec' + 'SKIP') +sha256sums_i686=('f57ebfafed1e857b2b1dc1a22cf1133766f68a0759dc2f717dec54a8d4385dec' + 'SKIP') + +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com> + +case "${CARCH}" in + x86_64) _ARCH='x86_64-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; +esac + +package() { + cd "rust-$pkgver-$_ARCH" + + ./install.sh --prefix=/usr --destdir="$pkgdir" +} diff --git a/build-support/disabled/rust162/0001-bootstrap-Change-libexec-dir.patch b/build-support/disabled/rust162/0001-bootstrap-Change-libexec-dir.patch new file mode 100644 index 00000000..903a38dc --- /dev/null +++ b/build-support/disabled/rust162/0001-bootstrap-Change-libexec-dir.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 6 May 2021 20:14:58 +0200 +Subject: [PATCH] bootstrap: Change libexec dir + +--- + 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 b1fae356d893..a9783708d7a7 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -950,7 +950,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { + for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") { + let dirent = dirent.expect("read dir entry"); + if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") { +- tarball.add_file(&dirent.path(), "libexec", 0o755); ++ tarball.add_file(&dirent.path(), "lib", 0o755); + } + } + diff --git a/build-support/disabled/rust162/0001-cargo-Change-libexec-dir.patch b/build-support/disabled/rust162/0001-cargo-Change-libexec-dir.patch new file mode 100644 index 00000000..06bc493d --- /dev/null +++ b/build-support/disabled/rust162/0001-cargo-Change-libexec-dir.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 6 May 2021 20:13:31 +0200 +Subject: [PATCH] cargo: Change libexec dir + +--- + src/cargo/ops/registry/auth.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cargo/ops/registry/auth.rs b/src/cargo/ops/registry/auth.rs +index 648e051e6dc2..a7b24e07e552 100644 +--- a/src/cargo/ops/registry/auth.rs ++++ b/src/cargo/ops/registry/auth.rs +@@ -224,7 +224,7 @@ fn sysroot_credential( + .parent() + .and_then(|p| p.parent()) + .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?; +- let exe = root.join("libexec").join(format!( ++ let exe = root.join("lib").join(format!( + "cargo-credential-{}{}", + cred_name, + std::env::consts::EXE_SUFFIX diff --git a/build-support/disabled/rust162/0002-compiler-Change-LLVM-targets.patch b/build-support/disabled/rust162/0002-compiler-Change-LLVM-targets.patch new file mode 100644 index 00000000..a6e58b9c --- /dev/null +++ b/build-support/disabled/rust162/0002-compiler-Change-LLVM-targets.patch @@ -0,0 +1,84 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Fri, 12 Mar 2021 17:31:56 +0100 +Subject: [PATCH] compiler: Change LLVM targets + + - Change x86_64-unknown-linux-gnu to use x86_64-pc-linux-gnu + - Change i686-unknown-linux-gnu to use i686-pc-linux-gnu + +Reintroduce the aliasing that was removed in 1.52.0 and alias the -pc- +triples to the -unknown- triples. This avoids defining proper -pc- +targets, as things break when this is done: + + - The crate ecosystem expects the -unknown- targets. Making -pc- + rustc's host triple (and thus default target) would break various + crates. + - Firefox's build breaks when the host triple (from + `rustc --version --verbose`) is different from the target triple + (from `rustc --print target-list`) that best matches autoconf. +--- + compiler/rustc_session/src/config.rs | 2 +- + compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +- + compiler/rustc_target/src/spec/mod.rs | 9 +++++++++ + .../rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- + 4 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs +index 14ad1a42a7d8..efd47c47293b 100644 +--- a/compiler/rustc_session/src/config.rs ++++ b/compiler/rustc_session/src/config.rs +@@ -1867,7 +1867,7 @@ pub fn parse_target_triple( + early_error(error_format, &format!("target file {path:?} does not exist")) + }) + } +- Some(target) => TargetTriple::TargetTriple(target), ++ Some(target) => TargetTriple::from_alias(target), + _ => TargetTriple::from_triple(host_triple()), + } + } +diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +index 0998c618f31a..91c79c7e4ff0 100644 +--- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs +@@ -9,7 +9,7 @@ pub fn target() -> Target { + base.stack_probes = StackProbeType::Call; + + Target { +- llvm_target: "i686-unknown-linux-gnu".into(), ++ llvm_target: "i686-pc-linux-gnu".into(), + pointer_width: 32, + data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\ + f64:32:64-f80:32-n8:16:32-S128" +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index da0589cdd209..dc9865bdf64a 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -2506,6 +2506,15 @@ pub fn from_path(path: &Path) -> Result<Self, io::Error> { + Ok(TargetTriple::TargetJson { path_for_rustdoc: canonicalized_path, triple, contents }) + } + ++ /// Creates a target triple from its alias ++ pub fn from_alias(triple: String) -> Self { ++ match triple.as_str() { ++ "x86_64-pc-linux-gnu" => TargetTriple::from_triple("x86_64-unknown-linux-gnu"), ++ "i686-pc-linux-gnu" => TargetTriple::from_triple("i686-unknown-linux-gnu"), ++ _ => TargetTriple::TargetTriple(triple), ++ } ++ } ++ + /// Returns a string triple for this target. + /// + /// If this target is a path, the file name (without extension) is returned. +diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +index e525cfdde14f..2dfe25f4f238 100644 +--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +@@ -15,7 +15,7 @@ pub fn target() -> Target { + | SanitizerSet::THREAD; + + Target { +- llvm_target: "x86_64-unknown-linux-gnu".into(), ++ llvm_target: "x86_64-pc-linux-gnu".into(), + pointer_width: 64, + data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" + .into(), diff --git a/build-support/disabled/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch b/build-support/disabled/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch new file mode 100644 index 00000000..c2002ae6 --- /dev/null +++ b/build-support/disabled/rust162/0003-compiler-Use-wasm-ld-for-wasm-targets.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Sat, 6 Nov 2021 22:42:06 +0100 +Subject: [PATCH] compiler: Use wasm-ld for wasm targets + +We don't ship rust-lld. +--- + compiler/rustc_target/src/spec/wasm_base.rs | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs +index de7b7374af31..9ea181ab8d8f 100644 +--- a/compiler/rustc_target/src/spec/wasm_base.rs ++++ b/compiler/rustc_target/src/spec/wasm_base.rs +@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions { + // arguments just yet + limit_rdylib_exports: false, + +- // we use the LLD shipped with the Rust toolchain by default +- linker: Some("rust-lld".into()), ++ linker: Some("wasm-ld".into()), + lld_flavor: LldFlavor::Wasm, + linker_is_gnu: false, + diff --git a/build-support/disabled/rust162/PKGBUILD b/build-support/disabled/rust162/PKGBUILD new file mode 100644 index 00000000..33a068d3 --- /dev/null +++ b/build-support/disabled/rust162/PKGBUILD @@ -0,0 +1,303 @@ +# Maintainer: Johannes Löthberg <johannes@kyriasis.com> +# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> +# Contributor: Alexander F Rødseth <xyproto@archlinux.org> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: userwithuid <userwithuid@gmail.com> + +pkgbase=rust162 +pkgname=(rust162 rust162-musl rust162-wasm rust162-src) +epoch=1 +pkgver=1.62.0 +pkgrel=1 +pkgdesc="Systems programming language focused on safety, speed and concurrency" +url=https://www.rust-lang.org/ +arch=(i486 i686 pentium4 x86_64) +license=(MIT Apache) +options=(!emptydirs !strip !lto) +depends=(gcc-libs llvm-libs curl libssh2 gcc) +makedepends=(rust llvm libffi lib32-gcc-libs perl python cmake musl ninja + wasi-libc lld) +checkdepends=(procps-ng gdb) +source=( + "https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc} + 0001-cargo-Change-libexec-dir.patch + 0001-bootstrap-Change-libexec-dir.patch + 0002-compiler-Change-LLVM-targets.patch + 0003-compiler-Use-wasm-ld-for-wasm-targets.patch + remove-include-linux-fs.h.patch +) +sha256sums=('7d0878809b64d206825acae3eb7f60afb2212d81e3de1adf4c11c6032b36c027' + 'SKIP' + 'c901a9bb036c29ca092f7dbc8b447efdd9aa1044a902a88f9d024cb22681dc19' + '7080a88e44234aa363ba6321f319c8d9621382dd9581748a43847dae005e55bd' + '5137df0a3399e279db4c5b83ae8e99d2c1977f62aec2f90521edb02f51597064' + '26bf232d144b81a303ed91f6a331ddf004c5d9fefd41a11e36b61812a34459aa' + '34ed866e313e4580130a50118a4410d36fa0159123982521b6ef049439fc32ad') +validpgpkeys=(108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + 474E22316ABF4785A88C6E8EA2C794A986419D8A) # Tom Stellard <tstellar@redhat.com> + +prepare() { + cd rustc-$pkgver-src + + # Patch bootstrap and cargo so credential helpers + # are in /usr/lib instead of /usr/libexec + patch -d src/tools/cargo -Np1 < ../0001-cargo-Change-libexec-dir.patch + patch -Np1 -i ../0001-bootstrap-Change-libexec-dir.patch + + # Use our *-pc-linux-gnu targets, making LTO with clang simpler + patch -Np1 -i ../0002-compiler-Change-LLVM-targets.patch + + # Use our wasm-ld + patch -Np1 -i ../0003-compiler-Use-wasm-ld-for-wasm-targets.patch + + # https://github.com/llvm/llvm-project/issues/56421 + patch -Np1 -d src/llvm-project < ../remove-include-linux-fs.h.patch + + cat >config.toml <<END +changelog-seen = 2 +profile = "user" + +[llvm] +link-shared = true + +[build] +target = [ + "x86_64-unknown-linux-gnu", + "i686-unknown-linux-gnu", + "x86_64-unknown-linux-musl", + "wasm32-unknown-unknown", + "wasm32-wasi", +] +cargo = "/usr/bin/cargo" +rustc = "/usr/bin/rustc" +rustfmt = "/usr/bin/rustfmt" +locked-deps = true +vendor = true +tools = ["cargo", "rls", "clippy", "rustfmt", "analysis", "src", "rust-demangler"] +sanitizers = true +profiler = true + +# Generating docs fails with the wasm32-* targets +docs = false + +[install] +prefix = "/usr" + +[rust] +debuginfo-level-std = 2 +channel = "stable" +description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel" +rpath = false +backtrace-on-ice = true +remap-debuginfo = true +jemalloc = true + +# LLVM crashes when passing an object through ThinLTO twice. This is triggered +# when using rust code in cross-language LTO if libstd was built using ThinLTO. +# http://blog.llvm.org/2019/09/closing-gap-cross-language-lto-between.html +# https://github.com/rust-lang/rust/issues/54872 +codegen-units-std = 1 + +# musl target produces warnings +deny-warnings = false + +[dist] +compression-formats = ["gz"] + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" + +[target.x86_64-unknown-linux-musl] +sanitizers = false +musl-root = "/usr/lib/musl" + +[target.wasm32-unknown-unknown] +sanitizers = false +profiler = false + +[target.wasm32-wasi] +sanitizers = false +profiler = false +wasi-root = "/usr/share/wasi-sysroot" +END +} + +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/$f" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + +build() { + cd rustc-$pkgver-src + + export RUST_BACKTRACE=1 + + DESTDIR="$srcdir/dest-rust" python ./x.py install -j "$(nproc)" + + cd ../dest-rust + + # delete unnecessary files, e.g. files only used for the uninstall script + rm usr/lib/rustlib/{components,install.log,rust-installer-version,uninstall.sh} + rm usr/lib/rustlib/manifest-* + + # rustbuild always installs copies of the shared libraries to /usr/lib, + # overwrite them with symlinks to the per-architecture versions + mkdir -p usr/lib32 + ln -srft usr/lib usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/*.so + ln -srft usr/lib32 usr/lib/rustlib/i686-unknown-linux-gnu/lib/*.so + + mkdir -p usr/share/bash-completion + mv etc/bash_completion.d usr/share/bash-completion/completions + + mkdir -p usr/share/licenses/rust + mv -t usr/share/licenses/rust usr/share/doc/rust/{COPYRIGHT,LICENSE*} + + _pick dest-i686 usr/lib/rustlib/i686-unknown-linux-gnu usr/lib32 + _pick dest-musl usr/lib/rustlib/x86_64-unknown-linux-musl + _pick dest-wasm usr/lib/rustlib/wasm32-* + _pick dest-src usr/lib/rustlib/src +} + +package_rust162() { + optdepends=('lldb: rust-lldb script' + 'gdb: rust-gdb script') + provides=(cargo rustfmt) + conflicts=(cargo rustfmt 'rust-docs<1:1.56.1-3') + replaces=(cargo rustfmt cargo-tree 'rust-docs<1:1.56.1-3') + + cp -a dest-rust/* "$pkgdir" +} + +package_lib32-rust-libs() { + pkgdesc="32-bit target and libraries for Rust" + depends=(rust lib32-gcc-libs) + provides=(lib32-rust) + conflicts=(lib32-rust) + replaces=(lib32-rust) + + cp -a dest-i686/* "$pkgdir" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s rust "$pkgdir/usr/share/licenses/$pkgname" +} + +package_rust162-musl() { + pkgdesc="Musl target for Rust" + depends=(rust162) + + cp -a dest-musl/* "$pkgdir" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s rust "$pkgdir/usr/share/licenses/$pkgname" +} + +package_rust162-wasm() { + pkgdesc="WebAssembly targets for Rust" + depends=(rust162 lld) + + cp -a dest-wasm/* "$pkgdir" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s rust "$pkgdir/usr/share/licenses/$pkgname" +} + +package_rust162-src() { + pkgdesc="Source code for the Rust standard library" + depends=(rust162) + + cp -a dest-src/* "$pkgdir" + + mkdir -p "$pkgdir/usr/share/licenses" + ln -s rust "$pkgdir/usr/share/licenses/$pkgname" +} + +# vim:set ts=2 sw=2 et: +# enable i686-unknown-linux-gnu target +# and replace pentium4 (SSE2) with pentium3 (no SSE2) in the compiler spec file +# +# Also trying to reduce memory usage by building with +# -debuginfo-level-std=1 +# see https://github.com/rust-lang/rust/issues/60294 + +source+=(config.toml.patch) +sha256sums+=('a8b42b5f47c0eaebafbb2cd1f39d2f944945cbb55e87d4dc21c7bd5b1b8964d8') + +eval "$( + declare -f prepare | \ + sed ' + $ i patch -p1 -i "$srcdir/config.toml.patch" + ' +)" + +# stop insanity of nproc (see FS#62952) +#eval "$( +# declare -f build | \ +# sed ' +# s/-j "$(nproc)"/-j1/ +# ' +#)" + +if [ "${CARCH}" != 'pentium4' ]; then + eval "$( + declare -f prepare | \ + sed ' + $ i sed -i "s/pentium4/pentium3/g" "$srcdir/rustc-$pkgver-src/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs" + ' + )" +fi + +# Don't move lib32 support into rust32-lib, we are on 32-bit in the end +# and don't draw a symlink to 64-bit libraries (but to 32-bit instead) +# move rust-musl though, also patch architecture for musl accordingly +eval "$( + declare -f build | \ + sed ' + /mkdir.*usr\/lib32/d + /ln.*x86_64.*/d + /ln.*i686-unknown-linux-gnu.*/d + /_pick.*dest-i686.*/d + s/x86_64-unknown-linux-musl/i686-unknown-linux-musl/ + ' +)" + +eval "$( + declare -f package_rust | \ + sed ' + /ln /s/x86_64-unknown-linux-gnu/i686-unknown-linux-gnu/g + ' +)" + +eval "$( + declare -f package_rust-musl | \ + sed ' + s/x86_64-unknown-linux-musl/i686-unknown-linux-musl/ + ' +)" + +# remove 32-bit stuff (shouldn't that be removed automatically?) +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -v '^lib32-rust-libs' + ) +) +makedepends=(${makedepends[@]//lib32-gcc-libs/}) + +# Enable on demand, if your previous rust is broken use previous version +# from build-support (this is preferable to using rust-bin below, but +# requires all intermediate versions of rust to be built +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust148') + +# Enable on demand, if your previous rust is broken use previous version +# from build-support +#makedepends=(${makedepends[@]//rust/}) +#makedepends+=('rust159-bin') + +# rust 1.61 is built against llvm13.0, so force that in as a make dependency +makedepends+=('llvm13-libs') diff --git a/build-support/disabled/rust162/config.toml.patch b/build-support/disabled/rust162/config.toml.patch new file mode 100644 index 00000000..e262d277 --- /dev/null +++ b/build-support/disabled/rust162/config.toml.patch @@ -0,0 +1,39 @@ +diff -rauN a/config.toml b/config.toml +--- a/config.toml 2021-12-09 10:47:47.487749605 +0100 ++++ b/config.toml 2021-12-09 11:12:50.904278715 +0100 +@@ -6,11 +6,10 @@ + + [build] + target = [ +- "x86_64-unknown-linux-gnu", + "i686-unknown-linux-gnu", +- "x86_64-unknown-linux-musl", ++ "i686-unknown-linux-musl", + "wasm32-unknown-unknown", +- "wasm32-wasi", ++ "wasm32-wasi" + ] + cargo = "/usr/bin/cargo" + rustc = "/usr/bin/rustc" +@@ -28,7 +27,7 @@ + prefix = "/usr" + + [rust] +-debuginfo-level-std = 2 ++debuginfo-level-std = 0 + channel = "stable" + description = "Arch Linux $pkgbase $epoch:$pkgver-$pkgrel" + rpath = false +@@ -45,10 +44,10 @@ + [dist] + compression-formats = ["gz"] + +-[target.x86_64-unknown-linux-gnu] ++[target.i686-unknown-linux-gnu] + llvm-config = "/usr/bin/llvm-config" + +-[target.x86_64-unknown-linux-musl] ++[target.i686-unknown-linux-musl] + sanitizers = false + musl-root = "/usr/lib/musl" + diff --git a/build-support/disabled/rust162/remove-include-linux-fs.h.patch b/build-support/disabled/rust162/remove-include-linux-fs.h.patch new file mode 100644 index 00000000..bbf0d0e7 --- /dev/null +++ b/build-support/disabled/rust162/remove-include-linux-fs.h.patch @@ -0,0 +1,59 @@ +From 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 Mon Sep 17 00:00:00 2001 +From: Fangrui Song <i@maskray.me> +Date: Mon, 11 Jul 2022 12:53:34 -0700 +Subject: [PATCH] [sanitizer] Remove #include <linux/fs.h> to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It is generally not a good idea to mix usage of glibc headers and Linux UAPI +headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc +since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h +defines `fsconfig_command` which conflicts with linux/mount.h: + + .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ + +Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually. +Android sys/mount.h doesn't define BLKBSZGET and it still needs linux/fs.h. +In the long term we should move Linux specific definitions to sanitizer_platform_limits_linux.cpp +but this commit is easy to cherry pick into older compiler-rt releases. + +Fix https://github.com/llvm/llvm-project/issues/56421 + +Reviewed By: #sanitizers, vitalybuka, zatrazz + +Differential Revision: https://reviews.llvm.org/D129471 +--- + .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 4bd425435d56..3a94b260686f 100644 +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -73,7 +73,9 @@ + #include <sys/vt.h> + #include <linux/cdrom.h> + #include <linux/fd.h> ++#if SANITIZER_ANDROID + #include <linux/fs.h> ++#endif + #include <linux/hdreg.h> + #include <linux/input.h> + #include <linux/ioctl.h> +@@ -876,10 +878,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; + unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; + #endif +- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; +- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; +- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; +- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; ++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); ++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); ++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); ++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); + unsigned IOCTL_GIO_CMAP = GIO_CMAP; + unsigned IOCTL_GIO_FONT = GIO_FONT; + unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; diff --git a/build-support/disabled/rust165-bin/PKGBUILD b/build-support/disabled/rust165-bin/PKGBUILD new file mode 100644 index 00000000..59686c92 --- /dev/null +++ b/build-support/disabled/rust165-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=rust165-bin +pkgver=1.65.0 +pkgrel=1 +pkgdesc='Binary precompiled packages for Rust' +url='https://www.rust-lang.org/' +arch=(x86_64 pentium4 i686) +license=('MIT' 'Apache') +provides=('rust' 'cargo') +conflicts=('rust' 'cargo') +options=('!emptydirs') + +source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc}) +source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) +source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) + +sha256sums_x86_64=('8f754fdd5af783fe9020978c64e414cb45f3ad0a6f44d045219bbf2210ca3cb9' + 'SKIP') +sha256sums_pentium4=('b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46' + 'SKIP') +sha256sums_i686=('b29869f8e2c7029150a929b2c4e26843f363846ad99253a25be6abcfa8e84f46' + 'SKIP') + +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com> + +case "${CARCH}" in + x86_64) _ARCH='x86_64-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; +esac + +package() { + cd "rust-$pkgver-$_ARCH" + + ./install.sh --prefix=/usr --destdir="$pkgdir" +} diff --git a/build-support/disabled/rust168-bin/PKGBUILD b/build-support/disabled/rust168-bin/PKGBUILD new file mode 100644 index 00000000..0f1b54d1 --- /dev/null +++ b/build-support/disabled/rust168-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=rust168-bin +pkgver=1.68.2 +pkgrel=1 +pkgdesc='Binary precompiled packages for Rust' +url='https://www.rust-lang.org/' +arch=(x86_64 pentium4 i686) +license=('MIT' 'Apache') +provides=('rust' 'cargo') +conflicts=('rust' 'cargo') +options=('!emptydirs') + +source_x86_64=("https://static.rust-lang.org/dist/rust-$pkgver-x86_64-unknown-linux-gnu.tar.gz"{,.asc}) +source_pentium4=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) +source_i686=("https://static.rust-lang.org/dist/rust-$pkgver-i686-unknown-linux-gnu.tar.gz"{,.asc}) + +sha256sums_x86_64=('df7c7466ef35556e855c0d35af7ff08e133040400452eb3427c53202b6731926' + 'SKIP') +sha256sums_pentium4=('a85e1aa0831e8bd31dc8ba3e042b6dea69b4d45fd5d1111bf6fd2cc9d58dd619' + 'SKIP') +sha256sums_i686=('a85e1aa0831e8bd31dc8ba3e042b6dea69b4d45fd5d1111bf6fd2cc9d58dd619' + 'SKIP') + +validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE' # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org> + '474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com> + +case "${CARCH}" in + x86_64) _ARCH='x86_64-unknown-linux-gnu';; + i686|pentium4) _ARCH='i686-unknown-linux-gnu';; +esac + +package() { + cd "rust-$pkgver-$_ARCH" + + ./install.sh --prefix=/usr --destdir="$pkgdir" +} diff --git a/build-support/disabled/uinit/.SRCINFO b/build-support/disabled/uinit/.SRCINFO new file mode 100644 index 00000000..37b1f9dd --- /dev/null +++ b/build-support/disabled/uinit/.SRCINFO @@ -0,0 +1,14 @@ +pkgbase = uinit + pkgdesc = uinit -- smallest init possible + pkgver = 20171230git + pkgrel = 1 + url = https://github.com/shiftypenguin/uinit + arch = i686 + arch = x86_64 + license = custom:unlicense + makedepends = git + source = git+https://github.com/shiftypenguin/uinit.git#commit=8c11abef + sha512sums = SKIP + +pkgname = uinit + diff --git a/build-support/disabled/uinit/PKGBUILD b/build-support/disabled/uinit/PKGBUILD new file mode 100644 index 00000000..2afaf4bb --- /dev/null +++ b/build-support/disabled/uinit/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=uinit +pkgver=20171230git +_commit=8c11abef +pkgrel=1 +pkgdesc="uinit -- smallest init possible" +arch=('i686' 'x86_64') +url="https://github.com/shiftypenguin/uinit" +license=('custom:unlicense') +makedepends=('git') +source=("git+https://github.com/shiftypenguin/uinit.git#commit=${_commit}") +sha512sums=('SKIP') + +build() { + cd "${srcdir}/${pkgname}" + + make CFLAGS="${CFLAGS}" +} + +package(){ + cd "${srcdir}/${pkgname}" + + install -d -m0755 ${pkgdir}/{usr/bin,sbin} + + make DESTDIR="${pkgdir}" install + + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + mv ${pkgdir}/sbin/* ${pkgdir}/usr/bin/. + rmdir ${pkgdir}/sbin +} diff --git a/build-support/disabled/vala-bootstrap/PKGBUILD b/build-support/disabled/vala-bootstrap/PKGBUILD new file mode 100644 index 00000000..40aceda3 --- /dev/null +++ b/build-support/disabled/vala-bootstrap/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Andreas Baumann <mail@andreasbaumann.cc> + +pkgname=vala-bootstrap +pkgver=0.16.1 +pkgrel=1 +pkgdesc='Bootstrapping Compiler for the GObject type system' +url='https://wiki.gnome.org/Projects/Vala' +arch=(i486 i686 pentium4 x86_64) +license=(LGPL) +depends=() +makedepends=(git) +provides=(vala) +conflicts=(vala) +_commit=b2beeacc # corresponds to 0.16.1 +source=("git+https://gitlab.gnome.org/Archive/vala-bootstrap.git#commit=$_commit") +sha256sums=('SKIP') + +prepare() { + cd $pkgname +} + +build() { + cd $pkgname + ./configure --prefix=/usr --disable-build-from-vala + make +} + +check() { + cd $pkgname +# tests are horribly broken +# make check +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install +} diff --git a/build-support/disabled/vala/PKGBUILD b/build-support/disabled/vala/PKGBUILD new file mode 100644 index 00000000..0f6ce63a --- /dev/null +++ b/build-support/disabled/vala/PKGBUILD @@ -0,0 +1,5 @@ +# bootstrapping vala with vala-bootstrap (only for i486 for now) +if [ "$CARCH" = 'i486' ]; then + makedepends=(${makedepends[@]//vala/}) + makedepends+=(vala-bootstrap) +fi |