September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit python-qt4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at Fri Sep 3 14:21:38 CEST 2010. -------- --- python-qt4/python-qt4.changes 2010-06-08 16:53:37.000000000 +0200 +++ python-qt4/python-qt4.changes 2010-09-01 10:46:24.000000000 +0200 @@ -1,0 +2,23 @@ +Wed Sep 1 10:45:09 CEST 2010 - dmueller(a)suse.de + +- update to 4.7.5: + - Added QStringRef.__str__() and QStringRef.__unicode__() to the QString v1 + API. + - The destruction by Qt of internally constructed QObject instances is now + automatically detected. + - A signal defined with pyqtSignal() can now be used with methods that make + an internal call to QObject::connect(), e.g. QTimer.singleShot(). + - Added the --from-imports command line argument to pyuic4 and the + from_imports argument to PyQt4.uic.compileUi(). + - Added support for Python v3.2. + - The Windows installer now includes qcollectiongenerator.exe and + qhelpgenerator.exe. + - Any class with a count() method now supports the len() builtin. + - Added the missing == and != operators to QItemSelection. + - Added readQVariantHash(), readQVariantList(), readQVariantMap, + writeQVariantHash(), writeQVariantList() and writeQVariantMap() to + QDataStream. + - Added the ErrorPageExtensionOption and ErrorPageExtensionReturn classes, + and the ErrorDomain enum to QWebPage. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PyQt-x11-gpl-4.7.3.tar.bz2 New: ---- PyQt-x11-gpl-4.7.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.P0y7cw/_old 2010-09-03 14:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.P0y7cw/_new 2010-09-03 14:20:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-qt4 (Version 4.7.3) +# spec file for package python-qt4 (Version 4.7.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ License: GPLv2 Group: Development/Libraries/Python Summary: PyQt - python bindings for Qt 4 -Version: 4.7.3 +Version: 4.7.5 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/pyqt/intro ++++++ PyQt-x11-gpl-4.7.3.tar.bz2 -> PyQt-x11-gpl-4.7.5.tar.bz2 ++++++ python-qt4/PyQt-x11-gpl-4.7.3.tar.bz2 python-qt4/PyQt-x11-gpl-4.7.5.tar.bz2 differ: char 11, line 1 ++++++ build-compare.diff ++++++ --- /var/tmp/diff_new_pack.P0y7cw/_old 2010-09-03 14:20:05.000000000 +0200 +++ /var/tmp/diff_new_pack.P0y7cw/_new 2010-09-03 14:20:05.000000000 +0200 @@ -1,8 +1,6 @@ -Index: pyuic/uic/__init__.py -=================================================================== ---- pyuic/uic/__init__.py.orig +--- pyuic/uic/__init__.py +++ pyuic/uic/__init__.py -@@ -7,8 +7,7 @@ _header = """# -*- coding: utf-8 -*- +@@ -7,8 +7,7 @@ # Form implementation generated from reading ui file '%s' # @@ -12,12 +10,12 @@ # # WARNING! All changes made in this file will be lost! -@@ -123,7 +122,7 @@ def compileUi(uifile, pyfile, execute=Fa +@@ -125,7 +124,7 @@ indenter.indentwidth = indent - pyfile.write(_header % (uifname, ctime(), PYQT_VERSION_STR)) + pyfile.write(_header % (uifname, PYQT_VERSION_STR)) - winfo = compiler.UICompiler().compileUi(uifile, pyfile) + winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Fri Sep 3 14:21:26 CEST 2010. -------- --- KDE/kdebase4/kdebase4.changes 2010-08-04 11:10:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes 2010-08-27 13:53:39.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Aug 27 13:53:32 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- +Sun Aug 22 18:32:37 UTC 2010 - ctrippe(a)gmx.net + +- Change installation directory of konsole - Super User Icon (bnc#633082) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-4.5.0.tar.bz2 New: ---- kdebase-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4 (Version 4.5.0) +# spec file for package kdebase4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: System/GUI/KDE Summary: The Base KDE Apps Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-%version.tar.bz2 Source1: baselibs.conf @@ -107,12 +107,12 @@ sed -ri s,.*/usr/share/kde4/apps/konsole/Shell.profile,, filelists/konsole %create_exclude_filelist install -D -m 0644 %SOURCE4 %SOURCE5 $RPM_BUILD_ROOT/usr/share/applications/kde4/ - install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/utilities-terminal-su.png - install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/utilities-terminal-su.png - install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/utilities-terminal-su.png - install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/utilities-terminal-su.png - install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/utilities-terminal-su.png - install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/utilities-terminal-su.png + install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/usr/share/icons/hicolor/16x16/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE22 $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE23 $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE24 $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE25 $RPM_BUILD_ROOT/usr/share/icons/hicolor/64x64/apps/utilities-terminal_su.png + install -D -m 0644 %SOURCE26 $RPM_BUILD_ROOT/usr/share/icons/hicolor/128x128/apps/utilities-terminal_su.png %suse_update_desktop_file konqbrowser WebBrowser %suse_update_desktop_file konquerorsu System FileManager %suse_update_desktop_file dolphin System FileManager @@ -162,7 +162,7 @@ %defattr(-,root,root) %doc COPYING COPYING.DOC README %_kde4_applicationsdir/konsolesu.desktop -%_kde4_iconsdir/hicolor/*/utilities-terminal-su.png +%_kde4_iconsdir/hicolor/*/apps/utilities-terminal_su.png %package -n dolphin License: GPLv2+ ++++++ kdebase-4.5.0.tar.bz2 -> kdebase-4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/CMakeLists.txt new/kdebase-4.5.1/apps/CMakeLists.txt --- old/kdebase-4.5.0/apps/CMakeLists.txt 2010-07-28 23:04:48.000000000 +0200 +++ new/kdebase-4.5.1/apps/CMakeLists.txt 2010-08-27 10:10:18.000000000 +0200 @@ -4,8 +4,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.5.0") -find_package(KDE4 4.5.0 REQUIRED) +set(KDE_MIN_VERSION "4.5.1") +find_package(KDE4 4.5.1 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) Files old/kdebase-4.5.0/apps/doc/dolphin/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/dolphin/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/kdepasswd/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kdepasswd/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/kfind/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kfind/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/konqueror/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konqueror/index.cache.bz2 differ Files old/kdebase-4.5.0/apps/doc/konsole/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/konsole/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/doc/konsole/index.docbook new/kdebase-4.5.1/apps/doc/konsole/index.docbook --- old/kdebase-4.5.0/apps/doc/konsole/index.docbook 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/doc/konsole/index.docbook 2010-08-27 10:10:17.000000000 +0200 @@ -510,7 +510,7 @@ <varlistentry> <term><menuchoice> <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>[</keycap></keycombo></shortcut> -<guimenu>View</guimenu><guisubmenu>Shrink View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice> +<guimenu>View</guimenu><guisubmenu>Split View</guisubmenu><guimenuitem>Shrink View</guimenuitem></menuchoice> </term> <listitem><para><action>Makes the current view smaller</action> </para></listitem> Files old/kdebase-4.5.0/apps/doc/kwrite/index.cache.bz2 and new/kdebase-4.5.1/apps/doc/kwrite/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp --- old/kdebase-4.5.0/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-06-01 20:10:27.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphincolumnviewcontainer.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -108,7 +108,7 @@ int columnIndex = 0; foreach (DolphinColumnView* column, m_columns) { - if (column->url() == url) { + if (column->url().equals(url, KUrl::CompareWithoutTrailingSlash)) { // the column represents already the requested URL, hence activate it requestActivation(column); layoutColumns(); @@ -411,6 +411,8 @@ } else { column->deleteLater(); } + + layoutColumns(); } #include "dolphincolumnviewcontainer.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp --- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.cpp 2010-07-06 08:54:19.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -93,7 +93,6 @@ m_dolphinViewController(0), m_viewModeController(0), m_viewAccessor(proxyModel), - m_selectionModel(0), m_selectionChangedTimer(0), m_rootUrl(), m_activeItemUrl(), @@ -540,30 +539,33 @@ void DolphinView::setUrl(const KUrl& url) { - if (m_viewModeController->url() != url) { - m_newFileNames.clear(); + if (m_viewModeController->url() == url) { + return; + } - m_viewModeController->setUrl(url); // emits urlChanged, which we forward - m_viewAccessor.prepareUrlChange(url); - applyViewProperties(); - loadDirectory(url); + // The selection model might change in the case of the column view. Disconnect + // from the current selection model and reconnect later after the URL switch. + QAbstractItemView* view = m_viewAccessor.itemView(); + disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - // When changing the URL there is no need to keep the version - // data of the previous URL. - m_viewAccessor.dirModel()->clearVersionData(); + m_newFileNames.clear(); - emit startedPathLoading(url); - } + m_viewModeController->setUrl(url); // emits urlChanged, which we forward + m_viewAccessor.prepareUrlChange(url); + applyViewProperties(); + loadDirectory(url); - // the selection model might have changed in the case of a column view - QItemSelectionModel* selectionModel = m_viewAccessor.itemView()->selectionModel(); - if (m_selectionModel != selectionModel) { - disconnect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - m_selectionModel = selectionModel; - connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); - } + // When changing the URL there is no need to keep the version + // data of the previous URL. + m_viewAccessor.dirModel()->clearVersionData(); + + emit startedPathLoading(url); + + // Reconnect to the (probably) new selection model + view = m_viewAccessor.itemView(); + connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); } void DolphinView::selectAll() @@ -1271,28 +1273,28 @@ void DolphinView::createView() { + QAbstractItemView* view = m_viewAccessor.itemView(); + if ((view != 0) && (view->selectionModel() != 0)) { + disconnect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); + } + deleteView(); Q_ASSERT(m_viewAccessor.itemView() == 0); m_viewAccessor.createView(this, m_dolphinViewController, m_viewModeController, m_mode); - QAbstractItemView* view = m_viewAccessor.itemView(); + view = m_viewAccessor.itemView(); Q_ASSERT(view != 0); view->installEventFilter(this); view->viewport()->installEventFilter(this); m_dolphinViewController->setItemView(view); - // When changing the view mode, the selection is lost due to reinstantiating - // a new item view with a custom selection model. Pass the ownership of the - // selection model to DolphinView, so that it can be shared by all item views. - if (m_selectionModel != 0) { - view->setSelectionModel(m_selectionModel); - } else { - m_selectionModel = view->selectionModel(); - } - m_selectionModel->setParent(this); - connect(m_selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), + const int zoomLevel = ZoomLevelInfo::zoomLevelForIconSize(view->iconSize()); + m_viewModeController->setZoomLevel(zoomLevel); + + connect(view->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), this, SLOT(slotSelectionChanged(QItemSelection, QItemSelection))); setFocusProxy(m_viewAccessor.layoutTarget()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h --- old/kdebase-4.5.0/apps/dolphin/src/dolphinview.h 2010-05-16 12:04:03.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/dolphinview.h 2010-08-27 10:10:17.000000000 +0200 @@ -796,7 +796,6 @@ ViewModeController* m_viewModeController; ViewAccessor m_viewAccessor; - QItemSelectionModel* m_selectionModel; // allow to switch views without losing the selection QTimer* m_selectionChangedTimer; KUrl m_rootUrl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -20,10 +20,10 @@ #include "filemetadatatooltip.h" -#include <kcolorscheme.h> +#include <KColorScheme> #include <kfilemetadatawidget.h> -#include <kseparator.h> -#include <kwindowsystem.h> +#include <KSeparator> +#include <KWindowSystem> #include <QLabel> #include <QPainter> @@ -34,7 +34,6 @@ m_preview(0), m_name(0), m_fileMetaDataWidget(0) - { setAttribute(Qt::WA_TranslucentBackground); setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint); @@ -47,30 +46,25 @@ QFont font = m_name->font(); font.setBold(true); m_name->setFont(font); - m_name->setAlignment(Qt::AlignHCenter); // Create widget for the meta data m_fileMetaDataWidget = new KFileMetaDataWidget(); m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText); m_fileMetaDataWidget->setReadOnly(true); + connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)), + this, SIGNAL(metaDataRequestFinished(KFileItemList))); - // The stretchwidget allows the metadata widget to be top aligned and fills - // the remaining vertical space - QWidget* stretchWidget = new QWidget(this); - stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); - - QWidget* textContainer = new QWidget(this); - QVBoxLayout* textLayout = new QVBoxLayout(textContainer); + QVBoxLayout* textLayout = new QVBoxLayout(); + textLayout->setAlignment(Qt::AlignTop); textLayout->addWidget(m_name); textLayout->addWidget(new KSeparator()); textLayout->addWidget(m_fileMetaDataWidget); - textLayout->addWidget(stretchWidget); + textLayout->setAlignment(m_name, Qt::AlignCenter); + textLayout->setAlignment(m_fileMetaDataWidget, Qt::AlignLeft); QHBoxLayout* tipLayout = new QHBoxLayout(this); tipLayout->addWidget(m_preview); - tipLayout->addWidget(textContainer); - - tipLayout->setSizeConstraint(QLayout::SetFixedSize); + tipLayout->addLayout(textLayout); } FileMetaDataToolTip::~FileMetaDataToolTip() @@ -82,9 +76,12 @@ m_preview->setPixmap(pixmap); } -const QPixmap* FileMetaDataToolTip::preview() const +QPixmap FileMetaDataToolTip::preview() const { - return m_preview->pixmap(); + if (m_preview->pixmap() != 0) { + return *m_preview->pixmap(); + } + return QPixmap(); } void FileMetaDataToolTip::setName(const QString& name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-03-30 10:28:06.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/filemetadatatooltip.h 2010-08-27 10:10:17.000000000 +0200 @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#ifndef DOLPHINCONTROLLER_H -#define DOLPHINCONTROLLER_H +#ifndef FILEMETADATATOOLTIP_H +#define FILEMETADATATOOLTIP_H #include <QWidget> @@ -40,14 +40,26 @@ virtual ~FileMetaDataToolTip(); void setPreview(const QPixmap& pixmap); - const QPixmap* preview() const; + QPixmap preview() const; void setName(const QString& name); QString name() const; + /** + * Sets the items for which the meta data should be shown. + * The signal metaDataRequestFinished() will be emitted, + * as soon as the meta data for the items has been received. + */ void setItems(const KFileItemList& items); KFileItemList items() const; +signals: + /** + * Is emitted after the meta data has been received for the items + * set by FileMetaDataToolTip::setItems(). + */ + void metaDataRequestFinished(const KFileItemList& items); + protected: virtual void paintEvent(QPaintEvent* event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-07-23 23:12:06.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -19,13 +19,9 @@ #include "tooltipmanager.h" -#include "dolphinmodel.h" -#include "dolphinsortfilterproxymodel.h" - #include "filemetadatatooltip.h" -#include <kicon.h> -#include <kio/previewjob.h> -#include <kwindowsystem.h> +#include <KIcon> +#include <KIO/PreviewJob> #include <QApplication> #include <QDesktopWidget> @@ -33,22 +29,22 @@ #include <QScrollBar> #include <QTimer> +#include <dolphinmodel.h> +#include <dolphinsortfilterproxymodel.h> + ToolTipManager::ToolTipManager(QAbstractItemView* parent, DolphinSortFilterProxyModel* model) : QObject(parent), m_view(parent), m_dolphinModel(0), m_proxyModel(model), - m_prepareToolTipTimer(0), - m_startPreviewJobTimer(0), - m_waitOnPreviewTimer(0), - m_showToolTipDelayedTimer(0), + m_showToolTipTimer(0), + m_contentRetrievalTimer(0), m_fileMetaDataToolTip(0), + m_toolTipRequested(false), + m_metaDataRequested(false), m_item(), - m_itemRect(), - m_generatingPreview(false), - m_hasDefaultIcon(false), - m_previewPixmap() + m_itemRect() { static FileMetaDataToolTip* sharedToolTip = 0; if (sharedToolTip == 0) { @@ -58,7 +54,9 @@ // not work. } m_fileMetaDataToolTip = sharedToolTip; - + connect(m_fileMetaDataToolTip, SIGNAL(metaDataRequestFinished(KFileItemList)), + this, SLOT(slotMetaDataRequestFinished())); + m_dolphinModel = static_cast<DolphinModel*>(m_proxyModel->sourceModel()); connect(parent, SIGNAL(entered(const QModelIndex&)), this, SLOT(requestToolTip(const QModelIndex&))); @@ -66,33 +64,25 @@ this, SLOT(hideToolTip())); // Initialize timers - m_prepareToolTipTimer = new QTimer(this); - m_prepareToolTipTimer->setSingleShot(true); - m_prepareToolTipTimer->setInterval(500); - connect(m_prepareToolTipTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip())); - - m_startPreviewJobTimer = new QTimer(this); - m_startPreviewJobTimer->setSingleShot(true); - m_startPreviewJobTimer->setInterval(200); - connect(m_startPreviewJobTimer, SIGNAL(timeout()), this, SLOT(startPreviewJob())); - - m_waitOnPreviewTimer = new QTimer(this); - m_waitOnPreviewTimer->setSingleShot(true); - m_waitOnPreviewTimer->setInterval(250); - connect(m_waitOnPreviewTimer, SIGNAL(timeout()), this, SLOT(prepareToolTip())); - - m_showToolTipDelayedTimer = new QTimer(this); - m_showToolTipDelayedTimer->setSingleShot(true); - m_showToolTipDelayedTimer->setInterval(100); - connect(m_showToolTipDelayedTimer, SIGNAL(timeout()), this, SLOT(showToolTip())); - + m_showToolTipTimer = new QTimer(this); + m_showToolTipTimer->setSingleShot(true); + m_showToolTipTimer->setInterval(500); + connect(m_showToolTipTimer, SIGNAL(timeout()), this, SLOT(showToolTip())); + + m_contentRetrievalTimer = new QTimer(this); + m_contentRetrievalTimer->setSingleShot(true); + m_contentRetrievalTimer->setInterval(200); + connect(m_contentRetrievalTimer, SIGNAL(timeout()), this, SLOT(startContentRetrieval())); + + Q_ASSERT(m_contentRetrievalTimer->interval() < m_showToolTipTimer->interval()); + // When the mousewheel is used, the items don't get a hovered indication // (Qt-issue #200665). To assure that the tooltip still gets hidden, // the scrollbars are observed. connect(parent->horizontalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(hideTip())); + this, SLOT(hideToolTip())); connect(parent->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(hideTip())); + this, SLOT(hideToolTip())); m_view->viewport()->installEventFilter(this); m_view->installEventFilter(this); @@ -102,9 +92,17 @@ { } -void ToolTipManager::hideTip() +void ToolTipManager::hideToolTip() { - hideToolTip(); + QApplication::restoreOverrideCursor(); + + m_toolTipRequested = false; + m_metaDataRequested = false; + m_showToolTipTimer->stop(); + m_contentRetrievalTimer->stop(); + + m_fileMetaDataToolTip->setItems(KFileItemList()); + m_fileMetaDataToolTip->hide(); } bool ToolTipManager::eventFilter(QObject* watched, QEvent* event) @@ -128,7 +126,7 @@ void ToolTipManager::requestToolTip(const QModelIndex& index) { hideToolTip(); - + // Only request a tooltip for the name column and when no selection or // drag & drop operation is done (indicated by the left mouse button) if ((index.column() == DolphinModel::Name) && !(QApplication::mouseButtons() & Qt::LeftButton)) { @@ -139,44 +137,27 @@ const QModelIndex dirIndex = m_proxyModel->mapToSource(index); m_item = m_dolphinModel->itemForIndex(dirIndex); - // Only start the previewJob when the mouse has been over this item for 200 milliseconds. - // This prevents a lot of useless preview jobs when passing rapidly over a lot of items. - m_startPreviewJobTimer->start(); - m_previewPixmap = QPixmap(); - m_hasDefaultIcon = false; - - m_prepareToolTipTimer->start(); + // Only start the retrieving of the content, when the mouse has been over this + // item for 200 milliseconds. This prevents a lot of useless preview jobs and + // meta data retrieval, when passing rapidly over a lot of items. + m_contentRetrievalTimer->start(); + m_showToolTipTimer->start(); + m_toolTipRequested = true; + Q_ASSERT(!m_metaDataRequested); } } -void ToolTipManager::hideToolTip() -{ - m_prepareToolTipTimer->stop(); - m_startPreviewJobTimer->stop(); - m_waitOnPreviewTimer->stop(); - m_showToolTipDelayedTimer->stop(); - - m_fileMetaDataToolTip->hide(); -} - -void ToolTipManager::prepareToolTip() +void ToolTipManager::startContentRetrieval() { - if (m_generatingPreview) { - m_waitOnPreviewTimer->start(); + if (!m_toolTipRequested) { + return; } - if (!m_previewPixmap.isNull()) { - showToolTipDelayed(m_previewPixmap); - } else if (!m_hasDefaultIcon) { - const QPixmap image(KIcon(m_item.iconName()).pixmap(128, 128)); - showToolTipDelayed(image); - m_hasDefaultIcon = true; - } -} + m_fileMetaDataToolTip->setName(m_item.text()); + + m_metaDataRequested = true; + m_fileMetaDataToolTip->setItems(KFileItemList() << m_item); -void ToolTipManager::startPreviewJob() -{ - m_generatingPreview = true; KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, 256, 256); connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)), @@ -189,44 +170,98 @@ void ToolTipManager::setPreviewPix(const KFileItem& item, const QPixmap& pixmap) { - if ((m_item.url() != item.url()) || pixmap.isNull()) { - // An old preview or an invalid preview has been received + if (!m_toolTipRequested || (m_item.url() != item.url())) { + // No tooltip is requested anymore or an old preview has been received + return; + } + + if (pixmap.isNull()) { previewFailed(); } else { - m_previewPixmap = pixmap; - m_generatingPreview = false; + m_fileMetaDataToolTip->setPreview(pixmap); + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } } } void ToolTipManager::previewFailed() { - m_generatingPreview = false; + if (!m_toolTipRequested) { + return; + } + + const QPixmap pixmap = KIcon(m_item.iconName()).pixmap(128, 128); + m_fileMetaDataToolTip->setPreview(pixmap); + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } +} + +void ToolTipManager::slotMetaDataRequestFinished() +{ + if (!m_toolTipRequested) { + return; + } + + m_metaDataRequested = false; + if (!m_showToolTipTimer->isActive()) { + showToolTip(); + } } void ToolTipManager::showToolTip() { - const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight()); - const QSize size = m_fileMetaDataToolTip->sizeHint(); - + Q_ASSERT(m_toolTipRequested); + QApplication::restoreOverrideCursor(); + + if (QApplication::mouseButtons() & Qt::LeftButton) { + return; + } + + if (m_fileMetaDataToolTip->preview().isNull() || m_metaDataRequested) { + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + return; + } + + const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos()); + + // Restrict tooltip size to current screen size when needed. + // Because layout controlling widget doesn't respect widget's maximumSize property + // (correct me if I'm wrong), we need to let layout do its work, then manually change + // geometry if resulting widget doesn't fit the screen. + + // Step #1 - make sizeHint return calculated tooltip size + m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetFixedSize); + m_fileMetaDataToolTip->adjustSize(); + QSize size = m_fileMetaDataToolTip->sizeHint(); + + // Step #2 - correct tooltip size when needed + if (size.width() > screen.width()) { + size.setWidth(screen.width()); + } + if (size.height() > screen.height()) { + size.setHeight(screen.height()); + } + // m_itemRect defines the area of the item, where the tooltip should be // shown. Per default the tooltip is shown in the bottom right corner. - // If the tooltip content exceeds the desktop borders, it must be assured that: + // It must be assured that: // - the content is fully visible // - the content is not drawn inside m_itemRect - const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= desktop.left()); - const bool hasRoomToRight = (m_itemRect.right() + size.width() <= desktop.right()); - const bool hasRoomAbove = (m_itemRect.top() - size.height() >= desktop.top()); - const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom()); + const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= screen.left()); + const bool hasRoomToRight = (m_itemRect.right() + size.width() <= screen.right()); + const bool hasRoomAbove = (m_itemRect.top() - size.height() >= screen.top()); + const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= screen.bottom()); if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) { return; } - - int x = 0; - int y = 0; + + int x, y; if (hasRoomBelow || hasRoomAbove) { x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16 - if (x + size.width() >= desktop.right()) { - x = desktop.right() - size.width(); + if (x + size.width() >= screen.right()) { + x = screen.right() - size.width() + 1; } if (hasRoomBelow) { y = m_itemRect.bottom() + 1; @@ -240,38 +275,18 @@ } else { x = m_itemRect.left() - size.width(); } - // Put the tooltip at the bottom of the screen. The x-coordinate has already // been adjusted, so that no overlapping with m_itemRect occurs. - y = desktop.bottom() - size.height(); + y = screen.bottom() - size.height() + 1; } - - m_fileMetaDataToolTip->move(qMax(x, 0), qMax(y, 0)); - m_fileMetaDataToolTip->show(); -} -void ToolTipManager::showToolTipDelayed(const QPixmap& pixmap) -{ - if (QApplication::mouseButtons() & Qt::LeftButton) { - return; - } - - m_fileMetaDataToolTip->setPreview(pixmap); - m_fileMetaDataToolTip->setName(m_item.text()); - m_fileMetaDataToolTip->setItems(KFileItemList() << m_item); + // Step #3 - Alter tooltip geometry + m_fileMetaDataToolTip->setFixedSize(size); + m_fileMetaDataToolTip->layout()->setSizeConstraint(QLayout::SetNoConstraint); + m_fileMetaDataToolTip->setGeometry(x, y, size.width(), size.height()); + m_fileMetaDataToolTip->show(); - // Because one tooltip instance is reused, the size hint always depends on the previous - // content (QWidgets don't update their layout geometry if they are invisible). To - // assure having a consistent size without relayout flickering, the tooltip is opened - // on an invisible position first. This gives the layout system some time to asynchronously - // update the content. Sadly this only works with compositing enabled. - if (KWindowSystem::compositingActive()) { - const QRect desktop = QApplication::desktop()->screenGeometry(m_itemRect.bottomRight()); - m_fileMetaDataToolTip->move(desktop.bottomRight()); - m_fileMetaDataToolTip->show(); - } - - m_showToolTipDelayedTimer->start(); // Calls ToolTipManager::showToolTip() + m_toolTipRequested = false; } #include "tooltipmanager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h --- old/kdebase-4.5.0/apps/dolphin/src/tooltips/tooltipmanager.h 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/tooltips/tooltipmanager.h 2010-08-27 10:10:17.000000000 +0200 @@ -23,7 +23,7 @@ #include <QObject> #include <QRect> -#include <kfileitem.h> +#include <KFileItem> class DolphinModel; class DolphinSortFilterProxyModel; @@ -54,53 +54,38 @@ * only needed when the tooltip should be hidden although * an item is hovered. */ - void hideTip(); + void hideToolTip(); protected: virtual bool eventFilter(QObject* watched, QEvent* event); private slots: void requestToolTip(const QModelIndex& index); - void hideToolTip(); - void prepareToolTip(); - void startPreviewJob(); + void startContentRetrieval(); void setPreviewPix(const KFileItem& item, const QPixmap& pix); void previewFailed(); + void slotMetaDataRequestFinished(); void showToolTip(); - -private: - void showToolTipDelayed(const QPixmap& pixmap); private: QAbstractItemView* m_view; DolphinModel* m_dolphinModel; DolphinSortFilterProxyModel* m_proxyModel; - /// Timeout from requesting a tooltip until the tooltip is shown - QTimer* m_prepareToolTipTimer; - - /// Timeout from requesting a tooltip until starting a job to - /// create a preview pixmap. The preview job is started before - /// m_prepareToolTipTimer has been exceeded, to have the preview - /// pixmap ideally before the tooltip will be shown. - QTimer* m_startPreviewJobTimer; - - /// Don't show the tooltip, before the preview has been received. The - /// time indicates the interval, when the check for a received - /// is done. - QTimer* m_waitOnPreviewTimer; - - /// The tooltip is shown slightly delayed to prevent a flickering - /// because of layouting the content. - QTimer* m_showToolTipDelayedTimer; + /// Timeout from requesting a tooltip until the tooltip + /// should be shown + QTimer* m_showToolTipTimer; + + /// Timeout from requesting a tooltip until the retrieving of + /// the tooltip content like preview and meta data gets started. + QTimer* m_contentRetrievalTimer; FileMetaDataToolTip* m_fileMetaDataToolTip; + bool m_toolTipRequested; + bool m_metaDataRequested; KFileItem m_item; QRect m_itemRect; - bool m_generatingPreview; - bool m_hasDefaultIcon; - QPixmap m_previewPixmap; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp --- old/kdebase-4.5.0/apps/dolphin/src/viewextensionsfactory.cpp 2010-04-07 13:23:19.000000000 +0200 +++ new/kdebase-4.5.1/apps/dolphin/src/viewextensionsfactory.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -61,7 +61,7 @@ m_toolTipManager = new ToolTipManager(view, proxyModel); connect(dolphinViewController, SIGNAL(hideToolTip()), - m_toolTipManager, SLOT(hideTip())); + m_toolTipManager, SLOT(hideToolTip())); } // initialize preview generator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp --- old/kdebase-4.5.0/apps/keditbookmarks/bookmarklistview.cpp 2010-05-05 11:37:43.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/bookmarklistview.cpp 2010-08-27 10:10:18.000000000 +0200 @@ -200,8 +200,6 @@ return (source_column == 0); } -Q_DECLARE_METATYPE(KBookmark) - bool BookmarkFolderViewFilterModel::filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const { QModelIndex index = sourceModel()->index(source_row, 0, source_parent); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp --- old/kdebase-4.5.0/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-05-05 11:37:43.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/kbookmarkmodel/model.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -33,8 +33,6 @@ #include <QtCore/QStringList> #include <QtCore/QMimeData> -Q_DECLARE_METATYPE(KBookmark) - class KBookmarkModel::Private { public: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop --- old/kdebase-4.5.0/apps/keditbookmarks/keditbookmarks.desktop 2010-08-04 21:13:57.000000000 +0200 +++ new/kdebase-4.5.1/apps/keditbookmarks/keditbookmarks.desktop 2010-08-27 10:10:18.000000000 +0200 @@ -16,6 +16,7 @@ Name[en_GB]=Bookmark Editor Name[es]=Editor de marcadores Name[et]=Järjehoidjate redaktor +Name[eu]=Laster-marka editorea Name[fi]=Kirjanmerkkimuokkain Name[fr]=Éditeur de signets Name[fy]=Blêdwizerbewurker @@ -24,6 +25,7 @@ Name[he]=עורך הסימניות Name[hi]=पसंदीदा संपादक Name[hr]=Uređivač oznaka +Name[hu]=Könyvjelzőszerkesztő Name[ia]=Editor de marcator de libros Name[id]=Penyunting Penanda Name[is]=Bókamerkjastjóri @@ -38,6 +40,7 @@ Name[nb]=Bokmerkeredigerer Name[nds]=Leesteken-Editor Name[nl]=Bladwijzerbewerker +Name[nn]=Bokmerkeredigering Name[pa]=ਬੁੱਕਮਾਰਕ ਐਡੀਟਰ Name[pl]=Edytor zakładek Name[pt]=Editor de Favoritos @@ -71,6 +74,7 @@ Comment[en_GB]=Bookmark Organiser and Editor Comment[es]=Organizador y editor de marcadores Comment[et]=Järjehoidjate korraldaja ja redaktor +Comment[eu]=Laster-marka antolatzaile eta editorea Comment[fi]=Kirjanmerkkimuokkain ja -järjestelijä Comment[fr]=Éditeur et organisateur de signets Comment[fy]=Blêdwizers organisearje en bewurker @@ -78,6 +82,7 @@ Comment[he]=מארגן ועורך סימניות Comment[hi]=पसंदीदा व्यवस्था और संपादक Comment[hr]=Organizator i uređivač oznaka +Comment[hu]=Könyvjelzőszervező és -szerkesztő Comment[ia]=Editor e organisator de Marcator de libros Comment[id]=Pengorganisir dan Penyunting Penanda Comment[is]=Bókamerkjaskipuleggjari @@ -92,6 +97,7 @@ Comment[nb]=Bokmerkeordner og redigerer Comment[nds]=Leestekenpleger un -editor Comment[nl]=Bladwijzers organiseren en bewerken +Comment[nn]=Bokmerkeordnar og redigering Comment[pa]=ਬੁੱਕਮਾਰਕ ਪਰਬੰਧਕ ਤੇ ਐਡੀਟਰ Comment[pl]=Organizacja i modyfikacja zakładek Comment[pt]=Organizador e Editor de Favoritos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop --- old/kdebase-4.5.0/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/preloader/konqy_preloader.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=Konqueror Browser Preloader Name[es]=Módulo de precarga del navegador Konqueror Name[et]=Konquerori brauseri eellaadimise moodul +Name[eu]=Konqueror arakatzailearen aurrezamatzailea Name[fi]=Konqueror-selaimen esilataaja Name[fr]=Module de préchargement du navigateur Konqueror Name[fy]=Konqueror Blêder foarlader @@ -20,6 +21,7 @@ Name[he]=טעינה מקדימה של Konqueror Name[hi]=कॉन्क्वेरर ब्राउसर प्रीलोडर Name[hr]=Predučitavanje pretraživača Konqueror +Name[hu]=Előbetöltő a Konqueror böngészőhöz Name[ia]=Precargator del Navigator de Konqueror Name[id]=Prapemuatan Peramban Konqueror Name[is]=Konqueror forræsingareining @@ -35,6 +37,7 @@ Name[nb]=Forhåndslaster for Konqueror nettleser Name[nds]=Konqueror vörladen Name[nl]=Konqueror browser preloader-module +Name[nn]=Førehandslastar for nettlesaren Konqueror Name[pa]=ਕੋਨਕਿਉਰੋਰ ਬਰਾਊਜ਼ਰ ਪਹਿਲਾਂ ਲੋਡ ਮੋਡੀਊਲ Name[pl]=Wstępne wczytywanie dla Konquerora Name[pt]=Pré-Carregamento do Navegador Konqueror diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/cache.desktop 2010-07-07 19:10:00.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/cache.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -75,7 +75,7 @@ Name[pt]=Cache Name[pt_BR]=Cache Name[ro]=Cache -Name[ru]=Кеш +Name[ru]=Кэш Name[se]=Gaskarájus Name[si]=කැච් Name[sk]=Vyrovnávacia pamäť @@ -165,7 +165,7 @@ Comment[pt]=Configuração das opções da 'cache' da Web Comment[pt_BR]=Configurar as opções de cache da Internet Comment[ro]=Configurează setările cache-ului web -Comment[ru]=Настройка кеша +Comment[ru]=Настройка кэша Comment[se]=Heivet fierpmádatgaskarádjusa Comment[si]=ජාල කැච් සැකසුම් සකසන්න Comment[sk]=Nastavenie vyrovnávacej pamäte pre WWW diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp --- old/kdebase-4.5.0/apps/konqueror/settings/kio/kcookiespolicies.cpp 2009-10-06 23:37:09.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/kcookiespolicies.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -191,9 +191,9 @@ if ( !handleDuplicate(domain, advice) ) { const char* strAdvice = KCookieAdvice::adviceToStr(advice); - QTreeWidgetItem* index = new QTreeWidgetItem (dlg->lvDomainPolicy, - QStringList()<< domain << i18n(strAdvice)); - m_pDomainPolicy.insert (index, strAdvice); + QTreeWidgetItem* item = new QTreeWidgetItem (dlg->lvDomainPolicy, + QStringList()<< domain << i18n(strAdvice)); + m_pDomainPolicy.insert (item, strAdvice); configChanged(); } } @@ -395,12 +395,14 @@ group.writeEntry("CookieGlobalAdvice", advice); QStringList domainConfig; - QTreeWidgetItem *at = dlg->lvDomainPolicy->topLevelItem(0); - - while( at ) - { - domainConfig.append(QString::fromLatin1("%1:%2").arg(QString(tolerantToAce(at->text(0)))).arg(m_pDomainPolicy[at])); - at = dlg->lvDomainPolicy->itemBelow(at); + QMapIterator<QTreeWidgetItem*, const char*> it (m_pDomainPolicy); + while (it.hasNext()) { + it.next(); + QTreeWidgetItem *item = it.key(); + QString policy = tolerantToAce(item->text(0)); + policy += QLatin1Char(':'); + policy += QLatin1String(it.value()); + domainConfig << policy; } group.writeEntry("CookieDomainAdvice", domainConfig); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Google Chrome 5.0) Name[es]=UADescription (Google Chrome 5.0) Name[et]=UADescription (Google Chrome 5.0) +Name[eu]=UA azalpena (Google Chrome 5.0) Name[fr]=UADescription (Google Chrome 5.0) Name[fy]=UADescription (Google Chrome 5.0) Name[ga]=UADescription (Google Chrome 5.0) @@ -19,6 +20,7 @@ Name[he]=UADescription (Google Chrome 5.0) Name[hi]=यूए-डिस्क्रिप्शन (गूगल क्रोम 5.0्सपी पर) Name[hr]=UADescription (Google Chrome 5.0) +Name[hu]=Böngészőtípus (Google Chrome 5.0) Name[ia]=UADescription (Google Chrome 5.0) Name[id]=UADescription (Google Chrome 5.0) Name[is]=UADescription (Google Chrome 5.0) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Google Chrome 5.0) Name[nds]=UA-Beschrieven (Google Chrome 5.0) Name[nl]=GA-beschrijving (Google Chrome 5.0) +Name[nn]=Brukaragent (Google Chrome 5.0) Name[pa]=UADescription (ਗੂਗਲ ਕਰੋਮ ੫.੦) Name[pl]=UADescription (Google Chrome 5.0) Name[pt]=UADescription (Google Chrome 5.0) @@ -41,6 +44,7 @@ Name[ro]=Descriere AU (Google Chrome 5.0) Name[ru]=UADescription (Google Chrome 5.0) Name[sk]=Popis agenta (Google Chrome 5.0) +Name[sl]=UAOpis (Google Chrome 5.0) Name[sr]=УА‑опис (Гуглов Кроум 5.0) Name[sr@ijekavian]=УА‑опис (Гуглов Кроум 5.0) Name[sr@ijekavianlatin]=UA-opis (Googleov Chrome 5.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-07-12 23:08:16.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -14,7 +14,7 @@ Name[eo]=UA-Priskribo (Fajrovulpo 3.0 sub nuna) Name[es]=UADescription (Firefox 3.0 en actual) Name[et]=UADescription (Selles masinas töötav Firefox 3.0) -Name[eu]=UADescription (Firefox 3.0 unekoan) +Name[eu]=UA azalpena (Firefox 3.0 unekoan) Name[fi]=Käyttäjäagenttikuvaus (Firefox 3.0 nykyisellä) Name[fr]=UADescription (Firefox 3.0 sous le système actuel) Name[fy]=UA-beskriuwing (Firefox 3.0 op aktive) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Firefox 3.6 on current) Name[es]=UADescription (Firefox 3.6 en actual) Name[et]=UADescription (Selles masinas töötav Firefox 3.6) +Name[eu]=UA azalpena (Firefox 3.6 unekoan) Name[fr]=UADescription (Firefox 3.6 sous le système actuel) Name[fy]=UADescription (Firefox 3.6 op aktive) Name[ga]=UADescription (Firefox 3.6 ar an gcóras reatha) @@ -19,6 +20,7 @@ Name[he]=UADescription (Firefox 3.6 on current) Name[hi]=यूए-डिस्क्रिप्शन (फ़ॉयरफ़ॉक्स 3.6 हालिया पर) Name[hr]=UADescription (Firefox 3.6 on current) +Name[hu]=Böngészőtípus (Firefox 3.6) Name[ia]=UADescription (Firefox 3.6 super le currente) Name[id]=UADescription (Firefox 3.6 pada saat ini) Name[is]=UADescription (Firefox 3.6 á núverandi) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Firefox 3.6 herifra) Name[nds]=UA-Beschrieven (Firefox 3.6 op dit Systeem) Name[nl]=UADescription (Firefox 3.6 op huidige) +Name[nn]=Brukaragent (Firefox 3.6 herifrå) Name[pa]=UADescription (ਮੌਜੂਦਾ ਉੱਤੇ ਫਾਇਰਫਾਕਸ ੩.੬) Name[pl]=UADescription (Firefox 3.6, bieżący) Name[pt]=UADescription (Firefox 3.6 no sistema actual) @@ -41,6 +44,7 @@ Name[ro]=Descriere AU (Firefox 3.6 pe sistemul curent) Name[ru]=UADescription (Firefox 3.6 на текущей системе) Name[sk]=Popis agenta (Firefox 3.6 na aktuálnom) +Name[sl]=UAOpis (Firefox 3.6 na trenutnem) Name[sr]=УА‑опис (Фајерфокс 3.6 на текућем) Name[sr@ijekavian]=УА‑опис (Фајерфокс 3.6 на текућем) Name[sr@ijekavianlatin]=UA-opis (Firefox 3.6 na tekućem) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop --- old/kdebase-4.5.0/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/settings/kio/uasproviders/safari40.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -12,6 +12,7 @@ Name[en_GB]=UADescription (Safari 4.0 on MacOS X) Name[es]=UADescription (Safari 4.0 en MacOS X) Name[et]=UADescription (Safari 4.0 MacOS X platvormil) +Name[eu]=UA azalpena (Safari 4.0 MacOS X-en) Name[fr]=UADescription (Safari 4.0 sous MacOS X) Name[fy]=UADescription (Safari 4.0 op MacOS X) Name[ga]=UADescription (Safari 4.0 ar MacOS X) @@ -19,6 +20,7 @@ Name[he]=UADescription (Safari 4.0 on MacOS X) Name[hi]=यूए-डिस्क्रिप्शन (मॅक-ओएस X में सफारी 2.0) Name[hr]=UADescription (Safari 4.0 on MacOS X) +Name[hu]=Böngészőtípus (Safari 4.0, MacOS X) Name[ia]=UADescription (Safari 4.0 super MacOS X) Name[id]=UADescription (Safari 4.0 di MacOS X) Name[is]=UADescription (Safari 4.0 á MacOS X) @@ -34,6 +36,7 @@ Name[nb]=Brukeragent (Safari 4.0 på MacOS X) Name[nds]=UA-Beschrieven (Safari 4.0 op MacOS X) Name[nl]=GA-beschrijving (Safari 4.0 op MacOS X) +Name[nn]=Brukaragent (Safari 4.0 på MacOS X) Name[pa]=UADescription (MacOS X ਉੱਤੇ ਸਫ਼ਾਰੀ ੪.੦) Name[pl]=UADescription (Safari 4.0 w MacOS X) Name[pt]=UADescription (Safari 4.0 no MacOS X) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop --- old/kdebase-4.5.0/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/sidebar/default_entries/places.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -83,6 +83,7 @@ Comment[en_GB]=This is the list of places. Comment[es]=Esta es la lista de lugares. Comment[et]=Asukohtade loend. +Comment[eu]=Hau da lekuen zerrenda. Comment[fi]=Tämä on sijaintien luettelo. Comment[fr]=Ceci est la liste des emplacements. Comment[fy]=Dit is de opsomming fan places. @@ -90,6 +91,7 @@ Comment[he]=זוהי רשימת המקומות. Comment[hi]=यह स्थानों की सूची है Comment[hr]=Ovo je lista mjesta. +Comment[hu]=Ez a helyek listája. Comment[ia]=Isto es le lista de placias Comment[id]=Ini adalah senarai tempat. Comment[is]=Þetta er listi yfir staði á skráarkerfisinu. @@ -105,6 +107,7 @@ Comment[nb]=Dette er lista over steder. Comment[nds]=Dit is de List mit Steden. Comment[nl]=Dit is de lijst met plaatsen. +Comment[nn]=Dette er lista over stader. Comment[pa]=ਇਹ ਥਾਵਾਂ ਦੀ ਲਿਸਟ ਹੈ। Comment[pl]=To jest lista miejsc. Comment[pt]=Esta é a lista de locais. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop --- old/kdebase-4.5.0/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/sidebar/places_module/konqsidebar_places.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -13,12 +13,15 @@ Name[en_GB]=Places SideBar Module Name[es]=Módulo de la barra lateral de lugares Name[et]=Asukohtade külgriba moodul +Name[eu]=Lekuen alboko barraren modulua Name[fi]=Sijainnit sivupalkki-moduuli Name[fr]=Placer le module de barre de navigation Name[fy]=Places sydbalke module Name[ga]=Modúl Barra Taoibh Áiteanna Name[he]=מודול סרגל צד מקומות Name[hi]= बाज़ूपट्टी मॉड्यू लगाता हैल +Name[hr]=Postavlja modul bočne trake +Name[hu]=Helyek oldalsáv-modul Name[ia]=Modulo de Barra Lateral de Placias Name[id]=Tempat Modul Batang Sisi Name[is]=Staðahliðarsláreining @@ -34,6 +37,7 @@ Name[nb]=Modul for steder-sidestolpe Name[nds]=Steden-Sietpaneelmoduul Name[nl]=Plaatst module voor zijbalk +Name[nn]=Modul for stad-sidestolpe Name[pa]=ਥਾਵਾਂ ਬਾਹਰੀ ਮੋਡੀਊਲ Name[pl]=Moduł paska bocznego miejsc Name[pt]=Módulo da Barra Lateral dos Locais diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp --- old/kdebase-4.5.0/apps/konqueror/src/konqcombo.cpp 2010-05-27 19:22:54.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqcombo.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -869,6 +869,8 @@ const bool blocked = completionbox->blockSignals(true); completionbox->setCurrentItem(matchedItem); completionbox->blockSignals(blocked); + } else { + completionbox->setCurrentRow(-1); } } else { // completion box not visible yet -> show it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp --- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.cpp 2010-05-16 12:04:02.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.cpp 2010-08-27 10:10:17.000000000 +0200 @@ -74,8 +74,6 @@ m_pActiveChild = 0L; m_pViewManager = viewManager; - m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); - m_permanentCloseButtons = KonqSettings::permanentCloseButton(); if (m_permanentCloseButtons) { setTabsClosable( true ); @@ -379,7 +377,7 @@ void KonqFrameTabs::slotMouseMiddleClick(QWidget *w) { - if (m_MouseMiddleClickClosesTab) { + if (KonqSettings::mouseMiddleClickClosesTab()) { slotCloseRequest(w); } else { KUrl filteredURL(KonqMisc::konqFilteredURL(this, QApplication::clipboard()->text(QClipboard::Selection))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h --- old/kdebase-4.5.0/apps/konqueror/src/konqtabs.h 2010-04-07 13:23:17.000000000 +0200 +++ new/kdebase-4.5.1/apps/konqueror/src/konqtabs.h 2010-08-27 10:10:17.000000000 +0200 @@ -143,7 +143,6 @@ NewTabToolButton* m_leftWidget; bool m_permanentCloseButtons; bool m_alwaysTabBar; - bool m_MouseMiddleClickClosesTab; QMap<QString,QAction*> m_popupActions; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop --- old/kdebase-4.5.0/apps/lib/konq/favicons/favicons.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/favicons/favicons.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -82,6 +82,7 @@ Comment[en_GB]=Stores website icons Comment[es]=Almacena iconos de sitios web Comment[et]=Veebilehekülgede ikoonide salvestamine +Comment[eu]=Webguneen ikonoak gordetzen ditu Comment[fi]=Säilyttää nettisivujen kuvakkeita Comment[fr]=Stocker les icônes des site Internet Comment[fy]=Bewarret website byldkaikes @@ -89,6 +90,7 @@ Comment[he]=מאחסן צלמיות אתרים Comment[hi]=वेबसाइट प्रतीक सहेजता है Comment[hr]=Sprema ikone web stranica +Comment[hu]=Weboldalak ikonjainak tárolása Comment[ia]=Il immagazina icones del sito web Comment[id]=Simpan ikon situs web Comment[is]=Geymir táknmyndir vefsvæða @@ -103,6 +105,7 @@ Comment[nb]=Lagrer nettstedsikoner Comment[nds]=Wohrt Nettsiedenlüttbiller Comment[nl]=Slaat website pictogrammen op +Comment[nn]=Lagrar nettstadikon Comment[pa]=ਵੈੱਬਸਾਈਟ ਆਈਕਾਨ ਸਟੋਰ ਕਰਦਾ ਹੈ Comment[pl]=Przechowuje ikony stron WWW Comment[pt]=Guarda os ícones das páginas Web diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/Floppy.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/Floppy.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -13,11 +13,14 @@ Name[en_GB]=Format Name[es]=Formato Name[et]=Vormindamine +Name[eu]=Formatua Name[fi]=Alusta Name[fr]=Format Name[fy]=Opmaak Name[ga]=Formáidigh Name[hi]=फॉर्मेट +Name[hr]=Formatiranje +Name[hu]=Formátum Name[ia]=Format Name[id]=Format Name[is]=Forsníða @@ -33,6 +36,7 @@ Name[nb]=Format Name[nds]=Formateren Name[nl]=Formatteren +Name[nn]=Formater Name[pa]=ਫਾਰਮੈਟ Name[pl]=Format Name[pt]=Formatar @@ -40,6 +44,7 @@ Name[ro]=Formatare Name[ru]=Форматировать Name[sk]=Formát +Name[sl]=Formatiraj Name[sr]=Форматирање Name[sr@ijekavian]=Форматирање Name[sr@ijekavianlatin]=Formatiranje diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/linkNFS.desktop 2010-04-15 10:58:32.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkNFS.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -33,7 +33,7 @@ Name[hne]=एनएफएस... Name[hr]=NFS… Name[hsb]=NFS... -Name[hu]=NFS... +Name[hu]=NFS… Name[ia]=NFS... Name[id]=NFS... Name[is]=NFS... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop --- old/kdebase-4.5.0/apps/lib/konq/Templates/linkPath.desktop 2010-08-04 21:13:56.000000000 +0200 +++ new/kdebase-4.5.1/apps/lib/konq/Templates/linkPath.desktop 2010-08-27 10:10:17.000000000 +0200 @@ -21,6 +21,7 @@ Name[he]=קישור בסיסי לקובץ או ספריה... Name[hi]=फ़ाइल या डॉयरेक्ट्री को मूल कडी... Name[hr]=Osnovni link do datoteke ili direktorija… +Name[hu]=Egyszerű link fájlhoz vagy könyvtárhoz… Name[ia]=Ligamine basic a file o directorio Name[id]=Tautan dasar ke berkas atau direktori... Name[is]=Grunntengill við skrá eða möppu... @@ -81,6 +82,7 @@ Comment[he]=הכנס נתיב קובץ או תיקיה: Comment[hi]=फ़ाइल या डॉयरेक्ट्री का पथ दें: Comment[hr]=Unesite putanju datoteke ili direktorija: +Comment[hu]=Adja meg a fájl vagy könyvtár elérési útját: Comment[ia]=Tu entra le percurso del file o directorio Comment[id]=Masukkan alamat berkas atau direktori: Comment[is]=Settu inn slóð á skrá eða möppu: ++++++ konsolesu.desktop ++++++ --- /var/tmp/diff_new_pack.3tcGny/_old 2010-09-03 14:20:46.000000000 +0200 +++ /var/tmp/diff_new_pack.3tcGny/_new 2010-09-03 14:20:46.000000000 +0200 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Exec=konsole --profile Root_Shell -Icon=utilities-terminal-su +Icon=utilities-terminal_su X-DocPath=konsole/index.html Terminal=false X-KDE-StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-sip for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at Fri Sep 3 14:20:12 CEST 2010. -------- --- python-sip/python-sip.changes 2010-06-08 16:52:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-sip/python-sip.changes 2010-09-01 10:46:32.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Sep 1 10:42:55 CEST 2010 - dmueller(a)suse.de + +- update to 4.11: + - Added the %UnitPostIncludeCode directive. + - /KeepReference/ will now accept a key to track when the same object is + passed to more than one method. + - operator() and __call__() can now accept keyword arguments. + - Added support for Python v3.2. + +------------------------------------------------------------------- +Mon Aug 16 22:54:32 CEST 2010 - dmueller(a)suse.de + +- update to 4.10.5: + - A bug fix release for Python v3 and Python v2.7. + - Use capsules when being built for Python v2.7 to work around an apparent + bug in the support for PyCObject. + - Added support for Q_SLOT, Q_SLOTS, Q_SIGNAL and Q_SIGNALS. + - Added the /__len__/ function annotation. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sip-4.10.2.tar.bz2 New: ---- sip-4.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.aQb1wv/_old 2010-09-03 14:19:55.000000000 +0200 +++ /var/tmp/diff_new_pack.aQb1wv/_new 2010-09-03 14:19:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-sip (Version 4.10.2) +# spec file for package python-sip (Version 4.11) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings -Version: 4.10.2 +Version: 4.11 Release: 1 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro ++++++ sip-4.10.2.tar.bz2 -> sip-4.11.tar.bz2 ++++++ ++++ 13201 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 libcaca for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libcaca for openSUSE:Factory checked in at Fri Sep 3 14:19:49 CEST 2010. -------- --- libcaca/libcaca.changes 2009-11-03 20:19:28.000000000 +0100 +++ libcaca/libcaca.changes 2010-08-30 22:38:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 30 20:36:35 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build date in binaries + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- caca-no-build-date.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcaca.spec ++++++ --- /var/tmp/diff_new_pack.nmlj7W/_old 2010-09-03 14:17:55.000000000 +0200 +++ /var/tmp/diff_new_pack.nmlj7W/_new 2010-09-03 14:17:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libcaca (Version 0.99.beta16) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -24,8 +24,8 @@ BuildRequires: freeglut-devel xorg-x11-libs BuildRequires: gcc-c++ mono-devel ruby-devel Version: 0.99.beta16 -Release: 2 -License: GPL v2 or later +Release: 9 +License: GPLv2+ Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ Url: http://sam.zoy.org/projects/libcaca/ @@ -38,6 +38,7 @@ Patch6: remove_badwords.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch8: libcaca-0.99.beta16-libtool.patch +Patch9: caca-no-build-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch} %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver} @@ -62,7 +63,7 @@ %endif %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Library for Colour ASCII Art, text mode graphics Group: Development/Languages/C and C++ #yes, nothing else is required to link other applications with "libcaca" @@ -80,7 +81,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package csharp -License: GPL v2 or later +License: GPLv2+ Summary: C# support for libcaca Group: Development/Languages/Mono Requires: %{name} = %{version} mono @@ -96,7 +97,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package ruby -License: GPL v2 or later +License: GPLv2+ Summary: Ruby bindings for libcaca Group: Development/Languages/Ruby Requires: %{name} = %{version} ruby @@ -112,7 +113,7 @@ Jean-Yves Lamoureux <jylam(a)lnxscene.org> %package -n caca-utils -License: GPL v2 or later +License: GPLv2+ Summary: Colour ASCII Art Text mode graphics utilities based on libcaca Group: Amusements/Toys/Graphics @@ -150,6 +151,7 @@ %patch6 -p1 %patch7 %patch8 +%patch9 %build autoreconf -fiv ++++++ caca-no-build-date.patch ++++++ Index: src/img2txt.c =================================================================== --- src/img2txt.c.orig 2010-08-30 16:06:50.000000000 -0400 +++ src/img2txt.c 2010-08-30 16:08:38.214714972 -0400 @@ -81,14 +81,14 @@ static void version(void) { printf( "img2txt Copyright 2006-2007 Sam Hocevar and Jean-Yves Lamoureux\n" - "Internet: <sam(a)zoy.org> <jylam(a)lnxscene.org> Version: %s, date: %s\n" + "Internet: <sam(a)zoy.org> <jylam(a)lnxscene.org> Version: %s\n" "\n" "img2txt, along with its documentation, may be freely copied and distributed.\n" "\n" "The latest version of img2txt is available from the web site,\n" " http://caca.zoy.org/wiki/libcaca in the libcaca package.\n" "\n", - caca_get_version(), __DATE__); + caca_get_version()); } int main(int argc, char **argv) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdegraphics4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Fri Sep 3 14:19:35 CEST 2010. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2010-07-29 13:54:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2010-08-27 15:45:49.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 15:45:45 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.5.0.tar.bz2 New: ---- kdegraphics-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.WoX0d7/_old 2010-09-03 14:18:36.000000000 +0200 +++ /var/tmp/diff_new_pack.WoX0d7/_new 2010-09-03 14:18:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.5.0) +# spec file for package kdegraphics4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,7 +33,7 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdegraphics-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdegraphics-4.5.0.tar.bz2 -> kdegraphics-4.5.1.tar.bz2 ++++++ Files old/kdegraphics-4.5.0/doc/gwenview/index.cache.bz2 and new/kdegraphics-4.5.1/doc/gwenview/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kcontrol/kamera/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kamera/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kcontrol/kgamma/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kcontrol/kgamma/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kolourpaint/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kolourpaint/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/kruler/index.cache.bz2 and new/kdegraphics-4.5.1/doc/kruler/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/ksnapshot/index.cache.bz2 and new/kdegraphics-4.5.1/doc/ksnapshot/index.cache.bz2 differ Files old/kdegraphics-4.5.0/doc/okular/index.cache.bz2 and new/kdegraphics-4.5.1/doc/okular/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp --- old/kdegraphics-4.5.0/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkdcraw/libkdcraw/kdcraw_p.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -116,7 +116,12 @@ identify.pixelAspectRatio = raw->imgdata.sizes.pixel_aspect; identify.rawColors = raw->imgdata.idata.colors; identify.rawImages = raw->imgdata.idata.raw_count; - identify.blackPoint = raw->imgdata.color.black; + identify.blackPoint = raw->imgdata.color.cblack[0]; + //TODO: provide per channel black point with next interface change + for (int i = 1; i < raw->imgdata.idata.colors; i++) + { + identify.blackPoint = qMin(identify.blackPoint, raw->imgdata.color.cblack[i]); + } identify.whitePoint = raw->imgdata.color.maximum; identify.orientation = (DcrawInfoContainer::ImageOrientation)raw->imgdata.sizes.flip; memcpy(&identify.cameraColorMatrix1, &raw->imgdata.color.cmatrix, sizeof(raw->imgdata.color.cmatrix)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-05-27 19:22:45.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2exif.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -980,10 +980,33 @@ KExiv2::TagsMap KExiv2::getMakernoteTagsList() const { -#if (EXIV2_TEST_VERSION(0,18,1)) try { QList<const Exiv2::TagInfo*> tags; + +#if (EXIV2_TEST_VERSION(0,21,0)) + + const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList(); + + while (gi->ifdId_ != Exiv2::lastIfdId) + { + if (QString(gi->name_) == QString("Makernote")) + { + Exiv2::TagListFct tl = gi->tagList_; + const Exiv2::TagInfo* ti = tl(); + + while (ti->tag_ != 0xFFFF) + { + tags << ti; + ++ti; + } + } + ++gi; + } + +#else + +#if (EXIV2_TEST_VERSION(0,18,1)) tags // Canon Makernotes. << Exiv2::CanonMakerNote::tagList() @@ -994,7 +1017,7 @@ << Exiv2::CanonMakerNote::tagListPi() #if (EXIV2_TEST_VERSION(0,19,1)) << Exiv2::CanonMakerNote::tagListFi() -#endif +#endif // (EXIV2_TEST_VERSION(0,19,1)) // Sigma Makernotes. << Exiv2::SigmaMakerNote::tagList() // Sony Makernotes. @@ -1002,7 +1025,7 @@ #if (EXIV2_TEST_VERSION(0,19,1)) << Exiv2::SonyMakerNote::tagListCs() << Exiv2::SonyMakerNote::tagListCs2() -#endif +#endif // (EXIV2_TEST_VERSION(0,19,1)) // Minolta Makernotes. << Exiv2::MinoltaMakerNote::tagList() << Exiv2::MinoltaMakerNote::tagListCsStd() @@ -1031,6 +1054,10 @@ // Fuji Makernotes. << Exiv2::FujiMakerNote::tagList(); +#endif // (EXIV2_TEST_VERSION(0,18,1)) + +#endif // (EXIV2_TEST_VERSION(0,21,0)) + TagsMap tagsMap; for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) { @@ -1050,7 +1077,6 @@ { d->printExiv2ExceptionError("Cannot get Makernote Tags list using Exiv2 ", e); } -#endif return TagsMap(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -33,7 +33,9 @@ imageComments.clear(); exifMetadata.clear(); iptcMetadata.clear(); +#ifdef _XMP_SUPPORT_ xmpMetadata.clear(); +#endif } KExiv2Priv::KExiv2Priv() @@ -50,7 +52,7 @@ void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e) { std::string s(e.what()); - kDebug(51003) << msg.toAscii().constData() << " (Error #" + kDebug(51003) << msg.toAscii().constData() << " (Error #" << e.code() << ": " << s.c_str() << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2_p.h 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ #include "kexiv2.h" - // C++ includes. + // C++ includes #include <cstdlib> #include <cstdio> @@ -37,7 +37,7 @@ #include <iomanip> #include <string> -// Qt includes. +// Qt includes #include <QBuffer> #include <QFile> @@ -49,7 +49,7 @@ #include <QDataStream> #include <QSharedData> -// KDE includes. +// KDE includes #include <ktemporaryfile.h> #include <kencodingdetector.h> @@ -57,7 +57,10 @@ #include <kdeversion.h> #include <kdebug.h> -// Exiv2 includes. +// Exiv2 includes ------------------------------------------------------- + +// NOTE: All Exiv2 header must be stay there to not expose external source code to Exiv2 API +// and reduce Exiv2 dependency to client code. // The pragmas are required to be able to catch exceptions thrown by libexiv2: // See http://gcc.gnu.org/wiki/Visibility, the section about c++ exceptions. @@ -65,6 +68,8 @@ #ifdef __GNUC__ #pragma GCC visibility push(default) #endif + +#include <exiv2/exv_conf.h> #include <exiv2/error.hpp> #include <exiv2/image.hpp> #include <exiv2/jpgimage.hpp> @@ -74,25 +79,11 @@ #include <exiv2/properties.hpp> #include <exiv2/types.hpp> #include <exiv2/exif.hpp> -#include <exiv2/canonmn.hpp> -#include <exiv2/sigmamn.hpp> -#include <exiv2/sonymn.hpp> -#include <exiv2/minoltamn.hpp> -#include <exiv2/nikonmn.hpp> -#include <exiv2/olympusmn.hpp> -#include <exiv2/panasonicmn.hpp> -#include <exiv2/pentaxmn.hpp> -#include <exiv2/fujimn.hpp> -//#include <exiv2/preview.hpp> -#ifdef __GNUC__ -#pragma GCC visibility pop -#endif +#include <exiv2/xmpsidecar.hpp> // Check if Exiv2 support XMP -#if (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION ==15 && EXIV2_PATCH_VERSION >=99) || \ - (EXIV2_MAJOR_VERSION ==0 && EXIV2_MINOR_VERSION >15 ) || \ - (EXIV2_MAJOR_VERSION >0) +#ifdef EXV_HAVE_XMP_TOOLKIT # define _XMP_SUPPORT_ 1 #endif @@ -107,15 +98,28 @@ # define EXIV2_TEST_VERSION(major,minor,patch) (false) #endif -#ifndef _XMP_SUPPORT_ +#if (EXIV2_TEST_VERSION(0,21,0)) -// Dummy redifinition of XmpData class to compile fine -// if XMP metadata support is not available from Exiv2 -namespace Exiv2 -{ - class XmpData{}; -} -#endif // _XMP_SUPPORT_ +// With exiv2 > 0.20.0, all makernote header files have been removed to increase binary compatibility. +// See Exiv2 bugzilla entry http://dev.exiv2.org/issues/719 +// and wiki topic http://dev.exiv2.org/boards/3/topics/583 +#else +#include <exiv2/canonmn.hpp> +#include <exiv2/sigmamn.hpp> +#include <exiv2/sonymn.hpp> +#include <exiv2/minoltamn.hpp> +#include <exiv2/nikonmn.hpp> +#include <exiv2/olympusmn.hpp> +#include <exiv2/panasonicmn.hpp> +#include <exiv2/pentaxmn.hpp> +#include <exiv2/fujimn.hpp> +#endif + +#ifdef __GNUC__ +#pragma GCC visibility pop +#endif + +// End of Exiv2 headers ------------------------------------------------------ namespace KExiv2Iface { @@ -163,14 +167,20 @@ const Exiv2::ExifData& exifMetadata() const { return data.constData()->exifMetadata; } const Exiv2::IptcData& iptcMetadata() const { return data.constData()->iptcMetadata; } - const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; } const std::string& imageComments() const { return data.constData()->imageComments; } +#ifdef _XMP_SUPPORT_ + const Exiv2::XmpData& xmpMetadata() const { return data.constData()->xmpMetadata; } +#endif + Exiv2::ExifData& exifMetadata() { return data.data()->exifMetadata; } Exiv2::IptcData& iptcMetadata() { return data.data()->iptcMetadata; } - Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; } std::string& imageComments() { return data.data()->imageComments; } +#ifdef _XMP_SUPPORT_ + Exiv2::XmpData& xmpMetadata() { return data.data()->xmpMetadata; } +#endif + public: bool writeRawFiles; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp --- old/kdegraphics-4.5.0/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-05-16 12:06:16.000000000 +0200 +++ new/kdegraphics-4.5.1/libs/libkexiv2/libkexiv2/kexiv2xmp.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -44,7 +44,7 @@ catch( Exiv2::Error& e ) { std::string s(e.what()); - kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #" + kDebug(51003) << "Cannot check Xmp access mode using Exiv2 (Error #" << e.code() << ": " << s.c_str() << ")" << endl; } @@ -52,9 +52,11 @@ #else - return false; + Q_UNUSED(filePath); #endif // _XMP_SUPPORT_ + + return false; } bool KExiv2::hasXmp() const @@ -142,6 +144,10 @@ d->printExiv2ExceptionError("Cannot set Xmp data using Exiv2 ", e); } +#else + + Q_UNUSED(data); + #endif // _XMP_SUPPORT_ return false; @@ -229,6 +235,11 @@ d->printExiv2ExceptionError("Cannot parse Xmp metadata using Exiv2 ", e); } +#else + + Q_UNUSED(xmpKeysFilter); + Q_UNUSED(invertSelection); + #endif // _XMP_SUPPORT_ return MetaDataMap(); @@ -238,17 +249,21 @@ { #ifdef _XMP_SUPPORT_ - try + try { std::string xmpkey(xmpTagName); Exiv2::XmpKey xk(xmpkey); return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyTitle(xk) ); } - catch (Exiv2::Error& e) + catch (Exiv2::Error& e) { d->printExiv2ExceptionError("Cannot get Xmp metadata tag title using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + #endif // _XMP_SUPPORT_ return QString(); @@ -257,16 +272,22 @@ QString KExiv2::getXmpTagDescription(const char* xmpTagName) { #ifdef _XMP_SUPPORT_ - try + + try { std::string xmpkey(xmpTagName); Exiv2::XmpKey xk(xmpkey); return QString::fromLocal8Bit( Exiv2::XmpProperties::propertyDesc(xk) ); } - catch (Exiv2::Error& e) + catch (Exiv2::Error& e) { d->printExiv2ExceptionError("Cannot get Xmp metadata tag description using Exiv2 ", e); } + +#else + + Q_UNUSED(xmpTagName); + #endif // _XMP_SUPPORT_ return QString(); @@ -299,6 +320,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QString(); @@ -325,6 +351,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(value); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -345,8 +377,8 @@ AltLangMap map; const Exiv2::LangAltValue &value = static_cast<const Exiv2::LangAltValue &>(it->value()); - for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin(); - it2 != value.value_.end(); ++it2) + for (Exiv2::LangAltValue::ValueType::const_iterator it2 = value.value_.begin(); + it2 != value.value_.end(); ++it2) { QString lang = QString::fromUtf8(it2->first.c_str()); QString text = QString::fromUtf8(it2->second.c_str()); @@ -366,12 +398,17 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return AltLangMap(); } -bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values, +bool KExiv2::setXmpTagStringListLangAlt(const char* xmpTagName, const KExiv2::AltLangMap& values, bool setProgramName) const { #ifdef _XMP_SUPPORT_ @@ -407,6 +444,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(values); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -448,12 +491,18 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(langAlt); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QString(); } -bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value, +bool KExiv2::setXmpTagStringLangAlt(const char* xmpTagName, const QString& value, const QString& langAlt, bool setProgramName) const { #ifdef _XMP_SUPPORT_ @@ -465,7 +514,7 @@ { QString language("x-default"); // default alternative language. - if (!langAlt.isEmpty()) + if (!langAlt.isEmpty()) language = langAlt; QString txtLangAlt = QString("lang=%1 %2").arg(language).arg(value); @@ -499,6 +548,13 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string lang-alt into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(value); + Q_UNUSED(langAlt); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -542,6 +598,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QStringList(); @@ -580,6 +641,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string Seq into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(seq); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -622,6 +689,11 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(escapeCR); + #endif // _XMP_SUPPORT_ return QStringList(); @@ -660,6 +732,12 @@ d->printExiv2ExceptionError("Cannot set Xmp tag string Bag into image using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(bag); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; @@ -668,8 +746,6 @@ bool KExiv2::addToXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToAdd, bool setProgramName) const { -//#ifdef _XMP_SUPPORT_ - if (!setProgramId(setProgramName)) return false; @@ -686,16 +762,12 @@ if (setXmpTagStringBag(xmpTagName, newEntries, false)) return true; -//#endif // _XMP_SUPPORT_ - return false; } bool KExiv2::removeFromXmpTagStringBag(const char* xmpTagName, const QStringList& entriesToRemove, bool setProgramName) const { -//#ifdef _XMP_SUPPORT_ - if (!setProgramId(setProgramName)) return false; @@ -712,8 +784,6 @@ if (setXmpTagStringBag(xmpTagName, newEntries, false)) return true; -//#endif // _XMP_SUPPORT_ - return false; } @@ -801,7 +871,7 @@ QMap<QString, QVariant> map; // access the ValueType std::map< std::string, std::string> Exiv2::LangAltValue::ValueType::const_iterator i; - for (i = value.value_.begin(); i != value.value_.end(); ++i) + for (i = value.value_.begin(); i != value.value_.end(); ++i) { map[QString::fromUtf8(i->first.c_str())] = QString::fromUtf8(i->second.c_str()); } @@ -818,6 +888,12 @@ .arg(xmpTagName), e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(rationalAsListOfInts); + Q_UNUSED(stringEscapeCR); + #endif // _XMP_SUPPORT_ return QVariant(); @@ -839,6 +915,11 @@ KExiv2Priv::printExiv2ExceptionError("Cannot register a new Xmp namespace using Exiv2 ", e); } +#else + + Q_UNUSED(uri); + Q_UNUSED(prefix); + #endif // _XMP_SUPPORT_ return false; @@ -860,6 +941,10 @@ KExiv2Priv::printExiv2ExceptionError("Cannot unregister a new Xmp namespace using Exiv2 ", e); } +#else + + Q_UNUSED(uri); + #endif // _XMP_SUPPORT_ return false; @@ -887,6 +972,11 @@ d->printExiv2ExceptionError("Cannot remove Xmp tag using Exiv2 ", e); } +#else + + Q_UNUSED(xmpTagName); + Q_UNUSED(setProgramName); + #endif // _XMP_SUPPORT_ return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.cpp new/kdegraphics-4.5.1/okular/core/document.cpp --- old/kdegraphics-4.5.0/okular/core/document.cpp 2010-04-22 10:04:04.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/document.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -3370,6 +3370,11 @@ if ( docFileName == QLatin1String( "-" ) ) return false; + QString docPath = d->m_docFileName; + const QFileInfo fi( docPath ); + if ( fi.isSymLink() ) + docPath = fi.symLinkTarget(); + KZip okularArchive( fileName ); if ( !okularArchive.open( QIODevice::WriteOnly ) ) return false; @@ -3407,7 +3412,7 @@ okularArchive.writeFile( "content.xml", user.loginName(), userGroup.name(), contentDocXml.constData(), contentDocXml.length() ); - okularArchive.addLocalFile( d->m_docFileName, docFileName ); + okularArchive.addLocalFile( docPath, docFileName ); okularArchive.addLocalFile( metadataFile.fileName(), "metadata.xml" ); if ( !okularArchive.close() ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/document.h new/kdegraphics-4.5.1/okular/core/document.h --- old/kdegraphics-4.5.0/okular/core/document.h 2010-04-15 10:58:26.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/document.h 2010-08-27 10:12:04.000000000 +0200 @@ -791,7 +791,7 @@ /** * If 'rePos.enabled == true' then this structure contains the - * viewport center. + * viewport center or top left depending on the value of pos. */ struct { bool enabled; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/core/version.h new/kdegraphics-4.5.1/okular/core/version.h --- old/kdegraphics-4.5.0/okular/core/version.h 2010-07-28 23:04:13.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/core/version.h 2010-08-27 10:12:04.000000000 +0200 @@ -10,10 +10,10 @@ #ifndef _OKULAR_VERSION_H_ #define _OKULAR_VERSION_H_ -#define OKULAR_VERSION_STRING "0.11" +#define OKULAR_VERSION_STRING "0.11.1" #define OKULAR_VERSION_MAJOR 0 #define OKULAR_VERSION_MINOR 11 -#define OKULAR_VERSION_RELEASE 0 +#define OKULAR_VERSION_RELEASE 1 #define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c)) #define OKULAR_VERSION \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/comicbook/generator_comicbook.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp --- old/kdegraphics-4.5.0/okular/generators/comicbook/generator_comicbook.cpp 2010-07-28 23:04:14.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/comicbook/generator_comicbook.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -25,7 +25,7 @@ "okular_comicbook", "okular_comicbook", ki18n( "ComicBook Backend" ), - "0.2", + "0.2.1", ki18n( "A renderer for various comic book formats" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp --- old/kdegraphics-4.5.0/okular/generators/comicbook/unrar.cpp 2010-04-07 13:25:20.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/comicbook/unrar.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -232,7 +232,7 @@ mProcess->start(); QEventLoop loop; mLoop = &loop; - ret = loop.exec( QEventLoop::WaitForMoreEvents ); + ret = loop.exec( QEventLoop::WaitForMoreEvents | QEventLoop::ExcludeUserInputEvents ); mLoop = 0; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp --- old/kdegraphics-4.5.0/okular/generators/fax/faxdocument.cpp 2008-09-26 16:55:41.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/fax/faxdocument.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -136,6 +136,8 @@ if ( pn->strips == 0 ) pn->rowsperstrip = pn->size.height(); + pn->dataOrig = (t16bits *)data; + return data; } @@ -241,6 +243,7 @@ d->mPageNode.vres = 1; d->mPageNode.inverse = 0; d->mPageNode.data = 0; + d->mPageNode.dataOrig = 0; d->mPageNode.imageData = 0; d->mType = type; @@ -252,7 +255,7 @@ FaxDocument::~FaxDocument() { - delete [] d->mPageNode.data; + delete [] d->mPageNode.dataOrig; delete [] d->mPageNode.imageData; delete d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h --- old/kdegraphics-4.5.0/okular/generators/fax/faxexpand.h 2008-09-26 16:55:41.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/fax/faxexpand.h 2010-08-27 10:12:04.000000000 +0200 @@ -59,6 +59,7 @@ int stripnum; /* current strip while expanding */ struct strip *strips; /* array of strips containing fax data in file */ t16bits *data; /* in-memory copy of strip */ + t16bits *dataOrig; /* copy of `data', in case we shift it */ size_t length; /* length of data */ QSize size; /* width & height of page in pixels */ int inverse; /* black <=> white */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp --- old/kdegraphics-4.5.0/okular/generators/fax/generator_fax.cpp 2008-11-19 11:17:38.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/generators/fax/generator_fax.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ "okular_fax", "okular_fax", ki18n( "Fax Backend" ), - "0.1", + "0.1.1", ki18n( "A G3/G4 fax document backend" ), KAboutData::License_GPL, ki18n( "© 2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp --- old/kdegraphics-4.5.0/okular/generators/plucker/generator_plucker.cpp 2008-04-23 17:51:19.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/generators/plucker/generator_plucker.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -26,7 +26,7 @@ "okular_plucker", "okular_plucker", ki18n( "Plucker Document Backend" ), - "0.1", + "0.1.1", ki18n( "A renderer for Plucker eBooks" ), KAboutData::License_GPL, ki18n( "© 2007-2008 Tobias Koenig" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp --- old/kdegraphics-4.5.0/okular/generators/plucker/unpluck/image.cpp 2008-02-21 10:27:47.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/generators/plucker/unpluck/image.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -289,8 +289,23 @@ for (j = 0; j < bytes_per_row;) { incount = *palm_ptr++; inval = *palm_ptr++; - memset (rowbuf + j, inval, incount); - j += incount; + if (incount + j <= bytes_per_row * width) + { + memset (rowbuf + j, inval, incount); + j += incount; + } + else + { + free (rowbuf); + free (lastrow); + free (jpeg_row); + + jpeg_destroy_compress (&cinfo); + + fclose( outfile ); + + return false; + } } } else if ((flags & PALM_IS_COMPRESSED_FLAG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/annotationtools.h new/kdegraphics-4.5.1/okular/ui/annotationtools.h --- old/kdegraphics-4.5.0/okular/ui/annotationtools.h 2008-01-05 00:53:45.000000000 +0100 +++ new/kdegraphics-4.5.1/okular/ui/annotationtools.h 2010-08-27 10:12:04.000000000 +0200 @@ -24,7 +24,7 @@ } /** - * @short Engine: filter events to distill Annotation's. + * @short Engine: filter events to distill Annotations. */ class AnnotatorEngine { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/ui/pageview.cpp new/kdegraphics-4.5.1/okular/ui/pageview.cpp --- old/kdegraphics-4.5.0/okular/ui/pageview.cpp 2010-08-04 21:15:45.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/ui/pageview.cpp 2010-08-27 10:12:04.000000000 +0200 @@ -1427,7 +1427,13 @@ int deltaY = d->mouseMidLastY - mouseY; // wrap mouse from top to bottom - QRect mouseContainer = KGlobalSettings::desktopGeometry( this ); + const QRect mouseContainer = KGlobalSettings::desktopGeometry( this ); + const int absDeltaY = abs(deltaY); + if ( absDeltaY > mouseContainer.height() / 2 ) + { + deltaY = mouseContainer.height() - absDeltaY; + } + if ( mouseY <= mouseContainer.top() + 4 && d->zoomFactor < 3.99 ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-4.5.0/okular/VERSION new/kdegraphics-4.5.1/okular/VERSION --- old/kdegraphics-4.5.0/okular/VERSION 2010-07-28 23:04:18.000000000 +0200 +++ new/kdegraphics-4.5.1/okular/VERSION 2010-08-27 10:12:04.000000000 +0200 @@ -1 +1 @@ -okular v0.11 +okular v0.11.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 slang for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package slang for openSUSE:Factory checked in at Fri Sep 3 14:18:14 CEST 2010. -------- --- slang/slang.changes 2010-04-08 13:51:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang.changes 2010-08-17 17:40:11.000000000 +0200 @@ -1,0 +2,32 @@ +Tue Aug 17 15:44:19 UTC 2010 - gber(a)opensuse.org + +- disabled parallel build again, still broken + +------------------------------------------------------------------- +Sat Aug 14 17:43:42 UTC 2010 - gber(a)opensuse.org + +- updated to version 2.2.2 + + new languag features + * ternary expressions + * break and condition statements can now work on several levels + of loops + * multiline strings + * List_Type objects can now also be indexed using an array of + indices + + new modules: zlib, fork, sysconf + + new intrinsic functions: sumsq, expm1, log1p, list_to_array, + string_matches, _close, _fileno, dup2, getsid, killpg, + getpriority, setpriority, ldexp, frexp + + provides pkg-info file + + many bugfixes +- split package to conform to library naming policy +- rebased patches, removed obsolete slang-2.2.1-format.patch +- added patch slang-2.2.2-makefile.patch from Fedora which fixes + shared libs permissions, the slang shared library symlink, and + parallel build dependency issues and removes rpath +- build pcre, png, and zlib modules +- removed incorrect license information +- more accurate summary and description +- further cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- slang-2.1.1-autoconf.dif slang-2.1.1.dif slang-2.1.1-format.patch slang-2.1.1-fsuid.dif slang-2.1.1.tar.bz2 slangdoc-2.0.4.tar.bz2 New: ---- slang-2.2.2-autoconf.dif slang-2.2.2.dif slang-2.2.2-fsuid.dif slang-2.2.2-libpng12-linker-flag.patch slang-2.2.2-makefile.patch slang-2.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.QxBXGF/_old 2010-09-03 14:08:10.000000000 +0200 +++ /var/tmp/diff_new_pack.QxBXGF/_new 2010-09-03 14:08:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package slang (Version 2.1.1) +# spec file for package slang (Version 2.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,56 +19,101 @@ Name: slang -License: Artistic ; GPLv2+ +License: GPLv2+ Group: System/Libraries -Version: 2.1.1 -Release: 86 -Provides: slang%{version} +Version: 2.2.2 +Release: 1 AutoReqProv: on +Summary: Programming Library and Embeddable Extansion Language +Url: http://www.jedsoft.org/ +Source: ftp://space.mit.edu/pub/davis/slang/v2.2/slang-%{version}.tar.bz2 +Source2: baselibs.conf +Patch: slang-2.2.2.dif +Patch4: slang-2.2.2-autoconf.dif +Patch5: slang-2.2.2-fsuid.dif +Patch8: slang-2.2.2-makefile.patch +Patch9: slang-2.2.2-libpng12-linker-flag.patch +# BuildRequires: oniguruma-devel >= 5.9.0 +BuildRequires: pcre-devel +%if 0%{?suse_version} > 1120 +BuildRequires: libpng12-devel +%else +BuildRequires: libpng-devel +%endif +BuildRequires: zlib-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + + +%package slsh +License: GPLv2+ +Summary: Interpreter for S-Lang Scripts +Group: Development/Languages/Other +Provides: slang = %version +Obsoletes: slang <= 2.1.1 # bug437293 %ifarch ppc64 Obsoletes: slang-64bit %endif # -Summary: A Library for Display Control -Url: http://www.jedsoft.org/ -Source: ftp://space.mit.edu/pub/davis/slang/v2.0/slang-%{version}.tar.bz2 -Source1: slangdoc-2.0.4.tar.bz2 -Source2: baselibs.conf -Patch: slang-%{version}.dif -Patch4: slang-%{version}-autoconf.dif -Patch5: slang-%{version}-fsuid.dif -Patch7: slang-%{version}-format.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel -License: Artistic ; GPLv2+ -Provides: slang:/usr/include/slang.h -Summary: Library for Display Control - Development Package +%description slsh +slsh is a standalone interpreter of the S-Lang language. It can be used to +execute scripts or interactively. + + +%package -n libslang2 +License: GPLv2+ +Summary: Programming Library and Embeddable Extension Language Group: System/Libraries + +%description -n libslang2 +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + + +%package devel +License: GPLv2+ +Summary: Programming Library and Embeddable Extension Language - Development Package +Group: Development/Languages/C and C++ Requires: %{name} = %{version} +Provides: slang:/usr/include/slang.h # bug437293 %ifarch ppc64 Obsoletes: slang-devel-64bit %endif # -%description -A library with routines for display access. It is similar to ncurses, -but it has its own programming interface. Slang uses the entries in -/usr/lib/terminfo. - %description devel -A library with routines for display access. It is similar to ncurses, -but it has its own programming interface. Slang uses the entries in -/usr/lib/terminfo. +S-Lang is a multi-platform programming library designed to allow a developer to +create robust multi-platform software. It provides facilities required by +interactive applications such as display/screen management, keyboard input, +keymaps etc. Another major feature of the library is the interpreter for the +S-Lang extension language which can be embedded into an application to make it +extensible. With slsh a standalone interpreter is available as well. + +This package contains all necessary include files and libraries needed to +develop applications that require it. + %prep -%setup -n slang-%{version} -a 1 -%patch -%patch4 -%patch5 -%patch7 +%setup -q +%patch -p1 +%patch4 -p1 +%patch5 -p1 +#%patch8 -p1 +%patch9 -p1 %build mv autoconf/configure.ac . @@ -78,55 +123,53 @@ autoconf -I autoconf export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" export ELF_CFLAGS="$CFLAGS" - ./configure --prefix=/usr --enable-wide-chars \ - --libdir=%{_libdir} \ - --sysconfdir=/etc \ - --mandir=%{_mandir} \ - --enable-warnings -# Not parallizable in 2.1.1. -Marcus Meissner -make static +%configure \ + --docdir=%{_datadir}/doc/packages/slang-devel \ + --with-pcre \ + --with-pnginc=/usr/include/libpng12 \ + --with-pnglib=/usr/lib \ + --with-z +# --with-onig +# parallel make still broken in 2.2.2 make +make static -%install +%clean rm -rf "$RPM_BUILD_ROOT" -mkdir "$RPM_BUILD_ROOT" -make DESTDIR="$RPM_BUILD_ROOT" install install-static install-links -#make runtests -cd doc -ln -s slangdoc.html index.html -cd ../modules -make clean -cd ../slsh -make clean -cd .. -mv slsh examples/ -rm -rf $RPM_BUILD_ROOT/usr/share/doc/slang -rm -f /doc/tm/tools/{solarisobjs,i686objs} -%post -%run_ldconfig +%install +%makeinstall install-static + +rm -rf %{buildroot}%{_datadir}/doc/ + +%check +make check -%postun -%run_ldconfig +%post -n libslang2 -p /sbin/ldconfig -%files +%postun -n libslang2 -p /sbin/ldconfig + +%files slsh %defattr(-,root,root) -%doc README COPY* *.txt -%{_libdir}/lib*.so.* -/usr/bin/slsh -/etc/slsh.rc -%{_libdir}/slang -%{_mandir}/man1/slsh* -/usr/share/slsh +%doc COPYING slsh/README +%doc slsh/doc/html/ +%config(noreplace) %{_sysconfdir}/slsh.rc +%{_bindir}/slsh +%{_libdir}/slang/ +%{_datadir}/slsh/ +%{_mandir}/man1/slsh.1* -%files devel +%files -n libslang2 %defattr(-,root,root) -/usr/include/* -%{_libdir}/lib*.a -%{_libdir}/lib*.so -%doc doc/* demo examples modules +%{_libdir}/libslang.so.* -%clean -rm -rf "$RPM_BUILD_ROOT" +%files devel +%defattr(-,root,root) +%doc changes.txt COPYING NEWS README UPGRADE.txt demo/ examples/ +%doc doc/grammar.txt doc/text/ +%{_includedir}/* +%{_libdir}/pkgconfig/slang.pc +%{_libdir}/libslang.a +%{_libdir}/libslang.so %changelog ++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2-autoconf.dif ++++++ --- slang/slang-2.1.1-autoconf.dif 2008-07-09 01:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-autoconf.dif 2010-08-17 16:19:27.000000000 +0200 @@ -1,6 +1,7 @@ ---- autoconf/aclocal.m4 -+++ autoconf/aclocal.m4 -@@ -306,18 +306,18 @@ dnl#}}} +diff -urN slang-2.2.2.orig/autoconf/aclocal.m4 slang-2.2.2/autoconf/aclocal.m4 +--- slang-2.2.2.orig/autoconf/aclocal.m4 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/autoconf/aclocal.m4 2010-08-15 13:48:23.000000000 +0200 +@@ -317,18 +317,18 @@ AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{ [ AC_ARG_ENABLE(warnings, @@ -29,7 +30,7 @@ fi ]) -@@ -480,7 +480,7 @@ do +@@ -495,7 +495,7 @@ done if test "$TERMCAP"; then AC_MSG_RESULT(no) @@ -38,10 +39,10 @@ fi AC_SUBST(TERMCAP)dnl AC_SUBST(MISC_TERMINFO_DIRS)dnl -@@ -491,9 +491,9 @@ dnl#}}} - +@@ -507,9 +507,9 @@ AC_DEFUN(JD_ANSI_CC, dnl#{{{ [ + AC_AIX -AC_PROG_CC -AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL @@ -49,9 +50,9 @@ +AC_REQUIRE([AC_PROG_CPP]) +AC_REQUIRE([AC_PROG_GCC_TRADITIONAL]) AC_ISC_POSIX - AC_AIX -@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes, + dnl #This stuff came from Yorick config script +@@ -521,7 +521,7 @@ yes #endif ], [ @@ -60,7 +61,7 @@ if test "$CC" = cc; then CC="cc -Ae"; fi ])dnl dnl -@@ -530,8 +530,11 @@ dnl #----------------------------------- +@@ -545,8 +545,11 @@ dnl # Check for dynamic linker dnl #------------------------------------------------------------------------- DYNAMIC_LINK_LIB="" @@ -73,7 +74,7 @@ AC_CHECK_LIB(dl,dlopen,[ DYNAMIC_LINK_LIB="-ldl" AC_DEFINE(HAVE_DLOPEN) -@@ -562,7 +565,7 @@ case "$host_os" in +@@ -585,7 +588,7 @@ *linux*|*gnu*|k*bsd*-gnu ) DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" ELF_CC="\$(CC)" @@ -82,9 +83,10 @@ ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" ---- autoconf/configure.ac -+++ autoconf/configure.ac -@@ -17,6 +17,62 @@ dnl fi +diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac +--- slang-2.2.2.orig/autoconf/configure.ac 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/autoconf/configure.ac 2010-08-15 13:49:02.000000000 +0200 +@@ -17,6 +17,62 @@ AC_CONFIG_AUX_DIR(autoconf) AC_CANONICAL_HOST @@ -147,7 +149,7 @@ JD_INIT JD_ANSI_CC -@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE +@@ -125,20 +181,20 @@ ]) if test $jd_cv_nl_langinfo_codeset = yes then @@ -160,6 +162,10 @@ -AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)]) -AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)]) -AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)]) +-AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP)]) +-AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF)]) +-AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP)]) +-AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF)]) -AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)]) -AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)]) +AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])]) @@ -167,39 +173,54 @@ +AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])]) +AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])]) +AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])]) ++AC_CHECK_LIB(m, frexp, [AC_DEFINE(HAVE_FREXP,1,[Define to 1 if you have the `frexp' function])]) ++AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF,1,[Define to 1 if you have the `frexpf' function])]) ++AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP,1,[Define to 1 if you have the `ldexp' function])]) ++AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF,1,[Define to 1 if you have the `ldexpf' function])]) +AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])]) +AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])]) JD_ELF_COMPILER JD_IEEE_CFLAGS -@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre) +@@ -168,7 +224,7 @@ if test $jd_with_pcre_library = yes then PCRE_MODULE="pcre-module.so" - AC_DEFINE(HAVE_PCRE_H) + AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header]) + extramodules="$extramodules pcre" else PCRE_MODULE="" - fi -@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h) +@@ -180,7 +236,7 @@ if test $jd_with_onig_library = yes then ONIG_MODULE="onig-module.so" - AC_DEFINE(HAVE_ONIGURUMA_H) + AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header]) + extramodules="$extramodules oniguruma" else ONIG_MODULE="" - fi -@@ -169,20 +225,20 @@ JD_CHECK_FOR_LIBRARY(png) +@@ -192,7 +248,7 @@ if test $jd_with_png_library = yes then PNG_MODULE="png-module.so" - AC_DEFINE(HAVE_PNG_H) + AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header]) + extramodules="$extramodules png" else PNG_MODULE="" +@@ -204,7 +260,7 @@ + if test $jd_with_z_library = yes + then + ZLIB_MODULE="zlib-module.so" +- AC_DEFINE(HAVE_ZLIB_H) ++ AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have the zlib library]) + extramodules="$extramodules z" + else + ZLIB_MODULE="" +@@ -212,14 +268,14 @@ fi - AC_SUBST(PNG_MODULE) + AC_SUBST(ZLIB_MODULE) -m4_include([./iconv.m4]) +dnl m4_include([./iconv.m4]) @@ -212,5 +233,5 @@ - AC_DEFINE(HAVE_ICONV_H) + AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library]) ICONV_LIB="$ICONV_LIB -liconv" + extramodules="$extramodules iconv" else - SLANG_AM_ICONV ++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2.dif ++++++ --- slang/slang-2.1.1-autoconf.dif 2008-07-09 01:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2.dif 2010-08-17 16:31:58.000000000 +0200 @@ -1,216 +1,84 @@ ---- autoconf/aclocal.m4 -+++ autoconf/aclocal.m4 -@@ -306,18 +306,18 @@ dnl#}}} - AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{ - [ - AC_ARG_ENABLE(warnings, -- [ --enable-warnings turn on GCC compiler warnings], -+ AC_HELP_STRING([--enable-warnings],[turn on GCC compiler warnings]), - [gcc_warnings=$enableval]) --if test -n "$GCC" -+if test -n "$GCC" && test -n "$gcc_warnings" - then -- #CFLAGS="$CFLAGS -fno-strength-reduce" -- if test -n "$gcc_warnings" -- then -- CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -- -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes" -- # Now trim excess whitespace -- CFLAGS=`echo $CFLAGS` -- fi -+ CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -+ -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ -+ -Wformat -Wformat-security" -+ ELF_CFLAGS="$ELF_CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ -+ -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ -+ -Wformat -Wformat-security" -+ # Now trim excess whitespace -+ CFLAGS=`echo $CFLAGS` - fi - ]) - -@@ -480,7 +480,7 @@ do - done - if test "$TERMCAP"; then - AC_MSG_RESULT(no) -- AC_DEFINE(USE_TERMCAP) -+ AC_DEFINE(USE_TERMCAP,1,[Define to use termcap]) - fi - AC_SUBST(TERMCAP)dnl - AC_SUBST(MISC_TERMINFO_DIRS)dnl -@@ -491,9 +491,9 @@ dnl#}}} - - AC_DEFUN(JD_ANSI_CC, dnl#{{{ - [ --AC_PROG_CC --AC_PROG_CPP --AC_PROG_GCC_TRADITIONAL -+AC_REQUIRE([AC_PROG_CC]) -+AC_REQUIRE([AC_PROG_CPP]) -+AC_REQUIRE([AC_PROG_GCC_TRADITIONAL]) - AC_ISC_POSIX - AC_AIX +diff -urN slang-2.2.2.orig/src/sldisply.c slang-2.2.2/src/sldisply.c +--- slang-2.2.2.orig/src/sldisply.c 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/sldisply.c 2010-08-15 13:30:36.000000000 +0200 +@@ -2441,6 +2441,13 @@ + Term_Init_Str = tt_tgetstr ("ti"); + Term_Reset_Str = tt_tgetstr ("te"); -@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes, - yes - #endif - ], [ --AC_DEFINE(_HPUX_SOURCE) -+AC_DEFINE(_HPUX_SOURCE,1,[Special define needed for HPUX]) - if test "$CC" = cc; then CC="cc -Ae"; fi - ])dnl - dnl -@@ -530,8 +530,11 @@ dnl #----------------------------------- - dnl # Check for dynamic linker - dnl #------------------------------------------------------------------------- - DYNAMIC_LINK_LIB="" -+ -+AH_TEMPLATE([HAVE_DLOPEN],[Define if you have dlopen]) -+ - AC_CHECK_HEADER(dlfcn.h,[ -- AC_DEFINE(HAVE_DLFCN_H) -+ AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header]) - AC_CHECK_LIB(dl,dlopen,[ - DYNAMIC_LINK_LIB="-ldl" - AC_DEFINE(HAVE_DLOPEN) -@@ -562,7 +565,7 @@ case "$host_os" in - *linux*|*gnu*|k*bsd*-gnu ) - DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" - ELF_CC="\$(CC)" -- ELF_CFLAGS="\$(CFLAGS) -fPIC" -+ ELF_CFLAGS="$ELF_CFLAGS -fPIC" - ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" - ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" - CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" ---- autoconf/configure.ac -+++ autoconf/configure.ac -@@ -17,6 +17,62 @@ dnl fi - AC_CONFIG_AUX_DIR(autoconf) - AC_CANONICAL_HOST - -+AH_TOP([ -+/* -*- c -*- */ -+/* Note: this is for unix only. */ -+ -+#ifndef SL_CONFIG_H -+#define SL_CONFIG_H -+]) -+ -+AH_BOTTOM([ -+#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET) -+# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK) -+# define SLANG_POSIX_SIGNALS -+# endif -+#endif -+ -+/* Define if you need to in order for stat and other things to work. */ -+#undef _POSIX_SOURCE -+ -+#ifdef _AIX -+# ifndef _POSIX_SOURCE -+# define _POSIX_SOURCE 1 -+# endif -+# ifndef _ALL_SOURCE -+# define _ALL_SOURCE -+# endif -+/* This may generate warnings but the fact is that without it, xlc will -+ * INCORRECTLY inline many str* functions. */ -+# undef __STR__ -+#endif -+ -+/* define USE_TERMCAP if you want to use it instead of terminfo. */ -+#if defined(sequent) || defined(NeXT) +# ifndef USE_TERMCAP -+# define USE_TERMCAP -+# endif -+#endif -+ -+#if defined(ultrix) && !defined(__GNUC__) -+# ifndef NO_PROTOTYPES -+# define NO_PROTOTYPES -+# endif -+#endif -+ -+#ifndef unix -+# define unix 1 -+#endif -+ -+#ifndef __unix__ -+# define __unix__ 1 ++ /* Use the given terminal specification of the terminfo entries ++ * even if we have almost vtxxx. ++ */ ++ Keypad_Init_Str = SLtt_tgetstr ("ks"); ++ Keypad_Reset_Str = SLtt_tgetstr ("ke"); ++# else + /* If I do this for vtxxx terminals, arrow keys start sending ESC O A, + * which I do not want. This is mainly for HP terminals. + */ +@@ -2449,6 +2456,7 @@ + Keypad_Init_Str = tt_tgetstr ("ks"); + Keypad_Reset_Str = tt_tgetstr ("ke"); + } ++#endif + + /* Make up for defective termcap/terminfo databases */ + if ((Vt100_Like && (term[2] != '1')) +@@ -2651,10 +2659,12 @@ + /* specific to vtxxx only */ + void SLtt_enable_cursor_keys (void) + { ++#if 0 + #ifdef __unix__ + if (Vt100_Like) + #endif + tt_write_string("\033=\033[?1l"); +#endif + } + + #ifdef VMS +diff -urN slang-2.2.2.orig/src/sltermin.c slang-2.2.2/src/sltermin.c +--- slang-2.2.2.orig/src/sltermin.c 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/sltermin.c 2010-08-15 13:35:11.000000000 +0200 +@@ -23,6 +23,9 @@ + USA. + */ + ++#include <unistd.h> ++#include <sys/types.h> ++ + #include "slinclud.h" + + #include "slang.h" +@@ -119,7 +122,32 @@ + * I will also look into the use of setreuid, seteuid and setregid, setegid. + * FIXME: Priority=medium + */ ++ /* If your system lacks setfsuid/getfsuid either write ++ equivalent support or dont use slang to build setuid/setgid ++ apps like Mutt */ ++ ++ if(setfsuid(getuid())==-1) ++ { ++ perror("setfsuid"); ++ return NULL; ++ } ++ if(setfsgid(getgid())==-1) ++ { ++ perror("setfsgid"); ++ return NULL; ++ } + fp = fopen (file, "rb"); ++ if(setfsuid(geteuid())==-1) ++ { ++ perror("setfsuid"); ++ return NULL; ++ } ++ if(setfsgid(getegid())==-1) ++ { ++ perror("setfsgid"); ++ return NULL; ++ } + -+#define _SLANG_SOURCE_ 1 -+#endif /* SL_CONFIG_H */ -+]) -+ -+ - JD_INIT - JD_ANSI_CC + if (fp == NULL) return NULL; -@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE - ]) - if test $jd_cv_nl_langinfo_codeset = yes - then -- AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1) -+ AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1, [Define to 1 if you have the nl_langinfo(CODESET) function]) - fi - --AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH)]) --AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH)]) --AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)]) --AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)]) --AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)]) --AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)]) --AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)]) -+AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])]) -+AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH,1,[Define to 1 if you have the `asinh' function])]) -+AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])]) -+AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])]) -+AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])]) -+AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])]) -+AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])]) - - JD_ELF_COMPILER - JD_IEEE_CFLAGS -@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre) - if test $jd_with_pcre_library = yes - then - PCRE_MODULE="pcre-module.so" -- AC_DEFINE(HAVE_PCRE_H) -+ AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header]) - else - PCRE_MODULE="" - fi -@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h) - if test $jd_with_onig_library = yes - then - ONIG_MODULE="onig-module.so" -- AC_DEFINE(HAVE_ONIGURUMA_H) -+ AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header]) - else - ONIG_MODULE="" - fi -@@ -169,20 +225,20 @@ JD_CHECK_FOR_LIBRARY(png) - if test $jd_with_png_library = yes - then - PNG_MODULE="png-module.so" -- AC_DEFINE(HAVE_PNG_H) -+ AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header]) - else - PNG_MODULE="" - fi - AC_SUBST(PNG_MODULE) - --m4_include([./iconv.m4]) -+dnl m4_include([./iconv.m4]) - - ICONV_MODULE="" - JD_CHECK_FOR_LIBRARY(iconv) - if test $jd_with_iconv_library = yes - then - ICONV_MODULE="iconv-module.so" -- AC_DEFINE(HAVE_ICONV_H) -+ AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library]) - ICONV_LIB="$ICONV_LIB -liconv" - else - SLANG_AM_ICONV + if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf)))) ++++++ slang-2.1.1-fsuid.dif -> slang-2.2.2-fsuid.dif ++++++ --- slang/slang-2.1.1-fsuid.dif 2010-01-13 13:50:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-fsuid.dif 2010-08-17 16:19:27.000000000 +0200 @@ -1,12 +1,12 @@ -Index: autoconf/configure.ac -=================================================================== ---- autoconf/configure.ac.orig -+++ autoconf/configure.ac -@@ -109,8 +109,17 @@ sys/socket.h \ +diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac +--- slang-2.2.2.orig/autoconf/configure.ac 2010-08-15 13:13:18.000000000 +0200 ++++ slang-2.2.2/autoconf/configure.ac 2010-08-15 13:23:24.000000000 +0200 +@@ -116,9 +116,18 @@ netinet/in.h \ arpa/inet.h \ sys/un.h \ +sys/fsuid.h \ + sys/resource.h \ ) +AC_CHECK_FUNCS(setfsuid setfsgid) @@ -20,10 +20,21 @@ AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_UID_T -Index: src/slinclud.h -=================================================================== ---- src/slinclud.h.orig -+++ src/slinclud.h +diff -urN slang-2.2.2.orig/src/config.hin slang-2.2.2/src/config.hin +--- slang-2.2.2.orig/src/config.hin 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/config.hin 2010-08-15 13:25:31.000000000 +0200 +@@ -179,6 +179,8 @@ + #undef HAVE_SYS_UN_H + #undef socklen_t + ++#undef HAVE_SYS_FSUID_H ++#undef HAVE_SETFSUID + #undef HAVE_CONFSTR + #undef HAVE_SYSCONF + #undef HAVE_PATHCONF +diff -urN slang-2.2.2.orig/src/slinclud.h slang-2.2.2/src/slinclud.h +--- slang-2.2.2.orig/src/slinclud.h 2009-12-05 20:03:51.000000000 +0100 ++++ slang-2.2.2/src/slinclud.h 2010-08-15 13:24:28.000000000 +0200 @@ -30,4 +30,8 @@ # include <memory.h> #endif @@ -33,19 +44,3 @@ +#endif + #endif /* _SLANG_INCLUDE_H_ */ -Index: src/config.hin -=================================================================== ---- src/config.hin.orig -+++ src/config.hin -@@ -166,6 +166,11 @@ - #undef HAVE_SYS_UN_H - #undef socklen_t - -+ -+#undef HAVE_SYS_FSUID_H -+#undef HAVE_SETFSUID -+ -+ - /* These two are needed on DOS-like systems. Unix does not require them. - * They are included here for consistency. - * ++++++ slang-2.2.2-libpng12-linker-flag.patch ++++++ diff -urN slang-2.2.2.orig/modules/Makefile.in slang-2.2.2/modules/Makefile.in --- slang-2.2.2.orig/modules/Makefile.in 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/modules/Makefile.in 2010-08-14 20:40:22.000000000 +0200 @@ -33,7 +33,7 @@ # If building the PNG module, you may need to set these #--------------------------------------------------------------------------- PNG_INC = @PNG_INC@ -PNG_LIB = @PNG_LIB@ -lpng +PNG_LIB = @PNG_LIB@ -lpng12 #--------------------------------------------------------------------------- # If building the ICONV module, you may need to set these #--------------------------------------------------------------------------- ++++++ slang-2.2.2-makefile.patch ++++++ diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in --- slang-2.2.2/autoconf/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/autoconf/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -47,8 +47,7 @@ help: @echo "make check : Build the library and run the regression tests" static: makefiles cd src; $(MAKE) static - cd slsh; $(MAKE) all -elf: makefiles +elf: makefiles static cd src; $(MAKE) elf cd slsh; $(MAKE) all cd modules; $(MAKE) all diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in --- slang-2.2.2/modules/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/modules/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -59,7 +59,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@ MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -INSTALL_MODULE = @INSTALL_MODULE@ +INSTALL_MODULE = @INSTALL@ MKINSDIR = ../autoconf/mkinsdir.sh SLSH_DIR = $(prefix)/share/slsh CMAPS_DIR = $(SLSH_DIR)/cmaps @@ -73,7 +73,7 @@ DEST_SLSH_DIR = $(DESTDIR)$(SLSH_DIR) DEST_CMAPSDIR = $(DESTDIR)$(CMAPS_DIR) DEST_HELPDIR = $(DESTDIR)$(HELP_DIR) #--------------------------------------------------------------------------- -RPATH = @RPATH@ +RPATH = LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@ #LIBS = $(RPATH) $(DL_LIB) @M_LIB@ diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in --- slang-2.2.2/slsh/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/slsh/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -15,7 +15,7 @@ SLANG_SRCINC = -I@SRCDIR@ SLANG_SRCLIB = -L@ELFDIR@ #--------------------------------------------------------------------------- OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@ -RPATH = @RPATH@ +RPATH = #---------------------------------------------------------------------------- INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in --- slang-2.2.2/src/Makefile.in.makefile 2009-12-05 20:03:51.000000000 +0100 +++ slang-2.2.2/src/Makefile.in 2009-12-07 10:02:56.000000000 +0100 @@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda # Rules #--------------------------------------------------------------------------- all: static elf -static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) -elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB) +static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) +elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB) -$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) +$(OBJS): $(OBJDIR)/stamp + +$(ELFOBJS): $(ELFDIR)/stamp + +$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS) -$(RM) $(OBJDIR_NORMAL_LIB) cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES) $(RANLIB) $(OBJDIR_NORMAL_LIB) @echo "" @echo $(NORMAL_LIB) created in $(OBJDIR) -$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT) +$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT) -$(RM) $(ELFDIR_ELF_LIB) cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS) if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \ @@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) @echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR). @echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created. @echo "" -$(OBJDIR) : +$(OBJDIR)/stamp : -$(MKDIR) $(OBJDIR) -$(ELFDIR) : + touch $(OBJDIR)/stamp +$(ELFDIR)/stamp : -$(MKDIR) $(ELFDIR) + touch $(ELFDIR)/stamp $(CONFIG_H) : sysconf.h -$(CP) sysconf.h $(CONFIG_H) @@ -194,9 +200,9 @@ install-elf-and-links: -$(RM) $(DEST_LIBDIR)/$(ELFLIB) -$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR) @echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR) - $(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ + $(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/ -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR) - -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB) + -cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB) @echo "" @echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR). @echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created. ++++++ slang-2.1.1.tar.bz2 -> slang-2.2.2.tar.bz2 ++++++ ++++ 148713 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 kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Fri Sep 3 14:17:40 CEST 2010. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-08-10 12:13:41.000000000 +0200 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2010-09-03 14:11:01.408454000 +0200 @@ -1,0 +2,12 @@ +Fri Aug 27 13:43:25 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- +Fri Aug 13 15:24:29 CEST 2010 - dmueller(a)suse.de + +- update 4_5_BRANCH.diff: + * disable MALLOC_CHECK_ export + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.5.0.tar.bz2 r1159603-plasma-safe-applet-drag.diff r1159643-panel-applet-drag-behaviour.diff New: ---- kdebase-workspace-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.5.0) +# spec file for package kdebase4-wallpapers (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.5.0) +# spec file for package kdebase4-workspace (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -39,7 +39,7 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd @@ -88,8 +88,6 @@ Patch201: plasma-notifications-kill-timer.diff Patch203: kdebase-workspace-4.3.95-ck-shutdown.patch Patch208: kdm-themer-wallpaper-sizes.diff -Patch209: r1159603-plasma-safe-applet-drag.diff -Patch210: r1159643-panel-applet-drag-behaviour.diff Patch211: disable-python-support.diff Patch212: build-final.diff Requires: kde4-kgreeter-plugins = %version @@ -190,8 +188,6 @@ %patch203 -p1 ###KDE45: rediff! #%patch208 -%patch209 -%patch210 %patch211 %patch212 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.5.0) +# spec file for package python-kdebase4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ 4_5_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.MrsFur/_old 2010-09-03 14:11:11.000000000 +0200 +++ /var/tmp/diff_new_pack.MrsFur/_new 2010-09-03 14:11:11.000000000 +0200 @@ -3,80 +3,5 @@ --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1159322 ++current HEAD: 1163120 +svn di between //tags/KDE/4.5.0/kdebase/workspace and //branches/KDE/4.5/kdebase/workspace ---- kcontrol/keyboard/kcm_view_models.cpp -+++ kcontrol/keyboard/kcm_view_models.cpp -@@ -307,8 +307,8 @@ - else { - int groupRow = index.row(); - const OptionGroupInfo* xkbGroup = rules->optionGroupInfos[groupRow]; -- foreach(const QString& option, keyboardConfig->xkbOptions) { -- if( option.startsWith(xkbGroup->name + Rules::XKB_OPTION_GROUP_SEPARATOR) ) -+ foreach(const OptionInfo* optionInfo, xkbGroup->optionInfos) { -+ if( keyboardConfig->xkbOptions.indexOf(optionInfo->name) != -1 ) - return Qt::PartiallyChecked; - } - return Qt::Unchecked; ---- kcontrol/keyboard/CMakeLists.txt -+++ kcontrol/keyboard/CMakeLists.txt -@@ -3,14 +3,11 @@ - - if( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - set(XiGetDevicePresence_FOUND 1) -+ ADD_DEFINITIONS(-DHAVE_XINPUT_AND_DEVICE_NOTIFY=1) - else( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - MESSAGE(STATUS "_XiGetDevicePresenceNotifyEvent is not found, libXi version 1.2.0 or later is required to keep layouts with keyboard hotplugging") - endif( X11_Xinput_FOUND AND XiGetDevicePresenceNotifyEvent_EXISTS ) - --macro_bool_to_01(XiGetDevicePresence_FOUND HAVE_XINPUT) --ADD_DEFINITIONS(-DHAVE_XINPUT=${HAVE_XINPUT}) -- -- - - ### kded daemon ### - ---- kcontrol/keyboard/layout_widget.cpp -+++ kcontrol/keyboard/layout_widget.cpp -@@ -190,7 +190,7 @@ - - m_notifierItem->setToolTipSubTitle(longText); - -- const QIcon icon(flags->getIcon(layoutUnit.layout)); -+ const QIcon icon(getFlag(layoutUnit.layout)); - m_notifierItem->setToolTipIconByPixmap(icon); - - QIcon textOrIcon = flags->getIconWithText(layoutUnit, *keyboardConfig); ---- kcontrol/keyboard/xinput_helper.cpp -+++ kcontrol/keyboard/xinput_helper.cpp -@@ -27,7 +27,7 @@ - #include <X11/Xlib.h> - #include <X11/Xatom.h> - --#if HAVE_XINPUT==1 -+#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY - #include <X11/extensions/XInput.h> - #endif - -@@ -75,7 +75,7 @@ - } - - --#if HAVE_XINPUT==1 -+#ifdef HAVE_XINPUT_AND_DEVICE_NOTIFY - - extern "C" { - extern int _XiGetDevicePresenceNotifyEvent(Display *); ---- krunner/interfaces/default/interface.cpp -+++ krunner/interfaces/default/interface.cpp -@@ -172,9 +172,9 @@ - - KrunnerTabFilter *krunnerTabFilter = new KrunnerTabFilter(m_resultsScene, lineEdit, this); - m_searchTerm->installEventFilter(krunnerTabFilter); -- m_singleRunnerSearchTerm->installEventFilter(krunnerTabFilter); - connect(krunnerTabFilter, SIGNAL(historyRotated(QString)), this, SLOT(queryTextEdited(QString))); - lineEdit->installEventFilter(this); -+ m_singleRunnerSearchTerm->installEventFilter(this); - - themeUpdated(); - connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(themeUpdated())); ++++++ kdebase-workspace-4.5.0.tar.bz2 -> kdebase-workspace-4.5.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.5.0.tar.bz2 kdebase4-workspace/kdebase-workspace-4.5.1.tar.bz2 differ: char 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 libgphoto2 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at Fri Sep 3 14:09:16 CEST 2010. -------- --- GNOME/libgphoto2/libgphoto2.changes 2010-08-15 20:05:34.000000000 +0200 +++ libgphoto2/libgphoto2.changes 2010-08-31 11:50:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 31 09:50:22 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.kFOwLx/_old 2010-09-03 14:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.kFOwLx/_new 2010-09-03 14:09:06.000000000 +0200 @@ -31,12 +31,12 @@ Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.10 -Release: 1 +Release: 2 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libgphoto2-4096files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-runtime for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Fri Sep 3 14:08:54 CEST 2010. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2010-08-10 10:40:14.000000000 +0200 +++ kdebase4-runtime/kdebase4-runtime.changes 2010-08-27 13:43:11.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 13:43:07 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-runtime-4.5.0.tar.bz2 New: ---- kdebase-runtime-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.ZcZ4N1/_old 2010-09-03 14:07:18.000000000 +0200 +++ /var/tmp/diff_new_pack.ZcZ4N1/_new 2010-09-03 14:07:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.5.0) +# spec file for package kdebase4-runtime (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -42,7 +42,7 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu @@ -246,6 +246,7 @@ %doc %lang(en) %_kde4_htmldir/en/kioslave %doc %lang(en) %_kde4_htmldir/en/knetattach %doc %lang(en) %_kde4_htmldir/en/network +%doc %lang(en) %_kde4_htmldir/en/onlinehelp %_kde4_libdir/attica_kde.so %_kde4_sysconfdir/xdg/menus/applications-merged/kde4-essential.menu %_kde4_sysconfdir/xdg/menus/kde4-information.menu ++++++ 4_5_BRANCH.diff ++++++ ++++ 1156 lines (skipped) ++++ between KDE/kdebase4-runtime/4_5_BRANCH.diff ++++ and kdebase4-runtime/4_5_BRANCH.diff ++++++ kdebase-runtime-4.5.0.tar.bz2 -> kdebase-runtime-4.5.1.tar.bz2 ++++++ ++++ 4444 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 kdepimlibs4 for openSUSE:Factory
by root＠hilbert.suse.de 03 Sep '10

03 Sep '10

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Fri Sep 3 14:07:06 CEST 2010. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2010-07-29 16:55:28.000000000 +0200 +++ kdepimlibs4/kdepimlibs4.changes 2010-08-27 13:37:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 13:36:57 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.1 + * see http://kde.org/announcements/changelogs/changelog4_5_0to4_5_1.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdepimlibs-4.5.0.tar.bz2 New: ---- kdepimlibs-4.5.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.wkfrn3/_old 2010-09-03 14:05:59.000000000 +0200 +++ /var/tmp/diff_new_pack.wkfrn3/_new 2010-09-03 14:05:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdepimlibs4 (Version 4.5.0) +# spec file for package kdepimlibs4 (Version 4.5.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: KDE PIM Libraries Url: http://www.kde.org -Version: 4.5.0 +Version: 4.5.1 Release: 1 Source0: kdepimlibs-%version.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdepimlibs-4.5.0.tar.bz2 -> kdepimlibs-4.5.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/CMakeLists.txt new/kdepimlibs-4.5.1/CMakeLists.txt --- old/kdepimlibs-4.5.0/CMakeLists.txt 2010-07-28 23:04:12.000000000 +0200 +++ new/kdepimlibs-4.5.1/CMakeLists.txt 2010-08-27 10:09:27.000000000 +0200 @@ -11,7 +11,7 @@ ############### The kdepimlibs version (used e.g. in KdepimLibsConfig.cmake) ############### set(KDEPIMLIBS_VERSION_MAJOR 4) set(KDEPIMLIBS_VERSION_MINOR 5) -set(KDEPIMLIBS_VERSION_PATCH 00) +set(KDEPIMLIBS_VERSION_PATCH 1) set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/groupwiseprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Novell-GroupWise-Nachrichtendienst Comment[en_GB]=Novell GroupWise Messenger Comment[eo]=Novell GroupWise mesaĝilo +Comment[es]=Mensajería de Novell GroupWise Comment[et]=Novell GroupWise Messenger Comment[fr]=Messagerie GroupWise Novell Comment[ga]=Teachtaire Novell GroupWise @@ -41,6 +42,7 @@ Name[de]=GroupWise Name[en_GB]=GroupWise Name[eo]=GroupWise +Name[es]=GroupWise Name[et]=GroupWise Name[fr]=GroupWise Name[ga]=GroupWise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop --- old/kdepimlibs-4.5.0/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-07-28 23:04:08.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/contact/editor/im/protocols/ircprotocol.desktop 2010-08-27 10:09:27.000000000 +0200 @@ -11,6 +11,7 @@ Comment[de]=Internet Relay Chat Comment[en_GB]=Internet Relay Chat Comment[eo]=Interreta plusenda babilado +Comment[es]=Internet Relay Chat Comment[et]=Rühmadiskussioon internetis Comment[fr]=Relai Internet de discussion Comment[ga]=Internet Relay Chat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp --- old/kdepimlibs-4.5.0/akonadi/entitymimetypefiltermodel.cpp 2010-05-20 13:41:04.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/entitymimetypefiltermodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -214,6 +214,13 @@ if (!sourceModel()) return false; + // QSortFilterProxyModel implementation is buggy in that it emits rowsAboutToBeInserted etc + // only after the source model has emitted rowsInserted, instead of emitting it when the + // source model emits rowsAboutToBeInserted. That means that the source and the proxy are out + // of sync around the time of insertions, so we can't use the optimization below. + return rowCount(parent) > 0; +#if 0 + if ( !parent.isValid() ) return sourceModel()->hasChildren(parent); @@ -233,6 +240,7 @@ } } return false; +#endif } bool EntityMimeTypeFilterModel::canFetchMore( const QModelIndex &parent ) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/itemsync.cpp new/kdepimlibs-4.5.1/akonadi/itemsync.cpp --- old/kdepimlibs-4.5.0/akonadi/itemsync.cpp 2010-07-06 08:54:00.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/itemsync.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -53,7 +53,8 @@ mStreaming( false ), mIncremental( false ), mLocalListDone( false ), - mDeliveryDone( false ) + mDeliveryDone( false ), + mFinished( false ) { // we want to fetch all data by default mFetchScope.fetchFullPayload(); @@ -106,6 +107,7 @@ bool mIncremental; bool mLocalListDone; bool mDeliveryDone; + bool mFinished; }; void ItemSync::Private::createLocalItem( const Item & item ) @@ -124,7 +126,10 @@ if ( mPendingJobs > 0 || !mDeliveryDone || mTransactionJobs > 0 ) return; - q->emitResult(); + if ( !mFinished ) { // prevent double result emission, can happen since checkDone() is called from all over the place + mFinished = true; + q->emitResult(); + } } ItemSync::ItemSync( const Collection &collection, QObject *parent ) : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp --- old/kdepimlibs-4.5.0/akonadi/kdescendantsproxymodel.cpp 2010-07-23 23:11:01.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/kdescendantsproxymodel.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -171,7 +171,10 @@ Q_ASSERT(child.isValid()); if (q->sourceModel()->hasChildren(child)) + { + Q_ASSERT(q->sourceModel()->rowCount(child) > 0); newPendingParents.append(child); + } } } m_pendingParents += newPendingParents; @@ -335,6 +338,7 @@ if (d->m_mapping.isEmpty() && sourceModel()->hasChildren()) { + Q_ASSERT(sourceModel()->rowCount() > 0); const_cast<KDescendantsProxyModelPrivate*>(d)->synchronousMappingRefresh(); } return d->m_rowCount; @@ -538,6 +542,7 @@ if (!q->sourceModel()->hasChildren(parent)) { + Q_ASSERT(q->sourceModel()->rowCount(parent) == 0); // parent was not a parent before. return; } @@ -559,6 +564,7 @@ QModelIndex idx = q->sourceModel()->index(rowCount - 1, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } // The last item in the list is getting a sibling below it. @@ -648,13 +654,16 @@ const QModelIndex idx = q->sourceModel()->index(row, column, parent); Q_ASSERT(idx.isValid()); if (q->sourceModel()->hasChildren(idx)) + { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); m_pendingParents.append(idx); + } } m_rowCount += difference; - scheduleProcessPendingParents(); q->endInsertRows(); + scheduleProcessPendingParents(); } void KDescendantsProxyModelPrivate::sourceRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) @@ -667,6 +676,7 @@ QModelIndex idx = q->sourceModel()->index(end, column, parent); while (q->sourceModel()->hasChildren(idx)) { + Q_ASSERT(q->sourceModel()->rowCount(idx) > 0); idx = q->sourceModel()->index(q->sourceModel()->rowCount(idx) - 1, column, idx); } const int proxyEnd = q->mapFromSource(idx).row(); @@ -751,6 +761,7 @@ resetInternalData(); if (q->sourceModel()->hasChildren()) { + Q_ASSERT(q->sourceModel()->rowCount() > 0); m_pendingParents.append(QModelIndex()); scheduleProcessPendingParents(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/session.cpp new/kdepimlibs-4.5.1/akonadi/session.cpp --- old/kdepimlibs-4.5.0/akonadi/session.cpp 2010-07-12 23:08:14.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/session.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -164,7 +164,6 @@ if ( currentJob ) currentJob->d_ptr->lostConnection(); connected = false; - QTimer::singleShot( 30000, mParent, SLOT( reconnect() ) ); } void SessionPrivate::dataReceived() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp --- old/kdepimlibs-4.5.0/akonadi/tests/itemsynctest.cpp 2010-05-05 16:51:13.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/tests/itemsynctest.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -97,9 +97,10 @@ Item::List l; l << origItems[i]; syncer->setFullSyncItems( l ); - if ( i < origItems.count() - 1 ) + if ( i < origItems.count() - 1 ) { QTest::qWait( 10 ); // enter the event loop so itemsync actually can do something - QCOMPARE( spy.count(), 0 ); + QCOMPARE( spy.count(), 0 ); + } } QTest::qWait( 1000 ); // let it finish its job QCOMPARE( spy.count(), 1 ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp --- old/kdepimlibs-4.5.0/akonadi/transactionsequence.cpp 2010-06-16 14:02:27.000000000 +0200 +++ new/kdepimlibs-4.5.1/akonadi/transactionsequence.cpp 2010-08-27 10:09:27.000000000 +0200 @@ -104,7 +104,7 @@ else Job::removeSubjob( job ); - if ( subjobs().isEmpty() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { + if ( !hasSubjobs() && d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::Committing; TransactionCommitJob *job = new TransactionCommitJob( this ); connect( job, SIGNAL( result( KJob* ) ), SLOT( commitResult( KJob* ) ) ); @@ -113,7 +113,14 @@ setError( job->error() ); setErrorText( job->errorText() ); removeSubjob( job ); + + // cancel all subjobs in case someone else is listening (such as ItemSync), but without notifying ourselves again + foreach ( KJob* job, subjobs() ) { + disconnect( job, SIGNAL(result(KJob*)), this, SLOT(slotResult(KJob*)) ); + job->kill( EmitResult ); + } clearSubjobs(); + if ( d->mState == TransactionSequencePrivate::Running || d->mState == TransactionSequencePrivate::WaitingForSubjobs ) { d->mState = TransactionSequencePrivate::RollingBack; TransactionRollbackJob *job = new TransactionRollbackJob( this ); Files old/kdepimlibs-4.5.0/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.5.1/doc/kcontrol/kresources/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp --- old/kdepimlibs-4.5.0/kcal/incidenceformatter.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kcal/incidenceformatter.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -351,7 +351,11 @@ if ( (*it)->uri().startsWith( QLatin1String( "kmail:" ) ) ) { name = i18n( "Show mail" ); } else { - name = (*it)->label(); + if ( (*it)->label().isEmpty() ) { + name = (*it)->uri(); + } else { + name = (*it)->label(); + } } tmpStr += htmlAddLink( (*it)->uri(), name ); } else { @@ -395,7 +399,6 @@ //TODO: add a birthday cake icon QString tmpStr = displayViewLinkPerson( email_1, name_1, uid_1, iconPath ); - return tmpStr; } @@ -578,7 +581,7 @@ const bool isBirthday = event->customProperty( "KABC", "BIRTHDAY" ) == "YES"; const bool isAnniversary = event->customProperty( "KABC", "ANNIVERSARY" ) == "YES"; - if ( isBirthday || isAnniversary ) { + if ( isBirthday || isAnniversary ) { tmpStr += "<tr>"; if ( isAnniversary ) { tmpStr += "<td><b>" + i18n( "Anniversary:" ) + "</b></td>"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kimap/sessionthread.cpp new/kdepimlibs-4.5.1/kimap/sessionthread.cpp --- old/kdepimlibs-4.5.0/kimap/sessionthread.cpp 2010-06-24 18:26:24.000000000 +0200 +++ new/kdepimlibs-4.5.1/kimap/sessionthread.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -118,16 +118,12 @@ void SessionThread::closeSocket() { - QMutexLocker locker(&m_mutex); - - m_encryptedMode = false; QTimer::singleShot( 0, this, SLOT( doCloseSocket() ) ); } void SessionThread::doCloseSocket() { - QMutexLocker locker(&m_mutex); - + m_encryptedMode = false; m_socket->close(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepimlibs-4.5.0/kmime/kmime_content.cpp new/kdepimlibs-4.5.1/kmime/kmime_content.cpp --- old/kdepimlibs-4.5.0/kmime/kmime_content.cpp 2010-07-07 19:08:52.000000000 +0200 +++ new/kdepimlibs-4.5.1/kmime/kmime_content.cpp 2010-08-27 10:09:26.000000000 +0200 @@ -513,6 +513,7 @@ // Add to new content. main->setHeader( *it ); // Remove from this content. + delete (*it); it = h_eaders.erase( it ); } else { ++it; @@ -575,6 +576,7 @@ foreach( Headers::Base *h, main->h_eaders ) { setHeader( h ); // Will remove the old one if present. } + qDeleteAll( main->h_eaders ); main->h_eaders.clear(); // Move the body. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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