rpms/openoffice.org/devel openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.31, 1.32 openoffice.org.spec, 1.1174, 1.1175
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Fri May 18 13:35:49 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16015
Modified Files:
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org.spec
Log Message:
2.2.1 release candidate
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 4 May 2007 14:23:08 -0000 1.31
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 18 May 2007 13:35:44 -0000 1.32
@@ -1,3 +1,72 @@
+Index: inc/psprint/jobdata.hxx
+===================================================================
+RCS file: /cvs/gsl/psprint/inc/psprint/jobdata.hxx,v
+retrieving revision 1.4
+diff -u -r1.4 jobdata.hxx
+--- openoffice.org.orig/psprint/inc/psprint/jobdata.hxx 4 Dec 2006 16:33:06 -0000 1.4
++++ openoffice.org/psprint/inc/psprint/jobdata.hxx 9 May 2007 10:45:05 -0000
+@@ -51,6 +51,7 @@
+
+ struct JobData
+ {
++ bool m_bCupsJob;
+ int m_nCopies;
+ int m_nLeftMarginAdjust;
+ int m_nRightMarginAdjust;
+@@ -66,6 +67,7 @@
+ PPDContext m_aContext;
+
+ JobData() :
++ m_bCupsJob( false ),
+ m_nCopies( 1 ),
+ m_nLeftMarginAdjust( 0 ),
+ m_nRightMarginAdjust( 0 ),
+Index: source/printer/jobdata.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/printer/jobdata.cxx,v
+retrieving revision 1.9
+diff -u -r1.9 jobdata.cxx
+--- openoffice.org.orig/psprint/source/printer/jobdata.cxx 4 Dec 2006 16:33:20 -0000 1.9
++++ openoffice.org/psprint/source/printer/jobdata.cxx 9 May 2007 10:45:55 -0000
+@@ -46,6 +46,7 @@
+
+ JobData& JobData::operator=(const JobData& rRight)
+ {
++ m_bCupsJob = rRight.m_bCupsJob;
+ m_nCopies = rRight.m_nCopies;
+ m_nLeftMarginAdjust = rRight.m_nLeftMarginAdjust;
+ m_nRightMarginAdjust = rRight.m_nRightMarginAdjust;
+@@ -94,6 +95,10 @@
+ aLine += ByteString::CreateFromInt32( m_nCopies );
+ aStream.WriteLine( aLine );
+
++ aLine = "cups=";
++ aLine += ByteString::CreateFromInt32( m_bCupsJob );
++ aStream.WriteLine( aLine );
++
+ aLine = "margindajustment=";
+ aLine += ByteString::CreateFromInt32( m_nLeftMarginAdjust );
+ aLine += ',';
+@@ -136,6 +141,7 @@
+ bool bVersion = false;
+ bool bPrinter = false;
+ bool bOrientation = false;
++ bool bCups = false;
+ bool bCopies = false;
+ bool bContext = false;
+ bool bMargin = false;
+@@ -162,6 +168,11 @@
+ bCopies = true;
+ rJobData.m_nCopies = aLine.Copy( 7 ).ToInt32();
+ }
++ else if( aLine.CompareTo( "cups=", 5 ) == COMPARE_EQUAL )
++ {
++ bCups = true;
++ rJobData.m_bCupsJob = aLine.Copy( 5 ).ToInt32();
++ }
+ else if( aLine.CompareTo( "margindajustment=",17 ) == COMPARE_EQUAL )
+ {
+ bMargin = true;
Index: source/printergfx/printerjob.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/printergfx/printerjob.cxx,v
@@ -5,16 +74,15 @@
diff -u -r1.40 printerjob.cxx
--- openoffice.org.orig/psprint/source/printergfx/printerjob.cxx 24 Oct 2006 15:06:47 -0000 1.40
+++ openoffice.org/psprint/source/printergfx/printerjob.cxx 9 Nov 2006 10:40:31 -0000
-@@ -740,6 +740,9 @@
- if( ! pKey || ! pValue )
- return true;
-
-+ if (pValue->m_bCupsOnly)
-+ return true;
-+
- OStringBuffer aFeature(256);
- aFeature.append( "[{\n" );
- if( bUseIncluseFeature )
+@@ -1150,7 +1154,7 @@
+ WritePS (pFile, "<< /NumCopies null /Policies << /NumCopies 1 >> >> setpagedevice\n" );
+ }
+
+- bool bFeatureSuccess = writeFeatureList( pFile, rJob, true );
++ bool bFeatureSuccess = !rJob.m_bCupsJob ? writeFeatureList( pFile, rJob, true ) : true;
+
+ WritePS (pFile, "%%EndSetup\n");
+
Index: inc/psprint/ppdparser.hxx
===================================================================
RCS file: /cvs/gsl/psprint/inc/psprint/ppdparser.hxx,v
@@ -22,12 +90,11 @@
diff -u -r1.9 ppdparser.hxx
--- openoffice.org.orig/psprint/inc/psprint/ppdparser.hxx 8 Sep 2005 16:34:44 -0000 1.9
+++ openoffice.org/psprint/inc/psprint/ppdparser.hxx 19 May 2006 13:15:15 -0000
-@@ -61,6 +61,8 @@
+@@ -61,6 +61,7 @@
String m_aOptionTranslation;
String m_aValue;
String m_aValueTranslation;
-+ bool m_bCupsOnly;
-+ PPDValue() : m_eType(eInvocation), m_bCupsOnly(false) {}
++ PPDValue() : m_eType(eInvocation) {}
};
// ----------------------------------------------------------------------
@@ -144,7 +211,7 @@
// =======================================================================
DBG_NAME( JobSetup )
-@@ -244,6 +245,199 @@
+@@ -244,6 +245,198 @@
mpData = new ImplJobSetup();
mpData->maValueMap[ rKey ] = rValue;
@@ -332,13 +399,12 @@
+ PPDKey* pNewKey = new PPDKey( rKey );
+ PPDValue* pValue = pNewKey->insertValue(rValue);
+ pValue->m_eType = eInvocation;
-+ pValue->m_bCupsOnly = true;
+ pValue->m_aValue = rValue;
+ const_cast<PPDParser*>(aInfo.m_pParser)->insertKey( rKey, pNewKey );
+ aInfo.m_aContext.setValue(pNewKey, pValue);
+ }
+ }
-+
++ aInfo.m_bCupsJob=true;
+ copyJobDataToJobSetup( mpData, aInfo );
+
}
@@ -557,7 +623,7 @@
{
FreeResource();
-@@ -608,6 +656,246 @@
+@@ -608,6 +656,250 @@
// -----------------------------------------------------------------------
@@ -575,9 +641,13 @@
+ pPrinter->SetJobCupsKey( String::CreateFromAscii(key+5), String::CreateFromAscii(value));
+ else if ((!strcmp(key, "reverse")) && (!strcmp(value, "true")))
+ pPrinter->SetJobCupsKey(String::CreateFromAscii("OutputOrder"), String::CreateFromAscii("Reverse"));
++ else if ((!strcmp(key, "collate")) && (!strcmp(value, "true")))
++ pPrinter->SetJobCupsKey(String::CreateFromAscii("Collate"), String::CreateFromAscii("True"));
++ else if (!strcmp(key, "n-copies"))
++ pPrinter->SetJobCupsKey(String::CreateFromAscii("Copies"), String::CreateFromAscii(value));
+}
+
-+void ExportAsPDF(const rtl::OUString &rFileURL, sal_Bool, sal_uInt32, PrintDialogRange eRange, const OUString &rRange)
++void ExportAsPDF(const rtl::OUString &rFileURL, PrintDialogRange eRange, const OUString &rRange)
+{
+ Reference < XFramesSupplier > xDesktop =
+ Reference < XFramesSupplier >(
@@ -804,7 +874,7 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,308 @@
+@@ -625,15 +908,309 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
@@ -1007,10 +1077,11 @@
+ else
+ meCheckRange = PRINTDIALOG_ALL;
+
-+ SetCopyCount(gtk_print_settings_get_int_with_default (pSettings, GTK_PRINT_SETTINGS_N_COPIES, 1));
-+ BOOL bGtkCollate = gtk_print_settings_get_collate(pSettings);
-+ EnableCollate(bGtkCollate);
-+ CheckCollate(bGtkCollate);
++ //Tell OOo to only print 1 simple copy, we'll stick everything
++ //else through cups
++ SetCopyCount(1);
++ EnableCollate(false);
++ CheckCollate(false);
+
+ pStr = 0;
+
@@ -1022,7 +1093,7 @@
+ gtk_widget_hide( aHandle.pDialog );
+ rtl::OUString sFileURL;
+ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
-+ ExportAsPDF(sFileURL, IsCollateEnabled(), GetCopyCount(), meCheckRange, maRangeText);
++ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
+ }
+ else
+ {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1174
retrieving revision 1.1175
diff -u -r1.1174 -r1.1175
--- openoffice.org.spec 17 May 2007 20:13:27 -0000 1.1174
+++ openoffice.org.spec 18 May 2007 13:35:44 -0000 1.1175
@@ -1,6 +1,6 @@
%define oootag OOF680
-%define ooomilestone 14
-%define rh_rpm_release 9
+%define ooomilestone 16
+%define rh_rpm_release 1
# gcc#19664#
%define stlvisibilityfcked 1
@@ -18,7 +18,7 @@
%endif
%if %{langpacks}
-%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
+%define langpack_langs af ar bg bn ca cs cy da de dz el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
%else
%define langpack_langs en-US
%endif
@@ -28,7 +28,7 @@
ExclusiveArch: ppc %{ix86} x86_64
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.2.0
+Version: 2.2.1
Release: %{ooomilestone}.%{rh_rpm_release}
Epoch: 1
License: LGPL
@@ -152,8 +152,7 @@
%package core
Summary: Core modules for %{name}
Group: Applications/Productivity
-Requires: urw-fonts
-Requires: dejavu-lgc-fonts
+Requires: liberation-fonts
Requires: hunspell-en
%ifarch %{ppc}
# Ensure we have 32-bit theme libs in 64-bit multilib environments.
@@ -984,6 +983,16 @@
%description langpack-kn_IN
Provides additional kannada translations and resources for %{name}.
+%package langpack-dz
+Summary: Dzongkha language pack for %{name}
+Group: Applications/Productivity
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+Requires: jomolhari-fonts
+
+%description langpack-kn_IN
+Provides additional kannada translations and resources for %{name}.
+
+
%prep
%setup -q -n %{ooo_base_name}
%patch9 -p1 -b .rh133741.alwaysgtk.desktop.patch
@@ -1262,6 +1271,7 @@
xh help nolingu western ve nohelp nolingu western \
st help nolingu western ss nohelp nolingu western \
nr help nolingu western ns help nolingu western \
+dz help nolingu western
)
i=0
@@ -1515,6 +1525,7 @@
%files langpack-te_IN -f te-IN.filelist
%files langpack-ur -f ur-IN.filelist
%files langpack-kn_IN -f kn-IN.filelist
+%files langpack-dz -f dz.filelist
%endif
%files core
@@ -2634,6 +2645,12 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri May 18 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-16.1
+- Resolves: rhbz#216332 use cups for all duplex and printer features
+- Resolves: rhbz#237110 Dzongkha langpack
+- a 2.2.1 release candidate
+- require Liberation fonts
+
* Thu May 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.9
- ooo#77470 Because Liberation fonts will be included in FC-7 we need
to set the ms font equivalents as their fallbacks in exported to
More information about the fedora-extras-commits
mailing list