From c8deb27e03375e4ae2f374955cec526cd3f019b5 Mon Sep 17 00:00:00 2001 From: miqlas <5569059+extrowerk@users.noreply.github.com> Date: Mon, 9 Apr 2018 18:11:46 +0200 Subject: [PATCH] Links : bump, debuginfo, enable some libs (#2407) --- .../{links-2.14.recipe => links-2.15.recipe} | 18 +- ...inks-2.14.patchset => links-2.15.patchset} | 199 +++++++----------- 2 files changed, 95 insertions(+), 122 deletions(-) rename www-client/links/{links-2.14.recipe => links-2.15.recipe} (80%) rename www-client/links/patches/{links-2.14.patchset => links-2.15.patchset} (89%) diff --git a/www-client/links/links-2.14.recipe b/www-client/links/links-2.15.recipe similarity index 80% rename from www-client/links/links-2.14.recipe rename to www-client/links/links-2.15.recipe index 1117f2aa5..02511e1de 100644 --- a/www-client/links/links-2.14.recipe +++ b/www-client/links/links-2.15.recipe @@ -6,7 +6,7 @@ COPYRIGHT="1999-2013 Mikulas Patocka LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://links.twibright.com/download/links-$portVersion.tar.gz" -CHECKSUM_SHA256="22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387" +CHECKSUM_SHA256="677f594b58dc532e63913cd61b85cc1aa6f0385e333b88766eb3415b41b3a375" PATCHES="links-$portVersion.patchset" ARCHITECTURES="?x86_gcc2 ?x86 x86_64" @@ -17,24 +17,30 @@ PROVIDES=" " REQUIRES=" haiku + lib:libbrotlicommon + lib:libbz2 lib:libcrypto lib:libgomp lib:libjpeg + lib:liblzma lib:libpng16 lib:libssl -# lib:libtiff + lib:libtiff lib:libz " BUILD_REQUIRES=" haiku_devel + devel:libbrotlicommon + devel:libbz2 devel:libcrypto # devel:libGL devel:libglu devel:libpng16 devel:libjpeg + devel:liblzma devel:libssl -# devel:libtiff + devel:libtiff devel:libz >= 1.2.8 " BUILD_PREREQUIRES=" @@ -47,12 +53,18 @@ BUILD_PREREQUIRES=" cmd:pkg_config " +defineDebugInfoPackage links \ + "$binDir"/links + BUILD() { STDCPPLIBS=-lstdc++ if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then STDCPPLIBS=-lstdc++.r4 fi + + export CPPFLAGS="-fpermissive" + aclocal automake --add-missing autoheader diff --git a/www-client/links/patches/links-2.14.patchset b/www-client/links/patches/links-2.15.patchset similarity index 89% rename from www-client/links/patches/links-2.14.patchset rename to www-client/links/patches/links-2.15.patchset index c4b1904d0..a86c2bc38 100644 --- a/www-client/links/patches/links-2.14.patchset +++ b/www-client/links/patches/links-2.15.patchset @@ -1,23 +1,38 @@ -From 9b313c4abd8ae832743f9ce70aa728a67e69656e Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 15 Jul 2017 14:22:23 +0200 -Subject: apply patch from 2.8 +From 44e3ea63ba59013cd233d256a50421963e62bc61 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 31 Mar 2018 20:57:19 +0200 +Subject: [PATCH] Applied patchset +--- + Makefile.am | 19 +- + acconfig.h | 3 + + beos.c | 2 +- + cfg.h | 4 +- + configure.in | 39 ++- + drivers.c | 6 + + haiku.cpp | 892 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + links-haiku.rdef | 125 ++++++++ + os_dep.c | 37 ++- + os_dep.h | 23 +- + os_depx.h | 7 + + 11 files changed, 1142 insertions(+), 15 deletions(-) + create mode 100644 haiku.cpp + create mode 100644 links-haiku.rdef diff --git a/Makefile.am b/Makefile.am -index 373f783..594ecb8 100644 +index 9860794..15f1fd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ man_MANS=links.1 --EXTRA_DIST=$(man_MANS) atheos.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* suffix/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos mk-dos83.cmd links.wis *.nsi links.crt -+EXTRA_DIST=$(man_MANS) atheos.cpp haiku.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* intl/[!C]* suffix/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos mk-dos83.cmd links.wis *.nsi links.crt links-haiku.rdef +-EXTRA_DIST=$(man_MANS) atheos.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* certs/[!C]* intl/[!C]* suffix/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos mk-dos83.cmd links.wis *.nsi ++EXTRA_DIST=$(man_MANS) atheos.cpp haiku.cpp BRAILLE_HOWTO KEYS SITES descrip.mms *.opt PATCH-gpm-1.20.0-smooth-cursor PATCH-libpng-1.2.18 mailcap.pl rebuild Links_logo.png Unicode/*.cp Unicode/[!C]* certs/[!C]* intl/[!C]* suffix/[!C]* graphics/*.c graphics/arrow.png graphics/gen graphics/system_font/*.png graphics/font/century_extensions-medium-roman-serif-vari/*.png graphics/font/century_school-bold-roman-serif-vari/*.png graphics/font/century_school-medium-roman-serif-vari/*.png graphics/font/courier-medium-roman-serif-mono/*.png graphics/font/japanese-medium-roman-sans-mono/*.png graphics/font/symbol-medium-roman-sans-vari/*.png graphics/font/century_school-bold-roman-serif-vari/aliases graphics/font/century_school-medium-roman-serif-vari/aliases graphics/font/japanese-medium-roman-sans-mono/aliases graphics/font/symbol-medium-roman-sans-vari/aliases doc/links_cal/*.png doc/links_cal/*.html graphics/Makefile graphics/Fontmap graphics/clip.c graphics/links.xpm graphics/makefont graphics/pdf2html graphics/spacer.png pkg-config.m4 *.xpm *.ico *.rc mk-release-os2 mk-release-win mk-dos mk-dos83.cmd links.wis *.nsi + # parser/gen parser/javascr.l parser/javascript.y bin_PROGRAMS=links - -@@ -13,6 +13,17 @@ links_LDADD=atheos.o +@@ -14,6 +14,17 @@ links_LDADD=atheos.o else endif @@ -32,10 +47,10 @@ index 373f783..594ecb8 100644 +else +endif + - links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c font_inc.c framebuf.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc + links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c font_inc.c framebuf.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc + # builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h - dist-hook: -@@ -28,6 +39,12 @@ CXXFLAGS=@CXXFLAGS@ +@@ -30,6 +41,12 @@ CXXFLAGS=@CXXFLAGS@ atheos.o: $(srcdir)/atheos.cpp $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c $(srcdir)/atheos.cpp @@ -49,19 +64,19 @@ index 373f783..594ecb8 100644 LIBS = @LIBS@ diff --git a/acconfig.h b/acconfig.h -index dcd6db7..b878c80 100644 +index 8abf49c..ddaf8b2 100644 --- a/acconfig.h +++ b/acconfig.h -@@ -197,6 +197,9 @@ +@@ -208,6 +208,9 @@ + /* */ #undef GRDRV_ATHEOS - /* */ ++/* */ +#undef GRDRV_HAIKU + -+/* */ + /* */ #undef GRDRV_GRX - /* */ diff --git a/beos.c b/beos.c index dedc9a0..c39d144 100644 --- a/beos.c @@ -75,8 +90,24 @@ index dedc9a0..c39d144 100644 #include "com-defs.h" +diff --git a/cfg.h b/cfg.h +index 6889fff..2b683d4 100644 +--- a/cfg.h ++++ b/cfg.h +@@ -69,9 +69,9 @@ + #define volatile + #endif + +-#if defined(HAVE_RESTRICT) ++#if defined(HAVE_RESTRICT) && !defined(__cplusplus) + #define my_restrict restrict +-#elif defined(HAVE___RESTRICT) ++#elif defined(HAVE___RESTRICT) && !defined(__cplusplus) + #define my_restrict __restrict + #else + #define my_restrict diff --git a/configure.in b/configure.in -index d020c41..eb559fa 100644 +index fd4c837..bca4ffb 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ export CFLAGS @@ -88,7 +119,7 @@ index d020c41..eb559fa 100644 dnl Checks for programs. AC_PROG_CC -@@ -549,10 +549,10 @@ fi +@@ -551,10 +551,10 @@ fi AC_CHECK_FUNC(socket, cf_result=yes, cf_result=no) if test "$cf_result" = no; then @@ -103,7 +134,7 @@ index d020c41..eb559fa 100644 AC_CHECK_LIB(watt, socket) if test "$ac_cv_lib_watt_socket" = no; then AC_ERROR([socket function not present]) -@@ -712,6 +712,7 @@ if test "$ac_cv_have_beginthread" = yes; then +@@ -714,6 +714,7 @@ if test "$ac_cv_have_beginthread" = yes; then AC_DEFINE(HAVE_BEGINTHREAD) fi AC_CHECK_HEADERS(atheos/threads.h) @@ -111,7 +142,7 @@ index d020c41..eb559fa 100644 AC_HAVE_FUNCS(spawn_thread resume_thread) AC_HAVE_FUNCS(MouOpen _read_kbd) -@@ -867,6 +868,7 @@ fi +@@ -906,6 +907,7 @@ fi cf_have_atheos=no @@ -119,7 +150,7 @@ index d020c41..eb559fa 100644 if test "$cf_use_graphics" != no; then AC_DEFINE(G) -@@ -913,6 +915,7 @@ dnl AC_ARG_WITH(sdl, [ --without-sdl compile without SDL graphics dri +@@ -955,6 +957,7 @@ dnl AC_ARG_WITH(sdl, [ --without-sdl compile without SDL graphics dri AC_ARG_WITH(pmshell, [ --without-pmshell compile without PMShell graphics driver],[if test "$withval" = no; then disable_pmshell=yes; else disable_pmshell=no; fi]) AC_ARG_WITH(windows, [ --without-windows compile without Windows graphics driver],[if test "$withval" = no; then disable_windows=yes; else disable_windows=no; fi]) AC_ARG_WITH(atheos, [ --without-atheos compile without Atheos graphics driver],[if test "$withval" = no; then disable_atheos=yes; else disable_atheos; fi]) @@ -127,7 +158,7 @@ index d020c41..eb559fa 100644 AC_ARG_WITH(grx, [ --without-grx compile without DOS GRX graphics driver],[if test "$withval" = no; then disable_grx=yes; else disable_grx; fi]) drivers="" -@@ -1138,6 +1141,31 @@ if test "$disable_atheos" != yes; then +@@ -1180,6 +1183,31 @@ if test "$disable_atheos" != yes; then fi fi @@ -159,7 +190,7 @@ index d020c41..eb559fa 100644 if test "$disable_grx" != yes -a "$ac_cv_have_djgpp" = yes; then LIBS_X="$LIBS" AC_CHECK_HEADERS(grx20.h) -@@ -1275,6 +1303,7 @@ fi +@@ -1308,6 +1336,7 @@ fi AM_CONDITIONAL(ATHEOS_GR, test "$cf_have_atheos" = yes) @@ -168,7 +199,7 @@ index d020c41..eb559fa 100644 test "$ac_cv_have_emx" = yes && LDFLAGS="$LDFLAGS -Zexe" diff --git a/drivers.c b/drivers.c -index 71c5854..0a9bedb 100644 +index 8141bd3..c897490 100644 --- a/drivers.c +++ b/drivers.c @@ -31,6 +31,9 @@ extern struct graphics_driver pmshell_driver; @@ -193,10 +224,10 @@ index 71c5854..0a9bedb 100644 &x_driver, diff --git a/haiku.cpp b/haiku.cpp new file mode 100644 -index 0000000..707a12e +index 0000000..744797f --- /dev/null +++ b/haiku.cpp -@@ -0,0 +1,890 @@ +@@ -0,0 +1,892 @@ +/* haiku.cpp + * (c) 2007 François Revol + * This file is a part of the Links program, released under GPL @@ -226,9 +257,7 @@ index 0000000..707a12e + * - handle DnD of Net+ bookmarks + */ + -+extern "C" { +#include "cfg.h" -+} + +#ifdef GRDRV_HAIKU + @@ -753,7 +782,7 @@ index 0000000..707a12e + } + fcntl(rpipe, F_SETFL, O_NONBLOCK); + fcntl(wpipe, F_SETFL, O_NONBLOCK); -+ set_handlers(rpipe, be_get_event, NULL, NULL, NULL); ++ set_handlers(rpipe, be_get_event, NULL, NULL); + be_app_thread_id = spawn_thread(be_app_thread, "links_app", B_NORMAL_PRIORITY, NULL); + resume_thread(be_app_thread_id); + be_links_app->Unlock(); @@ -801,7 +830,7 @@ index 0000000..707a12e + //debug((unsigned char *)"D"); + close(rpipe); + close(wpipe); -+ set_handlers(rpipe, NULL, NULL, NULL, NULL); ++ set_handlers(rpipe, NULL, NULL, NULL); + //debug((unsigned char *)"DD"); + be_links_app->PostMessage(B_QUIT_REQUESTED); + //debug((unsigned char *)"E"); @@ -1056,8 +1085,12 @@ index 0000000..707a12e + be_init_device, + be_shutdown_device, + be_shutdown_driver, -+ dummy_emergency_shutdown, ++ NULL, ++ NULL, + be_get_driver_param, ++ NULL, ++ NULL, ++ NULL, + be_get_empty_bitmap, + be_register_bitmap, + be_prepare_strip, @@ -1219,10 +1252,10 @@ index 0000000..b18b11c + "types" = "application/x-vnd.Be.URL.http" +}; diff --git a/os_dep.c b/os_dep.c -index 2691467..79bf675 100644 +index ada4e33..946b009 100644 --- a/os_dep.c +++ b/os_dep.c -@@ -439,7 +439,7 @@ static void terminal_resize_poll(void) +@@ -486,7 +486,7 @@ static void terminal_resize_poll(void) #endif @@ -1231,7 +1264,7 @@ index 2691467..79bf675 100644 #ifdef SIGWINCH static void sigwinch(void *s) -@@ -858,7 +858,7 @@ int is_xterm(void) +@@ -903,7 +903,7 @@ int is_xterm(void) return xt; } @@ -1240,8 +1273,8 @@ index 2691467..79bf675 100644 int is_xterm(void) { -@@ -1029,6 +1029,12 @@ void init_os_terminal(void) - } +@@ -1070,6 +1070,12 @@ void init_os_terminal(void) + fatal_exit("Links doesn't work in detached session"); } #endif +#ifdef HAIKU @@ -1253,7 +1286,7 @@ index 2691467..79bf675 100644 } #ifdef INTERIX -@@ -1230,7 +1236,7 @@ unsigned char *os_fixup_external_program(unsigned char *prog) +@@ -1271,7 +1277,7 @@ unsigned char *os_fixup_external_program(unsigned char *prog) #endif @@ -1262,7 +1295,7 @@ index 2691467..79bf675 100644 #if defined(BEOS) && defined(HAVE_SETPGID) -@@ -1975,7 +1981,7 @@ static uint32 bgat(void *t) +@@ -2038,7 +2044,7 @@ static uint32 bgat(void *t) #endif @@ -1271,7 +1304,7 @@ index 2691467..79bf675 100644 void terminate_osdep(void) { -@@ -1992,7 +1998,7 @@ void unblock_stdin(void) {} +@@ -2055,7 +2061,7 @@ void unblock_stdin(void) {} #if defined(BEOS) @@ -1280,7 +1313,7 @@ index 2691467..79bf675 100644 static int thr_sem_init = 0; static sem_id thr_sem; -@@ -2765,6 +2771,13 @@ int get_system_env(void) +@@ -2832,6 +2838,13 @@ int get_system_env(void) return 0; } @@ -1294,7 +1327,7 @@ index 2691467..79bf675 100644 #elif defined(WIN) int get_system_env(void) -@@ -2887,6 +2900,14 @@ static int open_in_new_be(struct terminal *term, unsigned char *exe, unsigned ch +@@ -2954,6 +2967,14 @@ static int open_in_new_be(struct terminal *term, unsigned char *exe, unsigned ch } #endif @@ -1309,7 +1342,7 @@ index 2691467..79bf675 100644 #ifdef G static int open_in_new_g(struct terminal *term, unsigned char *exe, unsigned char *param) { -@@ -2935,6 +2956,9 @@ static struct { +@@ -3002,6 +3023,9 @@ static struct { #ifdef BEOS {ENV_BE, open_in_new_be, TEXT_(T_BEOS_TERMINAL), TEXT_(T_HK_BEOS_TERMINAL)}, #endif @@ -1319,7 +1352,7 @@ index 2691467..79bf675 100644 #ifdef G {ENV_G, open_in_new_g, TEXT_(T_WINDOW), TEXT_(T_HK_WINDOW)}, #endif -@@ -2983,6 +3007,9 @@ int can_open_os_shell(int environment) +@@ -3050,6 +3074,9 @@ int can_open_os_shell(int environment) #ifdef BEOS if (!(environment & ENV_BE)) return 0; #endif @@ -1378,7 +1411,7 @@ index ffc0e13..6d46b6c 100644 static inline int dir_sep(unsigned char x) { return x == '/' || x == '\\'; } diff --git a/os_depx.h b/os_depx.h -index cd71bbc..3a35740 100644 +index ceeb661..592a430 100644 --- a/os_depx.h +++ b/os_depx.h @@ -176,6 +176,10 @@ int bounced_write(int fd, const void *buf, size_t size); @@ -1392,7 +1425,7 @@ index cd71bbc..3a35740 100644 #ifdef OPENVMS #if defined(__INITIAL_POINTER_SIZE) #if __INITIAL_POINTER_SIZE == 64 -@@ -352,6 +356,9 @@ int vga_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); +@@ -375,6 +379,9 @@ int vga_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); #elif defined(GRDRV_ATHEOS) #define loop_select ath_select int ath_select(int n, fd_set *r, fd_set *w, fd_set *e, struct timeval *t); @@ -1403,77 +1436,5 @@ index cd71bbc..3a35740 100644 #define loop_select select #endif -- -2.12.2 - - -From d282e95dd072b3428fa87f38c325e5734c5785ce Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 15 Jul 2017 14:41:58 +0200 -Subject: fix build with 2.14 - - -diff --git a/cfg.h b/cfg.h -index 9822cd0..74aaac2 100644 ---- a/cfg.h -+++ b/cfg.h -@@ -67,9 +67,9 @@ - #define volatile - #endif - --#if defined(HAVE_RESTRICT) -+#if defined(HAVE_RESTRICT) && !defined(__cplusplus) - #define my_restrict restrict --#elif defined(HAVE___RESTRICT) -+#elif defined(HAVE___RESTRICT) && !defined(__cplusplus) - #define my_restrict __restrict - #else - #define my_restrict -diff --git a/haiku.cpp b/haiku.cpp -index 707a12e..744797f 100644 ---- a/haiku.cpp -+++ b/haiku.cpp -@@ -27,9 +27,7 @@ - * - handle DnD of Net+ bookmarks - */ - --extern "C" { - #include "cfg.h" --} - - #ifdef GRDRV_HAIKU - -@@ -554,7 +552,7 @@ unsigned char *be_init_driver(unsigned char *param, unsigned char *display) - } - fcntl(rpipe, F_SETFL, O_NONBLOCK); - fcntl(wpipe, F_SETFL, O_NONBLOCK); -- set_handlers(rpipe, be_get_event, NULL, NULL, NULL); -+ set_handlers(rpipe, be_get_event, NULL, NULL); - be_app_thread_id = spawn_thread(be_app_thread, "links_app", B_NORMAL_PRIORITY, NULL); - resume_thread(be_app_thread_id); - be_links_app->Unlock(); -@@ -602,7 +600,7 @@ void be_shutdown_driver() - //debug((unsigned char *)"D"); - close(rpipe); - close(wpipe); -- set_handlers(rpipe, NULL, NULL, NULL, NULL); -+ set_handlers(rpipe, NULL, NULL, NULL); - //debug((unsigned char *)"DD"); - be_links_app->PostMessage(B_QUIT_REQUESTED); - //debug((unsigned char *)"E"); -@@ -857,8 +855,12 @@ struct graphics_driver haiku_driver = { - be_init_device, - be_shutdown_device, - be_shutdown_driver, -- dummy_emergency_shutdown, -+ NULL, -+ NULL, - be_get_driver_param, -+ NULL, -+ NULL, -+ NULL, - be_get_empty_bitmap, - be_register_bitmap, - be_prepare_strip, --- -2.12.2 +2.16.2