pool/kaffeine
SHA256
17
0
Fork 1
Code Issues Pull Requests Activity

Compare commits

merge into: pool:factory
Branches Tags
pool:factory pool:leap-16.0 pool:leap-16.1
...
pull from: pool:leap-16.1
Branches Tags
pool:leap-16.0 pool:leap-16.1 pool:factory

1 Commits
factory ... leap-16.1

Author SHA256 Message Date
Adrian Schröter
5a64e4c6e5 Import openSUSE:Leap:16.0 modifications 2025-08-12 11:59:44 +02:00
8 changed files with 105 additions and 149 deletions
Expand all files Collapse all files

2
_service
View File

@@ -1,7 +1,7 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="changesgenerate">enable</param>
<param name="versionformat">2.0.18git.%ci~%h</param>
<param name="versionformat">2.0.19git.%ci~%h</param>
<param name="url">https://invent.kde.org/multimedia/kaffeine.git</param>
<param name="scm">git</param>
</service>

2
_servicedata
View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://invent.kde.org/multimedia/kaffeine.git</param>
<param name="changesrevision">afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05</param></service></servicedata>
<param name="changesrevision">afc3f87e4d52c3ba4180a08c1a60264fd5cb34c7</param></service></servicedata>

3
kaffeine-2.0.18git.20230531T022124~afc6c12.obscpio
View File

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

BIN
kaffeine-2.0.19git.20250316T013712~afc3f87.obscpio LFS Normal file
View File

Binary file not shown.

96
kaffeine-fixsplitter.patch
View File

@@ -1,96 +0,0 @@
diff --git a/src/playlist/playlisttab.cpp b/src/playlist/playlisttab.cpp
index 01f1290..6ae454b 100644
--- a/src/playlist/playlisttab.cpp
+++ b/src/playlist/playlisttab.cpp
@@ -25,6 +25,7 @@
#include <QAction>
#include <QBoxLayout>
#include <QFileDialog>
+#include <QToolBar>
#include <QKeyEvent>
#include <QListView>
#include <QMenu>
@@ -446,33 +447,35 @@ PlaylistTab::PlaylistTab(QMenu *menu, KActionCollection *collection, MediaWidget
QBoxLayout *sideLayout = new QVBoxLayout(widget);
sideLayout->setMargin(0);
+ QToolBar *ToolBarLayout= new QToolBar();
QBoxLayout *boxLayout = new QHBoxLayout();
QToolButton *toolButton = new QToolButton(widget);
toolButton->setDefaultAction(newAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(renameAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(removePlaylistAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(savePlaylistAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(savePlaylistAsAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
+ boxLayout->addWidget(ToolBarLayout);
boxLayout->addStretch();
sideLayout->addLayout(boxLayout);
@@ -499,28 +502,30 @@ PlaylistTab::PlaylistTab(QMenu *menu, KActionCollection *collection, MediaWidget
sideLayout = new QVBoxLayout(widget);
sideLayout->setMargin(0);
+ ToolBarLayout= new QToolBar();
boxLayout = new QHBoxLayout();
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(repeatAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(randomAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(removeTrackAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
toolButton = new QToolButton(widget);
toolButton->setDefaultAction(clearAction);
toolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
- boxLayout->addWidget(toolButton);
+ ToolBarLayout->addWidget(toolButton);
+ boxLayout->addWidget(ToolBarLayout);
boxLayout->addStretch();
sideLayout->addLayout(boxLayout);
@@ -615,6 +620,7 @@ void PlaylistTab::createFileWidget()
fileWidget->setFilter(MediaWidget::extensionFilter());
fileWidget->setMode(KFile::Files | KFile::ExistingOnly);
fileWidgetSplitter->setStretchFactor(1, 1);
+ fileWidget->setMinimumWidth(40);
// KFileWidget creates a QUrlComboBox without layout (!), which steals the focus:
// kDebug() << QApplication::focusWidget();

52
kaffeine.changes
View File

@@ -1,3 +1,55 @@
-------------------------------------------------------------------
Thu Mar 20 17:22:11 UTC 2025 - christophe@krop.fr
- Update to version 2.0.19git.20250316T013712~afc3f87:
* Changelog: update it with v2.0.19 changes
* scantable.dvb: update it to the latest version
* Remove use of deprecated QMouseEvent::globalPos() use globalPosition() instead
* Remove deprecated use of QHoverEvent.pos(), use position()
* Use correct format for qDebug
* Remove use of QDesktopWidget and QApplication::desktop()
* FileFilter: Adapt to new KFileFilter lists
* Decoding: Switch from QTextCodec to QStringConverter
* Strings: Replace QStringRef with QStringView
* RegEx: Replace QRegExp with QRegularExpression
* build: Switch to building with KF6/Qt6
* Use KF5/Qt5 for version 2.0.19
* Add gitlab CI
* Force creating the windowHandle before using it
* Remove use of deprecated QMouseEvent::globalPos() use globalPosition() instead
* Remove use of QKeyCombination::operator()+, use operator()| instead
* Remove deprecated use of QHoverEvent.pos(), use position()
* Remove deprecated use od QScopedPtr.take()
* Use correct format for qDebug
* Remove deprecated iterator usage, use std::prev insted
* Remove setting of Attribute AA_UseHighDpiPixmaps
* Add missing QActionGroup include
* Widgets/Screensaver: Remove X11 screensaver fallback
* KShortcuts: Use an persistant instance
* Remove use of QDesktopWidget and QApplication::desktop()
* FileFilter: Adapt to new KFileFilter lists
* Date: Use QLocale for date to string conversion
* Add missing QString include
* Time: switch from toTime_t() to toSecsSinceEpoch()
* Widgets: Switch over Widget.data to .toStongRef().get()
* KIO: Switch from generic to TransferJob
* Decoding: Switch from QTextCodec to QStringConverter
* Switch from QFlags to int implementation
* QChar: Wrap to-assign content into QChar where necessary
* String: Wrap raw content (string/number) in QLatin1String()/QString()
* Strings: Replace QStringRef with QStringView
* RegEx: Replace QRegExp with QRegularExpression
* I18N: Replace I18N_NOOP() macro with KLazyLocalizedString kli18n()
* Streams: Remove setCodec()
* StandardPaths: Replace QStandardPaths::DataLocation with AppLocalDataLocation
* Widgets: Replace setMargin() with setContentsMargins()
* build: Switch to building with KF6/Qt6
* Add developer_name and launchable to appdata
* Call cmake_minimum_required as first thing (& bump to 3.16)
* Add explicit moc includes to sources for moc-covered headers
- Drop patch:
* kaffeine-fixsplitter.patch
-------------------------------------------------------------------
Wed Nov 20 12:31:08 UTC 2024 - Christophe Marin <christophe@krop.fr>

6
kaffeine.obsinfo
View File

@@ -1,4 +1,4 @@
name: kaffeine
version: 2.0.18git.20230531T022124~afc6c12
mtime: 1685499684
commit: afc6c121b8cb23c0b1f14ab3c2dd04918d28cc05
version: 2.0.19git.20250316T013712~afc3f87
mtime: 1742089032
commit: afc3f87e4d52c3ba4180a08c1a60264fd5cb34c7

90
kaffeine.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package kaffeine
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,78 +16,78 @@
#
%define kf6_version 6.6.0
%define qt6_version 6.6.0
Name: kaffeine
Version: 2.0.18git.20230531T022124~afc6c12
Version: 2.0.19git.20250316T013712~afc3f87
Release: 0
Summary: VLC-based Multimedia Player
License: GPL-2.0-or-later
URL: https://apps.kde.org/kaffeine/
Source0: %{name}-%{version}.tar.xz
# PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters)
Patch0: kaffeine-fixsplitter.patch
BuildRequires: extra-cmake-modules
BuildRequires: hicolor-icon-theme
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
BuildRequires: pkgconfig
BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version}
BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version}
BuildRequires: cmake(KF6DocTools) >= %{kf6_version}
BuildRequires: cmake(KF6I18n) >= %{kf6_version}
BuildRequires: cmake(KF6KIO) >= %{kf6_version}
BuildRequires: cmake(KF6Solid) >= %{kf6_version}
BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version}
BuildRequires: cmake(KF6WindowSystem) >= %{kf6_version}
BuildRequires: cmake(KF6XmlGui) >= %{kf6_version}
BuildRequires: cmake(Qt6Core) >= %{qt6_version}
BuildRequires: cmake(Qt6Network) >= %{qt6_version}
BuildRequires: cmake(Qt6Sql) >= %{qt6_version}
BuildRequires: cmake(Qt6Widgets) >= %{qt6_version}
BuildRequires: pkgconfig(libdvbv5)
BuildRequires: pkgconfig(libvlc) >= 3.0
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xscrnsaver)
Requires: libQt5Sql5-sqlite
Requires: qt6-sql-sqlite >= %{qt6_version}
Requires: vlc-noX
Recommends: vlc-codecs
%description
Kaffeine is a media player.
What makes it different from the others is its excellent support of digital TV (DVB).
Kaffeine has a user-friendly interface so that even first-time users can start immediately
playing their movies: from DVD (including DVD menus, titles, chapters, etc.), VCD, or a file.
What makes it different from the others is its support of digital TV (DVB).
Kaffeine has a user-friendly interface so that even first-time users can start
immediately playing their movies: from DVD (including DVD menus, titles,
chapters, etc.), VCD, or a file.
%lang_package
%prep
%autosetup -p1
%build
%cmake_kf5 -d build
# Unneeded
sed -i '/scrnsaver/d' src/mediawidget.cpp
%cmake_build
%build
%cmake_kf6
%kf6_build
%install
%kf5_makeinstall -C build
%kf6_install
%find_lang %{name}
%{kf5_find_htmldocs}
%find_lang %{name} --with-html --with-man
%files
%license COPYING
%license LICENSES/*
%doc README.md
%doc %lang(en) %{_kf5_htmldir}/en/kaffeine/
%{_kf5_applicationsdir}/org.kde.kaffeine.desktop
%{_kf5_appstreamdir}/org.kde.kaffeine.appdata.xml
%{_kf5_bindir}/kaffeine
%{_kf5_iconsdir}/hicolor/*/*/*
%{_kf5_mandir}/man1/kaffeine.1%{?ext_man}
%{_kf5_sharedir}/kaffeine/
%{_kf5_sharedir}/solid/actions/
%doc %lang(en) %{_kf6_htmldir}/en/kaffeine/
%{_kf6_applicationsdir}/org.kde.kaffeine.desktop
%{_kf6_appstreamdir}/org.kde.kaffeine.appdata.xml
%{_kf6_bindir}/kaffeine
%{_kf6_iconsdir}/hicolor/*/*/*
%{_kf6_mandir}/man1/kaffeine.1%{?ext_man}
%dir %{_kf6_sharedir}/kaffeine
%{_kf6_sharedir}/kaffeine/scanfile.dvb
%{_kf6_sharedir}/solid/actions/kaffeine_play_audiocd.desktop
%{_kf6_sharedir}/solid/actions/kaffeine_play_dvd.desktop
%{_kf6_sharedir}/solid/actions/kaffeine_play_videocd.desktop
%files lang -f %{name}.lang
%{_kf5_mandir}/*/man1/kaffeine.1%{?ext_man}
%{_kf5_htmldir}/*/kaffeine/
%exclude %{_kf5_htmldir}/en/
%exclude %{_kf6_htmldir}/en/kaffeine/
%changelog