diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2005-12-23 22:54:37 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2005-12-23 22:54:37 +0000 |
commit | 9646979e5aa9f12289e64daceeb23e7c54381559 (patch) | |
tree | c7a887f232815aca27aa095cf5594cb1ceeba862 /app-office | |
parent | Version Bump. (diff) | |
download | gentoo-2-9646979e5aa9f12289e64daceeb23e7c54381559.tar.gz gentoo-2-9646979e5aa9f12289e64daceeb23e7c54381559.tar.bz2 gentoo-2-9646979e5aa9f12289e64daceeb23e7c54381559.zip |
another shot at the crystal icon problem
(Portage version: 2.1_pre1)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/openoffice/ChangeLog | 7 | ||||
-rw-r--r-- | app-office/openoffice/files/2.0.1/alwayscrystal.diff | 102 | ||||
-rw-r--r-- | app-office/openoffice/openoffice-2.0.1.ebuild | 3 |
3 files changed, 110 insertions, 2 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/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" |