[gentoo-commits] repo/gentoo:master commit in: net-im/minbif/, net-im/minbif/files/

[gentoo-commits] repo/gentoo:master commit in: net-im/minbif/, net-im/minbif/files/

[Austin English]

commit:     d8e1de3d0691bfc645271202a0e82657a6778eb4
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 18:47:47 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon May  2 22:21:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e1de3d

net-im/minbif: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-im/minbif/files/minbif.initd                                 | 4 ++--
 net-im/minbif/minbif-1.0.5-r1.ebuild                             | 2 +-
 net-im/minbif/{minbif-1.0.5-r1.ebuild => minbif-1.0.5-r2.ebuild} | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-im/minbif/files/minbif.initd b/net-im/minbif/files/minbif.initd
index a2d5649..ce52663 100644
--- a/net-im/minbif/files/minbif.initd
+++ b/net-im/minbif/files/minbif.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-im/minbif/minbif-1.0.5-r1.ebuild b/net-im/minbif/minbif-1.0.5-r1.ebuild
index 1586a3d..0262b1a 100644
--- a/net-im/minbif/minbif-1.0.5-r1.ebuild
+++ b/net-im/minbif/minbif-1.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

diff --git a/net-im/minbif/minbif-1.0.5-r1.ebuild b/net-im/minbif/minbif-1.0.5-r2.ebuild
similarity index 97%
copy from net-im/minbif/minbif-1.0.5-r1.ebuild
copy to net-im/minbif/minbif-1.0.5-r2.ebuild
index 1586a3d..0262b1a 100644
--- a/net-im/minbif/minbif-1.0.5-r1.ebuild
+++ b/net-im/minbif/minbif-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 

[gentoo-commits] repo/gentoo:master commit in: net-im/minbif/, net-im/minbif/files/

[Michael Orlitzky]

commit:     159f337e908f4b7c9dff13ebd92df7adcc3e27b5
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 28 17:05:51 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 17:06:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159f337e

net-im/minbif: fix build with newer imlib.

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

 .../minbif/files/minbif-1.0.5-rename-imlib-load-error.patch | 13 +++++++++++++
 net-im/minbif/minbif-1.0.5-r2.ebuild                        |  1 +
 2 files changed, 14 insertions(+)

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
index 0000000..e9fa875
--- /dev/null
+++ b/net-im/minbif/files/minbif-1.0.5-rename-imlib-load-error.patch
@@ -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. */

diff --git a/net-im/minbif/minbif-1.0.5-r2.ebuild b/net-im/minbif/minbif-1.0.5-r2.ebuild
index 0262b1a..b50395c 100644
--- a/net-im/minbif/minbif-1.0.5-r2.ebuild
+++ b/net-im/minbif/minbif-1.0.5-r2.ebuild
@@ -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"