rpms/openoffice.org/devel openoffice.org-2.3.0.ooo80967.ucb.neon27.patch, NONE, 1.1 openoffice.org.spec, 1.1266, 1.1267
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Aug 23 09:58:39 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
Log Message:
reenable neon
openoffice.org-2.3.0.ooo80967.ucb.neon27.patch:
--- NEW FILE openoffice.org-2.3.0.ooo80967.ucb.neon27.patch ---
Index: source/ucp/webdav/NeonSession.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
retrieving revision 1.49
diff -u -r1.49 NeonSession.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.cxx 18 Jul 2007 07:55:41 -0000 1.49
+++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 23 Aug 2007 09:48:56 -0000
@@ -364,32 +364,6 @@
}
// -------------------------------------------------------------------
-extern "C" void NeonSession_ProgressNotify( void *,
- off_t,
- off_t )
-{
- // progress: bytes read so far
- // total: total bytes to read, -1 -> total count not known
-}
-
-// -------------------------------------------------------------------
-extern "C" void NeonSession_StatusNotify( void *,
- ne_conn_status,
- const char * )
-{
-#if 0
- typedef enum {
- ne_conn_namelookup, /* lookup up hostname (info = hostname) */
- ne_conn_connecting, /* connecting to host (info = hostname) */
- ne_conn_connected, /* connected to host (info = hostname) */
- ne_conn_secure /* connection now secure (info = crypto level) */
- } ne_conn_status;
-#endif
-
- // info: hostname
-}
-
-// -------------------------------------------------------------------
extern "C" void NeonSession_PreSendRequest( ne_request * req,
void * userdata,
ne_buffer * headers )
@@ -578,13 +552,6 @@
NeonUri::makeConnectionEndPointString(
m_aHostName, m_nPort ) );
- // Set a progress callback for the session.
- ne_set_progress( m_pHttpSession, NeonSession_ProgressNotify, this );
-
- // Set a status notification callback for the session, to report
- // connection status.
- ne_set_status( m_pHttpSession, NeonSession_StatusNotify, this );
-
// Add hooks (i.e. for adding additional headers to the request)
#if 0
diff -ru config_office/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in 2007-08-23 11:49:35.000000000 +0100
+++ openoffice.org/config_office/configure.in 2007-08-23 11:50:28.000000000 +0100
@@ -4019,8 +4019,7 @@
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
- PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
- PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
+ PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1266
retrieving revision 1.1267
diff -u -r1.1266 -r1.1267
--- openoffice.org.spec 23 Aug 2007 09:24:30 -0000 1.1266
+++ openoffice.org.spec 23 Aug 2007 09:58:06 -0000 1.1267
@@ -129,6 +129,7 @@
Patch64: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
Patch65: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch66: workspace.dba23e.patch
+Patch67: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
%define instdir %{_libdir}/openoffice.org
@@ -1069,6 +1070,7 @@
%patch64 -p1 -b .ooo80944.sd.sixtyfour.patch
%patch65 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch66 -p1 -b .workspace.dba23e.patch
+%patch67 -p1 -b .ooo80967.ucb.neon27.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1081,7 +1083,7 @@
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --disable-neon --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-!
ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --with-system-libtextcat --with-system-vigra --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-!
afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -2729,6 +2731,7 @@
- move vba stuff into calc package
- add workspace.dba23e.patch
- no longer need openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
+- add openoffice.org-2.3.0.ooo80967.ucb.neon27.patch and reenable neon
* Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.1
- Resolves: rhbz#251896 count from start of ctl sequence, not start of
More information about the fedora-extras-commits
mailing list