+Date: Fri, 24 Feb 2012 12:25:44 +0100
+Subject: Disable the "Bug report" button
+
+The website behind it is not functional anymore.
+---
+ hv/hv3_main.tcl | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/hv/hv3_main.tcl b/hv/hv3_main.tcl
+index c1521ba..9e8c6f1 100644
+--- a/hv/hv3_main.tcl
++++ b/hv/hv3_main.tcl
+@@ -692,13 +692,10 @@ proc gui_build {widget_array} {
+ ::hv3::toolbutton .toolbar.b.home -text Home -command [list \
+ gui_current goto $::hv3::homeuri
+ ]
+- ::hv3::toolbutton .toolbar.bug -text {Report Bug} -command gui_report_bug
+
+ .toolbar.b.new configure -tooltip "Open New Tab"
+ .toolbar.b.home configure -tooltip "Go to Bookmarks Manager"
+
+- .toolbar.bug configure -tooltip "Bug Report"
+-
+ # Create the middle bit - the browser window
+ #
+ ::hv3::tabset .notebook \
+@@ -745,7 +742,6 @@ proc gui_build {widget_array} {
+ pack [frame .toolbar.b.spacer -width 2 -height 1] -side left
+
+ pack .toolbar.b -side left
+- pack .toolbar.bug -side right
+ pack .toolbar.entry -fill x -expand true
+
+ # Pack the top, bottom and middle, in that order. The middle must be
+@@ -824,7 +820,6 @@ proc gui_menu {widget_array} {
+ .toolbar.b.stop configure -image hv3_stopimg
+ .toolbar.b.new configure -image hv3_newimg
+ .toolbar.b.home configure -image hv3_homeimg
+- .toolbar.bug configure -image hv3_bugimg
+ }
+ }
+ #--------------------------------------------------------------------------
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/dont_ignore_bgcolor.patch tk-html3-3.0~fossil20110109/debian/patches/dont_ignore_bgcolor.patch
--- tk-html3-3.0~fossil20110109/debian/patches/dont_ignore_bgcolor.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/dont_ignore_bgcolor.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/74ccb54074bec7d5
-Description: Fix the problem that tkhtml seems to ignore 'background-color'
- on tbody-tags.
---- a/src/htmlprop.c
-+++ b/src/htmlprop.c
-@@ -2045,6 +2045,12 @@ HtmlComputedValuesInit(pTree, pNode, pParent, p)
- memcpy(&p->fontKey, pValues->fFont->pKey, sizeof(HtmlFontKey));
- pValues->mask =
- (pValues->mask & iCopyMask) | (pParentValues->mask & !iCopyMask);
-+ /* inherit background from parent */
-+ p->values.cBackgroundColor->nRef++;
-+ decrementColorRef(pTree, p->values.cBackgroundColor );
-+
-+ p->values.cBackgroundColor =
-+ ((HtmlElementNode *)pParent)->pPropertyValues->cBackgroundColor;
- }
-
- p->values.cColor->nRef++;
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/dont_resize_fixed_table_columns.patch tk-html3-3.0~fossil20110109/debian/patches/dont_resize_fixed_table_columns.patch
--- tk-html3-3.0~fossil20110109/debian/patches/dont_resize_fixed_table_columns.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/dont_resize_fixed_table_columns.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/ff9221f6ea2ba16d
-Description: If I have a html-table like ... ...
- all the columns are resized if the widget ist smaller then it should be.
---- a/src/htmltable.c
-+++ b/src/htmltable.c
-@@ -1480,14 +1480,12 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
- logWidthStage(2, pStageLog, pData->nCol, aWidth);
-
- /* Allocate pixels to explicit width columns */
-- if (iRemaining > 0) {
-- for (ii = 0; ii < pData->nCol; ii++) {
-- if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
-- int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
-- aWidth[ii] += iReq;
-- iRemaining -= iReq;
-- }
-- }
-+ for (ii = 0; ii < pData->nCol; ii++) {
-+ if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
-+ int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
-+ aWidth[ii] += iReq;
-+ iRemaining -= iReq;
-+ }
- }
- logWidthStage(3, pStageLog, pData->nCol, aWidth);
-
-@@ -1560,6 +1558,11 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
- assert(CELL_WIDTH_PERCENT == 2);
- for (jj = 0; iRemaining < 0 && jj < 3; jj++) {
-
-+ /* Only reduce columns with CELL_WIDTH_AUTO or CELL_WIDTH_PERCENT */
-+ if (jj != CELL_WIDTH_AUTO || jj != CELL_WIDTH_PERCENT ) {
-+ continue;
-+ };
-+
- /* Total allocated, less the total min-content-width, for the cols */
- int iAllocLessMin = 0;
-
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/ds9.patch tk-html3-3.0~fossil20110109/debian/patches/ds9.patch
--- tk-html3-3.0~fossil20110109/debian/patches/ds9.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/ds9.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,92 +0,0 @@
-Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.6.2.tar.gz
-Description: Fixes that were applied to the package included in the
- saods9 source.
---- a/src/htmlcmd.c
-+++ b/src/htmlcmd.c
-@@ -453,6 +453,28 @@ HtmlYviewCmd(clientData, interp, argc, argv)
- if (p)
- HtmlVerticalScroll(htmlPtr, p->anchor.y);
- }
-+ else if( argc==4 && !strncmp(argv[2],"text",4)) {
-+ HtmlElement *p;
-+ int i;
-+
-+ HtmlLock(htmlPtr);
-+ if( HtmlGetIndex(htmlPtr, argv[3], &p, &i)!=0 ){
-+ if( !HtmlUnlock(htmlPtr) ){
-+ Tcl_AppendResult(interp,"malformed index: \"", argv[3], "\"", 0);
-+ }
-+
-+ return TCL_ERROR;
-+ }
-+ if( !HtmlUnlock(htmlPtr) && p ){
-+ if( p->base.type==Html_Text ) {
-+ int offset = p->text.y-20;
-+ if (offset<0)
-+ offset = 0;
-+ HtmlVerticalScroll(htmlPtr, offset);
-+ }
-+
-+ }
-+ }
- else {
- int count;
- double fraction;
---- a/src/htmlurl.c
-+++ b/src/htmlurl.c
-@@ -389,6 +389,9 @@ HtmlCallResolver(htmlPtr, azSeries)
- continue;
- }
- }
-+ /* look for /../ at begining */
-+ if (!strncmp(zBuf,"/../",4))
-+ strcpy(zBuf,zBuf+3);
- HtmlFree(base->zPath);
- base->zPath = zBuf;
- }
---- a/src/htmlwidget.c
-+++ b/src/htmlwidget.c
-@@ -1638,6 +1638,13 @@ HtmlGetColorByName(htmlPtr, zColor, def)
- * compatibility.
- */
- n = strlen(zColor);
-+
-+ /* trucate any spaces on the end */
-+ while (n>0 && zColor[n-1]==' ') {
-+ zColor[n-1] = '\0';
-+ n--;
-+ }
-+
- if (n == 6 || n == 3 || n == 9 || n == 12) {
- for (i = 0; i < n; i++) {
- if (!isxdigit(zColor[i]))
-@@ -1809,22 +1816,23 @@ GetColorByValue(htmlPtr, pRef)
- float dist;
- float closestDist;
- int closest;
-- int r, g, b;
-+ XColor* q;
-+ q = Tk_GetColorByValue(htmlPtr->clipwin, pRef);
-
- /*
- * Search for an exact match
- */
-- r = pRef->red &= COLOR_MASK;
-- g = pRef->green &= COLOR_MASK;
-- b = pRef->blue &= COLOR_MASK;
- for (i = 0; i < N_COLOR; i++) {
- XColor *p = htmlPtr->apColor[i];
-- if (p && (p->red & COLOR_MASK) == r && (p->green & COLOR_MASK) == g
-- && (p->blue & COLOR_MASK) == b) {
-+ if (p && (q->red == p->red)
-+ && (q->green == p->green)
-+ && (q->blue == p->blue)) {
- htmlPtr->colorUsed |= (1LL << i);
-+ Tk_FreeColor(q);
- return i;
- }
- }
-+ Tk_FreeColor(q);
-
- /*
- * No exact matches. Look for a completely unused slot
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/ds9_patches.diff tk-html3-3.0~fossil20110109/debian/patches/ds9_patches.diff
--- tk-html3-3.0~fossil20110109/debian/patches/ds9_patches.diff 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/ds9_patches.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,238 +0,0 @@
-Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.6.2.tar.gz
-Description: These are source code patches on an old version of TkHtml (around the year 2000)-
- Some of them may be still useful...
-diff -urw tkHTML/src/htmllayout.c tkHTML_ds9//src/htmllayout.c
---- tkHTML/src/htmllayout.c 2000-11-26 15:13:18.000000000 +0100
-+++ tkHTML_ds9//src/htmllayout.c 2012-03-02 10:48:54.000000000 +0100
-@@ -690,19 +709,21 @@
- case CLEAR_Both:
- ClearObstacle(pLC,CLEAR_Left);
- ClearObstacle(pLC,CLEAR_Right);
- break;
-
- case CLEAR_Left:
- while( pLC->leftMargin && pLC->leftMargin->bottom>=0 ){
-- if( newBottom < pLC->leftMargin->bottom ){
- newBottom = pLC->leftMargin->bottom;
-- }
- HtmlPopOneMargin(&pLC->leftMargin);
- }
- if( newBottom > pLC->bottom + pLC->headRoom ){
- pLC->headRoom = 0;
- }else{
- pLC->headRoom = newBottom - pLC->bottom;
- }
- pLC->bottom = newBottom;
- PopExpiredMargins(&pLC->rightMargin, pLC->bottom);
-@@ -710,15 +731,16 @@
-
- case CLEAR_Right:
- while( pLC->rightMargin && pLC->rightMargin->bottom>=0 ){
-- if( newBottom < pLC->rightMargin->bottom ){
- newBottom = pLC->rightMargin->bottom;
-- }
- HtmlPopOneMargin(&pLC->rightMargin);
- }
- if( newBottom > pLC->bottom + pLC->headRoom ){
- pLC->headRoom = 0;
- }else{
- pLC->headRoom = newBottom - pLC->bottom;
- }
- pLC->bottom = newBottom;
- PopExpiredMargins(&pLC->leftMargin, pLC->bottom);
-@@ -729,25 +751,27 @@
- if( pLC->rightMargin
- && pLC->rightMargin->bottom < pLC->leftMargin->bottom
- ){
-- if( newBottom < pLC->rightMargin->bottom ){
- newBottom = pLC->rightMargin->bottom;
-- }
- HtmlPopOneMargin(&pLC->rightMargin);
- }else{
-- if( newBottom < pLC->leftMargin->bottom ){
- newBottom = pLC->leftMargin->bottom;
-- }
- HtmlPopOneMargin(&pLC->leftMargin);
- }
- }else if( pLC->rightMargin && pLC->rightMargin->bottom>=0 ){
- newBottom = pLC->rightMargin->bottom;
- HtmlPopOneMargin(&pLC->rightMargin);
- }else{
- }
- if( newBottom > pLC->bottom + pLC->headRoom ){
- pLC->headRoom = 0;
- }else{
- pLC->headRoom = newBottom - pLC->bottom;
- }
- pLC->bottom = newBottom;
- break;
-diff -urw tkHTML/src/htmlparse.c tkHTML_ds9//src/htmlparse.c
---- tkHTML/src/htmlparse.c 2000-11-26 15:13:18.000000000 +0100
-+++ tkHTML_ds9//src/htmlparse.c 2012-03-02 10:48:54.000000000 +0100
-@@ -586,7 +591,6 @@
- break;
- }
- }
-- if( z[i]==0 ) goto incomplete;
- if( p->pScript ){
- pScript->nScript = i - n;
- }
-diff -urw tkHTML/src/htmltable.c tkHTML_ds9//src/htmltable.c
---- tkHTML/src/htmltable.c 2000-11-26 15:13:18.000000000 +0100
-+++ tkHTML_ds9//src/htmltable.c 2012-03-02 10:48:54.000000000 +0100
-@@ -162,39 +163,19 @@
- z = HtmlMarkupArg(pStart, "hspace", 0);
- hspace = z ? atoi(z) : DFLT_HSPACE;
-
-- /* Figure out the maximum space available available */
-- z = HtmlMarkupArg(pStart, "width", 0);
-- if( z ){
-- int len = strlen(z);
-- if( len>0 && z[len-1]=='%' ){
-- maxTableWidth = (atoi(z) * lineWidth)/100;
-- }else{
-- maxTableWidth = atoi(z);
-- }
-- }else{
-- maxTableWidth = lineWidth;
-- }
-- maxTableWidth -= 2*margin;
-- SETMAX( maxTableWidth, 1);
-- TRACE(HtmlTrace_Table1,
-- ("lineWidth=%d maxTableWidth = %d margin=%d\n",
-- lineWidth, maxTableWidth, margin));
--
-- for(p=pStart->pNext; p; p=pNext){
-- if( p->base.type==Html_EndTABLE){
-- p->ref.pOther = pStart;
-- break;
-- }
-+ for(p=pStart->pNext; p && p->base.type!=Html_EndTABLE; p=pNext){
- pNext = p->pNext;
- switch( p->base.type ){
- case Html_EndTD:
- case Html_EndTH:
- case Html_EndTABLE:
- p->ref.pOther = pStart;
- break;
- case Html_EndTR:
- p->ref.pOther = pStart;
- inRow = 0;
- break;
- case Html_TR:
- p->ref.pOther = pStart;
-@@ -202,12 +183,14 @@
- pStart->table.nRow++;
- iCol = 0;
- inRow = 1;
-- availWidth = maxTableWidth;
-+ maxTableWidth = availWidth = lineWidth - 2*margin;
- break;
- case Html_CAPTION:
- while( p && p->base.type!=Html_EndTABLE
- && p->base.type!=Html_EndCAPTION ){
- p = p->pNext;
- }
- break;
- case Html_TD:
-@@ -257,12 +240,13 @@
- pNext = MinMax(htmlPtr, p, &minW, &maxW, availWidth);
- p->cell.pEnd = pNext;
- if( (z = HtmlMarkupArg(p, "width", 0))!=0 ){
-- for(i=0; isdigit(z[i]) || z[i]=='.'; i++){}
-+ for(i=0; isdigit(z[i]); i++){}
- if( strcmp(z,"*")==0 ){
- requestedW = availWidth;
- }else if( z[i]==0 ){
- requestedW = atoi(z);
- }else if( z[i]=='%' ){
- requestedW = (atoi(z)*maxTableWidth + 99)/100;
- }
- }else{
-@@ -287,14 +271,15 @@
- min = pStart->table.minW[iCol] + separation;
- }else{
- int n = p->cell.colspan;
-- int per = maxW/n;
-- int ix;
- SETMAX( ColMin(iCol,iCol+n-1), minW);
- SETMAX( ColReq(iCol,iCol+n-1), requestedW);
- min = minW + separation;
-- for(ix=iCol; ixtable.maxW[ix], per);
-+#if 0
-+ maxW = (maxW + (n - 1)*(1-separation))/n;
-+ for(i=iCol; itable.maxW[i], maxW );
- }
-+#endif
- }
- availWidth -= min;
- }
-@@ -475,11 +460,8 @@
- }else{
- totalWidth = atoi(z);
- }
-- SETMAX( totalWidth, pStart->table.minW[0] );
-- requestedW = totalWidth;
-- SETMAX( pStart->table.maxW[0], totalWidth );
-+ SETMAX( requestedW, totalWidth );
- }
-- SETMAX( maxTableWidth, pStart->table.minW[0] );
- if( lineWidth && (requestedW > lineWidth) ){
- TRACE(HtmlTrace_Table5,("RequestedW reduced to lineWidth: %d -> %d\n",
- requestedW, lineWidth));
-@@ -768,7 +756,6 @@
- char *z; /* A string */
- int leftMargin; /* The left edge of space available for drawing */
- int lineWidth; /* Total horizontal space available for drawing */
-- int specWidth; /* Total horizontal drawing width per width= attr */
- int separation; /* Distance between content of columns (or rows) */
- int i; /* Loop counter */
- int n; /* Number of columns */
-@@ -829,21 +817,10 @@
-
- /* Figure out how wide to draw the table
- */
-- z = HtmlMarkupArg(pTable, "width", 0);
-- if( z ){
-- int len = strlen(z);
-- if( len>0 && z[len-1]=='%' ){
-- specWidth = (atoi(z) * lineWidth)/100;
-- }else{
-- specWidth = atoi(z);
-- }
-- }else{
-- specWidth = lineWidth;
-- }
-- if( specWidth < pTable->table.minW[0] ){
-+ if( lineWidth < pTable->table.minW[0] ){
- width = pTable->table.minW[0];
-- }else if( specWidth <= pTable->table.maxW[0] ){
-- width = specWidth;
-+ }else if( lineWidth <= pTable->table.maxW[0] ){
-+ width = lineWidth;
- }else{
- width = pTable->table.maxW[0];
- }
-@@ -878,7 +855,7 @@
- return pEnd;
- }
- zAlign = HtmlMarkupArg(pTable, "align", "");
-- if( width <= lineWidth ){
-+ if( width < lineWidth ){
- int align = pTable->base.style.align;
- if( align==ALIGN_Right || stricmp(zAlign,"right")==0 ){
- x[1] += lineWidth - width;
-diff -urw tkHTML/src/htmlwidget.c tkHTML_ds9//src/htmlwidget.c
---- tkHTML/src/htmlwidget.c 2000-11-26 15:13:18.000000000 +0100
-+++ tkHTML_ds9//src/htmlwidget.c 2012-03-02 10:48:54.000000000 +0100
-@@ -1659,7 +1743,7 @@
- { "resolve", 0, 2, 0, "?URI ...?", HtmlResolveCmd },
- { "selection", "clear", 3, 3, 0, HtmlSelectionClearCmd},
- { 0, "set", 5, 5, "START END", HtmlSelectionSetCmd },
-- { "text", "ascii", 5, 5, "START END", 0 },
-+ { "text", "ascii", 5, 5, "START END", HtmlTextAsciiCmd},
- { 0, "delete", 5, 5, "START END", 0 },
- { 0, "html", 5, 5, "START END", 0 },
- { 0, "insert", 5, 5, "INDEX TEXT", 0 },
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Dynamic-set-ignores-background-color-on-tbody-nodes.patch tk-html3-3.0~fossil20110109/debian/patches/Dynamic-set-ignores-background-color-on-tbody-nodes.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Dynamic-set-ignores-background-color-on-tbody-nodes.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Dynamic-set-ignores-background-color-on-tbody-nodes.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,28 @@
+From: Matthias Meier
+Date: Tue, 3 May 2011 08:49:45 +0200
+Subject: Dynamic set ignores background-color on tbody-nodes
+
+Fix the problem that tkhtml seems to ignore 'background-color' on tbody-tags.
+
+http://groups.google.com/group/tkhtml3/browse_thread/thread/74ccb54074bec7d5
+---
+ src/htmlprop.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/htmlprop.c b/src/htmlprop.c
+index a660990..aea01f5 100644
+--- a/src/htmlprop.c
++++ b/src/htmlprop.c
+@@ -2045,6 +2045,12 @@ HtmlComputedValuesInit(pTree, pNode, pParent, p)
+ memcpy(&p->fontKey, pValues->fFont->pKey, sizeof(HtmlFontKey));
+ pValues->mask =
+ (pValues->mask & iCopyMask) | (pParentValues->mask & !iCopyMask);
++ /* inherit background from parent */
++ p->values.cBackgroundColor->nRef++;
++ decrementColorRef(pTree, p->values.cBackgroundColor );
++
++ p->values.cBackgroundColor =
++ ((HtmlElementNode *)pParent)->pPropertyValues->cBackgroundColor;
+ }
+
+ p->values.cColor->nRef++;
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Fixed-table-columns-are-resized.patch tk-html3-3.0~fossil20110109/debian/patches/Fixed-table-columns-are-resized.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Fixed-table-columns-are-resized.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Fixed-table-columns-are-resized.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,49 @@
+From: jemptymethod
+Date: Fri, 17 Jun 2011 01:53:48 -0700
+Subject: Fixed table-columns are resized
+
+If I have a html-table like ... ...
+ all the columns are resized if the widget ist smaller then it should be.
+
+Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/ff9221f6ea2ba16d
+---
+ src/htmltable.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/htmltable.c b/src/htmltable.c
+index 1520de6..7d5784e 100644
+--- a/src/htmltable.c
++++ b/src/htmltable.c
+@@ -1480,14 +1480,12 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
+ logWidthStage(2, pStageLog, pData->nCol, aWidth);
+
+ /* Allocate pixels to explicit width columns */
+- if (iRemaining > 0) {
+- for (ii = 0; ii < pData->nCol; ii++) {
+- if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
+- int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
+- aWidth[ii] += iReq;
+- iRemaining -= iReq;
+- }
+- }
++ for (ii = 0; ii < pData->nCol; ii++) {
++ if (aReqWidth[ii].eType == CELL_WIDTH_PIXELS) {
++ int iReq = MAX(0, aReqWidth[ii].x.iVal - aWidth[ii]);
++ aWidth[ii] += iReq;
++ iRemaining -= iReq;
++ }
+ }
+ logWidthStage(3, pStageLog, pData->nCol, aWidth);
+
+@@ -1560,6 +1558,11 @@ tableCalculateCellWidths(pData, availablewidth, isAuto)
+ assert(CELL_WIDTH_PERCENT == 2);
+ for (jj = 0; iRemaining < 0 && jj < 3; jj++) {
+
++ /* Only reduce columns with CELL_WIDTH_AUTO or CELL_WIDTH_PERCENT */
++ if (jj != CELL_WIDTH_AUTO || jj != CELL_WIDTH_PERCENT ) {
++ continue;
++ };
++
+ /* Total allocated, less the total min-content-width, for the cols */
+ int iAllocLessMin = 0;
+
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/fix_empty_offset.patch tk-html3-3.0~fossil20110109/debian/patches/fix_empty_offset.patch
--- tk-html3-3.0~fossil20110109/debian/patches/fix_empty_offset.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/fix_empty_offset.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/9a624679a76e73cf
-Description: The problem is that the get_selection method doesn't account for
- when the "html text offset" command returns the empty string (it does, and
- the C source says it can).
---- a/hv/hv3.tcl
-+++ b/hv/hv3.tcl
-@@ -786,11 +786,11 @@
- $me motion $N $x $y
- }
-
- # get_selection OFFSET MAXCHARS
- #
-- # This command is invoked whenever the current selection is selected
-+ # This command is invoked whenever the current selection is requested
- # while it is owned by the html widget. The text of the selected
- # region is returned.
- #
- proc get_selection {me offset maxChars} {
- upvar $me O
-@@ -801,10 +801,13 @@
- set n2 $O(myToNode)
- set i2 $O(myToIdx)
-
- set stridx_a [$O(myHv3) html text offset $O(myFromNode) $O(myFromIdx)]
- set stridx_b [$O(myHv3) html text offset $O(myToNode) $O(myToIdx)]
-+ if {$stridx_a eq "" || $stridx_b eq ""} {
-+ return ""
-+ }
- if {$stridx_a > $stridx_b} {
- foreach {stridx_a stridx_b} [list $stridx_b $stridx_a] {}
- }
-
- if {$O(myMode) eq "word"} {
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Fixes-that-were-applied-to-the-package-included-in-the-sa.patch tk-html3-3.0~fossil20110109/debian/patches/Fixes-that-were-applied-to-the-package-included-in-the-sa.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Fixes-that-were-applied-to-the-package-included-in-the-sa.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Fixes-that-were-applied-to-the-package-included-in-the-sa.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,107 @@
+From: William Joye
+Date: Fri, 2 Mar 2012 15:05:10 +0100
+Subject: Fixes that were applied to the package included in the saods9
+ source.
+
+Origin: http://hea-www.harvard.edu/saord/download/ds9/source/ds9.6.2.tar.gz
+---
+ src/htmlcmd.c | 22 ++++++++++++++++++++++
+ src/htmlurl.c | 3 +++
+ src/htmlwidget.c | 20 ++++++++++++++------
+ 3 files changed, 39 insertions(+), 6 deletions(-)
+
+diff --git a/src/htmlcmd.c b/src/htmlcmd.c
+index eb904a9..85eda04 100644
+--- a/src/htmlcmd.c
++++ b/src/htmlcmd.c
+@@ -453,6 +453,28 @@ HtmlYviewCmd(clientData, interp, argc, argv)
+ if (p)
+ HtmlVerticalScroll(htmlPtr, p->anchor.y);
+ }
++ else if( argc==4 && !strncmp(argv[2],"text",4)) {
++ HtmlElement *p;
++ int i;
++
++ HtmlLock(htmlPtr);
++ if( HtmlGetIndex(htmlPtr, argv[3], &p, &i)!=0 ){
++ if( !HtmlUnlock(htmlPtr) ){
++ Tcl_AppendResult(interp,"malformed index: \"", argv[3], "\"", 0);
++ }
++
++ return TCL_ERROR;
++ }
++ if( !HtmlUnlock(htmlPtr) && p ){
++ if( p->base.type==Html_Text ) {
++ int offset = p->text.y-20;
++ if (offset<0)
++ offset = 0;
++ HtmlVerticalScroll(htmlPtr, offset);
++ }
++
++ }
++ }
+ else {
+ int count;
+ double fraction;
+diff --git a/src/htmlurl.c b/src/htmlurl.c
+index d68c821..5b14b68 100644
+--- a/src/htmlurl.c
++++ b/src/htmlurl.c
+@@ -389,6 +389,9 @@ HtmlCallResolver(htmlPtr, azSeries)
+ continue;
+ }
+ }
++ /* look for /../ at begining */
++ if (!strncmp(zBuf,"/../",4))
++ strcpy(zBuf,zBuf+3);
+ HtmlFree(base->zPath);
+ base->zPath = zBuf;
+ }
+diff --git a/src/htmlwidget.c b/src/htmlwidget.c
+index 069e87f..4d65229 100644
+--- a/src/htmlwidget.c
++++ b/src/htmlwidget.c
+@@ -1638,6 +1638,13 @@ HtmlGetColorByName(htmlPtr, zColor, def)
+ * compatibility.
+ */
+ n = strlen(zColor);
++
++ /* trucate any spaces on the end */
++ while (n>0 && zColor[n-1]==' ') {
++ zColor[n-1] = '\0';
++ n--;
++ }
++
+ if (n == 6 || n == 3 || n == 9 || n == 12) {
+ for (i = 0; i < n; i++) {
+ if (!isxdigit(zColor[i]))
+@@ -1809,22 +1816,23 @@ GetColorByValue(htmlPtr, pRef)
+ float dist;
+ float closestDist;
+ int closest;
+- int r, g, b;
++ XColor* q;
++ q = Tk_GetColorByValue(htmlPtr->clipwin, pRef);
+
+ /*
+ * Search for an exact match
+ */
+- r = pRef->red &= COLOR_MASK;
+- g = pRef->green &= COLOR_MASK;
+- b = pRef->blue &= COLOR_MASK;
+ for (i = 0; i < N_COLOR; i++) {
+ XColor *p = htmlPtr->apColor[i];
+- if (p && (p->red & COLOR_MASK) == r && (p->green & COLOR_MASK) == g
+- && (p->blue & COLOR_MASK) == b) {
++ if (p && (q->red == p->red)
++ && (q->green == p->green)
++ && (q->blue == p->blue)) {
+ htmlPtr->colorUsed |= (1LL << i);
++ Tk_FreeColor(q);
+ return i;
+ }
+ }
++ Tk_FreeColor(q);
+
+ /*
+ * No exact matches. Look for a completely unused slot
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/fix_state_sock.patch tk-html3-3.0~fossil20110109/debian/patches/fix_state_sock.patch
--- tk-html3-3.0~fossil20110109/debian/patches/fix_state_sock.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/fix_state_sock.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/8e186f9355255d29
-Description: Fix the exception 'can't read "state(sock)": no such element
- in array'.
---- a/hv/hv3_http.tcl
-+++ b/hv/hv3_http.tcl
-@@ -626,7 +626,7 @@ if 0 {
- upvar 0 $token state
- catch {
- close $state(sock)
-- unset state(sock)
-+# unset state(sock)
- }
- eval [linsert $args 0 ::http::FinishReal $token]
- }
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Fix-the-exception-can-t-read-state-sock-no-such-element-i.patch tk-html3-3.0~fossil20110109/debian/patches/Fix-the-exception-can-t-read-state-sock-no-such-element-i.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Fix-the-exception-can-t-read-state-sock-no-such-element-i.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Fix-the-exception-can-t-read-state-sock-no-such-element-i.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,23 @@
+From: jemptymethod
+Date: Fri, 4 Sep 2009 11:21:19 -0700
+Subject: Fix the exception 'can't read "state(sock)": no such element in
+ array'
+
+Origin: http://groups.google.com/group/tkhtml3/browse_thread/thread/8e186f9355255d29
+---
+ hv/hv3_http.tcl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hv/hv3_http.tcl b/hv/hv3_http.tcl
+index 0f99f02..5629aed 100644
+--- a/hv/hv3_http.tcl
++++ b/hv/hv3_http.tcl
+@@ -626,7 +626,7 @@ if 0 {
+ upvar 0 $token state
+ catch {
+ close $state(sock)
+- unset state(sock)
++# unset state(sock)
+ }
+ eval [linsert $args 0 ::http::FinishReal $token]
+ }
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/hv3_binary.patch tk-html3-3.0~fossil20110109/debian/patches/hv3_binary.patch
--- tk-html3-3.0~fossil20110109/debian/patches/hv3_binary.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/hv3_binary.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-Author: Ole Streicher
-Description: Install the manpages in the proper section. Fix trivial manpage
- spelling.
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -208,7 +208,9 @@
- #========================================================================
-
- doc:
-- $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.n
-+ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man > tkhtml.3tcl
-+ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/hv3.man > hv3.3tcl
-+ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/browser.man> hv3browser.3tcl
-
- install: all install-binaries install-libraries install-doc
-
-@@ -235,12 +237,12 @@
- #========================================================================
-
- install-doc: doc
-- @mkdir -p $(DESTDIR)$(mandir)/mann
-+ @mkdir -p $(DESTDIR)$(mandir)/man3
- @echo "Installing documentation in $(DESTDIR)$(mandir)"
-- @list='*.n'; for i in $$list; do \
-+ @list='*.3tcl'; for i in $$list; do \
- echo "Installing $$i"; \
-- rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
-- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
-+ rm -f $(DESTDIR)$(mandir)/man3/`basename $$i`; \
-+ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man3 ; \
- done
-
- test: binaries libraries
---- a/doc/macros.tcl
-+++ b/doc/macros.tcl
-@@ -71,6 +71,8 @@
- regsub -all {_([^ \n]*)_} $output {\1}
- ]
-
-+ set output [string map { " -" " \\-" "\t-" "\t\\-"
-+ "\t." "\t ." "'" "\""} $output ]
- set output [string trim [strip_leading_tabs $output]]
- set output [regsub -all {[\n]*REMOVELINEBREAK\n} $output \n]
-
-@@ -78,8 +80,7 @@
- }
-
- proc TH {name section} {
-- set date [clock format [clock seconds]]
-- return "\n.TH \"$name\" \"$section\" \"$date\"\n"
-+ return "\n.TH \"$name\" \"3tcl\" \"Sat Feb 25 2006\"\n"
- }
-
- proc Section {args} {
---- a/doc/html.man
-+++ b/doc/html.man
-@@ -36,7 +36,7 @@
- The Tkhtml package adds the [SQ ::tkhtml::htmlstyle] command to
- the interpreter it is loaded into. Invoking this command
- returns a CSS document suitable for use with Tkhml as a default
-- stylesheet for HTML documents. If the "-quirks" option is
-+ stylesheet for HTML documents. If the -quirks option is
- passed to [SQ ::tkhtml::htmlstyle] then the returned document
- includes some extra rules used when rendering legacy documents.
-
-@@ -103,7 +103,7 @@
- As well as for replacing entire document nodes (i.e. ![]() ),
- images are used in several other contexts in CSS formatted
- documents, for example as list markers or backgrounds. If the
-- -imagecmd option is not set to an empty string (the default),
-+ -imagecmd option is not set to an empty string (the default),
- then each time an image URI is encountered in the document, it
- is appended to the -imagecmd script and the resulting list
- evaluated.
-@@ -539,7 +539,7 @@
-
- The [SQ pathName text text] command returns a string
- containing the raw, unformatted text of the displayed document.
-- Each block box is seperated from the next by a newline
-+ Each block box is separated from the next by a newline
- character. Each block of whitespace is collapsed to a
- single space, except within blocks with the CSS 'white-space'
- property set to "pre".
---- a/doc/hv3.man
-+++ b/doc/hv3.man
-@@ -58,7 +58,7 @@
- }]
-
- The two most important interfaces are the [SQ goto] method and the
-- _-requestcmd_ option. The [SQ goto] method tells the widget to
-+ _-requestcmd_ option. The [SQ goto] method tells the widget to
- load the document identified by the specified absolute or relative
- URI.
-
-@@ -67,7 +67,7 @@
- users responsibility to retrieve the document and pass it back to
- the widget. If the document contains links to external resources
- (images or CSS stylesheets), then the widget invokes the
-- _-requestcmd_ script to request these. The _-requestcmd_ callback may
-+ _-requestcmd_ script to request these. The _-requestcmd_ callback may
- choose to implement handling for one or more of http:// URIs,
- file:// URIs or any other existing or invented URI scheme. See
- the "Example Usage" section below for an example.
-@@ -350,7 +350,7 @@
- to display ready in a Tcl variable (or variables). The solution
- here is to invent a custom URI scheme to use within the
- application. For example, the following example demonstrates a
-- _-requestcmd_ script that implements the "tclvar:", URI scheme
-+ _-requestcmd_ script that implements the "tclvar:", URI scheme
- for refering to global Tcl variables.
-
- [Code {
-@@ -397,7 +397,7 @@
- found at the start of each URI passed to [SQ tclvar_requestcmd]. This
- is because Hv3 resolves and escapes all URIs against the base URI
- of the currently loaded document before passing them to the
-- _-requestcmd_. This means you need to be careful with special
-+ _-requestcmd_. This means you need to be careful with special
- characters. If the name of the variable storing the stylesheet
- document in the above example were _::css::my_stylesheet_, then
- markup like this:
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Install-the-manpages-in-the-proper-section.patch tk-html3-3.0~fossil20110109/debian/patches/Install-the-manpages-in-the-proper-section.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Install-the-manpages-in-the-proper-section.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Install-the-manpages-in-the-proper-section.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,138 @@
+From: Ole Streicher
+Date: Tue, 21 Feb 2012 15:07:26 +0100
+Subject: Install the manpages in the proper section.
+
+Fix trivial manpage spelling.
+---
+ Makefile.in | 12 +++++++-----
+ doc/html.man | 6 +++---
+ doc/hv3.man | 8 ++++----
+ doc/macros.tcl | 5 +++--
+ 4 files changed, 17 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 553510f..4e915d3 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -208,7 +208,9 @@ libraries: $(HV3_LIB)
+ #========================================================================
+
+ doc:
+- $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man>tkhtml.n
++ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/html.man > tkhtml.3tcl
++ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/hv3.man > hv3.3tcl
++ $(TCLSH) $(srcdir)/doc/macros.tcl -nroff $(srcdir)/doc/browser.man> hv3browser.3tcl
+
+ install: all install-binaries install-libraries install-doc
+
+@@ -235,12 +237,12 @@ install-libraries: libraries
+ #========================================================================
+
+ install-doc: doc
+- @mkdir -p $(DESTDIR)$(mandir)/mann
++ @mkdir -p $(DESTDIR)$(mandir)/man3
+ @echo "Installing documentation in $(DESTDIR)$(mandir)"
+- @list='*.n'; for i in $$list; do \
++ @list='*.3tcl'; for i in $$list; do \
+ echo "Installing $$i"; \
+- rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
+- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/mann ; \
++ rm -f $(DESTDIR)$(mandir)/man3/`basename $$i`; \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man3 ; \
+ done
+
+ test: binaries libraries
+diff --git a/doc/html.man b/doc/html.man
+index 6a77240..ce27655 100644
+--- a/doc/html.man
++++ b/doc/html.man
+@@ -36,7 +36,7 @@
+ The Tkhtml package adds the [SQ ::tkhtml::htmlstyle] command to
+ the interpreter it is loaded into. Invoking this command
+ returns a CSS document suitable for use with Tkhml as a default
+- stylesheet for HTML documents. If the "-quirks" option is
++ stylesheet for HTML documents. If the -quirks option is
+ passed to [SQ ::tkhtml::htmlstyle] then the returned document
+ includes some extra rules used when rendering legacy documents.
+
+@@ -103,7 +103,7 @@
+ As well as for replacing entire document nodes (i.e. ![]() ),
+ images are used in several other contexts in CSS formatted
+ documents, for example as list markers or backgrounds. If the
+- -imagecmd option is not set to an empty string (the default),
++ -imagecmd option is not set to an empty string (the default),
+ then each time an image URI is encountered in the document, it
+ is appended to the -imagecmd script and the resulting list
+ evaluated.
+@@ -539,7 +539,7 @@
+
+ The [SQ pathName text text] command returns a string
+ containing the raw, unformatted text of the displayed document.
+- Each block box is seperated from the next by a newline
++ Each block box is separated from the next by a newline
+ character. Each block of whitespace is collapsed to a
+ single space, except within blocks with the CSS 'white-space'
+ property set to "pre".
+diff --git a/doc/hv3.man b/doc/hv3.man
+index fdc7513..3a5ac48 100644
+--- a/doc/hv3.man
++++ b/doc/hv3.man
+@@ -58,7 +58,7 @@
+ }]
+
+ The two most important interfaces are the [SQ goto] method and the
+- _-requestcmd_ option. The [SQ goto] method tells the widget to
++ _-requestcmd_ option. The [SQ goto] method tells the widget to
+ load the document identified by the specified absolute or relative
+ URI.
+
+@@ -67,7 +67,7 @@
+ users responsibility to retrieve the document and pass it back to
+ the widget. If the document contains links to external resources
+ (images or CSS stylesheets), then the widget invokes the
+- _-requestcmd_ script to request these. The _-requestcmd_ callback may
++ _-requestcmd_ script to request these. The _-requestcmd_ callback may
+ choose to implement handling for one or more of http:// URIs,
+ file:// URIs or any other existing or invented URI scheme. See
+ the "Example Usage" section below for an example.
+@@ -350,7 +350,7 @@
+ to display ready in a Tcl variable (or variables). The solution
+ here is to invent a custom URI scheme to use within the
+ application. For example, the following example demonstrates a
+- _-requestcmd_ script that implements the "tclvar:", URI scheme
++ _-requestcmd_ script that implements the "tclvar:", URI scheme
+ for refering to global Tcl variables.
+
+ [Code {
+@@ -397,7 +397,7 @@
+ found at the start of each URI passed to [SQ tclvar_requestcmd]. This
+ is because Hv3 resolves and escapes all URIs against the base URI
+ of the currently loaded document before passing them to the
+- _-requestcmd_. This means you need to be careful with special
++ _-requestcmd_. This means you need to be careful with special
+ characters. If the name of the variable storing the stylesheet
+ document in the above example were _::css::my_stylesheet_, then
+ markup like this:
+diff --git a/doc/macros.tcl b/doc/macros.tcl
+index d2932f7..3dd9af1 100644
+--- a/doc/macros.tcl
++++ b/doc/macros.tcl
+@@ -71,6 +71,8 @@ proc process_text {input {nocommands 0}} {
+ regsub -all {_([^ \n]*)_} $output {\1}
+ ]
+
++ set output [string map { " -" " \\-" "\t-" "\t\\-"
++ "\t." "\t ." "'" "\""} $output ]
+ set output [string trim [strip_leading_tabs $output]]
+ set output [regsub -all {[\n]*REMOVELINEBREAK\n} $output \n]
+
+@@ -78,8 +80,7 @@ proc process_text {input {nocommands 0}} {
+ }
+
+ proc TH {name section} {
+- set date [clock format [clock seconds]]
+- return "\n.TH \"$name\" \"$section\" \"$date\"\n"
++ return "\n.TH \"$name\" \"3tcl\" \"Sat Feb 25 2006\"\n"
+ }
+
+ proc Section {args} {
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/remove_some_asserts.patch tk-html3-3.0~fossil20110109/debian/patches/remove_some_asserts.patch
--- tk-html3-3.0~fossil20110109/debian/patches/remove_some_asserts.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/remove_some_asserts.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-Author: Stefan Ziegler
-Date: Fri, 26 Apr 2013 18:26:09 +0200
-Description: Added new function HtmlInitTreeNodeCmd and deleted/avoid
- some asserts to make tkhtml a little bit more stable for us.
---- a/src/html.h
-+++ b/src/html.h
-@@ -913,6 +913,7 @@
- void HtmlTreeAddClosingTag(HtmlTree *, int, const char *, int);
-
- void HtmlInitTree(HtmlTree *);
-+void HtmlInitTreeNodeCmd(HtmlTree *);
-
- void HtmlHashInit(void *, int);
- HtmlTokenMap * HtmlHashLookup(void *, const char *zType);
---- a/src/htmltcl.c
-+++ b/src/htmltcl.c
-@@ -498,6 +498,11 @@
- HtmlNodeComputedValues(pTree->pRoot) ||
- pTree->cb.pRestyle==pTree->pRoot
- );
-+
-+ while( pTree->cb.inProgress ) {
-+ usleep( 2000 );
-+ }
-+
- HtmlCheckRestylePoint(pTree);
-
- HtmlLog(pTree, "CALLBACK",
-@@ -668,14 +673,17 @@
- (!pTree->cb.inProgress)
- ) {
- ClientData clientData = (ClientData)pTree;
-- assert(!pTree->cb.isForce);
-- pTree->cb.isForce++;
-- callbackHandler(clientData);
-- pTree->cb.isForce--;
-- assert(pTree->cb.isForce >= 0);
-- if (pTree->cb.flags == 0) {
-- Tcl_CancelIdleCall(callbackHandler, clientData);
-- }
-+ if( !pTree->cb.isForce )
-+ {
-+ pTree->cb.isForce++;
-+ callbackHandler(clientData);
-+ pTree->cb.isForce--;
-+ assert(pTree->cb.isForce >= 0);
-+
-+ if (pTree->cb.flags == 0) {
-+ Tcl_CancelIdleCall(callbackHandler, clientData);
-+ }
-+ };
- }
- }
-
-@@ -2430,7 +2438,7 @@
- int objc; /* Number of arguments. */
- Tcl_Obj *CONST objv[]; /* Argument strings. */
- {
-- HtmlInitTree((HtmlTree *)clientData);
-+ HtmlInitTreeNodeCmd((HtmlTree *)clientData);
- return HtmlLayoutNode(clientData, interp, objc, objv);
- }
- static int
---- a/src/htmltree.c
-+++ b/src/htmltree.c
-@@ -997,10 +997,23 @@
- * document is the current node.
- */
- pTree->state.pCurrent = HtmlNodeChild(pTree->pRoot, 1);
-- assert(HtmlNodeTagType(pTree->state.pCurrent) == Html_BODY);
- }
- }
-
-+void
-+HtmlInitTreeNodeCmd(pTree)
-+ HtmlTree *pTree;
-+{
-+ if (pTree->pRoot
-+ && !pTree->state.pCurrent) {
-+ /* If there is no current node, then the node of the
-+ * document is the current node.
-+ */
-+ pTree->state.pCurrent = HtmlNodeChild(pTree->pRoot, 1);
-+ }
-+}
-+
-+
- static HtmlNode *
- findFosterParent(pTree, ppTable)
- HtmlTree *pTree;
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/series tk-html3-3.0~fossil20110109/debian/patches/series
--- tk-html3-3.0~fossil20110109/debian/patches/series 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/series 2019-01-08 21:23:48.000000000 +0000
@@ -1,12 +1,12 @@
-fix_state_sock.patch
-hv3_binary.patch
-install_manpages.patch
-fix_empty_offset.patch
-dont_resize_fixed_table_columns.patch
-dont_ignore_bgcolor.patch
-disable_bugreport.patch
-updated_bookmarks.patch
-ds9.patch
-use_tcllib.patch
-configure_shlibs.patch
-remove_some_asserts.patch
+Fix-the-exception-can-t-read-state-sock-no-such-element-i.patch
+Create-a-small-shell-script-that-starts-the-hv3-browser.patch
+Install-the-manpages-in-the-proper-section.patch
+Check-for-an-empty-string-in-get_selection.patch
+Fixed-table-columns-are-resized.patch
+Dynamic-set-ignores-background-color-on-tbody-nodes.patch
+Disable-the-Bug-report-button.patch
+Updated-bookmarks-freshmeat-freecode-CVSTrac-fossil.patch
+Fixes-that-were-applied-to-the-package-included-in-the-sa.patch
+Use-tcllib-instead-of-packages-snit.patch
+Configure-shared-libs-for-hurd-i386-and-kfreeBSD-correctl.patch
+Added-new-function-HtmlInitTreeNodeCmd.patch
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Updated-bookmarks-freshmeat-freecode-CVSTrac-fossil.patch tk-html3-3.0~fossil20110109/debian/patches/Updated-bookmarks-freshmeat-freecode-CVSTrac-fossil.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Updated-bookmarks-freshmeat-freecode-CVSTrac-fossil.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Updated-bookmarks-freshmeat-freecode-CVSTrac-fossil.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,23 @@
+From: Ole Streicher
+Date: Fri, 24 Feb 2012 12:25:44 +0100
+Subject: Updated bookmarks: freshmeat->freecode; CVSTrac->fossil
+
+---
+ hv/hv3_bookmarks.tcl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hv/hv3_bookmarks.tcl b/hv/hv3_bookmarks.tcl
+index eea3f1a..73548d8 100644
+--- a/hv/hv3_bookmarks.tcl
++++ b/hv/hv3_bookmarks.tcl
+@@ -155,8 +155,8 @@ pressing enter.
+ "INSTRUCTIONS" http://tkhtml.tcl.tk 1
+ "Hv3/Tkhtml3 Home page" http://tkhtml.tcl.tk 0
+ "Hv3/Tkhtml3 Mailing List" http://groups.google.com/group/tkhtml3 0
+- "Hv3/Tkhtml3 CVSTrac" http://tkhtml.tcl.tk/cvstrac/timeline 0
+- "Hv3 @ freshmeat.net" http://freshmeat.net/hv3 0
++ "Hv3/Tkhtml3 Repository" http://tkhtml.tcl.tk/fossil 0
++ "Hv3 @ Freecode" http://freecode.com/projects/hv3 0
+ } {
+ if {$C} {
+ set zSnapshot "
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/updated_bookmarks.patch tk-html3-3.0~fossil20110109/debian/patches/updated_bookmarks.patch
--- tk-html3-3.0~fossil20110109/debian/patches/updated_bookmarks.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/updated_bookmarks.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-Author: Ole Streicher
-Description: Updated bookmarks: freshmeat->freecode; CVSTrac->fossil
---- a/hv/hv3_bookmarks.tcl
-+++ b/hv/hv3_bookmarks.tcl
-@@ -155,8 +155,8 @@ pressing enter.
- "INSTRUCTIONS" http://tkhtml.tcl.tk 1
- "Hv3/Tkhtml3 Home page" http://tkhtml.tcl.tk 0
- "Hv3/Tkhtml3 Mailing List" http://groups.google.com/group/tkhtml3 0
-- "Hv3/Tkhtml3 CVSTrac" http://tkhtml.tcl.tk/cvstrac/timeline 0
-- "Hv3 @ freshmeat.net" http://freshmeat.net/hv3 0
-+ "Hv3/Tkhtml3 Repository" http://tkhtml.tcl.tk/fossil 0
-+ "Hv3 @ Freecode" http://freecode.com/projects/hv3 0
- } {
- if {$C} {
- set zSnapshot "
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/Use-tcllib-instead-of-packages-snit.patch tk-html3-3.0~fossil20110109/debian/patches/Use-tcllib-instead-of-packages-snit.patch
--- tk-html3-3.0~fossil20110109/debian/patches/Use-tcllib-instead-of-packages-snit.patch 1970-01-01 00:00:00.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/Use-tcllib-instead-of-packages-snit.patch 2019-01-08 21:23:48.000000000 +0000
@@ -0,0 +1,30 @@
+From: Ole Streicher
+Date: Sat, 24 Mar 2012 17:21:55 +0100
+Subject: Use tcllib instead of packages snit
+
+Use the snit package included into tcllib bundle instead of private
+copies of snit*.tcl
+---
+ hv/hv3_browser.tcl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hv/hv3_browser.tcl b/hv/hv3_browser.tcl
+index 461a4b9..0a0ebdb 100644
+--- a/hv/hv3_browser.tcl
++++ b/hv/hv3_browser.tcl
+@@ -2,6 +2,7 @@
+
+ package require sqlite3
+ package require Tkhtml 3.0
++package require snit
+
+ proc sourcefile {file} [string map \
+ [list %HV3_DIR% [file dirname [info script]]] \
+@@ -9,7 +10,6 @@ proc sourcefile {file} [string map \
+ return [file join {%HV3_DIR%} $file]
+ }]
+
+-source [sourcefile snit.tcl]
+ source [sourcefile hv3_widgets.tcl]
+ source [sourcefile hv3_notebook.tcl]
+ source [sourcefile hv3_db.tcl]
diff -Nru tk-html3-3.0~fossil20110109/debian/patches/use_tcllib.patch tk-html3-3.0~fossil20110109/debian/patches/use_tcllib.patch
--- tk-html3-3.0~fossil20110109/debian/patches/use_tcllib.patch 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/patches/use_tcllib.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Author: Ole Streicher
-Description: Use the snit package included into tcllib bundle instead of
- private copies of snit*.tcl
---- a/hv/hv3_browser.tcl
-+++ b/hv/hv3_browser.tcl
-@@ -2,6 +2,7 @@
-
- package require sqlite3
- package require Tkhtml 3.0
-+package require snit
-
- proc sourcefile {file} [string map \
- [list %HV3_DIR% [file dirname [info script]]] \
-@@ -9,7 +10,6 @@ proc sourcefile {file} [string map \
- return [file join {%HV3_DIR%} $file]
- }]
-
--source [sourcefile snit.tcl]
- source [sourcefile hv3_widgets.tcl]
- source [sourcefile hv3_notebook.tcl]
- source [sourcefile hv3_db.tcl]
diff -Nru tk-html3-3.0~fossil20110109/debian/README.Debian tk-html3-3.0~fossil20110109/debian/README.Debian
--- tk-html3-3.0~fossil20110109/debian/README.Debian 2014-04-14 13:15:50.000000000 +0000
+++ tk-html3-3.0~fossil20110109/debian/README.Debian 2019-01-08 21:23:48.000000000 +0000
@@ -6,12 +6,12 @@
is not packaged yet for Debian.
The development of the source code for this package seems to be halted since a
-while. The home page is no not actual in all
+while. The home page is no not actual in all
aspects: The CVSTrac is not used anymore, instead the "fossil" SCM is used and
-can be reched at the address . However, the
+can be reched at the address . However, the
original authors are not working on the project anymore, and others seem to
have no write access to the repository. The google groups mailing list
- is not completely dead, however.
+ is not completely dead, however.
I incorporated all patches that appeared in the mailing list until 29 Sep 2011.
| |