pool/kaffeine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 500921 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Update to 2.0.9:
  * Fix build at tarball
- Drop fix-building-from-tarball.patch, included upstream
- Add remove-stray-call-to-ki18n_install.patch to fix build with the latest KDE Frameworks in Factory
- Enable DVB support on Leap 42.3 too, v4l-utils are recent enough

OBS-URL: https://build.opensuse.org/request/show/500921
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=23
This commit is contained in:
Luca Beltrame 2017-06-09 08:58:47 +00:00 committed by Git OBS Bridge
parent 2248b7aae3
commit 8fc9a26ca4
6 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fix-building-from-tarball.patch
View File

@ -1,43 +0,0 @@
From 2dbc752d644440f963bad172cf3ec83dc681ec7f Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Tue, 7 Mar 2017 06:54:39 -0300
Subject: 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>
---
CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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)
--
cgit v0.11.2

3
kaffeine-2.0.8.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd
size 4400524

3
kaffeine-2.0.9.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ac53b697bba4fa97350706698c777908c21c464f7c567fe1a4ce9352e955754f
size 4398832

10
kaffeine.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Jun 4 07:18:47 UTC 2017 - wbauer@tmo.at
- Update to 2.0.9:
* Fix build at tarball
- Drop fix-building-from-tarball.patch, included upstream
- Add remove-stray-call-to-ki18n_install.patch to fix build with
the latest KDE Frameworks in Factory
- Enable DVB support on Leap 42.3 too, v4l-utils are recent enough
-------------------------------------------------------------------
Tue Mar 7 11:54:46 UTC 2017 - wbauer@tmo.at

8
kaffeine.spec
View File

@ -20,14 +20,14 @@ Name: kaffeine
Summary: VLC-based Multimedia Player
License: GPL-2.0+
Group: Productivity/Multimedia/Video/Players
Version: 2.0.8
Version: 2.0.9
Release: 0
Url: http://kaffeine.kde.org/
Source0: %{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters)
Patch0: kaffeine-fixsplitter.patch
# PATCH-FIX-UPSTREAM fix-building-from-tarball.patch -- allow kaffeine to be built from the released tarball
Patch1: fix-building-from-tarball.patch
# PATCH-FIX-OPENSUSE remove-stray-call-to-ki18n_install.patch -- fixes the build with KDE Frameworks 5.34
Patch1: remove-stray-call-to-ki18n_install.patch
Recommends: %{name}-lang = %version
Requires: libQt5Sql5-sqlite
Requires: vlc-noX
@ -45,7 +45,7 @@ BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
%if 0%{?suse_version} > 1320
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300)
BuildRequires: pkgconfig(libdvbv5)
%endif
BuildRequires: pkgconfig(Qt5Core)

22
remove-stray-call-to-ki18n_install.patch Normal file
View File

@ -0,0 +1,22 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sun, 04 Jun 2017 09:16:09 +0200
Subject: Remove stray/duplicated call to ki18n_install
The release script injected an additional ki18n_install(po), but this
breaks the build with KDE Frameworks 5.34 (cmake error "another target
with the same name already exists") because ki18n_install(po) is
already called anyway.
So remove it to fix the build.
---
diff -u a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,7 +107,5 @@
if(BUILD_TOOLS)
add_subdirectory(tools)
endif(BUILD_TOOLS)
-find_package(KF5I18n CONFIG REQUIRED)
-ki18n_install(po)
find_package(KF5DocTools CONFIG REQUIRED)
kdoctools_install(po)