Merge branch 'releases/1.0'

This commit is contained in:
Daniel Eklöf 2019-05-04 14:51:36 +02:00
commit 88d4bf5b66
3 changed files with 9 additions and 8 deletions

View file

@ -1,5 +1,5 @@
pkgname=f00bar pkgname=f00bar
pkgver=0.9.0.r203.g22989d6 pkgver=1.0.0
pkgrel=1 pkgrel=1
pkgdesc="Simplistic and highly configurable status panel for X and Wayland" pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
arch=('x86_64') arch=('x86_64')
@ -18,9 +18,9 @@ depends=(
optdepends=('xcb-util-errors: better X error messages') optdepends=('xcb-util-errors: better X error messages')
source=() source=()
pkgver() { # pkgver() {
git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' # git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
} # }
build() { build() {
meson --buildtype=minsize --prefix=/usr -Dbackend-x11=enabled -Dbackend-wayland=enabled ../ meson --buildtype=minsize --prefix=/usr -Dbackend-x11=enabled -Dbackend-wayland=enabled ../

View file

@ -1,5 +1,5 @@
pkgname=f00bar-wayland pkgname=f00bar-wayland
pkgver=0.9.0.r203.g22989d6 pkgver=1.0.0
pkgrel=1 pkgrel=1
pkgdesc="Simplistic and highly configurable status panel for Wayland" pkgdesc="Simplistic and highly configurable status panel for Wayland"
arch=('x86_64') arch=('x86_64')
@ -18,9 +18,9 @@ depends=(
'libmpdclient') 'libmpdclient')
source=() source=()
pkgver() { # pkgver() {
git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' # git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
} # }
build() { build() {
meson --buildtype=minsize --prefix=/usr -Dbackend-x11=disabled -Dbackend-wayland=enabled ../ meson --buildtype=minsize --prefix=/usr -Dbackend-x11=disabled -Dbackend-wayland=enabled ../

View file

@ -1,5 +1,6 @@
project('f00bar', 'c', project('f00bar', 'c',
license: 'MIT', license: 'MIT',
version: '1.0.0',
default_options: ['c_std=c11', 'warning_level=1', 'werror=true']) default_options: ['c_std=c11', 'warning_level=1', 'werror=true'])
add_project_arguments( add_project_arguments(