rpms/kdebase-runtime/F-10 kdebase-runtime-4.1.70-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 kdebase-runtime.spec, 1.79, 1.80 sources, 1.25, 1.26 kdebase-runtime-4.1.0-pulseaudio.patch, 1.1, NONE

Fri Jan 23 22:33:49 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-runtime/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12335

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Added Files:
	kdebase-runtime-4.1.70-pulseaudio.patch 
Removed Files:
	kdebase-runtime-4.1.0-pulseaudio.patch 
Log Message:
sync w/devel, kde-4.2 hotness


kdebase-runtime-4.1.70-pulseaudio.patch:

--- NEW FILE kdebase-runtime-4.1.70-pulseaudio.patch ---
diff -Naur kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp
--- kdebase-runtime-4.1.70/phonon/kcm/globalconfig.cpp	2008-07-17 23:32:48.000000000 +0200
+++ kdebase-runtime-4.1.70.pulseaudio/phonon/kcm/globalconfig.cpp	2008-10-21 18:49:35.000000000 +0200
@@ -28,6 +28,7 @@
 #include "phononnamespace_p.h"
 
 #include <QtCore/QList>
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
@@ -158,6 +159,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioOutputDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 
@@ -212,6 +222,15 @@
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                   );
         }
+        // make PulseAudio the global default (assume it is already default in this list)
+        if (!list.isEmpty()) {
+            int firstIndex = list.first();
+            if (backendIface->objectDescriptionProperties(Phonon::AudioCaptureDeviceType,
+                  firstIndex)["name"].toString() == "PulseAudio") {
+                list.removeFirst();
+                defaultList.prepend(firstIndex);
+            }
+        }
         defaultList += list;
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	8 Jan 2009 14:16:44 -0000	1.23
+++ .cvsignore	23 Jan 2009 22:33:19 -0000	1.24
@@ -1 +1,2 @@
-kdebase-runtime-4.1.4.tar.bz2
+kdebase-runtime-4.1.96.tar.bz2
+kdebase-runtime-4.2.0.tar.bz2


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/kdebase-runtime.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kdebase-runtime.spec	22 Jan 2009 04:53:52 -0000	1.79
+++ kdebase-runtime.spec	23 Jan 2009 22:33:19 -0000	1.80
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
 %if 0%{?fedora} < 9
 # # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
 %define kde3_desktop 1
@@ -8,29 +6,20 @@
 %define _with_samba --with-samba
 
 Name:          kdebase-runtime
-Summary:       K Desktop Environment - Runtime 
-Version:       4.1.4
-Release:       2%{?dist}
+Summary:       K Desktop Environment - Runtime
+Version:       4.2.0
+Release:       1%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
-# http://websvn.kde.org/trunk/playground/artwork/Oxygen/phonon/
-Source2:       audio-backend-arts.svgz
-Source3:       audio-backend-esd.svgz
-Source4:       audio-backend-jack.svgz
-Source5:       audio-backend-pulseaudio.svgz
-Source6:       audio-card-firewire.svgz
-Source7:       audio-card-usb.svgz
-Source8:       audio-headset-bluetooth.svgz
-Source9:       audio-headset-usb.svgz
-Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
+Patch0:        kdebase-runtime-4.1.70-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
 Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
-# Upstream patces
+# Upstream patches
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -58,24 +47,21 @@
 %endif
 
 BuildRequires: alsa-lib-devel
-BuildRequires: cmake
 BuildRequires: clucene-core-devel
-BuildRequires: giflib-devel
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdepimlibs-devel >= %{version}
 %{?_with_samba:BuildRequires: libsmbclient-devel}
+# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
+BuildRequires: libxcb-devel
 BuildRequires: libXScrnSaver-devel
 BuildRequires: OpenEXR-devel
 BuildRequires: openssl-devel
-BuildRequires: pcre-devel
 BuildRequires: pkgconfig
+BuildRequires: pulseaudio-libs-devel
 BuildRequires: qimageblitz-devel
-BuildRequires: soprano-devel >= 2.0.97
-BuildRequires: strigi-devel >= 0.5.7
+BuildRequires: soprano-devel
 BuildRequires: xine-lib-devel
-# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
-BuildRequires: libxcb-devel
 # needed?
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
@@ -111,15 +97,6 @@
 %description -n oxygen-icon-theme-scalable
 %{summary}.
 
-%package -n phonon-backend-xine
-Summary: Xine phonon backend
-Group:   Applications/Multimedia
-# not sure exactly how best to version this one -- Rex
-Provides: phonon-backend = 4.2 
-%description -n phonon-backend-xine 
-%{summary}.
-
-
 %prep
 %setup -q -n kdebase-runtime-%{version}
 
@@ -132,7 +109,7 @@
 
 %build
 
-mkdir -p %{_target_platform} 
+mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} ..
 popd
@@ -153,19 +130,8 @@
 %endif
 
 %if 0%{?icons}
-make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
-# install phone-xine icons
-for i in 16 22 32 48 64 128 ; do
-  install -m 0644 -D phonon/xine/ox$i-app-phonon-xine.png %{buildroot}%{_kde4_iconsdir}/oxygen/${i}x${i}/apps/phonon-xine.png
-done
-install -m 0644 -D phonon/xine/oxsc-app-phonon-xine.svgz %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/phonon-xine.svgz
-for j in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} ; do
-  n=`basename $j`
-  for i in 16 22 32 48 64 128; do
-    convert -background None -geometry ${i}x${i} ${j} %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/${n%.svgz}.png
-  done
-  install -m 0644 -D ${j} %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/${n}
-done
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -271,10 +237,7 @@
 # FIXME: -devel type files, omit for now
 rm -rf %{buildroot}%{_kde4_includedir}/phonon/
 rm -f  %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
-#   /usr/include/kde4/phonon/audiodevice.h
-#   /usr/include/kde4/phonon/audiodeviceenumerator.h
-#   /usr/include/kde4/phonon/kaudiodevicelist_export.h
-#   /usr/lib64/libkaudiodevicelist.so
+rm -f  %{buildroot}%{_kde4_libdir}/libkwalletbackend.so
 
 %endif
 
@@ -294,7 +257,6 @@
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
 %if 0%{?icons}
@@ -318,6 +280,7 @@
 %files
 %defattr(-,root,root,-)
 %{_kde4_bindir}/*
+# FIXME(?), currently contains cmake/modules -- Rex
 %{_kde4_appsdir}/*
 %{_kde4_configdir}/*.knsrc
 %{_kde4_datadir}/autostart/nepomukserver.desktop
@@ -331,14 +294,11 @@
 %{_kde4_libdir}/libkdeinit4_*.so
 %{_kde4_libdir}/kde4/kcm_*.so
 %{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/libkwalletbackend.so.*
 %{_kde4_libexecdir}/*
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
-%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
-%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
-%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
-
 %if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
@@ -356,20 +316,9 @@
 
 %files libs
 %defattr(-,root,root,-)
-%{_kde4_libdir}/libkaudiodevicelist.so.*
 %{_kde4_libdir}/kde4/*.so
 %{_kde4_libdir}/kde4/plugins/phonon_platform/
 %{_kde4_libdir}/kde4/plugins/styles/
-%exclude %{_kde4_libdir}/kde4/kcm_*.so
-%exclude %{_kde4_libdir}/kde4/kded_*.so
-%exclude %{_kde4_libdir}/kde4/phonon_xine.so
-
-%files -n phonon-backend-xine
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kcm_phononxine.so
-%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
-%{_kde4_libdir}/kde4/phonon_xine.so
-%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %endif
 
@@ -387,14 +336,53 @@
 
 
 %changelog
-* Wed Jan 21 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.4-2
+* Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
+- 4.2.0
+- +BR: pulseaudio-libs-devel xine-lib-devel
+- -BR: giflib-devel pcre-devel
+
+* Tue Jan 13 2009 Rex Dieter <rdieter at fedoraproject.org> 4.1.96-2
+- tarball respin
+- drop extraneous deps (that are in kdelibs)
+
+* Wed Jan 07 2009 Than Ngo <than at redhat.com> - 4.1.96-1
+- 4.2rc1
+
+* Mon Dec 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.85-2
 - include %%_bindir/kdesu symlink
 
-* Thu Jan  8 2009 LukÃ¡Å¡ Tinkl <ltinkl at redhat.com> 4.1.4-1
-- KDE 4.1.4
+* Thu Dec 11 2008 Than Ngo <than at redhat.com> 4.1.85-1
+- 4.2beta2
+
+* Mon Dec 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-5
+- don't ship libkwalletbackend.so devel symlink (conflicts with kdelibs3-devel,
+  and should be in a -devel package if it gets shipped)
+
+* Thu Nov 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-4
+- BR strigi-devel >= 0.5.11.1 because 0.5.11 is broken
+
+* Thu Nov 20 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.80-3
+- readd still relevant part of the Phonon PulseAudio patch (for the KCM)
+
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon
+
+* Fri Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- Drop upstreamed patch kdebase-runtime-4.1.2-kioexec.patch
+- BR cmake >= 2.6.2
+- Use 'make install/fast'
+- Drop subpkg phonon-backend-xine and related file entries: this has to be
+  part of phonon now that it moved there
+- Drop xine-lib-devel BR
+- Add libkwalletbackend to files list
+- Drop _default_patch_fuzz 2
+
+* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
 
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
-- KDE 4.1.3
+- 4.1.3
 
 * Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
 - apply upstream patch, kioexec processes never terminate
@@ -465,7 +453,7 @@
 - 4.0.82
 
 * Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.80-2
-- add searchproviders-shortcuts for redhat bugzilla 
+- add searchproviders-shortcuts for redhat bugzilla
 
 * Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
 - 4.1 beta 1
@@ -515,7 +503,7 @@
 - 4.0.3
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-5
-- don't own %%_kde4_docdir/HTML/en/ 
+- don't own %%_kde4_docdir/HTML/en/
 
 * Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
 - oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
@@ -551,7 +539,7 @@
 * Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
 - kde-3.97.0
 
-* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4 
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4
 - disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
 
 * Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-10/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	8 Jan 2009 14:16:44 -0000	1.25
+++ sources	23 Jan 2009 22:33:19 -0000	1.26
@@ -1,9 +1 @@
-f976564b84c96c43ef7bbb42576ef7bf  audio-backend-arts.svgz
-1c229ebbf0d2063927175159329ba7b8  audio-backend-esd.svgz
-0f9b16ddfbc760a82a2c51a2846c8894  audio-backend-pulseaudio.svgz
-556827fe755f3348f6b2227e29c687dc  audio-card-firewire.svgz
-1db9c22cb987582526b5b45423116f9b  audio-card-usb.svgz
-6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
-b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
-26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz
-fad82875745bacbb52001eabf9c71202  kdebase-runtime-4.1.4.tar.bz2
+9e56281e9daa579d56cfda794f1bbc10  kdebase-runtime-4.2.0.tar.bz2


--- kdebase-runtime-4.1.0-pulseaudio.patch DELETED ---


