net-im/minbif: fix build with newer imlib.
authorMichael Orlitzky <mjo@gentoo.org>
Thu, 28 Jul 2016 17:05:51 +0000 (13:05 -0400)
committerMichael Orlitzky <mjo@gentoo.org>
Thu, 28 Jul 2016 17:06:10 +0000 (13:06 -0400)
Newer versions of imlib have renamed ImlibLoadError to
Imlib_Load_Error. This commit adds a minimal patch to fix the
build. It's bad mojo to modify a stable ebuild, but there are
mitigating factors here. First, the stable package simply will not
build without the patch, so it's not much good to anyone. Second, this
package is maintainer-needed, and a new revision would therefore never
get stabilized to truly fix the bug for stable users. So, I've applied
the patch to the one existing stable ebuild.

Gentoo-Bug: 559412

Package-Manager: portage-2.2.28

net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch [new file with mode: 0644]
net-im/minbif/minbif-1.0.5-r2.ebuild

diff --git a/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
new file mode 100644 (file)
index 0000000..e9fa875
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/src/im/account.cpp b/src/im/account.cpp
+index f155334..f040fcd 100644
+--- a/src/im/account.cpp
++++ b/src/im/account.cpp
+@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename)
+                               else
+                               {
+                                       char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0);
+-                                      ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN;
++                                      Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN;
+ 
+                                       close(temp_fd);
+                                       /* Try to encode in a supported format. */
index 0262b1a520672f2a59f7f2f7794a5d02c7f1d396..b50395ca5bd2dbff2e659756d42e9a518bbcc57d 100644 (file)
@@ -37,6 +37,7 @@ pkg_setup() {
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch"
        epatch "${FILESDIR}/${PN}-1.0.5-gcc47.patch"
+       epatch "${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch"
 
        sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed"