Commit a658c4d1 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

blackbox: remove deprecated package 



Also update legacy as well.
And remove the BR2_DEPRECATED_SINCE_2014_08 symbol since it's unused
now.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 4ac4bc32

Config.in

+0 −4
Original line number Diff line number Diff line
@@ -296,10 +296,6 @@ config BR2_DEPRECATED 


if BR2_DEPRECATED



config BR2_DEPRECATED_SINCE_2014_08

	bool

	default y



config BR2_DEPRECATED_SINCE_2015_02

	bool

	default y

Config.in.legacy

+7 −0
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ endif 
###############################################################################

comment "Legacy options removed in 2015.11"



config BR2_PACKAGE_BLACKBOX

	bool "blackbox package has been removed"

	select BR2_LEGACY

	help

	  Upstream is dead and the package has been deprecated for

	  some time. There are other alternative maintained WMs.



config BR2_KERNEL_HEADERS_3_0

	bool "kernel headers version 3.0.x are no longer supported"

	select BR2_KERNEL_HEADERS_3_2

package/Config.in

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ comment "X libraries and helper libraries" 
	source "package/x11r7/xkeyboard-config/Config.in"



comment "X window managers"

	source "package/blackbox/Config.in"

	source "package/enlightenment/Config.in"

	source "package/fluxbox/Config.in"

	source "package/matchbox/Config.in"

package/blackbox/0001-Fix-configure-ac.patch

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
blackbox: merge existing patch and fix lpthread



Merge the current configure patch into this one so it will patch 

configure.ac instead. Also add pthread to libs to fix a linkage problem.



Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

--- blackbox-0.70.1/configure.ac.orig	2013-12-17 11:02:38.799055141 +0000

+++ blackbox-0.70.1/configure.ac	2013-12-17 11:09:08.421204545 +0000

@@ -8,14 +8,6 @@ AC_CONFIG_SRCDIR([src/blackbox.cc])

 dnl Determine default prefix

 test "x$prefix" = "xNONE" && prefix="$ac_default_prefix"

 

-dnl Look in the most logical places for external libraries

-CPPFLAGS="$CPPFLAGS -I$prefix/include"

-LDFLAGS="$LDFLAGS -L$prefix/lib"

-if test "x$prefix" != "x/usr/local"; then

-  CPPFLAGS="$CPPFLAGS -I/usr/local/include"

-  LDFLAGS="$LDFLAGS -L/usr/local/lib"

-fi

-

 dnl Locate required external software

 AC_PROG_CC

 

@@ -128,6 +120,10 @@ int main(int, char **)

                   [AC_MSG_RESULT([no])]

                  )

 

+dnl required pthread

+AC_CHECK_LIB([pthread],

+	     [pthread_cancel],

+	     [LIBS="$LIBS -lpthread"])

 dnl needed for some X11 libs

 AC_CHECK_LIB([nsl],

              [t_open],

package/blackbox/0002-gcc43.patch

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
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