From 96e2e722a120cf1e0545d29aa585f4fc8e58dbb9 Mon Sep 17 00:00:00 2001
From: shlomi <shlomi@shlomi-laptop>
Date: Mon, 4 Jan 2010 23:43:51 +0200
Subject: [PATCH] Added back Hebrew support

---
 Makefile         |  6 ++++--
 debian/changelog |  6 ++++++
 debian/control   |  2 +-
 po/bin/po2txt    | 10 ++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b51354c..0a0268a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,10 @@ INCLUDES     = $(wildcard *.inc)
 # Dzongkha and Mongolian, which ought to be rendered vertically.
 # gfxboot has no bidirectional text support yet
 # (https://bugs.launchpad.net/ubuntu/+source/gfxboot/+bug/212491) so
-# right-to-left languages (Arabic and Hebrew) won't work.
-TRANSLATIONS = $(addsuffix .tr,en $(filter-out ar bn dz gu he hi km ml mn ne pa ta th, $(notdir $(basename $(wildcard po/*.po)))))
+# right-to-left languages (Arabic) won't work. This can be worked-around
+# by displaying RTL text in visual format (which works well for Hebrew and should
+# be considered for use in other languages where applicable)
+TRANSLATIONS = $(addsuffix .tr,en $(filter-out ar bn dz gu hi km ml mn ne pa ta th, $(notdir $(basename $(wildcard po/*.po)))))
 
 DEFAULT_LANG =
 
diff --git a/debian/changelog b/debian/changelog
index a1d3ce6..40ff37e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gfxboot-theme-ubuntu (0.9.1) lucid; urgency=low
+
+  * Added back Hebrew support by using visual text (LP: #212491)
+
+ -- Shlomi Loubaton <shlomister@gmail.com>  Mon, 04 Jan 2010 23:10:44 +0200
+
 gfxboot-theme-ubuntu (0.9.0) lucid; urgency=low
 
   * Remove "Press F4 to select alternative start-up and installation modes."
diff --git a/debian/control b/debian/control
index 67579cf..41ee704 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gfxboot-theme-ubuntu
 Section: utils
 Priority: optional
 Maintainer: Colin Watson <cjwatson@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.0), gfxboot (>= 3.3.28), cpio
+Build-Depends: debhelper (>= 7.0.0), gfxboot (>= 3.3.28), cpio, libfribidi0
 Standards-Version: 3.6.2
 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/gfxboot-theme-ubuntu/mainline
 
diff --git a/po/bin/po2txt b/po/bin/po2txt
index 5b8b538..c9fca4d 100755
--- a/po/bin/po2txt
+++ b/po/bin/po2txt
@@ -5,6 +5,7 @@
 # Note: en.po ist treated specially!
 
 use Getopt::Long;
+use IPC::Open2;
 
 sub read_texts;
 sub join_msg;
@@ -106,6 +107,15 @@ sub read_texts
     $txt =~ s/\\"/"/g;
     $txt =~ s/\\\\/\\/g;
     $txt =~ s/\\n/\n/g;
+    if($lang eq "he")
+    {
+      my $bidi_pid = open2(\*BIDI_OUT, \*BIDI_IN, 'fribidi', '--nopad', '--nobreak');
+      print BIDI_IN $txt;
+      close BIDI_IN;
+      { local $/ = undef; $txt = <BIDI_OUT>; }
+      $txt =~ s/(.)%/%$1/g;
+      waitpid $bidi_pid, 0;
+    }
     print "$txt\x00"
   }