diff options
| author |   Sam James <sam@gentoo.org> | 2021-07-26 00:10:55 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-07-26 00:23:34 +0100 |
| commit | 1ab287d52bf8f597b107156a07e70a6348fecfbd (patch) | |
| tree | abf6a5847ec26150d1937ee06117e8c428b3a662 /x11-misc/slim/files | |
| parent | media-video/bino: update EAPI 6 -> 7, fix build with GCC 11 (diff) | |
| download | gentoo-1ab287d52bf8f597b107156a07e70a6348fecfbd.tar.gz gentoo-1ab287d52bf8f597b107156a07e70a6348fecfbd.tar.bz2 gentoo-1ab287d52bf8f597b107156a07e70a6348fecfbd.zip | |
x11-misc/slim: EAPI 7, cmake-utils--, fix build with GCC 11
Closes: https://bugs.gentoo.org/786498
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc/slim/files')
5 files changed, 20 insertions, 8 deletions
diff --git a/x11-misc/slim/files/slim-1.3.6-config.diff b/x11-misc/slim/files/slim-1.3.6-config.diff index 9da6795cccfa..561e6a99273c 100644 --- a/x11-misc/slim/files/slim-1.3.6-config.diff +++ b/x11-misc/slim/files/slim-1.3.6-config.diff @@ -1,5 +1,5 @@ ---- slim.conf.orig 2010-08-25 11:52:23.000000000 -0400 -+++ slim.conf 2010-08-25 11:58:58.000000000 -0400 +--- a/slim.conf.orig 2010-08-25 11:52:23.000000000 -0400 ++++ b/slim.conf 2010-08-25 11:58:58.000000000 -0400 @@ -2,7 +2,7 @@ # Note: -xauth $authfile is automatically appended default_path /bin:/usr/bin:/usr/local/bin diff --git a/x11-misc/slim/files/slim-1.3.6-freetype.patch b/x11-misc/slim/files/slim-1.3.6-freetype.patch index 8cefc0bf0998..fe2aa60ad1b6 100644 --- a/x11-misc/slim/files/slim-1.3.6-freetype.patch +++ b/x11-misc/slim/files/slim-1.3.6-freetype.patch @@ -1,6 +1,6 @@ diff -up ./CMakeLists.txt.orig ./CMakeLists.txt ---- ./CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100 -+++ ./CMakeLists.txt 2014-11-11 20:39:34.206120264 +0100 +--- a/CMakeLists.txt.orig 2014-11-11 20:38:40.706121207 +0100 ++++ b/CMakeLists.txt 2014-11-11 20:39:34.206120264 +0100 @@ -165,7 +165,7 @@ include_directories( ${X11_Xft_INCLUDE_PATH} ${X11_Xrender_INCLUDE_PATH} diff --git a/x11-misc/slim/files/slim-1.3.6-gcc11.patch b/x11-misc/slim/files/slim-1.3.6-gcc11.patch new file mode 100644 index 000000000000..a6b07c637780 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-gcc11.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/786498 +--- a/panel.cpp ++++ b/panel.cpp +@@ -48,7 +48,7 @@ + gcm = GCGraphicsExposures; + gcv.graphics_exposures = False; + WinGC = XCreateGC(Dpy, Win, gcm, &gcv); +- if (WinGC < 0) { ++ if (WinGC == 0) { + cerr << APPNAME + << ": failed to create pixmap\n."; + exit(ERR_EXIT); diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch index 8335e0fe9e75..2a43be75fb02 100644 --- a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch +++ b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400 -+++ CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400 +--- a/CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400 ++++ b/CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400 @@ -42,11 +42,6 @@ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch index f116c5ebc976..9ffa19ce0537 100644 --- a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch +++ b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400 -+++ CMakeLists.txt.new 2013-10-17 09:41:41.602917345 -0400 +--- a/CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400 ++++ b/CMakeLists.txt 2013-10-17 09:41:41.602917345 -0400 @@ -238,10 +238,6 @@ install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) # configure |