[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
commit: d2a98923a8900427795ca0a950e6ade4158f371a Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Feb 22 16:45:33 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Feb 22 18:27:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2a98923 net-misc/nextcloud-client: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29730 Signed-off-by: Florian Schmaus gentoo.org> 4-drop-dependency-on-Qt-Quick-Controls-1.patch | 59 -- 1 file changed, 59 deletions(-) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch deleted file mode 100644 index e1bb0a11e13f.. --- a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 600ad8f6003daee635093ad713f3f90cb7cc7485 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Thu, 5 Jan 2023 11:58:08 +0100 -Subject: [PATCH] Drop dependency on Qt Quick Controls 1 - -Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still -depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing -those imports will cause the QMl script to use the according API from -Quick Controls 2, which are, fortunately largely API-comptible. - -This helps distribution to deprecate and remove Quick Controls 1 [2]. - -1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1 -2: https://bugs.gentoo.org/889772 - -Signed-off-by: Florian Schmaus a/src/gui/BasicComboBox.qml -+++ b/src/gui/BasicComboBox.qml -@@ -13,7 +13,6 @@ - */ - - import QtQuick 2.15 --import QtQuick.Dialogs 1.3 - import QtQuick.Layouts 1.15 - import QtQuick.Controls 2.15 - import QtGraphicalEffects 1.0 a/src/gui/PredefinedStatusButton.qml -+++ b/src/gui/PredefinedStatusButton.qml -@@ -13,7 +13,6 @@ - */ - - import QtQuick 2.15 --import QtQuick.Dialogs 1.3 - import QtQuick.Layouts 1.15 - import QtQuick.Controls 2.15 - a/src/gui/UserStatusSelector.qml -+++ b/src/gui/UserStatusSelector.qml -@@ -13,7 +13,6 @@ - */ - - import QtQuick 2.6 --import QtQuick.Dialogs 1.3 - import QtQuick.Layouts 1.15 - import QtQuick.Controls 2.15 - import QtQuick.Window 2.15 a/src/gui/UserStatusSelectorButton.qml -+++ b/src/gui/UserStatusSelectorButton.qml -@@ -13,7 +13,6 @@ - */ - - import QtQuick 2.6 --import QtQuick.Dialogs 1.3 - import QtQuick.Layouts 1.15 - import QtQuick.Controls 2.15 - --- -2.38.2 -
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
commit: 8bf14f5c7c237482d39c437c2449e1dae53a632b Author: Florian Schmaus gentoo org> AuthorDate: Thu Jan 5 11:54:31 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Jan 5 12:00:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf14f5c net-misc/nextcloud-client: do not import legacy QtQuick.Dialogs module Closes: https://bugs.gentoo.org/889772 Signed-off-by: Florian Schmaus gentoo.org> 4-drop-dependency-on-Qt-Quick-Controls-1.patch | 59 ++ ...-r1.ebuild => nextcloud-client-3.6.4-r2.ebuild} | 13 ++--- 2 files changed, 66 insertions(+), 6 deletions(-) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch new file mode 100644 index ..e1bb0a11e13f --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch @@ -0,0 +1,59 @@ +From 600ad8f6003daee635093ad713f3f90cb7cc7485 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Thu, 5 Jan 2023 11:58:08 +0100 +Subject: [PATCH] Drop dependency on Qt Quick Controls 1 + +Qt Quick Controls 1 where deprecated with Qt 5.11 [1]. Nextcloud still +depends on Quick Controls 1 by importing QtQuick.Dialogs. Removing +those imports will cause the QMl script to use the according API from +Quick Controls 2, which are, fortunately largely API-comptible. + +This helps distribution to deprecate and remove Quick Controls 1 [2]. + +1: https://doc.qt.io/qt-6/qtquickcontrols-changes-qt6.html#migrating-from-qt-quick-controls-1 +2: https://bugs.gentoo.org/889772 + +Signed-off-by: Florian Schmaus +--- a/src/gui/BasicComboBox.qml b/src/gui/BasicComboBox.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.15 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + import QtGraphicalEffects 1.0 +--- a/src/gui/PredefinedStatusButton.qml b/src/gui/PredefinedStatusButton.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.15 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + +--- a/src/gui/UserStatusSelector.qml b/src/gui/UserStatusSelector.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.6 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + import QtQuick.Window 2.15 +--- a/src/gui/UserStatusSelectorButton.qml b/src/gui/UserStatusSelectorButton.qml +@@ -13,7 +13,6 @@ + */ + + import QtQuick 2.6 +-import QtQuick.Dialogs 1.3 + import QtQuick.Layouts 1.15 + import QtQuick.Controls 2.15 + +-- +2.38.2 + diff --git a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild similarity index 93% rename from net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild rename to net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild index e2dbf57830dc..ab1e5c884f28 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.6.4-r1.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.6.4-r2.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc dolphin nautilus test webengine" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" >=dev-db/sqlite-3.34:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain:=[qt5(+)] @@ -38,12 +38,8 @@ COMMON_DEPEND=" nautilus? ( dev-python/nautilus-python ) webengine? ( dev-qt/qtwebengine:5[widgets] ) " -RDEPEND=" - ${COMMON_DEPEND} - dev-qt/qtquickcontrols2:5 -" DEPEND=" - ${COMMON_DEPEND} + ${R_DEPEND} dev-qt/qtconcurrent:5 dev-qt/qtxml:5 || ( gnome-base/librsvg media-gfx/inkscape ) @@ -63,6 +59,11 @@ BDEPEND=" dolphin? ( kde-frameworks/extra-cmake-modules ) " +PATCHES=( + # https://github.com/nextcloud/desktop/pull/5309 + "${FILESDIR}"/${PN}-3.6.4-drop-dependency-on-Qt-Quick-Controls-1.patch +) + src_prepare() { # Keep tests in ${T} sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
commit: 5750c4973292c8e8869fd697f1b20f433ad0da72 Author: Florian Schmaus gentoo org> AuthorDate: Thu May 12 14:10:05 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Thu May 12 14:11:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5750c497 net-misc/nextcloud-client: drop 3.3.6, 3.4.2 Signed-off-by: Florian Schmaus gentoo.org> net-misc/nextcloud-client/Manifest | 2 - .../nextcloud-client-3.3.4-inkscape_to_rsvg.patch | 54 .../nextcloud-client/nextcloud-client-3.3.6.ebuild | 94 - .../nextcloud-client/nextcloud-client-3.4.2.ebuild | 96 -- 4 files changed, 246 deletions(-) diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index 0e8992aba926..21ddc8f945dd 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,5 +1,3 @@ -DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0 -DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909 DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71 DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a63234ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4 DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch deleted file mode 100644 index 8e5510db04d5.. --- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001 -From: Heinz Wiesinger -Date: Thu, 26 Aug 2021 16:07:25 +0200 -Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape - -Signed-off-by: Heinz Wiesinger - src/gui/CMakeLists.txt | 18 +- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 970d2fc165..efe1b1c349 100644 a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME) - endif() - - # Generate png icons from svg --find_program(INKSCAPE -- NAMES inkscape inkscape.exe -+find_program(SVG_CONVERTER -+ NAMES inkscape inkscape.exe rsvg-convert - REQUIRED -- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) -+ HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR) - # REQUIRED keyword is only supported on CMake 3.18 and above --if (NOT INKSCAPE) -- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") -+if (NOT SVG_CONVERTER) -+ message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.") - endif() - - function(generate_sized_png_from_svg icon_path size) -@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size) - set(icon_output_name "${size}-${icon_name_wle}.png") - message(STATUS "Generate ${icon_output_name}") - execute_process(COMMAND --"${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" -+"${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" - WORKING_DIRECTORY "${icon_name_dir}" - RESULT_VARIABLE --INKSCAPE_SIDEBAR_ERROR -+SVG_CONVERTER_SIDEBAR_ERROR - OUTPUT_QUIET - ERROR_QUIET) - -- if (INKSCAPE_SIDEBAR_ERROR) -+ if (SVG_CONVERTER_SIDEBAR_ERROR) - message(FATAL_ERROR -- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") -+ "${SVG_CONVERTER} could not generate
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
commit: a325f31d02078b450cc1a33d3c66778409588a48 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Dec 26 08:13:03 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Dec 29 11:16:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a325f31d net-misc/nextcloud-client: remove unused patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/23518 Signed-off-by: Bernard Cafarelli gentoo.org> .../files/nextcloud-client-3.2.3-inkscape.patch| 79 .../files/nextcloud-client-3.2.3-webengine.patch | 419 - 2 files changed, 498 deletions(-) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch deleted file mode 100644 index 8b02ab2a8086.. --- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.0 +0200 -+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-06 19:20:34.225000546 +0200 -@@ -241,75 +241,6 @@ - set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) - endif() - --# Generate png icons from svg --find_program(INKSCAPE -- NAMES inkscape inkscape.exe -- REQUIRED -- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) --# REQUIRED keyword is only supported on CMake 3.18 and above --if (NOT INKSCAPE) -- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") --endif() -- --function(generate_sized_png_from_svg icon_path size) -- get_filename_component(icon_name_dir ${icon_path} DIRECTORY) -- get_filename_component(icon_name_wle ${icon_path} NAME_WLE) -- -- if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png") --return() -- endif() -- -- set(icon_output_name "${size}-${icon_name_wle}.png") -- message(STATUS "Generate ${icon_output_name}") -- execute_process(COMMAND --"${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" --WORKING_DIRECTORY "${icon_name_dir}" --RESULT_VARIABLE --INKSCAPE_SIDEBAR_ERROR --OUTPUT_QUIET --ERROR_QUIET) -- -- if (INKSCAPE_SIDEBAR_ERROR) --message(FATAL_ERROR -- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") -- else() -- endif() --endfunction() -- --if ((APPLICATION_ICON_SET MATCHES "PNG") --AND --(NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")) -- # We may have no svg application icon in when customers use PNG -- # icons in brander, but theme.qrc expects a svg icon. -- file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") --endif() -- --if(APPLE) -- set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg") -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128) -- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256) --endif() -- --if(WIN32) -- set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg") -- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70) -- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150) --endif() -- --set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") --generate_sized_png_from_svg(${APP_ICON_SVG} 16) --generate_sized_png_from_svg(${APP_ICON_SVG} 24) --generate_sized_png_from_svg(${APP_ICON_SVG} 32) --generate_sized_png_from_svg(${APP_ICON_SVG} 48) --generate_sized_png_from_svg(${APP_ICON_SVG} 64) --generate_sized_png_from_svg(${APP_ICON_SVG} 128) --generate_sized_png_from_svg(${APP_ICON_SVG} 256) --generate_sized_png_from_svg(${APP_ICON_SVG} 512) --generate_sized_png_from_svg(${APP_ICON_SVG} 1024) -- - file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*") - if(APPLE) - file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*") diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch deleted file mode 100644 index 8152528f30cb.. --- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch +++ /dev/null @@ -1,419 +0,0 @@ -diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt desktop-3.2.3.orig/src/CMakeLists.txt 2021-06-24 12:04:33.0 +0200 -+++ desktop-3.2.3/src/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200 -@@ -4,7 +4,13 @@ - - set(synclib_NAME ${APPLICATION_EXECUTABLE}sync) -
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
commit: e2b4865213779444685fd3888e478454e09b6add Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Jul 6 17:27:34 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Jul 6 17:27:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2b48652 net-misc/nextcloud-client: remove inkscape build requirement Closes: https://bugs.gentoo.org/800857 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> .../files/nextcloud-client-3.2.3-inkscape.patch| 79 ++ .../nextcloud-client/nextcloud-client-3.2.3.ebuild | 2 + 2 files changed, 81 insertions(+) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch new file mode 100644 index 000..8b02ab2a808 --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch @@ -0,0 +1,79 @@ +diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt +--- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.0 +0200 desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-06 19:20:34.225000546 +0200 +@@ -241,75 +241,6 @@ + set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) + endif() + +-# Generate png icons from svg +-find_program(INKSCAPE +- NAMES inkscape inkscape.exe +- REQUIRED +- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR) +-# REQUIRED keyword is only supported on CMake 3.18 and above +-if (NOT INKSCAPE) +- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.") +-endif() +- +-function(generate_sized_png_from_svg icon_path size) +- get_filename_component(icon_name_dir ${icon_path} DIRECTORY) +- get_filename_component(icon_name_wle ${icon_path} NAME_WLE) +- +- if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png") +-return() +- endif() +- +- set(icon_output_name "${size}-${icon_name_wle}.png") +- message(STATUS "Generate ${icon_output_name}") +- execute_process(COMMAND +-"${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}" +-WORKING_DIRECTORY "${icon_name_dir}" +-RESULT_VARIABLE +-INKSCAPE_SIDEBAR_ERROR +-OUTPUT_QUIET +-ERROR_QUIET) +- +- if (INKSCAPE_SIDEBAR_ERROR) +-message(FATAL_ERROR +- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}") +- else() +- endif() +-endfunction() +- +-if ((APPLICATION_ICON_SET MATCHES "PNG") +-AND +-(NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")) +- # We may have no svg application icon in when customers use PNG +- # icons in brander, but theme.qrc expects a svg icon. +- file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") +-endif() +- +-if(APPLE) +- set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg") +- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16) +- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32) +- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64) +- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128) +- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256) +-endif() +- +-if(WIN32) +- set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg") +- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70) +- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150) +-endif() +- +-set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg") +-generate_sized_png_from_svg(${APP_ICON_SVG} 16) +-generate_sized_png_from_svg(${APP_ICON_SVG} 24) +-generate_sized_png_from_svg(${APP_ICON_SVG} 32) +-generate_sized_png_from_svg(${APP_ICON_SVG} 48) +-generate_sized_png_from_svg(${APP_ICON_SVG} 64) +-generate_sized_png_from_svg(${APP_ICON_SVG} 128) +-generate_sized_png_from_svg(${APP_ICON_SVG} 256) +-generate_sized_png_from_svg(${APP_ICON_SVG} 512) +-generate_sized_png_from_svg(${APP_ICON_SVG} 1024) +- + file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*") + if(APPLE) + file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*") diff --git a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild index 7e82191086c..4bf713797b3 100644 --- a/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-3.2.3.ebuild @@ -53,6 +53,8 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-inkscape.patch ) + S="${WORKDIR}/desktop-${PV/_/-}" src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
commit: f77347204605c4df8936e4547c66d7e3cf1ca05a Author: Bernard Cafarelli gentoo org> AuthorDate: Wed Jun 23 07:20:39 2021 + Commit: Bernard Cafarelli gentoo org> CommitDate: Wed Jun 23 07:20:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7734720 net-misc/nextcloud-client: drop old and vulnerable versions Bug: https://bugs.gentoo.org/797706 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Bernard Cafarelli gentoo.org> net-misc/nextcloud-client/Manifest | 3 - .../nextcloud-client-2.6.1-include_tests.patch | 22 -- .../nextcloud-client/nextcloud-client-2.6.5.ebuild | 89 -- .../nextcloud-client-3.1.1-r1.ebuild | 89 -- .../nextcloud-client/nextcloud-client-3.1.1.ebuild | 89 -- .../nextcloud-client/nextcloud-client-3.1.2.ebuild | 89 -- 6 files changed, 381 deletions(-) diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest index b680d5d234e..d0b7483b540 100644 --- a/net-misc/nextcloud-client/Manifest +++ b/net-misc/nextcloud-client/Manifest @@ -1,6 +1,3 @@ -DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45abc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462 -DIST nextcloud-client-3.1.1.tar.gz 19440799 BLAKE2B ae6ef7fbff4b7b5c9a5728a30558000cd781348dd07aba068af5b123ec629e1661b52cd63b50bf45c593411866bc607dfcc3112713fa2aea3eabfda7ce969614 SHA512 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209 -DIST nextcloud-client-3.1.2.tar.gz 19517295 BLAKE2B 75713a892816be515984cef579e09dfb58165bf1e35e73982bd59fb1cce9a0cdcc76a33a9116b85da99174f0ee4f3c425afb380df5a99d65dba82a9c6d5b3553 SHA512 bad05fab6c6d391ed40e7f9b5869f3ab3231bdba1bbb24b7222d9cace0bd96989b0b24757bf0757053a851312265aec5a4ac6f4d1c71d532152aa20ddee838a6 DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99 DIST nextcloud-client-3.2.1.tar.gz 15234115 BLAKE2B 2fcbaab4e73db3cfbf7dea750a0e0782c6cb8bb03c867653a47d2f21cfe369da8e4eff8bf1f0ff548c62909e770132799a927e18f9c732a4d551b97ff6362572 SHA512 bf2b4e1c85e07ad32ed00efa4a56d6b4195b42f4d95c7cb32d8c43d2c5564ac1512155a9f51508d522366c5ce44104f1b076f1addef1147a77ace5a11bd500e6 DIST nextcloud-client-3.2.2.tar.gz 15398900 BLAKE2B b91c814977486db57b1864f71d3763c64f676449a5547f21bb379154f66a38bc4db355bb16cc6a70781cb45d4a4704f55238dd570f123b450c512bc3e0ce5b3c SHA512 ce6adbb09ee8495448b7da0c5e9637b3c775d28b8ee1656864843264bdacffbc402c9f507ced3e3943896ae25ee73975054b8ffa1577bdd3d32dc453c3f94d74 diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch deleted file mode 100644 index da8423022b7..000 --- a/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001 -From: tuxmaster5000 <837503+tuxmaster5...@users.noreply.github.com> -Date: Fri, 12 Oct 2018 15:56:26 +0200 -Subject: [PATCH] Fix include file - - test/testnextcloudpropagator.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp -index 6ad1a6b37..dc2e476ad 100644 a/test/testnextcloudpropagator.cpp -+++ b/test/testnextcloudpropagator.cpp -@@ -8,7 +8,7 @@ - #include - - #include "propagatedownload.h" --#include "nextcloudpropagator_p.h" -+#include "owncloudpropagator_p.h" - - using namespace OCC; - namespace OCC { diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild deleted file mode 100644 index 43b18edfd8e..000 --- a/net-misc/nextcloud-client/nextcloud-client-2.6.5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Desktop Syncing Client for Nextcloud" -HOMEPAGE="https://github.com/nextcloud/desktop; -SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="doc dolphin nautilus test" - -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - >=dev-libs/openssl-1.1.0:0= - dev-libs/qtkeychain[qt5(+)] -
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/, net-misc/nextcloud-client/
commit: 4eca64a213519d2aeb0fb3f737a0f31cf9c023d9 Author: Bernard Cafarelli gentoo org> AuthorDate: Tue Mar 5 23:33:42 2019 + Commit: Bernard Cafarelli gentoo org> CommitDate: Tue Mar 5 23:33:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eca64a2 net-misc/nextcloud-client: fix compilation with Qt 5.12 Closes: https://bugs.gentoo.org/677008 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Bernard Cafarelli gentoo.org> ...nextcloud-client-2.5.1-missing_qt_include.patch | 23 ++ .../nextcloud-client/nextcloud-client-2.5.1.ebuild | 6 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch new file mode 100644 index 000..a5d6f03581b --- /dev/null +++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch @@ -0,0 +1,23 @@ +From 129588442041c32b0d98f2361a69e0e350592f70 Mon Sep 17 00:00:00 2001 +From: Oskar Kruschitz +Date: Thu, 13 Dec 2018 16:13:01 +0100 +Subject: [PATCH] Added missing Include + +Fixing an error during Build with Qt5.12: +error: member access into incomplete type 'const QWebEngineCertificateError' +--- + src/gui/wizard/webview.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp +index 15c1f314e..73e671b8f 100644 +--- a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include "common/utility.h" + diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild index 29daa11a9db..d4aa0a622a2 100644 --- a/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild +++ b/net-misc/nextcloud-client/nextcloud-client-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -53,6 +53,10 @@ DEPEND="${COMMON_DEPEND} ) " +PATCHES=( + "${FILESDIR}"/${P}-missing_qt_include.patch + ) + S=${WORKDIR}/desktop-${PV/_/-} src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
commit: 39141d982bd90ffa282159d38dd6492b7ced9ab6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun Sep 23 17:20:37 2018 + Commit: Bernard Cafarelli gentoo org> CommitDate: Mon Sep 24 10:13:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39141d98 net-misc/nextcloud-client: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/9958 Signed-off-by: Michael Mair-Keimberger gmail.com> .../nextcloud-client-2.5.0_beta1-fix_cmake.patch | 24 -- 1 file changed, 24 deletions(-) diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch deleted file mode 100644 index e160d514088..000 --- a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001 -From: Ronny Kunze -Date: Sat, 4 Aug 2018 16:53:06 +0200 -Subject: [PATCH] rearange CMake find_package OpenSSL - -the command seems to be malformed . The keyword VERSION is not valid . -And the version should follow direct after the packagename. - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f8b8330f2..f1d07eea2 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,7 +183,7 @@ if(BUILD_CLIENT) - endif() - find_package(Sphinx) - find_package(PdfLatex) --find_package(OpenSSL REQUIRED VERSION 1.1) -+find_package(OpenSSL 1.1 REQUIRED ) - -find_package(ZLIB REQUIRED) -find_package(GLib2)