diff options
| author | Marcin Deranek <marcin.deranek@booking.com> | 2020-05-20 09:13:32 +0200 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@booking.com> | 2020-05-20 09:13:32 +0200 |
| commit | aafa8266162f3798d906aada3ffe9d9d45361502 (patch) | |
| tree | 996e7187a3fabbdaae4fb50803f43f0c0c5de77a | |
| parent | b66d74e0c48d910cd1b78c9c0f7adf9c32555b33 (diff) | |
| download | portage-aafa8266162f3798d906aada3ffe9d9d45361502.tar.gz portage-aafa8266162f3798d906aada3ffe9d9d45361502.tar.bz2 portage-aafa8266162f3798d906aada3ffe9d9d45361502.zip | |
Fix gcc-10 compilation problems
| -rw-r--r-- | x11-wm/compiz/Manifest | 3 | ||||
| -rw-r--r-- | x11-wm/compiz/compiz-9999.ebuild | 4 | ||||
| -rw-r--r-- | x11-wm/compiz/files/gcc-10.patch | 24 |
3 files changed, 29 insertions, 2 deletions
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index 09c3c95..16a8518 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,2 +1,3 @@ AUX access_violation.patch 1023 BLAKE2B cc06552acc0241a4f4c30feee61023023143fbb935cf925a9c18037ddb6d8bb6ceafd6f8b05da5ab40b448195cbfdd71cd3a145d204330c7c4f708e26e9aead5 SHA512 9772aaa487284599ecbffabee4bc91d522c71797c3e08dddd549b4f13c1565f861c66a1b63feb72ce12b4432d852e259de2d22c9b82314ebcf28d10420736a63 -EBUILD compiz-9999.ebuild 3622 BLAKE2B 7d84f466860a303066929be9d5b50e6cdcd127c7f4895d3e4060b58e28175ef0161e2c16eaf0b51ee57d03565bc73c76a04f8dbf6bbb7f029934e0cb213e0505 SHA512 ccfab8ed09f4a117e966c08cc533b66997da8931024deca0af1a1adc76225695f729d6899e8ad3cc4860b4d39d5fca74bc5e7ca9729c88decad28671db8b89b2 +AUX gcc-10.patch 1187 BLAKE2B f4f2daa0ec40c58d022c48cf78dc04c87509ec434569695e0dbccd9df4251977f29bce78b570c4ab5d65f8ac64238fb83ab4ae56899cc0119e6090d7b1c6d6bf SHA512 6d5f19ce3f2fc1e24698a3a6dcf5c53b985c149a1c1084f92ed4904cd4c0ff343e38804bcd139e1382026670d0495dcd7663efc508a781978421c1c51ee16f42 +EBUILD compiz-9999.ebuild 3698 BLAKE2B 52219e546bcd690701d3a23434c4c89e7673eb6e3e317cf8d9b9ed8839183338af60434503cf9d346b73a43e46960fe646b46ce77b7aee24cae88c36ad38c52f SHA512 a908aa504f940353d0068e8d41b53d3ceb36b3b5b26d242decae0fc3fc984b633ea3955f1ed664e8d2ddee14bedf98f14acd8ff09907053cb09d9196afb3c2c7 diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild index a361230..7cc4cd7 100644 --- a/x11-wm/compiz/compiz-9999.ebuild +++ b/x11-wm/compiz/compiz-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit cmake-utils eutils gnome2-utils xdg-utils python-single-r1 toolchain-funcs @@ -44,6 +44,7 @@ COMMONDEPEND=" dev-libs/libxslt $(python_gen_cond_dep ' dev-python/cython[${PYTHON_MULTI_USEDEP}] + dev-python/setuptools[${PYTHON_MULTI_USEDEP}] ') dev-libs/protobuf media-libs/libpng @@ -92,6 +93,7 @@ RDEPEND="${COMMONDEPEND} x11-themes/hicolor-icon-theme" PATCHES=( "${FILESDIR}/access_violation.patch" + "${FILESDIR}/gcc-10.patch" ) pkg_pretend() { diff --git a/x11-wm/compiz/files/gcc-10.patch b/x11-wm/compiz/files/gcc-10.patch new file mode 100644 index 0000000..a5867b4 --- /dev/null +++ b/x11-wm/compiz/files/gcc-10.patch @@ -0,0 +1,24 @@ +diff -Nur original/gtk/window-decorator/gtk-window-decorator.c modified/gtk/window-decorator/gtk-window-decorator.c +--- original/gtk/window-decorator/gtk-window-decorator.c 2019-11-27 13:24:31.000000000 +0000 ++++ modified/gtk/window-decorator/gtk-window-decorator.c 2020-05-17 00:28:11.586617947 +0100 +@@ -122,7 +122,7 @@ + + XRenderPictFormat *xformat_rgba; + +-const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM] = { ++const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM] = { + "normal", "modal_dialog", "dialog", "menu", "utility" + }; + +diff -Nur original/gtk/window-decorator/gtk-window-decorator.h modified/gtk/window-decorator/gtk-window-decorator.h +--- original/gtk/window-decorator/gtk-window-decorator.h 2019-11-27 13:24:31.000000000 +0000 ++++ modified/gtk/window-decorator/gtk-window-decorator.h 2020-05-17 00:27:21.383286282 +0100 +@@ -272,7 +272,7 @@ + } default_frame_references_t; + + extern default_frame_references_t default_frames[WINDOW_TYPE_FRAMES_NUM * 2]; +-const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM]; ++const gchar * __attribute__((__common__))window_type_frames[WINDOW_TYPE_FRAMES_NUM]; + + extern char *program_name; + |