summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chandler <sethbc@gentoo.org>2003-04-09 23:12:23 +0000
committerSeth Chandler <sethbc@gentoo.org>2003-04-09 23:12:23 +0000
commit0fa826d5c1cebcaf8c71fde2be23454c6d6cc37a (patch)
treea2352ed475a0cd976c132c1e72f06137310110fb /app-office
parentthis better work now (diff)
downloadhistorical-0fa826d5c1cebcaf8c71fde2be23454c6d6cc37a.tar.gz
historical-0fa826d5c1cebcaf8c71fde2be23454c6d6cc37a.tar.bz2
historical-0fa826d5c1cebcaf8c71fde2be23454c6d6cc37a.zip
blah
Diffstat (limited to 'app-office')
-rw-r--r--app-office/openoffice/files/1.1_beta/openoffice-xrender.patch12
-rw-r--r--app-office/openoffice/manifest3
-rw-r--r--app-office/openoffice/openoffice-1.1_beta.ebuild4
3 files changed, 16 insertions, 3 deletions
diff --git a/app-office/openoffice/files/1.1_beta/openoffice-xrender.patch b/app-office/openoffice/files/1.1_beta/openoffice-xrender.patch
new file mode 100644
index 000000000000..0995fc5c204f
--- /dev/null
+++ b/app-office/openoffice/files/1.1_beta/openoffice-xrender.patch
@@ -0,0 +1,12 @@
+--- ../vcl/unx/source/gdi/gcach_xpeer.hxx.orig Tue Mar 11 16:32:14 2003
++++ ../vcl/unx/source/gdi/gcach_xpeer.hxx Tue Mar 11 16:32:19 2003
+@@ -65,6 +65,8 @@
+ #include <glyphcache.hxx>
+
+ #define Region XLIB_Region
++typedef unsigned long CARD32;
++#define Cursor CARD32
+ #include <X11/extensions/Xrender.h>
+ #undef Region
+
+
diff --git a/app-office/openoffice/manifest b/app-office/openoffice/manifest
index 9497e51e5735..156c0bb3536a 100644
--- a/app-office/openoffice/manifest
+++ b/app-office/openoffice/manifest
@@ -1,4 +1,4 @@
-MD5 e4cb3e459a955dec6384d4de707e12f2 openoffice-1.1_beta.ebuild 16780
+MD5 2bcfc01a7018c7309e5afe484897f1ba openoffice-1.1_beta.ebuild 16779
MD5 460ff929624efb91c3bd1b41d72bd27d openoffice-1.0.2-r2.ebuild 20934
MD5 3d1de45989289e7ec5223c0c8cb45868 openoffice-1.0.2.ebuild 18274
MD5 58f842fee23dd5bb144251bd3543016e ChangeLog 4519
@@ -8,6 +8,7 @@ MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2 260
MD5 a9630306d271d3664cf03a1931dcd287 files/digest-openoffice-1.0.2-r1 260
MD5 b58bd85a59e18b13fe10d416940da3de files/digest-openoffice-1.0.2-r2 1170
MD5 271539dafab707398e9b806eef8f250a files/1.1_beta/ooffice-wrapper-1.2 8220
+MD5 230737cadf4606928cff18cc26d9b72e files/1.1_beta/openoffice-xrender.patch 330
MD5 82ddd83763d3ad994919438e46426294 files/1.1_beta/newstlportfix.patch 10531
MD5 c6d765863f974f7f6f6b17d20ad95541 files/1.0.2/openoffice-1.0.1-fix-asm.patch 2207
MD5 e448fa25e672e8e100a5d68adb75dda3 files/1.0.2/freetype-2.1.3.patch 1367
diff --git a/app-office/openoffice/openoffice-1.1_beta.ebuild b/app-office/openoffice/openoffice-1.1_beta.ebuild
index aaca19d06917..aa223361b72c 100644
--- a/app-office/openoffice/openoffice-1.1_beta.ebuild
+++ b/app-office/openoffice/openoffice-1.1_beta.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta.ebuild,v 1.3 2003/04/09 23:05:32 sethbc Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1_beta.ebuild,v 1.4 2003/04/09 23:12:17 sethbc Exp $
# IMPORTANT: This is extremely alpha!!!
@@ -203,7 +203,7 @@ src_unpack() {
rm STLport-4.5.3.patch
epatch ${FILESDIR}/${PV}/newstlportfix.patch
cd ${S}
-# epatch ${FILESDIR}/${PV}/openoffice-xrender.patch
+ epatch ${FILESDIR}/${PV}/openoffice-xrender.patch
# Now for our optimization flags ...
perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \