diff options
author | root <root@rshg054.dnsready.net> | 2013-01-09 00:06:34 -0800 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-01-09 00:06:34 -0800 |
commit | df5c50dd38ff67fd25c968d9ac33f9a52bc4583c (patch) | |
tree | 6845d6b38f64aa161c48055c8d45c94ad2418402 /extra | |
parent | c6944c224fa06987b04ffc1e90f5db0dfb200be9 (diff) |
Wed Jan 9 00:06:34 PST 2013
Diffstat (limited to 'extra')
-rw-r--r-- | extra/bitlbee/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/cvsps/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/freenx/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/nx/PKGBUILD | 121 | ||||
-rw-r--r-- | extra/pango/PKGBUILD | 6 |
5 files changed, 72 insertions, 76 deletions
diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 2b6362be8..ef8176d1f 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 170572 2012-11-09 00:21:44Z eric $ +# $Id: PKGBUILD 174921 2013-01-09 00:32:15Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,8 +8,8 @@ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=bitlbee -pkgver=3.0.6 -pkgrel=2 +pkgver=3.2 +pkgrel=1 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -23,7 +23,7 @@ source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d' 'bitlbee.tmpfiles') -sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c' +sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index 2be28cb75..36456b233 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174029 2013-01-02 03:39:24Z dan $ +# $Id: PKGBUILD 174919 2013-01-08 22:17:45Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps -pkgver=3.4 +pkgver=3.6 pkgrel=1 pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.catb.org/esr/cvsps/" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('zlib') makedepends=('asciidoc') source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz") -md5sums=('5bdcc9e49e1837e8016cdd139fe05ce7') +md5sums=('ca351c4227e72bc0c3fae7295a39772d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index 9a864096a..ad3660c99 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 171732 2012-11-21 18:26:59Z andyrtr $ +# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=14 +pkgrel=15 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64) url="http://freenx.berlios.de" license=('GPL') -depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' +depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') optdepends=('cups: adds printing support') makedepends=('imake') @@ -48,6 +48,7 @@ build() { patch -Np0 -i ${srcdir}/remove-dialog.patch sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample + sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig sed -i -e 's,netcat,nc,g' nxloadconfig sed -i -e 's/utmp/nx/g' nxsetup sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 804244272..94ba80f98 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,23 +1,19 @@ -# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $ +# $Id: PKGBUILD 174924 2013-01-09 04:17:18Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx -pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') -pkgver=3.5.0.15 -pkgrel=2 +pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') +pkgver=3.5.0.17 +pkgrel=1 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') -options=('!makeflags') # '!strip') -makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages +#options=('!makeflags') # '!strip') +makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends ) -source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz - nx-x11.ld.so.conf.d - nx-cflags.patch) -md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0' - 'f2ec60c7e2d81bef2f7292d2b33681a6' - 'd0c5b88aac0473e19699cf62d84b9d5f') +source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz) +md5sums=('aac9a999d4b38dedd476409e5fc2c4aa') build() { cd "${srcdir}/nx-libs-$pkgver" @@ -26,17 +22,7 @@ build() { # export CFLAGS="-march=x86-64 -O1 -g -pipe" # export CXXFLAGS="-march=x86-64 -O1 -g -pipe" - - # Gentoo hacks to honor cflags - patch -Np0 -i ${srcdir}/nx-cflags.patch - - # Run autoreconf in all neeed folders - for i in nxcomp nxcompext nxcompshad nxproxy; do - cd ${i} - autoreconf -vfi #${i} - cd .. - done - + # honour CFLAGS in X11 build - upstream fixed so far only the other libs # From xorg-x11-6.9.0-r3.ebuild pushd "${srcdir}/nx-libs-$pkgver/nx-X11" @@ -47,7 +33,11 @@ build() { echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF} echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF} popd - + + # fix two broken Makefiles + sed -i "s:/usr/local:/usr:" Makefile + sed -i "s:-o root -g root ::" nxcompshad/Makefile.in + make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" # fake install mkdir $srcdir/fakeinstall @@ -59,10 +49,11 @@ package_libxcomp() { pkgdesc="NX X compression library" depends=('libjpeg-turbo' 'libpng' 'gcc-libs') - install -dm755 ${pkgdir}/usr/lib/nx/lib - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib + install -dm755 ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx + # symlinks cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} . + ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} . } package_nxproxy() { @@ -71,14 +62,10 @@ package_nxproxy() { depends=('libxcomp') install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin} - cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxproxy . - - # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxproxy + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy ${pkgdir}/usr/lib/nx/bin/nxproxy cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 + # the wrapper + cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin } package_nx-xcompext() { @@ -87,12 +74,13 @@ package_nx-xcompext() { depends=('libxcomp' 'nx-x11') install -dm755 ${pkgdir}/usr/lib/nx - cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompext.so.3.5.0 libXcompext.so.3 - ln -sv libXcompext.so.3.5.0 libXcompext.so + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx + #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx + + # symlinks cd ${pkgdir}/usr/lib/ ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} . + #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . } package_nx-x11() { @@ -100,40 +88,47 @@ package_nx-x11() { pkgdesc="NX-X11 lib for the NX framework" depends=('libxcomp') - install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx - - cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxauth . - + install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}} + cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11 + # nxauth + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxauth - - install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" + cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin } package_nxagent() { pkgdesc="NX X server based on Xnest" - depends=('nx-xcompext') + depends=('nx-xcompext' 'libxml2') - install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin - cd ${pkgdir}/usr/lib/nx - ln -sv /usr/lib/nx/bin/nxagent . - + install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx} + cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin # the wrapper - cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin - chmod +x ${pkgdir}/usr/bin/nxagent - # required nxcompshad libs - cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/nx - ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 - ln -sv libXcompshad.so.3.5.0 libXcompshad.so + cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin + + # additional files for documentation + cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy ${pkgdir}/usr/share/nx + + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx + # symlinks cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . + ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . # files should move to nx-compext pkg +} + +package_x2go-agent() { + + pkgdesc="Wrapper arround nxagent to use with x2goserver" + depends=('nxagent') + + install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}} + # this is a nxagent symlink + cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin + # the wrapper + cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin + + cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/x2go.xpm ${pkgdir}/usr/share/pixmaps + cp -a ${srcdir}/fakeinstall/usr/share/x2go/rgb ${pkgdir}/usr/share/x2go + cp -a ${srcdir}/fakeinstall/usr/share/x2go/versions/VERSION.x2goagent ${pkgdir}/usr/share/x2go/versions } package_nx-headers() { diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 3f1bee4c5..c9a344b9d 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 173027 2012-12-08 21:00:11Z heftig $ +# $Id: PKGBUILD 174865 2013-01-08 09:21:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.32.4 +pkgver=1.32.5 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('9895b2e6572c3b3e0cc1c174b8bf55791a47de1995af21a1787f6c573b4b58db') +sha256sums=('7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821') build() { cd ${pkgname}-${pkgver} |