diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-11-02 12:46:54 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-11-02 12:46:54 +0000 |
| commit | b46454ed6e3a067f2374315e8bf2e00fe6bff2d2 (patch) | |
| tree | cf200436aff891ee57c549d053f805faa253a071 /x11-misc/xfe | |
| parent | Version bump. (diff) | |
| download | historical-b46454ed6e3a067f2374315e8bf2e00fe6bff2d2.tar.gz historical-b46454ed6e3a067f2374315e8bf2e00fe6bff2d2.tar.bz2 historical-b46454ed6e3a067f2374315e8bf2e00fe6bff2d2.zip | |
Fix building with USE="-startup-notification" wrt #343825 by Diego Elio Pettenò.
Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64
Diffstat (limited to 'x11-misc/xfe')
| -rw-r--r-- | x11-misc/xfe/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xfe/Manifest | 15 | ||||
| -rw-r--r-- | x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch | 35 | ||||
| -rw-r--r-- | x11-misc/xfe/xfe-1.32.2.ebuild | 4 |
4 files changed, 47 insertions, 14 deletions
diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog index d0721a0eb439..d6cb08950d56 100644 --- a/x11-misc/xfe/ChangeLog +++ b/x11-misc/xfe/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xfe # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.63 2010/10/31 23:32:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.64 2010/11/02 12:46:54 ssuominen Exp $ + + 02 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> xfe-1.32.2.ebuild, + +files/xfe-1.32.2-missing_Xlib_h.patch: + Fix building with USE="-startup-notification" wrt #343825 by Diego Elio + Pettenò. *xfe-1.32.2 (31 Oct 2010) diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest index 24c831e00df3..40c5f613db0f 100644 --- a/x11-misc/xfe/Manifest +++ b/x11-misc/xfe/Manifest @@ -1,17 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xfe-1.32.1-inline.patch 506 RMD160 fcaf8d4f71fba3e6e18137481627bd9f94f399ff SHA1 3bec4260e2d1ddfcb7c33e1974470d96ef06320d SHA256 cf49ab5a90d8be3f5c7745caf6650b21284ae9290cced2739e81892a998458e9 +AUX xfe-1.32.2-missing_Xlib_h.patch 624 RMD160 d7d9278e0fb92e5b3f6ec0f8836af7471a634232 SHA1 1afdedc200f4370196bea2f5ae6690b9657dcf10 SHA256 7f3d83dc14055be5cb8e7ef0e7254f70c3c6984eea5d7d5a11aafa3f274d9b5a DIST xfe-1.32.1.tar.gz 2115355 RMD160 474ea8b37d182f5119fb956df8fab2a66b1b0783 SHA1 c5b5ac3d2f7e18706dc7fb58b464c8eca6601ba1 SHA256 95025634152291c448a4bc66972d800e05fdc1240daa4b49698deeb3c02ab43a DIST xfe-1.32.2.tar.gz 2290341 RMD160 1a89887830aaa8d6c96195ba7fd5b9a4fe710fa3 SHA1 758564bf5637d47712328dd062cf1ceb8744d053 SHA256 bb3e88c96987710cf7614edbfb3fe493c7eb8b503eb3bbfb791801337b819bfd EBUILD xfe-1.32.1.ebuild 1132 RMD160 6dce809327b33ee3cddc686366b7a6e8da85a879 SHA1 eedc5273a20547c6f058843a22c40d1aff8103f4 SHA256 e590abee00fee345bcd2346f24ce56286b47bbe9835481d5a32dd32f819e0e95 -EBUILD xfe-1.32.2.ebuild 1095 RMD160 19781c576ac1ce96e3f5fba31d72876fe28c2772 SHA1 e2eaafe246ccde0fab45448026189c0b66427d96 SHA256 af66a6e9fdc93856f150071e1b0092753ed3b70cee6ff69f4550f2f6fc411da0 -MISC ChangeLog 7400 RMD160 8f7d0798162d988afc91ab470e4d18a2eb8237b0 SHA1 43c9f4fe1b17a5ea752f4fd92258f0e09d2adfe5 SHA256 211f67d4dfc3907ce0e9edd5e106f54d11766e9b2282b8f9bcb080e908902b6c +EBUILD xfe-1.32.2.ebuild 1145 RMD160 da1cf091434f91dcf8eeff2efb43fd468621b0f1 SHA1 40937ea1c4b7a795071ac0580b1809bd161bea55 SHA256 d8de5c626c42596294802cc1928a0b657c28e0aea25afaf3068883d28e25954a +MISC ChangeLog 7603 RMD160 c9ee880d5d7e8f696af8ed822c8fbc101ee19140 SHA1 77de884f580b35bcfdff59becfedb481ae34c100 SHA256 68d689bff80993756e6fdf28b03c3f0d586b424c2b1a80bd7617578ccff6166a MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkzN/LQACgkQ9/cejkQaxBDQ4wCeIXBSwg7hQ/FMiUji9qJJqaVV -XbwAn3DX+rIeOj7jmzys9SaoByg8aVD3 -=bkFw ------END PGP SIGNATURE----- diff --git a/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch b/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch new file mode 100644 index 000000000000..a29a252dc8e6 --- /dev/null +++ b/x11-misc/xfe/files/xfe-1.32.2-missing_Xlib_h.patch @@ -0,0 +1,35 @@ +http://bugs.gentoo.org/343825 + +--- src/ViewWindow.cpp ++++ src/ViewWindow.cpp +@@ -12,6 +12,8 @@ + #include <string.h> + #include <unistd.h> + ++#include <X11/Xlib.h> ++ + #include <fx.h> + #include <fxkeys.h> + #include <FXPNGIcon.h> +--- src/WriteWindow.cpp ++++ src/WriteWindow.cpp +@@ -12,6 +12,8 @@ + #include <unistd.h> + #include <signal.h> + ++#include <X11/Xlib.h> ++ + #include <fx.h> + #include <fxkeys.h> + #include <FXPNGIcon.h> +--- src/XFileExplorer.cpp ++++ src/XFileExplorer.cpp +@@ -8,6 +8,8 @@ + #include <sys/wait.h> + #include <unistd.h> + ++#include <X11/Xlib.h> ++ + #include <fx.h> + #include <fxkeys.h> + #include <FXPNGIcon.h> diff --git a/x11-misc/xfe/xfe-1.32.2.ebuild b/x11-misc/xfe/xfe-1.32.2.ebuild index 936319341845..c19b8ba7cb5a 100644 --- a/x11-misc/xfe/xfe-1.32.2.ebuild +++ b/x11-misc/xfe/xfe-1.32.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.32.2.ebuild,v 1.1 2010/10/31 23:32:50 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.32.2.ebuild,v 1.2 2010/11/02 12:46:54 ssuominen Exp $ EAPI=2 inherit eutils @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { + epatch "${FILESDIR}"/${P}-missing_Xlib_h.patch + cat >po/POTFILES.skip <<-EOF src/icons.cpp xfe.desktop.in.in |