From 084ea3f2a0c15252463f55aa8b3d672c6f6e8a87 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 22 Mar 2013 22:01:59 +0200 Subject: [PATCH] earth-live-wallpaper: Properly urlencode a space in repo URL. Otherwise, revert the rest to state of original patch, it should work now, and avoid fetching unneeded stuff (if any) from repo. --- metadata/com.seb.SLWP.txt | 7 +-- metadata/com.seb.SLWP/various.patch | 76 ----------------------------- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 metadata/com.seb.SLWP/various.patch diff --git a/metadata/com.seb.SLWP.txt b/metadata/com.seb.SLWP.txt index 2f9ae71d9b..3fe1b8813e 100644 --- a/metadata/com.seb.SLWP.txt +++ b/metadata/com.seb.SLWP.txt @@ -12,14 +12,11 @@ images of Earth and other planets flying thru space. Repo Type:git-svn # Note the starting space in a subdir name -Repo:http://earth-live-wallpaper.googlecode.com/svn/trunk/ earth-live-wallpaper/SLWP +Repo:http://earth-live-wallpaper.googlecode.com/svn/trunk/%20earth-live-wallpaper/SLWP -Build Version:1.4,60,!build server rejection 61,target=android-10,\ +Build Version:1.4,60,61,target=android-10,init=rm -rf bin/ gen/,\ patch=scoping-fix.patch;handle-no-market.patch;fix-appname.patch;button-name.patch -#Build Version:1.4,60,61,target=android-10,subdir= earth-live-wallpaper/SLWP,\ -#init=rm -rf bin/ gen/ ../SLWP_Maps/bin,patch=various.patch;button-name.patch - Auto Update Mode:None Update Check Mode:Market Current Version:1.4 diff --git a/metadata/com.seb.SLWP/various.patch b/metadata/com.seb.SLWP/various.patch deleted file mode 100644 index c18712b107..0000000000 --- a/metadata/com.seb.SLWP/various.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit 3e0b60afc74bed5d0d864ae08a63d5727b1c1b8e -Author: David Black -Date: Mon Mar 18 18:43:31 2013 +0000 - - patch - -diff --git a/ earth-live-wallpaper/SLWP/res/values-es/strings.xml b/ earth-live-wallpaper/SLWP/res/values-es/strings.xml -index a3f9b91..5c89079 100644 ---- a/ earth-live-wallpaper/SLWP/res/values-es/strings.xml -+++ b/ earth-live-wallpaper/SLWP/res/values-es/strings.xml -@@ -1,7 +1,6 @@ - - - Hello World, SLWP! -- EarthRot - rotación Globe (OpenGL VBO) - velocidad - Elija la velocidad de rotación de la Tierra -diff --git a/ earth-live-wallpaper/SLWP/res/values/strings.xml b/ earth-live-wallpaper/SLWP/res/values/strings.xml -index 501db7e..99d20aa 100644 ---- a/ earth-live-wallpaper/SLWP/res/values/strings.xml -+++ b/ earth-live-wallpaper/SLWP/res/values/strings.xml -@@ -1,7 +1,7 @@ - - - Hello World, SLWP! -- EarthRot -+ Earth Live Wallpaper - Rotating earth globe (Opengl VBO) - - -diff --git a/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/Prefs.java b/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/Prefs.java -index 900ff3d..cb0a5c7 100755 ---- a/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/Prefs.java -+++ b/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/Prefs.java -@@ -75,11 +75,18 @@ public class Prefs extends PreferenceActivity implements - bg.setOnPreferenceChangeListener(this); - initMapList(); - Button bt = (Button) findViewById(R.id.bt_donate); -+ final PreferenceActivity myact = this; - bt.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { -- startActivity(new Intent(Intent.ACTION_VIEW, Uri -- .parse("market://search?q=pub:unixseb"))); -+ try { -+ startActivity(new Intent(Intent.ACTION_VIEW, Uri -+ .parse("market://search?q=pub:unixseb"))); -+ } catch (Exception e) { -+ Log.e("SLWP", "Cannot open 'market:' link", e); -+ Toast.makeText(myact, "Cannot launch Market", Toast.LENGTH_SHORT).show(); -+ } -+ - } - }); - Button bth = (Button) findViewById(R.id.bt_help); -diff --git a/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java b/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java -index d94d995..d697662 100644 ---- a/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java -+++ b/ earth-live-wallpaper/SLWP/src/com/seb/SLWP/SLWP.java -@@ -590,7 +590,7 @@ public class SLWP extends GLWallpaperService implements - return mGle; - } - -- class GlEngine extends GLEngine { -+ class GlEngine extends GLWallpaperService.GLEngine { - - private static final float TOUCH_SCALE_FACTOR = 1E-3f; - private float mPreviousX = 0.0f; -@@ -841,4 +841,4 @@ public class SLWP extends GLWallpaperService implements - } - } - --} -\ No newline at end of file -+}