From f7a1fd8a176fcbc64bb943517024e28ddf791aad Mon Sep 17 00:00:00 2001
From: msmeissn <>
Date: Nov 17 2022 16:33:36 +0000
Subject: Update crow-translate to version 2.10.0 / rev 7 via SR 1035892
https://build.opensuse.org/request/show/1035892
by user msmeissn + dimstar_suse
---
diff --git a/.files b/.files
index 0e98cd9..81a688b 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 3a037d8..d1aa4cf 100644
--- a/.rev
+++ b/.rev
@@ -47,4 +47,12 @@
942492
+
+ 4489cbcaf629b91f4c4971c0f6bdde8a
+ 2.10.0
+
+ dimstar_suse
+
+ 1035892
+
diff --git a/Fix-install-path.patch b/Fix-install-path.patch
deleted file mode 100644
index b23181e..0000000
--- a/Fix-install-path.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nuar crow-translate-2.9.1.orig/CMakeLists.txt crow-translate-2.9.1/CMakeLists.txt
---- crow-translate-2.9.1.orig/CMakeLists.txt 2021-10-22 10:32:56.000000000 +0300
-+++ crow-translate-2.9.1/CMakeLists.txt 2021-12-24 18:24:42.001612532 +0300
-@@ -7,8 +7,8 @@
- LANGUAGES CXX
- )
-
--set(APPLICATION_NAME "Crow Translate")
--set(EXECUTABLE_NAME crow)
-+set(APPLICATION_NAME "crow-translate")
-+set(EXECUTABLE_NAME crow-translate)
- if(UNIX)
- set(DESKTOP_FILE io.crow_translate.CrowTranslate.desktop)
- endif()
-diff -Nuar crow-translate-2.9.1.orig/data/io.crow_translate.CrowTranslate.desktop crow-translate-2.9.1/data/io.crow_translate.CrowTranslate.desktop
---- crow-translate-2.9.1.orig/data/io.crow_translate.CrowTranslate.desktop 2021-10-22 10:32:56.000000000 +0300
-+++ crow-translate-2.9.1/data/io.crow_translate.CrowTranslate.desktop 2021-12-24 18:25:04.121855522 +0300
-@@ -10,7 +10,7 @@
- Keywords=google;yandex;text-to-speech;
- Keywords[ru]=google;yandex;текст в речь;
- Keywords[fi]=google;yandex;tekstistä puheeksi;
--Exec=crow
-+Exec=crow-translate
- Icon=crow-translate
- Terminal=false
- StartupNotify=false
diff --git a/Fluent-icon-theme-2021-08-15.tar.gz b/Fluent-icon-theme-2021-08-15.tar.gz
deleted file mode 120000
index 1f3fac7..0000000
--- a/Fluent-icon-theme-2021-08-15.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiahph4tnu5nltnm7njxwax5hsw3t3bombyl3u647uuwvkozoj7cdu
\ No newline at end of file
diff --git a/QHotkey-1.4.2.tar.gz b/QHotkey-1.4.2.tar.gz
deleted file mode 120000
index 5b0887a..0000000
--- a/QHotkey-1.4.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreifg2vifuugffpgio3enbpzlxcq5zwpv5jqnvtvapwbxee3rcw37nu
\ No newline at end of file
diff --git a/QOnlineTranslator-1.5.2.tar.gz b/QOnlineTranslator-1.5.2.tar.gz
deleted file mode 120000
index 925e7d6..0000000
--- a/QOnlineTranslator-1.5.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreiczyxjob7l2zenbhouvsplwh55w6jjzsiszefxogl4j3coenlvyvu
\ No newline at end of file
diff --git a/QTaskbarControl-2.0.2.tar.gz b/QTaskbarControl-2.0.2.tar.gz
deleted file mode 120000
index d0711fc..0000000
--- a/QTaskbarControl-2.0.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreidfhcychmk46hodg6vpcl6kvrz4anq6ds2jaontmqqhliiqshrifa
\ No newline at end of file
diff --git a/SingleApplication-3.2.0.tar.gz b/SingleApplication-3.2.0.tar.gz
deleted file mode 120000
index 3f69ce0..0000000
--- a/SingleApplication-3.2.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreiairty4vhqhkrw3fadzlwlxaoyv33vazju6tqa6542ecldgly34k4
\ No newline at end of file
diff --git a/circle-flags-2.3.0.tar.gz b/circle-flags-2.3.0.tar.gz
deleted file mode 120000
index 9baa419..0000000
--- a/circle-flags-2.3.0.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreida3hskqkylt6ms7rufvh35eaet2nwisi2ll2fsombmd4h6orxxae
\ No newline at end of file
diff --git a/cmakelists-txt.patch b/cmakelists-txt.patch
new file mode 100644
index 0000000..bae1413
--- /dev/null
+++ b/cmakelists-txt.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt 2022-08-23 19:55:00.617670378 +0300
++++ b/CMakeLists.txt 2022-08-23 19:56:23.654533634 +0300
+@@ -7,8 +7,8 @@
+ LANGUAGES CXX
+ )
+
+-set(APPLICATION_NAME "Crow Translate")
+-set(EXECUTABLE_NAME crow)
++set(APPLICATION_NAME "crow-translate")
++set(EXECUTABLE_NAME crow-translate)
+ if(UNIX)
+ set(DESKTOP_FILE io.crow_translate.CrowTranslate.desktop)
+ set(METAINFO_FILE io.crow_translate.CrowTranslate.metainfo.xml)
+@@ -93,13 +93,10 @@
+
+ set(APP_ICONS
+ data/icons/app/128-apps-crow-translate.png
+- data/icons/app/150-apps-crow-translate.png
+ data/icons/app/16-apps-crow-translate.png
+ data/icons/app/22-apps-crow-translate.png
+ data/icons/app/256-apps-crow-translate.png
+- data/icons/app/310-apps-crow-translate.png
+ data/icons/app/32-apps-crow-translate.png
+- data/icons/app/44-apps-crow-translate.png
+ data/icons/app/48-apps-crow-translate.png
+ data/icons/app/512-apps-crow-translate.png
+ data/icons/app/64-apps-crow-translate.png
diff --git a/crow-translate-2.10.0-source.tar.gz b/crow-translate-2.10.0-source.tar.gz
new file mode 120000
index 0000000..1914b86
--- /dev/null
+++ b/crow-translate-2.10.0-source.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiagsd3ej3xuk5rmimapsi6l4miof5hjifne7yeira3y22r63b5pau
\ No newline at end of file
diff --git a/crow-translate-2.9.1.tar.gz b/crow-translate-2.9.1.tar.gz
deleted file mode 120000
index 1f7aeee..0000000
--- a/crow-translate-2.9.1.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeidwr3zou4dnnki4fvdi75zszmdgbcdaak5747iwubjvhxdzicldru
\ No newline at end of file
diff --git a/crow-translate.changes b/crow-translate.changes
index 3f78c45..d1ee8cf 100644
--- a/crow-translate.changes
+++ b/crow-translate.changes
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Wed Sep 14 16:21:33 UTC 2022 - Андрей Алыпов
+
+- Update to version 2.10.0
+- Remove:
+ * Fluent-icon-theme-2021-08-15.tar.gz
+ * QHotkey-1.4.2.tar.gz
+ * QOnlineTranslator-1.5.2.tar.gz
+ * QTaskbarControl-2.0.2.tar.gz
+ * SingleApplication-3.2.0.tar.gz
+ * circle-flags-2.3.0.tar.gz
+ * fetchcontent.patch
+ * Fix-install-path.patch
+- Add patch:
+ * third-party-library-static.patch
+ * cmakelists-txt.patch
+ * desktop-file.patch
+
+-------------------------------------------------------------------
Sat Dec 25 23:19:11 UTC 2021 - Martin Hauke
- Remove superfluous _service file
diff --git a/crow-translate.spec b/crow-translate.spec
index bfd6010..3a79fe2 100644
--- a/crow-translate.spec
+++ b/crow-translate.spec
@@ -1,7 +1,7 @@
#
# spec file for package crow-translate
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2019, Martin Hauke
#
# All modifications and additions to the file contributed by third parties
@@ -17,65 +17,40 @@
#
-%define _qonlinetranslator_version 1.5.2
-%define _qhotkey_version 1.4.2
-%define _qtaskbarcontrol_version 2.0.2
-%define _singleapplication_version 3.2.0
-%define _circle_flags_version 2.3.0
-%define _fluent_icon_theme_version 2021-08-15
%define _name io.crow_translate.CrowTranslate
Name: crow-translate
-Version: 2.9.1
+Version: 2.10.0
Release: 0
Summary: A Qt GUI for Google, Yandex and Bing translators
License: GPL-3.0-only
Group: Productivity/Networking/Web/Frontends
URL: https://crow-translate.github.io/
-Source0: https://codeload.github.com/%{name}/%{name}/tar.gz/refs/tags/%{version}#/%{name}-%{version}.tar.gz
-# SECTION 3rd-party sources
-# QOnlineTranslator is licensed under GPL-3.0
-Source1: https://codeload.github.com/%{name}/QOnlineTranslator/tar.gz/refs/tags/%{_qonlinetranslator_version}#/QOnlineTranslator-%{_qonlinetranslator_version}.tar.gz
-# QHotkey is licensed under BSD-3-Clause
-Source2: https://codeload.github.com/Skycoder42/QHotkey/tar.gz/refs/tags/%{_qhotkey_version}#/QHotkey-%{_qhotkey_version}.tar.gz
-# QTaskbarControl is licensed under BSD-3-Clause
-Source3: https://codeload.github.com/Skycoder42/QTaskbarControl/tar.gz/refs/tags/%{_qtaskbarcontrol_version}#/QTaskbarControl-%{_qtaskbarcontrol_version}.tar.gz
-# SingleApplication is licensed under MIT
-Source4: https://codeload.github.com/itay-grudev/SingleApplication/tar.gz/refs/tags/v%{_singleapplication_version}#/SingleApplication-%{_singleapplication_version}.tar.gz
-# circle-flags is licensed under MIT
-Source5: https://codeload.github.com/HatScripts/circle-flags/tar.gz/refs/tags/v%{_circle_flags_version}#/circle-flags-%{_circle_flags_version}.tar.gz
-# Fluent-icon-theme is licensed under GPL-3.0
-Source6: https://codeload.github.com/vinceliuice/Fluent-icon-theme/tar.gz/refs/tags/%{_fluent_icon_theme_version}#/Fluent-icon-theme-%{_fluent_icon_theme_version}.tar.gz
-Patch0: Fix-install-path.patch
-Patch1: fetchcontent.patch
+Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.gz
+Patch0: third-party-library-static.patch
+Patch1: cmakelists-txt.patch
+Patch2: desktop-file.patch
BuildRequires: cmake >= 3.16.0
BuildRequires: extra-cmake-modules
BuildRequires: gcc-c++
BuildRequires: hicolor-icon-theme
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+BuildRequires: cmake(KF5Wayland)
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Concurrent)
+BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Multimedia)
+BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(lept)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(tesseract) >= 4.0
+BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
Requires: gstreamer-plugins-good
-# SECTION 3rd-party BuildRequires
-BuildRequires: pkgconfig(Qt5Core)
-#uildRequires: pkgconfig(Qt5DBus)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Multimedia)
-BuildRequires: pkgconfig(Qt5Network)
-#uildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: pkgconfig(x11)
-# /SECTION
-Provides: bundled(qonlinetranslator) = %{_qonlinetranslator_version}
-Provides: bundled(qhotkey) = %{_qhotkey_version}
-Provides: bundled(qtaskbarcontrol) = %{_qtaskbarcontrol_version}
-Provides: bundled(singleapplication) = %{_singleapplication_version}
%description
A simple and lightweight translator that allows to translate and speak
@@ -84,29 +59,15 @@ text using Google, Yandex and Bing written with Qt5.
%lang_package
%prep
-%setup -q -a1 -a2 -a3 -a4 -a5 -a6
-%patch0 -p1
-sed -i '/GIT_TAG/d' cmake/ExternalLibraries.cmake
-%patch1 -p1
-mkdir -p src/qonlinetranslator/ src/third-party/qhotkey/ src/third-party/qtaskbarcontrol/ \
-src/third-party/singleapplication/ src/circle-flags src/Fluent-icon-theme
-mv QOnlineTranslator-%{_qonlinetranslator_version}/* src/qonlinetranslator/
-mv QHotkey-%{_qhotkey_version}/* src/third-party/qhotkey/
-mv QTaskbarControl-%{_qtaskbarcontrol_version}/* src/third-party/qtaskbarcontrol/
-mv SingleApplication-%{_singleapplication_version}/* src/third-party/singleapplication/
-mv circle-flags-%{_circle_flags_version}/* src/circle-flags/
-mv Fluent-icon-theme-%{_fluent_icon_theme_version}/* src/Fluent-icon-theme/
+%autosetup -p1
%build
-%cmake \
- -DBUILD_SHARED_LIBS=OFF
+%cmake
%cmake_build
%install
%cmake_install
%suse_update_desktop_file -r %{_name} Office Dictionary
-# remove icons with unusual sizes
-rm -rf %{buildroot}%{_datadir}/icons/hicolor/{310x310,150x150,44x44}
%find_lang %{name} --with-qt
@@ -117,6 +78,7 @@ rm -rf %{buildroot}%{_datadir}/icons/hicolor/{310x310,150x150,44x44}
%{_datadir}/applications/%{_name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.??g
%{_datadir}/icons/hicolor/*/status/%{name}-tray-*.??g
+%{_datadir}/metainfo/%{_name}.metainfo.xml
%files lang -f %{name}.lang
%dir %{_datadir}/%{name}
diff --git a/desktop-file.patch b/desktop-file.patch
new file mode 100644
index 0000000..5714397
--- /dev/null
+++ b/desktop-file.patch
@@ -0,0 +1,17 @@
+--- a/data/io.crow_translate.CrowTranslate.desktop 2022-08-23 19:59:07.120233016 +0300
++++ b/data/io.crow_translate.CrowTranslate.desktop 2022-08-23 20:00:15.148940247 +0300
+@@ -10,12 +10,13 @@
+ Keywords=google;yandex;text-to-speech;
+ Keywords[ru]=google;yandex;текст в речь;
+ Keywords[fi]=google;yandex;tekstistä puheeksi;
+-Exec=crow
++Exec=crow-translate
+ Icon=crow-translate
+ Terminal=false
+ StartupNotify=false
+ Type=Application
+ Categories=Office;Network;Qt;
++X-LXQt-Need-Tray=true
+ StartupWMClass=crow
+ X-KDE-DBUS-Restricted-Interfaces=org.kde.kwin.Screenshot
+ X-Purism-FormFactor=Workstation;Mobile;
diff --git a/fetchcontent.patch b/fetchcontent.patch
deleted file mode 100644
index d2b5564..0000000
--- a/fetchcontent.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/cmake/ExternalLibraries.cmake 2021-10-04 00:33:51.992380168 +0300
-+++ b/cmake/ExternalLibraries.cmake 2021-10-04 00:36:16.441915429 +0300
-@@ -2,28 +2,28 @@
-
- set(QAPPLICATION_CLASS QApplication)
- FetchContent_Declare(SingleApplication
-- GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/singleapplication
- )
-
- FetchContent_Declare(QTaskbarControl
-- GIT_REPOSITORY https://github.com/Skycoder42/QTaskbarControl
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/qtaskbarcontrol
- )
-
- option(QHOTKEY_INSTALL OFF)
- FetchContent_Declare(QHotkey
-- GIT_REPOSITORY https://github.com/Skycoder42/QHotkey
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third-party/qhotkey
- )
-
- FetchContent_Declare(QOnlineTranslator
-- GIT_REPOSITORY https://github.com/crow-translate/QOnlineTranslator
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/qonlinetranslator
- )
-
- FetchContent_Declare(CircleFlags
-- GIT_REPOSITORY https://github.com/HatScripts/circle-flags
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/circle-flags
- )
-
- FetchContent_Declare(FluentIconTheme
-- GIT_REPOSITORY https://github.com/vinceliuice/Fluent-icon-theme
-+ SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Fluent-icon-theme
- )
-
- FetchContent_MakeAvailable(SingleApplication QTaskbarControl QHotkey QOnlineTranslator CircleFlags FluentIconTheme)
diff --git a/third-party-library-static.patch b/third-party-library-static.patch
new file mode 100644
index 0000000..9fae5c8
--- /dev/null
+++ b/third-party-library-static.patch
@@ -0,0 +1,24 @@
+diff -Nuar a/src/third-party/qhotkey/CMakeLists.txt b/src/third-party/qhotkey/CMakeLists.txt
+--- a/src/third-party/qhotkey/CMakeLists.txt 2022-06-18 15:28:48.571243258 +0300
++++ b/src/third-party/qhotkey/CMakeLists.txt 2022-06-18 15:29:44.679871444 +0300
+@@ -37,7 +37,7 @@
+ set(SRC_FILES ${SRC_FILES} QHotkey/qhotkey_x11.cpp)
+ endif()
+
+-add_library(qhotkey ${SRC_FILES} ${MOC_HEADERS})
++add_library(qhotkey STATIC ${SRC_FILES} ${MOC_HEADERS})
+ add_library(QHotkey::QHotkey ALIAS qhotkey)
+ target_link_libraries(qhotkey ${LIBS})
+
+diff -Nuar a/src/third-party/qtaskbarcontrol/CMakeLists.txt b/src/third-party/qtaskbarcontrol/CMakeLists.txt
+--- a/src/third-party/qtaskbarcontrol/CMakeLists.txt 2022-06-18 15:29:03.579411291 +0300
++++ b/src/third-party/qtaskbarcontrol/CMakeLists.txt 2022-06-18 15:29:32.147731138 +0300
+@@ -4,7 +4,7 @@
+
+ set(CMAKE_AUTOMOC ON)
+
+-add_library(${PROJECT_NAME}
++add_library(${PROJECT_NAME} STATIC
+ qtaskbarcontrol.cpp
+ qtaskbarcontrol_p.cpp
+ )