tags 621997 + patch tags 621997 + pending thanks Dear maintainer,
I've prepared an NMU for tiemu (versioned as 3.02-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Tom Waits: Come On Up To The House
diff -u tiemu-3.02/debian/changelog tiemu-3.02/debian/changelog --- tiemu-3.02/debian/changelog +++ tiemu-3.02/debian/changelog @@ -1,3 +1,18 @@ +tiemu (3.02-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: gui/calc/calc.c:589:4: error: 'GtkFunction' undeclared + (first use in this function)": use updated patch + 01_gtk_disable_deprecated.dpatch from Ubuntu / Andreas Moog + (Closes: #621997, LP: #756074) + * The package still FTBFS, so let's apply the remaining Ubuntu patches: + - 05_remove_vlc_cable.dpatch (Scott Kitterman): + Fix FTBFS with newer libs - Cherry pick from upstream svn + - 06_drop_GtkNotebookPage.dpatch (Scott Kitterman): + Replace deprecated function with gpointer to FTBFS. + + -- gregor herrmann <gre...@debian.org> Thu, 20 Oct 2011 19:13:28 +0200 + tiemu (3.02-1.1) unstable; urgency=medium * Non-maintainer upload. diff -u tiemu-3.02/debian/patches/00list tiemu-3.02/debian/patches/00list --- tiemu-3.02/debian/patches/00list +++ tiemu-3.02/debian/patches/00list @@ -4,0 +5,2 @@ +05_remove_vlc_cable +06_drop_GtkNotebookPage diff -u tiemu-3.02/debian/patches/01_gtk_disable_deprecated.dpatch tiemu-3.02/debian/patches/01_gtk_disable_deprecated.dpatch --- tiemu-3.02/debian/patches/01_gtk_disable_deprecated.dpatch +++ tiemu-3.02/debian/patches/01_gtk_disable_deprecated.dpatch @@ -1,4 +1,7 @@ #! /bin/sh /usr/share/dpatch/dpatch-run +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL ## 01_gtk_disable_deprecated.dpatch by Ralf Treinen <trei...@debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. @@ -6,12 +9,33 @@ ## DP: patch taken from Ubuntu. @DPATCH@ -diff -urNad tiemu-2.00~/src/gui/calc/popup.c tiemu-2.00/src/gui/calc/popup.c ---- tiemu-2.00~/src/gui/calc/popup.c 2005-08-22 22:51:30.000000000 +0200 -+++ tiemu-2.00/src/gui/calc/popup.c 2008-01-16 21:24:22.000000000 +0100 -@@ -26,7 +26,9 @@ - # include <config.h> - #endif +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu~/src/gui/calc/calc.c tiemu/src/gui/calc/calc.c +--- tiemu~/src/gui/calc/calc.c 2011-04-21 19:30:02.000000000 +0200 ++++ tiemu/src/gui/calc/calc.c 2011-04-21 19:47:19.998760979 +0200 +@@ -586,7 +586,7 @@ + + // Install LCD refresh: 100 FPS (10 ms) + tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate, +- (GtkFunction)hid_refresh, NULL); ++ (GSourceFunc)hid_refresh, NULL); + + explicit_destroy = 0; + gtk_widget_show(main_wnd); // show wnd here +@@ -640,7 +640,7 @@ + g_source_remove(tid); + + tid = g_timeout_add((params.lcd_rate == -1) ? 50 : params.lcd_rate, +- (GtkFunction)hid_refresh, NULL); ++ (GSourceFunc)hid_refresh, NULL); + } + + int hid_switch_with_skin(void) +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu~/src/gui/calc/popup.c tiemu/src/gui/calc/popup.c +--- tiemu~/src/gui/calc/popup.c 2011-04-21 19:26:31.000000000 +0200 ++++ tiemu/src/gui/calc/popup.c 2011-04-21 19:47:19.998760979 +0200 +@@ -31,7 +31,9 @@ + This means GtkTooltipsData is now deprecated. */ + #undef GTK_DISABLE_DEPRECATED +#undef GTK_DISABLE_DEPRECATED #include <gtk/gtk.h> @@ -19,9 +43,23 @@ #include <glade/glade.h> #include <stdlib.h> #include <string.h> -diff -urNad tiemu-3.03~/src/gui/filesel.c tiemu-3.03/src/gui/filesel.c ---- tiemu-3.03~/src/gui/filesel.c 2009-08-09 22:14:09.000000000 +0200 -+++ tiemu-3.03/src/gui/filesel.c 2009-08-09 22:18:04.660542068 +0200 +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu~/src/gui/debugger/dbg_romcall.c tiemu/src/gui/debugger/dbg_romcall.c +--- tiemu~/src/gui/debugger/dbg_romcall.c 2011-04-21 19:26:31.000000000 +0200 ++++ tiemu/src/gui/debugger/dbg_romcall.c 2011-04-21 19:48:04.506429940 +0200 +@@ -29,7 +29,9 @@ + # include <config.h> + #endif + +-#include <gtk/gtk.h> ++#undef GTK_DISABLE_DEPRECATED ++ #include <gtk/gtk.h> ++#define GTK_DISABLE_DEPRECATED + #include <glade/glade.h> + #include <string.h> + +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu~/src/gui/filesel.c tiemu/src/gui/filesel.c +--- tiemu~/src/gui/filesel.c 2011-04-21 19:26:31.000000000 +0200 ++++ tiemu/src/gui/filesel.c 2011-04-21 19:47:19.998760979 +0200 @@ -41,7 +41,9 @@ #include <stdio.h> only in patch2: unchanged: --- tiemu-3.02.orig/debian/patches/05_remove_vlc_cable.dpatch +++ tiemu-3.02/debian/patches/05_remove_vlc_cable.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_remove_vlc_cable.dpatch by <sc...@kitterman.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix FTBFS with newer libs - Cherry pick from upstream svn +## DP: http://svn.tilp.info/cgi-bin/viewvc.cgi/tiemu/trunk/src/gui/device.c?root=tiemu&view=log#rev2820 + +@DPATCH@ +diff -urNad tiemu-3.02~/src/gui/device.c tiemu-3.02/src/gui/device.c +--- tiemu-3.02~/src/gui/device.c 2007-12-30 18:14:15.000000000 -0500 ++++ tiemu-3.02/src/gui/device.c 2010-04-26 01:34:36.657234841 -0400 +@@ -102,10 +102,6 @@ + gtk_option_menu_set_history(GTK_OPTION_MENU(data), 7); + break; + +- case CABLE_VTL: +- gtk_option_menu_set_history(GTK_OPTION_MENU(data), 8); +- break; +- + case CABLE_ILP: + gtk_option_menu_set_history(GTK_OPTION_MENU(data), 9); + break; +@@ -194,8 +190,7 @@ + case 5: tmp.cable_model = CABLE_USB; break; + case 6: tmp.cable_model = CABLE_VTI; break; + case 7: tmp.cable_model = CABLE_TIE; break; +- case 8: tmp.cable_model = CABLE_VTL; break; +- case 9: tmp.cable_model = CABLE_ILP; break; ++ case 8: tmp.cable_model = CABLE_ILP; break; + } + } + only in patch2: unchanged: --- tiemu-3.02.orig/debian/patches/06_drop_GtkNotebookPage.dpatch +++ tiemu-3.02/debian/patches/06_drop_GtkNotebookPage.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_drop_GtkNotebookPage.dpatch by <sc...@kitterman.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace deprecated function with gpointer to fix FTBFS. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' tiemu-3.02~/src/gui/debugger/dbg_mem.c tiemu-3.02/src/gui/debugger/dbg_mem.c +--- tiemu-3.02~/src/gui/debugger/dbg_mem.c 2010-10-17 14:32:16.000000000 -0400 ++++ tiemu-3.02/src/gui/debugger/dbg_mem.c 2010-10-17 14:33:27.000000000 -0400 +@@ -593,7 +593,7 @@ + + GLADE_CB void + on_notebook1_switch_page (GtkNotebook *notebook, +- GtkNotebookPage *page, ++ gpointer *page, + guint page_num, + gpointer user_data) + {
signature.asc
Description: Digital signature
