[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#598281: marked as done (Needs porting to vte 0.26)

Your message dated Fri, 01 Oct 2010 11:47:05 +0000
with message-id <E1P1e4v-00057m-U7@franck.debian.org>
and subject line Bug#598281: fixed in cdebconf-terminal 0.9
has caused the Debian Bug report #598281,
regarding Needs porting to vte 0.26
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
598281: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598281
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: cdebconf-terminal
Version: 0.8
Severity: wishlist
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch maverick

        Hi there

 cdebconf-terminal doesn't build anymore in Ubuntu since vte 0.26; I
 wrote the attached patch, but only build-tested it; would love if
 someone could try it out.

   Thanks!
-- 
Loïc Minier

diff -Nru cdebconf-terminal-0.8/debian/changelog cdebconf-terminal-0.8ubuntu1dooz1/debian/changelog
--- cdebconf-terminal-0.8/debian/changelog	2010-07-11 10:29:39.000000000 +0200
+++ cdebconf-terminal-0.8ubuntu1dooz1/debian/changelog	2010-09-28 05:01:40.000000000 +0200
@@ -1,3 +1,13 @@
+cdebconf-terminal (0.9) UNRELEASED; urgency=low
+
+  * Port to vte >= 0.26.
+    * Makefile.in: also pass $(VTE_CFLAGS) when building gtk-*.c files.
+    * Bump libvte-dev build-dep to >= 0.16.15 for VTE_CHECK_VERSION().
+    * gtk-plugin-terminal.c: use vte_terminal_fork_command_full() instead of
+      vte_terminal_fork_command() with newer vtes.
+
+ -- Loïc Minier <loic.minier@ubuntu.com>  Tue, 28 Sep 2010 01:15:06 +0200
+
 cdebconf-terminal (0.8) unstable; urgency=low
 
   [ Otavio Salvador/Christian Perrier ]
diff -Nru cdebconf-terminal-0.8/debian/control cdebconf-terminal-0.8ubuntu1dooz1/debian/control
--- cdebconf-terminal-0.8/debian/control	2010-03-24 06:00:38.000000000 +0100
+++ cdebconf-terminal-0.8ubuntu1dooz1/debian/control	2010-09-28 04:38:37.000000000 +0200
@@ -3,7 +3,7 @@
 Section: debian-installer
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Jérémy Bobbio <lunar@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libdebconfclient0-dev (>= 0.146), libnewt-dev, libgtk2.0-dev (>= 2.18.7-2), libvte-dev (>> 0.16.14-1)
+Build-Depends: debhelper (>= 7.0.50~), po-debconf (>= 0.5.0), libdebian-installer4-dev, libdebconfclient0-dev (>= 0.146), libnewt-dev, libgtk2.0-dev (>= 2.18.7-2), libvte-dev (>> 0.16.15)
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/cdebconf-terminal
 
 Package: cdebconf-gtk-terminal
diff -Nru cdebconf-terminal-0.8/gtk-plugin-terminal.c cdebconf-terminal-0.8ubuntu1dooz1/gtk-plugin-terminal.c
--- cdebconf-terminal-0.8/gtk-plugin-terminal.c	2009-07-21 07:57:01.000000000 +0200
+++ cdebconf-terminal-0.8ubuntu1dooz1/gtk-plugin-terminal.c	2010-09-28 04:58:16.000000000 +0200
@@ -14,6 +14,11 @@
 #include <vte/vte.h>
 #include <string.h>
 
+#if VTE_CHECK_VERSION(0,26,0)
+/* whether vte has vte_terminal_fork_command_full() */
+#define VTE_HAS_NEW_FORK
+#endif
+
 extern char ** environ;
 
 #define DEFAULT_COMMAND_LINE "/bin/sh"
@@ -27,16 +32,20 @@
     struct frontend * fe;
     GtkWidget * goback_button;
     VteTerminal * terminal;
+#ifdef VTE_HAS_NEW_FORK
     char * command;
+#endif
     char ** argv;
     char ** environ;
 };
 
 static void destroy_terminal(struct terminal * terminal_data)
 {
+#ifdef VTE_HAS_NEW_FORK
     if (NULL != terminal_data->command) {
         g_free(terminal_data->command);
     }
+#endif
     if (NULL != terminal_data->argv) {
         g_strfreev(terminal_data->argv);
     }
@@ -94,11 +103,13 @@
         g_critical("g_strsplit_set failed.");
         return FALSE;
     }
+#ifdef VTE_HAS_NEW_FORK
     terminal_data->command = g_strdup(terminal_data->argv[0]);
     if (NULL == terminal_data->command) {
-        g_critical("g_strplit_set failed.");
+        g_critical("g_strdup failed.");
         return FALSE;
     }
+#endif
     return TRUE;
 }
 
@@ -340,10 +351,22 @@
 {
     pid_t pid;
 
+#if VTE_CHECK_VERSION(0,26,0)
+    vte_terminal_fork_command_full(
+        terminal_data->terminal,
+        VTE_PTY_NO_LASTLOG | VTE_PTY_NO_UTMP | VTE_PTY_NO_WTMP,
+        "/",
+        terminal_data->argv, terminal_data->environ,
+        0, /* no special spawn_flags */
+        NULL, NULL, /* no child_setup function nor child_setup_data */
+        &pid,
+        NULL /* extended error */);
+#else
     pid = vte_terminal_fork_command(
         terminal_data->terminal, terminal_data->command,
         terminal_data->argv, terminal_data->environ, "/",
         FALSE /* no lastlog */, FALSE /* no utmp */, FALSE /* no wtmp */);
+#endif
     if (0 == pid) {
         g_critical("vte_terminal_fork_command failed.");
         return FALSE;
diff -Nru cdebconf-terminal-0.8/Makefile.in cdebconf-terminal-0.8ubuntu1dooz1/Makefile.in
--- cdebconf-terminal-0.8/Makefile.in	2009-07-21 07:57:01.000000000 +0200
+++ cdebconf-terminal-0.8ubuntu1dooz1/Makefile.in	2010-09-28 02:26:37.000000000 +0200
@@ -14,6 +14,7 @@
 LDFLAGS=@LDFLAGS@
 GTK_CFLAGS=@GTK_CFLAGS@
 GTK_LIBS=@GTK_LIBS@
+VTE_CFLAGS=@VTE_CFLAGS@
 
 CFLAGS += -funsigned-char -fstrict-aliasing -Wall -W -Werror -Wundef \
 	-Wwrite-strings -Wsign-compare -Wno-unused-parameter -Winit-self \
@@ -47,7 +48,7 @@
 
 gtk-%.opic: gtk-%.c
 	@echo "Compiling $< to $@"
-	$(CC) $(CFLAGS) $(GTK_CFLAGS) -fPIC -o $@ -c $<
+	$(CC) $(CFLAGS) $(GTK_CFLAGS) $(VTE_CFLAGS) -fPIC -o $@ -c $<
 
 %.opic: %.c
 	@echo "Compiling $< to $@"

--- End Message ---
--- Begin Message --- 
Source: cdebconf-terminal
Source-Version: 0.9

We believe that the bug you reported is fixed in the latest version of
cdebconf-terminal, which is due to be installed in the Debian FTP archive:

cdebconf-gtk-terminal_0.9_i386.udeb
  to main/c/cdebconf-terminal/cdebconf-gtk-terminal_0.9_i386.udeb
cdebconf-newt-terminal_0.9_i386.udeb
  to main/c/cdebconf-terminal/cdebconf-newt-terminal_0.9_i386.udeb
cdebconf-terminal_0.9.dsc
  to main/c/cdebconf-terminal/cdebconf-terminal_0.9.dsc
cdebconf-terminal_0.9.tar.gz
  to main/c/cdebconf-terminal/cdebconf-terminal_0.9.tar.gz



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 598281@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Colin Watson <cjwatson@debian.org> (supplier of updated cdebconf-terminal package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 01 Oct 2010 12:40:08 +0100
Source: cdebconf-terminal
Binary: cdebconf-gtk-terminal cdebconf-newt-terminal
Architecture: source i386
Version: 0.9
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Colin Watson <cjwatson@debian.org>
Description: 
 cdebconf-gtk-terminal - cdebconf gtk plugin displaying a terminal (udeb)
 cdebconf-newt-terminal - cdebconf newt plugin to provide a clean terminal (udeb)
Closes: 598281
Changes: 
 cdebconf-terminal (0.9) unstable; urgency=low
 .
   * Support building with vte 0.26, based on patches from Loïc Minier
     (closes: #598281) and Marcin Juszkiewicz (LP: #649810).
 .
   [ Updated translations ]
   * Asturian (ast.po) by maacub
   * Bulgarian (bg.po) by Damyan Ivanov
   * Bosnian (bs.po) by Armin Beširović
   * Danish (da.po) by Jacob Sparre Andersen
   * Persian (fa.po) by Ebrahim Byagowi
   * Kazakh (kk.po) by Baurzhan Muftakhidinov
   * Telugu (te.po) by Arjuna Rao Chavala
Checksums-Sha1: 
 3631530ec78e9220a7fca874d6105f3abc60e340 1805 cdebconf-terminal_0.9.dsc
 319b90f31c5bf2fdcf9b7fa8399f0084a52411e1 91575 cdebconf-terminal_0.9.tar.gz
 a71478fc717eb6719f4f12470e41cfd9b69ed939 14408 cdebconf-gtk-terminal_0.9_i386.udeb
 66bfac55899a38c19901eccea885060d05f1d5fa 4954 cdebconf-newt-terminal_0.9_i386.udeb
Checksums-Sha256: 
 d43d66da44bb444d6fa8f82bf19d8accc8117c2a7eeffbf42d7231f429a3457e 1805 cdebconf-terminal_0.9.dsc
 41fed97de9cf5afe7f2b5e38ba576360bf43c16e630f6839c8c64d7817fd0c21 91575 cdebconf-terminal_0.9.tar.gz
 6b7a68b982c2a163e0630bc53d62743b73a08f103ef1f8f835eca4bfe7230553 14408 cdebconf-gtk-terminal_0.9_i386.udeb
 eafaed489d6c882c632bac41ffdb252686b904e64bcaeb62a1204cc34ea6ab23 4954 cdebconf-newt-terminal_0.9_i386.udeb
Files: 
 f47a8b93ee3a08a091d3aa022b1b6ec9 1805 debian-installer extra cdebconf-terminal_0.9.dsc
 664299ebcd6f099c67847848daf843b6 91575 debian-installer extra cdebconf-terminal_0.9.tar.gz
 1012890e78e0dba98931fa7fce8ea090 14408 debian-installer extra cdebconf-gtk-terminal_0.9_i386.udeb
 6fc3bfa439ced1870318b2e3495c8cac 4954 debian-installer extra cdebconf-newt-terminal_0.9_i386.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Colin Watson <cjwatson@debian.org> -- Debian developer

iQIVAwUBTKXI8Tk1h9l9hlALAQhBfg//cxJzpFWbPeH+uCq+mKJ3BfI0Tdz2B43A
laueN9Qp5bBq0nAAVLCjljHA2RG/IbJkf+w5twu7qdMvcwcOE1UPjWXJR48Q005d
4ho1v6eKmB8k0zB7aaOQ/2G65MKpGaJiLkOTdMXyPsIdL6q0665EjWYTp/zfOaeS
dQe5jQzsUBZkKU/vuAvsP9MTlOqk0+KA7NsLBB+vdCMlewDoJ3qU5JpBZ8oNMBd6
AHThZVezBsT1cV5Xq/AAftDnnALtRKRVFNzIZUg2AjgS5CT7gGZSpIuf2kobBsAl
4rhMH/d9obX2vv6tNCsOg7/h66xftYjXJh0dTue9umf4KY9KaQJKrabMP9FgbZEo
DGYnlRTY3Xx/iKgLPuCvR0Fqtx68y19mbVeATB63xcZY48xeaWlQSClOurPuku2d
4pSTkH5aotDm1J/YcPsGqVOZ/v0yRrZiJ0itRPCZaDQQFM6GuHWcdt4poxaVL/dV
m1gkY/mPIcq3Pu//F9RxkVEsFhEm+WE+UIcQpaySjfcnk/ahtEhSuG0ZaXY2aHbJ
MArFHfyk7+M2KrymFXoG83Lu8RNjH9R+u4YEiYLbs9ZSeyNL18uGT05VZ8Moe6x9
9J4gGIVVejgM4G8ESWWu6KqV6GhhJKzMogbFgF5cP3+AJ3iwCdZ18xQKW2Uclj3s
akTr+ZWEA2s=
=50Ff
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: