summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2012-11-21 08:50:18 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2012-11-21 08:50:18 +0000
commitfc6d1dcf63ce8bfbc0acbea5c87cefb5c7c2bfb2 (patch)
tree97ae7b7d6ffce52761046973242c9b2e73ab9bd9 /app-editors
parentPin capybara to specific xpath slot in accordance with gemspec. (diff)
downloadhistorical-fc6d1dcf63ce8bfbc0acbea5c87cefb5c7c2bfb2.tar.gz
historical-fc6d1dcf63ce8bfbc0acbea5c87cefb5c7c2bfb2.tar.bz2
historical-fc6d1dcf63ce8bfbc0acbea5c87cefb5c7c2bfb2.zip
Add debian patches to fix building with recent gtkmm3 wrt #444024 by Denis M. (Phr33d0m) <god@politeia.in>
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0x5D21B852895192F9
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/gobby/ChangeLog9
-rw-r--r--app-editors/gobby/Manifest26
-rw-r--r--app-editors/gobby/files/gobby-0.4.94-gtkmm3.patch222
-rw-r--r--app-editors/gobby/files/gobby-0.4.94-missing-icon.patch44
-rw-r--r--app-editors/gobby/gobby-0.4.94.ebuild9
5 files changed, 304 insertions, 6 deletions
diff --git a/app-editors/gobby/ChangeLog b/app-editors/gobby/ChangeLog
index fe027c88de3d..185f8a21f0fd 100644
--- a/app-editors/gobby/ChangeLog
+++ b/app-editors/gobby/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/gobby
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/ChangeLog,v 1.50 2012/06/08 11:50:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gobby/ChangeLog,v 1.51 2012/11/21 08:50:09 xarthisius Exp $
+
+ 21 Nov 2012; Kacper Kowalik <xarthisius@gentoo.org>
+ +files/gobby-0.4.94-gtkmm3.patch, +files/gobby-0.4.94-missing-icon.patch,
+ gobby-0.4.94.ebuild:
+ Add debian patches to fix building with recent gtkmm3 wrt #444024 by Denis M.
+ (Phr33d0m) <god@politeia.in>
08 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> gobby-0.4.13.ebuild:
x86 stable wrt bug #418563
@@ -234,4 +240,3 @@
+files/gobby.desktop, +metadata.xml, +gobby-0.1.1.ebuild:
Initial import, based on ebuild's by upstream devs with changes to handle
locale bug.
-
diff --git a/app-editors/gobby/Manifest b/app-editors/gobby/Manifest
index bcb9f0cf1367..358d2b1234a2 100644
--- a/app-editors/gobby/Manifest
+++ b/app-editors/gobby/Manifest
@@ -1,3 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gobby-0.4.94-gtkmm3.patch 6815 SHA256 52cd2897eb8835879653d4d5430e50aaa05360d3c59b4649d2ea77ae7dd9f133 SHA512 991afce432a5ff273ff99dbf4d002895f7948e9b4c25b30406ec33aa5f2e05c51eca0082bfd0ca117c280499af1d02f1b8d030e2399a334417b545c9c07345a0 WHIRLPOOL 8db03d50d3707d297877c537604d52b55c3f9ffe65caf879986baa78997f60aa3bf96cffc774b784dc61dc368b4ac2d1e3d6ed39c689b0309d03f430c7d7ae9e
+AUX gobby-0.4.94-missing-icon.patch 1446 SHA256 310cd1909e218468b78157b87314a75f031c6d1f3e2bca209a59f8b7463ac824 SHA512 899157ed212dc10318e01a3f9d7c7a860ad15884a1012d51957fa7ef174feb208e77d81f9f3cda9f4e90c29f2843fae355603fa009836d7a16ec97027859d1c7 WHIRLPOOL 14c001e9c81b9c71a162e5d709a3633de99b547e0e0d5a041b6750e764ad279b5535dc08cf233f0ad93b1f3418e402702e005bc48cd90a36b92a3f286cb9fcf9
DIST gobby-0.4.11.tar.gz 458897 SHA256 c2523ca1caaa9b4abd95246595496c6321f4880200ba6a3b0e24bfed0f5db178 SHA512 e928b5a6f0f0b4c83e0d2708b5a9307172fa1e1d7376a11a7ede343f2560d813a0843335b49b4bc085b27e0f7ac6a69c174e362de32571638d70ae2c4316b47b WHIRLPOOL 1b6da9ba121e62eb6a03b719eb9aff9d241188625a0d21f8fd8db88ed5443fd83bfc37c52b132d6f89eed517da2d87b70ef43b2706eefad76914606369e3a849
DIST gobby-0.4.13.tar.gz 507676 SHA256 8cbd89ffbe3e056160a8d76e11d641f3b045793e35897546f98d2de368001871 SHA512 15017de52c8e627b2c1999b68e53862ca6387b83c1486c5bf7c98e9abba5ea73c9f001077518458883d82c1af0f756da50428a8707fd05260715df13ed0cc978 WHIRLPOOL 6b4826cd838d4841cc59a0d05e77f27906ba85f27e6ebeac87b8c5aa9739aceb3b369803194ed732be7066505cbcf0762fdedd9f2b2f3991fadaf01dc2416403
DIST gobby-0.4.8.tar.gz 429871 SHA256 0bdec8a9accce05bb709299145dc58c96431bb3a5b0b4a1009ba045c85eca2a1 SHA512 464595cf0ed2a1058b7692212b2f75b2ddef6cfb0c8b9de1d0c3d51fe13f65cbc5729b5719b36a3f1512f1386355408ca54931df54e366edcae06898ff245183 WHIRLPOOL 8cbf75f018b01e5b000ae88efe00c273865d04902c3de8dd06571e1068bab15977c24a2de2568e76df944949d6555c65a25fef68a7d993965b0efce7bf066caf
@@ -5,6 +10,23 @@ DIST gobby-0.4.94.tar.gz 645815 SHA256 b9798808447cd94178430f0fb273d0e45d0ca30ab
EBUILD gobby-0.4.11.ebuild 918 SHA256 2308fae8a12ba27794cc77a73ac2fccd4230ec2e6bbc27d419253ba06794e52c SHA512 ac54256e403d3d7d2de4236b34c5b27b7350dc46d2b265398a9d3041a9faf0073a2bf27bf6fc5b3f321fc38e1cb4e3cad904db29720f8ba3b057da5cc32b71c4 WHIRLPOOL 0020ffe80ef3a5c4f8cf426e51526c06e65861345b30a19bfddd18a517240d93974f2d5023975a612b62a50baabac0d8e484e4eac1b1d1dd2ce7256f16b38938
EBUILD gobby-0.4.13.ebuild 861 SHA256 616cbc017d65c0382e7db634e713e64a8aeca02ceca8de9f3664ae8dec650120 SHA512 0473032062253997bf801b3f4d3339e2dedd8c8d4be0363a1a1c9a6168591b49156ae9b950d6afc7422e1db47ba1dbf0a21618da39242f348d0bcb8146fafd15 WHIRLPOOL 34f6c0f2c2d47550fb7fd5f1e21fe2be52a62c9cf357a8f4083800a447710f62ce962bcecfa1063ee2fa97bc0cd1b1cc6646a998d72fa46e58342df4608d598e
EBUILD gobby-0.4.8.ebuild 990 SHA256 2dd193b228c893c3607ede67582c7b34fccc499214b696bbe702860fc23bcf7b SHA512 aac06bd1db65636c9889ee8c255ca1eaf7e5fcfb7762154aa75c60b029554acd98e6f777d09b1a49aec74995791c288bd7f1e0ea86c684b7c670fe877c21aa13 WHIRLPOOL 6273069553eb5a83ef2b09cde6d1c4d18022dc2d723634609800e09110d5946afc24a57d3b1bb230fb127c8c68837f45b6c80b48c4ae9128a797ba68ed011a4b
-EBUILD gobby-0.4.94.ebuild 1080 SHA256 34d42a492bb318778feb142e194822dbebb1efa2254c71e9316ace71c82a7ee9 SHA512 681aa5a11b1396648c0385f86b589a8904ec921cc0a0e5856352cbfda02fd16e758e1dec3da186889258d851c39550d0f8f557816253e9fc9b561aa5ef2ac672 WHIRLPOOL 983c1455811b7aec6e7621e7abf45b48ee02c8a396cb2e1389e5e8dc6a00afc1bbd9329d7dd4572f6ffb02bd102edd84ea1a89204e57685d994c2c8af722a244
-MISC ChangeLog 8217 SHA256 031ff2da05fdf8d81536dd10120512d8f57c82d697b8233248c84a61faa8afd7 SHA512 b1a192b0ff178fa5326ece31c8f000d8938e53232d93c342954e65da26ebf2afa413b74dd2fed015673434e66d50aca66c9cf4244cdba95ea76812c2a2d85c22 WHIRLPOOL 871c45c2f8d12fd654bcc6c41e25f1fd0d5e2744088d0b9f22fe943be7eccd71053160d2ebdb6478135d85bd1a8c9c13a17696c1b908d46bf43a7898c4a2bc73
+EBUILD gobby-0.4.94.ebuild 1203 SHA256 da17d5f4003cc4be970b98ec6c8e3ff6a5d2d468b0859448ffad070df8632ec3 SHA512 d8a1b74f528a9073cbc50e663c46652dce67c270250564cfaf399c964ac081d62dc53f0a49aca5d4858892e1daeccc63084439222b1433d4c3a7d0d08319f5e1 WHIRLPOOL 63e8ecb6d44668edcc29f69e955a28e6636a780a34907b41963c73c0e6f7f2313b33e4ac36881dd0b639739dfa192a26c5f20c8c9bb41adf10eb43092f7e5802
+MISC ChangeLog 8481 SHA256 b66d7812c86bf6cb22c2d69d56d42ddd462728ecb995f1f9176378f12aede604 SHA512 30342ea1fc225c038436ff03d77ad3a02fd99b1f7e4c0c5955db6623aba27c71aaf47640a26992d1581b6cef1e97e4a84fcee62f4877f31ae1e14274e0a53f25 WHIRLPOOL 59bce3913323a5dcafcd4228f962cb4308fa635b1cbd093f7c032c7b707b25da2f2552d9edbb86e6deb6ec03f0ee93d6b766ed54d517a20a4fef1a61bf6903bf
MISC metadata.xml 406 SHA256 8141a0181abfa0e8fc091130dce047303d7864fe4580df7eead60d273c629834 SHA512 1be0d2371e60b0a356d167d17e282588027d9c866ac7a4c8014fcd4a2d85b01b40636eae95dd6a6c192a107d96c307543e152bd8eeaeb9f8f38f6453e8f8d6bc WHIRLPOOL 4d70901cf8bfa3ca68012c0fcebffc33cba142b4357fe8577ee39591624d8deda07adbb4755855876fb84fe89cc8093be97c77e3b9ae3af8e92813184573b356
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQrJXaAAoJEF0huFKJUZL5HeAP/16ymCb9H708Pu72EonTrxiP
+2vnjYhHnAUrmWuZgaR/vP0OnhzFL4azIzvDTNmHyR3+bpQtBVd4Rk1zt8+QwhT99
+sLSJzmQBcxj98FyCuhO/87ef3MEQyB0afFDzkkzrJvpm0Sa/28VWy0oTYlf/nCVt
+kc5ZgGzugrasqcQQyjn38ucbtIDH2wTjN0ZlyQ8dTdoleJTqL6q8CARvZ9Nix/Fi
+/Gsb8QBdG7JDcdQt9sPa3Zy15MyIuc2kxu2o1TsMvRA9Mu5Q3CCWAH29L4mlT4jU
+tQYa1PcLh2CEUYkckiIRir9yfQRxrgQTkMZ5HRAzEiMoBM5/UyGYiS4iTcekErTW
+0zDplYFXFyntv3e74jr4/1g4UIdCplItRp1Fpx+eLaw2PFxwxZQ05/7hRFGNd5l9
+W2rqyK/nMJkUDs2HKAvcNXWVcKh366pjtgmjCGsnYfd1xgqLEgEkNsz3Oe5CWwE+
+yqa8Fa8K4GlX2p9w6eJO2CzzW2xkWFqA6Bn121nJ6dFtjAjHA3GFto3TsYgZWh0H
+/vY8elHEYiJ5lOnYw76dAmeVmFHLWBT/bEUAloxcS4764LxUc/kCyN0su/jSnibs
+Qx4ywxbyf14EDCrmqRQLME8k8QXSEslYVolw2x8e2xaWE4P4d/rqAMrj+ESoFWk3
+GQZsHsvDwnuPbyNEJ2Yu
+=uDou
+-----END PGP SIGNATURE-----
diff --git a/app-editors/gobby/files/gobby-0.4.94-gtkmm3.patch b/app-editors/gobby/files/gobby-0.4.94-gtkmm3.patch
new file mode 100644
index 000000000000..e1fda8b7a149
--- /dev/null
+++ b/app-editors/gobby/files/gobby-0.4.94-gtkmm3.patch
@@ -0,0 +1,222 @@
+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
+
diff --git a/app-editors/gobby/files/gobby-0.4.94-missing-icon.patch b/app-editors/gobby/files/gobby-0.4.94-missing-icon.patch
new file mode 100644
index 000000000000..db167df6f6b9
--- /dev/null
+++ b/app-editors/gobby/files/gobby-0.4.94-missing-icon.patch
@@ -0,0 +1,44 @@
+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
+
diff --git a/app-editors/gobby/gobby-0.4.94.ebuild b/app-editors/gobby/gobby-0.4.94.ebuild
index 97074b1d53ab..5a03d2dd34cc 100644
--- a/app-editors/gobby/gobby-0.4.94.ebuild
+++ b/app-editors/gobby/gobby-0.4.94.ebuild
@@ -1,10 +1,10 @@
# 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.2 2012/05/03 18:33:01 jdhore Exp $
+# $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
+inherit eutils gnome2-utils toolchain-funcs
DESCRIPTION="GTK-based collaborative editor"
HOMEPAGE="http://gobby.0x539.de/"
@@ -29,6 +29,11 @@ DEPEND="${RDEPEND}
)
nls? ( >=sys-devel/gettext-0.12.1 )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-missing-icon.patch \
+ "${FILESDIR}"/${P}-gtkmm3.patch
+}
+
src_configure() {
econf $(use_enable nls) \
--with-gtk3