diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-20 17:35:20 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-04-20 17:35:20 +0000 |
| commit | ac5cddfd5dce3a098b18b319ecc3f37b27910037 (patch) | |
| tree | 5b1cf2136c30457108782502552a41929fc21de1 /app-office | |
| parent | Drop RESTRICT I just used for testing. Drop unused inherit eutils. (diff) | |
| download | historical-ac5cddfd5dce3a098b18b319ecc3f37b27910037.tar.gz historical-ac5cddfd5dce3a098b18b319ecc3f37b27910037.tar.bz2 historical-ac5cddfd5dce3a098b18b319ecc3f37b27910037.zip | |
Fix another glib-2.32 header issue (bug #412735, thanks to Anton Kochkov fo reporting).
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/abiword/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/abiword/Manifest | 16 | ||||
| -rw-r--r-- | app-office/abiword/files/abiword-2.8.6-glib-2.31.patch | 20 |
3 files changed, 36 insertions, 7 deletions
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog index c346220d1d65..e29ae769b7dd 100644 --- a/app-office/abiword/ChangeLog +++ b/app-office/abiword/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/abiword # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.257 2012/04/08 01:57:38 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.258 2012/04/20 17:35:20 tetromino Exp $ + + 20 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + files/abiword-2.8.6-glib-2.31.patch: + Fix another glib-2.32 header issue (bug #412735, thanks to Anton Kochkov for + reporting). 08 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> abiword-2.8.6-r2.ebuild, +files/abiword-2.8.6-glib-2.31.patch: diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest index 8a8ad9289fa5..1ab527830e95 100644 --- a/app-office/abiword/Manifest +++ b/app-office/abiword/Manifest @@ -1,18 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX abiword-2.8.6-gcc46.patch 557 RMD160 406dbd7dc80f374e9a163684b494de9a504c09a7 SHA1 159b1cd0b9354868ab86f851b64a03dae7d254dc SHA256 78e3b3be4340022f57246e88948d947bfd031819664edce965a40d7a518862a3 -AUX abiword-2.8.6-glib-2.31.patch 666 RMD160 b9563837b859392f59d2497695123739d10f5135 SHA1 e537867857f0c3a9ef416d62acb29902ebdb7656 SHA256 901307e24f27b63f6f0af4233549bcc9d5895ee297efdcf5c0d68131be42163b +AUX abiword-2.8.6-glib-2.31.patch 1318 RMD160 121cc0706770cf9dc79c00f5eddba53ec03d3862 SHA1 b2a18153b180bf8342307385a16c440ff52a585a SHA256 e16a496a552f43f21041e0be6077f179a66270b7534dfbd9fbb8f4e0554f5d35 AUX abiword-2.8.6-libpng15.patch 3710 RMD160 7de98b2183cd21a6d538bea8fba86a1c4d35a21e SHA1 646736e4e71a92574f4ccb7bc17ae422a13f04c2 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90 AUX abiword-2.8.6-libwpd.patch 15024 RMD160 2f48380cae981624cc44c552391c4a7fcd076872 SHA1 38f7074905afcdd2dbc8a6b9a8f6da080f7200d0 SHA256 92f89f04633f67d0568160e701815a5daf0a2de03608a1a3bd5b8f7e7f4f0fea DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15 EBUILD abiword-2.8.6-r2.ebuild 4799 RMD160 c453a2b1431eca6c12f100cc0a2fe332421f88d2 SHA1 84b4585f6898323d6dcdbf26df7e9c693aa3e78c SHA256 63775107ecf2f77bc485a2fe34687dc4a97b46e00344234ef095056f8e62fd8b -MISC ChangeLog 35012 RMD160 65ea64f8b3b1f4cada9d709ac0bd337a56bb657f SHA1 ae1a1dcf232e31508bd7ab42abf81cf23e5ce2c5 SHA256 785021e0159b764c23b70b4323853c23f74f3df83aafda6a68eef794bc94b25f +MISC ChangeLog 35204 RMD160 d1d006fdd4da597114334e90955e77dd41647f78 SHA1 ea8217d11a02c166a102a40aea85c0fcbc82970a SHA256 fd207889d7b2c74069695c314ae1ed1c6a8afdf7ca89d36bd71cd284b8599261 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAk+A8JcACgkQdjK8w9WeBnBYWwD/egdG3XOAVvhdMASWS5IFBm+O -bDuROKV+cmb5rW3DSRoBAIAviRcNYTR3+DvXQ8N97kDDVMeeHfujaGai28Nr7wEn -=0DO+ +iQEcBAEBAgAGBQJPkZ5lAAoJEJ0WA1zPCt1hFFQH/jt4PT4sdMmy7fZbsI1gn8Fv +xqMURUcTjt0+8OEmW3xmWxA9xdTuX/7NskrGpiMuTorVCy0tqsU2q18/XlzsLgyg ++GJz9SIB3jganLNsgBsbjtyGQaPsh4GWv1AaRbwShQUQd5060a54sBFKUbBZzIY+ +AFHHCd1rjPRVNBnPyyfuqrBlaMPC0GYE+nXvkDzfoEo0uSW29NxZJPY6WLyE0e+X +fgevlmyA7W/dWGjLfCjoXmZ6+jBsitY4J2y3I47PYl+E6gwM1Ok1qbS9EU1L61hH +E1ocDvIXJOyo6dbw9UO2kX1eRQlheGZDDfuuIcOn49xzZd2BuK3ohOUW6ivYjOc= +=RC4q -----END PGP SIGNATURE----- diff --git a/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch b/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch index df40dc7bdf4a..8b938cc25a7e 100644 --- a/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch +++ b/app-office/abiword/files/abiword-2.8.6-glib-2.31.patch @@ -6,6 +6,13 @@ Changed paths: Bug 13197: only import glib.h Patch by Dominique Leuenberger. ------------------------------------------------------------------------ +r30602 | hub | 2012-01-30 02:00:38 -0500 (Mon, 30 Jan 2012) | 2 lines +Changed paths: + M /abiword/trunk/goffice-bits/goffice/app/goffice-app.h + +Bug 13247 - Fix glib headers. Patch by Funda Wang +(safe to backport) +------------------------------------------------------------------------ Index: src/af/util/xp/ut_go_file.h =================================================================== --- src/af/util/xp/ut_go_file.h (revision 30478) @@ -18,3 +25,16 @@ Index: src/af/util/xp/ut_go_file.h #include <time.h> G_BEGIN_DECLS +Index: goffice-bits/goffice/app/goffice-app.h +=================================================================== +--- goffice-bits/goffice/app/goffice-app.h (revision 30601) ++++ goffice-bits/goffice/app/goffice-app.h (revision 30602) +@@ -22,7 +22,7 @@ + #ifndef GOFFICE_APP_H + #define GOFFICE_APP_H + +-#include <glib/gmacros.h> ++#include <glib.h> + + G_BEGIN_DECLS + |