[arch-commits] Commit in terminal/repos (4 files)

Jan de Groot jgc at archlinux.org
Sun Jul 20 17:15:44 EDT 2008


    Date: Sunday, July 20, 2008 @ 17:15:44
  Author: jgc
Revision: 5784

Merged revisions 2-5783 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/terminal/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r5752 | jgc | 2008-07-20 17:29:23 +0000 (Sun, 20 Jul 2008) | 3 lines
  
  upgpkg: terminal 0.2.8-2
      Re-apply patch, please do not remove it again!
  Remove calls to update-desktop-database
........

Modified:
  terminal/repos/extra-i686/	(properties)
  terminal/repos/extra-i686/PKGBUILD
  terminal/repos/extra-i686/terminal.install
Deleted:
  terminal/repos/extra-i686/open_link_security.patch

--------------------------+
 PKGBUILD                 |   20 ++--
 open_link_security.patch |  211 ---------------------------------------------
 terminal.install         |    7 -
 3 files changed, 11 insertions(+), 227 deletions(-)


Property changes on: terminal/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /terminal/trunk:1
   + /terminal/trunk:1-5783

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-20 21:14:45 UTC (rev 5783)
+++ extra-i686/PKGBUILD	2008-07-20 21:15:44 UTC (rev 5784)
@@ -4,24 +4,26 @@
 
 pkgname=terminal
 pkgver=0.2.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/projects/terminal/"
 groups=('xfce4')
-depends=('exo>=0.3.4' 'vte>=0.16.9' 'dbus-glib' 'startup-notification>=0.9' \
-         'hicolor-icon-theme')
+depends=('exo>=0.3.4' 'vte>=0.16.14' 'dbus-glib>=0.76'
+	 'startup-notification>=0.9' 'hicolor-icon-theme')
 makedepends=('pkgconfig')
 options=('!libtool')
-install=${pkgname}.install
-source=(http://www.xfce.org/archive/xfce-4.4.2/src/Terminal-${pkgver}.tar.bz2)
-md5sums=('cfe660ecf50e9d3b073576bbc4af6ab2')
+install=terminal.install
+source=(http://www.xfce.org/archive/xfce-4.4.2/src/Terminal-${pkgver}.tar.bz2
+	terminal-dont-die-on-dbus-kill.patch)
+md5sums=('cfe660ecf50e9d3b073576bbc4af6ab2' '7cff5c513739737a0ed2109354538241')
 
 build() {
-  cd ${startdir}/src/Terminal-${pkgver}
+  cd ${srcdir}/Terminal-${pkgver}
+  patch -Np0 -i ${srcdir}/terminal-dont-die-on-dbus-kill.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+    --localstatedir=/var --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install || return 1
 }

Deleted: extra-i686/open_link_security.patch
===================================================================
--- extra-i686/open_link_security.patch	2008-07-20 21:14:45 UTC (rev 5783)
+++ extra-i686/open_link_security.patch	2008-07-20 21:15:44 UTC (rev 5784)
@@ -1,211 +0,0 @@
-diff -Nur Terminal-0.2.6/helpers/balsa.desktop.in Terminal-0.2.6.patched/helpers/balsa.desktop.in
---- Terminal-0.2.6/helpers/balsa.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/balsa.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=balsa
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B -m "mailto:%u"
-+X-Terminal-Command=%B -m mailto:%u
-diff -Nur Terminal-0.2.6/helpers/epiphany.desktop.in Terminal-0.2.6.patched/helpers/epiphany.desktop.in
---- Terminal-0.2.6/helpers/epiphany.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/epiphany.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=epiphany;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-diff -Nur Terminal-0.2.6/helpers/evolution.desktop.in Terminal-0.2.6.patched/helpers/evolution.desktop.in
---- Terminal-0.2.6/helpers/evolution.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/evolution.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/exo-open-browser.desktop.in Terminal-0.2.6.patched/helpers/exo-open-browser.desktop.in
---- Terminal-0.2.6/helpers/exo-open-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/exo-open-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/exo-open-mailer.desktop.in Terminal-0.2.6.patched/helpers/exo-open-mailer.desktop.in
---- Terminal-0.2.6/helpers/exo-open-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/exo-open-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/firefox.desktop.in Terminal-0.2.6.patched/helpers/firefox.desktop.in
---- Terminal-0.2.6/helpers/firefox.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/firefox.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/galeon.desktop.in Terminal-0.2.6.patched/helpers/galeon.desktop.in
---- Terminal-0.2.6/helpers/galeon.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/galeon.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=galeon;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-diff -Nur Terminal-0.2.6/helpers/kmail.desktop.in Terminal-0.2.6.patched/helpers/kmail.desktop.in
---- Terminal-0.2.6/helpers/kmail.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/kmail.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=kmail;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-diff -Nur Terminal-0.2.6/helpers/konqueror.desktop.in Terminal-0.2.6.patched/helpers/konqueror.desktop.in
---- Terminal-0.2.6/helpers/konqueror.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/konqueror.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,6 +5,6 @@
- Type=Application
- X-Terminal-Binaries=konqueror;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
- 
- 
-diff -Nur Terminal-0.2.6/helpers/lynx.desktop.in Terminal-0.2.6.patched/helpers/lynx.desktop.in
---- Terminal-0.2.6/helpers/lynx.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/lynx.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=lynx;
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
-diff -Nur Terminal-0.2.6/helpers/mozilla-browser.desktop.in Terminal-0.2.6.patched/helpers/mozilla-browser.desktop.in
---- Terminal-0.2.6/helpers/mozilla-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mozilla-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/mozilla-mailer.desktop.in Terminal-0.2.6.patched/helpers/mozilla-mailer.desktop.in
---- Terminal-0.2.6/helpers/mozilla-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mozilla-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/mutt.desktop.in Terminal-0.2.6.patched/helpers/mutt.desktop.in
---- Terminal-0.2.6/helpers/mutt.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/mutt.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=mutt;
- X-Terminal-Category=MailReader
--X-Terminal-Command=Terminal -x %B "%u"
-+X-Terminal-Command=Terminal -x %B %u
-diff -Nur Terminal-0.2.6/helpers/opera-browser.desktop.in Terminal-0.2.6.patched/helpers/opera-browser.desktop.in
---- Terminal-0.2.6/helpers/opera-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/opera-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/opera-mailer.desktop.in Terminal-0.2.6.patched/helpers/opera-mailer.desktop.in
---- Terminal-0.2.6/helpers/opera-mailer.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/opera-mailer.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/helpers/sensible-browser.desktop.in Terminal-0.2.6.patched/helpers/sensible-browser.desktop.in
---- Terminal-0.2.6/helpers/sensible-browser.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/sensible-browser.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- Type=Application
- X-Terminal-Binaries=sensible-browser
- X-Terminal-Category=WebBrowser
--X-Terminal-Command=%B "%u"
-+X-Terminal-Command=%B %u
-diff -Nur Terminal-0.2.6/helpers/sylpheed-claws.desktop.in Terminal-0.2.6.patched/helpers/sylpheed-claws.desktop.in
---- Terminal-0.2.6/helpers/sylpheed-claws.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/sylpheed-claws.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -7,4 +7,4 @@
- StartupNotify=true
- X-Terminal-Binaries=sylpheed-claws;
- X-Terminal-Category=MailReader
--X-Terminal-Command=%B --compose "%u"
-+X-Terminal-Command=%B --compose %u
-diff -Nur Terminal-0.2.6/helpers/thunderbird.desktop.in Terminal-0.2.6.patched/helpers/thunderbird.desktop.in
---- Terminal-0.2.6/helpers/thunderbird.desktop.in	2007-01-20 16:30:46.000000000 +0200
-+++ Terminal-0.2.6.patched/helpers/thunderbird.desktop.in	2007-08-14 09:12:57.000000000 +0300
-@@ -5,4 +5,4 @@
- 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
-diff -Nur Terminal-0.2.6/terminal/terminal-helper.c Terminal-0.2.6.patched/terminal/terminal-helper.c
---- Terminal-0.2.6/terminal/terminal-helper.c	2007-01-20 16:30:51.000000000 +0200
-+++ Terminal-0.2.6.patched/terminal/terminal-helper.c	2007-08-14 09:17:20.000000000 +0300
-@@ -349,6 +349,8 @@
-   gchar       *argv[4];
-   gchar       *command;
-   gchar       *t;
-+  gchar       *escaped;
-+  gchar       **parts;
-   guint        n;
- 
-   g_return_if_fail (TERMINAL_IS_HELPER (helper));
-@@ -359,6 +361,12 @@
-     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 +374,7 @@
-         {
-           if (s[0] == '%' && g_ascii_tolower (s[1]) == 'u')
-             {
--              for (u = uri; *u != '\0'; )
-+              for (u = escaped; *u != '\0'; )
-                 *t++ = *u++;
-               s += 2;
-             }
-@@ -379,9 +387,11 @@
-     }
-   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";
-   argv[2] = command;

Modified: extra-i686/terminal.install
===================================================================
--- extra-i686/terminal.install	2008-07-20 21:14:45 UTC (rev 5783)
+++ extra-i686/terminal.install	2008-07-20 21:15:44 UTC (rev 5784)
@@ -1,5 +1,4 @@
 post_install() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
@@ -8,11 +7,5 @@
 }
 
 post_remove() {
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-
-$op $*





More information about the arch-commits mailing list