* [gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
@ 2018-09-08 12:51 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-09-08 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 4ba1b2e31f26bb8b31890fc3ce6eb7ef0aaf8b9b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 8 12:50:51 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 8 12:51:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba1b2e3
kde-apps/gwenview: Add missing patch
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../gwenview-18.07.90-activities-optional.patch | 160 +++++++++++++++++++++
1 file changed, 160 insertions(+)
diff --git a/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
new file mode 100644
index 00000000000..bf66688a6b9
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.07.90-activities-optional.patch
@@ -0,0 +1,160 @@
+From a00eecc78507f48843f719f32e80ae8805a34c15 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov <a.volkov@rusbitech.ru>
+Date: Tue, 7 Aug 2018 23:59:15 +0300
+Subject: Make dependency on KActivities optional
+
+Reviewers: #gwenview, rkflx
+
+Reviewed By: #gwenview, rkflx
+
+Subscribers: asturmlechner, rkflx
+
+Differential Revision: https://phabricator.kde.org/D14512
+---
+ CMakeLists.txt | 4 +++-
+ app/CMakeLists.txt | 5 ++++-
+ app/viewmainpage.cpp | 19 ++++++++++++++++---
+ config-gwenview.h.cmake | 1 +
+ 4 files changed, 24 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e3e412..810813a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,6 @@ add_definitions(-DPHONON_LIB_SONAME=\"${PHONON_LIB_SONAME}\")
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ KIO
+- Activities
+ ItemModels
+ I18n
+ DocTools
+@@ -80,6 +79,9 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ IconThemes
+ Notifications
+ )
++find_package(KF5 ${KF5_MIN_VERSION} OPTIONAL_COMPONENTS
++ Activities
++)
+
+ ## Dependencies
+ find_package(JPEG)
+diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
+index 5fe34d6..0d24360 100644
+--- a/app/CMakeLists.txt
++++ b/app/CMakeLists.txt
+@@ -78,11 +78,14 @@ add_executable(gwenview ${gwenview_SRCS})
+
+ target_link_libraries(gwenview
+ KF5::ItemModels
+- KF5::Activities
+ KF5::Notifications
+ gwenviewlib
+ )
+
++if (KF5Activities_FOUND)
++ target_link_libraries(gwenview KF5::Activities)
++endif()
++
+ target_link_libraries(gwenview LINK_INTERFACE_LIBRARIES KF5::KIOCore Qt5::Core)
+
+ if (KF5Kipi_FOUND)
+diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
+index fa06e80..480d3c2 100644
+--- a/app/viewmainpage.cpp
++++ b/app/viewmainpage.cpp
+@@ -18,6 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ */
+ #include "viewmainpage.h"
++#include "config-gwenview.h"
+
+ // Qt
+ #include <QCheckBox>
+@@ -35,8 +36,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #include <KMessageBox>
+ #include <KModelIndexProxyMapper>
+ #include <KToggleAction>
+-#include <KActivities/ResourceInstance>
+ #include <KSqueezedTextLabel>
++#ifdef KF5Activities_FOUND
++#include <KActivities/ResourceInstance>
++#endif
+
+ // Local
+ #include "fileoperations.h"
+@@ -132,7 +135,9 @@ struct ViewMainPagePrivate
+ // Activity Resource events reporting needs to be above KPart,
+ // in the shell itself, to avoid problems with other MDI applications
+ // that use this KPart
++#ifdef KF5Activities_FOUND
+ QHash<DocumentView*, KActivities::ResourceInstance*> mActivityResources;
++#endif
+
+ bool mCompareMode;
+ ZoomMode::Enum mZoomMode;
+@@ -250,7 +255,9 @@ struct ViewMainPagePrivate
+ QObject::connect(view, &DocumentView::videoFinished, mSlideShow, &SlideShow::resumeAndGoToNextUrl);
+
+ mDocumentViews << view;
++#ifdef KF5Activities_FOUND
+ mActivityResources.insert(view, new KActivities::ResourceInstance(q->window()->winId(), view));
++#endif
+
+ return view;
+ }
+@@ -269,7 +276,9 @@ struct ViewMainPagePrivate
+ QObject::disconnect(view, nullptr, mSlideShow, nullptr);
+
+ mDocumentViews.removeOne(view);
++#ifdef KF5Activities_FOUND
+ mActivityResources.remove(view);
++#endif
+ mDocumentViewContainer->deleteView(view);
+ }
+
+@@ -344,8 +353,10 @@ struct ViewMainPagePrivate
+ }
+ if (oldView) {
+ oldView->setCurrent(false);
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(oldView));
+ mActivityResources.value(oldView)->notifyFocusedOut();
++#endif
+ }
+ view->setCurrent(true);
+ mDocumentViewController->setView(view);
+@@ -358,10 +369,10 @@ struct ViewMainPagePrivate
+ // *before* listing /foo (because it matters less to the user)
+ mThumbnailBar->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Current);
+ }
+-
++#ifdef KF5Activities_FOUND
+ Q_ASSERT(mActivityResources.contains(view));
+ mActivityResources.value(view)->notifyFocusedIn();
+-
++#endif
+ QObject::connect(view, &DocumentView::currentToolChanged,
+ q, &ViewMainPage::updateFocus);
+ }
+@@ -701,7 +712,9 @@ void ViewMainPage::openUrls(const QList<QUrl>& allUrls, const QUrl ¤tUrl)
+ DocumentView* view = it.value();
+ DocumentView::Setup savedSetup = d->mDocumentViewContainer->savedSetup(url);
+ view->openUrl(url, d->mZoomMode == ZoomMode::Individual && savedSetup.valid ? savedSetup : setup);
++#ifdef KF5Activities_FOUND
+ d->mActivityResources.value(view)->setUri(url);
++#endif
+ }
+
+ // Init views
+diff --git a/config-gwenview.h.cmake b/config-gwenview.h.cmake
+index 29a5a60..369442a 100644
+--- a/config-gwenview.h.cmake
++++ b/config-gwenview.h.cmake
+@@ -6,3 +6,4 @@
+ #cmakedefine HAVE_X11 ${HAVE_X11}
+ #cmakedefine HAVE_FITS ${HAVE_FITS}
+ #cmakedefine HAVE_QTDBUS ${HAVE_QTDBUS}
++#cmakedefine KF5Activities_FOUND 1
+--
+cgit v0.11.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
@ 2019-01-17 0:36 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-01-17 0:36 UTC (permalink / raw
To: gentoo-commits
commit: e9e00e80e356314a68de6fc555730d38c3392a5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 22:25:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 00:36:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e00e80
kde-apps/gwenview: Drop unused patch
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/gwenview-18.12.0-exiv2-0.27.patch | 216 ---------------------
1 file changed, 216 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch b/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
deleted file mode 100644
index fa0d62d84b7..00000000000
--- a/kde-apps/gwenview/files/gwenview-18.12.0-exiv2-0.27.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 7e4cd5e91d7434448b7227ee8cf3307435cc7d00 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 12:59:05 +0100
-Subject: [PATCH 1/2] Include exiv2.hpp instead of individual headers
-
-Headers are subject to refactoring upstream, using exiv2.hpp per recommendation.
----
- lib/cms/cmsprofile.h | 2 +-
- lib/document/document.h | 2 +-
- lib/exiv2imageloader.cpp | 4 ----
- lib/exiv2imageloader.h | 2 +-
- lib/imagemetainfomodel.cpp | 4 +---
- lib/jpegcontent.cpp | 4 ----
- lib/timeutils.cpp | 4 ----
- tests/auto/documenttest.cpp | 2 --
- tests/auto/imagemetainfomodeltest.cpp | 2 --
- 9 files changed, 4 insertions(+), 22 deletions(-)
-
-diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
-index a2a38a87..bc378ff9 100644
---- a/lib/cms/cmsprofile.h
-+++ b/lib/cms/cmsprofile.h
-@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
- #include <QSharedData>
-
- // Exiv2
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
-
- class QByteArray;
- class QString;
-diff --git a/lib/document/document.h b/lib/document/document.h
-index c0bb454b..8e32c044 100644
---- a/lib/document/document.h
-+++ b/lib/document/document.h
-@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <lib/gwenviewlib_export.h>
-
- #include <string.h>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
-
- // Qt
- #include <QObject>
-diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
-index f2830f81..f12b7383 100644
---- a/lib/exiv2imageloader.cpp
-+++ b/lib/exiv2imageloader.cpp
-@@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- // KDE
-
--// Exiv2
--#include <exiv2/error.hpp>
--#include <exiv2/types.hpp>
--
- // Local
-
- namespace Gwenview
-diff --git a/lib/exiv2imageloader.h b/lib/exiv2imageloader.h
-index 57ef24d2..866e7fac 100644
---- a/lib/exiv2imageloader.h
-+++ b/lib/exiv2imageloader.h
-@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- // Exiv2
- #include <string.h>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
-
- // Local
-
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
-index d7b89ab2..58f1c13d 100644
---- a/lib/imagemetainfomodel.cpp
-+++ b/lib/imagemetainfomodel.cpp
-@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <KFormat>
-
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
-
- // Local
- #ifdef HAVE_FITS
-diff --git a/lib/jpegcontent.cpp b/lib/jpegcontent.cpp
-index bb810dd4..a628e8a8 100644
---- a/lib/jpegcontent.cpp
-+++ b/lib/jpegcontent.cpp
-@@ -41,10 +41,6 @@ extern "C" {
- // KDE
- #include <KLocalizedString>
-
--// Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--
- // Local
- #include "jpegerrormanager.h"
- #include "iodevicejpegsourcemanager.h"
-diff --git a/lib/timeutils.cpp b/lib/timeutils.cpp
-index 9e8836a9..19befff5 100644
---- a/lib/timeutils.cpp
-+++ b/lib/timeutils.cpp
-@@ -29,10 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
- // KDE
- #include <KFileItem>
-
--// Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--
- // Local
- #include <lib/exiv2imageloader.h>
- #include <lib/urlutils.h>
-diff --git a/tests/auto/documenttest.cpp b/tests/auto/documenttest.cpp
-index 9373641f..496346f0 100644
---- a/tests/auto/documenttest.cpp
-+++ b/tests/auto/documenttest.cpp
-@@ -39,8 +39,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include "../lib/transformimageoperation.h"
- #include "testutils.h"
-
--#include <exiv2/exif.hpp>
--
- #include "documenttest.h"
-
- QTEST_MAIN(DocumentTest)
-diff --git a/tests/auto/imagemetainfomodeltest.cpp b/tests/auto/imagemetainfomodeltest.cpp
-index e3ec8d30..c4467a73 100644
---- a/tests/auto/imagemetainfomodeltest.cpp
-+++ b/tests/auto/imagemetainfomodeltest.cpp
-@@ -28,8 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include "../lib/imagemetainfomodel.h"
- #include "testutils.h"
-
--#include <exiv2/exif.hpp>
--
- #include "imagemetainfomodeltest.h"
-
- QTEST_MAIN(ImageMetaInfoModelTest)
---
-2.20.1
-
-
-From 7d6c5d95cf4e4d7c857f5d659a58f82bdc46259c Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 30 Dec 2018 11:31:20 +0100
-Subject: [PATCH 2/2] Fix build with exiv2-0.27
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Summary:
-Include exiv2.hpp instead of individual headers
-
-Headers are subject to refactoring upstream, using exiv2.hpp per recommendation.
-
-Enable exceptions globally - otherwise, lots of the following error:
-
-In file included from /usr/include/exiv2/types.hpp:34,
- from /usr/include/exiv2/image.hpp:28,
- from gwenview-18.12.0/lib/cms/cmsprofile.h:33,
- from gwenview-18.12.0/lib/cms/cmsprofile.cpp:22:
-/usr/include/exiv2/slice.hpp: In constructor ‘Exiv2::Internal::SliceBase::SliceBase(size_t, size_t)’:
-/usr/include/exiv2/slice.hpp:99:77: error: exception handling disabled, use -fexceptions to enable
- throw std::out_of_range("Begin must be smaller than end");
- ^
-
-Test Plan: Built fine with exiv2-0.27
-
-Reviewers: #gwenview, cgiboudeaux
-
-Tags: #gwenview
-
-Differential Revision: https://phabricator.kde.org/D17869
----
- CMakeLists.txt | 2 ++
- lib/CMakeLists.txt | 6 ------
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f44f9afc..b85ba4bc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -126,6 +126,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-
-+kde_enable_exceptions()
-+
- ## dirs to build
- add_subdirectory(lib)
- add_subdirectory(app)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 169df3c6..f7e9f71f 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -220,12 +220,6 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO)
- )
- endif()
-
--kde_source_files_enable_exceptions(
-- exiv2imageloader.cpp
-- imagemetainfomodel.cpp
-- timeutils.cpp
-- )
--
- ki18n_wrap_ui(gwenviewlib_SRCS
- crop/cropwidget.ui
- documentview/messageview.ui
---
-2.20.1
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
@ 2019-06-16 21:57 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-06-16 21:57 UTC (permalink / raw
To: gentoo-commits
commit: d7091303920e6e28ce14fe0cd4fb10102a6d7744
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jun 16 15:28:27 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 21:50:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7091303
kde-apps/gwenview: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12269
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/gwenview-19.04.1-exiv2-0.27.1.patch | 34 ----------------------
1 file changed, 34 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch b/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
deleted file mode 100644
index f95f26c68bd..00000000000
--- a/kde-apps/gwenview/files/gwenview-19.04.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3f3e9a546fa5e9a335ad3dc9afc805fd4d2809fd Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 12 May 2019 08:40:53 +0200
-Subject: [PATCH] Fix build with exiv2-0.27.1
-
-Summary: Upstream is moving things around between headers. While they are busy doing that, they recommend including exiv2.hpp.
-
-Reviewers: #gwenview
-
-Tags: #gwenview
-
-Differential Revision: https://phabricator.kde.org/D21148
----
- lib/imagemetainfomodel.cpp | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
-index d7b89ab2..58f1c13d 100644
---- a/lib/imagemetainfomodel.cpp
-+++ b/lib/imagemetainfomodel.cpp
-@@ -33,9 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #include <KFormat>
-
- // Exiv2
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/iptc.hpp>
-+#include <exiv2/exiv2.hpp>
-
- // Local
- #ifdef HAVE_FITS
---
-2.21.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/
@ 2025-03-23 14:30 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2025-03-23 14:30 UTC (permalink / raw
To: gentoo-commits
commit: c3606034c797c49e4b4d844e44cea8a655449f68
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 12 07:22:37 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 14:30:03 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3606034
kde-apps/gwenview: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
kde-apps/gwenview/files/gwenview-24.08.0-odr.patch | 58 ----------------------
1 file changed, 58 deletions(-)
diff --git a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch b/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
deleted file mode 100644
index 148921f18169..000000000000
--- a/kde-apps/gwenview/files/gwenview-24.08.0-odr.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From b5cc214574eeb62f469a058daf52cd92270e4aa9 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@gentoo.org>
-Date: Tue, 3 Sep 2024 00:40:11 -0400
-Subject: [PATCH] fix ODR violation: many files had the wrong definition of
- Enum
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This enum has a different number of values, depending on whether
-gwenview is configured with the semanticinfo backend "none" or
-fake/baloo.
-
-In order to avoid Undefined Behavior, every file that includes sorting.h
-also has to include config-gwenview.h *before* sorting.h, which was not
-true. Solve this by including the config header inside the sorting.h
-header.
-
-Fixes link failures when LTO is enabled, since LTO allows the compiler
-to do whole-program optimization and type-check across the entire
-program:
-
-```
-/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: error: type ‘Gwenview::Sorting::Enum’ violates the C++ One Definition Rule [-Werror=odr]
- 37 | enum Enum {
- | ^
-/var/tmp/portage/kde-apps/gwenview-24.08.0/work/gwenview-24.08.0/app/../lib/sorting.h:37:6: note: an enum with different number of values is defined in another translation unit
- 37 | enum Enum {
- | ^
-lto1: some warnings being treated as errors
-lto-wrapper: fatal error: /usr/bin/x86_64-pc-linux-gnu-g++ returned 1 exit status
-compilation terminated.
-/usr/libexec/gcc/x86_64-pc-linux-gnu/ld: error: lto-wrapper failed
-collect2: error: ld returned 1 exit status
-```
-
-Fixes: https://bugs.gentoo.org/921649
----
- lib/sorting.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/sorting.h b/lib/sorting.h
-index 529ea6fc9..c008865cf 100644
---- a/lib/sorting.h
-+++ b/lib/sorting.h
-@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
- #ifndef SORTING_H
- #define SORTING_H
-
-+// Do not assume every file that includes this one, includes the config.h
-+#include <config-gwenview.h>
-+
- // Qt
-
- // KF
---
-GitLab
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-03-23 14:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-17 0:36 [gentoo-commits] repo/gentoo:master commit in: kde-apps/gwenview/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2025-03-23 14:30 Conrad Kostecki
2019-06-16 21:57 Andreas Sturmlechner
2018-09-08 12:51 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox