Re: [PR PATCH] [Updated] WIP: ctags: update to 5.9.20210214.0

Github messages for voidlinux
 help / color / mirror / Atom feed

From: Eluminae <Eluminae@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: ctags: update to 5.9.20210214.0
Date: Tue, 23 Feb 2021 09:27:56 +0100	[thread overview]
Message-ID: <20210223082756.HLdPsoCmDHgrLz31WBtgjYAMn9jB-09dEHElGnKIgOU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28885@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

There is an updated pull request by Eluminae against master on the void-packages repository

https://github.com/Eluminae/void-packages uctags
https://github.com/void-linux/void-packages/pull/28885

WIP: ctags: update to 5.9.20210214.0
This is an update of ctags using universal-ctags

#### General
- [x] This is a update package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I built this PR locally for my native architecture, (x86_64)



A patch file from https://github.com/void-linux/void-packages/pull/28885.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-uctags-28885.patch --]
[-- Type: text/x-diff, Size: 9813 bytes --]

From da45f074b99ef669cdbbd96b27371b3fcfe06185 Mon Sep 17 00:00:00 2001
From: Reed Wade <reedwade@misterbanal.net>
Date: Fri, 19 Feb 2021 15:02:16 +0100
Subject: [PATCH] ctags: update to 5.9.20210214.0

We moved from exhuberant_ctags to universal_ctags
---
 .../0001-Strip-libiconv-dependant-tests.patch | 195 ++++++++++++++++++
 srcpkgs/ctags/template                        |  19 +-
 2 files changed, 208 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch

diff --git a/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch
new file mode 100644
index 00000000000..821d0d1f6c8
--- /dev/null
+++ b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch
@@ -0,0 +1,195 @@
+From 0f18f8c8a27ea88d0637ab3d86394265abcbb8f9 Mon Sep 17 00:00:00 2001
+From: Reed Wade <reedwade@misterbanal.net>
+Date: Tue, 23 Feb 2021 09:12:01 +0100
+Subject: [PATCH] Strip libiconv dependant tests
+
+Signed-off-by: Reed Wade <reedwade@misterbanal.net>
+---
+ .../input-encoding-option.d/exit-expected.txt |  1 -
+ Tmain/input-encoding-option.d/input.java      |  4 ----
+ Tmain/input-encoding-option.d/input.js        |  1 -
+ Tmain/input-encoding-option.d/run.sh          | 22 -------------------
+ .../stderr-expected.txt                       |  0
+ .../stdout-expected.txt                       |  0
+ .../input-encoding-option.d/tags-expected.txt | 14 ------------
+ .../exit-expected.txt                         |  1 -
+ Tmain/output-encoding-option.d/input.java     |  4 ----
+ Tmain/output-encoding-option.d/input.js       |  1 -
+ Tmain/output-encoding-option.d/run.sh         | 21 ------------------
+ .../stderr-expected.txt                       |  0
+ .../stdout-expected.txt                       |  0
+ .../tags-expected.txt                         | 14 ------------
+ 14 files changed, 83 deletions(-)
+ delete mode 100644 Tmain/input-encoding-option.d/exit-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/input.java
+ delete mode 100644 Tmain/input-encoding-option.d/input.js
+ delete mode 100644 Tmain/input-encoding-option.d/run.sh
+ delete mode 100644 Tmain/input-encoding-option.d/stderr-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/stdout-expected.txt
+ delete mode 100644 Tmain/input-encoding-option.d/tags-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/exit-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/input.java
+ delete mode 100644 Tmain/output-encoding-option.d/input.js
+ delete mode 100644 Tmain/output-encoding-option.d/run.sh
+ delete mode 100644 Tmain/output-encoding-option.d/stderr-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/stdout-expected.txt
+ delete mode 100644 Tmain/output-encoding-option.d/tags-expected.txt
+
+diff --git Tmain/input-encoding-option.d/exit-expected.txt Tmain/input-encoding-option.d/exit-expected.txt
+deleted file mode 100644
+index 573541ac..00000000
+--- Tmain/input-encoding-option.d/exit-expected.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-0
+diff --git Tmain/input-encoding-option.d/input.java Tmain/input-encoding-option.d/input.java
+deleted file mode 100644
+index f1ebd5d6..00000000
+--- Tmain/input-encoding-option.d/input.java
++++ /dev/null
+@@ -1,4 +0,0 @@
+-class Foo { // FooƒNƒ‰ƒX
+-	public Foo() { // ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+-	}
+-}
+diff --git Tmain/input-encoding-option.d/input.js Tmain/input-encoding-option.d/input.js
+deleted file mode 100644
+index 8bfcd659..00000000
+--- Tmain/input-encoding-option.d/input.js
++++ /dev/null
+@@ -1 +0,0 @@
+-var a = 1; // ÊÑ¿ô½é´ü²½
+diff --git Tmain/input-encoding-option.d/run.sh Tmain/input-encoding-option.d/run.sh
+deleted file mode 100644
+index 16a5d21b..00000000
+--- Tmain/input-encoding-option.d/run.sh
++++ /dev/null
+@@ -1,22 +0,0 @@
+-#!/bin/sh
+-
+-# Copyright: 2015 Yasuhiro MATSUMOTO
+-# License: GPL-2
+-
+-CTAGS=$1
+-BUILDDIR=$2
+-
+-. ../utils.sh
+-
+-if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
+-  if ${CTAGS} --quiet --options=NONE \
+-	      --pseudo-tags=-TAG_PROC_CWD \
+-	      --input-encoding=utf-8 --input-encoding-java=cp932 --input-encoding-javascript=euc-jp \
+-	      -o ${BUILDDIR}/tags \
+-	      input.js input.java ; then
+-      remove_commit_id ${BUILDDIR}/tags
+-  fi
+-  exit $?
+-else
+-  skip "iconv feature is not available"
+-fi
+diff --git Tmain/input-encoding-option.d/stderr-expected.txt Tmain/input-encoding-option.d/stderr-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/input-encoding-option.d/stdout-expected.txt Tmain/input-encoding-option.d/stdout-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/input-encoding-option.d/tags-expected.txt Tmain/input-encoding-option.d/tags-expected.txt
+deleted file mode 100644
+index 07ddd7d6..00000000
+--- Tmain/input-encoding-option.d/tags-expected.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-!_TAG_FILE_ENCODING	UTF-8	//
+-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+-!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+-!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+-!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+-!_TAG_PROGRAM_VERSION	5.9.0	//
+-Foo	input.java	/^	public Foo() { \/\/ ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿$/;"	m	class:Foo
+-Foo	input.java	/^class Foo { \/\/ Fooã‚¯ãƒ©ã‚¹$/;"	c
+-a	input.js	/^var a = 1; \/\/ å¤‰æ•°åˆæœŸåŒ–$/;"	v
+diff --git Tmain/output-encoding-option.d/exit-expected.txt Tmain/output-encoding-option.d/exit-expected.txt
+deleted file mode 100644
+index 573541ac..00000000
+--- Tmain/output-encoding-option.d/exit-expected.txt
++++ /dev/null
+@@ -1 +0,0 @@
+-0
+diff --git Tmain/output-encoding-option.d/input.java Tmain/output-encoding-option.d/input.java
+deleted file mode 100644
+index 234c5b20..00000000
+--- Tmain/output-encoding-option.d/input.java
++++ /dev/null
+@@ -1,4 +0,0 @@
+-class Foo { // Fooã‚¯ãƒ©ã‚¹
+-	public Foo() { // ã‚³ãƒ³ã‚¹ãƒˆãƒ©ã‚¯ã‚¿
+-	}
+-}
+diff --git Tmain/output-encoding-option.d/input.js Tmain/output-encoding-option.d/input.js
+deleted file mode 100644
+index 8bfcd659..00000000
+--- Tmain/output-encoding-option.d/input.js
++++ /dev/null
+@@ -1 +0,0 @@
+-var a = 1; // ÊÑ¿ô½é´ü²½
+diff --git Tmain/output-encoding-option.d/run.sh Tmain/output-encoding-option.d/run.sh
+deleted file mode 100644
+index 0687e610..00000000
+--- Tmain/output-encoding-option.d/run.sh
++++ /dev/null
+@@ -1,21 +0,0 @@
+-#!/bin/sh
+-# Copyright: 2015 Yasuhiro MATSUMOTO
+-# License: GPL-2
+-
+-CTAGS=$1
+-BUILDDIR=$2
+-
+-. ../utils.sh
+-
+-if ${CTAGS} --quiet --options=NONE --list-features | grep -q iconv; then
+-  if ${CTAGS}  --quiet --options=NONE \
+-	       --pseudo-tags=-TAG_PROC_CWD \
+-	       --output-encoding=cp932 --input-encoding=utf-8 --input-encoding-javascript=euc-jp \
+-	       -o ${BUILDDIR}/tags \
+-	       input.js input.java ; then
+-      remove_commit_id ${BUILDDIR}/tags
+-  fi
+-  exit $?
+-else
+-	skip "iconv feature is not available"
+-fi
+diff --git Tmain/output-encoding-option.d/stderr-expected.txt Tmain/output-encoding-option.d/stderr-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/output-encoding-option.d/stdout-expected.txt Tmain/output-encoding-option.d/stdout-expected.txt
+deleted file mode 100644
+index e69de29b..00000000
+diff --git Tmain/output-encoding-option.d/tags-expected.txt Tmain/output-encoding-option.d/tags-expected.txt
+deleted file mode 100644
+index be3eae3f..00000000
+--- Tmain/output-encoding-option.d/tags-expected.txt
++++ /dev/null
+@@ -1,14 +0,0 @@
+-!_TAG_FILE_ENCODING	cp932	//
+-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
+-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
+-!_TAG_OUTPUT_EXCMD	mixed	/number, pattern, mixed, or combineV2/
+-!_TAG_OUTPUT_FILESEP	slash	/slash or backslash/
+-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
+-!_TAG_PATTERN_LENGTH_LIMIT	96	/0 for no limit/
+-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
+-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
+-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
+-!_TAG_PROGRAM_VERSION	5.9.0	//
+-Foo	input.java	/^	public Foo() { \/\/ ƒRƒ“ƒXƒgƒ‰ƒNƒ^$/;"	m	class:Foo
+-Foo	input.java	/^class Foo { \/\/ FooƒNƒ‰ƒX$/;"	c
+-a	input.js	/^var a = 1; \/\/ •Ï”‰Šú‰»$/;"	v
+-- 
+2.30.1
+
diff --git a/srcpkgs/ctags/template b/srcpkgs/ctags/template
index 0065bd92b36..56b3c3dfdfa 100644
--- a/srcpkgs/ctags/template
+++ b/srcpkgs/ctags/template
@@ -1,14 +1,21 @@
 # Template file for 'ctags'
 pkgname=ctags
-version=5.8
-revision=7
+version=5.9.20210214.0
+revision=1
+wrksrc=ctags-p${version}
 build_style=gnu-configure
+hostmakedepends="pkg-config automake python3-docutils"
 short_desc="Generates an index file of language objects found in source files"
 maintainer="Jan S. <jan.schreib@gmail.com>"
-license="GPL-3"
-homepage="http://ctags.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/ctags/${version}/ctags-${version}.tar.gz"
-checksum=0e44b45dcabe969e0bbbb11e30c246f81abe5d32012db37395eb57d66e9e99c7
+license="GPL-2.0-only"
+homepage="https://ctags.io/"
+distfiles="https://github.com/universal-ctags/ctags/archive/p${version}.tar.gz"
+checksum=26d9efe481a57e81195878cdb0baca730a3c4d234b9a7c4f6bf2c8def42bf42b
+
+do_configure() {
+	./autogen.sh
+	./configure ${configure_args}
+}
 
 do_install() {
 	make prefix=${DESTDIR}/usr bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install

next prev parent reply	other threads:[~2021-02-23  8:27 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19 16:01 [PR PATCH] " Eluminae
2021-02-19 16:16 ` [PR PATCH] [Updated] " Eluminae
2021-02-19 16:17 ` Eluminae
2021-02-19 16:21 ` Eluminae
2021-02-19 16:26 ` Eluminae
2021-02-19 16:56 ` [PR PATCH] [Closed]: WIP: " Chocimier
2021-02-19 16:56 ` Chocimier
2021-02-19 21:17 ` ericonr
2021-02-19 21:19 ` [PR REVIEW] " ericonr
2021-02-19 21:45 ` [PR PATCH] [Updated] " Eluminae
2021-02-19 21:47 ` [PR REVIEW] " Eluminae
2021-02-19 21:47 ` Eluminae
2021-02-19 21:47 ` Eluminae
2021-02-19 21:48 ` Eluminae
2021-02-19 22:08 ` ericonr
2021-02-21 18:24 ` Gottox
2021-02-21 18:25 ` Gottox
2021-02-21 18:25 ` [PR PATCH] [Closed]: " Gottox
2021-02-22 20:28 ` Gottox
2021-02-23  8:03 ` [PR REVIEW] " Eluminae
2021-02-23  8:27 ` Eluminae [this message]
2021-02-23  8:35 ` Eluminae

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210223082756.HLdPsoCmDHgrLz31WBtgjYAMn9jB-09dEHElGnKIgOU@z \
    --to=eluminae@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).