January 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kdebase4-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Thu Jan 8 18:26:35 CET 2009. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-12-02 13:21:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-12-15 15:51:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 15 15:50:47 CET 2008 - dmueller(a)suse.de + +- remove kdebase3 provide (bnc#458318) + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.L31618/_old 2009-01-08 18:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.L31618/_new 2009-01-08 18:26:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase4-runtime (Version 4.1.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.1.3 -Release: 4 +Release: 5 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -51,7 +51,6 @@ Provides: suse_help_viewer Recommends: ispell, enscript %define debug_package_requires %name = %version-%release kdelibs4-debuginfo -Provides: kdebase3 = 3.5.1 Obsoletes: kdebase3 <= 3.5.1 %description @@ -377,6 +376,8 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Mon Dec 15 2008 dmueller(a)suse.de +- remove kdebase3 provide (bnc#458318) * Tue Dec 02 2008 stbinner(a)suse.de - don't show KNetAttach menu entry on KDE3 desktop * Wed Nov 26 2008 dmueller(a)suse.de ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.L31618/_old 2009-01-08 18:26:19.000000000 +0100 +++ /var/tmp/diff_new_pack.L31618/_new 2009-01-08 18:26:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package oxygen-icon-theme (Version 4.1.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 4.1.3 -Release: 4 +Release: 5 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -127,6 +127,8 @@ /usr/share/icons/oxygen %changelog +* Mon Dec 15 2008 dmueller(a)suse.de +- remove kdebase3 provide (bnc#458318) * Tue Dec 02 2008 stbinner(a)suse.de - don't show KNetAttach menu entry on KDE3 desktop * Wed Nov 26 2008 dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4 for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Thu Jan 8 18:26:24 CET 2009. -------- --- KDE/kdebase4/kdebase4.changes 2008-12-16 13:38:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2009-01-03 11:33:19.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 3 11:31:53 CET 2009 - stbinner(a)suse.de + +- fix "Dolphin Super User Mode" start menu entry (bnc#449056) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.v30960/_old 2009-01-08 18:26:12.000000000 +0100 +++ /var/tmp/diff_new_pack.v30960/_new 2009-01-08 18:26:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase4 (Version 4.1.3) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,7 +33,7 @@ Summary: The Base KDE Apps Url: http://www.kde.org/ Version: 4.1.3 -Release: 5 +Release: 6 Source0: kdebase-%version.tar.bz2 Source1: _upstream Source2: rpmlintrc @@ -490,6 +490,8 @@ /usr/share/kde4/services/plasma-applet-folderview.desktop %changelog +* Sat Jan 03 2009 stbinner(a)suse.de +- fix "Dolphin Super User Mode" start menu entry (bnc#449056) * Tue Dec 16 2008 stbinner(a)suse.de - versionized split-provides are not supported * Thu Nov 27 2008 ro(a)suse.de ++++++ dolphinsu.desktop ++++++ --- /var/tmp/diff_new_pack.v30960/_old 2009-01-08 18:26:12.000000000 +0100 +++ /var/tmp/diff_new_pack.v30960/_new 2009-01-08 18:26:12.000000000 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Name=File Manager - Super User Mode -Exec=dolphin %i -caption "%c" "%u" +Exec=dbus-launch dolphin %i -caption "%c" "%u" Icon=system-file-manager Type=Application X-DocPath=dolphin/index.html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-kipi-plugins for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kde4-kipi-plugins for openSUSE:Factory checked in at Thu Jan 8 18:26:04 CET 2009. -------- --- KDE/kde4-kipi-plugins/kde4-kipi-plugins.changes 2008-11-05 11:52:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-kipi-plugins/kde4-kipi-plugins.changes 2009-01-08 13:26:23.000000000 +0100 @@ -1,0 +2,31 @@ +Thu Jan 8 13:24:29 CET 2009 - stbinner(a)suse.de + +- update to 0.2 beta 6 release: + * FbExport : New plugin to export images to Facebook + * FlickrExport : Add support of Photosets. + * SmugExport : Add support for Album Templates + +------------------------------------------------------------------- +Mon Dec 29 10:23:51 CET 2008 - stbinner(a)suse.de + +- update to 0.2 beta 5 release: + * RemoveRedEyes : Added an option to preview the correction of + the currently selected image. + * SmugExport : New plugin to export images to a remote + SmugMug web service (http://www.smugmug.com) + +- update to 0.2 beta 4 release: + * RemoveRedEyes : New plugin to remove red eyes in batch. + Tool is based on OpenCV library. + * Calendar : Ported to QT4/KDE4. + * Calendar : Support RAW images. + * SlideShow : Normal effects are back. + * SlideShow : New effect "Cubism". + * SlideShow : Added support for RAW images. + * DNGConverter : plugin is now available as a stand alone app + * SlideShow : New effect "Mosaic" + * PrintWizard : Ported to QT4/KDE4 + * PrintWizard : Added a new option to skip cropping, the + image is scaled automatically. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kipi-plugins-0.2.0-beta3.tar.bz2 New: ---- kipi-plugins-0.2.0-beta6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-kipi-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Q29151/_old 2009-01-08 18:25:45.000000000 +0100 +++ /var/tmp/diff_new_pack.Q29151/_new 2009-01-08 18:25:45.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kde4-kipi-plugins (Version 0.2beta3) +# spec file for package kde4-kipi-plugins (Version 0.2beta6) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,9 +30,9 @@ License: GPL v2 or later Group: Productivity/Graphics/Other Summary: KDE Plug-Ins for Image Manipulation -Version: 0.2beta3 +Version: 0.2beta6 Release: 1 -%define rversion 0.2.0-beta3 +%define rversion 0.2.0-beta6 Recommends: dcraw Requires: /usr/bin/jpegtran BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +75,8 @@ cd .. %kde_post_install rm -rf $RPM_BUILD_ROOT/usr/share/locale/x-test -for l in kipiplugin_acquireimages kipiplugin_dngconverter kipiplugin_flickrexport kipiplugin_galleryexport kipiplugin_gpssync kipiplugin_htmlexport kipiplugin_imageviewer kipiplugin_jpeglossless kipiplugin_metadataedit kipiplugin_picasawebexport kipiplugin_rawconverter kipiplugin_sendimages kipiplugin_simpleviewerexport kipiplugin_slideshow kipiplugin_timeadjust kipiplugin_wallpaper kipiplugins ; do +rm $RPM_BUILD_ROOT/usr/share/applications/kde4/dngconverter.desktop +for l in kipiplugin_acquireimages kipiplugin_dngconverter kipiplugin_flickrexport kipiplugin_galleryexport kipiplugin_gpssync kipiplugin_htmlexport kipiplugin_imageviewer kipiplugin_jpeglossless kipiplugin_metadataedit kipiplugin_picasawebexport kipiplugin_rawconverter kipiplugin_sendimages kipiplugin_simpleviewerexport kipiplugin_slideshow kipiplugin_timeadjust kipiplugin_wallpaper kipiplugins kipiplugin_calendar kipiplugin_ipodexport kipiplugin_printwizard kipiplugin_removeredeyes kipiplugin_smugexport kipiplugin_fbexport; do %find_lang $l suse.lang done @@ -85,6 +86,11 @@ %files -f suse.lang %defattr(-,root,root) %doc COPYING AUTHORS ChangeLog README +/usr/bin/dngconverter +%_kde4_modules/kipiplugin_calendar.so +%_kde4_modules/kipiplugin_ipodexport.so +%_kde4_modules/kipiplugin_printwizard.so +%_kde4_modules/kipiplugin_smugexport.so %_kde4_modules/kipiplugin_flickrexport.so %_kde4_modules/kipiplugin_gpssync.so %_kde4_modules/kipiplugin_htmlexport.so @@ -116,6 +122,10 @@ %_kde_share_dir/services/kipiplugin_slideshow.desktop %_kde_share_dir/services/kipiplugin_timeadjust.desktop %_kde_share_dir/services/kipiplugin_dngconverter.desktop +%_kde_share_dir/services/kipiplugin_calendar.desktop +%_kde_share_dir/services/kipiplugin_ipodexport.desktop +%_kde_share_dir/services/kipiplugin_printwizard.desktop +%_kde_share_dir/services/kipiplugin_smugexport.desktop %_libdir/libkipiplugins.so %_libdir/libkipiplugins.so.1 %_libdir/libkipiplugins.so.1.0.0 @@ -136,8 +146,34 @@ /usr/share/icons/hicolor/32x32/actions/ogl.png /usr/share/icons/hicolor/32x32/actions/timeadjust.png /usr/share/icons/hicolor/64x64/actions/metadataedit.png +%_kde4_modules/kipiplugin_fbexport.so +%_kde_share_dir/services/kipiplugin_fbexport.desktop %changelog +* Thu Jan 08 2009 stbinner(a)suse.de +- update to 0.2 beta 6 release: + * FbExport : New plugin to export images to Facebook + * FlickrExport : Add support of Photosets. + * SmugExport : Add support for Album Templates +* Mon Dec 29 2008 stbinner(a)suse.de +- update to 0.2 beta 5 release: + * RemoveRedEyes : Added an option to preview the correction of + the currently selected image. + * SmugExport : New plugin to export images to a remote + SmugMug web service (http://www.smugmug.com) +- update to 0.2 beta 4 release: + * RemoveRedEyes : New plugin to remove red eyes in batch. + Tool is based on OpenCV library. + * Calendar : Ported to QT4/KDE4. + * Calendar : Support RAW images. + * SlideShow : Normal effects are back. + * SlideShow : New effect "Cubism". + * SlideShow : Added support for RAW images. + * DNGConverter : plugin is now available as a stand alone app + * SlideShow : New effect "Mosaic" + * PrintWizard : Ported to QT4/KDE4 + * PrintWizard : Added a new option to skip cropping, the + image is scaled automatically. * Wed Nov 05 2008 stbinner(a)suse.de - update to 0.2 beta 3 release: * Slideshow enhancements by ken-burns effects ++++++ kipi-plugins-0.2.0-beta3.tar.bz2 -> kipi-plugins-0.2.0-beta6.tar.bz2 ++++++ ++++ 443425 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3-SuSE for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kdebase3-SuSE for openSUSE:Factory checked in at Thu Jan 8 18:26:00 CET 2009. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2008-11-29 16:25:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2008-12-28 23:27:14.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Dec 28 23:27:11 CET 2008 - stbinner(a)suse.de + +- adapt to updater rename (bnc#440329) + +------------------------------------------------------------------- +Wed Dec 10 16:50:34 CET 2008 - stbinner(a)suse.de + +- fix distro version in software.opensuse.org/search links + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.D29221/_old 2009-01-08 18:25:46.000000000 +0100 +++ /var/tmp/diff_new_pack.D29221/_new 2009-01-08 18:25:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase3-SuSE (Version 11.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -38,7 +38,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 11.1 -Release: 65 +Release: 66 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -271,6 +271,10 @@ /opt/kde3/share/services/sysinfo.protocol %changelog +* Sun Dec 28 2008 stbinner(a)suse.de +- adapt to updater rename (bnc#440329) +* Wed Dec 10 2008 stbinner(a)suse.de +- fix distro version in software.opensuse.org/search links * Sat Nov 29 2008 stbinner(a)suse.de - translation update * Sun Nov 23 2008 stbinner(a)suse.de ++++++ kdebase-SuSE-11.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme --- old/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme 2008-05-19 13:55:35.000000000 +0200 +++ new/kdebase-SuSE/config-files/opt/kde3/bin/startkde.theme 2008-12-31 18:26:21.000000000 +0100 @@ -123,16 +123,16 @@ mkdir -p $HOME/.config/ cp -a "${TEMPLATE_DIR}"/qtcurvestylerc $HOME/.config/ - if test -e /etc/YaST2/live-install.xml ; then + if test -e /usr/share/applications/YaST2/live-installer.desktop ; then if test -e "${TEMPLATE_DIR}"/kdedrc.live ; then cp -a "${TEMPLATE_DIR}"/kdedrc.live "${kdehome}"/share/config/kdedrc fi if test -e "${TEMPLATE_DIR}"/susepluggerrc.live ; then cp -a "${TEMPLATE_DIR}"/susepluggerrc.live "${kdehome}"/share/config/susepluggerrc fi - if test -e "${TEMPLATE_DIR}"/opensuseupdater-autostart.desktop ; then + if test -e "${TEMPLATE_DIR}"/kupdateapplet-autostart.desktop ; then mkdir -p $HOME/.config/autostart - cp -a "${TEMPLATE_DIR}"/opensuseupdater-autostart.desktop $HOME/.config/autostart/opensuseupdater-autostart.desktop + cp -a "${TEMPLATE_DIR}"/kupdateapplet-autostart.desktop $HOME/.config/autostart/kupdateapplet-autostart.desktop fi if test -e "${TEMPLATE_DIR}"/beagled-autostart.desktop.live ; then mkdir -p $HOME/.config/autostart diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/bookmarks.xml new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/bookmarks.xml --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/bookmarks.xml 2008-05-15 15:15:08.000000000 +0200 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/bookmarks.xml 2008-12-08 13:34:33.000000000 +0100 @@ -10,7 +10,7 @@ <bookmark href="http://forums.opensuse.org/" > <title>openSUSE Forums</title> </bookmark> - <bookmark href="http://software.opensuse.org/search?baseproject=openSUSE:11.0" > + <bookmark href="http://software.opensuse.org/search?baseproject=openSUSE:11.1" > <title>openSUSE Online Software Repositories</title> </bookmark> <bookmark href="http://en.opensuse.org/How_to_Participate" > diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kupdateapplet-autostart.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kupdateapplet-autostart.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kupdateapplet-autostart.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/kupdateapplet-autostart.desktop 2008-12-28 23:25:55.000000000 +0100 @@ -0,0 +1,2 @@ +[Desktop Entry] +Hidden=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/opensuseupdater-autostart.desktop new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/opensuseupdater-autostart.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/opensuseupdater-autostart.desktop 2008-05-19 13:40:48.000000000 +0200 +++ new/kdebase-SuSE/config-files/opt/kde3/share/config/SuSE/default/opensuseupdater-autostart.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[Desktop Entry] -Hidden=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/config-files/opt/kde3/share/services/searchproviders/rpm.desktop new/kdebase-SuSE/config-files/opt/kde3/share/services/searchproviders/rpm.desktop --- old/kdebase-SuSE/config-files/opt/kde3/share/services/searchproviders/rpm.desktop 2008-04-21 15:04:14.000000000 +0200 +++ new/kdebase-SuSE/config-files/opt/kde3/share/services/searchproviders/rpm.desktop 2008-12-08 13:34:33.000000000 +0100 @@ -3,6 +3,6 @@ Hidden=false Keys=rpm Name=openSUSE Build Service -Query=http://software.opensuse.org/search?baseproject=openSUSE%3A11.0&p=1&q=\\{@} +Query=http://software.opensuse.org/search?baseproject=openSUSE%3A11.1&p=1&q=\\{@} ServiceTypes=SearchProvider Type=Service diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/greeter/greetings.cpp new/kdebase-SuSE/greeter/greetings.cpp --- old/kdebase-SuSE/greeter/greetings.cpp 2008-05-23 19:35:29.000000000 +0200 +++ new/kdebase-SuSE/greeter/greetings.cpp 2008-12-08 13:34:33.000000000 +0100 @@ -217,7 +217,7 @@ } if (url=="http://software.opensuse.org/") - url="http://software.opensuse.org/search?baseproject=openSUSE%3A11.0"; + url="http://software.opensuse.org/search?baseproject=openSUSE%3A11.1"; KProcess p; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kio_sysinfo/de.po new/kdebase-SuSE/po/kio_sysinfo/de.po --- old/kdebase-SuSE/po/kio_sysinfo/de.po 2008-11-29 16:24:00.000000000 +0100 +++ new/kdebase-SuSE/po/kio_sysinfo/de.po 2008-12-31 18:32:28.000000000 +0100 @@ -5,19 +5,20 @@ # This file is distributed under the same license as @PACKAGE@ package. FIRST # # Michael Skiba <trans(a)michael-skiba.de>, 2007,2008. +# Hermann J. Beckers <hj.beckers(a)onlinehome.de>, 2008. msgid "" msgstr "" "Project-Id-Version: kio_sysinfo.de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-01 12:10+0200\n" -"PO-Revision-Date: 2008-04-13 23:50+0200\n" -"Last-Translator: Michael Skiba <trans(a)michael-skiba.de>\n" -"Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" +"PO-Revision-Date: 2008-12-06 17:19+0100\n" +"Last-Translator: Hermann J. Beckers <hj.beckers(a)onlinehome.de>\n" +"Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.2\n" #: ksysinfopart.cpp:72 msgid "KSysinfo" @@ -37,7 +38,7 @@ #: sysinfo.cpp:129 msgid "Looking for CPU information..." -msgstr "Suche nach CPU-Informationen..." +msgstr "Suche nach CPU-Informationen ..." #: sysinfo.cpp:138 sysinfo.cpp:140 msgid "My Computer" @@ -45,15 +46,15 @@ #: sysinfo.cpp:141 msgid "Folders, Harddisks, Removable Devices, System Information and more..." -msgstr "Ordner, Festplatten, Wechselmedien, Systeminformation und mehr..." +msgstr "Ordner, Festplatten, Wechselmedien, Systeminformation und mehr ..." #: sysinfo.cpp:147 msgid "Looking for disk information..." -msgstr "Suche nach Datenträgerinformation..." +msgstr "Suche nach Datenträgerinformation ..." #: sysinfo.cpp:148 msgid "Disk Information" -msgstr "Datenträger" +msgstr "Datenträgerinformation" #: sysinfo.cpp:152 msgid "OS Information" @@ -61,7 +62,7 @@ #: sysinfo.cpp:154 msgid "OS:" -msgstr "Betriebssystem:" +msgstr "BS:" #: sysinfo.cpp:156 msgid "Current user:" @@ -93,7 +94,7 @@ #: sysinfo.cpp:177 msgid "Getting OS information...." -msgstr "Betriebssysteminformation abrufen...." +msgstr "Betriebssysteminformation abrufen ..." #: sysinfo.cpp:180 msgid "Common Folders" @@ -117,7 +118,7 @@ #: sysinfo.cpp:190 msgid "Looking up network status..." -msgstr "Netzwerkstatus ermitteln..." +msgstr "Netzwerkstatus ermitteln ..." #: sysinfo.cpp:193 msgid "Network Status" @@ -149,7 +150,7 @@ #: sysinfo.cpp:220 msgid "Looking for memory information..." -msgstr "Suche nach Speicherinformationen..." +msgstr "Suche nach Speicherinformationen ..." #: sysinfo.cpp:222 msgid "Memory Information" @@ -226,7 +227,7 @@ #: sysinfo.cpp:601 msgid "Establishing connection to the network" -msgstr "Aufbauen einer Verbindung zum Netzwerk" +msgstr "Aufbauen einer Netzwerk-Verbindung" #: sysinfo.cpp:603 msgid "You are online" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kio_sysinfo/es.po new/kdebase-SuSE/po/kio_sysinfo/es.po --- old/kdebase-SuSE/po/kio_sysinfo/es.po 2008-11-29 16:24:00.000000000 +0100 +++ new/kdebase-SuSE/po/kio_sysinfo/es.po 2008-12-31 18:32:28.000000000 +0100 @@ -18,7 +18,7 @@ "Project-Id-Version: kio_sysinfo.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-01 12:10+0200\n" -"PO-Revision-Date: 2008-11-09 19:52+0100\n" +"PO-Revision-Date: 2008-12-13 20:31+0100\n" "Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -137,7 +137,7 @@ # include/network/lan/address.ycp:102 #: sysinfo.cpp:186 msgid "Network Folders" -msgstr "Carpetas de red" +msgstr "Carpetas compartidas" #: sysinfo.cpp:190 msgid "Looking up network status..." @@ -271,7 +271,7 @@ #: sysinfo.cpp:599 msgid "Network is shutting down" -msgstr "Se está deshabilitando la red" +msgstr "Se está desactivando la red" #: sysinfo.cpp:601 msgid "Establishing connection to the network" @@ -284,5 +284,5 @@ # include/network/summary.ycp:108 #: sysinfo.cpp:605 msgid "Unknown network status" -msgstr "Estado desconocido de la red" +msgstr "Estado de la red desconocido" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/kio_sysinfo/sk.po new/kdebase-SuSE/po/kio_sysinfo/sk.po --- old/kdebase-SuSE/po/kio_sysinfo/sk.po 2008-11-29 16:24:00.000000000 +0100 +++ new/kdebase-SuSE/po/kio_sysinfo/sk.po 2008-12-31 18:32:28.000000000 +0100 @@ -1,26 +1,31 @@ +# translation of kio_sysinfo.po to Slovak +# Stanislav Visnovsky <visnovsky(a)kde.org>, 2003. +# Milan Hromada <mhromada(a)elas.sk>, 2000. +# Ladislav Michnovic <lmichnovic(a)suse.cz>, 2007. +# Rastislav Krupanský <ra100(a)atlas.sk>, 2008. # Slovak message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002, 2003 SuSE Linux AG. # Copyright (C) 2000, 2001 SuSE GmbH. -# Stanislav Visnovsky <visnovsky(a)kde.org>, 2003 -# Milan Hromada <mhromada(a)elas.sk>, 2000. -# Ladislav Michnovic <lmichnovic(a)suse.cz>, 2007. msgid "" msgstr "" -"Project-Id-Version: YaST (@memory@)\n" +"Project-Id-Version: kio_sysinfo\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-01 12:10+0200\n" -"PO-Revision-Date: 2003-05-27 16:53+0200\n" -"Last-Translator: Ladislav Michnovic <lmichnovic(a)suse.cz>\n" +"PO-Revision-Date: 2008-09-25 21:05+0100\n" +"Last-Translator: Rastislav Krupanský <ra100(a)atlas.sk>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: Slovak\n" +"X-Poedit-Country: SLOVAKIA\n" #: ksysinfopart.cpp:72 msgid "KSysinfo" -msgstr "" +msgstr "KSysinfo" # Video card information string: # %1 will be substituted with the name of the video card @@ -40,63 +45,54 @@ # %1 will be substituted with the name of the video card # (e.g. "Hyper VGA DeLuxe Pro"), #: sysinfo.cpp:73 -#, fuzzy msgid "%1 KB" -msgstr "%1" +msgstr "%1 KB" #: sysinfo.cpp:129 -#, fuzzy msgid "Looking for CPU information..." -msgstr "Ukladám nastavenie počítača..." +msgstr "Hľadajú sa informácie o CPU..." -#: sysinfo.cpp:138 sysinfo.cpp:140 -#, fuzzy +#: sysinfo.cpp:138 +#: sysinfo.cpp:140 msgid "My Computer" -msgstr "Počítač" +msgstr "Môj počítač" #: sysinfo.cpp:141 msgid "Folders, Harddisks, Removable Devices, System Information and more..." -msgstr "" +msgstr "Priečinky, Pevné disky, Výmenné médiá, Systémové informácie a iné..." #: sysinfo.cpp:147 -#, fuzzy msgid "Looking for disk information..." -msgstr "Ukladám nastavenie počítača..." +msgstr "Hľadajú sa informácie o diskoch..." #: sysinfo.cpp:148 -#, fuzzy msgid "Disk Information" -msgstr "&Informácie" +msgstr "Informácie o diskoch" #: sysinfo.cpp:152 -#, fuzzy msgid "OS Information" -msgstr "&Informácie" +msgstr "Informácie o OS" #: sysinfo.cpp:154 msgid "OS:" msgstr "OS:" #: sysinfo.cpp:156 -#, fuzzy msgid "Current user:" -msgstr "Aktuálny stav:" +msgstr "Aktuálny používateľ:" #: sysinfo.cpp:158 -#, fuzzy msgid "System:" -msgstr "Systém" +msgstr "Systém:" #: sysinfo.cpp:159 -#, fuzzy msgid "KDE:" -msgstr "KDE" +msgstr "KDE:" # item of a menu button #: sysinfo.cpp:165 -#, fuzzy msgid "Display Info" -msgstr "&Zobraziť záznam" +msgstr "Informácie o grafickej karte" #: sysinfo.cpp:167 msgid "Vendor:" @@ -111,148 +107,128 @@ msgstr "Ovládač:" #: sysinfo.cpp:177 -#, fuzzy msgid "Getting OS information...." -msgstr "Ukladám nastavenie počítača..." +msgstr "Získavanie informácií o OS...." # Translator: Common in the sense of multiple items share the same settings. # _not_ in the sense of "typical" #: sysinfo.cpp:180 -#, fuzzy msgid "Common Folders" -msgstr "Všeobecné nastavenia" +msgstr "Spoločné priečinky" #: sysinfo.cpp:183 -#, fuzzy msgid "My Documents" -msgstr "Dokument" +msgstr "Moje dokumenty" #: sysinfo.cpp:184 msgid "My Home Folder" -msgstr "" +msgstr "Môj domáci priečinok" #: sysinfo.cpp:185 -#, fuzzy msgid "Root Folder" -msgstr "Správca štartu" +msgstr "Root priečinok" # tree node string #: sysinfo.cpp:186 -#, fuzzy msgid "Network Folders" -msgstr "Sieťové zariadenia" +msgstr "Sieťové priečinky" # Progress step 4/5 #: sysinfo.cpp:190 -#, fuzzy msgid "Looking up network status..." -msgstr "Načítavam sieťové nastavenia..." +msgstr "Zisťovanie stavu siete..." #: sysinfo.cpp:193 -#, fuzzy msgid "Network Status" -msgstr "Sieťové nastavenie" +msgstr "Stav siete" #: sysinfo.cpp:201 -#, fuzzy msgid "CPU Information" -msgstr "&Informácie" +msgstr "Informácie o CPU" # tree node string - CPU information #: sysinfo.cpp:203 -#, fuzzy msgid "Processor (CPU):" -msgstr "Procesor" +msgstr "Procesor (CPU):" #: sysinfo.cpp:204 -#, fuzzy msgid "Speed:" -msgstr "Vy&brané:" +msgstr "Rýchlosť:" # Video card information string: # %1 will be substituted with the name of the video card # (e.g. "Hyper VGA DeLuxe Pro"), #: sysinfo.cpp:205 -#, fuzzy msgid "%1 MHz" -msgstr "%1" +msgstr "%1 MHz" #: sysinfo.cpp:209 msgid "Cores:" -msgstr "" +msgstr "Jadrá:" #: sysinfo.cpp:213 msgid "Temperature:" -msgstr "" +msgstr "Teplota:" #: sysinfo.cpp:220 -#, fuzzy msgid "Looking for memory information..." -msgstr "Ukladám nastavenie počítača..." +msgstr "Hľadajú sa informácie o pamäti..." #: sysinfo.cpp:222 -#, fuzzy msgid "Memory Information" -msgstr "Informácie o systéme" +msgstr "Informácie o pamäti" #: sysinfo.cpp:224 msgid "Total memory (RAM):" -msgstr "" +msgstr "Celková pamäť (RAM):" #: sysinfo.cpp:225 -#, fuzzy msgid "Free memory:" -msgstr "Pamäť FLASH" +msgstr "Voľná pamäť:" #: sysinfo.cpp:226 -#, fuzzy msgid "Used Memory" -msgstr "Pamäť FLASH" +msgstr "Použitá pamäť" #: sysinfo.cpp:227 -#, fuzzy msgid "Total swap:" -msgstr "Celkom:" +msgstr "Celkový swap:" #: sysinfo.cpp:228 -#, fuzzy msgid "Free swap:" -msgstr "voľné miesto:" +msgstr "Voľný swap:" #: sysinfo.cpp:292 msgid "%1 (+ %2 Caches)" -msgstr "" +msgstr "%1 (+ %2 Caches)" #: sysinfo.cpp:334 msgid "Device" msgstr "Zariadenie" #: sysinfo.cpp:334 -#, fuzzy msgid "Filesystem" -msgstr "Systémy súborov" +msgstr "Súborový systém" #: sysinfo.cpp:335 -#, fuzzy msgid "Total space" -msgstr "Celková veľkosť: " +msgstr "Celková veľkosť" #: sysinfo.cpp:335 -#, fuzzy msgid "Available space" -msgstr "&Dostupné sú:" +msgstr "Dostupná veľkosť" #: sysinfo.cpp:341 msgid "Press the right mouse button for more options like Mount or Eject" -msgstr "" +msgstr "Kliknite pravým tlačidlom myši pre viac informácií o možnostiach ako Pripojiť, alebo Vysunúť" #: sysinfo.cpp:577 msgid "%1 (3D Support)" -msgstr "" +msgstr "%1 (S 3D podporou)" #: sysinfo.cpp:581 msgid "%1 (No 3D Support)" -msgstr "" +msgstr "%1 (Bez 3D podpory)" #: sysinfo.cpp:587 msgid "Unknown" @@ -260,28 +236,25 @@ #: sysinfo.cpp:595 msgid "Network is unreachable" -msgstr "" +msgstr "Sieť je nedostupná" #: sysinfo.cpp:597 msgid "You are offline" -msgstr "" +msgstr "Ste offline" #: sysinfo.cpp:599 msgid "Network is shutting down" -msgstr "" +msgstr "Sieť sa vypína" #: sysinfo.cpp:601 msgid "Establishing connection to the network" -msgstr "" +msgstr "Nadväzovanie pripojenia ku sieti" #: sysinfo.cpp:603 msgid "You are online" -msgstr "" +msgstr "Ste online" #: sysinfo.cpp:605 -#, fuzzy msgid "Unknown network status" -msgstr "Neznáme sieťové zariadenie." +msgstr "Neznámy stav siete" -#~ msgid "unknown" -#~ msgstr "neznámy" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/krpmview/de.po new/kdebase-SuSE/po/krpmview/de.po --- old/kdebase-SuSE/po/krpmview/de.po 2008-11-29 16:24:00.000000000 +0100 +++ new/kdebase-SuSE/po/krpmview/de.po 2008-12-31 18:32:29.000000000 +0100 @@ -5,19 +5,20 @@ # This file is distributed under the same license as @PACKAGE@ package. FIRST # # Michael Skiba <trans(a)michael-skiba.de>, 2007,2008. +# Hermann J. Beckers <hj.beckers(a)onlinehome.de>, 2008. msgid "" msgstr "" "Project-Id-Version: krpmview.de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-20 11:57+0200\n" -"PO-Revision-Date: 2008-05-21 13:29+0200\n" -"Last-Translator: Michael Skiba <trans(a)michael-skiba.de>\n" -"Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" +"PO-Revision-Date: 2008-12-06 17:26+0100\n" +"Last-Translator: Hermann J. Beckers <hj.beckers(a)onlinehome.de>\n" +"Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.2\n" #: krpmview.cpp:56 msgid "Install Package with YaST" @@ -45,7 +46,7 @@ #: krpmview.cpp:87 msgid "Change Log" -msgstr "Veränderungs Protokoll" +msgstr "Veränderungs-Protokoll" #: krpmview.cpp:235 msgid "License: %1\n" @@ -53,7 +54,7 @@ #: krpmview.cpp:238 msgid "RPM group: %1\n" -msgstr "RPM Gruppe: %1\n" +msgstr "RPM-Gruppe: %1\n" #: krpmview.cpp:241 msgid "Distribution: %1\n" @@ -69,11 +70,11 @@ #: krpmview.cpp:253 msgid "Build time: %1\n" -msgstr "Bauzeit: %1\n" +msgstr "Erstellungszeit: %1\n" #: krpmview.cpp:257 msgid "Build host: %1\n" -msgstr "Baurechner: %1\n" +msgstr "Erstellungs-Ŕechner: %1\n" #: krpmview.cpp:262 msgid "Size: %1\n" @@ -81,7 +82,7 @@ #: krpmview.cpp:265 msgid "Source RPM: %1\n" -msgstr "Quell RPM: %1\n" +msgstr "Quell-RPM: %1\n" #: krpmview.cpp:267 msgid "Provides" @@ -121,7 +122,7 @@ #: krpmview.cpp:305 msgid "Parsing complete." -msgstr "Fertig mit einlesen." +msgstr "Einlesen beendet." #: krpmview.cpp:332 msgid "krpmview" @@ -133,9 +134,10 @@ #: krpmview.cpp:337 msgid "KRPMView views the content of RPM archives and can use YaST to install them" -msgstr "KRPMView zeigt den Inhalt von RPM-Archiven an und kann diese via YaST installieren" +msgstr "" +"KRPMView zeigt den Inhalt von RPM-Archiven an und kann diese via YaST installieren." #: krpmview.cpp:340 msgid "Current Maintainer" -msgstr "Aktueller Betreuer" +msgstr "Derzeitiger Betreuer" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/krpmview/sk.po new/kdebase-SuSE/po/krpmview/sk.po --- old/kdebase-SuSE/po/krpmview/sk.po 2008-11-29 16:24:00.000000000 +0100 +++ new/kdebase-SuSE/po/krpmview/sk.po 2008-12-31 18:32:29.000000000 +0100 @@ -9,14 +9,16 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-20 11:57+0200\n" -"PO-Revision-Date: 2006-11-16 12:20+0100\n" -"Last-Translator: Ladislav Michnovič <lmichnovic(a)suse.cz>\n" +"PO-Revision-Date: 2008-11-06 21:12+0100\n" +"Last-Translator: Rastislav Krupanský <ra100(a)atlas.sk>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: KBabel 1.2\n" +"X-Poedit-Language: Slovak\n" +"X-Poedit-Country: SLOVAKIA\n" #: krpmview.cpp:56 msgid "Install Package with YaST" @@ -24,7 +26,7 @@ #: krpmview.cpp:62 msgid "Use Directory as Source with YaST" -msgstr "Použiť adresár ako zdroj pre YaST" +msgstr "Použiť priečinok ako zdroj pre YaST" #: krpmview.cpp:83 msgid "Description" @@ -44,7 +46,7 @@ #: krpmview.cpp:87 msgid "Change Log" -msgstr "Protokol o zmenách" +msgstr "Zoznam zmien" #: krpmview.cpp:235 msgid "License: %1\n" @@ -68,26 +70,23 @@ #: krpmview.cpp:253 msgid "Build time: %1\n" -msgstr "" +msgstr "Čas zostavenia: %1\n" #: krpmview.cpp:257 msgid "Build host: %1\n" -msgstr "" +msgstr "Počítač zostavenia: %1\n" #: krpmview.cpp:262 -#, fuzzy msgid "Size: %1\n" -msgstr "Sedenie: %1" +msgstr "Veľkosť: %1\n" #: krpmview.cpp:265 -#, fuzzy msgid "Source RPM: %1\n" -msgstr "Zdroj:" +msgstr "Zdroj RPM: %1\n" #: krpmview.cpp:267 -#, fuzzy msgid "Provides" -msgstr "Poskytuje:" +msgstr "Poskytuje" # tree node string #: krpmview.cpp:269 @@ -95,31 +94,28 @@ msgstr "Vyžaduje" #: krpmview.cpp:271 -#, fuzzy msgid "Conflicts" -msgstr "Konflikty:" +msgstr "Konflikty" #: krpmview.cpp:273 -#, fuzzy msgid "Obsoletes" -msgstr "Nahradzuje:" +msgstr "Nahrádza" #: krpmview.cpp:275 -#, fuzzy msgid "Recommends" -msgstr "Doporučené" +msgstr "Doporučuje" #: krpmview.cpp:277 msgid "Suggests" -msgstr "" +msgstr "Návrhy" #: krpmview.cpp:279 msgid "Enhances" -msgstr "" +msgstr "Rozšírenia" #: krpmview.cpp:281 msgid "Supplements" -msgstr "" +msgstr "Doplnky" #: krpmview.cpp:288 msgid "Project Page: " @@ -139,8 +135,9 @@ #: krpmview.cpp:337 msgid "KRPMView views the content of RPM archives and can use YaST to install them" -msgstr "KRPMView zobrazuje obsah RPM balíku a môže ich inštalovať pomocou YaSTu" +msgstr "KRPMView zobrazuje obsah RPM balíka a môže ich inštalovať pomocou YaSTu" #: krpmview.cpp:340 msgid "Current Maintainer" -msgstr "Balík má na starosti" +msgstr "Aktuálny správca" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/pl.po new/kdebase-SuSE/po/SUSEgreeter/pl.po --- old/kdebase-SuSE/po/SUSEgreeter/pl.po 2008-11-29 16:24:01.000000000 +0100 +++ new/kdebase-SuSE/po/SUSEgreeter/pl.po 2008-12-31 18:32:37.000000000 +0100 @@ -1,3 +1,4 @@ +# translation of SUSEgreeter.pl.po to Polski # translation of SUSEgreeter.po to # This file is distributed under the same license as the PACKAGE package. # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER, 2004 @@ -6,14 +7,15 @@ # Wojciech Kapusta <wojciech(a)aviary.pl>, 2006. # Łukasz Suchenek <drottnar(a)oaza.pl>, 2006. # Wadim Dziedzic <wdziedzic(a)aviary.pl>, 2008. +# Mariusz Fik <fisiu82(a)gmail.com>, 2008. msgid "" msgstr "" -"Project-Id-Version: SUSEgreeter\n" +"Project-Id-Version: SUSEgreeter.pl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-02 18:26+0200\n" -"PO-Revision-Date: 2008-05-16 23:53+0200\n" -"Last-Translator: Wadim Dziedzic <wdziedzic(a)aviary.pl>\n" -"Language-Team: <pl(a)li.org>\n" +"PO-Revision-Date: 2008-11-18 20:25+0100\n" +"Last-Translator: Mariusz Fik <fisiu82(a)gmail.com>\n" +"Language-Team: Polski <pl(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -72,11 +74,12 @@ #: greet.xml:0(None) msgid "translator-credits" msgstr "" -"openSUSE 10.3 - wersja polska\n" +"openSUSE 11.1 - wersja polska\n" "Zespół Aviary.pl <team(a)aviary.pl>, 2005,2006,2007\n" "Piotr Leszczyński <piotr(a)kontury.pl>, 2007\n" "Piotr Pacholak <obi_gl(a)o2.pl>, 2007\n" -"Karol Sikora <elektrrrus(a)gmail.com>, 2007" +"Karol Sikora <elektrrrus(a)gmail.com>, 2007\n" +"Mariusz Fik <fisiu82(a)gmail.com>, 2008" #: greetings.cpp:64 greetings.cpp:83 greetings.cpp:101 greetings.cpp:107 #: greetings.cpp:149 @@ -85,7 +88,7 @@ #: greetings.cpp:160 msgid "Have a lot of fun!" -msgstr "Życzymy wiele radości" +msgstr "Życzymy wiele radości!" #: greetings.cpp:161 msgid "CLOSE" @@ -97,7 +100,7 @@ #: main.cpp:140 msgid "Show Introduction to KDE4" -msgstr "" +msgstr "Pokaż Wprowadzenie do KDE4" #: _translatorinfo.cpp:1 msgid "" @@ -107,7 +110,8 @@ "Zespół Aviary.pl\n" "Piotr Leszczyński\n" "Piotr Pacholak\n" -"Karol Sikora" +"Karol Sikora\n" +"Mariusz Fik" #: _translatorinfo.cpp:3 msgid "" @@ -117,4 +121,5 @@ "<team(a)aviary.pl>\n" "<piotr(a)kontury.pl>\n" "<obi_gl(a)o2.pl>\n" -"<elektrrrus(a)gmail.com>" +"<elektrrrus(a)gmail.com>\n" +"<fisiu82(a)gmail.com>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/sk.po new/kdebase-SuSE/po/SUSEgreeter/sk.po --- old/kdebase-SuSE/po/SUSEgreeter/sk.po 2008-11-29 16:24:01.000000000 +0100 +++ new/kdebase-SuSE/po/SUSEgreeter/sk.po 2008-12-31 18:32:37.000000000 +0100 @@ -1,21 +1,21 @@ -# translation of SUSEgreeter.sk.po to Slovak -# Antje Faber, 2005. +# translation of SUSEgreeter.po to Slovak # Antje Faber, 2005. # Stanislav Visnovsky <visnovsky(a)kde.org>, 2003. # Andrej Kacian <andrej(a)kacian.sk>, 2004, 2005. # Ladislav Michnovič <lmichnovic(a)suse.cz>, 2007, 2008. +# Rastislav Krupanský <ra100(a)atlas.sk>, 2008. msgid "" msgstr "" "Project-Id-Version: SUSEgreeter\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-02 18:26+0200\n" -"PO-Revision-Date: 2008-05-05 15:46+0100\n" -"Last-Translator: Ladislav Michnovič <lmichnovic(a)suse.cz>\n" +"PO-Revision-Date: 2008-12-05 23:22+0100\n" +"Last-Translator: Rastislav Krupanský <ra100(a)atlas.sk>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.10\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: greet.xml:4(title) @@ -78,11 +78,11 @@ #: greetings.cpp:160 msgid "Have a lot of fun!" -msgstr "Prajeme veľa zábavy" +msgstr "Prajeme veľa zábavy!" #: greetings.cpp:161 msgid "CLOSE" -msgstr "Zavrieť" +msgstr "ZAVRIEŤ" #: main.cpp:31 main.cpp:44 msgid "SUSEgreeter" @@ -90,81 +90,21 @@ #: main.cpp:140 msgid "Show Introduction to KDE4" -msgstr "" +msgstr "Zobraziť úvod do KDE4" #: _translatorinfo.cpp:1 msgid "" "_: NAME OF TRANSLATORS\n" "Your names" -msgstr "Ladislav Michnovič" +msgstr "" +"Ladislav Michnovič \n" +"Rastislav Krupanský" #: _translatorinfo.cpp:3 msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" -msgstr "lmichnovic(a)suse.cz" - -#~ msgid "Support and Communication" -#~ msgstr "Podpora a komunikácia" - -#~ msgid "The openSUSE community are helpful people. There are several ways to get in touch with other community members, such as <a href=\"http://en.opensuse.org/Communicate\">forums, mailing lists</a> and <a href=\"irc://irc.freenode.net/opensuse\">internet chat (IRC)</a>. On the openSUSE wiki there are also <a href=\"http://en.opensuse.org/Documentation\">HOWTOs and other documentation</a>. The first place to look for help is our <a href=\"http://en.opensuse.org/SDB:SDB\">support database</a>." -#~ msgstr "Komunita okolo openSUSE sú nápomocní ľudia. Je niekoľko možností ako získať kontakt na členov komunity, ako sú <a href=\"http://en.opensuse.org/Communicate\"> diskusné fóra, e-mailové konferencie</a> a <a href=\"irc://irc.freenode.net/opensuse\"> internetový pokec (IRC)</a>. Na wiki stránkach openSUSE sú tiež <a href=\"http://en.opensuse.org/Documentation\">návody a ďalšia dokumentácia</a>. Pomoc by ste mali hľadať najprv v našej <a href=\"http://en.opensuse.org/SDB:SDB\">databáze podpory</a>." - -#~ msgid "Register Now to Access Your Free Installation Support" -#~ msgstr "Zaregistrujte sa hneď teraz, a získajte inštalačnú podporu zdarma!" - -#, fuzzy -#~ msgid "If you have purchased a physical box of openSUSE 10.3, you have access to free installation support. For full access to the openSUSE installation support, register now at:" -#~ msgstr "Ak ste si zakúpili krabicovú verziu openSUSE 10.2, potom máte možnosť využívať volne prístupnú inštalačnú podporu. Pre kompletné služby inštalačnej podpory, zaregistrujte sa prosím teraz na:" - -#~ msgid "The portal provides you access to your free installation support, important information, and access to additional services that support your copy of openSUSE. Your support registration code can be found on your media cover." -#~ msgstr "<a href=\"http://www.suseportal.cz\">Portál</a> poskytuje prístup k Vašej inštalačnej podpore,dôležité informácie a prístup k dodatočným službám, pre Vašu kópiu openSUSE. Váš registračný kód nájdete na obale média." - -#~ msgid "Keep Your System Up-to-Date" -#~ msgstr "Pravidelne svoj systém aktualizujte!" - -#~ msgid "Update your system regularly with performing an online update. It's easy!" -#~ msgstr "Pravidelne aktualizujte svoj systém pomocou On-line aktualizácie. Je to jednoduché!" - -#~ msgid "Get Your Free Novell Linux Newsletter!" -#~ msgstr "Odoberajte Novell Linux Newsletter zdarma!" - -#~ msgid "The openSUSE project is sponsored by Novell, which offers a suite of fully supported Linux solutions targeted for business users. The monthly Novell Linux Newsletter provides you with the latest tips and tricks for openSUSE plus comprehensive news and information about other Novell offerings. <a href=\"http://www.novell.com/company/subscribe/\">Subscribe today!</a>" -#~ msgstr "Projekt openSUSE je podporovaný spoločnosťou Novell, ktorá Vám ponúka súbor produktov postavených na linuxových riešeniach pre biznis zákazníkov. Mesačník Novell Linux Newsletter vám poskytne najaktuálnejšie tipy a triky pre openSUSE, ako aj súhrnné novinky a informácie, týkajúce sa ďalších produktov firmy Novell. <a href=\"http://www.novell.com/company/subscribe/\">Začnite ho odoberať ešte dnes!</a>" - -#~ msgid "Enjoy openSUSE!" -#~ msgstr "Užite si openSUSE!" - -#~ msgid "Welcome to openSUSE Beta" -#~ msgstr "Vítame Vás v openSUSE Beta" - -#, fuzzy -#~ msgid "In the final version of openSUSE 10.3, this is where you'll register for support. Because we don't provide formal technical support for test builds of openSUSE, we will simply thank you for your support and participation in the openSUSE community. As you use this development version, you will encounter things that don't work correctly. Please let us know what you discover that we should fix by submitting a bug in our bugzilla database. To learn how you can participate more fully in the openSUSE community, please visit opensuse.org." -#~ msgstr "Vo finálnej verzii openSUSE 10.2 budete na tomto mieste vyzvaní k zaregistrovaniu sa. Protože k testovacím vydaniam nie je poskytovaná podpora, radi by sme tento prostor využili k poďakovaniu. Ďakujeme Vám za účast na testovaní a zapojeniu sa do komunity projektu openSUSE. Protože toto vydanie je v štádiu vývoja, istotne narazíte na veci, ktoré nebudú fungovať správne. Ak narazíte na chybu, nahláste nám ju prostredníctvom bugzilla databáze. Ďalšie informácie o projekte openSUSE a možnostiach zapojenia sa nájdete na stránkach opensuse.org." - -#~ msgid "Welcome to the new SUSE LINUX 9.3 OEM version!" -#~ msgstr "Vitajte v novom SUSE LINUX 9.3 OEM verzii!" - -#~ msgid "SUSE LINUX 9.3 OEM version from Novell provides everything you need for home computing and computing-on-the-go." -#~ msgstr "SUSE LINUX 9.3 OEM verzia od firmy Novell poskytuje všetko, čo potrebujete pre prácu s počítačom doma a na cestách." - -#~ msgid "Register now!" -#~ msgstr "Zaregistrujte sa hneď!" - -#~ msgid "For full access to the <a href=\"http://portal.suse.com\">SUSE LINUX Portal</a> register now. The Portal provides you important information and access to additonal services that support copy of SUSE LINUX." -#~ msgstr "Pre plný prístup k <a href=\"http://portal.suse.com\">SUSE LINUX Portal</a> sa musíte zaregistrovať. Tento portál vám poskytuje dôležité informácie, a dodatočné služby, ktoré dopĺňajú Vašu kópiu SUSE LINUX." - -#~ msgid "The Monthly SUSE LINUX Newsletter provides you with the latest tips and tricks on SUSE LINUX plus comprehensive product news and invitation. <a href=\"http://www.novell.com/company/subscribe/\">Subscribe</a> today!" -#~ msgstr "Mesačník SUSE LINUX Newsletter vám prináša najnovšie tipy a triky pre SUSE LINUX, ako aj súhrnné novinky týkajúce sa tohoto produktu. Začnite ho odoberať ešte dnes! <Link to http://www.suse.de/en/private/newsletter.html>here</link>, a hlavne:" - -#~ msgid "Welcome to the new SUSE LINUX 9.3 Evaluation version!" -#~ msgstr "Vitajte v novom SUSE LINUX 9.3 Skúšobná verzia!" - -#~ msgid "SUSE LINUX 9.3 Evaluation version from Novell provides everything you need for home computing and computing-on-the-go." -#~ msgstr "SUSE LINUX 9.3 Skúšobná verzia od firmy Novell poskytuje všetko, čo potrebujete pre prácu s počítačom doma a na cestách." - -#~ msgid "Welcome to the new SUSE LINUX Professional!" -#~ msgstr "Vitajte v novom SUSE LINUX Professional!" +msgstr "" +"lmichnovic(a)suse.cz\n" +"ra100(a)atlas.sk" -#~ msgid "SUSE LINUX Professional 9.3 from Novell provides everything you need for home computing and computing-on-the-go." -#~ msgstr "SUSE LINUX Professional 9.3 od firmy Novell poskytuje všetko, čo potrebujetepre prácu s počítačom doma a na cestách." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/suseplugger/es.po new/kdebase-SuSE/po/suseplugger/es.po --- old/kdebase-SuSE/po/suseplugger/es.po 2008-11-29 16:24:02.000000000 +0100 +++ new/kdebase-SuSE/po/suseplugger/es.po 2008-12-31 18:32:38.000000000 +0100 @@ -20,8 +20,8 @@ "Project-Id-Version: suseplugger\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-20 11:57+0200\n" -"PO-Revision-Date: 2007-11-11 07:50+0100\n" -"Last-Translator: César Sánchez Alonso <csalinux(a)gmail.com>\n" +"PO-Revision-Date: 2008-12-10 15:27-0400\n" +"Last-Translator: Ricardo Varas Santana <rvaras81(a)yahoo.com>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -67,7 +67,7 @@ #: rc.cpp:15 #, no-c-format msgid "&Keep me informed about new hardware" -msgstr "&Mantenerme informado sobre el nuevo hardware" +msgstr "&Mantenerme informado sobre el hardware nuevo" # #. i18n: file susehwpopup.ui line 164 @@ -80,7 +80,7 @@ #: rc.cpp:21 #, no-c-format msgid "New Hardware Found" -msgstr "Nuevo hardware encontrado" +msgstr "Hardware nuevo encontrado" #: susehwitem.cpp:161 msgid "Network Interface" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/update_rpm new/kdebase-SuSE/update_rpm --- old/kdebase-SuSE/update_rpm 2008-06-10 11:45:06.000000000 +0200 +++ new/kdebase-SuSE/update_rpm 2008-12-28 23:34:46.000000000 +0100 @@ -3,7 +3,7 @@ opwd=$PWD tdir=`mktemp -d` cd $tdir || exit 1 -svn export https://svn.suse.de/svn/desktop/trunk/kdebase-SuSE +svn export https://svn.suse.de/svn/desktop/branches/openSUSE_11_1_BRANCH/kdebase-SuSE if test -d "$MY_LCN_CHECKOUT"; then echo "Updating $MY_LCN_CHECKOUT" svn up $MY_LCN_CHECKOUT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-amarok for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kde4-amarok for openSUSE:Factory checked in at Thu Jan 8 18:25:33 CET 2009. -------- --- KDE/kde4-amarok/kde4-amarok.changes 2008-12-15 22:03:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-amarok/kde4-amarok.changes 2009-01-06 19:55:35.000000000 +0100 @@ -1,0 +2,34 @@ +Tue Jan 6 18:59:19 CET 2009 - stbinner(a)suse.de + +- update to 2.0.1 + * Add advanced, configurable, searching and filtering to playlist. + * Add "Stop after track" option to the playlist menu. + * Queue track functionality has returned. + * Add automatic recovery option to MySQL embedded server. + * Greatly improved Librivox.org service script. It now works for + all books, and dynamically fetches a summary of each book that + is shown in the service info applet. The script now also has a + propper icon in the service browser and its own emblem and + default "album" cover for books. + * Sorting collection by Composer is now possible. + * Service scripts can now dynamically fetch context info when + items are selected (info can still be applied statically to + each item as well). + * Album items from a service script can now have custom covers. + * Items from a service script can now have a custom emblem. + * Service scripts can now set custom icons for the service browser. + * Add simple filtering to the service browser. + * Podcast channels are automatically refreshed once per hour if + autoscan is enabled. + +------------------------------------------------------------------- +Wed Dec 31 17:47:28 CET 2008 - stbinner(a)suse.de + +- gdkpixbuf is required for pod support + +------------------------------------------------------------------- +Tue Dec 30 22:18:33 CET 2008 - stbinner(a)suse.de + +- don't require errmsg.sys from mysql package (bnc#450318) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- amarok-2.0.tar.bz2 amarok.cv.weirdness.patch amarok.elide.highcpu.patch fix-mtp-crash.patch New: ---- amarok-2.0.1.tar.bz2 errmsg-mysql-embedded.diff errmsg.sys ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-amarok.spec ++++++ --- /var/tmp/diff_new_pack.A25076/_old 2009-01-08 18:25:01.000000000 +0100 +++ /var/tmp/diff_new_pack.A25076/_new 2009-01-08 18:25:01.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kde4-amarok (Version 2.0) +# spec file for package kde4-amarok (Version 2.0.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: cups-devel libkcddb4-devel ruby-devel sqlite-devel taglib-devel BuildRequires: kdebase4-workspace-devel libkcompactdisc4-devel tse3-devel update-desktop-files BuildRequires: gstreamer010-devel libmtp-devel libnjb-devel libvisual-devel xine-devel -BuildRequires: flac-devel libQtWebKit-devel libdvdread-devel libgpod-devel +BuildRequires: flac-devel gtk2-devel libQtWebKit-devel libdvdread-devel libgpod-devel BuildRequires: dbus-1-glib-devel libogg-devel libsamplerate-devel libsndfile-devel BuildRequires: gdk-pixbuf-devel libcurl-devel libsoprano-devel loudmouth-devel mysql-devel %if %suse_version > 1030 @@ -35,13 +35,12 @@ License: GPL v2 or later Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE -Version: 2.0 -Release: 3 +Version: 2.0.1 +Release: 1 Source0: amarok-%version.tar.bz2 -Patch: amarok.cv.weirdness.patch -Patch1: amarok.elide.highcpu.patch -Patch2: fix-mtp-crash.patch +Source1: errmsg.sys Patch3: link-mysql-embedded.diff +Patch4: errmsg-mysql-embedded.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires Requires: kde4-amarok-lang = %{version} @@ -64,10 +63,8 @@ %lang_package %prep %setup -q -n amarok-%version -%patch -p1 -%patch1 -p1 -%patch2 -p0 %patch3 +%patch4 %build %ifarch ppc ppc64 @@ -80,6 +77,7 @@ cd build %makeinstall cd .. + install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/kde4/apps/amarok/errmsg.sys %suse_update_desktop_file -r amarok AudioVideo Player %find_lang amarok %kde_post_install @@ -134,6 +132,31 @@ %_kde_share_dir/services/amaroklastfm.protocol %changelog +* Tue Jan 06 2009 stbinner(a)suse.de +- update to 2.0.1 + * Add advanced, configurable, searching and filtering to playlist. + * Add "Stop after track" option to the playlist menu. + * Queue track functionality has returned. + * Add automatic recovery option to MySQL embedded server. + * Greatly improved Librivox.org service script. It now works for + all books, and dynamically fetches a summary of each book that + is shown in the service info applet. The script now also has a + propper icon in the service browser and its own emblem and + default "album" cover for books. + * Sorting collection by Composer is now possible. + * Service scripts can now dynamically fetch context info when + items are selected (info can still be applied statically to + each item as well). + * Album items from a service script can now have custom covers. + * Items from a service script can now have a custom emblem. + * Service scripts can now set custom icons for the service browser. + * Add simple filtering to the service browser. + * Podcast channels are automatically refreshed once per hour if + autoscan is enabled. +* Wed Dec 31 2008 stbinner(a)suse.de +- gdkpixbuf is required for pod support +* Tue Dec 30 2008 stbinner(a)suse.de +- don't require errmsg.sys from mysql package (bnc#450318) * Mon Dec 15 2008 dmueller(a)suse.de - add missing requirement on qt4-sql-sqlite - use mysql embedded instead of mysql server ++++++ amarok-2.0.tar.bz2 -> amarok-2.0.1.tar.bz2 ++++++ ++++ 483381 lines of diff (skipped) ++++++ errmsg-mysql-embedded.diff ++++++ --- src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:00:57 1.1 +++ src/collection/sqlcollection/MySqlEmbeddedCollection.cpp 2009/01/06 18:02:52 @@ -109,7 +109,7 @@ dir.mkpath( "." ); } - static const int num_elements = 8; + static const int num_elements = 9; char **server_options = new char* [ num_elements + 1 ]; server_options[0] = const_cast<char*>( "amarokmysqld" ); server_options[1] = defaultsLine; @@ -121,6 +121,7 @@ server_options[5] = const_cast<char*>( "--loose-skip-innodb" ); server_options[6] = const_cast<char*>( "--skip-grant-tables" ); server_options[7] = const_cast<char*>( "--myisam-recover=FORCE" ); + server_options[8] = const_cast<char*>( "--language=/usr/share/kde4/apps/amarok" ); server_options[num_elements] = 0; char **server_groups = new char* [ 3 ]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-digikam for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package kde4-digikam for openSUSE:Factory checked in at Thu Jan 8 18:25:12 CET 2009. -------- --- KDE/kde4-digikam/kde4-digikam.changes 2008-11-28 15:38:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/kde4-digikam/kde4-digikam.changes 2009-01-07 16:18:50.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Jan 7 15:36:14 CET 2009 - stbinner(a)suse.de + +- update to beta8: many bugfixes and + * All batch tools as rebuild all thumbs or sync metadata with + database use modeless dialogs. + * Icon-View and Thumbbar items use a smart 3D decorative border. + * Fonts used by Icon-View, Folder-View & Tooltip can be customized + * Add Tool tips to display Physical albums properties. + * CameraGui: Add Icon-View items Tooltip. + * CameraGui: List camera item in more suitable order: more recent + items on the top, older one on the bottom. + * CameraGui: Animation over icon view during camera download + +------------------------------------------------------------------- +Wed Dec 24 13:13:41 CET 2008 - stbinner(a)suse.de + +- update to beta7: many bugfixes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- digikam-0.10.0-beta6.tar.bz2 New: ---- digikam-0.10.0-beta8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-digikam.spec ++++++ --- /var/tmp/diff_new_pack.Z24846/_old 2009-01-08 18:24:53.000000000 +0100 +++ /var/tmp/diff_new_pack.Z24846/_new 2009-01-08 18:24:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kde4-digikam (Version 0.10.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,8 +31,8 @@ Group: Productivity/Graphics/Viewers Summary: A KDE Photo Manager Version: 0.10.0 -Release: 60 -%define tar_version 0.10.0-beta6 +Release: 61 +%define tar_version 0.10.0-beta8 Source0: digikam-%{tar_version}.tar.bz2 Patch: CMakeLists.txt.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,7 +105,6 @@ %files -f digikam.lang %defattr(-,root,root) /usr/bin/digikam -/usr/bin/digikam-camera /usr/bin/digikamthemedesigner /usr/bin/digitaglinktree /usr/bin/showfoto @@ -512,9 +511,6 @@ /usr/share/icons/oxygen/*/actions/transform-crop-and-resize.* %_kde_share_dir/apps/digikam %_kde_share_dir/apps/showfoto -%_kde_share_dir/services/ServiceMenus/digikam-download.desktop -%_kde_share_dir/services/ServiceMenus/digikam-gphoto2-camera.desktop -%_kde_share_dir/services/ServiceMenus/digikam-mount-and-download.desktop %_kde_share_dir/services/digikamalbums.protocol %_kde_share_dir/services/digikamdates.protocol %_kde_share_dir/services/digikamimageplugin_adjustcurves.desktop @@ -551,8 +547,24 @@ %_kde_share_dir/apps/showfoto/data/splash-showfoto.png %_kde_share_dir/apps/showfoto/showfotoui.rc /usr/share/man/man1/digitaglinktree.1.gz +%dir /usr/share/kde4/apps/solid +%dir /usr/share/kde4/apps/solid/actions +/usr/share/kde4/apps/solid/actions/digikam-opencamera.desktop %changelog +* Wed Jan 07 2009 stbinner(a)suse.de +- update to beta8: many bugfixes and + * All batch tools as rebuild all thumbs or sync metadata with + database use modeless dialogs. + * Icon-View and Thumbbar items use a smart 3D decorative border. + * Fonts used by Icon-View, Folder-View & Tooltip can be customized + * Add Tool tips to display Physical albums properties. + * CameraGui: Add Icon-View items Tooltip. + * CameraGui: List camera item in more suitable order: more recent + items on the top, older one on the bottom. + * CameraGui: Animation over icon view during camera download +* Wed Dec 24 2008 stbinner(a)suse.de +- update to beta7: many bugfixes * Fri Nov 28 2008 dmueller(a)suse.de - update to beta6: 173645 : digiKam crashes after start dialog. ++++++ digikam-0.10.0-beta6.tar.bz2 -> digikam-0.10.0-beta8.tar.bz2 ++++++ KDE/kde4-digikam/digikam-0.10.0-beta6.tar.bz2 /mounts/work_src_done/STABLE/kde4-digikam/digikam-0.10.0-beta8.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit git for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at Thu Jan 8 18:10:07 CET 2009. -------- --- git/git.changes 2008-11-19 08:55:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/git/git.changes 2009-01-08 16:33:31.590954000 +0100 @@ -1,0 +2,23 @@ +Thu Jan 8 15:55:42 CET 2009 - tiwai(a)suse.de + +- updated to 1.6.1: + * handle properly the exit code when pager is used + * various git-gui updates including translations + * gitweb updates + * many other improvements / fixes. See release notes + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt + +------------------------------------------------------------------- +Fri Dec 19 14:04:40 CET 2008 - lnussel(a)suse.de + +- add apparmor profile for git-web +- don't use %jobs for generating docu +- change gitexecdir to /usr/lib instead of %_libdir + +------------------------------------------------------------------- +Wed Dec 17 09:35:17 CET 2008 - tiwai(a)suse.de + +- Fix VUL-0 Possible gitweb vulnerability: calling "git diff" + [bnc#459664] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- git-1.6.0.2.tar.bz2 git-install-git-shell.diff New: ---- git-1.6.1.tar.bz2 git-nohardlink.diff usr.share.git-web.gitweb.cgi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.iU1931/_old 2009-01-08 18:09:53.000000000 +0100 +++ /var/tmp/diff_new_pack.iU1931/_new 2009-01-08 18:09:53.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package git (Version 1.6.0.2) +# spec file for package git (Version 1.6.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # +%define gitexecdir %{_exec_prefix}/lib/git Name: git %if 0%{?suse_version} < 1030 @@ -35,8 +36,8 @@ %endif BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.6.0.2 -Release: 6 +Version: 1.6.1 +Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -46,8 +47,9 @@ Source2: sysconfig.git-daemon Source3: git-daemon.init Source4: git.xinetd +Source5: usr.share.git-web.gitweb.cgi Patch: asciidoc.diff -Patch1: git-install-git-shell.diff +Patch3: git-nohardlink.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} Recommends: git-svn git-cvs git-arch git-email gitk git-gui git-web @@ -243,23 +245,28 @@ %prep %setup -q %patch -p1 -%patch1 +%patch3 -p1 %build +cat > .make <<'EOF' +#!/bin/bash make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ GITWEB_CONFIG="/etc/gitweb.conf" \ GITWEB_PROJECTROOT="/srv/git" \ WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ + DESTDIR=$RPM_BUILD_ROOT \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ - gitexecdir=%{_libdir}/git \ - all %{!?_without_docs: doc} %{?jobs:-j %jobs} + gitexecdir=%{gitexecdir} \ + "$@" +EOF +# +chmod 755 .make +./.make all %{?jobs:-j %jobs} +%{!?_without_docs: ./.make doc} %install -make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease NO_EXPAT=1 \ - prefix=%{_prefix} mandir=%{_mandir} \ - gitexecdir=%{_libdir}/git \ - install %{!?_without_docs: install-doc} +./.make install %{!?_without_docs: install-doc} ### git-web cp gitweb/INSTALL INSTALL.gitweb cp gitweb/README README.gitweb @@ -282,7 +289,7 @@ install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git ### (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files -(find $RPM_BUILD_ROOT%{_libdir}/git -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files +(find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL @@ -292,7 +299,22 @@ %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh +# +# apparmor profile for git-web +# +install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d +install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d +# %if %{dist_has_fdupes} +# create predictable symlinks to make apparmor profile work +for i in git git-upload-archive; do + rm $RPM_BUILD_ROOT%{_bindir}/$i + ln -s %{gitexecdir}/git-add $RPM_BUILD_ROOT%{_bindir}/$i +done +if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then + echo "git-add is not a regular file, apparmor profile won't work!" >&2 + exit 1 +fi # use symlinks instead of hardlinks in sub-commands %fdupes -s $RPM_BUILD_ROOT %endif @@ -320,7 +342,7 @@ %files svn %defattr(-,root,root) -%{_libdir}/git/*svn* +%{gitexecdir}/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } @@ -329,28 +351,28 @@ %defattr(-,root,root) %doc Documentation/*git-cvs*.txt %{_bindir}/git-cvs* -%{_libdir}/git/*cvs* +%{gitexecdir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt -%{_libdir}/git/git-archimport +%{gitexecdir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) %doc Documentation/*email*.txt -%{_libdir}/git/*email* +%{gitexecdir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files daemon %defattr(-,root,root) %doc Documentation/*daemon*.txt -%{_libdir}/git/*daemon* +%{gitexecdir}/*daemon* /etc/init.d/git-daemon %{_sbindir}/rcgit-daemon %dir /srv/git @@ -370,7 +392,7 @@ %files gui %defattr(-,root,root) %doc Documentation/*gui*.txt -%{_libdir}/git/git-gui +%{gitexecdir}/git-gui* /usr/share/git-gui %{!?_without_docs: %{_mandir}/man1/*gui*.1*} %{!?_without_docs: %doc Documentation/*gui*.html } @@ -382,11 +404,13 @@ %dir /etc/apache2/conf.d %config(noreplace) /etc/apache2/conf.d/gitweb.conf /usr/share/git-web +/etc/apparmor.d %files core -f bin-man-doc-files %defattr(-,root,root) +%{_bindir}/git %{_datadir}/git-core/ -%dir %{_libdir}/git +%dir %{gitexecdir} %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } /var/adm/perl-modules/%{name} @@ -396,6 +420,20 @@ /etc/bash_completion.d/git.sh %changelog +* Thu Jan 08 2009 tiwai(a)suse.de +- updated to 1.6.1: + * handle properly the exit code when pager is used + * various git-gui updates including translations + * gitweb updates + * many other improvements / fixes. See release notes + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt +* Fri Dec 19 2008 lnussel(a)suse.de +- add apparmor profile for git-web +- don't use %%jobs for generating docu +- change gitexecdir to /usr/lib instead of %%_libdir +* Wed Dec 17 2008 tiwai(a)suse.de +- Fix VUL-0 Possible gitweb vulnerability: calling "git diff" + [bnc#459664] * Wed Nov 19 2008 tiwai(a)suse.de - install git-shell and git-cvsserver as in the upstream (bnc#446049) ++++++ asciidoc.diff ++++++ --- /var/tmp/diff_new_pack.iU1931/_old 2009-01-08 18:09:54.000000000 +0100 +++ /var/tmp/diff_new_pack.iU1931/_new 2009-01-08 18:09:54.000000000 +0100 @@ -1,8 +1,6 @@ -diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf -index 40d43b7..9fe70b2 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf -@@ -24,7 +24,7 @@ ifdef::backend-docbook[] +@@ -24,7 +24,7 @@ endif::backend-docbook[] ifdef::backend-docbook[] @@ -11,12 +9,12 @@ # "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this. # v1.72 breaks with this because it replaces dots not in roff requests. [listingblock] -@@ -39,7 +39,7 @@ ifdef::doctype-manpage[] +@@ -39,7 +39,7 @@ endif::doctype-manpage[] </literallayout> {title#}</example> -endif::docbook-xsl-172[] +endif::docbook-xsl-168[] - endif::backend-docbook[] + ifdef::docbook-xsl-172[] ifdef::doctype-manpage[] ++++++ git-1.6.0.2.tar.bz2 -> git-1.6.1.tar.bz2 ++++++ ++++ 75538 lines of diff (skipped) ++++++ git-nohardlink.diff ++++++ don't use hardlinks as our .spec calls fdupes which converts the hardlinks to symlinks again in an unpredicatable way Index: git-1.6.0.2/Makefile =================================================================== --- git-1.6.0.2.orig/Makefile +++ git-1.6.0.2/Makefile @@ -1371,7 +1371,6 @@ endif ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \ cp git-add$X "$$execdir/git-add$X"; } && \ { $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \ - ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \ ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \ cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \ ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" ++++++ usr.share.git-web.gitweb.cgi ++++++ # Last Modified: Fri Dec 19 11:03:49 2008 #include <tunables/global> /usr/share/git-web/gitweb.cgi { #include <abstractions/base> #include <abstractions/bash> #include <abstractions/nameservice> #include <abstractions/perl> /bin/bash rix, /dev/tty rw, /etc/gitweb.conf r, /etc/mime.types r, /proc/meminfo r, /proc/sys/kernel/ngroups_max r, /srv/git/ r, /srv/git/** r, /usr/bin/perl ix, /usr/lib/git/git-add rix, /usr/share/git-web/* r, } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gzip for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package gzip for openSUSE:Factory checked in at Thu Jan 8 18:08:20 CET 2009. -------- --- gzip/gzip.changes 2008-05-08 14:19:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/gzip/gzip.changes 2009-01-07 14:00:11.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 7 13:59:52 CET 2009 - schwab(a)suse.de + +- Fixup rsyncable patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.g26332/_old 2009-01-08 18:07:00.000000000 +0100 +++ /var/tmp/diff_new_pack.g26332/_new 2009-01-08 18:07:00.000000000 +0100 @@ -1,10 +1,17 @@ # # spec file for package gzip (Version 1.3.12) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# 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://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Version: 1.3.12 -Release: 68 +Release: 97 Summary: GNU Zip Compression Utilities Source: %{name}-%{version}.tar.gz Patch: zgrep.diff @@ -107,11 +114,13 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog +* Wed Jan 07 2009 schwab(a)suse.de +- Fixup rsyncable patch. * Thu May 08 2008 schwab(a)suse.de - Fix zdiff with two compressed files. * Sun May 20 2007 schwab(a)suse.de - Fix compiling with glibc 2.6. -* Sun Apr 15 2007 schwab(a)suse.de +* Sat Apr 14 2007 schwab(a)suse.de - Update to gzip 1.3.12. * znew now uses $TMPDIR (default /tmp) instead of always using /tmp. * Tue Mar 27 2007 dmueller(a)suse.de @@ -273,5 +282,5 @@ - fixed "double" /bin/gzip & /usr/bin/gzip * Thu Apr 24 1997 bs(a)suse.de - added symlink /bin/gunzip -* Mon Apr 14 1997 florian(a)suse.de +* Sun Apr 13 1997 florian(a)suse.de - add bug-fixes from gnu.utils.bugs ++++++ gzip-rsyncable.diff ++++++ --- /var/tmp/diff_new_pack.g26332/_old 2009-01-08 18:07:00.000000000 +0100 +++ /var/tmp/diff_new_pack.g26332/_new 2009-01-08 18:07:00.000000000 +0100 @@ -5,9 +5,9 @@ upstream gzip at somepoint in the not-too-distant future. ================================================================================ ---- gzip-1.3.6/deflate.c -+++ gzip-1.3.6/deflate.c -@@ -135,6 +135,14 @@ +--- gzip-1.3.12/deflate.c ++++ gzip-1.3.12/deflate.c +@@ -135,6 +135,14 @@ static char rcsid[] = "$Id: deflate.c,v #endif /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ @@ -22,7 +22,7 @@ /* =========================================================================== * Local data used by the "longest match" routines. */ -@@ -216,6 +224,8 @@ +@@ -216,6 +224,8 @@ local int compr_level; unsigned near good_match; /* Use a faster search when the previous match is longer than this */ @@ -31,7 +31,7 @@ /* Values for max_lazy_match, good_match and max_chain_length, depending on * the desired pack level (0..9). The values given below have been tuned to -@@ -314,6 +324,10 @@ +@@ -314,6 +324,10 @@ void lm_init (pack_level, flags) #endif /* prev will be initialized on the fly */ @@ -42,7 +42,7 @@ /* Set the default configuration parameters: */ max_lazy_match = configuration_table[pack_level].max_lazy; -@@ -550,6 +564,8 @@ +@@ -550,6 +564,8 @@ local void fill_window() memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); match_start -= WSIZE; strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ @@ -51,7 +51,7 @@ block_start -= (long) WSIZE; -@@ -577,13 +593,46 @@ +@@ -577,13 +593,46 @@ local void fill_window() } } @@ -99,7 +99,7 @@ /* =========================================================================== * Processes a new input file and return its compressed length. This -@@ -594,7 +643,7 @@ +@@ -594,7 +643,7 @@ local void fill_window() local off_t deflate_fast() { IPos hash_head; /* head of the hash chain */ @@ -108,7 +108,7 @@ unsigned match_length = 0; /* length of best match */ prev_length = MIN_MATCH-1; -@@ -623,6 +672,7 @@ +@@ -624,6 +673,7 @@ local off_t deflate_fast() lookahead -= match_length; @@ -116,7 +116,7 @@ /* Insert new strings in the hash table only if the match length * is not too large. This saves time but degrades compression. */ -@@ -651,9 +701,14 @@ +@@ -652,9 +702,14 @@ local off_t deflate_fast() /* No match, output a literal byte */ Tracevv((stderr,"%c",window[strstart])); flush = ct_tally (0, window[strstart]); @@ -131,7 +131,7 @@ if (flush) FLUSH_BLOCK(0), block_start = strstart; /* Make sure that we always have enough lookahead, except -@@ -726,6 +781,7 @@ +@@ -728,6 +783,7 @@ off_t deflate() */ lookahead -= prev_length-1; prev_length -= 2; @@ -139,7 +139,7 @@ do { strstart++; INSERT_STRING(strstart, hash_head); -@@ -738,24 +794,39 @@ +@@ -740,24 +796,39 @@ off_t deflate() match_available = 0; match_length = MIN_MATCH-1; strstart++; @@ -183,11 +183,11 @@ strstart++; lookahead--; } ---- gzip-1.3.6/doc/gzip.texi -+++ gzip-1.3.6/doc/gzip.texi -@@ -328,6 +328,14 @@ +--- gzip-1.3.12/doc/gzip.texi ++++ gzip-1.3.12/doc/gzip.texi +@@ -350,6 +350,14 @@ specified on the command line are direct into the directory and compress all the files it finds there (or - decompress them in the case of @code{gunzip}). + decompress them in the case of @command{gunzip}). +@item --rsyncable +While compressing, synchronize the output occasionally based on the @@ -199,10 +199,10 @@ + @item --suffix @var{suf} @itemx -S @var{suf} - Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be ---- gzip-1.3.6/gzip.c -+++ gzip-1.3.6/gzip.c -@@ -218,6 +218,7 @@ + Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be +--- gzip-1.3.12/gzip.c ++++ gzip-1.3.12/gzip.c +@@ -231,6 +231,7 @@ int ofd; /* output fil unsigned insize; /* valid bytes in inbuf */ unsigned inptr; /* index of next byte to be processed in inbuf */ unsigned outcnt; /* bytes in output buffer */ @@ -210,7 +210,7 @@ struct option longopts[] = { -@@ -247,6 +248,7 @@ +@@ -260,6 +261,7 @@ struct option longopts[] = {"best", 0, 0, '9'}, /* compress better */ {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ @@ -218,9 +218,27 @@ { 0, 0, 0, 0 } }; ---- gzip-1.3.6/gzip.h -+++ gzip-1.3.6/gzip.h -@@ -155,6 +155,7 @@ +@@ -341,6 +343,7 @@ local void help() + " -Z, --lzw produce output compatible with old compress", + " -b, --bits=BITS max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + "", + "With no FILE, or when FILE is -, read standard input.", + "", +@@ -469,6 +472,9 @@ int main (argc, argv) + recursive = 1; + #endif + break; ++ case 'R': ++ rsync = 1; break; ++ + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; +--- gzip-1.3.12/gzip.h ++++ gzip-1.3.12/gzip.h +@@ -158,6 +158,7 @@ EXTERN(uch, window); /* Sliding extern unsigned insize; /* valid bytes in inbuf */ extern unsigned inptr; /* index of next byte to be processed in inbuf */ extern unsigned outcnt; /* bytes in output buffer */ @@ -228,7 +246,7 @@ extern off_t bytes_in; /* number of input bytes */ extern off_t bytes_out; /* number of output bytes */ -@@ -303,7 +304,7 @@ +@@ -306,7 +307,7 @@ off_t deflate OF((void)); /* in trees.c */ void ct_init OF((ush *attr, int *method)); int ct_tally OF((int dist, int lc)); @@ -237,8 +255,8 @@ /* in bits.c */ void bi_init OF((file_t zipfile)); ---- gzip-1.3.6/trees.c -+++ gzip-1.3.6/trees.c +--- gzip-1.3.12/trees.c ++++ gzip-1.3.12/trees.c @@ -59,12 +59,13 @@ * void ct_tally (int dist, int lc); * Save the match info and tally the frequency counts. @@ -257,7 +275,7 @@ #include <config.h> #include <ctype.h> -@@ -860,9 +861,10 @@ +@@ -860,9 +861,10 @@ local void send_all_trees(lcodes, dcodes * trees or store, and output the encoded block to the zip file. This function * returns the total compressed length for the file so far. */ @@ -269,7 +287,7 @@ int eof; /* true if this is the last block for a file */ { ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ -@@ -955,6 +957,10 @@ +@@ -955,6 +957,10 @@ off_t flush_block(buf, stored_len, eof) Assert (input_len == bytes_in, "bad input size"); bi_windup(); compressed_len += 7; /* align on byte boundary */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkhtml2 for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package gtkhtml2 for openSUSE:Factory checked in at Thu Jan 8 18:07:07 CET 2009. -------- --- GNOME/gtkhtml2/gtkhtml2.changes 2008-11-07 12:45:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtkhtml2/gtkhtml2.changes 2009-01-07 08:40:03.715371000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 7 08:18:09 CET 2009 - abharath(a)suse.de + +- Patches added + + bgo#330452 - bgo-330452-spell-suggestions.patch - Automatic spell + check suggestions should be first level menu option. + + bgo#562323 - bgo-562323-insert-link.patch - Evolution inserts + a link incorrectly. + + bgo#564248 - bgo-564248-gtkhtml-copy-paste-images.patch - Support + Copy And Paste Of Images. + + bnc#449966 - bnc-449966-gtkhtml-replace-dialog.patch - Unlocalised + Text on the Replace Dlg in Evolution. + + bnc#443551 - bnc-443551-background-table-colors.patch - Evolution + does not use selected background color inside table. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- bgo-330452-spell-suggestions.patch bgo-562323-insert-link.patch bgo-564248-gtkhtml-copy-paste-images.patch bnc-443551-background-table-colors.patch bnc-449966-gtkhtml-replace-dialog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkhtml2.spec ++++++ --- /var/tmp/diff_new_pack.f24840/_old 2009-01-08 18:06:39.000000000 +0100 +++ /var/tmp/diff_new_pack.f24840/_new 2009-01-08 18:06:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gtkhtml2 (Version 3.24.1.1) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: gtkhtml2 Version: 3.24.1.1 -Release: 1 +Release: 2 %define _name gtkhtml BuildRequires: enchant-devel BuildRequires: fdupes @@ -46,6 +46,16 @@ Source: ftp://ftp.gnome.org/pub/gnome/sources/%{_name}/3.12/%{_name}-%{version}.tar… # PATCH-FIX-UPSTREAM gtkhtml-im-crash.patch bgo555420(pending) bnc65247==suse50247 sbrabec(a)suse.cz -- Fix crash with some IM modules. Patch1: gtkhtml-im-crash.patch +# PATCH-FIX-UPSTREAM bgo-330452-spell-suggestions.patch bgo330452 -- Patch is part of GNOME 2.25.4 release. +Patch2: bgo-330452-spell-suggestions.patch +# PATCH-FIX-UPSTREAM bgo-562323-insert-link.patch bgo562323 -- Patch is part of GNOME 2.25.4 release. +Patch3: bgo-562323-insert-link.patch +# PATCH-FIX-UPSTREAM bgo-564248-gtkhtml-copy-paste-images.patch bgo564248 -- Patch is part of GNOME 2.25.4 release. +Patch4: bgo-564248-gtkhtml-copy-paste-images.patch +# PATCH-FIX-UPSTREAM bnc-449966-gtkhtml-replace-dialog.patch bnc449966 -- +Patch5: bnc-449966-gtkhtml-replace-dialog.patch +# PATCH-FIX-UPSTREAM bnc-443551-background-table-colors.patch bnc443551 -- Patch yet to be pushed upstream. +Patch6: bnc-443551-background-table-colors.patch %description GtkHTML is a lightweight HTML rendering, printing, and editing engine. @@ -118,6 +128,11 @@ #'` %setup -q -n %{_name}-%{version} %patch1 -p0 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 %build autoreconf -f -i @@ -158,6 +173,18 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 07 2009 abharath(a)suse.de +- Patches added + + bgo#330452 - bgo-330452-spell-suggestions.patch - Automatic spell + check suggestions should be first level menu option. + + bgo#562323 - bgo-562323-insert-link.patch - Evolution inserts + a link incorrectly. + + bgo#564248 - bgo-564248-gtkhtml-copy-paste-images.patch - Support + Copy And Paste Of Images. + + bnc#449966 - bnc-449966-gtkhtml-replace-dialog.patch - Unlocalised + Text on the Replace Dlg in Evolution. + + bnc#443551 - bnc-443551-background-table-colors.patch - Evolution + does not use selected background color inside table. * Fri Nov 07 2008 psankar(a)suse.de - Push gtkhtml 3.24.1.1 tarball + Bug fixes: bgo #338921 ++++++ bgo-330452-spell-suggestions.patch ++++++ Index: components/editor/gtkhtml-editor.ui =================================================================== --- components/editor/gtkhtml-editor.ui (revision 9048) +++ components/editor/gtkhtml-editor.ui (working copy) @@ -137,6 +137,13 @@ <toolitem action='insert-table'/> </toolbar> <popup name='context-menu'> + <placeholder name='context-spell-suggest'/> + <menu action='context-more-suggestions-menu'/> + <separator/> + <menuitem action='context-spell-ignore'/> + <menu action='context-spell-add-menu'/> + <menuitem action='context-spell-add'/> + <separator/> <menuitem action='undo'/> <menuitem action='redo'/> <separator/> @@ -175,12 +182,6 @@ <menuitem action='context-delete-cell'/> </menu> <separator/> - <placeholder name='context-spell-suggest'/> - <separator/> - <menuitem action='context-spell-ignore'/> - <menu action='context-spell-add-menu'/> - <menuitem action='context-spell-add'/> - <separator/> <menu action='context-input-methods-menu'/> </popup> </ui> Index: components/editor/gtkhtml-editor-actions.c =================================================================== --- components/editor/gtkhtml-editor-actions.c (revision 9048) +++ components/editor/gtkhtml-editor-actions.c (working copy) @@ -2153,6 +2153,15 @@ static GtkActionEntry spell_context_entr N_("Add Word To"), NULL, NULL, + NULL }, + + /* Menus */ + + { "context-more-suggestions-menu", + NULL, + N_("More Suggestions"), + NULL, + NULL, NULL } }; Index: components/editor/gtkhtml-editor-private.c =================================================================== --- components/editor/gtkhtml-editor-private.c (revision 9048) +++ components/editor/gtkhtml-editor-private.c (working copy) @@ -41,6 +41,26 @@ PACKAGE " could not find the required fi "\nSee http://www.freedesktop.org/Standards/basedir-spec for more\n" \ "information about standard base directories.\n\n" +/* This controls how spelling suggestions are divided between the primary + * context menu and a secondary menu. The idea is to prevent the primary + * menu from growing too long. + * + * The constants below are used as follows: + * + * if TOTAL_SUGGESTIONS <= MAX_LEVEL1_SUGGETIONS: + * LEVEL1_SUGGESTIONS = TOTAL_SUGGESTIONS + * elif TOTAL_SUGGESTIONS - MAX_LEVEL1_SUGGESTIONS < MIN_LEVEL2_SUGGESTIONS: + * LEVEL1_SUGGESTIONS = TOTAL_SUGGESTIONS + * else + * LEVEL1_SUGGESTIONS = MAX_LEVEL1_SUGGETIONS + * + * LEVEL2_SUGGESTIONS = TOTAL_SUGGESTIONS - LEVEL1_SUGGESTIONS + * + * Note that MAX_LEVEL1_SUGGETIONS is not a hard maximum. + */ +#define MAX_LEVEL1_SUGGESTIONS 3 +#define MIN_LEVEL2_SUGGESTIONS 3 + /************************ Begin Spell Dialog Callbacks ***********************/ static void @@ -674,17 +694,103 @@ action_context_spell_suggest_cb (GtkActi GtkhtmlEditor *editor) { GtkHTML *html; - gchar *label; + const gchar *word; + + html = gtkhtml_editor_get_html (editor); + + word = g_object_get_data (G_OBJECT (action), "word"); + g_return_if_fail (word != NULL); + + html_engine_replace_spell_word_with (html->engine, word); +} + +static void +editor_inline_spelling_suggestions (GtkhtmlEditor *editor, + GtkhtmlSpellChecker *checker) +{ + GtkActionGroup *action_group; + GtkUIManager *manager; + GtkHTML *html; + GList *list; + const gchar *path; + gchar *word; + guint count = 0; + guint length; + guint merge_id; + guint threshold; html = gtkhtml_editor_get_html (editor); + word = html_engine_get_spell_word (html->engine); + list = gtkhtml_spell_checker_get_suggestions (checker, word, -1); + + path = "/context-menu/context-spell-suggest/"; + manager = gtkhtml_editor_get_ui_manager (editor); + action_group = editor->priv->suggestion_actions; + merge_id = editor->priv->spell_suggestions_merge_id; + + /* Calculate how many suggestions to put directly in the + * context menu. The rest will go in a secondary menu. */ + length = g_list_length (list); + if (length <= MAX_LEVEL1_SUGGESTIONS) + threshold = length; + else if (length - MAX_LEVEL1_SUGGESTIONS < MIN_LEVEL2_SUGGESTIONS) + threshold = length; + else + threshold = MAX_LEVEL1_SUGGESTIONS; + + while (list != NULL) { + gchar *suggestion = list->data; + gchar *action_name; + gchar *action_label; + GtkAction *action; + GtkWidget *child; + GSList *proxies; + + /* Once we reach the threshold, put all subsequent + * spelling suggestions in a secondary menu. */ + if (count == threshold) + path = "/context-menu/context-more-suggestions-menu/"; - /* The action's label is the replacement word. */ - g_object_get (action, "label", &label, NULL); - g_return_if_fail (label != NULL); + /* Action name just needs to be unique. */ + action_name = g_strdup_printf ("suggest-%d", count++); + + action_label = g_markup_printf_escaped ( + "%s", suggestion); + + action = gtk_action_new ( + action_name, action_label, NULL, NULL); + + g_object_set_data_full ( + G_OBJECT (action), "word", + g_strdup (suggestion), g_free); + + g_signal_connect ( + action, "activate", G_CALLBACK ( + action_context_spell_suggest_cb), editor); + + gtk_action_group_add_action (action_group, action); + + gtk_ui_manager_add_ui ( + manager, merge_id, path, + action_name, action_name, + GTK_UI_MANAGER_AUTO, FALSE); + + /* XXX GtkAction offers no support for Pango markup, + * so we have to manually set "use-markup" on the + * child of the proxy widget. */ + gtk_ui_manager_ensure_update (manager); + proxies = gtk_action_get_proxies (action); + child = gtk_bin_get_child (proxies->data); + g_object_set (child, "use-markup", TRUE, NULL); + + g_free (suggestion); + g_free (action_name); + g_free (action_label); - html_engine_replace_spell_word_with (html->engine, label); + list = g_list_delete_link (list, list); + } - g_free (label); + g_free (word); } /* Helper for gtkhtml_editor_update_context() */ @@ -730,6 +836,10 @@ editor_spell_checkers_foreach (GtkhtmlSp action = gtk_action_new ( action_name, action_label, NULL, NULL); + g_object_set_data_full ( + G_OBJECT (action), "word", + g_strdup (action_label), g_free); + g_signal_connect ( action, "activate", G_CALLBACK ( action_context_spell_suggest_cb), editor); @@ -880,6 +990,12 @@ gtkhtml_editor_update_context (GtkhtmlEd merge_id = gtk_ui_manager_new_merge_id (manager); editor->priv->spell_suggestions_merge_id = merge_id; + /* Handle a single active language as a special case. */ + if (g_list_length (list) == 1) { + editor_inline_spelling_suggestions (editor, list->data); + return; + } + /* Add actions and context menu content for active languages. */ g_list_foreach (list, (GFunc) editor_spell_checkers_foreach, editor); } ++++++ bgo-562323-insert-link.patch ++++++ Index: components/editor/gtkhtml-editor-signals.c =================================================================== --- components/editor/gtkhtml-editor-signals.c (revision 9048) +++ components/editor/gtkhtml-editor-signals.c (working copy) @@ -1153,13 +1153,13 @@ gtkhtml_editor_link_properties_show_wind sensitive = (url == NULL); - gtk_entry_set_text ( - GTK_ENTRY (url_entry), - (url != NULL) ? url : "http://"); - editor->priv->link_object = cursor->object; editor->priv->link_start_offset = start_offset; editor->priv->link_end_offset = end_offset; + + gtk_entry_set_text ( + GTK_ENTRY (url_entry), + (url != NULL) ? url : "http://"); } gtk_entry_set_text (GTK_ENTRY (dsc_entry), ""); ++++++ bgo-564248-gtkhtml-copy-paste-images.patch ++++++ Index: components/editor/gtkhtml-editor.c =================================================================== --- components/editor/gtkhtml-editor.c (revision 9066) +++ components/editor/gtkhtml-editor.c (working copy) @@ -1554,6 +1554,28 @@ gtkhtml_editor_insert_html (GtkhtmlEdito gtk_html_insert_html (html, html_text); } +/* inserts local files only, as inlined */ +void +gtkhtml_editor_insert_image (GtkhtmlEditor *editor, + const gchar *filename_uri) +{ + GtkHTML *html; + + g_return_if_fail (GTKHTML_IS_EDITOR (editor)); + g_return_if_fail (filename_uri != NULL); + + html = gtkhtml_editor_get_html (editor); + + if (html) { + HTMLObject *image; + + image = html_image_new ( + html_engine_get_image_factory (html->engine), filename_uri, + NULL, NULL, 0, 0, 0, 0, 0, NULL, HTML_VALIGN_NONE, FALSE); + html_engine_paste_object (html->engine, image, 1); + } +} + gboolean gtkhtml_editor_search_by_data (GtkhtmlEditor *editor, glong level, Index: components/editor/gtkhtml-editor.h =================================================================== --- components/editor/gtkhtml-editor.h (revision 9066) +++ components/editor/gtkhtml-editor.h (working copy) @@ -163,6 +163,8 @@ gboolean gtkhtml_editor_is_previous_para (GtkhtmlEditor *editor); void gtkhtml_editor_insert_html (GtkhtmlEditor *editor, const gchar *html_text); +void gtkhtml_editor_insert_image (GtkhtmlEditor *editor, + const gchar *filename_uri); gboolean gtkhtml_editor_search_by_data (GtkhtmlEditor *editor, glong level, const gchar *klass, ++++++ bnc-443551-background-table-colors.patch ++++++ Index: components/editor/gtkhtml-color-state.c =================================================================== --- components/editor/gtkhtml-color-state.c (revision 9074) +++ components/editor/gtkhtml-color-state.c (working copy) @@ -31,6 +31,7 @@ enum { PROP_CURRENT_COLOR, PROP_DEFAULT_COLOR, PROP_DEFAULT_LABEL, + PROP_DEFAULT_TRANSPARENT, PROP_PALETTE }; @@ -45,6 +46,7 @@ struct _GtkhtmlColorStatePrivate { gchar *default_label; GtkhtmlColorPalette *palette; gulong palette_handler_id; + gboolean default_transparent; }; static gpointer parent_class; @@ -83,6 +85,12 @@ color_state_set_property (GObject *objec g_value_get_string (value)); return; + case PROP_DEFAULT_TRANSPARENT: + gtkhtml_color_state_set_default_transparent ( + GTKHTML_COLOR_STATE (object), + g_value_get_boolean (value)); + return; + case PROP_PALETTE: gtkhtml_color_state_set_palette ( GTKHTML_COLOR_STATE (object), @@ -120,6 +128,13 @@ color_state_get_property (GObject *objec GTKHTML_COLOR_STATE (object))); return; + case PROP_DEFAULT_TRANSPARENT: + g_value_set_boolean ( + value, + gtkhtml_color_state_get_default_transparent ( + GTKHTML_COLOR_STATE (object))); + return; + case PROP_PALETTE: g_value_set_object ( value, gtkhtml_color_state_get_palette ( @@ -216,6 +231,17 @@ color_state_class_init (GtkhtmlColorStat g_object_class_install_property ( object_class, + PROP_DEFAULT_TRANSPARENT, + g_param_spec_boolean ( + "default-transparent", + _("Default is transparent"), + _("Whether the default color is transparent"), + FALSE, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, PROP_PALETTE, g_param_spec_object ( "palette", @@ -385,6 +411,25 @@ gtkhtml_color_state_set_default_label (G g_object_notify (G_OBJECT (state), "default-label"); } +gboolean +gtkhtml_color_state_get_default_transparent (GtkhtmlColorState *state) +{ + g_return_val_if_fail (GTKHTML_IS_COLOR_STATE (state), FALSE); + + return state->priv->default_transparent; +} + +void +gtkhtml_color_state_set_default_transparent (GtkhtmlColorState *state, + gboolean transparent) +{ + g_return_if_fail (GTKHTML_IS_COLOR_STATE (state)); + + state->priv->default_transparent = transparent; + + g_object_notify (G_OBJECT (state), "default-transparent"); +} + GtkhtmlColorPalette * gtkhtml_color_state_get_palette (GtkhtmlColorState *state) { Index: components/editor/gtkhtml-color-state.h =================================================================== --- components/editor/gtkhtml-color-state.h (revision 9074) +++ components/editor/gtkhtml-color-state.h (working copy) @@ -86,6 +86,11 @@ const gchar * gtkhtml_color_state_get_de void gtkhtml_color_state_set_default_label (GtkhtmlColorState *state, const gchar *text); +gboolean gtkhtml_color_state_get_default_transparent + (GtkhtmlColorState *state); +void gtkhtml_color_state_set_default_transparent + (GtkhtmlColorState *state, + gboolean transparent); GtkhtmlColorPalette * gtkhtml_color_state_get_palette (GtkhtmlColorState *state); void gtkhtml_color_state_set_palette (GtkhtmlColorState *state, Index: components/editor/gtkhtml-color-swatch.c =================================================================== --- components/editor/gtkhtml-color-swatch.c (revision 9074) +++ components/editor/gtkhtml-color-swatch.c (working copy) @@ -271,7 +271,6 @@ gtkhtml_color_swatch_set_color (GtkhtmlC GtkWidget *drawing_area; g_return_if_fail (GTKHTML_IS_COLOR_SWATCH (swatch)); - g_return_if_fail (color != NULL); drawing_area = swatch->priv->drawing_area; gtk_widget_modify_bg (drawing_area, GTK_STATE_NORMAL, color); Index: components/editor/gtkhtml-color-combo.c =================================================================== --- components/editor/gtkhtml-color-combo.c (revision 9074) +++ components/editor/gtkhtml-color-combo.c (working copy) @@ -39,6 +39,7 @@ enum { PROP_CURRENT_COLOR, PROP_DEFAULT_COLOR, PROP_DEFAULT_LABEL, + PROP_DEFAULT_TRANSPARENT, PROP_PALETTE, PROP_POPUP_SHOWN, PROP_STATE @@ -128,8 +129,12 @@ color_combo_notify_current_color_cb (Gtk GdkColor color; swatch = GTKHTML_COLOR_SWATCH (combo->priv->swatch); - gtkhtml_color_combo_get_current_color (combo, &color); - gtkhtml_color_swatch_set_color (swatch, &color); + if (gtkhtml_color_combo_get_current_color (combo, &color)) + gtkhtml_color_swatch_set_color (swatch, &color); + else if (gtkhtml_color_combo_get_default_transparent (combo)) + gtkhtml_color_swatch_set_color (swatch, NULL); + else + gtkhtml_color_swatch_set_color (swatch, &color); g_signal_emit (G_OBJECT (combo), signals[CHANGED], 0); } @@ -443,6 +448,12 @@ color_combo_set_property (GObject *objec g_value_get_string (value)); return; + case PROP_DEFAULT_TRANSPARENT: + gtkhtml_color_combo_set_default_transparent ( + GTKHTML_COLOR_COMBO (object), + g_value_get_boolean (value)); + return; + case PROP_PALETTE: gtkhtml_color_combo_set_palette ( GTKHTML_COLOR_COMBO (object), @@ -498,6 +509,13 @@ color_combo_get_property (GObject *objec GTKHTML_COLOR_COMBO (object))); return; + case PROP_DEFAULT_TRANSPARENT: + g_value_set_boolean ( + value, + gtkhtml_color_combo_get_default_transparent ( + GTKHTML_COLOR_COMBO (object))); + return; + case PROP_PALETTE: g_value_set_object ( value, gtkhtml_color_combo_get_palette ( @@ -719,6 +737,17 @@ color_combo_class_init (GtkhtmlColorComb g_object_class_install_property ( object_class, + PROP_DEFAULT_TRANSPARENT, + g_param_spec_boolean ( + "default-transparent", + _("Default is transparent"), + _("Whether the default color is transparent"), + FALSE, + G_PARAM_CONSTRUCT | + G_PARAM_READWRITE)); + + g_object_class_install_property ( + object_class, PROP_PALETTE, g_param_spec_object ( "palette", @@ -1073,6 +1102,24 @@ gtkhtml_color_combo_set_default_label (G gtkhtml_color_state_set_default_label (combo->priv->state, text); } +gboolean +gtkhtml_color_combo_get_default_transparent (GtkhtmlColorCombo *combo) +{ + g_return_val_if_fail (GTKHTML_IS_COLOR_COMBO (combo), FALSE); + + return gtkhtml_color_state_get_default_transparent (combo->priv->state); +} + +void +gtkhtml_color_combo_set_default_transparent (GtkhtmlColorCombo *combo, + gboolean transparent) +{ + g_return_if_fail (GTKHTML_IS_COLOR_COMBO (combo)); + + gtkhtml_color_state_set_default_transparent ( + combo->priv->state, transparent); +} + GtkhtmlColorPalette * gtkhtml_color_combo_get_palette (GtkhtmlColorCombo *combo) { Index: components/editor/gtkhtml-color-combo.h =================================================================== --- components/editor/gtkhtml-color-combo.h (revision 9074) +++ components/editor/gtkhtml-color-combo.h (working copy) @@ -86,6 +86,11 @@ const gchar * gtkhtml_color_combo_get_de void gtkhtml_color_combo_set_default_label (GtkhtmlColorCombo *combo, const gchar *text); +gboolean gtkhtml_color_combo_get_default_transparent + (GtkhtmlColorCombo *combo); +void gtkhtml_color_combo_set_default_transparent + (GtkhtmlColorCombo *combo, + gboolean transparent); GtkhtmlColorPalette * gtkhtml_color_combo_get_palette (GtkhtmlColorCombo *combo); void gtkhtml_color_combo_set_palette (GtkhtmlColorCombo *combo, Index: components/editor/gtkhtml-editor.glade =================================================================== --- components/editor/gtkhtml-editor.glade (revision 9074) +++ components/editor/gtkhtml-editor.glade (working copy) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> - + <glade-interface> <requires lib="gtkhtml-editor"/> <widget class="GtkWindow" id="text-properties-window"> @@ -1717,6 +1717,8 @@ Right</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="default_color">#000000000000</property> <property name="default_label">Transparent</property> + <property name="default_transparent">True</property> + <signal name="changed" handler="gtkhtml_editor_table_properties_color_changed_cb" object="table-properties-window"/> </widget> <packing> <property name="left_attach">1</property> @@ -2614,6 +2616,8 @@ Right</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="default_color">#000000000000</property> <property name="default_label">Transparent</property> + <property name="default_transparent">True</property> + <signal name="changed" handler="gtkhtml_editor_cell_properties_color_changed_cb" object="cell-properties-window"/> </widget> <packing> <property name="left_attach">1</property> @@ -3156,7 +3160,6 @@ Bottom</property> <widget class="GtkTable" id="image-properties-link-table"> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="n_rows">1</property> <property name="n_columns">3</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> Index: components/editor/gtkhtml-editor-signals.c =================================================================== --- components/editor/gtkhtml-editor-signals.c (revision 9074) +++ components/editor/gtkhtml-editor-signals.c (working copy) @@ -183,14 +183,19 @@ cell_properties_set_background_color_cb HTMLTableCell *cell, GtkWidget *widget) { + GtkhtmlColorCombo *combo; GtkHTML *html; GdkColor color; + gboolean got_color; + combo = GTKHTML_COLOR_COMBO (widget); html = gtkhtml_editor_get_html (editor); - gtkhtml_color_combo_get_current_color ( - GTKHTML_COLOR_COMBO (widget), &color); - html_engine_table_cell_set_bg_color (html->engine, cell, &color); + /* The default table cell color is transparent. */ + got_color = gtkhtml_color_combo_get_current_color (combo, &color); + + html_engine_table_cell_set_bg_color ( + html->engine, cell, got_color ? &color : NULL); } static void @@ -463,9 +468,9 @@ gtkhtml_editor_cell_properties_show_wind gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); widget = WIDGET (CELL_PROPERTIES_COLOR_COMBO); - if (cell->have_bg) - gtkhtml_color_combo_set_current_color ( - GTKHTML_COLOR_COMBO (widget), &cell->bg); + gtkhtml_color_combo_set_current_color ( + GTKHTML_COLOR_COMBO (widget), + cell->have_bg ? &cell->bg : NULL); widget = WIDGET (CELL_PROPERTIES_IMAGE_FILE_CHOOSER); if (cell->have_bgPixmap) { @@ -1688,6 +1693,27 @@ gtkhtml_editor_table_properties_border_c } AUTOCONNECTED_SIGNAL_HANDLER (void +gtkhtml_editor_table_properties_color_changed_cb (GtkWidget *window, + GtkhtmlColorCombo *combo)) +{ + GtkhtmlEditor *editor; + HTMLTable *table; + GtkHTML *html; + GdkColor color; + gboolean got_color; + + editor = extract_gtkhtml_editor (window); + html = gtkhtml_editor_get_html (editor); + table = HTML_TABLE (editor->priv->table_object); + + /* The default table color is transparent. */ + got_color = gtkhtml_color_combo_get_current_color (combo, &color); + + html_engine_table_set_bg_color ( + html->engine, table, got_color ? &color : NULL); +} + +AUTOCONNECTED_SIGNAL_HANDLER (void gtkhtml_editor_table_properties_cols_changed_cb (GtkWidget *window, GtkSpinButton *button)) { @@ -1861,7 +1887,9 @@ gtkhtml_editor_table_properties_show_win widget = WIDGET (TABLE_PROPERTIES_BORDER_SPIN_BUTTON); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value); - /* TODO - Initialize color combo */ + widget = WIDGET (TABLE_PROPERTIES_COLOR_COMBO); + gtkhtml_color_combo_set_current_color ( + GTKHTML_COLOR_COMBO (widget), table->bgColor); if (table->bgPixmap != NULL) { gchar *filename; ++++++ bnc-449966-gtkhtml-replace-dialog.patch ++++++ Index: components/editor/gtkhtml-editor-private.c =================================================================== --- components/editor/gtkhtml-editor-private.c (revision 9057) +++ components/editor/gtkhtml-editor-private.c (working copy) @@ -19,6 +19,7 @@ */ #include "gtkhtml-editor-private.h" +#include "config.h" #include <stdlib.h> @@ -218,7 +219,7 @@ glade_provide ("gtkhtml-editor"); filename = gtkhtml_editor_find_data_file ("gtkhtml-editor.glade"); - priv->glade_xml = glade_xml_new (filename, NULL, NULL); + priv->glade_xml = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); glade_xml_signal_autoconnect (priv->glade_xml); g_free (filename); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtk2 for openSUSE:Factory
by root＠Hilbert.suse.de 08 Jan '09

08 Jan '09

Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at Thu Jan 8 18:06:49 CET 2009. -------- --- GNOME/gtk2/gtk2.changes 2008-12-10 14:06:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/gtk2/gtk2.changes 2008-12-23 22:45:48.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Dec 23 15:29:10 CST 2008 - federico(a)novell.com + +- Updated gtk2-bnc355503-file-chooser-remember-geometry.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=445923 - The file + chooser was resizing itself each time you clicked on a file in + Firefox's file dialog. Also fixes flicker during the file chooser's + startup. +- Added gtk2-bnc447004-treeview-lines-rtl.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=447004 - Tree view + hierarchy lines were drawn incorrectly in right-to-left languages. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gtk2-bnc447004-treeview-lines-rtl.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.E21008/_old 2009-01-08 18:06:34.000000000 +0100 +++ /var/tmp/diff_new_pack.E21008/_new 2009-01-08 18:06:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gtk2 (Version 2.14.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,7 +49,7 @@ # PreReq: /usr/bin/touch /bin/rm /bin/rmdir Version: 2.14.4 -Release: 8 +Release: 9 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar… Source1: SuSEconfig.gtk2 @@ -96,6 +96,7 @@ # PATCH-FEATURE-OPENSUSE gtk2-bnc355503-file-chooser-remember-geometry.diff bnc355503 federico(a)novell.com - Make the file chooser remember its size across invocations Patch55: gtk2-bnc355503-file-chooser-remember-geometry.diff Patch56: gtk2-191223-java-selection-fix-updated.patch +Patch57: gtk2-bnc447004-treeview-lines-rtl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: cairo >= 0.9.2 hicolor-icon-theme %if %suse_version > 1020 @@ -323,6 +324,7 @@ %patch54 -p1 %patch55 -p1 %patch56 -p1 +%patch57 -p1 # gnome-patch-translation-update %build @@ -457,10 +459,19 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Dec 23 2008 federico(a)novell.com +- Updated gtk2-bnc355503-file-chooser-remember-geometry.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=445923 - The file + chooser was resizing itself each time you clicked on a file in + Firefox's file dialog. Also fixes flicker during the file chooser's + startup. +- Added gtk2-bnc447004-treeview-lines-rtl.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=447004 - Tree view + hierarchy lines were drawn incorrectly in right-to-left languages. * Wed Dec 10 2008 olh(a)suse.de - use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade (bnc#437293) -* Fri Dec 05 2008 hpj(a)novell.com +* Thu Dec 04 2008 hpj(a)novell.com - Added gtk2-filechooser-mount-parent.patch (bgo#561494 bnc#445362). - Added gtk2-filechooser-network-browsing.patch (bgo561494 @@ -470,7 +481,7 @@ smb:// or smb://server/ in a GTK file chooser. * Mon Nov 24 2008 olh(a)suse.de - obsolete old -XXbit packages (bnc#437293) -* Wed Nov 19 2008 pwu(a)suse.de +* Tue Nov 18 2008 pwu(a)suse.de - Change gtk_selection_data_get_targets to java X Selection type. The java X Selection "TARGETS"'s type is "TARGETS" not "ATOM". Fixes https://bugzilla.novell.com/show_bug.cgi?id=191223. @@ -483,7 +494,7 @@ https://bugzilla.novell.com/show_bug.cgi?id=355503 - The file chooser now remembers its window size across invocations, so it does not have to be resized every time. -* Mon Nov 03 2008 vuntz(a)novell.com +* Sun Nov 02 2008 vuntz(a)novell.com - Remove gtk-warn.patch: already fixed upstream. * Tue Oct 21 2008 maw(a)suse.de - Update to version 2.14.4: @@ -511,7 +522,7 @@ - add gcc-c++ to buildrequires to work around libtool problem * Sun Sep 28 2008 ro(a)suse.de - add gcc-c++ to buildrequires to work around libtool problem -* Tue Sep 09 2008 maw(a)suse.de +* Mon Sep 08 2008 maw(a)suse.de - Update to version 2.14.1: + Fix a deadlock in pixbuf loader initialization + Updated translations. @@ -558,7 +569,7 @@ bgo#540834, bgo#515596, bgo#534979, bgo#382291, bgo#545982, and bgo#544858 + Updated translations. -* Fri Aug 01 2008 maw(a)suse.de +* Thu Jul 31 2008 maw(a)suse.de - Update to version 2.13.5: + Merge the GSEAL branch (see http://live.gnome.org/GTK+/3.0/Tasks); as a result, members of structures can be conditionally be @@ -592,7 +603,7 @@ + Updated translations - Respin gtk+-strict-aliasing.patch - Drop gtk2-remove-empty-cache.patch and update SuSEconfig.gtk2. -* Wed Jul 23 2008 coolo(a)suse.de +* Tue Jul 22 2008 coolo(a)suse.de - obsolete gail-<targettype> * Mon Jul 21 2008 federico(a)novell.com - Tagged all the patches that didn't have tags. @@ -669,7 +680,7 @@ completion. * Tue May 06 2008 schwab(a)suse.de - Don't use libtool before it is created. -* Tue May 06 2008 federico(a)novell.com +* Mon May 05 2008 federico(a)novell.com - Added gtk2-bnc310710-bgo524166-underallocated-gtklabel-position.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=310710 - Labels with too-small allocations should still pay attention to their @@ -881,7 +892,7 @@ - adding hicolor-icon-theme to Requires [#249043] * Thu Apr 19 2007 sbrabec(a)suse.cz - Correctly initialize XDG_DATA_DIRS in SuSEconfig (#240603). -* Thu Apr 12 2007 maw(a)suse.de +* Wed Apr 11 2007 maw(a)suse.de - Remove some extraneous comments that were inadvertently left in the .spec. * Tue Apr 10 2007 sbrabec(a)suse.cz @@ -910,7 +921,7 @@ https://bugzilla.novell.com/show_bug.cgi?id=216883. The "Home" and "Desktop" items in the shortcuts pane of the file chooser would not show sometimes in SAVE mode. -* Thu Jan 18 2007 maw(a)suse.de +* Wed Jan 17 2007 maw(a)suse.de - Add gtk2-235661-pixbuf-loader-error-checking.diff (#235661). * Tue Jan 16 2007 sbrabec(a)suse.cz - Build with correct CFLAGS. @@ -923,9 +934,9 @@ * Mon Dec 11 2006 sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Sat Nov 11 2006 danw(a)suse.de +* Fri Nov 10 2006 danw(a)suse.de - Update gtk64.patch to fix stock icon cache on x86_64 (213922) -* Wed Nov 08 2006 jhargadon(a)suse.de +* Tue Nov 07 2006 jhargadon(a)suse.de - removed the execute bit from /etc/opt/gnome/gtk-2.0/gtkrc * Tue Oct 17 2006 jhargadon(a)suse.de - update to version 2.10.6 @@ -991,13 +1002,13 @@ - lots of updates in the printing area - various fixes in many other places - countless bugfixes -* Wed Jun 21 2006 federico(a)novell.com +* Tue Jun 20 2006 federico(a)novell.com - Added gtk2-184875-filechooser-location-entry-set-path.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=184875. This makes the location entry in the file chooser preserve the filename from gtk_file_chooser_set_filename() and set_uri(). It was incorrectly using just the directory name instead of the file name. -* Wed Jun 07 2006 federico(a)novell.com +* Tue Jun 06 2006 federico(a)novell.com - Added gtk2-179040-file-chooser-location-entry-folder.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=179040. This makes the location entry in GtkFileChooser update correctly when you switch @@ -1008,11 +1019,11 @@ months or years. * Thu Jun 01 2006 sbrabec(a)suse.cz - Fixed I18N of file selector navigation buttons (#180696). -* Sun May 28 2006 joeshaw(a)suse.de +* Sat May 27 2006 joeshaw(a)suse.de - Add gtk2-filechooserbutton-signal-disconnect-fix.patch to fix a crash when a GtkFileChooserButton is destroyed but not finalized and bookmarks or volumes change. (bnc #178122) -* Wed May 24 2006 federico(a)novell.com +* Tue May 23 2006 federico(a)novell.com - Updated gtk+-2.8.6-fontsel-fix.patch to fix bug https://bugzilla.novell.com/show_bug.cgi?id=177997. The previous patch caused crashes in all font selectors. @@ -1030,7 +1041,7 @@ just switched folders. * Mon Apr 03 2006 sbrabec(a)suse.cz - Fixed context translation bugs (GNOME#336645). -* Thu Mar 30 2006 federico(a)novell.com +* Wed Mar 29 2006 federico(a)novell.com - Removed gtk2-151580-filechooser-beagle.diff. - Added gtk2-filechooser-new-features.diff. This fixes bug #160605, so the file chooser now has an optional text entry for the file @@ -1038,13 +1049,13 @@ into the same patch. * Fri Mar 24 2006 rml(a)suse.de - Set default invisible char to something stetic (bug #160688) -* Fri Mar 24 2006 federico(a)novell.com +* Thu Mar 23 2006 federico(a)novell.com - Updated gtk2-151580-filechooser-beagle.diff to fix bug #156843. With this, the file chooser will no longer show a "Search" item in the "Save in folder" combo box. * Mon Mar 13 2006 sbrabec(a)suse.cz - Do not believe glibc first weekday (#130787, #104417). -* Tue Mar 07 2006 zsu(a)suse.de +* Mon Mar 06 2006 zsu(a)suse.de - Fixed gtkvts crash bug introduced by gtk+-2.8.6-fontsel.patch [#153099]. * Thu Feb 23 2006 federico(a)novell.com - Updated gtk2-151580-filechooser-beagle.diff; now we hide the search @@ -1067,7 +1078,7 @@ to translation compendium gnome-patch-translation. * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 gekker(a)suse.de +* Tue Jan 17 2006 gekker(a)suse.de - Add patch to improve scrolling speed in font selection (#130159) * Mon Jan 16 2006 meissner(a)suse.de - use -fstack-protector. @@ -1106,7 +1117,7 @@ * Tue Oct 11 2005 gekker(a)suse.de - Update to version 2.8.6 - Fix return of random data -* Wed Oct 05 2005 federico(a)novell.com +* Tue Oct 04 2005 federico(a)novell.com - Added gtk2-file-chooser-consistent-home-folder-name.diff so that $HOME will not appear as "Home", but rather as its actual name. This avoids having [/][home][Home] on the path bar. @@ -1115,7 +1126,7 @@ * Mon Oct 03 2005 gekker(a)suse.de - Update to version 2.8.4 - Remove upstream patches -* Fri Sep 30 2005 federico(a)novell.com +* Thu Sep 29 2005 federico(a)novell.com - Added gtk2-file-chooser-create-save-widgets-only-if-needed.diff and gtk2-file-chooser-no-reload.diff as optimizations for the file chooser's startup time. @@ -1136,11 +1147,11 @@ * Wed Aug 24 2005 rodrigo(a)suse.de - Update to version 2.8.1 - Updated gtk+-strict-aliasing.patch. -* Thu Aug 18 2005 gekker(a)suse.de +* Wed Aug 17 2005 gekker(a)suse.de - Update version to 2.8.0 (GNOME2.12) * Fri Aug 12 2005 gekker(a)suse.de - Fix crash in file chooser b.g.o (310270). -* Thu Aug 11 2005 gekker(a)suse.de +* Wed Aug 10 2005 gekker(a)suse.de - Update to version 2.7.5 - Remove upstreamed patch * Wed Aug 10 2005 clahey(a)suse.de @@ -1163,7 +1174,7 @@ - Fixed uninitialized variable warnings. * Mon Jun 20 2005 sbrabec(a)suse.cz - Create icon-cache files by SuSEconfig (#88599). -* Fri Jun 17 2005 gekker(a)suse.de +* Thu Jun 16 2005 gekker(a)suse.de - Fix gtk64.patch and build on x86_64. * Thu Jun 16 2005 gekker(a)suse.de - Update to version 2.6.8. @@ -1172,7 +1183,7 @@ - Use current name for XFree86-devel in Requires (#54136). * Mon May 02 2005 gekker(a)suse.de - Fix crasher in gtktextview (380). -* Mon Apr 04 2005 aj(a)suse.de +* Sun Apr 03 2005 aj(a)suse.de - Disable visibility to build with GCC4. This should be enabled again once gtk is fixed. * Fri Mar 18 2005 gekker(a)suse.de @@ -1269,7 +1280,7 @@ - Updated to version 2.2.4. * Thu Aug 28 2003 sbrabec(a)suse.cz - Updated to version 2.2.3. -* Thu Jul 24 2003 hhetter(a)suse.de +* Wed Jul 23 2003 hhetter(a)suse.de - fix SuSEconfig.gtk2 query paths * Wed Jul 16 2003 sbrabec(a)suse.cz - SuSEconfig.gtk2: Fixed paths to query binaries. @@ -1285,7 +1296,7 @@ - Fixed directory packaging. * Wed May 28 2003 sbrabec(a)suse.cz - Include manpage to devel package. -* Wed May 28 2003 ro(a)suse.de +* Tue May 27 2003 ro(a)suse.de - remove unpackaged files from buildroot * Thu May 22 2003 sbrabec(a)suse.cz - Fixed typo in Requires for -devel package (#27025). @@ -1298,7 +1309,7 @@ theme problems for all session types). * Wed Mar 12 2003 sbrabec(a)suse.cz - Fixed prefix clash for keyboard themes (fixes bug 25086). -* Mon Feb 10 2003 ro(a)suse.de +* Sun Feb 09 2003 ro(a)suse.de - create /etc/gtk-2.0 in SuSEconfig.gtk2 if needed * Thu Feb 06 2003 sbrabec(a)suse.cz - Updated to version 2.2.1. @@ -1400,7 +1411,7 @@ * Memory leak and UMR fixes * Misc bug fixes * Updated translations -* Thu Jun 13 2002 ro(a)suse.de +* Wed Jun 12 2002 ro(a)suse.de - use libpng-devel-packages in nededforbuild * Mon Jun 10 2002 meissner(a)suse.de - Need to use -mminimal-toc for ppc64. ++++++ gtk2-bnc355503-file-chooser-remember-geometry.diff ++++++ ++++ 1548 lines (skipped) ++++ between GNOME/gtk2/gtk2-bnc355503-file-chooser-remember-geometry.diff ++++ and /mounts/work_src_done/STABLE/gtk2/gtk2-bnc355503-file-chooser-remember-geometry.diff ++++++ gtk2-bnc447004-treeview-lines-rtl.diff ++++++ bnc447004 - Flip tree lines around in the right-to-left case 2008-11-29 Federico Mena Quintero <federico(a)novell.com> * gtk/gtktreeview.c (gtk_tree_view_bin_expose): If tree lines are enabled, flip them around for the right-to-left case. Fixes https://bugzilla.novell.com/show_bug.cgi?id=447004. Patch by Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> Signed-off-by: Federico Mena Quintero <federico(a)novell.com> diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 0ef05b2..451500b 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4572,24 +4572,33 @@ gtk_tree_view_bin_expose (GtkWidget *widget, if (gtk_tree_view_is_expander_column (tree_view, column) && tree_view->priv->tree_lines_enabled) { + gint x = background_area.x; + gint mult = rtl ? -1 : 1; + gint y0 = background_area.y; + gint y1 = background_area.y + background_area.height/2; + gint y2 = background_area.y + background_area.height; + + if (rtl) + x += background_area.width - 1; + if ((node->flags & GTK_RBNODE_IS_PARENT) == GTK_RBNODE_IS_PARENT && depth > 1) { gdk_draw_line (event->window, tree_view->priv->tree_line_gc, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y + background_area.height / 2, - background_area.x + tree_view->priv->expander_size * (depth - 1.1), - background_area.y + background_area.height / 2); + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y1, + x + tree_view->priv->expander_size * (depth - 1.1) * mult, + y1); } else if (depth > 1) { gdk_draw_line (event->window, tree_view->priv->tree_line_gc, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y + background_area.height / 2, - background_area.x + tree_view->priv->expander_size * (depth - 0.5), - background_area.y + background_area.height / 2); + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y1, + x + tree_view->priv->expander_size * (depth - 0.5) * mult, + y1); } if (depth > 1) @@ -4601,17 +4610,17 @@ gtk_tree_view_bin_expose (GtkWidget *widget, if (!_gtk_rbtree_next (tree, node)) gdk_draw_line (event->window, tree_view->priv->tree_line_gc, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y + background_area.height / 2); + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y0, + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y1); else gdk_draw_line (event->window, tree_view->priv->tree_line_gc, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y, - background_area.x + tree_view->priv->expander_size * (depth - 1.5), - background_area.y + background_area.height); + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y0, + x + tree_view->priv->expander_size * (depth - 1.5) * mult, + y2); tmp_node = tree->parent_node; tmp_tree = tree->parent_tree; @@ -4621,10 +4630,10 @@ gtk_tree_view_bin_expose (GtkWidget *widget, if (_gtk_rbtree_next (tmp_tree, tmp_node)) gdk_draw_line (event->window, tree_view->priv->tree_line_gc, - background_area.x + tree_view->priv->expander_size * (i - 0.5), - background_area.y, - background_area.x + tree_view->priv->expander_size * (i - 0.5), - background_area.y + background_area.height); + x + tree_view->priv->expander_size * (i - 0.5) * mult, + y0, + x + tree_view->priv->expander_size * (i - 0.5) * mult, + y2); tmp_node = tmp_tree->parent_node; tmp_tree = tmp_tree->parent_tree; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0