summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Lisin2019-11-03 17:34:26 +0100
committerMatthias Lisin2019-11-03 17:34:26 +0100
commit2bf258486806d66b22804c170e71b67ce428a1df (patch)
treee0c2abb601826e6c2feb6c515d068cc9a31bf41a
parent837cec2a29149566b224600048c8e9d1a25f8344 (diff)
downloadaur-2bf258486806d66b22804c170e71b67ce428a1df.tar.gz
upgpkg: ubports-installer-git 5ce9c514
- Adjust patches
-rw-r--r--.SRCINFO6
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD6
-rw-r--r--disable-update-check.patch10
-rw-r--r--use-system-tools.patch15
5 files changed, 18 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5be2de1a768..92161afb824 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ubports-installer-git
pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
- pkgver = 0.4.2_beta.r5.g3e68c62
+ pkgver = 0.4.5_beta.r0.g5ce9c51
pkgrel = 1
url = https://github.com/ubports/ubports-installer
arch = any
@@ -22,8 +22,8 @@ pkgbase = ubports-installer-git
sha512sums = SKIP
sha512sums = 478766bca96e64cb13b86003113e33eba74139e5a0d56687ff0647e4d2356639249c9f4054c5c3741fec697c624980dd1507925702f4865370ec9a20f766720a
sha512sums = efb0da575db03326f56a8bb589f3f5f543a4ae23b471658555bb030bcc1c1625ba2aafd15f26fac41425b3b0bde4cf176740d92aafd5853d5ce1da2b946686e8
- sha512sums = 7ed6bf81fa0bbf0dd9a256b9f0ac3e086210f493c398289674c9a41d3ec0d8af36387faf95d700bdfd5b2337f9a3f12e5bb7a72499668f5622c69dea25e6f49d
- sha512sums = bde53f6f98998d2eb864e63fd73e2da146e5d6f985b670112ea4fcb9001ce34bd59a55d2a8c28f8c8b42280c7225de6746f969d827938441c15eb8febdf15981
+ sha512sums = 42d977dabe003cc4001e75a7dd782090bd7218c8b5270e820d922b3ca206e58669de9e0d9bc4056839baf1b363922e2a789626642959a31070d3160e51c151cf
+ sha512sums = 4655eadabf03185b811e6a9df4569a23b459ee3ea4b64801aa445c3cfb7443e88a1c2de99050d4ec145c2936c58afdb4dd7767cb3ab00be4e8f969578bc86183
pkgname = ubports-installer-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..1455231d185
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+ubports-installer-git
+src/npm-cache
diff --git a/PKGBUILD b/PKGBUILD
index 24342ca4cad..d52f836a4e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Matthias Lisin <ml@visu.li>
pkgname=ubports-installer-git
-pkgver=0.4.2_beta.r5.g3e68c62
+pkgver=0.4.5_beta.r0.g5ce9c51
pkgrel=1
pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
arch=(any)
@@ -18,8 +18,8 @@ source=("$pkgname::git+${url}.git"
sha512sums=('SKIP'
'478766bca96e64cb13b86003113e33eba74139e5a0d56687ff0647e4d2356639249c9f4054c5c3741fec697c624980dd1507925702f4865370ec9a20f766720a'
'efb0da575db03326f56a8bb589f3f5f543a4ae23b471658555bb030bcc1c1625ba2aafd15f26fac41425b3b0bde4cf176740d92aafd5853d5ce1da2b946686e8'
- '7ed6bf81fa0bbf0dd9a256b9f0ac3e086210f493c398289674c9a41d3ec0d8af36387faf95d700bdfd5b2337f9a3f12e5bb7a72499668f5622c69dea25e6f49d'
- 'bde53f6f98998d2eb864e63fd73e2da146e5d6f985b670112ea4fcb9001ce34bd59a55d2a8c28f8c8b42280c7225de6746f969d827938441c15eb8febdf15981')
+ '42d977dabe003cc4001e75a7dd782090bd7218c8b5270e820d922b3ca206e58669de9e0d9bc4056839baf1b363922e2a789626642959a31070d3160e51c151cf'
+ '4655eadabf03185b811e6a9df4569a23b459ee3ea4b64801aa445c3cfb7443e88a1c2de99050d4ec145c2936c58afdb4dd7767cb3ab00be4e8f969578bc86183')
pkgver() {
cd "$pkgname"
diff --git a/disable-update-check.patch b/disable-update-check.patch
index 15dfd0d3b3a..449a44aa6c6 100644
--- a/disable-update-check.patch
+++ b/disable-update-check.patch
@@ -1,7 +1,7 @@
diff -ura package.orig/src/main.js package.new/src/main.js
---- package.orig/src/main.js 2019-10-30 00:09:52.833991579 +0100
-+++ package.new/src/main.js 2019-10-30 00:13:11.936926036 +0100
-@@ -393,22 +393,6 @@
+--- package.orig/src/main.js 2019-11-03 17:16:52.891370653 +0100
++++ package.new/src/main.js 2019-11-03 17:17:32.026472647 +0100
+@@ -390,20 +390,6 @@
});
});
@@ -16,9 +16,7 @@ diff -ura package.orig/src/main.js package.new/src/main.js
- );
- mainWindow.webContents.send("user:update-available");
- })
-- .catch(() => {
-- utils.log.debug("This is the latest version.");
-- });
+- .catch(() => {}); // Ignore errors, since this is non-essential
- });
-
mainWindow.loadURL(
diff --git a/use-system-tools.patch b/use-system-tools.patch
index 882deb6000b..8e8de8ea54b 100644
--- a/use-system-tools.patch
+++ b/use-system-tools.patch
@@ -1,7 +1,7 @@
diff -ura package.orig/src/utils.js package.new/src/utils.js
---- package.orig/src/utils.js 2019-10-30 00:09:52.833991579 +0100
-+++ package.new/src/utils.js 2019-10-30 00:24:23.422742604 +0100
-@@ -222,16 +222,9 @@
+--- package.orig/src/utils.js 2019-11-03 17:23:57.937681039 +0100
++++ package.new/src/utils.js 2019-11-03 17:31:22.048339885 +0100
+@@ -223,13 +223,7 @@
process.exit(-1);
}
@@ -12,10 +12,7 @@ diff -ura package.orig/src/utils.js package.new/src/utils.js
- platforms[os.platform()]
- )
- : path.join(__dirname, "..", "platform-tools", platforms[os.platform()]);
++let toolpath = ""
+ let processes = [];
function execTool(tool, args, callback) {
- exec(
-- [path.join(toolpath, tool)].concat(args).join(" "),
-+ [tool].concat(args).join(" "),
- { options: { maxBuffer: 1024 * 1024 * 2 } },
- callback
- );
+ let pid = exec(