- Update Terminal to 0.2.8

- still crashes *very* rarely when hitting ctrl-d, seems related to vte
(http://bugzilla.xfce.org/show_bug.cgi?id=3246)
- remove all unneeded patches
- install more documentation
- add update-desktop-database goo

ok ajacoutot@ steven@
This commit is contained in:
landry 2007-12-18 20:55:13 +00:00
parent 29a0737941
commit 62373b82ac
22 changed files with 58 additions and 244 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2007/09/15 20:04:26 merdely Exp $
# $OpenBSD: Makefile,v 1.6 2007/12/18 20:55:13 landry Exp $
COMMENT= lightweight vte-based terminal for xfce4
V= 0.2.6
V= 0.2.8
DISTNAME= Terminal-${V}
PKGNAME= terminal-${V}p1
PKGNAME= terminal-${V}
HOMEPAGE= http://www.xfce.org/projects/terminal/
MAINTAINER= Landry Breuil <gaston@gcu.info>
@ -15,15 +15,16 @@ PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.1/src/
MASTER_SITES= http://www.xfce.org/archive/xfce-4.4.2/src/
EXTRACT_SUFX= .tar.bz2
USE_GMAKE= Yes
LIB_DEPENDS= exo-0.3.>=4::x11/xfce4/exo \
LIB_DEPENDS= exo-0.3.>=5::x11/xfce4/exo \
dbus-glib-1::x11/dbus-glib \
dbus-1.>=6::x11/dbus \
vte.>=8.0::devel/vte
vte.>=11::devel/vte
RUN_DEPENDS= ::devel/desktop-file-utils
WANTLIB= X11 atk-1.0 c gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gobject-2.0 \
gtk-x11-2.0 startup-notification-1 xfce4util

View File

@ -1,5 +1,5 @@
MD5 (xfce4/Terminal-0.2.6.tar.bz2) = 7QkcAuAC4kAuMgOiqy98mg==
RMD160 (xfce4/Terminal-0.2.6.tar.bz2) = DhvLZrg6kgROrokcNcw3UJGMqD4=
SHA1 (xfce4/Terminal-0.2.6.tar.bz2) = iFEXlJLEdooaU9JCTXp8ixqHPFg=
SHA256 (xfce4/Terminal-0.2.6.tar.bz2) = odyxqG55eArLHzVIRm66H7A6nZ6b0x5v80lrB1BOU9g=
SIZE (xfce4/Terminal-0.2.6.tar.bz2) = 1582076
MD5 (xfce4/Terminal-0.2.8.tar.bz2) = z+Zg7PUOnTsHNXa7xK9qsg==
RMD160 (xfce4/Terminal-0.2.8.tar.bz2) = Sb+HCR7zkBHckRFDmpOaUvGXcf4=
SHA1 (xfce4/Terminal-0.2.8.tar.bz2) = nErgQi3qgWGqcmWdO9GwNWiNcNc=
SHA256 (xfce4/Terminal-0.2.8.tar.bz2) = IKWLlpFfZ8W09J+xQo4YdhlfH5/X034AgTUsrcE0Y+c=
SIZE (xfce4/Terminal-0.2.8.tar.bz2) = 1908459

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_balsa_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/balsa.desktop.in.orig Wed Sep 5 18:25:46 2007
+++ helpers/balsa.desktop.in Wed Sep 5 18:26:06 2007
@@ -5,4 +5,4 @@ _Name=Balsa
Type=Application
X-Terminal-Binaries=balsa
X-Terminal-Category=MailReader
-X-Terminal-Command=%B -m "mailto:%u"
+X-Terminal-Command=%B -m mailto:%u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_epiphany_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/epiphany.desktop.in.orig Wed Sep 5 18:26:15 2007
+++ helpers/epiphany.desktop.in Wed Sep 5 18:26:23 2007
@@ -5,4 +5,4 @@ _Name=Epiphany Web Browser
Type=Application
X-Terminal-Binaries=epiphany;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B "%u"
+X-Terminal-Command=%B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_evolution_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/evolution.desktop.in.orig Thu Sep 6 19:25:45 2007
+++ helpers/evolution.desktop.in Thu Sep 6 19:25:50 2007
@@ -5,4 +5,4 @@ _Name=Novell Evolution
Type=Application
X-Terminal-Binaries=evolution-2.2;evolution-2.0;evolution-1.6;evolution-1.5;evolution-1.4;evolution;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B "mailto:%u"
+X-Terminal-Command=%B mailto:%u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_exo-open-browser_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/exo-open-browser.desktop.in.orig Wed Sep 5 18:26:34 2007
+++ helpers/exo-open-browser.desktop.in Wed Sep 5 18:26:44 2007
@@ -5,4 +5,4 @@ _Name=Default Web Browser (Xfce)
Type=Application
X-Terminal-Binaries=exo-open
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B --launch WebBrowser "%u"
+X-Terminal-Command=%B --launch WebBrowser %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_exo-open-mailer_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/exo-open-mailer.desktop.in.orig Wed Sep 5 18:27:06 2007
+++ helpers/exo-open-mailer.desktop.in Wed Sep 5 18:27:16 2007
@@ -5,4 +5,4 @@ _Name=Default Mail Reader (Xfce)
Type=Application
X-Terminal-Binaries=exo-open
X-Terminal-Category=MailReader
-X-Terminal-Command=%B --launch MailReader "%u"
+X-Terminal-Command=%B --launch MailReader %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_firefox_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/firefox.desktop.in.orig Wed Sep 5 18:27:25 2007
+++ helpers/firefox.desktop.in Wed Sep 5 18:27:47 2007
@@ -5,4 +5,4 @@ _Name=Mozilla Firefox
Type=Application
X-Terminal-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B -remote "openURL(%u)" || %B "%u"
+X-Terminal-Command=%B -remote openURL\(%u\) || %B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_galeon_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/galeon.desktop.in.orig Wed Sep 5 18:28:03 2007
+++ helpers/galeon.desktop.in Wed Sep 5 18:28:09 2007
@@ -5,4 +5,4 @@ _Name=Galeon Web Browser
Type=Application
X-Terminal-Binaries=galeon;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B "%u"
+X-Terminal-Command=%B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_kmail_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/kmail.desktop.in.orig Wed Sep 5 18:28:17 2007
+++ helpers/kmail.desktop.in Wed Sep 5 18:28:24 2007
@@ -5,4 +5,4 @@ _Name=KMail
Type=Application
X-Terminal-Binaries=kmail;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B "%u"
+X-Terminal-Command=%B %u

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-helpers_konqueror_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/konqueror.desktop.in.orig Wed Sep 5 18:28:32 2007
+++ helpers/konqueror.desktop.in Wed Sep 5 18:28:40 2007
@@ -5,6 +5,6 @@ _Name=Konqueror
Type=Application
X-Terminal-Binaries=konqueror;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B "%u"
+X-Terminal-Command=%B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_lynx_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/lynx.desktop.in.orig Wed Sep 5 18:28:47 2007
+++ helpers/lynx.desktop.in Wed Sep 5 18:28:55 2007
@@ -5,4 +5,4 @@ _Name=Lynx
Type=Application
X-Terminal-Binaries=lynx;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=Terminal -x %B "%u"
+X-Terminal-Command=Terminal -x %B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_mozilla-browser_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/mozilla-browser.desktop.in.orig Wed Sep 5 18:29:13 2007
+++ helpers/mozilla-browser.desktop.in Wed Sep 5 18:29:30 2007
@@ -5,4 +5,4 @@ _Name=Mozilla Browser
Type=Application
X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_mozilla-mailer_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/mozilla-mailer.desktop.in.orig Wed Sep 5 18:29:38 2007
+++ helpers/mozilla-mailer.desktop.in Wed Sep 5 18:29:57 2007
@@ -5,4 +5,4 @@ _Name=Mozilla Mail
Type=Application
X-Terminal-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_mutt_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/mutt.desktop.in.orig Wed Sep 5 18:30:02 2007
+++ helpers/mutt.desktop.in Wed Sep 5 18:30:09 2007
@@ -5,4 +5,4 @@ _Name=Mutt
Type=Application
X-Terminal-Binaries=mutt;
X-Terminal-Category=MailReader
-X-Terminal-Command=Terminal -x %B "%u"
+X-Terminal-Command=Terminal -x %B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_opera-browser_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/opera-browser.desktop.in.orig Wed Sep 5 18:30:16 2007
+++ helpers/opera-browser.desktop.in Wed Sep 5 18:30:38 2007
@@ -5,4 +5,4 @@ _Name=Opera Browser
Type=Application
X-Terminal-Binaries=opera;
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B -remote "openURL(%u,new-window)" || %B "%u"
+X-Terminal-Command=%B -remote openURL\(%u,new-window\) || %B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_opera-mailer_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/opera-mailer.desktop.in.orig Wed Sep 5 18:30:49 2007
+++ helpers/opera-mailer.desktop.in Wed Sep 5 18:31:06 2007
@@ -5,4 +5,4 @@ _Name=Opera Mail
Type=Application
X-Terminal-Binaries=opera;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B -remote "openURL(mailto:%u)" || %B "mailto:%u"
+X-Terminal-Command=%B -remote openURL\(mailto:%u\) || %B mailto:%u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_sensible-browser_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/sensible-browser.desktop.in.orig Wed Sep 5 18:31:14 2007
+++ helpers/sensible-browser.desktop.in Wed Sep 5 18:31:22 2007
@@ -5,4 +5,4 @@ _Name=Debian Sensible Browser
Type=Application
X-Terminal-Binaries=sensible-browser
X-Terminal-Category=WebBrowser
-X-Terminal-Command=%B "%u"
+X-Terminal-Command=%B %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_sylpheed-claws_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/sylpheed-claws.desktop.in.orig Wed Sep 5 18:31:31 2007
+++ helpers/sylpheed-claws.desktop.in Wed Sep 5 18:31:39 2007
@@ -7,4 +7,4 @@ Type=Application
StartupNotify=true
X-Terminal-Binaries=sylpheed-claws;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B --compose "%u"
+X-Terminal-Command=%B --compose %u

View File

@ -1,9 +0,0 @@
$OpenBSD: patch-helpers_thunderbird_desktop_in,v 1.1 2007/09/06 18:44:52 steven Exp $
--- helpers/thunderbird.desktop.in.orig Wed Sep 5 18:31:48 2007
+++ helpers/thunderbird.desktop.in Wed Sep 5 18:32:04 2007
@@ -5,4 +5,4 @@ _Name=Mozilla Thunderbird
Type=Application
X-Terminal-Binaries=thunderbird;thunderbird-gtk2;thunderbird-gtk;mozilla-thunderbird;
X-Terminal-Category=MailReader
-X-Terminal-Command=%B -remote "mailto(%u)" || %B -compose "mailto:%u"
+X-Terminal-Command=%B -remote mailto\(%u\) || %B -compose mailto:%u

View File

@ -1,44 +0,0 @@
$OpenBSD: patch-terminal_terminal-helper_c,v 1.1 2007/09/06 18:44:52 steven Exp $
--- terminal/terminal-helper.c.orig Wed Sep 5 18:32:23 2007
+++ terminal/terminal-helper.c Wed Sep 5 18:34:30 2007
@@ -349,6 +349,8 @@ terminal_helper_execute (TerminalHelper *helper,
gchar *argv[4];
gchar *command;
gchar *t;
+ gchar *escaped;
+ gchar **parts;
guint n;
g_return_if_fail (TERMINAL_IS_HELPER (helper));
@@ -359,6 +361,10 @@ terminal_helper_execute (TerminalHelper *helper,
if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
++n;
+ parts = g_strsplit (uri, "$", 0);
+ escaped = g_shell_quote (g_strjoinv("\$", parts));
+ g_strfreev (parts);
+
if (n > 0)
{
command = g_new (gchar, strlen (helper->command) + n * strlen (uri) + 1);
@@ -366,7 +372,7 @@ terminal_helper_execute (TerminalHelper *helper,
{
if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
{
- for (u = uri; *u != '\0'; )
+ for (u = escaped; *u != '\0'; )
*t++ = *u++;
s += 2;
}
@@ -379,8 +385,10 @@ terminal_helper_execute (TerminalHelper *helper,
}
else
{
- command = g_strconcat (helper->command, " ", uri, NULL);
+ command = g_strconcat (helper->command, " ", escaped, NULL);
}
+
+ g_free (escaped);
argv[0] = "/bin/sh";
argv[1] = "-c";

View File

@ -1,30 +1,10 @@
@comment $OpenBSD: PLIST,v 1.2 2007/05/28 19:53:07 steven Exp $
@comment $OpenBSD: PLIST,v 1.3 2007/12/18 20:55:13 landry Exp $
bin/Terminal
bin/terminal
libexec/TerminalHelp
@man man/man1/Terminal.1
share/Terminal/
share/Terminal/Terminal-toolbars.ui
share/Terminal/Terminal.ui
share/Terminal/apps/
share/Terminal/apps/balsa.desktop
share/Terminal/apps/epiphany.desktop
share/Terminal/apps/evolution.desktop
share/Terminal/apps/exo-open-browser.desktop
share/Terminal/apps/exo-open-mailer.desktop
share/Terminal/apps/firefox.desktop
share/Terminal/apps/galeon.desktop
share/Terminal/apps/kmail.desktop
share/Terminal/apps/konqueror.desktop
share/Terminal/apps/lynx.desktop
share/Terminal/apps/mozilla-browser.desktop
share/Terminal/apps/mozilla-mailer.desktop
share/Terminal/apps/mutt.desktop
share/Terminal/apps/opera-browser.desktop
share/Terminal/apps/opera-mailer.desktop
share/Terminal/apps/sensible-browser.desktop
share/Terminal/apps/sylpheed-claws.desktop
share/Terminal/apps/thunderbird.desktop
share/applications/
share/applications/Terminal.desktop
share/doc/Terminal/
@ -51,9 +31,33 @@ share/doc/Terminal/C/images/terminal-set-title.png
share/doc/Terminal/C/images/terminal-toolbars.png
share/doc/Terminal/C/index.html
share/doc/Terminal/C/preferences.html
share/doc/Terminal/C/preferred-applications.html
share/doc/Terminal/C/support.html
share/doc/Terminal/C/usage.html
share/doc/Terminal/fr/
share/doc/Terminal/fr/advanced.html
share/doc/Terminal/fr/copyright.html
share/doc/Terminal/fr/faq.html
share/doc/Terminal/fr/getting-started.html
share/doc/Terminal/fr/images/
share/doc/Terminal/fr/images/terminal-applications-dialog.png
share/doc/Terminal/fr/images/terminal-applications-menu.png
share/doc/Terminal/fr/images/terminal-choose-custom-webbrowser.png
share/doc/Terminal/fr/images/terminal-compose-shortcut.png
share/doc/Terminal/fr/images/terminal-edit-applications.png
share/doc/Terminal/fr/images/terminal-edit-preferences.png
share/doc/Terminal/fr/images/terminal-first-time.png
share/doc/Terminal/fr/images/terminal-multiple-tabs.png
share/doc/Terminal/fr/images/terminal-preferences-advanced.png
share/doc/Terminal/fr/images/terminal-preferences-appearance.png
share/doc/Terminal/fr/images/terminal-preferences-colors.png
share/doc/Terminal/fr/images/terminal-preferences-general.png
share/doc/Terminal/fr/images/terminal-preferences-shortcuts.png
share/doc/Terminal/fr/images/terminal-set-title.png
share/doc/Terminal/fr/images/terminal-toolbars.png
share/doc/Terminal/fr/index.html
share/doc/Terminal/fr/preferences.html
share/doc/Terminal/fr/support.html
share/doc/Terminal/fr/usage.html
share/doc/Terminal/ja/
share/doc/Terminal/ja/advanced.html
share/doc/Terminal/ja/copyright.html
@ -77,7 +81,6 @@ share/doc/Terminal/ja/images/terminal-set-title.png
share/doc/Terminal/ja/images/terminal-toolbars.png
share/doc/Terminal/ja/index.html
share/doc/Terminal/ja/preferences.html
share/doc/Terminal/ja/preferred-applications.html
share/doc/Terminal/ja/support.html
share/doc/Terminal/ja/usage.html
share/doc/Terminal/terminal.css
@ -112,12 +115,13 @@ share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-mailreader.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png
share/icons/hicolor/48x48/stock/navigation/stock_terminal-webbrowser.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/Terminal.svg
share/locale/ar/
share/locale/ar/LC_MESSAGES/
share/locale/ar/LC_MESSAGES/Terminal.mo
share/locale/be/LC_MESSAGES/Terminal.mo
share/locale/ca/LC_MESSAGES/Terminal.mo
share/locale/cs/LC_MESSAGES/Terminal.mo
@ -145,20 +149,37 @@ share/locale/ko/LC_MESSAGES/Terminal.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/Terminal.mo
share/locale/lv/LC_MESSAGES/Terminal.mo
share/locale/nb_NO/
share/locale/nb_NO/LC_MESSAGES/
share/locale/nb_NO/LC_MESSAGES/Terminal.mo
share/locale/nl/LC_MESSAGES/Terminal.mo
share/locale/pa/
share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/Terminal.mo
share/locale/pl/LC_MESSAGES/Terminal.mo
share/locale/pt_BR/LC_MESSAGES/Terminal.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/Terminal.mo
share/locale/ro/LC_MESSAGES/Terminal.mo
share/locale/ru/LC_MESSAGES/Terminal.mo
share/locale/sk/LC_MESSAGES/Terminal.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/Terminal.mo
share/locale/sv/LC_MESSAGES/Terminal.mo
share/locale/tr/LC_MESSAGES/Terminal.mo
share/locale/uk/LC_MESSAGES/Terminal.mo
share/locale/ur/
share/locale/ur/LC_MESSAGES/
share/locale/ur/LC_MESSAGES/Terminal.mo
share/locale/vi/LC_MESSAGES/Terminal.mo
share/locale/zh_CN/LC_MESSAGES/Terminal.mo
share/locale/zh_TW/LC_MESSAGES/Terminal.mo
share/pixmaps/
share/pixmaps/terminal.xpm
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
@exec %D/bin/update-desktop-database
@unexec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor
@unexec %D/bin/update-desktop-database