Changeset - 666b9b76b865
[Not reviewed]
0 0 6
Chel Sea (chain) - 11 years ago 2014-01-19 20:34:28
chain@rpgfiction.net
fix compilation errors with recent gcc
6 files changed with 380 insertions and 0 deletions:
0 comments (0 inline, 0 general)
app-editors/gobby/Manifest
Show inline comments
 
new file 100644
 
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-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
app-editors/gobby/files/gobby-0.4.94-gtkmm3.patch
Show inline comments
 
new file 100644
 
From 5932bfb4cf653b0588872fd6f8cc106b248ad964 Mon Sep 17 00:00:00 2001
 
From: Armin Burgmeier <armin@arbur.net>
 
Date: Sun, 29 Apr 2012 14:43:06 +0200
 
Subject: [PATCH] Fix build against recent gtkmm3 versions
 

	
 
2012-04-29  Armin Burgmeier  <armin@arbur.net>
 

	
 
	* code/commands/autosave-commands.cpp:
 
	* code/commands/folder-commands.cpp:
 
	* code/commands/user-join-commands.cpp:
 
	* code/core/filechooser.cpp:
 
	* code/core/folder.cpp:
 
	* code/core/header.cpp:
 
	* code/core/preferences.cpp:
 
	* code/core/statusbar.cpp:
 
	* code/core/textsessionview.cpp:
 
	* code/dialogs/initial-dialog.cpp:
 
	* code/dialogs/preferences-dialog.cpp:
 
	* code/operations/operation-open.cpp:
 
	* code/operations/operation-open.hpp:
 
	* code/operations/operation-save.hpp: Add some missing glibmm includes
 
	that are no longer pulled in by gtkmm since recent gtkmm3 versions.
 
---
 
 ChangeLog                            |   18 ++++++++++++++++++
 
 code/commands/autosave-commands.cpp  |    2 ++
 
 code/commands/folder-commands.cpp    |    2 ++
 
 code/commands/user-join-commands.cpp |    2 ++
 
 code/core/filechooser.cpp            |    2 ++
 
 code/core/folder.cpp                 |    2 ++
 
 code/core/header.cpp                 |    1 +
 
 code/core/preferences.cpp            |    4 ++++
 
 code/core/statusbar.cpp              |    1 +
 
 code/core/textsessionview.cpp        |    3 +++
 
 code/dialogs/initial-dialog.cpp      |    1 +
 
 code/dialogs/preferences-dialog.cpp  |    1 +
 
 code/operations/operation-open.cpp   |    2 ++
 
 code/operations/operation-open.hpp   |    1 +
 
 code/operations/operation-save.hpp   |    1 +
 
 15 files changed, 43 insertions(+)
 

	
 
diff --git a/code/commands/autosave-commands.cpp b/code/commands/autosave-commands.cpp
 
index 0759b0d..827ffaf 100644
 
--- a/code/commands/autosave-commands.cpp
 
+++ b/code/commands/autosave-commands.cpp
 
@@ -23,6 +23,8 @@
 
 
 
 #include "core/sessionuserview.hpp"
 
 
 
+#include <glibmm/main.h>
 
+
 
 #include <ctime>
 
 
 
 class Gobby::AutosaveCommands::Info
 
diff --git a/code/commands/folder-commands.cpp b/code/commands/folder-commands.cpp
 
index 92b7d71..8cc2bee 100644
 
--- a/code/commands/folder-commands.cpp
 
+++ b/code/commands/folder-commands.cpp
 
@@ -20,6 +20,8 @@
 
 #include "commands/folder-commands.hpp"
 
 #include "core/sessionuserview.hpp"
 
 
 
+#include <glibmm/main.h>
 
+
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 
 
 // TODO: Make this work with non-text documents also... maybe split &
 
diff --git a/code/commands/user-join-commands.cpp b/code/commands/user-join-commands.cpp
 
index ebb0810..89ffdf2 100644
 
--- a/code/commands/user-join-commands.cpp
 
+++ b/code/commands/user-join-commands.cpp
 
@@ -20,6 +20,8 @@
 
 #include "commands/user-join-commands.hpp"
 
 #include "util/i18n.hpp"
 
 
 
+#include <glibmm/main.h>
 
+
 
 #include <libinfinity/common/inf-error.h>
 
 
 
 namespace
 
diff --git a/code/core/filechooser.cpp b/code/core/filechooser.cpp
 
index fbd7a67..23b85cf 100644
 
--- a/code/core/filechooser.cpp
 
+++ b/code/core/filechooser.cpp
 
@@ -19,6 +19,8 @@
 
 
 
 #include "core/filechooser.hpp"
 
 
 
+#include <glibmm/miscutils.h>
 
+#include <glibmm/convert.h>
 
 #include <gtkmm/stock.h>
 
 
 
 Gobby::FileChooser::Dialog::Dialog(Gobby::FileChooser& chooser,
 
diff --git a/code/core/folder.cpp b/code/core/folder.cpp
 
index f9ebadc..7c84206 100644
 
--- a/code/core/folder.cpp
 
+++ b/code/core/folder.cpp
 
@@ -24,6 +24,8 @@
 
 #include "core/texttablabel.hpp"
 
 #include "util/file.hpp"
 
 
 
+#include <glibmm/miscutils.h>
 
+
 
 #include <gdk/gdkkeysyms.h>
 
 #include <stdexcept>
 
 #include <iostream> // For std::cerr
 
diff --git a/code/core/header.cpp b/code/core/header.cpp
 
index d5d0c94..8f7f9f4 100644
 
--- a/code/core/header.cpp
 
+++ b/code/core/header.cpp
 
@@ -22,6 +22,7 @@
 
 #include "util/i18n.hpp"
 
 #include "features.hpp" // For PLATFORM_OSX_NATIVE
 
 
 
+#include <glibmm/markup.h>
 
 #include <gtkmm/stock.h>
 
 
 
 #ifdef PLATFORM_OSX_NATIVE
 
diff --git a/code/core/preferences.cpp b/code/core/preferences.cpp
 
index 9b8bfb3..a2952c6 100644
 
--- a/code/core/preferences.cpp
 
+++ b/code/core/preferences.cpp
 
@@ -20,6 +20,10 @@
 
 #include "features.hpp"
 
 #include "core/preferences.hpp"
 
 
 
+#include <glibmm/miscutils.h>
 
+#include <glibmm/fileutils.h>
 
+#include <glibmm/random.h>
 
+
 
 // TODO: Support direct enum config storage via context specialization for
 
 // enums.
 
 Gobby::Preferences::User::User(Config::ParentEntry& entry):
 
diff --git a/code/core/statusbar.cpp b/code/core/statusbar.cpp
 
index 9b302b8..0a06a33 100644
 
--- a/code/core/statusbar.cpp
 
+++ b/code/core/statusbar.cpp
 
@@ -21,6 +21,7 @@
 
 #include "util/gtk-compat.hpp"
 
 #include "util/i18n.hpp"
 
 
 
+#include <glibmm/main.h>
 
 #include <gtkmm/frame.h>
 
 #include <gtkmm/stock.h>
 
 
 
diff --git a/code/core/textsessionview.cpp b/code/core/textsessionview.cpp
 
index 2246957..45eae14 100644
 
--- a/code/core/textsessionview.cpp
 
+++ b/code/core/textsessionview.cpp
 
@@ -21,6 +21,9 @@
 
 #include "util/i18n.hpp"
 
 #include "util/color.hpp"
 
 
 
+#include <glibmm/main.h>
 
+#include <glibmm/markup.h>
 
+#include <glibmm/pattern.h>
 
 #include <gtkmm/scrolledwindow.h>
 
 #include <gtkmm/textiter.h>
 
 
 
diff --git a/code/dialogs/initial-dialog.cpp b/code/dialogs/initial-dialog.cpp
 
index 031bc2c..494c859 100644
 
--- a/code/dialogs/initial-dialog.cpp
 
+++ b/code/dialogs/initial-dialog.cpp
 
@@ -24,6 +24,7 @@
 
 #include "util/gtk-compat.hpp"
 
 #include "features.hpp"
 
 
 
+#include <glibmm/markup.h>
 
 #include <gtkmm/stock.h>
 
 #include <gtkmm/alignment.h>
 
 
 
diff --git a/code/dialogs/preferences-dialog.cpp b/code/dialogs/preferences-dialog.cpp
 
index d0af7a0..be3690a 100644
 
--- a/code/dialogs/preferences-dialog.cpp
 
+++ b/code/dialogs/preferences-dialog.cpp
 
@@ -22,6 +22,7 @@
 
 #include "util/i18n.hpp"
 
 #include "util/gtk-compat.hpp"
 
 
 
+#include <glibmm/markup.h>
 
 #include <gtkmm/messagedialog.h>
 
 #include <gtkmm/scrolledwindow.h>
 
 #include <gtkmm/stock.h>
 
diff --git a/code/operations/operation-open.cpp b/code/operations/operation-open.cpp
 
index 80b795f..26c53fd 100644
 
--- a/code/operations/operation-open.cpp
 
+++ b/code/operations/operation-open.cpp
 
@@ -22,6 +22,8 @@
 
 #include "core/noteplugin.hpp"
 
 #include "util/i18n.hpp"
 
 
 
+#include <glibmm/main.h>
 
+
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 #include <gtksourceview/gtksourcebuffer.h>
 
 
 
diff --git a/code/operations/operation-open.hpp b/code/operations/operation-open.hpp
 
index 3e0e6f5..acf63ed 100644
 
--- a/code/operations/operation-open.hpp
 
+++ b/code/operations/operation-open.hpp
 
@@ -26,6 +26,7 @@
 
 
 
 #include <giomm/file.h>
 
 #include <giomm/inputstream.h>
 
+#include <glibmm/convert.h>
 
 
 
 namespace Gobby
 
 {
 
diff --git a/code/operations/operation-save.hpp b/code/operations/operation-save.hpp
 
index f7f2eb7..8fed55d 100644
 
--- a/code/operations/operation-save.hpp
 
+++ b/code/operations/operation-save.hpp
 
@@ -25,6 +25,7 @@
 
 
 
 #include <giomm/file.h>
 
 #include <giomm/outputstream.h>
 
+#include <glibmm/convert.h>
 
 
 
 #include <ctime>
 
 
 
-- 
 
1.7.10
 

	
app-editors/gobby/files/gobby-0.4.94-includes.patch
Show inline comments
 
new file 100644
 
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 @@
 
 
 
 #include <glibmm/markup.h>
 
 #include <gtkmm/stock.h>
 
+#include <gtksourceview/gtksourcelanguage.h>
 
 
 
 #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>
 
 #include <gtkmm/scrolledwindow.h>
 
 #include <gtkmm/textiter.h>
 
+#include <gtksourceview/gtksource.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 @@
 
 #include "util/i18n.hpp"
 
 
 
 #include <gtkmm/textbuffer.h>
 
+#include <gtksourceview/gtksourcebuffer.h>
 
 
 
 #include <libinftextgtk/inf-text-gtk-buffer.h>
 
 
app-editors/gobby/files/gobby-0.4.94-missing-icon.patch
Show inline comments
 
new file 100644
 
From ba98f5e531f915637c535e0a0f90e4cd87ac4f74 Mon Sep 17 00:00:00 2001
 
From: Philipp Kern <pkern@debian.org>
 
Date: Sun, 18 Mar 2012 19:01:44 +0100
 
Subject: [PATCH 2/2] code/util/gtk-compat.hpp: fix render_icon with missing
 
 icons and Gtk3
 

	
 
2012-03-18  Philipp Kern  <phil@0x539.de>
 

	
 
        * code/util/gtk-compat.hpp: Fix the call of
 
        gtk-widget-render-icon-pixbuf, which is allowed to return NULL if
 
        the stock icon does not exist.  Guard it with MISSING_IMAGE.
 
---
 
 ChangeLog                |    6 ++++++
 
 code/util/gtk-compat.hpp |    7 ++++++-
 
 2 files changed, 12 insertions(+), 1 deletions(-)
 

	
 
diff --git a/code/util/gtk-compat.hpp b/code/util/gtk-compat.hpp
 
index 1de7383..73332ab 100644
 
--- a/code/util/gtk-compat.hpp
 
+++ b/code/util/gtk-compat.hpp
 
@@ -27,6 +27,7 @@
 
 # define USE_GTKMM3
 
 #endif
 
 
 
+#include <gtkmm/stock.h>
 
 #include <gtkmm/combobox.h>
 
 #include <gtkmm/notebook.h>
 
 #ifndef USE_GTKMM3
 
@@ -122,7 +123,11 @@ inline Glib::RefPtr<Gdk::Pixbuf> render_icon(Gtk::Widget& widget,
 
                                              Gtk::IconSize size)
 
 {
 
 #ifdef USE_GTKMM3
 
-	return widget.render_icon_pixbuf(stock_id, size);
 
+	Glib::RefPtr<Gdk::Pixbuf> pixbuf = widget.render_icon_pixbuf(stock_id, size);
 
+	if(!pixbuf) // icon not found
 
+		pixbuf = widget.render_icon_pixbuf(Gtk::Stock::MISSING_IMAGE, size);
 
+	g_assert(pixbuf);
 
+	return pixbuf;
 
 #else
 
 	return widget.render_icon(stock_id, size);
 
 #endif
 
-- 
 
1.7.9.1
 

	
app-editors/gobby/files/textsessionview-gtksourcebuffer-fix.patch
Show inline comments
 
new file 100644
 
From: Andreas Henriksson <andreas@fatal.se>
 
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>
 
 
app-editors/gobby/gobby-0.4.94-r1.ebuild
Show inline comments
 
new file 100644
 
# Copyright 1999-2012 Gentoo Foundation
 
# Distributed under the terms of the GNU General Public License v2
 
# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/gobby-0.4.94.ebuild,v 1.3 2012/11/21 08:50:09 xarthisius Exp $
 

	
 
EAPI=2
 

	
 
inherit eutils gnome2-utils toolchain-funcs
 

	
 
DESCRIPTION="GTK-based collaborative editor"
 
HOMEPAGE="http://gobby.0x539.de/"
 
SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
 
LICENSE="GPL-2"
 
SLOT="0.5"
 
KEYWORDS="~amd64 ~x86"
 
IUSE="avahi doc nls"
 

	
 
RDEPEND="dev-cpp/glibmm:2
 
	dev-cpp/gtkmm:3.0
 
	dev-libs/libsigc++:2
 
	>=net-libs/libinfinity-0.4[gtk,avahi?]
 
	x11-libs/gtk+:3
 
	dev-cpp/libxmlpp:2.6
 
	x11-libs/gtksourceview:3.0"
 
DEPEND="${RDEPEND}
 
	virtual/pkgconfig
 
	doc? (
 
		app-text/gnome-doc-utils
 
		app-text/scrollkeeper
 
		)
 
	nls? ( >=sys-devel/gettext-0.12.1 )"
 

	
 
src_prepare() {
 
	epatch "${FILESDIR}"/${P}-missing-icon.patch \
 
	   "${FILESDIR}"/${P}-gtkmm3.patch \
 
	   "${FILESDIR}"/${P}-includes.patch
 
}
 

	
 
src_configure() {
 
	econf $(use_enable nls) \
 
		--with-gtk3
 
}
 

	
 
src_install() {
 
	emake DESTDIR="${D}" install || die
 
	domenu contrib/gobby-0.5.desktop
 
	doicon gobby-0.5.xpm
 
}
 

	
 
pkg_preinst() {
 
	gnome2_icon_savelist
 
}
 

	
 
pkg_postinst() {
 
	gnome2_icon_cache_update
 
}
 

	
 
pkg_postrm() {
 
	gnome2_icon_cache_update
 
}
0 comments (0 inline, 0 general)