[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/

[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/

[Johannes Huber]

commit:     a1c298b0a8d3d54281d2b3e2f8e30fa26bfd7701
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 22:15:10 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 22:15:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a1c298b0

[kde-misc/kdeconnect] Version bump, remove old

Package-Manager: portage-2.2.7

---
 .../files/kdeconnect-0.4.1-compile.patch           | 22 ++++++++++++++++++++++
 ...econnect-0.4.ebuild => kdeconnect-0.4.1.ebuild} |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch b/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch
new file mode 100644
index 0000000..dc55f23
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch
@@ -0,0 +1,22 @@
+commit e3b4b3660fe3e217e68516e2222551787bffda5c
+Author: Aleix Pol <aleixpol@kde.org>
+Date:   Fri Nov 8 03:13:13 2013 +0100
+
+    Compile everything
+    
+    Albert, this is asking you to be a library ;)
+    
+    CCMAIL: albertvaka@gmail.com
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index a9a8bad..b559abf 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -24,6 +24,6 @@ set(kdeconnect_libraries
+ )
+ 
+ #NetworkPackage
+-kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp)
++kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/kdebugnamespace.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp)
+ target_link_libraries(kdeconnect_tests ${kdeconnect_libraries})
+ 

diff --git a/kde-misc/kdeconnect/kdeconnect-0.4.ebuild b/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild
similarity index 95%
rename from kde-misc/kdeconnect/kdeconnect-0.4.ebuild
rename to kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild
index 3ca60a1..21ff93d 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.4.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild
@@ -35,6 +35,8 @@ RDEPEND="${DEPEND}
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${P}-compile.patch" )
+
 src_prepare(){
 	sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" kded/networkpackage.cpp || die
 	kde4-base_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/

[Manuel Rüger]

commit:     3e8d03a9bd72e816021a49a1e2ffc01d29c32e1a
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 17:24:24 2013 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 17:24:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3e8d03a9

[kde-misc/kdeconnect] Version bump.

---
 .../files/kdeconnect-0.4.1-compile.patch           | 22 ----------------------
 ...onnect-0.4.1.ebuild => kdeconnect-0.4.2.ebuild} |  2 --
 2 files changed, 24 deletions(-)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch b/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch
deleted file mode 100644
index dc55f23..0000000
--- a/kde-misc/kdeconnect/files/kdeconnect-0.4.1-compile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e3b4b3660fe3e217e68516e2222551787bffda5c
-Author: Aleix Pol <aleixpol@kde.org>
-Date:   Fri Nov 8 03:13:13 2013 +0100
-
-    Compile everything
-    
-    Albert, this is asking you to be a library ;)
-    
-    CCMAIL: albertvaka@gmail.com
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index a9a8bad..b559abf 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -24,6 +24,6 @@ set(kdeconnect_libraries
- )
- 
- #NetworkPackage
--kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp)
-+kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/kdebugnamespace.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp)
- target_link_libraries(kdeconnect_tests ${kdeconnect_libraries})
- 

diff --git a/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.4.2.ebuild
similarity index 95%
rename from kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild
rename to kde-misc/kdeconnect/kdeconnect-0.4.2.ebuild
index 21ff93d..3ca60a1 100644
--- a/kde-misc/kdeconnect/kdeconnect-0.4.1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-0.4.2.ebuild
@@ -35,8 +35,6 @@ RDEPEND="${DEPEND}
 
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}/${P}-compile.patch" )
-
 src_prepare(){
 	sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" kded/networkpackage.cpp || die
 	kde4-base_src_prepare

[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/

[Johannes Huber]

commit:     53093bb78eade2664b9f401cdf9641cfc72d034e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 19 23:27:49 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 21 20:47:43 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=53093bb7

[kde-misc/kdeconnect] Make tests optional

---
 .../files/kdeconnect-9999-tests-optional.patch     | 26 ++++++++++++++++++++++
 kde-misc/kdeconnect/kdeconnect-9999.ebuild         |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch b/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch
new file mode 100644
index 0000000..8ebc0bd
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-9999-tests-optional.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2015-01-21 01:15:05.438460864 +0100
++++ b/CMakeLists.txt	2015-01-21 01:17:08.896283297 +0100
+@@ -2,10 +2,11 @@
+ 
+ cmake_minimum_required(VERSION 2.8.12)
+ 
++set(QT_MIN_VERSION "5.2.0")
+ find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake)
+ 
+-find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick)
+ find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
+ find_package(Qca-qt5 2.1.0 REQUIRED)
+ 
+@@ -32,6 +33,9 @@
+ add_subdirectory(cli)
+ add_subdirectory(fileitemactionplugin)
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++    find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED)
++    add_subdirectory(tests)
++endif()
+ 
+ install(PROGRAMS kdeconnect-non-plasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index e614c51..a3f2a0a 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 EGIT_BRANCH="frameworks"
 MY_PN=${PN}-kde
 KMNAME=${MY_PN}
-
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Adds communication between KDE and your smartphone"
@@ -26,6 +26,8 @@ RDEPEND="${DEPEND}
 	net-dns/avahi
 "
 
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )
+
 [[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
 
 pkg_postinst(){

[gentoo-commits] proj/kde:master commit in: kde-misc/kdeconnect/files/, kde-misc/kdeconnect/

[Johannes Huber]

commit:     48896c930f970cc9049d604e66277d0f840d9fa2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 12 17:27:01 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 12 17:27:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=48896c93

kde-misc/kdeconnect: Remove obsolete patch

Upstream commit 4a4e8216aa684b10959041b6891da7b798c98e5b

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch | 11 -----------
 kde-misc/kdeconnect/kdeconnect-9999.ebuild                  |  2 --
 2 files changed, 13 deletions(-)

diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch b/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
deleted file mode 100644
index 7b34659502..0000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
-index 7f14139e..a1daaa16 100644
---- a/plugins/mousepad/CMakeLists.txt
-+++ b/plugins/mousepad/CMakeLists.txt
-@@ -1,5 +1,5 @@
- if(UNIX)
--    find_package(KF5 ${KF5_MIN_VERSION} QUIET COMPONENTS Wayland)
-+    find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
- 
-     find_package(LibFakeKey QUIET)
-     set_package_properties(LibFakeKey PROPERTIES DESCRIPTION "fake key events"

diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index 95eb1a8d1a..96d9cbe36a 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -56,8 +56,6 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.3.1-no-wayland.patch" )
-
 src_prepare() {
 	kde5_src_prepare