update readme and get rid of awesome pkgbuild: the changes are upstream. Also make terminus-font-patched more like terminus-font for ease of updates to follow

This commit is contained in:
Von Random 2016-02-10 13:29:04 +03:00
parent a4e80a313e
commit 327d86ffc6
4 changed files with 12 additions and 84 deletions

View file

@ -6,9 +6,13 @@ Seems appropriate, right?
So far the list: So far the list:
* **dropbox-dummy** - to provide the dependency for dropbox-cli and keep
dropbox binaries in dotdir.
* **nvidia** - a set of packages for 358.16, which does not fuck up Civ5
and a bunch of unity games unlike the following 361.16.
* **rxvt-unicode** - to provide support for configurating 256 colors via * **rxvt-unicode** - to provide support for configurating 256 colors via
xresources as well as pixbuf support. The package name is deliberately xresources as well as pixbuf support. The package name is deliberately
kept since I want to keep updated on new releases and revisions. The kept since I want to keep updated on new releases and revisions. The
plan is to stick as close to archlinux upstream package as possible. plan is to stick as close to archlinux upstream package as possible.
* **dropbox-dummy** - to provide the dependency for dropbox-cli and keep * **terminus-font-patched*** - just Terminus with my preferred set of
dropbox binaries in dotdir. patches applied.

View file

@ -1,49 +0,0 @@
# $Id: PKGBUILD 133580 2015-05-16 16:23:32Z anatolik $
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sébastien Luttringer
# Contributor: xduugu
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: Vesa Kaihlavirta
pkgname=awesome
pkgver=3.5.6
pkgrel=2
pkgdesc='Highly configurable framework window manager'
arch=('i686' 'x86_64')
url='http://awesome.naquadah.org/'
license=('GPL2')
depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'lua' 'lua-lgi'
'pango' 'startup-notification' 'xcb-util-cursor' 'xcb-util-keysyms'
'xcb-util-wm' 'xorg-xmessage')
makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
optdepends=('rlwrap: readline support for awesome-client'
'dex: autostart your desktop files'
'vicious: widgets for the Awesome window manager')
provides=('notification-daemon')
backup=('etc/xdg/awesome/rc.lua')
source=($url/download/$pkgname-$pkgver.tar.xz)
md5sums=('db1c31de752ab8e5f7aaa338718202af')
prepare() {
mkdir -p build
patch -p0 < ../vte-hints-fix.diff
}
build() {
cd build
cmake ../$pkgname-$pkgver \
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc \
-DLUA_LIBRARY=/usr/lib/liblua.so.5.3
make
}
package() {
cd build
make DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/$pkgname-$pkgver/awesome.desktop \
"$pkgdir/usr/share/xsessions/awesome.desktop"
}

View file

@ -1,29 +0,0 @@
--- awesome-3.5.6/objects/client.c.orig 2015-11-06 13:31:38.767875330 +0300
+++ awesome-3.5.6/objects/client.c 2015-11-06 13:32:34.933876384 +0300
@@ -623,7 +623,7 @@
/* Size hints are applied to the window without any decoration */
client_remove_titlebar_geometry(c, &geometry);
- if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
{
basew = c->size_hints.base_width;
baseh = c->size_hints.base_height;
@@ -642,7 +642,7 @@
minw = c->size_hints.min_width;
minh = c->size_hints.min_height;
}
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
{
/* min size is substituted with base size if not specified */
minw = c->size_hints.base_width;
@@ -2017,7 +2017,7 @@
if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE)
u_or_p = "user_size";
- else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+ else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
u_or_p = "program_size";
if(u_or_p)

View file

@ -1,3 +1,4 @@
#
# Original maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Original maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Original maintainer: Alexander Rødseth <rodseth@gmail.com> # Original maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Kristoffer Fossgård <kfs1@online.no> # Contributor: Kristoffer Fossgård <kfs1@online.no>
@ -15,7 +16,7 @@
pkgname=terminus-font-patched pkgname=terminus-font-patched
_pkgname=terminus-font _pkgname=terminus-font
pkgver=4.40 pkgver=4.40
pkgrel=1 pkgrel=2
pkgdesc='Monospace bitmap font (for X11 and console)' pkgdesc='Monospace bitmap font (for X11 and console)'
arch=('any') arch=('any')
url='http://sourceforge.net/projects/terminus-font/' url='http://sourceforge.net/projects/terminus-font/'
@ -24,7 +25,6 @@ makedepends=('xorg-bdftopcf' 'fontconfig' 'xorg-mkfontscale' 'xorg-mkfontdir')
optdepends=('xorg-fonts-alias') optdepends=('xorg-fonts-alias')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils') depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
install='terminus-font-patched.install' install='terminus-font-patched.install'
backup=('etc/fonts/conf.d/75-yes-terminus.conf')
source=("http://downloads.sourceforge.net/project/$_pkgname/$_pkgname-$pkgver/$_pkgname-$pkgver.tar.gz") source=("http://downloads.sourceforge.net/project/$_pkgname/$_pkgname-$pkgver/$_pkgname-$pkgver.tar.gz")
provides=($_pkgname) provides=($_pkgname)
conflicts=($_pkgname) conflicts=($_pkgname)
@ -41,21 +41,23 @@ build() {
patch -p0 -i alt/ij1.diff patch -p0 -i alt/ij1.diff
patch -p0 -i alt/ll2.diff patch -p0 -i alt/ll2.diff
patch -p0 -i alt/td1.diff patch -p0 -i alt/td1.diff
./configure --prefix=/usr \ ./configure --prefix=/usr --x11dir=/usr/share/fonts/misc \
--x11dir=/usr/share/fonts/misc \
--psfdir=/usr/share/kbd/consolefonts --psfdir=/usr/share/kbd/consolefonts
make make
} }
package() { package() {
make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/$_pkgname-$pkgver/75-yes-terminus.conf" \ install -Dm644 "$srcdir/$_pkgname-$pkgver/75-yes-terminus.conf" \
"$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf" "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
install -Dm644 "$srcdir/$_pkgname-$pkgver/OFL.TXT" \ install -Dm644 "$srcdir/$_pkgname-$pkgver/OFL.TXT" \
"$pkgdir/usr/share/licenses/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
install -d "$pkgdir/etc/fonts/conf.d" install -d "$pkgdir/etc/fonts/conf.d"
cd "$pkgdir/etc/fonts/conf.d" cd "$pkgdir/etc/fonts/conf.d"
ln -s ../conf.avail/75-yes-terminus.conf . ln -s ../conf.avail/75-yes-terminus.conf .
} }
# getver: terminus-font.sf.net
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et: