Date: Saturday, May 15, 2021 @ 18:20:32 Author: anthraxx Revision: 415545
archrelease: copy trunk to extra-x86_64 Added: postgresql-old-upgrade/repos/extra-x86_64/PKGBUILD (from rev 415544, postgresql-old-upgrade/trunk/PKGBUILD) Deleted: postgresql-old-upgrade/repos/extra-x86_64/PKGBUILD postgresql-old-upgrade/repos/extra-x86_64/icu68.patch -------------+ PKGBUILD | 175 +++++++++++++++++++++++++++------------------------------- icu68.patch | 17 ----- 2 files changed, 83 insertions(+), 109 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-05-15 18:20:28 UTC (rev 415544) +++ PKGBUILD 2021-05-15 18:20:32 UTC (rev 415545) @@ -1,92 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Dan McGee <d...@archlinux.org> - -pkgname=postgresql-old-upgrade -pkgver=12.5 -_majorver=${pkgver%.*} -pkgrel=3 -pkgdesc='PostgreSQL build for migrating between major versions with pg_upgrade' -url='https://www.postgresql.org/' -arch=('x86_64') -license=('custom:PostgreSQL') -depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0' 'pam' - 'zlib' 'icu' 'systemd-libs' 'libldap' 'krb5' 'llvm-libs') -makedepends=('python' 'python2' 'perl' 'tcl>=8.6.0' 'systemd' 'llvm' 'clang') -optdepends=('python2: for PL/Python 2 support' - 'python: for PL/Python 3 support' - 'perl: for PL/Perl support' - 'tcl: for PL/Tcl support') -source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 - icu68.patch) -sha256sums=('bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95' - 'ef6e69a308254e8ee5fcf1e23a600e7165377987a76b1131f55cf41353ce6230') -sha512sums=('9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e' - '60ea1330ab38a0f6960aaa3ca590f1e03db65f9ea42aa9d08cbe77ed8305b2e14528834de5406c78df52579af1e03fac7980a6d026f2f6a07cf4796b44b189f0') -b2sums=('7f7458346a0823d155f5caea0061aa14048d6f3cac27b1ea23dba03b02a39f39314ad1d44e589520d5e287004ffd32e042fea99ebfeda24b2cc23867b402d336' - '8392acfb26105578efaec8f0a9d6ab0499025fa9540e6b45ebf3b6873506eaf2548ca551a5a5c9a9053495239d1d831397b51b17db5d0e12917f7f558807ba72') - -prepare() { - cd postgresql-${pkgver} - patch -Np0 -i ../icu68.patch -} - -build() { - cd postgresql-${pkgver} - local options=( - --prefix=/opt/pgsql-${_majorver} - --with-gssapi - --with-libxml - --with-openssl - --with-perl - --with-python - --with-tcl - --with-pam - --without-readline - --with-system-tzdata=/usr/share/zoneinfo - --with-uuid=e2fs - --with-icu - --with-systemd - --with-ldap - --with-llvm - --disable-nls - --enable-thread-safety - ) - - # only build plpython3 for now - ./configure "${options[@]}" \ - PYTHON=/usr/bin/python - make -C src/pl/plpython all - make -C contrib/hstore_plpython all - make -C contrib/ltree_plpython all - - # save plpython3 build and Makefile.global - cp -a src/pl/plpython{,3} - cp -a contrib/hstore_plpython{,3} - cp -a contrib/ltree_plpython{,3} - cp -a src/Makefile.global{,.python3} - make distclean - - # regular build with everything - ./configure "${options[@]}" \ - PYTHON=/usr/bin/python2 - make -C src all - make -C contrib all -} - -package() { - cd postgresql-${pkgver} - make -C src DESTDIR="${pkgdir}" install - make -C contrib DESTDIR="${pkgdir}" install - - # install plpython3 - mv src/Makefile.global src/Makefile.global.save - cp src/Makefile.global.python3 src/Makefile.global - touch -r src/Makefile.global.save src/Makefile.global - make -C src/pl/plpython3 DESTDIR="${pkgdir}" install - make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install - make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install - - install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}" -} - -# vim: ts=2 sw=2 et: Copied: postgresql-old-upgrade/repos/extra-x86_64/PKGBUILD (from rev 415544, postgresql-old-upgrade/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-05-15 18:20:32 UTC (rev 415545) @@ -0,0 +1,83 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=postgresql-old-upgrade +pkgver=12.7 +_majorver=${pkgver%.*} +pkgrel=1 +pkgdesc='PostgreSQL build for migrating between major versions with pg_upgrade' +url='https://www.postgresql.org/' +arch=('x86_64') +license=('custom:PostgreSQL') +depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0' 'pam' + 'zlib' 'icu' 'systemd-libs' 'libldap' 'krb5' 'llvm-libs') +makedepends=('python' 'python2' 'perl' 'tcl>=8.6.0' 'systemd' 'llvm' 'clang') +optdepends=('python2: for PL/Python 2 support' + 'python: for PL/Python 3 support' + 'perl: for PL/Perl support' + 'tcl: for PL/Tcl support') +source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2) +sha256sums=('8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995') +sha512sums=('47ca347df63a441e52e52442074e85d0ebd3a89f7eb037022c4690cbe88b21a6a959092a812b79bb30db47b5975a5d7908318c73b2685683d48b4789d4ae6a44') +b2sums=('4939cb314253bb9ca2b14639f730967ce7ad5c5eb135d529b112290e6b351f7b507d6428cc48b4e24f34f664b5f4938029ceb9cc6161c9aff5f60ba0b3f848c7') + +build() { + cd postgresql-${pkgver} + local options=( + --prefix=/opt/pgsql-${_majorver} + --with-gssapi + --with-libxml + --with-openssl + --with-perl + --with-python + --with-tcl + --with-pam + --without-readline + --with-system-tzdata=/usr/share/zoneinfo + --with-uuid=e2fs + --with-icu + --with-systemd + --with-ldap + --with-llvm + --disable-nls + --enable-thread-safety + ) + + # only build plpython3 for now + ./configure "${options[@]}" \ + PYTHON=/usr/bin/python + make -C src/pl/plpython all + make -C contrib/hstore_plpython all + make -C contrib/ltree_plpython all + + # save plpython3 build and Makefile.global + cp -a src/pl/plpython{,3} + cp -a contrib/hstore_plpython{,3} + cp -a contrib/ltree_plpython{,3} + cp -a src/Makefile.global{,.python3} + make distclean + + # regular build with everything + ./configure "${options[@]}" \ + PYTHON=/usr/bin/python2 + make -C src all + make -C contrib all +} + +package() { + cd postgresql-${pkgver} + make -C src DESTDIR="${pkgdir}" install + make -C contrib DESTDIR="${pkgdir}" install + + # install plpython3 + mv src/Makefile.global src/Makefile.global.save + cp src/Makefile.global.python3 src/Makefile.global + touch -r src/Makefile.global.save src/Makefile.global + make -C src/pl/plpython3 DESTDIR="${pkgdir}" install + make -C contrib/hstore_plpython3 DESTDIR="${pkgdir}" install + make -C contrib/ltree_plpython3 DESTDIR="${pkgdir}" install + + install -Dm 644 COPYRIGHT -t "${pkgdir}/usr/share/licenses/${pkgname}" +} + +# vim: ts=2 sw=2 et: Deleted: icu68.patch =================================================================== --- icu68.patch 2021-05-15 18:20:28 UTC (rev 415544) +++ icu68.patch 2021-05-15 18:20:32 UTC (rev 415545) @@ -1,17 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 - -collationcmds.c:467:51: error: use of undeclared identifier 'TRUE' - uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); - ^ - ---- src/backend/commands/collationcmds.c.orig 2020-08-10 21:15:53 UTC -+++ src/backend/commands/collationcmds.c -@@ -463,7 +463,7 @@ get_icu_language_tag(const char *localename) - UErrorCode status; - - status = U_ZERO_ERROR; -- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); -+ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); - if (U_FAILURE(status)) - ereport(ERROR, - (errmsg("could not convert locale name \"%s\" to language tag: %s",