diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-05 11:13:43 -0300 |
| commit | 58d6937e71aea203f6693a68146018f950922fbc (patch) | |
| tree | 3b53b76f930f60717debca5e0d612eeab0279b39 /community/mldonkey | |
| parent | d07d53d7af1e9694d9558783841bc2df3124a90f (diff) | |
| parent | f651180e6b1ac9508ec0d1d9b94972de776020a9 (diff) | |
I don't understand gcc/PKGBUILD.mips64el
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/addresses/PKGBUILD
community/chmsee/PKGBUILD
community/coin/PKGBUILD
community/critterding/PKGBUILD
community/distcc/PKGBUILD
community/djview4/PKGBUILD
community/freedroid/PKGBUILD
community/gnumail/PKGBUILD
community/gyachi/PKGBUILD
community/java-oracle/PKGBUILD
community/liboop/PKGBUILD
community/ltris/PKGBUILD
community/nepim/PKGBUILD
community/pantomime/PKGBUILD
community/pyxattr/PKGBUILD
community/soqt/PKGBUILD
community/tilda/PKGBUILD
community/unrealircd/PKGBUILD
community/uqm/PKGBUILD
core/dnsutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
core/vpnc/PKGBUILD
extra/apache/PKGBUILD
extra/bind/PKGBUILD
extra/bzflag/PKGBUILD
extra/ccache/PKGBUILD
extra/claws-mail-extra-plugins/PKGBUILD
extra/clutter-gst/PKGBUILD
extra/cups/PKGBUILD
extra/doxygen/PKGBUILD
extra/fam/PKGBUILD
extra/fcitx/PKGBUILD
extra/gdk-pixbuf2/PKGBUILD
extra/geoip/PKGBUILD
extra/gtk2/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/libffi/PKGBUILD
extra/libfwbuilder/PKGBUILD
extra/libmpd/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt/PKGBUILD
extra/samba/PKGBUILD
extra/wireshark/PKGBUILD
extra/xulrunner/PKGBUILD
multilib-testing/lib32-keyutils/PKGBUILD
multilib-testing/lib32-udev/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
testing/dash/PKGBUILD
testing/libssh2/PKGBUILD
Diffstat (limited to 'community/mldonkey')
| -rw-r--r-- | community/mldonkey/PKGBUILD | 12 | ||||
| -rw-r--r-- | community/mldonkey/mldonkey-gcc46.patch | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 60fc8c24f..1e823cff7 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $ +# $Id: PKGBUILD 54810 2011-08-26 12:19:01Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=mldonkey -pkgver=3.0.7 -pkgrel=3 +pkgver=3.1.0 +pkgrel=1 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64' 'mips64el') url="http://mldonkey.sourceforge.net/" @@ -17,7 +17,6 @@ optdepends=('librsvg: GUI support' backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkey-gcc46.patch mldonkeyd mldonkey.conf mldonkey.desktop) @@ -25,8 +24,6 @@ source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.t build() { cd "$srcdir/$pkgname-$pkgver" - # Patch comes from upstream; will go away in later versions. - patch -p1 < "$srcdir/mldonkey-gcc46.patch" ./configure --prefix=/usr --enable-gui=newgui2 make } @@ -43,8 +40,7 @@ package() { install -Dm755 "$srcdir/mldonkeyd" "$pkgdir/etc/rc.d/mldonkey" install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } -md5sums=('162b78fc4e20335a8fe31d91e1656db2' - 'c2bd99420ba5d48629b6823aae6bf127' +md5sums=('072726d158ba1e936c554be341e7ceff' '75e4b6c7fb282f7de15a8d5478f3bd70' '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch deleted file mode 100644 index 656d72f85..000000000 --- a/community/mldonkey/mldonkey-gcc46.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h -index 775a898..af1621b 100644 ---- a/src/utils/lib/CryptoPP.h -+++ b/src/utils/lib/CryptoPP.h -@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs - { - public: - bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;} -+ NullNameValuePairs() {} - }; - - //! _ |