| 1 |
commit: 5e9cc2bc4db8f8444f73c0bf21e43c06a6239e15 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Dec 26 15:01:08 2016 +0000 |
| 4 |
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 27 19:29:44 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9cc2bc |
| 7 |
|
| 8 |
media-gfx/splashutils: remove unused patches |
| 9 |
|
| 10 |
.../files/splashutils-1.5.4.4-bzip2.patch | 43 ------------------ |
| 11 |
.../files/splashutils-1.5.4.4-r3-bzip2.patch | 53 ---------------------- |
| 12 |
2 files changed, 96 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch |
| 15 |
deleted file mode 100644 |
| 16 |
index e821c16..00000000 |
| 17 |
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch |
| 18 |
+++ /dev/null |
| 19 |
@@ -1,43 +0,0 @@ |
| 20 |
- core/configure.ac | 6 ++++++ |
| 21 |
- core/src/Makefile.am | 2 +- |
| 22 |
- 2 files changed, 7 insertions(+), 1 deletions(-) |
| 23 |
- |
| 24 |
-diff --git a/core/configure.ac b/core/configure.ac |
| 25 |
-index c5fbb84..ae9e235 100644 |
| 26 |
---- a/core/configure.ac |
| 27 |
-+++ b/core/configure.ac |
| 28 |
-@@ -616,6 +616,7 @@ AS_IF( |
| 29 |
- AC_SUBST([PNG_CFLAGS]) |
| 30 |
- AC_SUBST([PNG_LIBS]) |
| 31 |
- |
| 32 |
-+BZ2_LIBS= |
| 33 |
- AS_IF( |
| 34 |
- [test "x${config_ttf}" = "xyes"], |
| 35 |
- [ |
| 36 |
-@@ -625,8 +626,13 @@ AS_IF( |
| 37 |
- , |
| 38 |
- [AC_MSG_ERROR([freetype was not found.])] |
| 39 |
- ) |
| 40 |
-+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress], |
| 41 |
-+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"], |
| 42 |
-+ [AC_MSG_ERROR(['libbz2' library was not found.])] |
| 43 |
-+ ) |
| 44 |
- ] |
| 45 |
- ) |
| 46 |
-+AC_SUBST([BZ2_LIBS]) |
| 47 |
- |
| 48 |
- AH_TOP([#ifndef __SPLASH_CONFIG_H |
| 49 |
- #define __SPLASH_CONFIG_H]) |
| 50 |
-diff --git a/core/src/Makefile.am b/core/src/Makefile.am |
| 51 |
-index d6ce315..349b5e7 100644 |
| 52 |
---- a/core/src/Makefile.am |
| 53 |
-+++ b/core/src/Makefile.am |
| 54 |
-@@ -190,7 +190,7 @@ fbsplashctl_SOURCES = $(fbsplashd_SOURCES) $(splash_util_SOURCES) fbspla |
| 55 |
- fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD |
| 56 |
- fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) |
| 57 |
- fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static |
| 58 |
--fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) |
| 59 |
-+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS) |
| 60 |
- |
| 61 |
- if CONFIG_FBCON_DECOR |
| 62 |
- fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES) |
| 63 |
|
| 64 |
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch b/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch |
| 65 |
deleted file mode 100644 |
| 66 |
index 13626df..00000000 |
| 67 |
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch |
| 68 |
+++ /dev/null |
| 69 |
@@ -1,53 +0,0 @@ |
| 70 |
- core/configure.ac | 6 ++++++ |
| 71 |
- core/src/Makefile.am | 2 +- |
| 72 |
- 2 files changed, 7 insertions(+), 1 deletions(-) |
| 73 |
- |
| 74 |
-diff --git a/core/configure.ac b/core/configure.ac |
| 75 |
-index c5fbb84..ae9e235 100644 |
| 76 |
---- a/core/configure.ac |
| 77 |
-+++ b/core/configure.ac |
| 78 |
-@@ -616,6 +616,7 @@ AS_IF( |
| 79 |
- AC_SUBST([PNG_CFLAGS]) |
| 80 |
- AC_SUBST([PNG_LIBS]) |
| 81 |
- |
| 82 |
-+BZ2_LIBS= |
| 83 |
- AS_IF( |
| 84 |
- [test "x${config_ttf}" = "xyes"], |
| 85 |
- [ |
| 86 |
-@@ -625,8 +626,13 @@ AS_IF( |
| 87 |
- , |
| 88 |
- [AC_MSG_ERROR([freetype was not found.])] |
| 89 |
- ) |
| 90 |
-+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress], |
| 91 |
-+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"], |
| 92 |
-+ [AC_MSG_ERROR(['libbz2' library was not found.])] |
| 93 |
-+ ) |
| 94 |
- ] |
| 95 |
- ) |
| 96 |
-+AC_SUBST([BZ2_LIBS]) |
| 97 |
- |
| 98 |
- AH_TOP([#ifndef __SPLASH_CONFIG_H |
| 99 |
- #define __SPLASH_CONFIG_H]) |
| 100 |
-diff --git a/core/src/Makefile.am b/core/src/Makefile.am |
| 101 |
-index d6ce315..349b5e7 100644 |
| 102 |
---- a/core/src/Makefile.am |
| 103 |
-+++ b/core/src/Makefile.am |
| 104 |
-@@ -121,6 +121,9 @@ |
| 105 |
- libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(libfbsplashrender_version) |
| 106 |
- libfbsplashrender_la_LIBADD = libfbsplash.la |
| 107 |
- |
| 108 |
-+libfbsplashrender_la_CFLAGS += $(BZ2_CFLAGS) |
| 109 |
-+libfbsplashrender_la_LIBADD += $(BZ2_LIBS) |
| 110 |
-+ |
| 111 |
- libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS) |
| 112 |
- libfbsplashrender_la_LIBADD += $(JPEG_LIBS) |
| 113 |
- |
| 114 |
-@@ -190,7 +193,7 @@ |
| 115 |
- fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS) $(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD |
| 116 |
- fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS) |
| 117 |
- fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static |
| 118 |
--fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) |
| 119 |
-+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la $(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS) |
| 120 |
- |
| 121 |
- if CONFIG_FBCON_DECOR |
| 122 |
- fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES) |
Archives