diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-07 23:25:07 +0100 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2020-03-07 23:28:48 +0100 |
| commit | 61dabecd1f95240f6ae95e9a61b768c27b0aa72a (patch) | |
| tree | bec6019dc1f63fa558ad1c2a55706950a3bacbd2 | |
| parent | virtual/man: remove providers that no longer exist (diff) | |
| download | gentoo-61dabecd1f95240f6ae95e9a61b768c27b0aa72a.tar.gz gentoo-61dabecd1f95240f6ae95e9a61b768c27b0aa72a.tar.bz2 gentoo-61dabecd1f95240f6ae95e9a61b768c27b0aa72a.zip | |
x11-misc/wmakerconf: fix compilation with glib 2.62
Closes: https://bugs.gentoo.org/711042
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli <voyageur@gentoo.org>
| -rw-r--r-- | x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch | 14 | ||||
| -rw-r--r-- | x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild | 3 |
2 files changed, 16 insertions, 1 deletions
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 new file mode 100644 index 000000000000..422aa9e813a9 --- /dev/null +++ b/x11-misc/wmakerconf/files/wmakerconf-2.12-glib-2.62.patch @@ -0,0 +1,14 @@ +diff -Naur wmakerconf-2.12.orig/src/error.h wmakerconf-2.12/src/error.h +--- wmakerconf-2.12.orig/src/error.h 2001-04-18 23:13:33.000000000 +0200 ++++ wmakerconf-2.12/src/error.h 2020-03-07 23:21:51.336443663 +0100 +@@ -37,8 +37,8 @@ + #define N_(string) (string) + /* I18n */ + +-#define error error_line=__LINE__,error_file=__FILE__,_error +-#define warning error_line=__LINE__,error_file=__FILE__,_warning ++#define error _error ++#define warning _warning + #define MAXSTRLEN 1024 + + #undef NO diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild index 57ed8fa294b4..dcb30653f053 100644 --- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild +++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}"/${P}-desktop.patch "${FILESDIR}"/${P}-format-security.patch "${FILESDIR}"/${P}-wmaker-0.95_support.patch + "${FILESDIR}"/${P}-glib-2.62.patch ) src_prepare() { |