Changeset - 52b90a50dd38
[Not reviewed]
2 2 3
Chel Sea (chain) - 11 years ago 2014-06-07 01:10:38
chain@rpgfiction.net
fix compile of gobby-0.4.94 on recent systems
6 files changed with 93 insertions and 34 deletions:
0 comments (0 inline, 0 general)
app-editors/gobby/Manifest
Show inline comments
 
AUX gobby-0.4.94-gtkmm3.patch 6815 SHA256 52cd2897eb8835879653d4d5430e50aaa05360d3c59b4649d2ea77ae7dd9f133 SHA512 991afce432a5ff273ff99dbf4d002895f7948e9b4c25b30406ec33aa5f2e05c51eca0082bfd0ca117c280499af1d02f1b8d030e2399a334417b545c9c07345a0 WHIRLPOOL 8db03d50d3707d297877c537604d52b55c3f9ffe65caf879986baa78997f60aa3bf96cffc774b784dc61dc368b4ac2d1e3d6ed39c689b0309d03f430c7d7ae9e
 
AUX gobby-0.4.94-includes.patch 1454 SHA256 22df2724e823bd2cb96a8400f1826aff52a0d4ea234e097a0579d28e32bcefe3 SHA512 279d4841fab5b71fdf7ab46d7e4070111fae6560fd5934149b33206ccca25b7844383617b40bd75e28465e93ead9c734ab78a93a8a07bd259c1c5dcd79afa516 WHIRLPOOL 4ba69bc98d5c82faa5d661b40b14de13509495084e01f32d7007b3ff3d564eef1d89138285808d4c5c1d45da57af64367b4f146b5ce0164954eb613acdcccd85
 
AUX gobby-0.4.94-gtksourceview38.patch 795 SHA256 5df85c22afa047ed1137c588d73061ebf646367cd80109d28cd2dad1cd25f88a SHA512 928c6e655e6d81fd6e94a45d652324f99ffc8d3b3072cbea90d216db71b097c20824809e2907e9a905dfea5a221409c68ccd6911313f177ea7482c8f9222e709 WHIRLPOOL c35871d587e8bfae2467641ead5c5f67a447f1fd50244bf283ba131cde6429c4a0d8cc45d55c45b9bd9799578ea390af389eb4300bcbd520eb67c94b09177dad
 
AUX gobby-0.4.94-includes-preferences.patch 766 SHA256 516180a13715b72dbb0ce0f457e5b13a8c1c9105f292f263aa14661335e92cc6 SHA512 38e53393401e3b74ead18d228473fe2e67cd820190a78fd5483168ae9124cc54a0d09f187cebb3c74a03ada9d2841b6215d8b4fd4be84d0e2530bd51f02c8013 WHIRLPOOL 447a8a01dcaab6259841e8933a535359ac9513bf37a19cf5983a2daf150afc5a401af7baf69c861266f5790f4775bb6e551a3876506dc3d6ff23a876c0431736
 
AUX gobby-0.4.94-includes.patch 1654 SHA256 1f8aef22b10420c8157c6d1174f951c2c92be1ee671cccbb8b8bc336838a8fa7 SHA512 6af1245344b6e526569e67716f0091a97b8a9312b99fb321a84e5d3f95ff986e6ca0a2b34001992cd81656b03fbd74df9578524a6c45b8ea35ef0640e2db684c WHIRLPOOL 9120e52cef57a42717446c0a9df59c6c778309ef7a1facaa56d8cf0a7c13d3035ed102d6679d9cfc7f0035980714a61573acb67b36235ee0d0b25cb13598c314
 
AUX gobby-0.4.94-missing-icon.patch 1446 SHA256 310cd1909e218468b78157b87314a75f031c6d1f3e2bca209a59f8b7463ac824 SHA512 899157ed212dc10318e01a3f9d7c7a860ad15884a1012d51957fa7ef174feb208e77d81f9f3cda9f4e90c29f2843fae355603fa009836d7a16ec97027859d1c7 WHIRLPOOL 14c001e9c81b9c71a162e5d709a3633de99b547e0e0d5a041b6750e764ad279b5535dc08cf233f0ad93b1f3418e402702e005bc48cd90a36b92a3f286cb9fcf9
 
AUX textsessionview-gtksourcebuffer-fix.patch 480 SHA256 2e711daeeab9a1096747c69e4daf76e6c22462a91c7191fb17f9495f3b5712b8 SHA512 6d7c5f527054c6178f471e6709e856ebb263ec3747aaefb4efb1f09d8d95d8403f5c58c3f4a3b7b0f8a1ecaa1825cb187894f716b96d24aec592ff8fc95ae953 WHIRLPOOL 340cbae8aadefa7d812141e93cfcc9b2aba7fb4e3d0209ca2ffdd12563036ba5bf779a4121e6414ce189eba1428a66f9c36367dcb394e9df7791ef27af6ead6b
 
DIST gobby-0.4.94.tar.gz 645815 SHA256 b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00 SHA512 62089e4f21c3eb6d822b7e240f694473b3f5b1585ddc3e42593503d68f8058645b04be137eb70a59c841b766f69791cbdfcfd82be1c9d126fca0ffd49ee7fe07 WHIRLPOOL 519d8b3ff8dacb3749a157c2fd641b33122751fe28ad0bc35ea5bb0cb6096dbbb89072799d14a1c2ee53a029a8f3f12b496052f27ffccc87cfa9ae6fc011dd02
 
EBUILD gobby-0.4.94-r1.ebuild 1243 SHA256 c7198130d2b97be94dc393740b0213aeb310f7578a42ec0bd9560092c05e2059 SHA512 59ba412708c4911eaf319091af73bf2a3ec1abf8c587f026db5325917583a0a627216dcd373d3d02a89efaaeee94b56ef19ecc78bd87e15ee7a965adb09f35d4 WHIRLPOOL 85c93b796c624e526c2a7e7d25c67a86a71b88a5e6a8a7e056e02b948d4991ab7d1c59775aa6129e4d53e2e5130b35e5f1d2506eefa8db9952a839e7f6edc915
 
EBUILD gobby-0.4.94-r2.ebuild 1342 SHA256 ec9894c62c56bb09e4a424f3db209fe1695065039fe5de86ecbcf476512649ed SHA512 d6071c389f57505522a4bd824ba1e2aeef99f67fe5193524fb7d5a2d06cf2da4bcea99249371ecc3ba9ad17f08872e258d52be2519c936fcf6f75bb76e9a724c WHIRLPOOL 2cffbc387fe3291842ef245baec4185b056cd7e04c1a1ad4c25dbc01398ae72c2e8b6b30da91b8088d4f0deef7fb00fae53fc6ccbb67d8d289dadb20823f4c30
app-editors/gobby/files/gobby-0.4.94-gtksourceview38.patch
Show inline comments
 
new file 100644
 
From 7e89ed566c83011134cc5402f1936c379ade6d21 Mon Sep 17 00:00:00 2001
 
From: Philipp Kern <pkern@debian.org>
 
Date: Sun, 13 Apr 2014 16:53:22 +0200
 
Subject: [PATCH] Fix compilation with GtkSourceView 3.8.
 

	
 
Patch by Andreas Henriksson <andreas@fatal.se>; Debian bug #718524
 
---
 
 code/core/textsessionview.cpp | 2 ++
 
 1 file changed, 2 insertions(+)
 

	
 
diff --git a/code/core/textsessionview.cpp b/code/core/textsessionview.cpp
 
index 61a6fef..2d96f96 100644
 
--- a/code/core/textsessionview.cpp
 
+++ b/code/core/textsessionview.cpp
 
@@ -31,6 +31,8 @@
 
 #include <gtksourceview/gtksourcebuffer.h>
 
 #include <gtksourceview/gtksourcelanguage.h>
 
 #include <gtksourceview/gtksourcelanguagemanager.h>
 
+#include <gtksourceview/gtksourcebuffer.h>
 
+
 
 
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 
 
-- 
 
1.9.3
 

	
app-editors/gobby/files/gobby-0.4.94-includes-preferences.patch
Show inline comments
 
new file 100644
 
From ebee76ac74427aaac0c044c1301524df8a2e2239 Mon Sep 17 00:00:00 2001
 
From: Philipp Kern <pkern@debian.org>
 
Date: Sun, 13 Apr 2014 16:51:01 +0200
 
Subject: [PATCH] Add missing include to fix compilation with recent
 
 toolchains.
 

	
 
Patch by Daniel T Chen <seven.steps@gmail.com>; Debian bug #736347.
 
---
 
 code/dialogs/preferences-dialog.cpp | 1 +
 
 1 file changed, 1 insertion(+)
 

	
 
diff --git a/code/dialogs/preferences-dialog.cpp b/code/dialogs/preferences-dialog.cpp
 
index 3829fb5..2686660 100644
 
--- a/code/dialogs/preferences-dialog.cpp
 
+++ b/code/dialogs/preferences-dialog.cpp
 
@@ -29,6 +29,7 @@
 
 #include <stdexcept>
 
 
 
 #include <gtksourceview/gtksourcestyleschememanager.h>
 
+#include <gtksourceview/gtksourcestylescheme.h>
 
 
 
 #include <gnutls/x509.h>
 
 
 
-- 
 
1.9.3
 

	
app-editors/gobby/files/gobby-0.4.94-includes.patch
Show inline comments
 
diff -up gobby-0.4.94/code/core/header.cpp.gtksourcelanguage gobby-0.4.94/code/core/header.cpp
 
--- gobby-0.4.94/code/core/header.cpp.gtksourcelanguage	2013-06-11 02:33:21.194814678 -0600
 
+++ gobby-0.4.94/code/core/header.cpp	2013-06-11 02:33:21.224814646 -0600
 
@@ -23,6 +23,7 @@
 
From 7419121794423039a720cbfd816f9bfc16c8955e Mon Sep 17 00:00:00 2001
 
From: Armin Burgmeier <armin@arbur.net>
 
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>
 
@@ -9,21 +22,25 @@ diff -up gobby-0.4.94/code/core/header.cpp.gtksourcelanguage gobby-0.4.94/code/c
 
 
 
 #ifdef PLATFORM_OSX_NATIVE
 
 #include <ige-mac-menu.h>
 
diff -up gobby-0.4.94/code/core/textsessionview.cpp.gtksourcelanguage gobby-0.4.94/code/core/textsessionview.cpp
 
--- gobby-0.4.94/code/core/textsessionview.cpp.gtksourcelanguage	2013-06-11 02:33:21.195814677 -0600
 
+++ gobby-0.4.94/code/core/textsessionview.cpp	2013-06-11 02:33:21.225814645 -0600
 
@@ -25,6 +25,7 @@
 
 #include <glibmm/pattern.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/gtksource.h>
 
 
 
+#include <gtksourceview/gtksourcelanguage.h>
 
+#include <gtksourceview/gtksourcelanguagemanager.h>
 
+
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 
 
diff -up gobby-0.4.94/code/operations/operation-export-html.cpp.gtksourcelanguage gobby-0.4.94/code/operations/operation-export-html.cpp
 
--- gobby-0.4.94/code/operations/operation-export-html.cpp.gtksourcelanguage	2013-06-11 02:37:35.467555101 -0600
 
+++ gobby-0.4.94/code/operations/operation-export-html.cpp	2013-06-11 02:38:03.043528355 -0600
 
@@ -25,6 +25,7 @@
 
 // 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>
 
@@ -31,3 +48,6 @@ diff -up gobby-0.4.94/code/operations/operation-export-html.cpp.gtksourcelanguag
 
 
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 
 
-- 
 
1.9.3
 

	
app-editors/gobby/files/textsessionview-gtksourcebuffer-fix.patch
Show inline comments
 
deleted file
app-editors/gobby/gobby-0.4.94-r2.ebuild
Show inline comments
 
file renamed from app-editors/gobby/gobby-0.4.94-r1.ebuild to app-editors/gobby/gobby-0.4.94-r2.ebuild
 
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
 
src_prepare() {
 
	epatch "${FILESDIR}"/${P}-missing-icon.patch \
 
	   "${FILESDIR}"/${P}-gtkmm3.patch \
 
	   "${FILESDIR}"/${P}-includes.patch
 
	   "${FILESDIR}"/${P}-includes.patch \
 
	   "${FILESDIR}"/${P}-includes-preferences.patch \
 
	   "${FILESDIR}"/${P}-gtksourceview38.patch
 
}
 

	
 
src_configure() {
0 comments (0 inline, 0 general)