Attachment 660306 Details for Bug 772534 – fix the build on f17

[patch] fix the build on f17

pdfedit-f17.patch (text/plain), 2.74 KB, created by Kai Engert (:kaie) (inactive account) on 2012-12-09 15:38:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Engert (:kaie) (inactive account)

Created: 2012-12-09 15:38:39 UTC

Size: 2.74 KB

patch

obsolete

>diff --git a/build-045f17.patch b/build-045f17.patch
>new file mode 100644
>index 0000000..ffad56c
>--- /dev/null
>+++ b/build-045f17.patch
>@@ -0,0 +1,35 @@
>+diff -up ./src/gui/rect2Darray.h.045f17 ./src/gui/rect2Darray.h
>+--- ./src/gui/rect2Darray.h.045f17	2009-04-06 17:24:50.000000000 +0200
>++++ ./src/gui/rect2Darray.h	2012-12-07 23:15:09.703862328 +0100
>+@@ -305,7 +305,7 @@ void RectArray<T>::myAppend ( const BBox
>+ 		minY = std::min( minY, item->top() );
>+ 		maxY = std::max( maxY, item->bottom() );
>+ 	}
>+-	append( item );
>++	this->append( item );
>+ }
>+ 
>+ template <typename T>
>+@@ -461,7 +461,7 @@ void Rect2DArray<T>::myAppend( BBoxOfObj
>+ 	if (toAppend) {
>+ 		current = new RectArray<T>();
>+ 		current->myAppend( bbox );
>+-		append( current );
>++		this->append( current );
>+ 	}
>+ }
>+ 
>+diff -up ./src/kernel/cobject2xpdf.cc.045f17 ./src/kernel/cobject2xpdf.cc
>+--- ./src/kernel/cobject2xpdf.cc.045f17	2009-09-11 14:02:56.000000000 +0200
>++++ ./src/kernel/cobject2xpdf.cc	2012-12-07 23:15:33.847932118 +0100
>+@@ -718,6 +718,10 @@ simpleValueFromXpdfObj (const Object& ob
>+ 	rp (obj,val);
>+ }
>+ 
>++template
>++void
>++simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val);
>++
>+ //
>+ // Special case for pNull
>+ //
>diff --git a/pdfedit.spec b/pdfedit.spec
>index 84f8255..20df2cd 100644
>--- a/pdfedit.spec
>+++ b/pdfedit.spec
>@@ -1,6 +1,6 @@
> Name:           pdfedit
> Version:        0.4.5
>-Release:        4%{?dist}
>+Release:        5%{?dist}
> Summary:        A complete pdf document editing solution
> 
> Group:          Applications/Publishing
>@@ -9,6 +9,7 @@ URL:            http://sourceforge.net/projects/pdfedit/
> Source0:        http://downloads.sourceforge.net/pdfedit/%{name}-%{version}.tar.bz2
> Source1:        pdfedit.desktop
> Source2:        pdfedit_event.conf
>+Patch1:         build-045f17.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  boost-devel
>@@ -36,12 +37,14 @@ everything is based on a script.
> 
> %prep
> %setup -q
>+%patch1 -p0 -b .045f17
> # fix paths to be relative to rpm build root
> sed -i 's/$.path\s\+= $/\1$(QMAKE_DESTDIR)\//' src/gui/pdfedit.pro
> 
> 
> %build
> export QMAKESPEC=linux-g++
>+export QTDIR=`pkg-config qt-mt --variable=prefix`
> # Tools aren't actually installed, so not building them now
> # --enable-pdfedit-core-dev --enable-tools
> %configure
>@@ -49,6 +52,8 @@ make %{?_smp_mflags}
> 
> 
> %install
>+export QMAKESPEC=linux-g++
>+export QTDIR=`pkg-config qt-mt --variable=prefix`
> rm -rf $RPM_BUILD_ROOT
> # DESTDIR is reserved in qmake
> make install INSTALL_ROOT=$RPM_BUILD_ROOT
>@@ -109,6 +114,9 @@ fi
> 
> 
> %changelog
>+* Fri Dec 07 2012 Kai Engert <kaie@redhat.com> - 0.4.5-5
>+- Fix the build on Fedora 17
>+
> * Mon May 16 2011 Orion Poplawski <orion@cora.nwra.com> - 0.4.5-4
> - Prevent abrt reports
>

Actions: View | Diff

Attachments on bug 772534: 660306