From dacf1f99e929babdb8e0892ee7b8cccc851969d8 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 13:05:35 +0200 Subject: [PATCH 1/6] slock: fix crossbuilds fatal errors --- srcpkgs/slock/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template index c5e69151c01..7ab2115b6c7 100644 --- a/srcpkgs/slock/template +++ b/srcpkgs/slock/template @@ -1,9 +1,9 @@ # Template file for 'slock' pkgname=slock version=1.1 -revision=1 +revision=2 hostmakedepends="pkg-config" -makedepends="libXext-devel" +makedepends="libX11-devel libXext-devel" short_desc="A simple screen locker for X" maintainer="Juan RP " license="MIT" @@ -16,11 +16,15 @@ long_desc=" day when they are out with friends or fetching some food from the local pub." do_build() { - make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 ${makejobs} + 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 + make PREFIX=/usr DESTDIR=$DESTDIR install + vinstall LICENSE 644 usr/share/licenses/$pkgname } slock_package() { From 536ed7851fdd526eba2f05a91bf0828f1431ff05 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 17:20:22 +0200 Subject: [PATCH 2/6] New package: mcwm-20130209 --- srcpkgs/mcwm/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/mcwm/template diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template new file mode 100644 index 00000000000..c95e6b3528b --- /dev/null +++ b/srcpkgs/mcwm/template @@ -0,0 +1,28 @@ +# Template file for 'mcwm' +pkgname=mcwm +version=20130209-2 +revision=1 +build_style=gnu-makefile +makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" +short_desc="A minimalist stacking X window manager based on XCB" +maintainer="Ypnose " +license="ISC" +homepage="http://hack.org/mc/projects/mcwm/" +distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-$version.tar.bz2" +checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be + +do_build() { + sed -i 's/man\/man1/share\/man\/man1/g' Makefile + make ${makejobs} +} + +do_install() { + make PREFIX=/usr DESTDIR=${DESTDIR} install + vinstall LICENSE 644 usr/share/licenses/${pkgname} +} + +mcwm_package() { + pkg_install() { + vmove usr + } +} From 2b1a0615b91ee6c1b6bdc2a8a1add0b13db9b899 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Sun, 23 Jun 2013 19:16:15 +0200 Subject: [PATCH 3/6] mcwm: little fix CC --- srcpkgs/mcwm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index c95e6b3528b..33af5b522f1 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -13,7 +13,7 @@ checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be do_build() { sed -i 's/man\/man1/share\/man\/man1/g' Makefile - make ${makejobs} + make CC=$CC ${makejobs} } do_install() { From fa3e3de21ec746b0fbb4b00f40045d58fe95d535 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Jun 2013 10:31:42 +0200 Subject: [PATCH 4/6] libgsf: update to 1.14.27. --- srcpkgs/libgsf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template index fa392124afd..03beab1640e 100644 --- a/srcpkgs/libgsf/template +++ b/srcpkgs/libgsf/template @@ -1,7 +1,7 @@ # Template build file for 'libgsf'. pkgname=libgsf -version=1.14.26 -revision=2 +version=1.14.27 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-introspection=yes" hostmakedepends="pkg-config intltool gobject-introspection" @@ -11,11 +11,11 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.gnome.org/" distfiles="${GNOME_SITE}/libgsf/1.14/$pkgname-$version.tar.xz" -checksum=8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5 +checksum=a012e63bedd6003cea9ae8fa78944516b50c334767163b88527c6b2332bc3e6c libgsf-devel_package() { depends="libglib-devel libxml2-devel libgsf>=${version}" - short_desc+=" -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig From 272174964c3499d598f14d4fffb0808488f4c6e6 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Jun 2013 10:34:54 +0200 Subject: [PATCH 5/6] virtualbox-ose: update to 4.2.14. --- srcpkgs/virtualbox-ose/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index 30fee21c9ab..a35e37e49af 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -1,8 +1,8 @@ # Template file for 'virtualbox-ose' pkgname=virtualbox-ose -_vbox_distver=4.2.12 +_vbox_distver=4.2.14 version=${_vbox_distver} -revision=3 +revision=1 wrksrc="VirtualBox-${version}" patch_args="-Np1" short_desc="General-purpose full virtualizer for x86 hardware" @@ -10,7 +10,7 @@ maintainer="Juan RP " homepage="http://virtualbox.org" license="GPL-2, MPL-1.1, CDDL" distfiles="http://download.virtualbox.org/virtualbox/$version/VirtualBox-$version.tar.bz2" -checksum=eb65ecac94f63d6292a967d39cb5e28326404c10d0e8c2c50399eedb59c17ee6 +checksum=f8f6dc19612f3c84a5c857b8e5c452b8db2cf3c8c52a678b6a00e5dd5831130d only_for_archs="i686 x86_64" @@ -126,7 +126,7 @@ virtualbox-ose-dkms_package() { virtualbox-ose-guest_package() { systemd_services="vboxservice.service on" - depends="virtualbox-ose-guest-dkms-${version}_${revision}" + depends="xserver-abi-video-13_1 virtualbox-ose-guest-dkms-${version}_${revision}" short_desc+=" - guest utilities" pkg_install() { From c618944b5790d062bbc5c47da515db91a1c2c43e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 24 Jun 2013 10:58:48 +0200 Subject: [PATCH 6/6] mcwm: version must not contain dashes; install files to DESTDIR. --- srcpkgs/mcwm/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index 33af5b522f1..8e10e08d113 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -1,14 +1,17 @@ # Template file for 'mcwm' pkgname=mcwm -version=20130209-2 -revision=1 +_distver=20130209 +_patchver=2 +wrksrc=${pkgname}-${_distver}-${_patchver} +version=${_distver}.${_patchver} +revision=2 build_style=gnu-makefile makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" short_desc="A minimalist stacking X window manager based on XCB" maintainer="Ypnose " license="ISC" homepage="http://hack.org/mc/projects/mcwm/" -distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-$version.tar.bz2" +distfiles="http://hack.org/mc/hacks/$pkgname/$pkgname-${_distver}-${_patchver}.tar.bz2" checksum=2d2f9ced77bc6f90cb9fbdbf790eed97f3be28caefb0de496ac28813aed606be do_build() { @@ -17,7 +20,9 @@ do_build() { } do_install() { - make PREFIX=/usr DESTDIR=${DESTDIR} install + vmkdir usr/bin + vmkdir usr/share/man/man1 + make PREFIX=${DESTDIR}/usr install vinstall LICENSE 644 usr/share/licenses/${pkgname} }