rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch, NONE, 1.1 openoffice.org.spec, 1.663, 1.664

Tue Apr 18 10:11:45 UTC 2006

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3690

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch 
Log Message:
ooo#64463# drop Xaw require

openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch:
 config_office/configure.in                          |    3 ++-
 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    2 +-
 extensions/source/plugin/unx/makefile.mk            |    4 ++--
 extensions/source/plugin/unx/npwrap.cxx             |    2 +-
 source/plugin/inc/plugin/unx/plugcon.hxx            |    0 
 source/plugin/unx/makefile.mk                       |    0 
 source/plugin/unx/npwrap.cxx                        |    0 
 7 files changed, 6 insertions(+), 5 deletions(-)

--- NEW FILE openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch ---
Index: source/plugin/inc/plugin/unx/plugcon.hxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/inc/plugin/unx/plugcon.hxx,v
retrieving revision 1.9
diff -u -r1.9 plugcon.hxx
--- openoffice.org.orig/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	20 Jan 2006 12:58:34 -0000	1.9
+++ openoffice.org/extensions/source/plugin/inc/plugin/unx/plugcon.hxx	18 Apr 2006 09:59:51 -0000
@@ -69,7 +69,7 @@
 #if defined USE_MOTIF
 #include <Xm/DrawingA.h>
 #else
-#include <X11/Xaw/Label.h>
+#include <X11/Composite.h>
 #endif
 #include <X11/Xatom.h>
 #define XP_UNIX
Index: source/plugin/unx/makefile.mk
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/extensions/source/plugin/unx/makefile.mk	20 Jan 2006 12:59:15 -0000	1.9
+++ openoffice.org/extensions/source/plugin/unx/makefile.mk	18 Apr 2006 09:59:51 -0000
@@ -72,9 +72,9 @@
 APP1STDLIBS+=-lXm -lXt -lXext -lX11 -ldl
 .ELSE
 .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11
+APP1STDLIBS+=-lXt -lXext -lX11
 .ELSE
-APP1STDLIBS+=-lXaw -lXt -lXext -lX11 -ldl
+APP1STDLIBS+=-lXt -lXext -lX11 -ldl
 .ENDIF
 .ENDIF
 
Index: source/plugin/unx/npwrap.cxx
===================================================================
RCS file: /cvs/util/extensions/source/plugin/unx/npwrap.cxx,v
retrieving revision 1.12
diff -u -r1.12 npwrap.cxx
--- openoffice.org.orig/extensions/source/plugin/unx/npwrap.cxx	8 Sep 2005 19:56:16 -0000	1.12
+++ openoffice.org/extensions/source/plugin/unx/npwrap.cxx	18 Apr 2006 09:59:52 -0000
@@ -117,7 +117,7 @@
 		xmDrawingAreaWidgetClass,
 #else
         "",
-		labelWidgetClass,
+		compositeWidgetClass,
 #endif
   		shell,
         XtNwidth, 200,
diff -ru config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in	2006-04-18 11:00:38.000000000 +0100
+++ openoffice.org/config_office/configure.in	2006-04-18 11:02:40.000000000 +0100
@@ -3323,7 +3323,7 @@
    AC_PATH_X
    AC_PATH_XTRA
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
+   AC_CHECK_HEADERS(X11/Composite.h,[],[AC_MSG_ERROR([Xt include headers not found])])
 
    if test "x$x_includes" = "x"; then
      x_includes="/usr/include"
@@ -3431,6 +3431,7 @@
     AC_MSG_RESULT([internal])
     SYSTEM_NAS=NO
     ENABLE_NAS=YES
+    AC_CHECK_HEADERS(X11/Xaw/Label.h,[],[AC_MSG_ERROR([Xaw include headers not found])])
     BUILD_TYPE="$BUILD_TYPE NAS"
     dnl ===================================================================
     dnl Check whether xmkmf program can be used, x systems only


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -r1.663 -r1.664
--- openoffice.org.spec	12 Apr 2006 14:17:35 -0000	1.663
+++ openoffice.org.spec	18 Apr 2006 10:11:41 -0000	1.664
@@ -1,6 +1,6 @@
 %define oootag OOB680
 %define ooomilestone 5
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 %define build_fc6 1
 %define build_rhel4 0
@@ -155,7 +155,7 @@
 BuildRequires:	desktop-file-utils >= 0.9, evolution-data-server-devel
 BuildRequires:	libxslt-devel, unixODBC-devel, db4-devel, mozilla-devel
 %if ! %{build_rhel4}
-BuildRequires:	libXaw-devel, libXt-devel, libICE-devel
+BuildRequires:	libXt-devel, libICE-devel
 %endif
 %if ! %{internallibwpd}
 BuildRequires:  libwpd-devel >= 0.8.0
@@ -221,6 +221,7 @@
 Patch38: openoffice.org-2.0.1.gij4ant.patch
 %endif
 Patch39: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch40: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -1134,6 +1135,7 @@
 cd ../..
 %endif
 %patch39 -p1 -b .rh188467.printingdefaults.patch
+%patch40 -p1 -b .ooo64463.extensions.noxaw.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -3680,6 +3682,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Apr 18 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.10
+- ooo#64463# don't require Xaw for the use mozilla plugins (e.g flash)
+  in OOo feature
+
 * Wed Apr 12 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.2-5.9
 - rh#187939# not detecting changes to CUPS printers during execution
 - rh#188467# set printer font-handling defaults


