| 1 |
commit: 61dabecd1f95240f6ae95e9a61b768c27b0aa72a |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 7 22:25:07 2020 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 7 22:28:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61dabecd |
| 7 |
|
| 8 |
x11-misc/wmakerconf: fix compilation with glib 2.62 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/711042 |
| 11 |
Package-Manager: Portage-2.3.92, Repoman-2.3.20 |
| 12 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch | 14 ++++++++++++++ |
| 15 |
x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 3 ++- |
| 16 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..422aa9e813a |
| 21 |
--- /dev/null |
| 22 |
+++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch |
| 23 |
@@ -0,0 +1,14 @@ |
| 24 |
+diff -Naur wmakerconf-2.12.orig/src/error.h wmakerconf-2.12/src/error.h |
| 25 |
+--- wmakerconf-2.12.orig/src/error.h 2001-04-18 23:13:33.000000000 +0200 |
| 26 |
++++ wmakerconf-2.12/src/error.h 2020-03-07 23:21:51.336443663 +0100 |
| 27 |
+@@ -37,8 +37,8 @@ |
| 28 |
+ #define N_(string) (string) |
| 29 |
+ /* I18n */ |
| 30 |
+ |
| 31 |
+-#define error error_line=__LINE__,error_file=__FILE__,_error |
| 32 |
+-#define warning error_line=__LINE__,error_file=__FILE__,_warning |
| 33 |
++#define error _error |
| 34 |
++#define warning _warning |
| 35 |
+ #define MAXSTRLEN 1024 |
| 36 |
+ |
| 37 |
+ #undef NO |
| 38 |
|
| 39 |
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild |
| 40 |
index 57ed8fa294b..dcb30653f05 100644 |
| 41 |
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild |
| 42 |
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2019 Gentoo Authors |
| 45 |
+# Copyright 1999-2020 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=6 |
| 49 |
@@ -27,6 +27,7 @@ PATCHES=( |
| 50 |
"${FILESDIR}"/${P}-desktop.patch |
| 51 |
"${FILESDIR}"/${P}-format-security.patch |
| 52 |
"${FILESDIR}"/${P}-wmaker-0.95_support.patch |
| 53 |
+ "${FILESDIR}"/${P}-glib-2.62.patch |
| 54 |
) |
| 55 |
|
| 56 |
src_prepare() { |
Archives