summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cfitsio/PKGBUILD6
-rw-r--r--extra/clutter-gtk/PKGBUILD15
-rw-r--r--extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch29
-rw-r--r--extra/giflib/PKGBUILD6
-rw-r--r--extra/giflib/giflib-4.2.1-quantize.patch465
-rw-r--r--extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch37
-rw-r--r--extra/gnome-shell/PKGBUILD12
-rw-r--r--extra/gnome-shell/git-fixes.patch125
-rw-r--r--extra/lcms2/PKGBUILD12
-rw-r--r--extra/libsecret/PKGBUILD3
-rw-r--r--extra/openmpi/PKGBUILD17
-rw-r--r--extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch32
-rw-r--r--extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch47
-rw-r--r--extra/perl-tk/PKGBUILD35
-rw-r--r--extra/soprano/PKGBUILD11
-rw-r--r--extra/uim/PKGBUILD8
-rw-r--r--extra/xorg-server/PKGBUILD46
-rw-r--r--extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch (renamed from extra/xorg-server/git-fixes.patch)0
-rw-r--r--extra/xorg-server/xephyr-glx.patch39
19 files changed, 650 insertions, 295 deletions
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index af14bbaa8..bddf6ee59 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $
+# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cfitsio
-pkgver=3.340
+pkgver=3.350
pkgrel=1
pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('custom')
depends=('glibc')
options=('!libtool')
source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-md5sums=('99210838af46b7bf2d945ccbb05e3ad3')
+md5sums=('3e61f17731fe8db503b1b39873e4a8c4')
build() {
cd ${pkgname}
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index d09988c74..6c4d74824 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $
+# $Id: PKGBUILD 189249 2013-07-01 11:24:00Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=clutter-gtk
pkgver=1.4.4
-pkgrel=1
+pkgrel=2
pkgdesc="GTK clutter widget"
arch=('i686' 'x86_64')
url="http://clutter-project.org/"
@@ -11,8 +11,15 @@ options=('!libtool')
license=('LGPL')
depends=('clutter' 'gtk3')
makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch)
+sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e'
+ '45e86e364756d6ac86c646ee1bcab6c9b94316673963e0b83b1140d9c4978bef')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
+}
build() {
cd $pkgname-$pkgver
diff --git a/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
new file mode 100644
index 000000000..e3eb8ce13
--- /dev/null
+++ b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
@@ -0,0 +1,29 @@
+From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 27 Mar 2013 11:08:46 +0000
+Subject: util: Don't use clutter_x11_set_use_argb_visual() on non-X11
+
+We shouldn't be running this on non-X11 windowing systems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696687
+---
+diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
+index 38e3ced..d4a9fa5 100644
+--- a/clutter-gtk/gtk-clutter-util.c
++++ b/clutter-gtk/gtk-clutter-util.c
+@@ -249,8 +249,11 @@ gtk_clutter_init_with_args (int *argc,
+ return CLUTTER_INIT_SUCCESS;
+
+ #if defined(CLUTTER_WINDOWING_X11)
+- /* enable ARGB visuals by default for Clutter */
+- clutter_x11_set_use_argb_visual (TRUE);
++ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
++ {
++ /* enable ARGB visuals by default for Clutter */
++ clutter_x11_set_use_argb_visual (TRUE);
++ }
+ #endif
+
+ /* we let gtk+ open the display */
+--
+cgit v0.9.2
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index a183c7805..bcb81a0d9 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $
+# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
@@ -6,7 +6,7 @@
pkgname=giflib
pkgver=4.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
giflib-4.2.1-quantize.patch)
md5sums=('bbd3324af24156d5d7e66ab1cee8508d'
- '67e46b344340ac10f4f597d772679f23')
+ '26174405ba886a89b8a4db18fe653a99')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch
index 197f88b77..f6745d2c0 100644
--- a/extra/giflib/giflib-4.2.1-quantize.patch
+++ b/extra/giflib/giflib-4.2.1-quantize.patch
@@ -1,39 +1,39 @@
-diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in
---- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300
-+++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200
-@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libgif_la_DEPENDENCIES =
- am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
-- gifalloc.lo gif_err.lo
-+ gifalloc.lo gif_err.lo quantize.lo
- libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
- libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \
+From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr@thyrsus.com>
+Date: Sun, 3 Jun 2012 07:59:30 -0400
+Subject: [PATCH] Return QuantizeBuffer() to the core library.
+
+Fulfils SourceForge FR 3531618.
+---
+ NEWS | 2 +
+ lib/Makefile.am | 3 +-
+ lib/gif_lib.h | 9 ++
+ lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ util/rgb2gif.c | 302 ------------------------------------------------------
+ 5 files changed, 322 insertions(+), 303 deletions(-)
+ create mode 100644 lib/quantize.c
+
+index 813a2f8..ae6d5fa 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \
gif_hash.h \
gifalloc.c \
gif_err.c \
-+ quantize.c \
- gif_lib_private.h
+- gif_lib_private.h
++ gif_lib_private.h \
++ quantize.c
- libgif_la_LDFLAGS = -version-info @SHLIBVERSION@
-@@ -319,6 +320,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@
+ libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS)
+ libgif_la_LIBADD = @DEVS@
+diff --git a/lib/gif_lib.h b/lib/gif_lib.h
+index e942089..73bc437 100644
+--- a/lib/gif_lib.h
++++ b/lib/gif_lib.h
+@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h
---- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300
-+++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200
-@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile)
- #define D_GIF_ERR_IMAGE_DEFECT 112
- #define D_GIF_ERR_EOF_TOO_SOON 113
-+/******************************************************************************
+ /******************************************************************************
+ * O.K., here are the routines from GIF_LIB file QUANTIZE.C.
+******************************************************************************/
+int QuantizeBuffer(unsigned int Width, unsigned int Height,
@@ -42,37 +42,29 @@ diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h
+ GifByteType * OutputBuffer,
+ GifColorType * OutputColorMap);
+
- /* These are legacy. You probably do not want to call them directly */
- int DGifGetScreenDesc(GifFileType * GifFile);
- int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType);
-diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
---- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200
-+++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200
-@@ -0,0 +1,332 @@
++/******************************************************************************
+ * O.K., here are the routines from GIF_LIB file GIF_ERR.C.
+ ******************************************************************************/
+ extern int GifError(void); /* new in 2012 - ESR */
+diff --git a/lib/quantize.c b/lib/quantize.c
+new file mode 100644
+index 0000000..feb1dc7
+--- /dev/null
++++ b/lib/quantize.c
+@@ -0,0 +1,309 @@
+/*****************************************************************************
-+ * "Gif-Lib" - Yet another gif library.
+ *
-+ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989
-+ ******************************************************************************
-+ * Module to quatize high resolution image into lower one. You may want to
-+ * peek into the following article this code is based on:
-+ * "Color Image Quantization for frame buffer Display", by Paul Heckbert
-+ * SIGGRAPH 1982 page 297-307.
-+ ******************************************************************************
-+ * History:
-+ * 5 Jan 90 - Version 1.0 by Gershon Elber.
++ * quantize.c - quantize a high resolution image into lower one
++ *
++ * Based on: "Color Image Quantization for frame buffer Display", by
++ * Paul Heckbert SIGGRAPH 1982 page 297-307.
++ *
++ * This doesn't really belong in the core library, was undocumented,
++ * and was removed in 4.2. Then it turned out some client apps were
++ * actually using it, so it was restored in 5.0.
++ *
+ *****************************************************************************/
+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef __MSDOS__
-+#include <dos.h>
-+#include <alloc.h>
-+#include <graphics.h>
-+#endif /* __MSDOS__ */
-+
+#include <stdlib.h>
+#include <stdio.h>
+#include "gif_lib.h"
@@ -80,20 +72,9 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
+
+#define ABS(x) ((x) > 0 ? (x) : (-(x)))
+
-+#define PROGRAM_NAME "giflib"
-+
-+/* The colors are stripped to 5 bits per primary color if non MSDOS system
-+ * or to 4 (not enough memory...) if MSDOS as first step.
-+ */
-+#ifdef __MSDOS__
-+#define COLOR_ARRAY_SIZE 4096
-+#define BITS_PER_PRIM_COLOR 4
-+#define MAX_PRIM_COLOR 0x0f
-+#else
+#define COLOR_ARRAY_SIZE 32768
+#define BITS_PER_PRIM_COLOR 5
+#define MAX_PRIM_COLOR 0x1f
-+#endif /* __MSDOS__ */
+
+static int SortRGBAxis;
+
@@ -114,7 +95,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
+static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
+ unsigned int ColorMapSize,
+ unsigned int *NewColorMapSize);
-+static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2);
++static int SortCmpRtn(const void *Entry1, const void *Entry2);
+
+/******************************************************************************
+ * Quantize high resolution image into lower one. Input image consists of a
@@ -226,10 +207,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ } else
-+ fprintf(stderr,
-+ "\n%s: Null entry in quantized color map - that's weird.\n",
-+ PROGRAM_NAME);
++ }
+ }
+
+ /* Finally scan the input buffer again and put the mapped index in the
@@ -375,30 +353,327 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
+ * Routine called by qsort to compare to entries.
+ ****************************************************************************/
+static int
-+SortCmpRtn(const VoidPtr Entry1,
-+ const VoidPtr Entry2) {
++SortCmpRtn(const void *Entry1,
++ const void *Entry2) {
+
+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
+}
-diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c
---- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300
-+++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200
-@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1
- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
- ******************************************************************************/
- static int
--QuantizeBuffer(unsigned int Width,
-+GifQuantizeBuffer(unsigned int Width,
- unsigned int Height,
- int *ColorMapSize,
- GifByteType * RedInput,
-@@ -428,7 +428,7 @@ int main(int argc, char **argv)
- sizeof(GifByteType))) == NULL)
- GIF_EXIT("Failed to allocate memory required, aborted.");
++
++/* end */
+diff --git a/util/rgb2gif.c b/util/rgb2gif.c
+index 56386c7..46d9654 100644
+--- a/util/rgb2gif.c
++++ b/util/rgb2gif.c
+@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer,
+ static void QuitGifError(GifFileType *GifFile);
-- if (QuantizeBuffer(Width, Height, &ColorMapSize,
-+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize,
- RedBuffer, GreenBuffer, BlueBuffer,
- OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
- QuitGifError(NULL);
+ /******************************************************************************
+- * Code to quantize high resolution image into lower one. You may want to
+- * peek into the following article this code is based on:
+- * "Color Image Quantization for frame buffer Display", by Paul Heckbert
+- * SIGGRAPH 1982 page 297-307.
+- ******************************************************************************
+- * History:
+- * 5 Jan 90 - Version 1.0 by Gershon Elber.
+- *****************************************************************************/
+-
+-#define ABS(x) ((x) > 0 ? (x) : (-(x)))
+-
+-#define COLOR_ARRAY_SIZE 32768
+-#define BITS_PER_PRIM_COLOR 5
+-#define MAX_PRIM_COLOR 0x1f
+-
+-static int SortRGBAxis;
+-
+-typedef struct QuantizedColorType {
+- GifByteType RGB[3];
+- GifByteType NewColorIndex;
+- long Count;
+- struct QuantizedColorType *Pnext;
+-} QuantizedColorType;
+-
+-typedef struct NewColorMapType {
+- GifByteType RGBMin[3], RGBWidth[3];
+- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
+- unsigned long Count; /* Total number of pixels in all the entries */
+- QuantizedColorType *QuantizedColors;
+-} NewColorMapType;
+-
+-static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
+- unsigned int ColorMapSize,
+- unsigned int *NewColorMapSize);
+-static int SortCmpRtn(const void *Entry1, const void *Entry2);
+-
+-/******************************************************************************
+- * Quantize high resolution image into lower one. Input image consists of a
+- * 2D array for each of the RGB colors with size Width by Height. There is no
+- * Color map for the input. Output is a quantized image with 2D array of
+- * indexes into the output color map.
+- * Note input image can be 24 bits at the most (8 for red/green/blue) and
+- * the output has 256 colors at the most (256 entries in the color map.).
+- * ColorMapSize specifies size of color map up to 256 and will be updated to
+- * real size before returning.
+- * Also non of the parameter are allocated by this routine.
+- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
+- ******************************************************************************/
+-static int
+-QuantizeBuffer(unsigned int Width,
+- unsigned int Height,
+- int *ColorMapSize,
+- GifByteType * RedInput,
+- GifByteType * GreenInput,
+- GifByteType * BlueInput,
+- GifByteType * OutputBuffer,
+- GifColorType * OutputColorMap) {
+-
+- unsigned int Index, NumOfEntries;
+- int i, j, MaxRGBError[3];
+- unsigned int NewColorMapSize;
+- long Red, Green, Blue;
+- NewColorMapType NewColorSubdiv[256];
+- QuantizedColorType *ColorArrayEntries, *QuantizedColor;
+-
+- ColorArrayEntries = (QuantizedColorType *)malloc(
+- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
+- if (ColorArrayEntries == NULL) {
+- return GIF_ERROR;
+- }
+-
+- for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
+- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
+- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
+- MAX_PRIM_COLOR;
+- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
+- ColorArrayEntries[i].Count = 0;
+- }
+-
+- /* Sample the colors and their distribution: */
+- for (i = 0; i < (int)(Width * Height); i++) {
+- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- (2 * BITS_PER_PRIM_COLOR)) +
+- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- BITS_PER_PRIM_COLOR) +
+- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+- ColorArrayEntries[Index].Count++;
+- }
+-
+- /* Put all the colors in the first entry of the color map, and call the
+- * recursive subdivision process. */
+- for (i = 0; i < 256; i++) {
+- NewColorSubdiv[i].QuantizedColors = NULL;
+- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
+- for (j = 0; j < 3; j++) {
+- NewColorSubdiv[i].RGBMin[j] = 0;
+- NewColorSubdiv[i].RGBWidth[j] = 255;
+- }
+- }
+-
+- /* Find the non empty entries in the color table and chain them: */
+- for (i = 0; i < COLOR_ARRAY_SIZE; i++)
+- if (ColorArrayEntries[i].Count > 0)
+- break;
+- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
+- NumOfEntries = 1;
+- while (++i < COLOR_ARRAY_SIZE)
+- if (ColorArrayEntries[i].Count > 0) {
+- QuantizedColor->Pnext = &ColorArrayEntries[i];
+- QuantizedColor = &ColorArrayEntries[i];
+- NumOfEntries++;
+- }
+- QuantizedColor->Pnext = NULL;
+-
+- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
+- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
+- NewColorMapSize = 1;
+- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
+- GIF_OK) {
+- free((char *)ColorArrayEntries);
+- return GIF_ERROR;
+- }
+- if (NewColorMapSize < *ColorMapSize) {
+- /* And clear rest of color map: */
+- for (i = NewColorMapSize; i < *ColorMapSize; i++)
+- OutputColorMap[i].Red = OutputColorMap[i].Green =
+- OutputColorMap[i].Blue = 0;
+- }
+-
+- /* Average the colors in each entry to be the color to be used in the
+- * output color map, and plug it into the output color map itself. */
+- for (i = 0; i < NewColorMapSize; i++) {
+- if ((j = NewColorSubdiv[i].NumEntries) > 0) {
+- QuantizedColor = NewColorSubdiv[i].QuantizedColors;
+- Red = Green = Blue = 0;
+- while (QuantizedColor) {
+- QuantizedColor->NewColorIndex = i;
+- Red += QuantizedColor->RGB[0];
+- Green += QuantizedColor->RGB[1];
+- Blue += QuantizedColor->RGB[2];
+- QuantizedColor = QuantizedColor->Pnext;
+- }
+- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
+- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
+- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
+- } else
+- fprintf(stderr,
+- "\n%s: Null entry in quantized color map - that's weird.\n",
+- PROGRAM_NAME);
+- }
+-
+- /* Finally scan the input buffer again and put the mapped index in the
+- * output buffer. */
+- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
+- for (i = 0; i < (int)(Width * Height); i++) {
+- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- (2 * BITS_PER_PRIM_COLOR)) +
+- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- BITS_PER_PRIM_COLOR) +
+- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+- Index = ColorArrayEntries[Index].NewColorIndex;
+- OutputBuffer[i] = Index;
+- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
+- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
+- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
+- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
+- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
+- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
+- }
+-
+-#ifdef DEBUG
+- fprintf(stderr,
+- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
+- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
+-#endif /* DEBUG */
+-
+- free((char *)ColorArrayEntries);
+-
+- *ColorMapSize = NewColorMapSize;
+-
+- return GIF_OK;
+-}
+-
+-/******************************************************************************
+- * Routine to subdivide the RGB space recursively using median cut in each
+- * axes alternatingly until ColorMapSize different cubes exists.
+- * The biggest cube in one dimension is subdivide unless it has only one entry.
+- * Returns GIF_ERROR if failed, otherwise GIF_OK.
+- ******************************************************************************/
+-static int
+-SubdivColorMap(NewColorMapType * NewColorSubdiv,
+- unsigned int ColorMapSize,
+- unsigned int *NewColorMapSize) {
+-
+- int MaxSize;
+- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
+- long Sum, Count;
+- QuantizedColorType *QuantizedColor, **SortArray;
+-
+- while (ColorMapSize > *NewColorMapSize) {
+- /* Find candidate for subdivision: */
+- MaxSize = -1;
+- for (i = 0; i < *NewColorMapSize; i++) {
+- for (j = 0; j < 3; j++) {
+- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
+- (NewColorSubdiv[i].NumEntries > 1)) {
+- MaxSize = NewColorSubdiv[i].RGBWidth[j];
+- Index = i;
+- SortRGBAxis = j;
+- }
+- }
+- }
+-
+- if (MaxSize == -1)
+- return GIF_OK;
+-
+- /* Split the entry Index into two along the axis SortRGBAxis: */
+-
+- /* Sort all elements in that entry along the given axis and split at
+- * the median. */
+- SortArray = (QuantizedColorType **)malloc(
+- sizeof(QuantizedColorType *) *
+- NewColorSubdiv[Index].NumEntries);
+- if (SortArray == NULL)
+- return GIF_ERROR;
+- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
+- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
+- j++, QuantizedColor = QuantizedColor->Pnext)
+- SortArray[j] = QuantizedColor;
+-
+- qsort(SortArray, NewColorSubdiv[Index].NumEntries,
+- sizeof(QuantizedColorType *), SortCmpRtn);
+-
+- /* Relink the sorted list into one: */
+- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
+- SortArray[j]->Pnext = SortArray[j + 1];
+- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
+- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
+- free((char *)SortArray);
+-
+- /* Now simply add the Counts until we have half of the Count: */
+- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
+- NumEntries = 1;
+- Count = QuantizedColor->Count;
+- while (QuantizedColor->Pnext != NULL &&
+- (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
+- QuantizedColor->Pnext->Pnext != NULL) {
+- QuantizedColor = QuantizedColor->Pnext;
+- NumEntries++;
+- Count += QuantizedColor->Count;
+- }
+- /* Save the values of the last color of the first half, and first
+- * of the second half so we can update the Bounding Boxes later.
+- * Also as the colors are quantized and the BBoxes are full 0..255,
+- * they need to be rescaled.
+- */
+- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
+- /* coverity[var_deref_op] */
+- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
+- MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
+- MinColor <<= (8 - BITS_PER_PRIM_COLOR);
+-
+- /* Partition right here: */
+- NewColorSubdiv[*NewColorMapSize].QuantizedColors =
+- QuantizedColor->Pnext;
+- QuantizedColor->Pnext = NULL;
+- NewColorSubdiv[*NewColorMapSize].Count = Count;
+- NewColorSubdiv[Index].Count -= Count;
+- NewColorSubdiv[*NewColorMapSize].NumEntries =
+- NewColorSubdiv[Index].NumEntries - NumEntries;
+- NewColorSubdiv[Index].NumEntries = NumEntries;
+- for (j = 0; j < 3; j++) {
+- NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
+- NewColorSubdiv[Index].RGBMin[j];
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
+- NewColorSubdiv[Index].RGBWidth[j];
+- }
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
+- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
+- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
+-
+- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
+- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
+-
+- (*NewColorMapSize)++;
+- }
+-
+- return GIF_OK;
+-}
+-
+-/****************************************************************************
+- * Routine called by qsort to compare two entries.
+- ****************************************************************************/
+-static int
+-SortCmpRtn(const void *Entry1,
+- const void *Entry2) {
+-
+- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
+- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
+-}
+-/******************************************************************************
+ * Interpret the command line and scan the given GIF file.
+ ******************************************************************************/
+ int main(int argc, char **argv)
+--
+1.8.3.2
+
diff --git a/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch b/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch
deleted file mode 100644
index 8a3f69bdb..000000000
--- a/extra/gnome-shell/0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ace549c1bf1861b4cbaec6f2451a6341aa738bae Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Mon, 24 Jun 2013 18:09:04 +0200
-Subject: [PATCH] st: Be more forgiving when calling get_theme_node() on
- unstaged widgets
-
-While it is obviously still an error to call get_theme_node() on a
-widget that hasn't been added to the stage hierarchy yet, asserting
-on it hasn't proven too successful in avoiding those errors - it's
-likely the most frequent reason for crash reports. Just accept that
-there'll always be code paths where we can hit this case and make
-it non-fatal.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=610279
----
- src/st/st-widget.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-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)
---
-1.8.3.1
-
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 930763625..128c3facb 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188954 2013-06-27 04:03:27Z heftig $
+# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
pkgver=3.8.3
-pkgrel=2
+pkgrel=3
pkgdesc="The next generation GNOME Shell"
arch=(i686 x86_64)
url="http://live.gnome.org/GnomeShell"
@@ -20,10 +20,10 @@ install=gnome-shell.install
groups=(gnome)
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
nm-libexecdir.patch
- 0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.patch)
+ git-fixes.patch)
sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22'
'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
- 'c5f0c9b071d5c31e11289c45743e1f82f6bba8201a28e0efb7a197f57cbb2105')
+ '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c')
prepare() {
cd $pkgname-$pkgver
@@ -31,8 +31,8 @@ prepare() {
# FS#30747 FS#32730 Problems due to libexecdir different from NM
patch -Np1 -i ../nm-libexecdir.patch
- # FS#35174 Nautilus crashes GS
- patch -Np1 -i ../0001-st-Be-more-forgiving-when-calling-get_theme_node-on-.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
new file mode 100644
index 000000000..989c881f0
--- /dev/null
+++ b/extra/gnome-shell/git-fixes.patch
@@ -0,0 +1,125 @@
+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/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index c21ec1994..f23a19e33 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166698 2012-09-15 23:58:57Z eric $
+# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=lcms2
-pkgver=2.4
+pkgver=2.5
pkgrel=1
pkgdesc="Small-footprint color management engine, version 2"
arch=('i686' 'x86_64')
@@ -12,21 +12,21 @@ depends=('libtiff')
url="http://www.littlecms.com"
options=('!libtool')
source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('9944902864283af49e4e21a1ca456db4e04ea7c2')
+sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index c32bc93e5..1e1a449e0 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -3,13 +3,14 @@
pkgname=libsecret
pkgver=0.15
-pkgrel=1
+pkgrel=2
pkgdesc='library for storing and retrieving passwords and other secrets.'
arch=('i686' 'x86_64')
license=('LGPL')
url="https://live.gnome.org/Libsecret"
depends=('glib2' 'libgcrypt')
makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets')
options=('!libtool')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8')
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 34acb3e07..2c6bb39c0 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $
+# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=openmpi
-pkgver=1.6.4
-pkgrel=2
+pkgver=1.6.5
+pkgrel=1
pkgdesc="High performance message passing library (MPI)"
arch=('i686' 'x86_64')
url="http://www.open-mpi.org"
license=('custom')
depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
makedepends=('inetutils')
-options=(!libtool)
+options=('!libtool')
source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10')
+sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
# Make sure we use the system ltdl librariry rather than the ones in the tarball
rm -r opal/libltdl
@@ -40,7 +40,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
# FS#28583
@@ -52,8 +52,9 @@ package() {
# Openmpi's otfinfo conflicts with the one from texlive
mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
- # Remove dangling symlink
+ # Remove dangling symlink and useless file
rm "${pkgdir}"/usr/share/man/man1/orteCC.1
+ rm "${pkgdir}"/usr/share/vampirtrace/config.log
install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d
echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch
deleted file mode 100644
index 5b65557c1..000000000
--- a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001
-From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org>
-Date: Mon, 6 Aug 2012 17:42:14 -0400
-Subject: [PATCH] Fix compilation under threaded bleadperl
-
- Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 >
-
-CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.)
----
- tkGlue.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/tkGlue.c b/tkGlue.c
-index 1b7c025..9079302 100644
---- a/tkGlue.c
-+++ b/tkGlue.c
-@@ -4154,11 +4154,7 @@ int type;
- SV *x = NULL;
- int prefix = '?';
- name = SvPV(sv,na);
--#ifdef USE_ITHREADS
-- CopSTASHPV(PL_curcop) = NULL;
--#else
-- CopSTASH(PL_curcop) = NULL;
--#endif
-+ CopSTASH_set(PL_curcop, NULL);
- switch (type)
- {
- case TK_CONFIG_SCALARVAR:
---
-1.8.2.3
-
diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
deleted file mode 100644
index 95067501f..000000000
--- a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <slaven@rezic.de>
-Date: Sat, 23 Mar 2013 14:00:58 +0100
-Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an
- expression
-
----
- IO/IO.xs | 6 +-----
- tkGlue.c | 5 +----
- 2 files changed, 2 insertions(+), 9 deletions(-)
-
-diff --git a/IO/IO.xs b/IO/IO.xs
-index 8ae2a57..42f7515 100644
---- a/IO/IO.xs
-+++ b/IO/IO.xs
-@@ -207,11 +207,7 @@ int offset
- info.count = 0;
- info.error = 0;
- info.eof = 0;
-- if (!SvUPGRADE(buf, SVt_PV))
-- {
-- RETVAL = &PL_sv_undef;
-- return;
-- }
-+ (void)SvUPGRADE(buf, SVt_PV);
- SvPOK_only(buf); /* validate pointer */
- Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info);
- do
-diff --git a/tkGlue.c b/tkGlue.c
-index dd3d283..cdc53ad 100644
---- a/tkGlue.c
-+++ b/tkGlue.c
-@@ -3830,10 +3830,7 @@ ClientData clientData;
- return EXPIRE((interp, "Cannot trace readonly variable"));
- }
- }
-- if (!SvUPGRADE(sv, SVt_PVMG))
-- {
-- return EXPIRE((interp, "Trace SvUPGRADE failed"));
-- }
-+ (void)SvUPGRADE(sv, SVt_PVMG);
-
- if (SvTYPE(sv) == SVt_PVAV)
- {
---
-1.8.2.3
-
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 0e04e7f76..f0c9f15a5 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -1,51 +1,36 @@
-# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $
+# $Id: PKGBUILD 189257 2013-07-01 18:23:51Z eric $
# Maintainer:
# Contributor: François Charette <francois ατ archlinux δοτ org>
# Contributor: Jason Chu <jchu@xentac.net>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=perl-tk
-_cpanname=Tk
-pkgver=804.030
-pkgrel=5
+pkgver=804.031
+pkgrel=1
pkgdesc="A graphical user interface toolkit for Perl"
arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
+url="http://search.cpan.org/dist/Tk"
license=('PerlArtistic' 'GPL' 'custom')
depends=('libpng' 'libjpeg' 'tk' 'perl')
options=('!emptydirs')
replaces=('perltk')
provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz
- 0001-Fix-compilation-under-threaded-bleadperl.patch
- 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch)
-md5sums=('13275e85f99ee467a86d9598a437abff'
- '361c34978746310e5c31b7a47c016b22'
- '46448cdac9d7159f15f2d4b2719d171b')
-
-prepare() {
- cd "$srcdir/${_cpanname}-$pkgver"
-
- # https://rt.cpan.org/Public/Bug/Display.html?id=78824
- patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch"
-
- # https://rt.cpan.org/Public/Bug/Display.html?id=82677
- patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch"
-}
+source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz)
+md5sums=('57a8afd0563184c17a6470d1ee957f35')
build() {
- cd "$srcdir/${_cpanname}-$pkgver"
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ cd Tk-$pkgver
+ perl Makefile.PL INSTALLDIRS=vendor
make
}
#check() {
-# cd "$srcdir/${_cpanname}-$pkgver"
+# cd Tk-$pkgver
# make test
#}
package() {
- cd "$srcdir/${_cpanname}-$pkgver"
+ cd Tk-$pkgver
make install DESTDIR="$pkgdir"
# license
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 6d869c448..dc774e99d 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $
+# $Id: PKGBUILD 189254 2013-07-01 16:34:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=soprano
pkgver=2.9.2
-pkgrel=1
+pkgrel=2
pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
arch=('i686' 'x86_64')
url='http://soprano.sourceforge.net/'
license=('GPL' 'LGPL')
-depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
+depends=('qt4' 'libiodbc' 'virtuoso-base' 'redland')
makedepends=('cmake' 'java-environment' 'doxygen')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('60ce910cf3c8e4655c614b45d73f2b2a')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
# we need the rpath
cmake ../${pkgname}-${pkgver} \
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index a4ec0be5e..1d51ed253 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 181132 2013-03-31 23:20:08Z bisson $
+# $Id: PKGBUILD 189234 2013-07-01 01:03:08Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=uim
-pkgver=1.8.5
+pkgver=1.8.6
pkgrel=1
pkgdesc='Multilingual input method library'
url='http://code.google.com/p/uim/'
@@ -16,8 +16,8 @@ optdepends=('qt4: immodule and helper applications'
'gtk3: immodules and helper applications'
'gnome-panel: gnome applet indicator')
options=('!libtool')
-source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('13178e0ad9e9196e3fdb0bb9806e4add8fe3a8e5')
+source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d')
install=install
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index c864253f4..0bb678eb6 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 188929 2013-06-25 17:07:01Z andyrtr $
+# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
pkgver=1.14.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -19,38 +19,44 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
autoconfig-sis.patch
xserver-1.6.0-less-acpi-brokenness.patch
bug59825.patch
+ xephyr-glx.patch
xvfb-run
xvfb-run.1
10-quirks.conf
- git-fixes.patch)
+ fb-rename-wfbDestroyGlyphCache.patch)
sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
'26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
+ 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
+prepare() {
+ cd "${pkgbase}-${pkgver}"
# Use nouveau/nv/nvidia drivers for nvidia devices
- patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
+ patch -Np1 -i ../autoconfig-nvidia.patch
# Use unofficial imedia SiS driver for supported SiS devices
- patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
+ patch -Np0 -i ../autoconfig-sis.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo
- patch -Np1 -i "${srcdir}/bug59825.patch"
+ patch -Np1 -i ../bug59825.patch
# From Fedora. Do not build acpid code, it is buggy and we do not need it
- patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
+ patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
- # post release git fixes
- patch -Np1 -i "${srcdir}/git-fixes.patch"
+ # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346
+ patch -Np0 -i ../xephyr-glx.patch
+ # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219
+ patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch
+}
+build() {
+ cd "${pkgbase}-${pkgver}"
autoreconf -fi
./configure --prefix=/usr \
--enable-ipv6 \
@@ -93,7 +99,7 @@ package_xorg-server-common() {
pkgdesc="Xorg server common files"
depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
@@ -115,7 +121,7 @@ package_xorg-server() {
groups=('xorg')
conflicts=('nvidia-utils<=290.10')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc/X11"
@@ -145,7 +151,7 @@ package_xorg-server-xephyr() {
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
+ cd "${pkgbase}-${pkgver}/hw/kdrive"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
@@ -154,9 +160,9 @@ package_xorg-server-xephyr() {
package_xorg-server-xvfb() {
pkgdesc="Virtual framebuffer X server"
- depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common)
+ depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
+ cd "${pkgbase}-${pkgver}/hw/vfb"
make DESTDIR="${pkgdir}" install
install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
@@ -170,7 +176,7 @@ package_xorg-server-xnest() {
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
+ cd "${pkgbase}-${pkgver}/hw/xnest"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
@@ -181,7 +187,7 @@ package_xorg-server-xdmx() {
pkgdesc="Distributed Multihead X Server and utilities"
depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
+ cd "${pkgbase}-${pkgver}/hw/dmx"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
@@ -199,7 +205,7 @@ package_xorg-server-devel() {
# not technically required but almost every Xorg pkg needs it to build
xorg-util-macros)
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/usr/bin"
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch
index 177f908ef..177f908ef 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch
diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch
new file mode 100644
index 000000000..3011e2497
--- /dev/null
+++ b/extra/xorg-server/xephyr-glx.patch
@@ -0,0 +1,39 @@
+--- hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100
++++ hw/kdrive/ephyr/ephyrinit.c.new 2013-03-14 19:07:33.024335444 +0100
+@@ -28,6 +28,7 @@
+ #endif
+ #include "ephyr.h"
+ #include "ephyrlog.h"
++#include "glx_extinit.h"
+
+ extern Window EphyrPreExistingHostWin;
+ extern Bool EphyrWantGrayScale;
+@@ -53,9 +54,28 @@
+ KdCardInfoAdd(&ephyrFuncs, 0);
+ }
+
++static const ExtensionModule ephyrExtensions[] = {
++#ifdef GLXEXT
++ { GlxExtensionInit, "GLX", &noGlxExtension },
++#endif
++};
++
++static
++void ephyrExtensionInit(void)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++)
++ LoadExtension(&ephyrExtensions[i], TRUE);
++}
++
++
+ void
+ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
+ {
++ if (serverGeneration == 1)
++ ephyrExtensionInit();
++
+ KdInitOutput(pScreenInfo, argc, argv);
+ }
+