From 79c8154ccd58fc255d343323774a63f309e0649f Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Jan 17 2021 16:42:59 +0000 Subject: Drop compose-email script from exo (handled by settings) --- diff --git a/exo-0.10.2-magnet-links.patch b/exo-0.10.2-magnet-links.patch deleted file mode 100644 index 336ca21..0000000 --- a/exo-0.10.2-magnet-links.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001 -From: Felipe Contreras -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 ---- -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.9.2 diff --git a/exo.spec b/exo.spec index 5b69101..c0bdb49 100644 --- a/exo.spec +++ b/exo.spec @@ -2,7 +2,7 @@ Name: exo Version: 4.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application library for the Xfce desktop environment # libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+ @@ -11,14 +11,6 @@ License: LGPLv2+ and GPLv2+ URL: http://xfce.org/ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 -# internet-mail icon taken from GNOME, license is LGPLv3 -Source1: internet-mail-24.png -Source2: internet-mail-48.png - -# replace mailto handler with python version -# https://bugzilla.xfce.org/show_bug.cgi?id=9964 -Source3: mailtoparse.py - BuildRequires: gcc-c++ BuildRequires: gtk-doc BuildRequires: gettext @@ -57,14 +49,8 @@ Development tools and static libraries and header files for the exo library. find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' -%find_lang exo-2 - -install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png -# replace upstream perl script with python one. -rm -f %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 -install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail-1 +%find_lang exo-2 %files -f exo-2.lang %license COPYING @@ -73,7 +59,6 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail %{_bindir}/exo-open %{_libdir}/libexo-2.so.0 %{_libdir}/libexo-2.so.0.1.0 -%{_libdir}/xfce4/ %{_datadir}/icons/hicolor/*/*/* %{_datadir}/pixmaps/exo %{_mandir}/man1/exo-open.1.* @@ -86,6 +71,9 @@ install -Dpm 0755 %{SOURCE3} %{buildroot}%{_libdir}/xfce4/exo-1/exo-compose-mail %changelog +* Sun Jan 17 2021 Mukundan Ragavan - 4.16.0-2 +- Drop compose-email script from exo (handled by settings) + * Wed Dec 23 2020 Mukundan Ragavan - 4.16.0-1 - Update to 4.16.0 diff --git a/internet-mail-24.png b/internet-mail-24.png deleted file mode 100644 index aeb54ec..0000000 Binary files a/internet-mail-24.png and /dev/null differ diff --git a/internet-mail-48.png b/internet-mail-48.png deleted file mode 100644 index d06fdf5..0000000 Binary files a/internet-mail-48.png and /dev/null differ diff --git a/mailtoparse.py b/mailtoparse.py deleted file mode 100644 index 4b3b62c..0000000 --- a/mailtoparse.py +++ /dev/null @@ -1,178 +0,0 @@ -#!/usr/bin/python3 -tt -# skvidal@fedoraproject.org -# (c) red hat, inc 2013, 2015 -# gpl whatever -# this is a direct port of exo-compos-mail-1 from xfce -# from perl to python -# the idea is to dump the 2000000000 perl pkgs pulled in -# by this for a single item :( -# it should handle all the behaviour the same -# it probably has bugs - -# TODO: -# - figure out what the attachment parsing is trying to do -# - figure out if rebuilding the mailto for evo, sylpheed and balsa -# is actually necessary or not - feels silly but I'm not shocked by silly -# - would be nice to have an actual set of tests :) - - -import sys -import posix -import os -import urllib.parse - - -def parse_url(mailto): - url = urllib.parse.urlparse(mailto, 'mailto') - res = {} - to = [] - query = None - - if url.query or '?' not in url.path: - if url.path: - to.append(urllib.parse.unquote(url.path)) - - else: - (thisto, ques, query) = url.path.partition('?') - if thisto.strip(): - to.append(urllib.parse.unquote(thisto)) - - if not query: - query = url.query - - q_dict = urllib.parse.parse_qs(query) - to.extend(q_dict.get('to', [])) - res['to'] = to - if 'to' in q_dict: - del(q_dict['to']) - - res.update(q_dict) - return res - - -if len(sys.argv) < 3: - sys.stderr.write("Usage: %s