From d7931e8fa49a4698ac8dbb1a155ca6b48f031828 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 6 Jan 2012 23:14:57 +0000 Subject: Fri Jan 6 23:14:57 UTC 2012 --- community/aqbanking/PKGBUILD | 8 ++-- community/blender/PKGBUILD | 2 +- community/celt-0.7/PKGBUILD | 6 +-- community/chmsee/PKGBUILD | 15 ++++---- community/clementine/PKGBUILD | 6 +-- community/cuda-toolkit/PKGBUILD | 21 +++++++--- community/gwenhywfar/PKGBUILD | 8 ++-- community/ktoblzcheck/PKGBUILD | 6 +-- community/libircclient/PKGBUILD | 36 +++++++++++++++++ community/libircclient/shared.patch | 44 +++++++++++++++++++++ community/linux-tools/PKGBUILD | 35 +++++++++-------- community/pokerth/PKGBUILD | 23 ++++++----- community/tinyxml/PKGBUILD | 48 +++++++++++++++++++++++ community/tinyxml/entity.patch | 64 +++++++++++++++++++++++++++++++ community/tinyxml/tinyxml-2.5.3-stl.patch | 12 ++++++ 15 files changed, 274 insertions(+), 60 deletions(-) create mode 100644 community/libircclient/PKGBUILD create mode 100644 community/libircclient/shared.patch create mode 100644 community/tinyxml/PKGBUILD create mode 100644 community/tinyxml/entity.patch create mode 100644 community/tinyxml/tinyxml-2.5.3-stl.patch (limited to 'community') diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index cce228620..34307fd4b 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59854 2011-12-01 11:32:54Z spupykin $ +# $Id: PKGBUILD 61641 2012-01-05 10:54:39Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: David Moore pkgname=aqbanking -pkgver=5.0.17 -_dnrel=88 +pkgver=5.0.21 +_dnrel=91 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64) @@ -14,7 +14,7 @@ license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('4543012286159310bdf13badf221a173') +md5sums=('634dac2c82c583ed6643678bc214026e') build() { cd $srcdir/aqbanking-$pkgver diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index fa2f7b8d0..516791c85 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -14,7 +14,7 @@ _svn=false pkgname=blender pkgver=2.61 -pkgrel=2 +pkgrel=3 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') diff --git a/community/celt-0.7/PKGBUILD b/community/celt-0.7/PKGBUILD index ab728998d..d55759b58 100644 --- a/community/celt-0.7/PKGBUILD +++ b/community/celt-0.7/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40766 2011-02-26 17:17:27Z schiv $ +# $Id: PKGBUILD 61638 2012-01-05 08:56:24Z svenstaro $ # Maintainer: Ray Rashif # Contributor: Sven-Hendrik Haase # Contributor: Lauri Niskanen @@ -6,13 +6,13 @@ pkgname=celt-0.7 _realname=celt pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="Low-latency audio communication codec" arch=('i686' 'x86_64') url="http://www.celt-codec.org" license=('BSD') depends=('libogg') -provides=('celt=$pkgver') +#provides=('celt=$pkgver') conflicts=('celt') options=('!libtool') source=(http://downloads.xiph.org/releases/celt/$_realname-$pkgver.tar.gz) diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index e349fab6f..fc02fc811 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,34 +1,35 @@ -# $Id: PKGBUILD 59248 2011-11-21 23:02:41Z lcarlier $ +# $Id: PKGBUILD 61658 2012-01-05 20:32:51Z lcarlier $ # Maintainer : Laurent Carlier # Contributor: dionydonny # Contributor: Ermanno pkgname=chmsee -pkgver=1.99.06 +pkgver=1.99.07 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>=8.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>=9.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('fb11a4492795635bda843064f5b7f261' +md5sums=('46dc393ffde8e614b4e6e7b5926b02b1' '4999362b0c89c24764cbd25173610a38') build() { - cd ${srcdir}/jungleji-chmsee-dd9130e/src + cd ${srcdir}/jungleji-chmsee-ccdf6d2/src cp Makefile.arch Makefile - sed -i -e 's/5.0/8.0/g' Makefile + sed -i -e 's/python/python2/g' common.mk +# sed -i -e 's/5.0/9.0/g' Makefile make } package() { - cd ${srcdir}/jungleji-chmsee-dd9130e + cd ${srcdir}/jungleji-chmsee-ccdf6d2 install -d ${pkgdir}/usr/share/chmsee cp -a * ${pkgdir}/usr/share/chmsee diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD index db7adca77..c5ff14f7f 100644 --- a/community/clementine/PKGBUILD +++ b/community/clementine/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 61430 2011-12-31 01:22:51Z stephane $ +# $Id: PKGBUILD 61660 2012-01-05 21:38:03Z stephane $ #Maintainer: Stéphane Gaudreault #Contributor: BlackEagle #Contributor: Dany Martineau pkgname=clementine pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A music player and library organizer" url="http://www.clementine-player.org/" license=('GPL') arch=('i686' 'x86_64') depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'qjson' 'libcdio' 'protobuf' 'qca') + 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl') makedepends=('cmake' 'boost') optdepends=('gstreamer0.10-base-plugins: for more open formats' 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD index 2e2b09404..2fc1d6366 100644 --- a/community/cuda-toolkit/PKGBUILD +++ b/community/cuda-toolkit/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase pkgname=cuda-toolkit -pkgver=4.0.17 -pkgrel=3 -_fedver=13 +pkgver=4.1.21 +pkgrel=2 +_fedver=14 pkgdesc="NVIDIA's GPU programming toolkit" arch=('i686' 'x86_64') @@ -11,18 +11,18 @@ license=('custom') depends=('gcc-libs') if [ "$CARCH" = "i686" ]; then _arch=32 - md5sums=('20d69b2d5bb7043ca7c2ad679c2825ed' + md5sums=('930b7bfd1a162335b909f119a004f6d7' '5af5226b36cd3f9993f762f85b5d236a' 'c0781c63e726eaf03e10135b42b85729') else _arch=64 - md5sums=('152e1069f39fc8bbece875a1b9f576b6' + md5sums=('509c795b9b79f991e045a83576e2e2f3' '5af5226b36cd3f9993f762f85b5d236a' 'c0781c63e726eaf03e10135b42b85729') fi install=cuda-toolkit.install -source=(http://developer.download.nvidia.com/compute/cuda/4_0/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run +source=(http://developer.download.nvidia.com/compute/cuda/4_1/RC2/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run cuda-toolkit.sh cuda-toolkit.conf) @@ -41,4 +41,13 @@ package() { install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf install -Dm644 $pkgdir/opt/cuda-toolkit/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE + + # Fixes FS#27841 + cd $pkgdir/opt/cuda-toolkit/lib + ln -s /usr/lib/libncurses.so.5 libtinfo.so.5 + + if [[ $CARCH == "x86_64" ]]; then + cd $pkgdir/opt/cuda-toolkit/lib64 + ln -s /usr/lib/libncurses.so.5 libtinfo.so.5 + fi } diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index 96c247041..505ac1309 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 57282 2011-10-25 09:59:01Z spupykin $ +# $Id: PKGBUILD 61643 2012-01-05 10:55:35Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: William Rea pkgname=gwenhywfar -pkgver=4.3.0 +pkgver=4.3.1 pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64) @@ -13,8 +13,8 @@ license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('6c3647c5a9065d0126b0e2b77752527b') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('63370a89befee90436720458d0c81cc5') build() { pacman -Q gwenhywfar && return 1 diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 544b2a70c..ad3e93f04 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51218 2011-07-05 21:19:18Z spupykin $ +# $Id: PKGBUILD 61645 2012-01-05 10:56:22Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus pkgname=ktoblzcheck -pkgver=1.33 +pkgver=1.37 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('e9f62a9a64ee51ab43751eadcade0433' +md5sums=('93b540b5478bfb1b078613cbf1cc2446' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/libircclient/PKGBUILD b/community/libircclient/PKGBUILD new file mode 100644 index 000000000..50e1c02a8 --- /dev/null +++ b/community/libircclient/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Bartłomiej Piotrowski +# Contributor: SpepS +# Contributor: Marcel Wysocki +# Contributor: coolkehon + +pkgname=libircclient +pkgver=1.3 +pkgrel=5 +pkgdesc="A small but powerful library, which implements client-server IRC protocol." +arch=('i686' 'x86_64') +url="http://libircclient.sf.net" +depends=('glibc') +license=("GPL2") +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" + "shared.patch") +md5sums=('b0e80d1d6b0c1cc61660fb9d2350b32d' + 'f2c350d140bd522990c15162645c72f0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # add fPIC flag for x86_64 + [ "$CARCH" = x86_64 ] && export CFLAGS="$CFLAGS -fPIC" + + # shared and path patch + patch -p1 -i ../shared.patch + + ./configure --prefix=/usr + cd src && make CFLAGS="$CFLAGS" +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/libircclient/shared.patch b/community/libircclient/shared.patch new file mode 100644 index 000000000..ac57fe3a8 --- /dev/null +++ b/community/libircclient/shared.patch @@ -0,0 +1,44 @@ +diff -aur libircclient-1.3/src/Makefile.in libircclient-1.3.patched/src/Makefile.in +--- libircclient-1.3/src/Makefile.in 2005-03-09 22:11:53.000000000 +0100 ++++ libircclient-1.3.patched/src/Makefile.in 2012-01-05 05:46:21.000000000 +0100 +@@ -4,21 +4,22 @@ + AR=@AR@ cr + RANLIB=@RANLIB@ + INCLUDES=-I../include +- ++DESTDIR+= + + OBJS = libircclient.o + + all: lib + +-lib: libircclient.a ++lib: libircclient.a libircclient.so + + install: lib +- -mkdir @prefix@/include +- -mkdir @prefix@/lib +- cp ../include/libircclient.h @prefix@/include/libircclient.h +- cp ../include/libirc_errors.h @prefix@/include/libirc_errors.h +- cp ../include/libirc_events.h @prefix@/include/libirc_events.h +- cp libirc.a @prefix@/include/lib/libirc.a ++ mkdir -p $(DESTDIR)/usr/{lib,include/libircclient} ++ mkdir -p $(DESTDIR)/usr/share/{man,{doc,}/libircclient} ++ cp libircclient.a libircclient.so $(DESTDIR)/usr/lib ++ cp ../include/libirc*.h $(DESTDIR)/usr/include/libircclient ++ cp -a ../doc/{html,rfc1459.txt} $(DESTDIR)/usr/share/doc/libircclient ++ cp -a ../examples $(DESTDIR)/usr/share/libircclient ++ cp -a ../doc/man/man3 $(DESTDIR)/usr/share/man + + $(OBJS): utils.c dcc.c errors.c portable.c sockets.c colors.c + +@@ -26,6 +27,9 @@ + $(AR) libircclient.a $(OBJS) + $(RANLIB) libircclient.a + ++libircclient.so: $(OBJS) ++ $(CC) -shared -Wl $(OBJS) -o libircclient.so ++ + clean: + rm -f libircclient.a $(OBJS) + diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index 34165dbe9..345d8f9ad 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,9 +1,11 @@ -# $Id: PKGBUILD 59838 2011-12-01 00:13:46Z seblu $ +# $Id: PKGBUILD 61664 2012-01-06 00:12:09Z seblu $ # Maintainer: Sebastien Luttringer pkgbase=linux-tools pkgname=('perf' 'cpupower') -pkgver=3.1.4 +pkgver=3.2 +kernver=${pkgver} +[[ ${kernver##*rc} != $kernver ]] && testing='testing' pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') @@ -12,53 +14,52 @@ options=('!strip') makedepends=('asciidoc' 'xmlto') # split packages need all package dependencies set manually in makedepends makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') -source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$pkgver.tar.xz" +source=("http://ftp.kernel.org/pub/linux/kernel/v3.0/$testing/linux-$kernver.tar.xz" 'cpupower.rc' 'cpupower.conf') -md5sums=('e48e246675a3e790062d4fecf36cd6e3' +md5sums=('364066fa18767ec0ae5f4e4abcf9dc51' 'd8b119eff7dc1a2d655eb71a47fa6215' '218fd36a7957d3170ed8bd1a0be1f62f') build() { msg2 'Build perf' - cd linux-$pkgver/tools/perf - make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ + cd linux-$kernver/tools/perf + make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver-$pkgrel \ all man msg2 'Build cpupower' # we cannot use --as-needed LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} - cd "$srcdir/linux-$pkgver/tools/power/cpupower" - make + cd "$srcdir/linux-$kernver/tools/power/cpupower" + make VERSION=$pkgver-$pkgrel } package_perf() { - pkgdesc='Linux kernel perf tool' + pkgdesc='Linux kernel performance auditing tool' depends=('python2' 'libnewt' 'elfutils') - cd linux-${pkgver}/tools/perf + cd linux-${kernver}/tools/perf make PYTHON=python2 DESTDIR="${pkgdir}/usr" perfexecdir="lib/$pkgname" PERF_VERSION=$pkgver \ install install-man } package_cpupower() { - pkgdesc='Linux kernel power tool' + pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('pciutils') conflicts=('cpufrequtils') - provides=("cpufrequtils=$pkgver") - cd linux-$pkgver/tools/power/cpupower + # install rc.d script + install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower" + install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower" + + cd linux-$kernver/tools/power/cpupower make \ DESTDIR="$pkgdir" \ INSTALL='/bin/install -c' \ mandir='/usr/share/man' \ docdir='/usr/share/doc/cpupower' \ install install-man - - # install rc.d script - install -D -m 755 "$srcdir/cpupower.rc" "$pkgdir/etc/rc.d/cpupower" - install -D -m 644 "$srcdir/cpupower.conf" "$pkgdir/etc/conf.d/cpupower" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 97ade0741..b7008bb82 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,44 +1,43 @@ -# $Id: PKGBUILD 59960 2011-12-02 21:00:17Z ibiru $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 61635 2012-01-05 05:53:39Z bpiotrowski $ +# Maintainer: Mateusz Herych +# Maintainer: Bartłomiej Piotrowski # Contributor: Vasco Costa pkgname=pokerth _realname=PokerTH -pkgver=0.8.3 -pkgrel=6 +pkgver=0.9 +pkgrel=1 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" license=('GPL' 'custom') -depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' 'qt' 'sdl_mixer') +depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls' + 'qt' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2) -md5sums=('adbe56ad5f547eb255dad91de564bf1c') +md5sums=('849eb1a70735177c96bf4608d4637c7c') build() { - cd $_realname-$pkgver-src + cd "$srcdir/$_realname-$pkgver-src" sed -i 's/QMAKE_CXXFLAGS += -std=gnu++0x/QMAKE_CXXFLAGS += -std=gnu++0x -DBOOST_FILESYSTEM_VERSION=2/' *.pro - # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms' sed \ -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \ -i zlib_compress.pro pokerth_game.pro pokerth_server.pro qmake $pkgname.pro - make } package() { - cd $_realname-$pkgver-src + cd "$srcdir/$_realname-$pkgver-src" make INSTALL_ROOT="$pkgdir" install - install -D $pkgname "$pkgdir/usr/bin/$pkgname" + install -D "$pkgname" "$pkgdir/usr/bin/$pkgname" install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1" - install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt" rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt" } diff --git a/community/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD new file mode 100644 index 000000000..4c93beb72 --- /dev/null +++ b/community/tinyxml/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Larry Hajali +# Contributor: Hubert Grzeskowiak + +pkgname=tinyxml +pkgver=2.6.2 +pkgrel=1 +pkgdesc="A simple, small, C++ XML parser that can be easily integrated into other programs." +url='http://www.grinninglizard.com/tinyxml/' +arch=('i686' 'x86_64') +license=('zlib') +depends=('gcc-libs') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_${pkgver//./_}.tar.gz" + 'entity.patch' + 'tinyxml-2.5.3-stl.patch') +md5sums=('c1b864c96804a10526540c664ade67f0' + 'b6cc2d9330707373d920f760793c6311' + '6db8334398e0cdad7e3c6406206ff42a') + +build() { + cd "$srcdir"/$pkgname + + # Fix entity encoding. + patch -p0 < "$srcdir"/entity.patch + + # Make TINYXML_USE_STL permanently defined in tinyxml.h + patch -p1 < "$srcdir"/$pkgname-2.5.3-stl.patch + + # Fix Makefile + sed -i \ + -e '/^TINYXML_USE_STL/ s|=.*|=YES|' \ + -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile + + make + g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver -Wl,-soname,lib${pkgname}.so.0 *.o +} + +package() +{ + cd "$srcdir"/$pkgname + install -d -m 0755 "$pkgdir"/usr/{lib,include} + install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/ + install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include + (cd "$pkgdir"/usr/lib + ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0 + ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so + ) +} diff --git a/community/tinyxml/entity.patch b/community/tinyxml/entity.patch new file mode 100644 index 000000000..66d89a617 --- /dev/null +++ b/community/tinyxml/entity.patch @@ -0,0 +1,64 @@ +? entity.patch +Index: tinyxml.cpp +=================================================================== +RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v +retrieving revision 1.105 +diff -u -r1.105 tinyxml.cpp +--- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105 ++++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000 +@@ -57,30 +57,7 @@ + { + unsigned char c = (unsigned char) str[i]; + +- if ( c == '&' +- && i < ( (int)str.length() - 2 ) +- && str[i+1] == '#' +- && str[i+2] == 'x' ) +- { +- // Hexadecimal character reference. +- // Pass through unchanged. +- // © -- copyright symbol, for example. +- // +- // The -1 is a bug fix from Rob Laveaux. It keeps +- // an overflow from happening if there is no ';'. +- // There are actually 2 ways to exit this loop - +- // while fails (error case) and break (semicolon found). +- // However, there is no mechanism (currently) for +- // this function to return an error. +- while ( i<(int)str.length()-1 ) +- { +- outString->append( str.c_str() + i, 1 ); +- ++i; +- if ( str[i] == ';' ) +- break; +- } +- } +- else if ( c == '&' ) ++ if ( c == '&' ) + { + outString->append( entity[0].str, entity[0].strLength ); + ++i; +Index: xmltest.cpp +=================================================================== +RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v +retrieving revision 1.89 +diff -u -r1.89 xmltest.cpp +--- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89 ++++ xmltest.cpp 19 Jul 2010 21:24:16 -0000 +@@ -1340,6 +1340,16 @@ + }*/ + } + ++ #ifdef TIXML_USE_STL ++ { ++ TiXmlDocument xml; ++ xml.Parse("foo&#xa+bar"); ++ std::string str; ++ str << xml; ++ XmlTest( "Entity escaping", "foo&#xa+bar", str.c_str() ); ++ } ++ #endif ++ + /* 1417717 experiment + { + TiXmlDocument xml; diff --git a/community/tinyxml/tinyxml-2.5.3-stl.patch b/community/tinyxml/tinyxml-2.5.3-stl.patch new file mode 100644 index 000000000..7bcde59ff --- /dev/null +++ b/community/tinyxml/tinyxml-2.5.3-stl.patch @@ -0,0 +1,12 @@ +diff -up tinyxml/tinyxml.h~ tinyxml/tinyxml.h +--- tinyxml/tinyxml.h~ 2007-11-30 22:39:36.000000000 +0100 ++++ tinyxml/tinyxml.h 2007-11-30 22:39:36.000000000 +0100 +@@ -26,6 +26,8 @@ distribution. + #ifndef TINYXML_INCLUDED + #define TINYXML_INCLUDED + ++#define TIXML_USE_STL 1 ++ + #ifdef _MSC_VER + #pragma warning( push ) + #pragma warning( disable : 4530 ) -- cgit v1.2.3-54-g00ecf