Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2013-11-15 16:57:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center"
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2013-10-20 10:54:08.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new/yast2-control-center.changes
2013-11-15 16:57:13.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Nov 14 13:11:28 UTC 2013 - mvid...@suse.com
+
+- ported to Qt5
+- 3.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-3.1.0.tar.bz2
New:
----
yast2-control-center-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.5VMqdb/_old 2013-11-15 16:57:13.000000000 +0100
+++ /var/tmp/diff_new_pack.5VMqdb/_new 2013-11-15 16:57:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,7 +25,7 @@
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
-BuildRequires: libqt4-devel
+BuildRequires: libqt5-qtbase-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools
@@ -44,12 +44,6 @@
Group: System/YaST
Requires: yast2
Requires: yast2-control-center-binary
-Provides: y2c_menu
-Provides: y2m_menu
-Provides: yast2-menu
-Obsoletes: y2c_menu
-Obsoletes: y2m_menu
-Obsoletes: yast2-menu
%description
This package contains the menu selection component for YaST2.
++++++ yast2-control-center-3.1.0.tar.bz2 -> yast2-control-center-3.1.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/CMakeLists.txt
new/yast2-control-center-3.1.1/CMakeLists.txt
--- old/yast2-control-center-3.1.0/CMakeLists.txt 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/CMakeLists.txt 2013-11-15
13:41:10.000000000 +0100
@@ -1,6 +1,6 @@
PROJECT( yast2-control-center )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.6.0 )
-FIND_PACKAGE( Qt4 REQUIRED )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.9 )
+FIND_PACKAGE( Qt5Core REQUIRED )
SET( RPMNAME "yast2-control-center" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/CONTRIBUTING.md
new/yast2-control-center-3.1.1/CONTRIBUTING.md
--- old/yast2-control-center-3.1.0/CONTRIBUTING.md 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-control-center-3.1.1/CONTRIBUTING.md 2013-11-15
13:41:10.000000000 +0100
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+YaST is an open source project and as such it welcomes all kinds of
+contributions. If you decide to contribute, please follow these guidelines to
+ensure the process is effective and pleasant both for you and YaST maintainers.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
+registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
+if you don't have an account yet.)
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+that every bug will be fixed, but we'll try.
+
+When creating a bug report, please follow our [bug reporting
+guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to
significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+ 1. Fork the project.
+
+ 2. Create a topic branch based on `master`.
+
+ 3. Implement your change, including tests (if possible). Make sure you adhere
+ to the [Ruby style
+ guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
+
+ 4. Make sure your change didn't break anything by building the RPM package
+ (`rake osc:build`). The build process includes running the full testsuite.
+
+ 5. Publish the branch and create a pull request.
+
+ 6. YaST developers will review your change and possibly point out issues.
+ Adapt the code under their guidance until they are all resolved.
+
+ 7. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+Do not change the `VERSION` and `*.changes` files as this could lead to
+conflicts.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+you mention it in the commit message for cross-reference. Use format like
+bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
+autolinking](https://help.github.com/articles/github-flavored-markdown#references)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/VERSION
new/yast2-control-center-3.1.1/VERSION
--- old/yast2-control-center-3.1.0/VERSION 2013-10-14 18:35:55.000000000
+0200
+++ new/yast2-control-center-3.1.1/VERSION 2013-11-15 13:41:10.000000000
+0100
@@ -1 +1 @@
-3.1.0
+3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-3.1.0/package/yast2-control-center.changes
new/yast2-control-center-3.1.1/package/yast2-control-center.changes
--- old/yast2-control-center-3.1.0/package/yast2-control-center.changes
2013-10-14 18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/package/yast2-control-center.changes
2013-11-15 13:41:10.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Nov 14 13:11:28 UTC 2013 - mvid...@suse.com
+
+- ported to Qt5
+- 3.1.1
+
+-------------------------------------------------------------------
Mon Oct 14 16:10:40 UTC 2013 - jreidin...@suse.com
- do not use *.spec.in template, use *.spec file with RPM macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-3.1.0/package/yast2-control-center.spec
new/yast2-control-center-3.1.1/package/yast2-control-center.spec
--- old/yast2-control-center-3.1.0/package/yast2-control-center.spec
2013-10-15 11:20:08.000000000 +0200
+++ new/yast2-control-center-3.1.1/package/yast2-control-center.spec
2013-11-15 13:41:10.000000000 +0100
@@ -25,7 +25,7 @@
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
-BuildRequires: libqt4-devel
+BuildRequires: libqt5-qtbase-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools
@@ -44,12 +44,6 @@
Group: System/YaST
Requires: yast2
Requires: yast2-control-center-binary
-Provides: y2c_menu
-Provides: y2m_menu
-Provides: yast2-menu
-Obsoletes: y2c_menu
-Obsoletes: y2m_menu
-Obsoletes: yast2-menu
%description
This package contains the menu selection component for YaST2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/src/CMakeLists.txt
new/yast2-control-center-3.1.1/src/CMakeLists.txt
--- old/yast2-control-center-3.1.0/src/CMakeLists.txt 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/CMakeLists.txt 2013-11-15
13:41:10.000000000 +0100
@@ -1,5 +1,3 @@
-INCLUDE(${QT_USE_FILE})
-
INCLUDE_DIRECTORIES(/usr/include/initng ${CMAKE_CURRENT_BINARY_DIR})
SET(THEMEDIR "/usr/share/YaST2/theme")
@@ -53,14 +51,10 @@
#SET(yast2-control-center_RCCS ../files.qrc)
-QT4_AUTOMOC(${yast2-control-center_SRCS})
-# QT4_WRAP_UI(yast2-control-center_UIS_H ${yast2-control-center_UIS})
-QT4_WRAP_CPP(yast2-control-center_MOC ${yast2-control-center_UIS_H})
-QT4_ADD_RESOURCES(yast2-control-center_RCC_SRCS ${yast2-control-center_RCCS})
-
-
+SET(CMAKE_AUTOMOC ON)
ADD_EXECUTABLE(y2controlcenter ${yast2-control-center_SRCS}
${yast2-control-center_MOC} ${yast2-control-center_RCC_SRCS})
+QT5_USE_MODULES(y2controlcenter Widgets Gui)
TARGET_LINK_LIBRARIES(y2controlcenter ${QT_LIBRARIES})
INSTALL(TARGETS y2controlcenter DESTINATION
${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin)
@@ -76,8 +70,8 @@
yqmodulesmodel.cpp )
-QT4_AUTOMOC(${MODELS_TEST_SRCS})
ADD_EXECUTABLE(models_test ${MODELS_TEST_SRCS})
+QT5_USE_MODULES(models_test Widgets Gui)
TARGET_LINK_LIBRARIES(models_test ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES})
FIND_PACKAGE(KDE4)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-3.1.0/src/kcategorizedsortfilterproxymodel.h
new/yast2-control-center-3.1.1/src/kcategorizedsortfilterproxymodel.h
--- old/yast2-control-center-3.1.0/src/kcategorizedsortfilterproxymodel.h
2013-10-14 18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/kcategorizedsortfilterproxymodel.h
2013-11-15 13:41:10.000000000 +0100
@@ -24,7 +24,7 @@
#ifndef KCATEGORIZEDSORTFILTERPROXYMODEL_H
#define KCATEGORIZEDSORTFILTERPROXYMODEL_H
-#include <QtGui/QSortFilterProxyModel>
+#include <QSortFilterProxyModel>
//#include "kdeui_export.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/src/kcategorizedview.h
new/yast2-control-center-3.1.1/src/kcategorizedview.h
--- old/yast2-control-center-3.1.0/src/kcategorizedview.h 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/kcategorizedview.h 2013-11-15
13:41:10.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef KCATEGORIZEDVIEW_H
#define KCATEGORIZEDVIEW_H
-#include <QtGui/QListView>
+#include <QListView>
//#include <kdeui_export.h>
#define KDEUI_EXPORT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/src/main.cpp
new/yast2-control-center-3.1.1/src/main.cpp
--- old/yast2-control-center-3.1.0/src/main.cpp 2013-10-14 18:35:55.000000000
+0200
+++ new/yast2-control-center-3.1.1/src/main.cpp 2013-11-15 13:41:10.000000000
+0100
@@ -74,7 +74,7 @@
noborder = true;
}
- Qt::WFlags wflags = Qt::Window;
+ Qt::WindowFlags wflags = Qt::Window;
if ( noborder )
wflags |= Qt::FramelessWindowHint;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/src/main_window.cpp
new/yast2-control-center-3.1.1/src/main_window.cpp
--- old/yast2-control-center-3.1.0/src/main_window.cpp 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/main_window.cpp 2013-11-15
13:41:10.000000000 +0100
@@ -202,9 +202,9 @@
connect( d->searchField, SIGNAL( textChanged( const QString &)),
SLOT( slotFilterChanged() ));
- connect( shutdown, SIGNAL( activated()), qApp, SLOT( quit()));
+ connect( shutdown, &QAction::triggered, qApp, &QApplication::quit );
- connect( saveLogs, SIGNAL( activated()), logSaver, SLOT( save() ));
+ connect( saveLogs, &QAction::triggered, logSaver, &YQSaveLogs::save );
connect( logSaver, SIGNAL( statusMsg( const QString &)), statusBar(),
SLOT( showMessage( const QString &) ));
@@ -315,13 +315,13 @@
QApplication::setOverrideCursor(Qt::WaitCursor);
- qDebug() << "Run command: " << cmd.toAscii();
+ qDebug() << "Run command: " << cmd.toUtf8();
std::cout << "Run command: " << qPrintable(cmd) << std::endl;
//Translators: module name comes here (%1) e.g. HTTP server, Scanner,...
QString msg = _("Starting configuration module \"%1\"...").arg( name );
statusBar()->showMessage( msg, 2000 );
- system( cmd.toAscii() );
+ system( cmd.toUtf8() );
QTimer::singleShot( 3*1000, this, SLOT( slotRestoreCursor() ) );
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-3.1.0/src/yqdesktopfilesmodel.cpp
new/yast2-control-center-3.1.1/src/yqdesktopfilesmodel.cpp
--- old/yast2-control-center-3.1.0/src/yqdesktopfilesmodel.cpp 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/yqdesktopfilesmodel.cpp 2013-11-15
13:41:10.000000000 +0100
@@ -267,7 +267,7 @@
msgid += ": ";
msgid += valueAsString;
- QString msgstr = QString::fromUtf8( dgettext ( DESKTOP_TRANSLATIONS,
msgid.toAscii()) );
+ QString msgstr = QString::fromUtf8( dgettext ( DESKTOP_TRANSLATIONS,
msgid.toUtf8()) );
if( msgid == msgstr)
return valueAsString;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-3.1.0/src/yqsavelogs.cpp
new/yast2-control-center-3.1.1/src/yqsavelogs.cpp
--- old/yast2-control-center-3.1.0/src/yqsavelogs.cpp 2013-10-14
18:35:55.000000000 +0200
+++ new/yast2-control-center-3.1.1/src/yqsavelogs.cpp 2013-11-15
13:41:10.000000000 +0100
@@ -103,7 +103,7 @@
QString saveLogsCommand = "/sbin/save_y2logs";
QStringList args = QStringList() << fileName;
- if ( access( saveLogsCommand.toAscii(), X_OK ) == 0 )
+ if ( access( saveLogsCommand.toUtf8(), X_OK ) == 0 )
{
lock = true;
@@ -170,11 +170,11 @@
return QString::null;
- if ( access( file_name.toAscii(), F_OK ) == 0 ) // file exists?
+ if ( access( file_name.toUtf8(), F_OK ) == 0 ) // file exists?
{
QString msg;
- if ( access( file_name.toAscii(), W_OK ) == 0 )
+ if ( access( file_name.toUtf8(), W_OK ) == 0 )
{
// Confirm if the user wishes to overwrite an existing file
msg = ( _( "%1 exists! Really overwrite?" ) ).arg( file_name );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
