summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-04-03 11:21:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-04-03 11:21:18 +0000
commitde8c1fd7e550f82171c3e98122c9592376b2f341 (patch)
tree3216a7ddaa01ee9a9e573c67850b472cf2914271 /app-cdr
parentold (diff)
downloadgentoo-2-de8c1fd7e550f82171c3e98122c9592376b2f341.tar.gz
gentoo-2-de8c1fd7e550f82171c3e98122c9592376b2f341.tar.bz2
gentoo-2-de8c1fd7e550f82171c3e98122c9592376b2f341.zip
Fix building with dev-libs/glib >= 2.32 and Xfce 4.10 pre1 (missing #include for glib-object.h)
(Portage version: 2.2.0_alpha98/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/xfburn/ChangeLog7
-rw-r--r--app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch14
-rw-r--r--app-cdr/xfburn/xfburn-0.4.3-r3.ebuild3
3 files changed, 22 insertions, 2 deletions
diff --git a/app-cdr/xfburn/ChangeLog b/app-cdr/xfburn/ChangeLog
index 9e707c4696a0..85fc55810afe 100644
--- a/app-cdr/xfburn/ChangeLog
+++ b/app-cdr/xfburn/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-cdr/xfburn
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.41 2012/01/02 13:02:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/ChangeLog,v 1.42 2012/04/03 11:21:18 ssuominen Exp $
+
+ 03 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> xfburn-0.4.3-r3.ebuild,
+ +files/xfburn-0.4.3-gobject_h.patch:
+ Fix building with dev-libs/glib >= 2.32 and Xfce 4.10 pre1 (missing #include
+ for glib-object.h)
02 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -xfburn-0.4.3-r1.ebuild,
-xfburn-0.4.3-r2.ebuild,
diff --git a/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch b/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch
new file mode 100644
index 000000000000..692a454216f3
--- /dev/null
+++ b/app-cdr/xfburn/files/xfburn-0.4.3-gobject_h.patch
@@ -0,0 +1,14 @@
+error: unknown type name for GObject, GObjectClass, GType and GTypeInfo
+
+The errors started manifesting after upgrade to Xfce 4.10 pre1 (and to latest glib 2.32.0 etc.)
+
+--- xfburn/xfburn-settings.h
++++ xfburn/xfburn-settings.h
+@@ -24,6 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <glib.h>
++#include <glib-object.h>
+
+ G_BEGIN_DECLS
+
diff --git a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
index 581ca04a78ac..8d28714ab4b0 100644
--- a/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
+++ b/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.5 2012/03/10 10:12:08 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.4.3-r3.ebuild,v 1.6 2012/04/03 11:21:18 ssuominen Exp $
EAPI=4
EAUTORECONF=yes
@@ -33,6 +33,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${P}-update_desktop_entry.patch
"${FILESDIR}"/${P}-empty_directory_segmentation_fault-2.patch
+ "${FILESDIR}"/${P}-gobject_h.patch
)
XFCONF=(