nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unconditionally depend on libpcre >= 8.10 (#2472) 

Even Debian oldstable has 8.30, so let’s get rid of conditional
compilation where we don’t actually need it.
This commit is contained in:
Michael Stapelberg 2016-09-26 19:04:13 -07:00 committed by GitHub
parent f4f9b7102d
commit c93056b2d8
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -135,8 +135,8 @@ LIBEV_LIBS := $(call ldflags_for_lib, libev,ev)
# libpcre # libpcre
PCRE_CFLAGS := $(call cflags_for_lib, libpcre) PCRE_CFLAGS := $(call cflags_for_lib, libpcre)
ifeq ($(shell $(PKG_CONFIG) --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1) ifneq ($(shell $(PKG_CONFIG) --atleast-version=8.10 libpcre 2>/dev/null && echo 1),1)
I3_CPPFLAGS += -DPCRE_HAS_UCP=1 $(error "libpcre >= 8.10 not found")
endif endif
PCRE_LIBS := $(call ldflags_for_lib, libpcre,pcre) PCRE_LIBS := $(call ldflags_for_lib, libpcre,pcre)

2
debian/control vendored
View File

@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 9),
pkg-config, pkg-config,
libev-dev (>= 1:4.04), libev-dev (>= 1:4.04),
libyajl-dev (>= 2.0.4), libyajl-dev (>= 2.0.4),
libpcre3-dev, libpcre3-dev (>= 1:8.10),
libstartup-notification0-dev (>= 0.10), libstartup-notification0-dev (>= 0.10),
libcairo2-dev, libcairo2-dev,
libpango1.0-dev, libpango1.0-dev,

2
src/regex.c
View File

@ -28,11 +28,9 @@ struct regex *regex_new(const char *pattern) {
struct regex *re = scalloc(1, sizeof(struct regex)); struct regex *re = scalloc(1, sizeof(struct regex));
re->pattern = sstrdup(pattern); re->pattern = sstrdup(pattern);
int options = PCRE_UTF8; int options = PCRE_UTF8;
#ifdef PCRE_HAS_UCP
/* We use PCRE_UCP so that \B, \b, \D, \d, \S, \s, \W, \w and some POSIX /* We use PCRE_UCP so that \B, \b, \D, \d, \S, \s, \W, \w and some POSIX
* character classes play nicely with Unicode */ * character classes play nicely with Unicode */
options |= PCRE_UCP; options |= PCRE_UCP;
#endif
while (!(re->regex = pcre_compile2(pattern, options, &errorcode, &error, &offset, NULL))) { while (!(re->regex = pcre_compile2(pattern, options, &errorcode, &error, &offset, NULL))) {
/* If the error is that PCRE was not compiled with UTF-8 support we /* If the error is that PCRE was not compiled with UTF-8 support we
* disable it and try again */ * disable it and try again */