Accepting request 43154 from KDE:Distro:Factory
Copy from KDE:Distro:Factory/kaffeine based on submit request 43154 from user Beineri OBS-URL: https://build.opensuse.org/request/show/43154 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=31
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
5feb4be341
commit
51ed8e0812
@ -1,11 +0,0 @@
|
||||
--- src/mediawidget.cpp 2010-01-31 10:04:50.000000000 -0700
|
||||
+++ src/mediawidget.cpp.include_mkfifo 2010-02-16 14:45:57.167779667 -0700
|
||||
@@ -40,6 +40,8 @@
|
||||
#include <KMenu>
|
||||
#include <KStandardDirs>
|
||||
#include <KToolBar>
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8b2c4bb08c9f2d85bf430b39c91a4305f34123ca2b42db618bf6aa50cb6361ca
|
||||
size 337369
|
||||
3
kaffeine-1.0.tar.bz2
Normal file
3
kaffeine-1.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2eae80adcbd6a7e83077206dc4b06d45d72e9cfe2e406efbf268efb9e1c9c563
|
||||
size 289648
|
||||
96
kaffeine-fixsplitter.patch
Normal file
96
kaffeine-fixsplitter.patch
Normal file
@ -0,0 +1,96 @@
|
||||
Index: src/playlist/playlisttab.cpp
|
||||
===================================================================
|
||||
--- src/playlist/playlisttab.cpp (revision 1134989)
|
||||
+++ src/playlist/playlisttab.cpp (working copy)
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "playlisttab.h"
|
||||
|
||||
#include <QBoxLayout>
|
||||
+#include <QToolBar>
|
||||
#include <QKeyEvent>
|
||||
#include <QListView>
|
||||
#include <QSplitter>
|
||||
@@ -447,33 +448,35 @@
|
||||
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);
|
||||
|
||||
@@ -500,28 +503,30 @@
|
||||
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);
|
||||
|
||||
@@ -616,6 +621,7 @@
|
||||
fileWidget->setFilter(MediaWidget::extensionFilter());
|
||||
fileWidget->setMode(KFile::Files | KFile::ExistingOnly);
|
||||
fileWidgetSplitter->setStretchFactor(1, 1);
|
||||
+ fileWidget->setMinimumWidth(40);
|
||||
|
||||
// KFileWidget creates a KUrlComboBox without layout (!), which steals the focus:
|
||||
// kDebug() << QApplication::focusWidget();
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:df80cb57beec1a96dfaa1aa14c2eb782d4a0a5bc4888b61b4de7c3f315729722
|
||||
size 26302
|
||||
oid sha256:8dc0abc487015e1f1514e88a9a4e6253dc1e643a175f3441b5b7cbcf14456298
|
||||
size 26305
|
||||
|
||||
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 13:41:48 UTC 2010 - initialZero@gmail.com
|
||||
|
||||
- update to 1.0:
|
||||
* new dependency: libXss
|
||||
* scheduled programs are shown in the program guide
|
||||
* the begin and end margins for recordings are configurable
|
||||
* CICAM is supported
|
||||
* all audio pids are recorded during timeshift
|
||||
* subtitle support (also autoloading)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 7 12:59:53 UTC 2010 - binner@kde.org
|
||||
|
||||
- fix build in KDE:UpdatedApps for <11.3
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 26 11:47:58 UTC 2010 - cmorve69@yahoo.es
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package kaffeine (Version 0.9+1.0pre3)
|
||||
# spec file for package kaffeine (Version 1.0)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -20,21 +20,21 @@
|
||||
|
||||
Name: kaffeine
|
||||
BuildRequires: libkdepimlibs4-devel xine-devel
|
||||
%if %suse_version > 1120
|
||||
%if %suse_version > 1120 || !0%{?kde_updatedapps}
|
||||
BuildRequires: libksuseinstall-devel
|
||||
%endif
|
||||
Url: http://kaffeine.sourceforge.net/
|
||||
License: GPLv2+
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
Summary: Xine-Based Multimedia Player
|
||||
Version: 0.9+1.0pre3
|
||||
Release: 4
|
||||
%define rversion 1.0-pre3
|
||||
Version: 1.0
|
||||
Release: 1
|
||||
%define rversion 1.0
|
||||
# http://kaffeine.kde.org/?q=node/22
|
||||
Source0: kaffeine-%rversion.tar.gz
|
||||
Source0: kaffeine-%rversion.tar.bz2
|
||||
Source1: kaffeine-icons.tar.bz2
|
||||
Patch1: fix_plasma_startup_error.diff
|
||||
Patch2: kaffeine-1.0-pre3-include_mkfifo.patch
|
||||
Patch1: kaffeine-fixsplitter.patch
|
||||
Patch2: fix_plasma_startup_error.diff
|
||||
Patch3: ksuseinstall.diff
|
||||
Patch4: initial-preference.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -57,8 +57,8 @@ Authors:
|
||||
%prep
|
||||
%setup -q -n kaffeine-%rversion -b 1
|
||||
%patch1
|
||||
%patch2
|
||||
%if %suse_version > 1120
|
||||
#%patch2
|
||||
%if %suse_version > 1120 || !0%{?kde_updatedapps}
|
||||
%patch3
|
||||
%endif
|
||||
%patch4
|
||||
@ -85,18 +85,26 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files -f kaffeine.lang
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/kaffeine
|
||||
/usr/bin/kaffeine-xbu
|
||||
/usr/%_lib/kde4/kaffeinedvb.so
|
||||
%_bindir/kaffeine
|
||||
%_bindir/kaffeine-xbu
|
||||
#/usr/%_lib/kde4/kaffeinedvb.so
|
||||
%_kde_share_dir/apps/kaffeine
|
||||
/usr/share/applications/kde4/kaffeine.desktop
|
||||
/usr/share/icons/hicolor/*/apps/kaffeine.*
|
||||
%_datadir/applications/kde4/kaffeine.desktop
|
||||
%_datadir/icons/hicolor/*/apps/kaffeine.*
|
||||
%dir %_kde_share_dir/apps/profiles
|
||||
%dir %_kde_share_dir/apps/solid
|
||||
%dir %_kde_share_dir/apps/solid/actions
|
||||
%_kde_share_dir/apps/solid/actions/kaffeine_play_audiocd.desktop
|
||||
%_kde_share_dir/apps/solid/actions/kaffeine_play_dvd.desktop
|
||||
%_kde_share_dir/apps/solid/actions/kaffeine_play_videocd.desktop
|
||||
/usr/share/icons/oxygen/*/actions/audio-radio-encrypted.*
|
||||
/usr/share/icons/oxygen/*/actions/video-television-encrypted.*
|
||||
%_datadir/icons/oxygen/*/actions/audio-radio-encrypted.*
|
||||
%_datadir/icons/oxygen/*/actions/video-television-encrypted.*
|
||||
%_kde_share_dir/apps/profiles/kaffeine.profile.xml
|
||||
%if %suse_version < 1130
|
||||
%dir /usr/share/locale/sr@ijekavian
|
||||
%dir /usr/share/locale/sr@ijekavian/LC_MESSAGES
|
||||
%dir /usr/share/locale/sr@ijekavianlatin
|
||||
%dir /usr/share/locale/sr@ijekavianlatin/LC_MESSAGES
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
--- src/CMakeLists.txt.sav 2010-01-31 18:04:50.000000000 +0100
|
||||
+++ src/CMakeLists.txt 2010-04-14 14:26:48.125514619 +0200
|
||||
@@ -43,6 +43,7 @@ configure_file(config-kaffeine.h.cmake $
|
||||
--- src/CMakeLists.txt 2010/07/07 18:16:03 1.1
|
||||
+++ src/CMakeLists.txt 2010/07/07 18:17:30
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
kde4_add_executable(kaffeine ${kaffeine_SRCS})
|
||||
target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
|
||||
kde4_add_executable(kaffeine ${kaffeine_SRCS} ${kaffeinedvb_SRCS})
|
||||
target_link_libraries(kaffeine ${QT_QTSQL_LIBRARY} ${KDE4_KFILE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${X11_Xscreensaver_LIB})
|
||||
+target_link_libraries(kaffeine ksuseinstall)
|
||||
install(TARGETS kaffeine ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
install(FILES scanfile.dvb DESTINATION ${DATA_INSTALL_DIR}/kaffeine)
|
||||
install(FILES kaffeine.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
|
||||
--- src/backend-xine/xinecommands.h.sav 2010-04-14 14:02:32.000000000 +0200
|
||||
+++ src/backend-xine/xinecommands.h 2010-04-14 14:04:17.590512647 +0200
|
||||
@@ -59,7 +59,8 @@ namespace XineCommands
|
||||
--- src/backend-xine/xinecommands.h 2010/07/07 18:15:59 1.1
|
||||
+++ src/backend-xine/xinecommands.h 2010/07/07 18:16:08
|
||||
@@ -59,7 +59,8 @@
|
||||
UpdateAngles = 11,
|
||||
UpdateMouseTracking = 12,
|
||||
UpdateMouseCursor = 13,
|
||||
@ -18,9 +18,9 @@
|
||||
+ UpdateVideoSize = 14,
|
||||
+ SupportedMimeTypes = 15
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -351,6 +352,13 @@ public:
|
||||
@@ -351,6 +352,13 @@
|
||||
reinterpret_cast<const char *>(&videoSize), sizeof(videoSize));
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user