[arch-commits] Commit in exo/repos (10 files)
Evangelos Foutras
foutrelis at nymeria.archlinux.org
Mon Nov 11 15:17:24 UTC 2013
Date: Monday, November 11, 2013 @ 16:17:24
Author: foutrelis
Revision: 199343
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
exo/repos/extra-i686/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
(from rev 199342, exo/trunk/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
exo/repos/extra-i686/PKGBUILD
(from rev 199342, exo/trunk/PKGBUILD)
exo/repos/extra-i686/exo.install
(from rev 199342, exo/trunk/exo.install)
exo/repos/extra-x86_64/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
(from rev 199342, exo/trunk/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
exo/repos/extra-x86_64/PKGBUILD
(from rev 199342, exo/trunk/PKGBUILD)
exo/repos/extra-x86_64/exo.install
(from rev 199342, exo/trunk/exo.install)
Deleted:
exo/repos/extra-i686/PKGBUILD
exo/repos/extra-i686/exo.install
exo/repos/extra-x86_64/PKGBUILD
exo/repos/extra-x86_64/exo.install
-----------------------------------------------------------------+
/PKGBUILD | 104 ++++++++++
/exo.install | 26 ++
extra-i686/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch | 53 +++++
extra-i686/PKGBUILD | 43 ----
extra-i686/exo.install | 13 -
extra-x86_64/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch | 53 +++++
extra-x86_64/PKGBUILD | 43 ----
extra-x86_64/exo.install | 13 -
8 files changed, 236 insertions(+), 112 deletions(-)
Copied: exo/repos/extra-i686/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch (from rev 199342, exo/trunk/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
===================================================================
--- extra-i686/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch (rev 0)
+++ extra-i686/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,53 @@
+From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at gmail.com>
+Date: Sat, 18 May 2013 22:50:01 -0500
+Subject: [PATCH] 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 at gmail.com>
+---
+ exo/exo-string.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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;
+--
+1.8.4.2
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-11 15:17:04 UTC (rev 199342)
+++ extra-i686/PKGBUILD 2013-11-11 15:17:24 UTC (rev 199343)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien at chez.com>
-
-pkgname=exo
-pkgver=0.10.2
-pkgrel=1
-pkgdesc="Extensions to Xfce by os-cillation"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
-makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
-optdepends=('perl-uri: for mail-compose helper script')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python 2 fix
- export PYTHON=python2
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var \
- --disable-static \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: exo/repos/extra-i686/PKGBUILD (from rev 199342, exo/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien at chez.com>
+
+pkgname=exo
+pkgver=0.10.2
+pkgrel=2
+pkgdesc="Extensions to Xfce by os-cillation"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2' 'LGPL')
+groups=('xfce4')
+depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+optdepends=('perl-uri: for mail-compose helper script')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
+ 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
+sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce'
+ 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=10098
+ patch -Np1 -i "$srcdir/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Python 2 fix
+ export PYTHON=python2
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/exo.install
===================================================================
--- extra-i686/exo.install 2013-11-11 15:17:04 UTC (rev 199342)
+++ extra-i686/exo.install 2013-11-11 15:17:24 UTC (rev 199343)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: exo/repos/extra-i686/exo.install (from rev 199342, exo/trunk/exo.install)
===================================================================
--- extra-i686/exo.install (rev 0)
+++ extra-i686/exo.install 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: exo/repos/extra-x86_64/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch (from rev 199342, exo/trunk/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
===================================================================
--- extra-x86_64/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch (rev 0)
+++ extra-x86_64/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,53 @@
+From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at gmail.com>
+Date: Sat, 18 May 2013 22:50:01 -0500
+Subject: [PATCH] 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 at gmail.com>
+---
+ exo/exo-string.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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;
+--
+1.8.4.2
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-11 15:17:04 UTC (rev 199342)
+++ extra-x86_64/PKGBUILD 2013-11-11 15:17:24 UTC (rev 199343)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-# Contributor: Aurelien Foret <orelien at chez.com>
-
-pkgname=exo
-pkgver=0.10.2
-pkgrel=1
-pkgdesc="Extensions to Xfce by os-cillation"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2' 'LGPL')
-groups=('xfce4')
-depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
-makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
-optdepends=('perl-uri: for mail-compose helper script')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python 2 fix
- export PYTHON=python2
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/xfce4 \
- --localstatedir=/var \
- --disable-static \
- --enable-gtk-doc \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: exo/repos/extra-x86_64/PKGBUILD (from rev 199342, exo/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+# Contributor: Aurelien Foret <orelien at chez.com>
+
+pkgname=exo
+pkgver=0.10.2
+pkgrel=2
+pkgdesc="Extensions to Xfce by os-cillation"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2' 'LGPL')
+groups=('xfce4')
+depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+optdepends=('perl-uri: for mail-compose helper script')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
+ 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
+sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce'
+ 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=10098
+ patch -Np1 -i "$srcdir/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Python 2 fix
+ export PYTHON=python2
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-gtk-doc \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/exo.install
===================================================================
--- extra-x86_64/exo.install 2013-11-11 15:17:04 UTC (rev 199342)
+++ extra-x86_64/exo.install 2013-11-11 15:17:24 UTC (rev 199343)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: exo/repos/extra-x86_64/exo.install (from rev 199342, exo/trunk/exo.install)
===================================================================
--- extra-x86_64/exo.install (rev 0)
+++ extra-x86_64/exo.install 2013-11-11 15:17:24 UTC (rev 199343)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list