Remove vte patch

3 files changed, 7 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 976dc5ddfa80..b61fadb32002 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sat May 26 12:04:09 UTC 2018
+# Sun Jun 24 11:13:59 UTC 2018
 pkgbase = pantheon-terminal-git
 	pkgdesc = The Pantheon Terminal Emulator
 	pkgver = r1696.3f84363
@@ -14,9 +14,7 @@ pkgbase = pantheon-terminal-git
 	makedepends = intltool
 	makedepends = meson
 	makedepends = vala
-	depends = desktop-file-utils
 	depends = glib2
-	depends = glibc
 	depends = gtk3
 	depends = libnotify
 	depends = pango
@@ -25,9 +23,7 @@ pkgbase = pantheon-terminal-git
 	provides = pantheon-terminal
 	conflicts = pantheon-terminal
 	source = pantheon-terminal::git+https://github.com/elementary/terminal.git
-	source = pantheon-terminal-vte0.52.patch
 	sha256sums = SKIP
-	sha256sums = af30fd1c7685ed46a708b988a8844ec1bdb30ef2727a05160dfa0384b5bb76e1
 
 pkgname = pantheon-terminal-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ccd92cd9bf9c..8d58d73948c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,13 @@ arch=('x86_64')
 url='https://github.com/elementary/terminal'
 license=('GPL3')
 groups=('pantheon-unstable')
-depends=('desktop-file-utils' 'glib2' 'glibc' 'gtk3' 'libnotify' 'pango' 'vte3'
+depends=('glib2' 'gtk3' 'libnotify' 'pango' 'vte3'
          'libgranite.so')
 makedepends=('appstream' 'git' 'granite-git' 'intltool' 'meson' 'vala')
 provides=('pantheon-terminal')
 conflicts=('pantheon-terminal')
-source=('pantheon-terminal::git+https://github.com/elementary/terminal.git'
-        'pantheon-terminal-vte0.52.patch')
-sha256sums=('SKIP'
-            'af30fd1c7685ed46a708b988a8844ec1bdb30ef2727a05160dfa0384b5bb76e1')
+source=('pantheon-terminal::git+https://github.com/elementary/terminal.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd pantheon-terminal
@@ -24,28 +22,13 @@ pkgver() {
   echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-  mkdir build
-
-  cd pantheon-terminal
-
-  patch -Np1 -i ../pantheon-terminal-vte0.52.patch
-}
-
 build() {
-  cd build
-
-  arch-meson ../pantheon-terminal
-  ninja
+  arch-meson pantheon-terminal build
+  ninja -C build
 }
 
 package() {
-  cd build
-
-  DESTDIR="${pkgdir}" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/pantheon-terminal-vte0.52.patch b/pantheon-terminal-vte0.52.patch
deleted file mode 100644
index 36a7d5962dad..000000000000
--- a/pantheon-terminal-vte0.52.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/src/Widgets/TerminalWidget.vala b/src/Widgets/TerminalWidget.vala
-index 5dc4a9a..cb009c0 100644
---- a/src/Widgets/TerminalWidget.vala
-+++ b/src/Widgets/TerminalWidget.vala
-@@ -436,15 +436,15 @@ namespace PantheonTerminal {
-                     }
- 
-                     string uris_s = string.joinv ("", uris);
--                    this.feed_child (uris_s, uris_s.length);
-+                    this.feed_child ( (char[])uris_s.data );
- 
-                     break;
-                 case DropTargets.STRING:
-                 case DropTargets.TEXT:
--                    var data = selection_data.get_text ();
-+                    var data = selection_data.get_text();
- 
-                     if (data != null) {
--                        this.feed_child (data, data.length);
-+                        this.feed_child ( (char[])data.data );
-                     }
- 
-                     break;