commit 62746c37f38864c1d8162cc0fbdf2a4cdbcae106
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Jul 18 14:16:07 2013 +0100
Add fix for cppumaker API change (#985849)
OpenOffice-UNO-0.07-cppumaker.patch | 17 +++++++++++++++++
perl-OpenOffice-UNO.spec | 9 +++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/OpenOffice-UNO-0.07-cppumaker.patch b/OpenOffice-UNO-0.07-cppumaker.patch
new file mode 100644
index 0000000..8e2ac06
--- /dev/null
+++ b/OpenOffice-UNO-0.07-cppumaker.patch
@@ -0,0 +1,17 @@
+http://cgit.freedesktop.org/libreoffice/core/commit/codemaker/source/cppumaker/cppuoptions.cxx?id=02a8e8acd1f0cbb512868fd9849363f9d069db95
+
+ * API CHANGE: cppumaker no longer supports the -B switch, as that is meaningless
+ with the new format. When reading from an old-format .rdb file, /UCR is
+ hard-coded as the prefix now.
+
+--- Makefile.PL
++++ Makefile.PL
+@@ -233,7 +233,7 @@
+ # $sdk_dir/$sdk_platf/bin/regmerge $out/moo.uno.rdb /UCR $out/some.urd
+
+ $out/headers : $out
+- $sdk_bin_dir${psep}cppumaker -Gc -BUCR -O$abs_out $interfaces "$sdk_ure_lib${psep}types.rdb"
++ $sdk_bin_dir${psep}cppumaker -Gc -O$abs_out $interfaces "$sdk_ure_lib${psep}types.rdb"
+ \$(TOUCH) $out/headers
+
+ uno_stuff: $out/headers perluno
diff --git a/perl-OpenOffice-UNO.spec b/perl-OpenOffice-UNO.spec
index 13a586a..0362b6a 100644
--- a/perl-OpenOffice-UNO.spec
+++ b/perl-OpenOffice-UNO.spec
@@ -1,6 +1,6 @@
Name: perl-OpenOffice-UNO
Version: 0.07
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Interface to OpenOffice's UNO run-time
License: LGPLv2+ and SISSL
Group: Development/Libraries
@@ -9,6 +9,7 @@ Source0: http://www.cpan.org/authors/id/M/MB/MBARBON/OpenOffice-UNO-%{ver
Patch0: 0001-Preserve-cflags.patch
Patch1: 0001-Hardcode-rpath-to-uno-library.patch
Patch2: OpenOffice-UNO-0.07-libraries.patch
+Patch3: OpenOffice-UNO-0.07-cppumaker.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::More)
@@ -34,6 +35,7 @@ A bridge to the OpenOffice.org API.
%patch0 -p1
%patch1 -p1
%patch2
+%patch3
%build
. $(find %{_libdir}/libreoffice -name setsdkenv_unix.sh -print -quit)
@@ -64,7 +66,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
setsid ooffice --headless --accept='socket,host=localhost,port=8100;urp;StarOffice.ServiceManager' &
trap "kill -- -$! ||:" EXIT
# Try to avoid having tests running in parallel
-sleep $(expr \( %__isa_bits - 30 \) \* 4)
+sleep $(expr \( %__isa_bits - 30 \) \* 6)
make test
@@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 18 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 0.07-9
+- Add fix for cppumaker API change (#985849)
+
* Wed Jul 17 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 0.07-8
- Perl 5.18 rebuild
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
