Package: aghermann Version: 1.0.4-1 Followup-For: Bug #788025 Please apply the attached patch to port aghermann to libvte-2.91.
Regards, Rodolphe -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages aghermann depends on: ii libatk1.0-0 2.16.0-2 ii libc6 2.19-18 ii libcairo-gobject2 1.14.2-2 ii libcairo2 1.14.2-2 ii libconfig++9 1.4.9-2 ii libfftw3-double3 3.3.4-2 ii libgcc1 1:5.1.1-9 ii libgdk-pixbuf2.0-0 2.31.4-2 ii libglib2.0-0 2.44.1-1 ii libgnutls-deb0-28 3.3.15-5 ii libgomp1 5.1.1-9 ii libgsl0ldbl 1.16+dfsg-2 ii libgtk-3-0 3.16.3-2 ii libitpp8 4.3.1-3 ii liblua5.2-0 5.2.3-1.1 ii libpango-1.0-0 1.36.8-3 ii libpangocairo-1.0-0 1.36.8-3 ii libsamplerate0 0.1.8-8 ii libstdc++6 5.1.1-9 ii libunique-3.0-0 3.0.2-2 ii libvte-2.91-0 0.40.2-1 ii zlib1g 1:1.2.8.dfsg-2+b1 aghermann recommends no packages. Versions of packages aghermann suggests: pn edfbrowser <none> -- no debconf information
>From 0b8df589e82f5a41c1551521918776b0c72471f2 Mon Sep 17 00:00:00 2001 From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> Date: Wed, 10 Jun 2015 23:15:45 +0200 Subject: [PATCH] Build against vte-2.91 Closes: #788025 --- debian/control | 2 +- debian/patches/0001-Port-to-vte-2.91-API.patch | 57 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0001-Port-to-vte-2.91-API.patch create mode 100644 debian/patches/series diff --git a/debian/control b/debian/control index c672333..a783e21 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Andrei Zavada <johnhom...@gmail.com> Build-Depends: debhelper (>= 9), dh-autoreconf, autoconf-archive, pkg-config, libgomp1, libconfig++-dev, libgsl0-dev, libfftw3-dev, - libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.90-dev, + libsamplerate0-dev (>= 0.1.7), libgtk-3-dev, libitpp-dev, libunique-3.0-dev, libvte-2.91-dev, liblua5.2-dev, lua5.2, libxml2-utils Standards-Version: 3.9.6 Homepage: http://johnhommer.com/academic/code/aghermann diff --git a/debian/patches/0001-Port-to-vte-2.91-API.patch b/debian/patches/0001-Port-to-vte-2.91-API.patch new file mode 100644 index 0000000..86b1319 --- /dev/null +++ b/debian/patches/0001-Port-to-vte-2.91-API.patch @@ -0,0 +1,57 @@ +From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net> +Date: Wed, 10 Jun 2015 22:59:28 +0200 +Subject: Port to vte-2.91 API + +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788025 +--- + configure.ac | 2 +- + src/aghermann/ui/mw/splash.cc | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index af545dc..0c8c068 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,7 +65,7 @@ PKG_CHECK_MODULES([ITPP], [itpp]) + PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.4 glib-2.0 gthread-2.0 gio-unix-2.0 gmodule-export-2.0]) + PKG_CHECK_MODULES([CAIRO], [cairo >= 1.8.10]) + PKG_CHECK_MODULES([UNIQUE], [unique-3.0]) +-PKG_CHECK_MODULES([VTE], [vte-2.90]) ++PKG_CHECK_MODULES([VTE], [vte-2.91]) + + AC_CHECK_LIB( + fftw3_omp, fftw_init_threads, +diff --git a/src/aghermann/ui/mw/splash.cc b/src/aghermann/ui/mw/splash.cc +index c7950d5..641b260 100644 +--- a/src/aghermann/ui/mw/splash.cc ++++ b/src/aghermann/ui/mw/splash.cc +@@ -36,11 +36,11 @@ bDownload_clicked_cb( + void + download_process_child_exited_cb( + VteTerminal *terminal, ++ int exit_status, + const gpointer userdata) + { + auto& ED = *(SExpDesignUI*)userdata; + ED.set_wMainWindow_interactive( true, true); +- int exit_status = vte_terminal_get_child_exit_status( terminal); + if ( exit_status != 0 ) + pop_ok_message( + ED.wMainWindow, +@@ -144,7 +144,7 @@ try_download() + "source " PACKAGE_DATADIR "/aghermann/experiment-dl.sh", + NULL + }; +- vte_terminal_fork_command_full( ++ vte_terminal_spawn_sync( + tTerm, + VTE_PTY_DEFAULT, + ED->session_dir(), +@@ -154,6 +154,7 @@ try_download() + NULL, // GSpawnChildSetupFunc child_setup, + NULL, // gpointer child_setup_data, + &dl_pid, ++ NULL, + &Error); // GError **error); + if ( Error ) { + pop_ok_message( diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..874e8e0 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Port-to-vte-2.91-API.patch -- 2.1.4
