summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Proschofsky <suka@gentoo.org>2006-05-10 09:18:02 +0000
committerAndreas Proschofsky <suka@gentoo.org>2006-05-10 09:18:02 +0000
commitef58011e903466dc0e30aff2223cf867e82af05c (patch)
treecd23a0e5b1bba7356cf09f937a4c7a9502a8ed19 /app-office
parentFix for build breakage on systems without gtk+ see bug #132801 (diff)
downloadhistorical-ef58011e903466dc0e30aff2223cf867e82af05c.tar.gz
historical-ef58011e903466dc0e30aff2223cf867e82af05c.tar.bz2
historical-ef58011e903466dc0e30aff2223cf867e82af05c.zip
actually commit the last fix...
Package-Manager: portage-2.1_pre10-r5
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/Manifest8
-rw-r--r--app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff11
2 files changed, 15 insertions, 4 deletions
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 267cd14940f8..549aa4bf5046 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -2,10 +2,10 @@ AUX 2.0.1/alwayscrystal.diff 3222 RMD160 6f563dccad523db881def1fdb711df3949c2a68
MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
RMD160 6f563dccad523db881def1fdb711df3949c2a687 files/2.0.1/alwayscrystal.diff 3222
SHA256 22af14b2c3bd7d796eeda2f4a423f4290e71d2f2790a82038b837c6219133ef1 files/2.0.1/alwayscrystal.diff 3222
-AUX 2.0.2/gentoo-2.0.2.diff 1492 RMD160 87de23dc8ce07d92c64b656ea97cafb6f0e662a3 SHA1 16ef872339f2fb1c02640a9341d300c44bc033fe SHA256 ca17adbaab1c6ae3d98c9f799cfb243b8da36e0ce48cf62a78cad53868e368ef size 1492
-MD5 9ad30857c42877a5e91ff3bfb7232f8b files/2.0.2/gentoo-2.0.2.diff 1492
-RMD160 87de23dc8ce07d92c64b656ea97cafb6f0e662a3 files/2.0.2/gentoo-2.0.2.diff 1492
-SHA256 ca17adbaab1c6ae3d98c9f799cfb243b8da36e0ce48cf62a78cad53868e368ef files/2.0.2/gentoo-2.0.2.diff 1492
+AUX 2.0.2/gentoo-2.0.2.diff 1845 RMD160 53ef716a3fadb7555467a8448de7da4cba7c2425 SHA1 669a4abc20a0d1734bd8a071ea6143c7da4d7d10 SHA256 eb3cd6b39e18c4b870d8c33245bf51a0bb621b6a915b773a150cb04d8866f5b6 size 1845
+MD5 7fffe54659a4a0aa4af8722c54039fd4 files/2.0.2/gentoo-2.0.2.diff 1845
+RMD160 53ef716a3fadb7555467a8448de7da4cba7c2425 files/2.0.2/gentoo-2.0.2.diff 1845
+SHA256 eb3cd6b39e18c4b870d8c33245bf51a0bb621b6a915b773a150cb04d8866f5b6 files/2.0.2/gentoo-2.0.2.diff 1845
DIST OOO_2_0_1-binfilter.tar.bz2 18062219 RMD160 2ff50011435543209c3d7956e43c239ac4551450 SHA256 eb9418d43c23e85d4507de43a2b94287203f440a147b12ab9554a7ebd5722df8 size 18062219
DIST OOO_2_0_1-core.tar.bz2 109793621 RMD160 39af65ae67c6db30b39327da5821064af390a205 SHA256 a24c5021504fa930df563ed003776499579b925515a0b4a31c52fee895910ef3 size 109793621
DIST OOO_2_0_1-lang.tar.bz2 55193297 RMD160 fad1e8181d9156decd9f34c10e1752c50ce5a41a SHA256 75775d4dd704298e25c6235e9d110495a10982d4d96bd9cac9498b19d014d705 size 55193297
diff --git a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
index 5c28a184909b..252c18584c5c 100644
--- a/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
+++ b/app-office/openoffice/files/2.0.2/gentoo-2.0.2.diff
@@ -49,3 +49,14 @@
@@ -70,6 +70,7 @@
#include "drawpage.hxx"
#include "globstr.hrc"
+--- patches/src680/cws-atkbridge-20060425.diff
++++ patches/src680/cws-atkbridge-20060425.diff
+@@ -7868,7 +7868,7 @@
+ +
+ +ATKVERSION:=$(shell $(PKGCONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk)
+ +
+-+.IF $(ATKVERSION) >= "000100070000"
+++.IF "$(ATKVERSION)" >= "000100070000"
+ +CFLAGS+=-DHAS_ATKRECTANGLE
+ +.ENDIF
+ +