| 1 |
commit: 159f337e908f4b7c9dff13ebd92df7adcc3e27b5 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 28 17:05:51 2016 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 28 17:06:10 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159f337e |
| 7 |
|
| 8 |
net-im/minbif: fix build with newer imlib. |
| 9 |
|
| 10 |
Newer versions of imlib have renamed ImlibLoadError to |
| 11 |
Imlib_Load_Error. This commit adds a minimal patch to fix the |
| 12 |
build. It's bad mojo to modify a stable ebuild, but there are |
| 13 |
mitigating factors here. First, the stable package simply will not |
| 14 |
build without the patch, so it's not much good to anyone. Second, this |
| 15 |
package is maintainer-needed, and a new revision would therefore never |
| 16 |
get stabilized to truly fix the bug for stable users. So, I've applied |
| 17 |
the patch to the one existing stable ebuild. |
| 18 |
|
| 19 |
Gentoo-Bug: 559412 |
| 20 |
|
| 21 |
Package-Manager: portage-2.2.28 |
| 22 |
|
| 23 |
.../minbif/files/minbif-1.0.5-rename-imlib-load-error.patch | 13 +++++++++++++ |
| 24 |
net-im/minbif/minbif-1.0.5-r2.ebuild | 1 + |
| 25 |
2 files changed, 14 insertions(+) |
| 26 |
|
| 27 |
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 |
| 28 |
new file mode 100644 |
| 29 |
index 0000000..e9fa875 |
| 30 |
--- /dev/null |
| 31 |
+++ b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch |
| 32 |
@@ -0,0 +1,13 @@ |
| 33 |
+diff --git a/src/im/account.cpp b/src/im/account.cpp |
| 34 |
+index f155334..f040fcd 100644 |
| 35 |
+--- a/src/im/account.cpp |
| 36 |
++++ b/src/im/account.cpp |
| 37 |
+@@ -272,7 +272,7 @@ void Account::setBuddyIcon(string filename) |
| 38 |
+ else |
| 39 |
+ { |
| 40 |
+ char** prpl_formats = g_strsplit(prplinfo->icon_spec.format,",",0); |
| 41 |
+- ImlibLoadError err = IMLIB_LOAD_ERROR_UNKNOWN; |
| 42 |
++ Imlib_Load_Error err = IMLIB_LOAD_ERROR_UNKNOWN; |
| 43 |
+ |
| 44 |
+ close(temp_fd); |
| 45 |
+ /* Try to encode in a supported format. */ |
| 46 |
|
| 47 |
diff --git a/net-im/minbif/minbif-1.0.5-r2.ebuild b/net-im/minbif/minbif-1.0.5-r2.ebuild |
| 48 |
index 0262b1a..b50395c 100644 |
| 49 |
--- a/net-im/minbif/minbif-1.0.5-r2.ebuild |
| 50 |
+++ b/net-im/minbif/minbif-1.0.5-r2.ebuild |
| 51 |
@@ -37,6 +37,7 @@ pkg_setup() { |
| 52 |
src_prepare() { |
| 53 |
epatch "${FILESDIR}/${PN}-1.0.5-glib-single-includes.patch" |
| 54 |
epatch "${FILESDIR}/${PN}-1.0.5-gcc47.patch" |
| 55 |
+ epatch "${FILESDIR}/${PN}-1.0.5-rename-imlib-load-error.patch" |
| 56 |
|
| 57 |
sed -i "s/-Werror//g" CMakeLists.txt || die "sed failed" |
Archives