Your message dated Mon, 29 Jul 2013 08:20:45 +0300
with message-id <51f5fbad.7020...@iki.fi>
and subject line Re: FTBFS: cppumakers -B doesn't accept UCR anymore
has caused the Debian Bug report #717873,
regarding FTBFS: cppumakers -B doesn't accept UCR anymore
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
717873: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717873
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libreoffice-voikko
Version: 3.4.1-1
Severity: serious
Tags: upstream patch

Hi,

I uploaded LibreOffice 4.1.0 to sid today.

I should have checked and warned beforehand - I forgot, my bad and sorry.

Anyway:

As of
http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a8e8acd1f0cbb512868fd9849363f9d069db95

cppumakers -B doesn't accept UCR anymore, which results in libreoffice-voikko
FTBFS:

[...]
make[2]: Entering directory `/tmp/libreoffice-voikko-3.4.1'
mkdir -p build/oxt/META-INF
sed -e 
"s/VOIKKO_EXTENSION_SHAREDLIB/voikko.so/g;s/UNOPKG_PLATFORM/Linux_x86_64/g;/GRAMMAR_CHECKER_DISABLED/d"
 < oxt/META-INF/manifest.xml.template > build/oxt/META-INF/manifest.xml
mkdir -p build/oxt
sed -e "s/VOIKKO_VERSION/3.4.1/g" < oxt/description.xml.template > 
build/oxt/description.xml
mkdir -p build/hpp
"/usr/lib/libreoffice/sdk/bin/cppumaker" -Gc -BUCR -O./build/hpp 
"/usr/lib/libreoffice/ure-link/share/misc/types.rdb" 
"/usr/lib/libreoffice/program/types/offapi.rdb"
Illegal option the option is unknown-BUCR

When I look at e.g. 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f8015045cb59ff9574230530d371b6659697881
 it should suffice to just remove -BUCR.

That works for me. Patch attached.
work.

Regards,

Rene

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libreoffice-voikko depends on:
ii  libc6             2.17-7
ii  libgcc1           1:4.8.1-8
ii  libreoffice-core  1:4.1.0-1
ii  libstdc++6        4.8.1-8
ii  libvoikko1        3.6-2
ii  uno-libs3         4.1.0-1
ii  ure               4.1.0-1
ii  voikko-fi         1.14-1

Versions of packages libreoffice-voikko recommends:
ii  libreoffice          1:4.1.0-1
ii  libreoffice-calc     1:4.1.0-1
ii  libreoffice-draw     1:4.1.0-1
ii  libreoffice-impress  1:4.1.0-1
ii  libreoffice-writer   1:4.1.0-1

libreoffice-voikko suggests no packages.

-- no debconf information
diff -Nru libreoffice-voikko-3.4.1/debian/changelog libreoffice-voikko-3.4.1/debian/changelog
--- libreoffice-voikko-3.4.1/debian/changelog	2013-07-23 17:22:58.000000000 +0200
+++ libreoffice-voikko-3.4.1/debian/changelog	2013-07-25 22:56:36.000000000 +0200
@@ -1,3 +1,9 @@
+libreoffice-voikko (3.4.1-2) unstable; urgency=low
+
+  * fix build with LibreOffice 4.1.0
+
+ -- Rene Engelhard <r...@debian.org>  Thu, 25 Jul 2013 22:56:08 +0200
+
 libreoffice-voikko (3.4.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru libreoffice-voikko-3.4.1/debian/control libreoffice-voikko-3.4.1/debian/control
--- libreoffice-voikko-3.4.1/debian/control	2013-05-22 11:02:58.000000000 +0200
+++ libreoffice-voikko-3.4.1/debian/control	2013-07-25 22:51:00.000000000 +0200
@@ -2,7 +2,7 @@
 Section: text
 Priority: optional
 Maintainer: Timo Jyrinki <t...@debian.org>
-Build-Depends: debhelper (>= 9.0.0), libreoffice-dev, libvoikko-dev (>= 2.1), zip, unzip, hardening-wrapper
+Build-Depends: debhelper (>= 9.0.0), libreoffice-dev (>= 1:4.1.0~), libvoikko-dev (>= 2.1), zip, unzip, hardening-wrapper
 Build-Conflicts: libreoffice-common (<< 1:3.5.0~)
 Standards-Version: 3.9.4
 Homepage: http://voikko.sourceforge.net/
diff -Nru libreoffice-voikko-3.4.1/debian/patches/BUCR-is-gone.diff libreoffice-voikko-3.4.1/debian/patches/BUCR-is-gone.diff
--- libreoffice-voikko-3.4.1/debian/patches/BUCR-is-gone.diff	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-voikko-3.4.1/debian/patches/BUCR-is-gone.diff	2013-07-25 22:55:02.000000000 +0200
@@ -0,0 +1,18 @@
+Description: -BUCR is gone in cppumaker
+ -BUCR is gone in cppumaker upstream, se
+ http://cgit.freedesktop.org/libreoffice/core/commit/?id=02a8e8acd1f0cbb512868fd9849363f9d069db95.
+ Fix like upstream for javamaker (which had the same change) in
+ http://cgit.freedesktop.org/libreoffice/core/commit/?id=5f8015045cb59ff9574230530d371b6659697881
+Author: Rene Engelhard <r...@debian.org>
+
+--- libreoffice-voikko-3.4.1.orig/Makefile
++++ libreoffice-voikko-3.4.1/Makefile
+@@ -236,7 +236,7 @@ $(patsubst %,build/oxt/%,$(STANDALONE_EX
+ # Type library C++ headers
+ build/hpp.flag:
+ 	-$(MKDIR) build$(PS)hpp
+-	$(CPPUMAKER) -Gc -BUCR -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
++	$(CPPUMAKER) -Gc -O./build/hpp $(URE_TYPES) $(OFFICE_TYPES)
+ 	echo flagged > $@
+ 
+ 
diff -Nru libreoffice-voikko-3.4.1/debian/patches/series libreoffice-voikko-3.4.1/debian/patches/series
--- libreoffice-voikko-3.4.1/debian/patches/series	2011-12-17 10:37:48.000000000 +0100
+++ libreoffice-voikko-3.4.1/debian/patches/series	2013-07-25 22:38:20.000000000 +0200
@@ -1 +1,2 @@
 debug
+BUCR-is-gone.diff

--- End Message ---
--- Begin Message ---
Version: 3.4.1-2

Tested to build against LibreOffice 4.1.0 in pbuilder and uploaded.
Thank you!

-Timo

--- End Message ---

Reply via email to