diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/ekiga/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/ekiga/fix-generation-po.patch | 24 | ||||
-rw-r--r-- | extra/hylafax/PKGBUILD | 47 | ||||
-rw-r--r-- | extra/hylafax/configure-6.0.5.patch | 11 | ||||
-rw-r--r-- | extra/hylafax/hylafax.install | 5 | ||||
-rw-r--r-- | extra/vamp-plugin-sdk/PKGBUILD | 21 | ||||
-rw-r--r-- | extra/xorg-server/PKGBUILD | 24 | ||||
-rw-r--r-- | extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch | 36 |
8 files changed, 127 insertions, 55 deletions
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 6a3ab613e..d03b8be5f 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 132764 2011-07-25 20:58:05Z ibiru $ +# $Id: PKGBUILD 134880 2011-08-08 09:42:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) arch=(i686 x86_64) depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') -makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') +makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost' 'gnome-common') optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + fix-generation-po.patch) +sha256sums=('4776834810f213a93cd6c307108c505970fe22e4803935134dd9f6b0bc834e06' + 'b87a3a044253f96631dd13453034e14ce4698a9106acf39e5816b8776d0de529') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-generation-po.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus diff --git a/extra/ekiga/fix-generation-po.patch b/extra/ekiga/fix-generation-po.patch new file mode 100644 index 000000000..ebec28433 --- /dev/null +++ b/extra/ekiga/fix-generation-po.patch @@ -0,0 +1,24 @@ +From ebd9de96878c224145c0b1d7bf21c7151c0563bf Mon Sep 17 00:00:00 2001 +From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> +Date: Tue, 19 Jul 2011 08:15:52 +0000 +Subject: Fix generation of po translation files + +Bug introduced by commit 2bfaf29. +--- +diff --git a/configure.ac b/configure.ac +index 63d8685..eefae22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -770,7 +770,9 @@ AM_CONDITIONAL(DEBUG, test "x$has_debug" = "xyes") + dnl ######################################################################### + dnl Support for internationalization + dnl ######################################################################## +-AC_DEFINE(GETTEXT_PACKAGE, "[AC_PACKAGE_NAME]",[fix]) ++GETTEXT_PACKAGE=AC_PACKAGE_NAME ++AC_SUBST(GETTEXT_PACKAGE) # needed by gettext in po directory ++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[fix]) + AM_GLIB_GNU_GETTEXT + + +-- +cgit v0.9 diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index f0e678297..d0e7ab028 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 62528 2010-01-09 20:34:27Z tpowa $ +# $Id: PKGBUILD 134870 2011-08-08 08:29:49Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=1 pkgdesc="Fax Server" arch=('i686' 'x86_64') @@ -10,12 +10,14 @@ license=('custom') depends=('libtiff' 'pam' 'ghostscript') makedepends=('smtp-server') url="http://www.hylafax.org/" -backup=(var/spool/hylafax/bin/{faxrcvd,notify} \ - usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} \ +backup=(var/spool/hylafax/bin/{faxrcvd,notify} + usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) -source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz hylafax \ - hylafax.cron.daily config.local) -options=('!makeflags') +source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz + hylafax + hylafax.cron.daily + config.local + configure-6.0.5.patch) # build as root for successful build! build() { @@ -26,16 +28,22 @@ build() { useradd -u 10 -g uucp -d '/' -s /bin/false uucp &>/dev/null useradd -u 69 -g daemon -d '/' -s /bin/false fax &>/dev/null fi - mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} || return 1 - mkdir -p $pkgdir/var/{spool/hylafax,lock} || return 1 - cd $srcdir/${pkgname}-${pkgver} || return 1 + mkdir -p $pkgdir/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p $pkgdir/var/{spool/hylafax,lock} + cd $srcdir/${pkgname}-${pkgver} - cp ../config.local . || return 1 - ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" || return 1 - make || return 1 - make ROOT=$pkgdir install || return 1 - install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax || return 1 - install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax || return 1 + cp ../config.local . + # fix compiling + patch -Np0 -i ../configure-6.0.5.patch + ./configure --nointeractive --with-OPTIMIZER="${CFLAGS}" + make +} + +package () { + cd $srcdir/${pkgname}-${pkgver} + make ROOT=$pkgdir install + install -D -m 755 $srcdir/hylafax $pkgdir/etc/rc.d/hylafax + install -D -m 744 $srcdir/hylafax.cron.daily $pkgdir/etc/cron.daily/hylafax # remove group if created if [ $uucp_created -eq 1 ]; then userdel uucp &>/dev/null @@ -44,13 +52,14 @@ build() { fi # add missing awk file for notify-4.1 script install -D -m 755 $srcdir/${pkgname}-${pkgver}/util/notify.awk \ - $spkgdir/var/spool/hylafax/bin/notify.awk || return 1 + $spkgdir/var/spool/hylafax/bin/notify.awk # fix permission on /var/lock chmod 1777 $pkgdir/var/lock install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/COPYRIGHT } -md5sums=('6ba4bc3a47c9d2634de1b14f4ab34c80' +md5sums=('eb9ac942354ad708e20e4583cec6615f' '6602288a405324d8c8e3c5eac2bf19fd' '52beffe7dc296b4f9ce9fd0387f7804e' - '0d2ce24d918226a852539aebf57d3f4a') + '0d2ce24d918226a852539aebf57d3f4a' + '51d9f639bb76e5e39cdc8e2ac07e208d') diff --git a/extra/hylafax/configure-6.0.5.patch b/extra/hylafax/configure-6.0.5.patch new file mode 100644 index 000000000..e1f1126a5 --- /dev/null +++ b/extra/hylafax/configure-6.0.5.patch @@ -0,0 +1,11 @@ +--- configure.old 2011-08-08 10:19:37.619657223 +0200 ++++ configure 2011-08-08 10:20:26.422189170 +0200 +@@ -2882,7 +2882,7 @@ + echo '#define HAS_FCHMOD 1' + Note "... configure use of fchmod" + CheckFuncDecl fchmod 'extern int fchmod(int, mode_t);' \ +- unistd.h libc.h $OSFCNH sys/stat.h ++ unistd.h $OSFCNH sys/stat.h libc.h + } + CheckFuncDecl mknod 'extern int mknod(const char*, mode_t, dev_t);' \ + unistd.h sys/stat.h diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index d9d991e6b..bd97d42bd 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -42,8 +42,3 @@ pre_remove() { userdel fax &>/dev/null print_remove } - -op=$1 -shift - -$op $* diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 06633b1de..72a3938d5 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 86992 2010-08-08 20:57:26Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 134888 2011-08-08 13:42:21Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.1 +pkgver=2.2 pkgrel=1 -pkgdesc="The Vamp audio analysis plugin system" +pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -#options=('!libtool') -source=(http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz - gcc44.patch) -md5sums=('13252077a73987dae72a9174e529b6b9' +options=('!libtool') +source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz" + 'gcc44.patch') +md5sums=('037cdb83f20a331ff1fa07d54550c773' 'a07e3ef9c657a56cf2e8c4afc0ba1cec') build() { cd "$srcdir/$pkgname-$pkgver" - # gcc 4.4 compatibility - patch -Np1 -i ../gcc44.patch - ./configure --prefix=/usr make } @@ -29,7 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/COPYING" diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 7045d4ed8..7550063d1 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $ +# $Id: PKGBUILD 134875 2011-08-08 08:40:10Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.10.3 -pkgrel=2 +pkgver=1.10.3.901 +pkgrel=1 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - #git-fixes.patch + randr-compare-all-the-bytes-in-rrpostpendingproperties.patch bg-none-revert.patch xserver-1.10-pointer-barriers.patch - xorg-redhat-die-ugly-pattern-die-die-die.patch autoconfig-nvidia.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' - # '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695' +sha1sums=('c7b0d4a29adf91baeae4783841303ccf8ba285e2' + '571f2925f2f3d1b5cdbb2e5a676205fcea256198' '629c6d8d52126eab81ee1b72a9e4209535f8cb81' '1b95e91384a57d966428c7db98ed06f4cc562f91' - '0efcdf61bde3c0cd813072b94e2b30ab922775b9' 'f9328fd7bc931bb02c8909ecfcef35403de33782' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' @@ -31,8 +29,8 @@ sha1sums=('1699be5c0edeca553cfa3ee6caa228483465136b' build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Get rid of the ugly pattern - patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" + # Upstream post-release commit + patch -Np1 -i "${srcdir}/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch" # Add pointer barrier support, patch from Fedora patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch" @@ -40,9 +38,6 @@ build() { # Patches from ~ajax/xserver xserver-next branch patch -Np1 -i "${srcdir}/bg-none-revert.patch" - # Upstream fixes from 1.10 branch - #patch -Np1 -i "${srcdir}/git-fixes.patch" - # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" @@ -73,6 +68,7 @@ build() { --with-fontrootdir=/usr/share/fonts make + # Disable subdirs for make install rule to make splitting easier sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ diff --git a/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch new file mode 100644 index 000000000..36d28ded0 --- /dev/null +++ b/extra/xorg-server/randr-compare-all-the-bytes-in-rrpostpendingproperties.patch @@ -0,0 +1,36 @@ +From fa425363e3927e86d57f42c4b6e4995d26d6bd0c Mon Sep 17 00:00:00 2001 +From: Aaron Plattner <aplattner@nvidia.com> +Date: Fri, 29 Jul 2011 23:12:06 +0000 +Subject: randr: Compare all the bytes in RRPostPendingProperties + +RRPostPendingProperties tries to compare the pending and current +property values to decide whether they're actually changing. However, +it does this using a memcmp that passes in pending_value->size as the +number of bytes. This is actually the number of elements, where each +element is (pending_value->format / 8) bytes long. This causes the +pending value to not be propagated if the first pending_value->size +bytes are the same and only the end of it is changing. + +Fix this by computing the total number of bytes to compare in the +memcmp. + +Signed-off-by: Aaron Plattner <aplattner@nvidia.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 08dfff92e8d0c2b1726634392c147f6634d1706d) +--- +diff --git a/randr/rrproperty.c b/randr/rrproperty.c +index ba04c16..61e7bb4 100644 +--- a/randr/rrproperty.c ++++ b/randr/rrproperty.c +@@ -283,7 +283,7 @@ RRPostPendingProperties (RROutputPtr output) + pending_value->format == current_value->format && + pending_value->size == current_value->size && + !memcmp (pending_value->data, current_value->data, +- pending_value->size)) ++ pending_value->size * (pending_value->format / 8))) + continue; + + if (RRChangeOutputProperty (output, property->propertyName, +-- +cgit v0.8.3-6-g21f6 |