Hello community,
here is the log from the commit of package libyui-qt for openSUSE:Factory checked in at 2014-03-01 14:38:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-qt (Old)
and /work/SRC/openSUSE:Factory/.libyui-qt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-qt"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-qt/libyui-qt.changes 2014-01-09 17:25:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-qt.new/libyui-qt.changes 2014-03-01 14:38:05.000000000 +0100
@@ -1,0 +2,19 @@
+Thu Feb 27 14:59:54 UTC 2014 - mvidner@suse.com
+
+- Fixed save_y2logs invocation (bnc#866056).
+- 2.45.2
+
+-------------------------------------------------------------------
+Fri Feb 21 17:06:15 UTC 2014 - mvidner@suse.com
+
+- fontconfig-devel has been a build dependency; something has
+ stopped pulling it in for us
+- 2.45.1
+
+-------------------------------------------------------------------
+Tue Jan 7 12:50:04 UTC 2014 - mvidner@suse.com
+
+- Ported to Qt5
+- 2.45.0
+
+-------------------------------------------------------------------
Old:
----
libyui-qt-2.44.0.tar.bz2
New:
----
libyui-qt-2.45.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-qt-doc.spec ++++++
--- /var/tmp/diff_new_pack.VpLY6F/_old 2014-03-01 14:38:06.000000000 +0100
+++ /var/tmp/diff_new_pack.VpLY6F/_new 2014-03-01 14:38:06.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt-doc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,7 +17,7 @@
Name: libyui-qt-doc
-Version: 2.44.0
+Version: 2.45.2
Release: 0
Source: libyui-qt-%{version}.tar.bz2
++++++ libyui-qt.spec ++++++
--- /var/tmp/diff_new_pack.VpLY6F/_old 2014-03-01 14:38:06.000000000 +0100
+++ /var/tmp/diff_new_pack.VpLY6F/_new 2014-03-01 14:38:06.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libyui-qt
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,7 +17,7 @@
Name: libyui-qt
-Version: 2.44.0
+Version: 2.45.2
Release: 0
Source: libyui-qt-%{version}.tar.bz2
@@ -28,7 +28,10 @@
%define libyui_devel_version libyui-devel >= 3.0.4
BuildRequires: %{libyui_devel_version}
-BuildRequires: libqt4-devel
+BuildRequires: fontconfig-devel
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtsvg-devel
+BuildRequires: libqt5-qtx11extras-devel
Provides: yui_backend = 6
Url: http://github.com/libyui/
@@ -61,6 +64,7 @@
%package devel
Requires: %{libyui_devel_version}
+Requires: fontconfig-devel
Requires: libyui-qt6 = %{version}
Url: http://github.com/libyui/
++++++ libyui-qt-2.44.0.tar.bz2 -> libyui-qt-2.45.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/CMakeLists.txt new/libyui-qt-2.45.2/CMakeLists.txt
--- old/libyui-qt-2.44.0/CMakeLists.txt 2014-03-01 14:38:06.000000000 +0100
+++ new/libyui-qt-2.45.2/CMakeLists.txt 2014-03-01 14:38:06.000000000 +0100
@@ -1 +1 @@
-symbolic link to /usr/share/libyui/buildtools/CMakeLists.common
+symbolic link to ../libyui-master/buildtools/CMakeLists.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/ChangeLog new/libyui-qt-2.45.2/ChangeLog
--- old/libyui-qt-2.44.0/ChangeLog 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/ChangeLog 2014-02-27 16:25:40.000000000 +0100
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Thu Feb 27 14:59:54 UTC 2014 - mvidner@suse.com
+
+- Fixed save_y2logs invocation (bnc#866056).
+- 2.45.2
+
+-------------------------------------------------------------------
+Fri Feb 21 17:06:15 UTC 2014 - mvidner@suse.com
+
+- fontconfig-devel has been a build dependency; something has
+ stopped pulling it in for us
+- 2.45.1
+
+-------------------------------------------------------------------
+Tue Jan 7 12:50:04 UTC 2014 - mvidner@suse.com
+
+- Ported to Qt5
+- 2.45.0
+
+-------------------------------------------------------------------
Thu Dec 5 16:36:33 UTC 2013 - mvidner@suse.com
- adjusted to libyui so version 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/PROJECTINFO.cmake new/libyui-qt-2.45.2/PROJECTINFO.cmake
--- old/libyui-qt-2.44.0/PROJECTINFO.cmake 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/PROJECTINFO.cmake 2014-02-21 15:05:58.000000000 +0100
@@ -6,9 +6,9 @@
SET( SUBDIRS src ) # set the subdirs where your code is located.
SET( PLUGINNAME "qt" ) # define the your plugin's name, e.g. {gtk, ncurses-pkg, qt-graph}
-SET( LIB_DEPS Qt) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line
+SET( LIB_DEPS Qt5Core Qt5Gui Qt5Widgets Qt5Svg Qt5X11Extras) # define the plugin's dependecies CMake should look for separated with spaces; libyui-internal deps go in the next line
SET( INTERNAL_DEPS Libyui ) # include libyui or it's plugins (if needed), too!
-SET( LIB_LINKER QtCore QtGui X11 fontconfig dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too!
+SET( LIB_LINKER X11 fontconfig dl pthread ) # define the libs to link against with their -l name for separated with spaces, e.g. pthread dl; include libyui or it's plugins (if needed), too!
#SET( EXTRA_INCLUDES ) # set include-dir which are not picked by CMake automagically here.
SET( PROGSUBDIR "" ) # define your programm's name if the plugin is made for it, only. e.g. "YaST2" for {gtk,ncurses,qt}-pkg.
SET( URL "http://github.com/libyui/" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/VERSION.cmake new/libyui-qt-2.45.2/VERSION.cmake
--- old/libyui-qt-2.44.0/VERSION.cmake 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/VERSION.cmake 2014-02-27 16:25:40.000000000 +0100
@@ -1,6 +1,6 @@
SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "44")
-SET(VERSION_PATCH "0")
+SET(VERSION_MINOR "45")
+SET(VERSION_PATCH "2")
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/libyui-qt.spec.in new/libyui-qt-2.45.2/libyui-qt.spec.in
--- old/libyui-qt-2.44.0/libyui-qt.spec.in 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/libyui-qt.spec.in 2014-02-24 11:09:55.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package @PROJECTNAME@ (Version @VERSION@)
+# spec file for package @PROJECTNAME@
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -11,46 +11,47 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-#
-# norootforbuild
-Name: @PROJECTNAME@
-Version: @VERSION@
-Release: 0
-License: LGPL-2.1 or LGPL-3.0
-Source: @PROJECTNAME@-%{version}.tar.bz2
-Group: System/Libraries
-
-BuildRequires: boost-devel
-BuildRequires: cmake >= 2.8
-BuildRequires: gcc-c++
-BuildRequires: pkg-config
-%define libyui_devel_version libyui-devel >= 3.0.4
-BuildRequires: %{libyui_devel_version}
-BuildRequires: libqt4-devel
-Provides: yui_backend = @SONAME_MAJOR@
+Name: @PROJECTNAME@
+Version: @VERSION@
+Release: 0
+Source: @PROJECTNAME@-%{version}.tar.bz2
+
+BuildRequires: boost-devel
+BuildRequires: cmake >= 2.8
+BuildRequires: gcc-c++
+BuildRequires: pkg-config
-URL: @URL@
-Summary: @SUMMARY@
+%define libyui_devel_version libyui-devel >= 3.0.4
+BuildRequires: %{libyui_devel_version}
+BuildRequires: fontconfig-devel
+BuildRequires: libqt5-qtbase-devel
+BuildRequires: libqt5-qtsvg-devel
+BuildRequires: libqt5-qtx11extras-devel
+Provides: yui_backend = @SONAME_MAJOR@
+
+Url: @URL@
+Summary: @SUMMARY@
+License: LGPL-2.1 or LGPL-3.0
+Group: System/Libraries
%description
@DESCRIPTION@
%package -n @PROJECTNAME@@SONAME_MAJOR@
-Group: System/Libraries
-
-Requires: lib@BASELIB@@SONAME_MAJOR@
-Provides: lib@BASELIB@-qt = %{version}
-Provides: yast2-qt = %{version}
-Obsoletes: yast2-qt < 2.42.0
-
-URL: @URL@
-Summary: @SUMMARY@
+Requires: lib@BASELIB@@SONAME_MAJOR@
+Provides: lib@BASELIB@-qt = %{version}
+Provides: yast2-qt = %{version}
+Obsoletes: yast2-qt < 2.42.0
+
+Url: @URL@
+Summary: @SUMMARY@
+Group: System/Libraries
%description -n @PROJECTNAME@@SONAME_MAJOR@
@DESCRIPTION@
@@ -58,13 +59,13 @@
%package devel
-Group: Development/Languages/C and C++
-
-Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version}
-Requires: %{libyui_devel_version}
-
-URL: @URL@
-Summary: @PROJECTNAME_UC@ header files
+Requires: %{libyui_devel_version}
+Requires: fontconfig-devel
+Requires: @PROJECTNAME@@SONAME_MAJOR@ = %{version}
+
+Url: @URL@
+Summary: @PROJECTNAME_UC@ header files
+Group: Development/Languages/C and C++
%description devel
@DESCRIPTION@
@@ -76,7 +77,6 @@
%prep
%setup -q -n @PROJECTNAME@-%{version}
-
%build
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
@@ -89,21 +89,20 @@
%if %{?_with_debug:1}%{!?_with_debug:0}
cmake .. \
- -DPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
+ -DPREFIX=%{_prefix} \
+ -DDOC_DIR=%{_docdir} \
+ -DLIB_DIR=%{_lib} \
+ -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
%else
cmake .. \
- -DPREFIX=%{_prefix} \
- -DDOC_DIR=%{_docdir} \
- -DLIB_DIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=RELEASE
+ -DPREFIX=%{_prefix} \
+ -DDOC_DIR=%{_docdir} \
+ -DLIB_DIR=%{_lib} \
+ -DCMAKE_BUILD_TYPE=RELEASE
%endif
make %{?jobs:-j%jobs}
-
%install
cd build
make install DESTDIR="$RPM_BUILD_ROOT"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/CMakeLists.txt new/libyui-qt-2.45.2/src/CMakeLists.txt
--- old/libyui-qt-2.44.0/src/CMakeLists.txt 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/CMakeLists.txt 2014-02-21 15:05:58.000000000 +0100
@@ -1,2 +1,17 @@
-PROCESS_SOURCES()
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH})
+set(Y2QT_ICONDIR ${CMAKE_INSTALL_PREFIX}/share/YaST2/theme/current)
+add_definitions(
+ -DICONDIR="${Y2QT_ICONDIR}"
+ -DQT_LOCALEDIR="${QT_TRANSLATIONS_DIR}"
+ -DQTLIBDIR="${QT_LIBRARY_DIR}"
+ )
+qt5_wrap_ui(${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}")
+
+PROCESS_SOURCES()
+qt5_use_modules( ${TARGETLIB} Core Gui Widgets Svg X11Extras )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ComboTabWidget.h new/libyui-qt-2.45.2/src/QY2ComboTabWidget.h
--- old/libyui-qt-2.44.0/src/QY2ComboTabWidget.h 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/QY2ComboTabWidget.h 2014-02-21 15:05:58.000000000 +0100
@@ -30,6 +30,7 @@
#include <QString>
#include <QHash>
+#include <QWidget>
class QComboBox;
class QLabel;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2DiskUsageList.cc new/libyui-qt-2.45.2/src/QY2DiskUsageList.cc
--- old/libyui-qt-2.44.0/src/QY2DiskUsageList.cc 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/QY2DiskUsageList.cc 2014-02-21 15:05:58.000000000 +0100
@@ -195,7 +195,7 @@
setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
}
- textdomain(savedtextdomain.toAscii());
+ textdomain(savedtextdomain.toLatin1());
saveColumnWidths();
setSelectionMode(QAbstractItemView::NoSelection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2DiskUsageList.h new/libyui-qt-2.45.2/src/QY2DiskUsageList.h
--- old/libyui-qt-2.44.0/src/QY2DiskUsageList.h 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/QY2DiskUsageList.h 2014-02-21 15:05:58.000000000 +0100
@@ -218,17 +218,6 @@
**/
void init( bool allFields );
- /**
- * Paint method.
- *
- * Reimplemented from QY2ListViewItem.
- **/
- /*virtual void paintCell( QPainter * painter,
- const QColorGroup & colorGroup,
- int column,
- int width,
- int alignment );
- */
public:
/**
* Paint a percentage bar into a @ref QListViewItem cell.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ListView.cc new/libyui-qt-2.45.2/src/QY2ListView.cc
--- old/libyui-qt-2.44.0/src/QY2ListView.cc 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/QY2ListView.cc 2014-02-21 15:05:58.000000000 +0100
@@ -224,7 +224,7 @@
{
_mousePressedItem = 0;
_mousePressedCol = -1;
- _mousePressedButton = -1;
+ _mousePressedButton = Qt::NoButton;
}
// Call base class method
@@ -355,7 +355,7 @@
{
_sortByInsertionSequence = sortByInsertionSequence;
//FIXME sort();
- header()->setClickable( ! _sortByInsertionSequence );
+ header()->setSectionsClickable( ! _sortByInsertionSequence );
}
@@ -474,24 +474,6 @@
-#if FIXME_ITEM_COLORS
-void
-QY2CheckListItem::paintCell( QPainter * painter,
- const QColorGroup & colorGroup,
- int column,
- int width,
- int alignment )
-{
- QColorGroup cg = colorGroup;
-
- if ( _textColor.isValid() ) cg.setColor( QColorGroup::Text, _textColor );
- if ( _backgroundColor.isValid() ) cg.setColor( QColorGroup::Base, _backgroundColor );
-
- QTreeWidgetItem::paintCell( painter, cg, column, width, alignment );
-}
-#endif
-
-
#if FIXME_TOOLTIP
void
QY2ListViewToolTip::maybeTip( const QPoint & pos )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/QY2ListView.h new/libyui-qt-2.45.2/src/QY2ListView.h
--- old/libyui-qt-2.44.0/src/QY2ListView.h 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/QY2ListView.h 2014-02-21 15:05:58.000000000 +0100
@@ -214,7 +214,7 @@
QTreeWidgetItem * _mousePressedItem;
int _mousePressedCol;
- int _mousePressedButton;
+ Qt::MouseButton _mousePressedButton;
std::vector<int> _savedColumnWidth;
bool _sortByInsertionSequence;
@@ -291,19 +291,6 @@
protected:
- /**
- * Paint method. Reimplemented from @ref QTreeWidgetItem so different
- * colors can be used.
- *
- * Reimplemented from QTreeWidgetItem.
- **/
- /*
- virtual void paintCell( QPainter * painter,
- const QColorGroup & colorGroup,
- int column,
- int width,
- int alignment );
- */
//
// Data members
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-qt-2.44.0/src/YQApplication.h new/libyui-qt-2.45.2/src/YQApplication.h
--- old/libyui-qt-2.44.0/src/YQApplication.h 2013-12-11 11:44:33.000000000 +0100
+++ new/libyui-qt-2.45.2/src/YQApplication.h 2014-02-21 15:05:58.000000000 +0100
@@ -26,8 +26,8 @@
#ifndef YQApplication_h
#define YQApplication_h
-#include