[arch-commits] Commit in epiphany/trunk (3 files)
Date: Thursday, February 17, 2011 @ 03:41:43
Author: jgc
Revision: 110168
Update to 2.91.6
Remove introspection patch
Remove old gconf schemas if they exist. We do not depend on gconf because we
assume that it is present when an older version is installed.
Modified:
epiphany/trunk/PKGBUILD
epiphany/trunk/epiphany.install
Deleted:
epiphany/trunk/fix-introspection.patch
-+
PKGBUILD| 22 +++---
epiphany.install| 17 ++---
fix-introspection.patch | 21 -
3 files changed, 13 insertions(+), 47 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 07:12:43 UTC (rev 110167)
+++ PKGBUILD2011-02-17 08:41:43 UTC (rev 110168)
@@ -2,34 +2,26 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=epiphany
-pkgver=2.30.6
-pkgrel=2
+pkgver=2.91.6
+pkgrel=1
install=epiphany.install
pkgdesc=A GNOME2 web browser based on the WebKit rendering engine.
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libwebkit=1.2.4' 'iso-codes=3.10.1' 'desktop-file-utils'
'libxslt=1.1.24' 'libnotify=0.4.5' 'avahi=0.6.27' 'libsoup-gnome=2.32.0'
'nss=3.12.8' 'ca-certificates' 'gconf=2.32.0' 'gobject-introspection=0.9.8')
-makedepends=('gnome-doc-utils=0.20.1' 'pkgconfig' 'networkmanager' 'intltool'
'startup-notification' 'gnome-common')
+depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss'
'iso-codes' 'dconf' 'gobject-introspection')
+makedepends=('intltool' 'networkmanager' 'gnome-doc-utils'
'startup-notification')
options=('!libtool' '!emptydirs')
groups=('gnome')
url=http://www.gnome.org/projects/epiphany/;
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-fix-introspection.patch)
-sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc'
-'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('478b6afa8c8d7700de6bb1c70f0eb9c0a23035551670306cd2884f2feae25ada')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/fix-introspection.patch
- autoreconf
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
--disable-scrollkeeper \
--enable-network-manager
make
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-
- install -m755 -d ${pkgdir}/usr/share/gconf/schemas
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas
--domain epiphany ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+ make DESTDIR=${pkgdir} install
}
Modified: epiphany.install
===
--- epiphany.install2011-02-17 07:12:43 UTC (rev 110167)
+++ epiphany.install2011-02-17 08:41:43 UTC (rev 110168)
@@ -1,25 +1,20 @@
-pkgname=epiphany
-
post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
+ glib-compile-schemas usr/share/glib-2.0/schemas
update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
pre_upgrade() {
- pre_remove $1
+ if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
+usr/sbin/gconfpkg --uninstall epiphany
+ fi
}
post_upgrade() {
- post_install $1
+ post_install
}
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ post_install
}
Deleted: fix-introspection.patch
===
--- fix-introspection.patch 2011-02-17 07:12:43 UTC (rev 110167)
+++ fix-introspection.patch 2011-02-17 08:41:43 UTC (rev 110168)
@@ -1,21 +0,0 @@
-From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001
-From: Vincent Untz vu...@gnome.org
-Date: Fri, 01 Oct 2010 16:36:23 +
-Subject: introspection: Fix build by telling g-ir-scanner what the prefix is
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631119
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9d3715..acbf8ff 100644
a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir:
$(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
- --include=WebKit-1.0 \
- --program=./epiphany \
- --output $@ \
-+ --strip-prefix=Ephy \
- --pkg epiphany-$(EPIPHANY_API_VERSION) \
- -DEPIPHANY_COMPILATION \
- -I$(top_srcdir)/embed \
---
-cgit v0.8.3.1
[arch-commits] Commit in epiphany/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 03:42:26 Author: jgc Revision: 110169 archrelease: copy trunk to gnome-unstable-x86_64 Added: epiphany/repos/gnome-unstable-x86_64/
[arch-commits] Commit in epiphany/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 03:42:43 Author: jgc Revision: 110170 archrelease: copy trunk to gnome-unstable-i686 Added: epiphany/repos/gnome-unstable-i686/
[arch-commits] Commit in dvdrip/trunk (PKGBUILD)
Date: Thursday, February 17, 2011 @ 03:54:21
Author: giovanni
Revision: 110171
upgpkg: dvdrip 0.98.11-6
Fixed FS22876
Modified:
dvdrip/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 08:42:43 UTC (rev 110170)
+++ PKGBUILD2011-02-17 08:54:21 UTC (rev 110171)
@@ -4,7 +4,7 @@
pkgname=dvdrip
pkgver=0.98.11
-pkgrel=5
+pkgrel=6
pkgdesc=A Gtk frontend for transcode writen in Perl
arch=('i686' 'x86_64')
license=('custom')
@@ -12,7 +12,8 @@
install=${pkgname}.install
depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow')
-optdepends=('ogmtools: for ogm/odd video creation')
+optdepends=('ogmtools: for ogm/odd video creation'
+'lsdvd: fast reading of DVD table')
source=(http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz \
${pkgname}.desktop)
options=(!emptydirs)
[arch-commits] Commit in dvdrip/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 03:54:29 Author: giovanni Revision: 110172 archrelease: remove extra-i686 Deleted: dvdrip/repos/extra-i686/
[arch-commits] Commit in dvdrip/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 03:54:41 Author: giovanni Revision: 110173 archrelease: copy trunk to extra-i686 Added: dvdrip/repos/extra-i686/
[arch-commits] Commit in dvdrip/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 03:54:47 Author: giovanni Revision: 110174 archrelease: remove extra-x86_64 Deleted: dvdrip/repos/extra-x86_64/
[arch-commits] Commit in dvdrip/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 03:55:05 Author: giovanni Revision: 110175 archrelease: copy trunk to extra-x86_64 Added: dvdrip/repos/extra-x86_64/
[arch-commits] Commit in glibc/repos (core-i686)
Date: Thursday, February 17, 2011 @ 07:10:54 Author: allan Revision: 110176 db-move: glibc removed by allan for move to [core] (i686) Deleted: glibc/repos/core-i686/
[arch-commits] Commit in glibc/repos (core-i686 testing-i686)
Date: Thursday, February 17, 2011 @ 07:10:55 Author: allan Revision: 110177 db-move: moved glibc from [testing] to [core] (i686) Added: glibc/repos/core-i686/ Deleted: glibc/repos/testing-i686/
[arch-commits] Commit in glibc/repos (core-x86_64)
Date: Thursday, February 17, 2011 @ 07:10:55 Author: allan Revision: 110178 db-move: glibc removed by allan for move to [core] (x86_64) Deleted: glibc/repos/core-x86_64/
[arch-commits] Commit in glibc/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 17, 2011 @ 07:10:56 Author: allan Revision: 110179 db-move: moved glibc from [testing] to [core] (x86_64) Added: glibc/repos/core-x86_64/ Deleted: glibc/repos/testing-x86_64/
[arch-commits] Commit in binutils/repos (core-i686)
Date: Thursday, February 17, 2011 @ 07:10:58 Author: allan Revision: 110180 db-move: binutils removed by allan for move to [core] (i686) Deleted: binutils/repos/core-i686/
[arch-commits] Commit in binutils/repos (core-i686 testing-i686)
Date: Thursday, February 17, 2011 @ 07:11:01 Author: allan Revision: 110181 db-move: moved binutils from [testing] to [core] (i686) Added: binutils/repos/core-i686/ Deleted: binutils/repos/testing-i686/
[arch-commits] Commit in binutils/repos (core-x86_64)
Date: Thursday, February 17, 2011 @ 07:11:02 Author: allan Revision: 110182 db-move: binutils removed by allan for move to [core] (x86_64) Deleted: binutils/repos/core-x86_64/
[arch-commits] Commit in binutils/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 17, 2011 @ 07:11:03 Author: allan Revision: 110183 db-move: moved binutils from [testing] to [core] (x86_64) Added: binutils/repos/core-x86_64/ Deleted: binutils/repos/testing-x86_64/
[arch-commits] Commit in valgrind/trunk (3 files)
Date: Thursday, February 17, 2011 @ 07:26:47
Author: allan
Revision: 110184
upgpkg: valgrind 3.6.1-1
upstream update, remove patches applied upstream
Modified:
valgrind/trunk/PKGBUILD
Deleted:
valgrind/trunk/glibc-2.13-strcasecmp.patch
valgrind/trunk/glibc-2.13.patch
-+
PKGBUILD| 20 +
glibc-2.13-strcasecmp.patch | 151 --
glibc-2.13.patch| 33 -
3 files changed, 5 insertions(+), 199 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 12:11:03 UTC (rev 110183)
+++ PKGBUILD2011-02-17 12:26:47 UTC (rev 110184)
@@ -3,8 +3,8 @@
# Maintainer: Allan McRae al...@archlinux.org
pkgname=valgrind
-pkgver=3.6.0
-pkgrel=3
+pkgver=3.6.1
+pkgrel=1
pkgdesc=A tool to help find memory-management problems in programs
arch=('i686' 'x86_64')
license=('GPL')
@@ -13,13 +13,9 @@
makedepends=('gdb')
options=('!emptydirs')
source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-glibc-patch-version.patch
- glibc-2.13.patch
- glibc-2.13-strcasecmp.patch)
-md5sums=('b289c5f4ab8e39741602445f1dd09b34'
- 'b657f0ebdde3d9aefc9fd16f9e653702'
- '3706469d3b712f420e161a5ba1143d02'
- 'd593be202296116653c792556ab6db73')
+glibc-patch-version.patch)
+md5sums=('2c3aa122498baecc9d69194057ca88f5'
+ 'b657f0ebdde3d9aefc9fd16f9e653702')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,12 +26,6 @@
# prevent need to rebuild with glibc patch level version bumps
patch -Np1 -i ${srcdir}/glibc-patch-version.patch
- # glibc-2.13 compatibility
- patch -Np1 -i ${srcdir}/glibc-2.13.patch
-
- # http://bugs.kde.org/show_bug.cgi?id=256600
- patch -Np0 -i ${srcdir}/glibc-2.13-strcasecmp.patch
-
if [ ${CARCH} = x86_64 ]; then
./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
else
Deleted: glibc-2.13-strcasecmp.patch
===
--- glibc-2.13-strcasecmp.patch 2011-02-17 12:11:03 UTC (rev 110183)
+++ glibc-2.13-strcasecmp.patch 2011-02-17 12:26:47 UTC (rev 110184)
@@ -1,151 +0,0 @@
-Index: memcheck/mc_replace_strmem.c
-===
memcheck/mc_replace_strmem.c (revision 11477)
-+++ memcheck/mc_replace_strmem.c (revision 11478)
-@@ -35,10 +35,13 @@
- #include pub_tool_redir.h
- #include pub_tool_tooliface.h
- #include valgrind.h
-+#include config.h
-
- #include mc_include.h
- #include memcheck.h
-
-+#include ctype.h
-+
- /* -
-We have our own versions of these functions for two reasons:
-(a) it allows us to do overlap checking
-@@ -403,6 +406,120 @@
- #endif
-
-
-+#define STRCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2 ) \
-+ { \
-+ register unsigned char c1; \
-+ register unsigned char c2; \
-+ while (True) { \
-+ c1 = tolower(*(unsigned char *)s1); \
-+ c2 = tolower(*(unsigned char *)s2); \
-+ if (c1 != c2) break; \
-+ if (c1 == 0) break; \
-+ s1++; s2++; \
-+ } \
-+ if ((unsigned char)c1 (unsigned char)c2) return -1; \
-+ if ((unsigned char)c1 (unsigned char)c2) return 1; \
-+ return 0; \
-+ }
-+
-+STRCASECMP(VG_Z_LIBC_SONAME, strcasecmp)
-+#if defined(VGO_linux)
-+STRCASECMP(VG_Z_LIBC_SONAME, __GI_strcasecmp)
-+#endif
-+
-+
-+#define STRNCASECMP(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, SizeT nmax ) \
-+ { \
-+ SizeT n = 0; \
-+ while (True) { \
-+ if (n = nmax) return 0; \
-+ if (*s1 == 0 *s2 == 0) return 0; \
-+ if (*s1 == 0) return -1; \
-+ if (*s2 == 0) return 1; \
-+ \
-+ if (tolower(*(unsigned char*)s1) tolower(*(unsigned char*)s2))
return -1; \
-+ if (tolower(*(unsigned char*)s1) tolower(*(unsigned char*)s2))
return 1; \
-+ \
-+ s1++; s2++; n++; \
-+ } \
-+ }
-+
-+STRNCASECMP(VG_Z_LIBC_SONAME, strncasecmp)
-+#if defined(VGO_linux)
-+STRNCASECMP(VG_Z_LIBC_SONAME, __GI_strncasecmp)
-+#elif defined(VGO_darwin)
-+STRNCASECMP(VG_Z_DYLD,strncasecmp)
-+#endif
-+
-+
-+#ifdef HAVE_TOLOWER_L
-+
-+
-+#define STRCASECMP_L(soname, fnname) \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ); \
-+ int VG_REPLACE_FUNCTION_ZU(soname,fnname) \
-+ ( const char* s1, const char* s2, locale_t locale ) \
-+ {
[arch-commits] Commit in valgrind/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 07:28:05 Author: allan Revision: 110185 archrelease: remove extra-i686 Deleted: valgrind/repos/extra-i686/
[arch-commits] Commit in valgrind/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 07:28:42 Author: allan Revision: 110186 archrelease: copy trunk to extra-i686 Added: valgrind/repos/extra-i686/
[arch-commits] Commit in valgrind/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 07:29:43 Author: allan Revision: 110187 archrelease: remove extra-x86_64 Deleted: valgrind/repos/extra-x86_64/
[arch-commits] Commit in valgrind/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 07:30:19 Author: allan Revision: 110188 archrelease: copy trunk to extra-x86_64 Added: valgrind/repos/extra-x86_64/
[arch-commits] Commit in opencv/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 09:02:52 Author: schiv Revision: 110189 db-move: opencv removed by schiv for move to [extra] (i686) Deleted: opencv/repos/extra-i686/
[arch-commits] Commit in opencv/repos (extra-i686 testing-i686)
Date: Thursday, February 17, 2011 @ 09:02:52 Author: schiv Revision: 110190 db-move: moved opencv from [testing] to [extra] (i686) Added: opencv/repos/extra-i686/ Deleted: opencv/repos/testing-i686/
[arch-commits] Commit in opencv/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 09:02:53 Author: schiv Revision: 110191 db-move: opencv removed by schiv for move to [extra] (x86_64) Deleted: opencv/repos/extra-x86_64/
[arch-commits] Commit in opencv/repos (extra-x86_64 testing-x86_64)
Date: Thursday, February 17, 2011 @ 09:02:54 Author: schiv Revision: 110192 db-move: moved opencv from [testing] to [extra] (x86_64) Added: opencv/repos/extra-x86_64/ Deleted: opencv/repos/testing-x86_64/
[arch-commits] Commit in libdrm/trunk (PKGBUILD intel-git-fixes.patch)
Date: Thursday, February 17, 2011 @ 09:28:04
Author: jgc
Revision: 110193
Add some upstream git fixes. Should fix issues with 2.6.34 kernels
Added:
libdrm/trunk/intel-git-fixes.patch
Modified:
libdrm/trunk/PKGBUILD
---+
PKGBUILD | 15 ++---
intel-git-fixes.patch | 144
2 files changed, 152 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 14:02:54 UTC (rev 110192)
+++ PKGBUILD2011-02-17 14:28:04 UTC (rev 110193)
@@ -3,7 +3,7 @@
pkgname=libdrm
pkgver=2.4.23
-pkgrel=1
+pkgrel=2
pkgdesc=Userspace interface to kernel DRM services
arch=(i686 x86_64)
license=('custom')
@@ -12,19 +12,20 @@
url=http://dri.freedesktop.org/;
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
+ intel-git-fixes.patch
COPYING)
-md5sums=('7577ff36ec364d88fae466d4f7fc5fc6'
- '9b5ec3bbebe86921e2057694c42f65b8'
- 'ba65e71c481b94ef0fb6c23c7f21ffa1')
+sha1sums=('9d651d1e394654c02343e3d95c0f8a442a91ac75'
+ 'af2d9871565ea4cf524873f897691a18b2bba944'
+ '40d5a749f05dc097c91c087fe1f8b970613e9098'
+ 'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ${srcdir}/no-pthread-stubs.patch
+ patch -Np1 -i ${srcdir}/intel-git-fixes.patch
libtoolize --force
- aclocal
- autoconf
- automake
+ autoreconf --force --install
./configure --prefix=/usr \
--enable-udev \
--enable-intel \
Added: intel-git-fixes.patch
===
--- intel-git-fixes.patch (rev 0)
+++ intel-git-fixes.patch 2011-02-17 14:28:04 UTC (rev 110193)
@@ -0,0 +1,144 @@
+commit 6717b7579f84d05e45e7846d2b6e767760461709
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Wed Jan 12 10:57:46 2011 +
+
+intel: Fallback to old exec if no mrb_exec is available
+
+Reported-by: Torsten Hilbrich torsten.hilbr...@secunet.com
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=33016
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/intel/intel_bufmgr.c b/intel/intel_bufmgr.c
+index b7c5c09..2546222 100644
+--- a/intel/intel_bufmgr.c
b/intel/intel_bufmgr.c
+@@ -143,6 +143,10 @@ drm_intel_bo_mrb_exec(drm_intel_bo *bo, int used,
+ cliprects, num_cliprects, DR4,
+ rings);
+
++ if (ring_flag == 0)
++ return bo-bufmgr-bo_exec(bo, used,
++ cliprects, num_cliprects, DR4);
++
+ return -ENODEV;
+ }
+
+commit 53581b6210c024044e0065527d1506e6f5657ef5
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Mon Feb 14 09:27:05 2011 +
+
+intel: Set the public handle after opening by name
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 72c8731..092b56a 100644
+--- a/intel/intel_bufmgr_gem.c
b/intel/intel_bufmgr_gem.c
+@@ -816,6 +816,7 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr *bufmgr,
+ atomic_set(bo_gem-refcount, 1);
+ bo_gem-validate_index = -1;
+ bo_gem-gem_handle = open_arg.handle;
++ bo_gem-bo.handle = open_arg.handle;
+ bo_gem-global_name = handle;
+ bo_gem-reusable = 0;
+
+commit 36d4939343d8789d9066f7245fa2d4fe69119dd8
+Author: Chris Wilson ch...@chris-wilson.co.uk
+Date: Mon Feb 14 09:39:06 2011 +
+
+intel: Remember named bo
+
+... and if asked to open a bo by the same global name, return a fresh
+reference to the previously allocated buffer.
+
+Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk
+
+diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
+index 092b56a..3cdffce 100644
+--- a/intel/intel_bufmgr_gem.c
b/intel/intel_bufmgr_gem.c
+@@ -95,6 +95,8 @@ typedef struct _drm_intel_bufmgr_gem {
+ int num_buckets;
+ time_t time;
+
++ drmMMListHead named;
++
+ uint64_t gtt_size;
+ int available_fences;
+ int pci_device;
+@@ -124,6 +126,7 @@ struct _drm_intel_bo_gem {
+* Kenel-assigned global name for this object
+*/
+ unsigned int global_name;
++ drmMMListHead name_list;
+
+ /**
+* Index of the buffer within the validation list while preparing a
+@@ -690,6 +693,8 @@ retry:
+ drm_intel_gem_bo_free(bo_gem-bo);
+ return NULL;
+ }
++
++ DRMINITLISTHEAD(bo_gem-name_list);
+ }
+
+ bo_gem-name = name;
+@@ -792,6 +797,23 @@ drm_intel_bo_gem_create_from_name(drm_intel_bufmgr
*bufmgr,
+ int ret;
+ struct drm_gem_open open_arg;
+ struct drm_i915_gem_get_tiling
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD git-fixes.patch)
Date: Thursday, February 17, 2011 @ 09:29:12
Author: jgc
Revision: 110194
Update to latest git snapshot. No new features, just bugfixes and cleanup
Added:
xf86-video-intel/trunk/git-fixes.patch
Modified:
xf86-video-intel/trunk/PKGBUILD
-+
PKGBUILD| 11
git-fixes.patch | 1209 ++
2 files changed, 1217 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 14:28:04 UTC (rev 110193)
+++ PKGBUILD2011-02-17 14:29:12 UTC (rev 110194)
@@ -3,7 +3,7 @@
pkgname=xf86-video-intel
pkgver=2.14.0
-pkgrel=1
+pkgrel=2
pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers
arch=(i686 x86_64)
url=http://xorg.freedesktop.org/;
@@ -13,11 +13,16 @@
conflicts=('xorg-server1.9.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-video-drivers')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('05f187582aeabda57fcd6f2782cfbf8e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+git-fixes.patch)
+sha1sums=('103193a01b9c29d6f71a620ad99c6e1495276e68'
+ '62dc94bd6a45432bdaed85bb0187d7087b88fe29')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/git-fixes.patch
+ libtoolize --force
+ autoreconf --force --install
./configure --prefix=/usr --enable-dri
make
make DESTDIR=${pkgdir} install
Added: git-fixes.patch
===
--- git-fixes.patch (rev 0)
+++ git-fixes.patch 2011-02-17 14:29:12 UTC (rev 110194)
@@ -0,0 +1,1209 @@
+diff --git a/Makefile.am b/Makefile.am
+index f4239de..83948ab 100644
+--- a/Makefile.am
b/Makefile.am
+@@ -18,6 +18,7 @@
+ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+ SUBDIRS = uxa src man
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+diff --git a/configure.ac b/configure.ac
+index 529a294..5a1baac 100644
+--- a/configure.ac
b/configure.ac
+@@ -21,18 +21,24 @@
+ # Process this file with autoconf to produce a configure script
+
+ # Initialize Autoconf
+-AC_PREREQ([2.60])
++AC_PREREQ([2.63])
+ AC_INIT([xf86-video-intel],
+ [2.14.0],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [xf86-video-intel])
+ AC_CONFIG_SRCDIR([Makefile.am])
+ AC_CONFIG_HEADERS([config.h])
+-AC_CONFIG_AUX_DIR(.)
++AC_CONFIG_AUX_DIR([build-aux])
++AC_CONFIG_MACRO_DIR([m4])
+
+ # Initialize Automake
+-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2])
++AM_MAINTAINER_MODE([enable])
++
++# Support silent build rules, requires at least automake-1.11. Disable
++# by either passing --disable-silent-rules to configure or passing V=1
++# to make
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+ # Require X.Org macros 1.8 or later for MAN_SUBSTS set by
XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+@@ -50,8 +56,8 @@ m4_ifndef([XORG_DRIVER_CHECK_EXT],
+ depending on your distribution, try package 'xserver-xorg-dev' or
'xorg-x11-server-devel'])])
+
+ # Initialize libtool
+-AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
++LT_PREREQ([2.2])
++LT_INIT([disable-static])
+
+ PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm = 1.1], [gen4asm=yes],
[gen4asm=no])
+ AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
+@@ -85,6 +91,12 @@ AC_ARG_ENABLE(kms-only, AS_HELP_STRING([--enable-kms-only],
+ [KMS_ONLY=$enableval],
+ [KMS_ONLY=no])
+
++AC_ARG_ENABLE(debug,
++AS_HELP_STRING([--enable-debug],
++ [Enables internal debugging [[default=yes]]]),
++ [DEBUG=$enableval],
++ [DEBUG=yes])
++
+ # Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+@@ -138,15 +150,19 @@ fi
+ AC_MSG_CHECKING([whether to include XvMC support])
+ AC_MSG_RESULT([$XVMC])
+ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
+-if test $XVMC = yes; then
++if test x$XVMC = xyes; then
+ AC_DEFINE(ENABLE_XVMC,1,[Enable XvMC support])
+ fi
+
+ AM_CONDITIONAL(KMS_ONLY, test x$KMS_ONLY = xyes)
+-if test $KMS_ONLY = yes; then
++if test x$KMS_ONLY = xyes; then
+ AC_DEFINE(KMS_ONLY,1,[Assume KMS support])
+ fi
+
++if test x$DEBUG = xno; then
++ AC_DEFINE(NDEBUG,1,[Disable internal debugging])
++fi
++
+ DRIVER_NAME=intel
+ AC_SUBST([DRIVER_NAME])
+ AC_SUBST([moduledir])
+diff --git a/src/i915_render.c b/src/i915_render.c
+index 6d844e5..d04e8e1 100644
+--- a/src/i915_render.c
b/src/i915_render.c
+@@ -302,12 +302,10 @@ static Bool i915_texture_setup(PicturePtr picture,
PixmapPtr pixmap, int unit)
[arch-commits] Commit in libdrm/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 09:32:35 Author: jgc Revision: 110195 archrelease: remove extra-i686 Deleted: libdrm/repos/extra-i686/
[arch-commits] Commit in libdrm/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 09:32:53 Author: jgc Revision: 110196 archrelease: copy trunk to extra-i686 Added: libdrm/repos/extra-i686/
[arch-commits] Commit in libdrm/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 09:32:58 Author: jgc Revision: 110197 archrelease: remove extra-x86_64 Deleted: libdrm/repos/extra-x86_64/
[arch-commits] Commit in libdrm/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 09:33:11 Author: jgc Revision: 110198 archrelease: copy trunk to extra-x86_64 Added: libdrm/repos/extra-x86_64/
[arch-commits] Commit in xf86-video-intel/repos (testing-i686)
Date: Thursday, February 17, 2011 @ 09:37:10 Author: jgc Revision: 110199 archrelease: copy trunk to testing-i686 Added: xf86-video-intel/repos/testing-i686/
[arch-commits] Commit in xf86-video-intel/repos (testing-x86_64)
Date: Thursday, February 17, 2011 @ 09:37:26 Author: jgc Revision: 110200 archrelease: copy trunk to testing-x86_64 Added: xf86-video-intel/repos/testing-x86_64/
[arch-commits] Commit in cx_freeze/trunk (PKGBUILD)
Date: Thursday, February 17, 2011 @ 09:40:56
Author: schiv
Revision: 110201
upgpkg: cx_freeze 4.2.2-1
upstream release
Modified:
cx_freeze/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 14:37:26 UTC (rev 110200)
+++ PKGBUILD2011-02-17 14:40:56 UTC (rev 110201)
@@ -1,12 +1,12 @@
# $Id$
-# Maintainer: Ray Rashif sc...@archlinux.org
+# Maintainer: Ray Rashif sc...@archlinux.org
# Contributor: Douglas Soares de Andrade doug...@archlinux.org
# Contributor: Eric Belanger e...@archlinux.org
# Contributor: Roberto Alsina rals...@kde.org
pkgname=cx_freeze
_tarname=cx_Freeze
-pkgver=4.2.1
+pkgver=4.2.2
pkgrel=1
pkgdesc=A set of utilities for freezing Python scripts into executables
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@
depends=('python2')
source=(http://downloads.sourceforge.net/cx-freeze/$_tarname-$pkgver.tar.gz;
'FreezePython.sh')
-md5sums=('aa4dd1486a5290fbac797c1aa4cc52a7'
+md5sums=('656ab0ace90b21e0040f27236539bef0'
'5cc60d1644eba12a57c22cc1348a4afd')
package() {
[arch-commits] Commit in cx_freeze/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 09:41:06 Author: schiv Revision: 110202 archrelease: remove extra-i686 Deleted: cx_freeze/repos/extra-i686/
[arch-commits] Commit in cx_freeze/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 09:41:27 Author: schiv Revision: 110203 archrelease: copy trunk to extra-i686 Added: cx_freeze/repos/extra-i686/
[arch-commits] Commit in cx_freeze/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 09:41:35 Author: schiv Revision: 110204 archrelease: remove extra-x86_64 Deleted: cx_freeze/repos/extra-x86_64/
[arch-commits] Commit in cx_freeze/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 09:41:55 Author: schiv Revision: 110205 archrelease: copy trunk to extra-x86_64 Added: cx_freeze/repos/extra-x86_64/
[arch-commits] Commit in brasero/trunk (PKGBUILD)
Date: Thursday, February 17, 2011 @ 12:10:14
Author: heftig
Revision: 110206
upgpkg: brasero 2.91.6-1
Update for gnome-unstable
Modified:
brasero/trunk/PKGBUILD
--+
PKGBUILD | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 14:41:55 UTC (rev 110205)
+++ PKGBUILD2011-02-17 17:10:14 UTC (rev 110206)
@@ -4,15 +4,18 @@
# Contributor: William Rea sillywi...@gmail.com
pkgname=brasero
-pkgver=2.32.1
+pkgver=2.91.6
pkgrel=1
pkgdesc=A disc burning application for Gnome
arch=('i686' 'x86_64')
url=http://www.gnome.org/projects/brasero;
license=('GPL')
options=('!libtool' '!emptydirs')
-depends=('gstreamer0.10-base-plugins=0.10.30' 'totem-plparser=2.32.0'
'libbeagle=0.3.9' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme'
'libunique=1.1.6' 'libcanberra=0.25' 'dvd+rw-tools' 'dconf')
-makedepends=('gnome-doc-utils=0.20.1' 'intltool' 'libburn' 'libisofs'
'nautilus' 'gobject-introspection' 'namcap')
+depends=('gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'
+ 'libcanberra' 'dvd+rw-tools' 'dconf')
+makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus'
+ 'gobject-introspection' 'namcap')
optdepends=('libburn: alternative back-end'
'libisofs: libburn back-end'
'dvdauthor: video project'
@@ -20,8 +23,8 @@
'vcdimager: video project')
replaces=('nautilus-cd-burner')
install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.32/brasero-${pkgver}.tar.bz2)
-sha256sums=('7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('1e62e6dd5e4621edb98b67a37282207d548186bf69792b9fe3ef05590997dde7')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -29,5 +32,9 @@
--localstatedir=/var --disable-caches \
--disable-schemas-compile
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
[arch-commits] Commit in brasero/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 12:10:37 Author: heftig Revision: 110207 archrelease: copy trunk to gnome-unstable-i686 Added: brasero/repos/gnome-unstable-i686/
[arch-commits] Commit in brasero/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 12:10:56 Author: heftig Revision: 110208 archrelease: copy trunk to gnome-unstable-x86_64 Added: brasero/repos/gnome-unstable-x86_64/
[arch-commits] Commit in (6 files)
Date: Thursday, February 17, 2011 @ 12:37:09
Author: heftig
Revision: 110209
Add libpeas
Added:
libpeas/
libpeas/repos/
libpeas/trunk/
libpeas/trunk/PKGBUILD
libpeas/trunk/libpeas.install
Modified:
gnome-themes-standard/trunk/PKGBUILD
--+
gnome-themes-standard/trunk/PKGBUILD |1 +
libpeas/trunk/PKGBUILD | 28
libpeas/trunk/libpeas.install| 11 +++
3 files changed, 40 insertions(+)
Modified: gnome-themes-standard/trunk/PKGBUILD
===
--- gnome-themes-standard/trunk/PKGBUILD2011-02-17 17:10:56 UTC (rev
110208)
+++ gnome-themes-standard/trunk/PKGBUILD2011-02-17 17:37:09 UTC (rev
110209)
@@ -9,6 +9,7 @@
license=('GPL2')
depends=('cantarell-fonts' 'gtk3')
makedepends=('intltool')
+groups=('gnome')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
sha256sums=('59db71ade78c909236c19b74db321296ad093a3c70c83bd38d0b611ad91ee398')
Added: libpeas/trunk/PKGBUILD
===
--- libpeas/trunk/PKGBUILD (rev 0)
+++ libpeas/trunk/PKGBUILD 2011-02-17 17:37:09 UTC (rev 110209)
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+pkgname=libpeas
+pkgver=0.7.1
+pkgrel=1
+pkgdesc=A personal social data server
+arch=('i686' 'x86_64')
+url=http://www.gtk.org/;
+license=('GPL2')
+depends=('gtk3' 'hicolor-icon-theme' 'pygobject' 'gobject-introspection')
+makedepends=('gtk-doc' 'intltool' 'pygobject-devel')
+options=('!libtool')
+install=libpeas.install
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
+sha256sums=('a5090f7b2a812f2fd8925f976cbaa2246da4dd1be8fe0d76fb0ed590d7dbb1e4')
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+}
+
+# vim:set ts=2 sw=2 et:
Property changes on: libpeas/trunk/PKGBUILD
___
Added: svn:keywords
+ Id
Added: libpeas/trunk/libpeas.install
===
--- libpeas/trunk/libpeas.install (rev 0)
+++ libpeas/trunk/libpeas.install 2011-02-17 17:37:09 UTC (rev 110209)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+post_install $1
+}
+
+post_remove() {
+post_install $1
+}
[arch-commits] Commit in libpeas/trunk (PKGBUILD libpeas.install)
Date: Thursday, February 17, 2011 @ 12:42:37
Author: heftig
Revision: 110210
upgpkg: libpeas 0.7.1-1
Update for gnome-unstable
Modified:
libpeas/trunk/PKGBUILD
libpeas/trunk/libpeas.install
-+
PKGBUILD|5 +++--
libpeas.install |4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 17:37:09 UTC (rev 110209)
+++ PKGBUILD2011-02-17 17:42:37 UTC (rev 110210)
@@ -3,7 +3,7 @@
pkgname=libpeas
pkgver=0.7.1
pkgrel=1
-pkgdesc=A personal social data server
+pkgdesc=A GObject-based plugins engine
arch=('i686' 'x86_64')
url=http://www.gtk.org/;
license=('GPL2')
@@ -16,7 +16,8 @@
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+--sysconfdir=/etc --localstatedir=/var
make
}
Modified: libpeas.install
===
--- libpeas.install 2011-02-17 17:37:09 UTC (rev 110209)
+++ libpeas.install 2011-02-17 17:42:37 UTC (rev 110210)
@@ -3,9 +3,9 @@
}
post_upgrade() {
-post_install $1
+ post_install
}
post_remove() {
-post_install $1
+ post_install
}
[arch-commits] Commit in libpeas/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 12:42:55 Author: heftig Revision: 110211 archrelease: copy trunk to gnome-unstable-i686 Added: libpeas/repos/gnome-unstable-i686/
[arch-commits] Commit in libpeas/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 12:43:12 Author: heftig Revision: 110212 archrelease: copy trunk to gnome-unstable-x86_64 Added: libpeas/repos/gnome-unstable-x86_64/
[arch-commits] Commit in eog/trunk (PKGBUILD eog.install)
Date: Thursday, February 17, 2011 @ 12:59:36
Author: heftig
Revision: 110213
upgpkg: eog 2.91.7-1
Update for gnome-unstable
Modified:
eog/trunk/PKGBUILD
eog/trunk/eog.install
-+
PKGBUILD| 25 +
eog.install | 17 ++---
2 files changed, 19 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 17:43:12 UTC (rev 110212)
+++ PKGBUILD2011-02-17 17:59:36 UTC (rev 110213)
@@ -2,31 +2,32 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=eog
-pkgver=2.32.1
+pkgver=2.91.7
pkgrel=1
pkgdesc=Eye of Gnome: An image viewing and cataloging program
arch=('i686' 'x86_64')
license=('GPL')
-depends=('gnome-desktop=2.32.0' 'libexif=0.6.19' 'lcms=1.19'
'desktop-file-utils' 'gnome-icon-theme=2.31.0' 'exempi=2.1.1' 'python2=2.7')
-makedepends=('pkgconfig' 'gnome-doc-utils=0.20.1' 'intltool' 'pygtk')
+depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
+ 'python2' 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme'
+ 'hicolor-icon-theme')
+makedepends=('pkgconfig' 'gtk-doc' 'intltool' 'pygtk')
install=eog.install
groups=('gnome-extra')
options=('!emptydirs' '!libtool')
url=http://www.gnome.org;
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('543672fb8e8e300bf2cf4c7eef43b5b1624e2e48e6aa0801a083ae7beb2d7078')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('a79ba796dbcea2a163a9939d4d9c6ced8c3a3b23b2fbdc7f7f4664065c4a7193')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper \
- --enable-python
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-scrollkeeper
make
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
+}
- install -m755 -d ${pkgdir}/usr/share/gconf/schemas
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas
--domain eog ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
# remove it from Xfce menu that ships its own thingy
echo NotShowIn=XFCE ${pkgdir}/usr/share/applications/eog.desktop
Modified: eog.install
===
--- eog.install 2011-02-17 17:43:12 UTC (rev 110212)
+++ eog.install 2011-02-17 17:59:36 UTC (rev 110213)
@@ -1,24 +1,19 @@
-pkgname=eog
-
post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
pre_upgrade() {
- pre_remove $1
+ if (( $(vercmp $2 2.90.0) 0 )); then
+usr/sbin/gconfpkg --uninstall eog
+ fi
}
post_upgrade() {
- post_install $1
+ post_install
}
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ post_install
}
[arch-commits] Commit in eog/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 12:59:57 Author: heftig Revision: 110214 archrelease: copy trunk to gnome-unstable-i686 Added: eog/repos/gnome-unstable-i686/
[arch-commits] Commit in eog/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 13:00:18 Author: heftig Revision: 110215 archrelease: copy trunk to gnome-unstable-x86_64 Added: eog/repos/gnome-unstable-x86_64/
[arch-commits] Commit in vi/repos (core-i686)
Date: Thursday, February 17, 2011 @ 14:08:46 Author: ronald Revision: 110216 db-move: vi removed by ronald for move to [core] (i686) Deleted: vi/repos/core-i686/
[arch-commits] Commit in vi/repos (core-i686 testing-i686)
Date: Thursday, February 17, 2011 @ 14:08:46 Author: ronald Revision: 110217 db-move: moved vi from [testing] to [core] (i686) Added: vi/repos/core-i686/ Deleted: vi/repos/testing-i686/
[arch-commits] Commit in vi/repos (core-x86_64)
Date: Thursday, February 17, 2011 @ 14:08:47 Author: ronald Revision: 110218 db-move: vi removed by ronald for move to [core] (x86_64) Deleted: vi/repos/core-x86_64/
[arch-commits] Commit in vi/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 17, 2011 @ 14:08:48 Author: ronald Revision: 110219 db-move: moved vi from [testing] to [core] (x86_64) Added: vi/repos/core-x86_64/ Deleted: vi/repos/testing-x86_64/
[arch-commits] Commit in vino/trunk (PKGBUILD)
Date: Thursday, February 17, 2011 @ 14:29:34
Author: heftig
Revision: 110220
upgpkg: vino 2.32.1-1
Update for gnome-unstable
Modified:
vino/trunk/PKGBUILD
--+
PKGBUILD | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 19:08:48 UTC (rev 110219)
+++ PKGBUILD2011-02-17 19:29:34 UTC (rev 110220)
@@ -2,20 +2,20 @@
# Maintainer: Jan de Groot j...@archlinux.org
pkgname=vino
-pkgver=2.32.0
-pkgrel=2
+pkgver=2.32.1
+pkgrel=1
pkgdesc=a VNC server for the GNOME desktop
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libnotify=0.5.2' 'libxtst' 'libunique=1.1.6' 'libsm'
'gconf=2.32.0' 'libsoup=2.32.1' 'telepathy-glib=0.12.4' 'gtk2=2.22.1'
- 'libgnome-keyring=2.32' 'avahi=0.6.27')
-makedepends=('intltool' 'networkmanager' 'namcap')
+depends=('libnotify' 'libxtst' 'libunique' 'libsm' 'gconf' 'libsoup'
'telepathy-glib' 'gtk2'
+ 'libgnome-keyring' 'avahi')
+makedepends=('intltool' 'networkmanager')
groups=('gnome-extra')
url=http://www.gnome.org;
options=(!emptydirs)
install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('00446f52eb03893be9d69dadbb3899b58676c122f33db670f46dc19e4a7d3d6d')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('8ec3cb84216323660d6301e02f5853f928789c20be68ded538dd849eafac4087')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -25,6 +25,10 @@
--enable-gnome-keyring \
--enable-avahi
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
install -m755 -d ${pkgdir}/usr/share/gconf/schemas
[arch-commits] Commit in vino/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 14:29:52 Author: heftig Revision: 110221 archrelease: copy trunk to gnome-unstable-i686 Added: vino/repos/gnome-unstable-i686/
[arch-commits] Commit in vino/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 14:30:13 Author: heftig Revision: 110222 archrelease: copy trunk to gnome-unstable-x86_64 Added: vino/repos/gnome-unstable-x86_64/
[arch-commits] Commit in eog/trunk (PKGBUILD)
Date: Thursday, February 17, 2011 @ 14:33:01
Author: heftig
Revision: 110223
upgpkg: eog 2.91.7-2
Reduce deps
Modified:
eog/trunk/PKGBUILD
--+
PKGBUILD |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 19:30:13 UTC (rev 110222)
+++ PKGBUILD2011-02-17 19:33:01 UTC (rev 110223)
@@ -3,14 +3,13 @@
pkgname=eog
pkgver=2.91.7
-pkgrel=1
+pkgrel=2
pkgdesc=Eye of Gnome: An image viewing and cataloging program
arch=('i686' 'x86_64')
license=('GPL')
depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
- 'python2' 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme'
- 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'gtk-doc' 'intltool' 'pygtk')
+ 'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme')
+makedepends=('gtk-doc' 'intltool')
install=eog.install
groups=('gnome-extra')
options=('!emptydirs' '!libtool')
[arch-commits] Commit in eog/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 14:33:09 Author: heftig Revision: 110224 archrelease: remove gnome-unstable-i686 Deleted: eog/repos/gnome-unstable-i686/
[arch-commits] Commit in eog/repos (gnome-unstable-i686)
Date: Thursday, February 17, 2011 @ 14:33:23 Author: heftig Revision: 110225 archrelease: copy trunk to gnome-unstable-i686 Added: eog/repos/gnome-unstable-i686/
[arch-commits] Commit in eog/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 14:33:35 Author: heftig Revision: 110226 archrelease: remove gnome-unstable-x86_64 Deleted: eog/repos/gnome-unstable-x86_64/
[arch-commits] Commit in eog/repos (gnome-unstable-x86_64)
Date: Thursday, February 17, 2011 @ 14:33:50 Author: heftig Revision: 110227 archrelease: copy trunk to gnome-unstable-x86_64 Added: eog/repos/gnome-unstable-x86_64/
[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.install)
Date: Thursday, February 17, 2011 @ 17:49:28
Author: andyrtr
Revision: 110228
upgpkg: openjdk6 6.b20_1.9.7-1
upstream update 1.9.7; upstream moved plugin and webstart to separate
icedtea-web pkg
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/openjdk6.install
--+
PKGBUILD | 81 -
openjdk6.install |3 +
2 files changed, 46 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 19:33:50 UTC (rev 110227)
+++ PKGBUILD2011-02-17 22:49:28 UTC (rev 110228)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.6
+_icedteaver=1.9.7
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -16,8 +16,8 @@
arch=('i686' 'x86_64')
license=('custom')
makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme'
'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'xalan-java' 'xulrunner=1.9.2'
-'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
+'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'xalan-java' 'libxt' 'nss'
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
#'xulrunner=1.9.2'
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('865af3f871ded848f4aa909075ebe856'
+md5sums=('54a327a9591dab15049b81ec3c0af724'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -50,9 +50,9 @@
mksource() {
mkdir /tmp/icedtea6-${_date}
pushd /tmp/icedtea6-${_date}
- #hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+ #hg -v clone http://icedtea.classpath.org/hg/icedtea6
# use specific release branch
- hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/ ||
return 1
+ hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/
rm -rf icedtea6/.hg*
tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
popd
@@ -64,7 +64,8 @@
unset CLASSPATH
[ -z ${ANT_HOME} ] . /etc/profile.d/apache-ant.sh
-
+
+ _javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd ${srcdir}/icedtea6-${_icedteaver}
@@ -81,14 +82,14 @@
export HOTSPOT_BUILD_JOBS=${ALT_PARALLEL_COMPILE_JOBS}
unset MAKEFLAGS
- if [ -x ${_jvmdir}/bin/javac ]; then
-JCONF=--with-openjdk
- elif [ -x /opt/java/bin/javac ]; then
-JCONF=--with-openjdk
- else
-echo No supported java installation found, install either openjdk6 or jdk
-return 1
- fi
+# if [ -x ${_jvmdir}/bin/javac ]; then
+#JCONF=--with-openjdk --with-javac
+# elif [ -x /opt/java/bin/javac ]; then
+#JCONF=--with-openjdk
+# else
+#echo No supported java installation found, install either openjdk6 or
jdk
+#return 1
+# fi
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
--with-xalan2-jar=/usr/share/java/xalan.jar \
@@ -96,17 +97,19 @@
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \
--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
- --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip
+ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
+ --disable-webstart --disable-plugin --with-openjdk
- LD_PRELOAD= make || return 1
+ LD_PRELOAD= make
}
package_openjdk6() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing
binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst')
- optdepends=('xulrunner: for the browser plugin'
-'gtk2: for the browser plugin'
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
#'desktop-file-utils'
+ optdepends=( #'xulrunner: for the browser plugin'
+#'gtk2: for the browser plugin'
+ 'icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
conflicts=('java-environment' 'java-runtime')
@@ -128,49 +131,51 @@
pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install main files.
- cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
- cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
+
[arch-commits] Commit in openjdk6/repos (testing-i686)
Date: Thursday, February 17, 2011 @ 17:59:21 Author: andyrtr Revision: 110229 archrelease: copy trunk to testing-i686 Added: openjdk6/repos/testing-i686/
[arch-commits] Commit in openjdk6/repos (testing-x86_64)
Date: Thursday, February 17, 2011 @ 18:09:19 Author: andyrtr Revision: 110230 archrelease: copy trunk to testing-x86_64 Added: openjdk6/repos/testing-x86_64/
[arch-commits] Commit in ntp/trunk (7 files)
Date: Thursday, February 17, 2011 @ 18:15:46
Author: kevin
Revision: 110231
upgpkg: ntp 4.2.6.p3-1
Updated to 4.2.6p3 and implemented FS#18469, replace ntpdate with ntpd -q
Modified:
ntp/trunk/PKGBUILD
ntp/trunk/changelog
ntp/trunk/ntp-client.conf
ntp/trunk/ntp.conf
ntp/trunk/ntpdate
Deleted:
ntp/trunk/fix-ipv6.patch
ntp/trunk/ntp-4.2.4_p7-nano.patch
-+
PKGBUILD| 29 +++--
changelog |7 +++
fix-ipv6.patch | 10 --
ntp-4.2.4_p7-nano.patch | 20
ntp-client.conf | 10 ++
ntp.conf| 21 +
ntpdate |7 ---
7 files changed, 37 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 23:09:19 UTC (rev 110230)
+++ PKGBUILD2011-02-17 23:15:46 UTC (rev 110231)
@@ -2,8 +2,8 @@
# Maintainer: kevin ke...@archlinux.org
pkgname=ntp
-pkgver=4.2.6.p2
-_realver=4.2.6p2
+pkgver=4.2.6.p3
+_realver=4.2.6p3
pkgrel=1
pkgdesc=NTP (Network Time Protocol) tries to keep servers in sync
arch=(i686 x86_64)
@@ -15,32 +15,25 @@
options=('!emptydirs')
changelog=changelog
source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz
- ntp-4.2.4_p7-nano.patch
- fix-ipv6.patch
ntp-4.2.4-html2man.patch
ntp.conf
ntp-client.conf
ntpd
ntpdate)
-md5sums=('cf73cd85f248232c62f8029e6eb05938' '36c5711228cb0cf48966daa993e06f55'
- '9dabdbc6b8cd020f2205515df7972c21' '1b04e888717bb31479a6087632981723'
- '5bd3924f5720b97837969ec4ec4d5e09' 'c7f50632b69bd4f32cf052d0b1848463'
- '46118a8ec2c4f5bbfafd730af21b7c03' '140855352baeb89da0c6c1c475c18b57')
+md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723'
+ '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33'
+ '46118a8ec2c4f5bbfafd730af21b7c03' '486c0d16bb67cf26b4e64abddc50a573')
build() {
cd $srcdir/$pkgname-$_realver
- # fix glibc build issue
- patch -Np1 -i ../ntp-4.2.4_p7-nano.patch
- # fix ipv6 support
- patch -Np1 -i ../fix-ipv6.patch
# fix man page generation
patch -Np1 -i ../ntp-4.2.4-html2man.patch
# configure
- # 4.2.6p2 not finding rt lib: added LIS
export LDFLAGS=${LDFLAGS//-Wl,--as-needed}
- libtoolize --copy --force
- ac_cv_header_dns_sd_h=0 ./configure LIBS=-lrt --prefix=/usr
--mandir=/usr/share/man --enable-linux-caps
-
+ # 4.2.6p3: aclocal too old, regenerate
+ rm -f aclocal.m4
+ libtoolize --copy --force
+ ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr --mandir=/usr/share/man
--enable-linux-caps
# build
make
}
@@ -53,11 +46,11 @@
# install conf files
mkdir -p $pkgdir/usr/share/ntp
- install -D -m644 conf/* $pkgdir/usr/share/ntp/
+ install -D -m644 conf/* ${pkgdir}/usr/share/ntp
# install launch scripts
mkdir -p $pkgdir/etc/rc.d
- install -D -m755 $srcdir/{ntpd,ntpdate} $pkgdir/etc/rc.d/
+ install -D -m755 ${srcdir}/{ntpd,ntpdate} $pkgdir/etc/rc.d
# install man pages
cd html
Modified: changelog
===
--- changelog 2011-02-17 23:09:19 UTC (rev 110230)
+++ changelog 2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,5 +1,12 @@
2010-10-16 kevin ke...@archlinux.org
+* ntp 4.2.6p3
+- Implemented FS#18469, replace ntpdate with ntpd -q
+- Removed LIBS
+- Removed old IPv6 and nano patch
+
+2010-10-16 kevin ke...@archlinux.org
+
* ntp 4.2.6p2
- Added changelog
- Set LIBS to use librt since configure doesn't set it
Deleted: fix-ipv6.patch
===
--- fix-ipv6.patch 2011-02-17 23:09:19 UTC (rev 110230)
+++ fix-ipv6.patch 2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,10 +0,0 @@
ntp-4.2.4p7-orig/configure.ac 2009-06-18 14:48:12.151346763 +0200
-+++ ntp-4.2.4p7/configure.ac 2009-06-18 14:50:07.054692531 +0200
-@@ -4456,6 +4456,7 @@
- [
- AC_LANG_PROGRAM(
- [
-+#define _GNU_SOURCE
- #include sys/types.h
- #include sys/socket.h
- #include netinet/in.h
Deleted: ntp-4.2.4_p7-nano.patch
===
--- ntp-4.2.4_p7-nano.patch 2011-02-17 23:09:19 UTC (rev 110230)
+++ ntp-4.2.4_p7-nano.patch 2011-02-17 23:15:46 UTC (rev 110231)
@@ -1,20 +0,0 @@
-http://bugs.gentoo.org/270483
-
-ripped from fedora
-
ntp-4.2.4p7/include/ntp_syscall.h
-+++ ntp-4.2.4p7/include/ntp_syscall.h
-@@ -14,5 +14,13 @@
- # include sys/timex.h
- #endif
-
-+#if defined(ADJ_NANO) !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) !defined(MOD_TAI)
-+#define MOD_TAI
[arch-commits] Commit in ntp/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 18:15:52 Author: kevin Revision: 110232 archrelease: remove extra-i686 Deleted: ntp/repos/extra-i686/
[arch-commits] Commit in ntp/repos (extra-i686)
Date: Thursday, February 17, 2011 @ 18:16:01 Author: kevin Revision: 110233 archrelease: copy trunk to extra-i686 Added: ntp/repos/extra-i686/
[arch-commits] Commit in ntp/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 18:32:03 Author: kevin Revision: 110234 archrelease: remove extra-x86_64 Deleted: ntp/repos/extra-x86_64/
[arch-commits] Commit in ntp/repos (extra-x86_64)
Date: Thursday, February 17, 2011 @ 18:32:13 Author: kevin Revision: 110235 archrelease: copy trunk to extra-x86_64 Added: ntp/repos/extra-x86_64/
[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.13-prelink.patch)
Date: Thursday, February 17, 2011 @ 23:46:54
Author: allan
Revision: 110236
upgpkg: glibc 2.13-4
fix prelink issue (FS#22656)
Added:
glibc/trunk/glibc-2.13-prelink.patch
Modified:
glibc/trunk/PKGBUILD
--+
PKGBUILD |8 +++-
glibc-2.13-prelink.patch | 26 ++
2 files changed, 33 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 23:32:13 UTC (rev 110235)
+++ PKGBUILD2011-02-18 04:46:54 UTC (rev 110236)
@@ -6,7 +6,7 @@
pkgname=glibc
pkgver=2.13
-pkgrel=3
+pkgrel=4
_glibcdate=20110117
pkgdesc=GNU C Library
arch=('i686' 'x86_64')
@@ -25,6 +25,7 @@
glibc-__i686.patch
glibc-2.12.1-static-shared-getpagesize.patch
glibc-2.12.2-ignore-origin-of-privileged-program.patch
+glibc-2.13-prelink.patch
nscd
locale.gen.txt
locale-gen)
@@ -34,6 +35,7 @@
'40cd342e21f71f5e49e32622b25acc52'
'a3ac6f318d680347bb6e2805d42b73b2'
'b042647ea7d6f22ad319e12e796bd13e'
+ '24dfab6fd244f3773523412588ecc52c'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -67,6 +69,10 @@
# http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora
branch...)
patch -Np1 -i
${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+ # http://sourceware.org/bugzilla/show_bug.cgi?id=12489
+ # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora
branch...)
+ patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
+
# http://sourceware.org/bugzilla/show_bug.cgi?id=12403
if [[ $CARCH == x86_64 ]]; then
sed -i '/__ASSUME_PRIVATE_FUTEX/d'
$srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h
Added: glibc-2.13-prelink.patch
===
--- glibc-2.13-prelink.patch(rev 0)
+++ glibc-2.13-prelink.patch2011-02-18 04:46:54 UTC (rev 110236)
@@ -0,0 +1,26 @@
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 9a560b3..201c9cf 100644
+--- a/elf/rtld.c
b/elf/rtld.c
+@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit
interface: %s; ignored.\n,
+ we need it in the memory handling later. */
+ GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+
++ /* Remember the last search directory added at startup, now that
++ malloc will no longer be the one from dl-minimal.c. */
++ GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
++
+ if (prelinked)
+ {
+ if (main_map-l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
+@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit
interface: %s; ignored.\n,
+ lossage);
+ }
+
+- /* Remember the last search directory added at startup, now that
+- malloc will no longer be the one from dl-minimal.c. */
+- GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+-
+ if (! prelinked rtld_multiple_ref)
+ {
+ /* There was an explicit ref to the dynamic linker as a shared lib.
[arch-commits] Commit in glibc/repos (testing-i686)
Date: Thursday, February 17, 2011 @ 23:47:37 Author: allan Revision: 110237 archrelease: copy trunk to testing-i686 Added: glibc/repos/testing-i686/
[arch-commits] Commit in glibc/repos (testing-x86_64)
Date: Thursday, February 17, 2011 @ 23:48:20 Author: allan Revision: 110238 archrelease: copy trunk to testing-x86_64 Added: glibc/repos/testing-x86_64/
[arch-commits] Commit in icedtea-web/trunk (PKGBUILD)
Date: Friday, February 18, 2011 @ 00:02:55
Author: andyrtr
Revision: 110239
upgpkg: icedtea-web 1.0.1-1
upstream update 1.0.1; initial ArchLinux package
Modified:
icedtea-web/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 04:48:20 UTC (rev 110238)
+++ PKGBUILD2011-02-18 05:02:55 UTC (rev 110239)
@@ -3,7 +3,7 @@
pkgbase=icedtea-web
pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.0
+pkgver=1.0.1
pkgrel=1
arch=('i686' 'x86_64')
url=http://icedtea.classpath.org/wiki/IcedTea-Web;
@@ -12,7 +12,7 @@
install=$pkgname.install
source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz
fix-man-location.patch)
-md5sums=('f6124dbaef16650f46df5125d8ed7407'
+md5sums=('30f969de0503a296226ae0a1876f9702'
'58e305aa0d27d59f543d9cfddc6e175a')
build() {
@@ -30,7 +30,7 @@
package_icedtea-web() {
pkgdesc=provides a Free Software web browser plugin running applets written
in the Java programming language and an implementation of Java Web Start,
originally based on the NetX project
- depends=('openjdk6' 'gtk2')
+ depends=('openjdk6' 'gtk2' 'desktop-file-utils')
if [ ${CARCH} = x86_64 ]; then
_arch=amd64
[arch-commits] Commit in icedtea-web/repos (testing-i686)
Date: Friday, February 18, 2011 @ 00:03:43 Author: andyrtr Revision: 110240 archrelease: copy trunk to testing-i686 Added: icedtea-web/repos/testing-i686/
[arch-commits] Commit in icedtea-web/repos (testing-x86_64)
Date: Friday, February 18, 2011 @ 00:04:20 Author: andyrtr Revision: 110241 archrelease: copy trunk to testing-x86_64 Added: icedtea-web/repos/testing-x86_64/
[arch-commits] Commit in arora/trunk (PKGBUILD arora.install)
Date: Friday, February 18, 2011 @ 02:44:40
Author: andrea
Revision: 110242
upgpkg: arora 0.11.0-2
build cache database of MIME types after installation (FS#22943); cleanup
dependencies
Modified:
arora/trunk/PKGBUILD
arora/trunk/arora.install
---+
PKGBUILD |7 ---
arora.install |3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 05:04:20 UTC (rev 110241)
+++ PKGBUILD2011-02-18 07:44:40 UTC (rev 110242)
@@ -1,15 +1,16 @@
# $Id$
+# Maintainer:
# Contributor: Pierre Schmitz pie...@archlinux.de
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
pkgname=arora
pkgver=0.11.0
-pkgrel=1
+pkgrel=2
pkgdesc='A cross platform web browser built using Qt and WebKit'
arch=('i686' 'x86_64')
url='http://www.arora-browser.org'
license=('GPL')
-depends=('qt' 'openssl' 'xdg-utils')
+depends=('qt' 'desktop-file-utils')
install='arora.install'
source=(http://arora.googlecode.com/files/arora-${pkgver}.tar.gz;)
md5sums=('64334ce4198861471cad9316d841f0cb')
Modified: arora.install
===
--- arora.install 2011-02-18 05:04:20 UTC (rev 110241)
+++ arora.install 2011-02-18 07:44:40 UTC (rev 110242)
@@ -1,5 +1,6 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor /dev/null
+xdg-icon-resource forceupdate --theme hicolor /dev/null
+update-desktop-database -q
}
post_upgrade() {
[arch-commits] Commit in arora/repos (extra-i686)
Date: Friday, February 18, 2011 @ 02:44:48 Author: andrea Revision: 110243 archrelease: remove extra-i686 Deleted: arora/repos/extra-i686/
[arch-commits] Commit in arora/repos (extra-i686)
Date: Friday, February 18, 2011 @ 02:45:01 Author: andrea Revision: 110244 archrelease: copy trunk to extra-i686 Added: arora/repos/extra-i686/
[arch-commits] Commit in arora/repos (extra-x86_64)
Date: Friday, February 18, 2011 @ 02:45:08 Author: andrea Revision: 110245 archrelease: remove extra-x86_64 Deleted: arora/repos/extra-x86_64/
[arch-commits] Commit in arora/repos (extra-x86_64)
Date: Friday, February 18, 2011 @ 02:45:20 Author: andrea Revision: 110246 archrelease: copy trunk to extra-x86_64 Added: arora/repos/extra-x86_64/
[arch-commits] Commit in qt/trunk (PKGBUILD qt.install)
Date: Friday, February 18, 2011 @ 02:47:11
Author: andrea
Revision: 110247
build cache database of MIME types after installation (FS#22936)
Modified:
qt/trunk/PKGBUILD
qt/trunk/qt.install
+
PKGBUILD |2 +-
qt.install |1 +
2 files changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 07:45:20 UTC (rev 110246)
+++ PKGBUILD2011-02-18 07:47:11 UTC (rev 110247)
@@ -11,7 +11,7 @@
license=('GPL3' 'LGPL')
depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
-'xdg-utils' 'hicolor-icon-theme')
+'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmysqlclient: MySQL driver'
'unixodbc: ODBC driver'
Modified: qt.install
===
--- qt.install 2011-02-18 07:45:20 UTC (rev 110246)
+++ qt.install 2011-02-18 07:47:11 UTC (rev 110247)
@@ -1,5 +1,6 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor /dev/null
+update-desktop-database -q
}
post_upgrade() {
[arch-commits] Commit in k3b/trunk (fix-crash-with-qt-4.7.0.patch)
Date: Friday, February 18, 2011 @ 02:52:43
Author: andrea
Revision: 110248
cleanup
Deleted:
k3b/trunk/fix-crash-with-qt-4.7.0.patch
---+
fix-crash-with-qt-4.7.0.patch | 37 -
1 file changed, 37 deletions(-)
Deleted: fix-crash-with-qt-4.7.0.patch
===
--- fix-crash-with-qt-4.7.0.patch 2011-02-18 07:47:11 UTC (rev 110247)
+++ fix-crash-with-qt-4.7.0.patch 2011-02-18 07:52:43 UTC (rev 110248)
@@ -1,37 +0,0 @@
-Index: src/option/k3bpluginoptiontab.cpp
-===
src/option/k3bpluginoptiontab.cpp (revision 1168967)
-+++ src/option/k3bpluginoptiontab.cpp (working copy)
-@@ -43,12 +43,28 @@
- layout-addWidget( label );
- layout-addWidget( pluginSelector );
-
-+// find all categories
-+QHashQString, QString categoryNames;
-+
- foreach( K3b::Plugin* plugin, k3bcore-pluginManager()-plugins() ) {
--kDebug() Adding plugin plugin-pluginInfo().name();
--pluginSelector-addPlugins( QListKPluginInfo()
plugin-pluginInfo(),
-+categoryNames[ plugin-category() ] = plugin-categoryName();
-+}
-+
-+// add all plugins in each category
-+foreach( const QString category, categoryNames.keys() ) {
-+QListKPluginInfo plugins;
-+
-+foreach( K3b::Plugin* plugin, k3bcore-pluginManager()-plugins() ) {
-+if ( plugin-category() == category ) {
-+plugins plugin-pluginInfo();
-+kDebug() Adding plugin plugin-pluginInfo().name();
-+}
-+}
-+pluginSelector-addPlugins( plugins,
- KPluginSelector::ReadConfigFile,
--plugin-categoryName(),
--plugin-category() );
-+categoryNames[ category ],
-+category
-+ );
- }
- }
-
