diff options
| -rw-r--r-- | xfce-base/exo/Manifest | 1 | ||||
| -rw-r--r-- | xfce-base/exo/exo-0.10.2-r1.ebuild | 40 | ||||
| -rw-r--r-- | xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch | 52 |
3 files changed, 0 insertions, 93 deletions
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest index a6588722e5b0..836a76921389 100644 --- a/xfce-base/exo/Manifest +++ b/xfce-base/exo/Manifest @@ -1,3 +1,2 @@ -DIST exo-0.10.2.tar.bz2 1209633 SHA256 b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce SHA512 91a5a7f7b893c427ef10ee6ce248a6b6f8e2aba4281e406a60bc8fe7fa50196eb79d8b0ad6609ab48371acf77425df8cb67124ab11b7c4ff08d1dc83bb180eae WHIRLPOOL 65007fd57a585da8a4ae05af7560e3bcf2a35e08f4e652fd0a9d56ffa5d8505df6de383bf1c648453f14f686f9d455c3d893ec6b01de4adc86e79e75489fc999 DIST exo-0.10.6.tar.bz2 1276178 SHA256 1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752 SHA512 be537145ea0f0ea87566908f3ed4850ee3b20caf292d27dd752a9eaba7047598b585b398c2a6e4c925d832b5b2f76e0b9cc763ee3c955f08d47c6ac8bf3a2805 WHIRLPOOL 8daa7a8021faea4b87a5204d2a6604fde732efd183aa3d7404b6b0b52444edbceab28ac636a254f145c705689baa3996a4ccd39256edd4a3ae148b7b40dc9034 DIST exo-0.10.7.tar.bz2 1262301 SHA256 521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c SHA512 5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60 WHIRLPOOL 4c8a71b70e67f0db0bfaa752b0b1f01a80a83cbe84d754b44b3d45811743cf4276abe5d9cde40cef13f87f6013666255ccc5a1cc64afe129a55fe813b4dbcb1e diff --git a/xfce-base/exo/exo-0.10.2-r1.ebuild b/xfce-base/exo/exo-0.10.2-r1.ebuild deleted file mode 100644 index b514894d27ce..000000000000 --- a/xfce-base/exo/exo-0.10.2-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit xfconf - -DESCRIPTION="Extensions, widgets and framework library with session support for the Xfce desktop environment" -HOMEPAGE="http://www.xfce.org/projects/" -SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="debug" - -RDEPEND=">=dev-lang/perl-5.6 - >=dev-libs/glib-2.30 - dev-perl/URI - >=x11-libs/gtk+-2.24:2 - >=xfce-base/libxfce4ui-4.10 - >=xfce-base/libxfce4util-4.10" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -pkg_setup() { - PATCHES=( "${FILESDIR}"/${P}-exo_str_looks_like_an_uri.patch ) - - XFCONF=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(xfconf_use_debug) - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html - ) - - [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857 - - DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO ) -} diff --git a/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch b/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch deleted file mode 100644 index 9c813745691c..000000000000 --- a/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://bugs.gentoo.org/466144 - -From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001 -From: Felipe Contreras <felipe.contreras@gmail.com> -Date: Sat, 18 May 2013 22:50:01 -0500 -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.10.1 - |