update to 1.0.12 (#1827949)

drop obsolete patch
This commit is contained in:
Dominik 'Rathann' Mierzejewski 2020-05-01 23:09:14 +02:00
parent fdf3bccff7
commit 73228b77d3
4 changed files with 8 additions and 97 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@ libEMF-1.0.4.tar.gz
/libEMF-1.0.7.tar.gz /libEMF-1.0.7.tar.gz
/libemf-1.0.8.tar.gz /libemf-1.0.8.tar.gz
/libemf-1.0.9.tar.gz /libemf-1.0.9.tar.gz
/libemf-1.0.12.tar.gz

View File

@ -1,92 +0,0 @@
--- libEMF-1.0.7/include/libEMF/wine/winnt.h.orig 2014-05-11 09:42:07.438982485 +0100
+++ libEMF-1.0.7/include/libEMF/wine/winnt.h 2014-05-11 09:42:42.104573014 +0100
@@ -45,6 +45,10 @@
# undef WORDS_BIGENDIAN
# undef BITFIELDS_BIGENDIAN
# undef ALLOW_UNALIGNED_ACCESS
+#elif defined(__aarch64__)
+# undef WORDS_BIGENDIAN
+# undef BITFIELDS_BIGENDIAN
+# undef ALLOW_UNALIGNED_ACCESS
#elif defined(__sparc__)
# define WORDS_BIGENDIAN
# define BITFIELDS_BIGENDIAN
@@ -1425,6 +1429,78 @@
#endif /* __arm__ */
+#ifdef __aarch64__
+/*
+ * FIXME:
+ *
+ * There is not yet an official CONTEXT structure defined for the AArch64
+ * architecture, so I just made one up.
+ *
+ */
+
+/* These definitions are taken directly from wine
+ * http://source.winehq.org/git/wine.git/blob_plain/HEAD:/include/winnt.h */
+
+#define CONTEXT_ARM64 0x2000000
+#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x00000001)
+#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x00000002)
+#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004)
+#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)
+
+#define EXCEPTION_READ_FAULT 0
+#define EXCEPTION_WRITE_FAULT 1
+#define EXCEPTION_EXECUTE_FAULT 8
+
+typedef struct _CONTEXT {
+ ULONG ContextFlags;
+
+ /* This section is specified/returned if the ContextFlags word contains
+ the flag CONTEXT_INTEGER. */
+ ULONGLONG X0;
+ ULONGLONG X1;
+ ULONGLONG X2;
+ ULONGLONG X3;
+ ULONGLONG X4;
+ ULONGLONG X5;
+ ULONGLONG X6;
+ ULONGLONG X7;
+ ULONGLONG X8;
+ ULONGLONG X9;
+ ULONGLONG X10;
+ ULONGLONG X11;
+ ULONGLONG X12;
+ ULONGLONG X13;
+ ULONGLONG X14;
+ ULONGLONG X15;
+ ULONGLONG X16;
+ ULONGLONG X17;
+ ULONGLONG X18;
+ ULONGLONG X19;
+ ULONGLONG X20;
+ ULONGLONG X21;
+ ULONGLONG X22;
+ ULONGLONG X23;
+ ULONGLONG X24;
+ ULONGLONG X25;
+ ULONGLONG X26;
+ ULONGLONG X27;
+ ULONGLONG X28;
+ ULONGLONG X29;
+ ULONGLONG X30;
+
+ /* These are selected by CONTEXT_CONTROL */
+ ULONGLONG Sp;
+ ULONGLONG Pc;
+ ULONGLONG PState;
+
+ /* These are selected by CONTEXT_FLOATING_POINT */
+ /* FIXME */
+} CONTEXT;
+
+#endif /* __aarch64__ */
+
#if !defined(CONTEXT_FULL) && !defined(RC_INVOKED)
#error You need to define a CONTEXT for your CPU
#endif

View File

@ -1,12 +1,11 @@
Summary: A library for generating Enhanced Metafiles Summary: A library for generating Enhanced Metafiles
Summary(pl): Biblioteka do generowania plików w formacie Enhanced Metafile Summary(pl): Biblioteka do generowania plików w formacie Enhanced Metafile
Name: libEMF Name: libEMF
Version: 1.0.9 Version: 1.0.12
Release: 9%{?dist} Release: 1%{?dist}
License: LGPLv2+ and GPLv2+ License: LGPLv2+ and GPLv2+
URL: http://libemf.sourceforge.net/ URL: http://libemf.sourceforge.net/
Source0: https://downloads.sourceforge.net/project/libemf/libemf/%{version}/libemf-%{version}.tar.gz Source0: https://downloads.sourceforge.net/project/libemf/libemf/%{version}/libemf-%{version}.tar.gz
Patch0: libEMF-aarch64.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%description %description
@ -37,7 +36,6 @@ Pliki nagłówkowe libEMF.
%prep %prep
%setup -q -n libemf-%{version} %setup -q -n libemf-%{version}
%patch0 -p1 -b .aarch64
%build %build
%configure \ %configure \
@ -70,6 +68,10 @@ make check
%{_includedir}/libEMF %{_includedir}/libEMF
%changelog %changelog
* Fri May 01 2020 Dominik 'Rathann' Mierzejewski <rpm@greysector.net> 1.0.12-1
- update to 1.0.12 (#1827949)
- drop obsolete patch
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-9 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (libemf-1.0.9.tar.gz) = bc8fad35a5e21093c8fca070d5ad4ec4142a6d754dd506b9df1f6890c23e8cf67c3ae417350a18afc0d3f44de0d0bbe21d99e51ec69f3b42bdd3664990bf01e0 SHA512 (libemf-1.0.12.tar.gz) = 157ca72befe6f88671700091f85a38516b091e3298e478ff4c45a681a6c7f4b7d9e13fe3f1a5698e9a0685db67ed042bb93ca74d4979ce536a2b7c740f3c9bc6