diff options
| author | Solomon Choina | 2020-08-13 22:26:47 -0400 |
|---|---|---|
| committer | Solomon Choina | 2020-08-13 22:26:47 -0400 |
| commit | 93034a52ec2cd7df9e082f805677e663f394f01b (patch) | |
| tree | 2b029b4c665c04c5e9d677024fe48446ee446377 | |
| parent | bb9d2d214b00eb33053f23852f08fffd7f31a7ec (diff) | |
| download | aur-93034a52ec2cd7df9e082f805677e663f394f01b.tar.gz | |
nicer pkgver and libhandy patching
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0001-libhandy1-support.patch | 29 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
3 files changed, 42 insertions, 7 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Fri Aug 24 01:14:07 UTC 2018 pkgbase = pantheon-terminal-git pkgdesc = The Pantheon Terminal Emulator - pkgver = r1769.11e3666 + pkgver = 5.5.2.r80.g0bb980e0 pkgrel = 1 url = https://github.com/elementary/terminal arch = x86_64 @@ -23,7 +21,9 @@ pkgbase = pantheon-terminal-git provides = pantheon-terminal conflicts = pantheon-terminal source = pantheon-terminal::git+https://github.com/elementary/terminal.git + source = 0001-libhandy1-support.patch sha256sums = SKIP + sha256sums = ff08cdcbc3a16f99e65814abb8d933b43a75161250e0140792cf27f476e1741c pkgname = pantheon-terminal-git diff --git a/0001-libhandy1-support.patch b/0001-libhandy1-support.patch new file mode 100644 index 000000000000..be6e66735f4f --- /dev/null +++ b/0001-libhandy1-support.patch @@ -0,0 +1,29 @@ +From 2e84de40e5ae35fc82bc4977a4d53e0db832320f Mon Sep 17 00:00:00 2001 +From: Solomon Choina <shlomochoina@gmail.com> +Date: Thu, 13 Aug 2020 22:24:10 -0400 +Subject: [PATCH] libhandy1 support + +--- + meson.build | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/meson.build b/meson.build +index 7613a09f..45ff230b 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,6 +18,12 @@ add_global_arguments([ + language:'c' + ) + ++add_project_arguments ( ++ # FIXME Drop once we depend on libhandy 1.0. ++ '--disable-since-check', ++ language: 'vala' ++) ++ + vte_dep = dependency('vte-2.91') + + libpcre2_dep = [] +-- +2.28.0 + @@ -1,7 +1,7 @@ # Maintainer: Maxime Gauduin <alucryd@archlinux.org> pkgname=pantheon-terminal-git -pkgver=r1769.11e3666 +pkgver=5.5.2.r80.g0bb980e0 pkgrel=1 pkgdesc='The Pantheon Terminal Emulator' arch=('x86_64') @@ -13,15 +13,21 @@ depends=('glib2' 'gtk3' 'libnotify' 'pango' 'vte3' makedepends=('appstream' 'git' 'granite-git' 'intltool' 'meson' 'vala') provides=('pantheon-terminal') conflicts=('pantheon-terminal') -source=('pantheon-terminal::git+https://github.com/elementary/terminal.git') -sha256sums=('SKIP') +source=('pantheon-terminal::git+https://github.com/elementary/terminal.git' + '0001-libhandy1-support.patch') +sha256sums=('SKIP' + 'ff08cdcbc3a16f99e65814abb8d933b43a75161250e0140792cf27f476e1741c') pkgver() { cd pantheon-terminal - echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } +prepare(){ + cd pantheon-terminal + patch -Np1 -i ../0001-libhandy1-support.patch +} build() { arch-meson pantheon-terminal build \ -Dubuntu-bionic-patched-vte='false' |