pool/libEMF
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libEMF?expand=0&rev=2

Browse Source
This commit is contained in:
OBS User unknown 2008-02-29 11:40:00 +00:00 committed by Git OBS Bridge
parent d70acd7584
commit dc9de6b820
3 changed files with 58 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libEMF-gcc3-fix.diff → libEMF-gcc4-fix.diff
View File

@ -1,6 +1,5 @@
diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp --- libemf/libemf.cpp
--- libEMF-1.0.orig/libemf/libemf.cpp 2002-01-29 04:37:54.000000000 +0100 +++ libemf/libemf.cpp 2008/02/29 11:14:38
+++ libEMF-1.0/libemf/libemf.cpp 2002-11-20 19:03:37.000000000 +0100
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
be32 = !be16; be32 = !be16;
@ -15,7 +14,7 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp
std::for_each( dc->records.begin(), dc->records.end(), std::for_each( dc->records.begin(), dc->records.end(),
- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), + std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
dc->ds ) ); dc->ds ) );
fclose( dc->fp ); fclose( dc->fp );
@ -24,7 +23,7 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp
std::for_each( dc->records.begin(), dc->records.end(), std::for_each( dc->records.begin(), dc->records.end(),
- std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ), - std::bind2nd( std::mem_fun1( &EMF::METARECORD::serialize ),
+ std::bind2nd( mem_fun1( &EMF::METARECORD::serialize ), + std::bind2nd( std::mem_fun( &EMF::METARECORD::serialize ),
dc->ds ) ); dc->ds ) );
} }
@ -48,19 +47,9 @@ diff -ru libEMF-1.0.orig/libemf/libemf.cpp libEMF-1.0/libemf/libemf.cpp
// Regardless, position ourselves at the next record. // Regardless, position ourselves at the next record.
fseek( fp, next_position, SEEK_SET ); fseek( fp, next_position, SEEK_SET );
@@ -1108,7 +1108,7 @@ --- libemf/libemf.h
if ( dc == 0 ) return; +++ libemf/libemf.h 2008/02/29 11:14:38
@@ -21,11 +21,13 @@
std::for_each( dc->records.begin(), dc->records.end(),
- std::mem_fun( &EMF::METARECORD::edit ) );
+ mem_fun( &EMF::METARECORD::edit ) );
#endif /* ENABLE_EDITING */
}
diff -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h
--- libEMF-1.0.orig/libemf/libemf.h 2002-01-29 05:54:27.000000000 +0100
+++ libEMF-1.0/libemf/libemf.h 2002-11-20 19:08:00.000000000 +0100
@@ -21,10 +21,12 @@
#ifndef _LIBEMF_H #ifndef _LIBEMF_H
#define _LIBEMF_H 1 #define _LIBEMF_H 1
@ -69,7 +58,8 @@ diff -ru libEMF-1.0.orig/libemf/libemf.h libEMF-1.0/libemf/libemf.h
#include <vector> #include <vector>
#include <map> #include <map>
#include <functional> #include <functional>
+#include <backward/function.h>
#include <algorithm> #include <algorithm>
+#include <climits>
#include <config.h> #include <config.h>
#include <emf.h>

5
libEMF.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 29 12:36:26 CET 2008 - ro@suse.de
- fix build with current gcc
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:37:21 CET 2006 - mls@suse.de Wed Jan 25 21:37:21 CET 2006 - mls@suse.de

91
libEMF.spec
View File

@ -1,44 +1,46 @@
# #
# spec file for package libEMF (Version 1.0) # spec file for package libEMF (Version 1.0)
# #
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
# Please submit bugfixes or comments via http://www.suse.de/feedback/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild # norootforbuild
Name: libEMF
BuildRequires: gcc-c++ Name: libEMF
License: LGPL BuildRequires: gcc-c++
Group: System/Libraries License: LGPL v2.1 or later
Autoreqprov: on Group: System/Libraries
Version: 1.0 AutoReqProv: on
Release: 185 Version: 1.0
Source0: %{name}-%{version}.tar.bz2 Release: 254
Patch0: libEMF-gcc3-fix.diff Source0: %{name}-%{version}.tar.bz2
URL: http://libemf.sourceforge.net/ Patch0: libEMF-gcc4-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://libemf.sourceforge.net/
Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Library for Manipulation with Enhanced MetaFile (EMF, ECMA-234)
%package devel %package devel
Group: System/Libraries Group: System/Libraries
Autoreqprov: on AutoReqProv: on
Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234) Summary: Library for manipulation with Enhanced MetaFile (EMF, ECMA-234)
Requires: %name = %version Requires: %name = %version
# add platforms with a wine port here # add platforms with a wine port here
ExclusiveArch: axp %ix86 ppc sparc ExclusiveArch: axp %ix86 ppc sparc
%description %description
LibEMF is a C/C++ library which provides a drawing toolkit based on LibEMF is a C/C++ library that provides a drawing toolkit based on
ECMA-234. The general purpose of this library is to create vector ECMA-234. The general purpose of this library is to create vector
graphics files on POSIX systems which can be imported into graphics files on POSIX systems that can be imported into StarOffice or
StarOffice/OpenOffice. The Enhanced MetaFile (EMF) is one of the two OpenOffice. The Enhanced MetaFile (EMF) is one of the two color vector
color vector graphics format which is "vectorially" understood by graphics format that is "vectorially" understood by SO and OO. The EMF
SO/OO. The EMF format also has the additional advantage that it can be format also has the additional advantage that it can be "broken" into
"broken" into its constituent components and edited like any other its constituent components and edited like any other SO or OO graphics
SO/OO graphics object. object.
@ -46,7 +48,6 @@ Authors:
-------- --------
Allen Barnett <libemf@lignumcomputing.com> Allen Barnett <libemf@lignumcomputing.com>
%description devel %description devel
LibEMF is a C/C++ library which provides a drawing toolkit based on LibEMF is a C/C++ library which provides a drawing toolkit based on
ECMA-234. The general purpose of this library is to create vector ECMA-234. The general purpose of this library is to create vector
@ -64,12 +65,16 @@ Authors:
Allen Barnett <libemf@lignumcomputing.com> Allen Barnett <libemf@lignumcomputing.com>
%define prefix /usr %define prefix /usr
%prep %prep
%setup %setup
%patch0 -p1 %patch0
%{?suse_update_config:%{suse_update_config}} # set docdir to main-package name, will only work if only
# one subpackage has doc files
%define _docdir_fmt %{name}
%build %build
%{?suse_update_config:%{suse_update_config}}
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS"
./configure \ ./configure \
@ -81,42 +86,34 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
make make
%install %install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}
cp -R AUTHORS COPYING COPYING.LIB ChangeLog NEWS README doc/html $RPM_BUILD_ROOT/usr/share/doc/packages/%{name}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%dir /usr/share/doc/packages/%{name}
%doc /usr/share/doc/packages/%{name}/AUTHORS
%doc /usr/share/doc/packages/%{name}/COPYING
%doc /usr/share/doc/packages/%{name}/COPYING.LIB
%doc /usr/share/doc/packages/%{name}/ChangeLog
%doc /usr/share/doc/packages/%{name}/NEWS
%doc /usr/share/doc/packages/%{name}/README
%{prefix}/bin/* %{prefix}/bin/*
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
%doc doc/html
%{prefix}/include/libEMF %{prefix}/include/libEMF
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/*.*a %{_libdir}/*.*a
%defattr(-, root, root)
%doc /usr/share/doc/packages/%{name}/html
%changelog -n libEMF %changelog
* Wed Jan 25 2006 - mls@suse.de * Fri Feb 29 2008 ro@suse.de
- fix build with current gcc
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Thu Sep 29 2005 - dmueller@suse.de * Thu Sep 29 2005 dmueller@suse.de
- add norootforbuild - add norootforbuild
* Sat Aug 23 2003 - ro@suse.de * Sat Aug 23 2003 ro@suse.de
- added ExclusiveArch to specfile - added ExclusiveArch to specfile
* Sun Jun 15 2003 - coolo@suse.de * Sun Jun 15 2003 coolo@suse.de
- package %%_docdir - package %%_docdir
* Thu Nov 21 2002 - sbrabec@suse.cz * Thu Nov 21 2002 sbrabec@suse.cz
- New package. - New package.