Hello community, here is the log from the commit of package kdebase3 checked in at Sat Mar 10 23:58:03 CET 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-03-07 15:49:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-03-09 19:07:44.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Mar 9 17:23:58 CET 2007 - stbinner@suse.de + +- fix build (new icon location check) +- don't duplicate /opt/kde3/bin in PATH (#251358) +- solve #216489 problem in a more generic, path independent way + +------------------------------------------------------------------- New: ---- fix-desktop-icons.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.WYe462/_old 2007-03-10 23:57:38.000000000 +0100 +++ /var/tmp/diff_new_pack.WYe462/_new 2007-03-10 23:57:38.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.6 -Release: 14 +Release: 15 %define kde_version 3.5.6 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -190,6 +190,7 @@ Patch200: kdm-use-rpmoptflags.diff Patch202: no-media-backend-hack.diff Patch203: show-konqueror-in-menu.diff +Patch204: fix-desktop-icons.diff %description This package contains kdebase, one of the basic packages of the K @@ -376,7 +377,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 249 +Release: 250 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -548,6 +549,7 @@ %patch202 %endif %patch203 +%patch204 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -687,6 +689,28 @@ FILLUP_DIR=$RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $FILLUP_DIR install %SOURCE4 $FILLUP_DIR/sysconfig.windowmanager-kdebase3 +mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/ +for i in {16,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/mimetypes/misc.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmcomponentchooser.png;done +for i in {16,22,32,48,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/launch.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmperformance.png;done +cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/16x16/actions/services.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/16x16/apps/kcmkded.png +for i in {16,22,32,48}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/exit.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmsmserver.png;done +for i in {16,22,32}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/spellcheck.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmspellchecking.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmdesktopbehavior.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/filesystems/desktop.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmdesktop.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/apps/kmenu.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmtaskbar.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/mimetypes/colorscm.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmcolors.png;done +for i in {16,22,32,48,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/launch.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmlaunch.png;done +for i in {16,22,32}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/filter.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmkhtml_filter.png;done +for i in {16,22,32}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/run.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmcgi.png;done +for i in {16,22}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/history.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmhistory.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/filesystems/network.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmnetpref.png;done +for i in {16,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/blockdevice.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmkdnssd.png;done +for i in {16,22,32,48,64}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/joystick.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmjoystick.png;done +for i in {16,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/mouse.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmmouse.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/devices/system.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmmedia.png;done +for i in {16,22,32}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/actions/encrypted.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmcrypto.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/filesystems/trashcan_empty.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmprivacy.png;done +for i in {16,22,32,48,64,128}; do cp $BUILD_ROOT/opt/kde3/share/icons/crystalsvg/"$i"x"$i"/filesystems/network.png $RPM_BUILD_ROOT/opt/kde3/share/icons/hicolor/"$i"x"$i"/apps/kcmnic.png;done # # solve file conflicts with theme packages ... # @@ -1198,6 +1222,27 @@ /opt/kde3/share/icons/*/*/*/kcmx.* /opt/kde3/share/icons/*/*/*/kcmdf.* /opt/kde3/share/icons/*/*/*/kbinaryclock.* +/opt/kde3/share/icons/*/*/apps/kcmcgi.* +/opt/kde3/share/icons/*/*/apps/kcmcolors.* +/opt/kde3/share/icons/*/*/apps/kcmcomponentchooser.* +/opt/kde3/share/icons/*/*/apps/kcmcrypto.* +/opt/kde3/share/icons/*/*/apps/kcmdesktop.* +/opt/kde3/share/icons/*/*/apps/kcmdesktopbehavior.* +/opt/kde3/share/icons/*/*/apps/kcmhistory.* +/opt/kde3/share/icons/*/*/apps/kcmjoystick.* +/opt/kde3/share/icons/*/*/apps/kcmkded.* +/opt/kde3/share/icons/*/*/apps/kcmkdnssd.* +/opt/kde3/share/icons/*/*/apps/kcmkhtml_filter.* +/opt/kde3/share/icons/*/*/apps/kcmlaunch.* +/opt/kde3/share/icons/*/*/apps/kcmmedia.* +/opt/kde3/share/icons/*/*/apps/kcmmouse.* +/opt/kde3/share/icons/*/*/apps/kcmnetpref.* +/opt/kde3/share/icons/*/*/apps/kcmnic.* +/opt/kde3/share/icons/*/*/apps/kcmperformance.* +/opt/kde3/share/icons/*/*/apps/kcmprivacy.* +/opt/kde3/share/icons/*/*/apps/kcmsmserver.* +/opt/kde3/share/icons/*/*/apps/kcmspellchecking.* +/opt/kde3/share/icons/*/*/apps/kcmtaskbar.* /opt/kde3/share/icons/*/*/*/ieee1394.* /opt/kde3/share/icons/*/*/*/kdeprintfax.* /opt/kde3/share/icons/*/*/*/kdisknav.* @@ -1517,6 +1562,10 @@ %endif %changelog +* Fri Mar 09 2007 - stbinner@suse.de +- fix build (new icon location check) +- don't duplicate /opt/kde3/bin in PATH (#251358) +- solve #216489 problem in a more generic, path independent way * Wed Mar 07 2007 - dmueller@suse.de - adjust patsh for gnome help integration (#251117) * Mon Mar 05 2007 - stbinner@suse.de ++++++ fix-desktop-icons.diff ++++++ --- ./kcontrol/componentchooser/componentchooser.desktop 2007/03/09 15:10:09 1.1 +++ ./kcontrol/componentchooser/componentchooser.desktop 2007/03/09 15:10:20 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=kcmshell componentchooser -Icon=misc +Icon=kcmcomponentchooser Type=Application --- ./kcontrol/performance/kcmperformance.desktop 2007/03/09 15:10:41 1.1 +++ ./kcontrol/performance/kcmperformance.desktop 2007/03/09 15:10:50 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=launch +Icon=kcmperformance Type=Application Exec=kcmshell kcmperformance --- ./kcontrol/kded/kcmkded.desktop 2007/03/09 15:11:12 1.1 +++ ./kcontrol/kded/kcmkded.desktop 2007/03/09 15:11:22 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=kcmshell kcmkded -Icon=services +Icon=kcmkded Type=Application --- ./kcontrol/smserver/kcmsmserver.desktop 2007/03/09 15:11:41 1.1 +++ ./kcontrol/smserver/kcmsmserver.desktop 2007/03/09 15:11:54 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=exit +Icon=kcmsmserver Type=Application DocPath=kcontrol/kcmsmserver/index.html Exec=kcmshell kcmsmserver --- ./kcontrol/spellchecking/spellchecking.desktop 2007/03/09 15:12:12 1.1 +++ ./kcontrol/spellchecking/spellchecking.desktop 2007/03/09 15:12:27 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=kcmshell spellchecking -Icon=spellcheck +Icon=kcmspellchecking Type=Application DocPath=kcontrol/spellchecking/index.html --- ./kcontrol/konq/desktopbehavior.desktop 2007/03/09 15:12:49 1.1 +++ ./kcontrol/konq/desktopbehavior.desktop 2007/03/09 15:12:58 @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application DocPath=kcontrol/desktopbehavior/index.html -Icon=desktop +Icon=kcmdesktopbehavior Exec=kcmshell desktopbehavior --- ./kcontrol/konq/desktop.desktop 2007/03/09 15:13:12 1.1 +++ ./kcontrol/konq/desktop.desktop 2007/03/09 15:13:20 @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application DocPath=kcontrol/desktop/index.html#desktop-number -Icon=desktop +Icon=kcmdesktop Exec=kcmshell desktop --- ./kcontrol/taskbar/kcmtaskbar.desktop 2007/03/09 15:13:38 1.1 +++ ./kcontrol/taskbar/kcmtaskbar.desktop 2007/03/09 15:13:47 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=kmenu +Icon=kcmtaskbar Type=Application DocPath=kcontrol/kcmtaskbar/index.html Exec=kcmshell kcmtaskbar --- ./kcontrol/colors/colors.desktop 2007/03/09 15:14:05 1.1 +++ ./kcontrol/colors/colors.desktop 2007/03/09 15:14:15 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=kcmshell colors -Icon=colorscm +Icon=kcmcolors Type=Application DocPath=kcontrol/colors/index.html --- ./kcontrol/launch/kcmlaunch.desktop 2007/03/09 15:14:37 1.1 +++ ./kcontrol/launch/kcmlaunch.desktop 2007/03/09 15:14:45 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=launch +Icon=kcmlaunch Type=Application DocPath=kcontrol/kcmlaunch/index.html Exec=kcmshell kcmlaunch --- ./kcontrol/konqhtml/khtml_filter.desktop 2007/03/09 15:15:12 1.1 +++ ./kcontrol/konqhtml/khtml_filter.desktop 2007/03/09 15:15:24 @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application DocPath=kcontrol/khtml/index.html#khtml-adblock -Icon=filter +Icon=kcmkhtml_filter Exec=kcmshell khtml_filter X-KDE-Library=konqhtml --- ./kioslave/cgi/kcmcgi/kcmcgi.desktop 2007/03/09 15:15:42 1.1 +++ ./kioslave/cgi/kcmcgi/kcmcgi.desktop 2007/03/09 15:15:50 @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=run +Icon=kcmcgi Type=Application Exec=kcmshell kcmcgi DocPath= --- ./konqueror/sidebar/trees/history_module/kcmhistory.desktop 2007/03/09 15:16:05 1.1 +++ ./konqueror/sidebar/trees/history_module/kcmhistory.desktop 2007/03/09 15:16:12 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=history +Icon=kcmhistory Type=Application Exec=kcmshell kcmhistory --- ./kcontrol/kio/netpref.desktop 2007/03/09 15:16:28 1.1 +++ ./kcontrol/kio/netpref.desktop 2007/03/09 15:16:37 @@ -70,7 +70,7 @@ Comment[zh_TW]=設定一般網路喜好設定,例如逾時值 Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma Exec=kcmshell netpref -Icon=network +Icon=kcmnetpref Keywords=timeout,iopref,netpref,network preferences,ftp Keywords[bg]=просрочка, време, времето, пауза, прекъсване, връзка, timeout, iopref, netpref, network preferences, ftp Keywords[bs]=timeout,iopref,netpref,network preferences,ftp,mreža --- ./kcontrol/dnssd/kcm_kdnssd.desktop 2007/03/09 15:16:55 1.1 +++ ./kcontrol/dnssd/kcm_kdnssd.desktop 2007/03/09 15:17:07 @@ -61,7 +61,7 @@ Encoding=UTF-8 Exec=kcmshell kcm_kdnssd GenericName= -Icon=blockdevice +Icon=kcmkdnssd MimeType= Name=Service Discovery Name[af]=Dienste ontdekker --- ./kcontrol/joystick/joystick.desktop 2007/03/09 15:17:26 1.1 +++ ./kcontrol/joystick/joystick.desktop 2007/03/09 15:17:36 @@ -153,5 +153,5 @@ X-KDE-FactoryName=kcm_joystick X-KDE-Library=joystick X-KDE-Test-Module=true -Icon=joystick +Icon=kcmjoystick Categories=Qt;KDE;X-KDE-settings-hardware; --- ./kcontrol/input/mouse.desktop 2007/03/09 15:17:56 1.1 +++ ./kcontrol/input/mouse.desktop 2007/03/09 15:18:02 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Exec=kcmshell mouse -Icon=mouse +Icon=kcmmouse Type=Application DocPath=kcontrol/mouse/index.html --- ./kioslave/media/kcmodule/media.desktop 2007/03/09 15:18:28 1.1 +++ ./kioslave/media/kcmodule/media.desktop 2007/03/09 15:18:36 @@ -2,7 +2,7 @@ Encoding=UTF-8 Type=Application #DocPath= -Icon=system +Icon=kcmmedia Exec=kcmshell media --- ./kcontrol/crypto/crypto.desktop 2007/03/09 15:18:56 1.1 +++ ./kcontrol/crypto/crypto.desktop 2007/03/09 15:19:04 @@ -1,6 +1,6 @@ [Desktop Entry] Encoding=UTF-8 -Icon=encrypted +Icon=kcmcrypto Type=Application Exec=kcmshell crypto DocPath=kcontrol/crypto/index.html --- ./kcontrol/privacy/privacy.desktop 2007/03/09 15:19:22 1.1 +++ ./kcontrol/privacy/privacy.desktop 2007/03/09 15:19:38 @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=trashcan_empty +Icon=kcmprivacy Encoding=UTF-8 Comment=Privacy - a kcontrol module to clean unwanted traces the user leaves on the system Comment[af]=Privaatheid - 'n Beheer module wat voetspore wat deur gebruikers op die stelsel gelaat word skoon maak --- ./kcontrol/nics/nic.desktop 2007/03/09 15:19:58 1.1 +++ ./kcontrol/nics/nic.desktop 2007/03/09 15:20:10 @@ -3,7 +3,7 @@ Exec=kcmshell nic Type=Application DocPath=kinfocenter/nics/index.html -Icon=network +Icon=kcmnic X-KDE-Library=nic ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.WYe462/_old 2007-03-10 23:57:40.000000000 +0100 +++ /var/tmp/diff_new_pack.WYe462/_new 2007-03-10 23:57:40.000000000 +0100 @@ -2855,7 +2855,7 @@ +} --- kicker/ui/k_new_mnu.cpp +++ kicker/ui/k_new_mnu.cpp -@@ -0,0 +1,3753 @@ +@@ -0,0 +1,3766 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -5168,10 +5168,22 @@ + break; + case KURIFilterData::SHELL: + case KURIFilterData::EXECUTABLE: ++ { + exe = KGlobal::dirs()->findExe(filterData.uri().url()); ++#ifdef KDELIBS_SUSE ++ bool gimp_hack = false; ++ if (exe.endsWith("/bin/gimp")) { ++ QStringList::ConstIterator it = m_programsInMenu.begin(); ++ for (; it != m_programsInMenu.end(); ++it) ++ if ((*it).find("bin/gimp-remote-")!=-1) { ++ gimp_hack = true; ++ break; ++ } ++ } ++#endif + if (m_programsInMenu.find(exe)!=m_programsInMenu.end() +#ifdef KDELIBS_SUSE -+ || (exe=="/opt/gnome/bin/gimp" && ( m_programsInMenu.find("/opt/gnome/bin/gimp-remote-2.2")!=m_programsInMenu.end() || m_programsInMenu.find("/opt/gnome/bin/gimp-remote-2.3")!=m_programsInMenu.end())) ++ || gimp_hack +#endif + ) + exe = QString::null; @@ -5183,6 +5195,7 @@ + description = i18n("Run '%1'").arg(exe); + exe = "kicker:/runcommand"; + } ++ } + default: + break; + } ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.WYe462/_old 2007-03-10 23:57:41.000000000 +0100 +++ /var/tmp/diff_new_pack.WYe462/_new 2007-03-10 23:57:41.000000000 +0100 @@ -3,7 +3,7 @@ @@ -4,5 +4,8 @@ # -+PATH=/opt/kde3/bin:$PATH ++PATH=/opt/kde3/bin:${PATH/:\/opt\/kde3\/bin} +export PATH + # When the X server dies we get a HUP signal from xinit. We must ignore it ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org