index : packages | |
Archlinux32 package modifications | gitolite user |
summaryrefslogtreecommitdiff |
diff --git a/blacklist/pentium4/pypy/pypy b/blacklist/pentium4/pypy/pypy new file mode 100644 index 00000000..8756bb94 --- /dev/null +++ b/blacklist/pentium4/pypy/pypy @@ -0,0 +1 @@ +Don't have python2 (or time) to bootstrap it diff --git a/blacklist/pentium4/tracexec/tracexec b/blacklist/pentium4/tracexec/tracexec new file mode 100644 index 00000000..070c832b --- /dev/null +++ b/blacklist/pentium4/tracexec/tracexec @@ -0,0 +1,6 @@ + Compiling tracexec v0.2.2 (/build/tracexec/src/tracexec-0.2.2) +error: unsupported architecture + --> src/arch.rs:14:9 + | +14 | compile_error!("unsupported architecture"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/core/icu74/ICU-22132.patch b/core/icu74/ICU-22132.patch new file mode 100644 index 00000000..3b93c920 --- /dev/null +++ b/core/icu74/ICU-22132.patch @@ -0,0 +1,25 @@ +diff -u a/i18n/vtzone.cpp a/i18n/vtzone.cpp +--- a/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100 ++++ b/i18n/vtzone.cpp 2023-07-14 09:05:38.000000000 +0100 +@@ -1735,14 +1735,14 @@ + } + } + } else { +- UnicodeString icutzprop; +- UVector customProps(nullptr, uhash_compareUnicodeString, status); ++ UVector customProps(uprv_deleteUObject, uhash_compareUnicodeString, status); + if (olsonzid.length() > 0 && icutzver.length() > 0) { +- icutzprop.append(olsonzid); +- icutzprop.append(u'['); +- icutzprop.append(icutzver); +- icutzprop.append(u']'); +- customProps.addElement(&icutzprop, status); ++ LocalPointer<UnicodeString> icutzprop(new UnicodeString(ICU_TZINFO_PROP), status); ++ icutzprop->append(olsonzid); ++ icutzprop->append(u'['); ++ icutzprop->append(icutzver); ++ icutzprop->append(u']'); ++ customProps.adoptElement(icutzprop.orphan(), status); + } + writeZone(writer, *tz, &customProps, status); + }
\ No newline at end of file diff --git a/core/icu74/LICENSE b/core/icu74/LICENSE new file mode 100644 index 00000000..22472dc2 --- /dev/null +++ b/core/icu74/LICENSE @@ -0,0 +1,519 @@ +UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE + +See Terms of Use <https://www.unicode.org/copyright.html> +for definitions of Unicode Inc.’s Data Files and Software. + +NOTICE TO USER: Carefully read the following legal agreement. +BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S +DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), +YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE +TERMS AND CONDITIONS OF THIS AGREEMENT. +IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE +THE DATA FILES OR SOFTWARE. + +COPYRIGHT AND PERMISSION NOTICE + +Copyright © 1991-2023 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in https://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that either +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, or +(b) this copyright and permission notice appear in associated +Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. + +---------------------------------------------------------------------- + +Third-Party Software Licenses + +This section contains third-party software notices and/or additional +terms for licensed third-party software components included within ICU +libraries. + +---------------------------------------------------------------------- + +ICU License - ICU 1.8.1 to ICU 57.1 + +COPYRIGHT AND PERMISSION NOTICE + +Copyright (c) 1995-2016 International Business Machines Corporation and others +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies of +the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY +SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + +All trademarks and registered trademarks mentioned herein are the +property of their respective owners. + +---------------------------------------------------------------------- + +Chinese/Japanese Word Break Dictionary Data (cjdict.txt) + + # The Google Chrome software developed by Google is licensed under + # the BSD license. Other software included in this distribution is + # provided under other licenses, as set forth below. + # + # The BSD License + # http://opensource.org/licenses/bsd-license.php + # Copyright (C) 2006-2008, Google Inc. + # + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are met: + # + # Redistributions of source code must retain the above copyright notice, + # this list of conditions and the following disclaimer. + # Redistributions in binary form must reproduce the above + # copyright notice, this list of conditions and the following + # disclaimer in the documentation and/or other materials provided with + # the distribution. + # Neither the name of Google Inc. nor the names of its + # contributors may be used to endorse or promote products derived from + # this software without specific prior written permission. + # + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + # BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # + # + # The word list in cjdict.txt are generated by combining three word lists + # listed below with further processing for compound word breaking. The + # frequency is generated with an iterative training against Google web + # corpora. + # + # * Libtabe (Chinese) + # - https://sourceforge.net/project/?group_id=1519 + # - Its license terms and conditions are shown below. + # + # * IPADIC (Japanese) + # - http://chasen.aist-nara.ac.jp/chasen/distribution.html + # - Its license terms and conditions are shown below. + # + # ---------COPYING.libtabe ---- BEGIN-------------------- + # + # /* + # * Copyright (c) 1999 TaBE Project. + # * Copyright (c) 1999 Pai-Hsiang Hsiao. + # * All rights reserved. + # * + # * Redistribution and use in source and binary forms, with or without + # * modification, are permitted provided that the following conditions + # * are met: + # * + # * . Redistributions of source code must retain the above copyright + # * notice, this list of conditions and the following disclaimer. + # * . Redistributions in binary form must reproduce the above copyright + # * notice, this list of conditions and the following disclaimer in + # * the documentation and/or other materials provided with the + # * distribution. + # * . Neither the name of the TaBE Project nor the names of its + # * contributors may be used to endorse or promote products derived + # * from this software without specific prior written permission. + # * + # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # * OF THE POSSIBILITY OF SUCH DAMAGE. + # */ + # + # /* + # * Copyright (c) 1999 Computer Systems and Communication Lab, + # * Institute of Information Science, Academia + # * Sinica. All rights reserved. + # * + # * Redistribution and use in source and binary forms, with or without + # * modification, are permitted provided that the following conditions + # * are met: + # * + # * . Redistributions of source code must retain the above copyright + # * notice, this list of conditions and the following disclaimer. + # * . Redistributions in binary form must reproduce the above copyright + # * notice, this list of conditions and the following disclaimer in + # * the documentation and/or other materials provided with the + # * distribution. + # * . Neither the name of the Computer Systems and Communication Lab + # * nor the names of its contributors may be used to endorse or + # * promote products derived from this software without specific + # * prior written permission. + # * + # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + # * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # * OF THE POSSIBILITY OF SUCH DAMAGE. + # */ + # + # Copyright 1996 Chih-Hao Tsai @ Beckman Institute, + # University of Illinois + # c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4 + # + # ---------------COPYING.libtabe-----END-------------------------------- + # + # + # ---------------COPYING.ipadic-----BEGIN------------------------------- + # + # Copyright 2000, 2001, 2002, 2003 Nara Institute of Science + # and Technology. All Rights Reserved. + # + # Use, reproduction, and distribution of this software is permitted. + # Any copy of this software, whether in its original form or modified, + # must include both the above copyright notice and the following + # paragraphs. + # + # Nara Institute of Science and Technology (NAIST), + # the copyright holders, disclaims all warranties with regard to this + # software, including all implied warranties of merchantability and + # fitness, in no event shall NAIST be liable for + # any special, indirect or consequential damages or any damages + # whatsoever resulting from loss of use, data or profits, whether in an + # action of contract, negligence or other tortuous action, arising out + # of or in connection with the use or performance of this software. + # + # A large portion of the dictionary entries + # originate from ICOT Free Software. The following conditions for ICOT + # Free Software applies to the current dictionary as well. + # + # Each User may also freely distribute the Program, whether in its + # original form or modified, to any third party or parties, PROVIDED + # that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear + # on, or be attached to, the Program, which is distributed substantially + # in the same form as set out herein and that such intended + # distribution, if actually made, will neither violate or otherwise + # contravene any of the laws and regulations of the countries having + # jurisdiction over the User or the intended distribution itself. + # + # NO WARRANTY + # + # The program was produced on an experimental basis in the course of the + # research and development conducted during the project and is provided + # to users as so produced on an experimental basis. Accordingly, the + # program is provided without any warranty whatsoever, whether express, + # implied, statutory or otherwise. The term "warranty" used herein + # includes, but is not limited to, any warranty of the quality, + # performance, merchantability and fitness for a particular purpose of + # the program and the nonexistence of any infringement or violation of + # any right of any third party. + # + # Each user of the program will agree and understand, and be deemed to + # have agreed and understood, that there is no warranty whatsoever for + # the program and, accordingly, the entire risk arising from or + # otherwise connected with the program is assumed by the user. + # + # Therefore, neither ICOT, the copyright holder, or any other + # organization that participated in or was otherwise related to the + # development of the program and their respective officials, directors, + # officers and other employees shall be held liable for any and all + # damages, including, without limitation, general, special, incidental + # and consequential damages, arising out of or otherwise in connection + # with the use or inability to use the program or any product, material + # or result produced or otherwise obtained by using the program, + # regardless of whether they have been advised of, or otherwise had + # knowledge of, the possibility of such damages at any time during the + # project or thereafter. Each user will be deemed to have agreed to the + # foregoing by his or her commencement of use of the program. The term + # "use" as used herein includes, but is not limited to, the use, + # modification, copying and distribution of the program and the + # production of secondary products from the program. + # + # In the case where the program, whether in its original form or + # modified, was distributed or delivered to or received by a user from + # any person, organization or entity other than ICOT, unless it makes or + # grants independently of ICOT any specific warranty to the user in + # writing, such person, organization or entity, will also be exempted + # from and not be held liable to the user for any such damages as noted + # above as far as the program is concerned. + # + # ---------------COPYING.ipadic-----END---------------------------------- + +---------------------------------------------------------------------- + +Lao Word Break Dictionary Data (laodict.txt) + + # Copyright (C) 2016 and later: Unicode, Inc. and others. + # License & terms of use: http://www.unicode.org/copyright.html + # Copyright (c) 2015 International Business Machines Corporation + # and others. All Rights Reserved. + # + # Project: https://github.com/rober42539/lao-dictionary + # Dictionary: https://github.com/rober42539/lao-dictionary/laodict.txt + # License: https://github.com/rober42539/lao-dictionary/LICENSE.txt + # (copied below) + # + # This file is derived from the above dictionary version of Nov 22, 2020 + # ---------------------------------------------------------------------- + # Copyright (C) 2013 Brian Eugene Wilson, Robert Martin Campbell. + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions are met: + # + # Redistributions of source code must retain the above copyright notice, this + # list of conditions and the following disclaimer. Redistributions in binary + # form must reproduce the above copyright notice, this list of conditions and + # the following disclaimer in the documentation and/or other materials + # provided with the distribution. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + # FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + # COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + # INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + # OF THE POSSIBILITY OF SUCH DAMAGE. + # -------------------------------------------------------------------------- + +---------------------------------------------------------------------- + +Burmese Word Break Dictionary Data (burmesedict.txt) + + # Copyright (c) 2014 International Business Machines Corporation + # and others. All Rights Reserved. + # + # This list is part of a project hosted at: + # github.com/kanyawtech/myanmar-karen-word-lists + # + # -------------------------------------------------------------------------- + # Copyright (c) 2013, LeRoy Benjamin Sharon + # All rights reserved. + # + # Redistribution and use in source and binary forms, with or without + # modification, are permitted provided that the following conditions + # are met: Redistributions of source code must retain the above + # copyright notice, this list of conditions and the following + # disclaimer. Redistributions in binary form must reproduce the + # above copyright notice, this list of conditions and the following + # disclaimer in the documentation and/or other materials provided + # with the distribution. + # + # Neither the name Myanmar Karen Word Lists, nor the names of its + # contributors may be used to endorse or promote products derived + # from this software without specific prior written permission. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS + # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED + # TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + # -------------------------------------------------------------------------- + +---------------------------------------------------------------------- + +Time Zone Database + + ICU uses the public domain data and code derived from Time Zone +Database for its time zone support. The ownership of the TZ database +is explained in BCP 175: Procedure for Maintaining the Time Zone +Database section 7. + + # 7. Database Ownership + # + # The TZ database itself is not an IETF Contribution or an IETF + # document. Rather it is a pre-existing and regularly updated work + # that is in the public domain, and is intended to remain in the + # public domain. Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do + # not apply to the TZ Database or contributions that individuals make + # to it. Should any claims be made and substantiated against the TZ + # Database, the organization that is providing the IANA + # Considerations defined in this RFC, under the memorandum of + # understanding with the IETF, currently ICANN, may act in accordance + # with all competent court orders. No ownership claims will be made + # by ICANN or the IETF Trust on the database or the code. Any person + # making a contribution to the database or code waives all rights to + # future claims in that contribution or in the TZ Database. + +---------------------------------------------------------------------- + +Google double-conversion + +Copyright 2006-2011, the V8 project authors. All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +---------------------------------------------------------------------- + +File: aclocal.m4 (only for ICU4C) +Section: pkg.m4 - Macros to locate and utilise pkg-config. + + +Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: config.guess (only for ICU4C) + + +This file is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, see <https://www.gnu.org/licenses/>. + +As a special exception to the GNU General Public License, if you +distribute this file as part of a program that contains a +configuration script generated by Autoconf, you may include it under +the same distribution terms that you use for the rest of that +program. This Exception is an additional permission under section 7 +of the GNU General Public License, version 3 ("GPLv3"). + + +(The condition for the exception is fulfilled because +ICU4C includes a configuration script generated by Autoconf, +namely the `configure` script.) + +---------------------------------------------------------------------- + +File: install-sh (only for ICU4C) + + +Copyright 1991 by the Massachusetts Institute of Technology + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of M.I.T. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. M.I.T. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. diff --git a/core/icu74/PKGBUILD b/core/icu74/PKGBUILD new file mode 100644 index 00000000..f320d987 --- /dev/null +++ b/core/icu74/PKGBUILD @@ -0,0 +1,70 @@ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Art Gramlich <art@gramlich-net.com> + +pkgname=icu74 +pkgver=74.2 +pkgrel=1 +pkgdesc="International Components for Unicode library" +arch=(x86_64) +url="https://icu.unicode.org" +license=('LicenseRef-Unicode-3.0' + 'BSD-2-Clause' + 'BSD-3-Clause') +depends=('gcc-libs' 'glibc' 'sh') +makedepends=('python') +provides=(libicu{data,i18n,io,test,tu,uc}.so) +source=(icu-74.2.tar.gz::https://github.com/unicode-org/icu/archive/refs/tags/release-74-2.tar.gz + ICU-22132.patch + LICENSE) +# https://github.com/unicode-org/icu/releases/download/release-74-2/SHASUM512.txt +sha512sums=('728ae0f09ffc802d675bcf5b849e3081472de8417736bf8b7df0f4db9d1fb8073779be76536764c9111f7cb0e5ab2d2af6c644cc24be432b9eeae9063802ad6c' + '1178062ccfcf7ecc698c64132b3612e73f9c4b0bbfaa668ae2039f3eb4cb2722d0b08a9f45b057da10def7a308d5c8d14c0c644892e7f11092c9cc488c850ab7' + 'c1c3b2deaf2aeb1d90c1ca85d57db921e140e5087c1eba579dabaca94568a840a0e105145b8016f3b7269216ddc1b0ac56e1d5d1753129a99367e51e2080a6b0') +#validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>" +#validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>" +#validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>" +#validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>" +#validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>" +#validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>" +validpgpkeys=('3DA35301A7C330257B8755754058F67406EAA6AB') # Craig Cornelius <ccornelius@google.com> + +prepare() { + cd icu-release-74-2/icu4c/source + # Required fix for thunderbird 115 to show Calendar and sidebar properly + # https://bugzilla.mozilla.org/show_bug.cgi?id=1843007 + # https://unicode-org.atlassian.net/browse/ICU-22132 + patch -Np1 < "${srcdir}/ICU-22132.patch" +} + +build() { + cd icu-release-74-2/icu4c/source + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --sbindir=/usr/bin + make +} + +check() { + cd icu-release-74-2/icu4c/source + make -k check || true +} + +package() { + cd icu-release-74-2/icu4c/source + make -j1 DESTDIR="${pkgdir}" install + + # we keep only the libraries + rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -rf "${pkgdir}/usr/lib/icu" + rm -rf "${pkgdir}/usr/lib/"*.so + rm -rf "${pkgdir}/usr/share" + + # Install license + install -Dm644 "${srcdir}/LICENSE" "${pkgdir}"/usr/share/licenses/icu74/LICENSE +} + +groups+=(build-shims) + diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD deleted file mode 100644 index eb241c98..00000000 --- a/core/libtool/PKGBUILD +++ /dev/null @@ -1,3 +0,0 @@ -# temporary fix for FS#65995 -source[3]='https://sources.debian.org/data/main/libt/libtool/2.4.6-14/debian/patches/no_hostname.patch' -sha256sums[3]='693aabb24a6e7ce21fe0b5d14394e19edcb8476663b5afa4463f9fa0df24d946' diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index 03c17f77..0de77e9c 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -13,7 +13,8 @@ if [ "${CARCH}" = "i486" ]; then eval "$( declare -f build | \ sed ' - s@enable-ktls@enable-ktls 386 no-threads@ + s@enable-ktls@enable-ktls 386@ + s@make@make LDFLAGS='-latomic@' ' )" fi @@ -35,3 +36,4 @@ eval "$( s/make.*test/make test || true/ ' )" + diff --git a/extra/arti/PKGBUILD b/extra/arti/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/arti/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/cargo-binstall/PKGBUILD b/extra/cargo-binstall/PKGBUILD index 94d20857..d924e013 100644 --- a/extra/cargo-binstall/PKGBUILD +++ b/extra/cargo-binstall/PKGBUILD @@ -1 +1,9 @@ options+=(!debug) + +# Compiling detect-wasi v1.0.0 (/build/cargo-binstall/src/cargo-binstall-1.6.7/crates/detect-wasi) +#error[E0080]: evaluation of constant value failed +# --> /build/.cargo/registry/src/index.crates.io-1cd66030c949c28d/compact_str-0.7.1/src/repr/mod.rs:79:13 +# | +#79 | panic!("Inline string was too long, max length is `std::mem::size_of::<CompactString>()` bytes + +unset check diff --git a/extra/catch2/PKGBUILD b/extra/catch2/PKGBUILD new file mode 100644 index 00000000..b28b04f6 --- /dev/null +++ b/extra/catch2/PKGBUILD @@ -0,0 +1,3 @@ + + + diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index 18217d41..d394180e 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,39 +1,44 @@ -# do not build in parallel on build slaves -eval "$( - declare -f build | \ - sed ' - s/--parallel=.*/--parallel=1/ - ' -)" +# cmake requires expat but upstream don't seem to include it +depends+=('expat') -# ignore gui (for now, needs Qt6, which needs atomics) -makedepends=(${makedepends[@]//qt6-base/}) -eval "$( - declare -f build | \ - sed ' - s/--qt-gui// - ' -)" +if [[ $CARCH = 'i486' ]]; then + # do not build in parallel on build slaves + eval "$( + declare -f build | \ + sed ' + s/--parallel=.*/--parallel=1/ + ' + )" -# disable documentation (python is somewhat broken currently) -makedepends=(${makedepends[@]//python-sphinx/}) -eval "$( - declare -f build | \ - sed ' - s/--sphinx-man// - s/--sphinx-html// - ' - declare -f package | \ - sed ' - /html\/_sources/d - ' -)" + # ignore gui (for now, needs Qt6, which needs atomics) + makedepends=(${makedepends[@]//qt6-base/}) + eval "$( + declare -f build | \ + sed ' + s/--qt-gui// + ' + )" -# emacs is broken currently -makedepends=(${makedepends[@]//emacs/}) -eval "$( - declare -f package | \ - sed ' - /emacs/d - ' -)" + # disable documentation (python is somewhat broken currently) + makedepends=(${makedepends[@]//python-sphinx/}) + eval "$( + declare -f build | \ + sed ' + s/--sphinx-man// + s/--sphinx-html// + ' + declare -f package | \ + sed ' + /html\/_sources/d + ' + )" + + # emacs is broken currently + makedepends=(${makedepends[@]//emacs/}) + eval "$( + declare -f package | \ + sed ' + /emacs/d + ' + )" +fi diff --git a/extra/docbook-xml/PKGBUILD b/extra/docbook-xml/PKGBUILD new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/extra/docbook-xml/PKGBUILD diff --git a/extra/gcc13/PKGBUILD b/extra/gcc13/PKGBUILD new file mode 100644 index 00000000..ca003988 --- /dev/null +++ b/extra/gcc13/PKGBUILD @@ -0,0 +1,125 @@ +# remove tsan (thread sanitizer) plugin, not available for i686 +pkgname=( + $( + printf '%s\n' "${pkgname[@]}" | \ + grep -vFx 'lib32-gcc-libs' + ) +) +unset -f 'package_lib32-gcc-libs' +eval "$( + declare -f prepare | \ + sed ' + \,/s/lib64/lib/, d + ' + declare -f build | \ + sed ' + /configure/ s/--enable-multilib/--disable-multilib/ + /configure/ s,--with-bugurl=https://bugs\.archlinux\.org/,--with-bugurl=https://bugs.archlinux32.org/, + /configure/ s/;$/ --build=$CHOST;/ + ' + declare -f package_gcc-libs | \ + sed ' + s/\$pkgname-multilib// + s@libsanitizer/{a,l,ub,t}san@libsanitizer/{a,l,ub}san@ + /provides=/s/libtsan.so// + \@/usr/lib32/@ d + ' + declare -f package_gcc | \ + sed ' + s/"lib32-gcc-libs[^"]*"//g + s@make.*tsan.*install@#\0@ + ' + declare -f package_gcc-ada | \ + sed ' + \,cd .*/32/libada,{ + N + d + } + ' +)" +eval "$( + for name in "${pkgname[@]}"; do + declare -f package_${name} | \ + sed ' + s/$pkgname-multilib// + s/{,32}// + \,/lib32/,d + \,/32/,d + ' + done +)" + +# i486-specific + +# no ADA +makedepends=(${makedepends[@]//gcc-ada/}) +makedepends_i686+=('gcc-ada') +makedepends_pentium4+=('gcc-ada') + +if [ "${CARCH}" = "i486" ]; then + package_gcc-ada() { + touch "$pkgdir/this-is-a-dummy-package" + } + + eval "$( + declare -f build | \ + sed ' + /enable-languages/ s/ada,// + ' + )" + + eval "$( + declare -f package_gcc | \ + sed ' + s/,gnat-style,gnat_rm,gnat_ugn// + ' + )" + + # building toolchain (gcc): again, lobtool problems + # /usr/lib/gcc/i486-pc-linux-gnu/7.3.0/ld: cannot find -lquadmath + # collect2: error: ld returned 1 exit status + # libtool: install: error: relink `libgfortran.la' with the above command before installing it + # make: Leaving directory '/build/gcc/src/gcc-build/i486-pc-linux-gnu/libgfortran' + # => wrong link order: libgfortran requires libquadmath + eval "$( + declare -f package_gcc-libs | \ + sed ' + /for lib in / s/libgfortran/libquadmath libgfortran/ + ' + )" + +fi + +makedepends=(${makedepends[@]//lib32-glibc/}) +makedepends=(${makedepends[@]//lib32-gcc-libs/}) + +# i486-specific: disable PGO/LTO build, uses too much resources, +# also disabling LTO for now +if [ "${CARCH}" = "i486" ]; then + eval "$( + declare -f build | \ + sed ' + s/--enable-pgo-build=.*/--disable-pgo-build/ + s/--enable-lto/--disable-lto/ + s/--with-build-config=bootstrap-lto// + ' + declare -f package_gcc | \ + sed ' + /make.*lto-plugin.*install/d + /ln.*liblto_plugin.so/d + ' + )" +fi + +# testing on 486 VMs takes too long and runs in virtual memory exhaustion +if [ "${CARCH}" = "i486" ]; then + unset check +fi + +# disable CET on all subarchitectures (Control Flow instructions endbr32/enbr64) +eval "$( + declare -f build | \ + sed ' + s/--enable-cet=auto/--disable-cet/ + ' +)" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD new file mode 100644 index 00000000..eee0df51 --- /dev/null +++ b/extra/giflib/PKGBUILD @@ -0,0 +1,8 @@ +# failing tests +eval "$( + declare -f check | \ + sed ' + s/make check/make check || true/ + ' +)" + diff --git a/extra/git-delta/PKGBUILD b/extra/git-delta/PKGBUILD index 6883ef75..774cb0b9 100644 --- a/extra/git-delta/PKGBUILD +++ b/extra/git-delta/PKGBUILD @@ -1 +1,3 @@ eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" +unset check +unset checkdepends diff --git a/extra/itstool/PKGBUILD b/extra/itstool/PKGBUILD new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/extra/itstool/PKGBUILD @@ -0,0 +1 @@ + diff --git a/extra/meson-python/PKGBUILD b/extra/meson-python/PKGBUILD new file mode 100644 index 00000000..6403c888 --- /dev/null +++ b/extra/meson-python/PKGBUILD @@ -0,0 +1,2 @@ +unset check +unset checkdepends diff --git a/extra/nanobind/PKGBUILD b/extra/nanobind/PKGBUILD new file mode 100644 index 00000000..9c49573b --- /dev/null +++ b/extra/nanobind/PKGBUILD @@ -0,0 +1,4 @@ +# We do not build these +checkdepends=(${checkdepends[@]//python-pytorch/}) +checkdepends=(${checkdepends[@]//python-tensorflow/}) + diff --git a/extra/onetbb/PKGBUILD b/extra/onetbb/PKGBUILD index c8838aef..e72e43ae 100644 --- a/extra/onetbb/PKGBUILD +++ b/extra/onetbb/PKGBUILD @@ -1,3 +1,4 @@ +unset check # -latomic on i486 if [ "$CARCH" == 'i486' ]; then eval "$( diff --git a/extra/openblas/PKGBUILD b/extra/openblas/PKGBUILD new file mode 100644 index 00000000..769c1efa --- /dev/null +++ b/extra/openblas/PKGBUILD @@ -0,0 +1,3 @@ +# build64 avx tests fail +unset check +unset checkdepends diff --git a/extra/python-aiohttp/PKGBUILD b/extra/python-aiohttp/PKGBUILD new file mode 100644 index 00000000..ffd0add2 --- /dev/null +++ b/extra/python-aiohttp/PKGBUILD @@ -0,0 +1,5 @@ +makedepends=(${makedepends[@]//npm/}) +eval "$(declare -f build | sed 's@make .*@export AIOHTTP_NO_EXTENSIONS=1@')" +# check needs rewriting to work without cython +unset check +unset checkdepends diff --git a/extra/python-ansible-compat/PKGBUILD b/extra/python-ansible-compat/PKGBUILD new file mode 100644 index 00000000..94d4da61 --- /dev/null +++ b/extra/python-ansible-compat/PKGBUILD @@ -0,0 +1,2 @@ +unset sha256sums +b2sums=(SKIP) diff --git a/extra/python-astropy/PKGBUILD b/extra/python-astropy/PKGBUILD new file mode 100644 index 00000000..c6ea8ecb --- /dev/null +++ b/extra/python-astropy/PKGBUILD @@ -0,0 +1,7 @@ +# Temporary hack for gcc14 +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" + ' +)" diff --git a/extra/python-cachy/PKGBUILD b/extra/python-cachy/PKGBUILD new file mode 100644 index 00000000..d16da0df --- /dev/null +++ b/extra/python-cachy/PKGBUILD @@ -0,0 +1 @@ +makedepends+=(python-setuptools) diff --git a/extra/python-django-allauth/PKGBUILD b/extra/python-django-allauth/PKGBUILD new file mode 100644 index 00000000..76ea37b6 --- /dev/null +++ b/extra/python-django-allauth/PKGBUILD @@ -0,0 +1,2 @@ +b2sums=(SKIP) +unset sha512sums diff --git a/extra/python-gevent/PKGBUILD b/extra/python-gevent/PKGBUILD new file mode 100644 index 00000000..9a367660 --- /dev/null +++ b/extra/python-gevent/PKGBUILD @@ -0,0 +1,6 @@ +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" + ' +)" diff --git a/extra/python-lupa/PKGBUILD b/extra/python-lupa/PKGBUILD new file mode 100644 index 00000000..f93a0a4c --- /dev/null +++ b/extra/python-lupa/PKGBUILD @@ -0,0 +1,2 @@ +eval "$(declare -f build | sed 's@\$CARCH@i686@')" +eval "$(declare -f check | sed 's@\$CARCH@i686@')" diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD index 6e15ddae..b760a5ae 100644 --- a/extra/python-numpy/PKGBUILD +++ b/extra/python-numpy/PKGBUILD @@ -3,15 +3,20 @@ if [ "${CARCH}" = "i486" -o "${CARCH}" = "i686" ]; then eval "$( declare -f build | \ sed ' - s|python setup.py build|python setup.py build --cpu-baseline=NONE --cpu-dispatch=NONE| + s|python -m build|python -m build -Csetup-args=-Dcpu-baseline=NONE -Csetup-args=-Dcpu-dispatch=NONE| ' )" fi + if [ "${CARCH}" = "pentium4" ]; then eval "$( declare -f build | \ sed ' - s|python setup.py build|python setup.py build --cpu-baseline=NONE --cpu-dispatch=SSE,SSE2| + s|python -m build|python -m build -Csetup-args=-Dcpu-baseline=NONE -Csetup-args=-Dcpu-dispatch=SSE,SSE2| ' )" fi + +prepare() { + sed -i 's@meson-python>=0.15.0,<0.16.0@meson-python>=0.15.0@' numpy-$pkgver/pyproject.toml || true +} diff --git a/extra/python-pendulum/PKGBUILD b/extra/python-pendulum/PKGBUILD new file mode 100644 index 00000000..91b2edb8 --- /dev/null +++ b/extra/python-pendulum/PKGBUILD @@ -0,0 +1,53 @@ +# pendulum 3 doesn't build under 32 bit for now, so force 2.1.2 +# Maintainer: David Runge <dvzrv@archlinux.org> + +_name=pendulum +pkgname=python-pendulum +pkgver_real=2.1.2 +#pkgrel=$((8+$pkgrel)) +pkgver=3.0.0 +pkgrel=2 +pkgdesc="Python datetimes made easy" +arch=(x86_64) +url="https://pendulum.eustace.io/" +license=(MIT) +depends=( + python + python-dateutil + python-pytzdata +) +makedepends=( + python-build + python-installer + python-poetry-core + python-wheel + python-setuptools +) +checkdepends=( + python-babel + python-freezegun + python-pytest + python-pytz +) +source=($pkgname-$pkgver_real.tar.gz::https://github.com/sdispater/$_name/archive/$pkgver_real.tar.gz) +sha512sums=('c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2') +b2sums=('c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738') + +build() { + cd $_name-$pkgver_real + # NOTE: calling pyproject-build as we otherwise call the project's build.py script: + # https://github.com/sdispater/pendulum/issues/665 + pyproject-build --wheel --no-isolation +} + +check() { + cd $_name-$pkgver_real + pytest -vv +} + +package() { + cd $_name-$pkgver_real + python -m installer --destdir="$pkgdir" dist/*.whl + install -vDm 644 {CHANGELOG.md,README.rst} -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/" +} diff --git a/extra/python-qdldl/PKGBUILD b/extra/python-qdldl/PKGBUILD new file mode 100644 index 00000000..c6ea8ecb --- /dev/null +++ b/extra/python-qdldl/PKGBUILD @@ -0,0 +1,7 @@ +# Temporary hack for gcc14 +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" + ' +)" diff --git a/extra/python-scikit-learn/PKGBUILD b/extra/python-scikit-learn/PKGBUILD new file mode 100644 index 00000000..c6ea8ecb --- /dev/null +++ b/extra/python-scikit-learn/PKGBUILD @@ -0,0 +1,7 @@ +# Temporary hack for gcc14 +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" + ' +)" diff --git a/extra/python-shapely/PKGBUILD b/extra/python-shapely/PKGBUILD index 14ce07a9..c45e9935 100644 --- a/extra/python-shapely/PKGBUILD +++ b/extra/python-shapely/PKGBUILD @@ -1,16 +1,8 @@ -# temporary fix for: -# - https://github.com/Toblerity/Shapely/pull/762 -# -# which caused: -# - https://community.ultimaker.com/topic/29721-archlinux32-cura-341/?_fromLogin=1#replyForm -# -source+=(load_dll_c.patch) -sha512sums+=('6dee4823b76d5057beaed09e9ed529d03a9f76141598a4038f3c51cbca828b1f3e9203a25dab91ee1ff31fee2bf2781d6171dc662f5aa1715c9d5296f8607c60') - +# Temporary hack for gcc14 eval "$( - declare -f prepare | \ + declare -f build | \ sed ' - $ i cd Shapely-$pkgver && patch -p1 -i "$srcdir/load_dll_c.patch" + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" ' )" @@ -18,6 +10,6 @@ eval "$( eval "$( declare -f check | \ sed ' - /.*py.test/s/\$CARCH/i686/ + s/x86_64/i686/ ' )" diff --git a/extra/python-snappy/PKGBUILD b/extra/python-snappy/PKGBUILD new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/extra/python-snappy/PKGBUILD @@ -0,0 +1 @@ + diff --git a/extra/python-validate-pyproject/PKGBUILD b/extra/python-validate-pyproject/PKGBUILD new file mode 100644 index 00000000..7d66985c --- /dev/null +++ b/extra/python-validate-pyproject/PKGBUILD @@ -0,0 +1,4 @@ +# Doesn't validate +if [[ $pkgver == 0.16 && $pkgrel == 1 ]]; then + sha512sums=(SKIP) +fi diff --git a/extra/python-virtualenv/PKGBUILD b/extra/python-virtualenv/PKGBUILD index 2b54ed99..8b137891 100644 --- a/extra/python-virtualenv/PKGBUILD +++ b/extra/python-virtualenv/PKGBUILD @@ -1,14 +1 @@ -# breaking the cycle with python-spinx -makedepends=(${makedepends[@]/python-sphinx_rtd_theme}) -makedepends=(${makedepends[@]/python-sphinx-argparse}) -makedepends=(${makedepends[@]/python-sphinx}) -eval "$( - declare -f build | \ - sed ' - s/sphinx-build/true/ - ' - declare -f package | \ - sed ' - /virtualenv\.1/d - ' -)" + diff --git a/extra/python-xcffib/PKGBUILD b/extra/python-xcffib/PKGBUILD new file mode 100644 index 00000000..a27ac98c --- /dev/null +++ b/extra/python-xcffib/PKGBUILD @@ -0,0 +1,5 @@ +source+=('xcffibgen-custom') +sha512sums+=('9743d6edbd878a9d8896fb693c6847fedfcbc4324a575e4df4e833db09282791e362b51d4b07621674920a43b14c59d193409ab3d3e759cf48f5fa59fa871410') +makedepends=(${makedepends[@]//haskell-xcffib/}) +makedepends+=('archlinux-keyring' 'pacman') +eval "$(declare -f build | sed 's@GEN=xcffibgen@GEN="../xcffibgen-custom $pkgver-$pkgrel"@')" diff --git a/extra/python-xcffib/xcffibgen-custom b/extra/python-xcffib/xcffibgen-custom new file mode 100755 index 00000000..9e23f120 --- /dev/null +++ b/extra/python-xcffib/xcffibgen-custom @@ -0,0 +1,33 @@ +#!/usr/bin/env -S bash -x +mirror='http://ftp.otenet.gr/linux/archlinux' + +# Strip arch32 specific part of the version string +version="${1%.*}" +shift + +while [[ $# -gt 0 ]]; do + if [[ $1 == '--output' ]]; then + output="$2" + shift + shift + elif [[ $1 == '--input' ]]; then + input="$2" + shift + shift + fi +done + +curl --fail -O "${mirror}/extra/os/x86_64/python-xcffib-${version}-any.pkg.tar.zst" +curl --fail -O "${mirror}/extra/os/x86_64/python-xcffib-${version}-any.pkg.tar.zst.sig" + +if pacman-key -v "python-xcffib-${version}-any.pkg.tar.zst.sig" "python-xcffib-${version}-any.pkg.tar.zst"; then + tar -xf "python-xcffib-${version}-any.pkg.tar.zst" + + pyver=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))') + tarpath="usr/lib/python${pyver}/site-packages/xcffib/" + + mapfile -t files < <(find "$input" -type f -name '*.xml' -printf "${tarpath}%f\n" | sed 's/xml$/py/') + + mkdir -p "$output" + cp "${files[@]}" "$output" || true +fi diff --git a/extra/python-xmlsec/PKGBUILD b/extra/python-xmlsec/PKGBUILD new file mode 100644 index 00000000..c6ea8ecb --- /dev/null +++ b/extra/python-xmlsec/PKGBUILD @@ -0,0 +1,7 @@ +# Temporary hack for gcc14 +eval "$( + declare -f build | \ + sed ' + 3 i CFLAGS="-Wno-incompatible-pointer-types $CFLAGS" + ' +)" diff --git a/extra/rapidfuzz-cpp/PKGBUILD b/extra/rapidfuzz-cpp/PKGBUILD new file mode 100644 index 00000000..fd726d49 --- /dev/null +++ b/extra/rapidfuzz-cpp/PKGBUILD @@ -0,0 +1,7 @@ +# Temporary hack for gcc14 +eval "$( + declare -f build | \ + sed ' + 3 i CXXFLAGS="$CXXFLAGS -Wno-error=conversion -Wno-error=sign-conversion -Wno-error=overflow" + ' +)" diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index d288fca1..131948ae 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -15,3 +15,12 @@ eval "$( s|./configure|./configure --disable-cephfs| ' )" + +if test "$CARCH" == "i486"; then + eval "$( + declare -f build | \ + sed ' + s|./configure|LDFLAGS=-latomic ./configure| + ' + )" +fi diff --git a/extra/sssd/PKGBUILD b/extra/sssd/PKGBUILD new file mode 100644 index 00000000..e5d521d4 --- /dev/null +++ b/extra/sssd/PKGBUILD @@ -0,0 +1,3 @@ +# Tests pass but are flaky, especially if the builder is under high load +unset check +unset checkdepends diff --git a/extra/starship/PKGBUILD b/extra/starship/PKGBUILD new file mode 100644 index 00000000..94d20857 --- /dev/null +++ b/extra/starship/PKGBUILD @@ -0,0 +1 @@ +options+=(!debug) diff --git a/extra/typst/PKGBUILD b/extra/typst/PKGBUILD index 6883ef75..06d408d8 100644 --- a/extra/typst/PKGBUILD +++ b/extra/typst/PKGBUILD @@ -1 +1,13 @@ eval "$(declare -f prepare | sed 's@$CARCH-unknown-linux-gnu@$(rustc -vV | sed -n "s/host: //p")@')" +# layout/grid-positioning.typ ❌ +# Subtest 13 does not match expected errors. +# Not annotated // Error: 213:16-213:35 number too large +# Not emitted // Error: 213:3-213:39 cell position too large +# Subtest 14 does not match expected errors. +# Not annotated // Error: 222:23-222:42 number too large +# Not emitted // Error: 222:3-222:46 cell position too large Subtest 15 does not match expected errors. +# Not annotated // Error: 230:22-230:41 number too large +# Not emitted // Hint: 230:3-230:45 try reducing the cell's rowspan or colspan +# Not emitted // Error: 230:3-230:45 cell would span an exceedingly large position +unset check +unset checkdepends diff --git a/extra/uwsgi/PKGBUILD b/extra/uwsgi/PKGBUILD new file mode 100644 index 00000000..9e09c011 --- /dev/null +++ b/extra/uwsgi/PKGBUILD @@ -0,0 +1,3 @@ +pkgname=(${pkgname[@]//uwsgi-plugin-pypy/}) +pkgname=(${pkgname[@]//uwsgi-plugin-php-legacy/}) +makedepends=(${makedepends[@]//pypy/}) diff --git a/extra/wpewebkit/PKGBUILD b/extra/wpewebkit/PKGBUILD index 8b1e84de..7c9653bd 100644 --- a/extra/wpewebkit/PKGBUILD +++ b/extra/wpewebkit/PKGBUILD @@ -1,4 +1,5 @@ # linker runs out of memory on 32-bit +options+=(!debug) eval "$( declare -f build | \ sed ' diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD new file mode 100644 index 00000000..e02a9607 --- /dev/null +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -0,0 +1 @@ +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=implicit-function-declaration"')" diff --git a/extra/xf86-video-savage/.SRCINFO b/extra/xf86-video-savage/.SRCINFO new file mode 100644 index 00000000..48eb0e71 --- /dev/null +++ b/extra/xf86-video-savage/.SRCINFO @@ -0,0 +1,22 @@ +pkgbase = xf86-video-voodoo + pkgdesc = X.org 3dfx Voodoo1/Voodoo2 2D video driver + pkgver = 1.2.6 + pkgrel = 2 + url = https://xorg.freedesktop.org/ + arch = x86_64 + groups = xorg-drivers + license = MIT + makedepends = xorg-server-devel + makedepends = X-ABI-VIDEODRV_VERSION=25.2 + makedepends = xorgproto + depends = glibc + conflicts = xorg-server<21.1.1 + conflicts = X-ABI-VIDEODRV_VERSION<25 + conflicts = X-ABI-VIDEODRV_VERSION>=26 + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-voodoo-1.2.6.tar.xz + source = https://xorg.freedesktop.org//releases/individual/driver/xf86-video-voodoo-1.2.6.tar.xz.sig + validpgpkeys = 4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E + sha512sums = c889d79044438d6b15efceda07f63874063a2faa24a86d048e62c8ad1364efdfec04ff7ec662ad0749d2a7263abb14edb74e7d5ebf9a1aa880edb2b341a80a31 + sha512sums = SKIP + +pkgname = xf86-video-voodoo diff --git a/extra/xf86-video-savage/.nvchecker.toml b/extra/xf86-video-savage/.nvchecker.toml new file mode 100644 index 00000000..ecf02ead --- /dev/null +++ b/extra/xf86-video-savage/.nvchecker.toml @@ -0,0 +1,8 @@ +[xf86-video-voodoo] +source = "gitlab" +gitlab = "xorg/driver/xf86-video-voodoo" +host = "gitlab.freedesktop.org" +use_max_tag = true + +include_regex = ".*xf86-video-voodoo-.*" +prefix = "xf86-video-voodoo-" diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD new file mode 100644 index 00000000..2c783bb6 --- /dev/null +++ b/extra/xf86-video-savage/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Tasos Sahanidis <a32@tasossah.com> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-savage +pkgver=2.4.1 +pkgrel=1 +pkgdesc="X.org savage video driver" +arch=(i486 i686 pentium4) +url="https://xorg.freedesktop.org/" +license=('X11-distribute-modifications-variant') +depends=('glibc') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=25.2' 'xorgproto') +conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26') +groups=('xorg-drivers') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha512sums=('7928dafa148340e4a6c0ecd2324a69a67aa8fec55d316468c7e68fd79d1a388fd0e1f593d39b6dab0c8a5876b23e7c65c037a3285d340fa82b27ec7c2d5c8713' + 'SKIP') +validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>" + +build() { + cd ${pkgname}-${pkgver} + + # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf + # With them, module fail to load with undefined symbol. + # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 + export CFLAGS=${CFLAGS/-fno-plt} + export CXXFLAGS=${CXXFLAGS/-fno-plt} + export LDFLAGS=${LDFLAGS/-Wl,-z,now} + + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/xf86-video-savage/keys/pgp/4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E.asc b/extra/xf86-video-savage/keys/pgp/4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E.asc new file mode 100644 index 00000000..efeb7265 --- /dev/null +++ b/extra/xf86-video-savage/keys/pgp/4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E.asc @@ -0,0 +1,59 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQGiBEab+moRBACDH5yKqS3wcc5bdxY7PBNuwKvF5TKMfagmSvuRDtZjjIIWaA/n +Z1KboV9Gq5g7kP7+Kfu+Qgd8u65eVsWwmPW10fXvj3aCU53glx2EdGdrHcgiyH2g +EQfPiyBw+trIppWFRV0IDXSLMA1FNC92t2nSG/VFHaPTVwcgkIRSfcXDvwCglGdE +a6f4uLqoNHP+m4yYnzapFuMD/R4+2AJDAvEWKDdYCGZzlawjAmmWyXrmT7/C/mx9 +8qUR473l4buXjHgDkkXXlHqdzil1vK85PhrKzNJDCCmlHUJNz+QwiAMOLwpD+kwV +Pb57RG7y+a5JQ5+jtVw4RlUxZIk/wj2An9YBO3A5vR7PdjM32ZJCN2+aM4dYfNzQ +xQKTA/47icvBaBVTl9rztjg2pd2Aqpc1P/GsIYLGj7XjnnJvGAENBHSH1QjpZMJG +CTS9oJ+B0/wrIr+pA+MdFgYAb6ojMQJOO6UChjWWSGjMFcs/CeXhxlLBido3DtAE +TbNTwO6OEfAvdosvTdhJFnwvZlJ+zZGGy5CrF2Fd9PUe9tmASbQoQWxhbiBDb29w +ZXJzbWl0aCA8YWxhbmNAZnJlZWRlc2t0b3Aub3JnPohoBBMRCgAoAhsDBgsJCAcD +AgYVCAIJCgsEFgIDAQIeAQIXgAUCWtvjngUJHaXqrgAKCRCi+54IHy0TDrCEAJ0W +P1TlJC6G/R7wFC8jiisY/NQxKQCgiap1UHuxTtn752MGuPe4lzibQXq0K0FsYW4g +Q29vcGVyc21pdGggPGFsYW4uY29vcGVyc21pdGhAc3VuLmNvbT6IZgQTEQoAJgIb +AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheABQJa2+OeBQkdpequAAoJEKL7nggfLRMO +G0MAn3mUvsWWPwTN1apiiC7tX1bleZ3iAKCLS83eKCU9U0faAc5xOl03KXTBzLQu +QWxhbiBDb29wZXJzbWl0aCA8YWxhbi5jb29wZXJzbWl0aEBvcmFjbGUuY29tPohr +BBMRCgArAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCWtvjmAUJHaXq +rgAKCRCi+54IHy0TDmAsAJ4ubyCVncwKtAGVIx9whDq7f6SxZgCfXAVWUqRR20c9 +8J39lLTtcopZDfi5Ag0ERpv6bxAIAJp5aUlho5rUhpS6ik7spsAQFPRuycPKMNu0 +J4F0v/OoPz085soV8ytLj4HqCGk2Zamh1jSgliZwuk9m7V7Wgxx+nBJawpWDX/eK +LObErfDwQ4dfOFvjbXLQMmNnQNaUGIWLPP3l8GuBOHMq60Bu+TPgh627vUntL5RE +QEQqTXIzWC6U10QsDblLwIvdOVSdGF5xl/N1myXzSKvrsZwWtoFc8G9v9hcCjhtN +1sm9b7Ojc51iZXvcetcvPy5RA6AUW3yEExaedUdLnvIF9sjFYIfJWFVYh2AgavnG +re6fF+NV2v3zfx3wRT7H9//m4YIDYJmgZgyQccXegTwfGBIq3osAAwYH/1FiMUMM +ES5Ilz2nDqId+DCWECAU6wgvIFRcXrZWxDxB+ZrnmTCXoAD0xedpfOkRHp8XTVc/ +9MU+wQ+lZRx2OQ6MJW0XGuFvHm94KZF/8HzWA2Ah7U4n0+3sLpk6zWceZq2zZNF0 +yVTjwD98+xNK1Q9sP8aOKdtg8yMH3hisKR6rdW+mfX5q0Q8Gol2hZsFH/qyIhnPz +hXDknuOh8E5iMkzrejVXUEn++Yzj23XjP59SObLznVkyxI+kBI9qvVEPfFBDybjH +WqLcgRcCpXAzjizEi+/d31iDa2ErJHV4R42obecFqiPnoDtiX3IiP7z9fmxM4aWP +ZZRqvq+1ht5wkn+ISQQYEQIACQUCRpv6bwIbDAAKCRCi+54IHy0TDoLoAKCHYRpw +/XfyEunw1YL/uMZzl78qIQCdFVcXNbqD83qVhW4Ly7hyDL8o0aK5Ag0EUXnVIQEQ +AKHpjOmY056n0tsZoW9q5egsMcl5tKC8uimrhO05nnq+5/60/YedC++V9c9b/3/X +7O28LyBkAtBgD0xJZSDQ0DhTzKAp6AzjQtBvI68uinGwxSjT+oQpPMxqhA1I0kzo +EDCdEqV+HsVOAEdbAi/tP9bbdTDzwVc8MWDriamBUqc53Rb00Mffy9435UgTS4gA +hMwANhy6XZmOMBhITOzxFJUEDTDJtLbE0b1jPRQS7NHQgak1inmuvPMc3wAuoEcS +CSt1xupbYsBoXOjK5wC/eE1LIdZoRyW2OkT140DqDZ8zfRID860hnirnYgb09TPN +tj93pudUAUt6T9+tcLN4/rxhxHOwse66KGHO4bQ1rZ6mfco6SYd9V60cL6hC2eMe +cyxZliMu17lj7EX8lxUH+omIgHc7HGoyUR6V+WB60cxWj5v05zdeLeZ2aLBcPFhx +lfDESm8f4ezdJSDS1QZmC0P5h3RJfhhfmdBr8kHzr7111D1/O71Av1VV5FyJ9YxU +Sxp4IPuzK7JbbgVHcA6PvXrDzWUslmZgPADpKH4hTmG/NdCqhEXcufvY6s5yNksB +8X3ReNvuSSyfGnRz3kvtyK0XzC7KRX2PquLI6A8KJprHwZGqEB1NDG8b2iaYnghO +jyfIYEVQF3nGfaBwv4lrCPEoZSUaK8f/NQZjNU8NQyTnABEBAAGJAm4EGBEKAA8C +GwIFAlrb470FCRLIEBwCKcFdIAQZAQoABgUCUXnVIQAKCRDP3xSIKMZCp9bmD/90 +50ke3bdx0zLPlUANoTu74vQT55f0a0cXgnrj15ey6Ln0S1seHadd0aF3lKpDwUOL +0YIQppDhLfWf9gEsQEKSPtHQgyKRbajvz8nEOi8Hz5ovrTqGCZp81XHVoiyEiCWu +XxeW7eyN4C8bjxbpiN0vaZ+sgMeMhXA5mwyKFs4m9JPpDe6kd2eaMO0zkcJCYjk0 +RcNZiPohm6EmeesNbA2zJhXgo+hQHEByojIJ5ltWyy5Zacc9dfxVq9Wr3y+lXKd8 +bMZiklsOPX0L+60yMoYjl1y9tVq5wDtf+iS3GvFLpIEOG4hoAT3hkeVvGp/Id8RM +j8trZn8AsMC1h2ElHaBKRMfIpJbVCpiW6VJ8H/+WedrjiaZO5E41sM2BvQUZK+2w +ExnzSIcOo+BR9LrSTEJ8WuxIZ9MVT5fhADOlO1QkRyv4ngdQsN4x/A6CCFV+YrEV +dZ+53zENoJe7LAtO1WAwJmng/swDK4mVrGwVO75zVWXL3iCuThQy0AssyoJdKiwD +j3SAtNJ2DcdLDG3ZD8sl3Ljbtkgy+MZciu6ezxT86Yv11WBa7dskewvrxKTHxOzr +epM31Bcz88H7xXA5oLs8n6Dq3jQOV46Z2xLxw3fXJ/koHyuwvi6fi7XKswl+mdJu +U8y7nAmLeSOgD4N3lkWrH2dOLjAGN9VgYI+yV6rn0gkQovueCB8tEw7nxACeNnR9 +mrdd+VMF32hm6lu54QUhWiQAoJLzrvm3uK/HXyfDrNoGAjiyAj+3 +=aAdc +-----END PGP PUBLIC KEY BLOCK----- diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD new file mode 100644 index 00000000..ea735c5a --- /dev/null +++ b/extra/xf86-video-voodoo/PKGBUILD @@ -0,0 +1,2 @@ +eval "$(declare -f build | sed '3i export CFLAGS="$CFLAGS -Wno-error=incompatible-pointer-types"')" + diff --git a/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch b/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch new file mode 100644 index 00000000..452723ee --- /dev/null +++ b/extra/xorg-server/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch @@ -0,0 +1,54 @@ +From e89edec497bac581ca9b614fb00c25365580f045 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= <jexposit@redhat.com> +Date: Fri, 19 Jan 2024 13:05:51 +0100 +Subject: [PATCH] ephyr: Fix incompatible pointer type build error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fix a compilation error on 32 bits architectures with gcc 14: + + ephyr_glamor_xv.c: In function ‘ephyr_glamor_xv_init’: + ephyr_glamor_xv.c:154:31: error: assignment to ‘SetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int, void *)’} [-Wincompatible-pointer-types] + 154 | adaptor->SetPortAttribute = ephyr_glamor_xv_set_port_attribute; + | ^ + ephyr_glamor_xv.c:155:31: error: assignment to ‘GetPortAttributeFuncPtr’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, int *, void *)’} from incompatible pointer type ‘int (*)(KdScreenInfo *, Atom, INT32 *, void *)’ {aka ‘int (*)(struct _KdScreenInfo *, long unsigned int, long int *, void *)’} [-Wincompatible-pointer-types] + 155 | adaptor->GetPortAttribute = ephyr_glamor_xv_get_port_attribute; + | ^ + +Build error logs: +https://koji.fedoraproject.org/koji/taskinfo?taskID=111964273 + +Signed-off-by: José Expósito <jexposit@redhat.com> +--- + hw/kdrive/ephyr/ephyr_glamor_xv.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hw/kdrive/ephyr/ephyr_glamor_xv.c b/hw/kdrive/ephyr/ephyr_glamor_xv.c +index 4dd15cf417..b5eae48c85 100644 +--- a/hw/kdrive/ephyr/ephyr_glamor_xv.c ++++ b/hw/kdrive/ephyr/ephyr_glamor_xv.c +@@ -50,16 +50,16 @@ ephyr_glamor_xv_stop_video(KdScreenInfo *screen, void *data, Bool cleanup) + + static int + ephyr_glamor_xv_set_port_attribute(KdScreenInfo *screen, +- Atom attribute, INT32 value, void *data) ++ Atom attribute, int value, void *data) + { +- return glamor_xv_set_port_attribute(data, attribute, value); ++ return glamor_xv_set_port_attribute(data, attribute, (INT32)value); + } + + static int + ephyr_glamor_xv_get_port_attribute(KdScreenInfo *screen, +- Atom attribute, INT32 *value, void *data) ++ Atom attribute, int *value, void *data) + { +- return glamor_xv_get_port_attribute(data, attribute, value); ++ return glamor_xv_get_port_attribute(data, attribute, (INT32 *)value); + } + + static void +-- +GitLab + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index f30c30dd..68846353 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,18 +1,13 @@ -# backport of ed11c4d443ad2e82512df64358d38008e0ee7693 for initializing probed mode line names -source+=('xorg-server-21.1.3-probed-mode-name-not-null.patch') -sha512sums+=('d721fad70b417b40f6b29e77b21c530b8f6d91c37e65c1a82c2cfcde5012adc17022ac0faa50ca587583aab6f6a5e5bdcdc68e36ece6ada766813aca1ab8b76d') +source+=('0001-ephyr-Fix-incompatible-pointer-type-build-error.patch') +sha512sums+=('5d6e2063d2e4d97dd2883b11ab7953e8ddedf5389b2e510e85ff199eebb86ad43c74ab88dc9258290bff91ed7c6ceefc0f90b148846b9703b1ce7c782905424a') eval "$( - { - declare -f prepare || \ - printf 'prepare() {\n}\n' - } \ - | sed ' - $i cd "$srcdir/$pkgname-$pkgver" \ - patch -Np1 -i "$srcdir/xorg-server-21.1.3-probed-mode-name-not-null.patch" + declare -f prepare | sed ' + 4i patch -Np1 -i "$srcdir/0001-ephyr-Fix-incompatible-pointer-type-build-error.patch" || true ' )" + # disabling LTO on i486 as enabling it leads to all kind of link errors if [ "${CARCH}" = "i486" ]; then eval "$( diff --git a/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch b/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch deleted file mode 100644 index 77d5de33..00000000 --- a/extra/xorg-server/xorg-server-21.1.3-probed-mode-name-not-null.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rauN xorg-server-21.1.3/hw/xfree86/modes/xf86Modes.c xorg-server-21.1.3-probed-mode-name-not-null-patch/hw/xfree86/modes/xf86Modes.c ---- xorg-server-21.1.3/hw/xfree86/modes/xf86Modes.c 2022-03-05 19:16:34.732713684 +0100 -+++ xorg-server-21.1.3-probed-mode-name-not-null-patch/hw/xfree86/modes/xf86Modes.c 2022-03-05 19:17:39.749449014 +0100 -@@ -803,10 +803,14 @@ - { - struct libxcvt_mode_info *libxcvt_mode_info; - DisplayModeRec *Mode = xnfcalloc(1, sizeof(DisplayModeRec)); -+ char *tmp; - - libxcvt_mode_info = - libxcvt_gen_mode_info(HDisplay, VDisplay, VRefresh, Reduced, Interlaced); - -+ XNFasprintf(&tmp, "%dx%d", HDisplay, VDisplay); -+ Mode->name = tmp; -+ - Mode->VDisplay = libxcvt_mode_info->vdisplay; - Mode->HDisplay = libxcvt_mode_info->hdisplay; - Mode->Clock = libxcvt_mode_info->dot_clock; |