summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/abook/PKGBUILD11
-rw-r--r--extra/abook/vcard-compat.patch347
-rw-r--r--extra/bzr/PKGBUILD11
-rw-r--r--extra/pixman/PKGBUILD11
-rw-r--r--extra/pixman/test_failures_on_x86-32.diff46
-rw-r--r--extra/xfce4-power-manager/PKGBUILD15
-rw-r--r--extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch34
7 files changed, 458 insertions, 17 deletions
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD
index 45add6b74..7c4e1c16c 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149024 2012-02-05 14:23:12Z bisson $
+# $Id: PKGBUILD 160233 2012-05-31 11:55:41Z bisson $
# Contributor: damir <damir@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,17 +6,20 @@
pkgname=abook
pkgver=0.6.0pre2
-pkgrel=4
+pkgrel=5
pkgdesc='Text-based addressbook designed for use with Mutt'
arch=('i686' 'x86_64')
url='http://abook.sourceforge.net/'
license=('GPL2')
depends=('readline')
-source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz")
-sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec')
+source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz"
+ 'vcard-compat.patch')
+sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec'
+ 'feb35deb79116c187953d06e514c7918be5646b6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../vcard-compat.patch
./configure --prefix=/usr --mandir=/usr/share/man
make
}
diff --git a/extra/abook/vcard-compat.patch b/extra/abook/vcard-compat.patch
new file mode 100644
index 000000000..cc8ea7f3f
--- /dev/null
+++ b/extra/abook/vcard-compat.patch
@@ -0,0 +1,347 @@
+diff -aur old/filter.c new/filter.c
+--- old/filter.c 2006-09-06 15:26:10.000000000 +1000
++++ new/filter.c 2012-05-31 17:48:18.644744197 +1000
+@@ -44,6 +44,7 @@
+ static int csv_parse_file(FILE *in);
+ static int allcsv_parse_file(FILE *in);
+ static int palmcsv_parse_file(FILE *in);
++static int vcard_parse_file(FILE *in);
+
+ /*
+ * export filter prototypes
+@@ -75,6 +76,7 @@
+ { "csv", N_("comma separated values"), csv_parse_file },
+ { "allcsv", N_("comma separated values (all fields)"), allcsv_parse_file },
+ { "palmcsv", N_("Palm comma separated values"), palmcsv_parse_file },
++ { "vcard", N_("vCard file"), vcard_parse_file },
+ { "\0", NULL, NULL }
+ };
+
+@@ -1331,6 +1333,263 @@
+ */
+
+ /*
++ * vCard import filter
++ */
++
++static char *vcard_fields[] = {
++ "FN", /* NAME */
++ "EMAIL", /* EMAIL */
++ "ADR", /* ADDRESS */
++ "ADR", /* ADDRESS2 - not used */
++ "ADR", /* CITY */
++ "ADR", /* STATE */
++ "ADR", /* ZIP */
++ "ADR", /* COUNTRY */
++ "TEL", /* PHONE */
++ "TEL", /* WORKPHONE */
++ "TEL", /* FAX */
++ "TEL", /* MOBILEPHONE */
++ "NICKNAME", /* NICK */
++ "URL", /* URL */
++ "NOTE", /* NOTES */
++ "BDAY", /* ANNIVERSARY */
++ NULL
++};
++
++/*
++ * mappings between vCard ADR field and abook's ADDRESS
++ * see rfc2426 section 3.2.1
++ */
++static int vcard_address_fields[] = {
++ -1, /* vCard(post office box) - not used */
++ -1, /* vCard(the extended address) - not used */
++ 2, /* vCard(the street address) - ADDRESS */
++ 4, /* vCard(the locality) - CITY */
++ 5, /* vCard(the region) - STATE */
++ 6, /* vCard(the postal code) - ZIP */
++ 7 /* vCard(the country name) - COUNTRY */
++};
++
++enum {
++ VCARD_KEY = 0,
++ VCARD_KEY_ATTRIBUTE,
++ VCARD_VALUE,
++};
++
++static char *
++vcard_get_line_element(char *line, int element)
++{
++ int i;
++ char *line_copy = 0;
++ char *result = 0;
++ char *key = 0;
++ char *key_attr = 0;
++ char *value = 0;
++
++ line_copy = xstrdup(line);
++
++ /* make newline characters if exist end of string */
++ for(i=0; line_copy[i]; i++) {
++ if(line_copy[i] == '\r' || line_copy[i] == '\n') {
++ line_copy[i] = '\0';
++ break;
++ }
++ }
++
++ /* separate key from value */
++ for(i=0; line_copy[i]; i++) {
++ if(line_copy[i] == ':') {
++ line_copy[i] = '\0';
++ key = line_copy;
++ value = &line_copy[i+1];
++ break;
++ }
++ }
++
++ /* separate key from key attributes */
++ if (key) {
++ for(i=0; key[i]; i++) {
++ if(key[i] == ';') {
++ key[i] = '\0';
++ key_attr = &key[i+1];
++ break;
++ }
++ }
++ }
++
++ switch(element) {
++ case VCARD_KEY:
++ if(key)
++ result = xstrdup(key);
++ break;
++ case VCARD_KEY_ATTRIBUTE:
++ if(key_attr)
++ result = xstrdup(key_attr);
++ break;
++ case VCARD_VALUE:
++ if(value)
++ result = xstrdup(value);
++ break;
++ }
++
++ xfree(line_copy);
++ return result;
++}
++
++static void
++vcard_parse_email(list_item item, char *line)
++{
++ char *email;
++
++ email = vcard_get_line_element(line, VCARD_VALUE);
++
++ if(item[1]) {
++ item[1] = strconcat(item[1], ",", email, 0);
++ xfree(email);
++ }
++ else {
++ item[1] = email;
++ }
++}
++
++static void
++vcard_parse_address(list_item item, char *line)
++{
++ int i;
++ int k;
++ char *value;
++ char *address_field;
++
++ value = vcard_get_line_element(line, VCARD_VALUE);
++ if(!value)
++ return;
++
++ address_field = value;
++ for(i=k=0; value[i]; i++) {
++ if(value[i] == ';') {
++ value[i] = '\0';
++ if(vcard_address_fields[k] >= 0) {
++ item[vcard_address_fields[k]] = xstrdup(address_field);
++ }
++ address_field = &value[i+1];
++ k++;
++ if((k+1)==(sizeof(vcard_address_fields)/sizeof(*vcard_address_fields)))
++ break;
++ }
++ }
++ item[vcard_address_fields[k]] = xstrdup(address_field);
++ xfree(value);
++}
++
++static void
++vcard_parse_phone(list_item item, char *line)
++{
++ int index = 8;
++ char *type = vcard_get_line_element(line, VCARD_KEY_ATTRIBUTE);
++ char *value = vcard_get_line_element(line, VCARD_VALUE);
++
++ /* set the standard number */
++ if (!type) {
++ item[index] = value;
++ }
++
++ /*
++ * see rfc2426 section 3.3.1
++ */
++ else if (strstr(type, "TYPE=") == type){
++ if (strcasestr(type, "home")) {
++ item[index] = xstrdup(value);
++ }
++ if (strcasestr(type, "work")) {
++ item[index+1] = xstrdup(value);
++ }
++ if (strcasestr(type, "fax")) {
++ item[index+2] = xstrdup(value);
++ }
++ if (strcasestr(type, "cell")) {
++ item[index+3] = xstrdup(value);
++ }
++
++ xfree(type);
++ xfree(value);
++ }
++}
++
++static void
++vcard_parse_line(list_item item, char *line)
++{
++ int i;
++ char *key;
++
++ for(i=0; vcard_fields[i]; i++) {
++ key = vcard_fields[i];
++
++ if(!strncmp(key, line, strlen(key))) {
++ if(i == 1) {
++ vcard_parse_email(item, line);
++ }
++ else if(i == 2) {
++ vcard_parse_address(item, line);
++ }
++ else if(i == 8) {
++ vcard_parse_phone(item, line);
++ }
++ else {
++ item[i] = vcard_get_line_element(line, VCARD_VALUE);
++ }
++ break;
++ }
++ }
++}
++
++static void
++vcard_parse_item(FILE *in)
++{
++ char *line = NULL;
++ list_item item = item_create();
++
++ while(!feof(in)) {
++ line = getaline(in);
++
++ if(line && !strncmp("END:VCARD", line, 9)) {
++ xfree(line);
++ break;
++ }
++ else if(line) {
++ vcard_parse_line(item, line);
++ xfree(line);
++ }
++ }
++
++ add_item2database(item);
++ item_free(&item);
++}
++
++static int
++vcard_parse_file(FILE *in)
++{
++ char *line = NULL;
++
++ while(!feof(in)) {
++ line = getaline(in);
++
++ if(line && !strncmp("BEGIN:VCARD", line, 11)) {
++ xfree(line);
++ vcard_parse_item(in);
++ }
++ else if(line) {
++ xfree(line);
++ }
++ }
++
++ return 0;
++}
++
++/*
++ * end of vCard import filter
++ */
++
++/*
+ * csv addressbook export filters
+ */
+
+@@ -1547,10 +1806,18 @@
+
+ free(name);
+
++ if(db_fget(e.item, NICK))
++ fprintf(out, "NICKNAME:%s\r\n",
++ db_fget(e.item, NICK));
++
++ if(db_fget(e.item, ANNIVERSARY))
++ fprintf(out, "BDAY:%s\r\n",
++ db_fget(e.item, ANNIVERSARY));
++
+ if(db_fget(e.item, ADDRESS))
+- fprintf(out, "ADR:;;%s;%s;%s;%s;%s;%s\r\n",
+- safe_str(db_fget(e.item, ADDRESS)),
++ fprintf(out, "ADR:;%s;%s;%s;%s;%s;%s\r\n",
+ safe_str(db_fget(e.item, ADDRESS2)),
++ safe_str(db_fget(e.item, ADDRESS)),
+ safe_str(db_fget(e.item, CITY)),
+ safe_str(db_fget(e.item, STATE)),
+ safe_str(db_fget(e.item, ZIP)),
+diff -aur old/misc.c new/misc.c
+--- old/misc.c 2006-09-05 05:24:18.000000000 +1000
++++ new/misc.c 2012-05-31 17:40:46.241284874 +1000
+@@ -77,6 +77,27 @@
+ return 1;
+ }
+
++char *
++strcasestr(char *haystack, char *needle)
++{
++ int i;
++ int k;
++
++ assert(haystack != NULL);
++ assert(needle != NULL);
++
++ for(i=0; i<strlen(haystack)-strlen(needle)+1; i++) {
++ for(k=0; k<strlen(needle); k++, i++) {
++ if (tolower(haystack[i]) != tolower(needle[k]))
++ break;
++ else if ((k+1) == strlen(needle))
++ return &haystack[i];
++ }
++ }
++
++ return NULL;
++}
++
+
+ #ifdef HAVE_CONFIG_H
+ # include "config.h"
+diff -aur old/misc.h new/misc.h
+--- old/misc.h 2006-09-05 05:24:18.000000000 +1000
++++ new/misc.h 2012-05-31 17:40:46.241284874 +1000
+@@ -18,6 +18,8 @@
+
+ int is_number(char *s);
+
++char *strcasestr(char *haystack, char *needle);
++
+ char *strdup_printf(const char *format, ... );
+ char *strconcat(const char *str, ...);
+
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index 98cd43be0..77b8370de 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153560 2012-03-16 02:18:57Z eric $
+# $Id: PKGBUILD 160247 2012-05-31 16:28:09Z eric $
# Maintainer :
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=bzr
-pkgver=2.5.0
+pkgver=2.5.1
pkgrel=1
pkgdesc="A decentralized revision control system (bazaar)"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('GPL')
depends=('python2')
optdepends=('python-paramiko: for sftp support')
source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('44eb47b77995098a28f017e2daa606b6'
- 'b0d4a26a3dde94f30e142868b896fed5')
+md5sums=('ac5079858364a046071000d5cdccb67b'
+ 'c83dd08dd2c3e27edbab873500d7d6eb')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,5 +28,6 @@ package() {
python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
# bash-completion
- install -D -m644 contrib/bash/bzr "${pkgdir}/etc/bash_completion.d/bzr"
+ install -D -m644 contrib/bash/bzr \
+ "${pkgdir}/usr/share/bash-completion/completions/bzr"
}
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 83f1867d3..7fa36b87c 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149727 2012-02-09 19:48:22Z andyrtr $
+# $Id: PKGBUILD 160261 2012-05-31 17:12:14Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=pixman
-pkgver=0.24.4
+pkgver=0.26.0
pkgrel=1
pkgdesc="The pixel-manipulation library for X and cairo"
arch=(i686 x86_64)
@@ -11,11 +11,14 @@ url="http://xorg.freedesktop.org"
license=('custom')
depends=('glibc')
options=('!libtool')
-source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('683450f917015366ac7918fc517c76801aeff374')
+source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+ test_failures_on_x86-32.diff)
+sha1sums=('d772cf794ec5da0966eba3cb360919a0a5e0d23f'
+ '24a688271d5cf2c4137a147deaa2975122c01aa8')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/test_failures_on_x86-32.diff
./configure --prefix=/usr --disable-static
make
}
diff --git a/extra/pixman/test_failures_on_x86-32.diff b/extra/pixman/test_failures_on_x86-32.diff
new file mode 100644
index 000000000..6e333c03a
--- /dev/null
+++ b/extra/pixman/test_failures_on_x86-32.diff
@@ -0,0 +1,46 @@
+From da6193b1fcc1dfab27f4c36917864f2f2c41cf3e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 27 May 2012 17:01:57 +0000
+Subject: mmx: add missing _mm_empty calls
+
+Fixes spurious test failures on x86-32.
+---
+diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c
+index bb125bf..6e292c6 100644
+--- a/pixman/pixman-mmx.c
++++ b/pixman/pixman-mmx.c
+@@ -2232,6 +2232,8 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp,
+ w--;
+ }
+ }
++
++ _mm_empty ();
+ }
+
+ static void
+@@ -3542,6 +3544,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask)
+ w--;
+ }
+
++ _mm_empty ();
+ return iter->buffer;
+ }
+
+@@ -3585,6 +3588,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask)
+ w--;
+ }
+
++ _mm_empty ();
+ return iter->buffer;
+ }
+
+@@ -3630,6 +3634,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask)
+ w--;
+ }
+
++ _mm_empty ();
+ return iter->buffer;
+ }
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index f3f460a6a..6adb11b90 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157932 2012-04-30 06:20:21Z foutrelis $
+# $Id: PKGBUILD 160263 2012-05-31 17:40:20Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
pkgname=xfce4-power-manager
pkgver=1.2.0
-pkgrel=2
+pkgrel=3
pkgdesc="Power manager for Xfce desktop"
arch=('i686' 'x86_64')
url="http://xfce-goodies.berlios.de/"
@@ -14,12 +14,19 @@ depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
makedepends=('pkgconfig' 'intltool')
options=('!libtool')
install=$pkgname.install
-source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
-sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9')
+source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2
+ xfce4-power-manager-1.2.0-sync-en-gb-translation.patch)
+sha256sums=('d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9'
+ 'c8e1dfafd685c2abf1fcc2b3682f5b1eb2e7f1d4fa557f11a7478437eef9a933')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Fix en_GB translation
+ # https://bugs.archlinux.org/task/30055
+ patch -d po -Np0 -i \
+ "$srcdir/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch"
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
new file mode 100644
index 000000000..ca7a3dc31
--- /dev/null
+++ b/extra/xfce4-power-manager/xfce4-power-manager-1.2.0-sync-en-gb-translation.patch
@@ -0,0 +1,34 @@
+--- en_GB.po.orig 2012-05-31 20:18:09.000000000 +0300
++++ en_GB.po 2012-05-31 20:25:09.000000000 +0300
+@@ -345,9 +345,8 @@ msgid ""
+ "An application is currently disabling the automatic sleep. Doing this action "
+ "now may damage the working state of this application."
+ msgstr ""
+-"An application is currently disabling the automatic sleep, doing this action "
+-"now may damage the working state of this application, are you sure you want "
+-"to hibernate the system?"
++"An application is currently disabling the automatic sleep. Doing this action "
++"now may damage the working state of this application."
+
+ #: ../src/xfpm-power.c:331
+ msgid "Are you sure you want to hibernate the system?"
+@@ -548,8 +547,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "%s until is fully charged."
+ msgstr ""
+-"%s\n"
+-"Your %s is charging (%i%%)\n"
++"%s (%i%%)\n"
+ "%s until is fully charged."
+
+ #: ../src/xfpm-battery.c:232 ../src/xfpm-battery.c:268
+@@ -568,8 +566,7 @@ msgid ""
+ "%s (%i%%)\n"
+ "Estimated time left is %s."
+ msgstr ""
+-"%s\n"
+-"Your %s is discharging (%i%%)\n"
++"%s (%i%%)\n"
+ "Estimated time left is %s."
+
+ #: ../src/xfpm-battery.c:250 ../src/xfpm-battery.c:271
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-02-17 07:45:00 +0000