[packages/libEMF] - updated to 1.0.7 - added am patch (fixes build with automake 1.13) - removed obsolete amd64 patch
qboosh
qboosh at pld-linux.org
Fri Mar 22 17:14:15 CET 2013
commit cbf2363f60273de08b2119ddf53ff1b6826c0a41
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Mar 22 17:14:12 2013 +0100
- updated to 1.0.7
- added am patch (fixes build with automake 1.13)
- removed obsolete amd64 patch
libEMF-am.patch | 11 +++++++
libEMF-amd64.patch | 95 ------------------------------------------------------
libEMF.spec | 12 +++----
3 files changed, 16 insertions(+), 102 deletions(-)
---
diff --git a/libEMF.spec b/libEMF.spec
index 85e10c1..b112dd0 100644
--- a/libEMF.spec
+++ b/libEMF.spec
@@ -5,20 +5,19 @@
Summary: A library for generating Enhanced Metafiles
Summary(pl.UTF-8): Biblioteka do generowania plików w formacie Enhanced Metafile
Name: libEMF
-Version: 1.0.4
+Version: 1.0.7
Release: 1
License: LGPL v2.1+ (library), GPL v2+ (utility)
Group: Libraries
-#Source0: http://dl.sourceforge.net/libemf/%{name}-%{version}.tar.gz
-Source0: http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
-# Source0-md5: 4e74e5ee5fdab37bae8be6cde4d1c57c
-Patch0: %{name}-amd64.patch
+Source0: http://downloads.sourceforge.net/libemf/%{name}-%{version}.tar.gz
+# Source0-md5: f1011f5cc254aa228be78704fe5f9960
+Patch0: %{name}-am.patch
Patch1: %{name}-limits.patch
URL: http://libemf.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: libstdc++-devel >= 5:3.0
-BuildRequires: libtool >= 2:1.4d
+BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -68,7 +67,6 @@ Statyczna biblioteka libEMF.
%patch1 -p1
%build
-# supplied libtool is broken (no C++ libraries support)
%{__libtoolize}
%{__aclocal}
%{__autoconf}
diff --git a/libEMF-am.patch b/libEMF-am.patch
new file mode 100644
index 0000000..5cd04ef
--- /dev/null
+++ b/libEMF-am.patch
@@ -0,0 +1,11 @@
+--- libEMF-1.0.7/configure.ac.orig 2012-11-07 12:21:39.000000000 +0100
++++ libEMF-1.0.7/configure.ac 2013-03-22 17:07:38.169058707 +0100
+@@ -5,7 +5,7 @@
+ AC_INIT(libEMF, 1.0.7, dallenbarnett at users.sourceforge.net)
+ AC_CONFIG_AUX_DIR(config)
+ AM_INIT_AUTOMAKE(libEMF, 1.0.7)
+-AM_CONFIG_HEADER([config/config.h])
++AC_CONFIG_HEADERS([config/config.h])
+ AC_CONFIG_SRCDIR([include/libEMF/emf.h])
+
+ # Checks for programs.
diff --git a/libEMF-amd64.patch b/libEMF-amd64.patch
deleted file mode 100644
index b1cc82a..0000000
--- a/libEMF-amd64.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -urN libEMF-1.0.3/include/libEMF/wine/winbase.h libEMF-1.0.3.new/include/libEMF/wine/winbase.h
---- libEMF-1.0.3/include/libEMF/wine/winbase.h 2004-07-29 08:20:38.000000000 +0200
-+++ libEMF-1.0.3.new/include/libEMF/wine/winbase.h 2009-05-15 19:56:25.774725477 +0200
-@@ -1802,6 +1802,7 @@
- VOID WINAPI SetLastError(DWORD);
- #endif /* __i386__ && __GNUC__ */
-
-+#if 0
- /* FIXME: should handle platforms where sizeof(void*) != sizeof(long) */
- static inline PVOID WINAPI InterlockedCompareExchangePointer( PVOID *dest, PVOID xchg, PVOID compare )
- {
-@@ -1812,6 +1813,7 @@
- {
- return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
- }
-+#endif
-
- #ifdef __WINE__
- #define GetCurrentProcess() ((HANDLE)0xffffffff)
-diff -urN libEMF-1.0.3/include/libEMF/wine/winnt.h libEMF-1.0.3.new/include/libEMF/wine/winnt.h
---- libEMF-1.0.3/include/libEMF/wine/winnt.h 2005-08-07 17:50:12.000000000 +0200
-+++ libEMF-1.0.3.new/include/libEMF/wine/winnt.h 2009-05-15 18:50:24.735710711 +0200
-@@ -29,10 +29,14 @@
-
- /* Architecture dependent settings. */
- /* These are hardcoded to avoid dependencies on config.h in Winelib apps. */
--#if defined(__i386__)
-+#if defined(__i386__) || defined(__x86_64__)
- # undef WORDS_BIGENDIAN
- # undef BITFIELDS_BIGENDIAN
- # define ALLOW_UNALIGNED_ACCESS
-+#elif defined(__alpha__)
-+# undef WORDS_BIGENDIAN
-+# undef BITFIELDS_BIGENDIAN
-+# undef ALLOW_UNALIGNED_ACCESS
- #elif defined(__sparc__)
- # define WORDS_BIGENDIAN
- # define BITFIELDS_BIGENDIAN
-@@ -222,8 +226,13 @@
- typedef unsigned short WORD, *PWORD, *LPWORD;
- typedef int INT, *PINT, *LPINT;
- typedef unsigned int UINT, *PUINT, *LPUINT;
-+#if defined(_LP64) || defined(__alpha__)
-+typedef unsigned int DWORD, *PDWORD, *LPDWORD;
-+typedef unsigned int ULONG, *PULONG, *LPULONG;
-+#else
- typedef unsigned long DWORD, *PDWORD, *LPDWORD;
- typedef unsigned long ULONG, *PULONG, *LPULONG;
-+#endif
- typedef float FLOAT, *PFLOAT, *LPFLOAT;
- typedef double DOUBLE, *PDOUBLE, *LPDOUBLE;
- typedef double DATE;
-@@ -263,7 +272,11 @@
- typedef BYTE BOOLEAN, *PBOOLEAN;
- typedef char CHAR, *PCHAR;
- typedef short SHORT, *PSHORT;
-+#if defined(_LP64) || defined(__alpha__)
-+typedef int LONG, *PLONG, *LPLONG;
-+#else
- typedef long LONG, *PLONG, *LPLONG;
-+#endif
-
- /* Some systems might have wchar_t, but we really need 16 bit characters */
- #ifndef WINE_WCHAR_DEFINED
-@@ -652,6 +665,11 @@
-
- #endif /* __i386__ */
-
-+#ifdef __x86_64__
-+#define CONTEXT_FULL 1
-+typedef struct _CONTEXT CONTEXT;
-+#endif
-+
- /* Alpha context definitions */
- #ifdef _ALPHA_
-
-diff -urN libEMF-1.0.3/libemf/libemf.h libEMF-1.0.3.new/libemf/libemf.h
---- libEMF-1.0.3/libemf/libemf.h 2004-11-11 23:33:43.000000000 +0100
-+++ libEMF-1.0.3.new/libemf/libemf.h 2009-05-15 18:50:24.735710711 +0200
-@@ -306,6 +306,7 @@
- fread( &word, sizeof(INT16), 1, fp_ );
- return *this;
- }
-+#if !(defined(_LP64) || defined(__alpha__))
- /*!
- * Output a double word (long) to the stream (swabbed).
- * \param word word (long) to output.
-@@ -374,6 +375,7 @@
- fread( &long_, sizeof(LONG), 1, fp_ );
- return *this;
- }
-+#endif
- /*!
- * Output a (long) int to the stream (swabbed).
- * \param int_ (long) int to output.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libEMF.git/commitdiff/cbf2363f60273de08b2119ddf53ff1b6826c0a41
More information about the pld-cvs-commit
mailing list