* [gentoo-commits] repo/gentoo:master commit in: media-libs/libemf/, media-libs/libemf/files/
@ 2020-07-16 1:06 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2020-07-16 1:06 UTC (permalink / raw
To: gentoo-commits
commit: 84aaa47fa1de53e56c742e14273b603e0dba392d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 00:31:23 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 01:01:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aaa47f
media-libs/libemf: security cleanup
Bug: https://bugs.gentoo.org/728806
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libemf/Manifest | 3 -
.../libemf/files/libemf-1.0.4-amd64-alpha.patch | 95 ----------------------
media-libs/libemf/libemf-1.0.12.ebuild | 25 ------
media-libs/libemf/libemf-1.0.4-r1.ebuild | 37 ---------
media-libs/libemf/libemf-1.0.7.ebuild | 35 --------
5 files changed, 195 deletions(-)
diff --git a/media-libs/libemf/Manifest b/media-libs/libemf/Manifest
index c06256840e3..f79081a90c0 100644
--- a/media-libs/libemf/Manifest
+++ b/media-libs/libemf/Manifest
@@ -1,4 +1 @@
-DIST libEMF-1.0.4.tar.gz 818060 BLAKE2B 0abc5f478d06ebc562323a515c51c46afd2a98fd2559d8a309c4b18f16da8063cd65fa7d19a83ba360e8c53a7e9788b590e810d615000069fe7c912194a8eec1 SHA512 8abd6081e79e6045b0a4a1575fbcc19921beeefb22036164ed906a35e4dbc67b6959899acf46bb5db5996ae07cf38aaecf8eb62dd6bf5f528200a4d20b13db55
-DIST libEMF-1.0.7.tar.gz 908973 BLAKE2B cfe2c67bfae9fd7387f5332fa7b5038510d81aab942fc87b04da625ecc39c3e2b711ed14fba46eabae4a2eced4621eb580cedf1c9e67f32fb33afb9bc1ceaa5e SHA512 eff5c46a6e1008d8f581fda59355faa608a825e4832c54dbb074bf20caeee5b038ce18ed3a13181de04bd0601837db7f5c5a0913eb1b8301100dbc26a9ee5888
-DIST libemf-1.0.12.tar.gz 1314880 BLAKE2B 61e1e56e713ce53c589a758ad01eca572d61ca336c0a6cb08f4becb9b850973a82d4fe124b8fd6f39530d2d4637c38ccb137d4c5eecb17469654fc921e9ef150 SHA512 a96f2b14e4dc0b0b388d21789890b3a89e20bdd6aaba3665a7af2c61c3da531718ed19eb0d70ef1ce1f46e1327530a7edc057c1b78f68e7e883b5357829c7453
DIST libemf-1.0.13.tar.gz 1314905 BLAKE2B a2614aae1e34fdd65292d7feff3c0c002393aad806bbe398c665191e496ff0d3af676b04bf95400e732f09b846d033f98d3f08e47f6d7779dca9694372ef1451 SHA512 37fdc959d2269ad1ae97d49c4f75b914593b7b636024c035d96a5a47b4258b5b522cd1928a5b99392afcdfe54e46c7f2d4c157056f99c8c0d88d71c25813cc60
diff --git a/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch b/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch
deleted file mode 100644
index 6f809a957e7..00000000000
--- a/media-libs/libemf/files/libemf-1.0.4-amd64-alpha.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- a/include/libEMF/wine/winbase.h
-+++ b/include/libEMF/wine/winbase.h
-@@ -1802,6 +1802,7 @@ LONG WINAPI InterlockedIncrement(PLONG);
- 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 @@ static inline PVOID WINAPI InterlockedExchangePointer( PVOID *dest, PVOID val )
- {
- return (PVOID)InterlockedExchange( (PLONG)dest, (LONG)val );
- }
-+#endif
-
- #ifdef __WINE__
- #define GetCurrentProcess() ((HANDLE)0xffffffff)
---- a/include/libEMF/wine/winnt.h
-+++ b/include/libEMF/wine/winnt.h
-@@ -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 USHORT, *PUSHORT, *LPUSHORT;
- 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 VOID *PVOID, *LPVOID;
- 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,8 +665,13 @@ typedef CONTEXT86 CONTEXT;
-
- #endif /* __i386__ */
-
-+#ifdef __x86_64__
-+#define CONTEXT_FULL 1
-+typedef struct _CONTEXT CONTEXT;
-+#endif
-+
- /* Alpha context definitions */
--#ifdef _ALPHA_
-+#if defined(__alpha__)
-
- #define CONTEXT_ALPHA 0x00020000
-
---- a/libemf/libemf.h
-+++ b/libemf/libemf.h
-@@ -306,6 +306,7 @@ namespace EMF {
- 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 @@ namespace EMF {
- fread( &long_, sizeof(LONG), 1, fp_ );
- return *this;
- }
-+#endif
- /*!
- * Output a (long) int to the stream (swabbed).
- * \param int_ (long) int to output.
diff --git a/media-libs/libemf/libemf-1.0.12.ebuild b/media-libs/libemf/libemf-1.0.12.ebuild
deleted file mode 100644
index 18a1df100b1..00000000000
--- a/media-libs/libemf/libemf-1.0.12.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-src_configure() {
- econf \
- --enable-editing \
- $(use_enable static-libs static)
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- default
- use static-libs || find "${D}" -name '*.la' -type f -delete
-}
diff --git a/media-libs/libemf/libemf-1.0.4-r1.ebuild b/media-libs/libemf/libemf-1.0.4-r1.ebuild
deleted file mode 100644
index 6f4feb32114..00000000000
--- a/media-libs/libemf/libemf-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-MY_P="${P/emf/EMF}"
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-amd64-alpha.patch )
-
-src_prepare() {
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=( --enable-editing )
- autotools-utils_src_configure
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- autotools-utils_src_install
-}
diff --git a/media-libs/libemf/libemf-1.0.7.ebuild b/media-libs/libemf/libemf-1.0.7.ebuild
deleted file mode 100644
index b2375485f9f..00000000000
--- a/media-libs/libemf/libemf-1.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-MY_P="${P/emf/EMF}"
-DESCRIPTION="Library implementation of ECMA-234 API for the generation of enhanced metafiles"
-HOMEPAGE="http://libemf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libemf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -arm ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=( --enable-editing )
- autotools-utils_src_configure
-}
-
-src_install() {
- use doc && HTML_DOCS=( doc/html/. )
- autotools-utils_src_install
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-07-16 1:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-16 1:06 [gentoo-commits] repo/gentoo:master commit in: media-libs/libemf/, media-libs/libemf/files/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox