[arch-commits] Commit in hwdetect/repos (3 files)
Date: Thursday, February 11, 2010 @ 03:00:02 Author: tpowa Revision: 68162 Merged revisions 68161 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/hwdetect/trunk r68161 | tpowa | 2010-02-11 08:59:19 +0100 (Do, 11 Feb 2010) | 2 lines upgpkg: hwdetect 2010.02-3 fixed various output things Modified: hwdetect/repos/extra-x86_64/ (properties) hwdetect/repos/extra-x86_64/PKGBUILD hwdetect/repos/extra-x86_64/hwdetect --+ PKGBUILD |5 +++-- hwdetect | 12 +--- 2 files changed, 12 insertions(+), 5 deletions(-) Property changes on: hwdetect/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /hwdetect/trunk:1-67612 + /hwdetect/trunk:1-68161 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 07:59:19 UTC (rev 68161) +++ extra-x86_64/PKGBUILD 2010-02-11 08:00:02 UTC (rev 68162) @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski tp...@archlinux.org pkgname=hwdetect pkgver=2010.02 -pkgrel=2 +pkgrel=3 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support arch=(i686 x86_64) license=('GPL') @@ -16,4 +16,5 @@ build() { install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect } -md5sums=('37c57d0158761b5ece8fdc341cdcce43') + +md5sums=('8481aa25d82f06464a63c493f66a2742') Modified: extra-x86_64/hwdetect === --- extra-x86_64/hwdetect 2010-02-11 07:59:19 UTC (rev 68161) +++ extra-x86_64/hwdetect 2010-02-11 08:00:02 UTC (rev 68162) @@ -108,6 +108,9 @@ # vmware switch [ $(echo $* | grep '\-vmware') ] VMWARE=1 +# vmware switch +[ $(echo $* | grep '\-hooks') ] HOOKS=1 + ADVANCED= # root device check if ! [ $ROOTDEVICE = ]; then @@ -483,15 +486,18 @@ ;; --uvesafb) FB=uvesafb MODULES_INITRAMFS=$FB $MODULES_INITRAMFS - showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' + ! [ $HOOKS = 1 ] showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' ;; --fbmodule) FB= for i in $(cat /etc/modprobe.d/framebuffer_blacklist.conf); do i=$(echo $i | sed -e 's/blacklist //g') -cat /proc/modules | grep -q ^$i FB=$i + # check if already in FB array, to avoid double entries + if [ $(cat /proc/modules | grep ^$i) ]; then + ! [ $(grep -w $FB) ] FB=$i + fi done MODULES_INITRAMFS=$FB $MODULES_INITRAMFS - showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' + ! [ $HOOKS = 1 ] showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' ;; --net) if [ $(showlist2 MODULES \($(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/) \) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp') ] ; then if [ $(dmesg | grep 'use 8139too') ]; then
[arch-commits] Commit in hwdetect/repos (3 files)
Date: Thursday, February 11, 2010 @ 03:00:48 Author: tpowa Revision: 68163 Merged revisions 68161 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/hwdetect/trunk r68161 | tpowa | 2010-02-11 07:59:19 + (Do, 11 Feb 2010) | 2 lines upgpkg: hwdetect 2010.02-3 fixed various output things Modified: hwdetect/repos/extra-i686/(properties) hwdetect/repos/extra-i686/PKGBUILD hwdetect/repos/extra-i686/hwdetect --+ PKGBUILD |5 +++-- hwdetect | 12 +--- 2 files changed, 12 insertions(+), 5 deletions(-) Property changes on: hwdetect/repos/extra-i686 ___ Modified: svnmerge-integrated - /hwdetect/trunk:1-67613 + /hwdetect/trunk:1-68162 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:00:02 UTC (rev 68162) +++ extra-i686/PKGBUILD 2010-02-11 08:00:48 UTC (rev 68163) @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski tp...@archlinux.org pkgname=hwdetect pkgver=2010.02 -pkgrel=2 +pkgrel=3 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support arch=(i686 x86_64) license=('GPL') @@ -16,4 +16,5 @@ build() { install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect } -md5sums=('37c57d0158761b5ece8fdc341cdcce43') + +md5sums=('8481aa25d82f06464a63c493f66a2742') Modified: extra-i686/hwdetect === --- extra-i686/hwdetect 2010-02-11 08:00:02 UTC (rev 68162) +++ extra-i686/hwdetect 2010-02-11 08:00:48 UTC (rev 68163) @@ -108,6 +108,9 @@ # vmware switch [ $(echo $* | grep '\-vmware') ] VMWARE=1 +# vmware switch +[ $(echo $* | grep '\-hooks') ] HOOKS=1 + ADVANCED= # root device check if ! [ $ROOTDEVICE = ]; then @@ -483,15 +486,18 @@ ;; --uvesafb) FB=uvesafb MODULES_INITRAMFS=$FB $MODULES_INITRAMFS - showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' + ! [ $HOOKS = 1 ] showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' ;; --fbmodule) FB= for i in $(cat /etc/modprobe.d/framebuffer_blacklist.conf); do i=$(echo $i | sed -e 's/blacklist //g') -cat /proc/modules | grep -q ^$i FB=$i + # check if already in FB array, to avoid double entries + if [ $(cat /proc/modules | grep ^$i) ]; then + ! [ $(grep -w $FB) ] FB=$i + fi done MODULES_INITRAMFS=$FB $MODULES_INITRAMFS - showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' + ! [ $HOOKS = 1 ] showlist2 MODULES \$MODULES_INITRAMFS\ | sed -e 's/(\ /(/g' -e 's/\ //g' -e 's/\ //g' -e 's/\ \ /\ /g' ;; --net) if [ $(showlist2 MODULES \($(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/) \) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp') ] ; then if [ $(dmesg | grep 'use 8139too') ]; then
[arch-commits] Commit in libdrm/trunk (PKGBUILD intel_gitupdate.diff)
Date: Thursday, February 11, 2010 @ 03:19:14 Author: thomas Revision: 68164 Fix intel bugs that made the 2.10 driver unusable This adds the following 3 commits from upstream libdrm master: 973d8d6bd04230da801a8bc19af41dbc60e1918d: intel: check return value for calloc fdcde592c2c48e143251672cf2e82debb07606bd: intel: Account for potential pinned buffers hogging fences 4f0f871730b76730ca58209181d16725b0c40184: intel: Handle resetting of input params after EINTR during SET_TILING Added: libdrm/trunk/intel_gitupdate.diff Modified: libdrm/trunk/PKGBUILD --+ PKGBUILD |3 ++ intel_gitupdate.diff | 64 + 2 files changed, 67 insertions(+) Modified: PKGBUILD === --- PKGBUILD2010-02-11 08:00:48 UTC (rev 68163) +++ PKGBUILD2010-02-11 08:19:14 UTC (rev 68164) @@ -13,16 +13,19 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch nouveau_gitupdate.diff + intel_gitupdate.diff COPYING) md5sums=('667d81f993f7fd8a1b1b1b830a28a748' '9b5ec3bbebe86921e2057694c42f65b8' 'f83babf7dc9d2a698b94d46b090ed674' + '3ebf954a427746af68330d2fa2da4e47' 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/no-pthread-stubs.patch || return 1 patch -Np0 -i ${srcdir}/nouveau_gitupdate.diff || return 1 + patch -Np1 -i ${srcdir}/intel_gitupdate.diff || return 1 libtoolize --force || return 1 aclocal || return 1 autoconf || return 1 Added: intel_gitupdate.diff === --- intel_gitupdate.diff(rev 0) +++ intel_gitupdate.diff2010-02-11 08:19:14 UTC (rev 68164) @@ -0,0 +1,64 @@ +diff -u b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +--- b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +@@ -1423,18 +1423,15 @@ + + memset(set_tiling, 0, sizeof(set_tiling)); + set_tiling.handle = bo_gem-gem_handle; +- set_tiling.tiling_mode = *tiling_mode; +- set_tiling.stride = stride; + + do { ++ set_tiling.tiling_mode = *tiling_mode; ++ set_tiling.stride = stride; ++ + ret = ioctl(bufmgr_gem-fd, + DRM_IOCTL_I915_GEM_SET_TILING, + set_tiling); + } while (ret == -1 errno == EINTR); +- if (ret != 0) { +- *tiling_mode = bo_gem-tiling_mode; +- return -errno; +- } + bo_gem-tiling_mode = set_tiling.tiling_mode; + bo_gem-swizzle_mode = set_tiling.swizzle_mode; + +@@ -1445,7 +1442,7 @@ + drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); + + *tiling_mode = bo_gem-tiling_mode; +- return 0; ++ return ret == 0 ? 0 : -errno; + } + + static int +@@ -1727,6 +1724,9 @@ + unsigned long size; + + bufmgr_gem = calloc(1, sizeof(*bufmgr_gem)); ++ if (bufmgr_gem == NULL) ++ return NULL; ++ + bufmgr_gem-fd = fd; + + if (pthread_mutex_init(bufmgr_gem-lock, NULL) != 0) { +@@ -1766,6 +1766,19 @@ + fprintf(stderr, param: %d, val: %d\n, gp.param, + *gp.value); + bufmgr_gem-available_fences = 0; ++ } else { ++ /* XXX The kernel reports the total number of fences, ++ * including any that may be pinned. ++ * ++ * We presume that there will be at least one pinned ++ * fence for the scanout buffer, but there may be more ++ * than one scanout and the user may be manually ++ * pinning buffers. Let's move to execbuffer2 and ++ * thereby forget the insanity of using fences... ++ */ ++ bufmgr_gem-available_fences -= 2; ++ if (bufmgr_gem-available_fences 0) ++ bufmgr_gem-available_fences = 0; + } + } +
[arch-commits] Commit in brasero/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:23:37 Author: jgc Revision: 68165 Merged revisions 67983 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/brasero/trunk r67983 | jgc | 2010-02-10 09:37:21 +0100 (Wed, 10 Feb 2010) | 1 line Replace nautilus-cd-burner Modified: brasero/repos/extra-i686/ (properties) brasero/repos/extra-i686/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Property changes on: brasero/repos/extra-i686 ___ Modified: svnmerge-integrated - /brasero/trunk:1-61419 + /brasero/trunk:1-68164 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:19:14 UTC (rev 68164) +++ extra-i686/PKGBUILD 2010-02-11 08:23:37 UTC (rev 68165) @@ -4,7 +4,7 @@ pkgname=brasero pkgver=2.28.3 -pkgrel=1 +pkgrel=2 pkgdesc=A disc burning application for Gnome arch=('i686' 'x86_64') url=http://www.gnome.org/projects/brasero; @@ -17,6 +17,7 @@ 'dvdauthor: video project' 'gstreamer0.10-bad-plugins: video project' 'vcdimager: video project') +replaces=('nautilus-cd-burner') install=brasero.install source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.28/brasero-${pkgver}.tar.bz2) sha256sums=('adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c')
[arch-commits] Commit in brasero/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:24:12 Author: jgc Revision: 68166 Merged revisions 67983 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/brasero/trunk r67983 | jgc | 2010-02-10 09:37:21 +0100 (Wed, 10 Feb 2010) | 1 line Replace nautilus-cd-burner Modified: brasero/repos/extra-x86_64/ (properties) brasero/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Property changes on: brasero/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /brasero/trunk:1-61382 + /brasero/trunk:1-68165 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 08:23:37 UTC (rev 68165) +++ extra-x86_64/PKGBUILD 2010-02-11 08:24:12 UTC (rev 68166) @@ -4,7 +4,7 @@ pkgname=brasero pkgver=2.28.3 -pkgrel=1 +pkgrel=2 pkgdesc=A disc burning application for Gnome arch=('i686' 'x86_64') url=http://www.gnome.org/projects/brasero; @@ -17,6 +17,7 @@ 'dvdauthor: video project' 'gstreamer0.10-bad-plugins: video project' 'vcdimager: video project') +replaces=('nautilus-cd-burner') install=brasero.install source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.28/brasero-${pkgver}.tar.bz2) sha256sums=('adaee8f93170d5799cddcd116a01a8687fabb86575dd5dc88f1f668bb397623c')
[arch-commits] Commit in gnome-desktop-sharp/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:27:22 Author: jgc Revision: 68167 Merged revisions 67981 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-desktop-sharp/trunk r67981 | jgc | 2010-02-10 09:32:29 +0100 (Wed, 10 Feb 2010) | 1 line Update dependencies to GNOME 2.28 versions, remove nautilus-cd-burner dependencies Modified: gnome-desktop-sharp/repos/extra-i686/ (properties) gnome-desktop-sharp/repos/extra-i686/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Property changes on: gnome-desktop-sharp/repos/extra-i686 ___ Modified: svnmerge-integrated - /gnome-desktop-sharp/trunk:1-54876 + /gnome-desktop-sharp/trunk:1-68166 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:24:12 UTC (rev 68166) +++ extra-i686/PKGBUILD 2010-02-11 08:27:22 UTC (rev 68167) @@ -3,15 +3,14 @@ pkgname=gnome-desktop-sharp pkgver=2.26.0 -pkgrel=2 +pkgrel=3 pkgdesc=GNOME desktop bindings for C# arch=(i686 x86_64) license=(LGPL) url=http://gtk-sharp.sourceforge.net; -depends=('gnome-sharp=2.24.1' 'vte=0.20.5' 'librsvg=2.26.0' 'gnome-panel=2.27.4' 'libwnck=2.27.5' 'gtkhtml=3.27.90' 'gtksourceview2=2.7.4') -makedepends=('pkgconfig' 'monodoc' 'nautilus-cd-burner=2.24.0' 'libgnomeprintui=2.18.4') -optdepends=('nautilus-cd-burner' -'libgnomeprintui') +depends=('gnome-sharp=2.24.1' 'vte=0.22.5' 'librsvg=2.26.0' 'gnome-panel=2.28.0' 'libwnck=2.28.0' 'gtkhtml=3.28.2' 'gtksourceview2=2.8.2') +makedepends=('pkgconfig' 'monodoc' 'libgnomeprintui=2.18.4') +optdepends=('libgnomeprintui') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) md5sums=('4bc990900bb318b2ba0b0e7998bb47d1')
[arch-commits] Commit in gnome-desktop-sharp/repos (2 files)
Date: Thursday, February 11, 2010 @ 03:27:38 Author: jgc Revision: 68168 Merged revisions 67981 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-desktop-sharp/trunk r67981 | jgc | 2010-02-10 09:32:29 +0100 (Wed, 10 Feb 2010) | 1 line Update dependencies to GNOME 2.28 versions, remove nautilus-cd-burner dependencies Modified: gnome-desktop-sharp/repos/extra-x86_64/ (properties) gnome-desktop-sharp/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Property changes on: gnome-desktop-sharp/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /gnome-desktop-sharp/trunk:1-54874 + /gnome-desktop-sharp/trunk:1-68167 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 08:27:22 UTC (rev 68167) +++ extra-x86_64/PKGBUILD 2010-02-11 08:27:38 UTC (rev 68168) @@ -3,15 +3,14 @@ pkgname=gnome-desktop-sharp pkgver=2.26.0 -pkgrel=2 +pkgrel=3 pkgdesc=GNOME desktop bindings for C# arch=(i686 x86_64) license=(LGPL) url=http://gtk-sharp.sourceforge.net; -depends=('gnome-sharp=2.24.1' 'vte=0.20.5' 'librsvg=2.26.0' 'gnome-panel=2.27.4' 'libwnck=2.27.5' 'gtkhtml=3.27.90' 'gtksourceview2=2.7.4') -makedepends=('pkgconfig' 'monodoc' 'nautilus-cd-burner=2.24.0' 'libgnomeprintui=2.18.4') -optdepends=('nautilus-cd-burner' -'libgnomeprintui') +depends=('gnome-sharp=2.24.1' 'vte=0.22.5' 'librsvg=2.26.0' 'gnome-panel=2.28.0' 'libwnck=2.28.0' 'gtkhtml=3.28.2' 'gtksourceview2=2.8.2') +makedepends=('pkgconfig' 'monodoc' 'libgnomeprintui=2.18.4') +optdepends=('libgnomeprintui') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) md5sums=('4bc990900bb318b2ba0b0e7998bb47d1')
[arch-commits] Commit in gnome-python-desktop/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:30:32 Author: jgc Revision: 68169 Merged revisions 67982 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/gnome-python-desktop/trunk r67982 | jgc | 2010-02-10 09:36:23 +0100 (Wed, 10 Feb 2010) | 1 line Remove nautilus-cd-burner bindings Modified: gnome-python-desktop/repos/extra-i686/(properties) gnome-python-desktop/repos/extra-i686/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Property changes on: gnome-python-desktop/repos/extra-i686 ___ Modified: svnmerge-integrated - /gnome-python-desktop/trunk:1-59274 + /gnome-python-desktop/trunk:1-68168 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:27:38 UTC (rev 68168) +++ extra-i686/PKGBUILD 2010-02-11 08:30:32 UTC (rev 68169) @@ -5,14 +5,14 @@ pkgname=gnome-python-desktop pkgver=2.28.0 -pkgrel=2 +pkgrel=3 pkgdesc=Gnome Python interfaces for libraries not part of the core platform arch=(i686 x86_64) license=('GPL' 'LGPL') depends=('gnome-desktop=2.28.1' 'gnome-python=2.28.0') options=('!libtool') -makedepends=('intltool' 'pkgconfig' 'gnome-media=2.28.1' 'gnome-panel=2.28.0' 'gtksourceview=1.8.5' 'libgnomeprintui=2.18.4' 'libgtop=2.28.0' 'totem-plparser=2.28.1' 'nautilus-cd-burner=2.25.3' 'evince=2.28.1' 'bug-buddy=2.28.0' 'brasero=2.28.2') -optdepends=('gnome-media' 'gnome-panel' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'nautilus-cd-burner' 'evince' 'bug-buddy' 'brasero') +makedepends=('intltool' 'pkgconfig' 'gnome-media=2.28.1' 'gnome-panel=2.28.0' 'gtksourceview=1.8.5' 'libgnomeprintui=2.18.4' 'libgtop=2.28.0' 'totem-plparser=2.28.1' 'evince=2.28.1' 'bug-buddy=2.28.0' 'brasero=2.28.2') +optdepends=('gnome-media' 'gnome-panel' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'evince' 'bug-buddy' 'brasero') url=http://www.gnome.org; source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) sha256sums=('92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f')
[arch-commits] Commit in libdrm/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:33:00 Author: jgc Revision: 68171 upgpkg: libdrm 2.4.17-4 pkgrel++; Modified: libdrm/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 08:30:49 UTC (rev 68170) +++ PKGBUILD2010-02-11 08:33:00 UTC (rev 68171) @@ -3,7 +3,7 @@ pkgname=libdrm pkgver=2.4.17 -pkgrel=3 +pkgrel=4 pkgdesc=Userspace interface to kernel DRM services arch=(i686 x86_64) license=('custom') @@ -12,10 +12,10 @@ url=http://dri.freedesktop.org/; source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - nouveau_gitupdate.diff - intel_gitupdate.diff +nouveau_gitupdate.diff +intel_gitupdate.diff COPYING) - md5sums=('667d81f993f7fd8a1b1b1b830a28a748' +md5sums=('667d81f993f7fd8a1b1b1b830a28a748' '9b5ec3bbebe86921e2057694c42f65b8' 'f83babf7dc9d2a698b94d46b090ed674' '3ebf954a427746af68330d2fa2da4e47'
[arch-commits] Commit in libdrm/repos (3 files)
Date: Thursday, February 11, 2010 @ 03:33:15 Author: jgc Revision: 68172 Merged revisions 68164,68171 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdrm/trunk r68164 | thomas | 2010-02-11 09:19:14 +0100 (Thu, 11 Feb 2010) | 7 lines Fix intel bugs that made the 2.10 driver unusable This adds the following 3 commits from upstream libdrm master: 973d8d6bd04230da801a8bc19af41dbc60e1918d: intel: check return value for calloc fdcde592c2c48e143251672cf2e82debb07606bd: intel: Account for potential pinned buffers hogging fences 4f0f871730b76730ca58209181d16725b0c40184: intel: Handle resetting of input params after EINTR during SET_TILING r68171 | jgc | 2010-02-11 09:33:00 +0100 (Thu, 11 Feb 2010) | 2 lines upgpkg: libdrm 2.4.17-4 pkgrel++; Added: libdrm/repos/extra-i686/intel_gitupdate.diff (from rev 68171, libdrm/trunk/intel_gitupdate.diff) Modified: libdrm/repos/extra-i686/ (properties) libdrm/repos/extra-i686/PKGBUILD --+ PKGBUILD |9 -- intel_gitupdate.diff | 64 + 2 files changed, 70 insertions(+), 3 deletions(-) Property changes on: libdrm/repos/extra-i686 ___ Modified: svnmerge-integrated - /libdrm/trunk:1-63503 + /libdrm/trunk:1-68171 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:33:00 UTC (rev 68171) +++ extra-i686/PKGBUILD 2010-02-11 08:33:15 UTC (rev 68172) @@ -3,7 +3,7 @@ pkgname=libdrm pkgver=2.4.17 -pkgrel=3 +pkgrel=4 pkgdesc=Userspace interface to kernel DRM services arch=(i686 x86_64) license=('custom') @@ -12,17 +12,20 @@ url=http://dri.freedesktop.org/; source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - nouveau_gitupdate.diff +nouveau_gitupdate.diff +intel_gitupdate.diff COPYING) - md5sums=('667d81f993f7fd8a1b1b1b830a28a748' +md5sums=('667d81f993f7fd8a1b1b1b830a28a748' '9b5ec3bbebe86921e2057694c42f65b8' 'f83babf7dc9d2a698b94d46b090ed674' + '3ebf954a427746af68330d2fa2da4e47' 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/no-pthread-stubs.patch || return 1 patch -Np0 -i ${srcdir}/nouveau_gitupdate.diff || return 1 + patch -Np1 -i ${srcdir}/intel_gitupdate.diff || return 1 libtoolize --force || return 1 aclocal || return 1 autoconf || return 1 Copied: libdrm/repos/extra-i686/intel_gitupdate.diff (from rev 68171, libdrm/trunk/intel_gitupdate.diff) === --- extra-i686/intel_gitupdate.diff (rev 0) +++ extra-i686/intel_gitupdate.diff 2010-02-11 08:33:15 UTC (rev 68172) @@ -0,0 +1,64 @@ +diff -u b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +--- b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +@@ -1423,18 +1423,15 @@ + + memset(set_tiling, 0, sizeof(set_tiling)); + set_tiling.handle = bo_gem-gem_handle; +- set_tiling.tiling_mode = *tiling_mode; +- set_tiling.stride = stride; + + do { ++ set_tiling.tiling_mode = *tiling_mode; ++ set_tiling.stride = stride; ++ + ret = ioctl(bufmgr_gem-fd, + DRM_IOCTL_I915_GEM_SET_TILING, + set_tiling); + } while (ret == -1 errno == EINTR); +- if (ret != 0) { +- *tiling_mode = bo_gem-tiling_mode; +- return -errno; +- } + bo_gem-tiling_mode = set_tiling.tiling_mode; + bo_gem-swizzle_mode = set_tiling.swizzle_mode; + +@@ -1445,7 +1442,7 @@ + drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); + + *tiling_mode = bo_gem-tiling_mode; +- return 0; ++ return ret == 0 ? 0 : -errno; + } + + static int +@@ -1727,6 +1724,9 @@ + unsigned long size; + + bufmgr_gem = calloc(1, sizeof(*bufmgr_gem)); ++ if (bufmgr_gem == NULL) ++ return NULL; ++ + bufmgr_gem-fd = fd; + + if (pthread_mutex_init(bufmgr_gem-lock, NULL) != 0) { +@@ -1766,6 +1766,19 @@ + fprintf(stderr, param: %d, val: %d\n, gp.param, + *gp.value); + bufmgr_gem-available_fences = 0; ++ } else { ++ /* XXX The kernel reports the total number of fences, ++ * including any that may be pinned. ++ * ++ * We presume that there will be at least one pinned ++ * fence for the scanout buffer, but there may be more ++ * than one scanout and the user may be manually ++
[arch-commits] Commit in libdrm/repos (3 files)
Date: Thursday, February 11, 2010 @ 03:33:32 Author: jgc Revision: 68173 Merged revisions 68164,68171 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/libdrm/trunk r68164 | thomas | 2010-02-11 09:19:14 +0100 (Thu, 11 Feb 2010) | 7 lines Fix intel bugs that made the 2.10 driver unusable This adds the following 3 commits from upstream libdrm master: 973d8d6bd04230da801a8bc19af41dbc60e1918d: intel: check return value for calloc fdcde592c2c48e143251672cf2e82debb07606bd: intel: Account for potential pinned buffers hogging fences 4f0f871730b76730ca58209181d16725b0c40184: intel: Handle resetting of input params after EINTR during SET_TILING r68171 | jgc | 2010-02-11 09:33:00 +0100 (Thu, 11 Feb 2010) | 2 lines upgpkg: libdrm 2.4.17-4 pkgrel++; Added: libdrm/repos/extra-x86_64/intel_gitupdate.diff (from rev 68171, libdrm/trunk/intel_gitupdate.diff) Modified: libdrm/repos/extra-x86_64/(properties) libdrm/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |9 -- intel_gitupdate.diff | 64 + 2 files changed, 70 insertions(+), 3 deletions(-) Property changes on: libdrm/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /libdrm/trunk:1-63505 + /libdrm/trunk:1-68172 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 08:33:15 UTC (rev 68172) +++ extra-x86_64/PKGBUILD 2010-02-11 08:33:32 UTC (rev 68173) @@ -3,7 +3,7 @@ pkgname=libdrm pkgver=2.4.17 -pkgrel=3 +pkgrel=4 pkgdesc=Userspace interface to kernel DRM services arch=(i686 x86_64) license=('custom') @@ -12,17 +12,20 @@ url=http://dri.freedesktop.org/; source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - nouveau_gitupdate.diff +nouveau_gitupdate.diff +intel_gitupdate.diff COPYING) - md5sums=('667d81f993f7fd8a1b1b1b830a28a748' +md5sums=('667d81f993f7fd8a1b1b1b830a28a748' '9b5ec3bbebe86921e2057694c42f65b8' 'f83babf7dc9d2a698b94d46b090ed674' + '3ebf954a427746af68330d2fa2da4e47' 'ba65e71c481b94ef0fb6c23c7f21ffa1') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/no-pthread-stubs.patch || return 1 patch -Np0 -i ${srcdir}/nouveau_gitupdate.diff || return 1 + patch -Np1 -i ${srcdir}/intel_gitupdate.diff || return 1 libtoolize --force || return 1 aclocal || return 1 autoconf || return 1 Copied: libdrm/repos/extra-x86_64/intel_gitupdate.diff (from rev 68171, libdrm/trunk/intel_gitupdate.diff) === --- extra-x86_64/intel_gitupdate.diff (rev 0) +++ extra-x86_64/intel_gitupdate.diff 2010-02-11 08:33:32 UTC (rev 68173) @@ -0,0 +1,64 @@ +diff -u b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +--- b/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c +@@ -1423,18 +1423,15 @@ + + memset(set_tiling, 0, sizeof(set_tiling)); + set_tiling.handle = bo_gem-gem_handle; +- set_tiling.tiling_mode = *tiling_mode; +- set_tiling.stride = stride; + + do { ++ set_tiling.tiling_mode = *tiling_mode; ++ set_tiling.stride = stride; ++ + ret = ioctl(bufmgr_gem-fd, + DRM_IOCTL_I915_GEM_SET_TILING, + set_tiling); + } while (ret == -1 errno == EINTR); +- if (ret != 0) { +- *tiling_mode = bo_gem-tiling_mode; +- return -errno; +- } + bo_gem-tiling_mode = set_tiling.tiling_mode; + bo_gem-swizzle_mode = set_tiling.swizzle_mode; + +@@ -1445,7 +1442,7 @@ + drm_intel_bo_gem_set_in_aperture_size(bufmgr_gem, bo_gem); + + *tiling_mode = bo_gem-tiling_mode; +- return 0; ++ return ret == 0 ? 0 : -errno; + } + + static int +@@ -1727,6 +1724,9 @@ + unsigned long size; + + bufmgr_gem = calloc(1, sizeof(*bufmgr_gem)); ++ if (bufmgr_gem == NULL) ++ return NULL; ++ + bufmgr_gem-fd = fd; + + if (pthread_mutex_init(bufmgr_gem-lock, NULL) != 0) { +@@ -1766,6 +1766,19 @@ + fprintf(stderr, param: %d, val: %d\n, gp.param, + *gp.value); + bufmgr_gem-available_fences = 0; ++ } else { ++ /* XXX The kernel reports the total number of fences, ++ * including any that may be pinned. ++ * ++ * We presume that there will be at least one pinned ++ * fence for the scanout buffer, but there may be more ++ * than one scanout and the user may be
[arch-commits] Commit in nautilus-cd-burner/repos (extra-i686)
Date: Thursday, February 11, 2010 @ 03:34:20 Author: jgc Revision: 68174 db-remove: nautilus-cd-burner removed by jgc Deleted: nautilus-cd-burner/repos/extra-i686/
[arch-commits] Commit in nautilus-cd-burner/repos (extra-x86_64)
Date: Thursday, February 11, 2010 @ 03:34:25 Author: jgc Revision: 68175 db-remove: nautilus-cd-burner removed by jgc Deleted: nautilus-cd-burner/repos/extra-x86_64/
[arch-commits] Commit in (nautilus-cd-burner)
Date: Thursday, February 11, 2010 @ 03:35:34 Author: jgc Revision: 68176 Kill Deleted: nautilus-cd-burner/
[arch-commits] Commit in xf86-video-intel/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:55:31 Author: jgc Revision: 68177 upgpkg: xf86-video-intel 2.10.0-1 Update to 2.10.0. Add versioned dependency on libdrm, as all previous versions have bugs Modified: xf86-video-intel/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 08:35:34 UTC (rev 68176) +++ PKGBUILD2010-02-11 08:55:31 UTC (rev 68177) @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=xf86-video-intel -pkgver=2.9.99.902 +pkgver=2.10.0 pkgrel=1 pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers arch=(i686 x86_64) url=http://xorg.freedesktop.org/; license=('custom') -depends=('intel-dri=7.6' 'libpciaccess=0.10.9' 'libdrm=2.4.16' 'libxvmc=1.0.5' 'libxcb=1.5' 'xcb-util=0.3.6') +depends=('intel-dri=7.6' 'libpciaccess=0.10.9' 'libdrm=2.4.17-4' 'libxvmc=1.0.5' 'libxcb=1.5' 'xcb-util=0.3.6') makedepends=('pkgconfig' 'xorg-server=1.7.0' 'xf86driproto=2.1.0' 'glproto=1.4.10' 'mesa=7.6' 'xineramaproto=1.2' 'inputproto') conflicts=('xorg-server1.7.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-video-drivers') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('c3af5b142c24bdc124bb45a44fbb0267' +md5sums=('78309d4f04dd8ae6585d120377042741' 'b924480931774dec14515e270db4924d') build() {
[arch-commits] Commit in xf86-video-intel/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:55:46 Author: jgc Revision: 68178 Merged revisions 61574,68177 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-intel/trunk r61574 | jgc | 2009-12-19 21:10:43 +0100 (Sat, 19 Dec 2009) | 2 lines upgpkg: xf86-video-intel 2.9.99.902-1 Update to latest release candidate. This driver only supports KMS and should be used with kernel 2.6.32 r68177 | jgc | 2010-02-11 09:55:31 +0100 (Thu, 11 Feb 2010) | 2 lines upgpkg: xf86-video-intel 2.10.0-1 Update to 2.10.0. Add versioned dependency on libdrm, as all previous versions have bugs Modified: xf86-video-intel/repos/extra-i686/(properties) xf86-video-intel/repos/extra-i686/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Property changes on: xf86-video-intel/repos/extra-i686 ___ Modified: svnmerge-integrated - /xf86-video-intel/trunk:1-56809 + /xf86-video-intel/trunk:1-68177 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 08:55:31 UTC (rev 68177) +++ extra-i686/PKGBUILD 2010-02-11 08:55:46 UTC (rev 68178) @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=xf86-video-intel -pkgver=2.9.1 +pkgver=2.10.0 pkgrel=1 pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers arch=(i686 x86_64) url=http://xorg.freedesktop.org/; license=('custom') -depends=('intel-dri=7.6' 'libpciaccess=0.10.8' 'libdrm=2.4.15' 'libxvmc=1.0.5') +depends=('intel-dri=7.6' 'libpciaccess=0.10.9' 'libdrm=2.4.17-4' 'libxvmc=1.0.5' 'libxcb=1.5' 'xcb-util=0.3.6') makedepends=('pkgconfig' 'xorg-server=1.7.0' 'xf86driproto=2.1.0' 'glproto=1.4.10' 'mesa=7.6' 'xineramaproto=1.2' 'inputproto') conflicts=('xorg-server1.7.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-video-drivers') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('8951d0366c16991badb7f9050556f4f3' +md5sums=('78309d4f04dd8ae6585d120377042741' 'b924480931774dec14515e270db4924d') build() {
[arch-commits] Commit in xf86-video-intel/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, February 11, 2010 @ 03:56:03 Author: jgc Revision: 68179 Merged revisions 61574,68177 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-intel/trunk r61574 | jgc | 2009-12-19 21:10:43 +0100 (Sat, 19 Dec 2009) | 2 lines upgpkg: xf86-video-intel 2.9.99.902-1 Update to latest release candidate. This driver only supports KMS and should be used with kernel 2.6.32 r68177 | jgc | 2010-02-11 09:55:31 +0100 (Thu, 11 Feb 2010) | 2 lines upgpkg: xf86-video-intel 2.10.0-1 Update to 2.10.0. Add versioned dependency on libdrm, as all previous versions have bugs Modified: xf86-video-intel/repos/extra-x86_64/ (properties) xf86-video-intel/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Property changes on: xf86-video-intel/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /xf86-video-intel/trunk:1-56808 + /xf86-video-intel/trunk:1-68178 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 08:55:46 UTC (rev 68178) +++ extra-x86_64/PKGBUILD 2010-02-11 08:56:03 UTC (rev 68179) @@ -2,20 +2,20 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=xf86-video-intel -pkgver=2.9.1 +pkgver=2.10.0 pkgrel=1 pkgdesc=X.org Intel i810/i830/i915/945G/G965+ video drivers arch=(i686 x86_64) url=http://xorg.freedesktop.org/; license=('custom') -depends=('intel-dri=7.6' 'libpciaccess=0.10.8' 'libdrm=2.4.15' 'libxvmc=1.0.5') +depends=('intel-dri=7.6' 'libpciaccess=0.10.9' 'libdrm=2.4.17-4' 'libxvmc=1.0.5' 'libxcb=1.5' 'xcb-util=0.3.6') makedepends=('pkgconfig' 'xorg-server=1.7.0' 'xf86driproto=2.1.0' 'glproto=1.4.10' 'mesa=7.6' 'xineramaproto=1.2' 'inputproto') conflicts=('xorg-server1.7.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-video-drivers') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('8951d0366c16991badb7f9050556f4f3' +md5sums=('78309d4f04dd8ae6585d120377042741' 'b924480931774dec14515e270db4924d') build() {
[arch-commits] Commit in xf86-video-intel/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 03:56:24 Author: jgc Revision: 68180 db-remove: xf86-video-intel removed by jgc Deleted: xf86-video-intel/repos/testing-i686/
[arch-commits] Commit in xf86-video-intel/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 03:56:29 Author: jgc Revision: 68181 db-remove: xf86-video-intel removed by jgc Deleted: xf86-video-intel/repos/testing-x86_64/
[arch-commits] Commit in udev/repos (core-i686)
Date: Thursday, February 11, 2010 @ 06:33:52 Author: tpowa Revision: 68184 db-move: udev removed by tpowa for move to core Deleted: udev/repos/core-i686/
[arch-commits] Commit in udev/repos (core-i686 testing-i686)
Date: Thursday, February 11, 2010 @ 06:33:52 Author: tpowa Revision: 68185 db-move: moved udev from [testing] to [core] (i686) Added: udev/repos/core-i686/ Deleted: udev/repos/testing-i686/
[arch-commits] Commit in udev/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 11, 2010 @ 06:34:00 Author: tpowa Revision: 68187 db-move: moved udev from [testing] to [core] (x86_64) Added: udev/repos/core-x86_64/ Deleted: udev/repos/testing-x86_64/
[arch-commits] Commit in erlang/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 07:24:41 Author: vesa Revision: 68188 fix man pages Modified: erlang/trunk/PKGBUILD --+ PKGBUILD | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 11:34:00 UTC (rev 68187) +++ PKGBUILD2010-02-11 12:24:41 UTC (rev 68188) @@ -4,14 +4,15 @@ pkgname=erlang pkgver=R13B03 -pkgrel=1 +pkgrel=2 pkgdesc=A small concurrent functional programming language developed by Ericsson. arch=(i686 x86_64) url=http://www.erlang.org/index.html; license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk') -optdepends=('wxgtk: for wx support') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc') +optdepends=('wxgtk: for wx support' 'unixodbc: database') + options=('!makeflags') source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) @@ -51,14 +52,10 @@ # install documentation install -d $pkgdir/usr/share/doc/erlang install -D -m644 $srcdir/{COPYRIGHT,PR.template,README} $pkgdir/usr/share/doc/erlang - cp -r $srcdir/man $pkgdir/usr/share + cp -r $srcdir/man $pkgdir/usr/lib/erlang install -Dm644 $srcdir/otp_src_${pkgver/./-}/EPLICENCE $pkgdir/usr/share/licenses/$pkgname/EPLICENCE -# fixed man pages conflict - for i in array crypto inet io queue random rpc ssl string zlib; do -mv $pkgdir/usr/share/man/man3/$i.3 $pkgdir/usr/share/man/man3/erlang_$i.3 - done } md5sums=('411fcb29f0819973f71e28f6b56d9948' '1fe80b110061ef73614824fb06d4d6eb')
[arch-commits] Commit in erlang/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, February 11, 2010 @ 07:26:25 Author: vesa Revision: 68189 Merged revisions 68188 via svnmerge from svn+ssh://v...@gerolde.archlinux.org/srv/svn-packages/erlang/trunk r68188 | vesa | 2010-02-11 14:24:41 +0200 (Thu, 11 Feb 2010) | 2 lines fix man pages Modified: erlang/repos/extra-x86_64/(properties) erlang/repos/extra-x86_64/PKGBUILD --+ PKGBUILD | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) Property changes on: erlang/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /erlang/trunk:1-63057 + /erlang/trunk:1-68188 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 12:24:41 UTC (rev 68188) +++ extra-x86_64/PKGBUILD 2010-02-11 12:26:25 UTC (rev 68189) @@ -4,14 +4,15 @@ pkgname=erlang pkgver=R13B03 -pkgrel=1 +pkgrel=2 pkgdesc=A small concurrent functional programming language developed by Ericsson. arch=(i686 x86_64) url=http://www.erlang.org/index.html; license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk') -optdepends=('wxgtk: for wx support') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc') +optdepends=('wxgtk: for wx support' 'unixodbc: database') + options=('!makeflags') source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) @@ -51,14 +52,10 @@ # install documentation install -d $pkgdir/usr/share/doc/erlang install -D -m644 $srcdir/{COPYRIGHT,PR.template,README} $pkgdir/usr/share/doc/erlang - cp -r $srcdir/man $pkgdir/usr/share + cp -r $srcdir/man $pkgdir/usr/lib/erlang install -Dm644 $srcdir/otp_src_${pkgver/./-}/EPLICENCE $pkgdir/usr/share/licenses/$pkgname/EPLICENCE -# fixed man pages conflict - for i in array crypto inet io queue random rpc ssl string zlib; do -mv $pkgdir/usr/share/man/man3/$i.3 $pkgdir/usr/share/man/man3/erlang_$i.3 - done } md5sums=('411fcb29f0819973f71e28f6b56d9948' '1fe80b110061ef73614824fb06d4d6eb')
[arch-commits] Commit in soprano/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 09:11:56 Author: andrea Revision: 68190 upgpkg: soprano 2.4.0.1-1 upstream release (fix bugs with krunner, dolphin...) Modified: soprano/trunk/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 12:26:25 UTC (rev 68189) +++ PKGBUILD2010-02-11 14:11:56 UTC (rev 68190) @@ -3,17 +3,16 @@ # Contributor: Tobias Powalowski tp...@archlinux.org pkgname=soprano -pkgver=2.3.73 -pkgrel=2 +pkgver=2.4.0.1 +pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') depends=('qt' 'clucene' 'redland' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6') -options=('force') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2;) -md5sums=('e8e5455b5f12856e1cfd45137cc727f2') +md5sums=('6175a3b342a77a7adc6f157cf4968f6d') build() { cd ${srcdir}
[arch-commits] Commit in soprano/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 09:12:22 Author: andrea Revision: 68191 archrelease: new repo testing-i686 Added: soprano/repos/testing-i686/
[arch-commits] Commit in soprano/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 09:12:36 Author: andrea Revision: 68192 Initialized merge tracking via svnmerge with revisions 1-68190 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/soprano/trunk Modified: soprano/repos/testing-i686/ (properties) Property changes on: soprano/repos/testing-i686 ___ Added: svnmerge-integrated + /soprano/trunk:1-68190
[arch-commits] Commit in soprano/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 09:13:34 Author: andrea Revision: 68193 archrelease: new repo testing-x86_64 Added: soprano/repos/testing-x86_64/
[arch-commits] Commit in openvpn/repos (core-i686 testing-i686)
Date: Thursday, February 11, 2010 @ 10:27:25 Author: thomas Revision: 68196 db-move: moved openvpn from [testing] to [core] (i686) Added: openvpn/repos/core-i686/ Deleted: openvpn/repos/testing-i686/
[arch-commits] Commit in openvpn/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 11, 2010 @ 10:27:32 Author: thomas Revision: 68198 db-move: moved openvpn from [testing] to [core] (x86_64) Added: openvpn/repos/core-x86_64/ Deleted: openvpn/repos/testing-x86_64/
[arch-commits] Commit in openvpn/repos (core-x86_64)
Date: Thursday, February 11, 2010 @ 10:27:30 Author: thomas Revision: 68197 db-move: openvpn removed by thomas for move to core Deleted: openvpn/repos/core-x86_64/
[arch-commits] Commit in rfkill/repos (core-x86_64)
Date: Thursday, February 11, 2010 @ 10:27:41 Author: thomas Revision: 68199 db-move: rfkill removed by thomas for move to core Deleted: rfkill/repos/core-x86_64/
[arch-commits] Commit in rfkill/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 11, 2010 @ 10:27:42 Author: thomas Revision: 68200 db-move: moved rfkill from [testing] to [core] (x86_64) Added: rfkill/repos/core-x86_64/ Deleted: rfkill/repos/testing-x86_64/
[arch-commits] Commit in rfkill/repos (core-i686)
Date: Thursday, February 11, 2010 @ 10:27:48 Author: thomas Revision: 68201 db-move: rfkill removed by thomas for move to core Deleted: rfkill/repos/core-i686/
[arch-commits] Commit in ppp/repos (core-i686)
Date: Thursday, February 11, 2010 @ 10:27:57 Author: thomas Revision: 68203 db-move: ppp removed by thomas for move to core Deleted: ppp/repos/core-i686/
[arch-commits] Commit in ppp/repos (core-i686 testing-i686)
Date: Thursday, February 11, 2010 @ 10:27:58 Author: thomas Revision: 68204 db-move: moved ppp from [testing] to [core] (i686) Added: ppp/repos/core-i686/ Deleted: ppp/repos/testing-i686/
[arch-commits] Commit in ppp/repos (core-x86_64)
Date: Thursday, February 11, 2010 @ 10:28:02 Author: thomas Revision: 68205 db-move: ppp removed by thomas for move to core Deleted: ppp/repos/core-x86_64/
[arch-commits] Commit in ppp/repos (core-x86_64 testing-x86_64)
Date: Thursday, February 11, 2010 @ 10:28:03 Author: thomas Revision: 68206 db-move: moved ppp from [testing] to [core] (x86_64) Added: ppp/repos/core-x86_64/ Deleted: ppp/repos/testing-x86_64/
[arch-commits] Commit in policykit/repos (extra-i686)
Date: Thursday, February 11, 2010 @ 10:30:04 Author: jgc Revision: 68207 db-remove: policykit removed by jgc Deleted: policykit/repos/extra-i686/
[arch-commits] Commit in policykit-gnome/repos (extra-i686)
Date: Thursday, February 11, 2010 @ 10:30:12 Author: jgc Revision: 68208 db-remove: policykit-gnome removed by jgc Deleted: policykit-gnome/repos/extra-i686/
[arch-commits] Commit in policykit/repos (extra-x86_64)
Date: Thursday, February 11, 2010 @ 10:30:28 Author: jgc Revision: 68210 db-remove: policykit removed by jgc Deleted: policykit/repos/extra-x86_64/
[arch-commits] Commit in (policykit-gnome policykit)
Date: Thursday, February 11, 2010 @ 10:31:06 Author: jgc Revision: 68211 Remove from repositories. We have no packages using this anymore, so be gone. Deleted: policykit-gnome/ policykit/
[arch-commits] Commit in grub2/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 11:58:19 Author: ronald Revision: 68212 Merged revisions 67901 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/grub2/trunk r67901 | ronald | 2010-02-09 14:30:08 +0100 (Tue, 09 Feb 2010) | 2 lines upgpkg: grub2 1.97.2-1 update to latest version; grub2 now compiles on x86_64: FS#18217 Modified: grub2/repos/extra-i686/ (properties) grub2/repos/extra-i686/PKGBUILD --+ PKGBUILD | 36 ++-- 1 file changed, 6 insertions(+), 30 deletions(-) Property changes on: grub2/repos/extra-i686 ___ Modified: svnmerge-integrated - /grub2/trunk:1-58619 + /grub2/trunk:1-68211 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 15:31:06 UTC (rev 68211) +++ extra-i686/PKGBUILD 2010-02-11 16:58:19 UTC (rev 68212) @@ -3,7 +3,7 @@ # Contributor: dongiovanni dongiovanni.archlinux.de pkgname=grub2 -pkgver=1.97.1 +pkgver=1.97.2 pkgrel=1 pkgdesc=The GNU GRand Unified Bootloader url=http://www.gnu.org/software/grub/; @@ -22,14 +22,10 @@ 'grub.cfg') # don't install auto-install script. TODO: It needs a rewrite to work with grub2 # 'install-grub') -md5sums=('66fe18cd9318e3d67a34d7b7a8e7b1f6' +md5sums=('db4d23fb8897523a7e484e974ae3d1c9' '743215998a581a54ac77630f0db222ce') build() { - # Set destination architecture here - #DESTARCH=i686 - DESTARCH=x86_64 - cd $srcdir/grub-${pkgver} # run autogen.sh to create configure files ./autogen.sh @@ -37,35 +33,15 @@ # fix unifont.bdf location sed -i 's|/usr/src/unifont.bdf|/usr/share/fonts/misc/unifont.bdf|' configure || return 1 - # Arch64 grub2 needs to be statically build on i686 - if [ $CARCH = x86_64 ]; then -echo this package has to be built on i686, won't compile on x86_64 -sleep 5 - else + CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \ + --sbindir=/sbin --mandir=/usr/share/man \ + --infodir=/usr/share/info --sysconfdir=/etc -if [ $DESTARCH = x86_64 ]; then - export LDFLAGS=-static -export CFLAGS=-static - ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \ - --sbindir=/sbin --mandir=/usr/share/man \ - --infodir=/usr/share/info --sysconfdir=/etc - unset CFLAGS CPPFLAGS LDFLAGS - -else - CFLAGS= ./configure --prefix=/usr --enable-grub-mkfont --bindir=/bin \ - --sbindir=/sbin --mandir=/usr/share/man \ - --infodir=/usr/share/info --sysconfdir=/etc -fi - fi - CFLAGS= make || return 1 make DESTDIR=${pkgdir} install || return 1 install -Dm644 ${srcdir}/grub.cfg $startdir/pkg/boot/grub/grub.cfg #install -Dm755 ${srcdir}/install-grub $startdir/pkg/sbin/install-grub - # Fool makepkg into building a x86_64 package - if [ $DESTARCH = x86_64 ]; then -export CARCH=x86_64 - fi } +
[arch-commits] Commit in (3 files)
Date: Thursday, February 11, 2010 @ 13:17:17 Author: thomas Revision: 68213 Add directories for new mkinitcpio-nfs-utils package Added: mkinitcpio-nfs-utils/ mkinitcpio-nfs-utils/repos/ mkinitcpio-nfs-utils/trunk/
[arch-commits] Commit in mkinitcpio-nfs-utils/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 13:22:59 Author: thomas Revision: 68214 Initial revision of mkinitcpio-nfs-utils Added: mkinitcpio-nfs-utils/trunk/PKGBUILD --+ PKGBUILD | 23 +++ 1 file changed, 23 insertions(+) Added: PKGBUILD === --- PKGBUILD(rev 0) +++ PKGBUILD2010-02-11 18:22:59 UTC (rev 68214) @@ -0,0 +1,23 @@ +# $Id$ +# Maintainer: Thomas Bächler tho...@archlinux.org + +pkgname=mkinitcpio-nfs-utils +pkgver=0.1 +pkgrel=1 +pkgdesc=ipconfig and nfsmount tools for NFS root support in mkinitcpio +arch=('i686' 'x86_64') +url=http://www.archlinux.org/; +license=('GPL2') +depends=('glibc') +source=(ftp://ftp.archlinux.org/other/mkinitcpio/${pkgname}-${pkgver}.tar.gz) +sha256sums=('76b7fc337eb18cf8683b4e7d0faf4932c4f53b5b09fb16398708a0e3bfb54eff') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + make || return 1 +} + +package() { + cd $srcdir/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} Property changes on: mkinitcpio-nfs-utils/trunk/PKGBUILD ___ Added: svn:keywords + Id
[arch-commits] Commit in mkinitcpio-nfs-utils/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 13:23:47 Author: thomas Revision: 68215 archrelease: new repo testing-i686 Added: mkinitcpio-nfs-utils/repos/testing-i686/
[arch-commits] Commit in mkinitcpio-nfs-utils/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 13:24:01 Author: thomas Revision: 68216 Initialized merge tracking via svnmerge with revisions 1-68214 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mkinitcpio-nfs-utils/trunk Modified: mkinitcpio-nfs-utils/repos/testing-i686/ (properties) Property changes on: mkinitcpio-nfs-utils/repos/testing-i686 ___ Added: svnmerge-integrated + /mkinitcpio-nfs-utils/trunk:1-68214
[arch-commits] Commit in mkinitcpio-nfs-utils/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 13:24:22 Author: thomas Revision: 68217 archrelease: new repo testing-x86_64 Added: mkinitcpio-nfs-utils/repos/testing-x86_64/
[arch-commits] Commit in mkinitcpio-nfs-utils/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 13:24:34 Author: thomas Revision: 68218 Initialized merge tracking via svnmerge with revisions 1-68216 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mkinitcpio-nfs-utils/trunk Modified: mkinitcpio-nfs-utils/repos/testing-x86_64/(properties) Property changes on: mkinitcpio-nfs-utils/repos/testing-x86_64 ___ Added: svnmerge-integrated + /mkinitcpio-nfs-utils/trunk:1-68216
[arch-commits] Commit in mkinitcpio-busybox/repos (3 files)
Date: Thursday, February 11, 2010 @ 14:10:44 Author: thomas Revision: 68222 Merged revisions 68136,68221 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mkinitcpio-busybox/trunk r68136 | thomas | 2010-02-10 23:40:13 +0100 (Mi, 10 Feb 2010) | 2 lines Add setfont to mkinitcpio, patch provided by Davorin U?\196?\141akar r68221 | thomas | 2010-02-11 20:02:20 +0100 (Do, 11 Feb 2010) | 2 lines Rebuild with setfont enabled Modified: mkinitcpio-busybox/repos/testing-i686/(properties) mkinitcpio-busybox/repos/testing-i686/PKGBUILD mkinitcpio-busybox/repos/testing-i686/config --+ PKGBUILD |4 ++-- config |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Property changes on: mkinitcpio-busybox/repos/testing-i686 ___ Modified: svnmerge-integrated - /mkinitcpio-busybox/trunk:1-67452 + /mkinitcpio-busybox/trunk:1-68221 Modified: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2010-02-11 19:02:20 UTC (rev 68221) +++ testing-i686/PKGBUILD 2010-02-11 19:10:44 UTC (rev 68222) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler tho...@archlinux.org pkgname=mkinitcpio-busybox pkgver=1.15.3 -pkgrel=4 +pkgrel=5 pkgdesc=base initramfs tools arch=('i686' 'x86_64') url=http://www.busybox.net/; @@ -11,7 +11,7 @@ source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) sha256sums=('d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb' -'28263e92651ba14bba00910546fdaf841e9b810ed23196869963e340ef1fd656') +'abd66b978171447c20532ea23dd0a474c2c083d88658665fb1b7e2c3503a9bfe') build() { cd ${srcdir}/busybox-${pkgver} Modified: testing-i686/config === --- testing-i686/config 2010-02-11 19:02:20 UTC (rev 68221) +++ testing-i686/config 2010-02-11 19:10:44 UTC (rev 68222) @@ -287,7 +287,7 @@ # CONFIG_FEATURE_RESIZE_PRINT is not set # CONFIG_SETCONSOLE is not set # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETFONT is not set +CONFIG_SETFONT=y # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR= # CONFIG_SETKEYCODES is not set
[arch-commits] Commit in mkinitcpio-busybox/repos (3 files)
Date: Thursday, February 11, 2010 @ 14:11:39 Author: thomas Revision: 68223 Merged revisions 68136,68221 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mkinitcpio-busybox/trunk r68136 | thomas | 2010-02-10 23:40:13 +0100 (Mi, 10 Feb 2010) | 2 lines Add setfont to mkinitcpio, patch provided by Davorin U?\196?\141akar r68221 | thomas | 2010-02-11 20:02:20 +0100 (Do, 11 Feb 2010) | 2 lines Rebuild with setfont enabled Modified: mkinitcpio-busybox/repos/testing-x86_64/ (properties) mkinitcpio-busybox/repos/testing-x86_64/PKGBUILD mkinitcpio-busybox/repos/testing-x86_64/config --+ PKGBUILD |4 ++-- config |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Property changes on: mkinitcpio-busybox/repos/testing-x86_64 ___ Modified: svnmerge-integrated - /mkinitcpio-busybox/trunk:1-67454 + /mkinitcpio-busybox/trunk:1-68222 Modified: testing-x86_64/PKGBUILD === --- testing-x86_64/PKGBUILD 2010-02-11 19:10:44 UTC (rev 68222) +++ testing-x86_64/PKGBUILD 2010-02-11 19:11:39 UTC (rev 68223) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler tho...@archlinux.org pkgname=mkinitcpio-busybox pkgver=1.15.3 -pkgrel=4 +pkgrel=5 pkgdesc=base initramfs tools arch=('i686' 'x86_64') url=http://www.busybox.net/; @@ -11,7 +11,7 @@ source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) sha256sums=('d74020ad2cc5a4dcc5109c44dbd0e22582d6ce42954b0f1ff29763c8c0ff03cb' -'28263e92651ba14bba00910546fdaf841e9b810ed23196869963e340ef1fd656') +'abd66b978171447c20532ea23dd0a474c2c083d88658665fb1b7e2c3503a9bfe') build() { cd ${srcdir}/busybox-${pkgver} Modified: testing-x86_64/config === --- testing-x86_64/config 2010-02-11 19:10:44 UTC (rev 68222) +++ testing-x86_64/config 2010-02-11 19:11:39 UTC (rev 68223) @@ -287,7 +287,7 @@ # CONFIG_FEATURE_RESIZE_PRINT is not set # CONFIG_SETCONSOLE is not set # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETFONT is not set +CONFIG_SETFONT=y # CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set CONFIG_DEFAULT_SETFONT_DIR= # CONFIG_SETKEYCODES is not set
[arch-commits] Commit in (4 files)
Date: Thursday, February 11, 2010 @ 15:26:31 Author: giovanni Revision: 68224 Initial import Added: mythtv-contrib/ mythtv-contrib/repos/ mythtv-contrib/trunk/ mythtv-contrib/trunk/PKGBUILD --+ PKGBUILD | 23 +++ 1 file changed, 23 insertions(+) Added: mythtv-contrib/trunk/PKGBUILD === --- mythtv-contrib/trunk/PKGBUILD (rev 0) +++ mythtv-contrib/trunk/PKGBUILD 2010-02-11 20:26:31 UTC (rev 68224) @@ -0,0 +1,23 @@ +# $Id$ +# Maintainer: Giovanni Scafora giova...@archlinux.org + +pkgname=mythtv-contrib +pkgver=0.22 +pkgrel=1 +pkgdesc=Utilities for use with the Mythtv +arch=('any') +url=http://www.mythtv.org/; +license=('GPL') +depends=(mythtv=${pkgver}) +optdepends=('tk: required by tkmythremote') +source=(ftp://ftp.osuosl.org/pub/mythtv/mythtv-${pkgver}.tar.bz2) +md5sums=('e8f8b5b6a51cd7be700e215b2a1bf2c0') + +build() { + cd ${srcdir}/mythtv-${pkgver} + + install -dm755 ${pkgdir}/usr/share/mythtv + cp -a contrib/$i ${pkgdir}/usr/share/mythtv + cd database + cp -a mc.sql ${pkgdir}/usr/share/mythtv +} Property changes on: mythtv-contrib/trunk/PKGBUILD ___ Added: svn:keywords + Id
[arch-commits] Commit in mythtv-contrib/repos (extra-any)
Date: Thursday, February 11, 2010 @ 15:33:34 Author: giovanni Revision: 68226 Initialized merge tracking via svnmerge with revisions 1-68224 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mythtv-contrib/trunk Modified: mythtv-contrib/repos/extra-any/ (properties) Property changes on: mythtv-contrib/repos/extra-any ___ Added: svnmerge-integrated + /mythtv-contrib/trunk:1-68224
[arch-commits] Commit in fontforge/trunk (ChangeLog PKGBUILD libpng14.patch)
Date: Thursday, February 11, 2010 @ 16:15:44 Author: eric Revision: 68227 upgpkg: fontforge 20090923-2 Rebuilt against libpng 1.4.0 (close FS#18284) Added: fontforge/trunk/libpng14.patch Modified: fontforge/trunk/ChangeLog fontforge/trunk/PKGBUILD + ChangeLog |5 PKGBUILD | 10 + libpng14.patch | 58 +++ 3 files changed, 69 insertions(+), 4 deletions(-) Modified: ChangeLog === --- ChangeLog 2010-02-11 20:33:34 UTC (rev 68226) +++ ChangeLog 2010-02-11 21:15:44 UTC (rev 68227) @@ -1,3 +1,8 @@ +2010-02-10 Eric Belanger e...@archlinux.org + + * fontforge 20090923-2 + * Rebuilt against libpng 1.4.0 (close FS#18284) + 2009-10-14 Eric Belanger e...@archlinux.org * fontforge 20090923-1 Modified: PKGBUILD === --- PKGBUILD2010-02-11 20:33:34 UTC (rev 68226) +++ PKGBUILD2010-02-11 21:15:44 UTC (rev 68227) @@ -4,7 +4,7 @@ pkgname=fontforge pkgver=20090923 -pkgrel=1 +pkgrel=2 pkgdesc=An outline and bitmap font editor arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; @@ -12,12 +12,14 @@ depends=('libxkbui' 'libxi') makedepends=('freetype2' 'libxml2' 'pango') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd') +source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ +libpng14.patch) +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ --enable-devicetables --without-python || return 1 make || return 1 Added: libpng14.patch === --- libpng14.patch (rev 0) +++ libpng14.patch 2010-02-11 21:15:44 UTC (rev 68227) @@ -0,0 +1,58 @@ +diff -Naur fontforge-20090923-orig/gutils/gimagereadpng.c fontforge-20090923/gutils/gimagereadpng.c +--- fontforge-20090923-orig/gutils/gimagereadpng.c 2010-02-11 00:22:37.0 -0500 fontforge-20090923/gutils/gimagereadpng.c 2010-02-11 00:27:03.0 -0500 +@@ -220,13 +220,13 @@ + if ( (info_ptr-validPNG_INFO_tRNS) info_ptr-num_trans0 ) { + if ( info_ptr-color_type==PNG_COLOR_TYPE_RGB || info_ptr-color_type==PNG_COLOR_TYPE_RGB_ALPHA ) + base-trans = COLOR_CREATE( +- (info_ptr-trans_values.red8), +- (info_ptr-trans_values.green8), +- (info_ptr-trans_values.blue8)); ++ (info_ptr-trans_color.red8), ++ (info_ptr-trans_color.green8), ++ (info_ptr-trans_color.blue8)); + else if ( base-image_type == it_mono ) +- base-trans = info_ptr-trans[0]; ++ base-trans = info_ptr-trans_alpha[0]; + else +- base-clut-trans_index = base-trans = info_ptr-trans[0]; ++ base-clut-trans_index = base-trans = info_ptr-trans_alpha[0]; + } + + row_pointers = galloc(info_ptr-height*sizeof(png_bytep)); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 03:11:19.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 03:17:15.0 -0500 +@@ -183,8 +183,8 @@ +if ( info_ptr-num_palette=16 ) + _png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +@@ -192,9 +192,9 @@ + info_ptr-color_type = PNG_COLOR_TYPE_RGB_ALPHA; + +if ( base-trans!=-1 ) { +- info_ptr-trans_values.red = COLOR_RED(base-trans); +- info_ptr-trans_values.green = COLOR_GREEN(base-trans); +- info_ptr-trans_values.blue = COLOR_BLUE(base-trans); ++ info_ptr-trans_color.red = COLOR_RED(base-trans); ++ info_ptr-trans_color.green = COLOR_GREEN(base-trans); ++ info_ptr-trans_color.blue = COLOR_BLUE(base-trans); +} +} +_png_write_info(png_ptr, info_ptr); +@@ -210,7 +210,7 @@ + + _png_write_end(png_ptr, info_ptr); + +-if ( info_ptr-trans!=NULL ) gfree(info_ptr-trans); ++if ( info_ptr-trans_alpha!=NULL ) gfree(info_ptr-trans_alpha); +
[arch-commits] Commit in archboot/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:15:55 Author: tpowa Revision: 68228 upgpkg: archboot 2010.02-1 first new release for 2010, with all changed initcpio Modified: archboot/trunk/PKGBUILD --+ PKGBUILD | 18 ++ 1 file changed, 6 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 21:15:44 UTC (rev 68227) +++ PKGBUILD2010-02-11 21:15:55 UTC (rev 68228) @@ -2,31 +2,25 @@ # Maintainer : Tobias Powalowski tp...@archlinux.org pkgname=archboot -pkgver=2009.09 -pkgrel=2 +pkgver=2010.02 +pkgrel=1 pkgdesc=Advanced, modular arch boot/install image creation utility arch=(i686 x86_64) license=('GPL') url=http://www.archlinux.org/; -depends=('mkinitcpio=0.5.26-1' 'mksyslinux=2008.12-1' 'mkpxelinux=2009.09-1' 'mkisolinux=2008.12-1' 'initscripts=2009.08-1' 'subversion=1.6.5-3' 'wget=1.11.4-2' 'bash=4.0.028-1' 'coreutils=7.5-2' 'cryptsetup=1.0.7-1' 'dialog=1.1_20080819-2' 'e2fsprogs=1.41.8-2' 'findutils=4.4.2-1' 'gawk=3.1.7-1' 'grep=2.5.4-3' 'iputils=20071127-2' 'jfsutils=1.1.14-1' 'less=436-1' 'lvm2=2.02.48-1' 'mdadm=2.6.9-1' 'module-init-tools=3.10-1' 'nano=2.0.9-2' 'ncurses=5.7-2' 'net-tools=1.60-14' 'gnu-netcat=0.7.1-3' 'ntfsprogs=2.0.0-4' 'pcmciautils=015-2' 'procps=3.2.8-1' 'psmisc=22.8-1' 'reiserfsprogs=3.6.21-2' 'sed=4.2.1-1' 'snarf=7.0-3' 'syslog-ng=3.0.4-1' 'sysvinit=2.86-5' 'tar=1.22-1' 'util-linux-ng=2.16-1' 'which=2.20-1' 'kbd=1.15-2' 'wireless_tools=29-3' 'xfsprogs=3.0.1-2' 'dnsutils=9.6.1-2' 'hdparm=9.27-1' 'memtest86+=2.11-1' 'grub=0.97-16' 'inetutils=1.6-4' 'openssh=5.2p1-1' 'hwdetect=2009.09-5' 'shadow=4.1.4.2-1' 'bridge-utils=1.4-2' 'ifens lave=1.1.0-4' 'cpufrequtils=005-2' 'links=2.2-2' 'tcp_wrappers=7.6-10' 'dosfstools=3.0.5-1' 'glibc=2.10.1-4' 'kernel-headers=2.6.30.5-1' 'kernel26=2.6.31-1' 'kernel26-firmware=2.6.30-1' 'xinetd=2.3.14-5' 'kexec-tools=2.0.0-1' 'ppp=2.4.4-9' 'rp-pppoe=3.10-1' 'lilo=22.8-3' 'iptables=1.4.4-1' 'capi4k-utils=050718-7' 'isdn4k-utils=3.2p1-5' 'ntfs-3g=2009.4.4-1' 'pciutils=3.1.4-1' 'usbutils=0.86-2' 'vpnc=0.5.3-1' 'openvpn=2.1_rc19-2' 'b43-fwcutter=012-1' 'wpa_supplicant=0.6.9-2' 'rsync=3.0.6-1' 'gzip=1.3.12-6' 'libdownload=1.3-3' 'libarchive=2.7.1-1' 'device-mapper=1.02.33-1' 'screen=4.0.3-8' 'libelf=0.8.12-1' 'pam=1.0.4-1' 'cracklib=2.8.13-2' 'nfs-utils=1.2.0-3' 'nfsidmap=0.21-2' 'readline=6.0.004-1' 'acl=2.2.47-2' 'attr=2.4.43-1' 'pcre=7.9-1' 'cpio=2.10-1' 'fuse=2.8.0-1' 'klibc=1.5.15-3' 'libusb=0.1.12-3' 'vim=7.2.245-1' 'lzo2=2.03-1' 'libsasl=2.1.23-1' 'libldap=2.3.43-3' 'gpm=1.20.6-1' 'libevent=1.4.11-1' 'gcc-libs=4.4.1-1' 'sd parm=1.03-2' 'licenses=2.5-1' 'pptpclient=1.7.2-2' 'rt2x00-rt61-fw=1.2-3' 'rt2x00-rt71w-fw=1.8-3' 'ndiswrapper=1.55-1' 'ndiswrapper-utils=1.55-1' 'zd1211-firmware=1.4-2' 'wlan-ng26-utils=0.2.9-1' 'ipw2100-fw=1.3-3' 'ipw2200-fw=3.1-1' 'iwlwifi-3945-ucode=15.32.2.9-1' 'iwlwifi-4965-ucode=228.61.2.24-1' 'iwlwifi-5000-ucode=8.24.2.12-1' 'smbclient=3.3.7-1' 'tdb=3.3.7-1' 'bittorrent=5.2.2-1' 'dhcpcd=5.1.0-1' 'openssl=0.9.8k-4' 'git=1.6.4.3-1' 'dmraid=1.0.0.rc15-8' 'linux-atm=2.5.0-1' 'netcfg=2.2.1-1' 'tiacx=20080210-10' 'tiacx-firmware=2-1' 'parted=1.8.8-3' 'tzdata=2009l-1' 'ntp=4.2.4p7-3' 'libgcrypt=1.4.4-2' 'iw=0.9.15-1' 'crda=1.1.0-1' 'libnl=1.1-1' 'iproute2=2.6.29-1' 'wireless-regdb=2009.08.05-1' 'v86d=0.1.9-7' 'dhclient=3.1.2p1-3' 'syslinux=3.82-1' 'mtools=4.0.10-5' 'fsarchiver=0.5.9-1' 'iwlwifi-5150-ucode=8.24.2.2-1' 'xz-utils=4.999.9beta-1' 'libtirpc=0.2.0-1' 'librpcsecgss=0.18-1' 'rpcbind=0.2.0-1' 'testdisk=6.11-1' 'wipe=2.2.0 -2' 'clamav=0.95.2-1' 'ddrescue=1.11-1' 'udev=146-2') +depends=('mkinitcpio=0.6-1' 'mksyslinux=2008.12-1' 'mkpxelinux=2009.09-1' 'mkisolinux=2008.12-1' 'initscripts=2010.01-1' 'subversion=1.6.9-1' 'wget=1.12-1' 'bash=4.1.002-2' 'coreutils=8.4-1' 'cryptsetup=1.1.0-2' 'dialog=1.1_20100119-1' 'e2fsprogs=1.41.9-1' 'findutils=4.4.2-1' 'gawk=3.1.7-1' 'grep=2.5.4-3' 'iputils=20071127-2' 'jfsutils=1.1.14-1' 'less=436-1' 'lvm2=2.02.60-3' 'mdadm=3.1.1-2' 'module-init-tools=3.11.1-2' 'nano=2.2.2-1' 'ncurses=5.7-2' 'net-tools=1.60-14' 'gnu-netcat=0.7.1-3' 'ntfsprogs=2.0.0-4' 'pcmciautils=016-1' 'procps=3.2.8-1' 'psmisc=22.10-1' 'reiserfsprogs=3.6.21-2' 'sed=4.2.1-1' 'snarf=7.0-3' 'syslog-ng=3.0.4-1' 'sysvinit=2.86-5' 'tar=1.22-1' 'util-linux-ng=2.17-1' 'which=2.20-1' 'kbd=1.15.1-1' 'wireless_tools=29-3' 'xfsprogs=3.1.1-1' 'dnsutils=9.6.1-2' 'hdparm=9.27-2' 'memtest86+=4.00-1' 'grub=0.97-16' 'inetutils=1.7-2' 'openssh=5.3p1-3' 'hwdetect=2010.02-1' 'shadow=4.1.4.2-1' 'bridge-utils=1.4-2' 'ifens lave=1.1.0-4' 'cpufrequtils=007-1' 'links=2.2-3' 'tcp_wrappers=7.6-11' 'dosfstools=3.0.9-1' 'glibc=2.11.1-1' 'kernel-headers=' 'kernel26=2.6.32.7-1' 'kernel26-firmware=2.6.32.7-1' 'kernel26-lts=2.6.27.45-1' 'xinetd=2.3.14-5' 'kexec-tools=2.0.1-1' 'ppp=2.4.5-1' 'rp-pppoe=3.10-3' 'lilo=22.8-4' 'iptables=1.4.6-1' 'capi4k-utils=050718-7'
[arch-commits] Commit in fontforge/repos (4 files)
Date: Thursday, February 11, 2010 @ 16:16:13 Author: eric Revision: 68229 Merged revisions 68227 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontforge/trunk r68227 | eric | 2010-02-11 16:15:44 -0500 (Thu, 11 Feb 2010) | 2 lines upgpkg: fontforge 20090923-2 Rebuilt against libpng 1.4.0 (close FS#18284) Added: fontforge/repos/extra-i686/libpng14.patch (from rev 68227, fontforge/trunk/libpng14.patch) Modified: fontforge/repos/extra-i686/ (properties) fontforge/repos/extra-i686/ChangeLog fontforge/repos/extra-i686/PKGBUILD + ChangeLog |5 PKGBUILD | 10 + libpng14.patch | 58 +++ 3 files changed, 69 insertions(+), 4 deletions(-) Property changes on: fontforge/repos/extra-i686 ___ Modified: svnmerge-integrated - /fontforge/trunk:1-55854 + /fontforge/trunk:1-68227 Modified: extra-i686/ChangeLog === --- extra-i686/ChangeLog2010-02-11 21:15:55 UTC (rev 68228) +++ extra-i686/ChangeLog2010-02-11 21:16:13 UTC (rev 68229) @@ -1,3 +1,8 @@ +2010-02-10 Eric Belanger e...@archlinux.org + + * fontforge 20090923-2 + * Rebuilt against libpng 1.4.0 (close FS#18284) + 2009-10-14 Eric Belanger e...@archlinux.org * fontforge 20090923-1 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 21:15:55 UTC (rev 68228) +++ extra-i686/PKGBUILD 2010-02-11 21:16:13 UTC (rev 68229) @@ -4,7 +4,7 @@ pkgname=fontforge pkgver=20090923 -pkgrel=1 +pkgrel=2 pkgdesc=An outline and bitmap font editor arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; @@ -12,12 +12,14 @@ depends=('libxkbui' 'libxi') makedepends=('freetype2' 'libxml2' 'pango') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd') +source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ +libpng14.patch) +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ --enable-devicetables --without-python || return 1 make || return 1 Copied: fontforge/repos/extra-i686/libpng14.patch (from rev 68227, fontforge/trunk/libpng14.patch) === --- extra-i686/libpng14.patch (rev 0) +++ extra-i686/libpng14.patch 2010-02-11 21:16:13 UTC (rev 68229) @@ -0,0 +1,58 @@ +diff -Naur fontforge-20090923-orig/gutils/gimagereadpng.c fontforge-20090923/gutils/gimagereadpng.c +--- fontforge-20090923-orig/gutils/gimagereadpng.c 2010-02-11 00:22:37.0 -0500 fontforge-20090923/gutils/gimagereadpng.c 2010-02-11 00:27:03.0 -0500 +@@ -220,13 +220,13 @@ + if ( (info_ptr-validPNG_INFO_tRNS) info_ptr-num_trans0 ) { + if ( info_ptr-color_type==PNG_COLOR_TYPE_RGB || info_ptr-color_type==PNG_COLOR_TYPE_RGB_ALPHA ) + base-trans = COLOR_CREATE( +- (info_ptr-trans_values.red8), +- (info_ptr-trans_values.green8), +- (info_ptr-trans_values.blue8)); ++ (info_ptr-trans_color.red8), ++ (info_ptr-trans_color.green8), ++ (info_ptr-trans_color.blue8)); + else if ( base-image_type == it_mono ) +- base-trans = info_ptr-trans[0]; ++ base-trans = info_ptr-trans_alpha[0]; + else +- base-clut-trans_index = base-trans = info_ptr-trans[0]; ++ base-clut-trans_index = base-trans = info_ptr-trans_alpha[0]; + } + + row_pointers = galloc(info_ptr-height*sizeof(png_bytep)); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 03:11:19.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 03:17:15.0 -0500 +@@ -183,8 +183,8 @@ +if ( info_ptr-num_palette=16 ) + _png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +@@ -192,9 +192,9 @@ +
[arch-commits] Commit in archboot/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 16:16:18 Author: tpowa Revision: 68230 archrelease: new repo testing-x86_64 Added: archboot/repos/testing-x86_64/
[arch-commits] Commit in archboot/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 16:16:36 Author: tpowa Revision: 68231 Initialized merge tracking via svnmerge with revisions 1-68228 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/archboot/trunk Modified: archboot/repos/testing-x86_64/(properties) Property changes on: archboot/repos/testing-x86_64 ___ Added: svnmerge-integrated + /archboot/trunk:1-68228
[arch-commits] Commit in archboot/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 16:17:52 Author: tpowa Revision: 68232 archrelease: new repo testing-i686 Added: archboot/repos/testing-i686/
[arch-commits] Commit in archboot/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 16:18:09 Author: tpowa Revision: 68233 Initialized merge tracking via svnmerge with revisions 1-68231 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/archboot/trunk Modified: archboot/repos/testing-i686/ (properties) Property changes on: archboot/repos/testing-i686 ___ Added: svnmerge-integrated + /archboot/trunk:1-68231
[arch-commits] Commit in fontforge/repos (4 files)
Date: Thursday, February 11, 2010 @ 16:18:19 Author: eric Revision: 68234 Merged revisions 68227 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontforge/trunk r68227 | eric | 2010-02-11 16:15:44 -0500 (Thu, 11 Feb 2010) | 2 lines upgpkg: fontforge 20090923-2 Rebuilt against libpng 1.4.0 (close FS#18284) Added: fontforge/repos/extra-x86_64/libpng14.patch (from rev 68227, fontforge/trunk/libpng14.patch) Modified: fontforge/repos/extra-x86_64/ (properties) fontforge/repos/extra-x86_64/ChangeLog fontforge/repos/extra-x86_64/PKGBUILD + ChangeLog |5 PKGBUILD | 10 + libpng14.patch | 58 +++ 3 files changed, 69 insertions(+), 4 deletions(-) Property changes on: fontforge/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /fontforge/trunk:1-55853 + /fontforge/trunk:1-68232 Modified: extra-x86_64/ChangeLog === --- extra-x86_64/ChangeLog 2010-02-11 21:18:09 UTC (rev 68233) +++ extra-x86_64/ChangeLog 2010-02-11 21:18:19 UTC (rev 68234) @@ -1,3 +1,8 @@ +2010-02-10 Eric Belanger e...@archlinux.org + + * fontforge 20090923-2 + * Rebuilt against libpng 1.4.0 (close FS#18284) + 2009-10-14 Eric Belanger e...@archlinux.org * fontforge 20090923-1 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 21:18:09 UTC (rev 68233) +++ extra-x86_64/PKGBUILD 2010-02-11 21:18:19 UTC (rev 68234) @@ -4,7 +4,7 @@ pkgname=fontforge pkgver=20090923 -pkgrel=1 +pkgrel=2 pkgdesc=An outline and bitmap font editor arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; @@ -12,12 +12,14 @@ depends=('libxkbui' 'libxi') makedepends=('freetype2' 'libxml2' 'pango') options=('!libtool' '!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd') +source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ +libpng14.patch) +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') build() { cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ --enable-devicetables --without-python || return 1 make || return 1 Copied: fontforge/repos/extra-x86_64/libpng14.patch (from rev 68227, fontforge/trunk/libpng14.patch) === --- extra-x86_64/libpng14.patch (rev 0) +++ extra-x86_64/libpng14.patch 2010-02-11 21:18:19 UTC (rev 68234) @@ -0,0 +1,58 @@ +diff -Naur fontforge-20090923-orig/gutils/gimagereadpng.c fontforge-20090923/gutils/gimagereadpng.c +--- fontforge-20090923-orig/gutils/gimagereadpng.c 2010-02-11 00:22:37.0 -0500 fontforge-20090923/gutils/gimagereadpng.c 2010-02-11 00:27:03.0 -0500 +@@ -220,13 +220,13 @@ + if ( (info_ptr-validPNG_INFO_tRNS) info_ptr-num_trans0 ) { + if ( info_ptr-color_type==PNG_COLOR_TYPE_RGB || info_ptr-color_type==PNG_COLOR_TYPE_RGB_ALPHA ) + base-trans = COLOR_CREATE( +- (info_ptr-trans_values.red8), +- (info_ptr-trans_values.green8), +- (info_ptr-trans_values.blue8)); ++ (info_ptr-trans_color.red8), ++ (info_ptr-trans_color.green8), ++ (info_ptr-trans_color.blue8)); + else if ( base-image_type == it_mono ) +- base-trans = info_ptr-trans[0]; ++ base-trans = info_ptr-trans_alpha[0]; + else +- base-clut-trans_index = base-trans = info_ptr-trans[0]; ++ base-clut-trans_index = base-trans = info_ptr-trans_alpha[0]; + } + + row_pointers = galloc(info_ptr-height*sizeof(png_bytep)); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 03:11:19.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 03:17:15.0 -0500 +@@ -183,8 +183,8 @@ +if ( info_ptr-num_palette=16 ) + _png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +@@ -192,9
[arch-commits] Commit in flashplugin/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:27:51 Author: giovanni Revision: 68235 upgpkg: flashplugin 10.0.45.2-1 upstream release Modified: flashplugin/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 21:18:19 UTC (rev 68234) +++ PKGBUILD2010-02-11 21:27:51 UTC (rev 68235) @@ -3,7 +3,7 @@ pkgname=flashplugin _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' -pkgver=10.0.42.34 +pkgver=10.0.45.2 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -14,10 +14,10 @@ license=('custom') source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' http://www.adobe.com/products/eulas/pdfs/${_licensefile};) -md5sums=('aa694c7392d4519e4ef7812fd2922730' +md5sums=('dbfc776cd4310250cde078e0bf0472e7' '1636037610ee2aa35c5fb736a697b7e0') [ ${CARCH} = x86_64 ] source[0]=http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz; -[ ${CARCH} = x86_64 ] md5sums[0]='8b427c2991c0447af56a951c653ee383' +[ ${CARCH} = x86_64 ] md5sums[0]='4a4561e456612a6751653b58342d53df' build() { install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
[arch-commits] Commit in flashplugin/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:28:35 Author: giovanni Revision: 68236 Merged revisions 68235 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/flashplugin/trunk r68235 | giovanni | 2010-02-11 22:27:51 +0100 (gio, 11 feb 2010) | 2 lines upgpkg: flashplugin 10.0.45.2-1 upstream release Modified: flashplugin/repos/extra-i686/ (properties) flashplugin/repos/extra-i686/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Property changes on: flashplugin/repos/extra-i686 ___ Modified: svnmerge-integrated - /flashplugin/trunk:1-60911 + /flashplugin/trunk:1-68235 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 21:27:51 UTC (rev 68235) +++ extra-i686/PKGBUILD 2010-02-11 21:28:35 UTC (rev 68236) @@ -3,7 +3,7 @@ pkgname=flashplugin _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' -pkgver=10.0.42.34 +pkgver=10.0.45.2 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -14,10 +14,10 @@ license=('custom') source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' http://www.adobe.com/products/eulas/pdfs/${_licensefile};) -md5sums=('aa694c7392d4519e4ef7812fd2922730' +md5sums=('dbfc776cd4310250cde078e0bf0472e7' '1636037610ee2aa35c5fb736a697b7e0') [ ${CARCH} = x86_64 ] source[0]=http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz; -[ ${CARCH} = x86_64 ] md5sums[0]='8b427c2991c0447af56a951c653ee383' +[ ${CARCH} = x86_64 ] md5sums[0]='4a4561e456612a6751653b58342d53df' build() { install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
[arch-commits] Commit in flashplugin/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:32:42 Author: giovanni Revision: 68237 Merged revisions 68235 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/flashplugin/trunk r68235 | giovanni | 2010-02-11 22:27:51 +0100 (gio, 11 feb 2010) | 2 lines upgpkg: flashplugin 10.0.45.2-1 upstream release Modified: flashplugin/repos/extra-x86_64/ (properties) flashplugin/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Property changes on: flashplugin/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /flashplugin/trunk:1-60914 + /flashplugin/trunk:1-68236 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 21:28:35 UTC (rev 68236) +++ extra-x86_64/PKGBUILD 2010-02-11 21:32:42 UTC (rev 68237) @@ -3,7 +3,7 @@ pkgname=flashplugin _licensefile='Reader_Player_AIR_WWEULA-Combined-20080204_1313.pdf' -pkgver=10.0.42.34 +pkgver=10.0.45.2 pkgrel=1 pkgdesc='Adobe Flash Player' url='http://get.adobe.com/flashplayer' @@ -14,10 +14,10 @@ license=('custom') source=('http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz' http://www.adobe.com/products/eulas/pdfs/${_licensefile};) -md5sums=('aa694c7392d4519e4ef7812fd2922730' +md5sums=('dbfc776cd4310250cde078e0bf0472e7' '1636037610ee2aa35c5fb736a697b7e0') [ ${CARCH} = x86_64 ] source[0]=http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-${pkgver}.linux-${CARCH}.so.tar.gz; -[ ${CARCH} = x86_64 ] md5sums[0]='8b427c2991c0447af56a951c653ee383' +[ ${CARCH} = x86_64 ] md5sums[0]='4a4561e456612a6751653b58342d53df' build() { install -d -m755 ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
[arch-commits] Commit in python-sqlobject/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:38:02 Author: giovanni Revision: 68238 upgpkg: python-sqlobject 0.12.1-1 upstream release Modified: python-sqlobject/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 21:32:42 UTC (rev 68237) +++ PKGBUILD2010-02-11 21:38:02 UTC (rev 68238) @@ -3,7 +3,7 @@ # Contributor: Todd Maynard a...@toddmaynard.com pkgname=python-sqlobject -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc=A popular Object Relational Manager for providing an object interface to your database, with tables as classes, rows as instances, and columns as attributes arch=('any') @@ -11,8 +11,7 @@ url=http://sqlobject.org/; depends=('python=2.6' 'setuptools=0.6c8' 'python-formencode=0.7') source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) -md5sums=('a51376b08206b0ea400a7bdde60d58d8') -sha1sums=('3a89fa14eebb1745bd83ebaa26a19e51d77a99be') +md5sums=('8da2cb264934d82f8f10ba5e9abfb3a2') build() { cd $srcdir/SQLObject-$pkgver
[arch-commits] Commit in python-sqlobject/repos (extra-any extra-any/PKGBUILD)
Date: Thursday, February 11, 2010 @ 16:38:46 Author: giovanni Revision: 68239 Merged revisions 68238 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/python-sqlobject/trunk r68238 | giovanni | 2010-02-11 22:38:02 +0100 (gio, 11 feb 2010) | 2 lines upgpkg: python-sqlobject 0.12.1-1 upstream release Modified: python-sqlobject/repos/extra-any/ (properties) python-sqlobject/repos/extra-any/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Property changes on: python-sqlobject/repos/extra-any ___ Modified: svnmerge-integrated - /python-sqlobject/trunk:1-58518 + /python-sqlobject/trunk:1-68238 Modified: extra-any/PKGBUILD === --- extra-any/PKGBUILD 2010-02-11 21:38:02 UTC (rev 68238) +++ extra-any/PKGBUILD 2010-02-11 21:38:46 UTC (rev 68239) @@ -3,7 +3,7 @@ # Contributor: Todd Maynard a...@toddmaynard.com pkgname=python-sqlobject -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc=A popular Object Relational Manager for providing an object interface to your database, with tables as classes, rows as instances, and columns as attributes arch=('any') @@ -11,8 +11,7 @@ url=http://sqlobject.org/; depends=('python=2.6' 'setuptools=0.6c8' 'python-formencode=0.7') source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) -md5sums=('a51376b08206b0ea400a7bdde60d58d8') -sha1sums=('3a89fa14eebb1745bd83ebaa26a19e51d77a99be') +md5sums=('8da2cb264934d82f8f10ba5e9abfb3a2') build() { cd $srcdir/SQLObject-$pkgver
[arch-commits] Commit in chromium/trunk (5 files)
Date: Thursday, February 11, 2010 @ 18:45:07 Author: pierre Revision: 68240 upgpkg: chromium 5.0.307.7-1 switch to new beta branch Modified: chromium/trunk/PKGBUILD chromium/trunk/createSource chromium/trunk/drop_sse2.patch chromium/trunk/ffmpeg_branding_mime.patch chromium/trunk/libpng-1.4.patch + PKGBUILD | 24 +--- createSource |5 +++-- drop_sse2.patch|6 +++--- ffmpeg_branding_mime.patch | 10 +- libpng-1.4.patch | 43 +-- 5 files changed, 53 insertions(+), 35 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 21:38:46 UTC (rev 68239) +++ PKGBUILD2010-02-11 23:45:07 UTC (rev 68240) @@ -2,28 +2,27 @@ # Maintainer: Pierre Schmitz pie...@archlinux.de pkgname=chromium -pkgver=4.0.249.78 -pkgrel=3 +pkgver=5.0.307.7 +pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' arch=('i686' 'x86_64') url='http://www.chromium.org/' license=('BSD') -depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt' 'ffmpeg') -makedepends=('python' 'perl' 'gperf') +depends=('nss' 'gconf' 'alsa-lib' 'xdg-utils' 'hicolor-icon-theme' 'bzip2' 'libxslt' 'ffmpeg' + 'libevent' 'libxss') +makedepends=('python' 'perl' 'gperf' 'yasm' 'mesa') provides=('chromium-browser') conflicts=('chromium-browser') install='chromium.install' -# downgrade from 4.0.267.0-2 -options=('force') source=(ftp://ftp.archlinux.org/other/chromium/chromium-${pkgver}.tar.xz; 'chromium.desktop' 'chromium.sh' 'drop_sse2.patch' 'ffmpeg_branding_mime.patch' 'libpng-1.4.patch') -md5sums=('15d2cdc31d1c41eebf02eab3323dab3c' +md5sums=('916fa2a672086ab105dc7acacfb96987' '897de25e9c25a01f8b1b67abe554a6b7' '93cd6f5f53b15546dc9d3de49118534c' - 'ddc1d741d50e8d46765a6b76e8faad32' - '95567a364197237dcefa3fabb5631822' - 'ac1da2e538ed1e16235b206ff9ba9407') + 'dfbc18bb26dffa2dc6d4d3a857730902' + 'ae9e26e6c2d164e6af0e513dae2273a3' + 'e3b482665b179e06ff852c58463706a8') build() { cd ${srcdir}/chromium-${pkgver} @@ -42,12 +41,15 @@ use_system_bzip2=1 \ use_system_libpng=1 \ use_system_ffmpeg=1 \ - werror= + use_system_yasm=1 \ + use_system_libevent=1 \ + use_system_ssl=1 patch -p0 -i ${srcdir}/ffmpeg_branding_mime.patch || return 1 # i686 does not include SSE2 # see http://code.google.com/p/chromium/issues/detail?id=9007 patch -p0 -i ${srcdir}/drop_sse2.patch || return 1 + # see http://codereview.chromium.org/569009/show patch -p0 -i ${srcdir}/libpng-1.4.patch || return 1 export PATH=./depot_tools/:$PATH Modified: createSource === --- createSource2010-02-11 21:38:46 UTC (rev 68239) +++ createSource2010-02-11 23:45:07 UTC (rev 68240) @@ -21,7 +21,8 @@ mkdir -p $tmp/chromium-$pkgver cd $tmp/chromium-$pkgver -svn co -r34500 http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools +# this should be updated to a more recent revision on major updates +svn co -r38382 -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools export PATH=./depot_tools/:$PATH gclient.py config http://src.chromium.org/svn/releases/$pkgver @@ -47,7 +48,7 @@ find . -iname '*.nexe' -delete cd .. -bsdtar cvJf $current/chromium-$pkgver.tar.xz chromium-$pkgver +bsdtar cJf $current/chromium-$pkgver.tar.xz chromium-$pkgver cd $current rm -rf $tmp Modified: drop_sse2.patch === --- drop_sse2.patch 2010-02-11 21:38:46 UTC (rev 68239) +++ drop_sse2.patch 2010-02-11 23:45:07 UTC (rev 68240) @@ -1,6 +1,6 @@ src/build/common.gypi 2009-12-17 01:57:20.0 +0100 -+++ src/build/common.gypi 2009-12-17 02:37:05.663568345 +0100 -@@ -652,15 +652,6 @@ +--- src/build/common.gypi 2010-02-11 19:30:43.0 +0100 src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100 +@@ -759,15 +759,6 @@ # used during computation does not change depending on how the # compiler optimized the code, since the value is always kept # in its specified precision. Modified: ffmpeg_branding_mime.patch === --- ffmpeg_branding_mime.patch 2010-02-11 21:38:46 UTC (rev 68239) +++ ffmpeg_branding_mime.patch 2010-02-11 23:45:07 UTC (rev 68240) @@ -1,5 +1,5 @@ src/net/base/mime_util.cc 2009-12-13 19:09:26.467781732 +0100 -+++ src/net/base/mime_util.cc 2009-12-13 19:10:14.967931404
[arch-commits] Commit in kdevplatform/repos (3 files)
Date: Thursday, February 11, 2010 @ 18:51:37 Author: andrea Revision: 68241 Merged revisions 68137 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevplatform/trunk r68137 | andrea | 2010-02-11 00:24:17 +0100 (Thu, 11 Feb 2010) | 1 line ready for next release Added: kdevplatform/repos/extra-i686/kdevplatform.install (from rev 68137, kdevplatform/trunk/kdevplatform.install) Modified: kdevplatform/repos/extra-i686/(properties) kdevplatform/repos/extra-i686/PKGBUILD --+ PKGBUILD | 14 ++ kdevplatform.install | 11 +++ 2 files changed, 21 insertions(+), 4 deletions(-) Property changes on: kdevplatform/repos/extra-i686 ___ Modified: svnmerge-integrated - /kdevplatform/trunk:1-61392 + /kdevplatform/trunk:1-68240 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 23:45:07 UTC (rev 68240) +++ extra-i686/PKGBUILD 2010-02-11 23:51:37 UTC (rev 68241) @@ -3,8 +3,9 @@ # Contributor: Giovanni Scafora giova...@archlinux.org pkgname=kdevplatform -pkgver=0.9.97 -pkgrel=2 +pkgver=0.9.98 +_kdevelopver=3.9.98 +pkgrel=1 pkgdesc=A C/C++ development platform for KDE arch=('i686' 'x86_64') url=http://www.kdevelop.org/; @@ -12,8 +13,9 @@ depends=('kdelibs' 'boost' 'subversion' 'commoncpp2') optdepends=(kdesdk-kompare: difference checking) makedepends=('cmake' 'automoc4') -source=(http://download.kde.org/unstable/kdevelop/3.9.97/src/${pkgname}-${pkgver}.tar.bz2;) -md5sums=('bfe385bc471d4d9abf4e989ca203db86') +install=${pkgname}.install +source=(http://download.kde.org/unstable/kdevelop/${_kdevelopver}/src/${pkgname}-${pkgver}.tar.bz2;) +md5sums=('dcdc427d8be4d8fa721f7354ac4406ed') build() { cd ${srcdir} @@ -25,5 +27,9 @@ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make || return 1 +} + +package() { + cd ${srcdir}/build make DESTDIR=${pkgdir} install || return 1 } Copied: kdevplatform/repos/extra-i686/kdevplatform.install (from rev 68137, kdevplatform/trunk/kdevplatform.install) === --- extra-i686/kdevplatform.install (rev 0) +++ extra-i686/kdevplatform.install 2010-02-11 23:51:37 UTC (rev 68241) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
[arch-commits] Commit in kdevplatform/repos (3 files)
Date: Thursday, February 11, 2010 @ 18:53:03 Author: andrea Revision: 68242 Merged revisions 68137 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevplatform/trunk r68137 | andrea | 2010-02-11 00:24:17 +0100 (Thu, 11 Feb 2010) | 1 line ready for next release Added: kdevplatform/repos/extra-x86_64/kdevplatform.install (from rev 68137, kdevplatform/trunk/kdevplatform.install) Modified: kdevplatform/repos/extra-x86_64/ (properties) kdevplatform/repos/extra-x86_64/PKGBUILD --+ PKGBUILD | 14 ++ kdevplatform.install | 11 +++ 2 files changed, 21 insertions(+), 4 deletions(-) Property changes on: kdevplatform/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /kdevplatform/trunk:1-61409 + /kdevplatform/trunk:1-68241 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 23:51:37 UTC (rev 68241) +++ extra-x86_64/PKGBUILD 2010-02-11 23:53:03 UTC (rev 68242) @@ -3,8 +3,9 @@ # Contributor: Giovanni Scafora giova...@archlinux.org pkgname=kdevplatform -pkgver=0.9.97 -pkgrel=2 +pkgver=0.9.98 +_kdevelopver=3.9.98 +pkgrel=1 pkgdesc=A C/C++ development platform for KDE arch=('i686' 'x86_64') url=http://www.kdevelop.org/; @@ -12,8 +13,9 @@ depends=('kdelibs' 'boost' 'subversion' 'commoncpp2') optdepends=(kdesdk-kompare: difference checking) makedepends=('cmake' 'automoc4') -source=(http://download.kde.org/unstable/kdevelop/3.9.97/src/${pkgname}-${pkgver}.tar.bz2;) -md5sums=('bfe385bc471d4d9abf4e989ca203db86') +install=${pkgname}.install +source=(http://download.kde.org/unstable/kdevelop/${_kdevelopver}/src/${pkgname}-${pkgver}.tar.bz2;) +md5sums=('dcdc427d8be4d8fa721f7354ac4406ed') build() { cd ${srcdir} @@ -25,5 +27,9 @@ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make || return 1 +} + +package() { + cd ${srcdir}/build make DESTDIR=${pkgdir} install || return 1 } Copied: kdevplatform/repos/extra-x86_64/kdevplatform.install (from rev 68137, kdevplatform/trunk/kdevplatform.install) === --- extra-x86_64/kdevplatform.install (rev 0) +++ extra-x86_64/kdevplatform.install 2010-02-11 23:53:03 UTC (rev 68242) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
[arch-commits] Commit in kdevelop/repos (3 files)
Date: Thursday, February 11, 2010 @ 18:54:21 Author: andrea Revision: 68243 Merged revisions 68140 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevelop/trunk r68140 | andrea | 2010-02-11 00:39:02 +0100 (Thu, 11 Feb 2010) | 1 line ready for next release Added: kdevelop/repos/extra-i686/kdevelop.install (from rev 68140, kdevelop/trunk/kdevelop.install) Modified: kdevelop/repos/extra-i686/(properties) kdevelop/repos/extra-i686/PKGBUILD --+ PKGBUILD | 11 --- kdevelop.install | 11 +++ 2 files changed, 19 insertions(+), 3 deletions(-) Property changes on: kdevelop/repos/extra-i686 ___ Modified: svnmerge-integrated - /kdevelop/trunk:1-61249 + /kdevelop/trunk:1-68242 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-11 23:53:03 UTC (rev 68242) +++ extra-i686/PKGBUILD 2010-02-11 23:54:21 UTC (rev 68243) @@ -3,16 +3,17 @@ # Contributor: Giovanni Scafora giova...@archlinux.org pkgname=kdevelop -pkgver=3.9.97 +pkgver=3.9.98 pkgrel=1 pkgdesc=A C/C++ development environment for KDE arch=('i686' 'x86_64') url=http://www.kdevelop.org/; license=('GPL') -depends=('kdebase-workspace' 'kdevplatform=0.9.97') +depends=('kdebase-workspace' 'kdevplatform=0.9.98') makedepends=('cmake' 'automoc4' 'perl') +install=${pkgname}.install source=(http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;) -md5sums=('260b4eae5962c1e57941ebbb64b42bb8') +md5sums=('335fa118aa57c25a1793d2c45526a89f') build() { cd ${srcdir} @@ -24,5 +25,9 @@ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make || return 1 +} + +package() { + cd ${srcdir}/build make DESTDIR=${pkgdir} install || return 1 } Copied: kdevelop/repos/extra-i686/kdevelop.install (from rev 68140, kdevelop/trunk/kdevelop.install) === --- extra-i686/kdevelop.install (rev 0) +++ extra-i686/kdevelop.install 2010-02-11 23:54:21 UTC (rev 68243) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
[arch-commits] Commit in chromium/repos (testing-i686)
Date: Thursday, February 11, 2010 @ 18:54:50 Author: pierre Revision: 68244 archrelease: copy trunk to testing-i686 Added: chromium/repos/testing-i686/
[arch-commits] Commit in kdevelop/repos (3 files)
Date: Thursday, February 11, 2010 @ 18:55:37 Author: andrea Revision: 68245 Merged revisions 68140 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdevelop/trunk r68140 | andrea | 2010-02-11 00:39:02 +0100 (Thu, 11 Feb 2010) | 1 line ready for next release Added: kdevelop/repos/extra-x86_64/kdevelop.install (from rev 68140, kdevelop/trunk/kdevelop.install) Modified: kdevelop/repos/extra-x86_64/ (properties) kdevelop/repos/extra-x86_64/PKGBUILD --+ PKGBUILD | 11 --- kdevelop.install | 11 +++ 2 files changed, 19 insertions(+), 3 deletions(-) Property changes on: kdevelop/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /kdevelop/trunk:1-61243 + /kdevelop/trunk:1-68244 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-11 23:54:50 UTC (rev 68244) +++ extra-x86_64/PKGBUILD 2010-02-11 23:55:37 UTC (rev 68245) @@ -3,16 +3,17 @@ # Contributor: Giovanni Scafora giova...@archlinux.org pkgname=kdevelop -pkgver=3.9.97 +pkgver=3.9.98 pkgrel=1 pkgdesc=A C/C++ development environment for KDE arch=('i686' 'x86_64') url=http://www.kdevelop.org/; license=('GPL') -depends=('kdebase-workspace' 'kdevplatform=0.9.97') +depends=('kdebase-workspace' 'kdevplatform=0.9.98') makedepends=('cmake' 'automoc4' 'perl') +install=${pkgname}.install source=(http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2;) -md5sums=('260b4eae5962c1e57941ebbb64b42bb8') +md5sums=('335fa118aa57c25a1793d2c45526a89f') build() { cd ${srcdir} @@ -24,5 +25,9 @@ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' make || return 1 +} + +package() { + cd ${srcdir}/build make DESTDIR=${pkgdir} install || return 1 } Copied: kdevelop/repos/extra-x86_64/kdevelop.install (from rev 68140, kdevelop/trunk/kdevelop.install) === --- extra-x86_64/kdevelop.install (rev 0) +++ extra-x86_64/kdevelop.install 2010-02-11 23:55:37 UTC (rev 68245) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
[arch-commits] Commit in chromium/repos (testing-x86_64)
Date: Thursday, February 11, 2010 @ 18:58:23 Author: pierre Revision: 68246 archrelease: copy trunk to testing-x86_64 Added: chromium/repos/testing-x86_64/
[arch-commits] Commit in python-sqlobject/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 18:58:36 Author: andrea Revision: 68247 upgpkg: python-sqlobject 0.12.1-2 added optional dependence for supported databases (FS#18299) Modified: python-sqlobject/trunk/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 23:58:23 UTC (rev 68246) +++ PKGBUILD2010-02-11 23:58:36 UTC (rev 68247) @@ -1,21 +1,24 @@ # $Id$ -# Maintainer: Aaron Griffin aa...@archlinux.org +# Contributor: Aaron Griffin aa...@archlinux.org # Contributor: Todd Maynard a...@toddmaynard.com pkgname=python-sqlobject pkgver=0.12.1 -pkgrel=1 +pkgrel=2 pkgdesc=A popular Object Relational Manager for providing an object interface to your database, with tables as classes, rows as instances, and columns as attributes arch=('any') license=('LGPL') url=http://sqlobject.org/; -depends=('python=2.6' 'setuptools=0.6c8' 'python-formencode=0.7') +depends=('python' 'setuptools' 'python-formencode') +optdepends=('python-pysqlite: SQlite database support' + 'python-mysql: MySQL database support' + 'python-psycopg1: PostgreSQL database support') source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) md5sums=('8da2cb264934d82f8f10ba5e9abfb3a2') build() { cd $srcdir/SQLObject-$pkgver python setup.py install --root=$pkgdir || return 1 - echo /usr/lib/python2.6/site-packages/SQLObject-$pkgver-py2.6.egg \ + echo /usr/lib/python2.6/site-packages/SQLObject-$pkgver-py2.6.egg \ $pkgdir/usr/lib/python2.6/site-packages/$pkgname.pth || return 1 }
[arch-commits] Commit in python-sqlobject/repos (extra-any extra-any/PKGBUILD)
Date: Thursday, February 11, 2010 @ 18:59:12 Author: andrea Revision: 68248 Merged revisions 68247 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/python-sqlobject/trunk r68247 | andrea | 2010-02-12 00:58:36 +0100 (Fri, 12 Feb 2010) | 2 lines upgpkg: python-sqlobject 0.12.1-2 added optional dependence for supported databases (FS#18299) Modified: python-sqlobject/repos/extra-any/ (properties) python-sqlobject/repos/extra-any/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) Property changes on: python-sqlobject/repos/extra-any ___ Modified: svnmerge-integrated - /python-sqlobject/trunk:1-68238 + /python-sqlobject/trunk:1-68247 Modified: extra-any/PKGBUILD === --- extra-any/PKGBUILD 2010-02-11 23:58:36 UTC (rev 68247) +++ extra-any/PKGBUILD 2010-02-11 23:59:12 UTC (rev 68248) @@ -1,21 +1,24 @@ # $Id$ -# Maintainer: Aaron Griffin aa...@archlinux.org +# Contributor: Aaron Griffin aa...@archlinux.org # Contributor: Todd Maynard a...@toddmaynard.com pkgname=python-sqlobject pkgver=0.12.1 -pkgrel=1 +pkgrel=2 pkgdesc=A popular Object Relational Manager for providing an object interface to your database, with tables as classes, rows as instances, and columns as attributes arch=('any') license=('LGPL') url=http://sqlobject.org/; -depends=('python=2.6' 'setuptools=0.6c8' 'python-formencode=0.7') +depends=('python' 'setuptools' 'python-formencode') +optdepends=('python-pysqlite: SQlite database support' + 'python-mysql: MySQL database support' + 'python-psycopg1: PostgreSQL database support') source=(http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-$pkgver.tar.gz) md5sums=('8da2cb264934d82f8f10ba5e9abfb3a2') build() { cd $srcdir/SQLObject-$pkgver python setup.py install --root=$pkgdir || return 1 - echo /usr/lib/python2.6/site-packages/SQLObject-$pkgver-py2.6.egg \ + echo /usr/lib/python2.6/site-packages/SQLObject-$pkgver-py2.6.egg \ $pkgdir/usr/lib/python2.6/site-packages/$pkgname.pth || return 1 }
[arch-commits] Commit in devtools/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 19:52:46 Author: pierre Revision: 68249 update to 0.9.0 Modified: devtools/trunk/PKGBUILD --+ PKGBUILD | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-11 23:59:12 UTC (rev 68248) +++ PKGBUILD2010-02-12 00:52:46 UTC (rev 68249) @@ -1,17 +1,16 @@ # $Id$ -# Maintainer: Jason Chu ja...@archlinux.org +# Maintainer: Pierre Schmitz pie...@archlinux.de pkgname=devtools -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=1 -pkgdesc=A few tools to help Arch Linux developers +pkgdesc='Tools for Arch Linux package maintainers' arch=('any') license=('GPL') -url=http://projects.archlinux.org/?p=devtools.git; -depends=('namcap') -conflicts=('aurtools') -source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('03749475e668d90eb684db543027efd0') +url='http://projects.archlinux.org/devtools.git/' +depends=('namcap' 'openssh' 'subversion' 'rsync') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz;) +md5sums=('8801ae35c351d7f9fc10745a38774032') build() { cd $srcdir/$pkgname-$pkgver
[arch-commits] Commit in devtools/repos (testing-any)
Date: Thursday, February 11, 2010 @ 19:53:05 Author: pierre Revision: 68250 archrelease: copy trunk to testing-any Added: devtools/repos/testing-any/
[arch-commits] Commit in konversation/trunk (PKGBUILD)
Date: Thursday, February 11, 2010 @ 21:53:13 Author: andrea Revision: 68251 upgpkg: konversation 1.2.2-1 upstream release Modified: konversation/trunk/PKGBUILD --+ PKGBUILD | 16 ++-- 1 file changed, 10 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-12 00:53:05 UTC (rev 68250) +++ PKGBUILD2010-02-12 02:53:13 UTC (rev 68251) @@ -4,17 +4,17 @@ # Contributor: Sergio Jovani Guzman mo...@paretux.org pkgname=konversation -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc=A user friendly IRC client for KDE arch=('i686' 'x86_64') url=http://konversation.kde.org; -depends=('kdebase-runtime' 'libxss' 'kdepimlibs' 'qca') +depends=('kdebase-runtime' 'kdepimlibs') makedepends=('automoc4' 'cmake' 'pkgconfig') license=('GPL2' 'FDL') -install=konversation.install +install=${pkgname}.install source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7d3c5d7f0062e8441b27ff549aa0029e') +md5sums=('668e4aacfbb4521a3bf0ed53382fdf9f') build() { cd ${srcdir} @@ -24,6 +24,10 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr -make || return 1 -make DESTDIR=${pkgdir} install || return 1 + make || return 1 } + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install || return 1 +}
[arch-commits] Commit in konversation/repos (extra-i686 extra-i686/PKGBUILD)
Date: Thursday, February 11, 2010 @ 21:54:08 Author: andrea Revision: 68252 Merged revisions 61146-61147,63522,68251 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/konversation/trunk r61146 | andrea | 2009-12-12 16:32:02 +0100 (Sat, 12 Dec 2009) | 1 line prepare kde-unstable repo r61147 | andrea | 2009-12-12 16:34:00 +0100 (Sat, 12 Dec 2009) | 1 line undo r63522 | andrea | 2010-01-17 19:42:46 +0100 (Sun, 17 Jan 2010) | 1 line cleanup build r68251 | andrea | 2010-02-12 03:53:13 +0100 (Fri, 12 Feb 2010) | 2 lines upgpkg: konversation 1.2.2-1 upstream release Modified: konversation/repos/extra-i686/(properties) konversation/repos/extra-i686/PKGBUILD --+ PKGBUILD | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) Property changes on: konversation/repos/extra-i686 ___ Modified: svnmerge-integrated - /konversation/trunk:1-58707 + /konversation/trunk:1-68251 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-12 02:53:13 UTC (rev 68251) +++ extra-i686/PKGBUILD 2010-02-12 02:54:08 UTC (rev 68252) @@ -4,17 +4,17 @@ # Contributor: Sergio Jovani Guzman mo...@paretux.org pkgname=konversation -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc=A user friendly IRC client for KDE arch=('i686' 'x86_64') url=http://konversation.kde.org; -depends=('kdebase-runtime' 'libxss' 'kdepimlibs' 'qca') +depends=('kdebase-runtime' 'kdepimlibs') makedepends=('automoc4' 'cmake' 'pkgconfig') license=('GPL2' 'FDL') -install=konversation.install +install=${pkgname}.install source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7d3c5d7f0062e8441b27ff549aa0029e') +md5sums=('668e4aacfbb4521a3bf0ed53382fdf9f') build() { cd ${srcdir} @@ -23,8 +23,11 @@ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ --DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \ -DCMAKE_INSTALL_PREFIX=/usr -make || return 1 -make DESTDIR=${pkgdir} install || return 1 + make || return 1 } + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install || return 1 +}
[arch-commits] Commit in konversation/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Thursday, February 11, 2010 @ 21:55:57 Author: andrea Revision: 68253 Merged revisions 61146-61147,63522,68251 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/konversation/trunk r61146 | andrea | 2009-12-12 16:32:02 +0100 (Sat, 12 Dec 2009) | 1 line prepare kde-unstable repo r61147 | andrea | 2009-12-12 16:34:00 +0100 (Sat, 12 Dec 2009) | 1 line undo r63522 | andrea | 2010-01-17 19:42:46 +0100 (Sun, 17 Jan 2010) | 1 line cleanup build r68251 | andrea | 2010-02-12 03:53:13 +0100 (Fri, 12 Feb 2010) | 2 lines upgpkg: konversation 1.2.2-1 upstream release Modified: konversation/repos/extra-x86_64/ (properties) konversation/repos/extra-x86_64/PKGBUILD --+ PKGBUILD | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) Property changes on: konversation/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /konversation/trunk:1-58873 + /konversation/trunk:1-68252 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-12 02:54:08 UTC (rev 68252) +++ extra-x86_64/PKGBUILD 2010-02-12 02:55:57 UTC (rev 68253) @@ -4,17 +4,17 @@ # Contributor: Sergio Jovani Guzman mo...@paretux.org pkgname=konversation -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc=A user friendly IRC client for KDE arch=('i686' 'x86_64') url=http://konversation.kde.org; -depends=('kdebase-runtime' 'libxss' 'kdepimlibs' 'qca') +depends=('kdebase-runtime' 'kdepimlibs') makedepends=('automoc4' 'cmake' 'pkgconfig') license=('GPL2' 'FDL') -install=konversation.install +install=${pkgname}.install source=(http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7d3c5d7f0062e8441b27ff549aa0029e') +md5sums=('668e4aacfbb4521a3bf0ed53382fdf9f') build() { cd ${srcdir} @@ -23,8 +23,11 @@ cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ --DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \ -DCMAKE_INSTALL_PREFIX=/usr -make || return 1 -make DESTDIR=${pkgdir} install || return 1 + make || return 1 } + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install || return 1 +}
[arch-commits] Commit in fontforge/trunk (ChangeLog PKGBUILD libpng14.patch)
Date: Thursday, February 11, 2010 @ 22:04:19 Author: eric Revision: 68254 upgpkg: fontforge 20090923-2 Added python interpreter, Disabled dlopen Modified: fontforge/trunk/ChangeLog fontforge/trunk/PKGBUILD fontforge/trunk/libpng14.patch + ChangeLog |2 ++ PKGBUILD |9 - libpng14.patch | 33 + 3 files changed, 39 insertions(+), 5 deletions(-) Modified: ChangeLog === --- ChangeLog 2010-02-12 02:55:57 UTC (rev 68253) +++ ChangeLog 2010-02-12 03:04:19 UTC (rev 68254) @@ -1,6 +1,8 @@ 2010-02-10 Eric Belanger e...@archlinux.org * fontforge 20090923-2 + * Added python interpreter + * Disabled dlopen * Rebuilt against libpng 1.4.0 (close FS#18284) 2009-10-14 Eric Belanger e...@archlinux.org Modified: PKGBUILD === --- PKGBUILD2010-02-12 02:55:57 UTC (rev 68253) +++ PKGBUILD2010-02-12 03:04:19 UTC (rev 68254) @@ -9,19 +9,18 @@ arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; license=('BSD') -depends=('libxkbui' 'libxi') -makedepends=('freetype2' 'libxml2' 'pango') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libpng' 'libtiff' 'libjpeg' 'python') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ libpng14.patch) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '7f69008310b6c1b8c1f2d617fc68d207') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' 'b25885ad555bb25736f25311a23b5b21fc5a2165') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ ---enable-devicetables --without-python || return 1 +--enable-devicetables --with-regular-link --with-python || return 1 make || return 1 make DESTDIR=${pkgdir} install || return 1 install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 Modified: libpng14.patch === --- libpng14.patch 2010-02-12 02:55:57 UTC (rev 68253) +++ libpng14.patch 2010-02-12 03:04:19 UTC (rev 68254) @@ -56,3 +56,36 @@ if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); _png_destroy_write_struct(png_ptr, info_ptr); gfree(rows); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 17:10:41.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 17:12:59.0 -0500 +@@ -314,15 +314,15 @@ +if ( info_ptr-num_palette=16 ) + png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +if ( base-trans!=-1 ) { +- info_ptr-trans_values.red = COLOR_RED(base-trans); +- info_ptr-trans_values.green = COLOR_GREEN(base-trans); +- info_ptr-trans_values.blue = COLOR_BLUE(base-trans); ++ info_ptr-trans_color.red = COLOR_RED(base-trans); ++ info_ptr-trans_color.green = COLOR_GREEN(base-trans); ++ info_ptr-trans_color.blue = COLOR_BLUE(base-trans); +} +} +png_write_info(png_ptr, info_ptr); +@@ -338,7 +338,7 @@ + + png_write_end(png_ptr, info_ptr); + +-if ( info_ptr-trans!=NULL ) gfree(info_ptr-trans); ++if ( info_ptr-trans_alpha!=NULL ) gfree(info_ptr-trans_alpha); + if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); + png_destroy_write_struct(png_ptr, info_ptr); + gfree(rows);
[arch-commits] Commit in fontforge/repos (4 files)
Date: Thursday, February 11, 2010 @ 22:04:38 Author: eric Revision: 68255 Merged revisions 68254 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontforge/trunk r68254 | eric | 2010-02-11 22:04:19 -0500 (Thu, 11 Feb 2010) | 2 lines upgpkg: fontforge 20090923-2 Added python interpreter, Disabled dlopen Modified: fontforge/repos/extra-i686/ (properties) fontforge/repos/extra-i686/ChangeLog fontforge/repos/extra-i686/PKGBUILD fontforge/repos/extra-i686/libpng14.patch + ChangeLog |2 ++ PKGBUILD |9 - libpng14.patch | 33 + 3 files changed, 39 insertions(+), 5 deletions(-) Property changes on: fontforge/repos/extra-i686 ___ Modified: svnmerge-integrated - /fontforge/trunk:1-68227 + /fontforge/trunk:1-68254 Modified: extra-i686/ChangeLog === --- extra-i686/ChangeLog2010-02-12 03:04:19 UTC (rev 68254) +++ extra-i686/ChangeLog2010-02-12 03:04:38 UTC (rev 68255) @@ -1,6 +1,8 @@ 2010-02-10 Eric Belanger e...@archlinux.org * fontforge 20090923-2 + * Added python interpreter + * Disabled dlopen * Rebuilt against libpng 1.4.0 (close FS#18284) 2009-10-14 Eric Belanger e...@archlinux.org Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-12 03:04:19 UTC (rev 68254) +++ extra-i686/PKGBUILD 2010-02-12 03:04:38 UTC (rev 68255) @@ -9,19 +9,18 @@ arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; license=('BSD') -depends=('libxkbui' 'libxi') -makedepends=('freetype2' 'libxml2' 'pango') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libpng' 'libtiff' 'libjpeg' 'python') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ libpng14.patch) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '7f69008310b6c1b8c1f2d617fc68d207') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' 'b25885ad555bb25736f25311a23b5b21fc5a2165') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ ---enable-devicetables --without-python || return 1 +--enable-devicetables --with-regular-link --with-python || return 1 make || return 1 make DESTDIR=${pkgdir} install || return 1 install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 Modified: extra-i686/libpng14.patch === --- extra-i686/libpng14.patch 2010-02-12 03:04:19 UTC (rev 68254) +++ extra-i686/libpng14.patch 2010-02-12 03:04:38 UTC (rev 68255) @@ -56,3 +56,36 @@ if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); _png_destroy_write_struct(png_ptr, info_ptr); gfree(rows); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 17:10:41.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 17:12:59.0 -0500 +@@ -314,15 +314,15 @@ +if ( info_ptr-num_palette=16 ) + png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +if ( base-trans!=-1 ) { +- info_ptr-trans_values.red = COLOR_RED(base-trans); +- info_ptr-trans_values.green = COLOR_GREEN(base-trans); +- info_ptr-trans_values.blue = COLOR_BLUE(base-trans); ++ info_ptr-trans_color.red = COLOR_RED(base-trans); ++ info_ptr-trans_color.green = COLOR_GREEN(base-trans); ++ info_ptr-trans_color.blue = COLOR_BLUE(base-trans); +} +} +png_write_info(png_ptr, info_ptr); +@@ -338,7 +338,7 @@ + + png_write_end(png_ptr, info_ptr); + +-if ( info_ptr-trans!=NULL ) gfree(info_ptr-trans); ++if ( info_ptr-trans_alpha!=NULL ) gfree(info_ptr-trans_alpha); + if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); + png_destroy_write_struct(png_ptr, info_ptr); + gfree(rows);
[arch-commits] Commit in fontforge/repos (4 files)
Date: Thursday, February 11, 2010 @ 22:06:19 Author: eric Revision: 68256 Merged revisions 68254 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontforge/trunk r68254 | eric | 2010-02-11 22:04:19 -0500 (Thu, 11 Feb 2010) | 2 lines upgpkg: fontforge 20090923-2 Added python interpreter, Disabled dlopen Modified: fontforge/repos/extra-x86_64/ (properties) fontforge/repos/extra-x86_64/ChangeLog fontforge/repos/extra-x86_64/PKGBUILD fontforge/repos/extra-x86_64/libpng14.patch + ChangeLog |2 ++ PKGBUILD |9 - libpng14.patch | 33 + 3 files changed, 39 insertions(+), 5 deletions(-) Property changes on: fontforge/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /fontforge/trunk:1-68232 + /fontforge/trunk:1-68255 Modified: extra-x86_64/ChangeLog === --- extra-x86_64/ChangeLog 2010-02-12 03:04:38 UTC (rev 68255) +++ extra-x86_64/ChangeLog 2010-02-12 03:06:19 UTC (rev 68256) @@ -1,6 +1,8 @@ 2010-02-10 Eric Belanger e...@archlinux.org * fontforge 20090923-2 + * Added python interpreter + * Disabled dlopen * Rebuilt against libpng 1.4.0 (close FS#18284) 2009-10-14 Eric Belanger e...@archlinux.org Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-12 03:04:38 UTC (rev 68255) +++ extra-x86_64/PKGBUILD 2010-02-12 03:06:19 UTC (rev 68256) @@ -9,19 +9,18 @@ arch=('i686' 'x86_64') url=http://fontforge.sourceforge.net; license=('BSD') -depends=('libxkbui' 'libxi') -makedepends=('freetype2' 'libxml2' 'pango') +depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libpng' 'libtiff' 'libjpeg' 'python') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/fontforge/fontforge_full-${pkgver}.tar.bz2 \ libpng14.patch) -md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '20f8881ee1731d974b362dbaba245877') -sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' '7b66882e16f241927598628d68214adce51f6ecd') +md5sums=('ea9d8dc38de79235fbe6add725b38ffe' '7f69008310b6c1b8c1f2d617fc68d207') +sha1sums=('cccf78ddf074ea5ddc3ce13a988dc17d383eabdd' 'b25885ad555bb25736f25311a23b5b21fc5a2165') build() { cd ${srcdir}/${pkgname}-${pkgver} patch -p1 ../libpng14.patch || return 1 ./configure --prefix=/usr --mandir=/usr/share/man --enable-type3 --enable-double \ ---enable-devicetables --without-python || return 1 +--enable-devicetables --with-regular-link --with-python || return 1 make || return 1 make DESTDIR=${pkgdir} install || return 1 install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 Modified: extra-x86_64/libpng14.patch === --- extra-x86_64/libpng14.patch 2010-02-12 03:04:38 UTC (rev 68255) +++ extra-x86_64/libpng14.patch 2010-02-12 03:06:19 UTC (rev 68256) @@ -56,3 +56,36 @@ if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); _png_destroy_write_struct(png_ptr, info_ptr); gfree(rows); +diff -Naur fontforge-20090923-orig/gutils/gimagewritepng.c fontforge-20090923/gutils/gimagewritepng.c +--- fontforge-20090923-orig/gutils/gimagewritepng.c2010-02-11 17:10:41.0 -0500 fontforge-20090923/gutils/gimagewritepng.c 2010-02-11 17:12:59.0 -0500 +@@ -314,15 +314,15 @@ +if ( info_ptr-num_palette=16 ) + png_set_packing(png_ptr); +if ( base-trans!=-1 ) { +- info_ptr-trans = galloc(1); +- info_ptr-trans[0] = base-trans; ++ info_ptr-trans_alpha = galloc(1); ++ info_ptr-trans_alpha[0] = base-trans; +} +} else { +info_ptr-color_type = PNG_COLOR_TYPE_RGB; +if ( base-trans!=-1 ) { +- info_ptr-trans_values.red = COLOR_RED(base-trans); +- info_ptr-trans_values.green = COLOR_GREEN(base-trans); +- info_ptr-trans_values.blue = COLOR_BLUE(base-trans); ++ info_ptr-trans_color.red = COLOR_RED(base-trans); ++ info_ptr-trans_color.green = COLOR_GREEN(base-trans); ++ info_ptr-trans_color.blue = COLOR_BLUE(base-trans); +} +} +png_write_info(png_ptr, info_ptr); +@@ -338,7 +338,7 @@ + + png_write_end(png_ptr, info_ptr); + +-if ( info_ptr-trans!=NULL ) gfree(info_ptr-trans); ++if ( info_ptr-trans_alpha!=NULL ) gfree(info_ptr-trans_alpha); + if ( info_ptr-palette!=NULL ) gfree(info_ptr-palette); + png_destroy_write_struct(png_ptr, info_ptr); + gfree(rows);
[arch-commits] Commit in pmount/trunk (PKGBUILD)
Date: Friday, February 12, 2010 @ 00:21:01 Author: dgriffiths Revision: 68257 FS#17385 Modified: pmount/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-12 03:06:19 UTC (rev 68256) +++ PKGBUILD2010-02-12 05:21:01 UTC (rev 68257) @@ -3,13 +3,14 @@ pkgname=pmount pkgver=0.9.20 -pkgrel=1 +pkgrel=2 pkgdesc=mount removable devices as normal user arch=(i686 x86_64) license=('GPL2') url=http://pmount.alioth.debian.org/; backup=('etc/pmount.allow') -depends=('sysfsutils=2.0.0-1' 'bash' 'hal=0.5.11') +depends=('sysfsutils=2.0.0-1' 'bash') +optdepends=('hal: needed for pmount-hal') makedepends=('intltool') source=(http://alioth.debian.org/frs/download.php/3127/${pkgname}-${pkgver}.tar.gz)
[arch-commits] Commit in pmount/repos (extra-i686 extra-i686/PKGBUILD)
Date: Friday, February 12, 2010 @ 00:21:16 Author: dgriffiths Revision: 68258 Merged revisions 68257 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/pmount/trunk r68257 | dgriffiths | 2010-02-11 23:21:01 -0600 (Thu, 11 Feb 2010) | 2 lines FS#17385 Modified: pmount/repos/extra-i686/ (properties) pmount/repos/extra-i686/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Property changes on: pmount/repos/extra-i686 ___ Modified: svnmerge-integrated - /pmount/trunk:1-54526 + /pmount/trunk:1-68257 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2010-02-12 05:21:01 UTC (rev 68257) +++ extra-i686/PKGBUILD 2010-02-12 05:21:16 UTC (rev 68258) @@ -3,13 +3,14 @@ pkgname=pmount pkgver=0.9.20 -pkgrel=1 +pkgrel=2 pkgdesc=mount removable devices as normal user arch=(i686 x86_64) license=('GPL2') url=http://pmount.alioth.debian.org/; backup=('etc/pmount.allow') -depends=('sysfsutils=2.0.0-1' 'bash' 'hal=0.5.11') +depends=('sysfsutils=2.0.0-1' 'bash') +optdepends=('hal: needed for pmount-hal') makedepends=('intltool') source=(http://alioth.debian.org/frs/download.php/3127/${pkgname}-${pkgver}.tar.gz)
[arch-commits] Commit in pmount/repos (extra-x86_64 extra-x86_64/PKGBUILD)
Date: Friday, February 12, 2010 @ 00:21:40 Author: dgriffiths Revision: 68259 Merged revisions 68257 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/pmount/trunk r68257 | dgriffiths | 2010-02-11 23:21:01 -0600 (Thu, 11 Feb 2010) | 2 lines FS#17385 Modified: pmount/repos/extra-x86_64/(properties) pmount/repos/extra-x86_64/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Property changes on: pmount/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /pmount/trunk:1-54527 + /pmount/trunk:1-68258 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2010-02-12 05:21:16 UTC (rev 68258) +++ extra-x86_64/PKGBUILD 2010-02-12 05:21:40 UTC (rev 68259) @@ -3,13 +3,14 @@ pkgname=pmount pkgver=0.9.20 -pkgrel=1 +pkgrel=2 pkgdesc=mount removable devices as normal user arch=(i686 x86_64) license=('GPL2') url=http://pmount.alioth.debian.org/; backup=('etc/pmount.allow') -depends=('sysfsutils=2.0.0-1' 'bash' 'hal=0.5.11') +depends=('sysfsutils=2.0.0-1' 'bash') +optdepends=('hal: needed for pmount-hal') makedepends=('intltool') source=(http://alioth.debian.org/frs/download.php/3127/${pkgname}-${pkgver}.tar.gz)
[arch-commits] Commit in openoffice-i18n/trunk (PKGBUILD)
Date: Friday, February 12, 2010 @ 00:55:49 Author: andyrtr Revision: 68260 upgpkg: openoffice-i18n 3.2.0-1 new version 3.2.0 Modified: openoffice-i18n/trunk/PKGBUILD --+ PKGBUILD | 820 +++-- 1 file changed, 215 insertions(+), 605 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 68259:68260 to see the changes.
[arch-commits] Commit in hwdetect/trunk (PKGBUILD)
Date: Friday, February 12, 2010 @ 01:24:36 Author: dgriffiths Revision: 68261 FS#18220 Modified: hwdetect/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-12 05:55:49 UTC (rev 68260) +++ PKGBUILD2010-02-12 06:24:36 UTC (rev 68261) @@ -4,7 +4,7 @@ pkgver=2010.02 pkgrel=3 pkgdesc=Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support -arch=(i686 x86_64) +arch=(any) license=('GPL') depends=('sh' 'awk' 'grep' 'coreutils' 'sed' 'e2fsprogs') optdepends=('cryptsetup: for encrypt mkinitcpio config support' @@ -14,7 +14,7 @@ source=(hwdetect) build() { - install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect + install -D -m 755 ${srcdir}/hwdetect ${pkgdir}/sbin/hwdetect } md5sums=('8481aa25d82f06464a63c493f66a2742')
[arch-commits] Commit in openoffice-i18n/repos/extra-any (PKGBUILD)
Date: Friday, February 12, 2010 @ 01:25:57 Author: andyrtr Revision: 68262 fix svn Deleted: openoffice-i18n/repos/extra-any/PKGBUILD --+ PKGBUILD | 1301 - 1 file changed, 1301 deletions(-) The diff is longer than the limit of 200KB. Use svn diff -r 68261:68262 to see the changes.
[arch-commits] Commit in openoffice-i18n/repos (extra)
Date: Friday, February 12, 2010 @ 01:26:47 Author: andyrtr Revision: 68263 archrelease: new repo extra Added: openoffice-i18n/repos/extra/
[arch-commits] Commit in openoffice-i18n/repos (extra)
Date: Friday, February 12, 2010 @ 01:27:09 Author: andyrtr Revision: 68264 Initialized merge tracking via svnmerge with revisions 1-68262 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-i18n/trunk Modified: openoffice-i18n/repos/extra/ (properties) Property changes on: openoffice-i18n/repos/extra ___ Added: svnmerge-integrated + /openoffice-i18n/trunk:1-68262
[arch-commits] Commit in openoffice-i18n/repos (extra-any extra)
Date: Friday, February 12, 2010 @ 01:27:44 Author: andyrtr Revision: 68265 fix svn Deleted: openoffice-i18n/repos/extra-any/ openoffice-i18n/repos/extra/
[arch-commits] Commit in openoffice-i18n/repos (extra-any)
Date: Friday, February 12, 2010 @ 01:28:44 Author: andyrtr Revision: 68266 archrelease: new repo extra-any Added: openoffice-i18n/repos/extra-any/
[arch-commits] Commit in openoffice-i18n/repos (extra-any)
Date: Friday, February 12, 2010 @ 01:29:02 Author: andyrtr Revision: 68267 Initialized merge tracking via svnmerge with revisions 1-68265 from svn+ssh://gerolde.archlinux.org/srv/svn-packages/openoffice-i18n/trunk Modified: openoffice-i18n/repos/extra-any/ (properties) Property changes on: openoffice-i18n/repos/extra-any ___ Added: svnmerge-integrated + /openoffice-i18n/trunk:1-68265