From d105af916712a0e6fce0d8afd3543bbeee29db55 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Fri, 29 Aug 2014 15:11:15 +0200 Subject: [PATCH] FBReader: Strip jars and patch source. --- .../org.geometerplus.zlibrary.ui.android.txt | 9 +- .../fbreader-2.0.6.patch | 98 +++++++++++++++++++ 2 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 metadata/org.geometerplus.zlibrary.ui.android/fbreader-2.0.6.patch diff --git a/metadata/org.geometerplus.zlibrary.ui.android.txt b/metadata/org.geometerplus.zlibrary.ui.android.txt index 7a9f2ab323..1b3be20992 100644 --- a/metadata/org.geometerplus.zlibrary.ui.android.txt +++ b/metadata/org.geometerplus.zlibrary.ui.android.txt @@ -246,11 +246,12 @@ Build:1.8.2-Honeycomb+,108022 buildjni=yes Build:2.0.6,2000610 - disable=missing source files + disable=needs testing commit=2.0.6 srclibs=PDFParseLib@36d7479ce85638eb4f0ff9c875ec77680177da5d,ApacheHttpClient@4.2.5,NanoHttpd@Release-2.0.5,JsonSimple@tag_release_1_1_1 forceversion=yes rm=libs/*jar,obsolete/lib/*.jar + patch=fbreader-2.0.6.patch prebuild=echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\n" >> local.properties && \ cp local.properties third-party/AmbilWarna/ && \ cp local.properties third-party/android-filechooser/code/ && \ @@ -264,7 +265,8 @@ Build:2.0.6,2000610 popd && \ cp $$NanoHttpd$$/core/target/nanohttpd-2.0.5.jar libs/ && \ cp -fR $$JsonSimple$$/src/main/java/org src/ && \ - cp -fR $$PDFParseLib$$/pdfparse-lib/src/main/java/org src/ + cp -fR $$PDFParseLib$$/pdfparse-lib/src/main/java/org src/ && \ + rm -fR src/com/paragon update=third-party/AmbilWarna,third-party/android-filechooser/code,third-party/drag-sort-listview/library,. target=android-14 buildjni=yes @@ -279,7 +281,8 @@ Maintainer Notes: * 2.0.6 is meant for gingerbread (2.3.*), however it might be the only "free" one, since the readme states: "Version for old (2.*) devices does not use google services API" -- so - if everything else uses gplay services... + if everything else uses gplay services... +* sed -i -e '/MinicardContract/d' src/org/geometerplus/android/fbreader/DictionaryUtil.java . Archive Policy:6 versions diff --git a/metadata/org.geometerplus.zlibrary.ui.android/fbreader-2.0.6.patch b/metadata/org.geometerplus.zlibrary.ui.android/fbreader-2.0.6.patch new file mode 100644 index 0000000000..f36c820193 --- /dev/null +++ b/metadata/org.geometerplus.zlibrary.ui.android/fbreader-2.0.6.patch @@ -0,0 +1,98 @@ +diff --git a/src/org/geometerplus/android/fbreader/DictionaryUtil.java b/src/org/geometerplus/android/fbreader/DictionaryUtil.java +index b5e9874..a2e4250 100644 +--- a/src/org/geometerplus/android/fbreader/DictionaryUtil.java ++++ b/src/org/geometerplus/android/fbreader/DictionaryUtil.java +@@ -27,11 +27,6 @@ import android.net.Uri; + import android.os.Looper; + import android.util.DisplayMetrics; + +-import com.abbyy.mobile.lingvo.api.MinicardContract; +-import com.paragon.dictionary.fbreader.OpenDictionaryFlyout; +-import com.paragon.open.dictionary.api.Dictionary; +-import com.paragon.open.dictionary.api.OpenDictionaryAPI; +- + import org.geometerplus.zlibrary.core.filesystem.ZLFile; + import org.geometerplus.zlibrary.core.language.Language; + import org.geometerplus.zlibrary.core.options.ZLStringOption; +@@ -122,14 +117,8 @@ public abstract class DictionaryUtil { + final Intent intent = getDictionaryIntent(text); + try { + if ("ABBYY Lingvo".equals(Id)) { +- intent.putExtra(MinicardContract.EXTRA_GRAVITY, frameMetrics.Gravity); +- intent.putExtra(MinicardContract.EXTRA_HEIGHT, frameMetrics.Height); +- intent.putExtra(MinicardContract.EXTRA_FORCE_LEMMATIZATION, true); +- intent.putExtra(MinicardContract.EXTRA_TRANSLATE_VARIANTS, true); +- intent.putExtra(MinicardContract.EXTRA_LIGHT_THEME, true); + final String targetLanguage = TargetLanguageOption.getValue(); + if (!Language.ANY_CODE.equals(targetLanguage)) { +- intent.putExtra(MinicardContract.EXTRA_LANGUAGE_TO, targetLanguage); + } + } else if ("ColorDict".equals(Id)) { + intent.putExtra(ColorDict3.HEIGHT, frameMetrics.Height); +@@ -144,29 +133,6 @@ public abstract class DictionaryUtil { + } + } + +- private static class OpenDictionaryPackageInfo extends PackageInfo { +- final OpenDictionaryFlyout Flyout; +- +- OpenDictionaryPackageInfo(Dictionary dictionary) { +- super( +- dictionary.getUID(), +- dictionary.getApplicationPackageName(), +- ".Start", +- dictionary.getName(), +- null, +- null, +- "%s", +- false +- ); +- Flyout = new OpenDictionaryFlyout(dictionary); +- } +- +- @Override +- void open(String text, Activity context, PopupFrameMetric frameMetrics) { +- Flyout.showTranslation(context, text, frameMetrics); +- } +- } +- + private static class InfoReader extends ZLXMLReaderAdapter { + @Override + public boolean dontCacheAttributeValues() { +@@ -253,25 +219,6 @@ public abstract class DictionaryUtil { + String FULLSCREEN = "EXTRA_FULLSCREEN"; + } + +- private static void collectOpenDictionaries(Context context) { +- final SortedSet dictionariesTreeSet = +- new TreeSet(new Comparator() { +- @Override +- public int compare(Dictionary lhs, Dictionary rhs) { +- return lhs.toString().compareTo(rhs.toString()); +- } +- } +- ); +- dictionariesTreeSet.addAll( +- new OpenDictionaryAPI(context).getDictionaries() +- ); +- +- for (Dictionary dict : dictionariesTreeSet) { +- final PackageInfo info = new OpenDictionaryPackageInfo(dict); +- ourInfos.put(info, FLAG_SHOW_AS_DICTIONARY); +- } +- } +- + private static final class Initializer implements Runnable { + private final Activity myActivity; + private final Runnable myPostAction; +@@ -293,10 +240,6 @@ public abstract class DictionaryUtil { + new BitKnightsInfoReader(myActivity).readQuietly(ZLFile.createFileByPath("dictionaries/bitknights.xml")); + myActivity.runOnUiThread(new Runnable() { + public void run() { +- collectOpenDictionaries(myActivity); +- if (myPostAction != null) { +- myPostAction.run(); +- } + } + }); + }