This commit is contained in:
OBS User unknown
Git OBS Bridge
commit
c1e86af86a
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
3
k3b-1.65.0alpha1.tar.bz2
Normal file
3
k3b-1.65.0alpha1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ec9e54e122c1f6c24fc4ba4ac23e3860e11d7166345516522b9a7790fe0ce9f
|
||||
size 3863402
|
||||
115
k3b.changes
Normal file
115
k3b.changes
Normal file
@ -0,0 +1,115 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 23 10:45:01 CEST 2009 - beineri@opensuse.org
|
||||
|
||||
- rename to k3b, update to 1.65.0 Alpha
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 21 09:50:28 CET 2009 - beineri@opensuse.org
|
||||
|
||||
- update to 4.2.1.svn942189
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 25 09:50:28 CET 2009 - stbinner@suse.de
|
||||
|
||||
- update to 4.2.0.svn931376
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 18 11:22:28 CET 2009 - stbinner@suse.de
|
||||
|
||||
- update to 4.2.0.svn927728
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 23 23:21:29 CET 2009 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.4.svn915827
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 7 15:12:26 CET 2009 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.4.svn907132
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 16 12:01:02 CET 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.3.svn897517
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 22 10:53:38 CET 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.3.svn887510
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 7 22:56:22 CET 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.3.svn881374
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 13 08:10:05 CEST 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.1.svn860449
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 22 21:38:15 CEST 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.0.svn851044
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 25 07:22:21 CEST 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.1.0.svn837567
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 16 11:08:42 CEST 2008 - stbinner@suse.de
|
||||
|
||||
- update to 4.0.98.svn833153
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 27 14:38:57 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.84.svn825098
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 3 15:33:43 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.81.svn816194
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 15 21:13:32 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.74.svn808129
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed May 7 22:38:24 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.73.svn805196
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 24 18:35:57 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.71.svn800684
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 18 16:48:15 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.69.svn798537
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 2 17:56:56 CEST 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.68.svn792936
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 14 23:45:25 CET 2008 - dmueller@suse.de
|
||||
|
||||
- update to 4.0.62.svn775117
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 28 13:13:42 CET 2007 - dmueller@suse.de
|
||||
|
||||
- update to 3.96.0.svn742626
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 1 20:42:20 CET 2007 - dmueller@suse.de
|
||||
|
||||
- update to 3.95.0.svn731749
|
||||
|
||||
174
k3b.spec
Normal file
174
k3b.spec
Normal file
@ -0,0 +1,174 @@
|
||||
#
|
||||
# spec file for package k3b (Version 1.65.0)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: k3b
|
||||
BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel
|
||||
BuildRequires: libkcompactdisc4-devel libkdepimlibs4-devel tse3-devel update-desktop-files
|
||||
BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel
|
||||
BuildRequires: flac-devel libQtWebKit-devel libdvdread-devel libvorbis-devel
|
||||
BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel
|
||||
%if %suse_version > 1030
|
||||
BuildRequires: libmusicbrainz3-devel
|
||||
%endif
|
||||
Url: http://k3b.sourceforge.net/
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/Multimedia/CD/Record
|
||||
Summary: A Universal CD and DVD Burning Application
|
||||
Requires: /usr/bin/cdrecord /usr/bin/mkisofs /usr/bin/cdrdao dvd+rw-tools
|
||||
Version: 1.65.0
|
||||
Release: 2
|
||||
# svn.kde.org/home/kde/trunk/extragear/multimedia/k3b
|
||||
Source0: k3b-1.65.0alpha1.tar.bz2
|
||||
Patch0: r957664.diff
|
||||
Patch1: qt44.diff
|
||||
Patch2: kde41.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%kde4_runtime_requires
|
||||
Provides: kde4-k3b = 4.2.1.svn942189
|
||||
Provides: kde4-k3b = 4.2.2.svn951754
|
||||
Obsoletes: kde4-k3b <= 4.2.2.svn951754
|
||||
|
||||
%description
|
||||
K3b is a CD burning application that supports Ogg Vorbis, MP3 audio
|
||||
files, DVD burning, CDDB, and much more.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Sebastian Trueg <trueg@informatik.uni-freiburg.de>
|
||||
Thomas Froescher <tfroescher@gmx.de>
|
||||
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Summary: A Universal CD and DVD Burning Application
|
||||
Group: Productivity/Multimedia/CD/Record
|
||||
Requires: %name = %version
|
||||
|
||||
%description devel
|
||||
K3b is a CD burning application that supports Ogg Vorbis, MP3 audio
|
||||
files, DVD burning, CDDB, and much more.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Sebastian Trueg <trueg@informatik.uni-freiburg.de>
|
||||
Thomas Froescher <tfroescher@gmx.de>
|
||||
|
||||
%prep
|
||||
%setup -q -n k3b-%{version}
|
||||
%patch
|
||||
%patch1
|
||||
%patch2
|
||||
|
||||
%build
|
||||
%cmake_kde4 -d build
|
||||
%make_jobs
|
||||
|
||||
%install
|
||||
cd build
|
||||
%makeinstall
|
||||
%suse_update_desktop_file k3b DiscBurning
|
||||
%kde_post_install
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
/usr/bin/k3b
|
||||
#/usr/bin/k3bsetup
|
||||
/usr/%_lib/kde4/k3b*.so
|
||||
/usr/%_lib/kde4/kcm_k3b*.so
|
||||
/usr/%_lib/kde4/kio_videodvd.so
|
||||
/usr/%_lib/libk3b.so.*
|
||||
/usr/%_lib/libk3bdevice.so.*
|
||||
/usr/share/applications/kde4/k3b.desktop
|
||||
/usr/share/icons/hicolor/*/apps/k3b.*
|
||||
/usr/share/kde4/apps/k3b
|
||||
/usr/share/kde4/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
|
||||
/usr/share/kde4/services/ServiceMenus/k3b_*
|
||||
/usr/share/kde4/services/k3b*.desktop
|
||||
/usr/share/kde4/services/kcm_k3b*.desktop
|
||||
/usr/share/kde4/services/videodvd.protocol
|
||||
/usr/share/kde4/servicetypes/k3bplugin.desktop
|
||||
/usr/share/sounds/k3b_*
|
||||
%dir /usr/share/kde4/apps/solid
|
||||
%dir /usr/share/kde4/apps/solid/actions
|
||||
/usr/share/kde4/apps/solid/actions/k3b_*.desktop
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
/usr/include/k3b*
|
||||
/usr/%_lib/libk3b.so
|
||||
/usr/%_lib/libk3bdevice.so
|
||||
|
||||
%changelog
|
||||
* Thu Apr 23 2009 beineri@opensuse.org
|
||||
- rename to k3b, update to 1.65.0 Alpha
|
||||
* Sat Mar 21 2009 beineri@opensuse.org
|
||||
- update to 4.2.1.svn942189
|
||||
* Wed Feb 25 2009 stbinner@suse.de
|
||||
- update to 4.2.0.svn931376
|
||||
* Wed Feb 18 2009 stbinner@suse.de
|
||||
- update to 4.2.0.svn927728
|
||||
* Sat Jan 24 2009 stbinner@suse.de
|
||||
- update to 4.1.4.svn915827
|
||||
* Wed Jan 07 2009 stbinner@suse.de
|
||||
- update to 4.1.4.svn907132
|
||||
* Tue Dec 16 2008 stbinner@suse.de
|
||||
- update to 4.1.3.svn897517
|
||||
* Sat Nov 22 2008 stbinner@suse.de
|
||||
- update to 4.1.3.svn887510
|
||||
* Fri Nov 07 2008 stbinner@suse.de
|
||||
- update to 4.1.3.svn881374
|
||||
* Sat Sep 13 2008 stbinner@suse.de
|
||||
- update to 4.1.1.svn860449
|
||||
* Fri Aug 22 2008 stbinner@suse.de
|
||||
- update to 4.1.0.svn851044
|
||||
* Fri Jul 25 2008 stbinner@suse.de
|
||||
- update to 4.1.0.svn837567
|
||||
* Wed Jul 16 2008 stbinner@suse.de
|
||||
- update to 4.0.98.svn833153
|
||||
* Fri Jun 27 2008 dmueller@suse.de
|
||||
- update to 4.0.84.svn825098
|
||||
* Tue Jun 03 2008 dmueller@suse.de
|
||||
- update to 4.0.81.svn816194
|
||||
* Thu May 15 2008 dmueller@suse.de
|
||||
- update to 4.0.74.svn808129
|
||||
* Wed May 07 2008 dmueller@suse.de
|
||||
- update to 4.0.73.svn805196
|
||||
* Thu Apr 24 2008 dmueller@suse.de
|
||||
- update to 4.0.71.svn800684
|
||||
* Fri Apr 18 2008 dmueller@suse.de
|
||||
- update to 4.0.69.svn798537
|
||||
* Wed Apr 02 2008 dmueller@suse.de
|
||||
- update to 4.0.68.svn792936
|
||||
* Fri Feb 15 2008 dmueller@suse.de
|
||||
- update to 4.0.62.svn775117
|
||||
* Wed Nov 28 2007 dmueller@suse.de
|
||||
- update to 3.96.0.svn742626
|
||||
* Thu Nov 01 2007 dmueller@suse.de
|
||||
- update to 3.95.0.svn731749
|
||||
85
kde41.diff
Normal file
85
kde41.diff
Normal file
@ -0,0 +1,85 @@
|
||||
Index: src/rip/videodvd/k3bvideodvdrippingwidget.cpp
|
||||
===================================================================
|
||||
--- src/rip/videodvd/k3bvideodvdrippingwidget.cpp (revision 958507)
|
||||
+++ src/rip/videodvd/k3bvideodvdrippingwidget.cpp (working copy)
|
||||
@@ -26,7 +26,10 @@
|
||||
#include <kurllabel.h>
|
||||
#include <kdialog.h>
|
||||
#include <klineedit.h>
|
||||
+#include <kdeversion.h>
|
||||
+#if KDE_IS_VERSION(4,2,0)
|
||||
#include <KDiskFreeSpaceInfo>
|
||||
+#endif
|
||||
|
||||
#include <qcombobox.h>
|
||||
#include <qspinbox.h>
|
||||
@@ -255,10 +258,17 @@
|
||||
path.truncate( path.lastIndexOf('/') );
|
||||
|
||||
QPalette pal( m_labelFreeSpace->palette() );
|
||||
+#if KDE_IS_VERSION(4,2,0)
|
||||
KDiskFreeSpaceInfo free = KDiskFreeSpaceInfo::freeSpaceInfo( path );
|
||||
if( free.isValid() ) {
|
||||
m_labelFreeSpace->setText( KIO::convertSizeFromKiB(free.available()) );
|
||||
if( free.available() < m_neededSize/1024 )
|
||||
+#else
|
||||
+ unsigned long size, avail;
|
||||
+ if( K3b::kbFreeOnFs( path, size, avail ) ) {
|
||||
+ m_labelFreeSpace->setText( KIO::convertSizeFromKiB(avail) );
|
||||
+ if( avail < m_neededSize/1024 )
|
||||
+#endif
|
||||
pal.setColor( QPalette::Text, Qt::red );
|
||||
else
|
||||
pal.setColor( QPalette::Text, palette().color( QPalette::Text ) );
|
||||
Index: libk3b/core/k3bglobals.cpp
|
||||
===================================================================
|
||||
--- libk3b/core/k3bglobals.cpp (revision 958522)
|
||||
+++ libk3b/core/k3bglobals.cpp (working copy)
|
||||
@@ -33,7 +33,17 @@
|
||||
#include <kio/netaccess.h>
|
||||
#include <kurl.h>
|
||||
#include <kprocess.h>
|
||||
+#if KDE_IS_VERSION(4,2,0)
|
||||
#include <KDiskFreeSpaceInfo>
|
||||
+#else
|
||||
+#include <sys/stat.h>
|
||||
+#ifdef HAVE_SYS_STATVFS_H
|
||||
+# include <sys/statvfs.h>
|
||||
+#endif
|
||||
+#ifdef HAVE_SYS_VFS_H
|
||||
+# include <sys/vfs.h>
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
#include <kmountpoint.h>
|
||||
#include <Solid/Device>
|
||||
@@ -209,6 +219,7 @@
|
||||
|
||||
bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
|
||||
{
|
||||
+#if KDE_IS_VERSION(4,2,0)
|
||||
KDiskFreeSpaceInfo fs = KDiskFreeSpaceInfo::freeSpaceInfo( path );
|
||||
if ( fs.isValid() ) {
|
||||
size = fs.size()/1024;
|
||||
@@ -218,6 +229,21 @@
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
+#else
|
||||
+#ifdef HAVE_SYS_STATVFS_H
|
||||
+ struct statvfs fs;
|
||||
+ if( ::statvfs( QFile::encodeName(path), &fs ) == 0 ) {
|
||||
+ unsigned long kBfak = fs.f_frsize/1024;
|
||||
+
|
||||
+ size = fs.f_blocks*kBfak;
|
||||
+ avail = fs.f_bavail*kBfak;
|
||||
+
|
||||
+ return true;
|
||||
+ }
|
||||
+ else
|
||||
+#endif
|
||||
+ return false;
|
||||
+#endif
|
||||
}
|
||||
|
||||
|
||||
15
qt44.diff
Normal file
15
qt44.diff
Normal file
@ -0,0 +1,15 @@
|
||||
Index: libk3bdevice/k3bdevice.cpp
|
||||
===================================================================
|
||||
--- libk3bdevice/k3bdevice.cpp (revision 958425)
|
||||
+++ libk3bdevice/k3bdevice.cpp (working copy)
|
||||
@@ -1446,7 +1446,9 @@
|
||||
if( readTocPmaAtip( &data, dataLen, 5, false, 0 ) ) {
|
||||
// we need more than the header and a multiple of 18 bytes to have valid CD-TEXT
|
||||
if( dataLen > 4 && dataLen%18 == 4 ) {
|
||||
- textData.append( reinterpret_cast<char*>(data), dataLen );
|
||||
+ // keep building with Qt 4.4
|
||||
+ QByteArray cdtext( reinterpret_cast<char*>(data), dataLen );
|
||||
+ textData.append( cdtext );
|
||||
if ( success )
|
||||
*success = true;
|
||||
}
|
||||
13
r957664.diff
Normal file
13
r957664.diff
Normal file
@ -0,0 +1,13 @@
|
||||
Index: cmake/modules/FindPolkitQt.cmake
|
||||
===================================================================
|
||||
--- cmake/modules/FindPolkitQt.cmake (revision 957663)
|
||||
+++ cmake/modules/FindPolkitQt.cmake (revision 957664)
|
||||
@@ -25,7 +25,7 @@
|
||||
set(POLKITQT_MIN_VERSION "0.9.0")
|
||||
endif (NOT POLKITQT_MIN_VERSION)
|
||||
|
||||
-pkg_search_module( POLKITQT REQUIRED polkit-qt )
|
||||
+pkg_search_module( POLKITQT polkit-qt )
|
||||
|
||||
if (POLKITQT_FOUND)
|
||||
if (POLKITQT_VERSION VERSION_LESS POLKITQT_MIN_VERSION)
|
||||
Loading…
Reference in New Issue
Block a user