diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
| commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
| tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /x11-plugins/wmgrabimage | |
| parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) | |
gentoo resync : 05.02.2020
Diffstat (limited to 'x11-plugins/wmgrabimage')
| -rw-r--r-- | x11-plugins/wmgrabimage/Manifest | 3 | ||||
| -rw-r--r-- | x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch | 32 | ||||
| -rw-r--r-- | x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild | 9 |
3 files changed, 40 insertions, 4 deletions
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest index d86a2030aebf..cad4a4f4702f 100644 --- a/x11-plugins/wmgrabimage/Manifest +++ b/x11-plugins/wmgrabimage/Manifest @@ -1,5 +1,6 @@ +AUX wmgrabimage-0.72-gcc-10.patch 1009 BLAKE2B aa7be547c75400ec11afada57b8466eecbe0f18589503e72532ae32cfeab88efa1a3344b78feceb7f60844f8826d99d939fbfae8986c1b590c74f31cf5485e86 SHA512 479f97bc55fd0b6bec501f4ae3d698b2b6cf2258509f7afd6bedaddbc27447b471a3cda4f8c317c297ceb4880800dc79a2b2b0cd52611c49ecf12dc38f0c67e1 AUX wmgrabimage-noman.patch 295 BLAKE2B cb10ee8ea0e98a2c77fe51fb333ce722efa8d0ce7b4296cdae925deae9a4ac946cc88d97e5da6805ba3385381fbd4651fd4a4b75eedac0678b6d52b6b9d59496 SHA512 adaace112266f179c120fac600d5b4eb016806ac7075f69663880c5f518e09ee213f899318b74feb2777e5504c06fdc72f4d54e733fc9f2ba9bd533490c42307 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458 DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e -EBUILD wmgrabimage-0.72-r2.ebuild 1056 BLAKE2B 8929d496dd7b8c6196f213d612891703b41744d8d2da7f4562d09fb068753ad748d7889c8dc7b40d53f5e09db1ec2b108017525ac282fc683fcf98a50ffe2ac1 SHA512 19e587ebbbd722ea282be228313b0400328509059975256e10c912b240c83eb98f4b807dabb8489c6c7c1e9b6e09faf6cf1256cb7ddf442a49ce45a5901d4e53 +EBUILD wmgrabimage-0.72-r2.ebuild 1108 BLAKE2B b8ba771cb7d67ebe95d82a667b8319d501de210edcbfff1a9b1d1dd2f9607013ba69253f00eac2298c3b793951624f16dbd3364863190733825749a9b67d9416 SHA512 976065532662b03bb110d6479d55bca9dc6b7d6aadb90bde747b66842fcda762ce1916fda4cb3078edbe9e2ef70cef7dd79ad1c89714da73006ffa66c842fc35 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d diff --git a/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch new file mode 100644 index 000000000000..f7b85c9d1bc5 --- /dev/null +++ b/x11-plugins/wmgrabimage/files/wmgrabimage-0.72-gcc-10.patch @@ -0,0 +1,32 @@ +diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c wmGrabImage-0.72/wmgeneral/wmgeneral.c +--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.c 2001-05-27 21:02:18.000000000 +0200 ++++ wmGrabImage-0.72/wmgeneral/wmgeneral.c 2020-02-02 12:25:53.013879815 +0100 +@@ -47,6 +47,10 @@ + char *Geometry = ""; + Window iconwin, win; + Pixmap pixmask; ++Display *display; ++Window Root; ++GC NormalGC; ++XpmIcon wmgen; + + /*****************/ + /* Mouse Regions */ +diff -Naur wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h wmGrabImage-0.72/wmgeneral/wmgeneral.h +--- wmGrabImage-0.72.orig/wmgeneral/wmgeneral.h 2001-05-27 21:02:18.000000000 +0200 ++++ wmGrabImage-0.72/wmgeneral/wmgeneral.h 2020-02-02 12:25:31.926869125 +0100 +@@ -28,10 +28,10 @@ + /* Global variable */ + /*******************/ + +-Display *display; +-Window Root; +-GC NormalGC; +-XpmIcon wmgen; ++extern Display *display; ++extern Window Root; ++extern GC NormalGC; ++extern XpmIcon wmgen; + + + /***********************/ diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild index 131e0beaee7a..b1d7ff43dabc 100644 --- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild +++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,9 +29,12 @@ S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN} PATCHES=( "${FILESDIR}"/${PN}-noman.patch ) src_prepare() { - sed -i -e 's/-geom /-geometry /' GrabImage || die "sed failed." - sed -i -e 's/install -s -m /install -m /' Makefile || die "sed failed." + sed -i -e 's/-geom /-geometry /' GrabImage || die + sed -i -e 's/install -s -m /install -m /' Makefile || die default + + pushd "${WORKDIR}"/${MY_PN}-${PV} || die + eapply "${FILESDIR}"/${P}-gcc-10.patch } src_compile() { |