diff options
| author | Erich Eckner <git@eckner.net> | 2022-02-28 21:56:23 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2022-02-28 21:58:00 +0100 |
| commit | 99216b5daf9f1c7a0dbce1c6d54345be1ea71e17 (patch) | |
| tree | ccb93db1c1e7718efaae2790631b79e28484fb92 /fpc-src-svn | |
| parent | 75cc60a8619791eb4ba7fbce72045a835344d3c5 (diff) | |
| download | archlinuxewe-99216b5daf9f1c7a0dbce1c6d54345be1ea71e17.tar.xz | |
fpc-src-svn: 3.3.1.r49634-1 -> 3.3.1.r10652-1
Diffstat (limited to 'fpc-src-svn')
| -rw-r--r-- | fpc-src-svn/.gitignore | 2 | ||||
| -rw-r--r-- | fpc-src-svn/PKGBUILD | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/fpc-src-svn/.gitignore b/fpc-src-svn/.gitignore index 65d12c1d4..5a18cd2fb 100644 --- a/fpc-src-svn/.gitignore +++ b/fpc-src-svn/.gitignore @@ -1 +1 @@ -fpcsrc +source diff --git a/fpc-src-svn/PKGBUILD b/fpc-src-svn/PKGBUILD index d776f1057..333602698 100644 --- a/fpc-src-svn/PKGBUILD +++ b/fpc-src-svn/PKGBUILD @@ -9,9 +9,9 @@ # See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc pkgname='fpc-src-svn' -pkgver=3.3.1.r49634 +pkgver=3.3.1.r10652 _pkgver="${pkgver%.r*}" -_revision="${pkgver##*.r}" +_commit="${pkgver##*.}" pkgrel=1 arch=('i486' 'i686' 'pentium4' 'x86_64') url='http://www.freepascal.org/' @@ -24,23 +24,32 @@ conflicts=('fpc-src') provides=("fpc-src=${pkgver}") source=('38680_refined_htypechk.pas-2.patch' -'fpcsrc::svn+http://svn.freepascal.org/svn/fpc/trunk#revision='"${_revision}") +'git+https://gitlab.com/freepascal.org/fpc/source.git#commit='"${_commit}") sha512sums=('583e26eca23d4fde9b6dc163c8e97cd5f271ca98e38560e0da0b79d30652a876f5c66e4b7c2ea32b429f34855b1cdc48987f4fd7bb7cf63eeafcbb6a08ee9693' 'SKIP') pkgver() { - cd "${srcdir}"/fpcsrc + cd "${srcdir}"/source + last_version=$( + git tag \ + | grep '^[0-9.]\+$' \ + | sort -V \ + | tail -n1 + ) + revision=$( + git rev-list --count "${_commit/HEAD/main}" "^${last_version}" + ) printf '%s.r%s' \ - $(grep -m 1 'version' Makefile.fpc | cut -d '=' -f 2) \ - $(svnversion | tr -d [A-z]) + ${last_version} \ + ${revision} } prepare() { - cd "${srcdir}"/fpcsrc + cd "${srcdir}"/source patch -p0 -i "${srcdir}/38680_refined_htypechk.pas-2.patch" } package() { install -dm755 "${pkgdir}"/usr/lib/fpc/src - mv "${srcdir}"/fpcsrc/* "${pkgdir}"/usr/lib/fpc/src/ + mv "${srcdir}"/source/* "${pkgdir}"/usr/lib/fpc/src/ } |