From 2780a023dd05759a1be68237dc51da77d2152904 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Aug 11 2020 12:00:39 +0000 Subject: groups/211.native_packages_cmdline.group: the_silver_searcher: bump to v2.2.0 Signed-off-by: Lucio Andrés Illanes Albornoz --- diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index d33fc4e..1817845 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -169,9 +169,9 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_TCSH_VERSION:=6.20.00}; : ${PKG_TCSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz}; : ${PKG_THE_SILVER_SEARCHER_DEPENDS:="libz pcre xz"}; -: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d4652bd91c3a05e87a15809c5f3f14ad2e5e1f80185af510e3fa4ad2038c15d4}; -: ${PKG_THE_SILVER_SEARCHER_VERSION:=2.1.0}; -: ${PKG_THE_SILVER_SEARCHER_URL:=http://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz}; +: ${PKG_THE_SILVER_SEARCHER_SHA256SUM:=d9621a878542f3733b5c6e71c849b9d1a830ed77cb1a1f6c2ea441d4b0643170}; +: ${PKG_THE_SILVER_SEARCHER_VERSION:=2.2.0}; +: ${PKG_THE_SILVER_SEARCHER_URL:=https://geoff.greer.fm/ag/releases/the_silver_searcher-${PKG_THE_SILVER_SEARCHER_VERSION}.tar.gz}; : ${PKG_TOILET_DEPENDS:="libcaca"}; : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master}; : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}/include:CACA_LIBS=-L${PREFIX_NATIVE} -lcaca"}; diff --git a/patches/the_silver_searcher-2.1.0.local.patch b/patches/the_silver_searcher-2.1.0.local.patch deleted file mode 100644 index d1f5b38..0000000 --- a/patches/the_silver_searcher-2.1.0.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru the_silver_searcher-2.1.0.orig/src/main.c the_silver_searcher-2.1.0/src/main.c ---- the_silver_searcher-2.1.0.orig/src/main.c 2017-06-27 05:33:25.000000000 +0200 -+++ the_silver_searcher-2.1.0/src/main.c 2017-11-18 21:00:58.908603541 +0100 -@@ -154,7 +154,7 @@ - } - #if defined(HAVE_PTHREAD_SETAFFINITY_NP) && (defined(USE_CPU_SET) || defined(HAVE_SYS_CPUSET_H)) - if (opts.use_thread_affinity) { --#ifdef __linux__ -+#if defined(__linux__) || defined(__midipix__) - cpu_set_t cpu_set; - #elif __FreeBSD__ - cpuset_t cpu_set; diff --git a/patches/the_silver_searcher-2.2.0.local.patch b/patches/the_silver_searcher-2.2.0.local.patch new file mode 100644 index 0000000..d1f5b38 --- /dev/null +++ b/patches/the_silver_searcher-2.2.0.local.patch @@ -0,0 +1,12 @@ +diff -ru the_silver_searcher-2.1.0.orig/src/main.c the_silver_searcher-2.1.0/src/main.c +--- the_silver_searcher-2.1.0.orig/src/main.c 2017-06-27 05:33:25.000000000 +0200 ++++ the_silver_searcher-2.1.0/src/main.c 2017-11-18 21:00:58.908603541 +0100 +@@ -154,7 +154,7 @@ + } + #if defined(HAVE_PTHREAD_SETAFFINITY_NP) && (defined(USE_CPU_SET) || defined(HAVE_SYS_CPUSET_H)) + if (opts.use_thread_affinity) { +-#ifdef __linux__ ++#if defined(__linux__) || defined(__midipix__) + cpu_set_t cpu_set; + #elif __FreeBSD__ + cpuset_t cpu_set;