summaryrefslogtreecommitdiff
path: root/x11-wm/blackbox/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-01-01 21:06:00 +0000
commit129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree53bf797418ac5e9b99c41ca0382c87b82421e5de /x11-wm/blackbox/files
parent441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
gentoo new year resync : 01.01.2021
Diffstat (limited to 'x11-wm/blackbox/files')
-rw-r--r--x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch49
-rw-r--r--x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch106
-rw-r--r--x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch14
3 files changed, 0 insertions, 169 deletions
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch b/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
deleted file mode 100644
index a6b1e22e62b5..000000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-asneeded.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Fixing build with as-needed. Enabling shared libs.
-
-http://bugs.gentoo.org/show_bug.cgi?id=248549
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -22,7 +22,7 @@
-
- DEFAULT_MENU = $(pkgdatadir)/menu
- DEFAULT_STYLE = $(pkgdatadir)/styles/Gray
--CPPFLAGS = @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
-+AM_CPPFLAGS = @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
- -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
- -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
- -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
---- lib/Makefile.am
-+++ lib/Makefile.am
-@@ -62,7 +62,8 @@
- Util.hh \
- XDG.hh
-
--libbt_la_LIBADD = @ICONV@ @LOCALE@
-+libbt_la_LIBADD = @ICONV@ @LOCALE@ @xft_LIBS@
-+libbt_la_CFLAGS = @xft_CFLAGS@
-
- pkgconfigdir = $(libdir)/pkgconfig
- nodist_pkgconfig_DATA = libbt.pc
---- util/Makefile.am
-+++ util/Makefile.am
-@@ -21,7 +21,7 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
-
--CPPFLAGS = @CPPFLAGS@ @DEBUG@ @NLS@ \
-+AM_CPPFLAGS = @DEBUG@ @NLS@ \
- -I$(top_srcdir)/lib
-
- bin_SCRIPTS = bsetbg
---- configure.ac
-+++ configure.ac
-@@ -29,7 +29,7 @@
- AC_PROG_INSTALL
-
- dnl libbt shouldn't be shared by default (yet)
--AC_DISABLE_SHARED
-+dnl AC_DISABLE_SHARED
- AC_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
-
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
deleted file mode 100644
index 1026bd5c80ee..000000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
---- blackbox-0.70.1.orig/lib/Image.cc 2005-04-08 17:41:09.000000000 +0200
-+++ blackbox-0.70.1/lib/Image.cc 2008-02-24 08:31:28.000000000 +0100
-@@ -42,8 +42,9 @@
-
- #include <assert.h>
- #include <math.h>
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-
- // #define COLORTABLE_DEBUG
- // #define MITSHM_DEBUG
-diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
---- blackbox-0.70.1.orig/lib/Resource.cc 2005-04-06 23:16:50.000000000 +0200
-+++ blackbox-0.70.1/lib/Resource.cc 2008-02-24 08:33:11.000000000 +0100
-@@ -28,7 +28,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xresource.h>
-
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
-
-
- bt::Resource::Resource(void)
-diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
---- blackbox-0.70.1.orig/lib/XDG.cc 2005-04-06 16:04:38.000000000 +0200
-+++ blackbox-0.70.1/lib/XDG.cc 2008-02-24 08:34:11.000000000 +0100
-@@ -25,7 +25,8 @@
- #include "Util.hh"
- #include "XDG.hh"
-
--#include <stdlib.h>
-+#include <cstdlib>
-+#include <algorithm>
-
-
- // make sure directory names end with a slash
-diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
---- blackbox-0.70.1.orig/src/BlackboxResource.cc 2005-10-18 09:34:46.000000000 +0200
-+++ blackbox-0.70.1/src/BlackboxResource.cc 2008-02-24 08:34:49.000000000 +0100
-@@ -33,6 +33,8 @@
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
-
-+#include <cstring>
-+
-
- BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
- screen_resources = 0;
-diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
---- blackbox-0.70.1.orig/src/main.cc 2005-01-03 10:42:57.000000000 +0100
-+++ blackbox-0.70.1/src/main.cc 2008-02-24 08:37:16.000000000 +0100
-@@ -34,7 +34,8 @@
- #include "blackbox.hh"
- #include "../version.h"
-
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
-
-
- static void showHelp(int exitval) {
-diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
---- blackbox-0.70.1.orig/src/Screen.cc 2005-10-18 10:07:22.000000000 +0200
-+++ blackbox-0.70.1/src/Screen.cc 2008-02-24 08:35:46.000000000 +0100
-@@ -45,8 +45,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <assert.h>
--#include <ctype.h>
- #include <dirent.h>
-+#include <cctype>
-+#include <cstring>
-
-
- static bool running = true;
-diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
---- blackbox-0.70.1.orig/src/ScreenResource.cc 2005-04-13 07:54:08.000000000 +0200
-+++ blackbox-0.70.1/src/ScreenResource.cc 2008-02-24 08:36:31.000000000 +0100
-@@ -33,6 +33,8 @@
-
- #include <assert.h>
-
-+#include <cstring>
-+
-
- static const int iconify_width = 9;
- static const int iconify_height = 9;
-diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
---- blackbox-0.70.1.orig/util/bsetroot.cc 2005-03-15 08:01:37.000000000 +0100
-+++ blackbox-0.70.1/util/bsetroot.cc 2008-02-24 08:38:41.000000000 +0100
-@@ -30,7 +30,9 @@
- #include <cctype>
-
- #include <X11/Xatom.h>
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-
-
- // ignore all X errors
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch b/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
deleted file mode 100644
index e907b588b158..000000000000
--- a/x11-wm/blackbox/files/blackbox-0.70.1-no-LDFLAGS-pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix LDFGAS leak to .pc file:
-> * QA Notice: pkg-config files with wrong LDFLAGS detected:
-> * /usr/lib64/pkgconfig/libbt.pc:Libs: -L${libdir} -lbt -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu -L/usr/lib -L/usr/local/lib
-diff --git a/lib/libbt.pc.in b/lib/libbt.pc.in
-index a2a8869..8246cb0 100644
---- a/lib/libbt.pc.in
-+++ b/lib/libbt.pc.in
-@@ -7,5 +7,5 @@ Name: Blackbox Toolbox
- Description: Utility class library for writing small applications
- Requires: @XFT_PKGCONFIG@
- Version: @VERSION@
--Libs: -L${libdir} -lbt @LDFLAGS@ @ICONV@ @LOCALE@
-+Libs: -L${libdir} -lbt @ICONV@ @LOCALE@
- Cflags: -I${includedir}/bt