diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2022-05-03 18:22:42 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2022-05-03 19:28:55 -0400 |
| commit | 42021ed7172a082412ecae09859c5057239d5440 (patch) | |
| tree | beb6cd8a4fdad20c3c169cff99429f7452d4edfb | |
| parent | ae9b0724c4c405d99b1d92a55220dff9b1972621 (diff) | |
| download | abslibre-42021ed7172a082412ecae09859c5057239d5440.tar.gz abslibre-42021ed7172a082412ecae09859c5057239d5440.tar.bz2 abslibre-42021ed7172a082412ecae09859c5057239d5440.zip | |
[conky]: rebuild with arch bugfix
| -rw-r--r-- | libre/conky/PKGBUILD | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/libre/conky/PKGBUILD b/libre/conky/PKGBUILD index db7e6149f..6ab0be1b7 100644 --- a/libre/conky/PKGBUILD +++ b/libre/conky/PKGBUILD @@ -3,27 +3,27 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> -# Maintainer: Freemor <freemor2freemor.ca> +# Maintainer: Freemor <freemor@freemor.ca> # Contributor: bill-auger <bill-auger@programmer.net> -# parabola changes and rational: +# parabola changes and rationale: # - arch package depends on blacklisted 'libxnvctrl' # - arch package is built from VCS -# - FTBS with glibc 2.34 - add 'MAINTAINER_MODE=OFF' cmake option -# https://github.com/brndnmtthws/conky/issues/1179 +# - arch package does not install BSD license +# - arch package does not declare all upstream licenses pkgname=conky pkgver=1.12.2 -pkgrel=1 +pkgrel=2 pkgrel+=.parabola1 pkgdesc='Lightweight system monitor for X' url='https://github.com/brndnmtthws/conky' -license=('BSD' 'GPL3' 'ISC' 'LGPL') +license=('Boost' 'BSD' 'GPL3' 'ISC' 'LGPL') arch=('x86_64') arch+=('armv7h' 'i686') -makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git') +makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git' 'catch2') depends=( 'glibc' 'glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2' 'libxml2' 'libpulse' 'libxnvctrl' 'systemd-libs' 'ncurses' 'curl' @@ -37,32 +37,39 @@ validpgpkeys=( 'EB2E847572A71BE20F59AFBEB49ABB7270D9D4FD' # Brenden Matthews ) -mksource() { +prepare() { cd ${pkgname}-${pkgver} +# NOTE: The Boost license applies only to 'catch2', +# which is deleted (temporarily) as a bug fix. +# If this becomes a permanent treatment, +# 'Boost' can be deleted from the license' array. +# Unbundle catch2 to fix build with glibc 2.35 + rm -r tests/catch2 + ln -s /usr/include/catch2 tests # prepare missing ISC license - head -n 17 src/prss.h > LICENSE.ISC + head -n 17 src/prss.h > LICENSE.ISC } build() { cd ${pkgname}-${pkgver} - cmake \ + cmake \ -B build \ - -D CMAKE_BUILD_TYPE=Release \ - -D MAINTAINER_MODE=ON \ - -D BUILD_DOCS=ON \ - -D BUILD_WLAN=ON \ - -D BUILD_XDBE=ON \ - -D BUILD_XSHAPE=ON \ - -D BUILD_IMLIB2=ON \ - -D BUILD_CURL=ON \ - -D BUILD_RSS=ON \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \ + -D MAINTAINER_MODE=ON \ + -D BUILD_DOCS=ON \ + -D BUILD_WLAN=ON \ + -D BUILD_XDBE=ON \ + -D BUILD_XSHAPE=ON \ + -D BUILD_IMLIB2=ON \ + -D BUILD_CURL=ON \ + -D BUILD_RSS=ON \ -D BUILD_NVIDIA=OFF \ - -D BUILD_WEATHER_METAR=ON \ - -D BUILD_PULSEAUDIO=ON \ - -D BUILD_JOURNAL=ON \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D MAINTAINER_MODE=OFF \ + -D BUILD_WEATHER_METAR=ON \ + -D BUILD_PULSEAUDIO=ON \ + -D BUILD_JOURNAL=ON \ + -D CMAKE_INSTALL_PREFIX=/usr \ -Wno-dev \ -S . |