From 49b89c0b29436e469496be5559cd7cadafd243d6 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 22 Dec 2014 09:15:39 +0000 Subject: [PATCH] Fix missing include (bug #533234 by Samuel BAUER). Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA792A613 --- x11-misc/fbdesk/ChangeLog | 8 ++- x11-misc/fbdesk/Manifest | 16 +++--- x11-misc/fbdesk/fbdesk-1.4.1.ebuild | 6 +-- .../fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch | 50 +++++++++++-------- 4 files changed, 47 insertions(+), 33 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 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 metadata.xml: Cleanup due desktop-wm removal diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest index aefbab36ea7f..3137a5459a4d 100644 --- a/x11-misc/fbdesk/Manifest +++ b/x11-misc/fbdesk/Manifest @@ -1,17 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX fbdesk-1.4.1-gcc-4.3.patch 3506 SHA256 25f296b0079afd84a9e9fe4e5b057638ee79b5baaa869b70920008d1057a54e0 SHA512 2c6bea30632f47e0f25d4de5b043c1644537ec3b4b1bf108d20b96b567e34564795e0484fe4a3c695c635542a24a52b82fef2cc867282c47a2a059c3a314dda9 WHIRLPOOL e587aac35b4332d1ecdd6124094c2197a0052b3a15775c06fb6d1a60f7509e3d123ca1553110b1d115b2194b0fd1f019ca58b413006c837e11e2fb7983794bb4 +AUX fbdesk-1.4.1-gcc-4.3.patch 2703 SHA256 ba7462dba990e9d79291f098c839d906ed53fbbabd4a2cfc961a0a0227601f8d SHA512 31fb499b77fb844fb5466c7fea671c277b5947208c03315a20ba3c87c6e42fa6ce05e1a628bb9eaa143bebb310613b3ffb6d062f671af521f7e7146545e799b4 WHIRLPOOL 83bc713f74d6dbc59eb99a3dbc0e0469bf1bb6d1ff3d5be732312861c58df2ad98b60975164f6ec7f2e66854e9ab0ac776982a07b6ebac2f7c1cbfd977375468 AUX fbdesk-1.4.1-libpng14.patch 260 SHA256 d73f722d414c5024377df767f24b2ce5c33f10816cd30710b04b09f011e4bec3 SHA512 c8d5f0946b94ea82ae0a9dcdc603f4c7b443b68f77d7375dad0b14b9e172c63ac2e536b7130f80ab5995f8025f8c016dd06c7153818dfcd1ec99111d3e68493a WHIRLPOOL 85a10812ff1cdb4a2eb795432d02f484d24328c7a632ec04d1b411d7c366b6e84ddb97ab7ca10d1afb5819526fb8d7aa66323caea42be5e934f0fd74330b5154 AUX fbdesk-1.4.1-libpng15.patch 5823 SHA256 c6951dc8443293c9a036388ef76c89611a250223ab17157e6142c2a81792e5cc SHA512 2c2e049e9c39e011284dbbbe0330e4704dcb00fa762d6140843282bbc44af2f1d92cbc66d8c0a6e6ba79ca1fe2db45aef8f1f43199fb89109be014d16ada1c75 WHIRLPOOL eb590d7c2cd1361cbaa6d41147a2769dec2154470dfd1eff20edd2fb59da57fb1ec8091232acbc8459d928bb67729c325457beaf80432bc34e19c25125804de5 -DIST fbdesk-1.4.1.tar.gz 426550 SHA256 ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c -EBUILD fbdesk-1.4.1.ebuild 940 SHA256 6502e4765ffd4d669e2b39e677705425d0bd9c3c074b503ca65a016837f4f02e SHA512 37440f72931bcf6f3cd7475eee35722950905c4f4d9b0c66c0340a8398dbf148f8514c34e7072d8d22a099e677e44dec210efee79eba56d34ae31940d8c55fc3 WHIRLPOOL 291fca832ec49f8a6aaae6a239ee3f6b75bf07e6667f14a9672b88de24ee8fc55d84312cafbd5fe2006faeb90a419dd936abb48d1d3c9f5d040666a09e300094 -MISC ChangeLog 4968 SHA256 bc707d2ff9ea8367cd916dceae35c852ad0ad027786cd7795d4012e3b8d2fa5e SHA512 726fac8626be1d7091634a99e9dd465e6482b88a3c4cbeb0334a28fd5991680efd6aa08b3b122a675aee439661b8cc4f1330ae27c1160695b62b8f50be2fe2dc WHIRLPOOL 994d06afb08c38f31a9edce2d66eeeb660a92c43f77a176167b0ce9fe18b296bcd54f34c3b8594c23d908857405ab92bc91f6f96d64c37bd17a0dbba1646bf39 +DIST fbdesk-1.4.1.tar.gz 426550 SHA256 ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c SHA512 0a99ae062442f85a9d4018db0f2815c0e537488999e71aef18eb3df09526e2b9c931e5caf30bb0cf484ddce28c3fc3672773fbf576e3f932f30ee48c89b346a0 WHIRLPOOL f3b5ece5d9b59f961843cbe91ca4c2dbd65b0ddb7bf5091c25778579ed668d30b2b8a932f4ee1e42fef2aa4c0e3aa9c10e79dd865eec6b2bfdfa2a4a73a3465d +EBUILD fbdesk-1.4.1.ebuild 934 SHA256 388ff552b5ec089cfd0dcf436f5efce13545bf676b8757c7ac4d92312d11b4ca SHA512 f357c7f833db44954eba9e13189100786b3f3d425f63bcf1cabddb9a063d98831d051cd030f974580bdebe37e13fac01e946bb9d14aa38356beea755e4a72a20 WHIRLPOOL 876f9abc58da341a8490160fb2bcaa04a0c5b520e8ca8edc403ddd0aecce335a6644b7118fb8e0c3c2545d0a046c5647d4acc75c0dc83f41f552ffc5acf21356 +MISC ChangeLog 5124 SHA256 f9ce6dafff22b253b09c30771699fa0dbe2bd05b4791ee8e1e41a672a7a6e8fe SHA512 c28acbc409de0b7447265e5ea012e71f40a880343b16a232c9a505d7eaea1eef4472e8196d2b0beb06615e802fd0a062ae27d48ec5fc81927b82790237f5c7df WHIRLPOOL fe50446133e37724a1a14226f19d2692111bcbc5486794ade68eb2af19a49a223df6ceb5e3ff640a4d6acc4299c5f223964c655c99dbfe059de50d8ca1db85f1 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlJin7YACgkQCaWpQKGI+9S0swCfebhq7NnxqMki+kUfJIC9nXNL -Hn4An3B4+uG0xg5qJXH+CXrGueELF7/j -=w3Cw +iEYEAREIAAYFAlSX4TsACgkQVWmRsqeSphOmkACdF8avnDRwxrNVbDvdiZ+oiiIZ +pTgAnRN882k13oyGGoaNG7huv54ED0im +=nso7 -----END PGP SIGNATURE----- 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 #include @@ -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 @@ -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 @@ -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 #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 @@ -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 #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 #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 + #include + #include ++#include + using namespace std; + + namespace { -- 2.26.2