Hello community,
here is the log from the commit of package kompare for openSUSE:Factory checked in at 2015-10-03 20:22:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kompare (Old)
and /work/SRC/openSUSE:Factory/.kompare.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2015-07-14 17:36:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kompare.new/kompare.changes 2015-10-03 20:22:42.000000000 +0200
@@ -1,0 +2,23 @@
+Sun Sep 13 19:21:14 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.08.1
+ * KDE Applications 15.08.1
+ * https://www.kde.org/announcements/announce-applications-15.08.1.php
+
+
+-------------------------------------------------------------------
+Wed Aug 19 19:43:42 UTC 2015 - cgiboudeaux@gmx.com
+
+- Update to KDE Applications 15.08.0
+ * KDE Applications 15.08.0
+ * https://www.kde.org/announcements/announce-applications-15.08.0.php
+
+-------------------------------------------------------------------
+Fri Aug 7 06:57:28 UTC 2015 - tittiatcoke@gmail.com
+
+- Update to KDE Applications 15.07.90
+ * KDE Applications 15.08.0 RC1
+ * https://www.kde.org/announcements/announce-applications-15.07.90.php
+
+
+-------------------------------------------------------------------
Old:
----
kompare-15.04.3.tar.xz
New:
----
kompare-15.08.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kompare.spec ++++++
--- /var/tmp/diff_new_pack.KxwbkY/_old 2015-10-03 20:22:43.000000000 +0200
+++ /var/tmp/diff_new_pack.KxwbkY/_new 2015-10-03 20:22:43.000000000 +0200
@@ -36,7 +36,7 @@
License: GPL-2.0 and GFDL-1.2
Group: Development/Tools/Other
Url: http://www.kde.org/
-Version: 15.04.3
+Version: 15.08.1
Release: 0
Source0: %{name}-%{version}.tar.xz
Obsoletes: %{name}5 < %{version}
@@ -89,9 +89,9 @@
%dir %{_kf5_htmldir}
%doc %{_kf5_htmldir}/en/*/
%{_kf5_iconsdir}/hicolor/*/*/kompare.*
-%{_kf5_sharedir}/kompare/
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
+%{_kf5_kxmlguidir}/kompare
%files devel
%defattr(-,root,root)
++++++ kompare-15.04.3.tar.xz -> kompare-15.08.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/.reviewboardrc new/kompare-15.08.1/.reviewboardrc
--- old/kompare-15.04.3/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100
+++ new/kompare-15.08.1/.reviewboardrc 2015-08-27 04:11:03.000000000 +0200
@@ -0,0 +1,3 @@
+REVIEWBOARD_URL = "https://git.reviewboard.kde.org"
+REPOSITORY = "kompare"
+BRANCH = "master"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/CMakeLists.txt new/kompare-15.08.1/CMakeLists.txt
--- old/kompare-15.04.3/CMakeLists.txt 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/CMakeLists.txt 2015-08-27 04:11:03.000000000 +0200
@@ -74,6 +74,6 @@
########### install files ###############
install( PROGRAMS kompare.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES kompareui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare )
+install( FILES kompareui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kompare )
install( FILES komparenavigationpart.desktop kompareviewpart.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/kompare.desktop new/kompare-15.08.1/kompare.desktop
--- old/kompare-15.04.3/kompare.desktop 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/kompare.desktop 2015-08-27 04:11:03.000000000 +0200
@@ -67,7 +67,7 @@
Name[zh_TW]=Kompare
GenericName=Diff/Patch Frontend
GenericName[af]=Diff/Lap Voorprogram
-GenericName[ast]=Interface Diff/Patch
+GenericName[ast]=Interfaz Diff/Patch
GenericName[bg]=Интерфейс за Diff/Patch
GenericName[bs]=Poređenje datoteka za KDE pomoću Diff/Patch
GenericName[ca]=Frontal del Diff/Patch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/kompare_shell.cpp new/kompare-15.08.1/kompare_shell.cpp
--- old/kompare-15.04.3/kompare_shell.cpp 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/kompare_shell.cpp 2015-08-27 04:11:03.000000000 +0200
@@ -44,9 +44,9 @@
#include "kompareinterface.h"
#include "kompareurldialog.h"
-#define ID_N_OF_N_DIFFERENCES 1
-#define ID_N_OF_N_FILES 2
-#define ID_GENERAL 3
+#define ID_N_OF_N_DIFFERENCES 0
+#define ID_N_OF_N_FILES 1
+#define ID_GENERAL 2
Q_LOGGING_CATEGORY(KOMPARESHELL, "kompareshell")
@@ -208,10 +208,10 @@
a = actionCollection()->addAction("file_compare_files", this, SLOT(slotFileCompareFiles()));
a->setIcon(QIcon::fromTheme("document-open"));
a->setText(i18n("&Compare Files..."));
- a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
+ actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_C));
a = actionCollection()->addAction("file_blend_url", this, SLOT(slotFileBlendURLAndDiff()));
a->setText(i18n("&Blend URL with Diff..."));
- a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B));
+ actionCollection()->setDefaultShortcut(a, QKeySequence(Qt::CTRL + Qt::Key_B));
actionCollection()->addAction(KStandardAction::Quit, this, SLOT( slotFileClose() ));
createStandardStatusBarAction();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/komparepart/CMakeLists.txt new/kompare-15.08.1/komparepart/CMakeLists.txt
--- old/kompare-15.04.3/komparepart/CMakeLists.txt 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/komparepart/CMakeLists.txt 2015-08-27 04:11:03.000000000 +0200
@@ -37,7 +37,7 @@
########### install files ###############
install( FILES komparepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES komparepartui.rc DESTINATION ${DATA_INSTALL_DIR}/kompare )
+install( FILES komparepartui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kompare )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/komparepart/kompare_part.cpp new/kompare-15.08.1/komparepart/kompare_part.cpp
--- old/kompare-15.04.3/komparepart/kompare_part.cpp 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/komparepart/kompare_part.cpp 2015-08-27 04:11:03.000000000 +0200
@@ -181,7 +181,7 @@
m_diffRefresh = actionCollection()->addAction("file_refreshdiff", this, SLOT(slotRefreshDiff()));
m_diffRefresh->setIcon(QIcon::fromTheme("view-refresh"));
m_diffRefresh->setText(i18n("Refresh Diff"));
- m_diffRefresh->setShortcuts(KStandardShortcut::reload());
+ actionCollection()->setDefaultShortcuts(m_diffRefresh, KStandardShortcut::reload());
m_print = actionCollection()->addAction(KStandardAction::Print, this, SLOT( slotFilePrint() ));
m_printPreview = actionCollection()->addAction(KStandardAction::PrintPreview, this, SLOT( slotFilePrintPreview() ));
@@ -540,12 +540,15 @@
dlg.setModal( true );
dlg.setWindowTitle( i18n("Diff Options") );
QDialogButtonBox *buttons = new QDialogButtonBox( QDialogButtonBox::Save | QDialogButtonBox::Cancel, &dlg );
+ connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
+ connect(buttons, &QDialogButtonBox::rejected, &dlg, &QDialog::reject);
KompareSaveOptionsWidget* w = new KompareSaveOptionsWidget(
m_info.localSource,
m_info.localDestination,
m_diffSettings, &dlg );
- QHBoxLayout *layout = new QHBoxLayout(&dlg);
+ QVBoxLayout *layout = new QVBoxLayout(&dlg);
layout->addWidget( w );
+ layout->addWidget( buttons );
dlg.setLayout( layout );
if( dlg.exec() ) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-15.04.3/komparepart/kompareprefdlg.cpp new/kompare-15.08.1/komparepart/kompareprefdlg.cpp
--- old/kompare-15.04.3/komparepart/kompareprefdlg.cpp 2015-05-31 08:57:46.000000000 +0200
+++ new/kompare-15.08.1/komparepart/kompareprefdlg.cpp 2015-08-27 04:11:03.000000000 +0200
@@ -19,9 +19,11 @@
#include "kompareprefdlg.h"
#include <QTabWidget>
+#include <QPushButton>
#include