From 4cda5029a1150c1a72e21a947fcf178304ed8df9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:09:14 +0200 Subject: [PATCH 01/10] gnome-terminal: update to 3.8.4. --- srcpkgs/gnome-terminal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 7f3feb0f382..3bab10e580d 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.8.3 +version=3.8.4 revision=1 build_style=gnu-configure hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" -checksum=b368a9220f9a50fecdb57ba8ce7008c65e3c236bc700325a45ecb806f3ab4651 +checksum=5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22 gnome-terminal_package() { depends="desktop-file-utils" From d396342fcad9162ee9a3a12025ef83a37620a0bc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:11:35 +0200 Subject: [PATCH 02/10] gtksourceview: update to 3.8.2. --- srcpkgs/gtksourceview/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index f1e8d7d9e71..51070d20918 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -1,6 +1,6 @@ # Template file for 'gtksourceview' pkgname=gtksourceview -version=3.8.1 +version=3.8.2 revision=1 build_style=gnu-configure configure_args="--disable-static" @@ -11,14 +11,15 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.8/${pkgname}-${version}.tar.xz" -checksum=f08005bfa5ecb71b05c4046d585ae072f084c90003b281a3ced8d882b96fe3cd +checksum=1c2a01f1e04e3c8c9f09ff22f34f73f17b0e4e7ff0d83b2996c209bd02a6501b gtksourceview-devel_package() { depends="gtk+3-devel libxml2-devel ${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" vmove "usr/share/gir*" vmove usr/share/gtk-doc } From f5e6aa0c73cc0494dd4e0efa32c980fd8c5afb0c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:13:12 +0200 Subject: [PATCH 03/10] vte3: update to 0.34.7. --- srcpkgs/vte3/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 79d8fcebfbc..7d2ebcd835e 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template build file for 'vte3'. pkgname=vte3 -version=0.34.6 +version=0.34.7 revision=1 wrksrc=vte-${version} build_style=gnu-configure @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/vte/0.34/vte-$version.tar.xz" -checksum=e1dcc30ec8df24ec5f7f100ca231ab96da0e560b0bfddec3617c962943d8f3f3 +checksum=187e49cca574f548d04ceea701e95a1531ff9dd9cd1953ce6455824720dab932 long_desc=" Terminal widget with improved font, internationalization and accessibility support for the GNOME 3 desktop." @@ -24,6 +24,7 @@ vte3-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" vmove usr/share/gir-1.0 vmove usr/share/gtk-doc } From 8f777a5250f90a47d9e13cf3656cb646f24ad502 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:19:55 +0200 Subject: [PATCH 04/10] gettext: update to 0.18.3. --- srcpkgs/gettext/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index c6a9c69c272..a15260b2b07 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -1,6 +1,6 @@ # Template build file for 'gettext'. pkgname=gettext -version=0.18.2.1 +version=0.18.3 revision=1 build_style=gnu-configure configure_args="--disable-java --disable-native-java --disable-csharp @@ -12,14 +12,15 @@ maintainer="Juan RP " homepage="http://www.gnu.org/software/gettext/" license="GPL-3" distfiles="http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=32fc1b85fc249ab81bfc37b942a992c7a34f2e1101357ce0d4591341b9164a0a +checksum=36f3c1043df803565d4977c1efbd41e1ec0f0301acf5f057984406c34cb9f948 gettext-devel_package() { depends="gettext-libs>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/share/doc/gettext vmove usr/share/aclocal vmove usr/share/gettext @@ -27,9 +28,9 @@ gettext-devel_package() { } gettext-libs_package() { - short_desc="${short_desc} - shared libraries" + short_desc+=" - shared libraries" pkg_install() { - vmove "usr/lib/*.so*" + vmove "usr/lib/*.so.*" } } From 64c27c6b5f5e34c161d34916e23da422bf2339f8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:20:27 +0200 Subject: [PATCH 05/10] chroot-gettext: update to 0.18.3. --- srcpkgs/chroot-gettext/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chroot-gettext/template b/srcpkgs/chroot-gettext/template index b48ec246609..d82e0e1c48d 100644 --- a/srcpkgs/chroot-gettext/template +++ b/srcpkgs/chroot-gettext/template @@ -1,6 +1,6 @@ # Template build file for 'chroot-gettext'. pkgname=chroot-gettext -version=0.18.2 +version=0.18.3 revision=1 wrksrc="gettext-${version}" build_wrksrc=gettext-tools @@ -16,7 +16,7 @@ license="GPL-3" short_desc="Internationalized Message Handling tools -- for xbps-src use" maintainer="Juan RP " distfiles="http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz" -checksum=516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c +checksum=36f3c1043df803565d4977c1efbd41e1ec0f0301acf5f057984406c34cb9f948 bootstrap=yes From 17f6ad8b9c9319c46820941e7fbae3f73ddcb20a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:32:20 +0200 Subject: [PATCH 06/10] gettext: update sonames and fix cross build. --- common/shlibs | 4 ++-- srcpkgs/gettext/template | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 37a2b455e2c..5349cfbbb85 100644 --- a/common/shlibs +++ b/common/shlibs @@ -166,8 +166,8 @@ libdb-4.8.so libdb-4.8.24_1 libdb_cxx-4.8.so libdb-cxx-4.8.24_1 libgdbm.so.4 gdbm-1.10_1_1 libgdbm_compat.so.4 gdbm-1.10_1_1 -libgettextsrc-0.18.2.so gettext-libs-0.18.2_1 -libgettextlib-0.18.2.so gettext-libs-0.18.2_1 +libgettextsrc-0.18.3.so gettext-libs-0.18.3_1 +libgettextlib-0.18.3.so gettext-libs-0.18.3_1 libgettextpo.so.0 gettext-libs-0.17_1 libattr.so.1 attr-2.4.43_1 libacl.so.1 acl-2.2.47_1 diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index a15260b2b07..53762388e6c 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -14,6 +14,13 @@ license="GPL-3" distfiles="http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${version}.tar.gz" checksum=36f3c1043df803565d4977c1efbd41e1ec0f0301acf5f057984406c34cb9f948 +if [ "$CROSS_BUILD" ]; then + hostmakedepends="automake libtool" + pre_configure() { + autoreconf -fi + } +fi + gettext-devel_package() { depends="gettext-libs>=${version}" short_desc+=" - development files" From 07f739f3fc06c94192cba7763211aa3956bcac07 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:38:55 +0200 Subject: [PATCH 07/10] gpgme: update to 1.4.2. --- srcpkgs/gpgme/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 5248a9b8f18..df13d7de14a 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -1,6 +1,6 @@ # Template file for 'gpgme' pkgname=gpgme -version=1.4.1 +version=1.4.2 revision=1 build_style=gnu-configure configure_args="--enable-fd-passing --disable-gpgsm-test --disable-gpgconf-test --disable-g13-test" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="GPL-2" homepage="http://www.gnupg.org/related_software/gpgme/" distfiles="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-$version.tar.bz2" -checksum=7ab63e5086ebe4cfe7f78face1bb059a7a60da586b1e5c6a77bedcd6d04019b8 +checksum=2c4f2bf71e53e6fb7badf07801d4248777566a621c8c2339c02c289731df6856 long_desc=" GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, @@ -35,6 +35,7 @@ gpgme-devel_package() { vmove usr/bin vmove usr/include vmove usr/share + vmove "usr/lib/*.so" } } From 7b2a24bc432df69fb8b3029029e410e5611e6423 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:40:58 +0200 Subject: [PATCH 08/10] gpgme: set --with-gpg to fix cross build. --- srcpkgs/gpgme/template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index df13d7de14a..3e39280302c 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -3,7 +3,8 @@ pkgname=gpgme version=1.4.2 revision=1 build_style=gnu-configure -configure_args="--enable-fd-passing --disable-gpgsm-test --disable-gpgconf-test --disable-g13-test" +configure_args="--enable-fd-passing --disable-gpgsm-test + --disable-gpgconf-test --disable-g13-test --with-gpg=/usr/bin/gpg" hostmakedepends="gnupg" makedepends="libgpg-error-devel libassuan-devel" short_desc="GnuPG Made Easy" @@ -24,10 +25,6 @@ long_desc=" instead. This way bug fixes or improvements can be done at a central place and every application benefits from this." -if [ "$CROSS_BUILD" ]; then - makedepends+=" gnupg" -fi - gpgme-devel_package() { depends="libgpg-error-devel libassuan-devel gpgme>=${version}" short_desc+=" - development files" From 027f65d78a9c4cb8f92f9e5667e845751980aa6e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:45:27 +0200 Subject: [PATCH 09/10] gpgme: fix cross build. --- srcpkgs/gpgme/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 3e39280302c..3dcffc0e262 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -3,8 +3,9 @@ pkgname=gpgme version=1.4.2 revision=1 build_style=gnu-configure -configure_args="--enable-fd-passing --disable-gpgsm-test - --disable-gpgconf-test --disable-g13-test --with-gpg=/usr/bin/gpg" +configure_args="--enable-fd-passing --with-gpg=/usr/bin/gpg + --with-gpgsm=/usr/bin/gpgsm --with-gpgconf=/usr/bin/gpgconf + --with-g13=/usr/bin/g13" hostmakedepends="gnupg" makedepends="libgpg-error-devel libassuan-devel" short_desc="GnuPG Made Easy" From 71a9f4b9055058749e4b7227e77a294b6c868dc8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 8 Jul 2013 15:49:31 +0200 Subject: [PATCH 10/10] gpgme: fix cross build (v2). --- srcpkgs/gpgme/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 3dcffc0e262..aa4ae0b65ab 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -26,6 +26,11 @@ long_desc=" instead. This way bug fixes or improvements can be done at a central place and every application benefits from this." +if [ "$CROSS_BUILD" ]; then + configure_args+=" --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr + --with-libassuan-prefix=$XBPS_CROSS_BASE/usr" +fi + gpgme-devel_package() { depends="libgpg-error-devel libassuan-devel gpgme>=${version}" short_desc+=" - development files"