From 0bb1fcb2a50a7beb3b463764ce451ea7b166d17b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Nov 2014 22:57:02 +0200 Subject: bump exo to latest stable version from portage tree --- xfce-base/exo/ChangeLog | 39 +++++++++++++++- xfce-base/exo/Manifest | 17 ------- xfce-base/exo/exo-0.10.2-r1.ebuild | 40 +++++++++++++++++ .../exo-0.10.2-exo_str_looks_like_an_uri.patch | 52 ++++++++++++++++++++++ 4 files changed, 129 insertions(+), 19 deletions(-) create mode 100644 xfce-base/exo/exo-0.10.2-r1.ebuild create mode 100644 xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch diff --git a/xfce-base/exo/ChangeLog b/xfce-base/exo/ChangeLog index 363621f1..4e0cd4aa 100644 --- a/xfce-base/exo/ChangeLog +++ b/xfce-base/exo/ChangeLog @@ -1,6 +1,41 @@ # ChangeLog for xfce-base/exo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.100 2013/05/05 17:04:20 ssuominen Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/ChangeLog,v 1.110 2014/07/18 20:02:27 ssuominen Exp $ + + 18 Jul 2014; Samuli Suominen -exo-0.10.2.ebuild: + old + + 18 Jul 2014; Agostino Sarubbo exo-0.10.2-r1.ebuild: + Stable for sparc, wrt bug #513930 + + 18 Jul 2014; Agostino Sarubbo exo-0.10.2-r1.ebuild: + Stable for ia64, wrt bug #513930 + + 18 Jul 2014; Agostino Sarubbo exo-0.10.2-r1.ebuild: + Stable for alpha, wrt bug #513930 + + 18 Jul 2014; Agostino Sarubbo exo-0.10.2-r1.ebuild: + Stable for ppc64, wrt bug #513930 + + 18 Jul 2014; Agostino Sarubbo exo-0.10.2-r1.ebuild: + Stable for ppc, wrt bug #513930 + + 29 Jun 2014; Markus Meier exo-0.10.2-r1.ebuild: + arm stable, bug #513930 + + 25 Jun 2014; Jeroen Roovers exo-0.10.2-r1.ebuild: + Stable for HPPA (bug #513930). + + 20 Jun 2014; Samuli Suominen exo-0.10.2-r1.ebuild: + amd64/x86 stable wrt #513930 + +*exo-0.10.2-r1 (26 May 2014) + + 26 May 2014; Samuli Suominen +exo-0.10.2-r1.ebuild, + +files/exo-0.10.2-exo_str_looks_like_an_uri.patch: + Apply upstream patch for bug 466144 to fix exo_str_looks_like_an_uri() + function. Thanks to "nandhp" for reporting and Sasha Medvedev for pointing out + the patch. 05 May 2013; Samuli Suominen -exo-0.8.0.ebuild: old diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest index 1c98c981..034d4892 100644 --- a/xfce-base/exo/Manifest +++ b/xfce-base/exo/Manifest @@ -1,18 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - DIST exo-0.10.2.tar.bz2 1209633 SHA256 b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce SHA512 91a5a7f7b893c427ef10ee6ce248a6b6f8e2aba4281e406a60bc8fe7fa50196eb79d8b0ad6609ab48371acf77425df8cb67124ab11b7c4ff08d1dc83bb180eae WHIRLPOOL 65007fd57a585da8a4ae05af7560e3bcf2a35e08f4e652fd0a9d56ffa5d8505df6de383bf1c648453f14f686f9d455c3d893ec6b01de4adc86e79e75489fc999 -EBUILD exo-0.10.2.ebuild 1172 SHA256 5bf22f2be10b552c922a2764046f001a10edb9ac4cd6a67f1b5785e2e50f07fd SHA512 4ef9ef61e27ecd6661f013c468d6834a3da9b367adee774462986a4ade9a2e775206233ce7539861100893086bbdbef10f303ca0388d68f1d8f68c452e8c773f WHIRLPOOL fc46b67d87876233f3084c6ca7c7c78d1d535a8b24dd26addb1896d6f9ee6b503241585149fddf1f1b9670ddc4fdb5748693ad9ebeaac843dd41e5986619a07d -MISC ChangeLog 12145 SHA256 ff7e1ab9cd699e713773ce492e0e8983403eb5a75ac79af1e80166880d8697f5 SHA512 886ba9d2ddea287cc0e79b3e11d242b64da1466d92e0d8648842cb729b66d5d0513d33fe863a9c1a3eb64c75a1e9fd0ffdec25e9921de372d568dd1be6395168 WHIRLPOOL 6b1aa6246e116e5172f50ba93ec5f837178dc0466226bd187e711c97eb98e883f368b4e7f58d1e54ae5e4fa2df85fd79793a7427eb2c503389569f7f81e29fa5 -MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCAAGBQJRhpEFAAoJEEdUh39IaPFNSe0H/3CvzC3y26ZuCDPnR+bFjatm -FUdViXD2UcZ7I7FGeivsw3q7zJfNy3AP6FLHEw8hs5YGgmeWIyli/W5ClyqDMfQx -mu0Z6c7a6fo6YS2t5rvb96xm9ZXUi5eQYhSwOadWUEj819HyKLiXwUYOMZyMWVEJ -TKbYkEbgmt99rBFNwacewH9MPt9aSl2yNH2HB3+u0VaYcQCVS9/lRdbMBV32gPkS -60v8V9H46U48duNAe4GNRqDdGhz5bfzuWmKp2221vCEsiFg60+Pm2bMbFFUmeynV -JTizRNBPj40rqrVeZpfYRi4UGaon5BygB/f3gSH++4EXnpQtMb/ot2lUUYD9s5k= -=gRGi ------END PGP SIGNATURE----- diff --git a/xfce-base/exo/exo-0.10.2-r1.ebuild b/xfce-base/exo/exo-0.10.2-r1.ebuild new file mode 100644 index 00000000..170bb9d5 --- /dev/null +++ b/xfce-base/exo/exo-0.10.2-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-base/exo/exo-0.10.2-r1.ebuild,v 1.9 2014/07/18 19:56:07 ago Exp $ + +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 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 new file mode 100644 index 00000000..9c813745 --- /dev/null +++ b/xfce-base/exo/files/exo-0.10.2-exo_str_looks_like_an_uri.patch @@ -0,0 +1,52 @@ +http://bugs.gentoo.org/466144 + +From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001 +From: Felipe Contreras +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 + +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); + + /* must be followed by ":" */ +- return (*s == ':' && *(s+1) == '/'); ++ return (*s == ':' && *(s+1) != '\0'); + } + + return FALSE; +-- +cgit v0.10.1 + -- cgit v1.2.3