rpms/openoffice.org/devel openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch, NONE, 1.1 openoffice.org-1.9.114.oooXXXXX.rpath.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, NONE, 1.1 openoffice.org.spec, 1.268, 1.269
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Jul 5 08:40:10 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7592
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
openoffice.org-1.9.114.oooXXXXX.rpath.patch
openoffice.org-1.9.114.rh161886.rpath.desktop.patch
Log Message:
crash in crux
openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch:
salnativewidgets-gtk.cxx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
--- NEW FILE openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch ---
Index: unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v
retrieving revision 1.14
retrieving revision 1.14.86.1
diff -u -p -r1.14 -r1.14.86.1
--- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 12 Apr 2005 12:19:49 -0000 1.14
+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 20 Jun 2005 15:25:43 -0000 1.14.86.1
@@ -2517,6 +2517,11 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu
ControlState nState, const ImplControlValue& aValue,
SalControlHandle& rControlHandle, OUString aCaption )
{
+ // #i50745# gtk does not draw disabled menu entries (and crux theme
+ // even crashes), draw them using vcl functionality.
+ if( nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) )
+ return FALSE;
+
GtkStateType stateType;
GtkShadowType shadowType;
GtkShadowType selected_shadow_type = GTK_SHADOW_OUT;
@@ -2576,14 +2581,15 @@ BOOL GtkSalGraphics::NWPaintGTKPopupMenu
{
if( nState & (CTRL_STATE_SELECTED|CTRL_STATE_ROLLOVER) )
{
+ if( nState & CTRL_STATE_ENABLED )
gtk_paint_box( gMenuItemMenuWidget->style,
- gdkDrawable,
- GTK_STATE_PRELIGHT,
- selected_shadow_type,
- &clipRect,
- gMenuItemMenuWidget,
- "menuitem",
- x, y, w, h);
+ gdkDrawable,
+ GTK_STATE_PRELIGHT,
+ selected_shadow_type,
+ &clipRect,
+ gMenuItemMenuWidget,
+ "menuitem",
+ x, y, w, h);
}
}
}
openoffice.org-1.9.114.oooXXXXX.rpath.patch:
berkeleydb/makefile.mk | 7 +++++++
portaudio/portaudio_v18_1.patch | 5 +++--
sndfile/makefile.mk | 13 ++++++++++---
3 files changed, 20 insertions(+), 5 deletions(-)
--- NEW FILE openoffice.org-1.9.114.oooXXXXX.rpath.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/berkeleydb/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/berkeleydb/makefile.mk 11 Apr 2005 09:32:45 -0000 1.21
+++ openoffice.org/berkeleydb/makefile.mk 4 Jul 2005 15:14:53 -0000
@@ -93,6 +93,13 @@ ADDITIONAL_FILES= \
PATCH_FILE_NAME=db-4.2.52.patch
.IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
CONFIGURE_DIR=out
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=..$/dist$/configure
Index: portaudio_v18_1.patch
===================================================================
RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
retrieving revision 1.2
diff -u -p -r1.2 portaudio_v18_1.patch
--- openoffice.org.orig/portaudio/portaudio_v18_1.patch 31 May 2005 16:34:54 -0000 1.2
+++ openoffice.org/portaudio/portaudio_v18_1.patch 4 Jul 2005 21:54:37 -0000
@@ -1,5 +1,5 @@
-*** misc/portaudio_v18_1/configure 2003-02-11 23:24:56.000000000 -0500
---- misc/build/portaudio_v18_1/configure 2004-06-02 17:23:18.000000000 -0400
+*** misc/portaudio_v18_1/configure 2005-07-04 16:28:16.000000000 +0100
+--- misc/build/portaudio_v18_1/configure 2005-07-04 16:30:12.000000000 +0100
***************
*** 1883,1892 ****
case "${host_os}" in
@@ -28,7 +28,7 @@
! OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
! LIBS="-lm -lpthread";
! PADLL="libportaudio.so";
-! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+! SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0 -Wl,-rpath,'\$\$ORIGIN'";
! CFLAGS="-O2 -fPIC"
! ;;
!
Index: makefile.mk
===================================================================
RCS file: /cvs/external/sndfile/makefile.mk,v
retrieving revision 1.6
diff -u -p -r1.6 makefile.mk
--- openoffice.org.orig/sndfile/makefile.mk 31 May 2005 16:31:45 -0000 1.6
+++ openoffice.org/sndfile/makefile.mk 4 Jul 2005 16:28:16 -0000
@@ -80,11 +80,18 @@ PATCH_FILE_NAME=libsndfile-1.0.9.patch
CONFIGURE_DIR=
-CONFIGURE_ACTION=./configure --with-pic
-.IF "$(COM)" == "GCC" && "$(OS)" != "MACOSX" && "$(OS)" != "FREEBSD"
-CONFIGURE_FLAGS=LDFLAGS=-Wl,-noinhibit-exec
+.IF "$(GUI)"=="UNX"
+.IF "$(OS)$(COM)"=="LINUXGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-noinhibit-exec
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+.EXPORT: LDFLAGS
.ENDIF
+CONFIGURE_ACTION=./configure --with-pic
+
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
desktop/scripts/soffice.sh | 98 ++-------------------------------------------
scripts/soffice.sh | 0
2 files changed, 5 insertions(+), 93 deletions(-)
--- NEW FILE openoffice.org-1.9.114.rh161886.rpath.desktop.patch ---
Index: scripts/soffice.sh
===================================================================
RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
retrieving revision 1.17
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
+++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000
@@ -92,103 +92,15 @@ sd_inst="`pwd`"
# change back directory
cd "$sd_cwd"
-# check if all required patches are installed
-if [ -x "$sd_prog/sopatchlevel.sh" ]; then
- "$sd_prog/sopatchlevel.sh"
- if [ $? -eq 1 ]; then
- exit 0
- fi
-fi
-
-# set search path for shared libraries
-sd_platform=`uname -s`
-moz_lib=
-for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
- test -f $moz_lib_path/libnss3.so && moz_lib="$moz_lib_path" && break;
-done
-case $sd_platform in
- AIX)
- # this is a temporary hack until we can live with the default search paths
- if [ $LIBPATH ]; then
- SYSTEM_LIBPATH=$LIBPATH
- export SYSTEM_LIBPATH
- LIBPATH="$sd_prog:$moz_lib":$LIBPATH
- else
- LIBPATH="$sd_prog:$moz_lib"
- fi
- export LIBPATH
- ;;
-
- Darwin)
- # this is a temporary hack until we can live with the default search paths
- if [ $DYLD_LIBRARY_PATH ]; then
- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
- export SYSTEM_DYLD_LIBRARY_PATH
- DYLD_LIBRARY_PATH="$sd_prog:$moz_lib":$DYLD_LIBRARY_PATH
- else
- DYLD_LIBRARY_PATH="$sd_prog:$moz_lib"
- fi
- export DYLD_LIBRARY_PATH
- ;;
-
- HP-UX)
- # this is a temporary hack until we can live with the default search paths
- if [ $SHLIB_PATH ]; then
- SYSTEM_SHLIB_PATH=$SHLIB_PATH
- export SYSTEM_SHLIB_PATH
- SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib:$SHLIB_PATH
- else
- SHLIB_PATH="$sd_prog:$moz_lib":/usr/openwin/lib
- fi
- export SHLIB_PATH
- ;;
-
- IRIX*)
- # this is a temporary hack until we can live with the default search paths
- if [ $LD_LIBRARYN32_PATH ]; then
- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
- export SYSTEM_LD_LIBRARYN32_PATH
- LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib":$LD_LIBRARYN32_PATH
- else
- LD_LIBRARYN32_PATH=:"$sd_prog:$moz_lib"
- fi
- export LD_LIBRARYN32_PATH
- ;;
-
- *)
- # this is a temporary hack until we can live with the default search paths
- if [ $LD_LIBRARY_PATH ]; then
- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
- export SYSTEM_LD_LIBRARY_PATH
- LD_LIBRARY_PATH="$sd_prog:$moz_lib":$LD_LIBRARY_PATH
- else
- LD_LIBRARY_PATH="$sd_prog:$moz_lib"
- fi
- export LD_LIBRARY_PATH
- ;;
-esac
-
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/javaldx" ] ; then
java_ld_library_path=`"$sd_prog/javaldx"`
if [ "$java_ld_library_path" != "" ] ; then
- case $sd_platform in
- AIX)
- LIBPATH=${java_ld_library_path}:${LIBPATH}
- ;;
- Darwin)
- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
- ;;
- HP-UX)
- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
- ;;
- IRIX*)
- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
- ;;
- *)
- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
- ;;
- esac
+ if [ $LD_LIBRARY_PATH ]; then
+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+ else
+ LD_LIBRARY_PATH=${java_ld_library_path}
+ fi
fi
fi
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- openoffice.org.spec 5 Jul 2005 07:56:56 -0000 1.268
+++ openoffice.org.spec 5 Jul 2005 08:40:07 -0000 1.269
@@ -110,6 +110,7 @@
Patch47: openoffice.org-1.9.113.ooo51385.bridges.stack.patch
Patch48: openoffice.org-1.9.114.oooXXXXX.rpath.patch
Patch49: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch50: openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -737,7 +738,7 @@
%patch46 -p1 -b .ooo43430.cvskk.np_sdk.patch
%patch47 -p1 -b .ooo51385.bridges.stack.patch
%patch48 -p1 -b .oooXXXXX.rpath.patch
-%patch49 -p1 -b .rh161886.rpath.desktop.patch
+%patch50 -p1 -b .ooo50745.cruxcrash.vcl.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
#libxmlsec/portaudio/sndfile/db4 then this needs to be modified/dropped
@@ -2902,6 +2903,7 @@
- rh#161886#
+ openoffice.org-1.9.114.oooXXXXX.rpath.patch
+ openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+- add openoffice.org-1.9.114.ooo50745.cruxcrash.vcl.patch for rh#160293#
* Mon Jul 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.114-1
- bump to next version
More information about the fedora-cvs-commits
mailing list