OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Move source change to build patch

Browse Source
This commit is contained in:
Javier Serrano Polo
2020-06-10 02:27:37 +02:00
parent 84be701870
commit daf3d810d1
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
View File

@@ -305,8 +305,7 @@ public final class MainActivity
t = Toast.makeText(this, msg, duration);
lastToast = new WeakReference<Toast>(t);
} else {
// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && t.getView().isShown()) {
if (Build.VERSION.SDK_INT >= 28 && t.getView().isShown()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && t.getView().isShown()) {
t.cancel();
}
t.setText(msg);

11
travis/support.stretch/debian/patches/00-version_codes.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -305,7 +305,7 @@ public final class MainActivity
t = Toast.makeText(this, msg, duration);
lastToast = new WeakReference<Toast>(t);
} else {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && t.getView().isShown()) {
+ if (Build.VERSION.SDK_INT >= 28 && t.getView().isShown()) {
t.cancel();
}
t.setText(msg);

11
travis/support.stretch/debian/rules
View File

@@ -1,7 +1,12 @@
#!/usr/bin/make -f
patch-stamp:
[ -e debian/control ]
patch -b -p1 -z .source-orig < $(wildcard debian/patches/*)
touch $@
build-indep: build-indep-stamp
build-indep-stamp:
build-indep-stamp: patch-stamp
[ -e debian/control ]
travis/support/script
touch $@
@@ -12,9 +17,11 @@ build: build-indep
clean:
[ -e debian/control ]
rm -f build-indep-stamp debian/files
rm -f build-indep-stamp debian/files patch-stamp
cd AndorsTrail && rm -fr *.apk .gradle build build.gradle \
gradle.properties keystore.p12 local.properties src/main
find -name "*.source-orig" \
-execdir sh -c 'mv $$0 $${0%.source-orig}' "{}" \;
binary-indep: build-indep
[ -e debian/control ]