diff options
61 files changed, 415 insertions, 2438 deletions
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD index 77beb3d7f..404a1bf98 100644 --- a/community/balsa/PKGBUILD +++ b/community/balsa/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 76471 2012-09-18 19:07:49Z jlichtblau $ +# $Id: PKGBUILD 88630 2013-04-20 17:58:41Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=balsa -pkgver=2.4.12 +pkgver=2.5.0 pkgrel=1 pkgdesc="An e-mail client for GNOME" arch=('i686' 'x86_64') url='http://pawsa.fedorapeople.org/balsa/' license=('GPL') -depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils') +depends=('gmime' 'webkitgtk3' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview3' 'gtkspell3' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('perlxml' 'gnome-doc-utils' 'intltool') install=$pkgname.install source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4') +sha256sums=('67eaddbc33a079a74b65bf5f71ef163573f7d4a6f29ed6dca2ad6811d95519b4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/balsa/gmime26.patch b/community/balsa/gmime26.patch deleted file mode 100644 index fe4e6a9fa..000000000 --- a/community/balsa/gmime26.patch +++ /dev/null @@ -1,1372 +0,0 @@ -From 393d0077495cb750ee47bab6ec44a60906a95179 Mon Sep 17 00:00:00 2001 -From: Peter Bloomfield <PeterBloomfield@bellsouth.net> -Date: Mon, 28 Nov 2011 03:00:55 +0000 -Subject: Build with GMime 2.6.0 - - * configure.in: check for GMime >= 2.5.7 - * libbalsa/gmime-application-pkcs7.c - (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), - (g_mime_application_pkcs7_encrypt), - (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. - * libbalsa/gmime-application-pkcs7.h: ditto. - * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), - (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), - (g_mime_gpgme_digest_id): ditto. - * libbalsa/gmime-gpgme-context.h: ditto. - * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), - (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): - ditto. - * libbalsa/gmime-part-rfc2440.h: ditto. - * libbalsa/rfc3156.c (password_request_func), - (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), - (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. ---- -diff --git a/ChangeLog b/ChangeLog -index bd95e68..d5c62f5 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,25 @@ -+2011-11-27 Peter Bloomfield -+ -+ Build with GMime 2.6.0 -+ -+ * configure.in: check for GMime >= 2.5.7 -+ * libbalsa/gmime-application-pkcs7.c -+ (g_mime_application_pkcs7_sign), (g_mime_application_pkcs7_verify), -+ (g_mime_application_pkcs7_encrypt), -+ (g_mime_application_pkcs7_decrypt): build with GMime >= 2.5.7. -+ * libbalsa/gmime-application-pkcs7.h: ditto. -+ * libbalsa/gmime-gpgme-context.c (g_mime_gpgme_context_get_type), -+ (g_mime_gpgme_context_class_init), (g_mime_gpgme_context_finalize), -+ (g_mime_gpgme_digest_id): ditto. -+ * libbalsa/gmime-gpgme-context.h: ditto. -+ * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_sign_encrypt), -+ (g_mime_part_rfc2440_verify), (g_mime_part_rfc2440_decrypt): -+ ditto. -+ * libbalsa/gmime-part-rfc2440.h: ditto. -+ * libbalsa/rfc3156.c (password_request_func), -+ (libbalsa_sign_mime_object), (libbalsa_encrypt_mime_object), -+ (libbalsa_body_check_signature), (libbalsa_body_decrypt): ditto. -+ - 2011-11-22 Pawel Salek - - * NEWS, configure.in: release balsa-2.4.11 -diff --git a/configure.in b/configure.in -index 4a8320e..64d99f3 100644 ---- a/configure.in -+++ b/configure.in -@@ -307,7 +307,12 @@ fi - case "$with_gmime" in - 2.4) ;; - 2.6) AC_DEFINE([HAVE_GMIME_2_6], [1], -- [Defined to build with GMime version 2.5 or 2.6]) ;; -+ [Defined to build with GMime version 2.5 or 2.6]) -+ if $PKG_CONFIG --atleast-version=2.5.7 gmime-2.6; then -+ AC_DEFINE([HAVE_GMIME_2_5_7], [1], -+ [Defined when GMime version is at least 2.5.7]) -+ fi -+ ;; - *) AC_MSG_ERROR([unknown GMime version $with_gmime]) ;; - esac - -diff --git a/libbalsa/gmime-application-pkcs7.c b/libbalsa/gmime-application-pkcs7.c -index 12f4f8f..63b8087 100644 ---- a/libbalsa/gmime-application-pkcs7.c -+++ b/libbalsa/gmime-application-pkcs7.c -@@ -96,8 +96,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter, *from_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->sign_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* Prepare all the parts for signing... */ -@@ -127,7 +133,14 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - sig_data_stream = g_mime_stream_mem_new (); - - /* get the signed content */ -- if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_sign (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, sig_data_stream, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_sign -+ (ctx, userid, GMIME_CIPHER_HASH_DEFAULT, filtered_stream, -+ sig_data_stream, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (filtered_stream); - g_object_unref (sig_data_stream); - g_object_unref (stream); -@@ -168,9 +181,15 @@ g_mime_application_pkcs7_sign (GMimePart *pkcs7, GMimeObject *content, - * decrypting it again. In this case, validity is undefined. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** list, -+ GMimeCryptoContext * ctx, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -181,8 +200,14 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -208,9 +233,16 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - g_object_unref(crlf_filter); - - /* get the cleartext */ -+#ifndef HAVE_GMIME_2_5_7 - *validity = g_mime_cipher_context_verify(ctx, GMIME_CIPHER_HASH_DEFAULT, - ciphertext, filtered_stream, err); -- if (!*validity) { -+ if (!*validity) -+#else /* HAVE_GMIME_2_5_7 */ -+ *list = g_mime_crypto_context_verify(ctx, GMIME_CIPHER_ALGO_DEFAULT, -+ ciphertext, filtered_stream, err); -+ if (!*list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -@@ -248,7 +280,12 @@ g_mime_application_pkcs7_verify(GMimePart * pkcs7, - */ - int - g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx, GPtrArray *recipients, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx, -+ GPtrArray *recipients, -+#endif /* HAVE_GMIME_2_5_7 */ - GError **err) - { - GMimeDataWrapper *wrapper; -@@ -257,8 +294,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - GMimeFilter *crlf_filter; - - g_return_val_if_fail (GMIME_IS_PART (pkcs7), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail (GMIME_IS_CIPHER_CONTEXT (ctx), -1); - g_return_val_if_fail (ctx->encrypt_protocol != NULL, -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail (GMIME_IS_CRYPTO_CONTEXT (ctx), -1); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail (GMIME_IS_OBJECT (content), -1); - - /* get the cleartext */ -@@ -279,7 +322,15 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - - /* encrypt the content stream */ - ciphertext = g_mime_stream_mem_new (); -- if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_encrypt (ctx, FALSE, NULL, recipients, stream, ciphertext, err) == -1) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_encrypt -+ (ctx, FALSE, NULL, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, ciphertext, err) == -1) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref (ciphertext); - g_object_unref (stream); - return -1; -@@ -313,8 +364,14 @@ g_mime_application_pkcs7_encrypt (GMimePart *pkcs7, GMimeObject *content, - * err with more information about the reason. - */ - GMimeObject * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - GError **err) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, -+ GMimeCryptoContext *ctx, -+ GError **err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeObject *decrypted; - GMimeDataWrapper *wrapper; -@@ -325,8 +382,14 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - const char *smime_type; - - g_return_val_if_fail(GMIME_IS_PART(pkcs7), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_IS_CIPHER_CONTEXT(ctx), NULL); - g_return_val_if_fail(ctx->encrypt_protocol != NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(GMIME_IS_CRYPTO_CONTEXT(ctx), NULL); -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol(ctx) -+ != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some sanity checks */ - smime_type = -@@ -353,7 +416,13 @@ g_mime_application_pkcs7_decrypt (GMimePart *pkcs7, GMimeCipherContext *ctx, - g_object_unref(crlf_filter); - - /* get the cleartext */ -- if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (g_mime_cipher_context_decrypt(ctx, ciphertext, filtered_stream, err) == NULL) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_crypto_context_decrypt -+ (ctx, ciphertext, filtered_stream, err) == NULL) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(filtered_stream); - g_object_unref(ciphertext); - g_object_unref(stream); -diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h -index 03fa401..6678ff5 100644 ---- a/libbalsa/gmime-application-pkcs7.h -+++ b/libbalsa/gmime-application-pkcs7.h -@@ -28,7 +28,11 @@ extern "C" { - #endif /* __cplusplus */ - - #include <gmime/gmime-part.h> -+#ifndef HAVE_GMIME_2_5_7 - #include <gmime/gmime-cipher-context.h> -+#else /* HAVE_GMIME_2_5_7 */ -+#include <gmime/gmime-crypto-context.h> -+#endif /* HAVE_GMIME_2_5_7 */ - - #undef HAS_APPLICATION_PKCS7_MIME_SIGNED_SUPPORT - -@@ -39,21 +43,40 @@ extern "C" { - * Balsa always encodes S/MIME signed stuff as multipart/signed. */ - int g_mime_application_pkcs7_sign(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - const char *userid, GError ** err); - #endif - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, - GMimeSignatureValidity ** validity, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_verify(GMimePart * pkcs7, -+ GMimeSignatureList ** validity, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - int g_mime_application_pkcs7_encrypt(GMimePart * pkcs7, - GMimeObject * content, -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * ctx, -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext * ctx, -+#endif /* HAVE_GMIME_2_5_7 */ - GPtrArray * recipients, GError ** err); - -+#ifndef HAVE_GMIME_2_5_7 - GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, - GMimeCipherContext * ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeObject *g_mime_application_pkcs7_decrypt(GMimePart * pkcs7, -+ GMimeCryptoContext * ctx, GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/gmime-gpgme-context.c b/libbalsa/gmime-gpgme-context.c -index 24b140b..0c56f94 100644 ---- a/libbalsa/gmime-gpgme-context.c -+++ b/libbalsa/gmime-gpgme-context.c -@@ -27,6 +27,9 @@ - #include <unistd.h> - #include <glib.h> - #include <gmime/gmime.h> -+#ifdef HAVE_GMIME_2_5_7 -+#include <gmime/gmime-certificate.h> -+#endif /* HAVE_GMIME_2_5_7 */ - #include <gpgme.h> - #include <time.h> - #include <glib/gi18n.h> -@@ -44,6 +47,7 @@ static gboolean g_mime_gpgme_context_check_protocol(GMimeGpgmeContextClass - protocol, - GError ** error); - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash g_mime_gpgme_hash_id(GMimeCipherContext * ctx, - const char *hash); - -@@ -70,6 +74,46 @@ static GMimeSignatureValidity *g_mime_gpgme_decrypt(GMimeCipherContext * - GMimeStream * istream, - GMimeStream * ostream, - GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, -+ const char *hash); -+ -+static const char *g_mime_gpgme_digest_name(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash); -+ -+static const char -+ *g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context); -+static const char -+ *g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context); -+ -+static int g_mime_gpgme_sign(GMimeCryptoContext * ctx, -+ const char * userid, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+ -+static GMimeSignatureList *g_mime_gpgme_verify(GMimeCryptoContext * ctx, -+ GMimeDigestAlgo hash, -+ GMimeStream * istream, -+ GMimeStream * sigstream, -+ GError ** err); -+ -+static int g_mime_gpgme_encrypt(GMimeCryptoContext * ctx, -+ gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, -+ GMimeStream * ostream, GError ** err); -+ -+static GMimeDecryptResult *g_mime_gpgme_decrypt(GMimeCryptoContext * ctx, -+ GMimeStream * istream, -+ GMimeStream * ostream, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - - /* internal passphrase callback */ -@@ -102,7 +146,11 @@ static void g_set_error_from_gpgme(GError ** error, gpgme_error_t gpgme_err, - const gchar * message); - - -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherContextClass *parent_class = NULL; -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeCryptoContextClass *parent_class = NULL; -+#endif /* HAVE_GMIME_2_5_7 */ - - - GType -@@ -124,8 +172,13 @@ g_mime_gpgme_context_get_type(void) - }; - - type = -+#ifndef HAVE_GMIME_2_5_7 - g_type_register_static(GMIME_TYPE_CIPHER_CONTEXT, - "GMimeGpgmeContext", &info, 0); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_type_register_static(GMIME_TYPE_CRYPTO_CONTEXT, -+ "GMimeGpgmeContext", &info, 0); -+#endif /* HAVE_GMIME_2_5_7 */ - } - - return type; -@@ -136,19 +189,39 @@ static void - g_mime_gpgme_context_class_init(GMimeGpgmeContextClass * klass) - { - GObjectClass *object_class = G_OBJECT_CLASS(klass); -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass *cipher_class = - GMIME_CIPHER_CONTEXT_CLASS(klass); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass *crypto_class = -+ GMIME_CRYPTO_CONTEXT_CLASS(klass); -+#endif /* HAVE_GMIME_2_5_7 */ - - parent_class = g_type_class_ref(G_TYPE_OBJECT); - - object_class->finalize = g_mime_gpgme_context_finalize; - -+#ifndef HAVE_GMIME_2_5_7 - cipher_class->hash_id = g_mime_gpgme_hash_id; - cipher_class->hash_name = g_mime_gpgme_hash_name; - cipher_class->sign = g_mime_gpgme_sign; - cipher_class->verify = g_mime_gpgme_verify; - cipher_class->encrypt = g_mime_gpgme_encrypt; - cipher_class->decrypt = g_mime_gpgme_decrypt; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto_class->digest_id = g_mime_gpgme_digest_id; -+ crypto_class->digest_name = g_mime_gpgme_digest_name; -+ crypto_class->get_signature_protocol = -+ g_mime_gpgme_get_signature_protocol; -+ crypto_class->get_encryption_protocol = -+ g_mime_gpgme_get_encryption_protocol; -+ crypto_class->get_key_exchange_protocol = -+ g_mime_gpgme_get_key_exchange_protocol; -+ crypto_class->sign = g_mime_gpgme_sign; -+ crypto_class->verify = g_mime_gpgme_verify; -+ crypto_class->encrypt = g_mime_gpgme_encrypt; -+ crypto_class->decrypt = g_mime_gpgme_decrypt; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP) == - GPG_ERR_NO_ERROR) -@@ -190,7 +263,11 @@ g_mime_gpgme_context_finalize(GObject * object) - } - - #if !defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - g_object_unref(GMIME_CIPHER_CONTEXT(ctx)->session); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(GMIME_CRYPTO_CONTEXT(ctx)->session); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif /* HAVE_GMIME_2_6 */ - - G_OBJECT_CLASS(parent_class)->finalize(object); -@@ -200,15 +277,26 @@ g_mime_gpgme_context_finalize(GObject * object) - /* - * Convert a hash algorithm name to a number - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeCipherHash - g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDigestAlgo -+g_mime_gpgme_digest_id(GMimeCryptoContext * ctx, const char *hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { -+#ifndef HAVE_GMIME_2_5_7 - if (hash == NULL) - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (hash == NULL) -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - - if (!g_ascii_strcasecmp(hash, "pgp-")) - hash += 4; - -+#ifndef HAVE_GMIME_2_5_7 - if (!g_ascii_strcasecmp(hash, "md2")) - return GMIME_CIPHER_HASH_MD2; - else if (!g_ascii_strcasecmp(hash, "md5")) -@@ -223,6 +311,22 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - return GMIME_CIPHER_HASH_HAVAL5160; - - return GMIME_CIPHER_HASH_DEFAULT; -+#else /* HAVE_GMIME_2_5_7 */ -+ if (!g_ascii_strcasecmp(hash, "md2")) -+ return GMIME_DIGEST_ALGO_MD2; -+ else if (!g_ascii_strcasecmp(hash, "md5")) -+ return GMIME_DIGEST_ALGO_MD5; -+ else if (!g_ascii_strcasecmp(hash, "sha1")) -+ return GMIME_DIGEST_ALGO_SHA1; -+ else if (!g_ascii_strcasecmp(hash, "ripemd160")) -+ return GMIME_DIGEST_ALGO_RIPEMD160; -+ else if (!g_ascii_strcasecmp(hash, "tiger192")) -+ return GMIME_DIGEST_ALGO_TIGER192; -+ else if (!g_ascii_strcasecmp(hash, "haval-5-160")) -+ return GMIME_DIGEST_ALGO_HAVAL5160; -+ -+ return GMIME_DIGEST_ALGO_DEFAULT; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -230,7 +334,11 @@ g_mime_gpgme_hash_id(GMimeCipherContext * ctx, const char *hash) - * Convert a hash algorithm number to a string - */ - static const char * -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_digest_name(GMimeCryptoContext * context, GMimeDigestAlgo hash) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); - char *p; -@@ -239,6 +347,7 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - g_return_val_if_fail(ctx->gpgme_ctx, NULL); - - /* note: this is only a subset of the hash algorithms gpg(me) supports */ -+#ifndef HAVE_GMIME_2_5_7 - switch (hash) { - case GMIME_CIPHER_HASH_MD2: - p = "pgp-md2"; -@@ -258,6 +367,27 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - case GMIME_CIPHER_HASH_HAVAL5160: - p = "pgp-haval-5-160"; - break; -+#else /* HAVE_GMIME_2_5_7 */ -+ switch (hash) { -+ case GMIME_DIGEST_ALGO_MD2: -+ p = "pgp-md2"; -+ break; -+ case GMIME_DIGEST_ALGO_MD5: -+ p = "pgp-md5"; -+ break; -+ case GMIME_DIGEST_ALGO_SHA1: -+ p = "pgp-sha1"; -+ break; -+ case GMIME_DIGEST_ALGO_RIPEMD160: -+ p = "pgp-ripemd160"; -+ break; -+ case GMIME_DIGEST_ALGO_TIGER192: -+ p = "pgp-tiger192"; -+ break; -+ case GMIME_DIGEST_ALGO_HAVAL5160: -+ p = "pgp-haval-5-160"; -+ break; -+#endif /* HAVE_GMIME_2_5_7 */ - default: - if (!(p = ctx->micalg)) - return p; -@@ -270,6 +400,29 @@ g_mime_gpgme_hash_name(GMimeCipherContext * context, GMimeCipherHash hash) - return p; - } - -+#ifdef HAVE_GMIME_2_5_7 -+static const char * -+g_mime_gpgme_get_signature_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->sign_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_encryption_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->encrypt_protocol; -+} -+ -+static const char * -+g_mime_gpgme_get_key_exchange_protocol(GMimeCryptoContext * context) -+{ -+ GMimeGpgmeContext *ctx = GMIME_GPGME_CONTEXT(context); -+ return ctx->key_protocol; -+} -+ -+#endif /* HAVE_GMIME_2_5_7 */ - - /* - * Wrapper to convert the passphrase returned from the gmime session to gpgme. -@@ -279,7 +432,11 @@ g_mime_session_passphrase(void *HOOK, const char *UID_HINT, - const char *PASSPHRASE_INFO, int PREV_WAS_BAD, - int FD) - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *ctx = GMIME_CIPHER_CONTEXT(HOOK); -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *ctx = GMIME_CRYPTO_CONTEXT(HOOK); -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - GMimeStream *stream; - gboolean rc; -@@ -366,9 +523,15 @@ cb_data_release(void *handle) - * arg, but set the value in the context. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - GMimeCipherHash hash, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_sign(GMimeCryptoContext * context, const char *userid, -+ GMimeDigestAlgo hash, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_sig_mode_t sig_mode; -@@ -460,6 +623,7 @@ g_mime_gpgme_sign(GMimeCipherContext * context, const char *userid, - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * In standard mode, verify that sigstream contains a detached signature for - * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -@@ -471,13 +635,33 @@ static GMimeSignatureValidity * - g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - GMimeStream * istream, GMimeStream * sigstream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * In standard mode, verify that sigstream contains a detached signature for -+ * istream. In single-part mode (RFC 2440, RFC 2633 application/pkcs7-mime), -+ * istream contains clearsigned data, and sigstream will be filled with the -+ * verified plaintext. The routine returns a GMimeSignatureList object. -+ * More information is saved in the context's signature object. -+ * On error error is set accordingly. -+ */ -+static GMimeSignatureList * -+g_mime_gpgme_verify(GMimeCryptoContext * context, GMimeDigestAlgo hash, -+ GMimeStream * istream, GMimeStream * sigstream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; - gpgme_protocol_t protocol; - gpgme_error_t err; - gpgme_data_t msg, sig; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+ -+#endif /* HAVE_GMIME_2_5_7 */ - struct gpgme_data_cbs cbs = { - (gpgme_data_read_cb_t) g_mime_gpgme_stream_rd, /* read method */ - (gpgme_data_write_cb_t) g_mime_gpgme_stream_wr, /* write method */ -@@ -521,6 +705,7 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - ctx->sig_state = - g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -536,12 +721,44 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - } - } else - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+#endif /* HAVE_GMIME_2_5_7 */ - - /* release gmgme data buffers */ - gpgme_data_release(msg); - gpgme_data_release(sig); - -+#ifndef HAVE_GMIME_2_5_7 - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -549,10 +766,19 @@ g_mime_gpgme_verify(GMimeCipherContext * context, GMimeCipherHash hash, - * Encrypt istream to ostream for recipients. If sign is set, sign by userid. - */ - static int -+#ifndef HAVE_GMIME_2_5_7 - g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - const char *userid, GPtrArray * recipients, - GMimeStream * istream, GMimeStream * ostream, - GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+g_mime_gpgme_encrypt(GMimeCryptoContext * context, gboolean sign, -+ const char *userid, -+ GMimeDigestAlgo digest, -+ GPtrArray * recipients, -+ GMimeStream * istream, GMimeStream * ostream, -+ GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -653,9 +879,15 @@ g_mime_gpgme_encrypt(GMimeCipherContext * context, gboolean sign, - * Decrypt istream to ostream. In RFC 2440 mode, also try to check an included - * signature (if any). - */ -+#ifndef HAVE_GMIME_2_5_7 - static GMimeSignatureValidity * - g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - GMimeStream * ostream, GError ** error) -+#else /* HAVE_GMIME_2_5_7 */ -+static GMimeDecryptResult * -+g_mime_gpgme_decrypt(GMimeCryptoContext * context, GMimeStream * istream, -+ GMimeStream * ostream, GError ** error) -+#endif /* HAVE_GMIME_2_5_7 */ - { - GMimeGpgmeContext *ctx = (GMimeGpgmeContext *) context; - gpgme_ctx_t gpgme_ctx; -@@ -668,7 +900,13 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - NULL, /* seek method */ - cb_data_release /* release method */ - }; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+ GMimeSignatureList *list; -+ GMimeSignature *signature; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* some paranoia checks */ - g_return_val_if_fail(ctx, NULL); -@@ -716,6 +954,7 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - /* try to get information about the signature (if any) */ - ctx->sig_state = g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx); - -+#ifndef HAVE_GMIME_2_5_7 - validity = g_mime_signature_validity_new(); - if (ctx->sig_state) { - switch (ctx->sig_state->status) -@@ -733,14 +972,57 @@ g_mime_gpgme_decrypt(GMimeCipherContext * context, GMimeStream * istream, - g_mime_signature_validity_set_status(validity, GMIME_SIGNATURE_STATUS_UNKNOWN); - - return validity; -+#else /* HAVE_GMIME_2_5_7 */ -+ list = g_mime_signature_list_new(); -+ signature = g_mime_signature_new(); -+ g_mime_signature_list_add(list, signature); -+ result = g_mime_decrypt_result_new(); -+ g_mime_decrypt_result_set_signatures(result, list); -+ -+ if (ctx->sig_state) { -+ switch (ctx->sig_state->status) -+ { -+ case GPG_ERR_NO_ERROR: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_GOOD); -+ break; -+ case GPG_ERR_NOT_SIGNED: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, -+ GMIME_SIGNATURE_ERROR_NONE); -+ break; -+ default: -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_BAD); -+ } -+ } else { -+ g_mime_signature_set_status(signature, -+ GMIME_SIGNATURE_STATUS_ERROR); -+ g_mime_signature_set_errors(signature, GMIME_SIGNATURE_ERROR_NONE); -+ } -+ -+ return result; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -+#ifndef HAVE_GMIME_2_5_7 - /* - * Create a new gpgme cipher context with protocol. If anything fails, return - * NULL and set error. - */ -+#else /* HAVE_GMIME_2_5_7 */ -+/* -+ * Create a new gpgme crypto context with protocol. If anything fails, return -+ * NULL and set error. -+ */ -+#endif /* HAVE_GMIME_2_5_7 */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext * -+#endif /* HAVE_GMIME_2_5_7 */ - #if defined(HAVE_GMIME_2_6) - g_mime_gpgme_context_new(GMimePasswordRequestFunc request_passwd, - gpgme_protocol_t protocol, GError ** error) -@@ -749,7 +1031,11 @@ g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, GError ** error) - #endif /* HAVE_GMIME_2_6 */ - { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - GMimeGpgmeContext *ctx; - gpgme_error_t err; - gpgme_ctx_t gpgme_ctx; -@@ -766,14 +1052,22 @@ g_mime_gpgme_context_new(GMimeSession * session, - return NULL; - } - -+#ifndef HAVE_GMIME_2_5_7 - /* create the cipher context */ -+#else /* HAVE_GMIME_2_5_7 */ -+ /* create the crypto context */ -+#endif /* HAVE_GMIME_2_5_7 */ - ctx = g_object_new(GMIME_TYPE_GPGME_CONTEXT, NULL, NULL); - if (!ctx) { - gpgme_release(gpgme_ctx); - return NULL; - } else - ctx->gpgme_ctx = gpgme_ctx; -+#ifndef HAVE_GMIME_2_5_7 - cipher = (GMimeCipherContext *) ctx; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto = (GMimeCryptoContext *) ctx; -+#endif /* HAVE_GMIME_2_5_7 */ - - /* check if the requested protocol is available */ - if (!g_mime_gpgme_context_check_protocol -@@ -785,23 +1079,47 @@ g_mime_gpgme_context_new(GMimeSession * session, - - /* setup according to requested protocol */ - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - cipher->request_passwd = request_passwd; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->request_passwd = request_passwd; -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ -+#ifndef HAVE_GMIME_2_5_7 - cipher->session = session; -+#else /* HAVE_GMIME_2_5_7 */ -+ crypto->session = session; -+#endif /* HAVE_GMIME_2_5_7 */ - g_object_ref(session); - #endif /* HAVE_GMIME_2_6 */ - gpgme_set_protocol(gpgme_ctx, protocol); - if (protocol == GPGME_PROTOCOL_OpenPGP) { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pgp-signature"; - cipher->encrypt_protocol = "application/pgp-encrypted"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pgp-signature"; -+ ctx->encrypt_protocol = "application/pgp-encrypted"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } else { -+#ifndef HAVE_GMIME_2_5_7 - cipher->sign_protocol = "application/pkcs7-signature"; - cipher->encrypt_protocol = "application/pkcs7-mime"; - cipher->key_protocol = NULL; /* FIXME */ -+#else /* HAVE_GMIME_2_5_7 */ -+ ctx->sign_protocol = "application/pkcs7-signature"; -+ ctx->encrypt_protocol = "application/pkcs7-mime"; -+ ctx->key_protocol = NULL; /* FIXME */ -+#endif /* HAVE_GMIME_2_5_7 */ - } - -+#ifndef HAVE_GMIME_2_5_7 - return cipher; -+#else /* HAVE_GMIME_2_5_7 */ -+ return crypto; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -diff --git a/libbalsa/gmime-gpgme-context.h b/libbalsa/gmime-gpgme-context.h -index 585d927..19c5fae 100644 ---- a/libbalsa/gmime-gpgme-context.h -+++ b/libbalsa/gmime-gpgme-context.h -@@ -63,7 +63,11 @@ typedef gboolean(*GMimeGpgmeKeyTrustCB) (const gchar * name, - GMimeGpgmeContext * ctx); - - struct _GMimeGpgmeContext { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext parent_object; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext parent_object; -+#endif /* HAVE_GMIME_2_5_7 */ - - gpgme_ctx_t gpgme_ctx; /* gpgme context */ - gboolean singlepart_mode; /* set context to single-part mode (RFC 2440, 2633) */ -@@ -73,11 +77,21 @@ struct _GMimeGpgmeContext { - GMimeGpgmeKeySelectCB key_select_cb; /* key selection callback */ - GMimeGpgmeKeyTrustCB key_trust_cb; /* low trust key cb */ - gpgme_passphrase_cb_t passphrase_cb; /* passphrase callback */ -+#ifdef HAVE_GMIME_2_5_7 -+ -+ const gchar *sign_protocol; -+ const gchar *encrypt_protocol; -+ const gchar *key_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - }; - - - struct _GMimeGpgmeContextClass { -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContextClass parent_class; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContextClass parent_class; -+#endif /* HAVE_GMIME_2_5_7 */ - - gboolean has_proto_openpgp; - gboolean has_proto_cms; -@@ -86,10 +100,17 @@ struct _GMimeGpgmeContextClass { - - GType g_mime_gpgme_context_get_type(void); - #if defined(HAVE_GMIME_2_6) -+#ifndef HAVE_GMIME_2_5_7 - GMimeCipherContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc - request_passwd, - gpgme_protocol_t protocol, - GError ** error); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeCryptoContext *g_mime_gpgme_context_new(GMimePasswordRequestFunc -+ request_passwd, -+ gpgme_protocol_t protocol, -+ GError ** error); -+#endif /* HAVE_GMIME_2_5_7 */ - #else /* HAVE_GMIME_2_6 */ - GMimeCipherContext *g_mime_gpgme_context_new(GMimeSession * session, - gpgme_protocol_t protocol, -diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c -index 795d2e1..e79c4cb 100644 ---- a/libbalsa/gmime-part-rfc2440.c -+++ b/libbalsa/gmime-part-rfc2440.c -@@ -112,8 +112,13 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - - g_return_val_if_fail(GMIME_IS_PART(part), -1); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), -1); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - -1); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, -1); -+#endif /* HAVE_GMIME_2_5_7 */ - g_return_val_if_fail(recipients != NULL || sign_userid != NULL, -1); - - /* get the raw content */ -@@ -131,14 +136,27 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - ctx->singlepart_mode = TRUE; - if (recipients == NULL) - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_sign(GMIME_CIPHER_CONTEXT(ctx), sign_userid, - GMIME_CIPHER_HASH_DEFAULT, stream, - cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_sign(GMIME_CRYPTO_CONTEXT(ctx), sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - else - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_encrypt(GMIME_CIPHER_CONTEXT(ctx), - sign_userid != NULL, sign_userid, - recipients, stream, cipherstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_encrypt(GMIME_CRYPTO_CONTEXT(ctx), -+ sign_userid != NULL, sign_userid, -+ GMIME_CIPHER_ALGO_DEFAULT, -+ recipients, stream, cipherstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - if (result == -1) { - g_object_unref(cipherstream); - return -1; -@@ -202,18 +220,31 @@ g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - * set on err to provide more information. Upon success, the content - * of part is replaced by the verified output of the crypto engine. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *list; -+#endif /* HAVE_GMIME_2_5_7 */ - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->sign_protocol != NULL, - NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_signature_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(GMIME_PART(part)); -@@ -227,13 +258,25 @@ g_mime_part_rfc2440_verify(GMimePart * part, - - /* verify the signature */ - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - valid = - g_mime_cipher_context_verify(GMIME_CIPHER_CONTEXT(ctx), - GMIME_CIPHER_HASH_DEFAULT, stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ list = -+ g_mime_crypto_context_verify(GMIME_CRYPTO_CONTEXT(ctx), -+ GMIME_CIPHER_ALGO_DEFAULT, stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* upon success, replace the signed content by the checked one */ -- if (valid) { -+#ifndef HAVE_GMIME_2_5_7 -+ if (valid) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (list) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - GMimeDataWrapper *wrapper = g_mime_data_wrapper_new(); - - g_mime_data_wrapper_set_stream(wrapper, plainstream); -@@ -242,7 +285,11 @@ g_mime_part_rfc2440_verify(GMimePart * part, - } - g_object_unref(plainstream); - -+#ifndef HAVE_GMIME_2_5_7 - return valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ return list; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - -@@ -255,19 +302,32 @@ g_mime_part_rfc2440_verify(GMimePart * part, - * verified and the result is placed in ctx by the underlying gpgme - * context. - */ -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity * -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeDecryptResult * -+#endif /* HAVE_GMIME_2_5_7 */ - g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * ctx, GError ** err) - { - GMimeStream *stream, *plainstream; - GMimeDataWrapper * wrapper; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *result; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeDecryptResult *result; -+#endif /* HAVE_GMIME_2_5_7 */ - gchar *headbuf = g_malloc0(1024); - - g_return_val_if_fail(GMIME_IS_PART(part), NULL); - g_return_val_if_fail(GMIME_IS_GPGME_CONTEXT(ctx), NULL); -+#ifndef HAVE_GMIME_2_5_7 - g_return_val_if_fail(GMIME_CIPHER_CONTEXT(ctx)->encrypt_protocol != - NULL, NULL); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_return_val_if_fail(g_mime_crypto_context_get_encryption_protocol -+ (GMIME_CRYPTO_CONTEXT(ctx)) != NULL, NULL); -+#endif /* HAVE_GMIME_2_5_7 */ - - /* get the raw content */ - wrapper = g_mime_part_get_content_object(part); -@@ -284,8 +344,13 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, - - /* decrypt and (if possible) verify the input */ - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_cipher_context_decrypt(GMIME_CIPHER_CONTEXT(ctx), stream, - plainstream, err); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_crypto_context_decrypt(GMIME_CRYPTO_CONTEXT(ctx), stream, -+ plainstream, err); -+#endif /* HAVE_GMIME_2_5_7 */ - - if (result != NULL) { - GMimeStream *filter_stream; -diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h -index 48be5a4..cc1901a 100644 ---- a/libbalsa/gmime-part-rfc2440.h -+++ b/libbalsa/gmime-part-rfc2440.h -@@ -53,12 +53,21 @@ int g_mime_part_rfc2440_sign_encrypt(GMimePart * part, - GPtrArray * recipients, - const char *sign_userid, - GError ** err); -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *g_mime_part_rfc2440_verify(GMimePart * part, - GMimeGpgmeContext * ctx, - GError ** err); - GMimeSignatureValidity *g_mime_part_rfc2440_decrypt(GMimePart * part, - GMimeGpgmeContext * - ctx, GError ** err); -+#else /* HAVE_GMIME_2_5_7 */ -+GMimeSignatureList *g_mime_part_rfc2440_verify(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+GMimeDecryptResult *g_mime_part_rfc2440_decrypt(GMimePart * part, -+ GMimeGpgmeContext * ctx, -+ GError ** err); -+#endif /* HAVE_GMIME_2_5_7 */ - - #ifdef __cplusplus - } -diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c -index a56e12c..df4a2e1 100644 ---- a/libbalsa/rfc3156.c -+++ b/libbalsa/rfc3156.c -@@ -268,9 +268,15 @@ libbalsa_message_body_protection(LibBalsaMessageBody * body) - - #if defined(HAVE_GMIME_2_6) - static gboolean -+#ifndef HAVE_GMIME_2_5_7 - password_request_func(GMimeCipherContext * ctx, const char *user_id, - const char *prompt_ctx, gboolean reprompt, - GMimeStream * response, GError ** err) -+#else /* HAVE_GMIME_2_5_7 */ -+password_request_func(GMimeCryptoContext * ctx, const char *user_id, -+ const char *prompt_ctx, gboolean reprompt, -+ GMimeStream * response, GError ** err) -+#endif /* HAVE_GMIME_2_5_7 */ - { - gint fd; - gchar *name_used; -@@ -366,9 +372,16 @@ libbalsa_sign_mime_object(GMimeObject ** content, const gchar * rfc822_for, - return FALSE; - } - -+#ifndef HAVE_GMIME_2_5_7 - if (g_mime_multipart_signed_sign - (mps, *content, GMIME_CIPHER_CONTEXT(ctx), rfc822_for, -- GMIME_CIPHER_HASH_DEFAULT, error) != 0) { -+ GMIME_CIPHER_HASH_DEFAULT, error) != 0) -+#else /* HAVE_GMIME_2_5_7 */ -+ if (g_mime_multipart_signed_sign -+ (mps, *content, GMIME_CRYPTO_CONTEXT(ctx), rfc822_for, -+ GMIME_DIGEST_ALGO_DEFAULT, error) != 0) -+#endif /* HAVE_GMIME_2_5_7 */ -+ { - g_object_unref(mps); - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) -@@ -458,10 +471,18 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - - encrypted_obj = GMIME_OBJECT(mpe); - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_encrypt(mpe, *content, - GMIME_CIPHER_CONTEXT(ctx), - FALSE, NULL, - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_encrypt(mpe, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ FALSE, NULL, -+ GMIME_DIGEST_ALGO_DEFAULT, -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #ifdef HAVE_SMIME - else { -@@ -471,9 +492,15 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for, - encrypted_obj = GMIME_OBJECT(pkcs7); - ctx->singlepart_mode = TRUE; - result = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_application_pkcs7_encrypt(pkcs7, *content, - GMIME_CIPHER_CONTEXT(ctx), - recipients, error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_application_pkcs7_encrypt(pkcs7, *content, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ recipients, error); -+#endif /* HAVE_GMIME_2_5_7 */ - } - #endif - -@@ -565,8 +592,14 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - #if !defined(HAVE_GMIME_2_6) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ -- GMimeCipherContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 -+ GMimeCipherContext *g_mime_ctx; - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeCryptoContext *g_mime_ctx; -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ -+ GMimeGpgmeContext *ctx; - GError *error = NULL; - - /* paranoia checks */ -@@ -592,12 +625,12 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - /* try to create GMimeGpgMEContext */ - #if !defined(HAVE_GMIME_2_6) - session = g_object_new(g_mime_session_get_type(), NULL, NULL); -- ctx = g_mime_gpgme_context_new(session, protocol, &error); -+ g_mime_ctx = g_mime_gpgme_context_new(session, protocol, &error); - #else /* HAVE_GMIME_2_6 */ -- ctx = -+ g_mime_ctx = - g_mime_gpgme_context_new(password_request_func, protocol, &error); - #endif /* HAVE_GMIME_2_6 */ -- if (ctx == NULL) { -+ if (g_mime_ctx == NULL) { - if (error) { - libbalsa_information(LIBBALSA_INFORMATION_ERROR, "%s: %s", - _("creating a gpgme context failed"), -@@ -613,6 +646,7 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - body->parts->next->sig_info->status = GPGME_SIG_STAT_ERROR; - return FALSE; - } -+ ctx = GMIME_GPGME_CONTEXT(g_mime_ctx); - - /* S/MIME uses the protocol application/pkcs7-signature, but some ancient - mailers, not yet knowing RFC 2633, use application/x-pkcs7-signature, -@@ -622,14 +656,19 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - g_mime_object_get_content_type_parameter(GMIME_OBJECT (body->mime_part), - "protocol"); - if (!g_ascii_strcasecmp(cms_protocol, "application/x-pkcs7-signature")) -+#ifndef HAVE_GMIME_2_5_7 -+ g_mime_ctx->sign_protocol = cms_protocol; -+#else /* HAVE_GMIME_2_5_7 */ - ctx->sign_protocol = cms_protocol; -+#endif /* HAVE_GMIME_2_5_7 */ - } - - /* verify the signature */ - - libbalsa_mailbox_lock_store(body->message->mailbox); - valid = g_mime_multipart_signed_verify(GMIME_MULTIPART_SIGNED -- (body->mime_part), ctx, &error); -+ (body->mime_part), g_mime_ctx, -+ &error); - libbalsa_mailbox_unlock_store(body->message->mailbox); - - if (valid == NULL) { -@@ -642,12 +681,16 @@ libbalsa_body_check_signature(LibBalsaMessageBody * body, - libbalsa_information(LIBBALSA_INFORMATION_ERROR, - _("signature verification failed")); - } -- if (GMIME_GPGME_CONTEXT(ctx)->sig_state) { -- body->parts->next->sig_info = GMIME_GPGME_CONTEXT(ctx)->sig_state; -+ if (ctx->sig_state) { -+ body->parts->next->sig_info = ctx->sig_state; - g_object_ref(G_OBJECT(body->parts->next->sig_info)); - } -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -- g_object_unref(ctx); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(g_mime_ctx); - #if !defined(HAVE_GMIME_2_6) - g_object_unref(session); - #endif /* HAVE_GMIME_2_6 */ -@@ -747,14 +790,26 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - libbalsa_mailbox_lock_store(body->message->mailbox); - if (protocol == GPGME_PROTOCOL_OpenPGP) - mime_obj = -+#ifndef HAVE_GMIME_2_5_7 - g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_mime_multipart_encrypted_decrypt(GMIME_MULTIPART_ENCRYPTED(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ NULL, -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #ifdef HAVE_SMIME - else if (smime_signed) { -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - - ctx->singlepart_mode = TRUE; -+#ifndef HAVE_GMIME_2_5_7 - mime_obj = - g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), - &valid, -@@ -766,6 +821,19 @@ libbalsa_body_decrypt(LibBalsaMessageBody * body, - g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), - GMIME_CIPHER_CONTEXT(ctx), - &error); -+#else /* HAVE_GMIME_2_5_7 */ -+ mime_obj = -+ g_mime_application_pkcs7_verify(GMIME_PART(body->mime_part), -+ &valid, -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+ g_object_unref(valid); -+ } else -+ mime_obj = -+ g_mime_application_pkcs7_decrypt(GMIME_PART(body->mime_part), -+ GMIME_CRYPTO_CONTEXT(ctx), -+ &error); -+#endif /* HAVE_GMIME_2_5_7 */ - #endif - libbalsa_mailbox_unlock_store(body->message->mailbox); - -@@ -906,7 +974,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - GMimeSession *session; - #endif /* HAVE_GMIME_2_6 */ - GMimeGpgmeContext *ctx; -+#ifndef HAVE_GMIME_2_5_7 - GMimeSignatureValidity *valid; -+#else /* HAVE_GMIME_2_5_7 */ -+ GMimeSignatureList *valid; -+#endif /* HAVE_GMIME_2_5_7 */ - GError *error = NULL; - gpgme_error_t retval; - -@@ -978,7 +1050,11 @@ libbalsa_rfc2440_verify(GMimePart * part, GMimeGpgmeSigstat ** sig_info) - } - - /* clean up */ -+#ifndef HAVE_GMIME_2_5_7 - g_mime_signature_validity_free(valid); -+#else /* HAVE_GMIME_2_5_7 */ -+ g_object_unref(valid); -+#endif /* HAVE_GMIME_2_5_7 */ - retval = ctx->sig_state->status; - g_object_unref(ctx); - #if !defined(HAVE_GMIME_2_6) --- -cgit v0.9.0.2 diff --git a/community/cellwriter/PKGBUILD b/community/cellwriter/PKGBUILD index ebac22ee5..90f06cc78 100644 --- a/community/cellwriter/PKGBUILD +++ b/community/cellwriter/PKGBUILD @@ -4,23 +4,23 @@ # Contributor: Winston Weinert pkgname=cellwriter -pkgver=1.3.4 -pkgrel=6 +pkgver=1.3.5 +pkgrel=1 pkgdesc='A grid-entry natural handwriting input panel.' arch=('i686' 'x86_64') license=('GPL') url='http://v1.risujin.org/cellwriter/' depends=('gtk2' 'libxtst' 'libgnome' 'hicolor-icon-theme') source=("http://v1.risujin.org/pub/cellwriter/${pkgname}-${pkgver}.tar.gz" - "http://launchpadlibrarian.net/18959127/${pkgname}-${pkgver}-cellwidget-dont-disable-xinput.diff") -md5sums=('72b4e552a32d6acd888da0b88aeebbdd' + "http://launchpadlibrarian.net/18959127/${pkgname}-1.3.4-cellwidget-dont-disable-xinput.diff") +md5sums=('16db87415c3c669e0489f9c4d795ec7d' '5e8c61309c5ec8f67f0af7bb5ceb1aea') install="${pkgname}.install" build() { cd "${srcdir}/${pkgname}-${pkgver}/src" - patch -p0 < "${srcdir}/${pkgname}-${pkgver}-cellwidget-dont-disable-xinput.diff" + patch -p0 < "${srcdir}/${pkgname}-1.3.4-cellwidget-dont-disable-xinput.diff" cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 94916efe6..d545e739c 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 86294 2013-03-14 20:45:45Z foutrelis $ +#$Id: PKGBUILD 88577 2013-04-20 14:52:33Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman -pkgver=1.12 -pkgrel=2 +pkgver=1.13 +pkgrel=1 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') options=('!libtool') source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'allow_group_network.diff') -md5sums=('41e5bbc603d031459df4ff243b8318f0' +md5sums=('12c0d5a52ad3749afac260ebc7151d16' 'a8d22ee089fb0ed725130d16ad393047') build() { diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 622ad9a04..6acd4b76f 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87838 2013-04-08 09:19:47Z spupykin $ +# $Id: PKGBUILD 88609 2013-04-20 16:45:02Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.2 _pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ @@ -25,6 +25,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" mkdir -p build cd build + CXXFLAGS+=" -fpermissive" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 94624a3e2..075cc1066 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78927 2012-10-27 23:44:18Z ebelanger $ +# $Id: PKGBUILD 88610 2013-04-20 16:45:03Z heftig $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=14 +pkgrel=15 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64') url="http://openil.sourceforge.net/" diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD index 41b82d6c8..88f684eec 100644 --- a/community/dunst/PKGBUILD +++ b/community/dunst/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 83044 2013-01-26 21:37:31Z dwallace $ +# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: feuri pkgname=dunst -pkgver=0.5.0 +pkgver=1.0.0 pkgrel=1 pkgdesc="a dmenu-ish notification system " arch=('i686' 'x86_64') url="http://knopwob.github.com/dunst" license=(MIT) -depends=(dbus libxinerama libxft libxss libxdg-basedir) -makedepends=('perl') +depends=(libxinerama libxss libxdg-basedir pango) +optdepends=("libnotify: notify-send" + "dbus: start dunst on demand") +makedepends=(libnotify dbus 'perl') provides=(notification-daemon) source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2") -md5sums=('3805fd0ef171378cc6ff3a74ce8a4f06') build() { make -C "$srcdir/$pkgname-$pkgver" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 @@ -24,3 +25,4 @@ package() { install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } # vim:set ts=2 sw=2 et: +md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723') diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD index a24a98dd8..ad374d4d3 100644 --- a/community/dvtm/PKGBUILD +++ b/community/dvtm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74674 2012-08-01 19:22:27Z lfleischer $ +# $Id: PKGBUILD 88575 2013-04-20 13:06:56Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Giorgio Lando <patroclo7@gmail.com> # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('MIT') depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'config.h') -md5sums=('c565067557c9be4cdc63aecd0932452e' - '50ae76c4b33864f0cf051417443cc422') +md5sums=('7de1103abb0ca410f7250cf89f019a38' + '41107e5e84a8572f70d6cb111b4e07f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dvtm/config.h b/community/dvtm/config.h index 2b00776f2..48367695a 100644 --- a/community/dvtm/config.h +++ b/community/dvtm/config.h @@ -1,4 +1,3 @@ -/* curses attributes for the currently focused window */ /* valid curses attributes are listed below they can be ORed * * A_NORMAL Normal display (no highlight) @@ -10,23 +9,16 @@ * A_BOLD Extra bright or bold * A_PROTECT Protected mode * A_INVIS Invisible or blank mode - * */ #define BLUE (COLORS==256 ? 68 : COLOR_BLUE) - -#define SELECTED_ATTR A_NORMAL -#define SELECTED_FG BLUE -#define SELECTED_BG -1 +/* curses attributes for the currently focused window */ +#define SELECTED_ATTR COLOR(BLUE, -1) | A_NORMAL /* curses attributes for normal (not selected) windows */ -#define NORMAL_ATTR A_NORMAL -#define NORMAL_FG -1 -#define NORMAL_BG -1 +#define NORMAL_ATTR COLOR(-1, -1) | A_NORMAL +/* curses attributes for the status bar */ +#define BAR_ATTR COLOR(BLUE, -1) | A_NORMAL /* status bar (command line option -s) position */ #define BAR_POS BAR_TOP /* BAR_BOTTOM, BAR_OFF */ -/* curses attributes for the status bar */ -#define BAR_ATTR A_NORMAL -#define BAR_FG BLUE -#define BAR_BG -1 /* determines whether the statusbar text should be right or left aligned */ #define BAR_ALIGN ALIGN_RIGHT /* separator between window title and window number */ @@ -46,7 +38,7 @@ #include "fullscreen.c" /* by default the first layout entry is used */ -Layout layouts[] = { +static Layout layouts[] = { { "[]=", tile }, { "+++", grid }, { "TTT", bstack }, @@ -55,9 +47,10 @@ Layout layouts[] = { #define MOD CTRL('g') -/* you can at most specifiy MAX_ARGS (2) number of arguments */ -Key keys[] = { +/* you can at most specifiy MAX_ARGS (3) number of arguments */ +static Key keys[] = { { MOD, 'c', { create, { NULL } } }, + { MOD, 'C', { create, { NULL, NULL, "$CWD" } } }, { MOD, 'x', { killclient, { NULL } } }, { MOD, 'j', { focusnext, { NULL } } }, { MOD, 'u', { focusnextnm, { NULL } } }, @@ -89,14 +82,19 @@ Key keys[] = { { MOD, 'r', { redraw, { NULL } } }, { MOD, 'X', { lock, { NULL } } }, { MOD, 'B', { togglebell, { NULL } } }, + { MOD, 'v', { copymode, { NULL } } }, + { MOD, '/', { copymode, { "/" } } }, + { MOD, '?', { copymode, { "?" } } }, + { MOD, 'p', { paste, { NULL } } }, { MOD, KEY_PPAGE, { scrollback, { "-1" } } }, { MOD, KEY_NPAGE, { scrollback, { "1" } } }, - { MOD, '?', { create, { "man dvtm", "dvtm help" } } }, + { MOD, KEY_F(1), { create, { "man dvtm", "dvtm help" } } }, }; static const ColorRule colorrules[] = { - /* title attrs fgcolor bgcolor */ + { "", A_NORMAL, -1, -1 }, /* default */ #if 0 + /* title attrs fgcolor bgcolor */ { "ssh", A_NORMAL, COLOR_BLACK, 224 }, #endif }; @@ -137,7 +135,7 @@ static const ColorRule colorrules[] = { #define ENABLE_MOUSE true /* whether to enable mouse events by default */ #ifdef CONFIG_MOUSE -Button buttons[] = { +static Button buttons[] = { { BUTTON1_CLICKED, { mouse_focus, { NULL } } }, { BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } }, { BUTTON2_CLICKED, { mouse_zoom, { NULL } } }, @@ -145,11 +143,15 @@ Button buttons[] = { }; #endif /* CONFIG_MOUSE */ -Cmd commands[] = { +static Cmd commands[] = { { "create", { create, { NULL } } }, }; /* gets executed when dvtm is started */ -Action actions[] = { +static Action actions[] = { { create, { NULL } }, }; + +static char const * const keytable[] = { + /* add your custom key escape sequences */ +}; diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD index dc61fe518..75cb2ecb3 100644 --- a/community/emacs-nox/PKGBUILD +++ b/community/emacs-nox/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $ +# $Id: PKGBUILD 88621 2013-04-20 17:17:19Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Chris Brannon <cmbrannon@cox.net> pkgname=emacs-nox -pkgver=24.2 +pkgver=24.3 pkgrel=1 -pkgdesc="The Emacs Editor, without X11 support" +pkgdesc="The extensible, customizable, self-documenting real-time display editor, without X11 support" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('dbus-core' 'ncurses' 'perl') provides=('emacs') -conflicts=('emacs' 'emacs-cvs') -options=('docs') +conflicts=('emacs') changelog=$pkgname.changelog install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz) -sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357') +sha256sums=('0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41') build() { cd ${srcdir}/emacs-$pkgver @@ -33,9 +32,8 @@ package() { # remove conflict with ctags package mv ${pkgdir}/usr/bin/{ctags,ctags.emacs} mv ${pkgdir}/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} - - # fix all the 777 perms on directories - find ${pkgdir}/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \; + # remove conflict with texinfo + rm "$pkgdir"/usr/share/info/info.info.gz # fix user/root permissions on usr/share files find ${pkgdir}/usr/share/emacs/$pkgver -exec chown root.root {} \; # remove .desktop file and icons diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog index 9fe1ae221..ffae307fa 100644 --- a/community/emacs-nox/emacs-nox.changelog +++ b/community/emacs-nox/emacs-nox.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * emacs-nox 24.3-1 + 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * emacs-nox 24.2-1 diff --git a/community/emacs-nox/emacs-nox.install b/community/emacs-nox/emacs-nox.install index 740640994..06dc781ee 100644 --- a/community/emacs-nox/emacs-nox.install +++ b/community/emacs-nox/emacs-nox.install @@ -1,15 +1,15 @@ INFO_DIR=usr/share/info -INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake -forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode +INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse +ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake +forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar tramp url vip viper widget woman) +speedbar srecode tramp url vip viper widget wisent woman) post_install() { [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } @@ -20,6 +20,6 @@ post_upgrade() { pre_remove() { [[ -x usr/bin/install-info ]] || return 0 for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null + install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null done } diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index bbcdb0c64..60a1a3d2e 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86854 2013-03-23 07:25:46Z bpiotrowski $ +# $Id: PKGBUILD 88616 2013-04-20 16:45:10Z heftig $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') -pkgver=3.4.0 -pkgrel=6 +pkgver=3.4.1 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -30,10 +30,8 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' 'gmime') options=(!emptydirs) -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - fix-xfce4-terminal.patch) -md5sums=('e9d63bfaf351fc7e1705d1b80785b6af' - '543ffb3402485e0bcfc67ecf15b7b682') +source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('eef35861d1e95808180ac7ed5a436569') create_dirs() { install -dm755 ${pkgdir}/usr/lib/gambas3 @@ -43,9 +41,6 @@ create_dirs() { build() { cd ${srcdir}/${pkgbase}-${pkgver} - # merged upstream - patch -Np0 -i ../fix-xfce4-terminal.patch - ./reconf-all ./configure --prefix=/usr -C @@ -864,8 +859,8 @@ package_gambas3-devel() { package_gambas3-ide() { depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' - 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' - 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') + 'gambas3-gb-form-dialog' 'gambas3-gb-form-stock' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' + 'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') pkgdesc="Integrated Development Environment" cd ${srcdir}/fakeinstall diff --git a/community/gambas3/fix-xfce4-terminal.patch b/community/gambas3/fix-xfce4-terminal.patch deleted file mode 100644 index c8fcc8f4f..000000000 --- a/community/gambas3/fix-xfce4-terminal.patch +++ /dev/null @@ -1,476 +0,0 @@ ---- gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5536) -+++ gb.desktop/src/gb.desktop/.src/Desktop.class (révision 5537) -@@ -1,6 +1,6 @@ - ' Gambas class file - --Export -+Export - - Class _Desktop - -@@ -27,64 +27,64 @@ - Static Private $aImgExt As String[] - - Static Public Sub SendMail({To} As String[], Optional Cc As String[], Optional Bcc As String[], Optional Subject As String, Optional Body As String, Optional Attachment As String) -- -+ - Dim aArg As String[] - 'xdg-email [--utf8] [--cc address] [--bcc address] [--subject text] [--body text - ' ] [--attach file] { mailto-uri | address(es) } -- -+ - aArg = ["--utf8"] -- If CC And If CC.Count Then -+ If CC And If CC.Count Then - aArg.Add("--cc") - aArg.Insert(CC) - Endif -- If BCC And If BCC.Count Then -+ If BCC And If BCC.Count Then - aArg.Add("--bcc") - aArg.Insert(BCC) - Endif -- If Subject Then -+ If Subject Then - aArg.Add("--subject") - aArg.Add(Subject) -- Endif -- If Body Then -+ Endif -+ If Body Then - aArg.Add("--body") - aArg.Add(Body) - Endif -- If Attachment Then -+ If Attachment Then - aArg.Add("--attach") - aArg.Add(Attachment) -- Endif -- -- If {To} And If To.Count Then -+ Endif -+ -+ If {To} And If To.Count Then - aArg.Insert({To}) - Endif -- -+ - Main.RunXdgUtil("xdg-email", aArg) -- -+ - End - - Static Public Sub {Open}(URL As String, Optional {Wait} As Boolean) -- -+ - If URL = "~" Then - URL = User.Home - Else If URL Begins "~/" Then - URL = User.Home & Mid$(URL, 2) - Endif -- -+ - Main.RunXdgUtil("xdg-open", [URL], {Wait}) -- -+ - End - - ' Static Private Function Menus_Read() As _DesktopMenus --' --' Return _DesktopMenus --' -+' -+' Return _DesktopMenus -+' - ' End --' --' -+' -+' - ' Static Private Function Icons_Read() As _DesktopIcons --' -+' - ' Return _DesktopIcons --' -+' - ' End - - Static Private Function ScreenSaver_Read() As _Desktop_ScreenSaver -@@ -96,20 +96,20 @@ - ' GB_STATIC_METHOD("Find", "Integer[]", CDESKTOP_find, "[(Title)s(Application)s(Role)s]"), - - Static Public Sub FindWindow(Optional Title As String, Application As String, Role As String) As Integer[] -- -+ - Return _Desktop.FindWindow(Title, Application, Role) -- -+ - End - - ' STATIC PRIVATE SUB InitKeys() --' -+' - ' $cKeys = NEW Collection - ' $cKeys["é"] = "eacute" --' -+' - ' END - - Static Public Sub SendKeys(Keys As String) -- -+ - Dim iInd As Integer - Dim sCar As String - Dim iPos As Integer -@@ -117,15 +117,15 @@ - Dim bHold As Boolean - Dim sErr As String - Dim iLen As Integer = String.Len(Keys) -- -+ - Do -- -+ - Inc iInd - If iInd > iLen Then Break -- -+ - sCar = String.Mid$(Keys, iInd, 1) -- -- If sCar = "[" Then -+ -+ If sCar = "[" Then - iPos = String.InStr(Keys, "]", iInd) - If iPos = 0 Then Break - sCar = String.Mid$(Keys, iInd + 1, iPos - iInd - 1) -@@ -134,7 +134,7 @@ - Else If sCar = "{" And If Not bHold Then - bHold = True - Continue -- Else If sCar = "}" And If bHold Then -+ Else If sCar = "}" And If bHold Then - bHold = False - aRelease.Reverse - For Each sCar In aRelease -@@ -144,11 +144,11 @@ - aRelease.Clear - Continue - Endif -- -- If Len(sCar) >= 2 Then -+ -+ If Len(sCar) >= 2 Then - Try sCar = Conv(sCar, "UTF-8", "LATIN1") - Endif -- -+ - If bHold Then - 'DEBUG sCar;; TRUE - _Desktop.SendKey(sCar, True) -@@ -159,25 +159,25 @@ - 'DEBUG sCar;; FALSE - _Desktop.SendKey(sCar, False) - Endif -- -- Loop -- --Catch - -+ Loop -+ -+Catch -+ - sErr = Error.Text & ": '" & sCar & "'" -- -+ - For Each sCar In aRelease - _Desktop.SendKey(sCar, False) - Next - - Error.Raise(sErr) -- -+ - End - - Static Private Sub GetDesktop() As String -- -+ - If Not $sDesktop Then -- -+ - If Application.Env["KDE_FULL_SESSION"] Then - If Application.Env["KDE_SESSION_VERSION"] = "4" Then - $sDesktop = "KDE4" -@@ -204,24 +204,23 @@ - $sDesktop = "?" - End Select - Endif -- -+ - Endif -- -+ - '$sDesktop = "GNOME" - Return $sDesktop -- -+ - End - -+Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) - --Static Public Sub OpenTerminal(Optional {Dir} As String) ', Optional Command As String) -- - Dim sExec As String - Dim sCmd As String - Dim bNoDir As Boolean - Dim Command As String -- -+ - Select Case GetDesktop() -- -+ - Case "KDE" - sExec = "konsole" - Case "KDE4" -@@ -247,7 +246,7 @@ - Endif - If Command Then sExec &= " -x " & Shell$(Command) - Case "XFCE" -- sExec = "Terminal" -+ sExec = "xfce4-terminal" - If Command Then sExec &= " -x " & Shell$(Command) - Case "LXDE" - sExec = "lxterminal" -@@ -255,46 +254,43 @@ - Case Else - sExec = "xterm" - If Command Then sExec &= " -e " & Shell$(Command) -- -+ - End Select -- -+ - If {Dir} And If Not bNoDir Then - sCmd = "(cd " & Shell$({Dir}) & "; " & sExec & ")" - Else - sCmd = sExec - Endif -- -+ - Shell sCmd -- -+ - End - -- - Static Private Function Type_Read() As String - -- Return GetDesktop() -+ Return GetDesktop() - - End - -- - Static Public Sub _get(Index As Integer) As _DesktopVirtual - - Dim hVirtual As _DesktopVirtual -- -+ - If Not $cDesktop Then $cDesktop = New Collection -- -+ - hVirtual = $cDesktop[Index] - If Not hVirtual Then - hVirtual = New _DesktopVirtual(Index) - $cDesktop[Index] = hVirtual - Endif - Return hVirtual -- -+ - End - -- - Static Private Function Current_Read() As Integer - -- Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] -+ Try Return _Desktop.GetWindowProperty(Atom["_NET_CURRENT_DESKTOP"])[0] - - End - -@@ -313,7 +309,7 @@ - - Static Private Sub Count_Write(Value As Integer) - -- _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) -+ _Desktop.SendClientMessageToRootWindow(Atom["_NET_NUMBER_OF_DESKTOPS"], [Value]) - - End - -@@ -343,40 +339,40 @@ - - Static Private Sub Showing_Write(Value As Boolean) - -- _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) -+ _Desktop.SendClientMessageToRootWindow(Atom["_NET_SHOWING_DESKTOP"], [If(Value, 1, 0)]) - - End - - ' Static Private Function Width_Read() As Integer --' -+' - ' Dim iWidth As Integer --' -+' - ' Try iWidth = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[0] - ' If iWidth = 0 Then iWidth = Super.Width - ' Return iWidth --' -+' - ' End --' -+' - ' Static Private Function Height_Read() As Integer --' -+' - ' Dim iHeight As Integer --' -+' - ' Try iHeight = _Desktop.GetWindowProperty(Atom["_NET_DESKTOP_GEOMETRY"])[1] - ' If iHeight = 0 Then iHeight = Super.Height - ' Return iHeight --' -+' - ' End - - ' Static Private Function W_Read() As Integer --' -+' - ' Return Width_Read() --' -+' - ' End --' -+' - ' Static Private Function H_Read() As Integer --' -+' - ' Return Height_Read() --' -+' - ' End - - Static Private Function Passwords_Read() As _Desktop_Passwords -@@ -385,7 +381,6 @@ - - End - -- - Static Private Function Path_Read() As String - - Return Main.GetDesktopPath() -@@ -399,34 +394,33 @@ - End - - Static Public Sub RunAsRoot(Command As String) -- -+ - Main.RunXdgUtil("xdg-su", ["-c", Command]) -- - - End - - Static Public Sub GetFileIcon(Path As String, Size As Integer, Optional Preview As Boolean) As Picture -- -+ - Dim hImage As Image - Dim hIcon As Image - Dim sIcon As String - Dim hPict As Picture -- -+ - If IsDir(Path) Then Return Picture["icon:/" & CStr(Size) & "/directory"] -- -+ - If Preview And If $aImgExt.Exist(File.Ext(Path)) < 0 Then -- If Stat(Path).Size <= 65536 Then -- -+ If Stat(Path).Size <= 65536 Then -+ - Try hImage = Image.Load(Path) - If Not Error Then -- If Not (hImage.Width = Size And hImage.Height = Size) Then -- If hImage.Width > hImage.Height Then -+ If Not (hImage.Width = Size And hImage.Height = Size) Then -+ If hImage.Width > hImage.Height Then - hImage = hImage.Stretch(Size, (Size * hImage.Height) \ hImage.Width) - Else - hImage = hImage.Stretch((Size * hImage.Width) \ hImage.Height, Size) - Endif - Endif -- -+ - hIcon = New Image(hImage.W + 4, hImage.H + 4, Color.Transparent) - Paint.Begin(hIcon) - Paint.AntiAlias = False -@@ -435,38 +429,38 @@ - Paint.Stroke - Paint.End - hIcon.DrawImage(hImage, 2, 2) -- -+ - Return hIcon.Picture - Else -- Return Picture["icon:/" & Size & "/image"] -+ Return Picture["icon:/" & Size & "/image"] - Endif -- -+ - Endif -- -+ - Endif - - Try hPict = DesktopMime.FromFile(Path).GetIcon(Size).Picture - If hPict Then Return hPict -- -+ - If Not $cExt Then InitFileExt -- -+ - Try sIcon = $cExt[File.Ext(Path)] - If sIcon Then Return Picture["icon:/" & CStr(Size) &/ sIcon] -- -+ - With Stat(Path) -- -+ - If InStr(.Perm[System.User.Name], "x") Then Return Picture["icon:/" & CStr(Size) &/ "exec"] -- -+ - End With -- -+ - Catch -- -+ - Error "gb.desktop: unable to get icon for file: "; File.Name(Path) -- -+ - End - - Static Private Sub InitFileExt() -- -+ - $cExt = New Collection - $cExt["html"] = "html" - $cExt["htm"] = "html" -@@ -502,7 +496,7 @@ - $cExt["ico"] = "image" - $cExt["xcf"] = "image" - $cExt["svg"] = "image" -- -+ - $aImgExt = ["png", "jpeg", "jpg", "gif", "xpm", "bmp", "ico"] -- -+ - End diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index 7a0379815..40bc64972 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84760 2013-02-24 12:07:30Z jlichtblau $ +# $Id: PKGBUILD 88623 2013-04-20 17:34:23Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.7 +pkgver=3.3.8 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('x86_64' 'i686') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('fd01c21b54a3c48cac3e7885f26d4ca10ea9944238776b8ce03489e5e45c592b') +sha256sums=('ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog index 9101abbb8..a230f5fcf 100644 --- a/community/geos/geos.changelog +++ b/community/geos/geos.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * geos 3.3.8-1 + 2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * geos 3.3.7-1 diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 72aee9d8e..ba20f9ea9 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87641 2013-04-04 13:30:22Z spupykin $ +# $Id: PKGBUILD 88611 2013-04-20 16:45:04Z heftig $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -7,7 +7,7 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") pkgver=1.5.5.1 -pkgrel=1 +pkgrel=2 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") @@ -18,12 +18,16 @@ source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz md5sums=('ec68076448166ea18d15c0a69489dd25' '120319b0d6c81c5af186abe2281b79ca') -build() { +prepare() { cd "${srcdir}/gmic-${pkgver}" patch -p1 -i "${srcdir}/opencv-buildfix.patch" find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \; find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile +} + +build() { + cd "${srcdir}/gmic-${pkgver}" make -C src all } diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD index a9c611216..8d2ec7fff 100644 --- a/community/libgtksourceviewmm2/PKGBUILD +++ b/community/libgtksourceviewmm2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63642 2012-02-05 12:02:56Z ibiru $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> +# $Id: PKGBUILD 88627 2013-04-20 17:41:57Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.orgg> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=libgtksourceviewmm2 -pkgver=2.10.1 -pkgrel=2 +pkgver=2.10.3 +pkgrel=1 pkgdesc='A C++ API for gtksourceview2' arch=('i686' 'x86_64') url='http://projects.gnome.org/gtksourceviewmm/' @@ -12,8 +12,8 @@ license=('LGPL') depends=('gtkmm' 'gtksourceview2') makedepends=('doxygen' 'glibmm-docs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.bz2") -md5sums=('83d1b3dc061f02f4ff1766b37302058e') +source=(http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.xz) +sha256sums=('0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b') build() { cd gtksourceviewmm-${pkgver} diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD index 3719e587e..307d2d90d 100644 --- a/community/libnewt/PKGBUILD +++ b/community/libnewt/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 81605 2012-12-25 00:34:10Z foutrelis $ +# $Id: PKGBUILD 88638 2013-04-20 19:08:21Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=libnewt -pkgver=0.52.12 +pkgver=0.52.15 +pkgrel=1 _tclver=8.6 -pkgrel=5 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang" -arch=('i686' 'x86_64') -url='http://www.redhat.com/' +arch=('x86_64' 'i686') +url='https://fedorahosted.org/newt/' license=('GPL') depends=('slang' 'popt' 'gpm') makedepends=("tcl>=$_tclver" 'python2') @@ -18,15 +18,20 @@ optdepends=('tcl: whiptcl support' \ 'python2: libnewt api through _snack module') options=('!makeflags') source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz") -sha256sums=('2ba88dc3d118daf509c58e3707c43ad57dd3415d8164054e93fe76439f348529') +sha256sums=('7a6151923e7a8a950f9a8a21668a5780d09b0f35f9d76a7ec606c71c35a0e241') -build() { +prepare() { cd "$srcdir/newt-$pkgver" sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in sed -i 's:bin/python:bin/python2:' *.py - ./configure --prefix=/usr --with-gpm-support echo '#define USE_INTERP_RESULT 1' >> config.h +} + +build() { + cd "$srcdir/newt-$pkgver" + + ./configure --prefix=/usr --with-gpm-support make } diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 874b8a136..bc5946b0e 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 85372 2013-03-01 10:35:25Z andrea $ +# $Id: PKGBUILD 88633 2013-04-20 18:17:17Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr -pkgver=2.3.0 -pkgrel=5 +pkgver=2.3.1 +pkgrel=1 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' license=('GPL') depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qtwebkit') -makedepends=('cmake') +makedepends=('cmake' 'boost' 'gtest') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) -sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676') +sha256sums=('7a2a81cd0f2da6b6780bdd47e5f902c9dfaeb8107d763ea63007b6fcdcb4d23b') build() { - cd "${srcdir}/luminance-hdr-${pkgver}" + cd "${srcdir}" cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/luminance-hdr-${pkgver}" + cd "${srcdir}" make DESTDIR="${pkgdir}" install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index c3c1f1197..908eb4476 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.1-1 + 2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.3.0-2 exiv2-0.23 rebuild diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index d4c742a66..3fc75d039 100644 --- a/community/mp3splt-gtk/PKGBUILD +++ b/community/mp3splt-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85719 2013-03-05 18:41:12Z jlichtblau $ +# $Id: PKGBUILD 88581 2013-04-20 15:31:43Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=mp3splt-gtk -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="Split mp3 and ogg files without decoding" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('pkgconfig') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) -sha256sums=('d0bfd6524bd29e061c9d00574c164ed70a112eec11f36ae8a240606c712f1241') +sha256sums=('5634d0a6d15f73affc361c49cafb96a5e53fa2e65a6d7723e74a3a79d3f27c88') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog index 0a86bdfc2..724bd3ded 100644 --- a/community/mp3splt-gtk/mp3splt-gtk.changelog +++ b/community/mp3splt-gtk/mp3splt-gtk.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * mp3splt-gtk 0.8.2-1 + 2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * mp3splt-gtk 0.8.1-1 diff --git a/community/nicotine/PKGBUILD b/community/nicotine/PKGBUILD deleted file mode 100644 index bd3c6e999..000000000 --- a/community/nicotine/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 83656 2013-02-04 10:04:46Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Andrew Wright <andreww@photism.org> - -pkgname=nicotine -pkgver=1.2.16 -pkgrel=5 -pkgdesc='Soulseek music-sharing client, written in python' -arch=('x86_64' 'i686') -url='http://sourceforge.net/projects/nicotine-plus/' -license=('GPL') -depends=('pygtk' 'mutagen') #'python-sexy') TODO: Move python-sexy from AUR -makedepends=('setconf') -optdepends=('python2-geoip: to enable Geographical blocker') -source=("http://downloads.sourceforge.net/project/nicotine-plus/nicotine-plus/${pkgver}/${pkgname}+-${pkgver}.tar.bz2") -sha256sums=('71e5b33e273daaf072dbf63839536c14d7ead9d149323d50eee09f7429e34c1d') - -build() { - cd "$srcdir/${pkgname}+-$pkgver" - - # Fix for FS#22476 - setconf files/nicotine.desktop Icon nicotine-plus-32px - - # Python fix - sed -i -e 's|/usr/bin/env python|/usr/bin/env python2|' \ - -e 's|/usr/bin/python|/usr/bin/python2|' pynicotine/{,gtkgui/}*.py - - cd trayicon - python2 autogen.py - make -} - -package() { - cd "$srcdir/${pkgname}+-$pkgver" - - python2 setup.py install --root="$pkgdir" - cd trayicon - make DESTDIR="$pkgdir" install - ln -s nicotine.py "$pkgdir/usr/bin/nicotine" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/nzbget/PKGBUILD b/community/nzbget/PKGBUILD index 18385aef8..1643a3606 100644 --- a/community/nzbget/PKGBUILD +++ b/community/nzbget/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 83419 2013-01-31 20:33:20Z jlichtblau $ +# $Id: PKGBUILD 88583 2013-04-20 15:33:34Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=nzbget -pkgver=9.1 +pkgver=10.2 pkgrel=1 pkgdesc="Download from Usenet using .nzb files" arch=('x86_64' 'i686') @@ -13,7 +13,7 @@ depends=('gnutls' 'libpar2' 'libxml2' 'libsigc++' 'libgcrypt') makedepends=('autoconf' 'automake') changelog=$pkgname.changelog source=(http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.gz) -sha256sums=('0cd20e1c78359c720862c19c5fd908dc10d6b54658441b86f9caaa71f66e5633') +sha256sums=('c9b878744c162e7721ffc8b048a2e4550a8ed8da6e706ee4cbd026ed2d612ec2') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/nzbget/nzbget.changelog b/community/nzbget/nzbget.changelog index 7a021fd20..e0ea55273 100644 --- a/community/nzbget/nzbget.changelog +++ b/community/nzbget/nzbget.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * nzbget 10.2-1 + 2013-01-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * nzbget 9.1-1 diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index fd44dc76f..cf038c179 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88354 2013-04-16 15:17:44Z svenstaro $ +# $Id: PKGBUILD 88614 2013-04-20 16:45:07Z heftig $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio pkgver=1.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index 1070ca369..1ff9bef08 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,7 +1,8 @@ +# $Id: PKGBUILD 88615 2013-04-20 16:45:08Z heftig $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage pkgver=1.3.0 -pkgrel=3 +pkgrel=4 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) url="http://code.google.com/p/openshadinglanguage/" @@ -31,12 +32,12 @@ package() { make DESTDIR="$pkgdir/" install - mkdir -p $pkgdir/usr/share/OSL/ - mkdir -p $pkgdir/usr/share/licenses/$pkgname - mv $pkgdir/usr/LICENSE $pkgdir/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit - mv $pkgdir/usr/{CHANGES,README.md,INSTALL} $pkgdir/usr/share/OSL/ - mv $pkgdir/usr/doc $pkgdir/usr/share/OSL/doc - mv $pkgdir/usr/shaders $pkgdir/usr/share/OSL/shaders + mkdir -p "$pkgdir"/usr/share/OSL/ + mkdir -p "$pkgdir"/usr/share/licenses/$pkgname + mv "$pkgdir"/usr/LICENSE "$pkgdir"/usr/share/licenses/$pkgname # TODO: Tell upstream about this shit + mv "$pkgdir"/usr/{CHANGES,README.md,INSTALL} "$pkgdir"/usr/share/OSL/ + mv "$pkgdir"/usr/doc "$pkgdir"/usr/share/OSL/doc + mv "$pkgdir"/usr/shaders "$pkgdir"/usr/share/OSL/shaders } # vim:set ts=2 sw=2 et: diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 92ef3dedd..4d40f0ede 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 86853 2013-03-23 07:25:44Z bpiotrowski $ +# $Id: PKGBUILD 88617 2013-04-20 16:45:11Z heftig $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=2 +pkgrel=3 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 8f8d7477e..fd9157b4b 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,72 +1,68 @@ -# $Id: PKGBUILD 79309 2012-11-02 16:29:05Z spupykin $ +# $Id: PKGBUILD 88636 2013-04-20 19:00:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20121022 -pkgrel=2 -pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems" -arch=('i686' 'x86_64') -url="http://swtch.com/plan9port/" +pkgver=20130320 +pkgrel=1 +pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems' +arch=('x86_64' 'i686') +url='http://swtch.com/plan9port/' license=('custom') -depends=(xorg-server libxt libxext sh fuse) +depends=('xorg-server' 'libxt' 'libxext' 'sh' 'fuse') optdepends=('python2: for the codereview script') provides=('plan9') -install=plan9.install -options=(!zipman) -source=(http://swtch.com/$pkgname/$pkgname-$pkgver.tgz plan9.sh) -sha256sums=('1293b5d2e46d0d6f7be2adbdb285ce278a25c77e88b5cd7c230e16a47d0f8638' +install='plan9.install' +options=('!zipman') +source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz" + 'plan9.sh') +sha256sums=('49a5e6c97c76f0846c45791bda10d6b3ba5c4453855e401980e8e04f92e830fa' '0247c4446497359d305aaec069b07180fbf79ce4fa5191464cd9ebb8c7f0228d') -build() { - cd "$srcdir/plan9" - - ./INSTALL -b -} - package() { cd "$srcdir/plan9" - install -Dm755 ../plan9.sh $pkgdir/etc/profile.d/plan9.sh - - mkdir -p "$pkgdir/opt" - cp -r $srcdir/plan9 $pkgdir/opt/ - - mkdir -p $pkgdir/usr/share/doc/$pkgname + # Package + ./INSTALL -b + install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh" + mkdir -p "$pkgdir/opt" "$pkgdir/usr/share/doc/$pkgname" + cp -r "$srcdir/plan9" "$pkgdir/opt/" cd "$pkgdir/opt/plan9" ./INSTALL -c -r "$pkgdir/opt/plan9" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - - # Don't need these under /opt/plan9. + # Clean up rm -rf .hg/ rm -f .hgignore .hgtags find . -name '.cvsignore' -print0 |xargs -0 rm -f rm -f config install.log install.sum install.txt configure Makefile INSTALL \ LICENSE - msg2 "Fixing hardcoded paths..." + # Fix hardcoded paths for f in `grep -H -r "$pkgdir/opt/plan9" | cut -d: -f1`; do echo -n "\t$f" [ -e "$f" ] && sed -i "s:$pkgdir/opt/plan9:/opt/plan9:" "$f" || true done + # Fix python scripts find "$pkgdir" -name '*.py' -print0 |xargs -0 \ sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/python2,' \ -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' + # Package text files for i in CHANGES CONTRIBUTORS README TODO; do install -m644 $i "$pkgdir/usr/share/doc/$pkgname" rm -f $i done - echo "==> Decompressing plan9 man pages" + # Decompress the plan9 man pages for i in `find /opt/plan9/man -type f`; do if [ ${i##*.} = "gz" ]; then -# echo " ${i%%.*}..." - gunzip $i + gunzip "$i" fi done } + +# vim:set ts=2 sw=2 et: diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 90d5ea67a..049cda336 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 85725 2013-03-05 19:16:19Z jlichtblau $ +#$Id: PKGBUILD 88593 2013-04-20 16:06:40Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.7 +pkgver=0.7.0 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support' install=$pkgname.install changelog=$pkgname.changelog source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('82d8ed7f3678695e213f0989f869095b37bd212d23ad2827981bc65225d59f8c') +sha256sums=('2f9a67821a711f925e27d7254eb3039d31019fe1a2aaa7a901be0d2f9066183d') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index af394d59f..57758c02f 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.7.0-1 + 2013-03-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.7-1 diff --git a/community/unrtf/PKGBUILD b/community/unrtf/PKGBUILD index 1b3950de9..44cb83f66 100644 --- a/community/unrtf/PKGBUILD +++ b/community/unrtf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 60272 2011-12-08 20:04:08Z jlichtblau $ +# $Id: PKGBUILD 88595 2013-04-20 16:12:02Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: froggie <sullivanva@gmail.com> pkgname=unrtf -pkgver=0.21.2 +pkgver=0.21.3 pkgrel=1 pkgdesc="Command-line program which converts RTF documents to other formats" arch=('i686' 'x86_64') @@ -13,14 +13,11 @@ license=('GPL3') depends=('glibc') changelog=$pkgname.changelog source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('acb1b093dd2c7485fc43b128ccaf665d6188f568752cec96d54b693374caddb0') +sha256sums=('8aec68a5583fea8ac575cdb6bbd111ecc6700054127ab12023ac94729da77536') build() { cd ${srcdir}/$pkgname-$pkgver -# bugfix FS#14043 - sed -e 's|/usr/local|/usr|' -i src/{main.h,path.h} - ./configure --prefix=/usr make } diff --git a/community/unrtf/unrtf.changelog b/community/unrtf/unrtf.changelog index 04b898b16..fc7f75065 100644 --- a/community/unrtf/unrtf.changelog +++ b/community/unrtf/unrtf.changelog @@ -1,3 +1,6 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * unrtf 0.21.3-1 + 2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * unrtf 0.21.2 diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD index 1b103536b..476fa519f 100644 --- a/community/yaws/PKGBUILD +++ b/community/yaws/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85282 2013-02-28 12:10:15Z arodseth $ +# $Id: PKGBUILD 88640 2013-04-20 21:08:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Patrick Smits <mail@patricksmits.net> pkgname=yaws -pkgver=1.95 -pkgrel=5 +pkgver=1.96 +pkgrel=1 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework' arch=('x86_64' 'i686') url='http://yaws.hyber.org/' @@ -17,17 +17,22 @@ install=$pkgname.install optdepends=('erlang-nox: Erlang without X (headless)') source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz" "$pkgname.service") -sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406' +sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2' '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698') -build() { +prepare() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var # python2 fix for file in cgi.yaws cgi-bin/foo.py; do sed -i '0,/on/s//on2/' "www/$file" done +} + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index 8373e9385..81508b46b 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87054 2013-03-26 11:49:48Z foutrelis $ +# $Id: PKGBUILD 88599 2013-04-20 16:23:14Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,8 +7,8 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.49 -pkgrel=2 +pkgver=4.2.54 +pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64') url="http://www.indexdata.dk/yaz" @@ -17,7 +17,7 @@ depends=('openssl' 'libxslt' 'icu') options=('!libtool') changelog=$pkgname.changelog source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('b4dd27100fdf18219a0e1fde53eaf385e426db6795ab4fbb4a01796d4c9056a1') +sha256sums=('a11fb3b7129bec80311f8e27a0717b9bf6d7c56049674bb5477b91e7e98d2087') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog index 2124e895e..27f48a9c4 100644 --- a/community/yaz/yaz.changelog +++ b/community/yaz/yaz.changelog @@ -1,2 +1,5 @@ +2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * yaz 4.2.54-1 + 2013-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * yaz 4.2.49-1 diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index b0edba380..7581b9d5f 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180517 2013-03-22 13:51:08Z andyrtr $ +# $Id: PKGBUILD 183276 2013-04-20 14:43:27Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) @@ -14,13 +14,13 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -sha1sums=(8b60a26b7eae1a727d58932d6b1efeb5716648ed'') +sha1sums=('c9998383532ba3e8bcaf690f2f0d65e814b48d2f') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-static \ - --disable-padlock-support #$EXTRAFLAGS + --disable-padlock-support make } diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 007b3ce5f..02a4f3a58 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182625 2013-04-11 16:04:29Z andrea $ +# $Id: PKGBUILD 183278 2013-04-20 16:41:10Z heftig $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -18,11 +18,11 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.6.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD index 9473111c1..c298060dd 100644 --- a/extra/cinepaint/PKGBUILD +++ b/extra/cinepaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $ +# $Id: PKGBUILD 183279 2013-04-20 16:41:11Z heftig $ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] pkgname=cinepaint pkgver=1.3 -pkgrel=5 +pkgrel=6 pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures" arch=('i686' 'x86_64') license=('LGPL' 'GPL' 'MIT') @@ -23,18 +23,24 @@ sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b' '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5' 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9') -build() { - cd "${srcdir}/${pkgname}" +prepare() { + cd ${pkgname} patch -p1 -i ../cinepaint-libpng15.patch patch -p1 -i ../cinepaint-missing-include.patch find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} + sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' \ + -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' configure.in -# aclocal -I aclocal -# autoconf + aclocal -I aclocal + autoconf sh autogen.sh - - LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \ +} + +build() { + cd ${pkgname} + LIBS+="-lstdc++ -lm -lX11" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libdir=/usr/lib --mandir=/usr/share/man \ --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2 sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \ plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile @@ -42,7 +48,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd ${pkgname} make DESTDIR="${pkgdir}" install sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \ -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool" diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index bb983bc6a..8ea642657 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,38 +1,31 @@ -# $Id: PKGBUILD 181119 2013-03-31 19:16:43Z stephane $ +# $Id: PKGBUILD 183281 2013-04-20 16:41:14Z heftig $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse -pkgver=4.0 -pkgrel=10 +pkgver=4.1.1 +pkgrel=1 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') url="http://enblend.sourceforge.net" -depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') +depends=('openexr' 'glew' 'freeglut' 'lcms2' 'boost-libs' 'vigra' 'gsl') makedepends=('boost' 'mesa') replaces=('enblend') conflicts=('enblend') provides=('enblend') install=${pkgname}.install -source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz{,.asc} \ - libpng-1.4.patch enblend-4.0-libpng15.patch) -sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' - 'aac6364b29b0a9d6c61c3db0982f52ce1579e934' - 'eae6cf48ea082865130302d0b4d1ca0b884a563b' - '71e961d90be842eafe9d473d8d70b04b29077036') +source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz) +sha1sums=('bc18fca3033b031d603b22678b2e680a0ffae1b6') build() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" - sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx - patch -p1 -i ../libpng-1.4.patch - patch -p0 -i ../enblend-4.0-libpng15.patch - LIBS="-lboost_system" ./configure --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" diff --git a/extra/enblend-enfuse/enblend-4.0-libpng15.patch b/extra/enblend-enfuse/enblend-4.0-libpng15.patch deleted file mode 100644 index d4465ccad..000000000 --- a/extra/enblend-enfuse/enblend-4.0-libpng15.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- src/vigra_impex/png.cxx -+++ src/vigra_impex/png.cxx -@@ -81,7 +81,7 @@ - static void PngError( png_structp png_ptr, png_const_charp error_msg ) - { - png_error_message = std::string(error_msg); -- longjmp( png_ptr->jmpbuf, 1 ); -+ longjmp( png_jmpbuf( png_ptr ), 1 ); - } - - // called on non-fatal errors -@@ -213,7 +213,7 @@ - vigra_postcondition( png != 0, "could not create the read struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() ); - } -@@ -221,14 +221,14 @@ - vigra_postcondition( info != 0, "could not create the info struct." ); - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } - png_init_io( png, file.get() ); - - // specify that the signature was already read -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_read_struct( &png, &info, NULL ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() ); - } -@@ -244,13 +244,13 @@ - void PngDecoderImpl::init() - { - // read all chunks up to the image data -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() ); - png_read_info( png, info ); - - // pull over the header fields - int interlace_method, compression_method, filter_method; -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() ); - png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type, - &interlace_method, &compression_method, &filter_method ); -@@ -264,7 +264,7 @@ - - // transform palette to rgb - if ( color_type == PNG_COLOR_TYPE_PALETTE) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() ); - png_set_palette_to_rgb(png); - color_type = PNG_COLOR_TYPE_RGB; -@@ -273,7 +273,7 @@ - - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); - png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; -@@ -283,7 +283,7 @@ - #if 0 - // strip alpha channel - if ( color_type & PNG_COLOR_MASK_ALPHA ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() ); - png_set_strip_alpha(png); - color_type ^= PNG_COLOR_MASK_ALPHA; -@@ -323,12 +323,12 @@ - - // read icc profile - #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) -- char * dummyName; -+ png_charpp dummyName; - int dummyCompType; -- char * profilePtr; -+ png_bytepp profilePtr; - png_uint_32 profileLen; -- if (info->valid & PNG_INFO_iCCP) { -- png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; -+ if (png_get_valid(png, info, PNG_INFO_iCCP)) { -+ png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ; - iccProfilePtr = (unsigned char *) profilePtr; - iccProfileLength = profileLen; - } -@@ -340,7 +340,7 @@ - // image gamma - double image_gamma = 0.45455; - if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() ); - png_get_gAMA( png, info, &image_gamma ); - } -@@ -349,26 +349,26 @@ - double screen_gamma = 2.2; - - // set gamma correction -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() ); - png_set_gamma( png, screen_gamma, image_gamma ); - #endif - - // interlace handling, get number of read passes needed -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str()); - n_interlace_passes = png_set_interlace_handling(png); - - // update png library state to reflect any changes that were made -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() ); - png_read_update_info( png, info ); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str()); - n_channels = png_get_channels(png, info); - -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str()); - rowsize = png_get_rowbytes(png, info); - -@@ -379,7 +379,7 @@ - void PngDecoderImpl::nextScanline() - { - for (int i=0; i < n_interlace_passes; i++) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str()); - png_read_row(png, row_data.begin(), NULL); - } -@@ -545,7 +545,7 @@ - vigra_postcondition( png != 0, "could not create the write struct." ); - - // create info struct -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() ); - } -@@ -556,7 +556,7 @@ - } - - // init png i/o -- if (setjmp(png->jmpbuf)) { -+ if (setjmp(png_jmpbuf( png ))) { - png_destroy_write_struct( &png, &info ); - vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() ); - } -@@ -571,7 +571,7 @@ - void PngEncoderImpl::finalize() - { - // write the IHDR -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() ); - png_set_IHDR( png, info, width, height, bit_depth, color_type, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, -@@ -579,7 +579,7 @@ - - // set resolution - if (x_resolution > 0 && y_resolution > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() ); - png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5), - (png_uint_32) (y_resolution / 0.0254 + 0.5), -@@ -588,7 +588,7 @@ - - // set offset - if (position.x > 0 && position.y > 0) { -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() ); - png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL); - } -@@ -597,12 +597,12 @@ - // set icc profile - if (iccProfile.size() > 0) { - png_set_iCCP(png, info, "icc", 0, -- (char *)iccProfile.begin(), iccProfile.size()); -+ iccProfile.begin(), iccProfile.size()); - } - #endif - - // write the info struct -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() ); - png_write_info( png, info ); - -@@ -634,10 +634,10 @@ - } - - // write the whole image -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() ); - png_write_image( png, row_pointers.begin() ); -- if (setjmp(png->jmpbuf)) -+ if (setjmp(png_jmpbuf( png ))) - vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() ); - png_write_end(png, info); - } diff --git a/extra/enblend-enfuse/libpng-1.4.patch b/extra/enblend-enfuse/libpng-1.4.patch deleted file mode 100644 index 3bf852b58..000000000 --- a/extra/enblend-enfuse/libpng-1.4.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx ---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx 2010-01-19 22:09:36.000000000 -0500 -+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx 2010-01-19 22:13:43.000000000 -0500 -@@ -275,8 +275,8 @@ - // expand gray values to at least one byte size - if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) { - if (setjmp(png->jmpbuf)) -- vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str()); -- png_set_gray_1_2_4_to_8(png); -+ vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str()); -+ png_set_expand_gray_1_2_4_to_8(png); - bit_depth = 8; - } - diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 300515304..7809431e3 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180552 2013-03-23 07:23:57Z bpiotrowski $ +# $Id: PKGBUILD 183282 2013-04-20 16:41:15Z heftig $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders pkgver=1.7.5 -pkgrel=3 +pkgrel=4 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') url="http://www.enlightenment.org" diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD index 061d99698..b0df14cb0 100644 --- a/extra/fyre/PKGBUILD +++ b/extra/fyre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $ +# $Id: PKGBUILD 183283 2013-04-20 16:41:16Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fyre pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="Rendering of the Peter de Jong map" arch=('i686' 'x86_64') url="http://fyre.navi.cx/" diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index ce98d5f33..5ee14dbf4 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180578 2013-03-23 23:09:32Z td123 $ +# $Id: PKGBUILD 183284 2013-04-20 16:41:17Z heftig $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=6 +pkgrel=7 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64') url="http://www.gegl.org/" @@ -19,9 +19,13 @@ source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar. sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573' 'c10fd988c634fcf0948cc91a51d6528f6f1704ba') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD new file mode 100644 index 000000000..6cd486b41 --- /dev/null +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 183264 2013-04-19 23:02:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgbase=gstreamer-vaapi +pkgname=(gst-vaapi gstreamer0.10-vaapi) +pkgver=0.5.3 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework VA Plugins" +arch=(i686 x86_64) +license=(LGPL) +url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" +makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) +options=(!libtool !emptydirs) + +source=($url/$pkgbase-${pkgver}.tar.bz2) +sha1sums=('f99f657c8c19dd008a8066d8b2237aff4a05810d') + +prepare() { + cd $pkgbase-$pkgver + mkdir build-1.0 build-0.10 +} + + +build() { + cd $pkgbase-$pkgver/build-1.0 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0 + make + + cd ../build-0.10 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 + make +} + +check() { + cd $pkgbase-$pkgver/build-1.0 + make check + + cd ../build-0.10 + make check +} + +package_gst-vaapi() { + depends=(gst-plugins-base gst-plugins-bad libva) + + cd $pkgbase-$pkgver/build-1.0 + make DESTDIR="$pkgdir" install +} + +package_gstreamer0.10-vaapi() { + depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva) + + cd $pkgbase-$pkgver/build-0.10 + make DESTDIR="$pkgdir" install +} diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index f5f608208..96cdd4a34 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182119 2013-04-07 20:49:30Z heftig $ +# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz -pkgver=0.9.15 +pkgver=0.9.16 pkgrel=1 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('214f919c2c998eb1316dd1a14a13adf27460e706a709488777076babf7fbbf1d') +sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 0f4dfca35..3375f4298 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181120 2013-03-31 19:16:44Z stephane $ +# $Id: PKGBUILD 183285 2013-04-20 16:41:18Z heftig $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2012.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index fe1618f48..6d84a4278 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=1.0.3 +pkgver=2.0.0 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" @@ -10,14 +10,10 @@ arch=(i686 x86_64) url="http://www.openexr.com" license=('custom') options=('!libtool') -source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz - ilmbase-IexMath.patch) -md5sums=('d99962ec7e2bfac0647aaabf6b91d5de' - '9c8efaf15f60bccf79749ec879657962') +source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz) build() { cd "${srcdir}/$pkgname-$pkgver" - patch -p0 -i "${srcdir}/ilmbase-IexMath.patch" ./configure --prefix=/usr make } @@ -33,3 +29,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } +md5sums=('70f1413840c2a228783d1332b8b168e6') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 8d8bc6fc4..bfe98c9a8 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181383 2013-04-04 03:27:53Z eric $ +# $Id: PKGBUILD 183287 2013-04-20 16:41:21Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.4.6 +pkgver=6.8.4.10 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -13,16 +13,18 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('80acfe2bcc9b28c84db28a8e94bfa6180dcdd6f5' +sha1sums=('8d5529f35f624b83ad925958c977a381ab30c0f7' 'e143cf9d530fabf3b58023899b5cc544ba93daec') -build() { +prepare() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf --force --install patch -p0 -i "${srcdir}/perlmagick.rpath.patch" +} +build() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index febf4bc16..204600f6a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 180553 2013-03-23 07:23:58Z bpiotrowski $ +# $Id: PKGBUILD 183288 2013-04-20 16:41:22Z heftig $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=5 +pkgrel=6 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') arch=('i686' 'x86_64') makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.0' 'popt' +depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt' 'python2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' @@ -20,13 +20,18 @@ optdepends=('pstoedit: latex formulas' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + inkscape-0.48.4-spuriouscomma.patch) +sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' + '7d1d5a6d1d2b0926721a994d5889c52890fc57c1') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # fix FTBS, patch taken from FC + patch -Np0 -i ${srcdir}/inkscape-0.48.4-spuriouscomma.patch sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py diff --git a/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch new file mode 100644 index 000000000..bc538068f --- /dev/null +++ b/extra/inkscape/inkscape-0.48.4-spuriouscomma.patch @@ -0,0 +1,11 @@ +--- src/widgets/desktop-widget.h~ 2011-07-08 13:25:09.000000000 -0500 ++++ src/widgets/desktop-widget.h 2013-02-15 16:04:45.806910365 -0600 +@@ -239,7 +239,7 @@ + private: + GtkWidget *tool_toolbox; + GtkWidget *aux_toolbox; +- GtkWidget *commands_toolbox,; ++ GtkWidget *commands_toolbox; + GtkWidget *snap_toolbox; + + static void init(SPDesktopWidget *widget); diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index 9f21d9a2d..894a2f870 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 182393 2013-04-09 21:34:09Z eric $ +# $Id: PKGBUILD 183291 2013-04-20 16:41:26Z heftig $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=kdelibs3 pkgver=3.5.10 -pkgrel=16 +pkgrel=17 pkgdesc='KDE3 Core Libraries' arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') -depends=('libxslt' 'pcre' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' +depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper' 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates') makedepends=('cups' 'hspell') optdepends=('hspell: for Hebrew spell-checking support') @@ -35,59 +35,47 @@ sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' 'e5f5b8c060a2db9cedb82bf18caadfa869921779' '6a6c544b3336bfe89bb17ef737d783a7ec006c6c') -build() { - cd "$srcdir"/kdelibs-${pkgver} - - . "$srcdir"/kde3.profile - - patch -p0 -i "$srcdir"/kde-3.5-1074156.patch - patch -p1 -i "$srcdir"/acinclude.patch - patch -p1 -i "$srcdir"/kde4-compatibility.patch - patch -p1 -i "${srcdir}"/openssl.patch - patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch - patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch +prepare() { + cd kdelibs-${pkgver} + patch -p0 -i "$srcdir"/kde-3.5-1074156.patch + patch -p1 -i "$srcdir"/acinclude.patch + patch -p1 -i "$srcdir"/kde4-compatibility.patch + patch -p1 -i "${srcdir}"/openssl.patch + patch -p0 -i "$srcdir"/kdelibs3-missing-include.patch + patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch +} - ./configure --prefix=/opt/kde \ - --with-distribution='Arch Linux' \ - --with-alsa \ - --disable-debug \ - --disable-dnssd \ - --disable-dnotify \ - --enable-inotify \ - --enable-sendfile \ - --without-lua \ - --with-hspell \ - --enable-gcc-hidden-visibility \ - --enable-final \ - --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \ - --without-arts \ - --disable-libfam - make +build() { + cd kdelibs-${pkgver} + ./configure --prefix=/opt/kde --with-distribution='Arch Linux' \ + --with-alsa --disable-dnssd --disable-dnotify \ + --enable-inotify --enable-sendfile --with-hspell \ + --enable-gcc-hidden-visibility --enable-final \ + --without-arts --without-lua --disable-libfam + make } package() { - cd "$srcdir"/kdelibs-${pkgver} + cd kdelibs-${pkgver} - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install - # disable broken kconf_update by default - install -D -m644 "$srcdir"/kconf_updaterc \ - "$pkgdir"/opt/kde/share/config/kconf_updaterc +# disable broken kconf_update by default + install -D -m644 "$srcdir"/kconf_updaterc "$pkgdir"/opt/kde/share/config/kconf_updaterc - # install KDE3 profile - install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh - # make KDE3 styles available to Qt3 - install -d -m755 "$pkgdir"/opt/qt/plugins - ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles +# install KDE3 profile + install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh +# make KDE3 styles available to Qt3 + install -d -m755 "$pkgdir"/usr/lib/qt3/plugins + ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/usr/lib/qt3/plugins/styles - # cert bundle seems to be hardcoded - # link it to the one from ca-certificates - rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt +# cert bundle seems to be hardcoded +# link it to the one from ca-certificates + ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt - # we don't have khelpcenter anyway - rm -rf "$pkgdir"/opt/kde/share/doc +# we don't have khelpcenter anyway + rm -rf "$pkgdir"/opt/kde/share/doc - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf + install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ + echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 08c0b3fe2..60579b81f 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180907 2013-03-27 23:06:26Z andyrtr $ +# $Id: PKGBUILD 183277 2013-04-20 14:43:33Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.43 +pkgver=2.4.44 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -15,25 +15,21 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) - #git_fixes.diff -sha256sums=('7fb8cd89df06e236a66a1a6a9f6d058271c1b1ec92631e08c66dc9e12abd4975' - '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded' +sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2' + 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { cd $pkgname-$pkgver patch -Np1 -i ../no-pthread-stubs.patch - # git_commits - #patch -Np1 -i ${srcdir}/git_fixes.diff - #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ --enable-omap-experimental-api \ - # --enable-exynos-experimental-api \ - # --enable-freedreno-experimental-api + --enable-exynos-experimental-api \ + --enable-freedreno-experimental-api make } diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 3b05ce18d..d49e397b7 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -102,3 +102,20 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am libdrm_exynos_la_SOURCES = exynos_drm.c +--- libdrm-2.4.44/freedreno/Makefile.am 2013-04-19 00:59:07.000000000 +0200 ++++ libdrm-2.4.44/freedreno/Makefile.am.new 2013-04-19 17:19:03.153950143 +0200 +@@ -2,13 +2,12 @@ + $(WARN_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/freedreno \ +- $(PTHREADSTUBS_CFLAGS) \ + -I$(top_srcdir)/include/drm + + libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la + libdrm_freedreno_ladir = $(libdir) + libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined +-libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ ++libdrm_freedreno_la_LIBADD = ../libdrm.la + + libdrm_freedreno_la_SOURCES = \ + freedreno_device.c \ diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index cb897bcbb..e3be4a21c 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182085 2013-04-06 18:07:38Z andyrtr $ +# $Id: PKGBUILD 183292 2013-04-20 16:41:28Z heftig $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.2.2 pkgver=4.0.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.2' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -299,7 +299,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.2" + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 1b57dbcc0..fec3ea1c8 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 166173 2012-09-05 06:04:00Z andyrtr $ +# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps -pkgver=0.2.7 +pkgver=0.2.8 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64') url="http://libwps.sourceforge.net/" license=('LGPL') -depends=('libwpd>=0.9.4') +depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('d197bd6211669a2fa4ca648faf04bcb1') +md5sums=('78196c097db366fac66841d032b1ddac') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 044d675db..88f403d39 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182637 2013-04-11 18:36:34Z schiv $ +# $Id: PKGBUILD 183293 2013-04-20 16:41:29Z heftig $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase=opencv pkgname=('opencv' 'opencv-samples') _realname=OpenCV pkgver=2.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -97,6 +97,10 @@ package_opencv-samples() { mkdir -p "$pkgdir/usr/share/opencv" cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples" + + # install license file + install -Dm644 "$srcdir/opencv-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index 55a64ac24..42666f4d5 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $ +# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openexr -pkgver=1.7.1 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc="An high dynamic-range image file format library" url="http://www.openexr.com/" arch=('i686' 'x86_64') license=('BSD') depends=('zlib' 'ilmbase') options=('!libtool') -source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gcc43.patch') +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i "${srcdir}/gcc43.patch" ./configure --prefix=/usr make } @@ -25,6 +23,4 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } - -md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1' - 'd91fae759053a70bcedcf02eb33ca4a2') +md5sums=('0820e1a8665236cb9e728534ebf8df18') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 32e197ba7..6292d96aa 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 180549 2013-03-23 07:23:53Z bpiotrowski $ +# $Id: PKGBUILD 183295 2013-04-20 16:41:31Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.2 -pkgrel=1 +pkgver=0.22.3 +pkgrel=2 arch=(i686 x86_64) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('3939740201c59c470bc7198003450a20' +md5sums=('be915388eaad6865cee5a156c8119ec1' '9dc64c254a31e570507bdd4ad4ba629a') build() { - . /etc/profile.d/qt4.sh +# . /etc/profile.d/qt4.sh cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} + sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ @@ -44,7 +44,7 @@ check() { package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms2') optdepends=('poppler-data: encoding data to display PDF documents containing CJK characters') conflicts=("poppler-qt3<${pkgver}") |