* [gentoo-commits] proj/qt:master commit in: media-sound/kajammer/, media-sound/kajammer/files/
@ 2012-03-14 12:22 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2012-03-14 12:22 UTC (permalink / raw
To: gentoo-commits
commit: dee162f9d57aed80534d3b18682fa1e03df26634
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed Mar 14 12:19:27 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed Mar 14 12:19:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dee162f9
[media-sound/kajammer] Version bump for bug #403125
(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)
---
media-sound/kajammer/Manifest | 2 +-
.../files/kajammer-0.9.3-desktopfile.patch | 18 +++++++++++++
.../kajammer/files/kajammer-0.9.3-gentoo.patch | 19 ++++++++++++++
.../files/kajammer-0.9.3-underlinking.patch | 10 +++++++
...jammer-0.9.2.2.ebuild => kajammer-0.9.3.ebuild} | 27 +++++++++----------
5 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/media-sound/kajammer/Manifest b/media-sound/kajammer/Manifest
index 5eb435a..86cfcc3 100644
--- a/media-sound/kajammer/Manifest
+++ b/media-sound/kajammer/Manifest
@@ -1 +1 @@
-DIST kajammer-0.9.2.2-1.tar.gz 57244 RMD160 84c769beb0367804b140ca879d77a3a3ada32be5 SHA1 73bc164e6d45d32039d5cb414a1a0c4a132a7e74 SHA256 351e7c9701f1a810ae3515b38ef061599563f7ff4b6dd8308e0832add4599117
+DIST kajammer-0.9.3.tar.gz 59734 SHA256 33e1fb968ce92ae4da3d274a43f5af22a96cca49b7589deb8235fb2b15d71584 SHA512 ec4eee34b005734ee681893df10a4cd3bfae0182659296544a29d947a422005c9a6c2078ba490bb9ba1c81ccee5721de1326a061adabe6760dffeac78488a12e WHIRLPOOL 0e8a03fa1dd2e50105ddf4913bae9499bff7f1a24e2a97a343b833f3ae497b91edd0046e52a3e240f5a2050ead650e9812cd6c6d926de110edbfbb6d4feebe76
diff --git a/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch b/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch
new file mode 100644
index 0000000..d3f3671
--- /dev/null
+++ b/media-sound/kajammer/files/kajammer-0.9.3-desktopfile.patch
@@ -0,0 +1,18 @@
+--- res/kajammer.desktop
++++ res/kajammer.desktop
+@@ -1,12 +1,11 @@
+ [Desktop Entry]
+ Type=Application
+ Version=1.0
+-Encoding=UTF-8
+ Name=Kajammer
+-Generic Name=Audio Player
++GenericName=Audio Player
+ Comment=Music Player
+ Icon=/usr/share/icons/kajammer.png
+ Exec=kajammer
+ Terminal=false
+-MimeType=application/ogg;application/x-ogg;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp3;audio/x-mp3;audio/wav;audio/x-wav;audio/x-vorbis+ogg;application/ogg;audio/ogg;
+-Categories=Qt;KDE;AudioVideo;Audio;Player
++MimeType=application/ogg;application/x-ogg;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp3;audio/x-mp3;audio/wav;audio/x-wav;audio/x-vorbis+ogg;audio/ogg;
++Categories=Qt;KDE;AudioVideo;Audio;Player;
diff --git a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
new file mode 100644
index 0000000..74cc688
--- /dev/null
+++ b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
@@ -0,0 +1,19 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -2,7 +2,7 @@
+ PROJECT( kajammer )
+
+ SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake )
+-SET(CMAKE_CXX_FLAGS "-g -Wall")
++SET(CMAKE_CXX_FLAGS "-Wall")
+
+ FIND_PACKAGE( Qt4 REQUIRED )
+ FIND_PACKAGE( Phonon REQUIRED )
+@@ -90,6 +90,6 @@
+ )
+
+ INSTALL(TARGETS kajammer DESTINATION /usr/bin)
+-INSTALL(FILES res/kajammer.png DESTINATION /usr/share/icons)
++INSTALL(FILES res/kajammer.png DESTINATION /usr/share/pixmaps)
+ INSTALL(FILES res/kajammer.desktop DESTINATION /usr/share/applications)
+
diff --git a/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch b/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch
new file mode 100644
index 0000000..a8d2a9b
--- /dev/null
+++ b/media-sound/kajammer/files/kajammer-0.9.3-underlinking.patch
@@ -0,0 +1,10 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -82,6 +83,7 @@
+ kajammer
+ ${QT_LIBRARIES}
+ ${QT_GUI_LIBRARIES}
++ ${QT_QTNETWORK_LIBRARY}
+ ${Phonon_LIBRARY}
+ ${Kajamtag_LIB}
+ ${LastFM_LIB}
diff --git a/media-sound/kajammer/kajammer-0.9.2.2.ebuild b/media-sound/kajammer/kajammer-0.9.3.ebuild
similarity index 51%
rename from media-sound/kajammer/kajammer-0.9.2.2.ebuild
rename to media-sound/kajammer/kajammer-0.9.3.ebuild
index 4809d9b..e51a41c 100644
--- a/media-sound/kajammer/kajammer-0.9.2.2.ebuild
+++ b/media-sound/kajammer/kajammer-0.9.3.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=4
-inherit cmake-utils
+inherit eutils cmake-utils
DESCRIPTION="Simple Qt audio player"
HOMEPAGE="http://sourceforge.net/projects/kajammer/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -22,18 +22,17 @@ DEPEND="x11-libs/qt-core:4
lastfm? ( media-libs/liblastfm )"
RDEPEND="${DEPEND}"
+DOCS="Changelog README"
+
src_prepare() {
- sed -i -e 's:/usr/share/icons:/usr/share/pixmaps:' \
- CMakeLists.txt || die "sed failed"
+ epatch "${FILESDIR}"/${P}-underlinking.patch
+ epatch "${FILESDIR}"/${P}-desktopfile.patch
+ epatch "${FILESDIR}"/${P}-gentoo.patch
- if ! use lastfm; then
+ if ! use lastfm ; then
# avoid automagic dep
- sed -i -e '/FIND_PACKAGE( LastFM )/d' CMakeLists.txt || die "sed failed"
+ sed -i -e '/FIND_PACKAGE( LastFM )/d' \
+ -e '/^FIND_PATH( HAVE_LASTFM_H/d' \
+ CMakeLists.txt || die "sed failed"
fi
}
-
-src_install() {
- cmake-utils_src_install
-
- dodoc Changelog README || die
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: media-sound/kajammer/, media-sound/kajammer/files/
@ 2012-08-31 16:28 Michael Palimaka
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka @ 2012-08-31 16:28 UTC (permalink / raw
To: gentoo-commits
commit: cd995278456077cad5e60dabe2c3a2605c2d968d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 16:27:03 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 16:27:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=cd995278
[media-sound/kajammer] Fix deps wrt bug #431478. Respect CXXFLAGS.
(Portage version: 2.1.11.12/git/Linux x86_64, unsigned Manifest commit)
---
.../kajammer/files/kajammer-0.9.3-gentoo.patch | 2 +-
...ammer-0.9.3.ebuild => kajammer-0.9.3-r1.ebuild} | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
index 74cc688..200223b 100644
--- a/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
+++ b/media-sound/kajammer/files/kajammer-0.9.3-gentoo.patch
@@ -5,7 +5,7 @@
SET( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake )
-SET(CMAKE_CXX_FLAGS "-g -Wall")
-+SET(CMAKE_CXX_FLAGS "-Wall")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
FIND_PACKAGE( Qt4 REQUIRED )
FIND_PACKAGE( Phonon REQUIRED )
diff --git a/media-sound/kajammer/kajammer-0.9.3.ebuild b/media-sound/kajammer/kajammer-0.9.3-r1.ebuild
similarity index 87%
rename from media-sound/kajammer/kajammer-0.9.3.ebuild
rename to media-sound/kajammer/kajammer-0.9.3-r1.ebuild
index e51a41c..ab3d9fb 100644
--- a/media-sound/kajammer/kajammer-0.9.3.ebuild
+++ b/media-sound/kajammer/kajammer-0.9.3-r1.ebuild
@@ -13,12 +13,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="kde lastfm"
+IUSE="lastfm"
-DEPEND="x11-libs/qt-core:4
+DEPEND="media-libs/phonon
+ x11-libs/qt-core:4
x11-libs/qt-gui:4
- kde? ( media-libs/phonon )
- !kde? ( x11-libs/qt-phonon:4 )
lastfm? ( media-libs/liblastfm )"
RDEPEND="${DEPEND}"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-31 16:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-31 16:28 [gentoo-commits] proj/qt:master commit in: media-sound/kajammer/, media-sound/kajammer/files/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2012-03-14 12:22 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox