summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Kevin Decherf <kevin@kdecherf.com> 2019-03-26 23:10:48 +0100
committerAvatar Marc-Antoine Perennou <keruspe@exherbo.org> 2019-04-09 09:44:11 +0000
commit93b95f2d42ef50972079cbcabe77894d35ab7f66 (patch)
tree3304e75a222de14744f8e9a3001c422d00c71626
parent8c2b526b6d24ce47f77b7fad223f80b44cf76856 (diff)
downloadcogitri-master.tar.gz
cogitri-master.tar.xz
nextcloudclient: bump to 2.5.2HEADmaster
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
-rw-r--r--packages/net-misc/nextcloudclient/files/no-automagic-dolphin.patch41
-rw-r--r--packages/net-misc/nextcloudclient/nextcloudclient-2.5.2.exheres-0 (renamed from packages/net-misc/nextcloudclient/nextcloudclient-2.3.3-r2.exheres-0)15
2 files changed, 5 insertions, 51 deletions
diff --git a/packages/net-misc/nextcloudclient/files/no-automagic-dolphin.patch b/packages/net-misc/nextcloudclient/files/no-automagic-dolphin.patch
deleted file mode 100644
index 1f22600..0000000
--- a/packages/net-misc/nextcloudclient/files/no-automagic-dolphin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 20a0de8..38e5d4d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,6 +123,9 @@ endif()
- # this option creates only libocsync and libowncloudsync
- option(BUILD_LIBRARIES_ONLY "BUILD_LIBRARIES_ONLY" OFF)
-
-+# this options builds the dolphin integration plugin
-+option(BUILD_SHELL_INTEGRATION_DOLPHIN "BUILD_SHELL_INTEGRATION_DOLPHIN" ON)
-+
- # When this option is enabled, 5xx errors are not added to the blacklist
- # Normally you don't want to enable this option because if a particular file
- # triggers a bug on the server, you want the file to be blacklisted.
-diff --git a/shell_integration/CMakeLists.txt b/shell_integration/CMakeLists.txt
-index 03b2bbc..c35161a 100644
---- a/shell_integration/CMakeLists.txt
-+++ b/shell_integration/CMakeLists.txt
-@@ -5,13 +5,14 @@ add_subdirectory(icons)
-
- if( UNIX AND NOT APPLE )
- add_subdirectory(nautilus)
--
-- find_package(ECM 1.2.0 NO_MODULE QUIET)
-- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-- find_package(KF5 "5.16" COMPONENTS KIO)
-- if(KF5_FOUND)
-- add_subdirectory(dolphin)
-- else()
-- message("Dolphin plugin disabled: KDE Frameworks 5.16 not found")
-+ if(BUILD_SHELL_INTEGRATION_DOLPHIN)
-+ find_package(ECM 1.2.0 NO_MODULE QUIET)
-+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-+ find_package(KF5 "5.16" COMPONENTS KIO)
-+ if(KF5_FOUND)
-+ add_subdirectory(dolphin)
-+ else()
-+ message("Dolphin plugin disabled: KDE Frameworks 5.16 not found")
-+ endif()
- endif()
- endif()
diff --git a/packages/net-misc/nextcloudclient/nextcloudclient-2.3.3-r2.exheres-0 b/packages/net-misc/nextcloudclient/nextcloudclient-2.5.2.exheres-0
index 8848fc5..fdc3fa9 100644
--- a/packages/net-misc/nextcloudclient/nextcloudclient-2.3.3-r2.exheres-0
+++ b/packages/net-misc/nextcloudclient/nextcloudclient-2.5.2.exheres-0
@@ -3,10 +3,9 @@
require cmake [ api=2 ]
require gtk-icon-cache
-require github [ user=nextcloud project=client_theming tag=v${PV} ]
+require github [ user=nextcloud project=desktop tag=v${PV} ]
SUMMARY="Nextcloud themed desktop client"
-DOWNLOADS+=" http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz"
LICENCES="GPL-2"
SLOT="0"
@@ -28,10 +27,11 @@ DEPENDENCIES="
sys-libs/zlib
x11-libs/qtbase:5[gui][sql][sqlite]
x11-libs/qttools:5
+ x11-libs/qtwebengine:5
dolphin? ( kde-frameworks/kio:5 )
shibboleth? ( x11-libs/qtwebkit:5 )
providers:libressl? ( dev-libs/libressl:= )
- providers:openssl? ( dev-libs/openssl[>=1] )
+ providers:openssl? ( dev-libs/openssl[>=1.1] )
test:
dev-util/cmocka
suggestion:
@@ -39,12 +39,8 @@ DEPENDENCIES="
nautilus indicating which files have been synched and which haven't been ] ]]
"
-WORK="${WORKBASE}"/owncloudclient-${PV}
-CMAKE_SOURCE="${WORKBASE}"/owncloudclient-${PV}
-
-DEFAULT_SRC_PREPARE_PATCHES=(
- "${FILES}"/no-automagic-dolphin.patch
-)
+WORK="${WORKBASE}"/desktop-${PV}
+CMAKE_SOURCE="${WORKBASE}"/desktop-${PV}
CMAKE_SRC_CONFIGURE_OPTIONS=(
'dolphin BUILD_SHELL_INTEGRATION_DOLPHIN'
@@ -57,7 +53,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
-DSHARE_INSTALL_PREFIX:PATH=/usr/share
-DCMAKE_INSTALL_DOCDIR:PATH=/usr/share/doc/${PNVR}
-DSYSCONF_INSTALL_DIR:PATH=/etc
- -DOEM_THEME_DIR:PATH="${WORKBASE}"/client_theming-${PV}/nextcloudtheme
)
CMAKE_SRC_CONFIGURE_TESTS=( '-DUNIT_TESTING:BOOL=TRUE -DUNIT_TESTING:BOOL=FALSE' )