commit f39201510480920d9a5326f5fdb09c991e8a3b05
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Nov 4 13:57:33 2012 +0100
- rel 5; update kde4 deps; ffmpeg fixes
k3b-ffmpeg-0.8.patch => k3b-2.0.2-ffmpeg.patch | 34 ++-
k3b-2.0.2-libavformat54.patch | 22 ++
k3b-am.patch | 35 ---
k3b-desktop.patch | 20 --
k3b-ffmpeg.patch | 69 ------
k3b-group.patch | 29 ---
k3b-kde3support.patch | 325 -------------------------
k3b-libadd.patch | 187 --------------
k3b.spec | 8 +-
kde-am.patch | 11 -
10 files changed, 49 insertions(+), 691 deletions(-)
---
diff --git a/k3b.spec b/k3b.spec
index 92a3185..e4e1f60 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -14,13 +14,14 @@ Summary(hu.UTF-8): CD Kreator
Summary(pl.UTF-8): Kreator CD
Name: k3b
Version: 2.0.2
-Release: 4
+Release: 5
Epoch: 1
License: GPL v2+
Group: X11/Libraries
Source0: http://downloads.sourceforge.net/k3b/%{name}-%{version}.tar.bz2
# Source0-md5: c86113af31a2032e57fd2f302b5f637a
-Patch0: %{name}-ffmpeg-0.8.patch
+Patch0: k3b-2.0.2-ffmpeg.patch
+Patch1: k3b-2.0.2-libavformat54.patch
URL: http://k3b.plainblack.com/
BuildRequires: Qt3Support-devel >= %{qtver}
BuildRequires: QtNetwork-devel >= %{qtver}
@@ -38,7 +39,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: flac-c++-devel
BuildRequires: kde4-kdebase-workspace-devel >= %{kdever}
BuildRequires: kde4-kdelibs-devel >= %{kdever}
-BuildRequires: kde4-kdemultimedia-devel >= %{kdever}
+BuildRequires: kde4-libkcddb-devel >= %{kdever}
BuildRequires: libdvdread-devel
BuildRequires: libjpeg-devel
BuildRequires: libmad-devel
@@ -141,6 +142,7 @@ Pliki nagłówkowe biblioteki libk3bcore.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
install -d build
diff --git a/k3b-ffmpeg-0.8.patch b/k3b-2.0.2-ffmpeg.patch
similarity index 73%
rename from k3b-ffmpeg-0.8.patch
rename to k3b-2.0.2-ffmpeg.patch
index a4d73dd..2878b1e 100644
--- a/k3b-ffmpeg-0.8.patch
+++ b/k3b-2.0.2-ffmpeg.patch
@@ -1,6 +1,17 @@
---- k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.old 2011-01-15
21:47:29.000000000 +0100
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2011-06-22
14:14:58.637253378 +0200
-@@ -109,7 +109,13 @@
+commit 61ca30beb978f68e72257408777c6433f33129bd
+Author: Michal Malek <[email protected]>
+Date: Sun Aug 28 20:18:53 2011 +0200
+
+ Fixed compilation with new FFMPEG
+
+ BUG: 274817
+ FIXED-IN: 2.0.3
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index 0ad59fc..0c5f366 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
#else
::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
#endif
@@ -15,7 +26,7 @@
kDebug() << "(K3bFFMpegFile) not a simple audio stream: " <<
m_filename;
return false;
}
-@@ -225,8 +231,11 @@
+@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
QString K3bFFMpegFile::title() const
{
// FIXME: is this UTF8 or something??
@@ -29,7 +40,7 @@
else
return QString();
}
-@@ -235,8 +244,11 @@
+@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
QString K3bFFMpegFile::author() const
{
// FIXME: is this UTF8 or something??
@@ -43,7 +54,7 @@
else
return QString();
}
-@@ -245,8 +257,11 @@
+@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
QString K3bFFMpegFile::comment() const
{
// FIXME: is this UTF8 or something??
@@ -57,27 +68,26 @@
else
return QString();
}
-@@ -309,8 +324,13 @@
+@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
#if LIBAVCODEC_VERSION_MAJOR < 52
int len = ::avcodec_decode_audio(
#else
-- int len = ::avcodec_decode_audio2(
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ int len = ::avcodec_decode_audio3(
+ #else
-+ int len = ::avcodec_decode_audio2(
+ int len = ::avcodec_decode_audio2(
+ #endif
#endif
-+
++
#ifdef FFMPEG_BUILD_PRE_4629
&d->formatContext->streams[0]->codec,
#else
-@@ -318,7 +338,11 @@
+@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
#endif
(short*)d->alignedOutputBuffer,
&d->outputBufferSize,
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ &d->packet );
++ &d->packet );
+#else
d->packetData, d->packetSize );
+#endif
diff --git a/k3b-2.0.2-libavformat54.patch b/k3b-2.0.2-libavformat54.patch
new file mode 100644
index 0000000..174a776
--- /dev/null
+++ b/k3b-2.0.2-libavformat54.patch
@@ -0,0 +1,22 @@
+Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+===================================================================
+--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
+ close();
+
+ // open the file
+- int err = ::av_open_input_file( &d->formatContext,
m_filename.toLocal8Bit(), 0, 0, 0 );
++ int err = ::avformat_open_input( &d->formatContext,
m_filename.toLocal8Bit(), 0, NULL);
+ if( err < 0 ) {
+ kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with
error " << err;
+ return false;
+@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
+ }
+
+ // dump some debugging info
+- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+
+ return true;
+ }
diff --git a/k3b-am.patch b/k3b-am.patch
deleted file mode 100644
index c925828..0000000
--- a/k3b-am.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur k3b-1.0.5.orig/admin/cvs.sh k3b-1.0.5/admin/cvs.sh
---- k3b-1.0.5.orig/admin/cvs.sh 2009-07-03 16:21:55.747706941 +0200
-+++ k3b-1.0.5/admin/cvs.sh 2009-07-03 16:22:38.166938212 +0200
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10* | automake*1.11*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
-diff -ur k3b-1.0.5.orig/k3b-i18n-1.0.5/admin/cvs.sh
k3b-1.0.5/k3b-i18n-1.0.5/admin/cvs.sh
---- k3b-1.0.5.orig/k3b-i18n-1.0.5/admin/cvs.sh 2009-07-03 16:21:56.164373339
+0200
-+++ k3b-1.0.5/k3b-i18n-1.0.5/admin/cvs.sh 2009-07-03 16:22:53.140409188
+0200
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10* | automake*1.11*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
---- k3b-1.0.5/libk3b/core/Makefile.am.orig 2008-05-27 10:24:09.000000000
+0200
-+++ k3b-1.0.5/libk3b/core/Makefile.am 2009-07-12 18:12:20.268778591 +0200
-@@ -13,7 +13,7 @@
- include_HEADERS = k3bcore.h k3bdefaultexternalprograms.h
k3bexternalbinmanager.h \
- k3bprocess.h k3bversion.h k3bglobals.h k3bjob.h k3bthread.h \
- k3bthreadjob.h k3bglobalsettings.h k3bjobhandler.h \
-- k3b_export.h k3bjobhandler.h k3bsimplejobhandler.h
-+ k3b_export.h k3bsimplejobhandler.h
-
- METASOURCES = AUTO
-
diff --git a/k3b-desktop.patch b/k3b-desktop.patch
deleted file mode 100644
index 7129217..0000000
--- a/k3b-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/k3b.desktop.orig 2006-08-07 11:03:24.000000000 +0200
-+++ src/k3b.desktop 2006-08-07 17:35:19.459909280 +0200
-@@ -103,5 +103,5 @@
- MimeType=application/x-k3b
- X-KDE-StartupNotify=true
- X-KDE-NativeMimeType=application/x-k3b;application/x-iso
--Categories=KDE;Application;AudioVideo;DiscBurning;
-+Categories=Qt;KDE;Application;AudioVideo;DiscBurning;
- X-DCOP-ServiceType=Unique
---- k3bsetup/k3bsetup2.desktop.orig 2006-08-07 11:03:26.000000000 +0200
-+++ k3bsetup/k3bsetup2.desktop 2006-08-07 17:36:04.073127040 +0200
-@@ -77,7 +77,7 @@
- X-KDE-Library=k3bsetup2
- X-KDE-ModuleType=Library
- X-KDE-RootOnly=true
--Categories=Application;System;X-KDE-System;
-+Categories=Qt;KDE;X-KDE-settings-system;
- GenericName=CD & DVD Burning Setup
- GenericName[ar]=العام اعداد كتابة القرص المدمج (CD) و القرص المرئي الرقمي
(DVD)
- GenericName[bg]=Настройки за запис на CD и DVD
diff --git a/k3b-ffmpeg.patch b/k3b-ffmpeg.patch
deleted file mode 100644
index 9114808..0000000
--- a/k3b-ffmpeg.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -uNr k3b-1.0.5/plugins/decoder/ffmpeg.orig/configure.in.in
k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
---- k3b-1.0.5/plugins/decoder/ffmpeg.orig/configure.in.in 2008-05-27
08:23:36.000000000 +0000
-+++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in 2008-10-02
12:12:49.000000000 +0000
-@@ -21,8 +21,8 @@
- AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(
- extern "C" {
-- #include <ffmpeg/avformat.h>
-- #include <ffmpeg/avcodec.h>
-+ #include <libavformat/avformat.h>
-+ #include <libavcodec/avcodec.h>
- }
-
- int main() {
-@@ -36,8 +36,8 @@
- LIBS="-lavformat -lavcodec $LIBS"
- AC_LINK_IFELSE(
- extern "C" {
-- #include <ffmpeg/avformat.h>
-- #include <ffmpeg/avcodec.h>
-+ #include <libavformat/avformat.h>
-+ #include <libavcodec/avcodec.h>
- }
-
- int main() {
-diff -uNr k3b-1.0.5/plugins/decoder/ffmpeg.orig/k3bffmpegdecoder.cpp
k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
---- k3b-1.0.5/plugins/decoder/ffmpeg.orig/k3bffmpegdecoder.cpp 2008-05-27
08:23:36.000000000 +0000
-+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp 2008-10-02
12:13:06.000000000 +0000
-@@ -22,7 +22,7 @@
- #include <k3bpluginfactory.h>
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
-+#include <libavcodec/avcodec.h>
- }
-
- #include <math.h>
-diff -uNr k3b-1.0.5/plugins/decoder/ffmpeg.orig/k3bffmpegwrapper.cpp
k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
---- k3b-1.0.5/plugins/decoder/ffmpeg.orig/k3bffmpegwrapper.cpp 2008-05-27
08:23:36.000000000 +0000
-+++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp 2008-10-02
12:47:17.000000000 +0000
-@@ -18,8 +18,8 @@
- #include "k3bffmpegwrapper.h"
-
- extern "C" {
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
- }
-
- #include <string.h>
-@@ -194,7 +194,7 @@
- return i18n("Windows Media v1");
- case CODEC_ID_WMAV2:
- return i18n("Windows Media v2");
-- case CODEC_ID_MP3LAME:
-+ case CODEC_ID_MP3:
- return i18n("MPEG 1 Layer III");
- case CODEC_ID_AAC:
- return i18n("Advanced Audio Coding (AAC)");
-@@ -290,7 +290,7 @@
- #ifdef FFMPEG_BUILD_PRE_4629
- int len = avcodec_decode_audio( &d->formatContext->streams[0]->codec,
- #else
-- int len = avcodec_decode_audio( d->formatContext->streams[0]->codec,
-+ int len = avcodec_decode_audio2( d->formatContext->streams[0]->codec,
- #endif
- (short*)d->outputBuffer,
&d->outputBufferSize,
- d->packetData, d->packetSize );
diff --git a/k3b-group.patch b/k3b-group.patch
deleted file mode 100644
index ea95eef..0000000
--- a/k3b-group.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- k3b-0.11.18/k3bsetup/k3bsetup2.cpp~ 2004-11-28 14:27:24.000000000
+0200
-+++ k3b-0.11.18/k3bsetup/k3bsetup2.cpp 2005-01-02 20:03:05.000000000 +0200
-@@ -329,7 +329,7 @@
-
- d->config->setGroup( "General Settings" );
- w->m_checkUseBurningGroup->setChecked( d->config->readBoolEntry( "use
burning group", false ) );
-- w->m_editBurningGroup->setText( d->config->readEntry( "burning group",
"burning" ) );
-+ w->m_editBurningGroup->setText( d->config->readEntry( "burning group",
"cdrom" ) );
-
-
- // load search path
-@@ -343,7 +343,7 @@
- void K3bSetup2::defaults()
- {
- w->m_checkUseBurningGroup->setChecked(false);
-- w->m_editBurningGroup->setText( "burning" );
-+ w->m_editBurningGroup->setText( "cdrom" );
-
- //
- // This is a hack to work around a kcm bug which makes the faulty
assumption that
-@@ -486,7 +486,7 @@
- QString K3bSetup2::burningGroup() const
- {
- QString g = w->m_editBurningGroup->text();
-- return g.isEmpty() ? QString("burning") : g;
-+ return g.isEmpty() ? QString("cdrom") : g;
- }
-
-
diff --git a/k3b-kde3support.patch b/k3b-kde3support.patch
deleted file mode 100644
index 9cb04ae..0000000
--- a/k3b-kde3support.patch
+++ /dev/null
@@ -1,325 +0,0 @@
---- admin/acinclude.m4.in 2008-05-27 10:23:30.000000000 +0200
-+++ admin/acinclude.m4.in-new 2009-07-12 16:17:53.748582894 +0200
-@@ -1791,11 +1791,11 @@
- AC_MSG_CHECKING([for KDE])
-
- if test "${prefix}" != NONE; then
-- kde_includes=${includedir}
-- KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-+ kde_includes=${includedir}/kde3
-+ KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir/kde3)
-
-- kde_libraries=${libdir}
-- KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-+ kde_libraries=${libdir}/kde3dev
-+ KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir/kde3dev)
-
- else
- ac_kde_includes=
-@@ -1829,7 +1829,7 @@
- So, check this please and use another prefix!])
- fi
-
--kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff}
/usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff}
/usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff}
/usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff}
/opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff}
/usr/X11R6/kde/lib${kdelibsuff}"
-+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff}/kde3dev
/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff}
/usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3
/usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff}
/opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff}
/usr/X11R6/kde/lib${kdelibsuff}"
- test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR
$kde_libdirs"
- kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
- AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-@@ -1839,12 +1839,6 @@
- dnl this might be somewhere else
- AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs,
kde_widgetdir)
-
--if test -n "$ac_kde_libraries" && test ! -r
"$ac_kde_libraries/$kde_check_lib"; then
--AC_MSG_ERROR([
--in the prefix, you've chosen, are no KDE libraries installed. This will fail.
--So, check this please and use another prefix!])
--fi
--
- if test -n "$kde_widgetdir" && test ! -r
"$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
- AC_MSG_ERROR([
- I can't find the designer plugins. These are required and should have been
installed
-@@ -1886,8 +1880,8 @@
- AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
-- kde_libraries="${libdir}"
-- kde_includes="${includedir}"
-+ kde_libraries="${libdir}/kde3dev"
-+ kde_includes="${includedir}/kde3"
-
- else
- ac_cv_have_kde="have_kde=yes \
-@@ -1928,7 +1922,7 @@
- KDE_CHECK_UIC_PLUGINS
- fi
-
--ac_kde_libraries="$kde_libdir"
-+ac_kde_libraries="$kde_libdir/kde3dev"
-
- AC_SUBST(AUTODIRS)
-
---- admin/acinclude.m4.in-new 2009-07-12 16:59:51.390969154 +0200
-+++ admin/acinclude.m4.in 2009-07-12 17:00:06.398894540 +0200
-@@ -578,7 +578,7 @@
- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs],
[KDE_MISSING_ARTS_ERROR(mcopidl)])
- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs],
[KDE_MISSING_ARTS_ERROR(artsc-config)])
- fi
-- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-+ KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs])
-
- kde32ornewer=1
- kde33ornewer=1
---- admin/am_edit 2008-05-27 10:23:30.000000000 +0200
-+++ admin/am_edit-new 2009-07-12 17:03:38.005110229 +0200
-@@ -1999,7 +1999,7 @@
- my $lines = "";
- my $lookup = 'MEINPROC\s*=';
- if ($MakefileData !~ /\n($lookup)/) {
-- $lines = "MEINPROC=/\$(kde_bindir)/meinproc\n";
-+ $lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n";
- }
- $lookup = 'KDE_XSL_STYLESHEET\s*=';
- if ($MakefileData !~ /\n($lookup)/) {
---- k3b-i18n-1.0.5/admin/acinclude.m4.in.old 2009-07-12 17:11:48.840906438
+0200
-+++ k3b-i18n-1.0.5/admin/acinclude.m4.in 2009-07-12 17:12:01.948410314
+0200
-@@ -578,7 +578,7 @@
- KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs],
[KDE_MISSING_ARTS_ERROR(mcopidl)])
- KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs],
[KDE_MISSING_ARTS_ERROR(artsc-config)])
- fi
-- KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-+ KDE_FIND_PATH(meinproc4, MEINPROC, [$kde_default_bindirs])
-
- kde32ornewer=1
- kde33ornewer=1
---- k3b-i18n-1.0.5/admin/am_edit.old 2009-07-12 17:11:52.847501698 +0200
-+++ k3b-i18n-1.0.5/admin/am_edit 2009-07-12 17:12:09.890240661 +0200
-@@ -1999,7 +1999,7 @@
- my $lines = "";
- my $lookup = 'MEINPROC\s*=';
- if ($MakefileData !~ /\n($lookup)/) {
-- $lines = "MEINPROC=/\$(kde_bindir)/meinproc\n";
-+ $lines = "MEINPROC=/\$(kde_bindir)/meinproc4\n";
- }
- $lookup = 'KDE_XSL_STYLESHEET\s*=';
- if ($MakefileData !~ /\n($lookup)/) {
---- admin/ltmain.sh 2009-07-12 17:52:23.311079431 +0200
-+++ admin/ltmain.sh-new 2009-07-12 17:52:37.627328398 +0200
-@@ -5669,7 +5669,23 @@
- case $hardcode_action in
- immediate | unsupported)
- if test "$hardcode_direct" = no; then
-- add="$dir/$linklib"
-+ if test "$linklib" = "libDCOP.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkwalletclient.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdefx.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdecore.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdeui.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkparts.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkio.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ else
-+ add="$dir/$linklib"
-+ fi
- case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-@@ -5710,14 +5726,30 @@
- relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
-- add="$dir/$linklib"
-+ if test "$linklib" = "libDCOP.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkwalletclient.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdefx.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdecore.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdeui.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkparts.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkio.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ else
-+ add="$dir/$linklib"
-+ fi
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$dir"
- # Try looking first in the location we're being installed to.
- if test -n "$inst_prefix_dir"; then
- case $libdir in
- [\\/]*)
-- add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+ add_dir="$add_dir -L$inst_prefix_dir$libdir/kde3dev"
- ;;
- esac
- fi
-@@ -5767,7 +5799,23 @@
- # Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
-- add="$libdir/$linklib"
-+ if test "$linklib" = "libDCOP.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkwalletclient.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdefx.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdecore.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkdeui.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkparts.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ elif test "$linklib" = "libkio.so"; then
-+ add="$dir/kde3dev/$linklib"
-+ else
-+ add="$dir/$linklib"
-+ fi
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
---- admin/acinclude.m4.in 2009-07-12 17:53:54.890669276 +0200
-+++ admin/acinclude.m4.in-new 2009-07-12 18:21:36.072038700 +0200
-@@ -1903,7 +1903,7 @@
-
- KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL
-DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-
--KDE_LDFLAGS="-L$kde_libraries"
-+KDE_LDFLAGS="-L$kde_libraries/kde3dev"
- if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" =
"$qt_libraries" ; then
- all_libraries="$KDE_LDFLAGS $all_libraries"
- fi
---- admin/acinclude.m4.in 2009-07-12 18:22:26.757982416 +0200
-+++ admin/acinclude.m4.in-new 2009-07-12 18:35:21.812623658 +0200
-@@ -1514,7 +1514,7 @@
- ac_libs_safe="$LIBS"
-
- CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
--LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+LDFLAGS="$LDFLAGS -L$qt_libdir $USER_LDFLAGS $all_libraries $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
- KDE_PRINT_QT_PROGRAM
-@@ -1913,7 +1913,7 @@
-
- AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
--all_libraries="$all_libraries $USER_LDFLAGS"
-+all_libraries="$USER_LDFLAGS $all_libraries"
- all_includes="$all_includes $USER_INCLUDES"
- AC_SUBST(all_includes)
- AC_SUBST(all_libraries)
-@@ -2049,7 +2049,7 @@
-
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
-- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-+ LDFLAGS="$LDFLAGS $USER_LDFLAGS $all_libraries"
-
- AC_TRY_LINK([
- #include <qdom.h>
-@@ -2517,7 +2517,7 @@
- AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
- [
- ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-+LIBS="$USER_LDFLAGS $all_libraries -ljpeg$2 -lm"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- AC_TRY_LINK(
-@@ -2608,7 +2608,7 @@
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-+LIBS="$USER_LDFLAGS $all_libraries $LIBQT"
- LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
- ac_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-@@ -2643,7 +2643,7 @@
- AC_CACHE_VAL(ac_cv_lib_z,
- [
- kde_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-+LIBS="$USER_LDFLAGS $all_libraries -lz $LIBSOCKET"
- kde_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- AC_TRY_LINK(dnl
-@@ -2689,9 +2689,9 @@
- AC_LANG_CPLUSPLUS
- kde_save_LIBS="$LIBS"
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes";
then
--LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-+LIBS="$USER_LDFLAGS $all_libraries -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
- else
--LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-+LIBS="$USER_LDFLAGS $all_libraries -l$1 $LIBJPEG $LIBZ -lm"
- fi
- kde_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-@@ -2766,7 +2766,7 @@
- EXRSTATUS=old
- else
- kde_save_LIBS="$LIBS"
-- LIBS="$LIBS $all_libraries $USER_LDFLAGS `pkg-config --libs
OpenEXR` $LIBZ"
-+ LIBS="$LIBS $USER_LDFLAGS $all_libraries `pkg-config --libs
OpenEXR` $LIBZ"
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_CXXFLAGS="$CXXFLAGS"
-@@ -2815,9 +2815,9 @@
- [
- kde_save_LIBS="$LIBS"
- if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes";
then
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-+LIBS="$LIBS $USER_LDFLAGS $all_libraries -lpng $LIBZ -lm -lX11 $LIBSOCKET"
- else
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-+LIBS="$LIBS $USER_LDFLAGS $all_libraries -lpng $LIBZ -lm"
- fi
- kde_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-@@ -2858,7 +2858,7 @@
- AC_CACHE_VAL(ac_cv_jasper,
- [
- kde_save_LIBS="$LIBS"
--LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-+LIBS="$LIBS $USER_LDFLAGS $all_libraries -ljasper $LIBJPEG -lm"
- kde_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-@@ -5509,7 +5509,7 @@
- ac_libs_safe="$LIBS"
-
- CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-- LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-+ LDFLAGS="$LDFLAGS $QT_LDFLAGS $USER_LDFLAGS $all_libraries $KDE_MT_LDFLAGS"
- LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-
- cat > conftest.$ac_ext <<EOF
-@@ -5590,7 +5590,7 @@
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-+LIBS="$USER_LDFLAGS $all_libraries -lbz2 $LIBSOCKET"
- kde_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
- AC_TRY_LINK(dnl
-@@ -5630,7 +5630,7 @@
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- kde_save_LIBS="$LIBS"
-- LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-+ LIBS="$USER_LDFLAGS $all_libraries $ld_shared_flag -lbz2 $LIBSOCKET"
- kde_save_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
diff --git a/k3b-libadd.patch b/k3b-libadd.patch
deleted file mode 100644
index f742c95..0000000
--- a/k3b-libadd.patch
+++ /dev/null
@@ -1,187 +0,0 @@
---- k3b-1.0pre1/plugins/encoder/external/Makefile.am.wiget 2006-08-18
19:14:14.000000000 +0200
-+++ k3b-1.0pre1/plugins/encoder/external/Makefile.am 2006-08-18
19:15:41.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bexternalencoder_la_SOURCES = base_k3bexternalencoderconfigwidget.ui
k3bexternalencoder.cpp
-
--libk3bexternalencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bexternalencoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- libk3bexternalencoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/encoder/sox/Makefile.am.wiget 2006-08-18
19:12:56.000000000 +0200
-+++ k3b-1.0pre1/plugins/encoder/sox/Makefile.am 2006-08-18
19:13:44.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bsoxencoder_la_SOURCES = base_k3bsoxencoderconfigwidget.ui
k3bsoxencoder.cpp
-
--libk3bsoxencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-+libk3bsoxencoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT)
- libk3bsoxencoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/encoder/ogg/Makefile.am.wiget 2006-08-18
19:17:41.000000000 +0200
-+++ k3b-1.0pre1/plugins/encoder/ogg/Makefile.am 2006-08-18
19:18:40.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3boggvorbisencoder_la_SOURCES = base_k3boggvorbisencodersettingswidget.ui
k3boggvorbisencoder.cpp
-
--libk3boggvorbisencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-logg -lvorbis -lvorbisenc
-+libk3boggvorbisencoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -logg -lvorbis
-lvorbisenc
- libk3boggvorbisencoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/encoder/lame/Makefile.am.wiget 2006-08-18
19:16:14.000000000 +0200
-+++ k3b-1.0pre1/plugins/encoder/lame/Makefile.am 2006-08-18
19:17:15.000000000 +0200
-@@ -6,7 +6,7 @@
- base_k3bmanualbitratesettingswidget.ui \
- k3blameencoder.cpp
-
--libk3blameencoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDECORE)
-lmp3lame
-+libk3blameencoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lmp3lame
- libk3blameencoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/audiooutput/arts/Makefile.am.wiget 2006-08-18
19:19:07.000000000 +0200
-+++ k3b-1.0pre1/plugins/audiooutput/arts/Makefile.am 2006-08-18
19:20:19.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bartsoutputplugin_la_SOURCES = k3bartsoutputplugin.cpp
-
--libk3bartsoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la -lartsc
-+libk3bartsoutputplugin_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) -lartsc
- libk3bartsoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/mp3/Makefile.am.wiget 2006-08-18
19:00:11.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/mp3/Makefile.am 2006-08-18
19:01:05.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bmaddecoder_la_SOURCES = k3bmad.cpp k3bmaddecoder.cpp
-
--libk3bmaddecoder_la_LIBADD = $(LIB_KDECORE) $(MAD_LIB) $(taglib_libs)
../../../libk3b/libk3b.la
-+libk3bmaddecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) $(MAD_LIB) $(taglib_libs)
- libk3bmaddecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/wave/Makefile.am.wiget 2006-08-18
18:53:04.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/wave/Makefile.am 2006-08-18
18:57:56.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp
-
--libk3bwavedecoder_la_LIBADD = $(LIB_KDECORE) ../../../libk3b/libk3b.la
-+libk3bwavedecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT)
- libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/ffmpeg/Makefile.am.wiget 2006-08-18
19:05:53.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/ffmpeg/Makefile.am 2006-08-18
19:06:39.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bffmpegdecoder_la_SOURCES = k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp
-
--libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI)
-lavcodec -lavformat
-+libk3bffmpegdecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) -lavcodec -lavformat
- libk3bffmpegdecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/flac/Makefile.am.wiget 2006-08-18
19:01:26.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/flac/Makefile.am 2006-08-18
19:02:40.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp
-
--libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI) -lFLAC++
-lFLAC $(taglib_libs)
-+libk3bflacdecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) -lFLAC++ -lFLAC
$(taglib_libs)
- libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/musepack/Makefile.am.wiget 2006-08-18
19:07:16.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/musepack/Makefile.am 2006-08-18
19:07:57.000000000 +0200
-@@ -7,7 +7,7 @@
-
- libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp
-
--libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(MPC_LIBS)
-+libk3bmpcdecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) $(MPC_LIBS)
- libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/libsndfile/Makefile.am.wiget 2006-08-18
19:03:56.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/libsndfile/Makefile.am 2006-08-18
19:05:15.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp
-
--libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_KDEUI)
-lsndfile
-+libk3blibsndfiledecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) -lsndfile
- libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/decoder/ogg/Makefile.am.wiget 2006-08-18
18:58:28.000000000 +0200
-+++ k3b-1.0pre1/plugins/decoder/ogg/Makefile.am 2006-08-18
18:59:46.000000000 +0200
-@@ -4,7 +4,7 @@
-
- libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp
-
--libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis
-lvorbisfile
-+libk3boggvorbisdecoder_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile $(LIB_KDECORE) $(LIB_QT)
- libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/plugins/project/audioprojectcddb/Makefile.am.wiget
2006-08-18 19:24:48.000000000 +0200
-+++ k3b-1.0pre1/plugins/project/audioprojectcddb/Makefile.am 2006-08-18
19:25:51.000000000 +0200
-@@ -12,7 +12,7 @@
-
- libk3baudioprojectcddbplugin_la_SOURCES = k3baudioprojectcddbplugin.cpp
-
--libk3baudioprojectcddbplugin_la_LIBADD = ../../../libk3b/libk3b.la
-+libk3baudioprojectcddbplugin_la_LIBADD =
../../../libk3bdevice/libk3bdevice.la ../../../libk3b/libk3b.la $(LIB_KDEUI)
$(LIB_KDECORE) $(LIB_QT)
-
- libk3baudioprojectcddbplugin_la_LDFLAGS = -module $(KDE_PLUGIN)
$(all_libraries)
-
---- k3b-1.0pre1/plugins/project/audiometainforenamer/Makefile.am.wiget
2006-08-18 19:26:36.000000000 +0200
-+++ k3b-1.0pre1/plugins/project/audiometainforenamer/Makefile.am
2006-08-18 19:29:57.000000000 +0200
-@@ -10,7 +10,7 @@
- kde_module_LTLIBRARIES = libk3baudiometainforenamerplugin.la
-
- libk3baudiometainforenamerplugin_la_SOURCES =
k3baudiometainforenamerplugin.cpp
--libk3baudiometainforenamerplugin_la_LIBADD = ../../../libk3b/libk3b.la
-+libk3baudiometainforenamerplugin_la_LIBADD = ../../../libk3b/libk3b.la
$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- libk3baudiometainforenamerplugin_la_LDFLAGS = -module $(KDE_PLUGIN)
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
---- k3b-1.0pre1/k3bsetup/Makefile.am.wiget 2006-08-18 19:30:40.000000000
+0200
-+++ k3b-1.0pre1/k3bsetup/Makefile.am 2006-08-18 19:31:46.000000000 +0200
-@@ -6,7 +6,7 @@
- kde_module_LTLIBRARIES = kcm_k3bsetup2.la
-
- kcm_k3bsetup2_la_SOURCES = base_k3bsetup2.ui k3bsetup2.cpp
--kcm_k3bsetup2_la_LIBADD = $(LIB_KDEUI) ../libk3b/libk3b.la
-+kcm_k3bsetup2_la_LIBADD = ../libk3bdevice/libk3bdevice.la ../libk3b/libk3b.la
$(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
- kcm_k3bsetup2_la_LDFLAGS = -module -avoid-version $(all_libraries)
-no-undefined
-
- k3bsetup2_DATA = k3bsetup2.desktop
---- k3b-1.0pre1/kioslaves/videodvd/Makefile.am.wiget 2006-08-18
15:43:26.000000000 +0200
-+++ k3b-1.0pre1/kioslaves/videodvd/Makefile.am 2006-08-18 15:48:51.000000000
+0200
-@@ -6,7 +6,7 @@
- kde_module_LTLIBRARIES = kio_videodvd.la
-
- kio_videodvd_la_SOURCES = videodvd.cpp
--kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la
-+kio_videodvd_la_LIBADD = -lkio ../../libk3b/libk3b.la
../../libk3bdevice/libk3bdevice.la $(LIB_KDECORE) $(LIB_QT)
- kio_videodvd_la_LDFLAGS = -avoid-version -module $(all_libraries)
$(KDE_PLUGIN)
-
- protocol_DATA = videodvd.protocol
---- k3b-1.0rc3/plugins/audiooutput/alsa/Makefile.am.orig 2006-12-29
21:40:30.000000000 +0100
-+++ k3b-1.0rc3/plugins/audiooutput/alsa/Makefile.am 2006-12-30
06:47:54.000000000 +0100
-@@ -5,7 +5,7 @@
- libk3balsaoutputplugin_la_SOURCES = k3balsaoutputplugin.cpp
-
- libk3balsaoutputplugin_la_CFLAGS = $(ALSA_CFLAGS)
--libk3balsaoutputplugin_la_LIBADD = ../../../libk3b/libk3b.la $(ALSA_LIBS)
-+libk3balsaoutputplugin_la_LIBADD = ../../../libk3bdevice/libk3bdevice.la
../../../libk3b/libk3b.la $(LIB_KDECORE) $(LIB_QT) $(ALSA_LIBS)
- libk3balsaoutputplugin_la_LDFLAGS = -avoid-version -module -no-undefined
$(all_libraries)
-
- pluginsdir = $(kde_datadir)/k3b/plugins
diff --git a/kde-am.patch b/kde-am.patch
deleted file mode 100644
index 5a23f3a..0000000
--- a/kde-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdelibs-3.5.10/admin/cvs.sh~ 2008-08-19 23:28:39.000000000 +0300
-+++ kdelibs-3.5.10/admin/cvs.sh 2009-05-19 13:34:47.966210297 +0300
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* |
automake*1.10* | automake*1.11*)
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/k3b.git/commitdiff/f39201510480920d9a5326f5fdb09c991e8a3b05
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
