[arch-commits] Commit in kompare/repos (8 files)

Antonio Rojas arojas at archlinux.org
Wed Jul 29 08:07:25 UTC 2015


    Date: Wednesday, July 29, 2015 @ 10:07:25
  Author: arojas
Revision: 242779

archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64

Added:
  kompare/repos/kde-unstable-i686/
  kompare/repos/kde-unstable-i686/PKGBUILD
    (from rev 242778, kompare/kde-unstable/PKGBUILD)
  kompare/repos/kde-unstable-i686/kompare.install
    (from rev 242778, kompare/kde-unstable/kompare.install)
  kompare/repos/kde-unstable-i686/save-preferences.patch
    (from rev 242778, kompare/kde-unstable/save-preferences.patch)
  kompare/repos/kde-unstable-x86_64/
  kompare/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 242778, kompare/kde-unstable/PKGBUILD)
  kompare/repos/kde-unstable-x86_64/kompare.install
    (from rev 242778, kompare/kde-unstable/kompare.install)
  kompare/repos/kde-unstable-x86_64/save-preferences.patch
    (from rev 242778, kompare/kde-unstable/save-preferences.patch)

--------------------------------------------+
 kde-unstable-i686/PKGBUILD                 |   39 +++++++
 kde-unstable-i686/kompare.install          |   12 ++
 kde-unstable-i686/save-preferences.patch   |  148 +++++++++++++++++++++++++++
 kde-unstable-x86_64/PKGBUILD               |   39 +++++++
 kde-unstable-x86_64/kompare.install        |   12 ++
 kde-unstable-x86_64/save-preferences.patch |  148 +++++++++++++++++++++++++++
 6 files changed, 398 insertions(+)

Copied: kompare/repos/kde-unstable-i686/PKGBUILD (from rev 242778, kompare/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD	                        (rev 0)
+++ kde-unstable-i686/PKGBUILD	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.07.80
+pkgrel=1
+pkgdesc='Diff/Patch Frontend'
+url='http://kde.org/applications/development/kompare/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdesdk')
+depends=('libkomparediff2' 'ktexteditor' 'hicolor-icon-theme')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+install=${pkgname}.install
+conflicts=('kdesdk-kompare')
+replaces=('kdesdk-kompare')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/kompare-${pkgver}.tar.xz")
+sha1sums=('bc4d5cb3b92f2f24c2c1ae0c32d215c7dd993cef')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../kompare-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
+}

Copied: kompare/repos/kde-unstable-i686/kompare.install (from rev 242778, kompare/kde-unstable/kompare.install)
===================================================================
--- kde-unstable-i686/kompare.install	                        (rev 0)
+++ kde-unstable-i686/kompare.install	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kompare/repos/kde-unstable-i686/save-preferences.patch (from rev 242778, kompare/kde-unstable/save-preferences.patch)
===================================================================
--- kde-unstable-i686/save-preferences.patch	                        (rev 0)
+++ kde-unstable-i686/save-preferences.patch	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,148 @@
+From: David Rosca <nowrep at gmail.com>
+Date: Wed, 13 May 2015 12:14:42 +0000
+Subject: Fix warnings on startup + saving preferences dialog
+X-Git-Url: http://quickgit.kde.org/?p=kompare.git&a=commitdiff&h=788e7d87e9c340ce5a1e39e7786117c41bd02ab8
+---
+Fix warnings on startup + saving preferences dialog
+
+This fixes warnings on startup:
+* install xmlgui files to correct location
+* use correct indexes when adding permanent widget to status bar
+* use KActionCollection::setDefaultShortcut instead of QShortcut::setShortcut
+* use correct parser option name in main.cpp
+
+This also fixes actions of all buttons in KomparePrefDlg where it connects to correct signals.
+
+REVIEW: 123767
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,7 +74,7 @@
+ ########### 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} )
+ 
+ 
+
+--- a/kompare_shell.cpp
++++ b/kompare_shell.cpp
+@@ -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();
+
+--- a/komparepart/CMakeLists.txt
++++ b/komparepart/CMakeLists.txt
+@@ -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 )
+ 
+ 
+ 
+
+--- a/komparepart/kompare_part.cpp
++++ b/komparepart/kompare_part.cpp
+@@ -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() ));
+
+--- a/komparepart/kompareprefdlg.cpp
++++ b/komparepart/kompareprefdlg.cpp
+@@ -19,9 +19,11 @@
+ #include "kompareprefdlg.h"
+ 
+ #include <QTabWidget>
++#include <QPushButton>
+ 
+ #include <klocalizedstring.h>
+ #include <khelpclient.h>
++#include <kstandardguiitem.h>
+ 
+ #include "diffpage.h"
+ #include "viewpage.h"
+@@ -32,8 +34,10 @@
+ {
+ 	setFaceType( KPageDialog::List );
+ 	setWindowTitle( i18n( "Preferences" ) );
+-	setStandardButtons( QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel );
++	setStandardButtons( QDialogButtonBox::Help|QDialogButtonBox::Reset|QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel );
+ 	setModal( true );
++
++	KGuiItem::assign( button( QDialogButtonBox::Reset ), KStandardGuiItem::defaults() );
+ 
+ 	// ok i need some stuff in that pref dlg...
+ 	//setIconListAllVisible(true);
+@@ -52,11 +56,11 @@
+ 
+ //	frame = addVBoxPage( i18n( "" ), i18n( "" ), UserIcon( "" ) );
+ 
+-	connect( this, SIGNAL(defaultClicked()), SLOT(slotDefault()) );
+-	connect( this, SIGNAL(helpClicked()), SLOT(slotHelp()) );
+-	connect( this, SIGNAL(applyClicked()), SLOT(slotApply()) );
+-	connect( this, SIGNAL(okClicked()), SLOT(slotOk()) );
+-	connect( this, SIGNAL(cancelClicked()), SLOT(slotCancel()) );
++	connect( button( QDialogButtonBox::Reset ), &QPushButton::clicked, this, &KomparePrefDlg::slotDefault );
++	connect( button( QDialogButtonBox::Help ), &QPushButton::clicked, this, &KomparePrefDlg::slotHelp );
++	connect( button( QDialogButtonBox::Apply ), &QPushButton::clicked, this, &KomparePrefDlg::slotApply );
++	connect( button( QDialogButtonBox::Ok ), &QPushButton::clicked, this, &KomparePrefDlg::slotOk );
++	connect( button( QDialogButtonBox::Cancel ), &QPushButton::clicked, this, &KomparePrefDlg::slotCancel );
+ 
+ 	adjustSize();
+ }
+
+--- a/main.cpp
++++ b/main.cpp
+@@ -83,6 +83,7 @@
+ 	aboutData.addCredit( i18n("Bernd Gehrmann"), i18n("Cervisia diff viewer"), "bernd at physik.hu-berlin.de" );
+ 
+ 	QApplication app(argc, argv);
++	app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kompare")));
+ 	QCommandLineParser parser;
+ 	KAboutData::setApplicationData(aboutData);
+ 	parser.addVersionOption();
+@@ -119,7 +120,7 @@
+ 			qCDebug(KOMPARESHELL) << "Argument " << (i+1) << ": " << args.at( i ) ;
+ 		}
+ 
+-		if ( parser.isSet( "e" ) )
++		if ( parser.isSet( "e <encoding>" ) )
+ 		{
+ 			// Encoding given...
+ 			// FIXME: Need to implement this...
+

Copied: kompare/repos/kde-unstable-x86_64/PKGBUILD (from rev 242778, kompare/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD	                        (rev 0)
+++ kde-unstable-x86_64/PKGBUILD	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kompare
+pkgver=15.07.80
+pkgrel=1
+pkgdesc='Diff/Patch Frontend'
+url='http://kde.org/applications/development/kompare/'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde-applications' 'kdesdk')
+depends=('libkomparediff2' 'ktexteditor' 'hicolor-icon-theme')
+makedepends=('extra-cmake-modules' 'python' 'kdoctools')
+install=${pkgname}.install
+conflicts=('kdesdk-kompare')
+replaces=('kdesdk-kompare')
+source=("http://download.kde.org/unstable/applications/${pkgver}/src/kompare-${pkgver}.tar.xz")
+sha1sums=('bc4d5cb3b92f2f24c2c1ae0c32d215c7dd993cef')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../kompare-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR=$pkgdir install
+}

Copied: kompare/repos/kde-unstable-x86_64/kompare.install (from rev 242778, kompare/kde-unstable/kompare.install)
===================================================================
--- kde-unstable-x86_64/kompare.install	                        (rev 0)
+++ kde-unstable-x86_64/kompare.install	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kompare/repos/kde-unstable-x86_64/save-preferences.patch (from rev 242778, kompare/kde-unstable/save-preferences.patch)
===================================================================
--- kde-unstable-x86_64/save-preferences.patch	                        (rev 0)
+++ kde-unstable-x86_64/save-preferences.patch	2015-07-29 08:07:25 UTC (rev 242779)
@@ -0,0 +1,148 @@
+From: David Rosca <nowrep at gmail.com>
+Date: Wed, 13 May 2015 12:14:42 +0000
+Subject: Fix warnings on startup + saving preferences dialog
+X-Git-Url: http://quickgit.kde.org/?p=kompare.git&a=commitdiff&h=788e7d87e9c340ce5a1e39e7786117c41bd02ab8
+---
+Fix warnings on startup + saving preferences dialog
+
+This fixes warnings on startup:
+* install xmlgui files to correct location
+* use correct indexes when adding permanent widget to status bar
+* use KActionCollection::setDefaultShortcut instead of QShortcut::setShortcut
+* use correct parser option name in main.cpp
+
+This also fixes actions of all buttons in KomparePrefDlg where it connects to correct signals.
+
+REVIEW: 123767
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,7 +74,7 @@
+ ########### 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} )
+ 
+ 
+
+--- a/kompare_shell.cpp
++++ b/kompare_shell.cpp
+@@ -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();
+
+--- a/komparepart/CMakeLists.txt
++++ b/komparepart/CMakeLists.txt
+@@ -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 )
+ 
+ 
+ 
+
+--- a/komparepart/kompare_part.cpp
++++ b/komparepart/kompare_part.cpp
+@@ -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() ));
+
+--- a/komparepart/kompareprefdlg.cpp
++++ b/komparepart/kompareprefdlg.cpp
+@@ -19,9 +19,11 @@
+ #include "kompareprefdlg.h"
+ 
+ #include <QTabWidget>
++#include <QPushButton>
+ 
+ #include <klocalizedstring.h>
+ #include <khelpclient.h>
++#include <kstandardguiitem.h>
+ 
+ #include "diffpage.h"
+ #include "viewpage.h"
+@@ -32,8 +34,10 @@
+ {
+ 	setFaceType( KPageDialog::List );
+ 	setWindowTitle( i18n( "Preferences" ) );
+-	setStandardButtons( QDialogButtonBox::Help|QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel );
++	setStandardButtons( QDialogButtonBox::Help|QDialogButtonBox::Reset|QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel );
+ 	setModal( true );
++
++	KGuiItem::assign( button( QDialogButtonBox::Reset ), KStandardGuiItem::defaults() );
+ 
+ 	// ok i need some stuff in that pref dlg...
+ 	//setIconListAllVisible(true);
+@@ -52,11 +56,11 @@
+ 
+ //	frame = addVBoxPage( i18n( "" ), i18n( "" ), UserIcon( "" ) );
+ 
+-	connect( this, SIGNAL(defaultClicked()), SLOT(slotDefault()) );
+-	connect( this, SIGNAL(helpClicked()), SLOT(slotHelp()) );
+-	connect( this, SIGNAL(applyClicked()), SLOT(slotApply()) );
+-	connect( this, SIGNAL(okClicked()), SLOT(slotOk()) );
+-	connect( this, SIGNAL(cancelClicked()), SLOT(slotCancel()) );
++	connect( button( QDialogButtonBox::Reset ), &QPushButton::clicked, this, &KomparePrefDlg::slotDefault );
++	connect( button( QDialogButtonBox::Help ), &QPushButton::clicked, this, &KomparePrefDlg::slotHelp );
++	connect( button( QDialogButtonBox::Apply ), &QPushButton::clicked, this, &KomparePrefDlg::slotApply );
++	connect( button( QDialogButtonBox::Ok ), &QPushButton::clicked, this, &KomparePrefDlg::slotOk );
++	connect( button( QDialogButtonBox::Cancel ), &QPushButton::clicked, this, &KomparePrefDlg::slotCancel );
+ 
+ 	adjustSize();
+ }
+
+--- a/main.cpp
++++ b/main.cpp
+@@ -83,6 +83,7 @@
+ 	aboutData.addCredit( i18n("Bernd Gehrmann"), i18n("Cervisia diff viewer"), "bernd at physik.hu-berlin.de" );
+ 
+ 	QApplication app(argc, argv);
++	app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kompare")));
+ 	QCommandLineParser parser;
+ 	KAboutData::setApplicationData(aboutData);
+ 	parser.addVersionOption();
+@@ -119,7 +120,7 @@
+ 			qCDebug(KOMPARESHELL) << "Argument " << (i+1) << ": " << args.at( i ) ;
+ 		}
+ 
+-		if ( parser.isSet( "e" ) )
++		if ( parser.isSet( "e <encoding>" ) )
+ 		{
+ 			// Encoding given...
+ 			// FIXME: Need to implement this...
+



More information about the arch-commits mailing list