Hello!

I'm attaching a debdiff for the gobby-infinote NMU I made for the
gtksourceview3 transition[1].

An additional patch was needed on top of the upstream commit that was
supposed to fix the problem.

Please see attached patch.

[1]: http://release.debian.org/transitions/html/gtksourceview3.html

-- 
Andreas Henriksson
diff -Nru gobby-infinote-0.4.94/debian/changelog 
gobby-infinote-0.4.94/debian/changelog
--- gobby-infinote-0.4.94/debian/changelog      2012-06-21 11:19:45.000000000 
+0200
+++ gobby-infinote-0.4.94/debian/changelog      2013-08-12 14:15:51.000000000 
+0200
@@ -1,3 +1,14 @@
+gobby-infinote (0.4.94-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload with maintainer consent.
+  * Add debian/patches/0001-Fix-compilation-with-recent-versions-of-gcc.patch
+    - patch from upstream git.
+  * Add debian/patches/textsessionview-gtksourcebuffer-fix.patch
+    - additional patch which, together with previous patch, fixes
+      compilation with GtkSourceView 3.8 (Closes: #718524)
+
+ -- Andreas Henriksson <[email protected]>  Sun, 11 Aug 2013 23:58:39 +0200
+
 gobby-infinote (0.4.94-5) unstable; urgency=low
 
   * Add gobby-0.5 as a (better) alternative for the gobby binary name.
diff -Nru 
gobby-infinote-0.4.94/debian/patches/0001-Fix-compilation-with-recent-versions-of-gcc.patch
 
gobby-infinote-0.4.94/debian/patches/0001-Fix-compilation-with-recent-versions-of-gcc.patch
--- 
gobby-infinote-0.4.94/debian/patches/0001-Fix-compilation-with-recent-versions-of-gcc.patch
 1970-01-01 01:00:00.000000000 +0100
+++ 
gobby-infinote-0.4.94/debian/patches/0001-Fix-compilation-with-recent-versions-of-gcc.patch
 2013-08-11 23:53:03.000000000 +0200
@@ -0,0 +1,53 @@
+From 7419121794423039a720cbfd816f9bfc16c8955e Mon Sep 17 00:00:00 2001
+From: Armin Burgmeier <[email protected]>
+Date: Tue, 16 Jul 2013 19:34:07 +0200
+Subject: [PATCH] Fix compilation with recent versions of gcc
+
+Patch by till, http://gobby.0x539.de/trac/ticket/604
+---
+ code/core/header.cpp                      | 1 +
+ code/core/textsessionview.cpp             | 3 +++
+ code/operations/operation-export-html.cpp | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/code/core/header.cpp b/code/core/header.cpp
+index 8f7f9f4..b3ee29d 100644
+--- a/code/core/header.cpp
++++ b/code/core/header.cpp
+@@ -24,6 +24,7 @@
+ 
+ #include <glibmm/markup.h>
+ #include <gtkmm/stock.h>
++#include <gtksourceview/gtksourcelanguage.h>
+ 
+ #ifdef PLATFORM_OSX_NATIVE
+ #include <ige-mac-menu.h>
+diff --git a/code/core/textsessionview.cpp b/code/core/textsessionview.cpp
+index dd25ee7..9db622b 100644
+--- a/code/core/textsessionview.cpp
++++ b/code/core/textsessionview.cpp
+@@ -27,6 +27,9 @@
+ #include <gtkmm/scrolledwindow.h>
+ #include <gtkmm/textiter.h>
+ 
++#include <gtksourceview/gtksourcelanguage.h>
++#include <gtksourceview/gtksourcelanguagemanager.h>
++
+ #include <libinftextgtk/inf-text-gtk-buffer.h>
+ 
+ // TODO: Put all the preferences handling into an extra class
+diff --git a/code/operations/operation-export-html.cpp 
b/code/operations/operation-export-html.cpp
+index 80608e2..76da2b9 100644
+--- a/code/operations/operation-export-html.cpp
++++ b/code/operations/operation-export-html.cpp
+@@ -26,6 +26,7 @@
+ #include "util/i18n.hpp"
+ 
+ #include <gtkmm/textbuffer.h>
++#include <gtksourceview/gtksourcebuffer.h>
+ 
+ #include <libinftextgtk/inf-text-gtk-buffer.h>
+ 
+-- 
+1.8.4.rc2
+
diff -Nru gobby-infinote-0.4.94/debian/patches/series 
gobby-infinote-0.4.94/debian/patches/series
--- gobby-infinote-0.4.94/debian/patches/series 2012-04-30 08:57:13.000000000 
+0200
+++ gobby-infinote-0.4.94/debian/patches/series 2013-08-12 14:08:51.000000000 
+0200
@@ -2,3 +2,5 @@
 0001-configure.ac-Support-the-new-libinfinity-library-nam.patch
 0001-Fix-build-against-recent-gtkmm3-versions.patch
 0002-code-util-gtk-compat.hpp-fix-render_icon-with-missin.patch
+0001-Fix-compilation-with-recent-versions-of-gcc.patch
+textsessionview-gtksourcebuffer-fix.patch
diff -Nru 
gobby-infinote-0.4.94/debian/patches/textsessionview-gtksourcebuffer-fix.patch 
gobby-infinote-0.4.94/debian/patches/textsessionview-gtksourcebuffer-fix.patch
--- 
gobby-infinote-0.4.94/debian/patches/textsessionview-gtksourcebuffer-fix.patch  
    1970-01-01 01:00:00.000000000 +0100
+++ 
gobby-infinote-0.4.94/debian/patches/textsessionview-gtksourcebuffer-fix.patch  
    2013-08-12 14:09:35.000000000 +0200
@@ -0,0 +1,16 @@
+From: Andreas Henriksson <[email protected]>
+Subject: textsessionview.cpp also needs gtksourcebuffer.h
+
+Bug-Debian: http://bugs.debian.org/718524
+
+--- gobby-infinote-0.4.94.orig/code/core/textsessionview.cpp
++++ gobby-infinote-0.4.94/code/core/textsessionview.cpp
+@@ -28,6 +28,8 @@
+ 
+ #include <gtksourceview/gtksourcelanguage.h>
+ #include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksourcebuffer.h>
++
+ 
+ #include <libinftextgtk/inf-text-gtk-buffer.h>
+ 

Attachment: signature.asc
Description: Digital signature

Reply via email to