Remove unnecessary patch for orbterm-git

3 files changed, 4 insertions, 315 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8051884c20c6..c6c36760f924 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = orbterm-git
 	pkgdesc = The default terminal for RedoxOS, compatible with Linux - git version
-	pkgver = 0.3.6.r15.gf177f49
+	pkgver = 0.3.6.r25.g505cac5
 	pkgrel = 1
 	url = https://gitlab.redox-os.org/redox-os/orbterm
 	arch = x86_64
@@ -15,8 +15,6 @@ pkgbase = orbterm-git
 	provides = orbterm
 	conflicts = orbterm
 	source = orbterm-git::git+https://gitlab.redox-os.org/redox-os/orbterm
-	source = update-orbfont.diff
 	sha512sums = SKIP
-	sha512sums = d78fe9cf662dc286c77ed0526493deb39dbed614259108fc247b44c406cbdf1c70aef4d05ee6c816fd51035df2fb107466d6f06fbde6941576e34a7f89febfc0
 
 pkgname = orbterm-git
diff --git a/PKGBUILD b/PKGBUILD
index b9497365af32..41e6f901bb1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Peukert <daniel@peukert.cc>
 _pkgname='orbterm'
 pkgname="$_pkgname-git"
-pkgver='0.3.6.r15.gf177f49'
+pkgver='0.3.6.r25.g505cac5'
 pkgrel='1'
 pkgdesc='The default terminal for RedoxOS, compatible with Linux - git version'
 arch=('x86_64' 'i686' 'pentium4' 'armv7h' 'aarch64')
@@ -11,18 +11,13 @@ depends=('sdl2')
 makedepends=('cargo' 'git')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=(
-	"$pkgname::git+$url"
-	'update-orbfont.diff'
-)
-sha512sums=('SKIP'
-            'd78fe9cf662dc286c77ed0526493deb39dbed614259108fc247b44c406cbdf1c70aef4d05ee6c816fd51035df2fb107466d6f06fbde6941576e34a7f89febfc0')
+source=("$pkgname::git+$url")
+sha512sums=('SKIP')
 
 _sourcedirectory="$pkgname"
 
 prepare() {
 	cd "$srcdir/$_sourcedirectory/"
-	patch --forward -p1 < "$srcdir/update-orbfont.diff"
 
 	# Prepare correct target for our architecture
 	_cargotarget="$CARCH-unknown-linux-gnu"
diff --git a/update-orbfont.diff b/update-orbfont.diff
deleted file mode 100644
index 22bac77c5545..000000000000
--- a/update-orbfont.diff
+++ /dev/null
@@ -1,304 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 30f0e73..c263017 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2,6 +2,12 @@
- # It is not intended for manual editing.
- version = 3
- 
-+[[package]]
-+name = "ab_glyph_rasterizer"
-+version = "0.1.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"
-+
- [[package]]
- name = "addr2line"
- version = "0.17.0"
-@@ -26,15 +32,6 @@ dependencies = [
-  "memchr",
- ]
- 
--[[package]]
--name = "arrayvec"
--version = "0.4.12"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
--dependencies = [
-- "nodrop",
--]
--
- [[package]]
- name = "arrayvec"
- version = "0.5.2"
-@@ -79,12 +76,6 @@ version = "3.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
- 
--[[package]]
--name = "byteorder"
--version = "1.4.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
--
- [[package]]
- name = "cc"
- version = "1.0.73"
-@@ -106,6 +97,59 @@ dependencies = [
-  "cc",
- ]
- 
-+[[package]]
-+name = "core-foundation"
-+version = "0.9.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-+dependencies = [
-+ "core-foundation-sys",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "core-foundation-sys"
-+version = "0.8.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-+
-+[[package]]
-+name = "core-graphics"
-+version = "0.22.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb"
-+dependencies = [
-+ "bitflags",
-+ "core-foundation",
-+ "core-graphics-types",
-+ "foreign-types",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "core-graphics-types"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b"
-+dependencies = [
-+ "bitflags",
-+ "core-foundation",
-+ "foreign-types",
-+ "libc",
-+]
-+
-+[[package]]
-+name = "core-text"
-+version = "19.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
-+dependencies = [
-+ "core-foundation",
-+ "core-graphics",
-+ "foreign-types",
-+ "libc",
-+]
-+
- [[package]]
- name = "cty"
- version = "0.2.2"
-@@ -145,6 +189,16 @@ dependencies = [
-  "termcolor",
- ]
- 
-+[[package]]
-+name = "expat-sys"
-+version = "2.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa"
-+dependencies = [
-+ "cmake",
-+ "pkg-config",
-+]
-+
- [[package]]
- name = "failure"
- version = "0.1.8"
-@@ -167,6 +221,45 @@ dependencies = [
-  "synstructure",
- ]
- 
-+[[package]]
-+name = "font-loader"
-+version = "0.11.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c49d6b4c11dca1a1dd931a34a9f397e2da91abe3de4110505f3530a80e560b52"
-+dependencies = [
-+ "core-foundation",
-+ "core-text",
-+ "libc",
-+ "servo-fontconfig",
-+ "winapi",
-+]
-+
-+[[package]]
-+name = "foreign-types"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-+dependencies = [
-+ "foreign-types-shared",
-+]
-+
-+[[package]]
-+name = "foreign-types-shared"
-+version = "0.1.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-+
-+[[package]]
-+name = "freetype-sys"
-+version = "0.13.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
-+dependencies = [
-+ "cmake",
-+ "libc",
-+ "pkg-config",
-+]
-+
- [[package]]
- name = "getrandom"
- version = "0.2.7"
-@@ -220,12 +313,6 @@ version = "0.2.139"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
- 
--[[package]]
--name = "linked-hash-map"
--version = "0.5.6"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
--
- [[package]]
- name = "log"
- version = "0.4.17"
-@@ -250,12 +337,6 @@ dependencies = [
-  "adler",
- ]
- 
--[[package]]
--name = "nodrop"
--version = "0.1.14"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
--
- [[package]]
- name = "object"
- version = "0.29.0"
-@@ -288,10 +369,11 @@ dependencies = [
- 
- [[package]]
- name = "orbfont"
--version = "0.1.8"
-+version = "0.1.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da4dfbc851e5c24c3cf1e16ec5222f868f3362d2b7493d0b53051fe2669267a2"
-+checksum = "ab07d79a63f06e8342bf25b3dd07f18c04f06e453ee02c063c3f1463bd1a2b67"
- dependencies = [
-+ "font-loader",
-  "orbclient",
-  "rusttype",
- ]
-@@ -314,6 +396,21 @@ dependencies = [
-  "xdg",
- ]
- 
-+[[package]]
-+name = "owned_ttf_parser"
-+version = "0.15.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb"
-+dependencies = [
-+ "ttf-parser",
-+]
-+
-+[[package]]
-+name = "pkg-config"
-+version = "0.3.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-+
- [[package]]
- name = "proc-macro2"
- version = "1.0.42"
-@@ -415,13 +512,12 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
- 
- [[package]]
- name = "rusttype"
--version = "0.2.4"
-+version = "0.9.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d8d729e72445ad579171b01a9231657736b3793a2cf423078e687e20ecb8695a"
-+checksum = "3ff8374aa04134254b7995b63ad3dc41c7f7236f69528b28553da7d72efaa967"
- dependencies = [
-- "arrayvec 0.4.12",
-- "linked-hash-map",
-- "stb_truetype 0.2.8",
-+ "ab_glyph_rasterizer",
-+ "owned_ttf_parser",
- ]
- 
- [[package]]
-@@ -467,21 +563,24 @@ dependencies = [
- ]
- 
- [[package]]
--name = "stb_truetype"
--version = "0.2.8"
-+name = "servo-fontconfig"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9d1bec4382294c5a680fcebd29f8451e8d8c04479a026f6909004e2ab1cb425d"
-+checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c"
- dependencies = [
-- "stb_truetype 0.3.1",
-+ "libc",
-+ "servo-fontconfig-sys",
- ]
- 
- [[package]]
--name = "stb_truetype"
--version = "0.3.1"
-+name = "servo-fontconfig-sys"
-+version = "5.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
-+checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388"
- dependencies = [
-- "byteorder",
-+ "expat-sys",
-+ "freetype-sys",
-+ "pkg-config",
- ]
- 
- [[package]]
-@@ -545,6 +644,12 @@ dependencies = [
-  "serde",
- ]
- 
-+[[package]]
-+name = "ttf-parser"
-+version = "0.15.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"
-+
- [[package]]
- name = "unicode-ident"
- version = "1.0.2"
-@@ -575,7 +680,7 @@ version = "0.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "96cc8a191608603611e78c6ec11dafef37e3cca0775aeef1931824753e81711d"
- dependencies = [
-- "arrayvec 0.5.2",
-+ "arrayvec",
-  "utf8parse",
-  "vte_generate_state_changes",
- ]