diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-22 17:06:20 +0100 |
commit | 47d70348352503e92ba694a6a683f629eaa18215 (patch) | |
tree | 7fb6f5ec75596b795dee52cfa35e3ef00a047cfb /community/ushare | |
parent | c0bcbcf4015ba2388cb0f0bd418e5242f9613b43 (diff) | |
parent | 1f55cedf5ea357497d2a98eb2be78d8dab4a9665 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/hostapd/PKGBUILD
community/discid/PKGBUILD
community/dumb/PKGBUILD
community/dynamite/PKGBUILD
community/echat/PKGBUILD
community/fbdump/PKGBUILD
community/fldiff/PKGBUILD
community/flightgear/PKGBUILD
community/fonteditfs/PKGBUILD
community/freehdl/PKGBUILD
community/unclutter/PKGBUILD
community/unpaper/PKGBUILD
community/wmii/PKGBUILD
community/xkeycaps/PKGBUILD
community/xl2tpd/PKGBUILD
community/xmmsctrl/PKGBUILD
extra/gnutls/PKGBUILD
extra/inkscape/PKGBUILD
extra/ntp/PKGBUILD
extra/transmission/PKGBUILD
multilib/lib32-libpng/PKGBUILD
testing/libreoffice/PKGBUILD
Diffstat (limited to 'community/ushare')
-rw-r--r-- | community/ushare/PKGBUILD | 11 | ||||
-rw-r--r-- | community/ushare/segfault.patch | 61 |
2 files changed, 68 insertions, 4 deletions
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 522bd1b1f..5d5126cdc 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58584 2011-11-15 20:14:24Z spupykin $ +# $Id: PKGBUILD 65329 2012-02-21 01:38:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=16 +pkgrel=17 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') @@ -17,11 +17,13 @@ install=ushare.install source=("http://ushare.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "ushare" "upnp-build-fix.patch" - "ushare-config.patch") + "ushare-config.patch" + "segfault.patch") md5sums=('5bbcdbf1ff85a9710fa3d4e82ccaa251' 'e3cf0a44b0280da4966177c21e49361c' '32c29f9f673e8b3a3d9e7bf5e60febbc' - '5243475c0cebc5db49296b2f3691085b') + '5243475c0cebc5db49296b2f3691085b' + '0b0fbf5d103f0ebb72716cbad0b28ffa') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -30,6 +32,7 @@ build() { configure patch -p1 <$srcdir/upnp-build-fix.patch patch -p1 <$srcdir/ushare-config.patch + patch -p1 <$srcdir/segfault.patch ./configure --prefix=/usr --sysconfdir=/etc/ushare \ --enable-dlna --with-libdlna-dir=/usr/include/libavformat make diff --git a/community/ushare/segfault.patch b/community/ushare/segfault.patch new file mode 100644 index 000000000..f46f9f1f4 --- /dev/null +++ b/community/ushare/segfault.patch @@ -0,0 +1,61 @@ +--- ushare-1.1a/src/cds.c 2007-12-09 16:03:36.000000000 +0300 ++++ ushare-1.1a.my/src/cds.c 2012-01-26 05:14:03.317360310 +0400 +@@ -20,6 +20,8 @@ + */ + + #include <stdlib.h> ++#include <string.h> ++#include <stdio.h> + #include <upnp/upnp.h> + #include <upnp/upnptools.h> + +--- ushare-1.1a/src/cms.c 2007-12-09 16:03:36.000000000 +0300 ++++ ushare-1.1a.my/src/cms.c 2012-01-26 05:15:33.236991387 +0400 +@@ -20,6 +20,7 @@ + */ + + #include <stdlib.h> ++#include <string.h> + #include <upnp/upnp.h> + #include <upnp/upnptools.h> + +--- ushare-1.1a/src/http.c 2012-01-26 05:27:44.073992912 +0400 ++++ ushare-1.1a.my/src/http.c 2012-01-26 05:17:31.756505126 +0400 +@@ -25,6 +25,7 @@ + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <unistd.h> + #include <errno.h> + +--- ushare-1.1a/src/presentation.c 2007-12-09 16:03:36.000000000 +0300 ++++ ushare-1.1a.my/src/presentation.c 2012-01-26 05:19:41.635972259 +0400 +@@ -19,6 +19,8 @@ + */ + + #include <stdlib.h> ++#include <string.h> ++#include <stdio.h> + + #if HAVE_LANGINFO_CODESET + # include <langinfo.h> +--- ushare-1.1a/src/mime.c 2007-12-09 16:03:36.000000000 +0300 ++++ ushare-1.1a.my/src/mime.c 2012-01-26 05:23:54.251602492 +0400 +@@ -21,6 +21,7 @@ + + #include <stdlib.h> + #include <string.h> ++#include <stdio.h> + + #include "mime.h" + #include "ushare.h" +--- ushare-1.1a/src/services.c 2007-12-09 16:03:36.000000000 +0300 ++++ ushare-1.1a.my/src/services.c 2012-01-26 05:21:28.572200186 +0400 +@@ -20,6 +20,7 @@ + */ + + #include <stdlib.h> ++#include <string.h> + #include <upnp/upnp.h> + #include <upnp/upnptools.h> |