summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch21
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec22
-rw-r--r--redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch11
-rw-r--r--redhat/applications/k3b/k3brc6
-rw-r--r--redhat/applications/k3b/trinity-k3b-icons.patch23
5 files changed, 3 insertions, 80 deletions
diff --git a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch b/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
deleted file mode 100644
index 4ee6105a0..000000000
--- a/redhat/applications/k3b/k3b-1.0.4-manualbufsize.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp
---- k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp.manualbufsize 2007-11-02 10:55:39.000000000 +0100
-+++ k3b-1.0.4/libk3b/core/k3bglobalsettings.cpp 2008-04-22 14:15:06.000000000 +0200
-@@ -22,7 +22,7 @@ K3bGlobalSettings::K3bGlobalSettings()
- : m_eject(true),
- m_burnfree(true),
- m_overburn(false),
-- m_useManualBufferSize(false),
-+ m_useManualBufferSize(true),
- m_bufferSize(4),
- m_force(false)
- {
-@@ -37,7 +37,7 @@ void K3bGlobalSettings::readSettings( KC
- m_eject = !c->readBoolEntry( "No cd eject", false );
- m_burnfree = c->readBoolEntry( "burnfree", true );
- m_overburn = c->readBoolEntry( "Allow overburning", false );
-- m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", false );
-+ m_useManualBufferSize = c->readBoolEntry( "Manual buffer size", true );
- m_bufferSize = c->readNumEntry( "Fifo buffer", 4 );
- m_force = c->readBoolEntry( "Force unsafe operations", false );
-
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index a83b551bc..d7745ea13 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -57,11 +57,6 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source2: k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4: k3b-1.0.4-manualbufsize.patch
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
@@ -89,12 +84,6 @@ BuildRequires: libvorbis-devel
BuildRequires: taglib-devel
BuildRequires: zlib-devel
-%if 0%{?fedora} >= 24
-BuildRequires: libmusicbrainz5-devel
-%else
-BuildRequires: libmusicbrainz-devel
-%endif
-
# IDN support
BuildRequires: libidn-devel
@@ -300,7 +289,6 @@ BuildArch: noarch
%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
%{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
%{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_confdir}/k3brc
%{tde_datadir}/mimelnk/application/x-k3b.desktop
%{tde_datadir}/icons/hicolor/*/apps/k3b.png
%{tde_datadir}/services/tdefile_k3b.desktop
@@ -419,9 +407,6 @@ and a generic audio and video file converter.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-# set in k3brc too
-%patch4 -p1 -b .manualbufsize
-
%build
unset QTDIR QTINC QTLIB
@@ -429,8 +414,8 @@ export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# FFMPEG trick ...
-if [ -d /usr/include/ffmpeg ]; then
- export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+if [ -d "/usr/include/ffmpeg" ]; then
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg -I/opt/trinity/include"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -457,7 +442,7 @@ fi
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
\
-DWITH_ALL_OPTIONS="ON" \
- -DWITH_MUSICBRAINZ="ON" \
+ -DWITH_MUSICBRAINZ="OFF" \
-DWITH_FFMPEG_ALL_CODECS="ON" \
-DWITH_MUSEPACK="ON" \
..
@@ -469,7 +454,6 @@ fi
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot} -C build
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_confdir}/k3brc
# remove the .la files
%__rm -f %{buildroot}%{tde_libdir}/libk3b*.la
diff --git a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch b/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
deleted file mode 100644
index bd3bfdebf..000000000
--- a/redhat/applications/k3b/k3b-3.5.13.2-fix_ffmpeg_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.ORI 2013-09-07 12:10:15.846286823 +0200
-+++ trinity-k3b-3.5.13.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2013-09-07 12:11:08.020207223 +0200
-@@ -49,7 +49,7 @@
- K3b::Msf length;
-
- // for decoding
-- char outputBuffer[AVCODEC_MAX_AUDIO_FRAME_SIZE];
-+ char outputBuffer[192000];
- char* outputBufferPos;
- int outputBufferSize;
- AVPacket packet;
diff --git a/redhat/applications/k3b/k3brc b/redhat/applications/k3b/k3brc
deleted file mode 100644
index 5d967f599..000000000
--- a/redhat/applications/k3b/k3brc
+++ /dev/null
@@ -1,6 +0,0 @@
-[General Options]
-check system config=false
-Manual buffer size=true
-
-[Notification Messages]
-Don't prompt me again.=No
diff --git a/redhat/applications/k3b/trinity-k3b-icons.patch b/redhat/applications/k3b/trinity-k3b-icons.patch
deleted file mode 100644
index 4dd762215..000000000
--- a/redhat/applications/k3b/trinity-k3b-icons.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -rcb k3b.ori/src/k3b.desktop k3b/src/k3b.desktop
-*** k3b.ori/src/k3b.desktop Wed Dec 15 14:23:05 2010
---- k3b/src/k3b.desktop Wed Dec 15 14:28:55 2010
-***************
-*** 116,123 ****
- Name[ar]= K3b
- Name[bn]=কে-থ্রি-বি
- Name[hi]=के3बी
-! MimeType=application/x-k3b;application/x-iso;application/x-cue
- X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue
-! Categories=KDE;Application;AudioVideo;DiscBurning;
- X-DCOP-ServiceType=Unique
---- 116,124 ----
- Name[ar]= K3b
- Name[bn]=কে-থ্রি-বি
- Name[hi]=के3बी
-! Encoding=UTF-8
-! MimeType=application/x-k3b;application/x-iso;application/x-cue;
- X-KDE-StartupNotify=true
-! X-KDE-NativeMimeType=application/x-k3b;application/x-iso;application/x-cue;
-! Categories=KDE;AudioVideo;DiscBurning;
- X-DCOP-ServiceType=Unique
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 10:22:37 +0000