1 |
commit: f8ba8afb7c74c07ad25e92f4dca481fb11d6206c |
2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 18:02:24 2016 +0000 |
4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 18:02:24 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ba8afb |
7 |
|
8 |
media-gfx/graphicsmagick: remove unused patches, bug #597858 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
.../files/graphicsmagick-1.3.18-freetype.patch | 32 ---------------------- |
13 |
.../files/graphicsmagick-1.3.18-powerpc.patch | 11 -------- |
14 |
2 files changed, 43 deletions(-) |
15 |
|
16 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch |
17 |
deleted file mode 100644 |
18 |
index d6504e6..00000000 |
19 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch |
20 |
+++ /dev/null |
21 |
@@ -1,32 +0,0 @@ |
22 |
-https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940 |
23 |
- |
24 |
---- GraphicsMagick-1.3.18/configure |
25 |
-+++ GraphicsMagick-1.3.18/configure |
26 |
-@@ -22249,7 +22249,6 @@ |
27 |
- # directory as GraphicsMagick installation prefix. |
28 |
- #LDFLAGS="$LDFLAGS -L$LIB_DIR" |
29 |
- #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR" |
30 |
--MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_CPPFLAGS" |
31 |
- |
32 |
- # |
33 |
- # Find the X11 RGB database |
34 |
-@@ -25994,8 +25993,8 @@ |
35 |
- then |
36 |
- freetype_prefix=`${freetype_config} --prefix` |
37 |
- freetype_exec_prefix=`${freetype_config} --exec-prefix` |
38 |
-- LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib" |
39 |
-- CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2" |
40 |
-+ LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`" |
41 |
-+ CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`" |
42 |
- fi |
43 |
- |
44 |
- if test "$LIB_TTF" = '' |
45 |
-@@ -29605,7 +29604,7 @@ |
46 |
- |
47 |
- MAGICK_API_CFLAGS=$CFLAGS |
48 |
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/ */ /g'` |
49 |
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS" |
50 |
-+MAGICK_API_LDFLAGS="$LDFLAGS" |
51 |
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS" |
52 |
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS" |
53 |
- |
54 |
|
55 |
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch |
56 |
deleted file mode 100644 |
57 |
index 30a67fd..00000000 |
58 |
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch |
59 |
+++ /dev/null |
60 |
@@ -1,11 +0,0 @@ |
61 |
---- a/magick/studio.h |
62 |
-+++ b/magick/studio.h |
63 |
-@@ -51,7 +51,7 @@ |
64 |
- threads. Most CPUs have cache lines of 32 or 64 bytes. IBM Power CPUs have |
65 |
- cache lines of 128 bytes. |
66 |
- */ |
67 |
--#if defined(MAGICK_TARGET_CPU) && (MAGICK_TARGET_CPU == powerpc) |
68 |
-+#ifdef __powerpc__ |
69 |
- # define MAGICK_CACHE_LINE_SIZE 128 |
70 |
- #else |
71 |
- # define MAGICK_CACHE_LINE_SIZE 64 |