From 3a59febf72d65266fdcaabab24e246673b8090b4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Jul 2013 05:57:46 +0200 Subject: [PATCH 1/5] rust: update to 0.7. --- srcpkgs/rust/template | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 8240e2294b9..553f742e1f8 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -1,33 +1,34 @@ # Template file for 'rust' pkgname=rust -version=0.6 +version=0.7 revision=1 -makedepends="which pkg-config perl curl python chrpath" +build_style=configure +configure_args="--prefix=/usr --disable-docs --build-triple=$(gcc -dumpmachine)" +hostmakedepends="which pkg-config perl curl python chrpath" short_desc="A safe, concurrent, practical language" maintainer="pancake " homepage="http://www.rust-lang.org/" license="MIT, Apache-2.0" distfiles="http://static.rust-lang.org/dist/rust-${version}.tar.gz" -checksum=e11cb529a1e20f27d99033181a9e0e131817136b46d2742f0fa1afa1210053e5 +checksum=0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0 -disable_debug=yes - -do_configure() { - ./configure --prefix=${DESTDIR}/usr --disable-docs -} - -do_build() { - make ${makejobs} -} - -do_install() { - make install +post_install() { vinstall COPYRIGHT 644 usr/share/licenses/rust LICENSE - # Set proper rpath on binaries. - for f in rust rustdoc rustc rusti rustpkg; do - chrpath -r /usr/lib/rustc/${XBPS_MACHINE}-unknown-linux-gnu/lib ${DESTDIR}/usr/bin/${f} - done + vmkdir usr/share/vim/vimfiles + cp -a src/etc/vim ${DESTDIR}/usr/share/vim/vimfiles + find ${DESTDIR}/usr/share/vim -type f -exec chmod 644 {} + + find ${DESTDIR}/usr/share/vim -type d -exec chmod 755 {} + + + vinstall src/etc/zsh/_rust 644 usr/share/zsh/site-functions + vinstall src/etc/kate/rust.xml 644 usr/share/apps/katepart/syntax + vinstall src/etc/gedit/share/mime/packages/rust.xml 644 usr/share/mime/packages + vinstall src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang \ + 644 usr/share/gtksourceview-3.0/language-specs + + # https://github.com/mozilla/rust/issues/5219 + cd ${DESTDIR}/usr + chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so } rust_package() { From 28ea86f23ef8781e40234c37eab91b3766844c27 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Jul 2013 06:04:57 +0200 Subject: [PATCH 2/5] rust: fix x86 build; disable cross builds for now. --- srcpkgs/rust/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 553f742e1f8..78b9d16c52f 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -3,7 +3,7 @@ pkgname=rust version=0.7 revision=1 build_style=configure -configure_args="--prefix=/usr --disable-docs --build-triple=$(gcc -dumpmachine)" +configure_args="--prefix=/usr --disable-docs" hostmakedepends="which pkg-config perl curl python chrpath" short_desc="A safe, concurrent, practical language" maintainer="pancake " @@ -12,6 +12,14 @@ license="MIT, Apache-2.0" distfiles="http://static.rust-lang.org/dist/rust-${version}.tar.gz" checksum=0b88b8a4489382e0a69214eaab88e2e7c316ec33c164af0d3b53630b17590df0 +if [ "$XBPS_MACHINE" = "x86_64" ]; then + configure_args+=" --build-triple=$(gcc -dumpmachine)" +fi + +if [ "$CROSS_BUILD" ]; then + msg_error "$pkgver cannot be cross compiled currently.\n" +fi + post_install() { vinstall COPYRIGHT 644 usr/share/licenses/rust LICENSE From c93275006cae4c314bb06ebe506fd1e978d900da Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Jul 2013 07:33:57 +0200 Subject: [PATCH 3/5] libpwquality: update to 1.2.2. --- srcpkgs/libpwquality/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 22c27039524..eee347020a4 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,7 +1,7 @@ # Template file for 'libpwquality' pkgname=libpwquality -version=1.2.0 -revision=3 +version=1.2.2 +revision=1 build_style=gnu-configure configure_args="--disable-static --enable-pam --disable-python-bindings --with-securedir=/usr/lib/security" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="https://fedorahosted.org/libpwquality/" license="GPL-2" distfiles="https://fedorahosted.org/releases/l/i/$pkgname/$pkgname-$version.tar.bz2" -checksum=32cfbe302ade7e7271ed44bcae8aae3b6b55ca56ff642c4ece1752ffaa8003ee +checksum=9689627283b43d20ca74ca822404ee486242e3e528fa95bf7016d37ff46e0696 if [ "$CROSS_BUILD" ]; then hostmakedepends="libtool automake gettext-devel" @@ -22,17 +22,17 @@ fi libpwquality-devel_package() { depends="${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" } } libpwquality_package() { conf_files="/etc/security/pwquality.conf" pkg_install() { - vmove etc - vmove usr + vmove all } } From 415649be9ebb2626df0d5d233f3e9eba73df0404 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Jul 2013 10:54:28 +0200 Subject: [PATCH 4/5] xbps-git: revbump to pick up latest xbps-rindex commit. --- srcpkgs/xbps-git/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index aa85885093e..e557d3df470 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -1,7 +1,7 @@ # Template file for 'xbps-git' pkgname=xbps-git version=20130704 -revision=1 +revision=2 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests" short_desc="The XBPS package system (development branch)" From 060aaa8ebd441af2ffc07f93cd561ee32900e840 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 4 Jul 2013 11:07:29 +0200 Subject: [PATCH 5/5] xbps-git: revbump++ to pick up 6d87bf04d07a3796. --- srcpkgs/xbps-git/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index e557d3df470..cd81271cf1e 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -1,7 +1,7 @@ # Template file for 'xbps-git' pkgname=xbps-git version=20130704 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug --enable-tests" short_desc="The XBPS package system (development branch)"