From 2935a4f007a249f112f0583799e1056e34c9eca6 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 2 Dec 2018 15:30:37 -0500 Subject: [PATCH 1/3] PKGBUILDs: Clean up spacing One dependency per line seems to be the way to go here. --- .archlinux/PKGBUILDs/tari-bspwm/PKGBUILD | 3 +- .archlinux/PKGBUILDs/tari-core/PKGBUILD | 5 +-- .archlinux/PKGBUILDs/tari-dev/PKGBUILD | 39 ++++++++++++++++++------ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD b/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD index c224d89..23b9371 100644 --- a/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD +++ b/.archlinux/PKGBUILDs/tari-bspwm/PKGBUILD @@ -1,10 +1,9 @@ pkgname=tari-bspwm pkgver=0.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Packages I use specifically for bspwm." arch=('any') depends=(bspwm sxhkd - dunst compton) diff --git a/.archlinux/PKGBUILDs/tari-core/PKGBUILD b/.archlinux/PKGBUILDs/tari-core/PKGBUILD index c41c5a8..85e6e13 100644 --- a/.archlinux/PKGBUILDs/tari-core/PKGBUILD +++ b/.archlinux/PKGBUILDs/tari-core/PKGBUILD @@ -1,23 +1,20 @@ pkgname=tari-core pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Core packages for my Arch setup." arch=('any') depends=(stow python-pywal rng-tools - fd exa ripgrep fzf jq - zip unzip p7zip unrar - borg openssh openvpn) diff --git a/.archlinux/PKGBUILDs/tari-dev/PKGBUILD b/.archlinux/PKGBUILDs/tari-dev/PKGBUILD index b6e17b5..61aaacf 100644 --- a/.archlinux/PKGBUILDs/tari-dev/PKGBUILD +++ b/.archlinux/PKGBUILDs/tari-dev/PKGBUILD @@ -3,17 +3,38 @@ _httpiever='1.0.0' pkgname=tari-dev pkgver=0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Packages I use relating to development and other things." arch=('any') -depends=(vim neovim httpie exa fd ripgrep - fzf jq rsync git tig diff-so-fancy - tmux openssh nodejs npm yarn crystal - shards llvm rustup ansible docker docker-compose - bind-tools pacman-contrib nginx-mainline - jdk-openjdk texlive-core texlive-science - texlive-humanities texlive-fontsextra texlive-latexextra - texlive-bibtexextra minted) +depends=(vim + neovim + httpie + rsync + git + tig + diff-so-fancy + tmux + nodejs + npm + yarn + crystal + shards + llvm + rustup + ansible + docker + docker-compose + bind-tools + pacman-contrib + nginx-mainline + jdk-openjdk + texlive-core + texlive-science + texlive-humanities + texlive-fontsextra + texlive-latexextra + texlive-bibtexextra + minted) source=("https://raw.githubusercontent.com/junegunn/vim-plug/${_vimplugver}/plug.vim" "https://raw.githubusercontent.com/jakubroztocil/httpie/${_httpiever}/extras/httpie-completion.fish") sha256sums=('01a138fc0ed99ef2678ba004613acbf8b0c51a85a8d2a1b658ef87af722e98e1' From 83598a092c0fb4cab0932fda20e34ea10212ee98 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 2 Dec 2018 15:33:14 -0500 Subject: [PATCH 2/3] meta: Remove tari-util I initially created tari-util as a package to be pre-built and installed in the installation media. This was a while ago, and now that I know exactly how the installation process and PKGBUILDs work, all the previous issues I had with makepkg turned out to not be issues at all. --- .archlinux/PKGBUILDs/tari-util/PKGBUILD | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .archlinux/PKGBUILDs/tari-util/PKGBUILD diff --git a/.archlinux/PKGBUILDs/tari-util/PKGBUILD b/.archlinux/PKGBUILDs/tari-util/PKGBUILD deleted file mode 100644 index b4aee92..0000000 --- a/.archlinux/PKGBUILDs/tari-util/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -_yayver='8.1173.0' -_yay="yay_${_yayver}_x86_64" - -pkgname=tari-util -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Misc utility packages." -arch=('any') -provides=('yay') -conflicts=('yay') -source=("https://github.com/Jguer/yay/releases/download/v${_yayver}/${_yay}.tar.gz") -sha256sums=('e0f28c6be3c4322901438f324aed1f49ab593a8d4ed92279b1dda51381c51d6b') - -package() { - _yayout="${srcdir}/${_yay}" - - install -Dm 755 "$_yayout"/yay "$pkgdir"/usr/bin/yay - install -Dm 644 "$_yayout"/yay.8 "$pkgdir"/usr/share/man/man8/yay.8 - install -Dm 644 "$_yayout"/bash "$pkgdir"/usr/share/bash-completion/completions/yay - install -Dm 644 "$_yayout"/zsh "$pkgdir"/usr/share/zsh/site-functions/_yay - install -Dm 644 "$_yayout"/fish "$pkgdir"/usr/share/fish/vendor_completions.d/yay.fish -} From 69e2a52bf2a08bd62a468ca5091d0cf85cd7980d Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sun, 2 Dec 2018 16:17:55 -0500 Subject: [PATCH 3/3] tari-web: Remove unnecessary dependencies Since fonts and other desktop-related packages are now handled by tari-desktop, this is no longer necessary. Note that I also created tari-web before I figured out HiDPI support for Qt and GTK applications. --- .archlinux/PKGBUILDs/tari-web/PKGBUILD | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.archlinux/PKGBUILDs/tari-web/PKGBUILD b/.archlinux/PKGBUILDs/tari-web/PKGBUILD index 8987171..7b863f2 100644 --- a/.archlinux/PKGBUILDs/tari-web/PKGBUILD +++ b/.archlinux/PKGBUILDs/tari-web/PKGBUILD @@ -5,12 +5,11 @@ _https='https_everywhere-2018.9.19-an+fx.xpi' _arcdark='arc_dark_theme-2018.9.24-fx.xpi' pkgname=tari-web -pkgver=0.1.0 +pkgver=0.2.0 pkgrel=1 pkgdesc="Web browser settings." arch=('any') -depends=(ttf-dejavu ttf-liberation noto-fonts noto-fonts-cjk - noto-fonts-emoji adapta-gtk-theme firefox chromium) +depends=(firefox chromium) source=('local-settings.js' 'mozilla.cfg' "https://addons.cdn.mozilla.net/user-media/addons/607454/${_ubo}" "https://addons.cdn.mozilla.net/user-media/addons/808538/${_vimium}"