diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
| commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
| tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /x11-plugins/wmapm | |
| parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) | |
gentoo resync : 13.06.2020
Diffstat (limited to 'x11-plugins/wmapm')
| -rw-r--r-- | x11-plugins/wmapm/Manifest | 3 | ||||
| -rw-r--r-- | x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch | 23 | ||||
| -rw-r--r-- | x11-plugins/wmapm/wmapm-3.1-r2.ebuild | 5 |
3 files changed, 29 insertions, 2 deletions
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest index e954acde65e0..59e66744a854 100644 --- a/x11-plugins/wmapm/Manifest +++ b/x11-plugins/wmapm/Manifest @@ -1,3 +1,4 @@ +AUX wmapm-3.1-fno-common.patch 767 BLAKE2B 66d644c6aab907608304476704d19ae5b3d725eb45f15dba91313719ef16354428aec93bc67ecbd78a0bd92b077f0f2cf758cf5f4a62478746074af85adca6cd SHA512 32a232d099f91fe58a0f8b2a0e23c80a4a78a504ff0935469edca81923dfa3ca8fe74248c730c4347fc6772e215246a361a121010aed42449bfd66e6b45eb828 DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e -EBUILD wmapm-3.1-r2.ebuild 777 BLAKE2B 70630c9faafd4a563ea5801ce88c152d1bed01c55d62485dde2088785dfef00946f576cc469d5d23dbfd8b5e5d940a4b3cdd7a7aa571aab3966bf0beb89cdc05 SHA512 2e9372b490b87e8ed9351e294bdbe9c2c9177a8008e74485eb79cfc116b88effe45a2e83ecb0d93407a18da4542b1a27b1035b6abf963569677b3a43e1f352d9 +EBUILD wmapm-3.1-r2.ebuild 854 BLAKE2B e7ec72849bc1387dc37e33b3576d3a0bb333700eb5e6107070501a866e360cf2113cde2ea8b32864443b1667eeed5a54fe8cde32bb3e81b7a2a48eb7cf60104f SHA512 779facbbca66ce574784f3f5ddc78bace9fdf6ec9b7f300a7075612118a3d75cc83b7758590145363f2ba8015101b3864546fdcf786b0b2b4bca7ac787d7cf3e MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad diff --git a/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch b/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch new file mode 100644 index 000000000000..74b8cb1c9c91 --- /dev/null +++ b/x11-plugins/wmapm/files/wmapm-3.1-fno-common.patch @@ -0,0 +1,23 @@ +diff -Naur wmapm-3.1.orig/wmgeneral/wmgeneral.c wmapm-3.1/wmgeneral/wmgeneral.c +--- wmapm-3.1.orig/wmgeneral/wmgeneral.c 1998-08-04 03:49:00.000000000 +0200 ++++ wmapm-3.1/wmgeneral/wmgeneral.c 2020-06-13 10:46:38.921354685 +0200 +@@ -50,6 +50,7 @@ + GC NormalGC; + XpmIcon wmgen; + Pixmap pixmask; ++Display *display; + + /*****************/ + /* Mouse Regions */ +diff -Naur wmapm-3.1.orig/wmgeneral/wmgeneral.h wmapm-3.1/wmgeneral/wmgeneral.h +--- wmapm-3.1.orig/wmgeneral/wmgeneral.h 1998-08-04 03:49:00.000000000 +0200 ++++ wmapm-3.1/wmgeneral/wmgeneral.h 2020-06-13 10:46:31.276348472 +0200 +@@ -28,7 +28,7 @@ + /* Global variable */ + /*******************/ + +-Display *display; ++extern Display *display; + + /***********************/ + /* Function Prototypes */ diff --git a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild index 870dfd26f77c..90652b1aee08 100644 --- a/x11-plugins/wmapm/wmapm-3.1-r2.ebuild +++ b/x11-plugins/wmapm/wmapm-3.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,9 @@ src_prepare() { #Respect LDFLAGS, see bug #334747 sed -i 's/ -o wmapm/ ${LDFLAGS} -o wmapm/' "Makefile" default + + pushd "${WORKDIR}"/${P} || die + eapply "${FILESDIR}"/${P}-fno-common.patch } src_compile() { |