[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[Johannes Huber]

commit:     f7a2244ce5d89cb58690c42c7f026e2f36219513
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 16 19:10:07 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 19:10:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7a2244c

[kde-apps/gwenview] Remove failing patch

Should be handled by eclass.

Package-Manager: portage-2.2.18

 .../files/gwenview-9999-tests-optional.patch       | 28 ----------------------
 kde-apps/gwenview/gwenview-9999.ebuild             |  2 --
 2 files changed, 30 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch b/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch
deleted file mode 100644
index b5d1248..0000000
--- a/kde-apps/gwenview/files/gwenview-9999-tests-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/CMakeLists.txt	2015-01-29 00:15:10.245160459 +0100
-+++ b/CMakeLists.txt	2015-01-29 00:16:41.950314278 +0100
-@@ -36,7 +36,7 @@
-     set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test Concurrent Svg OpenGL)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Concurrent Svg OpenGL)
- 
- find_package(Phonon4Qt5 4.6.60 NO_MODULE)
- include_directories(BEFORE ${PHONON_INCLUDES})
-@@ -101,11 +101,15 @@
- add_subdirectory(app)
- # add_subdirectory(importer)
- add_subdirectory(part)
--add_subdirectory(tests)
- add_subdirectory(icons)
- add_subdirectory(images)
- add_subdirectory(cursors)
- add_subdirectory(color-schemes)
- add_subdirectory(doc)
- 
-+if(BUILD_TESTING)
-+   find_package(Qt5Test CONFIG REQUIRED)
-+   add_subdirectory(tests)
-+endif()
-+
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 2e60db4..3b4ac99 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -52,8 +52,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}"-9999-tests-optional.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[Manuel Rüger]

commit:     027e9b6b0d347cb91cf445c725d09548b48a45af
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep 18 21:22:36 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 14:02:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=027e9b6b

kde-apps/gwenview: Fix missing menu items

Upstream bug: https://bugs.kde.org/show_bug.cgi?id=351431
Bad commit: https://quickgit.kde.org/?p=gwenview.git&a=commit&h=78e4e57af3a5476dd949797c559a3d25d8ce50a1

Package-Manager: portage-2.2.20.1

 .../gwenview/files/gwenview-15.08.1-fix-menu-items.patch     | 12 ++++++++++++
 kde-apps/gwenview/gwenview-15.08.1.ebuild                    |  2 ++
 kde-apps/gwenview/gwenview-15.08.49.9999.ebuild              |  2 ++
 kde-apps/gwenview/gwenview-9999.ebuild                       |  2 ++
 4 files changed, 18 insertions(+)

diff --git a/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch b/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch
new file mode 100644
index 0000000..2433fb8
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch
@@ -0,0 +1,12 @@
+--- a/app/CMakeLists.txt	2015-09-18 23:08:00.449716542 +0200
++++ b/app/CMakeLists.txt	2015-09-18 23:11:31.939072561 +0200
+@@ -88,7 +88,8 @@
+     ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ install(FILES gwenviewui.rc
+-    DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/gwenview)
++    DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/org.kde.gwenview
++    RENAME org.kde.gwenviewui.rc)
+ 
+ install(PROGRAMS org.kde.gwenview.desktop
+     DESTINATION ${KDE_INSTALL_APPDIR})

diff --git a/kde-apps/gwenview/gwenview-15.08.1.ebuild b/kde-apps/gwenview/gwenview-15.08.1.ebuild
index ddcbb9b..6de3e1f 100644
--- a/kde-apps/gwenview/gwenview-15.08.1.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.1.ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)

diff --git a/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild b/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild
index f6cfc66..6a65d05 100644
--- a/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49.9999.ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index f6cfc66..6a65d05 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
 	dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package kipi KF5Kipi)

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[Andreas Sturmlechner]

commit:     795d21efcf99d0edd0b3626b36f8ae815bca260d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 11:05:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 12:35:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=795d21ef

kde-apps/gwenview: Patch upstreamed

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../gwenview/files/gwenview-17.11.80-cfitsio.patch | 172 ---------------------
 kde-apps/gwenview/gwenview-9999.ebuild             |   2 -
 2 files changed, 174 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch b/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
deleted file mode 100644
index aa56d94755..0000000000
--- a/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 48f0fa32a451bd25378a63d7caa39b7a13a78f49 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 22 Oct 2017 14:23:41 +0200
-Subject: [PATCH] Make CFitsio optional
-
----
- CMakeLists.txt             |  5 ++++-
- app/main.cpp               |  6 +++++-
- config-gwenview.h.cmake    |  1 +
- lib/CMakeLists.txt         | 29 ++++++++++++++++++++++-------
- lib/imagemetainfomodel.cpp |  7 +++++--
- 5 files changed, 37 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8dd8d5e1..2ddb8c10 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,7 +99,10 @@ find_package(Exiv2)
- set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org" DESCRIPTION "image metadata support" TYPE REQUIRED)
- 
- find_package(CFitsio)
--set_package_properties(CFitsio PROPERTIES URL "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html" DESCRIPTION "FITS format support" TYPE REQUIRED)
-+set_package_properties(CFitsio PROPERTIES URL "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html" DESCRIPTION "FITS format support" TYPE OPTIONAL)
-+if(CFITSIO_FOUND)
-+    set(HAVE_FITS true)
-+endif()
- 
- find_package(KF5Kipi)
- if (KF5Kipi_FOUND)
-diff --git a/app/main.cpp b/app/main.cpp
-index 662dcd7b..e844668c 100644
---- a/app/main.cpp
-+++ b/app/main.cpp
-@@ -40,12 +40,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- #include <lib/imageformats/imageformats.h>
- #include "mainwindow.h"
- 
-+#ifdef HAVE_FITS
- // This hack is needed to include the fitsplugin moc file in main.cpp
- // Otherwise the linker complains about: undefined reference to `qt_static_plugin_FitsPlugin()'
- // This symbol is defined in the moc file, but it is not a visible symbol after libgwenview is linked.
- // If Q_IMPORT_PLUGIN(FitsPlugin) is moved to the library, gwenview crashes on the first call to FitsPlugin()
- // when the vtable is looked up in the plugin registration.
- #include <../lib/imageformats/moc_fitsplugin.cpp>
-+#endif
- 
- class StartHelper
- {
-@@ -165,4 +167,6 @@ int main(int argc, char *argv[])
-     return app.exec();
- }
- 
--Q_IMPORT_PLUGIN(FitsPlugin)
-+#ifdef HAVE_FITS
-+    Q_IMPORT_PLUGIN(FitsPlugin)
-+#endif
-diff --git a/config-gwenview.h.cmake b/config-gwenview.h.cmake
-index 21e7ca98..80dc9cac 100644
---- a/config-gwenview.h.cmake
-+++ b/config-gwenview.h.cmake
-@@ -4,3 +4,4 @@
- #cmakedefine KIPI_FOUND 1
- #define GV_TEST_DATA_DIR "@CMAKE_CURRENT_SOURCE_DIR@/tests/data"
- #cmakedefine HAVE_X11 ${HAVE_X11}
-+#cmakedefine HAVE_FITS ${HAVE_FITS}
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index e1893d71..2f5ce417 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -56,9 +56,14 @@ include_directories(
-     ${EXIV2_INCLUDE_DIR}
-     ${JPEG_INCLUDE_DIR}
-     ${PNG_INCLUDE_DIRS}
--    ${CFITSIO_INCLUDE_DIR}
-     )
- 
-+if(HAVE_FITS)
-+    include_directories(
-+        ${CFITSIO_INCLUDE_DIR}
-+        )
-+endif()
-+
- # For config-gwenview.h
- include_directories(
-     ${CMAKE_CURRENT_BINARY_DIR}/..
-@@ -124,11 +129,6 @@ set(gwenviewlib_SRCS
-     imageformats/imageformats.cpp
- #     imageformats/jpegplugin.cpp
- #     imageformats/jpeghandler.cpp
--    imageformats/fitsplugin.cpp
--    imageformats/fitsplugin.h
--    imageformats/fitshandler.cpp
--    imageformats/fitsformat/bayer.c
--    imageformats/fitsformat/fitsdata.cpp
-     imagemetainfomodel.cpp
-     imagescaler.cpp
-     imageutils.cpp
-@@ -175,6 +175,17 @@ set(gwenviewlib_SRCS
-     ${GV_JPEG_DIR}/transupp.c
-     )
- 
-+if(HAVE_FITS)
-+    set(gwenviewlib_SRCS
-+        ${gwenviewlib_SRCS}
-+        imageformats/fitsplugin.cpp
-+        imageformats/fitsplugin.h
-+        imageformats/fitshandler.cpp
-+        imageformats/fitsformat/bayer.c
-+        imageformats/fitsformat/fitsdata.cpp
-+        )
-+endif()
-+
- if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
-     set(gwenviewlib_SRCS
-         ${gwenviewlib_SRCS}
-@@ -241,8 +252,12 @@ target_link_libraries(gwenviewlib
-     ${PNG_LIBRARIES}
-     ${LCMS2_LIBRARIES}
-     ${PHONON_LIBRARY}
--    ${CFITSIO_LIBRARIES}
-     )
-+
-+if(HAVE_FITS)
-+    target_link_libraries(gwenviewlib ${CFITSIO_LIBRARIES})
-+endif()
-+
- if (WIN32)
-     target_link_libraries(gwenviewlib ${EXPAT_LIBRARIES})
- endif()
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
-index e92e584c..c8e36ced 100644
---- a/lib/imagemetainfomodel.cpp
-+++ b/lib/imagemetainfomodel.cpp
-@@ -21,8 +21,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- // Self
- #include "imagemetainfomodel.h"
- 
--#include "imageformats/fitsformat/fitsdata.h"
--
- // Qt
- #include <QSize>
- #include <QDebug>
-@@ -39,7 +37,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <exiv2/iptc.hpp>
- 
- // Local
-+#ifdef HAVE_FITS
-+#include "imageformats/fitsformat/fitsdata.h"
- #include "urlutils.h"
-+#endif
- 
- namespace Gwenview
- {
-@@ -331,6 +332,7 @@ void ImageMetaInfoModel::setUrl(const QUrl &url)
-     d->setGroupEntryValue(GeneralGroup, "General.Size", sizeString);
-     d->setGroupEntryValue(GeneralGroup, "General.Time", timeString);
- 
-+#ifdef HAVE_FITS
-     if (UrlUtils::urlIsFastLocalFile(url) && (url.fileName().endsWith(".fit", Qt::CaseInsensitive) ||
-         url.fileName().endsWith(".fits", Qt::CaseInsensitive))) {
-         FITSData fitsLoader;
-@@ -385,6 +387,7 @@ void ImageMetaInfoModel::setUrl(const QUrl &url)
-             }
-         }
-     }
-+#endif
- }
- 
- void ImageMetaInfoModel::setImageSize(const QSize& size)
--- 
-2.14.2
-

diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 50ae7beaa9..c0b1fd7a3f 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -69,8 +69,6 @@ RDEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtimageformats)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-cfitsio.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package fits CFitsio)

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/files/, kde-apps/gwenview/

[Andreas Sturmlechner]

commit:     f8902579139556cd20f278d97e9cdef5cedd0b2a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 12:05:39 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 12:57:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8902579

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

Backporting upstream(ed) commit 2ffdf26b81a90c91abadbc8582f82d219dd19e90

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

 .../files/gwenview-22.08.3-without_x11.patch       | 52 ++++++++++++++++++++++
 kde-apps/gwenview/gwenview-22.08.3.ebuild          |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
new file mode 100644
index 0000000000..89724ce4bb
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
@@ -0,0 +1,52 @@
+From 2ffdf26b81a90c91abadbc8582f82d219dd19e90 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 27 Nov 2021 12:49:09 +0100
+Subject: [PATCH] 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 X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22ebcb42..d1b0b5fe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,13 +132,16 @@ endif()
+ set_package_properties(KF5KDcraw PROPERTIES URL "https://invent.kde.org/graphics/libkdcraw/" DESCRIPTION "C++ interface around LibRaw library used to decode RAW picture files" TYPE OPTIONAL)
+ 
+ 
+-find_package(X11)
+-if(X11_FOUND)
+-    if (QT_MAJOR_VERSION STREQUAL "5")
+-        find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++option(WITHOUT_X11 "Build without X11 integration (disables finding X11)" OFF)
++if(NOT WITHOUT_X11)
++    find_package(X11)
++    if(X11_FOUND)
++        if (QT_MAJOR_VERSION STREQUAL "5")
++            find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++        endif()
++        # we need to add qt6 lib when we found x11
++        set(HAVE_X11 TRUE)
+     endif()
+-    # we need to add qt6 lib when we found x11
+-    set(HAVE_X11 1)
+ endif()
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5")
+-- 
+GitLab
+

diff --git a/kde-apps/gwenview/gwenview-22.08.3.ebuild b/kde-apps/gwenview/gwenview-22.08.3.ebuild
index d341db59c1..9f34c3cac0 100644
--- a/kde-apps/gwenview/gwenview-22.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-22.08.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kimageformats-${KFMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_prepare() {
 	ecm_src_prepare
 	if ! use mpris; then
@@ -89,7 +91,7 @@ src_configure() {
 		$(cmake_use_find_package raw KF5KDcraw)
 		-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo None)
 		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
+		-DWITHOUT_X11=$(usex !X)
 	)
 	ecm_src_configure
 }