commit: 5e9cc2bc4db8f8444f73c0bf21e43c06a6239e15
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail
<DOT> com>
AuthorDate: Mon Dec 26 15:01:08 2016 +0000
Commit: Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:29:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9cc2bc
media-gfx/splashutils: remove unused patches
.../files/splashutils-1.5.4.4-bzip2.patch | 43 ------------------
.../files/splashutils-1.5.4.4-r3-bzip2.patch | 53 ----------------------
2 files changed, 96 deletions(-)
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
deleted file mode 100644
index e821c16..00000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-bzip2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
- core/configure.ac | 6 ++++++
- core/src/Makefile.am | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/core/configure.ac b/core/configure.ac
-index c5fbb84..ae9e235 100644
---- a/core/configure.ac
-+++ b/core/configure.ac
-@@ -616,6 +616,7 @@ AS_IF(
- AC_SUBST([PNG_CFLAGS])
- AC_SUBST([PNG_LIBS])
-
-+BZ2_LIBS=
- AS_IF(
- [test "x${config_ttf}" = "xyes"],
- [
-@@ -625,8 +626,13 @@ AS_IF(
- ,
- [AC_MSG_ERROR([freetype was not found.])]
- )
-+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress],
-+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"],
-+ [AC_MSG_ERROR(['libbz2' library was not found.])]
-+ )
- ]
- )
-+AC_SUBST([BZ2_LIBS])
-
- AH_TOP([#ifndef __SPLASH_CONFIG_H
- #define __SPLASH_CONFIG_H])
-diff --git a/core/src/Makefile.am b/core/src/Makefile.am
-index d6ce315..349b5e7 100644
---- a/core/src/Makefile.am
-+++ b/core/src/Makefile.am
-@@ -190,7 +190,7 @@ fbsplashctl_SOURCES = $(fbsplashd_SOURCES)
$(splash_util_SOURCES) fbspla
- fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS)
$(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
- fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
- fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static
--fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la
$(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
-+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la
$(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS)
-
- if CONFIG_FBCON_DECOR
- fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES)
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
deleted file mode 100644
index 13626df..00000000
--- a/media-gfx/splashutils/files/splashutils-1.5.4.4-r3-bzip2.patch
+++ /dev/null
@@ -1,53 +0,0 @@
- core/configure.ac | 6 ++++++
- core/src/Makefile.am | 2 +-
- 2 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/core/configure.ac b/core/configure.ac
-index c5fbb84..ae9e235 100644
---- a/core/configure.ac
-+++ b/core/configure.ac
-@@ -616,6 +616,7 @@ AS_IF(
- AC_SUBST([PNG_CFLAGS])
- AC_SUBST([PNG_LIBS])
-
-+BZ2_LIBS=
- AS_IF(
- [test "x${config_ttf}" = "xyes"],
- [
-@@ -625,8 +626,13 @@ AS_IF(
- ,
- [AC_MSG_ERROR([freetype was not found.])]
- )
-+ AC_CHECK_LIB([bz2], [BZ2_bzDecompress],
-+ [BZ2_LIBS="${BZ2_LIBS} -lbz2"],
-+ [AC_MSG_ERROR(['libbz2' library was not found.])]
-+ )
- ]
- )
-+AC_SUBST([BZ2_LIBS])
-
- AH_TOP([#ifndef __SPLASH_CONFIG_H
- #define __SPLASH_CONFIG_H])
-diff --git a/core/src/Makefile.am b/core/src/Makefile.am
-index d6ce315..349b5e7 100644
---- a/core/src/Makefile.am
-+++ b/core/src/Makefile.am
-@@ -121,6 +121,9 @@
- libfbsplashrender_la_LDFLAGS = $(AM_LDFLAGS) -version-info
$(libfbsplashrender_version)
- libfbsplashrender_la_LIBADD = libfbsplash.la
-
-+libfbsplashrender_la_CFLAGS += $(BZ2_CFLAGS)
-+libfbsplashrender_la_LIBADD += $(BZ2_LIBS)
-+
- libfbsplashrender_la_CFLAGS += $(JPEG_CFLAGS)
- libfbsplashrender_la_LIBADD += $(JPEG_LIBS)
-
-@@ -190,7 +193,7 @@
- fbsplashctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_STATIC_CFLAGS)
$(RT_CFLAGS) $(libfbsplashrender_la_CFLAGS) -DUNIFIED_BUILD
- fbsplashctl_CPPFLAGS = $(fbsplashd_CPPFLAGS) $(splash_util_CPPFLAGS)
- fbsplashctl_LDFLAGS = $(AM_LDFLAGS) -all-static
--fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la
$(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS)
-+fbsplashctl_LDADD = libfbsplashrender.la libfbsplash.la
$(PTHREAD_STATIC_LIBS) $(RT_LIBS) $(GPM_LIBS) $(BZ2_LIBS)
-
- if CONFIG_FBCON_DECOR
- fbsplashctl_SOURCES += $(fbcondecor_ctl_SOURCES)
