Hello!

It seems that upstream has tagged 2.4.21 in SVN which should contain
the necessary changes to build with vte2.91 by just switching
configure flags --with-gnomeui to --with-gnomeui3.

Given that I was unable to find a tarball for 2.4.21 I opted for
picking up the patch that looked mostly relevant and apply it
on the current debian package and ended up with the attached
result (which has only been compile-tested).

HTH

Regards,
Andreas Henriksson
diff -Nru vice-2.4.dfsg+2.4.20/debian/changelog vice-2.4.dfsg+2.4.20/debian/changelog
--- vice-2.4.dfsg+2.4.20/debian/changelog	2015-05-16 18:03:03.000000000 +0200
+++ vice-2.4.dfsg+2.4.20/debian/changelog	2015-10-30 12:56:19.000000000 +0100
@@ -1,3 +1,15 @@
+vice (2.4.dfsg+2.4.20-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Add debian/patches/svn-r29773-vte-2.91.patch from upstream vcs
+  * Add debian/patches/configure.ac-vte-2.91.patch
+    - equivalent to above patch but configure.ac instead of configure.proto
+  * debian/rules: switch --enable-gnomeui to --enable-gnomeui3
+    - mainly to make configure pick up vte-2.91 (instead of old vte)
+  * Switch libvte-dev build-dependency to libvte-2.91-dev (Closes: #803460)
+
+ -- Andreas Henriksson <andr...@fatal.se>  Fri, 30 Oct 2015 12:32:22 +0100
+
 vice (2.4.dfsg+2.4.20-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru vice-2.4.dfsg+2.4.20/debian/control vice-2.4.dfsg+2.4.20/debian/control
--- vice-2.4.dfsg+2.4.20/debian/control	2014-10-18 16:52:00.000000000 +0200
+++ vice-2.4.dfsg+2.4.20/debian/control	2015-10-30 12:32:53.000000000 +0100
@@ -1,5 +1,5 @@
 Source: vice
-Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autoconf, autotools-dev, bison++ | bison, flex, libreadline-dev, libjpeg-dev, libpng-dev, libgtk2.0-dev, libasound2-dev [linux-any], libpulse-dev, libtwolame-dev, libavformat-dev (>= 6:10), libieee1284-3-dev [!hurd-i386], libgtkglext1-dev, libvte-dev, libswscale-dev, xfonts-utils
+Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), autoconf, autotools-dev, bison++ | bison, flex, libreadline-dev, libjpeg-dev, libpng-dev, libgtk2.0-dev, libasound2-dev [linux-any], libpulse-dev, libtwolame-dev, libavformat-dev (>= 6:10), libieee1284-3-dev [!hurd-i386], libgtkglext1-dev, libvte-2.91-dev, libswscale-dev, xfonts-utils
 Section: contrib/otherosfs
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
diff -Nru vice-2.4.dfsg+2.4.20/debian/patches/configure.ac-vte-2.91.patch vice-2.4.dfsg+2.4.20/debian/patches/configure.ac-vte-2.91.patch
--- vice-2.4.dfsg+2.4.20/debian/patches/configure.ac-vte-2.91.patch	1970-01-01 01:00:00.000000000 +0100
+++ vice-2.4.dfsg+2.4.20/debian/patches/configure.ac-vte-2.91.patch	2015-10-30 12:48:23.000000000 +0100
@@ -0,0 +1,12 @@
+--- vice/configure.ac (a)
++++ vice/configure.ac (b)
+@@ -2953,7 +2953,8 @@
+       PKG_CHECK_MODULES(GTK, [gtk+-3.0])
+       AC_DEFINE(HAVE_CAIRO,,[Enable Cairo rendering support])
+       if test x"$enable_vte" != "xno"; then
+-        PKG_CHECK_MODULES(VTE, [vte-2.90], have_vte=yes, AC_MSG_RESULT(no))
++        PKG_CHECK_MODULES(VTE, [vte-2.91], have_vte=yes,
++           PKG_CHECK_MODULES(VTE, [vte-2.90], have_vte=yes, AC_MSG_RESULT(no)))
+       fi
+     else
+       PKG_CHECK_MODULES(GTK, [gtk+-2.0])
diff -Nru vice-2.4.dfsg+2.4.20/debian/patches/series vice-2.4.dfsg+2.4.20/debian/patches/series
--- vice-2.4.dfsg+2.4.20/debian/patches/series	2015-05-16 18:22:51.000000000 +0200
+++ vice-2.4.dfsg+2.4.20/debian/patches/series	2015-10-30 12:58:01.000000000 +0100
@@ -2,3 +2,5 @@
 kfreebsd_no_machine_cpufunc.h.patch
 revert_upstream_lib64.patch
 try-to-fix-possible-race-condition.patch
+svn-r29773-vte-2.91.patch
+configure.ac-vte-2.91.patch
diff -Nru vice-2.4.dfsg+2.4.20/debian/patches/svn-r29773-vte-2.91.patch vice-2.4.dfsg+2.4.20/debian/patches/svn-r29773-vte-2.91.patch
--- vice-2.4.dfsg+2.4.20/debian/patches/svn-r29773-vte-2.91.patch	1970-01-01 01:00:00.000000000 +0100
+++ vice-2.4.dfsg+2.4.20/debian/patches/svn-r29773-vte-2.91.patch	2015-10-30 12:32:10.000000000 +0100
@@ -0,0 +1,32 @@
+Index: vice/src/arch/unix/x11/gnome/uimon.c
+===================================================================
+--- vice/src/arch/unix/x11/gnome/uimon.c	(revision 29772)
++++ vice/src/arch/unix/x11/gnome/uimon.c	(revision 29773)
+@@ -357,7 +357,13 @@
+             gtk_window_resize_to_geometry (GTK_WINDOW (fixed.window), width, height);
+         }
+ #endif
++#if GTK_CHECK_VERSION (3, 0, 0)
++        scrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL,
++            gtk_scrollable_get_vadjustment (GTK_SCROLLABLE(fixed.term)));
++#else
+         scrollbar = gtk_vscrollbar_new(vte_terminal_get_adjustment (VTE_TERMINAL(fixed.term)));
++#endif
++
+         horizontal_container = gtk_hbox_new(FALSE, 0);
+         gtk_container_add(GTK_CONTAINER(fixed.window), horizontal_container);
+         gtk_container_add(GTK_CONTAINER(horizontal_container), fixed.term);
+Index: vice/configure.proto
+===================================================================
+--- vice/configure.proto	(revision 29772)
++++ vice/configure.proto	(revision 29773)
+@@ -2953,7 +2953,8 @@
+       PKG_CHECK_MODULES(GTK, [gtk+-3.0])
+       AC_DEFINE(HAVE_CAIRO,,[Enable Cairo rendering support])
+       if test x"$enable_vte" != "xno"; then
+-        PKG_CHECK_MODULES(VTE, [vte-2.90], have_vte=yes, AC_MSG_RESULT(no))
++        PKG_CHECK_MODULES(VTE, [vte-2.91], have_vte=yes,
++           PKG_CHECK_MODULES(VTE, [vte-2.90], have_vte=yes, AC_MSG_RESULT(no)))
+       fi
+     else
+       PKG_CHECK_MODULES(GTK, [gtk+-2.0])
diff -Nru vice-2.4.dfsg+2.4.20/debian/rules vice-2.4.dfsg+2.4.20/debian/rules
--- vice-2.4.dfsg+2.4.20/debian/rules	2015-01-25 21:13:47.000000000 +0100
+++ vice-2.4.dfsg+2.4.20/debian/rules	2015-10-30 12:55:47.000000000 +0100
@@ -41,7 +41,7 @@
 	dh_autotools-dev_updateconfig
 	./configure \
 	    --prefix=/usr --infodir=/usr/share/info --mandir=/usr/share/man \
-	    --enable-gnomeui --enable-ethernet \
+	    --enable-gnomeui3 --enable-ethernet \
 	    --enable-fullscreen --enable-parsid --with-midas --without-xaw3d \
 	    --enable-arch=no
 	touch $@

Reply via email to