aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2020-02-05 17:14:17 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-02-06 01:40:48 +0100
commit15c44c29f2db7723facaf347bce941eb132a0efe (patch)
tree5570b9fcb7b0bad199862f1bb21d3b061c02814d
parent12e23894bcf8a87a40110a87a185c131df89ede3 (diff)
downloadaports-15c44c29f2db7723facaf347bce941eb132a0efe.tar.bz2
aports-15c44c29f2db7723facaf347bce941eb132a0efe.tar.xz
main/ctags: upgrade to 0_git20200205
Unfortunately, upstream does not tag releases currently [1]. For this reason, the package is technically outdated most of the time. I believe it make sense to update the package periodically, the last update was done almost two months ago, time for a new one. [1]: https://github.com/universal-ctags/ctags/issues/1038
-rw-r--r--main/ctags/0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch42
-rw-r--r--main/ctags/APKBUILD10
2 files changed, 4 insertions, 48 deletions
diff --git a/main/ctags/0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch b/main/ctags/0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch
deleted file mode 100644
index c74543acfe..0000000000
--- a/main/ctags/0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c2bd0a7e6caba9597e190fe4a8cfe0c8c128e72e Mon Sep 17 00:00:00 2001
-From: Masatake YAMATO <yamato@redhat.com>
-Date: Sun, 5 Jan 2020 13:54:50 +0900
-Subject: [PATCH] lregex: fix meaningless type mismatching between unsigned int
- and unsigned long
-
-Partially close #2369.
-
-A pointer to unsigned int variable is passed to functions expecting
-a pointer to unsigned long variable.
-
-This didn't cause a trouble because the sizes of the types are the
-same on x86_64, the most popular platform. However, on s390x, they
-are different, and cause a trouble as reported in #2369.
-
-Signed-off-by: Masatake YAMATO <yamato@redhat.com>
----
- main/lregex.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/main/lregex.c b/main/lregex.c
-index 5e0745dd..243f4607 100644
---- a/main/lregex.c
-+++ b/main/lregex.c
-@@ -478,7 +478,7 @@ static flagDefinition prePtrnFlagDef[] = {
- static void scope_ptrn_flag_eval (const char* const f CTAGS_ATTR_UNUSED,
- const char* const v, void* data)
- {
-- unsigned long *bfields = data;
-+ unsigned int *bfields = data;
-
- if (strcmp (v, "ref") == 0)
- *bfields |= SCOPE_REF;
-@@ -497,7 +497,7 @@ static void scope_ptrn_flag_eval (const char* const f CTAGS_ATTR_UNUSED,
- static void placeholder_ptrn_flag_eval (const char* const f CTAGS_ATTR_UNUSED,
- const char* const v CTAGS_ATTR_UNUSED, void* data)
- {
-- unsigned long *bfields = data;
-+ unsigned int *bfields = data;
- *bfields |= SCOPE_PLACEHOLDER;
- }
-
diff --git a/main/ctags/APKBUILD b/main/ctags/APKBUILD
index d599e745db..81d0d197e3 100644
--- a/main/ctags/APKBUILD
+++ b/main/ctags/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=ctags
-pkgver=0_git20191207
-_commit=2ebf5b1bed1f8ce2f2cccec66e613cd33bcee571
+pkgver=0_git20200205
+_commit=0d0ef5f0ce5914f809bb25781c51b6fd3136108a
pkgrel=0
pkgdesc="Generator of tags for all types of C/C++ languages"
url="https://ctags.io/"
@@ -12,8 +12,7 @@ license="GPL-2.0-or-later"
checkdepends="diffutils python"
makedepends="autoconf automake pkgconf py3-docutils"
subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_commit.tar.gz
- 0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/universal-ctags/ctags/archive/$_commit.tar.gz"
builddir="$srcdir"/$pkgname-$_commit
# secfixes:
@@ -51,5 +50,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2e4fe3b3bf77e0456298f398a2e16cb3dd116da2c078e09884b8cd40d182a6cb07b88538713c890517535348fb1d9016b3dca46fa6f6a9b18fe784ec7b18ca30 ctags-0_git20191207.tar.gz
-e5c636eaa0bb6371d0ba54fc9777d3f3e488a03baf380509389c6d0488c19dd23eba5dc787d2d6bab13007cfe98ed17dfed5078ea7b94398afebbe5e64a3b6cf 0001-lregex-fix-meaningless-type-mismatching-between-unsi.patch"
+sha512sums="eac10b0cbaf78ed3cf41ee9182b57e6ef1636ffe08820683df412a57556069c62ec9b17be04b47cc3565cc954ca81dbad48a793b550c5501deb2783879d2cb50 ctags-0_git20200205.tar.gz"