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

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

Browse Source 
- Update to 2.0.10:
  * Fix video resize and scale factor issues;
  * Handle parameters when there's a running instance and a new
    kaffeine is called with some URL.
  * Updated scanfile.dvb.
- Drop remove-stray-call-to-ki18n_install.patch, no longer necessary

OBS-URL: https://build.opensuse.org/request/show/507342
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kaffeine?expand=0&rev=25
This commit is contained in:
Luca Beltrame 2017-07-03 13:26:51 +00:00 committed by Git OBS Bridge
parent 8fc9a26ca4
commit ba698c99c8
5 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
kaffeine-2.0.9.tar.xz
View File

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

11
kaffeine.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jun 30 11:48:07 UTC 2017 - wbauer@tmo.at
- Update to 2.0.10:
* Fix video resize and scale factor issues;
* Handle parameters when there's a running instance and a new
kaffeine is called with some URL.
* Updated scanfile.dvb.
- Drop remove-stray-call-to-ki18n_install.patch, no longer
necessary
-------------------------------------------------------------------
Sun Jun 4 07:18:47 UTC 2017 - wbauer@tmo.at

6
kaffeine.spec
View File

@ -20,14 +20,12 @@ Name: kaffeine
Summary: VLC-based Multimedia Player
License: GPL-2.0+
Group: Productivity/Multimedia/Video/Players
Version: 2.0.9
Version: 2.0.10
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-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
@ -44,6 +42,7 @@ BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120300)
BuildRequires: pkgconfig(libdvbv5)
@ -69,7 +68,6 @@ playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VC
%prep
%setup -q
%patch0
%patch1 -p1
%build
%cmake_kf5 -d build

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

@ -1,22 +0,0 @@
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)