another shot at the crystal icon problem

Package-Manager: portage-2.1_pre1

4 files changed, 113 insertions, 4 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index e46a201072d9..ada015be82ca 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.165 2005/12/23 21:20:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.166 2005/12/23 22:54:37 suka Exp $
+
+  23 Dec 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/2.0.1/alwayscrystal.diff, openoffice-2.0.1.ebuild:
+  Another fix for the problem with missing crystal icons, seems the solution
+  wasn't that easy...
 
   23 Dec 2005; Andreas Proschofsky <suka@gentoo.org> ChangeLog:
   Maybe smarter to disable the quickstarter for everyone who is not using
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index 53284ae5e9cf..714a4166aff4 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,4 +1,4 @@
-MD5 32480f86e5187e80c0194dc8c2b41fce ChangeLog 35776
+MD5 f98d3f878178ce0a3cfbbb47012f84d4 ChangeLog 35989
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.4/build-new-xslt.diff 650
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
@@ -32,6 +32,7 @@ MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
 MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
 MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
+MD5 500f7e71be57d40b0a8042cab1484df9 files/2.0.1/alwayscrystal.diff 3222
 MD5 88bf8cd578cde25c883e4fd2f9f0ea89 files/2.0.1/noquickstarter.diff 495
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
@@ -41,4 +42,4 @@ MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 eae9be6a4eb2de3c689d24cb348d0b9c openoffice-1.1.4-r1.ebuild 16659
 MD5 a69a836ff536fa824b7bb4390198d2e6 openoffice-1.1.5.ebuild 16566
 MD5 efc84271190bae49c9785f068d0326ff openoffice-2.0.0.ebuild 6916
-MD5 35b57b7e7112092e49fadcfa5bfba49e openoffice-2.0.1.ebuild 6906
+MD5 0c705644dc1a3bf4b3f7b5917962418f openoffice-2.0.1.ebuild 6951
diff --git a/app-office/openoffice/files/2.0.1/alwayscrystal.diff b/app-office/openoffice/files/2.0.1/alwayscrystal.diff
new file mode 100644
index 000000000000..560dfa481ab4
--- /dev/null
+++ b/app-office/openoffice/files/2.0.1/alwayscrystal.diff
@@ -0,0 +1,102 @@
+RCS file: /cvs/gnome/ooo-build configure.in,v
+retrieving revision 1.332
+retrieving revision 1.333
+diff -u -r1.332 -r1.333
+--- configure.in	2005/12/20 00:08:41	1.332
++++ configure.in	2005/12/22 12:20:31	1.333
+@@ -164,12 +164,12 @@
+ 
+ AC_ARG_ENABLE(gtk,
+ [
+-  --disable-gtk           Disables gtk+ native widgets and Gnome icons.],
++  --disable-gtk           Disables gtk+ native widgets.],
+ ,)
+ 
+ AC_ARG_ENABLE(kde,
+ [
+-  --disable-kde           Disables KDE native widgets and KDE icons.],
++  --disable-kde           Disables KDE native widgets.],
+ ,)
+ 
+ AC_ARG_ENABLE(gcc33,
+@@ -475,22 +475,16 @@
+ 
+ AC_MSG_CHECKING([for widget sets])
+ OOO_WIDGET_FLAGS=
+-WITH_ICONS="hicontrast"
+-if test "z$with_win32" != "z"; then
+-   WITH_ICONS="industrial $WITH_ICONS"
+-fi
+ if test "$enable_kde" != "no"; then
+    if test "z$with_win32" = "z"; then
+       OOO_WIDGET_FLAGS="--enable-kde "
+       widget_sets="kde"
+-      WITH_ICONS="crystal $WITH_ICONS"
+    fi
+ fi
+ if test "$enable_gtk" != "no"; then
+    if test "z$with_win32" = "z"; then
+       OOO_WIDGET_FLAGS="--enable-gtk $OOO_WIDGET_FLAGS"
+       widget_sets="gtk $widget_sets"
+-      WITH_ICONS="industrial $WITH_ICONS"
+ 
+       PKG_CHECK_MODULES( FOO_GTK, [ gtk+-2.0 ],
+          have_gtk=true, have_gtk=false )
+@@ -510,7 +504,6 @@
+ 
+ AC_MSG_RESULT($OOO_WIDGET_FLAGS)
+ AC_SUBST(OOO_WIDGET_FLAGS)
+-AC_SUBST(WITH_ICONS)
+ 
+ if test "z$BUILD_WIN32" = "zyes" -a "z$enable_cairo" = "z" ; then
+     AC_MSG_WARN([On Cygwin, automatically using --disable-cairo])
+@@ -804,7 +797,6 @@
+ 	src package dir:    $SRCDIR
+ 	distro:             $with_distro
+ 	widget sets:        ${widget_sets:-disabled}
+-	icons:              ${WITH_ICONS:-default}
+ 	gcc to use:         $gcc_to_use
+ 	hunspell-uno:	    $hunspell_uno_enabled
+ 	hunspell-lib:	    $hunspell_lib_result
+===================================================================
+RCS file: /cvs/gnome/ooo-build/bin setup.in,v
+retrieving revision 1.153
+retrieving revision 1.154
+diff -u -r1.153 -r1.154
+--- bin/setup.in	2005/12/02 19:58:51	1.153
++++ bin/setup.in	2005/12/22 12:20:32	1.154
+@@ -18,7 +18,6 @@
+ ICECREAM_JOBS='@ICECREAM_JOBS@'
+ ICECREAM_BINDIR='@ICECREAM_BINDIR@'
+ OOO_WIDGET_FLAGS='@OOO_WIDGET_FLAGS@'
+-WITH_ICONS='@WITH_ICONS@'
+ OOO_CUSTOM_IMAGES='@OOO_CUSTOM_IMAGES@'
+ OOO_CRYSTAL_IMAGES='@OOO_CRYSTAL_IMAGES@'
+ OOO_BUILDVERSION='@OOO_BUILDVERSION@'
+@@ -73,10 +72,6 @@
+ # build the right native widgets
+ CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $OOO_WIDGET_FLAGS"
+ 
+-if test "z$WITH_ICONS" != "z"; then
+-    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-images='$WITH_ICONS'"
+-fi
+-
+ # Misc. internal
+ TOOLSDIR='@TOOLSDIR@'
+ OOBUILDDIR='@OOBUILDDIR@'
+===================================================================
+RCS file: /cvs/gnome/ooo-build/bin/unpack,v
+retrieving revision 1.62
+retrieving revision 1.63
+diff -u -r1.62 -r1.63
+--- bin/unpack	2005/11/30 13:07:36	1.62
++++ bin/unpack	2005/12/22 12:20:32	1.63
+@@ -254,7 +254,7 @@
+ # fix a checkbox bug - in the up-stream icon set.
+     rm -f $CUSTOM_DIR/industrial/vcl/source/src/check*; 
+ fi
+-if test "z${WITH_ICONS#*crystal}" != "z$WITH_ICONS" ; then
++if test -f $SRCDIR/$OOO_CRYSTAL_IMAGES ; then
+     tar xjf $SRCDIR/$OOO_CRYSTAL_IMAGES -C $CUSTOM_DIR || exit 1;
+ fi
+ 
diff --git a/app-office/openoffice/openoffice-2.0.1.ebuild b/app-office/openoffice/openoffice-2.0.1.ebuild
index f2a106c2af73..f8a40e66bbb1 100644
--- a/app-office/openoffice/openoffice-2.0.1.ebuild
+++ b/app-office/openoffice/openoffice-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.5 2005/12/23 21:39:59 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-2.0.1.ebuild,v 1.6 2005/12/23 22:54:37 suka Exp $
 
 inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs
 
@@ -120,6 +120,7 @@ src_unpack() {
 	#Some fixes for our patchset
 	cd ${S}
 	use !gnome && use !gtk && epatch ${FILESDIR}/2.0.1/noquickstarter.diff
+	epatch ${FILESDIR}/2.0.1/alwayscrystal.diff
 
 	#Detect which look and patchset we are using, amd64 is known not to be working atm, so this is here for testing purposes only
 	use amd64 && export DISTRO="Gentoo64" || export DISTRO="Gentoo"