From 6d1995f3b94a2f190d8968a72f9a116d3f3b7e7b Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 13:53:41 +0200 Subject: [PATCH 1/3] dwm: fix compilation error with Xinerama. --- srcpkgs/dwm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template index 98d947d7f5b..4fa968cf398 100644 --- a/srcpkgs/dwm/template +++ b/srcpkgs/dwm/template @@ -21,7 +21,7 @@ do_build() { sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk - make CC=$CC INCS="-I." LIBS="-lX11" + make CC=$CC INCS="-I." LIBS="-lX11 -lXinerama" } do_install() { From 66615bfe916b8309d36113b61fd90bc49c3ad165 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 16:37:38 +0200 Subject: [PATCH 2/3] slock: new package added 1.1 --- srcpkgs/slock_/template | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 srcpkgs/slock_/template diff --git a/srcpkgs/slock_/template b/srcpkgs/slock_/template new file mode 100644 index 00000000000..bedc77bd0c0 --- /dev/null +++ b/srcpkgs/slock_/template @@ -0,0 +1,29 @@ +# Template file for 'slock' +pkgname=slock +version=1.1 +revision=1 +makedepends="libX11-devel libXext-devel" +short_desc="Simple X display locker" +maintainer="Ypnose " +license="MIT" +homepage="http://tools.suckless.org/slock" +distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" +checksum=e04ae5070c646c78251780d386e14d16fd100367e877dd5cf616dc7aedd0e0e4 + +do_build() { + sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk + sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk + sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk + make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs} +} + +do_install() { + make PREFIX=/usr DESTDIR=$DESTDIR install + vinstall LICENSE 644 usr/share/licenses/$pkgname +} + +slock_package() { + pkg_install() { + vmove usr + } +} From a6984700d17efcae597ec39b705772ba77d3a0c3 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sat, 22 Jun 2013 18:57:35 +0200 Subject: [PATCH 3/3] dev: revbump for previous fix --- srcpkgs/dwm/template | 2 +- srcpkgs/slock_/template | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 srcpkgs/slock_/template diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template index 4fa968cf398..3c17a425634 100644 --- a/srcpkgs/dwm/template +++ b/srcpkgs/dwm/template @@ -1,7 +1,7 @@ # Template file for 'dwm' pkgname=dwm version=6.0 -revision=1 +revision=2 homepage="http://dwm.suckless.org" distfiles="http://dl.suckless.org/dwm/dwm-$version.tar.gz" makedepends="libX11-devel libXinerama-devel" diff --git a/srcpkgs/slock_/template b/srcpkgs/slock_/template deleted file mode 100644 index bedc77bd0c0..00000000000 --- a/srcpkgs/slock_/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'slock' -pkgname=slock -version=1.1 -revision=1 -makedepends="libX11-devel libXext-devel" -short_desc="Simple X display locker" -maintainer="Ypnose " -license="MIT" -homepage="http://tools.suckless.org/slock" -distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" -checksum=e04ae5070c646c78251780d386e14d16fd100367e877dd5cf616dc7aedd0e0e4 - -do_build() { - sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk - sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk - sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk - make CC=$CC INCS="-I." LIBS="-lX11 -lXext -lcrypt" ${makejobs} -} - -do_install() { - make PREFIX=/usr DESTDIR=$DESTDIR install - vinstall LICENSE 644 usr/share/licenses/$pkgname -} - -slock_package() { - pkg_install() { - vmove usr - } -}