From 36e7431572d2980cbed0060085a99fb4957dce60 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 19 Apr 2012 15:32:43 -0700 Subject: [PATCH] cairo-dock: Fix glib compile issue --- x11-misc/cairo-dock/Manifest | 3 ++- ...-dock-3.0.0.ebuild => cairo-dock-3.0.0-r1.ebuild} | 1 + x11-misc/cairo-dock/files/glib-include.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) rename x11-misc/cairo-dock/{cairo-dock-3.0.0.ebuild => cairo-dock-3.0.0-r1.ebuild} (97%) create mode 100644 x11-misc/cairo-dock/files/glib-include.patch diff --git a/x11-misc/cairo-dock/Manifest b/x11-misc/cairo-dock/Manifest index 02be830..9c54b50 100644 --- a/x11-misc/cairo-dock/Manifest +++ b/x11-misc/cairo-dock/Manifest @@ -1,6 +1,7 @@ AUX fix_lib6464.patch 850 RMD160 5dc45c849411c7e641e06f0512e1a0169a3331d4 SHA1 5c5b629a8b51b97b0c39265a7a84d68b36d5b733 SHA256 3eaa7d90620cb5e13d9be54e29a6fbcbb0e8d4cc5e8af11f63da6acf4499de18 +AUX glib-include.patch 490 RMD160 9ebff56fc96538baee7d25c7339bf07047634994 SHA1 be41f05f98cb4cd82ac1f23deace67f61240bdb9 SHA256 3cc33d6069e2e5c95227377e10ec06e485289edd4be49c3ab2e9d57fc720e45a AUX improved-cairo-dock-session.patch 5129 RMD160 33000789484425f77ade2f9016c37ac514183b67 SHA1 3cc8dbea855e11c51804183c6156b71fb2608fa1 SHA256 015147962c7e9a0a131b8ec52334d6ad51409e12f814011ce31653a7024cceb2 DIST cairo-dock-2.4.0~2.tar.gz 2281677 RMD160 662810cf0bf67be75cde36bb6c31c150abebc391 SHA1 140670d97985a8a623bc126fa86eed00e7b5a69e SHA256 8087e68c174d06dcd62bb9acfdd54cc534cc09ddbfffcc0f9cfac967d882123c DIST cairo-dock-3.0.0.tar.gz 2325081 RMD160 5d04384132f9c97e6b87a402ee519c59fb4dd478 SHA1 2b6f961e0ac13a44e733ae6a19f61f7fe2e8a859 SHA256 bef0794405f86bc397c4c077e48cb8e6df8f256f1c530e76aebd8612251a9b82 EBUILD cairo-dock-2.4.0.2.ebuild 2025 RMD160 437aedcf234ba74d8df8376c63ee059720b750e3 SHA1 c9ef90a1f726390cdc8f94acedaa61d4d58b529e SHA256 f0c9bc9e29505898ebe2073c408afa2e36681a38a3b25fd1a85f0f0f837c9380 -EBUILD cairo-dock-3.0.0.ebuild 1678 RMD160 137aaa85e0aee6c6aa7bc659e49c9fac29f71393 SHA1 b5a24d522096ad39d8d7c7a76fd1e31173ae9c84 SHA256 d7009a740fa0cc2e00deb6b51aa7beedcb85e1994307d5aeabce16a115ecb5d4 +EBUILD cairo-dock-3.0.0-r1.ebuild 1720 RMD160 4e634dae200b3e86e844051539f8f27eec5da1d8 SHA1 bfa64bc0344ec6f62f5ef911993c34b810cc7cf5 SHA256 cb4f17294219e4abf46fb1db354857ccdfefef47824bf727a9ff79455ed9ae40 diff --git a/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild b/x11-misc/cairo-dock/cairo-dock-3.0.0-r1.ebuild similarity index 97% rename from x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild rename to x11-misc/cairo-dock/cairo-dock-3.0.0-r1.ebuild index 07eaa13..0185e84 100644 --- a/x11-misc/cairo-dock/cairo-dock-3.0.0.ebuild +++ b/x11-misc/cairo-dock/cairo-dock-3.0.0-r1.ebuild @@ -48,6 +48,7 @@ S="${WORKDIR}/${PN}-${PV}" src_prepare() { epatch "${FILESDIR}/fix_lib6464.patch" + epatch "${FILESDIR}/glib-include.patch" } pkg_postinst() { diff --git a/x11-misc/cairo-dock/files/glib-include.patch b/x11-misc/cairo-dock/files/glib-include.patch new file mode 100644 index 0000000..2d04327 --- /dev/null +++ b/x11-misc/cairo-dock/files/glib-include.patch @@ -0,0 +1,12 @@ +diff -urN cairo-dock-3.0.0.orig/src/gldit/cairo-dock-keybinder.h cairo-dock-3.0.0/src/gldit/cairo-dock-keybinder.h +--- cairo-dock-3.0.0.orig/src/gldit/cairo-dock-keybinder.h 2012-04-19 23:09:27.610906117 +0600 ++++ cairo-dock-3.0.0/src/gldit/cairo-dock-keybinder.h 2012-04-19 23:11:13.424875527 +0600 +@@ -31,7 +31,7 @@ + #ifndef __CD_KEY_BINDER_H__ + #define __CD_KEY_BINDER_H__ + +-#include ++#include + #include "cairo-dock-struct.h" + #include "cairo-dock-manager.h" +