diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /x11-misc/wmakerconf | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'x11-misc/wmakerconf')
| -rw-r--r-- | x11-misc/wmakerconf/Manifest | 3 | ||||
| -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 |
3 files changed, 18 insertions, 2 deletions
diff --git a/x11-misc/wmakerconf/Manifest b/x11-misc/wmakerconf/Manifest index ef634842fe66..3a1f56140afa 100644 --- a/x11-misc/wmakerconf/Manifest +++ b/x11-misc/wmakerconf/Manifest @@ -1,6 +1,7 @@ AUX wmakerconf-2.12-desktop.patch 337 BLAKE2B 6fb3b059a2240cc147ba720f72a18cbe2c5d5c5f0aeca2d52f809bce9902f2ce2fb67510d6efe97a616c2e2a28177fce35c584d46ccca697c12b942f49ef686d SHA512 599c668a481c51d9a0cd802c09ef855e6c0e1960ed27b1127390ee3da5f89967e6ad9a443bdb8cc47802d0d74b1d226be55fc4f6fa4f71eab61bf651cf3a2162 AUX wmakerconf-2.12-format-security.patch 575 BLAKE2B ea65a217b77218f6946f7a15dbb131fc319f377ac9d1d6bba471a391e2c6eaa79999198a78306c870f19eb0af155110fb02f1dd0fa5f4c3eeb6c3ef4717cfb80 SHA512 b341490da9937165f408311a1f4d56e513eef4b7362cc569d9cce327b01b7b614b688a5994b9cef8dc7872930930381fc031ba1a2a0a058a5e207f843ea137b3 +AUX wmakerconf-2.12-glib-2.62.patch 500 BLAKE2B 0e2358e79a0c9d028b58527b66311afdfd47774019027850b94dcd9a446377c05877b0986f0d36b5a3e33f9665e2389238e820944aa5956c2cbd458b6ff987ec SHA512 d607c6ef920173909187610ffc87fa6351b0ccc0be7ad55bb83575d0e0034be52d6c0e079824081f4436c0dce183aedd7de2328a7305837775a1bcc00a01d51a AUX wmakerconf-2.12-wmaker-0.95_support.patch 3548 BLAKE2B 0f79184e802703db3a9e9276edf7f1a94ee88fc9053774b8c5f326ce175fa090d8ad15339d66804b03584a82182abd8cafcf2fab707ac7e97c4e45dbeff33ca5 SHA512 be084d96f35ef6c94a1994abb75b5b71a68ffbc6e3ba9b122b380b632d42da743c94951618094ce42305f87ff238a0c667c76859a320229992c4e0316fcbc79a DIST wmakerconf_2.12.tar.gz 830156 BLAKE2B 65dd7d16606304b9746e84a3e71764b5491149ac27f4a1802faa5c14a66cbeaa4d04ecce66649acaf05f798e4fe643ac48b9df15c22e5b4e054951adf1d921df SHA512 4289846b20667a12c729b646ce5cc9d673adc49c3c99f1afcf0bf2eb978d7a62c93104e44f38c47984f5fc7bd22a78fff89d68646701c7e763a26ec18d4ff059 -EBUILD wmakerconf-2.12-r3.ebuild 1373 BLAKE2B 7aa7eaa8b628dc21b2f0e1b4c639b84da42e5be3d649411df858c12507e95407c80b87464981f8f785f216951861bfca32fb2fd9d0762bcddd48bd2692f10772 SHA512 528e71176380e7a5833897ce44cfd8c99a4a82985bcfd9463a0e1e3bc636e85c7124777391297d2d7b9a6ad2135026627b83537172aee5daa81f0d8b7b716a56 +EBUILD wmakerconf-2.12-r3.ebuild 1409 BLAKE2B d6852d9ae60dc9eb2aa8700876168211f9cef830a0c316a30799dca64fd96ecf0c1dba7fef1215f6723c3d72c874952abb47e4e08c217a19da1064d589207d45 SHA512 187e1aac499dc3d632a96e159c7d4cfed40d94596661f88a80ab494463aded7f10bbddde42a7147a9e7572a39510adc8cb70b6598df27f25856f56d949903d02 MISC metadata.xml 337 BLAKE2B 8a0c239dd9d71185a61e17ec3308c84ffa97f60dd152e50eaa50a250746f3fa7049d137d6bbe795444d9e84d66cfcf0bb6fe96031113e29e592eee52c00ab041 SHA512 8f144b1c6d8110362014ab291ecde3aef2192ffbe57ce8261849ef9069ad9449f6871a8aa7c2246b2ae866b4264e38261dee2836b86b25b73396ea7c19d1f9f5 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() { |