[arch-commits] Commit in miro/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 04:13:43
Author: ronald
Revision: 127264
upgpkg: miro 4.0.1.1-1
update to v4.0.1.1
Modified:
miro/trunk/PKGBUILD
--+
PKGBUILD |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 03:23:36 UTC (rev 127263)
+++ PKGBUILD2011-06-12 08:13:43 UTC (rev 127264)
@@ -2,8 +2,8 @@
# Maintainer: Ronald van Haren ronald.archlinux.org
pkgname=miro
-pkgver=3.5.1
-pkgrel=2
+pkgver=4.0.1.1
+pkgrel=1
pkgdesc=The free and open source internet TV platform
arch=('i686' 'x86_64')
url=http://www.getmiro.com;
@@ -12,11 +12,12 @@
'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins'
'python-pycurl')
+'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins'
'python-pycurl'
+'gstreamer0.10-ffmpeg' 'ffmpeg')
makedepends=('pkg-config')
install=miro.install
source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('0f5c2a307e7040c9c2895ee9a2d1c3ff99d34e9e')
+sha1sums=('f6dbfb661bd642ccf60b38405c63182c7a9142df')
build() {
cd ${srcdir}/${pkgname}-${pkgver}/linux
[arch-commits] Commit in miro/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 04:13:47 Author: ronald Revision: 127265 archrelease: remove extra-i686 Deleted: miro/repos/extra-i686/
[arch-commits] Commit in miro/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 04:14:02 Author: ronald Revision: 127266 archrelease: copy trunk to extra-i686 Added: miro/repos/extra-i686/
[arch-commits] Commit in miro/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 04:14:06 Author: ronald Revision: 127267 archrelease: remove extra-x86_64 Deleted: miro/repos/extra-x86_64/
[arch-commits] Commit in miro/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 04:14:20 Author: ronald Revision: 127268 archrelease: copy trunk to extra-x86_64 Added: miro/repos/extra-x86_64/
[arch-commits] Commit in celestia/trunk (3 files)
Date: Sunday, June 12, 2011 @ 04:43:30
Author: ronald
Revision: 127269
upgpkg: celestia 1.6.1-1
bump to 1.6.1; add build patches from gentoo
Added:
celestia/trunk/celestia-1.6.1-gentoo.patch
Modified:
celestia/trunk/PKGBUILD
Deleted:
celestia/trunk/libpng14.patch
-+
PKGBUILD| 26 +++---
celestia-1.6.1-gentoo.patch | 23 +++
libpng14.patch | 12
3 files changed, 38 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 08:14:20 UTC (rev 127268)
+++ PKGBUILD2011-06-12 08:43:30 UTC (rev 127269)
@@ -3,32 +3,36 @@
# Contributor : Damir Perisa damir.per...@bluewin.ch
pkgname=celestia
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
pkgdesc=Real-time space simulation
arch=('i686' 'x86_64')
license=('GPL')
url=http://www.shatters.net/celestia/;
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa'
'libjpeg=8')
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
options=('!makeflags')
source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
- celestia-1.5.1-gcc44.patch libpng14.patch)
-md5sums=('9b96a8e7666ab5a26f032b9d605e023d'
- '0c606dbd3a641afb1b0725428db854c8'
- '829c0860659272a9f55aedf096ee4216')
+ celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+ '5ab2769e239a89468bb8ffb5740cbeec6018143c'
+ 'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# build patch
-patch -Np0 ${srcdir}/celestia-1.5.1-gcc44.patch || return 1
-patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+patch -Np0 ${srcdir}/celestia-1.5.1-gcc44.patch
+patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
./configure --prefix=/usr \
--with-lua=/usr \
--datadir=/usr/share \
--with-gtk
-make || return 1
-make DESTDIR=${pkgdir} install || return 1
+make
}
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+make DESTDIR=${pkgdir} install
+}
+
Added: celestia-1.6.1-gentoo.patch
===
--- celestia-1.6.1-gentoo.patch (rev 0)
+++ celestia-1.6.1-gentoo.patch 2011-06-12 08:43:30 UTC (rev 127269)
@@ -0,0 +1,23 @@
+--- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200
src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200
+@@ -15,6 +15,7 @@
+ if ENABLE_GTK
+ SUBDIRS += gtk
+ celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+
+ COMMONSOURCES = \
+
+Index: src/celengine/frametree.h
+===
+--- src/celengine/frametree.h (revision 5163)
src/celengine/frametree.h (arbetskopia)
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include vector
++#include cstddef
+
+ class Star;
+ class Body;
Deleted: libpng14.patch
===
--- libpng14.patch 2011-06-12 08:14:20 UTC (rev 127268)
+++ libpng14.patch 2011-06-12 08:43:30 UTC (rev 127269)
@@ -1,12 +0,0 @@
-diff -Nur celestia-1.6.0.orig/src/celengine/image.cpp
celestia-1.6.0/src/celengine/image.cpp
celestia-1.6.0.orig/src/celengine/image.cpp2009-06-22
18:44:08.0 +0300
-+++ celestia-1.6.0/src/celengine/image.cpp 2010-01-18 23:27:55.0
+0200
-@@ -737,7 +737,7 @@
-
- if (color_type == PNG_COLOR_TYPE_GRAY bit_depth 8)
- {
--png_set_gray_1_2_4_to_8(png_ptr);
-+png_set_expand_gray_1_2_4_to_8(png_ptr);
- }
-
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
[arch-commits] Commit in celestia/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 04:43:36 Author: ronald Revision: 127270 archrelease: remove extra-i686 Deleted: celestia/repos/extra-i686/
[arch-commits] Commit in celestia/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 04:43:52 Author: ronald Revision: 127271 archrelease: copy trunk to extra-i686 Added: celestia/repos/extra-i686/
[arch-commits] Commit in celestia/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 04:43:56 Author: ronald Revision: 127272 archrelease: remove extra-x86_64 Deleted: celestia/repos/extra-x86_64/
[arch-commits] Commit in celestia/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 04:44:12 Author: ronald Revision: 127273 archrelease: copy trunk to extra-x86_64 Added: celestia/repos/extra-x86_64/
[arch-commits] Commit in kile/trunk (PKGBUILD kile.install)
Date: Sunday, June 12, 2011 @ 05:04:19
Author: ronald
Revision: 127274
upgpkg: kile 2.1-1
update to latest version; fix install file; depend on kdebase-runtime so we
install oxygen-icons (needs a default iconset when KDE is not installed)
Modified:
kile/trunk/PKGBUILD
kile/trunk/kile.install
--+
PKGBUILD |6 +++---
kile.install |2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 08:44:12 UTC (rev 127273)
+++ PKGBUILD2011-06-12 09:04:19 UTC (rev 127274)
@@ -3,17 +3,17 @@
# Contributor : Damir Perisa damir.per...@bluewin.ch
pkgname=kile
-pkgver=2.1b5
+pkgver=2.1
pkgrel=1
pkgdesc=A user friendly TeX/LaTeX frontend for KDE.
arch=(i686 x86_64)
license=('GPL2')
url=http://kile.sourceforge.net/;
-depends=('kdelibs' 'texlive-core')
+depends=('kdebase-runtime' 'texlive-core')
makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl')
install=kile.install
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2;)
-sha1sums=('ee805e5210474d42344d690d24383adaad1d8842')
+sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf')
build() {
cd ${srcdir}
Modified: kile.install
===
--- kile.install2011-06-12 08:44:12 UTC (rev 127273)
+++ kile.install2011-06-12 09:04:19 UTC (rev 127274)
@@ -1,5 +1,7 @@
post_install() {
xdg-icon-resource forceupdate --theme hicolor /dev/null
+update-mime-database usr/share/mime /dev/null
+update-desktop-database -q
}
post_upgrade() {
[arch-commits] Commit in kile/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 05:04:24 Author: ronald Revision: 127275 archrelease: remove extra-i686 Deleted: kile/repos/extra-i686/
[arch-commits] Commit in kile/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 05:04:40 Author: ronald Revision: 127276 archrelease: copy trunk to extra-i686 Added: kile/repos/extra-i686/
[arch-commits] Commit in kile/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 05:04:44 Author: ronald Revision: 127277 archrelease: remove extra-x86_64 Deleted: kile/repos/extra-x86_64/
[arch-commits] Commit in kile/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 05:05:00 Author: ronald Revision: 127278 archrelease: copy trunk to extra-x86_64 Added: kile/repos/extra-x86_64/
[arch-commits] Commit in grub2/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 05:18:46
Author: ronald
Revision: 127279
upgpkg: grub2 1.99-1
update to 1.99 final
Modified:
grub2/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 09:05:00 UTC (rev 127278)
+++ PKGBUILD2011-06-12 09:18:46 UTC (rev 127279)
@@ -12,7 +12,7 @@
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
-pkgver='1.99~rc2.r3238'
+pkgver='1.99'
pkgrel=1
url=http://www.gnu.org/software/grub/;
arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@
options=(strip purge docs zipman !emptydirs)
# http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
-source=(ftp://ftp.archlinux.org/other/grub2/grub-${pkgver}.tar.xz;
+source=(ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz;
ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz;
ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz;
ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz;
@@ -37,7 +37,7 @@
grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz
grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz)
-sha1sums=('e5ae00ae7dee95a64599fdf7cf89c8518aa2de5c'
+sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
'9f2dbf7a3faab24ca92266400aa513fecd3895c8'
'b04994c005910b4bf123f034b30109d5c8d6fd86'
'e0c1a97770cc23226cf4535c029ef50b17f67974'
[arch-commits] Commit in grub2/repos (testing-i686)
Date: Sunday, June 12, 2011 @ 05:19:04 Author: ronald Revision: 127280 archrelease: copy trunk to testing-i686 Added: grub2/repos/testing-i686/
[arch-commits] Commit in grub2/repos (testing-x86_64)
Date: Sunday, June 12, 2011 @ 05:19:21 Author: ronald Revision: 127281 archrelease: copy trunk to testing-x86_64 Added: grub2/repos/testing-x86_64/
Re: [arch-commits] Commit in grub2/trunk (PKGBUILD)
On Sunday 12 June 2011 05:18:47 Ronald van Haren wrote:
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
-pkgver='1.99~rc2.r3238'
+pkgver='1.99'
Hi Ronald,
this needs epoch=1
--
Andrea
[arch-commits] Commit in grub2-efi-x86_64/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 07:02:43
Author: ronald
Revision: 127282
upgpkg: grub2-efi-x86_64 1.99-1
bump to 1.99
Modified:
grub2-efi-x86_64/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 09:19:21 UTC (rev 127281)
+++ PKGBUILD2011-06-12 11:02:43 UTC (rev 127282)
@@ -9,7 +9,7 @@
_grub2_gpxe_ver=12
pkgname=grub2-efi-x86_64
-pkgver='1.99~rc2.r3238'
+pkgver='1.99'
pkgrel=1
pkgdesc=The GNU GRand Unified Bootloader version 2 - x86_64 UEFI version
url=http://www.gnu.org/software/grub/;
@@ -22,14 +22,14 @@
replaces=('grub2-efi-x64')
#http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
-source=(ftp://ftp.archlinux.org/other/grub2/grub-${pkgver}.tar.xz;
+source=(ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz;
ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz;
ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz;)
noextract=(grub2_extras_lua_r${_grub2_lua_ver}.tar.xz
grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz)
-sha1sums=('e5ae00ae7dee95a64599fdf7cf89c8518aa2de5c'
+sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6'
'9f2dbf7a3faab24ca92266400aa513fecd3895c8'
'b04994c005910b4bf123f034b30109d5c8d6fd86')
[arch-commits] Commit in grub2-efi-x86_64/repos (testing-any)
Date: Sunday, June 12, 2011 @ 07:02:59 Author: ronald Revision: 127283 archrelease: copy trunk to testing-any Added: grub2-efi-x86_64/repos/testing-any/
[arch-commits] Commit in mesa/trunk (3 files)
Date: Sunday, June 12, 2011 @ 07:12:35
Author: andyrtr
Revision: 127284
upgpkg: mesa 7.10.99.git20110612-1
update snapshot
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/gnome-shell-shader-fix.patch
mesa/trunk/nouveau-fix-header.patch
--+
PKGBUILD | 10
gnome-shell-shader-fix.patch | 535 -
nouveau-fix-header.patch | 86 --
3 files changed, 5 insertions(+), 626 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 11:02:59 UTC (rev 127283)
+++ PKGBUILD2011-06-12 11:12:35 UTC (rev 127284)
@@ -9,7 +9,7 @@
#_git=false
if [ ${_git} = true ]; then
-pkgver=7.10.99.git20110531
+pkgver=7.10.99.git20110612
else
pkgver=7.10.2
fi
@@ -21,8 +21,8 @@
license=('custom')
source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch)
if [ ${_git} = true ]; then
- # mesa git shot from mastee (will become 7.11) branch - see for state:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1246cf13bc4e301b499a95d33e0cab26655fed5
- source=(${source[@]}
'ftp://ftp.archlinux.org/other/mesa/mesa-b1246cf13bc4e301b499a95d33e0cab26655fed5.tar.bz2')
+ # mesa git shot from mastee (will become 7.11) branch - see for state:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87
+ source=(${source[@]}
'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2')
else
source=(${source[@]}
ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2;
)
@@ -30,7 +30,7 @@
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
'3ec78f340f9387abd7a37b195e764cbf'
'67c87b77cc2236b52a3b47dad3fbb5d4'
- 'c2ff7ab905adf67a5d6c8acbbf495b12')
+ '77b10baeba21268d2a65440f99f97c12')
build() {
if [ ${_git} = true ]; then
@@ -209,7 +209,7 @@
package_ati-dri() {
depends=(libgl=${pkgver})
- pkgdesc=Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon
+ pkgdesc=Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI
Radeon
conflicts=('xf86-video-ati6.9.0-6')
if [ ${_git} = true ]; then
Deleted: gnome-shell-shader-fix.patch
===
--- gnome-shell-shader-fix.patch2011-06-12 11:02:59 UTC (rev 127283)
+++ gnome-shell-shader-fix.patch2011-06-12 11:12:35 UTC (rev 127284)
@@ -1,535 +0,0 @@
-From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001
-From: Christoph Bumiller e0425...@student.tuwien.ac.at
-Date: Thu, 31 Mar 2011 13:49:33 +
-Subject: nv50: copy regalloc fixes from nvc0
-
-Should fix gnome-shell's fade shader.
-
-Unification of the shader backend which is supposed to remove the
-code duplication is still WIP.
-diff --git a/src/gallium/drivers/nv50/nv50_pc.h
b/src/gallium/drivers/nv50/nv50_pc.h
-index e6f3815..a9a3248 100644
a/src/gallium/drivers/nv50/nv50_pc.h
-+++ b/src/gallium/drivers/nv50/nv50_pc.h
-@@ -228,6 +228,8 @@ struct nv_ref {
-ubyte flags; /* not used yet */
- };
-
-+#define NV_REF_FLAG_REGALLOC_PRIV (1 0)
-+
- struct nv_basic_block;
-
- struct nv_instruction {
-@@ -263,6 +265,15 @@ struct nv_instruction {
-ubyte quadop;
- };
-
-+static INLINE int
-+nvi_vector_size(struct nv_instruction *nvi)
-+{
-+ int i;
-+ assert(nvi);
-+ for (i = 0; i 4 nvi-def[i]; ++i);
-+ return i;
-+}
-+
- #define CFG_EDGE_FORWARD 0
- #define CFG_EDGE_BACK1
- #define CFG_EDGE_LOOP_ENTER 2
-diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-index 39ae366..657df2c 100644
a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-@@ -32,14 +32,39 @@
- #include util/u_simple_list.h
-
- #define NUM_REGISTER_FILES 4
-+#define MAX_REGISTER_COUNT 256
-
- struct register_set {
-struct nv_pc *pc;
-
-uint32_t last[NUM_REGISTER_FILES];
-- uint32_t bits[NUM_REGISTER_FILES][8];
-+ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32];
- };
-
-+/* using OR because a set bit means occupied/unavailable, aliasing is allowed
*/
-+static void
-+intersect_register_sets(struct register_set *dst,
-+struct register_set *src1, struct register_set *src2)
-+{
-+ int i, j;
-+
-+ for (i = 0; i NUM_REGISTER_FILES; ++i) {
-+ for (j = 0; j (MAX_REGISTER_COUNT + 31) / 32; ++j)
-+ dst-bits[i][j] = src1-bits[i][j] | src2-bits[i][j];
-+ }
-+}
-+
-+static void
-+mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask)
-+{
-+ int i, j;
-+
-+ for (i = 0; i NUM_REGISTER_FILES; ++i) {
-+ for (j = 0; j (MAX_REGISTER_COUNT + 31) / 32; ++j)
-+ set-bits[i][j] = (set-bits[i][j] | mask) umask;
-+ }
-+}
-+
- struct nv_pc_pass {
-struct nv_pc *pc;
-
-@@ -61,11 +86,15 @@
[arch-commits] Commit in mesa/repos (testing-i686)
Date: Sunday, June 12, 2011 @ 07:12:44 Author: andyrtr Revision: 127285 archrelease: remove testing-i686 Deleted: mesa/repos/testing-i686/
[arch-commits] Commit in mesa/repos (testing-i686)
Date: Sunday, June 12, 2011 @ 07:13:06 Author: andyrtr Revision: 127286 archrelease: copy trunk to testing-i686 Added: mesa/repos/testing-i686/
[arch-commits] Commit in mesa/repos (testing-x86_64)
Date: Sunday, June 12, 2011 @ 07:13:28 Author: andyrtr Revision: 127288 archrelease: copy trunk to testing-x86_64 Added: mesa/repos/testing-x86_64/
[arch-commits] Commit in grub2/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 07:30:29
Author: ronald
Revision: 127289
upgpkg: grub2 1.99-2
add epoch=1
Modified:
grub2/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 11:13:28 UTC (rev 127288)
+++ PKGBUILD2011-06-12 11:30:29 UTC (rev 127289)
@@ -13,10 +13,11 @@
pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386')
pkgbase=grub2
pkgver='1.99'
-pkgrel=1
+pkgrel=2
url=http://www.gnu.org/software/grub/;
arch=('i686' 'x86_64')
license=('GPL3')
+epoch=1
makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man'
'gettext' 'device-mapper')
options=(strip purge docs zipman !emptydirs)
[arch-commits] Commit in grub2/repos (testing-i686)
Date: Sunday, June 12, 2011 @ 07:30:32 Author: ronald Revision: 127290 archrelease: remove testing-i686 Deleted: grub2/repos/testing-i686/
[arch-commits] Commit in grub2/repos (testing-i686 testing-x86_64)
Date: Sunday, June 12, 2011 @ 07:31:06 Author: ronald Revision: 127291 archrelease: copy trunk to testing-i686 Added: grub2/repos/testing-i686/ Deleted: grub2/repos/testing-x86_64/
[arch-commits] Commit in grub2/repos (testing-x86_64)
Date: Sunday, June 12, 2011 @ 07:31:22 Author: ronald Revision: 127292 archrelease: copy trunk to testing-x86_64 Added: grub2/repos/testing-x86_64/
[arch-commits] Commit in grub2-efi-x86_64/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 07:35:21
Author: ronald
Revision: 127293
upgpkg: grub2-efi-x86_64 1.99-1
add epoch=1
Modified:
grub2-efi-x86_64/trunk/PKGBUILD
--+
PKGBUILD |1 +
1 file changed, 1 insertion(+)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 11:31:22 UTC (rev 127292)
+++ PKGBUILD2011-06-12 11:35:21 UTC (rev 127293)
@@ -20,6 +20,7 @@
makedepends=('python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext')
options=(strip purge docs zipman !emptydirs)
replaces=('grub2-efi-x64')
+epoch=1
#http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz;
source=(ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz;
[arch-commits] Commit in grub2-efi-x86_64/repos (testing-any)
Date: Sunday, June 12, 2011 @ 07:35:25 Author: ronald Revision: 127294 archrelease: remove testing-any Deleted: grub2-efi-x86_64/repos/testing-any/
[arch-commits] Commit in grub2-efi-x86_64/repos (testing-any)
Date: Sunday, June 12, 2011 @ 07:35:41 Author: ronald Revision: 127295 archrelease: copy trunk to testing-any Added: grub2-efi-x86_64/repos/testing-any/
[arch-commits] Commit in mesa/trunk (2 files)
Date: Sunday, June 12, 2011 @ 09:40:08
Author: ibiru
Revision: 127296
still needed by 7.10
Added:
mesa/trunk/gnome-shell-shader-fix.patch
mesa/trunk/nouveau-fix-header.patch
--+
gnome-shell-shader-fix.patch | 535 +
nouveau-fix-header.patch | 86 ++
2 files changed, 621 insertions(+)
Added: gnome-shell-shader-fix.patch
===
--- gnome-shell-shader-fix.patch(rev 0)
+++ gnome-shell-shader-fix.patch2011-06-12 13:40:08 UTC (rev 127296)
@@ -0,0 +1,535 @@
+From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001
+From: Christoph Bumiller e0425...@student.tuwien.ac.at
+Date: Thu, 31 Mar 2011 13:49:33 +
+Subject: nv50: copy regalloc fixes from nvc0
+
+Should fix gnome-shell's fade shader.
+
+Unification of the shader backend which is supposed to remove the
+code duplication is still WIP.
+---
+diff --git a/src/gallium/drivers/nv50/nv50_pc.h
b/src/gallium/drivers/nv50/nv50_pc.h
+index e6f3815..a9a3248 100644
+--- a/src/gallium/drivers/nv50/nv50_pc.h
b/src/gallium/drivers/nv50/nv50_pc.h
+@@ -228,6 +228,8 @@ struct nv_ref {
+ubyte flags; /* not used yet */
+ };
+
++#define NV_REF_FLAG_REGALLOC_PRIV (1 0)
++
+ struct nv_basic_block;
+
+ struct nv_instruction {
+@@ -263,6 +265,15 @@ struct nv_instruction {
+ubyte quadop;
+ };
+
++static INLINE int
++nvi_vector_size(struct nv_instruction *nvi)
++{
++ int i;
++ assert(nvi);
++ for (i = 0; i 4 nvi-def[i]; ++i);
++ return i;
++}
++
+ #define CFG_EDGE_FORWARD 0
+ #define CFG_EDGE_BACK1
+ #define CFG_EDGE_LOOP_ENTER 2
+diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+index 39ae366..657df2c 100644
+--- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+@@ -32,14 +32,39 @@
+ #include util/u_simple_list.h
+
+ #define NUM_REGISTER_FILES 4
++#define MAX_REGISTER_COUNT 256
+
+ struct register_set {
+struct nv_pc *pc;
+
+uint32_t last[NUM_REGISTER_FILES];
+- uint32_t bits[NUM_REGISTER_FILES][8];
++ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32];
+ };
+
++/* using OR because a set bit means occupied/unavailable, aliasing is allowed
*/
++static void
++intersect_register_sets(struct register_set *dst,
++struct register_set *src1, struct register_set *src2)
++{
++ int i, j;
++
++ for (i = 0; i NUM_REGISTER_FILES; ++i) {
++ for (j = 0; j (MAX_REGISTER_COUNT + 31) / 32; ++j)
++ dst-bits[i][j] = src1-bits[i][j] | src2-bits[i][j];
++ }
++}
++
++static void
++mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask)
++{
++ int i, j;
++
++ for (i = 0; i NUM_REGISTER_FILES; ++i) {
++ for (j = 0; j (MAX_REGISTER_COUNT + 31) / 32; ++j)
++ set-bits[i][j] = (set-bits[i][j] | mask) umask;
++ }
++}
++
+ struct nv_pc_pass {
+struct nv_pc *pc;
+
+@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range)
+}
+ }
+
++/* @return: TRUE if @new_range can be freed (i.e. was not reused) */
+ static boolean
+ add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range
*new_range)
+ {
+struct nv_range *range, **nextp = val-livei;
+
++ if (bgn == end) /* [a, a) is invalid / empty */
++ return TRUE;
++
+for (range = val-livei; range; range = range-next) {
+ if (end range-bgn)
+ break; /* insert before */
+@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val)
+id = s;
+m = (1 (1 s)) - 1;
+
++ assert(s = 0); /* XXX: remove me */
++
+set-bits[f][id / 32] |= m (id % 32);
+
+if (set-pc-max_reg[f] id)
+@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a,
struct nv_value *b)
+if (a-join-reg.id == b-join-reg.id)
+ return TRUE;
+
+-#if 1
+/* either a or b or both have been assigned */
+
+if (a-join-reg.id = 0 b-join-reg.id = 0)
+ return FALSE;
+else
+if (b-join-reg.id = 0) {
+- if (a-join-reg.id = 0)
+- return FALSE;
+ val = a;
+ a = b;
+ b = val;
+@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a,
struct nv_value *b)
+ return FALSE;
+}
+return TRUE;
+-#endif
+- return FALSE;
+ }
+
+ static INLINE void
+@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value
*a, struct nv_value *b)
+assert(b-join == a-join);
+ }
+
+-static INLINE void
++static INLINE boolean
+ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value
*b)
+ {
+if (!join_allowed(ctx, a, b)) {
+ #ifdef NV50_RA_DEBUG_JOIN
+ debug_printf(cannot join %i to %i: not allowed\n, b-n, a-n);
+ #endif
+- return;
++ return FALSE;
+}
+if (livei_have_overlap(a-join, b-join)) {
+ #ifdef
[arch-commits] Commit in mkinitcpio/repos (core-any testing-any)
Date: Sunday, June 12, 2011 @ 09:50:43 Author: thomas Revision: 127298 db-move: moved mkinitcpio from [testing] to [core] (any) Added: mkinitcpio/repos/core-any/ Deleted: mkinitcpio/repos/testing-any/
[arch-commits] Commit in mkinitcpio/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 10:07:08
Author: thomas
Revision: 127299
mkinitcpio 0.6.14
Dave Reisner (9):
functions: refactor auto_modules
functions: refactor all_modules
functions: refactor checked modules
mkinitcpio: use binary hashed depmod files
init: remove support for disablemodules
init: load all earlymodules at once
init_functions: support {LABEL,UUID}= syntax
init_functions: simplify mount case of root=/dev/*
init: purge environment before leaving early userspace
Thomas B?\195?\164chler (2):
default_mount_handler: Only try to manually create the root device if
devtmpfs is not used.
Release version 0.6.14
Modified:
mkinitcpio/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 13:50:43 UTC (rev 127298)
+++ PKGBUILD2011-06-12 14:07:08 UTC (rev 127299)
@@ -2,7 +2,7 @@
# Maintainer: Thomas Baechler tho...@archlinux.org
pkgname=mkinitcpio
-pkgver=0.6.13
+pkgver=0.6.14
pkgrel=1
pkgdesc=Modular initramfs image creation utility
arch=(any)
@@ -18,7 +18,7 @@
'klibc-module-init-tools' 'klibc-udev')
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz)
backup=(etc/mkinitcpio.conf)
-sha256sums=('fe145596593e381aac5111c8198ebc39df7271313618901f4805384066ebd4d6')
+sha256sums=('79eff04d530eefd9a753e35407cb35f20e023d2dbad5f92dd55dcc54273d38b3')
package() {
cd $srcdir/${pkgname}-${pkgver}
[arch-commits] Commit in mkinitcpio/repos (testing-any)
Date: Sunday, June 12, 2011 @ 10:07:22 Author: thomas Revision: 127300 archrelease: copy trunk to testing-any Added: mkinitcpio/repos/testing-any/
[arch-commits] Commit in bitlbee/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 10:10:02
Author: bisson
Revision: 127301
minor upstream update
Modified:
bitlbee/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 14:07:22 UTC (rev 127300)
+++ PKGBUILD2011-06-12 14:10:02 UTC (rev 127301)
@@ -6,8 +6,8 @@
# Maintainer: Gaetan Bisson bis...@archlinux.org
pkgname=bitlbee
-pkgver=3.0.2
-pkgrel=3
+pkgver=3.0.3
+pkgrel=1
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to
IRC'
arch=('i686' 'x86_64')
url='http://www.bitlbee.org/'
@@ -17,7 +17,7 @@
source=(http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz;
'xinetd'
'rc.d')
-sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc'
+sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff'
'5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
'be09d29af3853825778331df451f16ca9e452d03')
[arch-commits] Commit in bitlbee/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 10:10:08 Author: bisson Revision: 127302 archrelease: remove extra-i686 Deleted: bitlbee/repos/extra-i686/
[arch-commits] Commit in bitlbee/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 10:10:16 Author: bisson Revision: 127303 archrelease: copy trunk to extra-i686 Added: bitlbee/repos/extra-i686/
[arch-commits] Commit in bitlbee/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 10:10:17 Author: bisson Revision: 127304 archrelease: remove extra-x86_64 Deleted: bitlbee/repos/extra-x86_64/
[arch-commits] Commit in bitlbee/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 10:10:24 Author: bisson Revision: 127305 archrelease: copy trunk to extra-x86_64 Added: bitlbee/repos/extra-x86_64/
[arch-commits] Commit in bochs/trunk (PKGBUILD)
Date: Sunday, June 12, 2011 @ 20:31:34
Author: kevin
Revision: 127306
upgpkg: bochs 2.4.6-1
Updated to 2.4.6
Modified:
bochs/trunk/PKGBUILD
--+
PKGBUILD | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-12 14:10:24 UTC (rev 127305)
+++ PKGBUILD2011-06-13 00:31:34 UTC (rev 127306)
@@ -3,7 +3,7 @@
# Maintainer: Kevin Piche ke...@archlinux.org
pkgname=bochs
-pkgver=2.4.5
+pkgver=2.4.6
pkgrel=1
pkgdesc=A portable x86 PC emulation software package
arch=('i686' 'x86_64')
@@ -11,16 +11,21 @@
url=http://bochs.sourceforge.net/;
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
2.4.5-fetchcode.patch)
-depends=('gcc-libs' 'libxpm')
+depends=('gcc-libs' 'libxrandr')
+# 'libxpm')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
+ #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
--enable-fpu --enable-3dnow
- make || return 1
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make prefix=${pkgdir}/usr install
install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
}
-sha256sums=('b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616'
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
'3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')
[arch-commits] Commit in bochs/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 20:31:40 Author: kevin Revision: 127307 archrelease: remove extra-x86_64 Deleted: bochs/repos/extra-x86_64/
[arch-commits] Commit in bochs/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 20:31:54 Author: kevin Revision: 127308 archrelease: copy trunk to extra-x86_64 Added: bochs/repos/extra-x86_64/
[arch-commits] Commit in bochs/trunk (2.4.5-fetchcode.patch PKGBUILD)
Date: Sunday, June 12, 2011 @ 21:13:14
Author: kevin
Revision: 127309
upgpkg: bochs 2.4.6-1
Updated to 2.4.6
Modified:
bochs/trunk/PKGBUILD
Deleted:
bochs/trunk/2.4.5-fetchcode.patch
---+
2.4.5-fetchcode.patch | 45 -
PKGBUILD |8 ++--
2 files changed, 2 insertions(+), 51 deletions(-)
Deleted: 2.4.5-fetchcode.patch
===
--- 2.4.5-fetchcode.patch 2011-06-13 00:31:54 UTC (rev 127308)
+++ 2.4.5-fetchcode.patch 2011-06-13 01:13:14 UTC (rev 127309)
@@ -1,45 +0,0 @@
cpu/fetchdecode.cc.orig2010-04-16 15:52:44.0 -0400
-+++ cpu/fetchdecode.cc 2010-10-07 13:23:06.0 -0400
-@@ -1,5 +1,5 @@
- /
--// $Id: fetchdecode.cc,v 1.266 2010/04/16 19:52:44 sshwarts Exp $
-+// $Id: fetchdecode.cc,v 1.267 2010/04/29 21:04:23 sshwarts Exp $
- /
- //
- // Copyright (C) 2001-2009 The Bochs Project
-@@ -474,7 +474,7 @@
- /* 0F 0D /wr */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD,
NOP on Intel
- /* 0F 0E /wr */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /wr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /wr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1025,7 +1025,7 @@
- /* 0F 0D /dr */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD,
NOP on Intel
- /* 0F 0E /dr */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /dr */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /dr */ { 0, BX_IA_ERROR },
- #endif
-@@ -1583,7 +1583,7 @@
- /* 0F 0D /wm */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD,
NOP on Intel
- /* 0F 0E /wm */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /wm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /wm */ { 0, BX_IA_ERROR },
- #endif
-@@ -2134,7 +2134,7 @@
- /* 0F 0D /dm */ { 0, BX_IA_PREFETCHW }, // 3DNow! PREFETCH on AMD,
NOP on Intel
- /* 0F 0E /dm */ { 0, BX_IA_FEMMS }, // 3DNow! FEMMS
- #if BX_SUPPORT_3DNOW
-- /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR, Bx3DNowOpcodeInfo },
-+ /* 0F 0F /dm */ { BxImmediate_Ib, BX_IA_ERROR },
- #else
- /* 0F 0F /dm */ { 0, BX_IA_ERROR },
- #endif
Modified: PKGBUILD
===
--- PKGBUILD2011-06-13 00:31:54 UTC (rev 127308)
+++ PKGBUILD2011-06-13 01:13:14 UTC (rev 127309)
@@ -9,14 +9,12 @@
arch=('i686' 'x86_64')
license=('LGPL')
url=http://bochs.sourceforge.net/;
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-2.4.5-fetchcode.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
depends=('gcc-libs' 'libxrandr')
-# 'libxpm')
+sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch
./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \
--enable-fpu --enable-3dnow
make
@@ -27,5 +25,3 @@
make prefix=${pkgdir}/usr install
install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt
}
-sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9'
-'3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff')
[arch-commits] Commit in bochs/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 21:13:16 Author: kevin Revision: 127310 archrelease: remove extra-i686 Deleted: bochs/repos/extra-i686/
[arch-commits] Commit in bochs/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 21:13:23 Author: kevin Revision: 127311 archrelease: copy trunk to extra-i686 Added: bochs/repos/extra-i686/
[arch-commits] Commit in fvwm/trunk (PKGBUILD fvwm.desktop fvwm2.desktop)
Date: Sunday, June 12, 2011 @ 23:53:57
Author: eric
Revision: 127312
upgpkg: fvwm 2.6.1-3
Changed it to replace fvwm-devel, Disabled SMP build, Moved sample configs from
/etc to /usr/share/doc, Renamed and updated desktop file
Added:
fvwm/trunk/fvwm.desktop
Modified:
fvwm/trunk/PKGBUILD
Deleted:
fvwm/trunk/fvwm2.desktop
---+
PKGBUILD | 19 +--
fvwm.desktop |7 +++
fvwm2.desktop |8
3 files changed, 16 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-13 01:13:23 UTC (rev 127311)
+++ PKGBUILD2011-06-13 03:53:57 UTC (rev 127312)
@@ -3,20 +3,22 @@
pkgname=fvwm
pkgver=2.6.1
-pkgrel=2
+pkgrel=3
pkgdesc=A multiple large virtual desktop window manager originally derived
from twm
arch=('i686' 'x86_64')
url=http://www.fvwm.org;
license=('GPL' 'custom')
depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama'
'libxcursor')
makedepends=('libxslt')
+provides=('fvwm-devel')
conflicts=('fvwm-devel')
-options=('!emptydirs')
-source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2
fvwm2.desktop)
+replaces=('fvwm-devel')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2
fvwm.desktop)
md5sums=('fbbbed1bb41fa0878b17ee209947602d'
- 'e52a6ef25a936dcf3ad0e58f2e9ed0ea')
+ 'a12c52729a74355838404ee2f5716e0c')
sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36'
- 'e0924164329e7eb14e0d6137d8ff18cf6230191c')
+ '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,10 +29,7 @@
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
-
- install -d ${pkgdir}/etc/fvwm
- install -D -m644 sample.fvwmrc/* ${pkgdir}/etc/fvwm
- rm -f ${pkgdir}/etc/fvwm/Makefile*
- install -D -m644 ../fvwm2.desktop
${pkgdir}/usr/share/xsessions/fvwm2.desktop
+ install -D -m644
sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*}
${pkgdir}/usr/share/doc/fvwm
+ install -D -m644 ../fvwm.desktop ${pkgdir}/usr/share/xsessions/fvwm.desktop
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
Added: fvwm.desktop
===
--- fvwm.desktop(rev 0)
+++ fvwm.desktop2011-06-13 03:53:57 UTC (rev 127312)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=FVWM
+Comment=The fvwm window manager
+Type=XSession
+Exec=/usr/bin/fvwm
+TryExec=/usr/bin/fvwm
Deleted: fvwm2.desktop
===
--- fvwm2.desktop 2011-06-13 01:13:23 UTC (rev 127311)
+++ fvwm2.desktop 2011-06-13 03:53:57 UTC (rev 127312)
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=FVWM2
-Comment=The fvwm2 window manager
-Exec=fvwm2
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
[arch-commits] Commit in fvwm/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 23:54:01 Author: eric Revision: 127313 archrelease: remove extra-i686 Deleted: fvwm/repos/extra-i686/
[arch-commits] Commit in fvwm/repos (extra-i686)
Date: Sunday, June 12, 2011 @ 23:54:10 Author: eric Revision: 127314 archrelease: copy trunk to extra-i686 Added: fvwm/repos/extra-i686/
[arch-commits] Commit in fvwm/repos (extra-x86_64)
Date: Sunday, June 12, 2011 @ 23:54:12 Author: eric Revision: 127315 archrelease: remove extra-x86_64 Deleted: fvwm/repos/extra-x86_64/
[arch-commits] Commit in fvwm-crystal/repos (extra-any)
Date: Sunday, June 12, 2011 @ 23:57:03 Author: eric Revision: 127318 archrelease: remove extra-any Deleted: fvwm-crystal/repos/extra-any/
[arch-commits] Commit in fvwm-crystal/repos (extra-any)
Date: Sunday, June 12, 2011 @ 23:57:12 Author: eric Revision: 127319 archrelease: copy trunk to extra-any Added: fvwm-crystal/repos/extra-any/
[arch-commits] Commit in icewm/repos (extra-i686)
Date: Monday, June 13, 2011 @ 00:06:26 Author: eric Revision: 127321 archrelease: remove extra-i686 Deleted: icewm/repos/extra-i686/
[arch-commits] Commit in icewm/repos (extra-i686)
Date: Monday, June 13, 2011 @ 00:06:37 Author: eric Revision: 127322 archrelease: copy trunk to extra-i686 Added: icewm/repos/extra-i686/
[arch-commits] Commit in icewm/repos (extra-x86_64)
Date: Monday, June 13, 2011 @ 00:06:39 Author: eric Revision: 127323 archrelease: remove extra-x86_64 Deleted: icewm/repos/extra-x86_64/
[arch-commits] Commit in icewm/repos (extra-x86_64)
Date: Monday, June 13, 2011 @ 00:06:51 Author: eric Revision: 127324 archrelease: copy trunk to extra-x86_64 Added: icewm/repos/extra-x86_64/
[arch-commits] Commit in fvwm-devel/repos (extra-i686)
Date: Monday, June 13, 2011 @ 00:09:56 Author: eric Revision: 127325 db-remove: fvwm-devel removed by eric Deleted: fvwm-devel/repos/extra-i686/
[arch-commits] Commit in fvwm-devel/repos (extra-x86_64)
Date: Monday, June 13, 2011 @ 00:10:35 Author: eric Revision: 127326 db-remove: fvwm-devel removed by eric Deleted: fvwm-devel/repos/extra-x86_64/
[arch-commits] Commit in (fvwm-devel)
Date: Monday, June 13, 2011 @ 00:12:18 Author: eric Revision: 127327 No longer developed or supported upstream, Removing from repo Deleted: fvwm-devel/
[arch-commits] Commit in indent/trunk (3 files)
Date: Monday, June 13, 2011 @ 01:26:28
Author: eric
Revision: 127328
upgpkg: indent 2.2.11-1
Upstream update, Improved description, Removed texinfo depends, Added texi2html
makedepends, Added patch to fix seg fault, PKGBUILD cleanup
Added:
indent/trunk/indent-2.2.11-segfault.patch
Modified:
indent/trunk/PKGBUILD
indent/trunk/indent.install
--+
PKGBUILD | 34 ++
indent-2.2.11-segfault.patch | 16
indent.install |4 +++-
3 files changed, 37 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-13 04:12:18 UTC (rev 127327)
+++ PKGBUILD2011-06-13 05:26:28 UTC (rev 127328)
@@ -4,28 +4,30 @@
# Contributor: Herb Rose (hros...@yahoo.com)
pkgname=indent
-pkgver=2.2.10
-pkgrel=4
-pkgdesc=The GNU Pretty-printer
+pkgver=2.2.11
+pkgrel=1
+pkgdesc=A tool to change the appearance of a C program by inserting or
deleting whitespace
arch=('i686' 'x86_64')
url=http://indent.isidore-it.eu/beautify.html;
-depends=('glibc' 'texinfo')
+depends=('glibc')
+makedepends=('texi2html')
license=('GPL3')
install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
-md5sums=('be35ea62705733859fbf8caf816d8959')
-sha1sums=('20fa8a7a4af6670c3254c8b87020291c3db37ed1')
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz
indent-2.2.11-segfault.patch)
+md5sums=('98beafca62472805a3739d3867d5d70f'
+ 'e5ded8513547ff4555dec2bb805dd2ab')
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+ '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
build() {
cd $srcdir/$pkgname-$pkgver
- # Fix doc install path
- sed -i 's|^docdir = .*$|docdir = @docdir@|' doc/Makefile.in || return 1
-
- # Fix manpage installation
- sed -i 's|\(info texinfo2man\)\.c Makefile\.am|\1|' man/Makefile.in ||
return 1
- rm man/indent.1
+ patch -p1 -i ../indent-2.2.11-segfault.patch
+ sed -i 's/-number/-number-sections/' doc/Makefile.in
+ ./configure --prefix=/usr
+ make
+}
- ./configure --prefix=/usr --datadir=/usr/share
--docdir=/usr/share/doc/indent || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir docdir=/usr/share/doc/indent install
}
Added: indent-2.2.11-segfault.patch
===
--- indent-2.2.11-segfault.patch(rev 0)
+++ indent-2.2.11-segfault.patch2011-06-13 05:26:28 UTC (rev 127328)
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+char buf[1024];
+int line_no = 0;
+
++ if (argc != 3)
++ {
++ fprintf(stderr, Usage: %s man template info file\n, argv[0]);
++ fprintf(stderr, The man page will be written to stdout.\n);
++ return -1;
++ }
++
+texinfoname = argv[2];
+
+in = fopen (argv[2], r);
Modified: indent.install
===
--- indent.install 2011-06-13 04:12:18 UTC (rev 127327)
+++ indent.install 2011-06-13 05:26:28 UTC (rev 127328)
@@ -1,7 +1,8 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
info_file=indent.info.gz
post_install() {
+[ -x usr/bin/install-info ] || return 0
install-info ${info_dir}/$info_file ${info_dir}/dir 2 /dev/null
}
@@ -10,5 +11,6 @@
}
pre_remove() {
+[ -x usr/bin/install-info ] || return 0
install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2 /dev/null
}
[arch-commits] Commit in indent/repos (extra-i686)
Date: Monday, June 13, 2011 @ 01:26:39 Author: eric Revision: 127329 archrelease: remove extra-i686 Deleted: indent/repos/extra-i686/
[arch-commits] Commit in indent/repos (extra-i686)
Date: Monday, June 13, 2011 @ 01:26:47 Author: eric Revision: 127330 archrelease: copy trunk to extra-i686 Added: indent/repos/extra-i686/
[arch-commits] Commit in indent/repos (extra-x86_64)
Date: Monday, June 13, 2011 @ 01:26:48 Author: eric Revision: 127331 archrelease: remove extra-x86_64 Deleted: indent/repos/extra-x86_64/
[arch-commits] Commit in indent/repos (extra-x86_64)
Date: Monday, June 13, 2011 @ 01:26:57 Author: eric Revision: 127332 archrelease: copy trunk to extra-x86_64 Added: indent/repos/extra-x86_64/
