diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-16 09:57:05 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-16 09:57:05 +0000 |
| commit | 324831e86fc345017fffa2fa8c1495cb05e12daf (patch) | |
| tree | b9c5fed7f3d448a51bebfbdb60077c92fb5862ab | |
| parent | 5d164ec4c1104d8400a95521a8f7378c949d95d8 (diff) | |
| download | aports-324831e86fc345017fffa2fa8c1495cb05e12daf.tar.bz2 aports-324831e86fc345017fffa2fa8c1495cb05e12daf.tar.xz | |
main/awesome: move from testing and upgrade to 3.4.13
| -rw-r--r-- | main/awesome/APKBUILD (renamed from testing/awesome/APKBUILD) | 17 | ||||
| -rw-r--r-- | main/awesome/iconv.patch (renamed from testing/awesome/iconv.patch) | 0 | ||||
| -rw-r--r-- | testing/awesome/awesome-glib-fix.patch | 13 |
3 files changed, 9 insertions, 21 deletions
diff --git a/testing/awesome/APKBUILD b/main/awesome/APKBUILD index a11eae19aa..02f08d24e7 100644 --- a/testing/awesome/APKBUILD +++ b/main/awesome/APKBUILD @@ -1,8 +1,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=awesome -pkgver=3.4.11 -pkgrel=1 +pkgver=3.4.13 +pkgrel=0 pkgdesc="lua-configurable window manager framework" url="http://awesome.naquadah.org/" arch="all" @@ -11,11 +11,10 @@ depends="imagemagick" makedepends="lua-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev - dbus-dev" + dbus-dev lua-doc" install="" subpackages="$pkgname-doc" -source="http://awesome.naquadah.org/download/${pkgname}-${pkgver}.tar.bz2 - awesome-glib-fix.patch +source="http://awesome.naquadah.org/download/${pkgname}-${pkgver}.tar.xz iconv.patch " @@ -34,7 +33,10 @@ prepare() { build() { mkdir "$_builddir" cd "$_builddir" - cmake -DPREFIX=/usr -DSYSCONFDIR=/etc "$_srcdir" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc \ + -DCMAKE_BUILD_TYPE=Release \ + "$_srcdir" make || return 1 } @@ -43,6 +45,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="cca11acbe9252121b10e969fce66e641 awesome-3.4.11.tar.bz2 -7a3384627fe90b3a8f21d426b9026c9b awesome-glib-fix.patch +md5sums="8449fde51c08ca69fe4c5bb831b3c618 awesome-3.4.13.tar.xz 78d1ab9037c1dae956ffe239083596a2 iconv.patch" diff --git a/testing/awesome/iconv.patch b/main/awesome/iconv.patch index 3f60300249..3f60300249 100644 --- a/testing/awesome/iconv.patch +++ b/main/awesome/iconv.patch diff --git a/testing/awesome/awesome-glib-fix.patch b/testing/awesome/awesome-glib-fix.patch deleted file mode 100644 index e3e6fcf948..0000000000 --- a/testing/awesome/awesome-glib-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ ->=glib-2.31 build fix - ---- a/spawn.c -+++ b/spawn.c -@@ -24,7 +24,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include <glib/gspawn.h> -+#include <glib.h> - - #include "spawn.h" - #include "screen.h" |