rpms/openoffice.org/devel openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch, NONE, 1.1 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.46, 1.47 openoffice.org.spec, 1.1518, 1.1519 openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch, 1.1, NONE openoffice.org-3.0.0.ooo89172.filter.string.patch, 1.1, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Tue Jun 3 09:06:56 UTC 2008 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27046

Modified Files:
	openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch 
Removed Files:
	openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch 
	openoffice.org-3.0.0.ooo89172.filter.string.patch 
Log Message:
next version

openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch:

--- NEW FILE openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch ---
--- openoffice.org.orig/odk/settings/std.mk	2008-06-03 09:08:57.000000000 +0100
+++ openoffice.org/odk/settings/std.mk	2008-06-03 09:38:23.000000000 +0100
@@ -23,13 +23,19 @@
 
 ifneq "$(OO_SDK_URE_HOME)" ""
 URE_TYPES=$(subst \\,\,$(URE_MISC)$(PS)types.rdb)
+endif
+
+ifneq "$(OFFICE_PROGRAM_PATH)" ""
+OFFICE_TYPES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)
+endif
+
+ifneq "$(OO_SDK_URE_HOME)" ""
 URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
 else
-URE_TYPES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)
 URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
 endif
 
-OFFICE_TYPE_LIBRARY="$(URE_TYPES)"
+OFFICE_TYPE_LIBRARY="$(URE_TYPES)" "$(OFFICE_TYPES)"
 # DKREGISTRYNAME is only for compatibility reasons 
 DKREGISTRYNAME=$(OFFICE_TYPE_LIBRARY)
 

openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:

Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	15 Apr 2008 18:04:28 -0000	1.46
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch	3 Jun 2008 09:06:07 -0000	1.47
@@ -1611,13 +1611,13 @@
 diff -u -r1.25 gtkframe.hxx
 --- openoffice.org.orig/vcl/unx/inc/plugins/gtk/gtkframe.hxx	1 Nov 2006 15:30:08 -0000	1.25
 +++ openoffice.org/vcl/unx/inc/plugins/gtk/gtkframe.hxx	1 May 2007 12:22:02 -0000
-@@ -383,6 +383,9 @@
- 	::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getAccessible( bool bCreate = true );
-     
-     static AtkRole              GetAtkRole( GtkWindow* window );
+@@ -389,6 +389,9 @@
+ 	virtual void					EndSetClipRegion();
+ 
+ 	static GtkSalFrame         *getFromWindow( GtkWindow *pWindow );
 +
-+    virtual unsigned long GetNativeHandle() const;
-+    virtual void SetNativeParent(unsigned long nParent);
++	virtual unsigned long GetNativeHandle() const;
++	virtual void SetNativeParent(unsigned long nParent);
  };
  
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1518
retrieving revision 1.1519
diff -u -r1.1518 -r1.1519
--- openoffice.org.spec	30 May 2008 13:23:29 -0000	1.1518
+++ openoffice.org.spec	3 Jun 2008 09:06:07 -0000	1.1519
@@ -1,5 +1,5 @@
 %define oootag DEV300
-%define ooomilestone 14
+%define ooomilestone 15
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -121,17 +121,16 @@
 Patch45: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 Patch46: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
 Patch47: openoffice.org-3.0.0.ooo87604.fixupsystemhunspell.patch
-Patch48: openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
-Patch49: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
-Patch50: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch51: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
-Patch52: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
-Patch53: openoffice.org-3.0.0.ooo89172.filter.string.patch
-Patch54: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch55: openoffice.org-3.0.0.ooo88815.oox.parallel.patch
-Patch56: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch57: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
-Patch58: openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
+Patch48: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
+Patch49: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch50: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+Patch51: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
+Patch52: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch53: openoffice.org-3.0.0.ooo88815.oox.parallel.patch
+Patch54: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch55: openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch
+Patch56: openoffice.org-3.0.0.ooo88090.chart2.negativecount.patch
+Patch57: openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1256,17 +1255,16 @@
 %patch45 -p1 -b .oooXXXXX.psprint.debugcups.patch
 %patch46 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
 %patch47 -p1 -b .ooo87604.fixupsystemhunspell.patch
-%patch48 -p1 -b .ooo88260.decl-defi-mismatch.patch
-%patch49 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
-%patch50 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch51 -p1 -b .ooo6087.sc.sheetnames.patch
-%patch52 -p1 -b .ooo89002.vcl.symbolfonts.patch
-%patch53 -p1 -b .ooo89172.filter.string.patch
-%patch54 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch55 -p1 -b .ooo88815.oox.parallel.patch
-%patch56 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch57 -p1 -b .ooo90055.swext.allowadmin.patch
-%patch58 -p1 -b .ooo88090.chart2.negativecount.patch
+%patch48 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
+%patch49 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch50 -p1 -b .ooo6087.sc.sheetnames.patch
+%patch51 -p1 -b .ooo89002.vcl.symbolfonts.patch
+%patch52 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch53 -p1 -b .ooo88815.oox.parallel.patch
+%patch54 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch55 -p1 -b .ooo90055.swext.allowadmin.patch
+%patch56 -p1 -b .ooo88090.chart2.negativecount.patch
+%patch57 -p1 -b .oooXXXXX.odk.3layer.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1489,7 +1487,7 @@
         sed -e "s, at OO_SDK_NAME@,sdk," \
             -e "s, at OO_SDK_HOME@,%{baseinstdir}/sdk," \
             -e "s, at OFFICE_HOME@,%{basisinstdir}," \
-            -e "s, at OO_SDK_URE_HOME@,," \
+            -e "s, at OO_SDK_URE_HOME@,%{ureinstdir}," \
             -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
             -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
             -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
@@ -3423,6 +3421,13 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.15-1
+- next version
+- add openoffice.org-2.3.0.oooXXXXX.odk.3layer.patch for building against
+  3 layer OOo
+- drop integrated openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch
+- drop integrated openoffice.org-3.0.0.ooo89172.filter.string.patch
+
 * Wed May 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.14-1
 - next version
 - Require new hunspell-ml for Malayalam langpack


--- openoffice.org-3.0.0.ooo88260.decl-defi-mismatch.patch DELETED ---


--- openoffice.org-3.0.0.ooo89172.filter.string.patch DELETED ---

More information about the fedora-extras-commits mailing list