CVS commit: pkgsrc/x11/fbdesk

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Apr 17 13:30:49 UTC 2020

Modified Files:
        pkgsrc/x11/fbdesk: distinfo
        pkgsrc/x11/fbdesk/patches: patch-src_FbTk_TextBox.cc

Log Message:
Make sure to use abs on an integer, not unsigned.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/fbdesk/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/fbdesk/distinfo
diff -u pkgsrc/x11/fbdesk/distinfo:1.10 pkgsrc/x11/fbdesk/distinfo:1.11
--- pkgsrc/x11/fbdesk/distinfo:1.10     Wed Nov  4 03:28:28 2015
+++ pkgsrc/x11/fbdesk/distinfo  Fri Apr 17 13:30:49 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2015/11/04 03:28:28 agc Exp $
+$NetBSD: distinfo,v 1.11 2020/04/17 13:30:49 joerg Exp $
 
 SHA1 (fbdesk-1.4.1.tar.gz) = b5a2f446fa27406d9adb9a9608f1dc3c638d37ff
 RMD160 (fbdesk-1.4.1.tar.gz) = ce22936b73acd8273e9816f4c2a5458cc98cf45a
@@ -10,7 +10,7 @@ SHA1 (patch-ac) = 56ee3f78fb3f2bb20270c4
 SHA1 (patch-src_FbDesk.cc) = 65ac9146794e1ea7388906a05bbc8b86fdd70b46
 SHA1 (patch-src_FbTk_KeyUtil.cc) = b895774066d0f474ff6f1b0f6ee38477bd87fca3
 SHA1 (patch-src_FbTk_StringUtil.cc) = fcc300d550a58995822f7ff9bc368d0e5f63bda7
-SHA1 (patch-src_FbTk_TextBox.cc) = bf786dec9636e7941f9435baadb157684cb560b4
+SHA1 (patch-src_FbTk_TextBox.cc) = c947dc52f96395c9c8348344fe0033e72df428b4
 SHA1 (patch-src_FbTk_TextureRender.cc) = 56b1dc0ebf05ee2e188ab4c960eef518cdbd92a5
 SHA1 (patch-src_FbTk_Theme.cc) = 842743e69a7b005fa12e4732270cdb218a23d990
 SHA1 (patch-src_FbTk_ThemeItems.cc) = 61656f0b627455594816db1f09ad85d94a65e042

Index: pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc
diff -u pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc:1.1 pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc:1.2
--- pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc:1.1     Fri Nov 25 22:25:31 2011
+++ pkgsrc/x11/fbdesk/patches/patch-src_FbTk_TextBox.cc Fri Apr 17 13:30:49 2020
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_FbTk_TextBox.cc,v 1.1 2011/11/25 22:25:31 joerg Exp $
+$NetBSD: patch-src_FbTk_TextBox.cc,v 1.2 2020/04/17 13:30:49 joerg Exp $
 
---- src/FbTk/TextBox.cc.orig   2011-11-25 17:42:54.000000000 +0000
+--- src/FbTk/TextBox.cc.orig   2006-03-25 15:42:00.000000000 +0000
 +++ src/FbTk/TextBox.cc
 @@ -32,6 +32,7 @@
  #else
@@ -10,3 +10,12 @@ $NetBSD: patch-src_FbTk_TextBox.cc,v 1.1
  #include <X11/keysym.h>
  #include <X11/Xutil.h>
  
+@@ -199,7 +200,7 @@ void TextBox::buttonPressEvent(XButtonEv
+         int delta = width();
+         int tmp = 0;
+         for(i = m_start_pos; i <= m_end_pos; i++) {
+-            tmp = abs(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
++            tmp = abs(event.x - (int)font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
+ 
+             if (tmp < delta) {
+                 delta = tmp;