diff options
Diffstat (limited to 'source/xfce/exo')
| -rwxr-xr-x | source/xfce/exo/exo.SlackBuild | 12 | ||||
| -rw-r--r-- | source/xfce/exo/exo.magnet.uri.diff | 49 | ||||
| -rw-r--r-- | source/xfce/exo/exo.url | 1 |
3 files changed, 7 insertions, 55 deletions
diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild index efb86758a..ee299a2e3 100755 --- a/source/xfce/exo/exo.SlackBuild +++ b/source/xfce/exo/exo.SlackBuild @@ -22,13 +22,13 @@ PKGNAM=exo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -38,8 +38,8 @@ fi NUMJOBS=${NUMJOBS:--j6} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -64,8 +64,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -zcat $CWD/exo.magnet.uri.diff.gz | patch -p1 --verbose || exit 1 - find . -exec touch {} \; chown -R root:root . @@ -75,6 +73,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xfce/exo/exo.magnet.uri.diff b/source/xfce/exo/exo.magnet.uri.diff deleted file mode 100644 index 336ca2121..000000000 --- a/source/xfce/exo/exo.magnet.uri.diff +++ /dev/null @@ -1,49 +0,0 @@ -From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001 -From: Felipe Contreras <felipe.contreras@gmail.com> -Date: Sun, 19 May 2013 03:50:01 +0000 -Subject: Fix exo_str_looks_like_an_uri() (bug #10098). - -Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to -fix a hang in thunar by properly recognizing that 'http:' is not an URI, -however, while doing so, it broke proper URIs like 'magnet:foo'. - -As the RFC clearly states: - - The following are two example URIs and their component parts: - - foo://example.com:8042/over/there?name=ferret#nose - \_/ \______________/\_________/ \_________/ \__/ - | | | | | - scheme authority path query fragment - | _____________________|__ - / \ / \ - urn:example:animal:ferret:nose - -But even with this succinct example exo_str_looks_like_an_uri() fails. - -There is an easy solution; fail only when component part is missing -('urn:'), but succeed otherwise. - -This solution fixes 'magnet:foo', and doesn't break the current -expectation from thunar that 'http:' should fail, having the best of -both worlds. - -[1] http://www.ietf.org/rfc/rfc3986.txt - -Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> ---- -diff --git a/exo/exo-string.c b/exo/exo-string.c -index 33f86f9..056b36a 100644 ---- a/exo/exo-string.c -+++ b/exo/exo-string.c -@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str) - for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s); - - /* <scheme> must be followed by ":" */ -- return (*s == ':' && *(s+1) == '/'); -+ return (*s == ':' && *(s+1) != '\0'); - } - - return FALSE; --- -cgit v0.9.2 diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url new file mode 100644 index 000000000..9a66d2ebd --- /dev/null +++ b/source/xfce/exo/exo.url @@ -0,0 +1 @@ +http://archive.xfce.org:/src/xfce/exo/0.10/ |