From 0788709f26876a8ec6137dd11f67e94569c5ce7d Mon Sep 17 00:00:00 2001 From: chrox Date: Sat, 28 Mar 2015 22:04:12 +0800 Subject: [PATCH 1/8] Popup goto dialog only when holding on visible status bar --- frontend/apps/reader/modules/readerfooter.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index 2a22147a3..f1d39e231 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -351,6 +351,7 @@ function ReaderFooter:onTapFooter(arg, ges) end function ReaderFooter:onHoldFooter(arg, ges) + if self.mode == 0 then return end self.ui:handleEvent(Event:new("ShowGotoDialog")) return true end From cfffb44c9dac63646a59fc3de1bbc911b8db28d0 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 29 Mar 2015 08:59:51 +0800 Subject: [PATCH 2/8] Fix no hardware key bindings on Android --- frontend/device/android/device.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/device/android/device.lua b/frontend/device/android/device.lua index 843fddc7c..43a7768b4 100644 --- a/frontend/device/android/device.lua +++ b/frontend/device/android/device.lua @@ -7,6 +7,7 @@ local function yes() return true end local Device = Generic:new{ model = "Android", + hasKeys = yes, isAndroid = yes, firmware_rev = "none", display_dpi = ffi.C.AConfiguration_getDensity(android.app.config), From e7e3f6d96cf197c16986c6709729b382791ab3db Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 30 Mar 2015 09:48:14 +0800 Subject: [PATCH 3/8] update koreader-base --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index fb7378172..b81a3c21d 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit fb73781726adf2e2fc39762fa1754c611f0f9d60 +Subproject commit b81a3c21d7e630e82c12ff5f385f60f90a2e20cd From 68e1b6ea19e1eb2bb0402a379d2af5e65abd9fdd Mon Sep 17 00:00:00 2001 From: chrox Date: Mon, 30 Mar 2015 18:13:39 +0800 Subject: [PATCH 4/8] Fix docToWindowRect fail for the last word of a line when floating punctuation is off. This should fix #1206 and #1369. --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index b81a3c21d..57d4cca62 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit b81a3c21d7e630e82c12ff5f385f60f90a2e20cd +Subproject commit 57d4cca62d6e1f14c32bf883a4d3b3ff63b2a9cd From c2924abac4c90f3daa914e4b574d4f264493feb7 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 31 Mar 2015 10:30:59 +0800 Subject: [PATCH 5/8] Fix OCR fails on native djvu pages The page_width and page_height were always 600 and 800 before this patch rendering the OCR engine confused. This should fix #1379. --- base | 2 +- frontend/document/koptinterface.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/base b/base index 57d4cca62..5af9c0e97 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 57d4cca62d6e1f14c32bf883a4d3b3ff63b2a9cd +Subproject commit 5af9c0e97716d94df47ad07a3639263a6ed49e3d diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua index 64897f899..c6f1ba0b7 100644 --- a/frontend/document/koptinterface.lua +++ b/frontend/document/koptinterface.lua @@ -620,7 +620,9 @@ function KoptInterface:getNativeOCRWord(doc, pageno, rect) kc:setZoom(30/rect.h) local page = doc._document:openPage(pageno) page:getPagePix(kc) + --kc:exportSrcPNGFile({rect}, nil, "ocr-word.png") local word_w, word_h = kc:getPageDim() + --DEBUG(word_w, word_h) local ok, word = pcall( kc.getTOCRWord, kc, "src", 0, 0, word_w, word_h, From 6f4bbe3b1dbc028f123c9083ab6ffd45b7fc5030 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 31 Mar 2015 20:30:49 +0800 Subject: [PATCH 6/8] Statically link libstdc++ for all shared libraries This should fix #1469 and #480. --- base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base b/base index 5af9c0e97..dd4d31c22 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 5af9c0e97716d94df47ad07a3639263a6ed49e3d +Subproject commit dd4d31c222e20dd49337b6387d31a04d8e09e9ed From 92b9a568f20291c84553fb562246e88279a1fe6e Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 31 Mar 2015 20:43:24 +0800 Subject: [PATCH 7/8] Reflect that multiple PocketBook devices are supported --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41d1451bd..0f89189da 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ KOReader KOReader is a document viewer application, originally created for Kindle e-ink readers. It currently runs on Kindle 5 (Touch), Kindle Paperwhite, -Kobo, PocketBook 840 and Android (2.3+) devices. Developers can also run Koreader emulator +Kobo, PocketBook and Android (2.3+) devices. Developers can also run Koreader emulator for development purpose on desktop PC with Linux or Windows operating system. Main features for users From 625b184b8eb5d2bae57eebd0ef222c2ce6852547 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 31 Mar 2015 22:38:59 +0800 Subject: [PATCH 8/8] Fix travis build --- .travis.yml | 6 +++++- base | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e661d7b3e..0f3fe3b8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,11 @@ env: - EMULATE_READER=1 USE_NO_CCACHE=1 before_install: - - sudo apt-get update + - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + - sudo apt-get install -qq g++-4.8 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50 install: # nasm for building libpng diff --git a/base b/base index dd4d31c22..9d9e12973 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit dd4d31c222e20dd49337b6387d31a04d8e09e9ed +Subproject commit 9d9e1297339160aabc3e0d73fa131dbce7bddbae