Upstream release rhbz#1397608

.gitignore

@@ -9,3 +9,4 @@
 /CopyQ-2.7.0.tar.gz
 /CopyQ-2.7.1.tar.gz
 /copyq-rhbz-1359526.patch
+/CopyQ-2.8.0.tar.gz

copyq-rhbz-1227038.patch

@@ -1,14 +0,0 @@
-diff -up CopyQ-2.4.7/shared/copyq.appdata.xml.fix CopyQ-2.4.7/shared/copyq.appdata.xml
---- CopyQ-2.4.7/shared/copyq.appdata.xml.fix	2015-06-01 17:30:27.957538270 -0700
-+++ CopyQ-2.4.7/shared/copyq.appdata.xml	2015-06-01 17:23:27.357553784 -0700
-@@ -3,7 +3,9 @@
- <component type="desktop">
-     <id>copyq.desktop</id>
-     <metadata_license>CC0-1.0</metadata_license>
--    <project_license>GPL-3.0+</project_license>
-+	<project_license>GPL-3.0+</project_license>
-+	<name>CopyQ</name>
-+	<summary>Advanced Qt based clipboard manager</summary>
- 
-     <description>
-         <p>

copyq-rhbz-1359526.patch

@@ -1,78 +0,0 @@
-From cf7f7a6520897b485f002a38bd86f837b404b971 Mon Sep 17 00:00:00 2001
-From: Lukas Holecek <hluk@email.cz>
-Date: Sun, 24 Jul 2016 09:07:37 +0200
-Subject: [PATCH] Add hidden option to open tray menu on left mouse click
-
-Adds option "tray_menu_open_on_left_click" which is "false" by default
-so the main window opens on left mouse click.
-
-Since tray/indicator areas in some desktop environments may override the
-mouse behavior this option is not visible in configuration dialog. It
-can be only change by editing configuration file and restarting the app.
-
-Fixes #378
----
- src/common/appconfig.h | 5 +++++
- src/gui/mainwindow.cpp | 5 ++++-
- src/gui/mainwindow.h   | 2 ++
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/common/appconfig.h b/src/common/appconfig.h
-index 49c4a22..1c3cdb1 100644
---- a/src/common/appconfig.h
-+++ b/src/common/appconfig.h
-@@ -217,6 +217,11 @@ struct tray_images : Config<bool> {
-     static Value defaultValue() { return true; }
- };
- 
-+struct tray_menu_open_on_left_click : Config<bool> {
-+    static QString name() { return "tray_menu_open_on_left_click"; }
-+    static Value defaultValue() { return false; }
-+};
-+
- struct tray_tab : Config<QString> {
-     static QString name() { return "tray_tab"; }
- };
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index e575a12..7d6dbfc 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -1692,6 +1692,7 @@ void MainWindow::loadSettings()
-     m_options.trayCurrentTab = appConfig.option<Config::tray_tab_is_current>();
-     m_options.trayTabName = appConfig.option<Config::tray_tab>();
-     m_options.trayImages = appConfig.option<Config::tray_images>();
-+    m_options.trayMenuOpenOnLeftClick = appConfig.option<Config::tray_menu_open_on_left_click>();
-     m_options.itemPopupInterval = appConfig.option<Config::item_popup_interval>();
-     m_options.clipboardNotificationLines = appConfig.option<Config::clipboard_notification_lines>();
-     m_options.clipboardTab = appConfig.option<Config::clipboard_tab>();
-@@ -1821,7 +1822,9 @@ void MainWindow::trayActivated(QSystemTrayIcon::ActivationReason reason)
-     // Don't do this on OS X, we only ever get "Trigger"
-     Q_UNUSED(reason);
- #else
--    if ( reason == QSystemTrayIcon::MiddleClick ) {
-+    if ( reason == QSystemTrayIcon::MiddleClick
-+         || (m_options.trayMenuOpenOnLeftClick && reason == QSystemTrayIcon::Trigger) )
-+    {
-         toggleMenu();
-     } else if ( reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::DoubleClick ) {
-         // Like toggleVisible() but hide window if visible and not focused
-diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
-index 2ac800a..af1ccb4 100644
---- a/src/gui/mainwindow.h
-+++ b/src/gui/mainwindow.h
-@@ -66,6 +66,7 @@ struct MainWindowOptions {
-         , trayTabName()
-         , trayItems(5)
-         , trayImages(true)
-+        , trayMenuOpenOnLeftClick(false)
-         , itemPopupInterval(0)
-         , clipboardNotificationLines(0)
-         , transparency(0)
-@@ -89,6 +90,7 @@ struct MainWindowOptions {
-     QString trayTabName;
-     int trayItems;
-     bool trayImages;
-+    bool trayMenuOpenOnLeftClick;
-     int itemPopupInterval;
-     int clipboardNotificationLines;
-     int transparency;

copyq.spec

@@ -1,12 +1,11 @@
 %global project		CopyQ
 Name:		copyq	
 Summary:	Advanced clipboard manager
-Version:	2.7.1
+Version:	2.8.0
-Release:	3%{?dist}
+Release:	1%{?dist}
 License:	GPLv3+
 Url:		https://hluk.github.io/%{project}/
 Source0:	https://github.com/hluk/%{project}/archive/v%{version}.tar.gz#/%{project}-%{version}.tar.gz
-Patch0:		%{name}-rhbz-1359526.patch
 BuildRequires:	libXtst-devel, libXfixes-devel, desktop-file-utils
 BuildRequires:	kf5-rpm-macros, qt5-qtbase-devel, qt5-qtwebkit-devel, qt5-qtsvg-devel
 BuildRequires:	qt5-qttools-devel, qt5-qtscript-devel, qwt-qt5-devel
@@ -19,7 +18,6 @@ support for image formats, command line control and more.
 %prep
 chmod 644 %{SOURCE0}
 %setup -qn %{project}-%{version}
-%patch0 -p1 -b .rhbz-1359526
 sed -i '/DQT_RESTRICTED_CAST_FROM_ASCII/d' CMakeLists.txt
 
 %build
@@ -65,6 +63,9 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
+* Tue Nov 22 2016 Gerald Cox <gbcox@fedoraproject.org> - 2.8.0-1
+- Upstream release rhbz#1397608
+
 * Sun Jul 24 2016 Gerald Cox <gbcox@fedoraproject.org> - 2.7.1-3
 - Open tray menu on left mouse click rhbz#1359526
 

sources

@@ -1 +1 @@
-abf18dc4f5aefa2638204df616adb40f  copyq-rhbz-1359526.patch
+49506f6f191094e187e9651ad885128a  CopyQ-2.8.0.tar.gz