rpms/openoffice.org/devel workspace.impress169.patch, NONE, 1.1 workspace.rptfix06.patch, NONE, 1.1 openoffice.org.spec, 1.1858, 1.1859 openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch, 1.1, NONE
Caolan McNamara
caolanm at fedoraproject.org
Mon Mar 16 20:33:25 UTC 2009
- Previous message: rpms/gnome-user-docs/devel .cvsignore, 1.26, 1.27 gnome-user-docs.spec, 1.39, 1.40 sources, 1.26, 1.27
- Next message: rpms/initscripts/devel .cvsignore, 1.160, 1.161 initscripts.spec, 1.188, 1.189 sources, 1.178, 1.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14307
Modified Files:
openoffice.org.spec
Added Files:
workspace.impress169.patch workspace.rptfix06.patch
Removed Files:
openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
Log Message:
reenable system jfreereport
workspace.impress169.patch:
--- NEW FILE workspace.impress169.patch ---
--- sd.orig/source/ui/view/drtxtob1.cxx 2009-02-19 13:51:29.000000000 +0000
+++ sd/source/ui/view/drtxtob1.cxx 2009-02-19 15:50:03.000000000 +0000
@@ -256,6 +260,8 @@
{
pOLV->AdjustDepth( -1 );
+ // Ensure bold/italic etc. icon state updates
+ Invalidate();
// #96551# trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
@@ -269,6 +275,8 @@
{
pOLV->AdjustDepth( 1 );
+ // Ensure bold/italic etc. icon state updates
+ Invalidate();
// #96551# trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
workspace.rptfix06.patch:
--- NEW FILE workspace.rptfix06.patch ---
--- reportbuilder/java/com/sun/star/report/pentaho/makefile.mk-old 2009-03-16 20:23:20.000000000 +0100
+++ reportbuilder/java/com/sun/star/report/pentaho/makefile.mk 2009-03-16 20:51:45.000000000 +0100
@@ -42,11 +42,14 @@
JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
.IF "$(SYSTEM_JFREEREPORT)" == "YES"
XCLASSPATH!:=$(XCLASSPATH)$(FLUTE_JAR)$(PATH_SEPERATOR)$(LIBBASE_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(LIBSERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)$(PATH_SEPERATOR)$(COMMONS_LOGGING_JAR)
-COMP=fix_system_jfreereport
.ELSE
JARFILES += flute-1.3.0.jar libbase-1.0.0.jar libfonts-1.0.0.jar libformula-0.2.0.jar liblayout-0.2.9.jar libloader-1.0.0.jar librepository-1.0.0.jar libxml-1.0.0.jar flow-engine-0.9.2.jar sac.jar commons-logging-1.1.1.jar
.ENDIF
+.IF "$(SYSTEM_JFREEREPORT)" == "YES" || ("$(SYSTEM_APACHE_COMMONS)" == "YES"
+COMP=fix_system_libs
+.ENDIF
+
JAVAFILES := $(shell @$(FIND) . -name "*.java")
# JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:s/.java/.class/))
@@ -94,13 +97,19 @@
$(JARTARGETN) : $(COMP) $(PROPERTYFILES) $(CSSFILES) $(XSDFILES) $(TXTFILES) $(XMLFILES)
.ENDIF # "$(JARTARGETN)"!=""
-fix_system_jfreereport:
- @echo "Fix Java Class-Path entry for JFree JFreeReport libraries from system."
+fix_system_libs:
+ @echo "Fix Java Class-Path entry for libraries from system."
+.IF ("$(SYSTEM_JFREEREPORT)" != "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
+ @$(SED) -r -e "s#commons-logging-1.1.1.jar#file://$(COMMONS_LOGGING_JAR)#" \
+ -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
+.ENDIF
+.IF ("$(SYSTEM_JFREEREPORT)" == "YES" && "$(SYSTEM_APACHE_COMMONS)" == "YES")
@$(SED) '/flute/,/sac/d' -i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
@$(SED) -r -e "s#^Class-Path.*#\0\n file://$(LIBBASE_JAR)\n file://$(SAC_JAR)\n file://$(LIBXML_JAR)\n\
file://$(FLUTE_JAR)\n file://$(JFREEREPORT_JAR)\n file://$(LIBLAYOUT_JAR)\n file://$(LIBLOADER_JAR)\n file://$(LIBFORMULA_JAR)\n\
- file://$(LIBREPOSITORY_JAR)\n file://$(LIBFONTS_JAR)\n file://$(LIBSERIALIZER_JAR)#" \
+ file://$(LIBREPOSITORY_JAR)\n file://$(LIBFONTS_JAR)\n file://$(LIBSERIALIZER_JAR)\n file://$(COMMONS_LOGGING_JAR)#" \
-i ../../../../../../$(INPATH)/class/sun-report-builder/META-INF/MANIFEST.MF
+.ENDIF
$(CLASSDIR)$/$(PACKAGE)$/%.properties : %.properties
@@-$(MKDIRHIER) $(@:d)
--- reportbuilder/util/makefile.mk-old 2009-03-16 20:39:34.000000000 +0100
+++ reportbuilder/util/makefile.mk 2009-03-16 20:40:21.000000000 +0100
@@ -110,7 +110,10 @@
$(EXTENSIONDIR)$/librepository-1.0.0.jar \
$(EXTENSIONDIR)$/libxml-1.0.0.jar \
$(EXTENSIONDIR)$/flow-engine-0.9.2.jar \
- $(EXTENSIONDIR)$/sac.jar \
+ $(EXTENSIONDIR)$/sac.jar
+.ENDIF
+.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
+COMPONENT_EXTJARFILES += \
$(EXTENSIONDIR)$/commons-logging-1.1.1.jar
.ENDIF
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1858
retrieving revision 1.1859
diff -u -r1.1858 -r1.1859
--- openoffice.org.spec 13 Mar 2009 12:37:35 -0000 1.1858
+++ openoffice.org.spec 16 Mar 2009 20:32:54 -0000 1.1859
@@ -1,6 +1,6 @@
%define oootag OOO310
%define ooomilestone 5
-%define rh_rpm_release 1
+%define rh_rpm_release 2
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -122,13 +122,14 @@
Patch47: workspace.vcl100.patch
Patch48: workspace.xmergeclean.patch
Patch49: openoffice.org-3.1.0.ooo99407.filter-detectsmalldevicefilters.patch
-Patch50: openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch
+Patch50: workspace.impress169.patch
Patch51: openoffice.org-3.1.0.ooo99526.sw.mailmergeup.outofrange.patch
Patch52: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
Patch53: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
Patch54: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Patch55: workspace.cl12.patch
Patch56: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch57: workspace.rptfix06.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1609,13 +1610,14 @@
%patch47 -p0 -b .workspace.vcl100.patch
%patch48 -p0 -b .workspace.xmergeclean.patch
%patch49 -p0 -b .ooo99407.filter-detectsmalldevicefilters.patch
-%patch50 -p0 -b .ooo99427.sd.ensure-icons-state.patch
+%patch50 -p0 -b .workspace.impress169.patch
%patch51 -p0 -b .ooo99526.sw.mailmergeup.outofrange.patch
%patch52 -p0 -b .ooo99529.sw.notrailingnewline.patch
%patch53 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
%patch54 -p1 -b .oooXXXXX.solenv.allowmissing.patch
%patch55 -p0 -b .workspace.cl12.patch
%patch56 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch57 -p1 -b .workspace.rptfix06.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1631,6 +1633,8 @@
--enable-evolution2 --enable-cairo --enable-dbus --enable-opengl \
--enable-minimizer --enable-presenter-console --enable-pdfimport \
--enable-wiki-publisher --enable-vba --enable-report-builder \
+ --with-system-jfreereport \
+ --with-commons-logging-jar=/usr/share/java/commons-logging-1.0.4.jar \
--with-vba-package-format="builtin" --with-system-libs \
--with-system-headers --with-system-apache-commons \
--with-system-mozilla --with-system-libtextcat --with-system-redland \
@@ -1640,12 +1644,6 @@
%{stlflags} --with-lang="%{langpack_langs}" \
--with-poor-help-localizations="$POORHELPS"
-# awaiting review of libbase
-# --with-system-jfreereport
-# --with-jfreereport-jar=/usr/share/java/pentaho-reporting-flow-engine.jar \
-# --with-libserializer-jar=/usr/share/java/jcommon-serializer.jar \
-# --with-libbase-jar=/dev/null \
-
./bootstrap
source ./Linux*Env.Set.sh
#unneccessary to build for both hash types
@@ -4107,6 +4105,9 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Mon Mar 16 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-5.2
+- re-enable system jfreereport
+
* Fri Mar 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-5.1
- next version
- disable gnome-print-unix dialog
--- openoffice.org-3.1.0.ooo99427.sd.ensure-icons-state.patch DELETED ---
- Previous message: rpms/gnome-user-docs/devel .cvsignore, 1.26, 1.27 gnome-user-docs.spec, 1.39, 1.40 sources, 1.26, 1.27
- Next message: rpms/initscripts/devel .cvsignore, 1.160, 1.161 initscripts.spec, 1.188, 1.189 sources, 1.178, 1.179
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list