[arch-commits] Commit in pantheon-terminal/trunk (2 files)

[Maxime Gauduin]

    Date: Thursday, June 21, 2018 @ 08:02:28
  Author: alucryd
Revision: 344257

upgpkg: pantheon-terminal 0.5-1

Added:
  pantheon-terminal/trunk/pantheon-terminal-vte0.52.patch
Modified:
  pantheon-terminal/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   34 ++++++++++++++--------------------
 pantheon-terminal-vte0.52.patch |   23 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-21 08:02:04 UTC (rev 344256)
+++ PKGBUILD	2018-06-21 08:02:28 UTC (rev 344257)
@@ -2,40 +2,34 @@
 # Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgname=pantheon-terminal
-pkgver=0.4.3
-pkgrel=2
+pkgver=0.5
+pkgrel=1
 pkgdesc='The Pantheon Terminal Emulator'
 arch=('x86_64')
 url='https://github.com/elementary/terminal'
 license=('GPL3')
-depends=('glib2' 'glibc' 'gtk3' 'pango' 'vte3'
+depends=('appstream' 'glib2' 'gtk3' 'pango' 'vte3'
          'libgranite.so')
-makedepends=('cmake' 'intltool' 'vala')
+makedepends=('git' 'intltool' 'meson' 'vala')
 groups=('pantheon')
-source=("pantheon-terminal-${pkgver}.tar.gz::https://github.com/elementary/terminal/archive/${pkgver}.tar.gz")
-sha256sums=('b529d367b809e0d344795a68278bc430b5bcd9160103cd920928eaf0cdeece55')
+source=("pantheon-terminal::git+https://github.com/elementary/terminal.git#tag=${pkgver}"
+        'pantheon-terminal-vte0.52.patch')
+sha256sums=('SKIP'
+            'af30fd1c7685ed46a708b988a8844ec1bdb30ef2727a05160dfa0384b5bb76e1')
 
 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
-
-  cmake ../terminal-${pkgver} \
-    -DCMAKE_BUILD_TYPE='Release' \
-    -DCMAKE_INSTALL_PREFIX='/usr' \
-    -DGSETTINGS_COMPILE='OFF'
-  make
+  arch-meson pantheon-terminal build
+  ninja -C build
 }
 
 package() {
-  cd build
-
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
 }
 
 # vim: ts=2 sw=2 et:

Added: pantheon-terminal-vte0.52.patch
===================================================================
--- pantheon-terminal-vte0.52.patch	                        (rev 0)
+++ pantheon-terminal-vte0.52.patch	2018-06-21 08:02:28 UTC (rev 344257)
@@ -0,0 +1,23 @@
+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;