Package: jwm
Version: 2.1.0+svn579-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch

Dear Maintainer,

In Ubuntu 14.04, the attached patch was applied to achieve the following:

  * Correct use of missing Fribidi functions.


On some 64-bit arches, implicitly declared functions result in segfaults
at runtime. This patch corrects those function uses. Thanks for
considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.11.0-17-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru jwm-2.1.0+svn579/debian/patches/60-fribidi.patch jwm-2.1.0+svn579/debian/patches/60-fribidi.patch
--- jwm-2.1.0+svn579/debian/patches/60-fribidi.patch	1969-12-31 19:00:00.000000000 -0500
+++ jwm-2.1.0+svn579/debian/patches/60-fribidi.patch	2014-02-17 22:27:28.000000000 -0500
@@ -0,0 +1,20 @@
+Index: jwm-2.1.0+svn579/src/font.c
+===================================================================
+--- jwm-2.1.0+svn579.orig/src/font.c	2012-01-26 20:04:17.000000000 -0500
++++ jwm-2.1.0+svn579/src/font.c	2014-02-17 22:27:26.906074506 -0500
+@@ -248,11 +248,13 @@
+ #ifdef USE_FRIBIDI
+ 
+    temp = AllocateStack((len + 1) * sizeof(FriBidiChar));
+-   unicodeLength = fribidi_utf8_to_unicode((char*)str, len, temp);
++   unicodeLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8,
++                                              (char*)str, len, temp);
+ 
+    fribidi_log2vis(temp, unicodeLength, &type, temp, NULL, NULL, NULL);
+ 
+-   fribidi_unicode_to_utf8(temp, len, (char*)temp);
++   fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, temp, len,
++                              (char*)temp);
+    output = (char*)temp;
+ 
+ #else
diff -Nru jwm-2.1.0+svn579/debian/patches/series jwm-2.1.0+svn579/debian/patches/series
--- jwm-2.1.0+svn579/debian/patches/series	2012-11-18 13:33:23.000000000 -0500
+++ jwm-2.1.0+svn579/debian/patches/series	2014-02-17 22:21:12.000000000 -0500
@@ -6,3 +6,4 @@
 50-jwmrc--removed-menus.patch
 55-alt-tab.patch
 57-jwmrc--debian-include.patch
+60-fribidi.patch

Reply via email to