From 1744d31c17d6e55320027fd74f99306ed20bfce1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 May 2013 08:08:13 +0200 Subject: [PATCH 1/5] gnome-disk-utility: update to 3.8.2. --- srcpkgs/gnome-disk-utility/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 7838f746431..9182aa37bb3 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -1,7 +1,7 @@ # Template file for 'gnome-disk-utility' pkgname=gnome-disk-utility -version=3.8.0 -revision=2 +version=3.8.2 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gnome-doc-utils" @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e +checksum=6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3 gnome-disk-utility_package() { depends="hicolor-icon-theme desktop-file-utils parted" From a65167e26e7f5f43b6ce04657462cc5d4fd8568e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 May 2013 08:14:46 +0200 Subject: [PATCH 2/5] procps-ng: update to 3.3.8. --- srcpkgs/procps-ng/files/sysctl.conf | 3 --- srcpkgs/procps-ng/template | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/procps-ng/files/sysctl.conf b/srcpkgs/procps-ng/files/sysctl.conf index 4695cdd9235..fae2c608203 100644 --- a/srcpkgs/procps-ng/files/sysctl.conf +++ b/srcpkgs/procps-ng/files/sysctl.conf @@ -36,6 +36,3 @@ net.ipv6.conf.all.forwarding = 0 # Reboot 600 seconds after kernel panic or oops. #kernel.panic_on_oops = 1 #kernel.panic = 600 - -# Disable SysRq key to avoid console security issues. -kernel.sysrq = 0 diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index 840c9bf3a0a..e0bf239ac3e 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -1,6 +1,6 @@ # Template file for 'procps-ng' pkgname=procps-ng -version=3.3.7 +version=3.3.8 revision=1 short_desc="Utilities for monitoring your system and its processes" maintainer="Juan RP " @@ -62,7 +62,6 @@ procps-ng_package() { provides="procps-${version}" conflicts="coreutils<8.21_3" pkg_install() { - vmove etc - vmove usr + vmove all } } From df7d815726551eba71eb77e106bccb989ccba7e4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 May 2013 08:21:47 +0200 Subject: [PATCH 3/5] flac: update to 1.3.0. --- .../flac/patches/autogen_skip_configure.patch | 9 -------- srcpkgs/flac/patches/configure-fixes.patch | 22 ------------------- .../patches/flac-1.2.1-gcc-4.3-includes.patch | 10 --------- srcpkgs/flac/template | 17 +++++++------- 4 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/flac/patches/autogen_skip_configure.patch delete mode 100644 srcpkgs/flac/patches/configure-fixes.patch delete mode 100644 srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch diff --git a/srcpkgs/flac/patches/autogen_skip_configure.patch b/srcpkgs/flac/patches/autogen_skip_configure.patch deleted file mode 100644 index 3f2ecc134b3..00000000000 --- a/srcpkgs/flac/patches/autogen_skip_configure.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- autogen.sh.orig 2013-03-21 17:21:18.281013739 +0100 -+++ autogen.sh 2013-03-21 17:21:23.960040231 +0100 -@@ -124,6 +124,3 @@ echo " $AUTOMAKE --add-missing $AUTOMAK - $AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 - echo " autoconf" - autoconf || exit 1 -- --cd $olddir --$srcdir/configure --enable-maintainer-mode "$@" && echo diff --git a/srcpkgs/flac/patches/configure-fixes.patch b/srcpkgs/flac/patches/configure-fixes.patch deleted file mode 100644 index 217546a70a1..00000000000 --- a/srcpkgs/flac/patches/configure-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.in.orig 2013-03-21 17:43:57.269562981 +0100 -+++ configure.in 2013-03-21 17:44:23.956687605 +0100 -@@ -44,7 +44,7 @@ AC_FUNC_FSEEKO - AC_CHECK_SIZEOF(void*,0) - - #@@@ new name is AC_CONFIG_HEADERS --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_C_BIGENDIAN - -@@ -256,8 +256,8 @@ AH_TEMPLATE(FLAC__HAS_OGG, [define if yo - fi - - dnl check for i18n(internationalization); these are from libiconv/gettext --AM_ICONV --AM_LANGINFO_CODESET -+AC_DEFINE([HAVE_ICONV], [], [Whether we have libiconv available]) LIBICONV="" -+AC_SUBST(LIBICONV) - - AC_CHECK_PROGS(DOCBOOK_TO_MAN, docbook-to-man docbook2man) - AM_CONDITIONAL(FLaC__HAS_DOCBOOK_TO_MAN, test -n "$DOCBOOK_TO_MAN") diff --git a/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch b/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 5798204c00a..00000000000 --- a/srcpkgs/flac/patches/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include - #include -+#include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 23b59ae35d7..8f3fc7297e2 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -1,7 +1,7 @@ # Template file for 'flac' pkgname=flac -version=1.2.1 -revision=6 +version=1.3.0 +revision=1 build_style=gnu-configure configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin" if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then @@ -12,8 +12,8 @@ short_desc="Free Lossless Audio Codec" maintainer="Juan RP " homepage="http://flac.sourceforge.net/" license="BSD, GPL" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf +distfiles="http://downloads.xiph.org/releases/flac/flac-${version}.tar.xz" +checksum=fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc long_desc=" FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is similar to MP3, but lossless. The FLAC project consists of: @@ -26,15 +26,15 @@ long_desc=" works)" if [ "$CROSS_BUILD" ]; then - hostmakedepends="automake pkg-config" + hostmakedepends="automake pkg-config libtool" pre_configure() { - ./autogen.sh + autoreconf -fi } configure_args+=" --with-ogg=$XBPS_CROSS_BASE" fi libflac_package() { - short_desc="${short_desc} - shared libraries" + short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/*.so*" } @@ -42,11 +42,10 @@ libflac_package() { libflac-devel_package() { depends="libstdc++-devel libogg-devel libflac>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" vmove usr/share/aclocal vmove usr/share/doc } From be2d7196ba30e9a91dc523e04c29edc799228d46 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 May 2013 08:37:39 +0200 Subject: [PATCH 4/5] pcre: update to 8.33. --- srcpkgs/pcre/template | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template index f0f98b3d4b0..705efcef3c7 100644 --- a/srcpkgs/pcre/template +++ b/srcpkgs/pcre/template @@ -1,19 +1,19 @@ # Template file for 'pcre' pkgname=pcre -version=8.32 -revision=2 +version=8.33 +revision=1 build_style=gnu-configure configure_args="--enable-utf8 --enable-unicode-properties --with-pic --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf ---enable-pcretest-libreadline --disable-pcregrep-jit --enable-jit ---disable-static" +--enable-pcretest-libreadline --enable-jit --disable-static" makedepends="zlib-devel bzip2-devel readline-devel" short_desc="Perl Compatible Regular Expressions" maintainer="Juan RP " homepage="http://www.pcre.org/" license="BSD" -distfiles="${SOURCEFORGE_SITE}/pcre/pcre-$version.tar.bz2" -checksum=a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55 +#distfiles="${SOURCEFORGE_SITE}/pcre/pcre-$version.tar.gz" +distfiles="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2" +checksum=c603957a4966811c04af5f6048c71cfb4966ec93312d7b3118116ed9f3bc0478 if [ "$CROSS_BUILD" ]; then hostmakedepends="libtool automake" @@ -22,19 +22,16 @@ if [ "$CROSS_BUILD" ]; then } fi - libpcrecpp_package() { short_desc+=" - C++ shared libraries" - pkg_install() { vmove "usr/lib/libpcrecpp.so*" } } libpcre_package() { - short_desc="${short_desc} - shared libraries" + short_desc+=" - shared libraries" replaces="pcre<8.11" - pkg_install() { vmove "usr/lib/libpcre.so*" vmove "usr/lib/libpcreposix.so*" @@ -43,8 +40,7 @@ libpcre_package() { pcre-devel_package() { depends="zlib-devel bzip2-devel libpcre>=${version} libpcrecpp>=${version}" - short_desc="${short_desc} (development files)" - + short_desci+=" - development files" pkg_install() { vmove usr/bin/pcre-config vmove usr/include From 6937c0c552a7c13a03bf0073f9d3ca5b572db916 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 May 2013 10:55:51 +0200 Subject: [PATCH 5/5] lm-sensors: update to 3.3.4. --- srcpkgs/lm-sensors/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm-sensors/template index 8b1ec938fba..5ef89bf9c8d 100644 --- a/srcpkgs/lm-sensors/template +++ b/srcpkgs/lm-sensors/template @@ -1,7 +1,7 @@ # Template file for 'lm-sensors' pkgname=lm-sensors -version=3.3.3 -revision=2 +version=3.3.4 +revision=1 wrksrc="lm_sensors-${version}" hostmakedepends="which flex perl" short_desc="Utilities to read temperature/voltage/fan sensors" @@ -9,7 +9,7 @@ maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://www.lm-sensors.org/" distfiles="http://dl.lm-sensors.org/$pkgname/releases/lm_sensors-$version.tar.bz2" -checksum=ecc91ba3d918e96fb7d5eb9acce978af803b130e0b33b08d5ea05b2bfca84955 +checksum=b4608610cb5de4b24e3fe1ae357712e8633a8a929bbb42df5eecc4ccee6ba76d long_desc=" $pkgname provides most complete hardware health monitoring support for Linux, in the form of kernel drivers and a user-space library" @@ -42,7 +42,6 @@ libsensors-devel_package() { lm-sensors_package() { conf_files="/etc/sensors3.conf" pkg_install() { - vmove etc - vmove usr + vmove all } }