January 2017 - crux-commits

ports/opt (3.3): aspell-en: update to 2017.01.22-0
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit bfb9d6ff79084e8dd25082709bc2d1ac03f279d9 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:43:09 2017 +0100 aspell-en: update to 2017.01.22-0 diff --git a/aspell-en/.md5sum b/aspell-en/.md5sum index 0407078..ba054ae 100644 --- a/aspell-en/.md5sum +++ b/aspell-en/.md5sum @@ -1 +1 @@ -ea65cee7f191382720521069e58b63dd aspell6-en-2016.11.20-0.tar.bz2 +a6e002076574de9dc4915967032a1dab aspell6-en-2017.01.22-0.tar.bz2 diff --git a/aspell-en/Pkgfile b/aspell-en/Pkgfile index 1a7536b..f978214 100644 --- a/aspell-en/Pkgfile +++ b/aspell-en/Pkgfile @@ -4,7 +4,7 @@ # Depends on: aspell name=aspell-en -version=2016.11.20-0 +version=2017.01.22-0 release=1 source=(http://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$version.tar.bz2)

1 0

ports/opt (3.3): nss: updated to 3.28.1
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit b7262a57a95c631c72ea4f4e74bcfa59aebee227 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Jan 24 01:19:16 2017 +0100 nss: updated to 3.28.1 diff --git a/nss/.footprint b/nss/.footprint index dc3d60b..f92bb84 100644 --- a/nss/.footprint +++ b/nss/.footprint @@ -28,6 +28,7 @@ drwxr-xr-x root/root usr/include/nss/ -rw-r--r-- root/root usr/include/nss/crmft.h -rw-r--r-- root/root usr/include/nss/cryptohi.h -rw-r--r-- root/root usr/include/nss/cryptoht.h +-rw-r--r-- root/root usr/include/nss/eccutil.h -rw-r--r-- root/root usr/include/nss/ecl-exp.h -rw-r--r-- root/root usr/include/nss/hasht.h -rw-r--r-- root/root usr/include/nss/jar-ds.h diff --git a/nss/.md5sum b/nss/.md5sum index 0cf0f11..ad989d1 100644 --- a/nss/.md5sum +++ b/nss/.md5sum @@ -1,3 +1,3 @@ -ed089d28a3c593f8ba4ac26ad9984a75 nss-3.27.2.tar.gz +e98d48435cee5792f97ef7fc35a602c3 nss-3.28.1.tar.gz 17226659298a9d9bb3f323186d220f6f nss-config.in a796e6ab6c87573ffb649ce8769bc07a nss.pc.in diff --git a/nss/Pkgfile b/nss/Pkgfile index b020392..c62f753 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -4,7 +4,7 @@ # Depends on: nspr sqlite3 name=nss -version=3.27.2 +version=3.28.1 release=1 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_… \ nss-config.in nss.pc.in) @@ -20,6 +20,7 @@ build() { export NSPR_LIB_DIR=/usr/lib export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 + export NSS_ENABLE_TLS_1_3=1 export BUILD_OPT=1 export XCFLAGS="-Wno-error ${CFLAGS}" export NSS_DISABLE_GTESTS=1

1 0

ports/core (3.3): signature update
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 35928718e943a48fced512357c27c6a184801f2a Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:55:43 2017 +0100 signature update diff --git a/flex/.signature b/flex/.signature index 4d7baa9..6d96f32 100644 --- a/flex/.signature +++ b/flex/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqkBKpvSjOWtFWEaaOWNBqSzc2qeURNMc9Kk75UCoc6uhuXCcqb0nVHAAbNe3XjwRsqh1YncWV6wYpaCP4fsktQc= -SHA256 (Pkgfile) = 800e94a50ecd3dd24869ad6691879c4398456a75887421cae495a9782957cbf8 +RWRJc1FUaeVeqqJYaBIKu21dDJ+z9UuSb6ITzwLdzGON5LKwz/vpbZMhYEOkijj1mEoQH//ZfTQV9vLmrVpTk6MTuDuYlnPi7wM= +SHA256 (Pkgfile) = 13dd58260456b9e72fa148dc0a63a71f36a66648150a3beabf169dc8f97e27b5 SHA256 (.footprint) = 4ded7e479fbecaf724eeed412013d7ec19ee65eceb2d4ef2804a6b575dd190d4 SHA256 (flex-2.6.3.tar.gz) = 68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa +SHA256 (flex-2.6.3-add_defines.patch) = 461f0843bc4a1fe2ccea751453d89716502c31a374b5645703ec3a333427c5ac diff --git a/kbd/.signature b/kbd/.signature index 7d480e6..fd42afa 100644 --- a/kbd/.signature +++ b/kbd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqi/1VAMenL3+Cro30GfpQd1kML0mOiJ0qEsDIUNcWbW+goVsYCVO+FESdn25DWc9d0gp/CBE1w5PD7UwJvABpQU= -SHA256 (Pkgfile) = f8872bd78271a4c627bae322ea0129d42c6accaff472c6597db92ba41bfdd943 -SHA256 (.footprint) = de6d8ccc43bee199ebb3da7e78e9e342120263312d0241570d79092499fb8ebd -SHA256 (kbd-2.0.3.tar.xz) = 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e +RWRJc1FUaeVeqhZNzJHiJBABw9+f170OnVcX0dWXZUJRD62CM1w8rEYibow3sVnEt5IXnjKiuq8SAkqsJNvblNS0KZE2G/BOoA8= +SHA256 (Pkgfile) = 058ebf9b8a1a4e5644acf85b31ca6b85aaec5b309ee827bb22f4b6a8962e806f +SHA256 (.footprint) = 18c9769c1f4af50237f4c5ba4d83bf91f4e95ebf22a30ed20748d525dd53aa70 +SHA256 (kbd-2.0.4.tar.xz) = 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 diff --git a/libpcre/.signature b/libpcre/.signature index 6f274b7..1f00220 100644 --- a/libpcre/.signature +++ b/libpcre/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqnmdi9GsXiOAkhowI20T9dHbQHTAI4fhEimOv80DwAYibX1Ay1lxhBI2ciFYJEO/xx7cbexji2fvicY8KJvSHwg= -SHA256 (Pkgfile) = a5495a9d0be67597647ef2b358e6af89a711202d11c3894ed73a3f12f4d2a1de -SHA256 (.footprint) = 5f36b414f1ef1e589bcb4d33fcef8d8119fc4dd14ff57acf8c5afaed1c0f147f -SHA256 (pcre-8.39.tar.bz2) = b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b +RWRJc1FUaeVeqs7ZG98+q5wvzdr/9eTtQgzN/YMFuE4gyO1psaWkLycF8tP/rKxn2kmQHeqTfbF6mJZfrmlXdoBb3XXQFb4U7wM= +SHA256 (Pkgfile) = 9bff44e9395132ea20c6963a4ffdc9c63cb05721fa833f22aba8bf22e58de618 +SHA256 (.footprint) = a7a24c168927d7f5c54b7d9959d74dac234233b3a0bb2c2a30ed531a1b7ea789 +SHA256 (pcre-8.40.tar.bz2) = 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4

1 0

ports/core (3.3): Merge branch '3.2' into 3.3
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit bbc5f9ab51a4e52819583f5525b111f903b9a827 Merge: 487cdee 1d2d96f Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:52:21 2017 +0100 Merge branch '3.2' into 3.3

1 0

ports/core (3.3): flex: add upstream patch to fix a build issue with wine
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 1d2d96f253d86bce1f351dbffbbe96219e404f6b Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:41:26 2017 +0100 flex: add upstream patch to fix a build issue with wine diff --git a/flex/.md5sum b/flex/.md5sum index 616f8d8..eba40b0 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1 +1,2 @@ +46620c53d99157a506cfdd183c999dd6 flex-2.6.3-add_defines.patch a5f65570cd9107ec8a8ec88f17b31bb1 flex-2.6.3.tar.gz diff --git a/flex/Pkgfile b/flex/Pkgfile index 73fd510..2944965 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -4,12 +4,16 @@ name=flex version=2.6.3 -release=1 -source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz + $name-$version-add_defines.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-add_defines.patch + touch doc/flex.1 + ./configure --prefix=/usr --disable-nls make diff --git a/flex/flex-2.6.3-add_defines.patch b/flex/flex-2.6.3-add_defines.patch new file mode 100644 index 0000000..f2f5eb8 --- /dev/null +++ b/flex/flex-2.6.3-add_defines.patch @@ -0,0 +1,82 @@ +From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <christos(a)zoulas.com> +Date: Sun, 22 Jan 2017 18:34:30 +0100 +Subject: [PATCH] Add more defines in the non-reentrant part. + +Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks +code that does #ifndef yywrap .. +--- + src/flex.skl | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/flex.skl b/src/flex.skl +index 190700f..6a7cde4 100644 +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -61,11 +61,17 @@ m4_changequote([[, ]]) + m4_ifelse(M4_YY_PREFIX,yy,, + #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] + #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] +-#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] ++#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] ++#define yy_scan_string M4_YY_PREFIX[[_scan_string]] ++#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] + #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] + #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] + #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] + #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] ++#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] ++#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] ++#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] ++#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] + #define yyin M4_YY_PREFIX[[in]] + #define yyleng M4_YY_PREFIX[[leng]] + #define yylex M4_YY_PREFIX[[lex]] +@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) + + m4preproc_define(`M4_GEN_PREFIX', + ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] +-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') ++%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + + %if-c++-only + /* The c++ scanner is a mess. The FlexLexer.h header file relies on the +@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + %endif + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`_create_buffer') + M4_GEN_PREFIX(`_delete_buffer') + M4_GEN_PREFIX(`_scan_buffer') +@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + M4_GEN_PREFIX(`set_column') + ]]) + M4_GEN_PREFIX(`wrap') ++) + %endif + + m4_ifdef( [[M4_YY_BISON_LVAL]], +@@ -170,11 +178,14 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], + ]]) + + ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`alloc') + M4_GEN_PREFIX(`realloc') + M4_GEN_PREFIX(`free') ++) + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + m4_ifdef( [[M4_YY_NOT_REENTRANT]], + [[ + M4_GEN_PREFIX(`text') +@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], + M4_GEN_PREFIX(`_flex_debug') + M4_GEN_PREFIX(`lineno') + ]]) ++) + %endif + +

1 0

ports/core (3.3): kbd: update to 2.0.4
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 06fe7d3efae3819691bef9f6f145f1b5ad5fdbfd Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:39:59 2017 +0100 kbd: update to 2.0.4 diff --git a/kbd/.footprint b/kbd/.footprint index 104082e..3071cd4 100644 --- a/kbd/.footprint +++ b/kbd/.footprint @@ -319,6 +319,9 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/azerty/ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/bepo/ -rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz -rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo.map.gz +drwxr-xr-x root/root usr/share/kbd/keymaps/i386/carpalx/ +-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx-full.map.gz +-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx.map.gz drwxr-xr-x root/root usr/share/kbd/keymaps/i386/colemak/ -rw-r--r-- root/root usr/share/kbd/keymaps/i386/colemak/en-latin9.map.gz drwxr-xr-x root/root usr/share/kbd/keymaps/i386/dvorak/ diff --git a/kbd/.md5sum b/kbd/.md5sum index 1ae4c29..7cd7df7 100644 --- a/kbd/.md5sum +++ b/kbd/.md5sum @@ -1 +1 @@ -231b46e7142eb41ea3ae06d2ded3c208 kbd-2.0.3.tar.xz +c1635a5a83b63aca7f97a3eab39ebaa6 kbd-2.0.4.tar.xz diff --git a/kbd/Pkgfile b/kbd/Pkgfile index a66f942..830c531 100644 --- a/kbd/Pkgfile +++ b/kbd/Pkgfile @@ -3,18 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=kbd -version=2.0.3 -release=2 +version=2.0.4 +release=1 source=(http://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz) build() { cd $name-$version - # we don't want a dependency to 'check' - sed -i '/^SUBDIR/s/tests//' Makefile.am - sed -i '/\[check >= 0.9.4\]/s/^/#/' configure.ac - autoreconf --install - ./configure --prefix=/usr \ --datadir=/usr/share/kbd \ --disable-vlock \

1 0

ports/core (3.3): libpcre: update to 8.40
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 5f860ba5b1b89d0176452b0e5ee6f95eadddbd97 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:37:46 2017 +0100 libpcre: update to 8.40 diff --git a/libpcre/.footprint b/libpcre/.footprint index c9f0e11..3925175 100644 --- a/libpcre/.footprint +++ b/libpcre/.footprint @@ -1,6 +1,6 @@ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libpcre.so.1 -> libpcre.so.1.2.7 --rwxr-xr-x root/root lib/libpcre.so.1.2.7 +lrwxrwxrwx root/root lib/libpcre.so.1 -> libpcre.so.1.2.8 +-rwxr-xr-x root/root lib/libpcre.so.1.2.8 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pcre-config @@ -16,7 +16,7 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libpcre.a -rwxr-xr-x root/root usr/lib/libpcre.la -lrwxrwxrwx root/root usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.7 +lrwxrwxrwx root/root usr/lib/libpcre.so -> ../../lib/libpcre.so.1.2.8 -rw-r--r-- root/root usr/lib/libpcrecpp.a -rwxr-xr-x root/root usr/lib/libpcrecpp.la lrwxrwxrwx root/root usr/lib/libpcrecpp.so -> libpcrecpp.so.0.0.1 diff --git a/libpcre/.md5sum b/libpcre/.md5sum index 27fdb05..b471d27 100644 --- a/libpcre/.md5sum +++ b/libpcre/.md5sum @@ -1 +1 @@ -e3fca7650a0556a2647821679d81f585 pcre-8.39.tar.bz2 +41a842bf7dcecd6634219336e2167d1d pcre-8.40.tar.bz2 diff --git a/libpcre/Pkgfile b/libpcre/Pkgfile index 07a4999..88f053c 100644 --- a/libpcre/Pkgfile +++ b/libpcre/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=libpcre -version=8.39 +version=8.40 release=1 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$version.tar.bz2)

1 0

ports/xorg (3.2): libinput: update to 1.6.0
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 78a37e11599ea8c70403cc99d6a8665eee22a51a Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:50:18 2017 +0100 libinput: update to 1.6.0 diff --git a/libinput/.footprint b/libinput/.footprint index 5ee7914..d846e31 100644 --- a/libinput/.footprint +++ b/libinput/.footprint @@ -17,9 +17,9 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libinput.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libinput.la -lrwxrwxrwx root/root usr/lib/libinput.so -> libinput.so.10.10.5 -lrwxrwxrwx root/root usr/lib/libinput.so.10 -> libinput.so.10.10.5 --rwxr-xr-x root/root usr/lib/libinput.so.10.10.5 +lrwxrwxrwx root/root usr/lib/libinput.so -> libinput.so.10.11.2 +lrwxrwxrwx root/root usr/lib/libinput.so.10 -> libinput.so.10.11.2 +-rwxr-xr-x root/root usr/lib/libinput.so.10.11.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libinput.pc drwxr-xr-x root/root usr/share/ diff --git a/libinput/.md5sum b/libinput/.md5sum index d4f27ef..b265dd7 100644 --- a/libinput/.md5sum +++ b/libinput/.md5sum @@ -1 +1 @@ -e9c9975487b8a1885a8a864c40bf26be libinput-1.5.4.tar.xz +ed9b435d411462d24d88a87728f6c9d6 libinput-1.6.0.tar.xz diff --git a/libinput/Pkgfile b/libinput/Pkgfile index 5d70781..f03d7f1 100644 --- a/libinput/Pkgfile +++ b/libinput/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mtdev xorg-libevdev name=libinput -version=1.5.4 +version=1.6.0 release=1 source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz)

1 0

ports/core (3.2): kbd: update to 2.0.4
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 06fe7d3efae3819691bef9f6f145f1b5ad5fdbfd Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:39:59 2017 +0100 kbd: update to 2.0.4 diff --git a/kbd/.footprint b/kbd/.footprint index 104082e..3071cd4 100644 --- a/kbd/.footprint +++ b/kbd/.footprint @@ -319,6 +319,9 @@ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/azerty/ drwxr-xr-x root/root usr/share/kbd/keymaps/i386/bepo/ -rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo-latin9.map.gz -rw-r--r-- root/root usr/share/kbd/keymaps/i386/bepo/fr-bepo.map.gz +drwxr-xr-x root/root usr/share/kbd/keymaps/i386/carpalx/ +-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx-full.map.gz +-rw-r--r-- root/root usr/share/kbd/keymaps/i386/carpalx/carpalx.map.gz drwxr-xr-x root/root usr/share/kbd/keymaps/i386/colemak/ -rw-r--r-- root/root usr/share/kbd/keymaps/i386/colemak/en-latin9.map.gz drwxr-xr-x root/root usr/share/kbd/keymaps/i386/dvorak/ diff --git a/kbd/.md5sum b/kbd/.md5sum index 1ae4c29..7cd7df7 100644 --- a/kbd/.md5sum +++ b/kbd/.md5sum @@ -1 +1 @@ -231b46e7142eb41ea3ae06d2ded3c208 kbd-2.0.3.tar.xz +c1635a5a83b63aca7f97a3eab39ebaa6 kbd-2.0.4.tar.xz diff --git a/kbd/Pkgfile b/kbd/Pkgfile index a66f942..830c531 100644 --- a/kbd/Pkgfile +++ b/kbd/Pkgfile @@ -3,18 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=kbd -version=2.0.3 -release=2 +version=2.0.4 +release=1 source=(http://ftp.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz) build() { cd $name-$version - # we don't want a dependency to 'check' - sed -i '/^SUBDIR/s/tests//' Makefile.am - sed -i '/\[check >= 0.9.4\]/s/^/#/' configure.ac - autoreconf --install - ./configure --prefix=/usr \ --datadir=/usr/share/kbd \ --disable-vlock \

1 0

ports/core (3.2): flex: add upstream patch to fix a build issue with wine
by crux＠crux.nu 24 Jan '17

24 Jan '17

commit 1d2d96f253d86bce1f351dbffbbe96219e404f6b Author: Juergen Daubert <jue(a)jue.li> Date: Tue Jan 24 12:41:26 2017 +0100 flex: add upstream patch to fix a build issue with wine diff --git a/flex/.md5sum b/flex/.md5sum index 616f8d8..eba40b0 100644 --- a/flex/.md5sum +++ b/flex/.md5sum @@ -1 +1,2 @@ +46620c53d99157a506cfdd183c999dd6 flex-2.6.3-add_defines.patch a5f65570cd9107ec8a8ec88f17b31bb1 flex-2.6.3.tar.gz diff --git a/flex/Pkgfile b/flex/Pkgfile index 73fd510..2944965 100644 --- a/flex/Pkgfile +++ b/flex/Pkgfile @@ -4,12 +4,16 @@ name=flex version=2.6.3 -release=1 -source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz) +release=2 +source=(https://github.com/westes/flex/releases/download/v$version/$name-$version.tar.gz + $name-$version-add_defines.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-add_defines.patch + touch doc/flex.1 + ./configure --prefix=/usr --disable-nls make diff --git a/flex/flex-2.6.3-add_defines.patch b/flex/flex-2.6.3-add_defines.patch new file mode 100644 index 0000000..f2f5eb8 --- /dev/null +++ b/flex/flex-2.6.3-add_defines.patch @@ -0,0 +1,82 @@ +From 078b46c69d063aef1715b11348a2871d6036f253 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas <christos(a)zoulas.com> +Date: Sun, 22 Jan 2017 18:34:30 +0100 +Subject: [PATCH] Add more defines in the non-reentrant part. + +Fix the reentrant part; don't "#define yyfoo yyfoo" because it breaks +code that does #ifndef yywrap .. +--- + src/flex.skl | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/src/flex.skl b/src/flex.skl +index 190700f..6a7cde4 100644 +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -61,11 +61,17 @@ m4_changequote([[, ]]) + m4_ifelse(M4_YY_PREFIX,yy,, + #define yy_create_buffer M4_YY_PREFIX[[_create_buffer]] + #define yy_delete_buffer M4_YY_PREFIX[[_delete_buffer]] +-#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] ++#define yy_scan_buffer M4_YY_PREFIX[[_scan_buffer]] ++#define yy_scan_string M4_YY_PREFIX[[_scan_string]] ++#define yy_scan_bytes M4_YY_PREFIX[[_scan_bytes]] + #define yy_init_buffer M4_YY_PREFIX[[_init_buffer]] + #define yy_flush_buffer M4_YY_PREFIX[[_flush_buffer]] + #define yy_load_buffer_state M4_YY_PREFIX[[_load_buffer_state]] + #define yy_switch_to_buffer M4_YY_PREFIX[[_switch_to_buffer]] ++#define yypush_buffer_state M4_YY_PREFIX[[push_buffer_state]] ++#define yypop_buffer_state M4_YY_PREFIX[[pop_buffer_state]] ++#define yyensure_buffer_stack M4_YY_PREFIX[[ensure_buffer_stack]] ++#define yy_flex_debug M4_YY_PREFIX[[_flex_debug]] + #define yyin M4_YY_PREFIX[[in]] + #define yyleng M4_YY_PREFIX[[leng]] + #define yylex M4_YY_PREFIX[[lex]] +@@ -107,7 +113,7 @@ m4_ifdef( [[M4_YY_PREFIX]],, [[m4_define([[M4_YY_PREFIX]], [[yy]])]]) + + m4preproc_define(`M4_GEN_PREFIX', + ``[[#define yy$1 ]]M4_YY_PREFIX[[$1]] +-m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') ++%# m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + + %if-c++-only + /* The c++ scanner is a mess. The FlexLexer.h header file relies on the +@@ -120,6 +126,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + %endif + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`_create_buffer') + M4_GEN_PREFIX(`_delete_buffer') + M4_GEN_PREFIX(`_scan_buffer') +@@ -155,6 +162,7 @@ m4_define([[yy$1]], [[M4_YY_PREFIX[[$1]]m4_ifelse($'`#,0,,[[($'`@)]])]])'') + M4_GEN_PREFIX(`set_column') + ]]) + M4_GEN_PREFIX(`wrap') ++) + %endif + + m4_ifdef( [[M4_YY_BISON_LVAL]], +@@ -170,11 +178,14 @@ m4_ifdef( [[<M4_YY_BISON_LLOC>]], + ]]) + + ++m4_ifelse(M4_YY_PREFIX,yy,, + M4_GEN_PREFIX(`alloc') + M4_GEN_PREFIX(`realloc') + M4_GEN_PREFIX(`free') ++) + + %if-c-only ++m4_ifelse(M4_YY_PREFIX,yy,, + m4_ifdef( [[M4_YY_NOT_REENTRANT]], + [[ + M4_GEN_PREFIX(`text') +@@ -184,6 +195,7 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]], + M4_GEN_PREFIX(`_flex_debug') + M4_GEN_PREFIX(`lineno') + ]]) ++) + %endif + +

1 0