diff options
Diffstat (limited to 'extra')
247 files changed, 5449 insertions, 3596 deletions
diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD index fd0323114..398d72d70 100644 --- a/extra/a2ps/PKGBUILD +++ b/extra/a2ps/PKGBUILD @@ -1,52 +1,55 @@ -# $Id: PKGBUILD 123160 2011-05-09 02:11:04Z eric $ +# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=a2ps pkgver=4.14 -pkgrel=2 +pkgrel=4 pkgdesc="An Any to PostScript filter" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/a2ps/" license=('GPL3') -depends=('ghostscript' 'psutils' 'imagemagick' 'perl') +depends=('ghostscript' 'psutils' 'imagemagick') makedepends=('gperf') backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg') options=('!libtool') install=a2ps.install -source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz \ - a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch a2ps-4.13-manpage-chmod.patch \ - a2ps-4.14-check-mempcpy.patch a2ps-4.14-fix-stpcpy-proto.patch) -md5sums=('781ac3d9b213fa3e1ed0d79f986dc8c7' - '93011b58e9f20a7fafa31287a51884a4' - '2e493d0bc00d71eb3e8a9b6febc52b69' - '09cc5ed4d3d8ff1b2103e519191e8286' - '42aa39b74f6da8cf6e94185c4fc3e601' - '066f9327fee6b6eca3a57d657d1097d1') +source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig} + a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch + a2ps-4.13-manpage-chmod.patch a2ps-4.14-check-mempcpy.patch + a2ps-4.14-fix-stpcpy-proto.patch a2ps-texinfo5.patch) sha1sums=('365abbbe4b7128bf70dad16d06e23c5701874852' + 'SKIP' '8783952d3410d8d59ed953e1db45e2ef1a0b8f65' '94e35a6ad9268161bec22a56d4cfb696d635994a' '2bb3d0a2ef2f3ff9262723e35c742a80ab0235ce' '6aed29c1399e79f3914b408059610f9e7c0fc38e' - '58fa90134f1027e3f05aeb08212cbcc10f420738') + '58fa90134f1027e3f05aeb08212cbcc10f420738' + '81269db9dd29685b0ece2539070ced3f7a8472df') + +prepare() { + cd ${pkgname}-${pkgver} + sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ + configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 + sed -i "s:^countdictstack: \0:" contrib/psset.in + patch -p1 -i "${srcdir}/a2ps-4.13c-fnmatch-replacement.patch" + patch -p1 -i "${srcdir}/a2ps-4.13c-emacs.patch" + patch -p1 -i "${srcdir}/a2ps-4.13-manpage-chmod.patch" + patch -p1 -i "${srcdir}/a2ps-4.14-check-mempcpy.patch" + patch -p0 -i "${srcdir}/a2ps-4.14-fix-stpcpy-proto.patch" + patch -p1 -i "${srcdir}/a2ps-texinfo5.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../a2ps-4.13c-fnmatch-replacement.patch - patch -p1 < ../a2ps-4.13c-emacs.patch - patch -p1 < ../a2ps-4.13-manpage-chmod.patch - patch -p1 < ../a2ps-4.14-check-mempcpy.patch - patch -p0 < ../a2ps-4.14-fix-stpcpy-proto.patch - sed -i '/AM_C_PROTOTYPES/d' configure.in - sed -i '/ansi2knr/d' Makefile.am {src,lib,contrib/sample}/Makefile.am + cd ${pkgname}-${pkgver} libtoolize --force --copy - autoreconf -I m4 + autoreconf --force --install -I m4 ./configure --prefix=/usr --sysconfdir=/etc/a2ps \ --includedir=/usr/include --enable-nls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - sed -i "s:^countdictstack: \0:" "${pkgdir}/usr/bin/psset" } diff --git a/extra/a2ps/a2ps-texinfo5.patch b/extra/a2ps/a2ps-texinfo5.patch new file mode 100644 index 000000000..847de44b3 --- /dev/null +++ b/extra/a2ps/a2ps-texinfo5.patch @@ -0,0 +1,46 @@ +diff -Naur a2ps-4.14-orig/doc/a2ps.texi a2ps-4.14/doc/a2ps.texi +--- a2ps-4.14-orig/doc/a2ps.texi 2013-07-30 02:27:21.950434805 -0400 ++++ a2ps-4.14/doc/a2ps.texi 2013-07-30 02:29:07.286445041 -0400 +@@ -22,12 +22,12 @@ + @c `a2ps'. Avoid those quotes. + @iftex + @macro pack +-@code{@value{PACKAGE}}@c ++@code{@value{PACKAGE}} + @end macro + @end iftex + @ifnottex + @macro pack +-@value{PACKAGE}@c ++@value{PACKAGE} + @end macro + @end ifnottex + +@@ -43,11 +43,6 @@ + @end macro + @end ifnottex + +-@c TeX variants +-@macro LaTeX +-La@TeX{} +-@end macro +- + @macro PreTeX + Pre@TeX{} + @end macro +@@ -3965,13 +3960,13 @@ + @itemx \end@{enumerate@} + @itemx \begin@{description@} + @itemx \end@{description@} +-These commands are legal in @LaTeX but have no sense in @PreTeX{}. ++These commands are legal in @LaTeX{} but have no sense in @PreTeX{}. + Hence there are simply ignored and not printed (if immediately followed + by an end-of-line). + @end table + + @node Differences with LaTeX +-@subsubsection Differences with @LaTeX ++@subsubsection Differences with @LaTeX{} + The following symbols, inherited from the style sheet @code{Symbol}, are + not supported by @LaTeX{}: + diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index 4995e372c..40c9e7366 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149328 2012-02-06 20:28:08Z stephane $ +# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $ # Maintainer: # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=a52dec pkgver=0.7.4 -pkgrel=6.2 +pkgrel=7 pkgdesc="A free library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -19,14 +19,17 @@ md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052' 'ccaa978e70cc74b364486bd72fd38d1d') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd "${pkgname}-${pkgver}" + patch -Np1 -i ../a52dec-0.7.4-build.patch + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in mv configure.in configure.ac - patch -p0 -i "$srcdir/configure.patch" - patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch" ./bootstrap - ./configure --prefix=/usr --enable-shared \ - --build=$CHOST --host=$CHOST +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --enable-shared make } diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD index 6433ad1b0..c9427e7a4 100644 --- a/extra/abook/PKGBUILD +++ b/extra/abook/PKGBUILD @@ -1,30 +1,29 @@ -# $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> +# $Id: PKGBUILD 191361 2013-07-24 01:43:47Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: damir <damir@archlinux.org> pkgname=abook -pkgver=0.6.0pre2 -pkgrel=5 +pkgver=0.6.0pre2.20130724 +pkgrel=1 pkgdesc='Text-based addressbook designed for use with Mutt' -arch=('i686' 'x86_64' 'mips64el') url='http://abook.sourceforge.net/' +arch=('i686' 'x86_64' 'mips64el') license=('GPL2') +makedepends=('git') depends=('readline') -source=("http://abook.sourceforge.net/devel/abook-${pkgver}.tar.gz" - 'vcard-compat.patch') -sha1sums=('42a939fba43e51aa011fa185113c12ec4bc1e1ec' - 'feb35deb79116c187953d06e514c7918be5646b6') +source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68") +sha1sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../vcard-compat.patch + cd "${srcdir}/${pkgname}" ./configure --prefix=/usr --mandir=/usr/share/man make + cd po && make update-po } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install } diff --git a/extra/abook/vcard-compat.patch b/extra/abook/vcard-compat.patch deleted file mode 100644 index cc8ea7f3f..000000000 --- a/extra/abook/vcard-compat.patch +++ /dev/null @@ -1,347 +0,0 @@ -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/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD index 5f2e409b9..0bd9d6f68 100644 --- a/extra/akonadi/PKGBUILD +++ b/extra/akonadi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190032 2013-07-13 12:39:56Z svenstaro $ +# $Id: PKGBUILD 191591 2013-07-26 06:33:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=akonadi -pkgver=1.10.0 -pkgrel=2 +pkgver=1.10.2 +pkgrel=1 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" arch=('i686' 'x86_64' 'mips64el') url='http://community.kde.org/KDE_PIM/Akonadi' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'postgresql') optdepends=('postgresql: PostgreSQL backend') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bb94de6a4300bf8355e6a1ccce5846af') +md5sums=('35eb8f76588b1d111f75bc46e3ac784b') prepare() { mkdir build diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index c03207608..179409919 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182673 2013-04-12 14:23:59Z heftig $ +# $Id: PKGBUILD 191885 2013-08-01 06:53:19Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins pkgver=1.0.27 -pkgrel=1 +pkgrel=2 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') url="http://www.alsa-project.org" @@ -14,13 +14,18 @@ depends=(alsa-lib) makedepends=(libpulse jack ffmpeg) optdepends=('libpulse: PulseAudio plugin' 'jack: Jack plugin' - 'ffmpeg: libavcodec resampling plugin' + 'ffmpeg: libavcodec resampling plugin, a52 plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') options=('!libtool') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') +prepare() { + cd $pkgname-$pkgver + sed -i 's/ && LIBAVCODEC_VERSION_MINOR >= 34//' a52/pcm_a52.c +} + build() { cd $pkgname-$pkgver ./configure --prefix=/usr diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD new file mode 100644 index 000000000..260ec0825 --- /dev/null +++ b/extra/alsa-tools/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: Sebastien Luttringer <seblu+arch@seblu.net> +# Contributor: Jochen ImmendÅ“rfer <jochen.immendoerfer@gmail.com> + +pkgname=alsa-tools +pkgver=1.0.27 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://alsa-project.org/" +license=('GPL') +depends=('gcc-libs' 'alsa-lib') +makedepends=('fltk' 'gtk2' 'gtk3') +optdepends=('fltk: hdspconf, hdspmixer' + 'gtk2: other GUI tools' + 'gtk3: hdajackretask' + 'bash: couple of tools') +provides=("$pkgname-emu10k1" "$pkgname-ice1712") +options=('!libtool') +source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2") +md5sums=('1ea381d00a6069a98613aa7effa4cb51') + +_tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb" + "hdspconf" "hdsploader" "hdspmixer" "ld10k1" "mixartloader" + "pcxhrloader" "rmedigicontrol" "sb16_csp" "sbiload" "sscape_ctl" + "us428control" "usx2yloader" "vxloader") + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # qlo10k1 cannot be built; it depends on ld10k1 + sed -i 's:ld10k1 qlo10k1 \\:ld10k1 \\:' Makefile + + # hwmixvolume requires pyalsa, not currently in repos + sed -i 's:hwmixvolume hdajackretask :hdajackretask :' Makefile +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # not using upstream's global makefile as it's too clever + for i in ${_tools[@]}; do + if [ $i != sbiload ]; then + ( + cd $i + ./configure --prefix=/usr --sbindir=/usr/bin + make + ) + else + ( + cd seq/sbiload + ./configure --prefix=/usr --sbindir=/usr/bin + make + ) + fi + done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + for i in ${_tools[@]}; do + if [ $i != sbiload ]; then + ( + cd $i + make DESTDIR="$pkgdir" install + ) + else + ( + cd seq/sbiload + make DESTDIR="$pkgdir" install + ) + fi + done +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 6dfe5274a..fdcd42531 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ +# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27.1 -pkgrel=2 +pkgver=1.0.27.2 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -14,7 +14,6 @@ makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 90alsa) -backup=(etc/conf.d/alsa) build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -39,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('3d81357b997744a139881ef72bc6921a' +md5sums=('b65e9a04181bd7c9db7667a4566f8dc3' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index b0685b62c..781d88be9 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188524 2013-06-15 07:43:53Z andrea $ +# $Id: PKGBUILD 191886 2013-08-01 06:53:20Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -6,7 +6,7 @@ pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD index 6602b518b..1ee8ea565 100644 --- a/extra/apache/PKGBUILD +++ b/extra/apache/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187049 2013-06-03 11:16:09Z allan $ +# $Id: PKGBUILD 190843 2013-07-18 19:19:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apache -pkgver=2.2.24 -pkgrel=3 +pkgver=2.2.25 +pkgrel=1 pkgdesc='A high performance Unix-based HTTP server' arch=('i686' 'x86_64' 'mips64el') options=('!libtool') @@ -38,7 +38,7 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2 httpd.logrotate httpd.service arch.layout) -md5sums=('91bd1484aca13a7095d6432be37fc7ae' +md5sums=('9ebe3070c0bb4311f21a0cd0e34f0045' 'SKIP' 'f1d9d41360908ceb2374da55ae99197a' 'cdfa04985a0efa850976aef01c2a0c40' diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD index dbb1fe20a..d838041ec 100644 --- a/extra/apr/PKGBUILD +++ b/extra/apr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158966 2012-05-13 20:20:53Z jgc $ +# $Id: PKGBUILD 190841 2013-07-18 18:46:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=apr -pkgver=1.4.6 +pkgver=1.4.8 pkgrel=1 pkgdesc="The Apache Portable Runtime" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('util-linux') options=('!libtool') license=('APACHE') source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2) -md5sums=('ffee70a111fd07372982b0550bbb14b7') +md5sums=('ce2ab01a0c3cdb71cf0a6326b8654f41') build() { cd "${srcdir}/apr-${pkgver}" diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 877faf646..66961d92f 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ +# $Id: PKGBUILD 191251 2013-07-22 09:20:17Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.2 +pkgver=3.3 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,11 @@ license=('GPL') depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('17028a3106f870cd62f6a60930a28590' +md5sums=('40edf6ab63488d52abf94a2a48d7ac97' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 78d8f7734..36da2e3ec 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -4,7 +4,7 @@ post_install() { > LXVST_PATH to include any custom directories of *.so VST plug-ins. > Ardour 3 also supports video (timeline and monitoring), but aside from - > xjadeo (AUR) the required external programs need to be retrieved from: + > xjadeo the required external programs need to be retrieved from: http://x42.github.io/harvid/ @@ -32,8 +32,7 @@ post_upgrade() { > Due to uncertainties with regards to program stability, 'harvid' is > currently not packaged in our repositories. - > In addition to the timeline, video can be monitored with xjadeo, which - > is presently available in the AUR. It will be in our repositories soon. + > In addition to the timeline, video can be monitored with xjadeo. MSG } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 08e5895df..4c280f793 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ +# $Id: PKGBUILD 191362 2013-07-24 02:13:43Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=9 +pkgrel=10 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') arch=('i686' 'x86_64' 'mips64el') options=('!libtool' '!emptydirs') -depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm') -optdepends=('dbus: communicating with client applications' - 'gtk3: avahi-discover-standalone, bshell, bssh, bvnc' +depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' 'gtk2: gtk2 bindings' 'qt3: qt3 bindings' 'qt4: qt4 bindings' @@ -40,6 +39,7 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action } diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 2334186b3..304f7e9de 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178951 2013-03-01 10:19:37Z andrea $ +# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -20,7 +20,9 @@ build() { cd "${srcdir}/${pkgbase}_${pkgver}" mkdir build cd build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 .. + cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 \ + -D LRELEASE_EXECUTABLE=/usr/lib/qt4/bin/lrelease .. make # plugin build expects libraries to be already installed; we fake a prefix diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP new file mode 100644 index 000000000..87010d49c --- /dev/null +++ b/extra/avidemux/PKGBUILD.WIP @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgbase=avidemux +pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') +pkgver=2.6.4 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL2') +url="http://fixounet.free.fr/avidemux/" +makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \ + 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \ + 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \ + 'libvdpau' 'libdca' 'fribidi' 'glu') +options=('!makeflags' '!emptydirs') +source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz) +sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3') +#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz) +#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2') + +prepare() { + cd ${pkgbase}_${pkgver} + sed -i 's|avidemux2|avidemux3|' avidemux2.desktop + sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash + sed -i 's|#include "ADM_files.h"|#include "ADM_files.h"\n#include "ADM_toolkitGtk.h"|' avidemux/gtk/ADM_userInterfaces/ui_support.cpp +} + +build() { +#mv snapshot_8273 ${pkgbase}_${pkgver} + + cd ${pkgbase}_${pkgver} + bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins +} + +package_avidemux-cli() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split)" + depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva') + optdepends=('lame: for the corresponding audio encoder plugin' + 'faac: for the corresponding audio encoder plugin' + 'faad2: for the corresponding audio decoder plugin' + 'opencore-amr: for the corresponding audio decoder plugin' + 'jack: for the corresponding audio device plugin' + 'libpulse: for the corresponding audio device plugin' + 'sdl: for the corresponding audio device plugin' + 'x264: for the corresponding video encoder plugin' + 'xvidcore: for the corresponding video encoder plugin' + 'qt4: for the QtScript scripting support' + 'libdca: for the corresponding audio decoder plugin' + 'fribidi: for the corresponding video filter plugin') + + cd ${pkgbase}_${pkgver} + (cd buildCli; make DESTDIR="${pkgdir}" install) + (cd buildCore; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install) + (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" + install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" +} + +package_avidemux-gtk() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI" + depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildGtk; make DESTDIR="${pkgdir}" install) + (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install) + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop" + + rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so" +} + +package_avidemux-qt() { + pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" + depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu') + install=avidemux.install + + cd ${pkgbase}_${pkgver} + (cd buildQt4; make DESTDIR="${pkgdir}" install) + (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install) + + install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop" + sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop" +} diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD index 2f8eab7f8..091d5f122 100644 --- a/extra/bijiben/PKGBUILD +++ b/extra/bijiben/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 185131 2013-05-11 10:28:24Z heftig $ +# $Id: PKGBUILD 191196 2013-07-19 15:53:05Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=bijiben -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Write out notes, every detail matters" arch=(i686 x86_64 mips64el) url="https://live.gnome.org/Bijiben" license=(GPL) -depends=(libtracker-sparql clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) +depends=(tracker clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) makedepends=(intltool itstool) options=(!emptydirs) install=bijiben.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c8c02c3701594d0b7f212c25613c097e2343d104157518c7c8cfb6a1bc111cf8') +sha256sums=('287742267c7484a92ead8c896091ceb0b2603ba8b5dccf304ea534456735beec') build() { cd $pkgname-$pkgver diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 6deb7002c..6f14ef9af 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $ -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> -# Contributor: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 191889 2013-08-01 06:53:23Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Kevin Piche <kevin@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=bzflag pkgver=2.4.2 -pkgrel=3 +pkgrel=4 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') -options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'glew' 'glu' 'sdl') source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2") sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291') +options=('!libtool') + build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr make - cd misc make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index ecb976ca3..8f384caae 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $ +# $Id: PKGBUILD 191326 2013-07-23 16:47:58Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3') +sha256sums=('5f08079b6ccaa6ea8de9163ff0e43554347c12e13f0a60eb6ad06d291c116937') build() { cd $pkgname-$pkgver diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index defbf418b..20f60941d 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185532 2013-05-14 19:17:44Z heftig $ +# $Id: PKGBUILD 191890 2013-08-01 06:53:24Z bpiotrowski $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=5 +pkgrel=6 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 039a58c76..cb5880f62 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ +# $Id: PKGBUILD 191274 2013-07-23 03:29:14Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.8 -pkgrel=2 +pkgrel=3 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'service' 'service.fresh' @@ -22,7 +22,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' - '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' + 'bb488a56b0f6a0760446cde89c1e3321e2717b78' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' '1c8ef193919b041135115170acd6313f008de808') diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate index 6a9051bed..5f6d87d29 100644 --- a/extra/clamav/logrotate +++ b/extra/clamav/logrotate @@ -1,8 +1,10 @@ /var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript + create 644 clamav clamav + sharedscripts + missingok + notifempty + postrotate + /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript } diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD index eabd82720..f2ac74081 100644 --- a/extra/cln/PKGBUILD +++ b/extra/cln/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143665 2011-11-28 09:23:06Z eric $ +# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=cln -pkgver=1.3.2 -pkgrel=1.2 +pkgver=1.3.3 +pkgrel=1 pkgdesc="Class library for numbers" arch=('i686' 'x86_64' 'mips64el') url="http://www.ginac.de/CLN/" @@ -13,8 +13,7 @@ makedepends=('texlive-core') options=('!libtool') install=cln.install source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2) -md5sums=('d897cce94d9c34d106575ed4ec865d71') -sha1sums=('c30dca80e75f45e2107f233075e6d0339ea884b0') +sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,6 +34,6 @@ check() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install-html install-pdf } diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 2b701d62a..637d67be0 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $ +# $Id: PKGBUILD 191304 2013-07-23 13:13:07Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.4 -pkgrel=2 +pkgver=2.0.6 +pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" @@ -12,7 +12,7 @@ depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97') +sha256sums=('0ecc5630b0578968201802b831a75904a26e6ffe38fb8b60209ef9da51f8b258') build() { cd $pkgname-$pkgver diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 2433a321b..2b0a30eea 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $ +# $Id: PKGBUILD 190119 2013-07-15 21:53:44Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter pkgver=1.14.4 -pkgrel=2 +pkgrel=3 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -19,7 +19,7 @@ sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ - --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input + --enable-wayland-backend --enable-egl-backend --enable-evdev-input # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 39f90d60c..573c9b350 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $ +# $Id: PKGBUILD 190118 2013-07-15 21:53:44Z tomegun $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl pkgver=1.14.0 -pkgrel=3 +pkgrel=4 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) url="http://www.clutter-project.org/" @@ -17,7 +17,7 @@ sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ - --enable-wayland-egl-{platform,server} --enable-gles{1,2} + --enable-wayland-egl-platform --enable-gles{1,2} # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 3998489f2..af55ab055 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188955 2013-06-27 04:04:12Z heftig $ +# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.1 -pkgrel=1 +pkgver=1.0.2 +pkgrel=2 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" @@ -15,8 +15,15 @@ optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) -source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('d480eb23a3de67cab090c810c894cc68069a278d') +source=($url/releases/$pkgname-$pkgver.tar.xz + udev-systemd.patch) +sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0' + '3b467b9674f767c804943d191beaf6bd1ba3a606') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../udev-systemd.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/colord/udev-systemd.patch b/extra/colord/udev-systemd.patch new file mode 100644 index 000000000..311a92437 --- /dev/null +++ b/extra/colord/udev-systemd.patch @@ -0,0 +1,17 @@ +Description: Migrate from usb_id and usb_db to udev builtins usb_id and hwdb. +Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1200185 + +--- colord-1.0.1.orig/rules/69-cd-sensors.rules.in ++++ colord-1.0.1/rules/69-cd-sensors.rules.in +@@ -86,8 +86,8 @@ ATTRS{idVendor}=="273f", ATTRS{idProduct + + # color calibration device + ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p" +-ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id" ++ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{builtin}="hwdb --subsystem=usb" + + # Allow the daemon to access the color devices + ENV{COLORD_SENSOR_KIND}=="*?", GROUP="@daemon_user@" diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 58bcbbabf..4080832c2 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 183552 2013-04-23 04:49:12Z eric $ +# $Id: PKGBUILD 190798 2013-07-16 21:17:38Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64 'mips64el') url="http://live.gnome.org/dconf" license=('LGPL2.1') -depends=('glib2' 'gtk-update-icon-cache') +depends=('glib2') makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python' 'python2') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb') +sha256sums=('a551d04d06599ee9adde500c71ad8567d68f45420b6dbca10ca51e2834d80fee') build() { cd "$pkgname-$pkgver" diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 75d713d64..7478c122a 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,13 +1,15 @@ post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + if [[ -x /usr/bin/gtk-update-icon-cache ]]; then gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + fi } post_upgrade(){ - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 1538b084b..dd82c9c0b 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 164005 2012-07-23 18:42:21Z schiv $ +# $Id: PKGBUILD 191219 2013-07-21 14:09:43Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ddrescue -pkgver=1.16 -pkgrel=2 +pkgver=1.17 +pkgrel=1 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/ddrescue/ddrescue.html" license=('GPL3') depends=('gcc-libs') install=$pkgname.install -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz" - "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig") -md5sums=('57b67407e882c6418531d48a2f20d16b' - 'bf072280587665d82829be15eb6fc9ad') +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz" + "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz.sig") +md5sums=('564469370fe70cd9ac280b15e1addc50' + 'SKIP') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index dbc6fc4e3..2a5913115 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ +# $Id: PKGBUILD 191281 2013-07-23 09:52:37Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') license=(GPL) @@ -14,6 +14,7 @@ depends=(webkitgtk3 hicolor-icon-theme) makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install +groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 42d4f1c32..99cb155ef 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179518 2013-03-05 19:33:11Z ioni $ +# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> @@ -6,24 +6,24 @@ # Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=4.2.2 +pkgver=4.3 pkgrel=1 -_date=201302041200 +_date=201306052000 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64' 'mips64el') url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst') +depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz" 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg') -md5sums=('daa539af97a5cf4fb8ae1d7675b9625b' +md5sums=('8046626198b529c2e292022c39c18262' '7ea99a30fbaf06ec29261541b8eb1e23' 'ba2cf02c48e6e35bfe3685401c26bb5b' '77cff7543ccf7e177cb6667f5a20ce19') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='902102ec85539f4c9342b2c1c4c67f64' +[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8' package() { # install eclipse @@ -35,17 +35,8 @@ package() { $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse" install -m644 eclipse.desktop "$pkgdir/usr/share/applications/" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \ - "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \ - "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \ - "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png" - ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \ - "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png" - # install icon install -Dm644 "$srcdir"/eclipse.svg \ "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg - sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v201301120609/bin/runant.py + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py } diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 21c3f573e..a7d6139c7 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 184371 2013-05-06 19:36:58Z foutrelis $ +# $Id: PKGBUILD 191914 2013-08-01 06:59:43Z bpiotrowski $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.3 -pkgrel=2 +pkgrel=3 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick') install=emacs.install -source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig} + emacs-24.3-giflib5.patch) md5sums=('ea9ed000ca165280265aabb55b9afbd7' - '3f6990fabfbe1d5f3cd58bace4eb20f1') + 'SKIP' + '560cdf463299e059c5fadf474bcba218') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../emacs-24.3-giflib5.patch +} build() { cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + ac_cv_lib_gif_EGifPutExtensionLast=yes ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --with-x-toolkit=gtk3 --with-xft make } diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch new file mode 100644 index 000000000..b8571abb2 --- /dev/null +++ b/extra/emacs/emacs-24.3-giflib5.patch @@ -0,0 +1,26 @@ +--- src/image.c ++++ src/image.c 2013-05-21 15:49:41.945819346 +0000 +@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image + } + + /* Open the GIF file. */ ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpenFileName (SSDATA (file)); ++#else ++ gif = fn_DGifOpenFileName (SSDATA (file), NULL); ++#endif + if (gif == NULL) + { + image_error ("Cannot open `%s'", file, Qnil); +@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image + memsrc.len = SBYTES (specified_data); + memsrc.index = 0; + ++#if GIFLIB_MAJOR < 5 + gif = fn_DGifOpen (&memsrc, gif_read_from_memory); ++#else ++ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); ++#endif + if (!gif) + { + image_error ("Cannot open memory source `%s'", img->spec, Qnil); diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index 8633e1d17..a2124de50 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190038 2013-07-13 12:40:51Z svenstaro $ +# $Id: PKGBUILD 191891 2013-08-01 06:53:24Z bpiotrowski $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 83413fc07..583bd60c7 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185537 2013-05-14 20:42:07Z ioni $ +# $Id: PKGBUILD 191825 2013-07-31 08:49:27Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.9 +pkgver=3.10 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('5777759e85b3323917c6cc9327f5d99c') +md5sums=('d1930df6e70a5204e8154a9911992be4') build() { cd $pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index f462e760e..4c12a00a0 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ +# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" license=('BSD') -depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' +depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') -source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') +source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz + evas-1.7.5-giflib5.patch) +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af' + 'ec40d3aff6240dc0e33e648c76393f62b985628a') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../evas-1.7.5-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver export CFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CFLAGS}" export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" @@ -56,7 +62,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # install license files diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch new file mode 100644 index 000000000..48d1834c5 --- /dev/null +++ b/extra/evas/evas-1.7.5-giflib5.patch @@ -0,0 +1,93 @@ +diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c +index 18a6e23..e8cc562 100644 +--- a/src/modules/loaders/gif/evas_image_load_gif.c ++++ b/src/modules/loaders/gif/evas_image_load_gif.c +@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + int h; + int alpha; + int loop_count = -1; +- ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + w = 0; + h = 0; + alpha = -1; +@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + GifFileType *gif; + Image_Entry_Frame *frame = NULL; + Gif_Frame *gif_frame = NULL; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + { + int fd; + GifFileType *gif; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + #ifndef __EMX__ + fd = open(file, O_RDONLY); +@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key + return EINA_FALSE; + } + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); +@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + int remain_frames = frame_num; + double duration = 0; + int frame_count = 0; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + frame_count = ie->frame_count; + +@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int + #endif + if (fd < 0) return -1; + ++#if GIFLIB_MAJOR >= 5 ++ gif = DGifOpenFileHandle(fd, &err); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + if (fd) close(fd); diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 43f81f44b..fbd713048 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188088 2013-06-08 19:38:24Z heftig $ +# $Id: PKGBUILD 191340 2013-07-23 17:20:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=(GPL) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4f60403ec17b462fc39f59193093d9819c534bbce689e14cbab20bc262ca5870') +sha256sums=('0b9e725d36a4c63ccb15b4e0f92932764c9a335e84af2ebeeb4c182760ef3f6e') build() { cd "$pkgname-$pkgver" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index a5f9df144..45f4e38b3 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188090 2013-06-08 19:44:06Z heftig $ +# $Id: PKGBUILD 191347 2013-07-23 17:52:56Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') url="http://www.gnome.org" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +depends=('evolution-data-server' 'gtkhtml4' 'libmspack') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('948dbee5e31b364155719003a0a8b28dfa270aae5f364b5614faa0b262a7ff3a') +sha256sums=('1883d0d375286583520800317fbf41be585d34b40166fd03dc14c3f237a6f660') build() { cd $pkgname-$pkgver diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 1cd35cf91..d02ef0b2a 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188089 2013-06-08 19:43:23Z heftig $ +# $Id: PKGBUILD 191343 2013-07-23 17:41:59Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a') +sha256sums=('d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766') build() { cd $pkgname-$pkgver diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD index 8b73023f6..b866cae93 100644 --- a/extra/exempi/PKGBUILD +++ b/extra/exempi/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: André Klitzing <aklitzing@online.de> + pkgname=exempi -pkgver=2.2.0 -pkgrel=1.2 +pkgver=2.2.1 +pkgrel=1 pkgdesc="A library to parse XMP metadata" arch=(i686 x86_64 'mips64el') url="http://libopenraw.freedesktop.org/wiki/Exempi" @@ -10,17 +11,18 @@ license=('custom:BSD') depends=('gcc-libs' 'expat' 'zlib') makedepends=('boost') options=(!libtool) -source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('f46d96975613593ee17aaf48cd350228') +source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2{,.asc}) +md5sums=('0f8e5832299224684a65847eedf8d1e4' + 'SKIP') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -d "$pkgdir/usr/share/licenses/$pkgname" install -m644 "$srcdir/$pkgname-$pkgver/COPYING" \ diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD index 0b137fe90..55a959c19 100644 --- a/extra/fbida/PKGBUILD +++ b/extra/fbida/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 184373 2013-05-06 19:37:00Z foutrelis $ +# $Id: PKGBUILD 191916 2013-08-01 06:59:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fbida pkgver=2.09 -pkgrel=2 +pkgrel=3 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran" arch=('i686' 'x86_64' 'mips64el') url="http://www.kraxel.org/blog/linux/fbida/" license=('GPL2') -depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl') -makedepends=('libxpm') +depends=('giflib' 'libtiff' 'libexif' 'lesstif' 'libpng' 'fontconfig' 'curl' 'desktop-file-utils') +makedepends=('libxpm' 'imagemagick') optdepends=('ghostscript: to use fbgs') -source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +install=fbida.install +source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} + ida-desktop.patch ida-PrintGifError.patch) sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7' - '18f5660301201326bd9426ce55e9fc217bf720d8') + 'SKIP' + 'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717' + '4e7ed05fbfba46296aae11a9768680109bee8ac5') prepare() { cd ${pkgname}-${pkgver} sed -i 's/ungif/gif/' GNUmakefile + patch -p0 -i "${srcdir}/ida-desktop.patch" + patch -p1 -i "${srcdir}/ida-PrintGifError.patch" } build() { cd ${pkgname}-${pkgver} - make + make verbose=yes + convert -resize 25% logo.jpg ida.png } package() { cd ${pkgname}-${pkgver} make STRIP="" DESTDIR="${pkgdir}" prefix=/usr install + install -D -m644 desktop/ida.desktop "${pkgdir}/usr/share/applications/ida.desktop" + install -D -m644 ida.png "${pkgdir}/usr/share/pixmaps/ida.png" } diff --git a/extra/fbida/fbida.install b/extra/fbida/fbida.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/fbida/fbida.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/fbida/ida-PrintGifError.patch b/extra/fbida/ida-PrintGifError.patch new file mode 100644 index 000000000..60a45ea7d --- /dev/null +++ b/extra/fbida/ida-PrintGifError.patch @@ -0,0 +1,61 @@ +diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c +--- fbida-2.09-orig/rd/read-gif.c 2013-07-29 16:43:26.949362012 -0400 ++++ fbida-2.09/rd/read-gif.c 2013-07-29 16:43:43.669166969 -0400 +@@ -13,6 +13,14 @@ + int w,h; + }; + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + static GifRecordType + gif_fileread(struct gif_state *h) + { +@@ -25,7 +33,7 @@ + if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { + if (debug) + fprintf(stderr,"gif: DGifGetRecordType failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + switch (RecordType) { +@@ -42,7 +50,7 @@ + if (rc == GIF_ERROR) { + if (debug) + fprintf(stderr,"gif: DGifGetExtension failed\n"); +- PrintGifError(); ++ localPrintGifError(); + return -1; + } + if (debug) { +@@ -93,12 +101,13 @@ + struct gif_state *h; + GifRecordType RecordType; + int i, image = 0; +- ++ int Error; ++ + h = malloc(sizeof(*h)); + memset(h,0,sizeof(*h)); + + h->infile = fp; +- h->gif = DGifOpenFileHandle(fileno(fp)); ++ h->gif = DGifOpenFileHandle(fileno(fp), &Error); + h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); + + while (0 == image) { +@@ -108,7 +117,7 @@ + if (GIF_ERROR == DGifGetImageDesc(h->gif)) { + if (debug) + fprintf(stderr,"gif: DGifGetImageDesc failed\n"); +- PrintGifError(); ++ localPrintGifError(); + } + if (NULL == h->gif->SColorMap && + NULL == h->gif->Image.ColorMap) { diff --git a/extra/fbida/ida-desktop.patch b/extra/fbida/ida-desktop.patch new file mode 100644 index 000000000..8440e4cb3 --- /dev/null +++ b/extra/fbida/ida-desktop.patch @@ -0,0 +1,17 @@ +--- desktop/ida.desktop~ 2008-08-28 00:33:58.000000000 +0200 ++++ desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 +@@ -1,9 +1,10 @@ + [Desktop Entry] + Type=Application +-Encoding=UTF-8 + Name=ida + GenericName=Image Viewer ++Comment=Image Viewer + Exec=ida %F +-Terminal=no +-Categories=Motif;Graphics;Viewer +-MimeType=image/jpeg;image/tiff;image/png ++Terminal=false ++Categories=Motif;Graphics;Viewer; ++MimeType=image/jpeg;image/tiff;image/png; ++Icon=ida diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index aab0934c4..94d69acbf 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ +# $Id: PKGBUILD 191951 2013-08-01 20:53:41Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2.1 -pkgrel=1 +pkgver=2.0 +pkgrel=2 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') +sha256sums=('940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c') build() { cd $pkgname-$pkgver @@ -62,14 +62,16 @@ build() { --enable-libvpx \ --enable-libx264 \ --enable-libxvid \ + --enable-pic \ --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ + --enable-swresample \ --enable-vdpau \ --enable-version3 \ --enable-x11grab \ $extraconf - + make make tools/qt-faststart make doc/ff{mpeg,play,server}.1 diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 1ae9e16e0..d95df37f3 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ +# $Id: PKGBUILD 191893 2013-08-01 06:53:26Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=ffmpegthumbnailer pkgver=2.0.8 -pkgrel=3 +pkgrel=4 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') diff --git a/extra/fluxter/PKGBUILD b/extra/fluxter/PKGBUILD index 743fb4f50..f8fd53cfc 100644 --- a/extra/fluxter/PKGBUILD +++ b/extra/fluxter/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 123175 2011-05-09 02:48:19Z eric $ +# $Id: PKGBUILD 191227 2013-07-21 21:10:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fluxter pkgver=0.1.0 -pkgrel=5.1 +pkgrel=6 pkgdesc="A workspace pager for fluxbox" arch=('i686' 'x86_64' 'mips64el') url="http://benedict.isomedia.com/homes/stevencooper/projects/fluxter.html" license=('GPL') depends=('gcc-libs' 'libx11') -source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz \ +source=(http://benedict.isomedia.com/homes/stevencooper/files/${pkgname}-${pkgver}.tar.gz fluxter-0.1.0-asneeded.patch) -md5sums=('6d18553220e8fc33c54762d2e7d31528' - '3deb4e816d12a262455bc8281fa82577') sha1sums=('d0da4759a21fdadc8a6457195c87b6648b5d69bc' '2fc912d40233577b34cb6c641e066863e487fab0') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p0 -i ../fluxter-0.1.0-asneeded.patch - autoreconf +} + +build() { + cd ${pkgname}-${pkgver} + autoreconf --force --install ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index df83a5ef7..9f842e358 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 171997 2012-11-25 21:50:28Z bisson $ +# $Id: PKGBUILD 191917 2013-08-01 06:59:46Z bpiotrowski $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge pkgver=20120731_b -pkgrel=3.1 +pkgrel=6 pkgdesc='Outline and bitmap font editor' -arch=('i686' 'x86_64' 'mips64el') url='http://fontforge.sourceforge.net/' +arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme') -options=('!libtool' '!makeflags') -source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2") -sha1sums=('b520f532b48e557c177dffa29120225066cc4e84') +source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2" + 'http://fontforge.org/cidmaps.tgz') +sha1sums=('b520f532b48e557c177dffa29120225066cc4e84' + 'efbc7c9d3e95159f5600dc71f9cccb370e46bb94') # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +options=('!libtool' '!makeflags') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver//_/-}" + sed 's/python /python2 /g' -i Makefile.dynamic.in + sed \ + -e'/^#include <gif_lib.h>/i #include <stddef.h>' \ + -e 's/\(DGifOpenFileName([^)]*\))/\1,NULL)/g' \ + -i configure gutils/gimagereadgif.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver//_/-}" - sed -i 's/python /python2 /g' Makefile.dynamic.in ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -40,9 +50,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/fontforge" + install -m644 ../Adobe-* "${pkgdir}/usr/share/fontforge" + install -d "${pkgdir}/usr/share/icons" cp -a Packaging/icons "${pkgdir}/usr/share/icons/hicolor" rm -fr "${pkgdir}/usr/share/icons/hicolor/src" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 Packaging/fontforge.desktop "${pkgdir}/usr/share/applications/fontforge.desktop" } diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index 2b7bcc010..e508223e3 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187057 2013-06-03 11:16:31Z allan $ +# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.9.2 -pkgrel=3 +pkgver=2.9.3 +pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64' 'mips64el') url="http://fuse.sourceforge.net/" @@ -16,11 +16,12 @@ backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab' +sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e' '3b42e37a741d4651099225987dc40e7f02a716ad') prepare() { cd "$pkgname-$pkgver" + # fix building with glibc-2.14 sed -i '1i#define _GNU_SOURCE' util/fusermount.c diff --git a/extra/fuse/fuse.rc.d b/extra/fuse/fuse.rc.d deleted file mode 100755 index 768da5b02..000000000 --- a/extra/fuse/fuse.rc.d +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# fuse Init script for Filesystem in Userspace -# Based on the script by Miklos Szeredi <miklos@szeredi.hu> - -. /etc/rc.conf -. /etc/rc.d/functions -FUSECTL=/sys/fs/fuse/connections - -case "$1" in - start) - stat_busy "Starting fuse" - if ! grep -qw fuse /proc/filesystems; then - modprobe fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - if grep -qw fusectl /proc/filesystems && ! grep -qw $FUSECTL /proc/mounts; then - mount -t fusectl none $FUSECTL >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - add_daemon fuse - stat_done - ;; - stop) - stat_busy "Stopping fuse" - umount $FUSECTL >/dev/null 2>&1 - rmmod fuse >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fuse - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index f36057f7c..53877eb72 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 184378 2013-05-06 19:37:15Z foutrelis $ +# $Id: PKGBUILD 191373 2013-07-24 20:02:25Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm pkgver=2.6.5 -pkgrel=2 +pkgrel=3 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') +optdepends=('perl-tk: for ClickToFocus support' + 'perl-x11-protocol: for ClickToFocus support') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 6c225a409..0f922cf8e 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,28 +1,34 @@ -# $Id: PKGBUILD 188471 2013-06-14 19:27:51Z heftig $ +# $Id: PKGBUILD 191808 2013-07-30 23:19:36Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gdm pkgname=(gdm libgdm) -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="Gnome Display Manager" arch=('i686' 'x86_64' 'mips64el') license=(GPL) url="http://www.gnome.org" options=('!libtool') -depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server) -makedepends=(itstool intltool gnome-doc-utils gobject-introspection) +depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost) +makedepends=(itstool intltool yelp-tools gobject-introspection) checkdepends=('check') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz - fix_external_program_directories.patch) -sha256sums=('1d0ed61ac2b184c62acb0d09a5b7c03793b5793599dbb6888d7fe8d1fb6e8da2' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') + fix_external_program_directories.patch arch-pam.patch) +sha256sums=('db40fb66bf476721b6d333abe0bfed7feacdca7d492f971c86a3f1e5cccdb447' + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' + 'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003') -build() { +prepare() { cd $pkgbase-$pkgver - patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i ../fix_external_program_directories.patch + patch -Np1 -i ../arch-pam.patch + AUTOPOINT='intltoolize --automake -c' autoreconf -fi +} +build() { + cd $pkgbase-$pkgver ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -37,7 +43,7 @@ build() { --without-tcp-wrappers \ --without-console-kit \ --with-systemd \ - --with-default-pam-config=exherbo + --with-default-pam-config=arch sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -62,8 +68,7 @@ package_gdm() { cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install - chmod 1770 "$pkgdir/var/log/gdm" - chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + chmod 711 "$pkgdir/var/log/gdm" rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" ### Split libgdm diff --git a/extra/gdm/arch-pam.patch b/extra/gdm/arch-pam.patch new file mode 100644 index 000000000..1faa2b90b --- /dev/null +++ b/extra/gdm/arch-pam.patch @@ -0,0 +1,179 @@ +diff --git c/configure.ac i/configure.ac +index bda20c6..e118101 100644 +--- c/configure.ac ++++ i/configure.ac +@@ -185,12 +185,13 @@ if test x$enable_split_authentication = xyes; then + fi + + AC_ARG_WITH(default-pam-config, +- AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, none @<:@default=auto@:>@])) ++ AS_HELP_STRING([--with-default-pam-config: One of redhat, openembedded, exherbo, lfs, arch, none @<:@default=auto@:>@])) + dnl If not given, try autodetecting from release files (see NetworkManager source) + if test x$with_default_pam_config = x; then + AC_CHECK_FILE(/etc/redhat-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/fedora-release,with_default_pam_config="redhat") + AC_CHECK_FILE(/etc/exherbo-release,with_default_pam_config="exherbo") ++ AC_CHECK_FILE(/etc/arch-release,with_default_pam_config="arch") + AC_CHECK_FILE(/etc/lfs-release,with_default_pam_config="lfs") + dnl If not autodetected, default to none + if test x$with_default_pam_config = x; then +@@ -198,7 +199,7 @@ if test x$with_default_pam_config = x; then + fi + fi + case x$with_default_pam_config in +- xredhat|xopenembedded|xexherbo|xlfs|xnone) ;; ++ xredhat|xopenembedded|xexherbo|xlfs|xarch|xnone) ;; + *) + AC_MSG_ERROR([Invalid --with-default-pam-config ${with_default_pam_config}]) + exit 1 +@@ -208,6 +209,7 @@ AM_CONDITIONAL(ENABLE_REDHAT_PAM_CONFIG, test x$with_default_pam_config = xredha + AM_CONDITIONAL(ENABLE_OPENEMBEDDED_PAM_CONFIG, test x$with_default_pam_config = xopenembedded) + AM_CONDITIONAL(ENABLE_EXHERBO_PAM_CONFIG, test x$with_default_pam_config = xexherbo) + AM_CONDITIONAL(ENABLE_LFS_PAM_CONFIG, test x$with_default_pam_config = xlfs) ++AM_CONDITIONAL(ENABLE_ARCH_PAM_CONFIG, test x$with_default_pam_config = xarch) + + AC_ARG_ENABLE(console-helper, + AS_HELP_STRING([--enable-console-helper], +diff --git c/data/Makefile.am i/data/Makefile.am +index 81eb8ef..6a67433 100644 +--- c/data/Makefile.am ++++ i/data/Makefile.am +@@ -129,6 +129,15 @@ pam_lfs_files = pam-lfs/gdm.pam \ + $(NULL) + EXTRA_DIST += $(pam_lfs_files) + ++pam_arch_files = pam-arch/gdm-autologin.pam \ ++ pam-arch/gdm-launch-environment.pam \ ++ pam-arch/gdm-fingerprint.pam \ ++ pam-arch/gdm-smartcard.pam \ ++ pam-arch/gdm-password.pam \ ++ pam-arch/gdm-pin.pam \ ++ $(NULL) ++EXTRA_DIST += $(pam_arch_files) ++ + if ENABLE_REDHAT_PAM_CONFIG + pam_files = $(pam_redhat_files) + endif +@@ -141,6 +150,9 @@ endif + if ENABLE_LFS_PAM_CONFIG + pam_files = $(pam_lfs_files) + endif ++if ENABLE_ARCH_PAM_CONFIG ++pam_files = $(pam_arch_files) ++endif + + EXTRA_DIST += \ + $(schemas_in_files) \ +diff --git c/data/pam-arch/gdm-autologin.pam i/data/pam-arch/gdm-autologin.pam +new file mode 100644 +index 0000000..de615ef +--- /dev/null ++++ i/data/pam-arch/gdm-autologin.pam +@@ -0,0 +1,13 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-fingerprint.pam i/data/pam-arch/gdm-fingerprint.pam +new file mode 100644 +index 0000000..f296ae0 +--- /dev/null ++++ i/data/pam-arch/gdm-fingerprint.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_fprintd.so ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_fprintd.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-launch-environment.pam i/data/pam-arch/gdm-launch-environment.pam +new file mode 100644 +index 0000000..6dfbc51 +--- /dev/null ++++ i/data/pam-arch/gdm-launch-environment.pam +@@ -0,0 +1,13 @@ ++auth required pam_succeed_if.so audit quiet_success user = gdm ++auth required pam_env.so ++auth optional pam_permit.so ++ ++account required pam_succeed_if.so audit quiet_success user = gdm ++account include system-local-login ++ ++password required pam_deny.so ++ ++session required pam_succeed_if.so audit quiet_success user = gdm ++session required pam_systemd.so ++session optional pam_keyinit.so force revoke ++session optional pam_permit.so +diff --git c/data/pam-arch/gdm-password.pam i/data/pam-arch/gdm-password.pam +new file mode 100644 +index 0000000..7411285 +--- /dev/null ++++ i/data/pam-arch/gdm-password.pam +@@ -0,0 +1,9 @@ ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-pin.pam i/data/pam-arch/gdm-pin.pam +new file mode 100644 +index 0000000..e024244 +--- /dev/null ++++ i/data/pam-arch/gdm-pin.pam +@@ -0,0 +1,11 @@ ++auth requisite pam_pin.so ++auth include system-local-login ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password include system-local-login ++password optional pam_pin.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start +diff --git c/data/pam-arch/gdm-smartcard.pam i/data/pam-arch/gdm-smartcard.pam +new file mode 100644 +index 0000000..7c3d736 +--- /dev/null ++++ i/data/pam-arch/gdm-smartcard.pam +@@ -0,0 +1,15 @@ ++auth required pam_tally.so onerr=succeed file=/var/log/faillog ++auth required pam_shells.so ++auth requisite pam_nologin.so ++auth required pam_env.so ++auth required pam_pkcs11.so wait_for_card card_only ++auth optional pam_permit.so ++auth optional pam_gnome_keyring.so ++ ++account include system-local-login ++ ++password required pam_pkcs11.so ++password optional pam_permit.so ++ ++session include system-local-login ++session optional pam_gnome_keyring.so auto_start + diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index c48faf4ae..4f15730f0 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -5,6 +5,7 @@ post_install() { getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null + chown root:gdm /var/log/gdm > /dev/null glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 8322d2d76..fb8eaea94 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184381 2013-05-06 19:37:25Z foutrelis $ +# $Id: PKGBUILD 191894 2013-08-01 06:53:27Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gegl pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD index ba7c13ff5..80ef5a0b2 100644 --- a/extra/genius/PKGBUILD +++ b/extra/genius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $ +# $Id: PKGBUILD 191334 2013-07-23 17:00:55Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> pkgname=genius -pkgver=1.0.16 +pkgver=1.0.17 pkgrel=1 pkgdesc="Advanced calculator including a mathematical programming language" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!makeflags') install=genius.install source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz) -sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78') +sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index fb5089c9a..627444421 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $ +# $Id: PKGBUILD 191918 2013-08-01 06:59:47Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> # Contributor: mightyjaym <jm.ambrosino@free.fr> pkgname=giflib -pkgver=4.2.1 -pkgrel=3 +pkgver=5.0.4 +pkgrel=2 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -18,34 +18,24 @@ conflicts=('libungif') replaces=('libungif') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 - giflib-4.2.1-quantize.patch) -md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '26174405ba886a89b8a4db18fe653a99') + giflib-5.0.4-include-stddef.patch) +md5sums=('da60935d07374de00a78c2f6f720c8f5' + 'e39b98822334f2bd2009469e5dea65c5') prepare() { cd ${pkgname}-${pkgver} - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac - patch -Np1 -i "$srcdir"/giflib-4.2.1-quantize.patch - autoreconf -fi + patch -Np1 -i ../giflib-5.0.4-include-stddef.patch } build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} } package() { cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - install -m755 libungif.so.${pkgver} "${pkgdir}/usr/lib/" - ln -sf libungif.so.${pkgver} "${pkgdir}/usr/lib/libungif.so.4" - ln -sf libungif.so.4 "${pkgdir}/usr/lib/libungif.so" - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch new file mode 100644 index 000000000..d3ea73854 --- /dev/null +++ b/extra/giflib/giflib-5.0.4-include-stddef.patch @@ -0,0 +1,11 @@ +diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h +--- a/lib/gif_lib.h 2013-01-06 07:29:57.000000000 +0100 ++++ b/lib/gif_lib.h 2013-07-30 10:52:47.611034000 +0200 +@@ -19,6 +19,7 @@ extern "C" { + #define GIF_OK 1 + + #include <stdbool.h> ++#include <stddef.h> + + #define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp. */ + #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1 diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d0afe870f..74a7cbe7d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ +# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.2 +pkgver=1.8.3.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') url="http://git-scm.com/" license=('GPL2') depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') -makedepends=('python2' 'emacs') +makedepends=('python2' 'emacs' 'libgnome-keyring') optdepends=('tk: gitk and git gui' 'perl-libwww: git svn' 'perl-term-readkey: git svn' @@ -18,10 +18,10 @@ optdepends=('tk: gitk and git gui' 'perl-authen-sasl: git send-email TLS support' 'python2: various helper scripts' 'subversion: git svn' - 'cvsps: git cvsimport') + 'cvsps: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') replaces=('git-core') provides=('git-core') -backup=('etc/conf.d/git-daemon.conf') install=git.install source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" @@ -37,8 +37,8 @@ build() { NO_CROSS_DIRECTORY_HARDLINKS=1 \ all - cd contrib/emacs - make prefix=/usr + make -C contrib/emacs prefix=/usr + make -C contrib/credential/gnome-keyring } check() { @@ -72,16 +72,23 @@ package() { CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ USE_LIBPCRE=1 \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ - INSTALLDIRS=vendor DESTDIR="$pkgdir" install + INSTALLDIRS=vendor DESTDIR="$pkgdir" install # bash completion mkdir -p "$pkgdir"/usr/share/bash-completion/completions/ - install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git # fancy git prompt mkdir -p "$pkgdir"/usr/share/git/ install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh - # more contrib stuff - cp -a ./contrib/* $pkgdir/usr/share/git/ + # emacs + make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install + # gnome credentials helper + install -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # the rest of the contrib stuff + cp -a ./contrib/* $pkgdir/usr/share/git/ + # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ @@ -92,9 +99,6 @@ package() { sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py - # emacs interface - cd contrib/emacs - make prefix=/usr DESTDIR="$pkgdir" install # how 'bout some manpages? for mansect in man1 man5 man7; do @@ -111,7 +115,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('83b792fd06066c77e1d4911ebba2d701' - 'f850829e1e7f32e388d2ffb61759fcc9' +md5sums=('80eec3201a5d012913d287b85adaee8e' + '86fd812754d25201fd72c7476045dfec' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 4de85bfcd..8777035fc 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,18 +1,24 @@ -# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $ +# $Id: PKGBUILD 191784 2013-07-30 19:02:00Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs pkgver=1.36.1 -pkgrel=1 +pkgrel=2 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') url="http://live.gnome.org/Gjs" license=(GPL) depends=(cairo gobject-introspection 'js>=17.0.0') options=('!libtool') -source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2) -sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27') +source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2 + gettext-typo.patch) +sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27' + 'c2c3ca377d9d69511d5784599ea33d754aed776d5ceefaf384b8e303b54fd038') +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../gettext-typo.patch +} build() { cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static diff --git a/extra/gjs/gettext-typo.patch b/extra/gjs/gettext-typo.patch new file mode 100644 index 000000000..9a07b9a71 --- /dev/null +++ b/extra/gjs/gettext-typo.patch @@ -0,0 +1,22 @@ +From 178c810b7797ff2fca0440e519ddf4dbede589a1 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <gcampagna@src.gnome.org> +Date: Sun, 12 May 2013 16:46:19 +0000 +Subject: gettext: fix typo + +https://bugzilla.gnome.org/show_bug.cgi?id=700336 +--- +diff --git a/modules/gettext.js b/modules/gettext.js +index 8f73c13..60991e1 100644 +--- a/modules/gettext.js ++++ b/modules/gettext.js +@@ -46,7 +46,7 @@ function gettext(msgid) { + return GLib.dgettext(null, msgid); + } + function dgettext(domain, msgid) { +- return GLib.dgetext(domain, msgid); ++ return GLib.dgettext(domain, msgid); + } + function dcgettext(domain, msgid, category) { + return GLib.dcgettext(domain, msgid, category); +-- +cgit v0.9.2 diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index 7425f8cfd..d29c44bf3 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,27 +1,22 @@ -# $Id: PKGBUILD 172301 2012-12-02 09:47:22Z andyrtr $ +# $Id: PKGBUILD 191913 2013-08-01 06:53:46Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.9.0 -pkgrel=2 +pkgver=1.10.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64' 'mips64el') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz - glxew_export_fix.diff) -sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe' - 'f389645a1400aebdadce596fec970cfe0be6c15b') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) +sha1sums=('f41b45ca4a630ad1d00b8b87c5f493781a380300') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix compilation for some 3rd party apps; FS#32835 - patch -Np1 -i ${srcdir}/glxew_export_fix.diff - sed -i 's|lib64|lib|' config/Makefile.linux make } diff --git a/extra/glew/glxew_export_fix.diff b/extra/glew/glxew_export_fix.diff deleted file mode 100644 index 8a179e0a7..000000000 --- a/extra/glew/glxew_export_fix.diff +++ /dev/null @@ -1,30 +0,0 @@ -X-Git-Url: -http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew%2Fglew;a=blobdiff_plain;f=auto%2Fsrc%2Fglxew_mid.h;h=e9a3391acefafcc1b2979d2cfad1d43c602521c1;hp=cfcd20d472a790f461e01e6e20a570582452236c;hb=6d14805de58321e8a7b1881323e604bb0ba27217;hpb=38a3d857549e7ac31b7edb2a1cfa1ead52f72220 - -diff --git a/auto/src/glxew_mid.h b/auto/src/glxew_mid.h -index cfcd20d..e9a3391 100644 ---- a/auto/src/glxew_mid.h -+++ b/auto/src/glxew_mid.h -@@ -1,7 +1,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT -Index: glew-1.8.0/include/GL/glxew.h -=================================================================== ---- glew-1.8.0.orig/include/GL/glxew.h 2012-08-08 20:56:17.574088414 +0200 -+++ glew-1.8.0/include/GL/glxew.h 2012-08-08 20:57:34.350092129 +0200 -@@ -1360,7 +1360,7 @@ - /* ------------------------------------------------------------------------- */ - - #ifdef GLEW_MX --#define GLXEW_FUN_EXPORT -+#define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - #define GLXEW_VAR_EXPORT - #else - #define GLXEW_FUN_EXPORT GLEW_FUN_EXPORT - diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch deleted file mode 100644 index fe92fbd94..000000000 --- a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch +++ /dev/null @@ -1,230 +0,0 @@ -From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de> -Date: Thu, 2 Aug 2012 21:41:41 +0200 -Subject: [PATCH] Make Glib::Object subclassing more robust -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Rearrange how we register the interfaces, properties and signals of a newly -created type so that: - -• The outcome is independent of the order of the arguments passed to -Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from -the change to hash randomization in perl 5.17.6. - -• We register things in the correct order: interfaces first, before entering -class_init; then properties and signals from within class_init. This also -avoids prematurely creating the new type's class. ---- - GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- - NEWS | 7 +++++ - 2 files changed, 77 insertions(+), 22 deletions(-) - -diff --git a/GType.xs b/GType.xs -index 02e24a4..fdaad68 100644 ---- a/GType.xs -+++ b/GType.xs -@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, - - - static void --add_signals (GType instance_type, HV * signals) -+add_signals (GType instance_type, HV * signals, AV * interfaces) - { -- GObjectClass *oclass; - HE * he; - -- oclass = g_type_class_ref (instance_type); -- - hv_iterinit (signals); - while (NULL != (he = hv_iternext (signals))) { - I32 keylen; -@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) - - /* the key is the signal name */ - signal_name = hv_iterkey (he, &keylen); -- /* if the signal is defined at this point, we're going to -- * override the installed closure. */ -- signal_id = g_signal_lookup (signal_name, instance_type); -+ -+ /* if, at this point, the signal is already defined in the -+ * ancestry or the interfaces we just added to instance_type, -+ * we can only override the installed closure. trying to -+ * create a new signal with the same name is an error. -+ * -+ * unfortunately, we cannot simply use instance_type to do the -+ * lookup because g_signal_lookup would complain about it since -+ * it hasn't been fully loaded yet. see -+ * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>. -+ * -+ * FIXME: the "if (signal_id)" check in the hash ref block -+ * below could be removed since g_signal_newv also checks this. -+ * consequently, this lookup code could be moved into the class -+ * closure block below. */ -+ signal_id = g_signal_lookup (signal_name, -+ g_type_parent (instance_type)); -+ if (!signal_id && interfaces) { -+ int i; -+ for (i = 0; i <= av_len (interfaces); i++) { -+ GType interface_type; -+ SV ** svp = av_fetch (interfaces, i, FALSE); -+ if (!svp || !gperl_sv_is_defined (*svp)) -+ continue; -+ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); -+ signal_id = g_signal_lookup (signal_name, interface_type); -+ if (signal_id) -+ break; -+ } -+ } - - /* parse the key's value... */ - value = hv_iterval (signals, he); -@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) - signal_name); - } - } -- -- g_type_class_unref (oclass); - } - - typedef struct { -@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, - } - - static void --add_properties (GType instance_type, AV * properties) -+add_properties (GType instance_type, GObjectClass * oclass, AV * properties) - { -- GObjectClass *oclass; - int propid; - -- oclass = g_type_class_ref (instance_type); -- - for (propid = 0; propid <= av_len (properties); propid++) { - SV * sv = *av_fetch (properties, propid, 1); - GParamSpec * pspec = NULL; -@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) - } - g_object_class_install_property (oclass, propid + 1, pspec); - } -- -- g_type_class_unref (oclass); - } - - /* -@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) - return q; - } - -+typedef struct { -+ GType instance_type; -+ AV *interfaces; -+ AV *properties; -+ HV *signals; -+} GPerlClassData; -+ - static void --gperl_type_class_init (GObjectClass * class) -+gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) - { - class->finalize = gperl_type_finalize; - class->get_property = gperl_type_get_property; - class->set_property = gperl_type_set_property; -+ -+ if (class_data->properties) -+ add_properties (class_data->instance_type, class, -+ class_data->properties); -+ if (class_data->signals) -+ add_signals (class_data->instance_type, -+ class_data->signals, class_data->interfaces); - } - - static void -@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); - PREINIT: - int i; - GTypeInfo type_info; -+ GPerlClassData class_data; - GTypeQuery query; - GType parent_type, new_type; - char * new_type_name; - CODE: - /* start with a clean slate */ - memset (&type_info, 0, sizeof (GTypeInfo)); -+ memset (&class_data, 0, sizeof (GPerlClassData)); - type_info.base_init = (GBaseInitFunc) gperl_type_base_init; - type_info.class_init = (GClassInitFunc) gperl_type_class_init; - type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; -+ type_info.class_data = &class_data; - - /* yeah, i could just call gperl_object_type_from_package directly, - * but i want the error messages to be more informative. */ -@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); - /* mark this type as "one of ours". */ - g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); - -- /* now look for things we should initialize presently, e.g. -- * signals and properties and interfaces and such, things that -- * would generally go into a class_init. */ -+ /* put it into the class data so that add_signals and add_properties -+ * can use it. */ -+ class_data.instance_type = new_type; -+ -+ /* now look for things we should initialize, e.g. signals and -+ * properties and interfaces. put the corresponding data into the -+ * class_data struct. the interfaces will be handled directly further -+ * below, while the properties and signals will be handled in the -+ * class_init function so that they have access to the class instance. -+ * this mimics the way things are supposed to be done in C: register -+ * interfaces in the get_type function, and register properties and -+ * signals in the class_init function. */ - for (i = 3 ; i < items ; i += 2) { - char * key = SvPV_nolen (ST (i)); - if (strEQ (key, "signals")) { - if (gperl_sv_is_hash_ref (ST (i+1))) -- add_signals (new_type, (HV*)SvRV (ST (i+1))); -+ class_data.signals = (HV*)SvRV (ST (i+1)); - else - croak ("signals must be a hash of signalname => signalspec pairs"); - } else if (strEQ (key, "properties")) { - if (gperl_sv_is_array_ref (ST (i+1))) -- add_properties (new_type, (AV*)SvRV (ST (i+1))); -+ class_data.properties = (AV*)SvRV (ST (i+1)); - else - croak ("properties must be an array of GParamSpecs"); - } else if (strEQ (key, "interfaces")) { - if (gperl_sv_is_array_ref (ST (i+1))) -- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); -+ class_data.interfaces = (AV*)SvRV (ST (i+1)); - else - croak ("interfaces must be an array of package names"); - } - } - -+ /* add the interfaces to the type now before we create its class and -+ * enter the class_init function. */ -+ if (class_data.interfaces) -+ add_interfaces (new_type, class_data.interfaces); -+ - /* instantiate the class right now. perl doesn't let classes go - * away once they've been defined, so we'll just leak this ref and - * let the GObjectClass live as long as the program. in fact, -diff --git a/NEWS b/NEWS -index 5606566..ad71da0 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,10 @@ -+Overview of changes in Glib <next> (unstable) -+============================================ -+ -+* Make Glib::Object subclassing more robust. This should in particular fix -+ issues revealed by the change to hash randomization introduced in perl -+ 5.17.6. -+ - Overview of changes in Glib 1.280 (stable) - ========================================== - --- -1.8.2.3 - diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index ee1300607..2f70e9ccd 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ +# $Id: PKGBUILD 191337 2013-07-23 17:10:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl -pkgver=1.280 -pkgrel=3 +pkgver=1.301 +pkgrel=1 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,17 +12,8 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz - 0001-Make-Glib-Object-subclassing-more-robust.patch) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' - 'ebe39d50eff182a1ad4390cbbef46e41') - -prepare() { - cd "${srcdir}/Glib-${pkgver}" - - # Needed for gtk2-perl to compile against Perl 5.18 - patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" -} +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) +md5sums=('7c0d005a20afff174c99a83c72f9786b') build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD index ea287c4d3..120a737cb 100644 --- a/extra/glib/PKGBUILD +++ b/extra/glib/PKGBUILD @@ -1,37 +1,50 @@ -# $Id: PKGBUILD 135061 2011-08-10 01:01:44Z eric $ +# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=glib pkgver=1.2.10 -pkgrel=9.2 +pkgrel=10 pkgdesc="Common C routines used by Gtk+ and other libs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('LGPL') -depends=('glibc') -options=('!libtool') +depends=('glibc' 'sh') +options=('!libtool' '!makeflags') install=glib.install -source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz \ - gcc340.patch aclocal-fixes.patch) -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz + gcc340.patch aclocal-fixes.patch glib1-autotools.patch) sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' 'a2cc224a66aeffdcac16ebd9e8af18143cf54918' - 'ae4438cf56c0c9264ee36f6973fb445f9a820be0') + 'ae4438cf56c0c9264ee36f6973fb445f9a820be0' + '8a25fde3c79567262b3024f4e74c9ca4ee8a6279') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}/gcc340.patch" + patch -Np0 -i "${srcdir}/aclocal-fixes.patch" + patch -Np1 -i "${srcdir}/glib1-autotools.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch + cd ${pkgname}-${pkgver} + if [[ $CARCH = "i686" ]]; then + CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu' + elif [[ $CARCH = "x86_64" ]]; then + CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + fi - [ "$CARCH" = 'x86_64' ] && CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu' + autoreconf --force --install ./configure --prefix=/usr --mandir=/usr/share/man \ --infodir=/usr/share/info $CONFIGFLAG make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glib/glib1-autotools.patch b/extra/glib/glib1-autotools.patch new file mode 100644 index 000000000..1332c9639 --- /dev/null +++ b/extra/glib/glib1-autotools.patch @@ -0,0 +1,33 @@ +diff -Naur glib-1.2.10-orig/configure.in glib-1.2.10/configure.in +--- glib-1.2.10-orig/configure.in 2013-07-22 01:33:26.930091236 -0400 ++++ glib-1.2.10/configure.in 2013-07-22 01:35:19.988776415 -0400 +@@ -17,7 +17,7 @@ + + dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they + dnl are available for $ac_help expansion (don't we all *love* autoconf?) +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + # + # The following version number definitions apply to GLib, GModule and GThread + # as a whole, so if changes occoured in any of them, they are all +@@ -81,7 +81,7 @@ + + dnl figure debugging default, prior to $ac_help setup + dnl +-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl ++AC_DIVERT_PUSH()dnl + if test `expr $GLIB_MINOR_VERSION \% 2` = 1 ; then + debug_default=yes + else +diff -Naur glib-1.2.10-orig/gmodule/Makefile.am glib-1.2.10/gmodule/Makefile.am +--- glib-1.2.10-orig/gmodule/Makefile.am 2013-07-22 01:33:26.933424531 -0400 ++++ glib-1.2.10/gmodule/Makefile.am 2013-07-22 01:38:46.553041607 -0400 +@@ -42,7 +42,7 @@ + libgplugin_b_la_LIBADD = @G_MODULE_LIBS@ # $(libglib) + + noinst_PROGRAMS = testgmodule +-testgmodule_LDFLAGS += @G_MODULE_LDFLAGS@ ++testgmodule_LDFLAGS = @G_MODULE_LDFLAGS@ + testgmodule_LDADD = libgmodule.la $(libglib) @G_MODULE_LIBS@ + + .PHONY: files release diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD index ba1d6d02e..df4f43807 100644 --- a/extra/glpk/PKGBUILD +++ b/extra/glpk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178114 2013-02-16 16:08:40Z ronald $ +# $Id: PKGBUILD 191850 2013-07-31 15:25:15Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: bzklrm <bzklrm@gmail.com> # Additional contributors Senjin, Xavier, dundee pkgname=glpk -pkgver=4.48 +pkgver=4.52 pkgrel=1 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems." arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig}) -sha1sums=('e00c92faa38fd5d865fa27206abbb06680bab7bb' - '4b57f5ae0a8114c5307daa6071f9be5967a935d6') +sha1sums=('44b30b0de777a0a07e00615ac6791af180ff4d2c' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD index 264534d7d..04a85ea81 100644 --- a/extra/gnet/PKGBUILD +++ b/extra/gnet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122722 2011-05-06 08:12:47Z eric $ +# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnet pkgver=2.0.8 -pkgrel=2.1 +pkgrel=3 pkgdesc="A simple network library" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GNetLibrary" @@ -11,17 +11,15 @@ license=('LGPL') depends=('glib2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('93327d2fca333d7e54ba2cf54e071165') sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - find examples -name Makefile.in | xargs sed -ri 's/^(LIBS .*)/\1 -lglib-2.0/' - ./configure --prefix=/usr + cd ${pkgname}-${pkgver} + LIBS+="-lglib-2.0" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 3db98fa9b..bbf6134ed 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 189930 2013-07-11 18:55:47Z ioni $ +# $Id: PKGBUILD 190124 2013-07-15 23:14:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accoun makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6cb3fe9e7f0f2380d77494a3408893265c42ea2a70579f0c871defbab5a7b5fa') +sha256sums=('48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 1c9c043e9..573dfed07 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187908 2013-06-07 23:36:32Z heftig $ +# $Id: PKGBUILD 191381 2013-07-25 09:28:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.3 +pkgver=3.8.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('e78a5b01692ccfe825e079d795d9e9610fcb94853c0e6d747b2d8d36dead9d84') +sha256sums=('3cfc5b93ca12f498c075f5b5356e0af4a0aaee003c0a90a4309bc12876f40c55') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD index 565988e8f..883e619c6 100644 --- a/extra/gnome-dictionary/PKGBUILD +++ b/extra/gnome-dictionary/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $ +# $Id: PKGBUILD 191351 2013-07-23 18:22:13Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-dictionary -pkgver=3.6.0 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Look up words in dictionary sources" arch=(i686 x86_64 mips64el) url="http://gnome.org" @@ -13,7 +13,7 @@ install=$pkgname.install options=(!libtool) groups=('gnome') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9') +sha256sums=('faebbca7684aeef5ff4111305bc8e0c1790b0551445df404b68f3d7cf2c50421') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 204d45b5f..6b165d2b3 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185463 2013-05-14 10:32:30Z heftig $ +# $Id: PKGBUILD 191810 2013-07-30 23:24:20Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.2 +pkgver=3.8.4 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('a6ed1c109005f81ec34a8aa09b2f114c07b4fba8feef47d2f23559797be88640' +sha256sums=('e6ccc71563d9e36d166ebb8a1e9fc962ff31605d5800af411d3b8df494f03ec1' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 39045563c..836cc9334 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189793 2013-07-08 08:16:03Z jgc $ +# $Id: PKGBUILD 191201 2013-07-19 20:57:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.3 -pkgrel=2 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,24 +14,14 @@ options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - git-fixes.patch) -sha256sums=('00e7f46c9a6fb8b148255adfcdd26bc5f2c1d393b8dfbac69da100c8dcfa1b6c' - '30b0a42df9ea0c6c18ed51cb8f150008e4b5ab624eb420f0251d08ab2503c330') - -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i ../git-fixes.patch -} +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('03ad56a8d517faf0754efcf2e7e26257e9ddbe32ef2931f3579138659cc178bc') build() { cd $pkgname-$pkgver - aclocal - autoconf - automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static + --libexecdir=/usr/lib/$pkgname --disable-static #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/extra/gnome-settings-daemon/git-fixes.patch b/extra/gnome-settings-daemon/git-fixes.patch deleted file mode 100644 index a56033ce1..000000000 --- a/extra/gnome-settings-daemon/git-fixes.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff --git a/data/gnome-settings-daemon.desktop.in.in b/data/gnome-settings-daemon.desktop.in.in -index c5a5518..ff71eee 100644 ---- a/data/gnome-settings-daemon.desktop.in.in -+++ b/data/gnome-settings-daemon.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Type=Application - _Name=GNOME Settings Daemon --Exec=@libexecdir@/gnome-settings-daemon -+Exec=@libexecdir@/gnome-settings-daemon-localeexec - OnlyShowIn=GNOME; - NoDisplay=true - X-GNOME-Autostart-Phase=Initialization -diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am -index 194a7cc..94b3861 100644 ---- a/gnome-settings-daemon/Makefile.am -+++ b/gnome-settings-daemon/Makefile.am -@@ -48,6 +48,15 @@ gsddir = $(libexecdir) - gsd_PROGRAMS = \ - gnome-settings-daemon - -+gsd_SCRIPTS = \ -+ gnome-settings-daemon-localeexec -+ -+EXTRA_DIST = \ -+ gnome-settings-daemon-localeexec.in -+ -+gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in -+ $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@prefix\@|$(prefix)|" $< > $@.tmp && mv $@.tmp $@ -+ - apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon - api_DATA = \ - gnome-settings-plugin.h -diff --git a/gnome-settings-daemon/gnome-settings-daemon-localeexec.in b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in -new file mode 100755 -index 0000000..eed91a4 ---- /dev/null -+++ b/gnome-settings-daemon/gnome-settings-daemon-localeexec.in -@@ -0,0 +1,20 @@ -+#!/bin/sh -+ -+SETTING=$(gsettings get org.gnome.system.locale region) -+REGION=${SETTING#\'} -+REGION=${REGION%\'} -+ -+if [ -n "$REGION" ]; then -+ export LC_TIME=$REGION -+ export LC_NUMERIC=$REGION -+ export LC_MONETARY=$REGION -+ export LC_MEASUREMENT=$REGION -+ export LC_PAPER=$REGION -+fi -+ -+if [ -x @prefix@/bin/ibus-daemon ]; then -+ export QT_IM_MODULE=ibus -+ export XMODIFIERS=@im=ibus -+fi -+ -+exec @libexecdir@/gnome-settings-daemon -diff --git a/gnome-settings-daemon/main.c b/gnome-settings-daemon/main.c -index 24c1598..16017df 100644 ---- a/gnome-settings-daemon/main.c -+++ b/gnome-settings-daemon/main.c -@@ -279,37 +279,6 @@ set_legacy_ibus_env_vars (GDBusProxy *proxy) - } - #endif - --/* Keep synchronised with set_locale() and -- * set_legacy_ibus_env_vars() above */ --static void --set_locale_env (void) --{ -- GSettings *locale_settings; -- gchar *region; -- -- /* Set locale environment */ -- locale_settings = g_settings_new ("org.gnome.system.locale"); -- region = g_settings_get_string (locale_settings, "region"); -- if (region[0]) { -- g_setenv ("LC_TIME", region, TRUE); -- g_setenv ("LC_NUMERIC", region, TRUE); -- g_setenv ("LC_MONETARY", region, TRUE); -- g_setenv ("LC_MEASUREMENT", region, TRUE); -- g_setenv ("LC_PAPER", region, TRUE); -- } -- g_free (region); -- g_object_unref (locale_settings); -- --#ifdef HAVE_IBUS -- /* Set IBus legacy environment */ -- if (is_program_in_path ("ibus-daemon") && -- keyboard_plugin_is_enabled ()) { -- g_setenv ("QT_IM_MODULE", "ibus", TRUE); -- g_setenv ("XMODIFIERS", "@im=ibus", TRUE); -- } --#endif --} -- - static void - register_with_gnome_session (GDBusProxy *proxy) - { -@@ -499,8 +468,6 @@ main (int argc, char *argv[]) - - g_log_set_default_handler (gsd_log_default_handler, NULL); - -- set_locale_env (); -- - notify_init ("gnome-settings-daemon"); - - bus_register (); -diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c -index 45393ec..f51d520 100644 ---- a/plugins/housekeeping/gsd-housekeeping-manager.c -+++ b/plugins/housekeeping/gsd-housekeeping-manager.c -@@ -372,12 +372,20 @@ gboolean - gsd_housekeeping_manager_start (GsdHousekeepingManager *manager, - GError **error) - { -+ gchar *dir; -+ - g_debug ("Starting housekeeping manager"); - gnome_settings_profile_start (NULL); - - /* Create ~/.local/ as early as possible */ - g_mkdir_with_parents(g_get_user_data_dir (), 0700); - -+ /* Create ~/.local/share/applications/, see -+ * https://bugzilla.gnome.org/show_bug.cgi?id=703048 */ -+ dir = g_build_filename (g_get_user_data_dir (), "applications", NULL); -+ g_mkdir (dir, 0700); -+ g_free (dir); -+ - gsd_ldsm_setup (FALSE); - - manager->priv->settings = g_settings_new (THUMB_PREFIX); -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index e6380bd..96da3d1 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -261,11 +261,12 @@ gsd_power_manager_error_quark (void) - } - - static void --notify_close_if_showing (NotifyNotification *notification) -+notify_close_if_showing (NotifyNotification **notification) - { -- if (notification == NULL) -+ if (*notification == NULL) - return; -- notify_notification_close (notification, NULL); -+ notify_notification_close (*notification, NULL); -+ g_clear_object (notification); - } - - typedef enum { -@@ -1214,7 +1215,7 @@ engine_ups_discharging (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - - /* create a new notification */ - create_notification (title, message->str, -@@ -1424,7 +1425,7 @@ engine_charge_low (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1597,7 +1598,7 @@ engine_charge_critical (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1735,7 +1736,7 @@ engine_charge_action (GsdPowerManager *manager, UpDevice *device) - icon = gpm_upower_get_device_icon (device, TRUE); - - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - - /* create a new notification */ - create_notification (title, message, -@@ -1797,8 +1798,8 @@ engine_device_changed_cb (UpClient *client, UpDevice *device, GsdPowerManager *m - } else if (state == UP_DEVICE_STATE_FULLY_CHARGED || - state == UP_DEVICE_STATE_CHARGING) { - g_debug ("fully charged or charging, hiding notifications if any"); -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - main_battery_or_ups_low_changed (manager, FALSE); - } - -@@ -2268,7 +2269,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (!up_client_get_on_battery (client)) { - /* if we are playing a critical charge sound loop on AC, stop it */ - play_loop_stop (&manager->priv->critical_alert_timeout_id); -- notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_low); - main_battery_or_ups_low_changed (manager, FALSE); - } - -@@ -2638,7 +2639,7 @@ idle_configure (GsdPowerManager *manager) - &manager->priv->idle_dim_id); - clear_idle_watch (manager->priv->idle_monitor, - &manager->priv->idle_sleep_warning_id); -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - return; - } - -@@ -2705,7 +2706,7 @@ idle_configure (GsdPowerManager *manager) - } - - if (manager->priv->idle_sleep_warning_id == 0) -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - /* set up dim callback for when the screen lock is not active, - * but only if we actually want to dim. */ -@@ -3038,7 +3039,7 @@ static void - show_sleep_warning (GsdPowerManager *manager) - { - /* close any existing notification of this class */ -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - /* create a new notification */ - switch (manager->priv->sleep_action_type) { -@@ -3109,7 +3110,7 @@ idle_became_active_cb (GnomeIdleMonitor *monitor, - set_temporary_unidle_on_ac (manager, FALSE); - - /* close any existing notification about idleness */ -- notify_close_if_showing (manager->priv->notification_sleep_warning); -+ notify_close_if_showing (&manager->priv->notification_sleep_warning); - - idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); - } -@@ -3344,8 +3345,8 @@ handle_resume_actions (GsdPowerManager *manager) - { - /* close existing notifications on resume, the system power - * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_ups_discharging); -+ notify_close_if_showing (&manager->priv->notification_low); -+ notify_close_if_showing (&manager->priv->notification_ups_discharging); - main_battery_or_ups_low_changed (manager, FALSE); - - /* ensure we turn the panel back on after resume */ diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index a9d5b9820..2653f103e 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ +# $Id: PKGBUILD 191829 2013-07-31 09:01:10Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.3 -pkgrel=3 +pkgver=3.8.4 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,15 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch - git-fixes.patch) -sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' - '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') + nm-libexecdir.patch) +sha256sums=('547e571c67b1436a32715b016ee63c666afcafed9c5a2f76dc4ad3bcaebffa47' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch - - # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f - patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch deleted file mode 100644 index 989c881f0..000000000 --- a/extra/gnome-shell/git-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css -index 775b687..f4ea781 100644 ---- a/data/theme/gnome-shell.css -+++ b/data/theme/gnome-shell.css -@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { - font-weight: bold; - color: #666666; - padding-top: 1em; -+ padding-left: 2px; - } - - .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 6075e66..cae3e1b 100644 ---- a/js/gdm/util.js -+++ b/js/gdm/util.js -@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ - - answerQuery: function(serviceName, answer) { - if (!this._userVerifier.hasPendingMessages) { -+ this._clearMessageQueue(); - this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); - } else { - let signalId = this._userVerifier.connect('no-more-messages', -diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js -index b07ea95..72bc010 100644 ---- a/js/ui/components/telepathyClient.js -+++ b/js/ui/components/telepathyClient.js -@@ -18,7 +18,7 @@ const Params = imports.misc.params; - const PopupMenu = imports.ui.popupMenu; - - // See Notification.appendMessage --const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute -+const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes - const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes - const SCROLLBACK_RECENT_LENGTH = 20; - const SCROLLBACK_IDLE_LENGTH = 5; -@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ - let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), - group: 'meta', - styles: ['chat-meta-message'], -- childProps: { expand: true, x_fill: false }, -+ childProps: { expand: true, x_fill: false, -+ x_align: St.Align.END }, - noTimestamp: true, - timestamp: lastMessageTime }); - -diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js -index d322581..ed61bf7 100644 ---- a/js/ui/endSessionDialog.js -+++ b/js/ui/endSessionDialog.js -@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ - _startTimer: function() { - let startTime = GLib.get_monotonic_time(); - this._secondsLeft = this._totalSecondsToStayOpen; -+ this._updateDescription(); - - this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, - function() { -diff --git a/js/ui/layout.js b/js/ui/layout.js -index 0bb887e..e25b3bd 100644 ---- a/js/ui/layout.js -+++ b/js/ui/layout.js -@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ - // and shown otherwise) - addChrome: function(actor, params) { - this.uiGroup.add_actor(actor); -+ if (this.uiGroup.contains(global.top_window_group)) -+ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); - this._trackActor(actor, params); - }, - -diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js -index 7e7b536..7fa052e 100644 ---- a/js/ui/osdWindow.js -+++ b/js/ui/osdWindow.js -@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ - { opacity: 0, - time: FADE_TIME, - transition: 'easeOutQuad', -- onComplete: Lang.bind(this, this._reset) }); -+ onComplete: Lang.bind(this, function() { -+ this._reset(); -+ Meta.enable_unredirect_for_screen(global.screen); -+ }) -+ }); - }, - - _reset: function() { - this.actor.hide(); - this.setLabel(null); - this.setLevel(null); -- Meta.enable_unredirect_for_screen(global.screen); - }, - - _monitorsChanged: function() { -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index fe9cd31..4264f01 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ - }, - - _onDragEnd: function(action, actor, eventX, eventY, modifiers) { -+ if (this._lockScreenState != MessageTray.State.HIDING) -+ return; - if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { - // Complete motion automatically - let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); -diff --git a/src/st/st-widget.c b/src/st/st-widget.c -index 42992ec..4875acc 100644 ---- a/src/st/st-widget.c -+++ b/src/st/st-widget.c -@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) - - if (stage == NULL) - { -- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -- st_describe_actor (CLUTTER_ACTOR (widget))); -+ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", -+ st_describe_actor (CLUTTER_ACTOR (widget))); -+ return g_object_new (ST_TYPE_THEME_NODE, NULL); - } - - if (parent_node == NULL) diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 7da4ab696..a6c6bac23 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $ +# $Id: PKGBUILD 191600 2013-07-26 23:41:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ replaces=(gnome-themes) conflicts=(gnome-themes) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1') +sha256sums=('977eb8ac94bad6e7095c272a583e614fba1c1897410e9f25ae028618d269b1e4') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 6e7fb614d..756dcd97a 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183409 2013-04-21 22:10:42Z heftig $ +# $Id: PKGBUILD 190104 2013-07-15 17:59:27Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.8.0 +pkgver=3.8.3 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!emptydirs' '!libtool') groups=('gnome') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae0638a24cf306b6615639a8706c9b48e8961ae26d7f8b5d65eb26955ca4cc3f') +sha256sums=('e6f36eaf66fafad2f6ec959ba2cb143b60ff00eb9a94a65b181411b366f2a26f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD index 5eab02234..5e3bf7ca5 100644 --- a/extra/gnome-vfs/PKGBUILD +++ b/extra/gnome-vfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136438 2011-08-29 09:40:33Z ibiru $ +# $Id: PKGBUILD 191321 2013-07-23 15:15:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs pkgver=2.24.4 -pkgrel=6.1 +pkgrel=7 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -14,33 +14,43 @@ url="http://www.gnome.org" install=gnome-vfs.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 gnutls-config.patch - gcrypt-config.patch) + gcrypt-config.patch + enable-deprecated.patch) sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d' - 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114') + 'c059e218f310da683778919d36e7862f7e763384805f6453d328fbaf507a8114' + 'ca2b9dffb1fa202c0d1f0d3648ef37cd8e84657a22d4c6746bb46e9a6cf1ee47') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} #Fix build with new gnutls - patch -Np1 -i "${srcdir}/gnutls-config.patch" + patch -Np1 -i ../gnutls-config.patch #fix build with new libgcrypt >= 1.5.0 - patch -Np1 -i "${srcdir}/gcrypt-config.patch" + patch -Np1 -i ../gcrypt-config.patch + # remove -DG_DISABLE_DEPRECATED + patch -Np1 -i ../enable-deprecated.patch + + sed -i -s 's|$(srcdir)/auto-test|auto-test|' test/Makefile.am +} +build() { + cd ${pkgname}-${pkgver} libtoolize --force gtkdocize aclocal autoconf - automake - ./configure --prefix=/usr --sysconfdir=/etc \ + automake --add-missing + CFLAGS="$CFLAGS -fno-strict-aliasing" ./configure \ + --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --disable-hal \ - --enable-avahi --disable-howl \ + --enable-samba --with-samba-includes=/usr/include/samba-4.0 \ + --disable-hal --enable-avahi --disable-howl \ --disable-openssl --enable-gnutls make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/gnome-vfs/enable-deprecated.patch b/extra/gnome-vfs/enable-deprecated.patch new file mode 100644 index 000000000..0f249b2bb --- /dev/null +++ b/extra/gnome-vfs/enable-deprecated.patch @@ -0,0 +1,57 @@ +diff -up gnome-vfs-2.24.4/daemon/Makefile.am.bak gnome-vfs-2.24.4/daemon/Makefile.am +--- gnome-vfs-2.24.4/daemon/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/daemon/Makefile.am 2013-03-27 17:01:25.000000000 +0100 +@@ -8,7 +8,6 @@ INCLUDES= \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff -up gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak gnome-vfs-2.24.4/libgnomevfs/Makefile.am +--- gnome-vfs-2.24.4/libgnomevfs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.am 2013-03-27 17:01:37.000000000 +0100 +@@ -19,7 +19,6 @@ INCLUDES = \ + -D_LARGEFILE64_SOURCE \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_BINDIR=\"$(bindir)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ +diff -up gnome-vfs-2.24.4/modules/Makefile.am.bak gnome-vfs-2.24.4/modules/Makefile.am +--- gnome-vfs-2.24.4/modules/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/modules/Makefile.am 2013-03-27 17:01:45.000000000 +0100 +@@ -18,7 +18,6 @@ INCLUDES = \ + -D_POSIX_PTHREAD_SEMANTICS \ + -D_REENTRANT \ + -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ +- -DG_DISABLE_DEPRECATED \ + -DGNOME_VFS_PREFIX=\"$(prefix)\" \ + -DGNOME_VFS_DATADIR=\"$(datadir)\" \ + -DGNOME_VFS_LIBDIR=\"$(libdir)\" \ +diff -up gnome-vfs-2.24.4/programs/Makefile.am.bak gnome-vfs-2.24.4/programs/Makefile.am +--- gnome-vfs-2.24.4/programs/Makefile.am.bak 2010-02-09 13:16:14.000000000 +0100 ++++ gnome-vfs-2.24.4/programs/Makefile.am 2013-03-27 17:01:56.000000000 +0100 +@@ -4,8 +4,7 @@ INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(TEST_CFLAGS) \ +- $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED ++ $(VFS_CFLAGS) + + libraries = \ + $(top_builddir)/libgnomevfs/libgnomevfs-2.la \ +diff -up gnome-vfs-2.24.4/test/Makefile.am.bak gnome-vfs-2.24.4/test/Makefile.am +--- gnome-vfs-2.24.4/test/Makefile.am.bak 2013-03-27 17:01:11.000000000 +0100 ++++ gnome-vfs-2.24.4/test/Makefile.am 2013-03-27 17:02:08.000000000 +0100 +@@ -6,7 +6,6 @@ INCLUDES = \ + -I$(top_builddir)/libgnomevfs \ + $(TEST_CFLAGS) \ + $(VFS_CFLAGS) \ +- -DG_DISABLE_DEPRECATED \ + -DMODULES_PATH=\"$(libdir)/vfs/modules\" + + if OS_WIN32 diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 40b638520..0eff0e9d2 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $ +# $Id: PKGBUILD 190849 2013-07-18 20:27:30Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.3 +pkgver=1.12.4 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6' +sha256sums=('562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index c2d2ea67e..9cda1fb2e 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189862 2013-07-10 07:26:53Z bpiotrowski $ +# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuplot -pkgver=4.6.2 -pkgrel=3 +pkgver=4.6.3 +pkgrel=1 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnuplot.info" @@ -16,7 +16,7 @@ options=('!makeflags') install=gnuplot.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" gnuplot-doc2texi-el.patch) -sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd' +sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2' '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8') build() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 0f50c438b..f42a8c29c 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187148 2013-06-04 15:50:10Z andyrtr $ +# $Id: PKGBUILD 191780 2013-07-30 17:27:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,18 +14,12 @@ options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') -source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig} - check_fix.diff) -md5sums=('c220b50736f61292ed8722d5132b6a3e' - 'SKIP' - '53ae2a58a401d9e6d052910670da8b07') +source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('7c0dd4f77dc70c64d2f385aeb2df4157' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix i686 test suite failure - patch -Np1 -i ${srcdir}/check_fix.diff - + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --with-zlib \ --disable-static \ @@ -35,13 +29,12 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make -k check - #make -j1 check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman diff --git a/extra/gnutls/check_fix.diff b/extra/gnutls/check_fix.diff deleted file mode 100644 index f7c7e32c3..000000000 --- a/extra/gnutls/check_fix.diff +++ /dev/null @@ -1,34 +0,0 @@ -From b12040aeab5fbaf02677571db1d8bf1995bd5ee0 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos <nmav@gnutls.org> -Date: Sun, 2 Jun 2013 12:10:06 +0200 -Subject: [PATCH] Avoid comparing the expiration date to prevent false positive error in 32-bit systems. - ---- - tests/cert-tests/pem-decoding | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tests/cert-tests/pem-decoding b/tests/cert-tests/pem-decoding -index fe769ec..f8c6372 100755 ---- a/tests/cert-tests/pem-decoding -+++ b/tests/cert-tests/pem-decoding -@@ -61,7 +61,9 @@ if test "$rc" != "0"; then - exit $rc - fi - --diff $srcdir/complex-cert.pem tmp-pem.pem -+cat $srcdir/complex-cert.pem |grep -v "Not After:" >tmp1 -+cat $srcdir/tmp-pem.pem |grep -v "Not After:" >tmp2 -+diff tmp1 tmp2 - rc=$? - - if test "$rc" != "0"; then -@@ -69,6 +71,6 @@ if test "$rc" != "0"; then - exit $rc - fi - --rm -f tmp-pem.pem -+rm -f tmp-pem.pem tmp1 tmp2 - - exit 0 --- -1.7.1 diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff new file mode 100644 index 000000000..8277e2b2d --- /dev/null +++ b/extra/gnutls/tls_fix.diff @@ -0,0 +1,32 @@ +diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c +index 198cb34..3caa5ac 100644 +--- a/lib/gnutls_cipher.c ++++ b/lib/gnutls_cipher.c +@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session, + return gnutls_assert_val(ret); + + if (unlikely((unsigned)length_to_decrypt > compressed->size)) +- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ { ++ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n", ++ (unsigned int)length_to_decrypt, (unsigned int)compressed->size); ++ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED); ++ } + + ret = + _gnutls_auth_cipher_decrypt2 (¶ms->read.cipher_state, +diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c +index 993ddb9..4795711 100644 +--- a/lib/gnutls_record.c ++++ b/lib/gnutls_record.c +@@ -1193,8 +1193,8 @@ begin: + /* We allocate the maximum possible to allow few compressed bytes to expand to a + * full record. + */ +- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session), +- MAX_RECORD_RECV_SIZE(session)); ++ t.size = _gnutls_get_max_decrypted_data(session); ++ decrypted = _mbuffer_alloc(t.size, t.size); + if (decrypted == NULL) + return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR); + diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 33cf7a38b..cd4827cbc 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188943 2013-06-26 11:06:57Z foutrelis $ +# $Id: PKGBUILD 190847 2013-07-18 20:16:59Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.3 +pkgver=0.10.4 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2') +sha256sums=('30cb91693abff241e1b14b741ac23bc588f428b4524b12e3fecd1ea3f0bc67ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD index c8ad827ae..d22eba99f 100644 --- a/extra/gperftools/PKGBUILD +++ b/extra/gperftools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166940 2012-09-22 20:23:08Z dreisner $ +# $Id: PKGBUILD 191875 2013-08-01 00:55:33Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas Jost <schnouki@schnouki.net> @@ -7,8 +7,8 @@ # Contributor: Jan Rüegg <rggjan@gmail.com> pkgname=gperftools -pkgver=2.0 -pkgrel=4 +pkgver=2.1 +pkgrel=1 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools" arch=('i686' 'x86_64') url="http://code.google.com/p/gperftools/" @@ -18,14 +18,11 @@ optdepends=('graphviz: pprof graph generation' 'gv: pprof postscript generation') options=('!libtool') source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080') +sha256sums=('f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f') build() { cd "$pkgname-$pkgver" - # fix for glibc 2.16 - sed -i 's:siginfo_t:siginfo:' src/base/linuxthreads.cc - ./configure --prefix=/usr --enable-frame-pointers make } diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index ec36f1b32..f6d7e0c2c 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $ +# $Id: PKGBUILD 191285 2013-07-23 10:02:47Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.2.8 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') @@ -21,6 +21,7 @@ optdepends=('gupnp-av: uPnP plugin' 'libdmapsharing: DMAP sharing plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') +groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index f3087f4bc..c9fefb682 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ +# $Id: PKGBUILD 191762 2013-07-30 09:58:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.3 +pkgver=0.14.4 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk3 gtk-doc vala) optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') +sha256sums=('ed93fa1555a7032fa1e2b24eeef17d20a2275ee8b1682f28ac48640d6f2112ac') build() { cd $pkgname-$pkgver diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 51abbdd64..8a3ab6f1e 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190013 2013-07-12 20:37:31Z heftig $ +# $Id: PKGBUILD 191871 2013-07-31 17:39:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f') +sha256sums=('759641c0597c24191322f40945b363b75df299a539ff4086650be6193028189a') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index ee250f344..bb9c4ac21 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190006 2013-07-12 20:19:50Z heftig $ +# $Id: PKGBUILD 191865 2013-07-31 17:14:21Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d') +sha256sums=('963e3b83d651661f495ca2e44ccd2d5c61e986e9d7706246e568276689a372ea') build() { cd $pkgbase-$pkgver diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 6219e1256..2cbed4550 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190007 2013-07-12 20:23:55Z heftig $ +# $Id: PKGBUILD 191870 2013-07-31 17:33:33Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad') +sha256sums=('cfa2e617a76f93e9ddd4ae1109297e93fb4a06b152042b996231234a72c5a5ff') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 631682bf7..578b1b492 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190010 2013-07-12 20:29:57Z heftig $ +# $Id: PKGBUILD 191938 2013-08-01 08:51:34Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84') +sha256sums=('11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 59afb9248..b7facf76f 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188473 2013-06-14 19:32:02Z heftig $ +# $Id: PKGBUILD 191181 2013-07-19 01:56:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.4 +pkgver=0.5.5.1 pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) @@ -14,14 +14,13 @@ makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstream options=(!libtool !emptydirs) source=($url/$pkgbase-${pkgver}.tar.bz2) -sha1sums=('acd624693e392d6fd037d7072613e7384ebd6371') +sha1sums=('f4f28d04a2f6dc2b68151af700231ff8e47a7596') 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 diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 30f4661a1..2b21463b8 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 190004 2013-07-12 20:15:01Z heftig $ +# $Id: PKGBUILD 191864 2013-07-31 17:05:38Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d') +sha256sums=('17a2c60a82baa461ef685ad3de187edb9c03a2c7e07513daba58a5a32efacaa3') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 4f46197a1..102ae5931 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178131 2013-02-16 22:48:50Z ioni $ +# $Id: PKGBUILD 191896 2013-08-01 06:53:29Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.19 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD index e77286af0..7356f01c6 100644 --- a/extra/gtk/PKGBUILD +++ b/extra/gtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137905 2011-09-12 10:53:48Z eric $ +# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gtk pkgver=1.2.10 -pkgrel=11.2 -pkgdesc="The GTK+ toolkit" +pkgrel=12 +pkgdesc="GTK+ is a multi-platform toolkit (v1)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('LGPL') @@ -12,20 +12,21 @@ depends=('libxi' 'glib' 'sh') makedepends=('libxt') options=('!libtool') install=gtk.install -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') +source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz + aclocal-fixes.patch) +sha1sums=('a5adcb909257da01ae4d4761e1d41081d06e4d7c' + 'b034e33efb85d27f3f3fb082c404e3b6ea79259f') -build() { - cd "${srcdir}/gtk+-${pkgver}" - if [ "${CARCH}" = "x86_64" ]; then - rm config.guess config.sub - ln -s /usr/share/libtool/config/config.guess config.guess - ln -s /usr/share/libtool/config/config.sub config.sub - fi - patch -Np0 -i "${srcdir}/aclocal-fixes.patch" +prepare() { + cd gtk+-${pkgver} + cp /usr/share/libtool/config/config.guess . + cp /usr/share/libtool/config/config.sub . + patch -p0 -i "${srcdir}/aclocal-fixes.patch" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} +build() { + cd gtk+-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --mandir=/usr/share/man --infodir=/usr/share/info \ --with-xinput=xfree @@ -33,6 +34,6 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" + cd gtk+-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 872afd9eb..a5d505ae8 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185255 2013-05-12 15:16:09Z heftig $ +# $Id: PKGBUILD 191835 2013-07-31 09:23:27Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.5 +pkgver=4.6.6 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('d5145919708250b3dd0e650f90d156984217356d953da936394ceb8da59ff546') +sha256sums=('145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index b53cddf20..303096b43 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185396 2013-05-13 18:53:34Z heftig $ +# $Id: PKGBUILD 191287 2013-07-23 10:08:45Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,6 +12,7 @@ url="http://www.gnome.org" depends=('dconf' 'gtk3' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils') options=('!libtool' '!emptydirs') +groups=('gnome') install=gucharmap.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901') diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 14689e9e5..d9e373f4f 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $ +# $Id: PKGBUILD 191763 2013-07-30 10:02:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.3 +pkgver=0.20.4 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0') +sha256sums=('27eec44d62f6f60305cd65d7a488fc128700f8345ab37cc2ab42cf052fdd5b35') build() { cd $pkgname-$pkgver diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 05f197b67..7f1e0aefd 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187876 2013-06-07 17:10:53Z heftig $ +# $Id: PKGBUILD 191565 2013-07-25 16:28:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=(harfbuzz) pkgname=(harfbuzz harfbuzz-icu) -pkgver=0.9.18 +pkgver=0.9.19 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=(MIT) makedepends=(glib2 freetype2 graphite cairo icu) options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908') +sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35') build() { cd $pkgbase-$pkgver diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 3915aa1ec..3b9d9af0f 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 190039 2013-07-13 12:40:59Z svenstaro $ +# $Id: PKGBUILD 191897 2013-08-01 06:53:30Z bpiotrowski $ # 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=7 +pkgrel=8 pkgdesc='Panorama photo stitcher' url='http://hugin.sourceforge.net/' license=('GPL') diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 500aab551..7c9eade1d 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 189729 2013-07-06 17:47:53Z schiv $ +# $Id: PKGBUILD 191614 2013-07-27 18:39:53Z eric $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ibus -pkgver=1.5.2 -pkgrel=2 +pkgver=1.5.3 +pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ibus.googlecode.com" license=('LGPL') -depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject') +depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify') makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a7e1695731b4c954fa8897d091e6dda64e08b28c') +sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521') build() { cd ${pkgname}-${pkgver} diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index eee6629cf..a28b75be1 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,14 +4,16 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany') noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz + openjdk-hotfix.patch) +sha256sums=('e53a41fa132e086fa8d17cadf1e7e38cb3ab99577277949fbcae4ab8705245fb' + '1bf96e430d0694c53539e4e7a8c979c65a2ab5274d8ae38067b0fd7dd5bfba03') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -22,6 +24,7 @@ build() { LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/${pkgbase/-java7/}-$pkgver.tar.gz cd "${srcdir}"/icedtea-web* + patch -Np1 < $srcdir/openjdk-hotfix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ --with-jdk-home=${_jvmdir} \ diff --git a/extra/icedtea-web-java7/openjdk-hotfix.patch b/extra/icedtea-web-java7/openjdk-hotfix.patch new file mode 100644 index 000000000..29a0a309b --- /dev/null +++ b/extra/icedtea-web-java7/openjdk-hotfix.patch @@ -0,0 +1,56 @@ +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/Boot.java +--- a/netx/net/sourceforge/jnlp/runtime/Boot.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/Boot.java Wed Jun 19 10:32:32 2013 +0200 +@@ -35,6 +35,8 @@ + import net.sourceforge.jnlp.cache.UpdatePolicy; + import net.sourceforge.jnlp.security.viewer.CertificateViewer; + import net.sourceforge.jnlp.services.ServiceUtil; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + /** + * This is the main entry point for the JNLP client. The main +@@ -113,6 +115,9 @@ + * Launch the JNLP file specified by the command-line arguments. + */ + public static void main(String[] argsIn) { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + args = argsIn; + + if (null != getOption("-viewer")) { +diff -r 1a327a09262e netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Wed Jun 19 10:32:32 2013 +0200 +@@ -234,7 +234,7 @@ + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { +- // ignore it ++ e.printStackTrace(); + } + + doMainAppContextHacks(); +diff -r 1a327a09262e plugin/icedteanp/java/sun/applet/PluginMain.java +--- a/plugin/icedteanp/java/sun/applet/PluginMain.java Mon Jun 10 13:22:53 2013 +0200 ++++ b/plugin/icedteanp/java/sun/applet/PluginMain.java Wed Jun 19 10:32:32 2013 +0200 +@@ -72,6 +72,8 @@ + import java.net.ProxySelector; + import java.util.Enumeration; + import java.util.Properties; ++import sun.awt.AppContext; ++import sun.awt.SunToolkit; + + import net.sourceforge.jnlp.config.DeploymentConfiguration; + import net.sourceforge.jnlp.runtime.JNLPRuntime; +@@ -94,6 +96,9 @@ + */ + public static void main(String args[]) + throws IOException { ++ if (AppContext.getAppContext() == null) { ++ SunToolkit.createNewAppContext(); ++ } + if (args.length != 2 || !(new File(args[0]).exists()) || !(new File(args[1]).exists())) { + System.err.println("Invalid pipe names provided. Refusing to proceed."); + System.exit(1); diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD index 3b13aa317..d6ef840bf 100644 --- a/extra/idnkit/PKGBUILD +++ b/extra/idnkit/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 180328 2013-03-20 15:10:14Z bisson $ +# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=2.1 +pkgrel=3 pkgdesc='Provides functionalities about Internationalized Domain Name processing' url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') +backup=('etc/idnalias.conf' 'etc/idn.conf') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') -backup=('etc/idnalias.conf' 'etc/idn.conf') +prepare() { + cd idnkit-${pkgver}-src + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} build() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src ./configure \ --host=$CHOST \ --build=$CHOST \ @@ -30,12 +34,12 @@ build() { } check() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make check } package() { - cd "${srcdir}/idnkit-${pkgver}-src" + cd idnkit-${pkgver}-src make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" rm "${pkgdir}"/etc/*.sample diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index 6300c081c..d9d7347fd 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 depends=('gcc-libs') pkgdesc="Base libraries from ILM for OpenEXR" @@ -31,5 +31,5 @@ package() { make DESTDIR="${pkgdir}" install install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('70f1413840c2a228783d1332b8b168e6' +md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae' '65f1ec028c9f6fbf3a0abd6a687e9745') diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD index adc59a7d4..ed2f84bff 100644 --- a/extra/imake/PKGBUILD +++ b/extra/imake/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152805 2012-03-09 17:06:42Z andyrtr $ +# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=imake -pkgver=1.0.5 -pkgrel=1.1 +pkgver=1.0.6 +pkgrel=1 pkgdesc="X.Org imake program and related utilities" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -14,22 +14,25 @@ optdepends=('perl: for mkhtmlindex') source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2" 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2' 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.4.tar.bz2' - 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.4.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2' + 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2' 'linuxconfig.patch' 'LICENSE') -sha1sums=('1fd3dca267d125ad86583d7f9663b6ff532cddd1' +sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140' 'a3d971a507a460233afd8ed46e9f06135fed634d' 'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe' - '1f0f8aea1526c6c022f2cf16f7a6c67118c68336' - 'c58b7252df481572ec1ccd77b9f1ab561ed89e45' + '2599afa039d2070bae9df6ce43da288b3a4adf97' + 'ae22eb81d56d018f0b3b149f70965ebfef2385fd' '72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0' 'c5ecffb25ad079ba3858e3aec047d046df603a89') -build() { - cd ${srcdir}/xorg-cf-files-1.0.4 + +prepare() { + cd xorg-cf-files-1.0.5 patch -p1 -i "${srcdir}/linuxconfig.patch" - cd "${srcdir}" +} + +build() { for i in *; do if [ -d "${i}" ]; then pushd "${i}" @@ -41,7 +44,6 @@ build() { } package() { - cd "${srcdir}" for i in *; do if [ -d "${i}" ]; then pushd "${i}" diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD index d81c0360f..ae0924c92 100644 --- a/extra/imlib/PKGBUILD +++ b/extra/imlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184394 2013-05-06 19:37:57Z foutrelis $ +# $Id: PKGBUILD 191919 2013-08-01 06:59:48Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=imlib pkgver=1.9.15 -pkgrel=12 +pkgrel=13 pkgdesc="General image handling library for X11 and Gtk" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/imlib/" @@ -12,12 +12,14 @@ depends=('gtk' 'giflib' 'libpng' 'libtiff') makedepends=('libxt') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2 - debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch imlib-1.9.15-libpng15.patch) + debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch + imlib-1.9.15-libpng15.patch imlib-giflib5.patch) sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720' 'fe2fd9ce4d7bc62271e724153de39012de8ec5ee' 'ec1b47281c1a7fb21abe841f948ecc56ed13f310' 'af54cb1ee0c8c6122b277284ebdd1022e31df3b5' - '33c3aaa43eb624f2a6ab0406285a8515903333e3') + '33c3aaa43eb624f2a6ab0406285a8515903333e3' + '56e9d65e05a347452fd608d2dfc8538f7ce09893') prepare() { cd ${pkgname}-${pkgver} @@ -25,6 +27,7 @@ prepare() { patch -p1 -i "${srcdir}/CAN-2004-1026.patch" patch -p0 -i "${srcdir}/aclocal-fixes.patch" patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch" + patch -p1 -i "${srcdir}/imlib-giflib5.patch" sed '/AC_PATH_XTRA/d' -i configure.in libtoolize --force cp /usr/bin/libtool . diff --git a/extra/imlib/imlib-giflib5.patch b/extra/imlib/imlib-giflib5.patch new file mode 100644 index 000000000..affd206fc --- /dev/null +++ b/extra/imlib/imlib-giflib5.patch @@ -0,0 +1,110 @@ +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 17:39:39.063991823 -0400 +@@ -444,6 +444,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -454,7 +455,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + if (!gif) + return NULL; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 17:33:54.656601713 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 17:37:11.941783903 -0400 +@@ -23,6 +23,7 @@ + int intjump[] = {8, 8, 4, 2}; + int istransp, transp; + int fd; ++ int Error; + + done = 0; + istransp = 0; +@@ -30,7 +31,7 @@ + fd = fileno(f); + /* Apparently rewind(f) isn't sufficient */ + lseek(fd, (long) 0, 0); +- gif = DGifOpenFileHandle(fd); ++ gif = DGifOpenFileHandle(fd, &Error); + + transp = -1; + data = NULL; +diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c +--- imlib-1.9.15-orig/Imlib/load.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/Imlib/load.c 2013-07-29 22:07:36.926673905 -0400 +@@ -6,6 +6,14 @@ + + #define G_MAXINT ((int) 0x7fffffff) + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + /* Split the ID - damages input */ + + static char * +@@ -462,14 +470,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; +diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c +--- imlib-1.9.15-orig/gdk_imlib/io-gif.c 2013-07-29 22:06:15.111285191 -0400 ++++ imlib-1.9.15/gdk_imlib/io-gif.c 2013-07-29 22:08:46.182265058 -0400 +@@ -10,6 +10,14 @@ + #else + #include <gif_lib.h> + ++static void ++localPrintGifError(void) ++{ ++ int ErrorCode=0; ++ GifErrorString(ErrorCode); ++ fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode); ++} ++ + unsigned char * + loader_gif(FILE *f, int *w, int *h, int *t) + { +@@ -43,14 +51,14 @@ + { + if (DGifGetRecordType(gif, &rec) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done)) + { + if (DGifGetImageDesc(gif) == GIF_ERROR) + { +- PrintGifError(); ++ localPrintGifError(); + rec = TERMINATE_RECORD_TYPE; + } + *w = gif->Image.Width; diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD index f042719d0..a51feb3fd 100644 --- a/extra/imlib2/PKGBUILD +++ b/extra/imlib2/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 184395 2013-05-06 19:37:59Z foutrelis $ +# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Arjan Timmerman <arjan.archlinux.org> # Contributor: Tom Newsom <Jeepster.gmx.co.uk> pkgname=imlib2 pkgver=1.4.5 -pkgrel=4 +pkgrel=5 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support" url="http://sourceforge.net/projects/enlightenment/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo') options=('!libtool') -source=("http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2") -sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0') +source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2 + imlib2-giflib5.patch) +sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0' + '29d0778ffbe6e57f08048918a79eb1ad6af87bce') + +prepare() { + cd $pkgname-$pkgver + patch -Np0 -i ../imlib2-giflib5.patch +} build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver - # disable optimizations, they cause problems (e.g. FS#12268) - [ $CARCH = "i686" ] && EXTRAOPTS="--disable-mmx" - [ $CARCH = "x86_64" ] && EXTRAOPTS="--disable-amd64" + [ $CARCH = "i686" ] && EXTRAOPTS="--enable-mmx" + [ $CARCH = "x86_64" ] && EXTRAOPTS="--enable-amd64" - # Configure and Build ./configure --prefix=/usr \ --sysconfdir=/etc/imlib2 \ --x-libraries=/usr/lib $EXTRAOPTS @@ -30,7 +35,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install # Install License diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch new file mode 100644 index 000000000..966c6e4a7 --- /dev/null +++ b/extra/imlib2/imlib2-giflib5.patch @@ -0,0 +1,14 @@ +--- src/modules/loaders/loader_gif.c.orig ++++ src/modules/loaders/loader_gif.c +@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct + #endif + if (fd < 0) + return 0; ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileHandle(fd, NULL); ++#else + gif = DGifOpenFileHandle(fd); ++#endif + if (!gif) + { + close(fd); diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 1b803b403..2e8864f5e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189830 2013-07-08 20:27:27Z guillaume $ +# $Id: PKGBUILD 191921 2013-08-01 06:59:51Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspo _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index a01b5989c..b9db17268 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178132 2013-02-16 22:48:51Z ioni $ +# $Id: PKGBUILD 191898 2013-08-01 06:53:31Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=8 +pkgrel=9 pkgdesc="Feature-rich and easy to handle CD burning application" arch=("i686" "x86_64" 'mips64el') url="http://sourceforge.net/projects/k3b/" @@ -20,16 +20,20 @@ optdepends=('dvd+rw-tools: for dvd burning support' options=('!libtool') install=k3b.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch) + k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch) sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' '8120c0e22e6c41ea285ca6060be13723ed91c52b' - '5b35bff3f7670686a32bd71afea2deaca4331631') + '5b35bff3f7670686a32bd71afea2deaca4331631' + '02db0666db8d793860c93ef9e2f19a00c9451945') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch" patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch" - cd .. + patch -p1 -i "${srcdir}/k3b-2.0.2-libav9.patch" +} + +build() { mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -39,6 +43,6 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/k3b/k3b-2.0.2-libav9.patch b/extra/k3b/k3b-2.0.2-libav9.patch new file mode 100644 index 000000000..bb1f5e1a4 --- /dev/null +++ b/extra/k3b/k3b-2.0.2-libav9.patch @@ -0,0 +1,42 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 17:46:13.523959500 +0200 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-04-22 18:40:49.890007513 +0200 +@@ -95,7 +95,7 @@ bool K3bFFMpegFile::open() + } + + // analyze the streams +- ::av_find_stream_info( d->formatContext ); ++ ::avformat_find_stream_info( d->formatContext, 0 ); + + // we only handle files containing one audio stream + if( d->formatContext->nb_streams != 1 ) { +@@ -129,7 +129,7 @@ bool K3bFFMpegFile::open() + + // open the codec on our context + kDebug() << "(K3bFFMpegFile) found codec for " << m_filename; +- if( ::avcodec_open( codecContext, d->codec ) < 0 ) { ++ if( ::avcodec_open2( codecContext, d->codec, 0 ) < 0 ) { + kDebug() << "(K3bFFMpegDecoderFactory) could not open codec."; + return false; + } +--- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig 2013-07-12 23:05:37.371157123 -0400 ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-07-12 23:12:01.649948739 -0400 +@@ -55,7 +55,7 @@ + K3b::Msf length; + + // for decoding. ffmpeg requires 16-byte alignment. +- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE + 15]; ++ char outputBuffer[192000 + 15]; + char* alignedOutputBuffer; + char* outputBufferPos; + int outputBufferSize; +@@ -319,7 +319,7 @@ + } + + d->outputBufferPos = d->alignedOutputBuffer; +- d->outputBufferSize = AVCODEC_MAX_AUDIO_FRAME_SIZE; ++ d->outputBufferSize = 192000; + + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index 29feeb073..0d44e0aa3 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,31 +1,38 @@ -# $Id: PKGBUILD 146418 2012-01-10 23:37:34Z eric $ +# $Id: PKGBUILD 191225 2013-07-21 20:40:01Z eric $ +# Maintainer: # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kaffeine pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc='KDE media player' license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://kaffeine.kde.org" -depends=('kdelibs' 'kdebase-runtime' 'xine-lib') -makedepends=('pkg-config' 'cmake' 'automoc4') +depends=('kdebase-runtime' 'xine-lib') +makedepends=('cmake' 'automoc4') install=kaffeine.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('690e48d2e5fe123887109aa9b1bc1c31') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + kaffeine-1.2.2-gcc4.7.patch) +md5sums=('690e48d2e5fe123887109aa9b1bc1c31' + '48afe5ec99b38fe02782db57a847033f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/kaffeine-1.2.2-gcc4.7.patch" +} build() { - cd "$srcdir" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make } package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install + cd build + make DESTDIR="$pkgdir" install } diff --git a/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch new file mode 100644 index 000000000..e74563e0b --- /dev/null +++ b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch @@ -0,0 +1,32 @@ +commit 2da9df1e67004c3cfa879578c351300a99f23da1 +Author: Christoph Pfister <christophpfister@gmail.com> +Date: Wed Apr 4 21:22:09 2012 +0200 + + fix build for gcc 4.7 + +diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp +index 7fc8f68..e70d8b8 100644 +--- a/src/dvb/dvbepg.cpp ++++ b/src/dvb/dvbepg.cpp +@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size) + // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011) + QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC); + +- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid(); +- --entryCount, entry.advance()) { ++ for (AtscEitSectionEntry eitEntry = eitSection.entries(); ++ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) { + DvbEpgEntry epgEntry; + epgEntry.channel = channel; +- epgEntry.begin = baseDateTime.addSecs(entry.startTime()); +- epgEntry.duration = QTime().addSecs(entry.duration()); +- epgEntry.title = entry.title(); ++ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); ++ epgEntry.duration = QTime().addSecs(eitEntry.duration()); ++ epgEntry.title = eitEntry.title(); + +- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); ++ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); + DvbSharedEpgEntry entry = epgEntries.value(id); + + if (entry.isValid() && (entry->channel == epgEntry.channel) && diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 85b1bc1d6..eed142676 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ +# $Id: PKGBUILD 191899 2013-08-01 06:53:32Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 4daeb8141..5848026bc 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ +# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-krdc' 'kdenetwork-krfb') pkgver=4.10.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,13 +20,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - 'use-libotr3.patch') + 'use-libotr3.patch' + 'giflib5.patch') sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' - '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '388319373e96e6f44446ea1132c35ae9f660e01c') prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch + cd kopete + patch -p1 -i "${srcdir}"/giflib5.patch } build() { diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch new file mode 100644 index 000000000..231aefbc2 --- /dev/null +++ b/extra/kdenetwork/giflib5.patch @@ -0,0 +1,67 @@ +From: Raymond Wooninck <tittiatcoke@gmail.com> +Date: Sun, 17 Mar 2013 12:24:09 +0000 +Subject: Enable building with giflib v5 +X-Git-Tag: v4.10.80 +X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2 +--- +Enable building with giflib v5 + +REVIEW: 7066 + +svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846 +--- + + +--- a/protocols/wlm/wlmchatsession.cpp ++++ b/protocols/wlm/wlmchatsession.cpp +@@ -65,6 +65,10 @@ + #include "wlmchatsessioninkaction.h" + #ifdef HAVE_GIFLIB + #include <gif_lib.h> ++/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */ ++#ifndef GIFLIB_MAJOR ++#define GIFLIB_MAJOR 4 ++#endif + #endif + + WlmChatSession::WlmChatSession (Kopete::Protocol * protocol, +@@ -467,11 +471,15 @@ + { + #ifdef HAVE_GIFLIB + #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+ ++#if GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n"); ++#else + const char * errorString = GifErrorString(); + if (errorString) + fprintf(stderr, "GIF-LIB error: %s\n", errorString); + else + fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError()); ++#endif + #else // older giflib versions, libungif + PrintGifError(); + #endif // HAVE_GIF_ERROR_STRING +@@ -483,6 +491,10 @@ + WlmChatSession::convertToGif( const QPixmap & ink, QString filename) + { + #ifdef HAVE_GIFLIB ++#if GIFLIB_MAJOR >= 5 ++#define FreeMapObject GifFreeMapObject ++#define MakeMapObject GifMakeMapObject ++#endif + int i, status; + GifFileType *GifFile; + ColorMapObject *screenColourmap; +@@ -525,7 +537,11 @@ + } + } + ++#if GIFLIB_MAJOR >= 5 ++ GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL); ++#else + GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0); ++#endif + if (!GifFile) { + FreeMapObject(imageColourmap); + FreeMapObject(screenColourmap); + diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD index 18dc8731e..6116bead8 100644 --- a/extra/libdatrie/PKGBUILD +++ b/extra/libdatrie/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $ +# $Id: PKGBUILD 191328 2013-07-23 16:51:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libdatrie -pkgver=0.2.5 -pkgrel=1.1 +pkgver=0.2.6 +pkgrel=1 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe." url="http://linux.thai.net/projects/datrie" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') options=('!libtool' '!emptydirs') -source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz) -md5sums=('c9b057d07198d66e1ac2eff32937d3d4') +source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.xz) +md5sums=('e253eb2433045f6e224c7fa44f9796e1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD index 8a6d1e1eb..7863a185e 100644 --- a/extra/libgdiplus/PKGBUILD +++ b/extra/libgdiplus/PKGBUILD @@ -1,28 +1,38 @@ -# $Id: PKGBUILD 184402 2013-05-06 19:38:19Z foutrelis $ +# $Id: PKGBUILD 191924 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=libgdiplus -pkgver=2.10 -pkgrel=4 +pkgver=2.10.9 +pkgrel=1 pkgdesc="An Open Source Implementation of the GDI+ API" arch=(i686 x86_64 'mips64el') license=('MPL' 'LGPL') url="http://www.mono-project.com" -depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif') +depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif') options=('!libtool') -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch) -md5sums=('451966e8f637e3a1f02d1d30f900255d' - 'a2d143676bbaceeb88b4c34069e93986') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + libpng15.patch + libgdiplus0-giflib5.patch + libgdiplus-2.10.9-gold.patch) +md5sums=('b4615c14584b5d73cbb9757c28887654' + 'a2d143676bbaceeb88b4c34069e93986' + 'ad97558c721106eea03c7808b501814b' + '95fb92750c131ce9287419c3ac5fcb76') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libpng15.patch + patch -Np1 -i ../libgdiplus0-giflib5.patch + patch -Np1 -i ../libgdiplus-2.10.9-gold.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 <../libpng15.patch + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --with-cairo=system make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/libgdiplus/libgdiplus-2.10.9-gold.patch b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch new file mode 100644 index 000000000..379ae941e --- /dev/null +++ b/extra/libgdiplus/libgdiplus-2.10.9-gold.patch @@ -0,0 +1,16 @@ + tests/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 97f5f4e..c02ca25 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -228,7 +228,7 @@ DEPS = \ + $(top_builddir)/src/libgdiplus.la + + LDADDS = \ +- $(top_builddir)/src/libgdiplus.la ++ $(top_builddir)/src/libgdiplus.la -lX11 -lglib-2.0 + + testgdi_DEPENDENCIES = $(TEST_DEPS) + testgdi_LDADD = $(LDADDS) diff --git a/extra/libgdiplus/libgdiplus0-giflib5.patch b/extra/libgdiplus/libgdiplus0-giflib5.patch new file mode 100644 index 000000000..36d2bf836 --- /dev/null +++ b/extra/libgdiplus/libgdiplus0-giflib5.patch @@ -0,0 +1,117 @@ +diff --git a/src/gifcodec.c b/src/gifcodec.c +index 8dee0eb..564beed 100644 +--- a/src/gifcodec.c ++++ b/src/gifcodec.c +@@ -39,8 +39,10 @@ GUID gdip_gif_image_format_guid = {0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0 + + #include "gifcodec.h" + ++#if GIFLIB_MAJOR < 5 + /* giflib declares this incorrectly as EgifOpen */ + extern GifFileType *EGifOpen(void *userData, OutputFunc writeFunc); ++#endif + + /* Data structure used for callback */ + typedef struct +@@ -105,7 +107,7 @@ gdip_gif_inputfunc (GifFileType *gif, GifByteType *data, int len) + */ + + static int +-AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) ++AddExtensionBlockMono(SavedImage *New, int Len, int func, BYTE ExtData[]) + { + ExtensionBlock *ep; + +@@ -129,7 +131,7 @@ AddExtensionBlockMono(SavedImage *New, int Len, BYTE ExtData[]) + + if (ExtData) { + memcpy(ep->Bytes, ExtData, Len); +- ep->Function = New->Function; ++ ep->Function = func; + } + + return (GIF_OK); +@@ -232,20 +234,20 @@ DGifSlurpMono(GifFileType * GifFile, SavedImage *TrailingExtensions) + } + + case EXTENSION_RECORD_TYPE: { +- if (DGifGetExtension(GifFile, &temp_save.Function, &ExtData) == GIF_ERROR) { ++ int func; ++ if (DGifGetExtension(GifFile, &func, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } + + while (ExtData != NULL) { + /* Create an extension block with our data */ +- if (AddExtensionBlockMono(&temp_save, ExtData[0], &ExtData[1]) == GIF_ERROR) { ++ if (AddExtensionBlockMono(&temp_save, func, ExtData[0], &ExtData[1]) == GIF_ERROR) { + return (GIF_ERROR); + } + + if (DGifGetExtensionNext(GifFile, &ExtData) == GIF_ERROR) { + return (GIF_ERROR); + } +- temp_save.Function = 0; + } + break; + } +@@ -303,12 +305,19 @@ gdip_load_gif_image (void *stream, GpImage **image, BOOL from_file) + result = NULL; + loop_counter = FALSE; + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + gif = DGifOpen(stream, &gdip_gif_fileinputfunc); + } else { + gif = DGifOpen (stream, &gdip_gif_inputfunc); + } +- ++#else ++ if (from_file) ++ gif = DGifOpen(stream, &gdip_gif_fileinputfunc, NULL); ++ else ++ gif = DGifOpen(stream, &gdip_gif_inputfunc, NULL); ++#endif ++ + if (gif == NULL) { + goto error; + } +@@ -660,11 +669,22 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + return InvalidParameter; + } + ++#if GIFLIB_MAJOR < 5 + if (from_file) { + fp = EGifOpenFileName (stream, 0); + } else { + fp = EGifOpen (stream, gdip_gif_outputfunc); + } ++#else ++ if (from_file) ++ fp = EGifOpenFileName (stream, 0, NULL); ++ else ++ fp = EGifOpen (stream, gdip_gif_outputfunc, NULL); ++#define MakeMapObject GifMakeMapObject ++#define FreeMapObject GifFreeMapObject ++#define QuantizeBuffer GifQuantizeBuffer ++#define BitSize GifBitSize ++#endif + + if (!fp) { + return FileNotFound; +@@ -848,8 +868,15 @@ gdip_save_gif_image (void *stream, GpImage *image, BOOL from_file) + Buffer[0] = 1; + Buffer[1] = ptr[0]; + Buffer[2] = ptr[1]; ++#if GIFLIB_MAJOR < 5 + EGifPutExtensionFirst(fp, APPLICATION_EXT_FUNC_CODE, 11, "NETSCAPE2.0"); + EGifPutExtensionLast(fp, APPLICATION_EXT_FUNC_CODE, 3, Buffer); ++#else ++ EGifPutExtensionLeader(fp, APPLICATION_EXT_FUNC_CODE); ++ EGifPutExtensionBlock(fp, 11, "NETSCAPE2.0"); ++ EGifPutExtensionBlock(fp, 3, Buffer); ++ EGifPutExtensionTrailer(fp); ++#endif + } + } + diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index ea824fdd0..5e725fc28 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190014 2013-07-12 20:40:29Z heftig $ +# $Id: PKGBUILD 191831 2013-07-31 09:07:16Z jgc $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -13,7 +13,7 @@ depends=(glib2) makedepends=(gobject-introspection vala) options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b365b3afccbf9a9ecf4282be0b8ce7dcd56afa3c59c19d2ca79bb7f2724a966c') +sha256sums=('fbb73b963abaf1d07f360ac5fdb6905b4862d53553ea5f383a6884678bcd8267') build() { cd $pkgname-$pkgver diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD index 74672fb5c..ee212be87 100644 --- a/extra/libmbim/PKGBUILD +++ b/extra/libmbim/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 188603 2013-06-16 20:32:24Z eric $ +# $Id: PKGBUILD 191189 2013-07-19 12:04:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libmbim -pkgver=1.2.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="MBIM modem protocol helper library" arch=(i686 x86_64 mips64el) -url="http://cgit.freedesktop.org/libmbim/libmbim" +url="http://www.freedesktop.org/wiki/Software/libmbim/" license=(GPL2) depends=(glib2 bash systemd) makedepends=(gtk-doc python) options=('!libtool') -source=(http://cgit.freedesktop.org/libmbim/libmbim/snapshot/$pkgname-$pkgver.tar.xz) -sha256sums=('0b00085486bb34b772e56643d6605eaffc3b2dd620485bc598cab8b0c6051825') +source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('a7fa909df229574eb11baac89075ac1366a2ac1670f586483bdf0173257cf781') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --with-tests + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static make } diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD index 05e91dd5b..c7018b2f7 100644 --- a/extra/libmp3splt/PKGBUILD +++ b/extra/libmp3splt/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 182921 2013-04-16 07:10:02Z tpowa $ +# $Id: PKGBUILD 191705 2013-07-29 10:07:56Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=libmp3splt -pkgver=0.8.2 +pkgver=0.9.0 pkgrel=1 pkgdesc="Library for splitting mp3 and ogg files without decoding" arch=('i686' 'x86_64' 'mips64el') url="http://mp3splt.sourceforge.net" license=('GPL') -depends=('libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') -makedepends=('libtool' 'git') +depends=('flac' 'libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl') +makedepends=('libtool') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz") @@ -29,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('562b39b6788f8128b7185b83f14ca516') +md5sums=('b9b9677ababf823e0739e5caff68aa86') diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD index db3c9d398..ba3bf2ddb 100644 --- a/extra/libpciaccess/PKGBUILD +++ b/extra/libpciaccess/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libpciaccess -pkgver=0.13.1 +pkgver=0.13.2 pkgrel=1 pkgdesc="X11 PCI access library" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig' 'xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac') +sha256sums=('abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch b/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch deleted file mode 100644 index e67728051..000000000 --- a/extra/libpng/0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 56d6bc2e8855d25e03816509a0137c3a70410ae6 Mon Sep 17 00:00:00 2001 -From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> -Date: Mon, 29 Apr 2013 08:57:14 -0500 -Subject: [PATCH 06/10] [libpng16] Avoid dereferencing NULL pointer possibly - returned from - -png_create_write_struct() (Andrew Church). ---- - ANNOUNCE | 6 ++++-- - CHANGES | 4 +++- - pngwrite.c | 65 +++++++++++++++++++++++++++++++------------------------------- - 3 files changed, 39 insertions(+), 36 deletions(-) - - (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) - -diff --git a/pngwrite.c b/pngwrite.c -index 33924aa..b71a3d3 100644 ---- a/pngwrite.c -+++ b/pngwrite.c -@@ -494,51 +494,50 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, - png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, - error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); - #endif /* PNG_USER_MEM_SUPPORTED */ -+ if (png_ptr != NULL) -+ { -+ /* Set the zlib control values to defaults; they can be overridden by the -+ * application after the struct has been created. -+ */ -+ png_ptr->zbuffer_size = PNG_ZBUF_SIZE; - -- /* Set the zlib control values to defaults; they can be overridden by the -- * application after the struct has been created. -- */ -- png_ptr->zbuffer_size = PNG_ZBUF_SIZE; -- -- /* The 'zlib_strategy' setting is irrelevant because png_default_claim in -- * pngwutil.c defaults it according to whether or not filters will be used, -- * and ignores this setting. -- */ -- png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; -- png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; -- png_ptr->zlib_mem_level = 8; -- png_ptr->zlib_window_bits = 15; -- png_ptr->zlib_method = 8; -+ /* The 'zlib_strategy' setting is irrelevant because png_default_claim in -+ * pngwutil.c defaults it according to whether or not filters will be -+ * used, and ignores this setting. -+ */ -+ png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; -+ png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; -+ png_ptr->zlib_mem_level = 8; -+ png_ptr->zlib_window_bits = 15; -+ png_ptr->zlib_method = 8; - - #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED -- png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; -- png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; -- png_ptr->zlib_text_mem_level = 8; -- png_ptr->zlib_text_window_bits = 15; -- png_ptr->zlib_text_method = 8; -+ png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; -+ png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; -+ png_ptr->zlib_text_mem_level = 8; -+ png_ptr->zlib_text_window_bits = 15; -+ png_ptr->zlib_text_method = 8; - #endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ - -- /* This is a highly dubious configuration option; by default it is off, but -- * it may be appropriate for private builds that are testing extensions not -- * conformant to the current specification, or of applications that must not -- * fail to write at all costs! -- */ --# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED -+ /* This is a highly dubious configuration option; by default it is off, -+ * but it may be appropriate for private builds that are testing -+ * extensions not conformant to the current specification, or of -+ * applications that must not fail to write at all costs! -+ */ -+#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED - png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; - /* In stable builds only warn if an application error can be completely - * handled. - */ --# endif -+#endif - -- /* App warnings are warnings in release (or release candidate) builds but -- * are errors during development. -- */ --# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC -+ /* App warnings are warnings in release (or release candidate) builds but -+ * are errors during development. -+ */ -+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC - png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN; --# endif -+#endif - -- if (png_ptr != NULL) -- { - /* TODO: delay this, it can be done in png_init_io() (if the app doesn't - * do it itself) avoiding setting the default function if it is not - * required. --- -1.8.2.2 - diff --git a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch b/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch deleted file mode 100644 index 0a305c150..000000000 --- a/extra/libpng/0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 127b08a265f99ce517ea31ec7988a91fc17da4d9 Mon Sep 17 00:00:00 2001 -From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net> -Date: Sun, 5 May 2013 22:13:47 -0500 -Subject: [PATCH 09/10] [libpng16] Calculate our own zlib windowBits when - decoding rather than - -trusting the CMF bytes in the PNG datastream. ---- - ANNOUNCE | 6 +++-- - CHANGES | 5 +++- - pngrutil.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- - 3 files changed, 88 insertions(+), 10 deletions(-) - - (foutrelis: pruned non-code changes to apply cleanly to libpng 1.6.2.) - -diff --git a/pngrutil.c b/pngrutil.c -index 01c3679..9c10e26 100644 ---- a/pngrutil.c -+++ b/pngrutil.c -@@ -18,8 +18,6 @@ - - #ifdef PNG_READ_SUPPORTED - --#define png_strtod(p,a,b) strtod(a,b) -- - png_uint_32 PNGAPI - png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf) - { -@@ -4165,6 +4163,75 @@ png_read_finish_row(png_structrp png_ptr) - } - #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ - -+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED -+/* This is the code to to select a windowBits value to match the smallest -+ * possible sliding window needed to contain the entire uncompressed image. -+ */ -+static unsigned int -+required_window_bits(png_alloc_size_t data_size) -+{ -+ unsigned int windowBits = 15; -+ if (data_size <= 16384) /* else windowBits must be 15 */ -+ { -+ unsigned int half_z_window_size = 1U << (windowBits-1); /* 16384 */ -+ -+ do -+ { -+ half_z_window_size >>= 1; -+ --windowBits; -+ } -+ while (windowBits > 8 && data_size <= half_z_window_size); -+ } -+ return windowBits; -+} -+/* This is used below to find the size of an image to pass to png_deflate_claim, -+ * so it only needs to be accurate if the size is less than 16384 bytes (the -+ * point at which a lower LZ window size can be used.) -+ * -+ * To do: merge this with png_image_size() in pngwutil.c and put the result -+ * in png.c as a PNG_INTERNAL_FUNCTION. -+ */ -+static png_alloc_size_t -+png_read_image_size(png_structrp png_ptr) -+{ -+ /* Only return sizes up to the maximum of a png_uint_32, do this by limiting -+ * the width and height used to 15 bits. -+ */ -+ png_uint_32 h = png_ptr->height; -+ -+ if (png_ptr->rowbytes < 32768 && h < 32768) -+ { -+ if (png_ptr->interlaced) -+ { -+ /* Interlacing makes the image larger because of the replication of -+ * both the filter byte and the padding to a byte boundary. -+ */ -+ png_uint_32 w = png_ptr->width; -+ unsigned int pd = png_ptr->pixel_depth; -+ png_alloc_size_t cb_base; -+ int pass; -+ -+ for (cb_base=0, pass=0; pass<=6; ++pass) -+ { -+ png_uint_32 pw = PNG_PASS_COLS(w, pass); -+ -+ if (pw > 0) -+ cb_base += (PNG_ROWBYTES(pd, pw)+1) * PNG_PASS_ROWS(h, pass); -+ } -+ -+ return cb_base; -+ } -+ -+ else -+ return (png_ptr->rowbytes+1) * h; -+ } -+ -+ else -+ return 0xffffffffU; -+} -+ -+#endif /* PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED */ -+ - void /* PRIVATE */ - png_read_start_row(png_structrp png_ptr) - { -@@ -4449,14 +4516,20 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) - png_free(png_ptr, buffer); - } - -- /* Finally claim the zstream for the inflate of the IDAT data, use the bits -- * value from the stream (note that this will result in a fatal error if the -- * IDAT stream has a bogus deflate header window_bits value, but this should -- * not be happening any longer!) -+ /* Finally claim the zstream for the inflate of the IDAT data, using the -+ * windowBts predicted from the uncompressed data size, not the value from -+ * the stream. If READ_OPTIMIZE_WINDOWBITS_SUPPORTED is not defined, then -+ * simply use a 32kbyte window (windowBits=15). - */ -- if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK) -+#ifdef PNG_READ_OPTIMIZE_WINDOWBITS_SUPPORTED -+ if (png_inflate_claim(png_ptr, png_IDAT, -+ required_window_bits(png_read_image_size(png_ptr))) != Z_OK) -+#else -+ if (png_inflate_claim(png_ptr, png_IDAT, 15) != Z_OK) -+#endif - png_error(png_ptr, png_ptr->zstream.msg); - - png_ptr->flags |= PNG_FLAG_ROW_INIT; - } -+ - #endif /* PNG_READ_SUPPORTED */ --- -1.8.2.2 - diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index bf803f20e..3bc376d33 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,40 +1,30 @@ -# $Id: PKGBUILD 184406 2013-05-06 19:38:28Z foutrelis $ +# $Id: PKGBUILD 191317 2013-07-23 14:38:48Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.6.2 -_apngver=1.6.2 -pkgrel=3 +pkgver=1.6.3 +_apngver=1.6.3 +pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libpng.org/pub/png/libpng.html" license=('custom') depends=('zlib' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz" - 0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch - 0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch - adjust-apng-patch-for-libpng16-git-changes.patch) -md5sums=('9d838f6fca9948a9f360a0cc1b516d5f' - '7d0c9f4b9a7f45dd5d1088e54b623c98' - '59b83234f60a7d1d179d9b0b6a0ebc01' - 'b1f7922b6678305bdb7c23d5bd1763f3' - 'f87704c3fb6d29f09b52178e89a42e2e') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc} + http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz) +md5sums=('9307f8ab04f4be3c1889ffb504f0fe5c' + 'SKIP' + '57007fc121baa2cdc48abcfb26300e78') prepare() { cd $pkgname-$pkgver - # Add fixes from libpng16 branch - patch -Np1 -i ../0001-libpng16-Avoid-dereferencing-NULL-pointer-possibly-r.patch - patch -Np1 -i ../0002-libpng16-Calculate-our-own-zlib-windowBits-when-deco.patch - # Add animated PNG (apng) support # see http://sourceforge.net/projects/libpng-apng/ - patch -d .. -Np0 -i adjust-apng-patch-for-libpng16-git-changes.patch patch -Np1 -i ../libpng-$_apngver-apng.patch } diff --git a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch b/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch deleted file mode 100644 index 26ac1c1cf..000000000 --- a/extra/libpng/adjust-apng-patch-for-libpng16-git-changes.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libpng-1.6.2-apng.patch.orig 2013-05-06 12:09:16.000000000 +0300 -+++ libpng-1.6.2-apng.patch 2013-05-06 12:12:14.000000000 +0300 -@@ -1034,7 +1034,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l - - if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) - png_chunk_benign_error(png_ptr, "Extra compressed data"); --@@ -4459,4 +4671,80 @@ -+@@ -4459,5 +4671,81 @@ - - png_ptr->flags |= PNG_FLAG_ROW_INIT; - } -@@ -1114,6 +1114,7 @@ diff -Naru libpng-1.6.2.org/pngrutil.c l - +} - +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ - +#endif /* PNG_READ_APNG_SUPPORTED */ -+ - #endif /* PNG_READ_SUPPORTED */ - diff -Naru libpng-1.6.2.org/pngset.c libpng-1.6.2/pngset.c - --- libpng-1.6.2.org/pngset.c 2013-04-29 17:31:42.000000000 +0900 diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD index b3d1be2a5..458310cc6 100644 --- a/extra/libqmi/PKGBUILD +++ b/extra/libqmi/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 188775 2013-06-20 03:53:16Z heftig $ +# $Id: PKGBUILD 191190 2013-07-19 12:11:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libqmi pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="QMI modem protocol helper library" arch=(i686 x86_64 mips64el) -url="http://cgit.freedesktop.org/libqmi" +url="http://www.freedesktop.org/wiki/Software/libqmi/" license=(GPL2) depends=(glib2 bash) makedepends=(gtk-doc python) options=('!libtool') -source=($url/snapshot/$pkgname-$pkgver.tar.xz) -sha256sums=('3a9d1359da703905147c173df4f6c0e5bb5dbca0a0fd3d0ce6efe26331bcafeb') +source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --with-tests make } diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index 75784fd1a..ae2c5581e 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164508 2012-08-01 10:14:01Z jgc $ +# $Id: PKGBUILD 191330 2013-07-23 16:53:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libthai -pkgver=0.1.18 +pkgver=0.1.19 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" @@ -12,8 +12,8 @@ license=('LGPL') depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('0250fc5255c1e62b23f88c2d6b1d6262') +source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.xz) +md5sums=('c4a6c3842257889f8f15ae192b66e797') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libtxc_dxtn/PKGBUILD b/extra/libtxc_dxtn/PKGBUILD new file mode 100644 index 000000000..289ced445 --- /dev/null +++ b/extra/libtxc_dxtn/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 190835 2013-07-18 12:20:11Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> + +pkgname=libtxc_dxtn +pkgver=1.0.1 +pkgrel=5 +arch=(i686 x86_64 mips64el) +pkgdesc="S3 Texture Compression (S3TC) library for Mesa" +url="http://dri.freedesktop.org/wiki/S3TC" +license=(custom:BSD) +depends=(mesa) +options=(!libtool) +source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('7105107f07ac49753f4b61ba9d0c79c5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + # License + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" + sed -n '5,22{s|^ \* \?||;p}' txc_dxtn.h \ + > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index d72cdcb5d..89c368a36 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189920 2013-07-11 14:30:26Z heftig $ +# $Id: PKGBUILD 191925 2013-08-01 06:59:55Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp pkgver=0.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD index 762f82dfc..1c41314ac 100644 --- a/extra/libx11/PKGBUILD +++ b/extra/libx11/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187152 2013-06-04 16:06:29Z andyrtr $ +# $Id: PKGBUILD 191746 2013-07-30 07:19:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libx11 -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="X11 client-side library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto') options=('!libtool') license=('custom') source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha256sums=('53131412343ec252307fe14903deaf54c356f9414d72d49180c2091dcd7019fa') +sha256sums=('10a54fc16b58b4f5a5eed4d080c357a82fd2f42d09af625c1f5df50650701892') build() { cd "${srcdir}/libX11-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index f2e695ec7..1742a636e 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,27 +1,35 @@ -# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $ +# $Id: PKGBUILD 191295 2013-07-23 11:13:07Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb pkgver=1.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X11 client-side library" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau') -makedepends=('pkgconfig' 'libxslt' 'python2') +depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau') +makedepends=('pkgconfig' 'libxslt' 'python') options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) + libxcb-1.1-no-pthread-stubs.patch + reorder-configure.patch) sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' - '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310') + '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310' + '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=66413 + patch -Np1 -i ../reorder-configure.patch + NOCONFIGURE=1 ./autogen.sh +} build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch" - export PYTHON=/usr/bin/python2 - ./autogen.sh --prefix=/usr \ + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ --enable-xinput \ --enable-xkb \ --disable-static @@ -29,7 +37,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch new file mode 100644 index 000000000..afeeffe7e --- /dev/null +++ b/extra/libxcb/reorder-configure.patch @@ -0,0 +1,29 @@ +--- libxcb-1.9.1/configure.ac 2013-05-30 17:38:01.000000000 +0200 ++++ libxcb-1.9.1/configure.ac.new 2013-06-30 21:01:30.134153288 +0200 +@@ -2,20 +2,21 @@ + # Process this file with autoconf to produce a configure script. + + # Initialize Autoconf +-AC_PREREQ(2.57) + AC_INIT([libxcb], + 1.9.1, + [xcb@lists.freedesktop.org]) ++AC_PREREQ(2.57) ++ ++# Initialize Automake ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) ++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ++ + AC_CONFIG_SRCDIR([xcb.pc.in]) + # Set common system defines for POSIX extensions, such as _GNU_SOURCE + # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) + # to avoid autoconf errors. + AC_USE_SYSTEM_EXTENSIONS + +-# Initialize Automake +-AM_INIT_AUTOMAKE([foreign dist-bzip2]) +-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +- + AM_PATH_PYTHON([2.6]) + + PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD index 9079e706d..1a2be3266 100644 --- a/extra/libxfont/PKGBUILD +++ b/extra/libxfont/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151781 2012-03-02 18:55:43Z andyrtr $ +# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfont -pkgver=1.4.5 -pkgrel=1.2 +pkgver=1.4.6 +pkgrel=1 pkgdesc="X11 font rasterisation library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2) -sha1sums=('0bf3cb8aa192ab96bbaf384d1a4a00d15a40171e') +sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f') build() { cd "${srcdir}/libXfont-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 960b8092c..79fbd180d 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188257 2013-06-13 16:04:25Z giovanni $ +# $Id: PKGBUILD 190133 2013-07-16 17:49:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.06.06 +pkgver=2013.07.16 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('81431f6217725e2b1c3f1a16fca19221') +md5sums=('8b660d11d43c3beac11580e62e3179f8') build() { cd ${srcdir}/live diff --git a/extra/loudmouth/07-glib-single-include.patch b/extra/loudmouth/07-glib-single-include.patch new file mode 100644 index 000000000..074b29526 --- /dev/null +++ b/extra/loudmouth/07-glib-single-include.patch @@ -0,0 +1,17 @@ +Description: Fix build failure with glib 2.32 + where including individual glib headers is no longer allowed. +Author: Michael Biebl <biebl@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665576 +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c 2008-10-29 21:48:15.000000000 +0100 ++++ loudmouth-1.4.3/loudmouth/lm-error.c 2012-03-26 00:24:19.518939657 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/extra/loudmouth/08-fix-ipv6-connect.patch b/extra/loudmouth/08-fix-ipv6-connect.patch new file mode 100644 index 000000000..b8815a7de --- /dev/null +++ b/extra/loudmouth/08-fix-ipv6-connect.patch @@ -0,0 +1,28 @@ +Description: fix crash when falling back from IPv6 to IPv4 + Previously, loudmouth would set socket->watch_connect to NULL when + encountering an error. When the connection attempt (to a different IPv6) + succeeded later on, _lm_socket_succeeded would therefore not remove the + socket_connect_cb watcher, leading to socket_connect_cb being called upon + socket activity and segfaulting the program. +Author: Michael Stapelberg <stapelberg@debian.org> +Bug-Debian: http://bugs.debian.org/631729 +Forwarded: no +Last-Update: 2013-02-03 +--- a/loudmouth/lm-socket.c ++++ b/loudmouth/lm-socket.c +@@ -529,7 +529,6 @@ + /* error condition, but might be possible to recover + * from it (by connecting to the next host) */ + if (!_lm_socket_failed_with_error (connect_data, err)) { +- socket->watch_connect = NULL; + goto out; + } + } +@@ -560,7 +559,6 @@ + _lm_sock_close (connect_data->fd); + _lm_socket_failed_with_error (connect_data, err); + +- socket->watch_connect = NULL; + goto out; + } + } diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD index 17cbb2b01..cbc3bf1ce 100644 --- a/extra/loudmouth/PKGBUILD +++ b/extra/loudmouth/PKGBUILD @@ -5,7 +5,7 @@ pkgname=loudmouth pkgver=1.4.3 -pkgrel=3 +pkgrel=4 pkgdesc="A lightweight Jabber client library written in C/Glib" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -16,19 +16,30 @@ makedepends=('intltool' 'pkgconfig' 'gtk-doc') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2 01-fix-sasl-md5-digest-uri.patch 03-drop-stanzas-on-fail.patch - 04-use-pkg-config-for-gnutls.patch) + 04-use-pkg-config-for-gnutls.patch + 07-glib-single-include.patch + 08-fix-ipv6-connect.patch) md5sums=('55339ca42494690c3942ee1465a96937' 'dc799cea18b24847b1e008c7424010a3' 'b7b2d81b01a5eee5fd5e21cae67b4af7' - 'bffb25b9551df43255fe1706588582f3') + 'bffb25b9551df43255fe1706588582f3' + 'd1546ed54740de536f6bb79a18c5dccb' + '8e3071299776d32b9be27bba7d3f9ae0') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch" - patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch" - patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch" + patch -Np1 -i ../01-fix-sasl-md5-digest-uri.patch + patch -Np1 -i ../03-drop-stanzas-on-fail.patch + patch -Np1 -i ../04-use-pkg-config-for-gnutls.patch + patch -Np1 -i ../07-glib-single-include.patch + patch -Np1 -i ../08-fix-ipv6-connect.patch libtoolize --force - autoreconf + aclocal + autoconf + automake --add-missing +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make } diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 81e62cbbc..4935e2033 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $ +# $Id: PKGBUILD 190839 2013-07-18 17:45:57Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.31 +pkgver=5.5.32 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28' +sha256sums=('cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index db347f8d2..c911dae6d 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188540 2013-06-15 10:10:22Z andrea $ +# $Id: PKGBUILD 191931 2013-08-01 07:14:32Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.9.0 -pkgrel=1 +pkgrel=3 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.linphone.org/" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index c10b39419..ef6114012 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ +# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.3 +pkgver=2.7 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('99e311b2202057a259899f67b425e087' +md5sums=('61093c08ca5d8d1310382d17764f0c43' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index d544f0ab8..24e1d6822 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 190055 2013-07-13 17:35:09Z andyrtr $ +# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.4 -pkgrel=5 +pkgver=9.1.6 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland' 'systemd') @@ -17,17 +17,10 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - git_fixes.patch LICENSE) -md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8' - '8ec30e1bd7abe5e8e540df4fa618540f' +md5sums=('443a2a352667294b53d56cb1a74114e9' '5c65a0fe315dd347e09b1f2826a1df5a') -prepare() { - cd ?esa-* - patch -Np1 -i ../git_fixes.patch -} - build() { cd ${srcdir}/?esa-* @@ -72,6 +65,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" depends=("mesa-libgl=${pkgver}") + optdepends=('libtxc_dxtn: S3 Texture Compressed support') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -89,6 +83,7 @@ package_ati-dri() { package_intel-dri() { pkgdesc="Mesa drivers for Intel" + optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri @@ -100,6 +95,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" + optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") # vdpau driver is problematic, so remove it (FS#36004) diff --git a/extra/mesa/git_fixes.patch b/extra/mesa/git_fixes.patch deleted file mode 100644 index 51b0b8f8e..000000000 --- a/extra/mesa/git_fixes.patch +++ /dev/null @@ -1,476 +0,0 @@ -From 6194644a49f841488e23ce021e7817ec02927eef Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 01 Jul 2013 21:31:03 +0000 -Subject: docs: Add 9.1.4 release md5sums - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> ---- -diff --git a/docs/relnotes-9.1.4.html b/docs/relnotes-9.1.4.html -index 48e421b..fa6fe67 100644 ---- a/docs/relnotes-9.1.4.html -+++ b/docs/relnotes-9.1.4.html -@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported. - - <h2>MD5 checksums</h2> - <pre> --TBD -+a2c4e25d0e27918bc67f61bae04d0cb8 MesaLib-9.1.4.tar.bz2 -+8c7e9ce5b05cb2223f0587396dd9dc08 MesaLib-9.1.4.tar.gz -+020459c5793d4279bdcb2daa1f7dd9f6 MesaLib-9.1.4.zip - </pre> - - <h2>New features</h2> --- -cgit v0.9.0.2-2-gbebe - -From e94a89de4deeabd0f8347795385b2f098aa35365 Mon Sep 17 00:00:00 2001 -From: Vinson Lee <vlee@freedesktop.org> -Date: Fri, 01 Feb 2013 07:28:41 +0000 -Subject: swrast: Fix memory leak. - -Fixes resource leak defect reported by Coverity. - -Signed-off-by: Vinson Lee <vlee@freedesktop.org> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 985e710c0d1f4f3bbd18448f04e611bd57ae9100) ---- -diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c -index 9638271..b380de3 100644 ---- a/src/mesa/drivers/dri/swrast/swrast.c -+++ b/src/mesa/drivers/dri/swrast/swrast.c -@@ -363,6 +363,7 @@ swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv, - xrb->bpp = 8; - break; - default: -+ free(xrb); - return NULL; - } - --- -cgit v0.9.0.2-2-gbebe - -From ab159327a7dc2dd41f9887d053d4abb3de69d195 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:33:59 +0000 -Subject: glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset - -This will be used in the next commit. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit 5097f358419c067a71e96e39764b3bb0a716bdbb) ---- -diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp -index b8335fe..fbbe577 100644 ---- a/src/mesa/main/uniform_query.cpp -+++ b/src/mesa/main/uniform_query.cpp -@@ -234,7 +234,7 @@ validate_uniform_parameters(struct gl_context *ctx, - return false; - } - -- _mesa_uniform_split_location_offset(location, loc, array_index); -+ _mesa_uniform_split_location_offset(shProg, location, loc, array_index); - - if (*loc >= shProg->NumUserUniformStorage) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", -diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c -index d902407..cee57a7 100644 ---- a/src/mesa/main/uniforms.c -+++ b/src/mesa/main/uniforms.c -@@ -532,7 +532,7 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) - if (shProg->UniformStorage[index].block_index != -1) - return -1; - -- return _mesa_uniform_merge_location_offset(index, offset); -+ return _mesa_uniform_merge_location_offset(shProg, index, offset); - } - - GLuint GLAPIENTRY -diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h -index a12ad9b..853a27c 100644 ---- a/src/mesa/main/uniforms.h -+++ b/src/mesa/main/uniforms.h -@@ -268,7 +268,8 @@ struct gl_builtin_uniform_desc { - * Combine the uniform's base location and the offset - */ - static inline GLint --_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) -+_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, -+ unsigned base_location, unsigned offset) - { - return (base_location << 16) | offset; - } -@@ -277,7 +278,8 @@ _mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset) - * Separate the uniform base location and parameter offset - */ - static inline void --_mesa_uniform_split_location_offset(GLint location, unsigned *base_location, -+_mesa_uniform_split_location_offset(const struct gl_shader_program *prog, -+ GLint location, unsigned *base_location, - unsigned *offset) - { - *offset = location & 0xffff; -diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -index 4286f0e..1e04f64 100644 ---- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp -@@ -3052,7 +3052,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx, - "Couldn't find uniform for initializer %s\n", name); - return; - } -- int loc = _mesa_uniform_merge_location_offset(index, offset); -+ int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset); - - for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) { - ir_constant *element; --- -cgit v0.9.0.2-2-gbebe - -From 4d12a9c67c850ff2c92f301317bc3fae0bcb448a Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:35:05 +0000 -Subject: glsl: Add gl_shader_program::UniformLocationBaseScale - -This is used by _mesa_uniform_merge_location_offset and -_mesa_uniform_split_location_offset to determine how the base and offset -are packed. Previously, this value was hard coded as (1U<<16) in those -functions via the shift and mask contained therein. The value is still -(1U<<16), but it can be changed in the future. - -The next patch dynamically generates this value. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit 26d86d26f9f972b19c7040bdb1b1daf48537ef3e) ---- -diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp -index d457e4d..ac726f4 100644 ---- a/src/glsl/link_uniforms.cpp -+++ b/src/glsl/link_uniforms.cpp -@@ -730,6 +730,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog) - - assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets)); - memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets)); -+ prog->UniformLocationBaseScale = (1U<<16); - - #ifndef NDEBUG - for (unsigned i = 0; i < num_user_uniforms; i++) { -diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h -index 23c3a0d..3e440f5 100644 ---- a/src/mesa/main/mtypes.h -+++ b/src/mesa/main/mtypes.h -@@ -2419,6 +2419,21 @@ struct gl_shader_program - unsigned NumUniformBlocks; - - /** -+ * Scale factor for the uniform base location -+ * -+ * This is used to generate locations (returned by \c glGetUniformLocation) -+ * of uniforms. The base location of the uniform is multiplied by this -+ * value, and the array index is added. -+ * -+ * \note -+ * Must be >= 1. -+ * -+ * \sa -+ * _mesa_uniform_merge_location_offset, _mesa_uniform_split_location_offset -+ */ -+ unsigned UniformLocationBaseScale; -+ -+ /** - * Indices into the _LinkedShaders's UniformBlocks[] array for each stage - * they're used in, or -1. - * -diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c -index 59daff5..0494320 100644 ---- a/src/mesa/main/shaderobj.c -+++ b/src/mesa/main/shaderobj.c -@@ -283,6 +283,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx, - ralloc_free(shProg->UniformStorage); - shProg->NumUserUniformStorage = 0; - shProg->UniformStorage = NULL; -+ shProg->UniformLocationBaseScale = 0; - } - - if (shProg->UniformHash) { -diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h -index 853a27c..421232d 100644 ---- a/src/mesa/main/uniforms.h -+++ b/src/mesa/main/uniforms.h -@@ -271,7 +271,9 @@ static inline GLint - _mesa_uniform_merge_location_offset(const struct gl_shader_program *prog, - unsigned base_location, unsigned offset) - { -- return (base_location << 16) | offset; -+ assert(prog->UniformLocationBaseScale >= 0); -+ assert(offset < prog->UniformLocationBaseScale); -+ return (base_location * prog->UniformLocationBaseScale) + offset; - } - - /** -@@ -282,8 +284,8 @@ _mesa_uniform_split_location_offset(const struct gl_shader_program *prog, - GLint location, unsigned *base_location, - unsigned *offset) - { -- *offset = location & 0xffff; -- *base_location = location >> 16; -+ *offset = location % prog->UniformLocationBaseScale; -+ *base_location = location / prog->UniformLocationBaseScale; - } - /*@}*/ - --- -cgit v0.9.0.2-2-gbebe - -From 307a703c759263bb37285b0919721ff2c413fc56 Mon Sep 17 00:00:00 2001 -From: Ian Romanick <ian.d.romanick@intel.com> -Date: Mon, 10 Jun 2013 17:39:28 +0000 -Subject: glsl: Generate smaller values for uniform locations - -Previously we would generate uniform locations as (slot << 16) + -array_index. We do this to handle applications that assume the location -of a[2] will be +1 from the location of a[1]. This resulted in every -uniform location being at least 0x10000. The OpenGL 4.3 spec was -amended to require this behavior, but previous versions did not require -locations of array (or structure) members be sequential. - -We've now encountered two applications that assume uniform values will -be "small." As far as we can tell, these applications store the GLint -returned by glGetUniformLocation in a int16_t or possibly an int8_t. - -THIS BEHAVIOR IS NOT GUARANTEED OR IMPLIED BY ANY VERSION OF OpenGL. - -Other implementations happen to have both these behaviors (sequential -array elements and small values) since OpenGL 2.0, so let's just match -their behavior. - -Fixes "3D Bowling" on Android. - -NOTE: This is a candidate for stable release branches. - -Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com> -(cherry picked from commit cfa3c5ad828f56559a6cc2de299f993b8e748ea4) ---- -diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp -index ac726f4..8e01d2e 100644 ---- a/src/glsl/link_uniforms.cpp -+++ b/src/glsl/link_uniforms.cpp -@@ -730,7 +730,20 @@ link_assign_uniform_locations(struct gl_shader_program *prog) - - assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets)); - memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets)); -- prog->UniformLocationBaseScale = (1U<<16); -+ -+ /* Determine the size of the largest uniform array queryable via -+ * glGetUniformLocation. Using this as the location scale guarantees that -+ * there is enough "room" for the array index to be stored in the low order -+ * part of the uniform location. It also makes the locations be more -+ * tightly packed. -+ */ -+ unsigned max_array_size = 1; -+ for (unsigned i = 0; i < num_user_uniforms; i++) { -+ if (uniforms[i].array_elements > max_array_size) -+ max_array_size = uniforms[i].array_elements; -+ } -+ -+ prog->UniformLocationBaseScale = max_array_size; - - #ifndef NDEBUG - for (unsigned i = 0; i < num_user_uniforms; i++) { --- -cgit v0.9.0.2-2-gbebe - -From 2cfc0072a80cfd9503be7e57a1d8375d64d7eb98 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <r.sandiford@uk.ibm.com> -Date: Mon, 17 Jun 2013 16:10:49 +0000 -Subject: st/xlib Fix XIMage bytes-per-pixel calculation - -Fixes a crash seen while running gnome on a 16-bit screen over vnc. - -NOTE: This is a candidate for stable release branches. - -Reviewed-by: Brian Paul <brianp@vmware.com> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit 876fefe2ff8901ae4b908cff89ac5dd4324f4fe5) ---- -diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c -index 5c6d6a7..4f99e23 100644 ---- a/src/gallium/state_trackers/glx/xlib/xm_api.c -+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c -@@ -1392,9 +1392,8 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - return; - } - -- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. -- We assume 32 bit pixels. */ -- ximage_stride = w * 4; -+ /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -+ ximage_stride = w * ((img->bits_per_pixel + 7) / 8); - - for (line = 0; line < h; line++) - memcpy(&map[line * tex_xfer->stride], --- -cgit v0.9.0.2-2-gbebe - -From 8ed60f7f7fb060ccf939328bb03c9714b207236f Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <r.sandiford@uk.ibm.com> -Date: Mon, 17 Jun 2013 16:13:25 +0000 -Subject: st/xlib: Fix XImage stride calculation - -Fixes window skew seen while running gnome on a 16-bit screen over vnc. - -NOTE: This is a candidate for stable release branches. - -Reviewed-by: Brian Paul <brianp@vmware.com> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit c132c2978b02da7140462a633605a0127dfcceb4) ---- -diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c -index 4f99e23..9bfd372 100644 ---- a/src/gallium/state_trackers/glx/xlib/xm_api.c -+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c -@@ -1366,7 +1366,7 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - enum pipe_format internal_format = res->format; - struct pipe_transfer *tex_xfer; - char *map; -- int line, ximage_stride; -+ int line, byte_width; - XImage *img; - - internal_format = choose_pixel_format(drawable->xm_visual); -@@ -1393,12 +1393,12 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer, - } - - /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -- ximage_stride = w * ((img->bits_per_pixel + 7) / 8); -+ byte_width = w * ((img->bits_per_pixel + 7) / 8); - - for (line = 0; line < h; line++) - memcpy(&map[line * tex_xfer->stride], -- &img->data[line * ximage_stride], -- ximage_stride); -+ &img->data[line * img->bytes_per_line], -+ byte_width); - - pipe_transfer_unmap(pipe, tex_xfer); - --- -cgit v0.9.0.2-2-gbebe - -From 5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88 Mon Sep 17 00:00:00 2001 -From: Kristian Høgsberg <krh@bitplanet.net> -Date: Tue, 18 Jun 2013 20:53:46 +0000 -Subject: wayland: Handle global_remove event as well - -We need to set up a handler for the global_remove event that gets sent -out when a global gets removed. Without the handler we end up calling -a NULL pointer. - -https://bugs.freedesktop.org/show_bug.cgi?id=65910 - -NOTE: This is a candidate for the stable branches. - -Signed-off-by: Kristian Høgsberg <krh@bitplanet.net> -(cherry picked from commit 712269d6744a8849d1d0cf01fa0132d969b79ed4) ---- -diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c -index 99d8729..e106dc2 100644 ---- a/src/egl/drivers/dri2/platform_wayland.c -+++ b/src/egl/drivers/dri2/platform_wayland.c -@@ -643,8 +643,15 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name, - } - } - -+static void -+registry_handle_global_remove(void *data, struct wl_registry *registry, -+ uint32_t name) -+{ -+} -+ - static const struct wl_registry_listener registry_listener = { -- registry_handle_global -+ registry_handle_global, -+ registry_handle_global_remove - }; - - EGLBoolean --- -cgit v0.9.0.2-2-gbebe - -From cda92f5191cd2ed4782dbdd41143d520857861c9 Mon Sep 17 00:00:00 2001 -From: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -Date: Tue, 18 Jun 2013 15:41:43 +0000 -Subject: st/dri/sw: Fix pitch calculation in drisw_update_tex_buffer - -swrastGetImage rounds the pitch up to 4 bytes for compatibility reasons -that are explained in drisw_glx.c:bytes_per_line, so drisw_update_tex_buffer -must do the same. - -Fixes window skew seen while running firefox over vnc on a 16-bit screen. - -NOTE: This is a candidate for the stable branches. - -[ajax: fixed typo in comment] - -Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> -Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com> -(cherry picked from commit 5a0556f061d9db00dd7637433d393beead3b3d85) ---- -diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c -index 7a5f797..41f66d5 100644 ---- a/src/gallium/state_trackers/dri/sw/drisw.c -+++ b/src/gallium/state_trackers/dri/sw/drisw.c -@@ -265,8 +265,9 @@ drisw_update_tex_buffer(struct dri_drawable *drawable, - /* Copy the Drawable content to the mapped texture buffer */ - get_image(dPriv, x, y, w, h, map); - -- /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */ -- ximage_stride = w * cpp; -+ /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. -+ get_image() has a pitch rounded up to 4 bytes. */ -+ ximage_stride = ((w * cpp) + 3) & -4; - for (line = h-1; line; --line) { - memmove(&map[line * transfer->stride], - &map[line * ximage_stride], --- -cgit v0.9.0.2-2-gbebe - -From 26f802d0635fc247bbc3ebf6f7e9bf126b6b5e69 Mon Sep 17 00:00:00 2001 -From: Brian Paul <brianp@vmware.com> -Date: Thu, 31 Jan 2013 00:44:25 +0000 -Subject: svga: check for NaN shader immediates - -The svga device doesn't handle them. Replace with zeros. -Fixes several piglit tests, such as "glsl-const-builtin-inversesqrt". - -Reviewed-by: Reviewed-by: José Fonseca <jfonseca@vmware.com> -(cherry picked from commit 3cb491534493a52e9a88cb88d31727569afb8167) ---- -diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c -index 36ed008..d439e5b 100644 ---- a/src/gallium/drivers/svga/svga_tgsi_insn.c -+++ b/src/gallium/drivers/svga/svga_tgsi_insn.c -@@ -2716,8 +2716,10 @@ static boolean svga_emit_immediate( struct svga_shader_emitter *emit, - unsigned i; - - assert(1 <= imm->Immediate.NrTokens && imm->Immediate.NrTokens <= 5); -- for (i = 0; i < imm->Immediate.NrTokens - 1; i++) -- value[i] = imm->u[i].Float; -+ for (i = 0; i < imm->Immediate.NrTokens - 1; i++) { -+ float f = imm->u[i].Float; -+ value[i] = util_is_inf_or_nan(f) ? 0.0f : f; -+ } - - for ( ; i < 4; i++ ) - value[i] = id[i]; --- -cgit v0.9.0.2-2-gbebe - diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 81bd3704a..921762748 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $ +# $Id: PKGBUILD 191901 2013-08-01 06:53:34Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -19,7 +19,7 @@ install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f' - 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') + '37dc0b4de66ccefd5fa3e9a68b187305180b4fc4') package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch index 99c14107d..efbf6f5da 100644 --- a/extra/miro/ffmpeg.patch +++ b/extra/miro/ffmpeg.patch @@ -61,3 +61,14 @@ av_free(oc); /* End-of-transcode marker. */ +--- miro-5.0.4/linux/miro-segmenter.c.orig 2012-10-04 20:48:31.000000000 +0200 ++++ miro-5.0.4/linux/miro-segmenter.c 2013-07-14 13:59:53.171303178 +0200 +@@ -228,7 +228,7 @@ + fprintf(stderr, "Could not find video decoder, key frames will not be honored\n"); + } + +- if (avcodec_open(video_st->codec, codec) < 0) { ++ if (avcodec_open2(video_st->codec, codec, NULL) < 0) { + fprintf(stderr, "Could not open video decoder, key frames will not be honored\n"); + } + } diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index c08be7683..58b68e0d8 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178318 2013-02-20 05:19:12Z eric $ +# $Id: PKGBUILD 191902 2013-08-01 06:53:35Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.5beta1 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="An ncurses console audio player designed to be powerful and easy to use" arch=('i686' 'x86_64' 'mips64el') @@ -41,9 +41,13 @@ mksource() { gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz } -build() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" +prepare() { + cd ${pkgname}-2.5.0-beta1 patch -p0 -i "${srcdir}/moc-ffmpeg.patch" +} + +build() { + cd ${pkgname}-2.5.0-beta1 ./configure --prefix=/usr --without-rcc \ --with-oss --with-alsa --with-jack --with-aac --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ @@ -53,6 +57,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-2.5.0-beta1" + cd ${pkgname}-2.5.0-beta1 make DESTDIR="${pkgdir}" install } diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 4ef875761..d8dce99af 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,37 +1,36 @@ -# $Id: PKGBUILD 187818 2013-06-06 13:48:42Z heftig $ +# $Id: PKGBUILD 191191 2013-07-19 12:16:04Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=modemmanager _realname=ModemManager -pkgver=0.7.991 +pkgver=1.0.0 pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') -url="http://cgit.freedesktop.org/ModemManager/ModemManager/" +url="http://www.freedesktop.org/wiki/Software/ModemManager/" license=(GPL2) depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme) -makedepends=(intltool git gtk-doc) +makedepends=(intltool gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') install=modemmanager.install -#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) -source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=a00f1d7") -sha256sums=('SKIP') +source=(http://www.freedesktop.org/software/$_realname/$_realname-$pkgver.tar.xz) +sha256sums=('e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563') build() { - cd $_realname - ./autogen.sh --prefix=/usr \ + cd $_realname-$pkgver + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --sbindir=/usr/bin \ --with-udev-base-dir=/usr/lib/udev \ --disable-static \ - --with-polkit + --with-polkit=permissive make } package() { - cd $_realname + cd $_realname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD index ad5376595..4094cb526 100644 --- a/extra/mp3splt/PKGBUILD +++ b/extra/mp3splt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182919 2013-04-16 07:09:21Z tpowa $ +# $Id: PKGBUILD 191707 2013-07-29 10:14:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=mp3splt -pkgver=2.5.2 +pkgver=2.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Commandline tool for splitting mp3 and ogg files without decoding" @@ -22,4 +22,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir/ install } -md5sums=('cd8eb9f866dddb934357b7cdefb5a370') +md5sums=('3f149cd0c2842b95551130bd56840f55') diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index c356c9e97..2434051da 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182602 2013-04-10 23:39:58Z bisson $ +# $Id: PKGBUILD 191959 2013-08-02 00:36:31Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpd pkgver=0.17.4 -pkgrel=1 +pkgrel=5 pkgdesc='Flexible, powerful, server-side application for playing music' url='http://www.musicpd.org/' license=('GPL') @@ -23,6 +23,12 @@ sha1sums=('f60b54e368fe74fde2fd4571227b0428fe0ae3cb' backup=('etc/mpd.conf') install=install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/cdio_paranoia_input_plugin.c + sed 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:192000:g' -i src/decoder/ffmpeg_decoder_plugin.c +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -31,6 +37,7 @@ build() { --enable-jack \ --enable-lastfm \ --enable-soundcloud \ + --enable-pipe-output \ --enable-pulse \ --disable-sidplay \ --with-systemdsystemunitdir=/usr/lib/systemd/system @@ -40,9 +47,11 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/usr/lib/systemd/user install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf + ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service sed \ -e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \ -e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \ diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index d3e701687..42905532d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187901 2013-06-07 22:39:54Z heftig $ +# $Id: PKGBUILD 191806 2013-07-30 22:50:38Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.3 +pkgver=3.8.4 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a') +sha256sums=('efe28bb665fd43d97b20c57bb1d1dc0a7e98919b6ad4b770bfd7ec5576e29454') build() { cd "$pkgname-$pkgver" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index 3ea4d33c2..87ec0b12a 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $ +# $Id: PKGBUILD 191279 2013-07-23 09:48:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-sendto pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64' 'mips64el') url="http://download.gnome.org/sources/nautilus-sendto/" @@ -14,6 +14,7 @@ depends=(glib2) makedepends=(gettext intltool gobject-introspection) options=('!libtool' '!emptydirs') install=nautilus-sendto.install +groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb') diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD index 0819548b5..2dffb2fb8 100644 --- a/extra/nedit/PKGBUILD +++ b/extra/nedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $ +# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=nedit pkgver=5.5 -pkgrel=6.2 +pkgrel=7 pkgdesc="A Unix text editor for programmers and general users" arch=('i686' 'x86_64' 'mips64el') url="http://www.nedit.org/" @@ -11,25 +11,25 @@ license=('GPL') depends=('lesstif' 'libxpm') source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 nedit_xorg_composite_fix.patch) -md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe' - 'ae1f56ae9b23163882051720ac52412d') sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87' '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../nedit_xorg_composite_fix.patch +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch" sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux sed -i 's|fgets|//fgets|' util/check_lin_tif.c sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c +} +build() { + cd ${pkgname}-${pkgver} make linux docs } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - + cd ${pkgname}-${pkgver} install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit" install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client" install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index 58f51c2f3..ed731d21d 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ +# $Id: PKGBUILD 191905 2013-08-01 06:53:38Z bpiotrowski $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core pkgver=4.10.5 -pkgrel=1 +pkgrel=2 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD index daec052c4..cf32cab3d 100644 --- a/extra/nmap/PKGBUILD +++ b/extra/nmap/PKGBUILD @@ -1,20 +1,24 @@ -# $Id: PKGBUILD 188110 2013-06-10 00:00:35Z bisson $ +# $Id: PKGBUILD 191740 2013-07-30 01:18:34Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=nmap -pkgver=6.25 -pkgrel=2.1 +pkgver=6.40 +pkgrel=1 pkgdesc='Utility for network discovery and security auditing' url='http://nmap.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('pygtk') -optdepends=('pygtk: zenmap') +optdepends=('pygtk: zenmap' + 'sudo: privilege escalation for zenmap' + 'xterm: privilege escalation for zenmap' + 'kdebase-runtime: privilege escalation for zenmap' + 'gksu: privilege escalation for zenmap') depends=('pcre' 'openssl' 'libpcap' 'lua') source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f') +sha1sums=('ee1bec1bb62045c7c1fc69ff183b2ae9b97bd0eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index e4a3d09eb..f9bf4bae3 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,63 +1,44 @@ -# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $ +# $Id: PKGBUILD 191781 2013-07-30 17:31:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=nspr -pkgver=4.9.6 -pkgrel=1 +pkgver=4.10 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/nspr/" license=('MPL' 'GPL') depends=('glibc') makedepends=('zip') -options=(!emptydirs) -source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz - nspr.pc.in) -md5sums=('62b1e9d376d503d972f90c3c0031d879' - 'bce1611f3117b53fc904cab549c09967') +options=('!emptydirs') +source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +md5sums=('f5466def95726b3c900d8a0227bdd034') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - if [ "$CARCH" = "x86_64" ]; then - confflags="--enable-64bit" + cd $pkgname-$pkgver + + if [[ $CARCH = x86_64 ]]; then + _confflags="--enable-64bit" else - confflags="" + _confflags="" fi - sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - -i mozilla/nsprpub/config/rules.mk - - ./mozilla/nsprpub/configure \ + ./nspr/configure \ --prefix=/usr \ --libdir=/usr/lib \ --includedir=/usr/include/nspr \ --enable-optimize \ - --disable-debug ${confflags} + --disable-debug ${_confflags} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib/*.a + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ - "${pkgdir}/usr/bin/prerr.properties" \ - "${pkgdir}/usr/share/aclocal/nspr.m4" \ - "${pkgdir}/usr/include/nspr/md" + chmod 644 "$pkgdir"/usr/lib/*.a + ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" + rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ + "$pkgdir/usr/include/nspr/md" } diff --git a/extra/nspr/nspr.pc.in b/extra/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0ca..000000000 --- a/extra/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 235d2716a..ebd9bb584 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,109 +1,97 @@ -# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $ +# $Id: PKGBUILD 191782 2013-07-30 17:31:52Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.14.3 -pkgrel=3 +pkgver=3.15.1 +pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.6 +_nsprver=4.10 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') -options=('!strip') +options=('!strip' '!makeflags') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss.pc.in nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c' +sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') -build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" +prepare() { + cd $pkgname-$pkgver + # Add CAcert and spi-inc.org CA certificates. # See http://wiki.cacert.org/NSSLib for how to generate - patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch" + patch -Np1 -i ../add_spi+cacert_ca_certs.patch # Adds transitional SSL renegotiate support - patch from Debian - patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" + patch -Np3 -i ../ssl-renegotiate-transitional.patch # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i security/coreconf/rules.mk + sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ + -i nss/coreconf/rules.mk +} - # see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now - # CaCert Wiki page should be updated to reflect these changes how to add the certificates - # for now the first patch should still do it - - # Generate certdata.c from certdata.txt - # cd security/nss/lib/ckfw/builtins - # make generate +build() { + cd $pkgname-$pkgver/nss - cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + export NSPR_INCLUDE_DIR="`nspr-config --includedir`" + export NSPR_LIB_DIR="`nspr-config --libdir`" export XCFLAGS="${CFLAGS}" [ "$CARCH" = "x86_64" ] && export USE_64=1 - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss + make -C coreconf + make -C lib/dbm + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${_nsprver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${pkgdir}/usr/lib/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" + cd $pkgname-$pkgver + install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} + + NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}') + + sed ../nss.pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,${_nsprver},g" \ + -e "s,%NSS_VERSION%,${pkgver},g" \ + > "$pkgdir/usr/lib/pkgconfig/nss.pc" + ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc" + + sed ../nss-config.in \ + -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > "$pkgdir/usr/bin/nss-config" + chmod 755 "$pkgdir/usr/bin/nss-config" + + cd dist/*.OBJ/bin + install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap + + cd ../lib + install -t "$pkgdir/usr/lib" *.so + install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk + + cd ../../public/nss + install -t "$pkgdir/usr/include/nss" -m644 *.h } diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index edaaa9464..3fc20f5b8 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,32 +1,26 @@ -# $Id: PKGBUILD 184344 2013-05-06 10:28:53Z bisson $ +# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=14 +pkgrel=17 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') arch=('i686' 'x86_64' 'mips64el') makedepends=('perl-html-parser') depends=('openssl' 'libcap' 'libedit') -backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +backup=('etc/ntp.conf') source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" - 'ntpd' - 'ntpdate' 'ntp.conf' - 'ntpd.conf' 'ntpd.service' 'ntpdate.service') sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' - '4e324e625c1f080b5c028be5092aa71adbf9bd99' - '01394b8a952f5edc85d19df8335eeac3980320f4' - 'f6a2292c26a201d9305669e99463fb54e5603b3f' - '4537d1f58b299d463db5048129cb264511474b0b' - 'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95' - '0cb9dbd285e2e8ac51ff47dee08af69e12a09855' + 'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b' + 'ff8370719f003f184563b7d6068c03086678482f' + 'e1c48cba549b7d21501aadf513926e463884c090' ) install=install @@ -50,10 +44,7 @@ package() { rmdir "${pkgdir}"/usr/{lib,sbin} install -d -o 87 "${pkgdir}"/var/lib/ntp - install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd - install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf - install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service install -Dm644 ../ntpdate.service "${pkgdir}"/usr/lib/systemd/system/ntpdate.service install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 2c0a34571..25135fb3b 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -17,6 +17,3 @@ restrict ::1 # Location of drift file driftfile /var/lib/ntp/ntp.drift - -# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing -# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd deleted file mode 100755 index 480fa1088..000000000 --- a/extra/ntp/ntpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -unset PID -PIDFILE='/run/ntpd.pid' - -if [[ -r ${PIDFILE} ]]; then - read -r PID <"${PIDFILE}" - if [[ -n ${PID} && ! -d /proc/${PID} ]]; then - rm -f "${PIDFILE}" - unset PID - fi -fi - -case "$1" in - start) - stat_busy "Starting NTP Daemon" - if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then - add_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then - rm ${PIDFILE} - rm_daemon ntpd - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf deleted file mode 100644 index 047961fde..000000000 --- a/extra/ntp/ntpd.conf +++ /dev/null @@ -1,5 +0,0 @@ -# client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g -u ntp" - -# arguments passed to ntpd when started -NTPD_ARGS="-g -u ntp" diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index 4e3290858..45239877f 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=forking PrivateTmp=true ExecStart=/usr/bin/ntpd -g -u ntp:ntp -ControlGroup=cpu:/ Restart=always [Install] diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate deleted file mode 100755 index a8e746785..000000000 --- a/extra/ntp/ntpdate +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -case "$1" in - start) - stat_busy "Starting NTP Client" - if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then - add_daemon ntpdate - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service index 82d72d8b6..094dd42c8 100644 --- a/extra/ntp/ntpdate.service +++ b/extra/ntp/ntpdate.service @@ -6,7 +6,6 @@ After=network.target nss-lookup.target Type=oneshot PrivateTmp=true ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp -ControlGroup=cpu:/ [Install] WantedBy=multi-user.target diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 7bb35ecce..45483af71 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ +# $Id: PKGBUILD 191854 2013-07-31 16:20:12Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave pkgver=3.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 732fc7890..e2f2da0ea 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178390 2013-02-21 05:35:59Z heftig $ +# $Id: PKGBUILD 191906 2013-08-01 06:53:39Z bpiotrowski $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.opalvoip.org" @@ -14,7 +14,7 @@ options=(!makeflags) source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz opal-ffmpeg.patch) sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864' - 'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231') + '0111eec3f7109a83f8cd4a87744ca050b3ca27482e9d31e3a1d50798f8cd88c1') build() { cd "${srcdir}/opal-${pkgver}" diff --git a/extra/opal/opal-ffmpeg.patch b/extra/opal/opal-ffmpeg.patch index c40e1ddfb..e7671ee53 100644 --- a/extra/opal/opal-ffmpeg.patch +++ b/extra/opal/opal-ffmpeg.patch @@ -193,3 +193,180 @@ diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/pl m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations } +diff -rupN a/plugins/video/common/dyna.cxx b/plugins/video/common/dyna.cxx +--- a/plugins/video/common/dyna.cxx 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.cxx 2013-07-22 16:55:47.307946942 +0000 +@@ -210,7 +210,7 @@ static void logCallbackFFMPEG(void * avc + #endif + + +-FFMPEGLibrary::FFMPEGLibrary(CodecID codec) ++FFMPEGLibrary::FFMPEGLibrary(AVCodecID codec) + { + m_codec = codec; + if (m_codec==CODEC_ID_H264) +@@ -348,12 +348,12 @@ bool FFMPEGLibrary::Load() + return true; + } + +-AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindEncoder(enum AVCodecID id) + { + return Favcodec_find_encoder(id); + } + +-AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum CodecID id) ++AVCodec *FFMPEGLibrary::AvcodecFindDecoder(enum AVCodecID id) + { + WaitAndSignal m(processLock); + +diff -rupN a/plugins/video/common/dyna.h b/plugins/video/common/dyna.h +--- a/plugins/video/common/dyna.h 2013-02-20 02:18:05.000000000 +0000 ++++ b/plugins/video/common/dyna.h 2013-07-22 16:55:47.191281134 +0000 +@@ -88,13 +88,13 @@ class DynaLink + class FFMPEGLibrary + { + public: +- FFMPEGLibrary(CodecID codec); ++ FFMPEGLibrary(AVCodecID codec); + ~FFMPEGLibrary(); + + bool Load(); + +- AVCodec *AvcodecFindEncoder(enum CodecID id); +- AVCodec *AvcodecFindDecoder(enum CodecID id); ++ AVCodec *AvcodecFindEncoder(enum AVCodecID id); ++ AVCodec *AvcodecFindDecoder(enum AVCodecID id); + AVCodecContext *AvcodecAllocContext(void); + AVFrame *AvcodecAllocFrame(void); + int AvcodecOpen(AVCodecContext *ctx, AVCodec *codec); +@@ -117,15 +117,15 @@ class FFMPEGLibrary + DynaLink m_libAvcodec; + DynaLink m_libAvutil; + +- CodecID m_codec; ++ AVCodecID m_codec; + char m_codecString[32]; + + void (*Favcodec_init)(void); + void (*Fav_init_packet)(AVPacket *pkt); + + void (*Favcodec_register_all)(void); +- AVCodec *(*Favcodec_find_encoder)(enum CodecID id); +- AVCodec *(*Favcodec_find_decoder)(enum CodecID id); ++ AVCodec *(*Favcodec_find_encoder)(enum AVCodecID id); ++ AVCodec *(*Favcodec_find_decoder)(enum AVCodecID id); + AVCodecContext *(*Favcodec_alloc_context)(void); + AVFrame *(*Favcodec_alloc_frame)(void); + int (*Favcodec_open)(AVCodecContext *ctx, AVCodec *codec); +diff -rupN a/plugins/video/common/ffmpeg/libavcodec/avcodec.h b/plugins/video/common/ffmpeg/libavcodec/avcodec.h +--- a/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-02-20 02:18:04.000000000 +0000 ++++ b/plugins/video/common/ffmpeg/libavcodec/avcodec.h 2013-07-22 16:55:47.167947971 +0000 +@@ -101,7 +101,7 @@ + * 1. no value of a existing codec ID changes (that would break ABI), + * 2. it is as close as possible to similar codecs. + */ +-enum CodecID { ++enum AVCodecID { + CODEC_ID_NONE, + + /* video codecs */ +@@ -1390,7 +1390,7 @@ typedef struct AVCodecContext { + + char codec_name[32]; + enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ +- enum CodecID codec_id; /* see CODEC_ID_xxx */ ++ enum AVCodecID codec_id; /* see CODEC_ID_xxx */ + + /** + * fourcc (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). +@@ -2843,7 +2843,7 @@ typedef struct AVCodec { + */ + const char *name; + enum AVMediaType type; +- enum CodecID id; ++ enum AVCodecID id; + int priv_data_size; + int (*init)(AVCodecContext *); + int (*encode)(AVCodecContext *, uint8_t *buf, int buf_size, void *data); +@@ -2898,7 +2898,7 @@ typedef struct AVHWAccel { + * + * See CODEC_ID_xxx + */ +- enum CodecID id; ++ enum AVCodecID id; + + /** + * Supported pixel format. +@@ -3402,10 +3402,10 @@ void avcodec_register(AVCodec *codec); + /** + * Find a registered encoder with a matching codec ID. + * +- * @param id CodecID of the requested encoder ++ * @param id AVCodecID of the requested encoder + * @return An encoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_encoder(enum CodecID id); ++AVCodec *avcodec_find_encoder(enum AVCodecID id); + + /** + * Find a registered encoder with the specified name. +@@ -3418,10 +3418,10 @@ AVCodec *avcodec_find_encoder_by_name(co + /** + * Find a registered decoder with a matching codec ID. + * +- * @param id CodecID of the requested decoder ++ * @param id AVCodecID of the requested decoder + * @return A decoder if one was found, NULL otherwise. + */ +-AVCodec *avcodec_find_decoder(enum CodecID id); ++AVCodec *avcodec_find_decoder(enum AVCodecID id); + + /** + * Find a registered decoder with the specified name. +@@ -3822,7 +3822,7 @@ char av_get_pict_type_char(int pict_type + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +-int av_get_bits_per_sample(enum CodecID codec_id); ++int av_get_bits_per_sample(enum AVCodecID codec_id); + + #if FF_API_OLD_SAMPLE_FMT + /** +diff -rupN a/plugins/video/H.263-1998/h263-1998.cxx b/plugins/video/H.263-1998/h263-1998.cxx +--- a/plugins/video/H.263-1998/h263-1998.cxx 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.cxx 2013-07-22 16:55:47.314613571 +0000 +@@ -203,7 +203,7 @@ H263_Base_EncoderContext::~H263_Base_Enc + PTRACE(4, m_prefix, "Encoder closed"); + } + +-bool H263_Base_EncoderContext::Init(CodecID codecId) ++bool H263_Base_EncoderContext::Init(AVCodecID codecId) + { + PTRACE(5, m_prefix, "Opening encoder"); + +diff -rupN a/plugins/video/H.263-1998/h263-1998.h b/plugins/video/H.263-1998/h263-1998.h +--- a/plugins/video/H.263-1998/h263-1998.h 2013-02-20 02:18:03.000000000 +0000 ++++ b/plugins/video/H.263-1998/h263-1998.h 2013-07-22 16:55:47.307946942 +0000 +@@ -115,7 +115,7 @@ class H263_Base_EncoderContext + virtual ~H263_Base_EncoderContext(); + + virtual bool Init() = 0; +- virtual bool Init(CodecID codecId); ++ virtual bool Init(AVCodecID codecId); + + virtual bool SetOptions(const char * const * options); + virtual void SetOption(const char * option, const char * value); +diff -rupN a/plugins/video/H.264/h264-x264.cxx b/plugins/video/H.264/h264-x264.cxx +--- a/plugins/video/H.264/h264-x264.cxx 2013-02-20 02:18:02.000000000 +0000 ++++ b/plugins/video/H.264/h264-x264.cxx 2013-07-22 17:05:35.383661843 +0000 +@@ -40,6 +40,9 @@ + #include "plugin-config.h" + #endif + ++#define FF_IDCT_H264 11 ++#define CODEC_FLAG2_SKIP_RD 0x00004000 ++ + #include <codec/opalplugin.hpp> + + #include "../common/ffmpeg.h" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 068e5c9b0..95f0f4dfd 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $ +# $Id: PKGBUILD 191907 2013-08-01 06:53:40Z bpiotrowski $ # 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.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD deleted file mode 100644 index cf262e1c6..000000000 --- a/extra/openexr/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 183294 2013-04-20 16:41:30Z heftig $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=openexr -pkgver=2.0.0 -pkgrel=1 -pkgdesc="An high dynamic-range image file format library" -url="http://www.openexr.com/" -arch=(i686 x86_64 'mips64el') -license=('BSD') -depends=('zlib' 'ilmbase') -options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('0820e1a8665236cb9e728534ebf8df18') diff --git a/extra/openexr/gcc43.patch b/extra/openexr/gcc43.patch deleted file mode 100644 index ab99eb9a1..000000000 --- a/extra/openexr/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- exrenvmap/blurImage.cpp -+++ exrenvmap/blurImage.cpp -@@ -39,6 +39,8 @@ - // - //----------------------------------------------------------------------------- - -+#include <cstring> -+ - #include <blurImage.h> - - #include <resizeImage.h> diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 788ff4ddb..7d6423df8 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ +# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.15 +pkgver=2.16 pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") -md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') +md5sums=('bd7afcd949023ed2f3e9d9294848ad19') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index c67d5c757..2f73b6e52 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $ # Maintainer: pkgname=perl-dbi -pkgver=1.627 +pkgver=1.628 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/DBI/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) -md5sums=('aab49be51b0f4867a1894145b023d2c5') +md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a') build() { cd DBI-${pkgver} diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index b0142295c..a20de52d2 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189866 2013-07-10 07:26:57Z bpiotrowski $ +# $Id: PKGBUILD 191859 2013-07-31 16:31:30Z bpiotrowski $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit -pkgver=3.61 -pkgrel=2 +pkgver=3.62 +pkgrel=1 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=("i686" "x86_64" 'mips64el') url="http://www.pstoedit.net/" @@ -14,7 +14,7 @@ depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick') makedepends=('ghostscript') options=('!libtool' '!makeflags') source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz") -sha1sums=('426f3746ecb441caa0db401d5880e1ac04a399d5') +sha1sums=('50d5a4e2fe0e0ff2f73cb094cb945b221083e742') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD index a22e4ef5f..a804817f3 100644 --- a/extra/purple-plugin-pack/PKGBUILD +++ b/extra/purple-plugin-pack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144607 2011-12-08 01:03:26Z foutrelis $ +# $Id: PKGBUILD 191204 2013-07-20 01:49:05Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -9,12 +9,12 @@ pkgver=2.7.0 pkgrel=1.2 pkgdesc="Compilation of plugins for the libpurple family of IM clients" arch=('i686' 'x86_64' 'mips64el') -url="https://www.guifications.org/projects/purple-plugin-pack" +url="https://bitbucket.org/rekkanoryo/purple-plugin-pack" license=('GPL') depends=('libpurple') makedepends=('intltool' 'gettext' 'python2' 'pidgin') options=('!libtool') -source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2) +source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2) sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c') build() { diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 6930e62cd..e6ff9a5f2 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,18 +1,12 @@ -# $Id: PKGBUILD 189853 2013-07-09 13:42:03Z tpowa $ +# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=1.5.1 -pkgrel=2 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64' 'mips64el') +pkgname=('qemu' 'libcacard') +pkgver=1.5.2 +pkgrel=1 +arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' - 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' - 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' - 'libiscsi') -backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 65-kvm.rules) @@ -23,14 +17,20 @@ build () { cd "${srcdir}/${pkgname}-${pkgver}" # gtk gui breaks keymappings at the moment - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl'\ + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ - --enable-mixemu --libexecdir=/usr/lib/qemu \ + --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \ --disable-gtk --enable-linux-aio --enable-seccomp make } -package() { +package_qemu() { + pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." + depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi' 'libcacard') + backup=('etc/qemu/target-x86_64.conf') cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install rm "${pkgdir}/usr/share/qemu/bios.bin" @@ -49,7 +49,22 @@ package() { /usr/bin/strip $STRIP_BINARIES "$binary";; esac done + # remove libcacard files + rm -rf ${pkgdir}/usr/lib/libcacard* + rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc + rm -rf ${pkgdir}/usr/bin/vscclient +} +package_libcacard() { + pkgdesc="Common Access Card (CAC) Emulation" + options=('strip' '!libtool') + depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2') + mkdir -p ${pkgdir}/usr/bin + mkdir -p ${pkgdir}/usr/lib/pkgconfig + cp -a ${srcdir}/qemu-${pkgver}/.libs/libcacard.so* ${pkgdir}/usr/lib/ + cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ + cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } -md5sums=('b56e73bdcfdb214d5c68e13111aca96f' + +md5sums=('04b94189ba587b3280713ded3b7f959a' '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index f752b84cb..ed0eeb3f0 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184430 2013-05-06 19:39:36Z foutrelis $ +# $Id: PKGBUILD 191650 2013-07-29 07:23:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.3.1 -pkgrel=2 +pkgver=2.3.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' @@ -11,14 +11,14 @@ license=('LGPL2.1' 'GPL3') depends=('qt4' 'systemd' 'gstreamer0.10-base') makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa') conflicts=('qt<4.8') -_qtver=4.8.4 +_qtver=4.8.5 source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}" - "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" + "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' 'qwebview.patch' 'LLIntCLoop32BigEndian.patch') -sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd' - 'f5880f11c139d7d8d01ecb8d874535f7d9553198' +sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c' + '745f9ebf091696c0d5403ce691dc28c039d77b9e' '315b6ff603f35e5492a036f7082f6aa075dfb607' 'ef467fcfc9e74aa88356f27acc21792706ed1e4d' 'af830ae24e2ae5113754c9ae524d27ec0a28a9d6') diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD index 1374c9d02..777734f48 100644 --- a/extra/quadrapassel/PKGBUILD +++ b/extra/quadrapassel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183453 2013-04-21 22:12:00Z heftig $ +# $Id: PKGBUILD 191635 2013-07-28 18:12:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=quadrapassel -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=quadrapassel.install url="https://live.gnome.org/Quadrapassel" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284') +sha256sums=('a2e861f65560345f697665434698e86a3df874ba2721ba1674dce26dcb0a6229') build() { cd $pkgname-$pkgver diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1b5a1435d..5b7826717 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189851 2013-07-09 13:36:09Z tpowa $ +# $Id: PKGBUILD 191365 2013-07-24 10:47:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,16 +17,15 @@ _COMPILER="GCC46" pkgname="refind-efi" pkgver="0.7.1" -pkgrel="1" +pkgrel="4" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" arch=('x86_64' 'i686') license=('GPL3' 'custom') makedepends=('subversion' 'python2') -depends=('dosfstools' 'efibootmgr') +depends=('bash' 'dosfstools' 'efibootmgr') optdepends=('mactel-boot: For bless command in Apple Mac systems' - 'bash: For refind-mkfont script' 'imagemagick: For refind-mkfont script') options=('!strip' 'docs' '!makeflags') @@ -64,10 +63,10 @@ _setup_env_vars() { _prepare_tianocore_sources() { - _setup_env_vars - msg "Delete old UDK BUILD dir" rm -rf "${_UDK_DIR}/" || true + + msg "Create UDK BUILD dir" mkdir -p "${_UDK_DIR}/" for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do @@ -105,10 +104,10 @@ _prepare_tianocore_sources() { sed "s|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true msg "Fix UDK Target ARCH for rEFInd" - sed "s|X64|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true - sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + sed "s|X64|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true + sed "s|IA32|${_TIANO_ARCH}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true - chmod +x "${_UDK_DIR}/BaseTools/BuildEnv" + chmod 0755 "${_UDK_DIR}/BaseTools/BuildEnv" } @@ -125,6 +124,8 @@ _prepare_refind_sources() { prepare() { + _setup_env_vars + msg "Prepare Tianocore Sources" _prepare_tianocore_sources @@ -180,29 +181,35 @@ build() { package() { msg "Install the rEFInd UEFI application" - install -d "${pkgdir}/usr/lib/refind/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/refind_${_TIANO_S_ARCH}.efi" msg "Install UEFI drivers built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" - install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" + install -d "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" + install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/share/refind/drivers_${_TIANO_S_ARCH}/" msg "Install UEFI applications built from rEFInd" - install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}" - install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" + install -d "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}" + install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/share/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" - msg "Install the rEFInd config file" - install -d "${pkgdir}/usr/lib/refind/config/" - install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf" - install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf" + msg "Install rEFInd helper scripts" + install -d "${pkgdir}/usr/bin/" + install -D -m0755 "${srcdir}/refind-${pkgver}/install.sh" "${pkgdir}/usr/bin/refind-install" + install -D -m0755 "${srcdir}/refind-${pkgver}/mkrlconf.sh" "${pkgdir}/usr/bin/refind-mkrlconf" + install -D -m0755 "${srcdir}/refind-${pkgver}/mvrefind.sh" "${pkgdir}/usr/bin/refind-mvrefind" + install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" + + msg "Install the rEFInd sample config files" + install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/share/refind/refind.conf-sample" + install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/share/refind/refind_linux.conf-sample" msg "Install the rEFInd docs" install -d "${pkgdir}/usr/share/refind/docs/html/" install -d "${pkgdir}/usr/share/refind/docs/Styles/" install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" install -D -m0644 "${srcdir}/refind-${pkgver}/docs/Styles"/* "${pkgdir}/usr/share/refind/docs/Styles/" - install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README" - install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS" + install -D -m0644 "${srcdir}/refind-${pkgver}/README.txt" "${pkgdir}/usr/share/refind/docs/README.txt" + install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS.txt" rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true msg "Install the rEFInd fonts" @@ -210,10 +217,6 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/fonts"/* "${pkgdir}/usr/share/refind/fonts/" rm -f "${pkgdir}/usr/share/refind/fonts/mkfont.sh" - msg "Install the rEFInd mkfont.sh" - install -d "${pkgdir}/usr/bin/" - install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" - msg "Install the rEFInd icons" install -d "${pkgdir}/usr/share/refind/icons/" install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/refind/icons/" @@ -230,4 +233,12 @@ package() { install -d "${pkgdir}/usr/share/licenses/refind/" install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" + msg "Use '#!/usr/bin/env bash' in all scripts" + sed 's|#!/bin/bash|#!/usr/bin/env bash|g' -i "${pkgdir}/usr/bin"/refind-* || true + + msg "Point refind dir paths to /usr/share/refind/ in refind-install script" + sed 's|^ThisDir=.*|ThisDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^RefindDir=.*|RefindDir="/usr/share/refind/"|g' -i "${pkgdir}/usr/bin/refind-install" + sed 's|^ThisScript=.*|ThisScript="/usr/bin/refind-install"|g' -i "${pkgdir}/usr/bin/refind-install" + } diff --git a/extra/refind-efi/refind-efi.install b/extra/refind-efi/refind-efi.install index e43f6cb61..947d157e3 100644 --- a/extra/refind-efi/refind-efi.install +++ b/extra/refind-efi/refind-efi.install @@ -2,20 +2,21 @@ post_install() { cat << EOF -rEFInd UEFI applications have been installed at /usr/lib/refind/refind_*.efi +rEFInd UEFI application has been installed at /usr/share/refind/refind_*.efi -Other UEFI applications have been installed at /usr/lib/refind/tools_*/ +Other UEFI applications have been installed at /usr/share/refind/tools_*/ -UEFI drivers have deen installed at /usr/lib/refind/drivers_*/ +UEFI drivers have deen installed at /usr/share/refind/drivers_*/ Copy the efi application (according to your UEFI ARCH) -and /usr/lib/refind/config/refind.conf to a sub-directory of <EFISYS>/EFI/ -and add an entry to firmware boot menu using efibootmgr or mactel-boot (for Macs) +and /usr/share/refind/refind.conf-sample to a sub-directory of <EFISYS>/EFI/ +as refind.conf and add an entry to firmware boot menu using efibootmgr +or mactel-boot (for Macs) rEFInd Icons have been installed at /usr/share/refind/icons/ rEFInd Fonts have been installed at /usr/share/refind/fonts/ -HTML Documentation is available at /usr/share/refind/docs/html/ +HTML Documentation is available at /usr/share/doc/refind/html/ More info: https://wiki.archlinux.org/index.php/UEFI_Bootloaders#Using_rEFInd diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 223544f00..d83c509b6 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182809 2013-04-15 13:34:39Z schiv $ +# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=13.04 +pkgver=13.06 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('bcc9be7bf8c3945e0eefdb95dc037f0b') +md5sums=('67b110277718b6ef2ec098a8fc452340') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,6 @@ build() { export lrdf_CFLAGS LRELEASE LUPDATE ./configure --prefix=/usr - make } diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index b4cc1ea97..2c42e4bc6 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 189979 2013-07-12 06:44:58Z eric $ +# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $ # Maintainer: # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump pkgver=20121230 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64' 'mips64el') url="http://rtmpdump.mplayerhq.hu/" license=('GPL2' 'LGPL2.1') depends=('openssl') -options=(!makeflags) +options=('!makeflags') #git://git.ffmpeg.org/rtmpdump -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('89faf9df54204dbab211621809aa961ea6405e192cc0ce6633307e87aed400b7') +source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz) +sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2') build() { cd $pkgname-$pkgver diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 4e3f4dccc..2a449a41a 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185316 2013-05-13 09:39:29Z heftig $ +# $Id: PKGBUILD 191370 2013-07-24 12:22:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.2 +pkgver=0.18.3 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('26dea444e69f68cec822e58080162d056528a518b9b155503016a19dda0b48a4') +sha256sums=('b3bb97476b44f7adae162c8cdb062160120336ed33a88c2a692ab8fac187d105') build() { cd $pkgname-$pkgver diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD deleted file mode 100644 index ba4aad179..000000000 --- a/extra/scribus/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Ben <ben@benmazer.net> - -pkgname=scribus -pkgver=1.4.2 -pkgrel=3 -pkgdesc='Desktop publishing software' -url="http://www.scribus.net/" -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -makedepends=('cmake' 'boost' 'mesa') -depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' - 'ghostscript' 'python2' 'aspell' 'boost-libs' - 'desktop-file-utils' 'shared-mime-info') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') - -options=('!libtool') -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop - sed \ - -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i scribus/plugins/scriptplugin/{samples,scripts}/* - install -d ../build -} - -build() { - cd "${srcdir}/build" - cmake "../${pkgname}-${pkgver}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install - install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop" -} diff --git a/extra/scribus/install b/extra/scribus/install deleted file mode 100644 index 8040f715b..000000000 --- a/extra/scribus/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - update-desktop-database -q -} -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index ae128ab19..587621f0b 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 184435 2013-05-06 19:39:45Z foutrelis $ +# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm') -makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') +makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') checkdepends=('time') optdepends=('libao: for ao plugin' - 'ffmpeg: for ffmpeg plugin' 'libmad: for mp3 plugin' 'libid3tag: for mp3 plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-ffmpeg0.11.patch) -sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9' - '2f92bcaebcaf300782396f106cdd27c72048a851') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9') prepare() { cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/sox-ffmpeg0.11.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in } diff --git a/extra/sox/sox-ffmpeg0.11.patch b/extra/sox/sox-ffmpeg0.11.patch deleted file mode 100644 index 901c81582..000000000 --- a/extra/sox/sox-ffmpeg0.11.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure ---- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400 -+++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400 -@@ -15781,9 +15781,9 @@ - cat >>confdefs.h <<_ACEOF - #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5 --$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; } --if ${ac_cv_lib_avformat_av_open_input_file+:} false; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5 -+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; } -+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -@@ -15797,27 +15797,27 @@ - #ifdef __cplusplus - extern "C" - #endif --char av_open_input_file (); -+char avformat_open_input (); - int - main () - { --return av_open_input_file (); -+return avformat_open_input (); - ; - return 0; - } - _ACEOF - if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_avformat_av_open_input_file=yes -+ ac_cv_lib_avformat_avformat_open_input=yes - else -- ac_cv_lib_avformat_av_open_input_file=no -+ ac_cv_lib_avformat_avformat_open_input=no - fi - rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5 --$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; } --if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5 -+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; } -+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then : - for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c ---- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400 -+++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400 -@@ -93,7 +93,7 @@ - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - enc->error_resilience = 1; - #else -- enc->error_recognition = 1; -+ enc->err_recognition = 1; - #endif - - if (!codec || avcodec_open(enc, codec) < 0) -@@ -157,7 +157,7 @@ - static int startread(sox_format_t * ft) - { - priv_t * ffmpeg = (priv_t *)ft->priv; -- AVFormatParameters params; -+ AVDictionary *params; - int ret; - int i; - -@@ -172,7 +172,7 @@ - - /* Open file and get format */ - memset(¶ms, 0, sizeof(params)); -- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) { -+ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) { - lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret); - return SOX_EOF; - } -@@ -231,7 +231,7 @@ - /* If input buffer empty, read more data */ - if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) { - if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 && -- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb))) -+ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error)) - break; - ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE); - ffmpeg->audio_buf_index = 0; -@@ -373,13 +373,6 @@ - return SOX_EOF; - } - -- /* set the output parameters (must be done even if no -- parameters). */ -- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) { -- lsx_fail("ffmpeg invalid output format parameters"); -- return SOX_EOF; -- } -- - /* Next line for debugging */ - /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */ - -@@ -391,14 +384,14 @@ - - /* open the output file, if needed */ - if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) { -- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) { -+ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) { - lsx_fail("ffmpeg could not open `%s'", ft->filename); - return SOX_EOF; - } - } - - /* write the stream header, if any */ -- av_write_header(ffmpeg->ctxt); -+ avformat_write_header(ffmpeg->ctxt, NULL); - - return SOX_SUCCESS; - } -@@ -478,7 +471,7 @@ - #if (LIBAVFORMAT_VERSION_INT < 0x340000) - url_fclose(&ffmpeg->ctxt->pb); - #else -- url_fclose(ffmpeg->ctxt->pb); -+ avio_close(ffmpeg->ctxt->pb); - #endif - } - diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 5e0a9ee44..487302ff3 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,85 +1,83 @@ -# $Id: PKGBUILD 189775 2013-07-07 23:18:58Z angvp $ +# $Id: PKGBUILD 191954 2013-08-01 21:53:49Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' - 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') -backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') url="http://subversion.apache.org/" +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' + 'libgnome-keyring' 'kdelibs' 'ruby') +[ "$CARCH" != "mips64el" ] && makedepends+=('java-runtime' 'java-environment') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' + 'kdeutils-kwallet: for KWallet for auth credentials' + 'bash-completion: for svn bash completion' + 'python2: for some hook scripts' + 'java-environment: for Java support' + 'ruby: for some hook scripts') provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f053a9948dfe5c70eff5c00509723214' +md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' + 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' 'bb2857eceafcfac35dde39dcffad2314' 'e8020c7a1d1a0c47091b5fdd034f81c5' '6b4340ba9d8845cd8497e013ae01be3f') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export PYTHON=/usr/bin/python2 - - #patch -Np0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - if [ "$CARCH" = "mips64el" ]; then - ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ - --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ - --disable-javahl --with-gnome-keyring --with-kwallet \ - --disable-static - else + [ "$CARCH" = "mips64el" ] && extraconf="--disable-javahl" ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ - --with-zlib=/usr --with-neon=/usr --with-serf=/usr --with-apxs \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ --enable-javahl --with-gnome-keyring --with-kwallet \ - --disable-static - fi + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \ + --disable-static $extraconf - #make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all + make LT_LDFLAGS="-L$Fdestdir/usr/lib" make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl #swig-rb + swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl swig-rb [ "$CARCH" = "mips64el" ] || make javahl } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} +check() { + cd ${pkgname}-${pkgver} + export LANG=C LC_ALL=C + make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +} package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl #install-swig-rb + install install-swig-py install-swig-pl install-swig-rb [ "$CARCH" = "mips64el" ] || make install-javahl @@ -87,9 +85,6 @@ package() { cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - ## svnserve ... # xinetd diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 4fab1ec3a..4ef6d9a1a 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179516 2013-03-05 19:16:44Z ioni $ +# $Id: PKGBUILD 191842 2013-07-31 09:40:22Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.17.3 +pkgver=0.17.5 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool' '!emptydirs') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f190ac6244440601f616dd61846689ba') +md5sums=('57d7778e58f82a43dba1311cece0d4e3') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 11b9b0305..5b2bb7fa5 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183617 2013-04-25 16:40:37Z ioni $ +# $Id: PKGBUILD 191840 2013-07-31 09:36:38Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.20.2 +pkgver=0.20.4 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('bfc8a1b94c7a268f15d4d92b83460987') +md5sums=('78be56307d2da7c580cf6df33a225ba0') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 578888af4..90e855186 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ +# $Id: PKGBUILD 191309 2013-07-23 13:29:40Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> @@ -20,7 +20,7 @@ md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ + PYTHON=python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-gnome-keyring \ --disable-schemas-compile diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 22f32357e..17779678b 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184438 2013-05-06 19:39:53Z foutrelis $ +# $Id: PKGBUILD 191946 2013-08-01 16:10:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.16.1 +pkgver=0.16.2 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771') +sha256sums=('033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409') build() { cd $pkgbase-$pkgver diff --git a/extra/transcode/04_ffmpeg_options.patch b/extra/transcode/04_ffmpeg_options.patch new file mode 100644 index 000000000..d0429b1d9 --- /dev/null +++ b/extra/transcode/04_ffmpeg_options.patch @@ -0,0 +1,26 @@ +Description: Remove "-vpre medium" from ffmpeg's command-line arguments list. +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436 +From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681436#25 +--- + export/ffmpeg_cfg.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- transcode.orig/export/ffmpeg_cfg.c ++++ transcode/export/ffmpeg_cfg.c +@@ -126,7 +126,7 @@ int lavc_param_gmc = 0; + //int lavc_param_atag = 0; + //int lavc_param_abitrate = 224; + +-char *lavc_param_video_preset = "medium"; ++char *lavc_param_video_preset = NULL; + char *lavc_param_ffmpeg_datadir = "/usr/share/ffmpeg"; + + TCConfigEntry lavcopts_conf[]={ +@@ -237,7 +237,6 @@ TCConfigEntry lavcopts_conf[]={ + {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, + {"fps_code", &lavc_param_fps_code, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 9}, +- {"vpre", &lavc_param_video_preset, TCCONF_TYPE_STRING, 0, 0, 0}, + {"ffmpeg_datadir", &lavc_param_ffmpeg_datadir, TCCONF_TYPE_STRING, 0, 0, 0}, + {NULL, NULL, 0, 0, 0, 0} + }; diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 6082f4cf4..9cd251ca0 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184439 2013-05-06 19:39:55Z foutrelis $ +# $Id: PKGBUILD 191909 2013-08-01 06:53:42Z bpiotrowski $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,29 +6,47 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=9 +pkgrel=10 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' - 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') + 'libmpeg2' 'libxaw' 'libxv' 'a52dec') makedepends=('nasm') options=('!libtool') source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch - ffmpeg-0.11.patch) + ffmpeg-0.11.patch transcode-1.1.7-libav-9.patch 04_ffmpeg_options.patch transcode-ffmpeg.patch) sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' '591943a33235342a66c3df0625a164a1479c09ae' - '3d2dcdc23f14938e87d14cfc03000bb3b649b85e') + '3d2dcdc23f14938e87d14cfc03000bb3b649b85e' + 'ef1cccd35317d3a28443b654da49de731cdf1766' + '00938db9aebde719799c11116ed9fe85a9cc4bdd' + '6d1774e202cca689c4e417def982452990b8e7e4') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/ffmpeg-0.11.patch" + patch -p0 -i "${srcdir}/transcode-1.1.7-libav-9.patch" + patch -p1 -i "${srcdir}/04_ffmpeg_options.patch" + patch -p1 -i "${srcdir}/transcode-ffmpeg.patch" + + cd ../subtitleripper + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" + sed -e 's|^\(.*lppm.*\)$|#\1|' \ + -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ + -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ + -i Makefile +} - patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch" + +build() { + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ @@ -38,21 +56,15 @@ build() { --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert make - cd "${srcdir}/subtitleripper" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" - patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" - sed -e 's|^\(.*lppm.*\)$|#\1|' \ - -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ - -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ - -i Makefile + cd ../subtitleripper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - cd "${srcdir}/subtitleripper" + cd ../subtitleripper install -m 755 pgm2txt "${pkgdir}/usr/bin/" install -m 755 srttool "${pkgdir}/usr/bin/" install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" diff --git a/extra/transcode/transcode-1.1.7-libav-9.patch b/extra/transcode/transcode-1.1.7-libav-9.patch new file mode 100644 index 000000000..3989d3d83 --- /dev/null +++ b/extra/transcode/transcode-1.1.7-libav-9.patch @@ -0,0 +1,31 @@ +--- import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200 ++++ import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200 +@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe) + return; + } + +- ret = av_find_stream_info(lavf_dmx_context); ++ ret = avformat_find_stream_info(lavf_dmx_context, NULL); + if (ret < 0) { + tc_log_error(__FILE__, "unable to fetch informations from '%s'" + " (libavformat failure)", +--- import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200 ++++ import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200 +@@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode) + + // Set these to the expected values so that ffmpeg's decoder can + // properly detect interlaced input. +- lavc_dec_context = avcodec_alloc_context(); ++ lavc_dec_context = avcodec_alloc_context3(NULL); + if (lavc_dec_context == NULL) { + tc_log_error(__FILE__, "Could not allocate enough memory."); + goto decoder_error; +@@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode) + lavc_dec_context->error_concealment = 3; + lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT; + +- if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) { ++ if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) { + tc_log_error(__FILE__, "Could not initialize the '%s' codec.", + codec->name); + goto decoder_error; diff --git a/extra/transcode/transcode-ffmpeg.patch b/extra/transcode/transcode-ffmpeg.patch new file mode 100644 index 000000000..0021d07d5 --- /dev/null +++ b/extra/transcode/transcode-ffmpeg.patch @@ -0,0 +1,115 @@ +diff -Naur transcode-1.1.7-orig/encode/encode_lavc.c transcode-1.1.7/encode/encode_lavc.c +--- transcode-1.1.7-orig/encode/encode_lavc.c 2013-07-13 18:41:25.441796991 -0400 ++++ transcode-1.1.7/encode/encode_lavc.c 2013-07-13 18:45:21.042465999 -0400 +@@ -977,8 +977,6 @@ + pd->ff_vcontext.mpeg_quant = 0; + pd->ff_vcontext.rc_initial_cplx = 0.0; + pd->ff_vcontext.rc_qsquish = 1.0; +- pd->ff_vcontext.luma_elim_threshold = 0; +- pd->ff_vcontext.chroma_elim_threshold = 0; + pd->ff_vcontext.strict_std_compliance = 0; + pd->ff_vcontext.dct_algo = FF_DCT_AUTO; + pd->ff_vcontext.idct_algo = FF_IDCT_AUTO; +@@ -1150,8 +1148,6 @@ + { "vrc_init_cplx", PCTX(rc_initial_cplx), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 9999999.0 }, + // { "vrc_init_occupancy", }, // not yet supported + { "vqsquish", PCTX(rc_qsquish), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 99.0 }, +- { "vlelim", PCTX(luma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, +- { "vcelim", PCTX(chroma_elim_threshold), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vstrict", PCTX(strict_std_compliance), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99 }, + { "vpsize", PCTX(rtp_payload_size), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000 }, + { "dct", PCTX(dct_algo), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10 }, +@@ -1182,7 +1178,7 @@ + { "intra_matrix_file", intra_matrix_file, TCCONF_TYPE_STRING, 0, 0, 0 }, + + { "mv0", PAUX(flags.mv0), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0 }, +- { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD }, ++ { "cbp", PAUX(flags.cbp), TCCONF_TYPE_FLAG, 0, 0, 0x04000000 }, + { "qpel", PAUX(flags.qpel), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QPEL }, + { "alt", PAUX(flags.alt), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN }, + { "ilme", PAUX(flags.ilme), TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME }, +diff -Naur transcode-1.1.7-orig/export/export_ffmpeg.c transcode-1.1.7/export/export_ffmpeg.c +--- transcode-1.1.7-orig/export/export_ffmpeg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/export_ffmpeg.c 2013-07-13 18:48:46.263478358 -0400 +@@ -835,8 +835,6 @@ + lavc_venc_context->rc_strategy = lavc_param_vrc_strategy; + lavc_venc_context->b_frame_strategy = lavc_param_vb_strategy; + lavc_venc_context->b_quant_offset = lavc_param_vb_qoffset; +- lavc_venc_context->luma_elim_threshold= lavc_param_luma_elim_threshold; +- lavc_venc_context->chroma_elim_threshold= lavc_param_chroma_elim_threshold; + lavc_venc_context->rtp_payload_size = lavc_param_packet_size; + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + if (lavc_param_packet_size) +@@ -867,7 +865,6 @@ + lavc_venc_context->context_model = lavc_param_context; + lavc_venc_context->scenechange_threshold= lavc_param_sc_threshold; + lavc_venc_context->noise_reduction = lavc_param_noise_reduction; +- lavc_venc_context->inter_threshold = lavc_param_inter_threshold; + lavc_venc_context->intra_dc_precision = lavc_param_intra_dc_precision; + lavc_venc_context->skip_top = lavc_param_skip_top; + lavc_venc_context->skip_bottom = lavc_param_skip_bottom; +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.c transcode-1.1.7/export/ffmpeg_cfg.c +--- transcode-1.1.7-orig/export/ffmpeg_cfg.c 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.c 2013-07-13 18:48:34.633609112 -0400 +@@ -50,8 +50,6 @@ + //int lavc_param_vpass = 0; + int lavc_param_vrc_strategy = 2; + int lavc_param_vb_strategy = 0; +-int lavc_param_luma_elim_threshold = 0; +-int lavc_param_chroma_elim_threshold = 0; + int lavc_param_packet_size= 0; + int lavc_param_strict= 0; + int lavc_param_data_partitioning= 0; +@@ -105,7 +103,6 @@ + int lavc_param_mv0= 0; + int lavc_param_noise_reduction= 0; + int lavc_param_qp_rd= 0; +-int lavc_param_inter_threshold= 0; + int lavc_param_sc_threshold= 0; + int lavc_param_ss= 0; + int lavc_param_top= -1; +@@ -156,8 +153,6 @@ + {"vrc_strategy", &lavc_param_vrc_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 2}, + {"vb_strategy", &lavc_param_vb_strategy, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"vb_qoffset", &lavc_param_vb_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0}, +- {"vlelim", &lavc_param_luma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, +- {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000}, + {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99}, + // {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0}, +@@ -215,13 +210,12 @@ + {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10}, + {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, + {"inter_matrix", &lavc_param_inter_matrix, TCCONF_TYPE_STRING, 0, 0, 0}, +- {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CBP_RD}, ++ {"cbp", &lavc_param_cbp, TCCONF_TYPE_FLAG, 0, 0, 0x04000000}, + {"mv0", &lavc_param_mv0, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_MV0}, + {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000}, +- {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD}, ++ {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, 0x08000000}, + {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16}, + {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME}, +- {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000}, + {"top", &lavc_param_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1, 1}, + {"gmc", &lavc_param_gmc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC}, +diff -Naur transcode-1.1.7-orig/export/ffmpeg_cfg.h transcode-1.1.7/export/ffmpeg_cfg.h +--- transcode-1.1.7-orig/export/ffmpeg_cfg.h 2013-07-13 18:41:25.438463695 -0400 ++++ transcode-1.1.7/export/ffmpeg_cfg.h 2013-07-13 18:49:04.169944470 -0400 +@@ -29,8 +29,6 @@ + //extern int lavc_param_vpass; + extern int lavc_param_vrc_strategy; + extern int lavc_param_vb_strategy; +-extern int lavc_param_luma_elim_threshold; +-extern int lavc_param_chroma_elim_threshold; + extern int lavc_param_packet_size; + extern int lavc_param_strict; + extern int lavc_param_data_partitioning; +@@ -84,7 +82,6 @@ + extern int lavc_param_mv0; + extern int lavc_param_noise_reduction; + extern int lavc_param_qp_rd; +-extern int lavc_param_inter_threshold; + extern int lavc_param_sc_threshold; + extern int lavc_param_ss; + extern int lavc_param_top; diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index d0a44ffc3..bb7dcab64 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 189680 2013-07-04 14:55:33Z tomegun $ +# $Id: PKGBUILD 191767 2013-07-30 10:31:09Z tomegun $ # Maintainer : Tom Gundersen <teg@jklm.no> # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.80 -pkgrel=2 +pkgver=2.81 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz) -md5sums=('2bde600d4b0a75d0bd3784550d59a8af') +md5sums=('db1ad10ecff07150486dab2365ccb3a8') build() { cd $pkgbase-$pkgver diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD deleted file mode 100644 index 0adeccb65..000000000 --- a/extra/truecrypt/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $ -# Maintainer: Paul Mattal <paul.archlinux.org> - -pkgname=truecrypt -pkgver=7.1a -pkgrel=1 -epoch=1 -pkgdesc="Free open-source cross-platform disk encryption software" -url="http://www.truecrypt.org/" -arch=('i686' 'x86_64' 'mips64el') -license=('custom') # TrueCrypt License v2.6 -depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper') -makedepends=('nasm') -optdepends=('sudo: mounting encrypted volumes as nonroot users') -conflicts=('truecrypt-utils') -replaces=('truecrypt-utils') -# N.B. Truecrypt's web-based source download is incompatible with -# makepkg. Source has been placed on ftp.archlinux.org instead -source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ - 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ - "${pkgname}.desktop" \ - "${pkgname}-arch-detection.patch") -md5sums=('102d9652681db11c813610882332ae48' - '5bca3d15b35d0725ff3317e568062ad8' - 'ce6a707b79411e82e8e558aa03e764b0' - '183b9bf04a943454d4e216130bcbac01' - '00ea70fa8437de877b31b027ac2b4060') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Work around buggy CPU type detection - patch -Np1 -i ../${pkgname}-arch-detection.patch - - # Build - make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-source" - - # Install Binary - install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" - - # Install Desktop file and Icon - install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" - - # Install License - install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" -} diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch deleted file mode 100644 index bc16a2a36..000000000 --- a/extra/truecrypt/truecrypt-arch-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile ---- truecrypt-7.0a-source/Makefile 2010-09-05 10:32:10.000000000 -0400 -+++ truecrypt-7.0a-source.fixed/Makefile 2011-07-05 21:41:50.296437879 -0400 -@@ -120,10 +120,7 @@ - - export CPU_ARCH ?= unknown - --ARCH = $(shell uname -p) --ifeq "$(ARCH)" "unknown" -- ARCH = $(shell uname -m) --endif -+ARCH = $(shell uname -m) - - ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH))) - CPU_ARCH = x86 diff --git a/extra/truecrypt/truecrypt.desktop b/extra/truecrypt/truecrypt.desktop deleted file mode 100644 index 53626f29f..000000000 --- a/extra/truecrypt/truecrypt.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Exec=truecrypt -Icon=truecrypt -Comment=On-the-fly encryption -Terminal=false -Name=TrueCrypt -StartupNotify=true -Categories=System; diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index cef6f3c74..9dc4e570f 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ +# $Id: PKGBUILD 191375 2013-07-24 21:41:22Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=13.0.0 +pkgver=13.1.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca') +sha1sums=('7f6e07b8098b248157ac26378fafa9e018f279a7') prepare() { cd "Twisted-$pkgver" diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD index 4b23230fe..e4fa0f68c 100644 --- a/extra/vice/PKGBUILD +++ b/extra/vice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184443 2013-05-06 19:40:02Z foutrelis $ +# $Id: PKGBUILD 191927 2013-08-01 07:00:00Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=vice pkgver=2.4 -pkgrel=3 +pkgrel=4 pkgdesc="The Versatile Commodore 8-bit Emulator" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,7 +25,7 @@ md5sums=('b017647a0c159bbe43cdb81762d1c577' '9d9f62f05a967a5926df496e86404148') prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} patch -Np1 -i "${srcdir}/vice-2.4-x11video.patch" patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch" @@ -38,7 +38,7 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --enable-ethernet \ @@ -50,7 +50,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" realdocdir="/usr/share/doc/vice" install ln -s /usr/share/doc/vice "${pkgdir}/usr/lib/vice/doc" diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 2a0673dad..2f6e1f820 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 184444 2013-05-06 19:40:04Z foutrelis $ +# $Id: PKGBUILD 191605 2013-07-27 08:12:19Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps - 'libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' + 'libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' # additional makedeps - 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy') + 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost>=1.54.0' 'python2-numpy') options=('!libtool') source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz) md5sums=('b6155afe1ea967917d2be16d98a85404') @@ -21,6 +21,7 @@ build() { cd "${srcdir}"/${pkgbase}-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DWITH_OPENEXR=true \ -DWITH_VIGRANUMPY=1 \ -DDOCINSTALL=share/doc make @@ -33,7 +34,7 @@ check() { package_vigra() { pkgdesc="Computer vision library" - depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') + depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 029ea78ef..d8ce95730 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185450 2013-05-14 10:15:54Z heftig $ +# $Id: PKGBUILD 191757 2013-07-30 09:24:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('eda05e6abfd3d575f8b954c1e442d28639ae13b67fc285ef585b8cd78da014e8') +sha256sums=('0d862429307d28333f17afa40cf81f6006903e1aa134a8bc430079a9db40b1c6') build() { cd $pkgname-$pkgver diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 3636f2cc4..bdb3fba56 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,27 +1,23 @@ -# $Id: PKGBUILD 184267 2013-05-05 08:27:00Z andrea $ +# $Id: PKGBUILD 191593 2013-07-26 10:24:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') -pkgver=6.1.6 -pkgrel=2 +pkgver=6.1.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz" - 'automake113.patch') -md5sums=('3991149c570f3738c3e819ce603e487f' - '570043e1b5f4acd9826732f002941c12') +source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('88885e84e8f7b61e59516f696b1d3be5') prepare() { cd ${pkgbase}-opensource-${pkgver} optipng -quiet -force -fix appsrc/ODS-Wiki/http/images/opts_16.png - - patch -p1 -i "${srcdir}"/automake113.patch } build() { diff --git a/extra/virtuoso/automake113.patch b/extra/virtuoso/automake113.patch deleted file mode 100644 index 5f84b49bc..000000000 --- a/extra/virtuoso/automake113.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ a/configure.in ---- b/configure.in -@@ -36,7 +36,7 @@ - AC_INIT([Virtuoso Open Source Edition], - AC_CONFIG_SRCDIR([libsrc/Dk.h]) - AC_CONFIG_AUX_DIR([binsrc/config]) - AC_CONFIG_MACRO_DIR([binsrc/config]) --AM_CONFIG_HEADER([libsrc/Dk/config.h]) -+AC_CONFIG_HEADER([libsrc/Dk/config.h]) - - dnl - dnl You may need to change the next macro for older versions of automake: diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 2fa15ab4c..b876df205 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $ +# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.7 -pkgrel=2 +pkgver=2.0.8.a +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'libdc1394' 'libavc1394' @@ -58,22 +58,29 @@ backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool' '!emptydirs') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('3b0e465b0990097b65abaf3e25589957') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz" + vlc-2.0.7-vaapi-compat.patch + vlc-2.0.8-Fix-live555-breakage-in-last-update.patch) +md5sums=('e5000677181406d026ffe448633d1ca0' + '6df10774bb7acf20e09d6139e5c7839e' + 'e592efe7bb65291a84f99cfaa3a9f8a2') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd "${srcdir}/${pkgname}-${pkgver/.a}" + + patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch + patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp +} - [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" - - # fix for flac-1.3.0 - sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c - sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c +build() { + cd "${srcdir}/${pkgname}-${pkgver/.a}" + [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc" CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \ + PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --disable-rpath \ @@ -98,12 +105,12 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver/.a}" make DESTDIR="${pkgdir}" install for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ + install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" done } diff --git a/extra/vlc/vlc-2.0.7-vaapi-compat.patch b/extra/vlc/vlc-2.0.7-vaapi-compat.patch new file mode 100644 index 000000000..4fd29710b --- /dev/null +++ b/extra/vlc/vlc-2.0.7-vaapi-compat.patch @@ -0,0 +1,11 @@ +diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c +--- a/modules/codec/avcodec/vaapi.c 2013-01-22 09:51:40.000000000 +0000 ++++ b/modules/codec/avcodec/vaapi.c 2013-07-27 17:23:37.965202118 +0000 +@@ -47,6 +47,7 @@ + + #include <X11/Xlib.h> + #include <va/va_x11.h> ++#include <va/va_compat.h> + + typedef struct + { diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch new file mode 100644 index 000000000..3006cbc8d --- /dev/null +++ b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch @@ -0,0 +1,29 @@ +From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf <jb@videolan.org> +Date: Thu, 25 Jul 2013 01:14:32 +0200 +Subject: [PATCH] Fix live555 breakage in last update + +--- + modules/demux/live555.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp +index 9e02630..7a1ab16 100644 +--- a/modules/demux/live555.cpp ++++ b/modules/demux/live555.cpp +@@ -243,7 +243,11 @@ public: + char const* applicationName, portNumBits tunnelOverHTTPPortNum, + demux_sys_t *p_sys) : + RTSPClient( env, rtspURL, verbosityLevel, applicationName, +- tunnelOverHTTPPortNum ) ++ tunnelOverHTTPPortNum ++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800 ++ , -1 ++#endif ++ ) + { + this->p_sys = p_sys; + } +-- +1.8.3.4 + diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index dbe4ca569..36333f1a6 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182997 2013-04-16 18:42:01Z tomegun $ +# $Id: PKGBUILD 190120 2013-07-15 21:53:45Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('d2dc9398a83692cafc16eba6e45f85d8') +md5sums=('48d375afb15f3e68a72cf7b4fd8f4a63') diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index bc3cf4a87..3d0632eda 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188207 2013-06-12 20:16:30Z heftig $ +# $Id: PKGBUILD 191357 2013-07-23 21:01:37Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=webkitgtk -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://webkitgtk.org/" @@ -16,7 +16,7 @@ conflicts=(webkitgtk3 libwebkit3) replaces=(webkitgtk3 libwebkit3) options=(!libtool !emptydirs) source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz) -sha256sums=('9bf8a32afbf087c4fc2c652b193a52c44b180735ba9c7c8db88137904d458e1b') +sha256sums=('bd1550b7f6e1a55f803efe7d64438163ff6c04f02186002cb81d0c090aac734f') prepare() { cd $pkgbase-$pkgver diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 20aae0027..6564b180f 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187179 2013-06-04 21:40:01Z giovanni $ +# $Id: PKGBUILD 191778 2013-07-30 17:02:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.25 -pkgrel=2 +pkgver=5.0.26 +pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') url="http://www.linux.it/~md/software/" @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz") -md5sums=('8f873c1c51592ee419b2a46b0a3c8432') +md5sums=('236829eea77e85df2443a54815a1b41d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index e694e615c..401e7f352 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,21 +1,29 @@ -# $Id: PKGBUILD 184448 2013-05-06 19:40:10Z foutrelis $ +# $Id: PKGBUILD 191928 2013-08-01 07:00:01Z bpiotrowski $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker pkgver=0.95.4 -pkgrel=2 +pkgrel=3 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64 'mips64el') url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') -source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz + wmaker.desktop + wm-giflib.patch) md5sums=('640b8ea5b1a875440aa48eaab09c5f00' - '2fba97bebfd691836b92b8f0db79ff13') + '2fba97bebfd691836b92b8f0db79ff13' + '05d8e98fb579f2fa5a097b629374e6b8') +prepare() { + cd WindowMaker-$pkgver + patch -Np0 -i ../wm-giflib.patch + autoreconf -fi +} build() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ @@ -24,10 +32,10 @@ build() { } package() { - cd $srcdir/WindowMaker-$pkgver + cd WindowMaker-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL - install -D -m644 $srcdir/wmaker.desktop $pkgdir/usr/share/xsessions/wmaker.desktop + make DESTDIR="$pkgdir" install + install -D -m644 COPYING.WTFPL "$pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL" + install -D -m644 ../wmaker.desktop "$pkgdir/usr/share/xsessions/wmaker.desktop" } diff --git a/extra/windowmaker/wm-giflib.patch b/extra/windowmaker/wm-giflib.patch new file mode 100644 index 000000000..4b6b69073 --- /dev/null +++ b/extra/windowmaker/wm-giflib.patch @@ -0,0 +1,2422 @@ +Index: WINGs/Examples/colorpick.c +=================================================================== +--- WINGs/Examples/colorpick.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/colorpick.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Examples/fontl.c +=================================================================== +--- WINGs/Examples/fontl.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/fontl.c 2013-01-18 16:57:47.955049409 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Examples/puzzle.c +=================================================================== +--- WINGs/Examples/puzzle.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Examples/puzzle.c 2013-01-18 16:57:47.955049409 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <WINGs/WINGs.h> +Index: WINGs/Extras/test.c +=================================================================== +--- WINGs/Extras/test.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/test.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdio.h> + #include <stdint.h> +Index: WINGs/Extras/wtabledelegates.c +=================================================================== +--- WINGs/Extras/wtabledelegates.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtabledelegates.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdint.h> + #include <WINGs/WINGsP.h> + +Index: WINGs/Extras/wtableview.c +=================================================================== +--- WINGs/Extras/wtableview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Extras/wtableview.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <X11/cursorfont.h> + #include <stdint.h> +Index: WINGs/Tests/mywidget.c +=================================================================== +--- WINGs/Tests/mywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/mywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -13,6 +13,10 @@ + * + * + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + /* +Index: WINGs/Tests/testmywidget.c +=================================================================== +--- WINGs/Tests/testmywidget.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/testmywidget.c 2013-01-18 16:57:47.956049439 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + #include <stdlib.h> + +Index: WINGs/Tests/wmfile.c +=================================================================== +--- WINGs/Tests/wmfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmfile.c 2013-01-18 16:57:47.957049469 +0100 +@@ -11,6 +11,10 @@ + ----------------------------------------------------------------------- + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wmquery.c +=================================================================== +--- WINGs/Tests/wmquery.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wmquery.c 2013-01-18 16:57:47.957049469 +0100 +@@ -3,6 +3,10 @@ + * Author: Len Trigg <trigg@cs.waikato.ac.nz> + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <unistd.h> +Index: WINGs/Tests/wtest.c +=================================================================== +--- WINGs/Tests/wtest.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/Tests/wtest.c 2013-01-18 16:57:47.957049469 +0100 +@@ -2,6 +2,10 @@ + * WINGs test application + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGs.h> + + #include <stdio.h> +Index: WINGs/array.c +=================================================================== +--- WINGs/array.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/array.c 2013-01-18 16:57:47.957049469 +0100 +@@ -8,6 +8,10 @@ + * proper credit is always appreciated :) + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/bagtree.c +=================================================================== +--- WINGs/bagtree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/bagtree.c 2013-01-18 16:57:47.957049469 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + +Index: WINGs/configuration.c +=================================================================== +--- WINGs/configuration.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/configuration.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/data.c +=================================================================== +--- WINGs/data.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/data.c 2013-01-18 16:57:47.958049499 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include "WUtil.h" + +Index: WINGs/dragcommon.c +=================================================================== +--- WINGs/dragcommon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragcommon.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion +Index: WINGs/dragdestination.c +=================================================================== +--- WINGs/dragdestination.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragdestination.c 2013-01-18 16:57:47.958049499 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <X11/Xatom.h> + +Index: WINGs/dragsource.c +=================================================================== +--- WINGs/dragsource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/dragsource.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/error.c +=================================================================== +--- WINGs/error.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/error.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdarg.h> +Index: WINGs/findfile.c +=================================================================== +--- WINGs/findfile.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/findfile.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WUtil.h" +Index: WINGs/handlers.c +=================================================================== +--- WINGs/handlers.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/handlers.c 2013-01-18 16:57:47.959049529 +0100 +@@ -3,6 +3,10 @@ + * WINGs internal handlers: timer, idle and input handlers + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/hashtable.c +=================================================================== +--- WINGs/hashtable.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/hashtable.c 2013-01-18 16:57:47.959049529 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <string.h> + #include <stdlib.h> +Index: WINGs/memory.c +=================================================================== +--- WINGs/memory.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/memory.c 2013-01-18 16:57:47.959049529 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WUtil.h" + +Index: WINGs/misc.c +=================================================================== +--- WINGs/misc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/misc.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,6 +1,10 @@ + + /* Miscelaneous helper functions */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + WMRange wmkrange(int start, int count) +Index: WINGs/notification.c +=================================================================== +--- WINGs/notification.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/notification.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <assert.h> + #include <stdio.h> +Index: WINGs/proplist.c +=================================================================== +--- WINGs/proplist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/proplist.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/selection.c +=================================================================== +--- WINGs/selection.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/selection.c 2013-01-18 16:57:47.960049559 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include <X11/Xatom.h> +Index: WINGs/string.c +=================================================================== +--- WINGs/string.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/string.c 2013-01-18 16:57:47.961049589 +0100 +@@ -6,6 +6,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: WINGs/tree.c +=================================================================== +--- WINGs/tree.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/tree.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + + #include "WUtil.h" +Index: WINGs/userdefaults.c +=================================================================== +--- WINGs/userdefaults.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/userdefaults.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <string.h> + #include <strings.h> +Index: WINGs/usleep.c +=================================================================== +--- WINGs/usleep.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/usleep.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <errno.h> + #include <time.h> + +Index: WINGs/wapplication.c +=================================================================== +--- WINGs/wapplication.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wapplication.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + #include <X11/Xlocale.h> + +Index: WINGs/wappresource.c +=================================================================== +--- WINGs/wappresource.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wappresource.c 2013-01-18 16:57:47.961049589 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <unistd.h> + + #include "WINGsP.h" +Index: WINGs/wballoon.c +=================================================================== +--- WINGs/wballoon.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wballoon.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + +Index: WINGs/wbox.c +=================================================================== +--- WINGs/wbox.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbox.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct { +Index: WINGs/wbrowser.c +=================================================================== +--- WINGs/wbrowser.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbrowser.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <math.h> /* for : double rint (double) */ + +Index: WINGs/wbutton.c +=================================================================== +--- WINGs/wbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wbutton.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Button { +Index: WINGs/wcolor.c +=================================================================== +--- WINGs/wcolor.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolor.c 2013-01-18 16:57:47.962049620 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include "wconfig.h" +Index: WINGs/wcolorpanel.c +=================================================================== +--- WINGs/wcolorpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorpanel.c 2013-01-18 16:57:47.963049651 +0100 +@@ -23,6 +23,10 @@ + * - Resizing + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include "WINGsP.h" + #include "rgb.h" +Index: WINGs/wcolorwell.c +=================================================================== +--- WINGs/wcolorwell.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wcolorwell.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #define XDND_COLOR_DATA_TYPE "application/X-color" +Index: WINGs/wevent.c +=================================================================== +--- WINGs/wevent.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wevent.c 2013-01-18 16:57:47.964049682 +0100 +@@ -3,6 +3,10 @@ + * This event handling stuff was inspired on Tk. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* table to map event types to event masks */ +Index: WINGs/wfilepanel.c +=================================================================== +--- WINGs/wfilepanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfilepanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: WINGs/wfont.c +=================================================================== +--- WINGs/wfont.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfont.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + + #include "wconfig.h" +Index: WINGs/wfontpanel.c +=================================================================== +--- WINGs/wfontpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wfontpanel.c 2013-01-18 16:57:47.964049682 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "WUtil.h" + #include "wconfig.h" +Index: WINGs/wframe.c +=================================================================== +--- WINGs/wframe.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wframe.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Frame { +Index: WINGs/widgets.c +=================================================================== +--- WINGs/widgets.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/widgets.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/winputmethod.c +=================================================================== +--- WINGs/winputmethod.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/winputmethod.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + + #include "WINGsP.h" +Index: WINGs/wlabel.c +=================================================================== +--- WINGs/wlabel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlabel.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_Label { +Index: WINGs/wlist.c +=================================================================== +--- WINGs/wlist.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wlist.c 2013-01-18 16:57:47.965049713 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + char *WMListDidScrollNotification = "WMListDidScrollNotification"; +Index: WINGs/wmenuitem.c +=================================================================== +--- WINGs/wmenuitem.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmenuitem.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_MenuItem { +Index: WINGs/wmisc.c +=================================================================== +--- WINGs/wmisc.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wmisc.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpanel.c +=================================================================== +--- WINGs/wpanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpanel.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/keysym.h> +Index: WINGs/wpixmap.c +=================================================================== +--- WINGs/wpixmap.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpixmap.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <wraster.h> +Index: WINGs/wpopupbutton.c +=================================================================== +--- WINGs/wpopupbutton.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wpopupbutton.c 2013-01-18 16:57:47.966049743 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_PopUpButton { +Index: WINGs/wprogressindicator.c +=================================================================== +--- WINGs/wprogressindicator.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wprogressindicator.c 2013-01-18 16:57:47.967049773 +0100 +@@ -5,6 +5,10 @@ + * - centralized drawing into one pain function + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ProgressIndicator { +Index: WINGs/wruler.c +=================================================================== +--- WINGs/wruler.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wruler.c 2013-01-18 16:57:47.967049773 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wscroller.c +=================================================================== +--- WINGs/wscroller.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscroller.c 2013-01-18 16:57:47.967049773 +0100 +@@ -7,6 +7,10 @@ + # undef _XOPEN_SOURCE + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <math.h> +Index: WINGs/wscrollview.c +=================================================================== +--- WINGs/wscrollview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wscrollview.c 2013-01-18 16:57:47.967049773 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_ScrollView { +Index: WINGs/wslider.c +=================================================================== +--- WINGs/wslider.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wslider.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #undef STRICT_NEXT_BEHAVIOUR +Index: WINGs/wsplitview.c +=================================================================== +--- WINGs/wsplitview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wsplitview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + /* +Index: WINGs/wtabview.c +=================================================================== +--- WINGs/wtabview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtabview.c 2013-01-18 16:57:47.968049802 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + typedef struct W_TabView { +Index: WINGs/wtext.c +=================================================================== +--- WINGs/wtext.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wtext.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,6 +1,10 @@ + + /* WINGs WMText: multi-line/font/color/graphic text widget, by Nwanua. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include <ctype.h> + #include <X11/keysym.h> +Index: WINGs/wtextfield.c +=================================================================== +--- WINGs/wtextfield.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WINGs/wtextfield.c 2013-01-18 16:57:47.969049831 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + #include "wconfig.h" + +Index: WINGs/wutil.c +=================================================================== +--- WINGs/wutil.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wutil.c 2013-01-18 16:57:47.969049831 +0100 +@@ -3,6 +3,10 @@ + * Handle events for non-GUI based applications + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + void WHandleEvents() +Index: WINGs/wview.c +=================================================================== +--- WINGs/wview.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wview.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WINGsP.h" + + #include <X11/Xresource.h> +Index: WINGs/wwindow.c +=================================================================== +--- WINGs/wwindow.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WINGs/wwindow.c 2013-01-18 16:57:47.970049862 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xmd.h> + + #include "WINGsP.h" +Index: WPrefs.app/Appearance.c +=================================================================== +--- WPrefs.app/Appearance.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Appearance.c 2013-01-18 16:57:47.970049862 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/Configurations.c +=================================================================== +--- WPrefs.app/Configurations.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Configurations.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Expert.c +=================================================================== +--- WPrefs.app/Expert.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Expert.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + /* This structure containts the list of all the check-buttons to display in the +Index: WPrefs.app/Focus.c +=================================================================== +--- WPrefs.app/Focus.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Focus.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/FontSimple.c +=================================================================== +--- WPrefs.app/FontSimple.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/FontSimple.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <fontconfig/fontconfig.h> +Index: WPrefs.app/Icons.c +=================================================================== +--- WPrefs.app/Icons.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Icons.c 2013-01-18 16:57:47.971049894 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/KeyboardSettings.c +=================================================================== +--- WPrefs.app/KeyboardSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/KeyboardSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Menu.c +=================================================================== +--- WPrefs.app/Menu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Menu.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + #include <ctype.h> +Index: WPrefs.app/MenuPreferences.c +=================================================================== +--- WPrefs.app/MenuPreferences.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MenuPreferences.c 2013-01-18 16:57:47.972049925 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/MouseSettings.c +=================================================================== +--- WPrefs.app/MouseSettings.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/MouseSettings.c 2013-01-18 16:57:47.972049925 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <X11/Xutil.h> +Index: WPrefs.app/Paths.c +=================================================================== +--- WPrefs.app/Paths.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Paths.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <unistd.h> + #include <assert.h> +Index: WPrefs.app/Preferences.c +=================================================================== +--- WPrefs.app/Preferences.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ WPrefs.app/Preferences.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/TexturePanel.c +=================================================================== +--- WPrefs.app/TexturePanel.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/TexturePanel.c 2013-01-18 16:57:47.973049956 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: WPrefs.app/Themes.c +=================================================================== +--- WPrefs.app/Themes.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Themes.c 2013-01-18 16:57:47.973049956 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <unistd.h> +Index: WPrefs.app/WPrefs.c +=================================================================== +--- WPrefs.app/WPrefs.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WPrefs.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + #include <assert.h> + +Index: WPrefs.app/WindowHandling.c +=================================================================== +--- WPrefs.app/WindowHandling.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/WindowHandling.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/Workspace.c +=================================================================== +--- WPrefs.app/Workspace.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/Workspace.c 2013-01-18 16:57:47.974049987 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + typedef struct _Panel { +Index: WPrefs.app/double.c +=================================================================== +--- WPrefs.app/double.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/double.c 2013-01-18 16:57:47.974049987 +0100 +@@ -4,6 +4,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + #include "double.h" +Index: WPrefs.app/editmenu.c +=================================================================== +--- WPrefs.app/editmenu.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/editmenu.c 2013-01-18 16:57:47.975050017 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + #include <WINGs/WUtil.h> + #include <stdlib.h> +Index: WPrefs.app/main.c +=================================================================== +--- WPrefs.app/main.c.orig 2013-01-09 22:42:38.000000000 +0100 ++++ WPrefs.app/main.c 2013-01-18 16:57:47.975050017 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "WPrefs.h" + + #include <assert.h> +Index: WPrefs.app/xmodifier.c +=================================================================== +--- WPrefs.app/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ WPrefs.app/xmodifier.c 2013-01-18 16:57:47.975050017 +0100 +@@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <string.h> + #include <strings.h> + #include <X11/Xlib.h> +Index: src/actions.c +=================================================================== +--- src/actions.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/actions.c 2013-01-18 16:57:47.975050017 +0100 +@@ -20,6 +20,10 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appicon.c +=================================================================== +--- src/appicon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/appicon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/application.c +=================================================================== +--- src/application.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/application.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/appmenu.c +=================================================================== +--- src/appmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/appmenu.c 2013-01-18 16:57:47.976050047 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/balloon.c +=================================================================== +--- src/balloon.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/balloon.c 2013-01-18 16:57:47.976050047 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef BALLOON_TEXT +Index: src/client.c +=================================================================== +--- src/client.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/client.c 2013-01-18 16:57:47.977050077 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/colormap.c +=================================================================== +--- src/colormap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/colormap.c 2013-01-18 16:57:47.977050077 +0100 +@@ -23,6 +23,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "WindowMaker.h" +Index: src/cycling.c +=================================================================== +--- src/cycling.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/cycling.c 2013-01-18 16:57:47.977050077 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/defaults.c +=================================================================== +--- src/defaults.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/defaults.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/dialog.c +=================================================================== +--- src/dialog.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dialog.c 2013-01-18 16:57:47.978050108 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dock.c +=================================================================== +--- src/dock.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/dock.c 2013-01-18 16:57:47.979050138 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/dockedapp.c +=================================================================== +--- src/dockedapp.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/dockedapp.c 2013-01-18 16:57:47.979050138 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/event.c +=================================================================== +--- src/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/event.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/framewin.c +=================================================================== +--- src/framewin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/framewin.c 2013-01-18 16:57:47.980050168 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/geomview.c +=================================================================== +--- src/geomview.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/geomview.c 2013-01-18 16:57:47.980050168 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <WINGs/WINGsP.h> + + typedef struct W_GeometryView { +Index: src/icon.c +=================================================================== +--- src/icon.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/icon.c 2013-01-18 16:57:47.980050168 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/main.c +=================================================================== +--- src/main.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/main.c 2013-01-18 16:57:47.981050198 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef HAVE_INOTIFY +Index: src/menu.c +=================================================================== +--- src/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/menu.c 2013-01-18 16:57:47.981050198 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/misc.c +=================================================================== +--- src/misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/misc.c 2013-01-18 16:57:47.981050198 +0100 +@@ -17,6 +17,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/monitor.c +=================================================================== +--- src/monitor.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/monitor.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + #include <unistd.h> + #include <stdlib.h> +Index: src/motif.c +=================================================================== +--- src/motif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/motif.c 2013-01-18 16:57:47.982050228 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef MWM_HINTS +Index: src/moveres.c +=================================================================== +--- src/moveres.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/moveres.c 2013-01-18 16:57:47.982050228 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/osdep_bsd.c +=================================================================== +--- src/osdep_bsd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_bsd.c 2013-01-18 16:57:47.983050258 +0100 +@@ -11,6 +11,10 @@ + #else /* OPENBSD || NETBSD */ + # include <sys/param.h> + #endif ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/sysctl.h> + + #include <assert.h> +Index: src/osdep_darwin.c +=================================================================== +--- src/osdep_darwin.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_darwin.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/sysctl.h> + +Index: src/osdep_linux.c +=================================================================== +--- src/osdep_linux.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_linux.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: src/osdep_stub.c +=================================================================== +--- src/osdep_stub.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/osdep_stub.c 2013-01-18 16:57:47.983050258 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/utsname.h> + + #include <WINGs/WUtil.h> +Index: src/pixmap.c +=================================================================== +--- src/pixmap.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/pixmap.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/placement.c +=================================================================== +--- src/placement.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/placement.c 2013-01-18 16:57:47.983050258 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/properties.c +=================================================================== +--- src/properties.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/properties.c 2013-01-18 16:57:47.983050258 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/resources.c +=================================================================== +--- src/resources.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/resources.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/rootmenu.c +=================================================================== +--- src/rootmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/rootmenu.c 2013-01-18 16:57:47.984050288 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/screen.c +=================================================================== +--- src/screen.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/screen.c 2013-01-18 16:57:47.984050288 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/session.c +=================================================================== +--- src/session.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/session.c 2013-01-18 16:57:47.985050319 +0100 +@@ -57,6 +57,10 @@ + * if the Die message is received, exit. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/shutdown.c +=================================================================== +--- src/shutdown.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/shutdown.c 2013-01-18 16:57:47.985050319 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/stacking.c +=================================================================== +--- src/stacking.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/stacking.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/startup.c +=================================================================== +--- src/startup.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/startup.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/superfluous.c +=================================================================== +--- src/superfluous.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/superfluous.c 2013-01-18 16:57:47.985050319 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/switchmenu.c +=================================================================== +--- src/switchmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/switchmenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/switchpanel.c +=================================================================== +--- src/switchpanel.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/switchpanel.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdlib.h> +Index: src/texture.c +=================================================================== +--- src/texture.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/texture.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/usermenu.c +=================================================================== +--- src/usermenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/usermenu.c 2013-01-18 16:57:47.986050350 +0100 +@@ -56,6 +56,10 @@ + * + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef USER_MENU +Index: src/wcore.c +=================================================================== +--- src/wcore.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wcore.c 2013-01-18 16:57:47.986050350 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wdefaults.c +=================================================================== +--- src/wdefaults.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/wdefaults.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/window.c +=================================================================== +--- src/window.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/window.c 2013-01-18 16:57:47.987050381 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/winmenu.c +=================================================================== +--- src/winmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/winmenu.c 2013-01-18 16:57:47.988050412 +0100 +@@ -19,6 +19,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <stdio.h> +Index: src/winspector.c +=================================================================== +--- src/winspector.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/winspector.c 2013-01-18 16:57:47.988050412 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/wmspec.c +=================================================================== +--- src/wmspec.c.orig 2013-01-09 22:42:49.000000000 +0100 ++++ src/wmspec.c 2013-01-18 16:57:47.989050442 +0100 +@@ -28,6 +28,10 @@ + * return to be Success is not enough. -Dan + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/workspace.c +=================================================================== +--- src/workspace.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/workspace.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <X11/Xlib.h> +Index: src/xdnd.c +=================================================================== +--- src/xdnd.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xdnd.c 2013-01-18 16:57:47.989050442 +0100 +@@ -1,5 +1,9 @@ + /* Many part of code are ripped of an example from JX's site */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #ifdef XDND +Index: src/xinerama.c +=================================================================== +--- src/xinerama.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xinerama.c 2013-01-18 16:57:47.989050442 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include "xinerama.h" +Index: src/xmodifier.c +=================================================================== +--- src/xmodifier.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xmodifier.c 2013-01-18 16:57:47.989050442 +0100 +@@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wconfig.h" + + #include <string.h> +Index: src/xutil.c +=================================================================== +--- src/xutil.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ src/xutil.c 2013-01-18 16:57:47.990050472 +0100 +@@ -18,6 +18,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <X11/Xutil.h> +Index: test/notest.c +=================================================================== +--- test/notest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/notest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -3,6 +3,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <X11/Xlib.h> + #include <X11/Xutil.h> +Index: test/wtest.c +=================================================================== +--- test/wtest.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ test/wtest.c 2013-01-18 16:57:47.990050472 +0100 +@@ -8,6 +8,10 @@ + * TODO: remake + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <X11/Xlib.h> +Index: util/convertfonts.c +=================================================================== +--- util/convertfonts.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/convertfonts.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/fontconv.c +=================================================================== +--- util/fontconv.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/fontconv.c 2013-01-18 16:57:47.990050472 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: util/geticonset.c +=================================================================== +--- util/geticonset.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/geticonset.c 2013-01-18 16:57:47.990050472 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/getstyle.c +=================================================================== +--- util/getstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/getstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/seticons.c +=================================================================== +--- util/seticons.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/seticons.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <stdio.h> + #include <stdlib.h> +Index: util/setstyle.c +=================================================================== +--- util/setstyle.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/setstyle.c 2013-01-18 16:57:47.991050502 +0100 +@@ -23,6 +23,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/stat.h> + + #include <getopt.h> +Index: util/wdread.c +=================================================================== +--- util/wdread.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdread.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + * WindowMaker defaults DB reader + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wdwrite.c +=================================================================== +--- util/wdwrite.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wdwrite.c 2013-01-18 16:57:47.991050502 +0100 +@@ -28,6 +28,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <getopt.h> + #include <limits.h> + #include <stdio.h> +Index: util/wmagnify.c +=================================================================== +--- util/wmagnify.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmagnify.c 2013-01-18 16:57:47.991050502 +0100 +@@ -6,6 +6,10 @@ + * This program is in the Public Domain. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xproto.h> + + #include <WINGs/WINGs.h> +Index: util/wmgenmenu.c +=================================================================== +--- util/wmgenmenu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmgenmenu.c 2013-01-18 16:57:47.992050532 +0100 +@@ -4,6 +4,10 @@ + #define _GNU_SOURCE /* getopt_long */ + #endif + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <ctype.h> + #include <getopt.h> + #include <limits.h> +Index: util/wmmenugen.c +=================================================================== +--- util/wmmenugen.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen.c 2013-01-18 16:57:47.992050532 +0100 +@@ -18,6 +18,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_misc.c +=================================================================== +--- util/wmmenugen_misc.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_misc.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <libgen.h> + #include <stdlib.h> + #include <string.h> +Index: util/wmmenugen_parse_wmconfig.c +=================================================================== +--- util/wmmenugen_parse_wmconfig.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_wmconfig.c 2013-01-18 16:57:47.992050532 +0100 +@@ -20,6 +20,10 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wmmenugen_parse_xdg.c +=================================================================== +--- util/wmmenugen_parse_xdg.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wmmenugen_parse_xdg.c 2013-01-18 16:57:47.992050532 +0100 +@@ -36,6 +36,10 @@ + * Basic validation of the .desktop file is done. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <sys/types.h> + #include <sys/stat.h> + +Index: util/wxcopy.c +=================================================================== +--- util/wxcopy.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ util/wxcopy.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/app.c +=================================================================== +--- wmlib/app.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/app.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + #include <string.h> +Index: wmlib/command.c +=================================================================== +--- wmlib/command.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/command.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include <stdlib.h> + +Index: wmlib/event.c +=================================================================== +--- wmlib/event.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/event.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <X11/Xlib.h> +Index: wmlib/menu.c +=================================================================== +--- wmlib/menu.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wmlib/menu.c 2013-01-18 16:57:47.993050562 +0100 +@@ -19,6 +19,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +Index: wrlib/alpha_combine.c +=================================================================== +--- wrlib/alpha_combine.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/alpha_combine.c 2013-01-18 16:57:47.993050562 +0100 +@@ -17,6 +17,10 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "wraster.h" + + void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha, +Index: wrlib/tests/testdraw.c +=================================================================== +--- wrlib/tests/testdraw.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testdraw.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testgrad.c +=================================================================== +--- wrlib/tests/testgrad.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testgrad.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdio.h> +Index: wrlib/tests/testrot.c +=================================================================== +--- wrlib/tests/testrot.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/testrot.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,4 +1,8 @@ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: wrlib/tests/view.c +=================================================================== +--- wrlib/tests/view.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/tests/view.c 2013-01-18 16:57:47.994050592 +0100 +@@ -1,3 +1,7 @@ ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include <X11/Xlib.h> + #include "wraster.h" + #include <stdlib.h> +Index: configure.ac +=================================================================== +--- configure.ac.orig 2013-01-09 22:42:49.000000000 +0100 ++++ configure.ac 2013-01-18 16:57:47.994050592 +0100 +@@ -67,8 +67,9 @@ dnl AC_CANONICAL_HOST -- already done by + + dnl Checks for programs. + dnl =================== +-AC_ISC_POSIX +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_LN_S + AC_PROG_GCC_TRADITIONAL + AC_PROG_LIBTOOL +Index: wrlib/gif.c +=================================================================== +--- wrlib/gif.c.orig 2013-01-09 22:42:39.000000000 +0100 ++++ wrlib/gif.c 2013-01-18 16:57:47.994050592 +0100 +@@ -50,17 +50,24 @@ RImage *RLoadGIF(char *file, int index) + unsigned char rmap[256]; + unsigned char gmap[256]; + unsigned char bmap[256]; ++ int dgiferr; + + if (index < 0) + index = 0; + + /* default error message */ + RErrorCode = RERR_BADINDEX; +- ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ gif = DGifOpenFileName(file, &dgiferr); ++#else + gif = DGifOpenFileName(file); +- ++#endif + if (!gif) { ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (dgiferr) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; +@@ -197,7 +204,11 @@ RImage *RLoadGIF(char *file, int index) + /* yuck! */ + goto did_not_get_any_errors; + giferr: ++#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5) ++ switch (gif->Error) { ++#else + switch (GifLastError()) { ++#endif + case D_GIF_ERR_OPEN_FAILED: + RErrorCode = RERR_OPEN; + break; diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch deleted file mode 100644 index 0b8b91363..000000000 --- a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- doc/asn2deb.pod.orig 2013-06-06 21:30:28.314150100 +0200 -+++ doc/asn2deb.pod 2013-06-06 21:31:59.448850746 +0200 -@@ -5,8 +5,21 @@ - - =head1 SYNOPSIS - --B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] --[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] -+B<asn2deb> -+S<[ B<-a> E<lt>ASN.1 fileE<gt> ]> -+S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]> -+S<[ B<-d> E<lt>optsE<gt> ]> -+S<[ B<--dbopts>=E<lt>optsE<gt> ]> -+S<[ B<-e> E<lt>addressE<gt> ]> -+S<[ B<--email>=E<lt>addressE<gt> ]> -+S<[ B<-h> ]> -+S<[ B<--help> ]> -+S<[ B<-n> E<lt>nameE<gt> ]> -+S<[ B<--name>=E<lt>nameE<gt> ]> -+S<[ B<-p> ]> -+S<[ B<--preserve> ]> -+S< [B<-v> ]> -+S<[ B<--version> ]> - - =head1 DESCRIPTION - -@@ -19,31 +32,31 @@ - - =over 4 - --=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file> -+=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt> - - ASN.1 file to use (mandatory). - --=item B<-d >I<opts> B<--dbopts=>I<opts> -+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> - - options for dpkg-buildpackage. - --=item B<-e >I<address> B<--email=>I<address> -+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> - - use e-mail address. - --=item B<-h> B<--help> -+=item -h --help - - print help and exit. - --=item B<-n >I<name> B<--name=>I<name> -+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> - - use user name. - --=item B<-p> B<--preserve> -+=item -p --preserve - - do not overwrite files. - --=item B<-v> B<--version> -+=item -v --version - - print version and exit. - -@@ -68,8 +81,8 @@ - - =head1 AUTHOR - --B<W. Borgert> Author. -+B<W. Borgert> Author. - - =head1 COPYRIGHT - --Copyright (C) 2003, 2005 W. Borger -\ No newline at end of file -+Copyright (C) 2003, 2005 W. Borger diff --git a/extra/wireshark/01_fix_pod_file.patch b/extra/wireshark/01_fix_pod_file.patch new file mode 100644 index 000000000..f75f4c0bf --- /dev/null +++ b/extra/wireshark/01_fix_pod_file.patch @@ -0,0 +1,11 @@ +--- trunk/doc/reordercap.pod 2013/05/20 05:45:32 49435 ++++ trunk/doc/reordercap.pod 2013/05/20 14:56:18 49436 +@@ -40,6 +40,8 @@ + When the B<-n> option is used, B<reordercap> will not write out the output + file if it finds that the input file is already in order. + ++=back ++ + =head1 SEE ALSO + + pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), mergecap(1), diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch deleted file mode 100644 index bc4000b8f..000000000 --- a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- doc/idl2deb.pod.orig 2013-06-06 21:31:06.674726010 +0200 -+++ doc/idl2deb.pod 2013-06-06 21:35:38.522125866 +0200 -@@ -5,9 +5,21 @@ - - =head1 SYNOPSIS - --B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>] --[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>] -- -+B<idl2deb> -+S< [ B<-d> E<lt>optsE<gt> ]> -+S< [ B<--dbopts>=E<lt>optsE<gt> ]> -+S< [ B<-e> E<lt>addressE<gt> ]> -+S< [ B<--email>=E<lt>addressE<gt> ]> -+S< [ B<-h> ]> -+S< [ B<--help> ]> -+S< [ B<-i> E<lt>idlfileE<gt> ]> -+S< [ B<--idl>=E<lt>idlfileE<gt> ]> -+S< [ B<-n> E<lt>nameE<gt> ]> -+S< [ B<--name>=E<lt>nameE<gt> ]> -+S< [ B<-p> ]> -+S< [ B<--preserve> ]> -+S< [ B<-v> ]> -+S< [ B<--version> ]> - - =head1 DESCRIPTION - -@@ -19,31 +31,31 @@ - - =over 4 - --=item B<-d>I<opts> B<--dbopts=>I<opts> -+=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt> - - options for dpkg-buildpackage. - --=item B<-e >I<address> B<--email=>I<address> -+=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt> - - use e-mail address. - --=item B<-i >I<idlfile> B<--idl=>I<idlfile> -+=item -h --help - --IDL file to use (mandatory) -+print help and exit. - --=item B<-h> B<--help> -+=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt> - --print help and exit. -+IDL file to use (mandatory) - --=item B<-n >I<name> B<--name=>I<name> -+=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt> - - use user name. - --=item B<-p> B<--preserve> -+=item -p --preserve - - do not overwrite files. - --=item B<-v> B<--version> -+=item -v --version - - print version and exit. - -@@ -67,7 +79,7 @@ - - =head1 AUTHOR - --B<W. Borgert> Author. -+B<W. Borgert> Author. - - =head1 COPYRIGHT - diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch deleted file mode 100644 index ace641100..000000000 --- a/extra/wireshark/03_force_utf8_for_pod2man.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- doc/Makefile.am (revision 49837) -+++ doc/Makefile.am (working copy) -@@ -123,6 +123,7 @@ - $(AM_V_POD2MAN)$(POD2MAN) \ - --center="The Wireshark Network Analyzer" \ - --release=$(VERSION) \ -+ --utf8 \ - $< > $@ - - .pod.html: ../config.h $(top_srcdir)/docbook/ws.css ---- doc/wireshark.pod.template (revision 49837) -+++ doc/wireshark.pod.template (working copy) -@@ -1,4 +1,9 @@ -+=begin man -+ -+=encoding utf8 -+ -+=end man - - =head1 NAME - - wireshark - Interactively dump and analyze network traffic diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index be063f430..7492f64d4 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $ +# $Id: PKGBUILD 191608 2013-07-27 17:57:23Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.10.0 -pkgrel=3 +pkgver=1.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -12,24 +12,14 @@ makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_fix_encoding_asn2deb_pod.patch - 02_fix_encoding_idl2deb_pod.patch - 03_force_utf8_for_pod2man.patch) -sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add' - '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d' - 'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27' - '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf') + 01_fix_pod_file.patch) +sha256sums=('06499544f053cc1f73529278ede0ac210d709cada8267e81d908bd346cc0c5bc' + '18470353d3658814b4925c7fcf07e647e1e400856cdf356555ddf105d12bdd41') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774 - for p in 01_fix_encoding_asn2deb_pod.patch \ - 02_fix_encoding_idl2deb_pod.patch \ - 03_force_utf8_for_pod2man.patch; - do - patch -p0 <${srcdir}/${p} - done + patch -p1 <${srcdir}/01_fix_pod_file.patch ./autogen.sh ./configure \ diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index 499536e98..0e3a76672 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=12.09.0 -pkgrel=1.1 +pkgver=13.04.1 +pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64' 'mips64el') url="http://wxmaxima.sourceforge.net/" @@ -13,7 +13,7 @@ license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) install=wxmaxima.install -sha1sums=('9b56f674392eabb75183b228757df8834b45b2a6') +sha1sums=('c1d8be28f92820d0e447d186271a48a72545c887') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index d353a86a8..eb9471cdf 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,25 +1,20 @@ -# $Id: PKGBUILD 168731 2012-10-15 02:00:18Z bisson $ +# $Id: PKGBUILD 191363 2013-07-24 02:13:55Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=3 +pkgrel=4 pkgdesc='VNC server for real X displays' url='http://www.karlrunge.com/x11vnc/' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') optdepends=('tk: for GUI support') -backup=('etc/conf.d/x11vnc') +depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi') source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'conf.d' - 'rc.d') + 'service') sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa' - '53e1ed7f84518a699a29607a03bee2321f9f9624' - '11011cce06511e9ba61672a1c80bb63a3a187539' - '477892cf0f0020043444b7493c80684762ded506') + '53e1ed7f84518a699a29607a03bee2321f9f9624') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -30,8 +25,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver } diff --git a/extra/x11vnc/conf.d b/extra/x11vnc/conf.d deleted file mode 100644 index 8a81e3286..000000000 --- a/extra/x11vnc/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to x11vnc -# - -X11VNC_ARGS="" diff --git a/extra/x11vnc/rc.d b/extra/x11vnc/rc.d deleted file mode 100644 index b5f2a6464..000000000 --- a/extra/x11vnc/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/x11vnc - -PID=$(pidof -o %PPID /usr/bin/x11vnc) -case "$1" in - start) - stat_busy "Starting x11vnc" - [[ -z "$PID" ]] && /usr/bin/x11vnc $X11VNC_ARGS &> /dev/null & - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon x11vnc - stat_done - fi - ;; - stop) - stat_busy "Stopping x11vnc" - [[ ! -z "$PID" ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon x11vnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 0effd2cac..4a06db7df 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,37 +1,41 @@ -# $Id: PKGBUILD 178144 2013-02-16 22:49:02Z ioni $ +# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20130206 -pkgrel=1 +pkgver=20130702 +pkgrel=2 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') makedepends=('yasm' 'git') -source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('f952248492745a077ad6a77465276166') +source=(git://git.videolan.org/x264.git#commit=585324fee3) +md5sums=('SKIP') -build() { - cd $pkgname - - [ "$CARCH" = "mips64el" ] && extra="--enable-pic" +pkgver() { + cd $pkgname + git log -1 --format="%cd" --date=short | sed 's|-||g' +} - ./configure --enable-shared $extra +build() { + cd $pkgname - make + ./configure --enable-shared \ + --enable-pic + make } + package() { - cd $pkgname + cd $pkgname - make DESTDIR="$pkgdir" \ - bindir=/usr/bin \ - libdir=/usr/lib \ - includedir=/usr/include \ - install + make DESTDIR="$pkgdir" \ + bindir=/usr/bin \ + libdir=/usr/lib \ + includedir=/usr/include \ + install } # vim:set ts=2 sw=2 et: diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 34c426773..dba40a0bf 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188846 2013-06-22 19:39:32Z andyrtr $ +# $Id: PKGBUILD 191716 2013-07-29 13:47:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,7 +7,7 @@ # Contributor: Milan KnÞek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.1.3 +pkgver=4.0.1.6 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('494b2d0435f7a11bc68a5d1d2a8a5f33' +md5sums=('61f2248fb16bc035f92b9588ab19c35e' 'f76081c01e40b6206895d194dc949707') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 013ddac45..eeb25cf03 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189300 2013-07-02 19:56:50Z lcarlier $ +# $Id: PKGBUILD 191785 2013-07-30 19:12:09Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.11 +pkgver=2.21.13 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22') +sha256sums=('76e17cebf79d3c3c98af246fcfb55018aa12e2d56fe5f3b6d54b93e90837efa8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index c3a3570fb..558680093 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188202 2013-06-12 18:59:24Z lcarlier $ +# $Id: PKGBUILD 191802 2013-07-30 21:14:54Z lcarlier $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') install=$pkgname.install source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2) -sha256sums=('9b904314b8e9c7a5800724a6a31038ed88fa3fcfd35da6f4015fc104c8283617') +sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482') build() { cd $pkgname-$pkgver diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 2553045d2..882e858d0 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $ +# $Id: PKGBUILD 191734 2013-07-29 19:57:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 pkgver=6.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,17 +14,23 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS optdepends=('r128-dri: DRI1 support from community repo') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + no-mibstore.patch) +sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c' + '6e4cbce4de6ff569f6d30a99f699ca44d4cb28e530e593f61578b4f97c1de13e') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../no-mibstore.patch +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-r128/no-mibstore.patch b/extra/xf86-video-r128/no-mibstore.patch new file mode 100644 index 000000000..b6f18031e --- /dev/null +++ b/extra/xf86-video-r128/no-mibstore.patch @@ -0,0 +1,24 @@ +From 24f28a78fdcd056357f137650ca7f0f01c257d97 Mon Sep 17 00:00:00 2001 +From: Connor Behan <connor.behan@gmail.com> +Date: Wed, 19 Dec 2012 18:41:14 +0000 +Subject: Remove call to obsolete miInitializeBackingStore() + +Definition was deleted from Xorg during 1.14 merge window, but has been +a no-op since 1.10 merge window. + +Signed-off-by: Connor Behan <connor.behan@gmail.com> +--- +diff --git a/src/r128_driver.c b/src/r128_driver.c +index a062a60..f47c7e3 100644 +--- a/src/r128_driver.c ++++ b/src/r128_driver.c +@@ -2701,7 +2701,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL) + R128DGAInit(pScreen); + + /* Backing store setup */ +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Set Silken Mouse */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 46c21bb73..7f0efbbb5 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ +# $Id: PKGBUILD 191912 2013-08-01 06:53:45Z bpiotrowski $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD index 5aa39e9c4..4860a675c 100644 --- a/extra/xorg-iceauth/PKGBUILD +++ b/extra/xorg-iceauth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 125572 2011-05-26 20:17:22Z andyrtr $ +# $Id: PKGBUILD 191580 2013-07-25 21:13:50Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-iceauth -pkgver=1.0.5 -pkgrel=1.1 +pkgver=1.0.6 +pkgrel=1 pkgdesc="ICE authority file utility" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libice') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/iceauth-${pkgver}.tar.bz2) -sha1sums=('d996c6ecaa93dcaccee4a11991eeacd40bddc13e') +sha256sums=('bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4') build() { cd "${srcdir}/iceauth-${pkgver}" diff --git a/extra/xorg-mkfontscale/PKGBUILD b/extra/xorg-mkfontscale/PKGBUILD index ebe951978..964796cf6 100644 --- a/extra/xorg-mkfontscale/PKGBUILD +++ b/extra/xorg-mkfontscale/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149834 2012-02-11 10:04:54Z andyrtr $ +# $Id: PKGBUILD 190802 2013-07-17 06:37:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-mkfontscale -pkgver=1.1.0 -pkgrel=1.2 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Create an index of scalable font files for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/mkfontscale-${pkgver}.tar.bz2) -sha1sums=('ba021369ae3b364ba083b9eb5e570e54b21fd583') +sha1sums=('ad1887ca253b9234ab6a6989de53d3127e302c6c') build() { cd "${srcdir}/mkfontscale-${pkgver}" diff --git a/extra/xorg-xconsole/PKGBUILD b/extra/xorg-xconsole/PKGBUILD index 5ca23dfab..cd09847f6 100644 --- a/extra/xorg-xconsole/PKGBUILD +++ b/extra/xorg-xconsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175083 2013-01-13 09:45:06Z andyrtr $ +# $Id: PKGBUILD 191215 2013-07-21 06:57:40Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xconsole -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Monitor system console messages with X" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xconsole-${pkgver}.tar.bz2) -sha256sums=('195fad7a1ca274835fc346c82acce90a0c2e9f288e85bd1a3c256dbc1c8c11e5') +sha256sums=('e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1') build() { cd "${srcdir}/xconsole-${pkgver}" diff --git a/extra/xorg-xfd/PKGBUILD b/extra/xorg-xfd/PKGBUILD index ab5daa42e..6892d54de 100644 --- a/extra/xorg-xfd/PKGBUILD +++ b/extra/xorg-xfd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150433 2012-02-17 16:53:03Z andyrtr $ +# $Id: PKGBUILD 190804 2013-07-17 06:52:57Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xfd -pkgver=1.1.1 -pkgrel=1.1 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Displays all the characters in a font using either the X11 core protocol or libXft2" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw' 'fontconfig' 'libxft' 'libxrender' 'libxmu') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xfd-${pkgver}.tar.bz2) -sha256sums=('3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73') +sha256sums=('c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759') build() { cd "${srcdir}/xfd-${pkgver}" diff --git a/extra/xorg-xhost/PKGBUILD b/extra/xorg-xhost/PKGBUILD index a7ea1e8bf..0b546f80e 100644 --- a/extra/xorg-xhost/PKGBUILD +++ b/extra/xorg-xhost/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154154 2012-03-23 19:23:30Z andyrtr $ +# $Id: PKGBUILD 190806 2013-07-17 06:56:33Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xhost -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Server access control program for X" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libx11' 'libxmu') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xhost-${pkgver}.tar.bz2) -sha1sums=('c9ad0447c709fc7a9a2afbbca712cf47fbb29757') +sha1sums=('6224c8bcd909bf205c7e92dbdc349356890c4428') build() { cd "${srcdir}/xhost-${pkgver}" diff --git a/extra/xorg-xrandr/PKGBUILD b/extra/xorg-xrandr/PKGBUILD index 1ca040ad8..43fe711f3 100644 --- a/extra/xorg-xrandr/PKGBUILD +++ b/extra/xorg-xrandr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178018 2013-02-13 16:44:53Z andyrtr $ +# $Id: PKGBUILD 190808 2013-07-17 07:01:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrandr -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="Primitive command line interface to RandR extension" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('libxrandr' 'libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrandr-${pkgver}.tar.bz2) -sha256sums=('a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693') +sha256sums=('67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50') build() { cd "${srcdir}/xrandr-${pkgver}" diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD index 0fa260fa5..d1b42a8e8 100644 --- a/extra/zeitgeist/PKGBUILD +++ b/extra/zeitgeist/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 183481 2013-04-21 22:21:01Z heftig $ +# $Id: PKGBUILD 191639 2013-07-28 19:42:13Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=zeitgeist -pkgver=0.9.12 +pkgver=0.9.14 pkgrel=1 pkgdesc="Service logging user activities and events" arch=(i686 x86_64 mips64el) url="http://zeitgeist-project.com/" license=(GPL2 LGPL2.1) -depends=(sqlite json-glib telepathy-glib gtk3) +depends=(json-glib telepathy-glib gtk3) makedepends=(intltool gobject-introspection vala raptor python2-rdflib) provides=(zeitgeist-datahub) conflicts=(zeitgeist-datahub) replaces=(zeitgeist-datahub) options=('!libtool') source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz") -sha256sums=('f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd') +sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061') prepare() { cd $pkgname-$pkgver @@ -41,6 +41,5 @@ check() { package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install #zeitgeistdocdir=/usr/share/doc/zeitgeist install - #install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon" + make DESTDIR="$pkgdir" install } |