Fix missing include (bug #533234 by Samuel BAUER).

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 39 insertions, 25 deletions

diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index 1a7901e30c66..eb1cfd548362 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fbdesk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.37 2013/10/19 15:05:24 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.38 2014/12/22 09:15:38 jer Exp $
+
+  22 Dec 2014; Jeroen Roovers <jer@gentoo.org> fbdesk-1.4.1.ebuild,
+  files/fbdesk-1.4.1-gcc-4.3.patch:
+  Fix missing include (bug #533234 by Samuel BAUER).
 
   19 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due desktop-wm removal
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 82913dc6a36d..a89f5f18cc2d 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.12 2011/09/13 13:02:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.13 2014/12/22 09:15:38 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils
 
 DESCRIPTION="fluxbox-util application that creates and manage icons on your Fluxbox desktop"
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
index fba8bfe97176..97c0b31678af 100644
--- a/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
@@ -1,5 +1,5 @@
---- fbdesk-1.4.1.orig/src/FbDesk.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbDesk.cc	2008-04-18 23:23:53.000000000 +0200
+--- a/src/FbDesk.cc
++++ b/src/FbDesk.cc
 @@ -37,10 +37,11 @@
  #include <iostream>
  #include <fstream>
@@ -12,8 +12,8 @@
  using namespace FbTk;
  
  
---- fbdesk-1.4.1.orig/src/FbTk/FbPixmap.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/FbPixmap.cc	2008-04-18 22:55:06.000000000 +0200
+--- a/src/FbTk/FbPixmap.cc
++++ b/src/FbTk/FbPixmap.cc
 @@ -28,10 +28,11 @@
  
  #include <X11/Xutil.h>
@@ -26,8 +26,8 @@
  
  namespace FbTk {
  
---- fbdesk-1.4.1.orig/src/FbTk/KeyUtil.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/KeyUtil.cc	2008-04-18 22:56:17.000000000 +0200
+--- a/src/FbTk/KeyUtil.cc
++++ b/src/FbTk/KeyUtil.cc
 @@ -23,10 +23,11 @@
  
  #include "KeyUtil.hh"
@@ -40,8 +40,8 @@
  
  struct t_modlist{
      char *str;
---- fbdesk-1.4.1.orig/src/FbTk/StringUtil.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/StringUtil.cc	2008-04-18 22:52:54.000000000 +0200
+--- a/src/FbTk/StringUtil.cc
++++ b/src/FbTk/StringUtil.cc
 @@ -47,10 +47,11 @@
  
  
@@ -54,8 +54,8 @@
  using std::transform;
  
  namespace FbTk {
---- fbdesk-1.4.1.orig/src/FbTk/TextBox.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/TextBox.cc	2008-04-18 22:58:22.000000000 +0200
+--- a/src/FbTk/TextBox.cc
++++ b/src/FbTk/TextBox.cc
 @@ -34,10 +34,11 @@
  #endif
  #include <X11/keysym.h>
@@ -68,8 +68,8 @@
  
  TextBox::TextBox(int screen_num,
                   const Font &font, const std::string &text):
---- fbdesk-1.4.1.orig/src/FbTk/TextureRender.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/TextureRender.cc	2008-04-18 22:48:18.000000000 +0200
+--- a/src/FbTk/TextureRender.cc
++++ b/src/FbTk/TextureRender.cc
 @@ -31,10 +31,11 @@
  #include "FbPixmap.hh"
  #include "GContext.hh"
@@ -82,8 +82,8 @@
  #else
    #include <stdio.h>
  #endif
---- fbdesk-1.4.1.orig/src/FbTk/Theme.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/Theme.cc	2008-04-18 22:49:14.000000000 +0200
+--- a/src/FbTk/Theme.cc
++++ b/src/FbTk/Theme.cc
 @@ -34,10 +34,11 @@
  #else
    #include <stdio.h>
@@ -96,8 +96,8 @@
  
  namespace FbTk {
  
---- fbdesk-1.4.1.orig/src/FbTk/ThemeItems.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/ThemeItems.cc	2008-04-18 23:22:03.000000000 +0200
+--- a/src/FbTk/ThemeItems.cc
++++ b/src/FbTk/ThemeItems.cc
 @@ -46,10 +46,12 @@
    #include <stdio.h>
  #endif
@@ -111,8 +111,8 @@
  
  using std::string;
  using std::cerr;
---- fbdesk-1.4.1.orig/src/FbTk/XFontImp.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/FbTk/XFontImp.cc	2008-04-18 22:45:31.000000000 +0200
+--- a/src/FbTk/XFontImp.cc
++++ b/src/FbTk/XFontImp.cc
 @@ -26,10 +26,11 @@
  #include "GContext.hh"
  #include "FbPixmap.hh"
@@ -125,8 +125,8 @@
  #ifdef HAVE_CSTDIO
    #include <cstdio>
  #else
---- fbdesk-1.4.1.orig/src/main.cc	2008-04-18 22:42:17.000000000 +0200
-+++ fbdesk-1.4.1/src/main.cc	2008-04-18 23:24:47.000000000 +0200
+--- a/src/main.cc
++++ b/src/main.cc
 @@ -21,14 +21,16 @@
  
  #include "App.hh"
@@ -144,3 +144,13 @@
  
  ///  handles system signals
  void signalhandler(int sig) {
+--- a/src/FbTk/ImagePNG.cc
++++ b/src/FbTk/ImagePNG.cc
+@@ -30,6 +30,7 @@
+ #include <png.h>
+ #include <cstdio>
+ #include <iostream>
++#include <cstring>
+ using namespace std;
+ 
+ namespace {