From a34928054aa62fa9d064c4cb5a4bb33e716ac9ad Mon Sep 17 00:00:00 2001 From: kyak Date: Sun, 27 Mar 2011 01:36:04 +0300 Subject: [PATCH] w3m: update to 0.5.3, rework patches --- libgc/Makefile | 3 + w3m/Makefile | 36 +-- w3m/files/functable.c | 260 ---------------- w3m/files/tagtable.c | 281 ------------------ w3m/patches/001-configure.patch | 20 -- .../001-disable-host-libs-detection.patch | 17 ++ .../002-dont-overwrite-pkg-config.patch | 11 + w3m/patches/002-main.patch | 11 - w3m/patches/003-GC_set_warn_proc.patch | 12 + w3m/patches/003-Makefile.in.patch | 20 -- w3m/patches/004-gdk-override.patch | 12 - w3m/patches/004-mktable-host.patch | 25 ++ 12 files changed, 84 insertions(+), 624 deletions(-) delete mode 100644 w3m/files/functable.c delete mode 100644 w3m/files/tagtable.c delete mode 100644 w3m/patches/001-configure.patch create mode 100644 w3m/patches/001-disable-host-libs-detection.patch create mode 100644 w3m/patches/002-dont-overwrite-pkg-config.patch delete mode 100644 w3m/patches/002-main.patch create mode 100644 w3m/patches/003-GC_set_warn_proc.patch delete mode 100644 w3m/patches/003-Makefile.in.patch delete mode 100644 w3m/patches/004-gdk-override.patch create mode 100644 w3m/patches/004-mktable-host.patch diff --git a/libgc/Makefile b/libgc/Makefile index 8f96b4f..954a90a 100644 --- a/libgc/Makefile +++ b/libgc/Makefile @@ -15,8 +15,10 @@ PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/ PKG_MD5SUM:=0a6785ebb61c6e2b50c3952c3bbf9ea1 PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=gc/host include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/gc TITLE:=gc @@ -65,4 +67,5 @@ define Package/gc/install $(1)/usr/lib/ endef +$(eval $(call HostBuild)) $(eval $(call BuildPackage,gc)) diff --git a/w3m/Makefile b/w3m/Makefile index e6f789e..00961f8 100644 --- a/w3m/Makefile +++ b/w3m/Makefile @@ -8,12 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=w3m -PKG_VERSION:=0.5.2 -PKG_RELEASE:=2 +PKG_VERSION:=0.5.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=ba06992d3207666ed1bf2dcf7c72bf58 +PKG_MD5SUM:=1b845a983a50b8dec0169ac48479eacc + +PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -31,33 +33,27 @@ define Package/w3m/description w3m is a text-based web browser endef -define Build/Prepare - $(call Build/Prepare/Default) - $(CP) $(FILES_DIR)/functable.c $(PKG_BUILD_DIR) - $(CP) $(FILES_DIR)/tagtable.c $(PKG_BUILD_DIR) -endef - CONFIGURE_ARGS += --with-ssl=$(STAGING_DIR)/usr \ --with-gc=$(STAGING_DIR)/usr/lib \ --disable-xface \ --with-imagelib="gtk2" \ - --enable-image="fb" + --enable-image="fb" \ + --with-termlib="ncurses" -CONFIGURE_VARS += ac_cv_lib_gc_GC_init=yes +TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/glib-2.0 \ - -I$(STAGING_DIR)/usr/include/gtk-2.0 \ - -I$(STAGING_DIR)/usr/include/pango-1.0 \ - -I$(STAGING_DIR)/usr/include/cairo - -TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - $(INTL_LDFLAGS) $(ICONV_LDFLAGS) \ - -lintl -lglib-2.0 -liconv -lgdk_pixbuf-2.0 +define Build/Configure + $(call Build/Configure/Default) + (mkdir $(PKG_BUILD_DIR)/host && \ + cd $(PKG_BUILD_DIR)/host && \ + $(HOSTCC) -DDUMMY -c -o dummy.o ../entity.c && \ + $(HOSTCC) -o mktable ../mktable.c dummy.o ../Str.c ../hash.c ../myctype.c -Wl,-rpath="$(STAGING_DIR_HOST)/lib" -L$(STAGING_DIR_HOST)/lib -I$(STAGING_DIR_HOST)/include -lgc) +endef define Package/w3m/install $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/w3m $(INSTALL_BIN) $(PKG_BUILD_DIR)/w3m $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/w3mimgdisplay $(1)/usr/lib/w3m + $(INSTALL_BIN) $(PKG_BUILD_DIR)/w3mimgdisplay $(1)/usr/lib/w3m/ endef $(eval $(call BuildPackage,w3m)) diff --git a/w3m/files/functable.c b/w3m/files/functable.c deleted file mode 100644 index 962697c..0000000 --- a/w3m/files/functable.c +++ /dev/null @@ -1,260 +0,0 @@ -#include "hash.h" -#include -#include "funcname1.h" -static HashItem_si MyHashItem[] = { - /* 0 */ {"SUSPEND",FUNCNAME_susp,&MyHashItem[1]}, - /* 1 */ {"SET_OPTION",FUNCNAME_setOpt,&MyHashItem[2]}, - /* 2 */ {"END",FUNCNAME_goLineL,NULL}, - /* 3 */ {"VIEW",FUNCNAME_vwSrc,NULL}, - /* 4 */ {"PREV_VISITED",FUNCNAME_prevVA,&MyHashItem[5]}, - /* 5 */ {"EXTERN",FUNCNAME_extbrz,NULL}, - /* 6 */ {"UNDO",FUNCNAME_undoPos,NULL}, - /* 7 */ {"SHELL",FUNCNAME_execsh,&MyHashItem[8]}, - /* 8 */ {"RIGHT",FUNCNAME_col1R,&MyHashItem[9]}, - /* 9 */ {"PREV_WORD",FUNCNAME_movLW,&MyHashItem[10]}, - /* 10 */ {"LEFT",FUNCNAME_col1L,&MyHashItem[11]}, - /* 11 */ {"INTERRUPT",FUNCNAME_susp,NULL}, - /* 12 */ {"TAB_GOTO_RELATIVE",FUNCNAME_tabrURL,NULL}, - /* 13 */ {"NEXT_UP",FUNCNAME_nextU,NULL}, - /* 14 */ {"CLOSE_TAB_MOUSE",FUNCNAME_closeTMs,NULL}, - /* 15 */ {"DOWN",FUNCNAME_ldown1,NULL}, - /* 16 */ {"HISTORY",FUNCNAME_ldHist,NULL}, - /* 17 */ {"SEARCH",FUNCNAME_srchfor,&MyHashItem[18]}, - /* 18 */ {"NEXT_VISITED",FUNCNAME_nextVA,&MyHashItem[19]}, - /* 19 */ {"NEXT_LEFT_UP",FUNCNAME_nextLU,&MyHashItem[20]}, - /* 20 */ {"MOVE_UP",FUNCNAME_movU,&MyHashItem[21]}, - /* 21 */ {"DOWNLOAD",FUNCNAME_svSrc,NULL}, - /* 22 */ {"VIEW_IMAGE",FUNCNAME_followI,&MyHashItem[23]}, - /* 23 */ {"MARK",FUNCNAME__mark,&MyHashItem[24]}, - /* 24 */ {"INFO",FUNCNAME_pginfo,NULL}, - /* 25 */ {"VERSION",FUNCNAME_dispVer,&MyHashItem[26]}, - /* 26 */ {"BEGIN",FUNCNAME_goLineF,NULL}, - /* 27 */ {"REDRAW",FUNCNAME_rdrwSc,NULL}, - /* 28 */ {"QUIT",FUNCNAME_qquitfm,&MyHashItem[29]}, - /* 29 */ {"DOWNLOAD_LIST",FUNCNAME_ldDL,NULL}, - /* 30 */ {"REG_MARK",FUNCNAME_reMark,NULL}, - /* 31 */ {"MOVE_RIGHT",FUNCNAME_movR,NULL}, - /* 32 */ {"MARK_MID",FUNCNAME_chkNMID,&MyHashItem[33]}, - /* 33 */ {"LOAD",FUNCNAME_ldfile,NULL}, - /* 34 */ {"EXEC_SHELL",FUNCNAME_execsh,NULL}, - /* 35 */ {"VIEW_BOOKMARK",FUNCNAME_ldBmark,&MyHashItem[36]}, - /* 36 */ {"TAB_MOUSE",FUNCNAME_tabMs,&MyHashItem[37]}, - /* 37 */ {"STOP_IMAGE",FUNCNAME_stopI,NULL}, - /* 38 */ {"SHIFT_RIGHT",FUNCNAME_shiftr,&MyHashItem[39]}, - /* 39 */ {"SEARCH_NEXT",FUNCNAME_srchnxt,NULL}, - /* 40 */ {"PEEK",FUNCNAME_curURL,NULL}, - /* 41 */ {"DICT_WORD_AT",FUNCNAME_dictwordat,NULL}, - /* 42 */ {"SOURCE",FUNCNAME_vwSrc,&MyHashItem[43]}, - /* 43 */ {"SAVE_LINK",FUNCNAME_svA,&MyHashItem[44]}, - /* 44 */ {"GOTO",FUNCNAME_goURL,&MyHashItem[45]}, - /* 45 */ {"ACCESSKEY",FUNCNAME_accessKey,NULL}, - /* 46 */ {"ABORT",FUNCNAME_quitfm,NULL}, - /* 47 */ {"MENU",FUNCNAME_mainMn,NULL}, - /* 48 */ {"PCMAP",FUNCNAME_pcmap,&MyHashItem[49]}, - /* 49 */ {"EXIT",FUNCNAME_quitfm,NULL}, - /* 50 */ {"LINE_INFO",FUNCNAME_curlno,&MyHashItem[51]}, - /* 51 */ {"ADD_BOOKMARK",FUNCNAME_adBmark,NULL}, - /* 52 */ {"WHEREIS",FUNCNAME_srchfor,&MyHashItem[53]}, - /* 53 */ {"SELECT_MENU",FUNCNAME_selMn,&MyHashItem[54]}, - /* 54 */ {"GOTO_LINE",FUNCNAME_goLine,NULL}, - /* 55 */ {"MOUSE",FUNCNAME_mouse,NULL}, - /* 56 */ {"PIPE_BUF",FUNCNAME_pipeBuf,&MyHashItem[57]}, - /* 57 */ {"LINK_BEGIN",FUNCNAME_topA,NULL}, - /* 58 */ {"PEEK_IMG",FUNCNAME_peekIMG,NULL}, - /* 59 */ {"CHARSET",FUNCNAME_docCSet,NULL}, - /* 60 */ {"GOTO_LINK",FUNCNAME_followA,&MyHashItem[61]}, - /* 61 */ {"EXTERN_LINK",FUNCNAME_linkbrz,NULL}, - /* 62 */ {"MARK_WORD",FUNCNAME_chkWORD,NULL}, - /* 63 */ {"MOVE_LIST_MENU",FUNCNAME_movlistMn,&MyHashItem[64]}, - /* 64 */ {"LINK_MENU",FUNCNAME_linkMn,NULL}, - /* 65 */ {"REDO",FUNCNAME_redoPos,&MyHashItem[66]}, - /* 66 */ {"BOOKMARK",FUNCNAME_ldBmark,NULL}, - /* 67 */ {"NEXT_RIGHT_DOWN",FUNCNAME_nextRD,&MyHashItem[68]}, - /* 68 */ {"NEXT_LEFT",FUNCNAME_nextL,&MyHashItem[69]}, - /* 69 */ {"COMMAND",FUNCNAME_execCmd,&MyHashItem[70]}, - /* 70 */ {"@@@",FUNCNAME_nulcmd,NULL}, - /* 71 */ {"RESHAPE",FUNCNAME_reshape,&MyHashItem[72]}, - /* 72 */ {"ALARM",FUNCNAME_setAlarm,NULL}, - /* 73 */ {"UP",FUNCNAME_lup1,&MyHashItem[74]}, - /* 74 */ {"SETENV",FUNCNAME_setEnv,&MyHashItem[75]}, - /* 75 */ {"RELOAD",FUNCNAME_reload,&MyHashItem[76]}, - /* 76 */ {"LIST",FUNCNAME_linkLst,NULL}, - /* 77 */ {"NEXT_PAGE",FUNCNAME_pgFore,&MyHashItem[78]}, - /* 78 */ {"MOVE_MOUSE",FUNCNAME_movMs,&MyHashItem[79]}, - /* 79 */ {"DISPLAY_IMAGE",FUNCNAME_dispI,NULL}, - /* 80 */ {"TAB_LEFT",FUNCNAME_tabL,&MyHashItem[81]}, - /* 81 */ {"PIPE_SHELL",FUNCNAME_pipesh,&MyHashItem[82]}, - /* 82 */ {"NEXT_TAB",FUNCNAME_nextT,&MyHashItem[83]}, - /* 83 */ {"NEXT_DOWN",FUNCNAME_nextD,NULL}, - /* 84 */ {"MAIN_MENU",FUNCNAME_mainMn,&MyHashItem[85]}, - /* 85 */ {"LIST_MENU",FUNCNAME_listMn,NULL}, - /* 86 */ {"REINIT",FUNCNAME_reinit,&MyHashItem[87]}, - /* 87 */ {"EDIT",FUNCNAME_editBf,NULL}, - /* 88 */ {"SAVE_IMAGE",FUNCNAME_svI,&MyHashItem[89]}, - /* 89 */ {"NEXT_MARK",FUNCNAME_nextMk,&MyHashItem[90]}, - /* 90 */ {"COOKIE",FUNCNAME_cooLst,NULL}, - /* 91 */ {"LINK_END",FUNCNAME_lastA,&MyHashItem[92]}, - /* 92 */ {"LINE_BEGIN",FUNCNAME_linbeg,&MyHashItem[93]}, - /* 93 */ {"DELETE_PREVBUF",FUNCNAME_deletePrevBuf,NULL}, - /* 94 */ {"WRAP_TOGGLE",FUNCNAME_wrapToggle,NULL}, - /* 95 */ {"DEFAULT_CHARSET",FUNCNAME_defCSet,NULL}, - /* 96 */ {"NOTHING",FUNCNAME_nulcmd,&MyHashItem[97]}, - /* 97 */ {"FRAME",FUNCNAME_rFrame,NULL}, - /* 98 */ {"SEARCH_PREV",FUNCNAME_srchprv,&MyHashItem[99]}, - /* 99 */ {"NEXT",FUNCNAME_nextBf,&MyHashItem[100]}, - /* 100 */ {"LINE_END",FUNCNAME_linend,NULL}, - /* 101 */ {"SELECT",FUNCNAME_selBuf,NULL}, - /* 102 */ {"PREV_TAB",FUNCNAME_prevT,&MyHashItem[103]}, - /* 103 */ {"MOVE_LEFT",FUNCNAME_movL,NULL}, - /* 104 */ {"SEARCH_BACK",FUNCNAME_srchbak,&MyHashItem[105]}, - /* 105 */ {"SAVE",FUNCNAME_svSrc,NULL}, - /* 106 */ {"SHIFT_LEFT",FUNCNAME_shiftl,&MyHashItem[107]}, - /* 107 */ {"READ_SHELL",FUNCNAME_readsh,&MyHashItem[108]}, - /* 108 */ {"PRINT",FUNCNAME_svBuf,&MyHashItem[109]}, - /* 109 */ {"MOVE_DOWN",FUNCNAME_movD,&MyHashItem[110]}, - /* 110 */ {"EDIT_SCREEN",FUNCNAME_editScr,NULL}, - /* 111 */ {"ISEARCH_BACK",FUNCNAME_isrchbak,NULL}, - /* 112 */ {"NEXT_LINK",FUNCNAME_nextA,NULL}, - /* 113 */ {"MSGS",FUNCNAME_msgs,NULL}, - /* 114 */ {"MULTIMAP",FUNCNAME_multimap,&MyHashItem[115]}, - /* 115 */ {"CENTER_H",FUNCNAME_ctrCsrH,NULL}, - /* 116 */ {"TAB_LINK",FUNCNAME_tabA,&MyHashItem[117]}, - /* 117 */ {"TAB_GOTO",FUNCNAME_tabURL,&MyHashItem[118]}, - /* 118 */ {"PREV_PAGE",FUNCNAME_pgBack,NULL}, - /* 119 */ {"SAVE_SCREEN",FUNCNAME_svBuf,NULL}, - /* 120 */ {"TAB_MENU",FUNCNAME_tabMn,&MyHashItem[121]}, - /* 121 */ {"SEARCH_FORE",FUNCNAME_srchfor,&MyHashItem[122]}, - /* 122 */ {"MOVE_UP1",FUNCNAME_movU1,&MyHashItem[123]}, - /* 123 */ {"MOVE_LEFT1",FUNCNAME_movL1,NULL}, - /* 124 */ {"PREV_MARK",FUNCNAME_prevMk,&MyHashItem[125]}, - /* 125 */ {"PEEK_LINK",FUNCNAME_peekURL,NULL}, - /* 126 */ {"MARK_URL",FUNCNAME_chkURL,NULL}, - /* 127 */ {"GOTO_RELATIVE",FUNCNAME_gorURL,NULL}, - /* 128 */ {"SUBMIT",FUNCNAME_submitForm,NULL}, - /* 129 */ {"NEXT_WORD",FUNCNAME_movRW,&MyHashItem[130]}, - /* 130 */ {"NEW_TAB",FUNCNAME_newT,&MyHashItem[131]}, - /* 131 */ {"HELP",FUNCNAME_ldhelp,NULL}, - /* 132 */ {"MOVE_DOWN1",FUNCNAME_movD1,NULL}, - /* 133 */ {"ISEARCH",FUNCNAME_isrchfor,NULL}, - /* 134 */ {"NEXT_RIGHT",FUNCNAME_nextR,&MyHashItem[135]}, - /* 135 */ {"CLOSE_TAB",FUNCNAME_closeT,&MyHashItem[136]}, - /* 136 */ {"CENTER_V",FUNCNAME_ctrCsrV,NULL}, - /* 137 */ {"MOVE_RIGHT1",FUNCNAME_movR1,NULL}, - /* 138 */ {"ESCMAP",FUNCNAME_escmap,&MyHashItem[139]}, - /* 139 */ {"ESCBMAP",FUNCNAME_escbmap,NULL}, - /* 140 */ {"MENU_MOUSE",FUNCNAME_menuMs,NULL}, - /* 141 */ {"PREV",FUNCNAME_prevBf,&MyHashItem[142]}, - /* 142 */ {"NULL",FUNCNAME_nulcmd,&MyHashItem[143]}, - /* 143 */ {"DICT_WORD",FUNCNAME_dictword,NULL}, - /* 144 */ {"PREV_LINK",FUNCNAME_prevA,NULL}, - /* 145 */ {"TAB_RIGHT",FUNCNAME_tabR,NULL}, - /* 146 */ {"MOUSE_TOGGLE",FUNCNAME_msToggle,&MyHashItem[147]}, - /* 147 */ {"BACK",FUNCNAME_backBf,NULL}, - /* 148 */ {"OPTIONS",FUNCNAME_ldOpt,&MyHashItem[149]}, - /* 149 */ {"DEFINE_KEY",FUNCNAME_defKey,NULL}, -}; - -static HashItem_si *MyHashItemTbl[] = { - &MyHashItem[0], - NULL, - NULL, - NULL, - NULL, - &MyHashItem[3], - &MyHashItem[4], - &MyHashItem[6], - &MyHashItem[7], - &MyHashItem[12], - &MyHashItem[13], - &MyHashItem[14], - &MyHashItem[15], - &MyHashItem[16], - &MyHashItem[17], - &MyHashItem[22], - &MyHashItem[25], - &MyHashItem[27], - &MyHashItem[28], - &MyHashItem[30], - &MyHashItem[31], - NULL, - &MyHashItem[32], - NULL, - &MyHashItem[34], - NULL, - NULL, - &MyHashItem[35], - &MyHashItem[38], - &MyHashItem[40], - &MyHashItem[41], - &MyHashItem[42], - &MyHashItem[46], - &MyHashItem[47], - &MyHashItem[48], - &MyHashItem[50], - NULL, - &MyHashItem[52], - NULL, - &MyHashItem[55], - &MyHashItem[56], - &MyHashItem[58], - &MyHashItem[59], - &MyHashItem[60], - &MyHashItem[62], - &MyHashItem[63], - NULL, - &MyHashItem[65], - &MyHashItem[67], - &MyHashItem[71], - &MyHashItem[73], - &MyHashItem[77], - &MyHashItem[80], - &MyHashItem[84], - &MyHashItem[86], - &MyHashItem[88], - &MyHashItem[91], - &MyHashItem[94], - &MyHashItem[95], - &MyHashItem[96], - &MyHashItem[98], - NULL, - &MyHashItem[101], - NULL, - &MyHashItem[102], - &MyHashItem[104], - NULL, - NULL, - &MyHashItem[106], - &MyHashItem[111], - NULL, - &MyHashItem[112], - NULL, - &MyHashItem[113], - &MyHashItem[114], - &MyHashItem[116], - &MyHashItem[119], - &MyHashItem[120], - NULL, - &MyHashItem[124], - &MyHashItem[126], - &MyHashItem[127], - &MyHashItem[128], - NULL, - &MyHashItem[129], - &MyHashItem[132], - &MyHashItem[133], - NULL, - &MyHashItem[134], - &MyHashItem[137], - &MyHashItem[138], - &MyHashItem[140], - &MyHashItem[141], - NULL, - NULL, - &MyHashItem[144], - &MyHashItem[145], - &MyHashItem[146], - NULL, - &MyHashItem[148], -}; - -Hash_si functable = {100, MyHashItemTbl}; diff --git a/w3m/files/tagtable.c b/w3m/files/tagtable.c deleted file mode 100644 index 4315252..0000000 --- a/w3m/files/tagtable.c +++ /dev/null @@ -1,281 +0,0 @@ -#include "hash.h" -#include -#include "html.h" -static HashItem_si MyHashItem[] = { - /* 0 */ {"option_int",HTML_OPTION_INT,&MyHashItem[1]}, - /* 1 */ {"/form_int",HTML_N_FORM_INT,&MyHashItem[2]}, - /* 2 */ {"/kbd",HTML_NOP,&MyHashItem[3]}, - /* 3 */ {"dd",HTML_DD,&MyHashItem[4]}, - /* 4 */ {"/dir",HTML_N_UL,NULL}, - /* 5 */ {"/body",HTML_N_BODY,&MyHashItem[6]}, - /* 6 */ {"noframes",HTML_NOFRAMES,NULL}, - /* 7 */ {"base",HTML_BASE,NULL}, - /* 8 */ {"/div",HTML_N_DIV,NULL}, - /* 9 */ {"tbody",HTML_TBODY,&MyHashItem[10]}, - /* 10 */ {"meta",HTML_META,&MyHashItem[11]}, - /* 11 */ {"i",HTML_I,NULL}, - /* 12 */ {"/_symbol",HTML_N_SYMBOL,&MyHashItem[13]}, - /* 13 */ {"sup",HTML_SUP,&MyHashItem[14]}, - /* 14 */ {"/p",HTML_N_P,NULL}, - /* 15 */ {"/q",HTML_N_Q,NULL}, - /* 16 */ {"input_alt",HTML_INPUT_ALT,&MyHashItem[17]}, - /* 17 */ {"dl",HTML_DL,NULL}, - /* 18 */ {"/tbody",HTML_N_TBODY,&MyHashItem[19]}, - /* 19 */ {"/s",HTML_N_S,NULL}, - /* 20 */ {"del",HTML_DEL,&MyHashItem[21]}, - /* 21 */ {"xmp",HTML_XMP,&MyHashItem[22]}, - /* 22 */ {"br",HTML_BR,NULL}, - /* 23 */ {"link",HTML_LINK,&MyHashItem[24]}, - /* 24 */ {"/u",HTML_N_U,&MyHashItem[25]}, - /* 25 */ {"em",HTML_EM,NULL}, - /* 26 */ {"title_alt",HTML_TITLE_ALT,&MyHashItem[27]}, - /* 27 */ {"caption",HTML_CAPTION,&MyHashItem[28]}, - /* 28 */ {"plaintext",HTML_PLAINTEXT,&MyHashItem[29]}, - /* 29 */ {"p",HTML_P,NULL}, - /* 30 */ {"q",HTML_Q,&MyHashItem[31]}, - /* 31 */ {"blockquote",HTML_BLQ,&MyHashItem[32]}, - /* 32 */ {"menu",HTML_UL,NULL}, - /* 33 */ {"/colgroup",HTML_N_COLGROUP,&MyHashItem[34]}, - /* 34 */ {"dfn",HTML_NOP,NULL}, - /* 35 */ {"s",HTML_S,&MyHashItem[36]}, - /* 36 */ {"strong",HTML_STRONG,NULL}, - /* 37 */ {"dt",HTML_DT,NULL}, - /* 38 */ {"u",HTML_U,NULL}, - /* 39 */ {"/map",HTML_N_MAP,&MyHashItem[40]}, - /* 40 */ {"/frameset",HTML_N_FRAMESET,&MyHashItem[41]}, - /* 41 */ {"/ol",HTML_N_OL,NULL}, - /* 42 */ {"/td",HTML_N_TD,NULL}, - /* 43 */ {"li",HTML_LI,NULL}, - /* 44 */ {"html",HTML_BODY,&MyHashItem[45]}, - /* 45 */ {"hr",HTML_HR,NULL}, - /* 46 */ {"/strong",HTML_N_STRONG,NULL}, - /* 47 */ {"/th",HTML_N_TH,&MyHashItem[48]}, - /* 48 */ {"option",HTML_OPTION,&MyHashItem[49]}, - /* 49 */ {"kbd",HTML_NOP,&MyHashItem[50]}, - /* 50 */ {"dir",HTML_UL,NULL}, - /* 51 */ {"col",HTML_COL,NULL}, - /* 52 */ {"/caption",HTML_N_CAPTION,&MyHashItem[53]}, - /* 53 */ {"div",HTML_DIV,NULL}, - /* 54 */ {"head",HTML_HEAD,&MyHashItem[55]}, - /* 55 */ {"ol",HTML_OL,&MyHashItem[56]}, - /* 56 */ {"/ul",HTML_N_UL,NULL}, - /* 57 */ {"/ins",HTML_N_INS,&MyHashItem[58]}, - /* 58 */ {"area",HTML_AREA,NULL}, - /* 59 */ {"pre_plain",HTML_PRE_PLAIN,&MyHashItem[60]}, - /* 60 */ {"td",HTML_TD,&MyHashItem[61]}, - /* 61 */ {"/option",HTML_N_OPTION,NULL}, - /* 62 */ {"/noframes",HTML_N_NOFRAMES,NULL}, - /* 63 */ {"/tr",HTML_N_TR,&MyHashItem[64]}, - /* 64 */ {"nobr",HTML_NOBR,NULL}, - /* 65 */ {"img_alt",HTML_IMG_ALT,&MyHashItem[66]}, - /* 66 */ {"table_alt",HTML_TABLE_ALT,&MyHashItem[67]}, - /* 67 */ {"th",HTML_TH,&MyHashItem[68]}, - /* 68 */ {"script",HTML_SCRIPT,&MyHashItem[69]}, - /* 69 */ {"/tt",HTML_NOP,NULL}, - /* 70 */ {"code",HTML_NOP,NULL}, - /* 71 */ {"samp",HTML_NOP,NULL}, - /* 72 */ {"textarea",HTML_TEXTAREA,NULL}, - /* 73 */ {"textarea_int",HTML_TEXTAREA_INT,NULL}, - /* 74 */ {"table",HTML_TABLE,&MyHashItem[75]}, - /* 75 */ {"img",HTML_IMG,&MyHashItem[76]}, - /* 76 */ {"/blockquote",HTML_N_BLQ,NULL}, - /* 77 */ {"applet",HTML_APPLET,&MyHashItem[78]}, - /* 78 */ {"map",HTML_MAP,&MyHashItem[79]}, - /* 79 */ {"ul",HTML_UL,NULL}, - /* 80 */ {"/script",HTML_N_SCRIPT,&MyHashItem[81]}, - /* 81 */ {"center",HTML_CENTER,NULL}, - /* 82 */ {"/table",HTML_N_TABLE,&MyHashItem[83]}, - /* 83 */ {"cite",HTML_NOP,&MyHashItem[84]}, - /* 84 */ {"/h1",HTML_N_H,NULL}, - /* 85 */ {"tr",HTML_TR,&MyHashItem[86]}, - /* 86 */ {"/h2",HTML_N_H,NULL}, - /* 87 */ {"image",HTML_IMG,&MyHashItem[88]}, - /* 88 */ {"/h3",HTML_N_H,NULL}, - /* 89 */ {"pre_int",HTML_PRE_INT,&MyHashItem[90]}, - /* 90 */ {"/font",HTML_N_FONT,&MyHashItem[91]}, - /* 91 */ {"tt",HTML_NOP,&MyHashItem[92]}, - /* 92 */ {"/h4",HTML_N_H,NULL}, - /* 93 */ {"body",HTML_BODY,&MyHashItem[94]}, - /* 94 */ {"/form",HTML_N_FORM,&MyHashItem[95]}, - /* 95 */ {"/h5",HTML_N_H,NULL}, - /* 96 */ {"/h6",HTML_N_H,NULL}, - /* 97 */ {"frame",HTML_FRAME,NULL}, - /* 98 */ {"/textarea_int",HTML_N_TEXTAREA_INT,&MyHashItem[99]}, - /* 99 */ {"/img_alt",HTML_N_IMG_ALT,&MyHashItem[100]}, - /* 100 */ {"/center",HTML_N_CENTER,NULL}, - /* 101 */ {"/pre",HTML_N_PRE,NULL}, - /* 102 */ {"tfoot",HTML_TFOOT,NULL}, - /* 103 */ {"ins",HTML_INS,NULL}, - /* 104 */ {"/var",HTML_NOP,NULL}, - /* 105 */ {"h1",HTML_H,NULL}, - /* 106 */ {"/tfoot",HTML_N_TFOOT,&MyHashItem[107]}, - /* 107 */ {"input",HTML_INPUT,&MyHashItem[108]}, - /* 108 */ {"h2",HTML_H,NULL}, - /* 109 */ {"h3",HTML_H,NULL}, - /* 110 */ {"h4",HTML_H,NULL}, - /* 111 */ {"h5",HTML_H,NULL}, - /* 112 */ {"internal",HTML_INTERNAL,&MyHashItem[113]}, - /* 113 */ {"h6",HTML_H,NULL}, - /* 114 */ {"div_int",HTML_DIV_INT,&MyHashItem[115]}, - /* 115 */ {"select_int",HTML_SELECT_INT,&MyHashItem[116]}, - /* 116 */ {"/pre_int",HTML_N_PRE_INT,NULL}, - /* 117 */ {"/menu",HTML_N_UL,NULL}, - /* 118 */ {"form_int",HTML_FORM_INT,&MyHashItem[119]}, - /* 119 */ {"/sub",HTML_N_SUB,NULL}, - /* 120 */ {"style",HTML_STYLE,&MyHashItem[121]}, - /* 121 */ {"address",HTML_BR,NULL}, - /* 122 */ {"/textarea",HTML_N_TEXTAREA,NULL}, - /* 123 */ {"/input_alt",HTML_N_INPUT_ALT,NULL}, - /* 124 */ {"doctype",HTML_DOCTYPE,&MyHashItem[125]}, - /* 125 */ {"/style",HTML_N_STYLE,NULL}, - /* 126 */ {"/html",HTML_N_BODY,NULL}, - /* 127 */ {"pre",HTML_PRE,&MyHashItem[128]}, - /* 128 */ {"title",HTML_TITLE,NULL}, - /* 129 */ {"select",HTML_SELECT,NULL}, - /* 130 */ {"/div_int",HTML_N_DIV_INT,&MyHashItem[131]}, - /* 131 */ {"var",HTML_NOP,NULL}, - /* 132 */ {"/title",HTML_N_TITLE,NULL}, - /* 133 */ {"embed",HTML_EMBED,&MyHashItem[134]}, - /* 134 */ {"/sup",HTML_N_SUP,&MyHashItem[135]}, - /* 135 */ {"colgroup",HTML_COLGROUP,&MyHashItem[136]}, - /* 136 */ {"/head",HTML_N_HEAD,&MyHashItem[137]}, - /* 137 */ {"isindex",HTML_ISINDEX,NULL}, - /* 138 */ {"strike",HTML_S,&MyHashItem[139]}, - /* 139 */ {"listing",HTML_LISTING,NULL}, - /* 140 */ {"bgsound",HTML_BGSOUND,NULL}, - /* 141 */ {"/address",HTML_BR,NULL}, - /* 142 */ {"thead",HTML_THEAD,&MyHashItem[143]}, - /* 143 */ {"wbr",HTML_WBR,&MyHashItem[144]}, - /* 144 */ {"/del",HTML_N_DEL,&MyHashItem[145]}, - /* 145 */ {"/nobr",HTML_N_NOBR,&MyHashItem[146]}, - /* 146 */ {"/select",HTML_N_SELECT,&MyHashItem[147]}, - /* 147 */ {"frameset",HTML_FRAMESET,&MyHashItem[148]}, - /* 148 */ {"/xmp",HTML_N_XMP,NULL}, - /* 149 */ {"/code",HTML_NOP,NULL}, - /* 150 */ {"_symbol",HTML_SYMBOL,&MyHashItem[151]}, - /* 151 */ {"/thead",HTML_N_THEAD,&MyHashItem[152]}, - /* 152 */ {"/samp",HTML_NOP,&MyHashItem[153]}, - /* 153 */ {"/dfn",HTML_NOP,&MyHashItem[154]}, - /* 154 */ {"_id",HTML_NOP,NULL}, - /* 155 */ {"/strike",HTML_N_S,&MyHashItem[156]}, - /* 156 */ {"/a",HTML_N_A,NULL}, - /* 157 */ {"/select_int",HTML_N_SELECT_INT,&MyHashItem[158]}, - /* 158 */ {"sub",HTML_SUB,&MyHashItem[159]}, - /* 159 */ {"/b",HTML_N_B,NULL}, - /* 160 */ {"/internal",HTML_N_INTERNAL,NULL}, - /* 161 */ {"/pre_plain",HTML_N_PRE_PLAIN,&MyHashItem[162]}, - /* 162 */ {"font",HTML_FONT,&MyHashItem[163]}, - /* 163 */ {"/dl",HTML_N_DL,NULL}, - /* 164 */ {"form",HTML_FORM,&MyHashItem[165]}, - /* 165 */ {"/cite",HTML_NOP,&MyHashItem[166]}, - /* 166 */ {"a",HTML_A,NULL}, - /* 167 */ {"b",HTML_B,NULL}, - /* 168 */ {"/listing",HTML_N_LISTING,&MyHashItem[169]}, - /* 169 */ {"/em",HTML_N_EM,&MyHashItem[170]}, - /* 170 */ {"/i",HTML_N_I,NULL}, -}; - -static HashItem_si *MyHashItemTbl[] = { - &MyHashItem[0], - &MyHashItem[5], - NULL, - &MyHashItem[7], - &MyHashItem[8], - &MyHashItem[9], - &MyHashItem[12], - &MyHashItem[15], - &MyHashItem[16], - &MyHashItem[18], - &MyHashItem[20], - &MyHashItem[23], - &MyHashItem[26], - &MyHashItem[30], - &MyHashItem[33], - &MyHashItem[35], - &MyHashItem[37], - &MyHashItem[38], - &MyHashItem[39], - NULL, - &MyHashItem[42], - &MyHashItem[43], - &MyHashItem[44], - &MyHashItem[46], - &MyHashItem[47], - NULL, - &MyHashItem[51], - NULL, - &MyHashItem[52], - NULL, - &MyHashItem[54], - &MyHashItem[57], - &MyHashItem[59], - &MyHashItem[62], - &MyHashItem[63], - NULL, - &MyHashItem[65], - &MyHashItem[70], - &MyHashItem[71], - &MyHashItem[72], - &MyHashItem[73], - &MyHashItem[74], - &MyHashItem[77], - NULL, - &MyHashItem[80], - &MyHashItem[82], - &MyHashItem[85], - &MyHashItem[87], - &MyHashItem[89], - &MyHashItem[93], - &MyHashItem[96], - &MyHashItem[97], - &MyHashItem[98], - &MyHashItem[101], - &MyHashItem[102], - &MyHashItem[103], - &MyHashItem[104], - &MyHashItem[105], - &MyHashItem[106], - &MyHashItem[109], - &MyHashItem[110], - &MyHashItem[111], - &MyHashItem[112], - NULL, - &MyHashItem[114], - &MyHashItem[117], - NULL, - NULL, - &MyHashItem[118], - &MyHashItem[120], - NULL, - &MyHashItem[122], - &MyHashItem[123], - &MyHashItem[124], - &MyHashItem[126], - NULL, - NULL, - &MyHashItem[127], - &MyHashItem[129], - NULL, - &MyHashItem[130], - &MyHashItem[132], - &MyHashItem[133], - &MyHashItem[138], - &MyHashItem[140], - &MyHashItem[141], - &MyHashItem[142], - NULL, - NULL, - &MyHashItem[149], - &MyHashItem[150], - &MyHashItem[155], - &MyHashItem[157], - NULL, - &MyHashItem[160], - NULL, - &MyHashItem[161], - &MyHashItem[164], - &MyHashItem[167], - &MyHashItem[168], -}; - -Hash_si tagtable = {100, MyHashItemTbl}; diff --git a/w3m/patches/001-configure.patch b/w3m/patches/001-configure.patch deleted file mode 100644 index c630e77..0000000 --- a/w3m/patches/001-configure.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- w3m-0.5.2/configure 2010-09-25 20:57:25.128744963 +0400 -+++ w3m-0.5.2_mod/configure 2010-09-25 20:57:51.055870033 +0400 -@@ -6221,7 +6221,7 @@ - _ACEOF - - --for lib in bsd BSD 44bsd socket nsl dld dl -+for lib in BSD 44bsd socket nsl dld dl - do - lib=$lib - { echo "$as_me:$LINENO: checking for -l$lib" >&5 -@@ -7886,7 +7886,7 @@ - { (exit 1); exit 1; }; } - fi - fi -- unset ac_cv_lib_gc_GC_init -+ - { echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5 - echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6; } - if test "${ac_cv_lib_gc_GC_init+set}" = set; then diff --git a/w3m/patches/001-disable-host-libs-detection.patch b/w3m/patches/001-disable-host-libs-detection.patch new file mode 100644 index 0000000..0ca22c8 --- /dev/null +++ b/w3m/patches/001-disable-host-libs-detection.patch @@ -0,0 +1,17 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -82,10 +82,10 @@ AC_W3M_MAILER + AC_W3M_EXT_BROWSER + + dnl Checks for ext libs +-for lib in bsd BSD 44bsd socket nsl dld dl +-do +- AC_W3M_EXTLIBS($lib) +-done ++dnl for lib in bsd BSD 44bsd socket nsl dld dl ++dnl do ++dnl AC_W3M_EXTLIBS($lib) ++dnl done + + AC_W3M_IPv6 + AC_W3M_SSL_DIGEST_AUTH diff --git a/w3m/patches/002-dont-overwrite-pkg-config.patch b/w3m/patches/002-dont-overwrite-pkg-config.patch new file mode 100644 index 0000000..dbced6f --- /dev/null +++ b/w3m/patches/002-dont-overwrite-pkg-config.patch @@ -0,0 +1,11 @@ +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -661,8 +661,6 @@ AC_DEFUN([AC_W3M_IMAGE], + with_gtk2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config +- else +- PKG_CONFIG=: + fi;; + esac + done diff --git a/w3m/patches/002-main.patch b/w3m/patches/002-main.patch deleted file mode 100644 index 093f2fb..0000000 --- a/w3m/patches/002-main.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- w3m-0.5.2/main.c 2007-05-31 05:19:50.000000000 +0400 -+++ w3m-0.5.2_mod/main.c 2010-09-25 18:12:27.960869894 +0400 -@@ -842,7 +842,7 @@ - mySignal(SIGPIPE, SigPipe); - #endif - -- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); -+ // orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); - err_msg = Strnew(); - if (load_argc == 0) { - /* no URL specified */ diff --git a/w3m/patches/003-GC_set_warn_proc.patch b/w3m/patches/003-GC_set_warn_proc.patch new file mode 100644 index 0000000..b8c687d --- /dev/null +++ b/w3m/patches/003-GC_set_warn_proc.patch @@ -0,0 +1,12 @@ +--- a/main.c ++++ b/main.c +@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp) + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ orig_GC_warn_proc = GC_get_warn_proc(); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/w3m/patches/003-Makefile.in.patch b/w3m/patches/003-Makefile.in.patch deleted file mode 100644 index 433040f..0000000 --- a/w3m/patches/003-Makefile.in.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- w3m-0.5.2/Makefile.in 2007-05-29 16:01:04.000000000 +0400 -+++ w3m-0.5.2_mod/Makefile.in 2010-09-25 22:01:16.666250962 +0400 -@@ -134,7 +134,7 @@ - $(OBJS) $(LOBJS): fm.h funcname1.h - - tagtable.c: tagtable.tab mktable$(EXT) html.h -- ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ -+# ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ - - indep.o: indep.c fm.h funcname1.h - func.o: funcname.c functable.c funcname1.h -@@ -167,7 +167,7 @@ - - functable.c: funcname.tab mktable$(EXT) - sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab -- ./mktable$(EXT) 100 functable.tab > $@ -+# ./mktable$(EXT) 100 functable.tab > $@ - -rm -f functable.tab - - mktable$(EXT): mktable.o dummy.o $(ALIB) diff --git a/w3m/patches/004-gdk-override.patch b/w3m/patches/004-gdk-override.patch deleted file mode 100644 index 94064cf..0000000 --- a/w3m/patches/004-gdk-override.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur w3m-0.5.2.orig/configure w3m-0.5.2/configure ---- w3m-0.5.2.orig/configure 2011-02-25 21:51:15.648183991 +0300 -+++ w3m-0.5.2/configure 2011-02-25 22:03:24.676058666 +0300 -@@ -5626,7 +5626,7 @@ - else - { echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&5 - echo "$as_me: WARNING: GdkPixbuf is not installed. Install GdkPixbuf (version >= 2.0.0)" >&2;} -- have_gdkpixbuf="no"; have_gtk2="no" -+ have_gdkpixbuf="yes"; have_gtk2="yes" - fi - fi - if test x"$with_gdkpixbuf" = xyes; then diff --git a/w3m/patches/004-mktable-host.patch b/w3m/patches/004-mktable-host.patch new file mode 100644 index 0000000..ebfbd45 --- /dev/null +++ b/w3m/patches/004-mktable-host.patch @@ -0,0 +1,25 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -136,11 +136,11 @@ $(ALIB): $(ALIBOBJS) + $(OBJS) $(LOBJS): fm.h funcname1.h + + tagtable.c: tagtable.tab mktable$(EXT) html.h +- ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ ++ ./host/mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ + + entity.h: entity.tab mktable$(EXT) + echo '/* $$I''d$$ */' > $@ +- ./mktable$(EXT) 100 $(srcdir)/entity.tab >> $@ ++ ./host/mktable$(EXT) 100 $(srcdir)/entity.tab >> $@ + + indep.o: indep.c fm.h funcname1.h entity.h + func.o: funcname.c functable.c funcname1.h +@@ -173,7 +173,7 @@ funcname2.h: funcname.tab + + functable.c: funcname.tab mktable$(EXT) + sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab +- ./mktable$(EXT) 100 functable.tab > $@ ++ ./host/mktable$(EXT) 100 functable.tab > $@ + -rm -f functable.tab + + mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o