public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
Date: Tue,  7 Mar 2017 18:07:04 +0000 (UTC)	[thread overview]
Message-ID: <1488910020.a1cf2cea618f7cc48102add51140d4e1c19d95ab.johu@gentoo> (raw)

commit:     a1cf2cea618f7cc48102add51140d4e1c19d95ab
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  7 18:06:49 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 18:07:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cf2cea

media-video/kaffeine: Version bump 2.0.8

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 media-video/kaffeine/Manifest                      |  1 +
 .../kaffeine/files/kaffeine-2.0.8-build.patch      | 38 ++++++++++++
 media-video/kaffeine/kaffeine-2.0.8.ebuild         | 68 ++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 84d894772e1..385d5a88dc1 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1,3 @@
 DIST kaffeine-2.0.5.tar.xz 2284712 SHA256 e1610931e9475e8b86f9c75331f51fbeea22fab0c5fc6a1085325ab2ef055a8c SHA512 2e0562debba616a1b5e3c8c635735e27473cea4ac9b21ab56b8babe5cfffd6f43bce82ecbdcb1d01c08722c08622110fd1b0d00aae779e9007ea82c5068680c2 WHIRLPOOL df3d8bc26077bbd15199a426d77ca0725342c22c0c0c29915479a74f41c37b95579d202cd718e271b2ef7bc0fb6dfc1c921f14395f56040a6727d4830421f840
 DIST kaffeine-2.0.6.tar.xz 2295280 SHA256 70cd8423a23717edc7c8f127bd41e5e98aa93cc5866615ed25a8da3e148464e6 SHA512 ca2f036b629e750703536054dd6e28bc9b8191c3851a745f07548b756799243b3739cba9c7ec031be6eab64c18aa5f2eb96d37bcd0b11456e65eb67b016d1bc2 WHIRLPOOL 0d67538dc45f50cced9ab2c0b1adf1bf2367d823270118bf268ed2126c7bb1a653333b09fabb51e2b60400fcf073de6fe917a4887d54edc3c13204433538d146
+DIST kaffeine-2.0.8.tar.xz 4400524 SHA256 0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd SHA512 9ee7b156d5195caef61cdbdf12deaa2493c6acc31724e839e1773dc5d7ee06f0d87cd7f21df74cf67dcb32fa5a347b72f5953f4568eb8476cb337a59121c609f WHIRLPOOL 4ae48e7e2f615428730f02d0b6b08406f6b3e805518da3fad9cb041ec5f1f9623541f521b3c065e94ed75f3f076d6651d5acc9d2fd306bc545527b05d550c01e

diff --git a/media-video/kaffeine/files/kaffeine-2.0.8-build.patch b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
new file mode 100644
index 00000000000..1507f46da21
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch
@@ -0,0 +1,38 @@
+commit 2dbc752d644440f963bad172cf3ec83dc681ec7f
+Author: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+Date:   Tue Mar 7 06:54:39 2017 -0300
+
+    CMakeLists.txt: fix it to allow building from tarball
+    
+    Kaffeine has a script at tools/update_l10n.sh that allows one to
+    download and test all translations locally, with is useful during
+    Kaffeine development. Such script creates a file at po/CMakeLists.txt.
+    
+    However, normal users will use the Kaffeine tarball, downloaded from
+    kde.org.
+    
+    The translations at the po/ directory on the tarballs don't
+    have a CMakeLists.txt, as this file is created only if the
+    tools/update_l10n.sh is called.
+    
+    So, change the main CMakeLists.txt to cope with both ways.
+    
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3215e94..d24e848 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -93,7 +93,11 @@ add_subdirectory(icons)
+ add_subdirectory(profiles)
+ add_subdirectory(src)
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+-  add_subdirectory(po)
++  if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" )
++    add_subdirectory(po)
++  else()
++    ki18n_install(po)
++  endif()
+ endif()
+ 
+ if(KF5DocTools_VERSION)

diff --git a/media-video/kaffeine/kaffeine-2.0.8.ebuild b/media-video/kaffeine/kaffeine-2.0.8.ebuild
new file mode 100644
index 00000000000..202f5a50eca
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.8.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+inherit kde5
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://kaffeine.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'sqlite')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-libs/libv4l
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	!media-video/kaffeine:4
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-build.patch" )
+
+src_prepare() {
+	kde5_src_prepare
+
+	# unused dependencies incorrectly added during the release process
+	# they do not appear in upstream git
+	sed -i \
+		-e "/find_package(KF5DocTools CONFIG REQUIRED)/d" \
+		-e "/kdoctools_install(po)/d" \
+		CMakeLists.txt || die
+}
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+	)
+
+	kde5_src_configure
+}


             reply	other threads:[~2017-03-07 18:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-07 18:07 Johannes Huber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-06 23:04 [gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/ Andreas Sturmlechner
2016-07-21 18:32 Johannes Huber
2016-06-12  7:52 Johannes Huber
2016-06-08 11:11 Johannes Huber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488910020.a1cf2cea618f7cc48102add51140d4e1c19d95ab.johu@gentoo \
    --to=johu@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox