diff options
| author |   David Seifert <soap@gentoo.org> | 2016-02-10 23:27:19 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-02-10 23:31:34 +0100 |
| commit | 2f2ed7ed16205a11433816b85e8313b20001193f (patch) | |
| tree | e16daf5c79151e6fb22ab0b39c9ef75c114fc5ce /media-sound/splay | |
| parent | mate-extra/caja-dropbox: Fix epatch call. Thanks to joost_op. (diff) | |
| download | gentoo-2f2ed7ed16205a11433816b85e8313b20001193f.tar.gz gentoo-2f2ed7ed16205a11433816b85e8313b20001193f.tar.bz2 gentoo-2f2ed7ed16205a11433816b85e8313b20001193f.zip | |
media-sound/splay: Patch out completely broken Qt3 handling
Gentoo-Bug: 574202
* Add missing media-libs/id3lib dependency
* Remove xsplay.1 man page
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-sound/splay')
| -rw-r--r-- | media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch (renamed from media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch) | 32 | ||||
| -rw-r--r-- | media-sound/splay/splay-0.9.5.2-r2.ebuild (renamed from media-sound/splay/splay-0.9.5.2-r1.ebuild) | 5 |
2 files changed, 36 insertions, 1 deletions
diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch index 286228af449f..52cea88b89ed 100644 --- a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch +++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch @@ -1,3 +1,35 @@ +* Remove completely broken Qt handling, dating back to Qt3 days +* Fix ancient C++ includes using '.h' suffixes +* Fix warnings caused by not using 'const char*' + +--- splay-0.9.5.2/apps/Makefile.am ++++ splay-0.9.5.2/apps/Makefile.am +@@ -1,4 +1,4 @@ +-bin_PROGRAMS = splay @XSPLAY@ ++bin_PROGRAMS = splay + EXTRA_PROGRAMS =xsplay + splay_SOURCES = common.cc splay.cc splay.h + xsplay_SOURCES = xsplay.cc functions.cc \ +@@ -17,7 +17,7 @@ + INCLUDES = -I../libs -I/usr/include/qt + xsplay_LDADD=-lqt $(LDADD) + +-man_MANS = splay.1 xsplay.1 ++man_MANS = splay.1 + EXTRA_DIST = $(man_MANS) + + +--- splay-0.9.5.2/configure.ac ++++ splay-0.9.5.2/configure.ac +@@ -15,7 +15,7 @@ + AC_CHECK_LIB(id3, ID3Tag_New) + AC_CHECK_LIB(m, cos) + AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1) +-AC_CHECK_LIB(qt, main,XSPLAY=xsplay) ++ + + if test "$INCLUDEPTHREAD" = 1; then + LIBS="$LIBS -lpthread" --- splay-0.9.5.2/apps/common.cc +++ splay-0.9.5.2/apps/common.cc @@ -34,7 +34,7 @@ diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild index 711310617779..67d31aeeacb9 100644 --- a/media-sound/splay/splay-0.9.5.2-r1.ebuild +++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild @@ -15,10 +15,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" +DEPEND="media-libs/id3lib" +RDEPEND="${DEPEND}" + PATCHES=( "${FILESDIR}/${P}-external-id3lib.diff" "${FILESDIR}/${P}-gcc43-2.patch" - "${FILESDIR}/${P}-modernize-cpp.patch" + "${FILESDIR}/${P}-fix-buildsystem.patch" ) src_prepare() { |