subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: kde\-apps\/konqueror\/"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2024-03-03 Thread Andreas Sturmlechner

commit: 4e468b885729218ac14598511b99441dd7861e3e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  3 09:33:34 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar  3 09:49:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e468b88

kde-apps/konqueror: Block kde-apps/kio-extras:5

File collision at /usr/share/kio_bookmarks/kio_bookmarks.css

Closes: https://bugs.gentoo.org/926057
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konqueror/{konqueror-24.02.0.ebuild => konqueror-24.02.0-r1.ebuild}  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konqueror/konqueror-24.02.0.ebuild 
b/kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
similarity index 98%
rename from kde-apps/konqueror/konqueror-24.02.0.ebuild
rename to kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
index 9b69c036e6cf..3db16d7bcc70 100644
--- a/kde-apps/konqueror/konqueror-24.02.0.ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.0-r1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
activities? ( kde-plasma/plasma-activities:6 )
 "
 RDEPEND="${COMMON_DEPEND}
+   !

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2024-01-07 Thread Andreas Sturmlechner

commit: 2ee8939856e3f21a6560eb3801e64a1b5469445b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 13:51:21 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 13:51:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee89398

kde-apps/konqueror: drop 23.08.4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-23.08.4.ebuild | 86 -
 1 file changed, 86 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.08.4.ebuild 
b/kde-apps/konqueror/konqueror-23.08.4.ebuild
deleted file mode 100644
index 29339015c629..
--- a/kde-apps/konqueror/konqueror-23.08.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-inherit flag-o-matic ecm gear.kde.org optfeature
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/konqueror/;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE="activities speech"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-COMMON_DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdesu-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   sys-libs/zlib
-   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   kde-apps/kfind:5
-   kde-plasma/kde-cli-tools:*
-"
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   ecm_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package speech Qt5TextToSpeech)
-   )
-   ecm_src_configure
-}
-
-pkg_postinst() {
-   if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
-   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
-   optfeature "SVG support" kde-apps/svg:${SLOT}
-   fi
-   ecm_pkg_postinst
-}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2024-01-07 Thread Andreas Sturmlechner

commit: 7aad1a31868110951e538f3777b56ab74f7e27bd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 12:07:34 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 13:51:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aad1a31

kde-apps/konqueror: Add missing kde-frameworks/kinit dependency

Closes: https://bugs.gentoo.org/921552
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-23.08.4-r1.ebuild | 87 ++
 1 file changed, 87 insertions(+)

diff --git a/kde-apps/konqueror/konqueror-23.08.4-r1.ebuild 
b/kde-apps/konqueror/konqueror-23.08.4-r1.ebuild
new file mode 100644
index ..c728d88b6c15
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-23.08.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit flag-o-matic ecm gear.kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/konqueror/;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 ~x86"
+IUSE="activities speech"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kcrash-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kdesu-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kinit-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   sys-libs/zlib
+   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:*
+"
+
+src_prepare() {
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+   ecm_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package speech Qt5TextToSpeech)
+   )
+   ecm_src_configure
+}
+
+pkg_postinst() {
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+   optfeature "SVG support" kde-apps/svg:${SLOT}
+   fi
+   ecm_pkg_postinst
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2023-11-11 Thread Andreas Sturmlechner

commit: 94a76c8482a127e7af1ddb93354a854b67ee87ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 11 19:47:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 11 19:50:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a76c84

kde-apps/konqueror: Drop unused cmake arg

Follow-up to kde overlay commit 151c1526dbd5c7f814ef8bd87d93b019da6fcc82

Dropped upstream in 94533411c5436a72225a18c5b9c459c03bee9a93

Closes: https://bugs.gentoo.org/917106
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-23.08.3.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-23.08.3.ebuild 
b/kde-apps/konqueror/konqueror-23.08.3.ebuild
index 648c1f4279ad..df14e7b77ab0 100644
--- a/kde-apps/konqueror/konqueror-23.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-23.08.3.ebuild
@@ -72,7 +72,6 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2023-10-14 Thread Andreas Sturmlechner

commit: 12823bb0d5e6b45d207445f77405a3d1f0156588
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 19:50:15 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 14 22:49:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12823bb0

kde-apps/konqueror: Drop unused dev-qt/qtscript

Dropped in upstream commit 72ddfa7dafa915e31c88511d541e7903219c4b9f

Also cleanup long obsolete optfeature.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konqueror/{konqueror-23.04.3.ebuild => konqueror-23.04.3-r1.ebuild} | 2 --
 .../konqueror/{konqueror-23.08.2.ebuild => konqueror-23.08.2-r1.ebuild} | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.04.3.ebuild 
b/kde-apps/konqueror/konqueror-23.04.3-r1.ebuild
similarity index 96%
rename from kde-apps/konqueror/konqueror-23.04.3.ebuild
rename to kde-apps/konqueror/konqueror-23.04.3-r1.ebuild
index 4073dc2ee796..1beecbb2c5e2 100644
--- a/kde-apps/konqueror/konqueror-23.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-23.04.3-r1.ebuild
@@ -23,7 +23,6 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -83,7 +82,6 @@ pkg_postinst() {
optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
optfeature "filemanager component" kde-apps/dolphin:${SLOT}
optfeature "SVG support" kde-apps/svg:${SLOT}
-   optfeature "Java support on webpages" virtual/jre
fi
ecm_pkg_postinst
 }

diff --git a/kde-apps/konqueror/konqueror-23.08.2.ebuild 
b/kde-apps/konqueror/konqueror-23.08.2-r1.ebuild
similarity index 96%
rename from kde-apps/konqueror/konqueror-23.08.2.ebuild
rename to kde-apps/konqueror/konqueror-23.08.2-r1.ebuild
index 1024d189ec9c..648c1f4279ad 100644
--- a/kde-apps/konqueror/konqueror-23.08.2.ebuild
+++ b/kde-apps/konqueror/konqueror-23.08.2-r1.ebuild
@@ -23,7 +23,6 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -83,7 +82,6 @@ pkg_postinst() {
optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
optfeature "filemanager component" kde-apps/dolphin:${SLOT}
optfeature "SVG support" kde-apps/svg:${SLOT}
-   optfeature "Java support on webpages" virtual/jre
fi
ecm_pkg_postinst
 }

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2023-07-06 Thread Andreas Sturmlechner

commit: c5602815e618007273c7362a3397a2a8eb73e842
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  6 10:28:27 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  6 12:12:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5602815

kde-apps/konqueror: Drop IUSE X, option unsupported upstream

See also:
https://invent.kde.org/network/konqueror/-/merge_requests/155
https://invent.kde.org/network/konqueror/-/merge_requests/163

Bug: https://bugs.gentoo.org/813450
Bug: https://bugs.gentoo.org/909314
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-23.04.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.04.2.ebuild 
b/kde-apps/konqueror/konqueror-23.04.2.ebuild
index 5e7d07f3aa90..1024d189ec9c 100644
--- a/kde-apps/konqueror/konqueror-23.04.2.ebuild
+++ b/kde-apps/konqueror/konqueror-23.04.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech X"
+IUSE="activities speech"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
@@ -26,6 +26,7 @@ COMMON_DEPEND="
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -52,7 +53,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
@@ -73,7 +73,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=$(usex !X)
+   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/

2022-12-03 Thread Andreas Sturmlechner

commit: 66371926a586e8dcec73c928d275082a186525d2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  3 10:49:44 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  3 10:50:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66371926

kde-apps/konqueror: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-22.04.3-with_x11.patch | 83 --
 1 file changed, 83 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch 
b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
deleted file mode 100644
index 90273b072f0e..
--- a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 69c2186c1a6c4fc0bf7f13b571b581e5f6157063 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sat, 27 Nov 2021 14:36:20 +0100
-Subject: [PATCH] Add CMake option to build without X11
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt| 16 ++--
- client/CMakeLists.txt |  4 ++--
- src/CMakeLists.txt|  6 +++---
- 3 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 77f5ea645..488ee7dc4 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,12 +46,16 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
-   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
- endif()
- 
--find_package(X11)
--set(KONQ_HAVE_X11 ${X11_FOUND})
--
--if (X11_FOUND)
--  find_package(Qt5 REQUIRED X11Extras)
--endif(X11_FOUND)
-+if (NOT WIN32)
-+option(WITH_X11 "Build with X11 integration" ON)
-+if (WITH_X11)
-+find_package(X11 REQUIRED)
-+find_package(Qt5X11Extras NO_MODULE REQUIRED)
-+set(KONQ_HAVE_X11 TRUE)
-+endif()
-+else()
-+set(WITH_X11 OFF)
-+endif()
- 
- add_definitions(
- -DQT_USE_QSTRINGBUILDER
-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 24aedb14c..51d2b44d0 100644
 a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -30,9 +30,9 @@ if (WIN32)
- else (WIN32)
- kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
- target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
--if(X11_FOUND)
-+if(WITH_X11)
-   target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
--endif(X11_FOUND)
-+endif()
- install(TARGETS kdeinit_kfmclient  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
- endif (WIN32)
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2113e1c2f..07e64d90f 100644
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
-KF5::KIOGui
- )
- 
--if(X11_FOUND)
-+if(WITH_X11)
-   target_link_libraries(konquerorprivate Qt5::X11Extras)
--endif(X11_FOUND)
-+endif()
- 
- 
- set_target_properties(konquerorprivate PROPERTIES VERSION 
${KONQUEROR_LIB_VERSION} SOVERSION "5" )
-@@ -113,7 +113,7 @@ target_link_libraries(kdeinit_konqueror
-KF5::SonnetUi
- )
- 
--if (X11_FOUND)
-+if (WITH_X11)
-   target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
- endif ()
- 
--- 
-2.34.1
-

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2022-10-06 Thread Andreas Sturmlechner

commit: 779773d4053daa83e43995376a5d9c94719c2ad7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 08:16:36 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:05:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=779773d4

kde-apps/konqueror: Add CPE to metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 78d20615f897..e4a1355e4b35 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -7,6 +7,7 @@


https://bugs.kde.org/
+   cpe:/a:kde:konqueror


Enable kactivities support

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/

2022-08-23 Thread Andreas Sturmlechner

commit: 08b09d949611072b3bfcdaed5907778abe82ad5e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 23 14:25:50 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 23 14:30:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b09d94

kde-apps/konqueror: Add missing patch

Closes: https://bugs.gentoo.org/866147
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-22.04.3-without_x11.patch  | 126 +
 1 file changed, 126 insertions(+)

diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch 
b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
new file mode 100644
index ..ff1de8680e69
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
@@ -0,0 +1,126 @@
+From 503557c54c6162970072f31cb84b0eb934d409d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 31 Jul 2022 14:47:48 +0200
+Subject: [PATCH 1/2] Drop unused X11 dependency
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 8 ++--
+ src/CMakeLists.txt | 4 
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 838197be7..d9218ae06 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,12 +47,8 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(X11)
+-set(KONQ_HAVE_X11 ${X11_FOUND})
+-
+-if (X11_FOUND)
+-  find_package(Qt5 REQUIRED X11Extras)
+-endif(X11_FOUND)
++find_package(Qt5X11Extras)
++set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
+ 
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a1343e04..286bc7da8 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -113,10 +113,6 @@ target_link_libraries(kdeinit_konqueror
+KF5::SonnetUi
+ )
+ 
+-if (X11_FOUND)
+-  target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+-endif ()
+-
+ if (KActivities_FOUND)
+   target_link_libraries(kdeinit_konqueror KF5::Activities)
+ endif (KActivities_FOUND)
+-- 
+2.35.1
+
+
+From ff0e19961f8345faea54e4f85057312b7ad7007d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH 2/2] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the
+used libraries may not work w/o Qt5X11Extras themselves yet or need
+to be built with X11 support for other reverse dependencies.
+
+KONQ_HAVE_X11 already exists and is set automagically so far, but
+using -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras will break if any
+dependencies list Qt5X11Extras as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding Qt5X11Extras or adding unwanted features
+if the option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 7 +--
+ client/CMakeLists.txt | 4 ++--
+ src/CMakeLists.txt| 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9218ae06..71bc03ecb 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,8 +47,11 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(Qt5X11Extras)
+-set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++option(WITHOUT_X11 "Build without X11 integration (skips finding 
Qt5X11Extras)" OFF)
++if(NOT WITHOUT_X11)
++find_package(Qt5X11Extras)
++set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++endif()
+ 
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..3c32c86f3 100644
+--- a/client/CMakeLists.txt
 b/client/CMakeLists.txt
+@@ -30,9 +30,9 @@ if (WIN32)
+ else (WIN32)
+ kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+ target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
+-if(X11_FOUND)
++if(KONQ_HAVE_X11)
+   target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ install(TARGETS kdeinit_kfmclient  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 286bc7da8..500b9750c 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+KF5::KIOGui
+ )
+ 
+-if(X11_FOUND)
++if(KONQ_HAVE_X11)
+   target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ 
+ 
+ set_target_properties(konquerorprivate PROPERTIES VERSION 
${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+-- 
+2.35.1
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2022-08-06 Thread Andreas Sturmlechner

commit: d4bedf3b05b25d89a0bf4b6293ac87eeb296ce38
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 27 13:39:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  6 07:44:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bedf3b

kde-apps/konqueror: Fix build with USE -X

Upstream commit ff0e19961f8345faea54e4f85057312b7ad7007d

Bug: https://bugs.gentoo.org/813450
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-22.04.3-with_x11.patch | 83 ++
 kde-apps/konqueror/konqueror-22.04.3.ebuild|  4 +-
 2 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch 
b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
new file mode 100644
index ..90273b072f0e
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-with_x11.patch
@@ -0,0 +1,83 @@
+From 69c2186c1a6c4fc0bf7f13b571b581e5f6157063 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH] Add CMake option to build without X11
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 16 ++--
+ client/CMakeLists.txt |  4 ++--
+ src/CMakeLists.txt|  6 +++---
+ 3 files changed, 15 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 77f5ea645..488ee7dc4 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -46,12 +46,16 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(X11)
+-set(KONQ_HAVE_X11 ${X11_FOUND})
+-
+-if (X11_FOUND)
+-  find_package(Qt5 REQUIRED X11Extras)
+-endif(X11_FOUND)
++if (NOT WIN32)
++option(WITH_X11 "Build with X11 integration" ON)
++if (WITH_X11)
++find_package(X11 REQUIRED)
++find_package(Qt5X11Extras NO_MODULE REQUIRED)
++set(KONQ_HAVE_X11 TRUE)
++endif()
++else()
++set(WITH_X11 OFF)
++endif()
+ 
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..51d2b44d0 100644
+--- a/client/CMakeLists.txt
 b/client/CMakeLists.txt
+@@ -30,9 +30,9 @@ if (WIN32)
+ else (WIN32)
+ kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+ target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
+-if(X11_FOUND)
++if(WITH_X11)
+   target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ install(TARGETS kdeinit_kfmclient  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 2113e1c2f..07e64d90f 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+KF5::KIOGui
+ )
+ 
+-if(X11_FOUND)
++if(WITH_X11)
+   target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ 
+ 
+ set_target_properties(konquerorprivate PROPERTIES VERSION 
${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+@@ -113,7 +113,7 @@ target_link_libraries(kdeinit_konqueror
+KF5::SonnetUi
+ )
+ 
+-if (X11_FOUND)
++if (WITH_X11)
+   target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+ endif ()
+ 
+-- 
+2.34.1
+

diff --git a/kde-apps/konqueror/konqueror-22.04.3.ebuild 
b/kde-apps/konqueror/konqueror-22.04.3.ebuild
index 6d69ff80806c..05c5705662e8 100644
--- a/kde-apps/konqueror/konqueror-22.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-22.04.3.ebuild
@@ -63,6 +63,8 @@ RDEPEND="${COMMON_DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-with_x11.patch" )
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -74,7 +76,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package X X11)
+   -DWITH_X11=$(usex X)
)
ecm_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2021-10-03 Thread Andreas Sturmlechner

commit: 07d9a46287411b1a04c9ee208c63b1cb41823402
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  3 11:19:43 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 11:45:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d9a462

kde-apps/konqueror: Drop 21.08.1 (r0)

Bug: https://bugs.gentoo.org/815022
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-21.08.1-r1.ebuild | 90 --
 1 file changed, 90 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-21.08.1-r1.ebuild 
b/kde-apps/konqueror/konqueror-21.08.1-r1.ebuild
deleted file mode 100644
index 845797349d9..000
--- a/kde-apps/konqueror/konqueror-21.08.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.84.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org optfeature
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/konqueror/;
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech X"
-
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-COMMON_DEPEND="
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
-   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdesu-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   sys-libs/zlib
-   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   kde-apps/kfind:5
-   kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   ecm_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package X X11)
-   )
-   ecm_src_configure
-}
-
-pkg_postinst() {
-   if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
-   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
-   optfeature "SVG support" kde-apps/svg:${SLOT}
-   optfeature "Java support on webpages" virtual/jre
-   fi
-   ecm_pkg_postinst
-}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2021-10-03 Thread Andreas Sturmlechner

commit: c322214967d93dd6ad80fa992366f5a1177fa7f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  3 11:18:46 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  3 11:45:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3222149

kde-apps/konqueror: Fix compatibility with KDE Frameworks 5.86

Closes: https://bugs.gentoo.org/815022
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-21.04.3-kf-5.86-compat.patch   | 250 +
 kde-apps/konqueror/konqueror-21.04.3-r2.ebuild |  91 
 kde-apps/konqueror/konqueror-21.08.1-r2.ebuild |  92 
 3 files changed, 433 insertions(+)

diff --git a/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch 
b/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
new file mode 100644
index 000..0814c335a73
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-21.04.3-kf-5.86-compat.patch
@@ -0,0 +1,250 @@
+From 6a46c0c8701fbde143a33e4be61f198e98f53c10 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Sun, 19 Sep 2021 12:03:46 +0200
+Subject: [PATCH 1/5] Don't open HTTP URLs in another browser than Konqueror,
+ from Konqueror
+
+From 8506c585594d9d0cfc0ebe8b869ca05ff7610fa7 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco 
+Date: Sun, 19 Sep 2021 20:56:38 +0200
+Subject: [PATCH 2/5] Make Konqueror compatible with KIO 5.86.0
+
+Due to a change in KIO::DesktopExecParser::hasSchemeHandler (commit
+5fa55a2395cbfb6504e56bf71c869c8e49902e13Q) URLs entered in the
+navigation bar either were always opened in a new tab or they were
+opened in another program altogether (for example, man and info URLs).
+
+To fix this issue, it has been necessary to copy the implementation of
+KRun::init and KParts::BrowserRun::init in KonqRun::init, making the
+necessary changes to restore the old behaviour.
+
+(cherry picked from commit ba1ea2b74f77832d2a26bb74fed18970eeadf301)
+
+From ec995b8091e97750c12e8e543d298a7a56045d41 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco 
+Date: Sun, 19 Sep 2021 22:01:30 +0200
+Subject: [PATCH 3/5] Fix signature and avoid calling url() repeatedly
+
+(cherry picked from commit 0326d9b8553a7c33d0c1498ca4c0199cc2344e15)
+
+From d368615b28a97993ce53691731f5152f044f98a2 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco 
+Date: Sun, 19 Sep 2021 22:47:03 +0200
+Subject: [PATCH 4/5] Add a comment explaining the interaction with
+ WebEnginePart
+
+(cherry picked from commit 5c4b0456af2a534c65c60b16add4012566309fb9)
+
+From 036fdfe1666294e5388803eb8877971362347428 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 30 Sep 2021 13:58:28 +0200
+Subject: [PATCH 5/5] Replace handleInitError with KParts::BrowserRun::init
+
+Avoids breaking string freeze.
+
+Thanks-to: Stefano Crocco 
+Signed-off-by: Andreas Sturmlechner 
+
+BUG: 442636
+---
+
+diff --git a/src/konqrun.cpp b/src/konqrun.cpp
+index 8bfc22285..4415c67c4 100644
+--- a/src/konqrun.cpp
 b/src/konqrun.cpp
+@@ -27,8 +27,17 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
++
+ #include 
+ #include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+@@ -48,8 +57,9 @@ KonqRun::KonqRun(KonqMainWindow *mainWindow, KonqView 
*_childView,
+  // Don't use inline errors on reloading due to 
auto-refresh sites, but use them in all other cases
+  // (no reload or user-requested reload)
+  !req.args.reload() || req.userRequestedReload),
+-  m_pMainWindow(mainWindow), m_pView(_childView), 
m_bFoundMimeType(false), m_req(req)
++  m_pMainWindow(mainWindow), m_pView(_childView), 
m_bFoundMimeType(false), m_req(req), m_inlineErrors(!req.args.reload() || 
req.userRequestedReload)
+ {
++setEnableExternalBrowser(false);
+ //qCDebug(KONQUEROR_LOG) << "KonqRun::KonqRun() " << this;
+ Q_ASSERT(!m_pMainWindow.isNull());
+ if (m_pView) {
+@@ -188,15 +198,124 @@ void KonqRun::handleError(KJob *job)
+ KParts::BrowserRun::handleError(job);
+ }
+ 
++//Code copied from browserrun.cpp
++void KonqRun::switchToErrorUrl(KIO::Error error, const QString )
++{
++KRun::setUrl(makeErrorUrl(error, stringUrl, url()));
++setJob(nullptr);
++mimeTypeDetermined(QStringLiteral("text/html"));
++}
++
++//Most of the code in this function has been copied from krun.cpp and 
browserrun.cpp
+ void KonqRun::init()
+ {
+-KParts::BrowserRun::init();
+-// Maybe init went to the "let's try stat'ing" part. Then connect to info 
messages.
+-// (in case it goes to scanFile, this will be done below)
+-KIO::StatJob *job = dynamic_cast(KRun::job());
++QUrl url = KRun::url();
++if (!url.isValid() || url.scheme().isEmpty()) {
++if (m_inlineErrors && !url.isValid()) {
++switchToErrorUrl(KIO::ERR_MALFORMED_URL, url.toString());
++return;
++

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2021-09-22 Thread Andreas Sturmlechner

commit: e043ed1efd403894abe55b07c223b07eae1e2292
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 16 18:46:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 22 21:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e043ed1e

kde-apps/konqueror: Add missing DEPEND for searchbar plugin

Upstream commits:
e17d92a3df75e61b7c8b24245940f2dc906bb644
7830a5a017428e6eeb8684196201811e94ad15b7

Closes: https://bugs.gentoo.org/813378
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konqueror/{konqueror-21.04.3.ebuild => konqueror-21.04.3-r1.ebuild}  | 1 +
 .../konqueror/{konqueror-21.08.1.ebuild => konqueror-21.08.1-r1.ebuild}  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/konqueror/konqueror-21.04.3.ebuild 
b/kde-apps/konqueror/konqueror-21.04.3-r1.ebuild
similarity index 98%
rename from kde-apps/konqueror/konqueror-21.04.3.ebuild
rename to kde-apps/konqueror/konqueror-21.04.3-r1.ebuild
index db7a0fe2cec..b1f66079872 100644
--- a/kde-apps/konqueror/konqueror-21.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.3-r1.ebuild
@@ -24,6 +24,7 @@ RESTRICT+=" test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5

diff --git a/kde-apps/konqueror/konqueror-21.08.1.ebuild 
b/kde-apps/konqueror/konqueror-21.08.1-r1.ebuild
similarity index 98%
rename from kde-apps/konqueror/konqueror-21.08.1.ebuild
rename to kde-apps/konqueror/konqueror-21.08.1-r1.ebuild
index 382f47e9132..845797349d9 100644
--- a/kde-apps/konqueror/konqueror-21.08.1.ebuild
+++ b/kde-apps/konqueror/konqueror-21.08.1-r1.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2021-06-05 Thread Mikle Kolyada

commit: b27f371c0d7e6e5664ddfa88c1e146458f3b6f8b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun  5 10:57:22 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun  5 10:57:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b27f371c

kde-apps/konqueror: Stabilize 20.12.3-r1 arm64, #788820

Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/konqueror/konqueror-20.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
index 5aff147a11b..485920585e0 100644
--- a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2021-06-05 Thread Mikle Kolyada

commit: 520cef015b286f7f6dc62468a46eb4b56f30203b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun  5 10:54:32 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun  5 10:55:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520cef01

kde-apps/konqueror: Stabilize 20.12.3-r1 x86, #788820

Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/konqueror/konqueror-20.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
index 1362af1c6ec..5aff147a11b 100644
--- a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2021-06-05 Thread Mikle Kolyada

commit: d6dff2e486a1be3ad89cf3e7a1fd36129e1c2a8b
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun  5 10:51:48 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun  5 10:52:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6dff2e4

kde-apps/konqueror: Stabilize 20.12.3-r1 amd64, #788820

Signed-off-by: Mikle Kolyada  gentoo.org>

 kde-apps/konqueror/konqueror-20.12.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
index f1d216d319c..1362af1c6ec 100644
--- a/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

2021-06-05 Thread Andreas Sturmlechner

commit: cc477457f1391c15abdeb330fba8c9c7e32c4c3a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun  5 10:27:08 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  5 10:27:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc477457

kde-apps/konqueror: Backport fix broken address bar w/ >=KF-5.82

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437161
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ox-signal.patch => konqueror-20.12.3-use-new-QComboBox-signal.patch} | 0
 .../{konqueror-21.04.1-r1.ebuild => konqueror-20.12.3-r1.ebuild}| 2 +-
 kde-apps/konqueror/konqueror-21.04.1-r1.ebuild  | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch 
b/kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch
similarity index 100%
rename from 
kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
rename to 
kde-apps/konqueror/files/konqueror-20.12.3-use-new-QComboBox-signal.patch

diff --git a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild 
b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
similarity index 99%
copy from kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
copy to kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
index 8cbc1bfb931..f1d216d319c 100644
--- a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-20.12.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.80.0
+KFMIN=5.75.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org optfeature

diff --git a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild 
b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
index 8cbc1bfb931..06ac23b4e1e 100644
--- a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${COMMON_DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-use-new-QComboBox-signal.patch" ) # KDE-bug 437161
+PATCHES=( "${FILESDIR}/${PN}-20.12.3-use-new-QComboBox-signal.patch" ) # 
KDE-bug 437161
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2021-06-03 Thread Andreas Sturmlechner

commit: d3b754271c5044865980daa94fcc0046c21d7ce8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  3 11:10:22 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  3 11:14:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b75427

kde-apps/konqueror: Fix broken address bar w/ >=KF-5.82

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437161
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...onqueror-21.04.1-use-new-QComboBox-signal.patch | 67 
 kde-apps/konqueror/konqueror-21.04.1-r1.ebuild | 90 ++
 2 files changed, 157 insertions(+)

diff --git 
a/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch 
b/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
new file mode 100644
index 000..65ca9be7e44
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-21.04.1-use-new-QComboBox-signal.patch
@@ -0,0 +1,67 @@
+From f4a3fec5a229fea59eba15b8644a06a9e16e91a0 Mon Sep 17 00:00:00 2001
+From: Jonathan Marten 
+Date: Sun, 16 May 2021 14:07:56 +
+Subject: [PATCH] KonqCombo: Use new QComboBox signal and new-style connect
+
+(cherry picked from commit 1003724180b3a758f7f4f42b247261ac95234e1b)
+---
+ src/konqcombo.cpp | 26 +-
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/konqcombo.cpp b/src/konqcombo.cpp
+index f401aca3f..84daa8078 100644
+--- a/src/konqcombo.cpp
 b/src/konqcombo.cpp
+@@ -143,9 +143,7 @@ KonqCombo::KonqCombo(QWidget *parent)
+ edit->setCompletionBox(new KonqComboCompletionBox(edit));
+ setLineEdit(edit);
+ setItemDelegate(new KonqComboItemDelegate(this));
+-
+-connect(edit, SIGNAL(textEdited(QString)),
+-this, SLOT(slotTextEdited(QString)));
++connect(edit, ::textEdited, this, ::slotTextEdited);
+ 
+ completionBox()->setTabHandling(true); // #167135
+ completionBox()->setItemDelegate(new KonqComboItemDelegate(this));
+@@ -156,16 +154,18 @@ KonqCombo::KonqCombo(QWidget *parent)
+ // Connect to the returnPressed signal when completionMode == 
CompletionNone. #314736
+ slotCompletionModeChanged(completionMode());
+ 
+-connect(KonqHistoryManager::kself(), SIGNAL(cleared()), 
SLOT(slotCleared()));
+-connect(this, ::cleared, this, ::slotCleared);
+-connect(this, static_cast(::highlighted), this, ::slotSetIcon);
++connect(KonqHistoryManager::kself(), ::HistoryProvider::cleared, 
this, ::slotCleared);
++connect(this, ::cleared, this, ::slotCleared);
++// The overload resolution is still needed until 
QComboBox::highlight(QString)
++// is either removed or hidden.
++connect(this, QOverload::of(::highlighted), this, 
::slotSetIcon);
+ 
+-// WARNING! has to be the old style connect below, otherwise location bar 
doesn't work!
+-//connect(this, ::activated, this, ::slotActivated);
++#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
++connect(this, ::textActivated, this, ::slotActivated);
++#else
+ connect(this, SIGNAL(activated(QString)), this, 
SLOT(slotActivated(QString)));
+-
+-connect(this, SIGNAL(completionModeChanged(KCompletion::CompletionMode)),
+-this, 
SLOT(slotCompletionModeChanged(KCompletion::CompletionMode)));
++#endif
++connect(this, ::completionModeChanged, this, 
::slotCompletionModeChanged);
+ }
+ 
+ KonqCombo::~KonqCombo()
+@@ -680,9 +680,9 @@ void KonqCombo::slotReturnPressed()
+ void KonqCombo::slotCompletionModeChanged(KCompletion::CompletionMode mode)
+ {
+ if (mode == KCompletion::CompletionNone) {
+-connect(this, static_cast(::returnPressed), this, 
::slotReturnPressed);
++connect(this, QOverload::of(::returnPressed), this, ::slotReturnPressed);
+ } else {
+-disconnect(this, static_cast(::returnPressed), this, 
::slotReturnPressed);
++disconnect(this, QOverload::of(::returnPressed), this, ::slotReturnPressed);
+ }
+ }
+ 
+-- 
+GitLab
+

diff --git a/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild 
b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
new file mode 100644
index 000..8cbc1bfb931
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-21.04.1-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic ecm kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/konqueror/;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities speech X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2020-04-23 Thread Andreas Sturmlechner

commit: 93d86ef95882e8cc6d1e02b0ce8f5de92eb8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 23 13:56:07 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 23 22:06:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d86ef9

kde-apps/konqueror: Adapt to >=kde-frameworks/kbookmarks-5.69

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konqueror-20.04.0-kf5bookmarks-5.69.patch  | 55 ++
 kde-apps/konqueror/konqueror-20.04.0.ebuild|  4 ++
 2 files changed, 59 insertions(+)

diff --git a/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch 
b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch
new file mode 100644
index 000..67eab1d6315
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-20.04.0-kf5bookmarks-5.69.patch
@@ -0,0 +1,55 @@
+From b61086cfece0d0f11ecfe9c3309697997cada201 Mon Sep 17 00:00:00 2001
+From: Stefano Crocco 
+Date: Tue, 14 Apr 2020 10:21:48 +0200
+Subject: [PATCH] Fix crash due to changes in KBookmarkMenu
+
+Summary:
+Since version 5.69, KBookmarkMenu doesn't automatically create an action
+collection. This causes Konqueror to crash when going on a submenu in
+the Bookmarks menu. To avoid it, manually create the action collection.
+
+Also, avoid calling the version of KBookmarkMenu construction which
+takes a KActionCollection, as it's deprecated.
+
+Test Plan:
+Open the bookmarks menu and hover with the mouse on a submenu. Check
+that it crashes. Do the same after this change and check it doesn't crash
+anymore.
+
+Reviewers: dfaure, nicolasfella
+
+Reviewed By: dfaure, nicolasfella
+
+Subscribers: arojas, poboiko
+
+Differential Revision: https://phabricator.kde.org/D28789
+---
+ src/konqbookmarkmenu.h | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h
+index 9ff4c0f55..d47960f7b 100644
+--- a/src/konqbookmarkmenu.h
 b/src/konqbookmarkmenu.h
+@@ -26,6 +26,7 @@
+ #include "kbookmarkcontextmenu.h"
+ 
+ #include 
++#include 
+ 
+ namespace Konqueror { // to avoid clashing with KF5::Bookmarks which had a 
KonqBookmarkMenu class. Remove once using KF6.
+ 
+@@ -61,7 +62,10 @@ public:
+ KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, 
KBookmarkActionMenu *parentMenu, QString parentAddress)
+ : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress)
+ {
++//KBookmarkMenu doesn't create an action collection only in version 5.69.0
++#if KBOOKMARKS_VERSION == QT_VERSION_CHECK(5, 69, 0)
+ m_actionCollection = new KActionCollection(this);
++#endif
+ }
+ 
+ protected:
+-- 
+2.26.2
+

diff --git a/kde-apps/konqueror/konqueror-20.04.0.ebuild 
b/kde-apps/konqueror/konqueror-20.04.0.ebuild
index 4d7a5e44fde..9f95cfadf19 100644
--- a/kde-apps/konqueror/konqueror-20.04.0.ebuild
+++ b/kde-apps/konqueror/konqueror-20.04.0.ebuild
@@ -63,6 +63,10 @@ RDEPEND="${COMMON_DEPEND}
kde-plasma/kde-cli-tools:5
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # bug 717316, KDE-Bug 420010
+)
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2020-02-16 Thread Andreas Sturmlechner

commit: bb59f87cc68d24aba9ed44878fce4ebc3302e094
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 16 10:51:23 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 16 13:40:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb59f87c

kde-apps/konqueror: Drop 19.08.3 (r0)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-19.08.3.ebuild | 116 
 kde-apps/konqueror/metadata.xml |   1 -
 2 files changed, 117 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild 
b/kde-apps/konqueror/konqueror-19.08.3.ebuild
deleted file mode 100644
index fbf41c36293..000
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
-QTMIN=5.12.3
-inherit flag-o-matic ecm kde.org
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-   https://kde.org/applications/internet/konqueror/
-   https://konqueror.org/
-"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-   >=kde-frameworks/karchive-${KFMIN}:5
-   >=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcmutils-${KFMIN}:5
-   >=kde-frameworks/kcodecs-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kcrash-${KFMIN}:5
-   >=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
-   >=kde-frameworks/kdesu-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/khtml-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwallet-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
-   sys-libs/zlib
-   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tidy? ( app-text/tidy-html5 )
-   webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   >=kde-apps/kfind-${PVCUT}:5
-   >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-   !webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   if ! use webengine; then
-   ecm_punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepart
-   fi
-
-   ecm_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake_use_find_package activities KF5Activities)
-   $(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package tidy LibTidy)
-   $(cmake_use_find_package X X11)
-   )
-   ecm_src_configure
-}
-
-pkg_postinst() {
-   ecm_pkg_postinst
-
-   if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg 
kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
-
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
-   fi
-   fi
-}

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2020-02-16 Thread Andreas Sturmlechner

commit: 2f435a68d13a9dcce30e46f2fc2263edefde217f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  5 12:22:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 16 13:40:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f435a68

kde-apps/konqueror: Drop USE webengine from 19.08.3

Drop a hack to disable QtWebEngine dependency. In 19.12 it is already gone,
QtWebKit is deprecated anyway, kwebkitpart is practically unmaintained.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-19.08.3-r1.ebuild | 107 +
 1 file changed, 107 insertions(+)

diff --git a/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
new file mode 100644
index 000..bc0d8af44d4
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+ECM_TEST="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic ecm kde.org
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="amd64 arm64 x86"
+IUSE="activities speech tidy X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kcrash-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kdelibs4support-${KFMIN}:5
+   >=kde-frameworks/kdesu-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/khtml-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   sys-libs/zlib
+   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+   tidy? ( app-text/tidy-html5 )
+   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:5
+"
+
+src_prepare() {
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+   ecm_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package speech Qt5TextToSpeech)
+   $(cmake_use_find_package tidy LibTidy)
+   $(cmake_use_find_package X X11)
+   )
+   ecm_src_configure
+}
+
+pkg_postinst() {
+   ecm_pkg_postinst
+
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+   elog "For bookmarks support, install keditbookmarks:"
+   elog "kde-apps/keditbookmarks:${SLOT}"
+   fi
+
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
+   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
+   elog "kde-apps/dolphin:${SLOT}"
+   fi
+
+   if ! has_version kde-apps/svg:${SLOT} ; then
+   elog "For konqueror to view SVGs, install the svg 
kpart:"
+   elog "kde-apps/svgpart:${SLOT}"
+   fi
+
+   if ! has_version virtual/jre ; then
+   elog "To use Java on webpages install virtual/jre."
+   fi
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2020-01-14 Thread Andreas Sturmlechner

commit: 370291548c1c6fd3891754054c060301090c9d33
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 14 19:08:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 14 19:16:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37029154

kde-apps/konqueror: Drop USE tidy

HTML/CSS validation plugin was dropped in 19.12 cycle already.

Upstream commit c36237c4f2fca0efc9b5f01f9d32567468fdd698

Closes: https://bugs.gentoo.org/705426
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-19.12.1.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-19.12.1.ebuild 
b/kde-apps/konqueror/konqueror-19.12.1.ebuild
index 2c5fd9420ac..911b8ea7556 100644
--- a/kde-apps/konqueror/konqueror-19.12.1.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.1.ebuild
@@ -16,7 +16,7 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech tidy X"
+IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
@@ -54,7 +54,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tidy? ( app-text/tidy-html5 )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -75,7 +74,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package tidy LibTidy)
$(cmake_use_find_package X X11)
)
ecm_src_configure

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2018-11-18 Thread Andreas Sturmlechner

commit: da166582725d5afc00610b2bf9272cdfa31ea1e5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 18 18:05:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 18 19:04:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da166582

kde-apps/konqueror: Drop 18.08.3 (r0)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-18.08.3.ebuild | 111 
 1 file changed, 111 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-18.08.3.ebuild 
b/kde-apps/konqueror/konqueror-18.08.3.ebuild
deleted file mode 100644
index 9d8010e3400..000
--- a/kde-apps/konqueror/konqueror-18.08.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-   https://www.kde.org/applications/internet/konqueror/
-   https://konqueror.org/
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kdesu)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep kwallet)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   sys-libs/zlib
-   speech? ( $(add_qt_dep qtspeech) )
-   tidy? ( app-text/htmltidy )
-   webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-   X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-   activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-   !kde-apps/kfmclient:4
-   !kde-apps/konq-plugins
-   !kde-apps/libkonq:5
-   $(add_kdeapps_dep kfind)
-   $(add_plasma_dep kde-cli-tools)
-   !webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   if ! use webengine; then
-   punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepart
-   fi
-
-   kde5_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package activities KF5Activities)
-   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-   $(cmake-utils_use_find_package tidy LibTidy)
-   $(cmake-utils_use_find_package X X11)
-   )
-   kde5_src_configure
-}
-
-pkg_postinst() {
-   kde5_pkg_postinst
-
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
-
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2018-11-18 Thread Andreas Sturmlechner

commit: be2e1a24cd6c969690ca7a2bc40d98203fbee551
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 18 18:04:26 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 18 19:04:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2e1a24

kde-apps/konqueror: Switch USE tidy to app-text/tidy-html5

Bug: https://bugs.gentoo.org/671450
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-18.08.3-tidyhtml5.patch|  46 +
 kde-apps/konqueror/konqueror-18.08.3-r1.ebuild | 113 +
 2 files changed, 159 insertions(+)

diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch 
b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 000..dae1486d580
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ plugins/validators/CMakeLists.txt | 2 +-
+ plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/validators/CMakeLists.txt 
b/plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/plugins/validators/CMakeLists.txt
 b/plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-   URL "http://tidy.sourceforge.net;
++   URL "http://www.html-tidy.org/;
+TYPE OPTIONAL
+PURPOSE "Gives the Konqueror validators plugin the 
ability to validate HTML"
+   )
+diff --git a/plugins/validators/tidy_validator.cpp 
b/plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/plugins/validators/tidy_validator.cpp
 b/plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include 
+ 
+-#include 
++#include 
+ #include 
+ 
+ #include 
+-- 
+2.19.1
+

diff --git a/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
new file mode 100644
index 000..c84260236ac
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+   https://www.kde.org/applications/internet/konqueror/
+   https://konqueror.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities speech tidy +webengine X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdesu)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwallet)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   sys-libs/zlib
+   speech? ( $(add_qt_dep qtspeech) )
+   tidy? ( app-text/tidy-html5 )
+   webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+   X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+   activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+   !kde-apps/kfmclient:4
+   !kde-apps/konq-plugins
+   !kde-apps/libkonq:5
+   $(add_kdeapps_dep kfind)
+   $(add_plasma_dep kde-cli-tools)
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2018-08-07 Thread Andreas Sturmlechner

commit: d20cc9f90cc22ceafc46ecb48644989ce4dc743d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug  6 23:27:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  7 07:05:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20cc9f9

kde-apps/konqueror: Fix build with USE=-webengine

Reported-by: Tupone Alfredo  gentoo.org>
Closes: https://bugs.gentoo.org/662466
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 .../konqueror/{konqueror-18.04.3.ebuild => konqueror-18.04.3-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-18.04.3.ebuild 
b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
similarity index 98%
rename from kde-apps/konqueror/konqueror-18.04.3.ebuild
rename to kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
index 377dba24af6..fa56ec002de 100644
--- a/kde-apps/konqueror/konqueror-18.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 
if ! use webengine; then
punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepartexit
+   cmake_comment_add_subdirectory webenginepart
fi
 
kde5_src_prepare

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2018-07-28 Thread Mikle Kolyada

commit: a4ed3bb61524effc97094de828a71373e4014de2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 29 00:30:17 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 29 00:30:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ed3bb6

kde-apps/konqueror: amd64 stable wrt bug #661810

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 kde-apps/konqueror/konqueror-18.04.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-18.04.3.ebuild 
b/kde-apps/konqueror/konqueror-18.04.3.ebuild
index 2ca638dfbc2..5fe71cffca7 100644
--- a/kde-apps/konqueror/konqueror-18.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

2017-05-06 Thread Andreas Sturmlechner

commit: 169244b9dc13a148c768aeccea04f8f84c1219cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  6 19:10:15 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  6 20:02:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169244b9

kde-apps/konqueror: Drop slot 4

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 kde-apps/konqueror/Manifest|   1 -
 .../files/konqueror-16.08.0-kactivities.patch  |  15 ---
 kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 102 -
 kde-apps/konqueror/metadata.xml|   2 -
 4 files changed, 120 deletions(-)

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 180c5605554..79194971d69 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,3 +1,2 @@
-DIST kde-baseapps-16.08.3.tar.xz 2051000 SHA256 
47e9bb15c64495392625d69af9ac7e00644caa52c98c7187489a7c569ec842a1 SHA512 
6606430c2ec5ab934d253a009bbc2c1df4e9d1f8b54dcf16dd9f1894449d7c734641f17360b906a3a7667ac7083ab712b8498b44a20c137d836dd1dab8963649
 WHIRLPOOL 
b65a32a9c03424ed6718db4b5fea85c28690074f450f49df1c581d77e03cc172004dda5aadd39de087e6ff0d101ac1f7587a960e20f7d4faa56f2b45a6ee7643
 DIST konqueror-16.12.3.tar.xz 1172012 SHA256 
e52654a1bb2c0be317f8ed80dba3147bc4d2126abce209ab57c6e69e64159bdf SHA512 
cef6fe2fbade73a89d8f8b7932ae0dba42d98fbf1160dcc888339a071d72084aeb847fc74a22ae4a39b21fd0cef24a60832e343885c0e673b418482faebad93a
 WHIRLPOOL 
1afb257eb10cff77e71d1479972d25029727dd1a6202173422203f9e309767a80150b713a104dd7848c66ad86c342e1c6a1d7bf28c705051a52e9a120ed1d4c3
 DIST konqueror-17.04.0.tar.xz 7783204 SHA256 
95a6358da4cfd9589b66b78116adce29c0f69a5964e81fcde3862e32b1653833 SHA512 
8d6c00a4df41a7feec82b63647a64fabf810dad8ed40647178d98529bfcfbfc228a05649f5b1e267644cd21db1efbc8fe43362a2dfef25bdec5b4cfee336336a
 WHIRLPOOL 
ae83fb5f379d2c68e0ec0fad1a96d22da0747268500963532fd2caadb04142cd731ff30939c1538fd4165ca31cb8a34c6bbfe7097831dcafe6f85f99bd870efb

diff --git a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch 
b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
deleted file mode 100644
index 9207fd6b973..000
--- a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure KActivities headers aren't used either if disabled.
-
 a/dolphin/src/CMakeLists.txt   2016-08-24 22:25:42.603345565 +0200
-+++ b/dolphin/src/CMakeLists.txt   2016-08-24 22:27:39.921317927 +0200
-@@ -27,7 +27,9 @@
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
- 
--include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} )
-+if (KActivities_FOUND)
-+  include_directories( ${KACTIVITIES_INCLUDE_DIRS} 
${CMAKE_CURRENT_BINARY_DIR} )
-+endif (KActivities_FOUND)
- 
- if(HAVE_BALOO)
-   include_directories(${BALOO_INCLUDE_DIR} ${BALOO_WIDGETS_INCLUDE_DIR} 
${KFILEMETADATA_INCLUDE_DIR})

diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
deleted file mode 100644
index b2a1a5b7595..000
--- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="Web browser and file manager"
-HOMEPAGE="
-   https://www.kde.org/applications/internet/konqueror/
-   https://konqueror.org/
-"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+bookmarks debug +filemanager svg"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
-
-DEPEND="
-   $(add_kdeapps_dep libkonq)
-   filemanager? (
-   media-libs/phonon[qt4]
-   x11-libs/libXrender
-   )
-"
-
-# bug #544630: evince[nsplugin] crashes konqueror
-RDEPEND="${DEPEND}
-   kde-apps/kfind:*
-   $(add_kdeapps_dep kfmclient)
-   $(add_kdeapps_dep kurifilter-plugins)
-   bookmarks? ( kde-apps/keditbookmarks:* )
-   filemanager? (
-   $(add_kdeapps_dep kdebase-kioslaves)
-   $(add_kdeapps_dep konsolepart)
-   !kde-apps/dolphin:4
-   )
-   svg? ( $(add_kdeapps_dep svgpart) )
-   !app-text/evince[nsplugin]
-"
-
-KMEXTRA="
-   dolphin/
-"
-
-KMEXTRACTONLY="
-   konqueror/client/
-   lib/konq/
-"
-
-PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   # required for dolphin
-   sed -e "/konq_copytomenu.h/ s/# //" \
-   -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
-   -i lib/konq/CMakeLists.txt \
-   || die "Failed to fix libkonq CMakeLists.txt"
-
-   kde4-meta_src_prepare
-
-   # Avoid doc file collisions

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2017-04-18 Thread Andreas Sturmlechner

commit: 46a35772d660b729825d0d60d4a944bc40ba1b14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 18 23:09:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 18 23:10:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a35772

kde-apps/konqueror: Fix USE=-handbook

Reported-by: Coacher 
Gentoo-bug: 615960

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild 
b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
index eb82291baf4..b2a1a5b7595 100644
--- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
@@ -62,8 +62,10 @@ src_prepare() {
 
kde4-meta_src_prepare
 
-   # Avoid doc file collisions
-   sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die
+   # Avoid doc file collisions with kde-apps/keditbookmarks:5
+   if use handbook; then
+   sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt 
|| die
+   fi
 
use filemanager || cmake_comment_add_subdirectory dolphin

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2017-04-17 Thread Andreas Sturmlechner

commit: c1cc5f76f0bbb3721a82b249165af594d079de62
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Apr 17 11:30:47 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Apr 17 11:52:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cc5f76

kde-apps/konqueror: Allow all slots of kde-apps/k{editbookmarks,find}

Fix file collision with kde-apps/keditbookmarks:5

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/4435

 .../{konqueror-16.08.3.ebuild => konqueror-16.08.3-r1.ebuild}  | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.08.3.ebuild 
b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
similarity index 90%
rename from kde-apps/konqueror/konqueror-16.08.3.ebuild
rename to kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
index a554744e689..eb82291baf4 100644
--- a/kde-apps/konqueror/konqueror-16.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,13 +27,12 @@ DEPEND="
 
 # bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND="${DEPEND}
-   $(add_kdeapps_dep kfind)
+   kde-apps/kfind:*
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
-   bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+   bookmarks? ( kde-apps/keditbookmarks:* )
filemanager? (
$(add_kdeapps_dep kdebase-kioslaves)
-   $(add_kdeapps_dep kfind)
$(add_kdeapps_dep konsolepart)
!kde-apps/dolphin:4
)
@@ -63,6 +62,9 @@ src_prepare() {
 
kde4-meta_src_prepare
 
+   # Avoid doc file collisions
+   sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die
+
use filemanager || cmake_comment_add_subdirectory dolphin
 
# Do not install *.desktop files for kfmclient

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2017-01-01 Thread Andreas Sturmlechner

commit: 154e8b3d8188e4b03310980e04e539d76bd6a78a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  1 16:03:17 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  1 16:08:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154e8b3d

kde-apps/konqueror: Drop old

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-16.12.0.ebuild | 107 
 1 file changed, 107 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.12.0.ebuild 
b/kde-apps/konqueror/konqueror-16.12.0.ebuild
deleted file mode 100644
index 9ef7946..
--- a/kde-apps/konqueror/konqueror-16.12.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-   https://www.kde.org/applications/internet/konqueror/
-   https://konqueror.org/
-"
-KEYWORDS="~amd64 ~x86"
-IUSE="activities speech tidy X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
-COMMON_DEPEND="
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcmutils)
-   $(add_frameworks_dep kcodecs)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kded)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kdesu)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep khtml)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui)
-   $(add_qt_dep qtwebengine 'widgets' '' '5=')
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   sys-libs/zlib
-   speech? ( $(add_qt_dep qtspeech) )
-   tidy? ( app-text/htmltidy )
-   X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-   activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-   $(add_kdeapps_dep kfind)
-   $(add_plasma_dep kde-cli-tools)
-   !kde-apps/kfmclient:4
-   !kde-apps/konq-plugins
-   !kde-apps/libkonq:5
-"
-
-src_prepare() {
-   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-   kde5_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package activities KF5Activities)
-   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-   $(cmake-utils_use_find_package tidy LibTidy)
-   $(cmake-utils_use_find_package X X11)
-   )
-   kde5_src_configure
-}
-
-pkg_postinst() {
-   kde5_pkg_postinst
-
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
-
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

2017-01-01 Thread Andreas Sturmlechner

commit: 034be77f8fd376a0d7f3782694c1a94dd61b31e7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  1 16:00:32 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  1 16:08:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034be77f

kde-apps/konqueror: Fix runtime crash

Gentoo-bug: 604310
See also: https://bugs.kde.org/show_bug.cgi?id=373781

Package-Manager: portage-2.3.0

 .../files/konqueror-16.12.0-crashfix.patch |  29 ++
 kde-apps/konqueror/konqueror-16.12.0-r1.ebuild | 109 +
 2 files changed, 138 insertions(+)

diff --git a/kde-apps/konqueror/files/konqueror-16.12.0-crashfix.patch 
b/kde-apps/konqueror/files/konqueror-16.12.0-crashfix.patch
new file mode 100644
index ..dd4fc75
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-16.12.0-crashfix.patch
@@ -0,0 +1,29 @@
+From 4c6575a9852e3dfcf85bd849fa953dcc083029d9 Mon Sep 17 00:00:00 2001
+From: David Faure 
+Date: Wed, 21 Dec 2016 08:51:10 +0100
+Subject: Set Qt::AA_ShareOpenGLContexts like what Qt tells me to do:
+
+"initialize: Qt WebEngine seems to be initialized from a plugin. Please set 
Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute before 
+constructing QGuiApplication."
+---
+ src/konqmain.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/konqmain.cpp b/src/konqmain.cpp
+index 774225e..73c6a2f 100644
+--- a/src/konqmain.cpp
 b/src/konqmain.cpp
+@@ -58,7 +58,8 @@ static KonqPreloadingHandler s_preloadingHandler;
+ 
+ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
+ {
+-KonquerorApplication app(argc, argv);
++QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); // says 
QtWebEngine
++KonquerorApplication app(argc, argv);
+ KLocalizedString::setApplicationDomain("konqueror");
+ 
+ KAboutData aboutData("konqueror", i18n("Konqueror"), KONQUEROR_VERSION);
+-- 
+cgit v0.11.2
+
+

diff --git a/kde-apps/konqueror/konqueror-16.12.0-r1.ebuild 
b/kde-apps/konqueror/konqueror-16.12.0-r1.ebuild
new file mode 100644
index ..3a49a33
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-16.12.0-r1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit flag-o-matic kde5
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="
+   https://www.kde.org/applications/internet/konqueror/
+   https://konqueror.org/
+"
+KEYWORDS="~amd64 ~x86"
+IUSE="activities speech tidy X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
+COMMON_DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kded)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdesu)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtwebengine 'widgets' '' '5=')
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   sys-libs/zlib
+   speech? ( $(add_qt_dep qtspeech) )
+   tidy? ( app-text/htmltidy )
+   X? ( $(add_qt_dep qtx11extras) )
+"
+DEPEND="${COMMON_DEPEND}
+   activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
+   $(add_kdeapps_dep kfind)
+   $(add_plasma_dep kde-cli-tools)
+   !kde-apps/kfmclient:4
+   !kde-apps/konq-plugins
+   !kde-apps/libkonq:5
+"
+
+PATCHES=( "${FILESDIR}/${PN}-16.12.0-crashfix.patch" )
+
+src_prepare() {
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+   kde5_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+   $(cmake-utils_use_find_package tidy LibTidy)
+   $(cmake-utils_use_find_package X X11)
+   )
+   kde5_src_configure
+}
+

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2016-07-20 Thread Michael Palimaka

commit: 40b60d81a17911fd63bb389f8a07f8e5a7068736
Author: Coacher 
AuthorDate: Wed Jul 20 15:16:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 15:16:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b60d81

kde-apps/konqueror: avoid installing dolphin stuff with USE="-filemanager"

Gentoo-bug: 589126

Package-Manager: portage-2.3.0

 .../{konqueror-16.04.3.ebuild => konqueror-16.04.3-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.04.3.ebuild 
b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
similarity index 100%
rename from kde-apps/konqueror/konqueror-16.04.3.ebuild
rename to kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
index 28a5bf9..9a4f654 100644
--- a/kde-apps/konqueror/konqueror-16.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
 
kde4-meta_src_prepare
 
+   use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2016-07-18 Thread Johannes Huber

commit: 1a1e7a3dd10c915a8ff1f400a3967ec9698bc0ea
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jul 18 20:41:12 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jul 18 20:41:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1e7a3d

kde-apps/konqueror: Update blocker

Gentoo-bug: 589082

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-16.04.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-16.04.3.ebuild 
b/kde-apps/konqueror/konqueror-16.04.3.ebuild
index 38fe745..28a5bf9 100644
--- a/kde-apps/konqueror/konqueror-16.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3.ebuild
@@ -37,10 +37,10 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kdebase-kioslaves)
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep konsolepart)
+   !kde-apps/dolphin:4
)
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
-   !kde-apps/dolphin:4
 "
 
 KMEXTRA="

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2016-05-24 Thread Mikle Kolyada

commit: a80ad9ba406f107b2bc3f38d93398ad80696
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue May 24 19:23:39 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue May 24 19:25:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80ad9ba

kde-apps/konqueror: amd64 stable wrt bug #579992

Package-Manager: portage-2.2.28

 kde-apps/konqueror/konqueror-15.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-15.12.3.ebuild 
b/kde-apps/konqueror/konqueror-15.12.3.ebuild
index 8133d4a..d177b02 100644
--- a/kde-apps/konqueror/konqueror-15.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
 "
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 ~x86"
 IUSE="+bookmarks debug svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

2016-03-06 Thread Mikle Kolyada

commit: 032862b13781650daf2e0be164c57bed5b7a2faa
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar  5 11:04:49 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar  5 11:04:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=032862b1

kde-apps/konqueror: amd64 stable wrt bug #569742

Package-Manager: portage-2.2.26

 kde-apps/konqueror/konqueror-15.08.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-15.08.3.ebuild 
b/kde-apps/konqueror/konqueror-15.08.3.ebuild
index 8b102c1..47806f8 100644
--- a/kde-apps/konqueror/konqueror-15.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
 "
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="+bookmarks debug svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/files/, kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/, kde-apps/konqueror/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/

35 matches

Site Navigation

Mail list logo

Footer information