TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update and cleanup tdemultimedia

Browse Source
pull/3/head
François Andriot 10 years ago
parent 93915c7ddd
commit e0568ac6b0
18 changed files with 67 additions and 4972 deletions
Show Stats Download Patch File Download Diff File

10
redhat/tdemultimedia/kdemultimedia-3.4.0-xdg.patch
Unescape View File

@ -1,10 +0,0 @@
--- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn 2005-04-25 16:16:32.000000000 +0200
+++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu 2005-04-25 16:17:51.000000000 +0200
@@ -2,6 +2,7 @@
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
+<Name>Applications</Name>
<Menu>
<Name>Multimedia</Name>
<Exclude>

396
redhat/tdemultimedia/kdemultimedia-3.5.12.spec
Unescape View File

@ -1,396 +0,0 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.12
%endif
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/kde3
%define appdir %{_datadir}/applications/kde
# former extras bits
#define _with_akode --with-akode
## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
#define _with_musicbrainz --with-musicbrainz
%define _with_taglib --with-taglib
%define _with_xine --with-xine
Name: trinity-kdemultimedia
Summary: Multimedia applications for the K Desktop Environment (KDE)
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
License: GPLv2
Group: Applications/Multimedia
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdemultimedia-%{version}.tar.gz
Provides: kdemultimedia3 = %{version}-%{release}
# RedHat Legacy patches (from Fedora 8)
Patch3: kdemultimedia-3.4.0-xdg.patch
Patch5: kdemultimedia-3.5.7-pthread.patch
Provides: kdemultimedia3 = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: zlib-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel
BuildRequires: desktop-file-utils
BuildRequires: libtheora-devel
BuildRequires: flac-devel
BuildRequires: alsa-lib-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: gstreamer-devel
BuildRequires: automake libtool
%{?_with_akode:BuildRequires: akode-devel}
%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
%{?_with_taglib:BuildRequires: taglib-devel}
%{?_with_xine:BuildRequires: xine-lib-devel}
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
%description
The K Desktop Environment (KDE) is a GUI desktop for the X Window
System. The %{name} package contains multimedia applications for
KDE, including:
kmid, a midi player
kmix, an audio mixer
arts, additional functionality for the aRts sound system
krec, a recording tool
kscd, an Audio-CD player
kaudiocreator, a graphical frontend for audio file creation
%package devel
Summary: Development files for %{name}, aRts and noatun plugins
Group: Development/Libraries
Provides: kdemultimedia3-devel = %{version}-%{release}
Requires: %{name}-libs = %{version}-%{release}
# for noatun shlib(s)
Requires: %{name}-extras-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
{summary}.
Install %{name}-devel if you wish to develop or compile any
applications using aRtsbuilder, aRtsmidi, aRtskde, aRts modules or
noatun plugins.
%package extras
Summary: Extra applications from %{name}
Group: Applications/Multimedia
Requires: %{name}-extras-libs = %{version}-%{release}
%description extras
%{summary}, including:
* juk, a media player
* kaboodle, a media player
* noatun, a media player
%package extras-libs
Summary: Extra %{name} runtime libraries
Group: System Environment/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description extras-libs
%{summary}.
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: trinity-kdelibs
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%prep
%setup -q -n kdemultimedia
%patch3 -p1 -b .xdg
%patch5 -p1 -b .pthread
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%if 0%{?fedora} > 0
export CXXFLAGS="${CXXFLAGS} -lDCOP"
%endif
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--includedir=%{tde_includedir} \
--with-cdparanoia \
--with-flac \
--with-theora \
--with-vorbis \
--with-alsa \
--with-gstreamer \
--without-lame \
--disable-debug \
--disable-warnings \
--enable-final \
--disable-rpath \
%{?_with_akode} %{!?_with_akode:--without-akode} \
%{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?_with_xine} %{!?_with_xine:--without-xine} \
--with-extra-includes=%{_usr}/include/cdda:%{_includedir}/tqt \
--enable-closure
%__make %{?_smp_mflags}
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
%__make install DESTDIR=%{?buildroot} -C kaudiocreator
## Remove/uninstall (conflicting) bits we don't want
%__rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode*MPEGPlayObject.mcopclass
# only show in KDE, really? -- Rex (FIXME)
for f in %{buildroot}%{appdir}/*.desktop ; do
if [ -f %{buildroot}%{appdir}/*.desktop ] ; then
echo "OnlyShowIn=KDE;" >> $f
fi
done
# don't make these world-writeable
chmod go-w %{buildroot}%{_datadir}/apps/kscd/*
# locale's
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# rpmdocs
for dir in k* ; do
for file in AUTHORS ChangeLog README TODO ; do
if test -s "$dir/$file" ; then
install -p -m644 -D "$dir/$file" "rpmdocs/$dir/$file"
# exclude kaboodle, juk, noatun
if [ $dir != kaboodle -a $dir != juk -a $dir != noatun ] ; then
echo "%doc rpmdocs/$dir/" >> %{name}.lang
fi
fi
done
done
%post
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%post libs
/sbin/ldconfig
%postun libs
/sbin/ldconfig
%post extras-libs
/sbin/ldconfig
%postun extras-libs
/sbin/ldconfig
%post extras
/sbin/ldconfig
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun extras
/sbin/ldconfig
for f in crystalsvg hicolor ; do
touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%clean
%__rm -rf %{buildroot}
%files extras
%defattr(-,root,root,-)
# kaboodle
%doc rpmdocs/kaboodle/
%doc %lang(en) %{_docdir}/HTML/en/kaboodle/
%{_bindir}/kaboodle
%{tde_libdir}/libkaboodlepart.*
%{_datadir}/applications/kde/kaboodle.desktop
%{_datadir}/apps/kaboodle/
%{_datadir}/icons/hicolor/*/apps/kaboodle.png
%{_datadir}/services/kaboodle*
# noatun
%doc %lang(en) %{_docdir}/HTML/en/noatun/
%{_bindir}/noatun
%{_libdir}/kconf_update_bin/noatun20update
%{tde_libdir}/noatun*
%{_libdir}/libartseffects.*
%{_libdir}/libwinskinvis.*
%{_libdir}/libkdeinit_noatun.*
%{_datadir}/applications/kde/noatun.desktop
%{_datadir}/apps/kconf_update/noatun.upd
%{_datadir}/apps/noatun/
%{_datadir}/icons/hicolor/*/apps/noatun.png
%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
# juk
%doc %lang(en) %{_docdir}/HTML/en/juk/
%{_bindir}/juk
%{_datadir}/applications/kde/juk.desktop
%{_datadir}/apps/juk/
%{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
%{_datadir}/icons/crystalsvg/*/*/juk*
%{_datadir}/icons/hicolor/*/apps/juk.png
%files extras-libs
%defattr(-,root,root,-)
%{_libdir}/libnoatun*.la
%{_libdir}/libnoatun*.so.*
%{_libdir}/libnoatunarts.so
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING
# kaboodle
%exclude %{tde_docdir}/HTML/en/kaboodle/
%exclude %{_bindir}/kaboodle
%exclude %{tde_libdir}/libkaboodlepart.*
%exclude %{_datadir}/applications/kde/kaboodle.desktop
%exclude %{_datadir}/apps/kaboodle/
%exclude %{_datadir}/icons/hicolor/*/apps/kaboodle.png
%exclude %{_datadir}/services/kaboodle*
# noatun
%exclude %{tde_docdir}/HTML/en/noatun/
%exclude %{_bindir}/noatun
%exclude %{_libdir}/kconf_update_bin/noatun20update
%exclude %{tde_libdir}/noatun*
%exclude %{_libdir}/libartseffects.*
%exclude %{_libdir}/libkdeinit_noatun.*
%exclude %{_libdir}/libnoatunarts.*
%exclude %{_libdir}/libnoatuncontrols.*
%exclude %{_libdir}/libnoatun.*
%exclude %{_libdir}/libnoatuntags.*
%exclude %{_libdir}/libwinskinvis.*
%exclude %{_datadir}/applications/kde/noatun.desktop
%exclude %{_datadir}/apps/kconf_update/noatun.upd
%exclude %{_datadir}/apps/noatun/
%exclude %{_datadir}/icons/hicolor/*/apps/noatun.png
%exclude %{_datadir}/mimelnk/interface/x-winamp-skin.desktop
# juk
%exclude %{tde_docdir}/HTML/en/juk/
%exclude %{_bindir}/juk
%exclude %{_datadir}/applications/kde/juk.desktop
%exclude %{_datadir}/apps/juk/
%exclude %{_datadir}/apps/konqueror/servicemenus/jukservicemenu.desktop
%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/*
%{_libdir}/libkdeinit_*.so
#%{_libdir}/liboggarts.so
%{tde_libdir}/*
%{_libdir}/kconf_update_bin/*
%{_bindir}/*
%{_datadir}/applications/kde/*
%{_datadir}/apps/*
%{_datadir}/autostart/*
%{_datadir}/config.kcfg/*
%{_datadir}/desktop-directories/*
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/*
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%files libs
%defattr(-,root,root,-)
%exclude %{_libdir}/libnoatun*.*
%{_libdir}/lib*.so.*
%{_libdir}/lib*.la
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/*
%{_libdir}/lib*.so
%exclude %{_libdir}/libkdeinit_*.so
%exclude %{_libdir}/libartseffects.so
%exclude %{_libdir}/libnoatunarts.*
#exclude %{_libdir}/liboggarts.so
%exclude %{_libdir}/libwinskinvis.so
%changelog
* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2
- Add support for RHEL5
* Sat Sep 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1
- Initial release for RHEL 6
- Spec file based on Fedora 8 "kdemultimedia-6:3.5.10-2"

31
redhat/tdemultimedia/kdemultimedia-3.5.13-fix_autostart_again.patch
Unescape View File

@ -1,31 +0,0 @@
commit 7eb7626c8a6d819c040cd9aba0b0bca3b484fde7
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1337622268 -0500
Reverse patch from GIT hash 2cc2e3a2.
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 237c95d..a8a419f 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -26,7 +26,6 @@ link_directories(
##### other data ################################
install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index d2da702..5051363 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
rcdir = $(kde_datadir)/kmix
rc_DATA = kmixui.rc
-autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
+autostart_DATA = restore_kmix_volumes.desktop
autostartdir = $(datadir)/autostart
lnkdir = $(kde_datadir)/kicker/applets

34
redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
Unescape View File

@ -1,34 +0,0 @@
commit 7da06e558a75c035ea881347e9da69ef9ee57927
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1343199702 -0500
Fix kmix autostart
This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index d1df895..10e7b6a 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -28,6 +28,8 @@
KMixApp::KMixApp()
: KUniqueApplication(), m_kmix( 0 )
{
+ // We handle autostart via standard autostart-enabled .desktop file instead of the session manager
+ disableSessionManagement();
}
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 5051363..d2da702 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
rcdir = $(kde_datadir)/kmix
rc_DATA = kmixui.rc
-autostart_DATA = restore_kmix_volumes.desktop
+autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
autostartdir = $(datadir)/autostart
lnkdir = $(kde_datadir)/kicker/applets

19
redhat/tdemultimedia/kdemultimedia-3.5.13-fix_linear_alphabet.patch
Unescape View File

@ -1,19 +0,0 @@
commit fd6afacf70587de329d9b2647b96469bae5e74da
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1327530995 -0600
Fix linear alphabet string errors
diff --git a/mpg123_artsplugin/mpg123/httpget.c b/mpg123_artsplugin/mpg123/httpget.c
index 12c6941..7175011 100644
--- a/mpg123_artsplugin/mpg123/httpget.c
+++ b/mpg123_artsplugin/mpg123/httpget.c
@@ -83,7 +83,7 @@ void readstring (char *string, int maxlen, FILE *f)
void encode64 (char *source,char *destination)
{
static char *Base64Digits =
- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
int n = 0;
int ssiz=strlen(source);
int i;

12
redhat/tdemultimedia/kdemultimedia-3.5.13-fix_mmx_detection.patch
Unescape View File

@ -1,12 +0,0 @@
diff -urN tdemultimedia/configure.in.in tdemultimedia.new/configure.in.in
--- tdemultimedia/configure.in.in 2010-08-11 22:36:30.000000000 -0500
+++ tdemultimedia.new/configure.in.in 2012-01-12 22:54:04.000000000 -0600
@@ -35,7 +35,7 @@
then
MMX_SUPPORT="no"
else
- as_ver=`echo $as_ver |sed -e "s/.*version //;s/ .*//"`
+ as_ver=`echo|as -v 2>&1 | grep ".*version.*" | awk '{print $NF}'`
as_major=`echo $as_ver |cut -d. -f1`
if test $as_major -gt 2
then

133
redhat/tdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
Unescape View File

@ -1,133 +0,0 @@
--- kdemultimedia/arts/runtime/Makefile.am.ORI 2012-07-31 13:56:06.508165053 +0200
+++ kdemultimedia/arts/runtime/Makefile.am 2012-07-31 13:57:03.018059604 +0200
@@ -11,7 +11,7 @@
structurebuilder_impl.cc structures_impl.cc moduleinfo.cc \
compatibility.cc localfactory_impl.cc artsbuilderloader_impl.cc
-libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL)
+libartsbuilder_la_LIBADD = -lmcop -lartsflow $(LIBDL) -lartsflow_idl
libartsbuilder_la_COMPILE_FIRST = artsbuilder.h
libartsbuilder_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) \
-no-undefined
--- kdemultimedia/arts/gui/kde/Makefile.am.ORI 2012-07-31 14:06:50.128691312 +0200
+++ kdemultimedia/arts/gui/kde/Makefile.am 2012-07-31 14:07:00.431493289 +0200
@@ -15,7 +15,7 @@
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp
-libartsgui_kde_la_LIBADD = $(LIB_KIO) -lkdecore -lkdeui \
+libartsgui_kde_la_LIBADD = $(LIB_KIO) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_QT) -lkdefx \
$(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h
--- kdemultimedia/arts/modules/synth/Makefile.am.ORI 2012-07-31 12:30:46.465821368 +0000
+++ kdemultimedia/arts/modules/synth/Makefile.am 2012-07-31 12:32:09.287170210 +0000
@@ -31,7 +31,7 @@
libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/runtime/libartsbuilder.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
- -lartsflow -lartsgsl -lartsflow_idl -lmcop
+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
--- kdemultimedia/arts/modules/common/Makefile.am.ORI 2012-07-31 12:36:08.682126035 +0000
+++ kdemultimedia/arts/modules/common/Makefile.am 2012-07-31 12:36:17.362939295 +0000
@@ -25,7 +25,7 @@
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
--- kdemultimedia/juk/Makefile.am.ORI 2012-07-31 14:39:39.222531330 +0200
+++ kdemultimedia/juk/Makefile.am 2012-07-31 14:40:03.805986466 +0200
@@ -85,7 +85,7 @@
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
-juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
+juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
--- kdemultimedia/kmid/Makefile.am.ORI 2012-07-31 14:42:26.666868929 +0200
+++ kdemultimedia/kmid/Makefile.am 2012-07-31 14:43:01.345123193 +0200
@@ -4,7 +4,7 @@
lib_LTLIBRARIES = libkmidlib.la
libkmidlib_la_LDFLAGS = $(all_libraries)
-libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid
+libkmidlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KIO) -lkmid $(LIB_QT) $(LIB_KDEUI) -lDCOP $(LIB_KDECORE)
libkmidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libkmidpart_la_LIBADD = libkmidlib.la
--- kdemultimedia/kmix/Makefile.am.ORI 2012-07-31 14:45:49.958546243 +0200
+++ kdemultimedia/kmix/Makefile.am 2012-07-31 14:47:51.780002978 +0200
@@ -25,13 +25,13 @@
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp
-kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmix_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_KDECORE) -lDCOP
kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version
kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \
mixertoolbox.cpp mixer_backend.cpp
-kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND)
+kmixctrl_la_LIBADD = $(LIB_KDECORE) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) -lDCOP
kmixctrl_la_LDFLAGS = $(all_libraries) -module -avoid-version
kmix_panelapplet_la_SOURCES = kmixapplet.cpp \
--- kdemultimedia/libkcddb/Makefile.am.ORI 2012-07-31 14:54:00.740438712 +0200
+++ kdemultimedia/libkcddb/Makefile.am 2012-07-31 14:54:14.899151410 +0200
@@ -14,7 +14,7 @@
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0
-libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO)
+libkcddb_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_QT) $(LIB_KDEUI)
METASOURCES = AUTO
--- kdemultimedia/noatun/library/noatunarts/Makefile.am.ORI 2012-07-31 15:07:07.507909928 +0200
+++ kdemultimedia/noatun/library/noatunarts/Makefile.am 2012-07-31 15:07:17.378685278 +0200
@@ -7,7 +7,7 @@
StereoVolumeControl_impl.cpp Session_impl.cpp
libnoatunarts_la_COMPILE_FIRST = noatunarts.h
libnoatunarts_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libnoatunarts_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lmcop -lartsflow_idl
libnoatunarts_la_METASOURCES = AUTO
noatunarts.mcoptype: noatunarts.h
--- kdemultimedia/noatun/library/Makefile.am.ftbfs 2011-10-28 21:13:18.000000000 +0200
+++ kdemultimedia/noatun/library/Makefile.am 2012-07-31 15:20:52.961371759 +0200
@@ -30,11 +30,11 @@
libnoatun_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(top_builddir)/arts/modules/libartsmodules.la \
-lkio -lqtmcop -lkmedia2_idl $(top_builddir)/noatun/library/noatunarts/libnoatunarts.la \
- -lartsflow -lsoundserver_idl -lartskde $(LIBDL)
+ -lartsflow -lsoundserver_idl -lartskde $(LIBDL) $(LIB_QT) -lDCOP
libnoatuncontrols_la_SOURCES = controls.cpp scrollinglabel.cpp
libnoatuncontrols_la_LDFLAGS = -version-info 3:0:2 $(KDE_RPATH) $(all_libraries) -no-undefined
-libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI)
+libnoatuncontrols_la_LIBADD = $(LIBDL) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
METASOURCES = AUTO
META_INCLUDES = $(srcdir)/noatun
--- kdemultimedia/noatun/modules/winskin/vis/Makefile.am.ORI 2012-07-31 15:26:20.619544165 +0200
+++ kdemultimedia/noatun/modules/winskin/vis/Makefile.am 2012-07-31 15:26:33.802272534 +0200
@@ -17,7 +17,7 @@
libwinskinvis_la_LDFLAGS= $(all_libraries) -avoid-version \
-no-undefined
-libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow
+libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop
libwinskinvis_la_COMPILE_FIRST = winskinvis.cc
libwinskinvis_la_METASOURCES = AUTO

49
redhat/tdemultimedia/kdemultimedia-3.5.13-remove_more_applications.patch
Unescape View File

@ -1,49 +0,0 @@
commit 31e44a7b933cb32eaf1c9e3d8bbbaae806963956
Author: Darrell Anderson <humanreadable@yahoo.com>
Date: 1331690438 -0500
Remove "More Applications" from TDE menu.
This partially resolves bug report 653.
diff --git a/arts/builder/artsbuilder.desktop b/arts/builder/artsbuilder.desktop
index 52a1b53..22e78e3 100644
--- a/arts/builder/artsbuilder.desktop
+++ b/arts/builder/artsbuilder.desktop
@@ -119,5 +119,5 @@ MimeType=application/x-artsbuilder;
DocPath=artsbuilder/index.html
X-DCOP-ServiceType=Multi
OnlyShowIn=KDE;
-Categories=Qt;KDE;AudioVideo;X-KDE-More;
+Categories=Qt;KDE;AudioVideo;
NoDisplay=true
diff --git a/arts/tools/artscontrol.desktop b/arts/tools/artscontrol.desktop
index d4bc38f..39a2640 100644
--- a/arts/tools/artscontrol.desktop
+++ b/arts/tools/artscontrol.desktop
@@ -133,5 +133,5 @@ Terminal=false
X-DCOP-ServiceType=Multi
DocPath=artsbuilder/index.html
OnlyShowIn=KDE;
-Categories=Qt;KDE;AudioVideo;X-KDE-More;
+Categories=Qt;KDE;AudioVideo;
NoDisplay=true
diff --git a/kaboodle/kaboodle.desktop b/kaboodle/kaboodle.desktop
index 2bddd99..f8f96e9 100644
--- a/kaboodle/kaboodle.desktop
+++ b/kaboodle/kaboodle.desktop
@@ -80,4 +80,4 @@ GenericName[zu]=Umdlali Womculo
Terminal=false
InitialPreference=6
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;AudioVideo;X-KDE-More;
+Categories=Qt;KDE;AudioVideo;
diff --git a/kmid/kmid.desktop b/kmid/kmid.desktop
index 3920b85..f99bdda 100644
--- a/kmid/kmid.desktop
+++ b/kmid/kmid.desktop
@@ -85,4 +85,4 @@ ServiceTypes=Browser/View
X-KDE-Library=libkmidpart
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;AudioVideo;X-KDE-More;
+Categories=Qt;KDE;AudioVideo;

1185
redhat/tdemultimedia/kdemultimedia-3.5.13.1.spec
View File

File diff suppressed because it is too large Load Diff

11
redhat/tdemultimedia/kdemultimedia-3.5.13.2-fix_gstreamer_1.0.patch
Unescape View File

@ -1,11 +0,0 @@
--- trinity-tdemultimedia-3.5.13.2/juk/configure.in.in.ORI 2013-02-13 21:30:12.230539642 +0100
+++ trinity-tdemultimedia-3.5.13.2/juk/configure.in.in 2013-02-13 22:00:07.584173123 +0100
@@ -50,7 +50,7 @@
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- GST_MAJORMINOR=0.10
+ GST_MAJORMINOR=1.0
GST_REQ=0.10.0
GST_VERSION=10

1204
redhat/tdemultimedia/kdemultimedia-3.5.13.spec
View File

File diff suppressed because it is too large Load Diff

11
redhat/tdemultimedia/kdemultimedia-3.5.7-pthread.patch
Unescape View File

@ -1,11 +0,0 @@
--- kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am.pthread 2006-07-22 03:10:54.000000000 -0500
+++ kdemultimedia-3.5.7-patched/xine_artsplugin/Makefile.am 2007-06-28 06:50:53.000000000 -0500
@@ -8,7 +8,7 @@
xinePlayObject_impl.cpp \
audio_fifo_out.c
libarts_xine_la_LDFLAGS = $(all_libraries) -module -no-undefined -pthread
-libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIB_X11) $(LIB_XEXT) \
+libarts_xine_la_LIBADD = $(XINE_LIBS) $(LIBPTHREAD) $(LIB_X11) $(LIB_XEXT) \
-lkmedia2_idl -lsoundserver_idl -lartsflow
libarts_xine_la_METASOURCES = AUTO

5
redhat/tdemultimedia/tdemultimedia-14.0.0.spec
Unescape View File

@ -1,5 +1,5 @@
# #
# spec file for package tdemultimedia # spec file for package tdemultimedia (version R14.0.0)
# #
# Copyright (c) 2014 Trinity Desktop Environment # Copyright (c) 2014 Trinity Desktop Environment
# #
@ -1228,9 +1228,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# don't make these world-writeable
chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
# Updates applications categories for openSUSE # Updates applications categories for openSUSE
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file krec AudioVideo Recorder %suse_update_desktop_file krec AudioVideo Recorder

26
redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_pulseaudio_mixer.patch
Unescape View File

@ -1,26 +0,0 @@
--- trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp.ORI 2013-05-21 23:07:46.511834317 +0200
+++ trinity-tdemultimedia-3.5.13.2~pre21+6e6307c6/kmix/kmixdockwidget.cpp 2013-05-21 23:07:04.202716141 +0200
@@ -109,6 +109,7 @@
_oldToolTipValue = -1;
_oldPixmapType = '-';
+/*
if (m_mixer == 0) {
// In case that there is no mixer installed, there will be no newVolumeLevels() signal's
// Thus we prepare the dock areas manually
@@ -116,6 +117,7 @@
updatePixmap(false);
return;
}
+*/
// create devices
_dockAreaPopup = new ViewDockAreaPopup(0, "dockArea", m_mixer, 0, this);
@@ -376,7 +378,6 @@
if ( md != 0 ) {
md->setMuted( !md->isMuted() );
m_mixer->commitVolumeChange( md );
- updatePixmap(false);
}
}
}

250
redhat/tdemultimedia/tdemultimedia-3.5.13.2-fix_xdg_menu.patch
Unescape View File

@ -1,250 +0,0 @@
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.directory 2013-07-28 16:37:31.827222470 +0200
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Music
-Name[br]=Sonerezh
-Name[bs]=Muzika
-Name[ca]=Música
-Name[da]=Musik
-Name[el]=Μουσική
-Name[eo]=Muziko
-Name[es]=Musica
-Name[et]=Muusika
-Name[eu]=Musika
-Name[fa]=موسیقی
-Name[fi]=Musiikki
-Name[fr]=Musique
-Name[ga]=Ceol
-Name[gl]=Música
-Name[he]=מוזיקה
-Name[hu]=Zene
-Name[is]=Tónlist
-Name[it]=Musica
-Name[ja]=音楽
-Name[km]=តន្ត្រី
-Name[lt]=Muzika
-Name[nb]=Musikk
-Name[ne]=सङ्गित
-Name[nl]=Muziek
-Name[nn]=Musikk
-Name[pa]=ਸੰਗੀਤ
-Name[pl]=Muzyka
-Name[pt]=Música
-Name[pt_BR]=Música
-Name[sk]=Hudba
-Name[sl]=Glasba
-Name[sr]=Музика
-Name[sr@Latn]=Muzika
-Name[sv]=Musik
-Name[tr]=Müzik
-Name[uk]=Музика
-Name[zh_CN]=音乐
-Name[zh_HK]=音樂
-GenericName=Professional Audio
-GenericName[bg]=Професионално аудио
-GenericName[bs]=Profesionalni audio
-GenericName[ca]=Àudio professional
-GenericName[cs]=Profesionální zvuk
-GenericName[da]=Professionel lyd
-GenericName[el]=Επαγγελματικός ήχος
-GenericName[es]=Audio profesional
-GenericName[et]=Professionaalne audio
-GenericName[eu]=Audio profesionala
-GenericName[fa]=صوتی حرفه‌ای
-GenericName[fi]=Ammattilaisääni
-GenericName[fr]=Audio professionnel
-GenericName[ga]=Fuaim Phroifisiúnta
-GenericName[gl]=Son Profesional
-GenericName[he]=שמע מקצועי
-GenericName[hu]=Professzinonális minőségű hanganyag
-GenericName[is]=Atvinnumannahljóð
-GenericName[it]=Audio professionale
-GenericName[ja]=プロフェッショナルオーディオ
-GenericName[kk]=Кәсіпқой Аудио
-GenericName[km]=អូឌីយ៉ូ​ឯកទេស
-GenericName[ko]=전문가 오디오
-GenericName[lt]=Profesionalus audio
-GenericName[mk]=Професионално аудио
-GenericName[nb]=Profesjonell lyd
-GenericName[nds]=Profeschonell Klang
-GenericName[ne]=पेशागत अडियो
-GenericName[nl]=Professionele audio
-GenericName[nn]=Profesjonell lydhandsaming
-GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
-GenericName[pl]=Profesjonalne audio
-GenericName[pt]=Áudio Profissional
-GenericName[pt_BR]=Áudio Profissional
-GenericName[ru]=Профессиональное аудио
-GenericName[sk]=Profesionálne audio
-GenericName[sl]=Profesionalni zvok
-GenericName[sr]=Професионални звук
-GenericName[sr@Latn]=Profesionalni zvuk
-GenericName[sv]=Professionellt ljud
-GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
-GenericName[tr]=Profesyonel Ses
-GenericName[uk]=Професійне аудіо
-GenericName[zh_CN]=专业音频
-GenericName[zh_HK]=專業音效
-GenericName[zh_TW]=專業音效
-Icon=package
-
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/kde-multimedia-music.menu 2013-07-28 16:37:31.827222470 +0200
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/kde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-<Name>Applications</Name>
-<Menu>
- <Name>Multimedia</Name>
- <Exclude>
- <Category>Music</Category>
- </Exclude>
- <Menu>
- <Name>Jack and More</Name>
- <Directory>kde-multimedia-music.directory</Directory>
- <Include>
- <And>
- <Category>Music</Category>
- </And>
- </Include>
- </Menu>
-</Menu>
-</Menu>
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/Makefile.am 2013-07-28 16:37:31.827222470 +0200
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/Makefile.am 2013-07-28 16:38:07.202464444 +0200
@@ -22,8 +22,8 @@
EXTRA_DIST = $(kappfinder_multimedia_data_DATA)
-xdg_directory_DATA = kde-multimedia-music.directory
+xdg_directory_DATA = tde-multimedia-music.directory
-xdg_mergedmenu_DATA = kde-multimedia-music.menu
+xdg_mergedmenu_DATA = tde-multimedia-music.menu
xdg_mergedmenudir = $(xdg_menudir)/applications-merged
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.directory 1970-01-01 01:00:00.000000000 +0100
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.directory 2013-06-07 19:26:15.000000000 +0200
@@ -0,0 +1,89 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Music
+Name[br]=Sonerezh
+Name[bs]=Muzika
+Name[ca]=Música
+Name[da]=Musik
+Name[el]=Μουσική
+Name[eo]=Muziko
+Name[es]=Musica
+Name[et]=Muusika
+Name[eu]=Musika
+Name[fa]=موسیقی
+Name[fi]=Musiikki
+Name[fr]=Musique
+Name[ga]=Ceol
+Name[gl]=Música
+Name[he]=מוזיקה
+Name[hu]=Zene
+Name[is]=Tónlist
+Name[it]=Musica
+Name[ja]=音楽
+Name[km]=តន្ត្រី
+Name[lt]=Muzika
+Name[nb]=Musikk
+Name[ne]=सङ्गित
+Name[nl]=Muziek
+Name[nn]=Musikk
+Name[pa]=ਸੰਗੀਤ
+Name[pl]=Muzyka
+Name[pt]=Música
+Name[pt_BR]=Música
+Name[sk]=Hudba
+Name[sl]=Glasba
+Name[sr]=Музика
+Name[sr@Latn]=Muzika
+Name[sv]=Musik
+Name[tr]=Müzik
+Name[uk]=Музика
+Name[zh_CN]=音乐
+Name[zh_HK]=音樂
+GenericName=Professional Audio
+GenericName[bg]=Професионално аудио
+GenericName[bs]=Profesionalni audio
+GenericName[ca]=Àudio professional
+GenericName[cs]=Profesionální zvuk
+GenericName[da]=Professionel lyd
+GenericName[el]=Επαγγελματικός ήχος
+GenericName[es]=Audio profesional
+GenericName[et]=Professionaalne audio
+GenericName[eu]=Audio profesionala
+GenericName[fa]=صوتی حرفه‌ای
+GenericName[fi]=Ammattilaisääni
+GenericName[fr]=Audio professionnel
+GenericName[ga]=Fuaim Phroifisiúnta
+GenericName[gl]=Son Profesional
+GenericName[he]=שמע מקצועי
+GenericName[hu]=Professzinonális minőségű hanganyag
+GenericName[is]=Atvinnumannahljóð
+GenericName[it]=Audio professionale
+GenericName[ja]=プロフェッショナルオーディオ
+GenericName[kk]=Кәсіпқой Аудио
+GenericName[km]=អូឌីយ៉ូ​ឯកទេស
+GenericName[ko]=전문가 오디오
+GenericName[lt]=Profesionalus audio
+GenericName[mk]=Професионално аудио
+GenericName[nb]=Profesjonell lyd
+GenericName[nds]=Profeschonell Klang
+GenericName[ne]=पेशागत अडियो
+GenericName[nl]=Professionele audio
+GenericName[nn]=Profesjonell lydhandsaming
+GenericName[pa]=ਵਪਾਰਕ ਆਡੀਓ
+GenericName[pl]=Profesjonalne audio
+GenericName[pt]=Áudio Profissional
+GenericName[pt_BR]=Áudio Profissional
+GenericName[ru]=Профессиональное аудио
+GenericName[sk]=Profesionálne audio
+GenericName[sl]=Profesionalni zvok
+GenericName[sr]=Професионални звук
+GenericName[sr@Latn]=Profesionalni zvuk
+GenericName[sv]=Professionellt ljud
+GenericName[th]=โปรแกรมจัดการเสียงสำหรับมืออาชีพ
+GenericName[tr]=Profesyonel Ses
+GenericName[uk]=Професійне аудіо
+GenericName[zh_CN]=专业音频
+GenericName[zh_HK]=專業音效
+GenericName[zh_TW]=專業音效
+Icon=package
+
diff -Nuar trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu
--- trinity-tdemultimedia-3.5.13.2/kappfinder-data.ORI/tde-multimedia-music.menu 1970-01-01 01:00:00.000000000 +0100
+++ trinity-tdemultimedia-3.5.13.2/kappfinder-data/tde-multimedia-music.menu 2013-07-28 16:38:14.396310283 +0200
@@ -0,0 +1,21 @@
+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+<Name>Applications</Name>
+<Menu>
+ <Name>Multimedia</Name>
+ <Exclude>
+ <Category>Music</Category>
+ </Exclude>
+ <Menu>
+ <Name>Jack and More</Name>
+ <Directory>tde-multimedia-music.directory</Directory>
+ <Include>
+ <And>
+ <Category>Music</Category>
+ </And>
+ </Include>
+ </Menu>
+</Menu>
+</Menu>

43
redhat/tdemultimedia/tdemultimedia-3.5.13.2-ftbfs.patch
Unescape View File

@ -1,43 +0,0 @@
--- trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am.ORI 2013-05-09 10:51:39.994294437 +0200
+++ trinity-tdemultimedia-3.5.13.2~pre17+a4c1404c/arts/modules/common/Makefile.am 2013-05-09 10:52:23.837409361 +0200
@@ -25,7 +25,7 @@
$(top_builddir)/arts/gui/common/libartsgui_idl.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) $(VORBISFILE_LIBS) -lgthread-2.0
+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) $(LIB_QT) -lgthread-2.0 $(ARTS_LIBS)
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
--- trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am.ORI 2013-08-04 19:15:24.030530158 +0200
+++ trinity-tdemultimedia-14.0.0~pre178+601a5c5f/arts/modules/synth/Makefile.am 2013-08-04 19:15:32.878625492 +0200
@@ -31,7 +31,7 @@
libartsmodulessynth_la_LIBADD = \
$(top_builddir)/arts/runtime/libartsbuilder.la \
$(top_builddir)/arts/midi/libartsmidi_idl.la \
- -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0
+ -lartsflow -lartsgsl -lartsflow_idl -lmcop -lglib-2.0 $(ARTS_LIBS)
#libartsmodulessynth_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la $(top_builddir)/arts/midi/libartsmidi_idl.la -lartsflow -lartsflow_idl -lmcop $(LIBDL) $(LIB_KDEUI) $(LIB_KDECORE)
libartsmodulessynth_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -lartsflow -lartsgsl -no-undefined
--- trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in.ORI 2013-09-08 17:50:11.453897325 +0200
+++ trinity-tdemultimedia-14.0.0~pre183+1859432c/configure.in.in 2013-09-08 17:54:24.503460785 +0200
@@ -544,15 +544,18 @@
LIB_ARTS="-lartskde"
ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
+ ARTS_LIBS=[`$PKG_CONFIG --libs-only-l arts`]
AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
else
build_arts="no"
LIB_ARTS=""
ARTS_CFLAGS=""
+ ARTS_LIBS=""
AC_DEFINE(HAVE_ARTS, 0, [no arts support in juk])
fi
AC_SUBST(LIB_ARTS)
AC_SUBST(ARTS_CFLAGS)
+AC_SUBST(ARTS_LIBS)
KDE_CHECK_MPEGLIB_ARTS

1519
redhat/tdemultimedia/tdemultimedia-3.5.13.2-kmix_pulseaudio.patch
View File

File diff suppressed because it is too large Load Diff

99
redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
Unescape View File

@ -1,48 +1,63 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". #
%if "%{?tde_prefix}" != "/usr" # spec file for package tdemultimedia (version 3.5.13.2)
%define _variant .opt #
%endif # Copyright (c) 2014 Trinity Desktop Environment
#
# 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:/www.trinitydesktop.org/
#
# BUILD WARNING:
# Remove qt-devel and qt3-devel and any kde*-devel on your system !
# Having KDE libraries may cause FTBFS here !
# TDE variables
%define tde_version 3.5.13.2 %define tde_version 3.5.13.2
%define tde_prefix /opt/trinity
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin %define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share %define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc %define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include %define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib} %define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde %define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde %define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir} # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# former extras bits
%define _with_akode --with-akode
## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
#define _with_musicbrainz --with-musicbrainz
%define _with_taglib --with-taglib
Name: trinity-tdemultimedia Name: trinity-tdemultimedia
Summary: Multimedia applications for the Trinity Desktop Environment (TDE) Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
Version: %{tde_version} Version: %{tde_version}
Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: Applications/Multimedia Group: Applications/Multimedia
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/ URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
License: GPL-2.0+
%else
License: GPLv2+
%endif
#Vendor: Trinity Project
#Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{tde_prefix} Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch0: tdemultimedia-3.5.13.2-ftbfs.patch
Patch1: tdemultimedia-3.5.13.2-fix_xdg_menu.patch
Obsoletes: trinity-kdemultimedia < %{version}-%{release} Obsoletes: trinity-kdemultimedia < %{version}-%{release}
Provides: trinity-kdemultimedia = %{version}-%{release} Provides: trinity-kdemultimedia = %{version}-%{release}
@ -54,27 +69,33 @@ Obsoletes: trinity-kdemultimedia-extras-libs < %{version}-%{release}
Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release} Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
BuildRequires: autoconf automake libtool m4
BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
%if "%{?_with_akode}" != "" BuildRequires: autoconf automake libtool m4
# TAGLIB support
%define _with_taglib --with-taglib
BuildRequires: taglib-devel
# AKODE support
%define _with_akode --with-akode
BuildRequires: trinity-akode-devel BuildRequires: trinity-akode-devel
BuildRequires: trinity-akode-libmad BuildRequires: trinity-akode-libmad
%endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: zlib-devel BuildRequires: zlib-devel
# MUSICBRAINZ support
## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
#define _with_musicbrainz --with-musicbrainz
#BuildRequires: libmusicbrainz-devel libtunepimp-devel
# Audio libraries # Audio libraries
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: audiofile-devel BuildRequires: audiofile-devel
BuildRequires: libtheora-devel BuildRequires: libtheora-devel
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
%{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel libtunepimp-devel}
%{?_with_taglib:BuildRequires: taglib-devel}
BuildRequires: cdparanoia BuildRequires: cdparanoia
# CDDA support # CDDA support
@ -132,7 +153,7 @@ BuildRequires: libXt-devel
%endif %endif
# XINE support # XINE support
%if 0%{?fedora} || 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1 %define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} %if 0%{?pclinuxos}
@ -1141,7 +1162,7 @@ noatun plugins.
########## ##########
%if 0%{?suse_version} || 0%{?pclinuxos} %if 0%{?pclinuxos}
%debug_package %debug_package
%endif %endif
@ -1156,8 +1177,6 @@ noatun plugins.
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
%patch1 -p1 -b .xdgmenu
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@ -1215,8 +1234,20 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# don't make these world-writeable # Updates applications categories for openSUSE
chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/* %if 0%{?suse_version}
%suse_update_desktop_file krec AudioVideo Recorder
%suse_update_desktop_file tdemid AudioVideo Midi
%suse_update_desktop_file artsbuilder AudioVideo AudioVideoEditing
%suse_update_desktop_file artscontrol AudioVideo AudioVideoEditing
%suse_update_desktop_file kmix AudioVideo Mixer
%suse_update_desktop_file kaboodle AudioVideo Player
%suse_update_desktop_file kaudiocreator AudioVideo CD
%suse_update_desktop_file kscd AudioVideo Player CD
%suse_update_desktop_file noatun AudioVideo Player Video
%suse_update_desktop_file juk AudioVideo Player Jukebox
%suse_update_desktop_file audiocd
%endif
%clean %clean

Write Preview
Loading…
Cancel
Save