summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNBonaparte2018-06-04 10:31:28 -0700
committerNBonaparte2018-06-04 10:46:17 -0700
commit644b90191a7f24c87bdab4e0cf214bc1cbae277b (patch)
tree56ecba5c6fbc9b318f02f13c767214acbc6fe21b
parent04158af2674f0ab8829dc72685f22b63a2b6ab69 (diff)
downloadaur-644b90191a7f24c87bdab4e0cf214bc1cbae277b.tar.gz
cherry-pick gcc7 fix
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD3
-rw-r--r--gcc7.patch13
3 files changed, 16 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index aa66098746c..2e7f2ec1f8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = yabar
pkgdesc = A modern and lightweight status bar for X window managers
pkgver = 0.4.0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/geommer/yabar
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 286e2ef98ea..45e8a50b7d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=yabar
pkgver=0.4.0
-pkgrel=2
+pkgrel=3
pkgdesc="A modern and lightweight status bar for X window managers"
arch=('i686' 'x86_64')
url="https://github.com/geommer/yabar"
@@ -14,6 +14,7 @@ md5sums=('ac4d4de6e4ac59d59bdb19d738ee4306')
build() {
cd $pkgname-$pkgver
sed -ie "s/\$(VERSION)/$pkgver/" Makefile
+ patch -p1 < ../../gcc7.patch
make
}
diff --git a/gcc7.patch b/gcc7.patch
new file mode 100644
index 00000000000..1a9a62e76e8
--- /dev/null
+++ b/gcc7.patch
@@ -0,0 +1,13 @@
+diff --git a/src/intern_blks/ya_intern.c b/src/intern_blks/ya_intern.c
+index 187e62d..2e6095f 100644
+--- a/src/intern_blks/ya_intern.c
++++ b/src/intern_blks/ya_intern.c
+@@ -116,7 +116,7 @@ int ya_fscanf(char* fpath, ya_block_t *blk, char *fmt, ...) {
+ return ret;
+ }
+
+-inline void ya_setup_prefix_suffix(ya_block_t *blk, size_t * prflen, size_t *suflen, char **startstr) {
++__attribute__ ((gnu_inline)) inline void ya_setup_prefix_suffix(ya_block_t *blk, size_t * prflen, size_t *suflen, char **startstr) {
+ if(blk->internal->prefix) {
+ *prflen = strlen(blk->internal->prefix);
+ if(*prflen) {