svn commit: r497176 - in head/graphics/gwenview: . files
Raphael Kubo da Costa
rakuco at FreeBSD.org
Fri Mar 29 18:44:21 UTC 2019
Author: rakuco
Date: Fri Mar 29 18:44:19 2019
New Revision: 497176
URL: https://svnweb.freebsd.org/changeset/ports/497176
Log:
Backport a few changes to enable exceptions in all files that use libexiv.
This is required after the recent exiv2 update to 0.27, as exiv requires a
build with exceptions enabled, and KDE disables exceptions by default.
This fixes the build with GCC (for some reason, clang doesn't complain that
code that uses exceptions is built with -fno-exceptions).
PR: 236849
Added:
head/graphics/gwenview/files/patch-git_b81eed1dc (contents, props changed)
head/graphics/gwenview/files/patch-git_fe0dbadae (contents, props changed)
Modified:
head/graphics/gwenview/Makefile
Modified: head/graphics/gwenview/Makefile
==============================================================================
--- head/graphics/gwenview/Makefile Fri Mar 29 18:10:40 2019 (r497175)
+++ head/graphics/gwenview/Makefile Fri Mar 29 18:44:19 2019 (r497176)
@@ -2,7 +2,7 @@
PORTNAME= gwenview
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics kde kde-applications
MAINTAINER= kde at FreeBSD.org
Added: head/graphics/gwenview/files/patch-git_b81eed1dc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gwenview/files/patch-git_b81eed1dc Fri Mar 29 18:44:19 2019 (r497176)
@@ -0,0 +1,38 @@
+commit b81eed1dc4d879f06d651ea0954bee1b46c7947e
+Author: Stefan Brüns <stefan.bruens at rwth-aachen.de>
+Date: Sat Dec 29 23:39:30 2018 +0100
+
+ Compile more files with enabled exceptions, required for exiv2 0.27
+
+ Summary:
+ The (exception based) error handling is now pulled in by e.g. image.hpp,
+ so more files require enabled exception handling.
+
+ Depends on D17872
+
+ Test Plan: build
+
+ Reviewers: #gwenview, ngraham, cfeck, asturmlechner
+
+ Reviewed By: #gwenview, ngraham
+
+ Subscribers: wbauer, lbeltrame
+
+ Tags: #gwenview
+
+ Differential Revision: https://phabricator.kde.org/D17873
+
+--- lib/CMakeLists.txt
++++ lib/CMakeLists.txt
+@@ -224,6 +224,11 @@ kde_source_files_enable_exceptions(
+ exiv2imageloader.cpp
+ imagemetainfomodel.cpp
+ timeutils.cpp
++ cms/cmsprofile.cpp
++ document/abstractdocumentimpl.cpp
++ document/document.cpp
++ document/loadingdocumentimpl.cpp
++ jpegcontent.cpp
+ )
+
+ ki18n_wrap_ui(gwenviewlib_SRCS
Added: head/graphics/gwenview/files/patch-git_fe0dbadae
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/gwenview/files/patch-git_fe0dbadae Fri Mar 29 18:44:19 2019 (r497176)
@@ -0,0 +1,32 @@
+commit fe0dbadaecc596eb05004e01334cbed0b5323f24
+Author: Timo Gurr <timo.gurr at gmail.com>
+Date: Wed Feb 20 09:21:10 2019 -0700
+
+ Compile tests files with enabled exceptions, required for exiv2 0.27
+
+ Summary: This is a follow up of https://cgit.kde.org/gwenview.git/patch/?id=b81eed1dc4d879f06d651ea0954bee1b46c7947e to also make the tests build withour running into errors when building against exiv2 0.27.
+
+ Reviewers: #gwenview, ngraham
+
+ Reviewed By: #gwenview, ngraham
+
+ Subscribers: ngraham, #gwenview
+
+ Tags: #gwenview
+
+ Differential Revision: https://phabricator.kde.org/D19169
+
+--- tests/auto/CMakeLists.txt
++++ tests/auto/CMakeLists.txt
+@@ -9,6 +9,11 @@ macro(gv_add_unit_test _test)
+ add_dependencies(buildtests ${_test})
+ endmacro(gv_add_unit_test)
+
++kde_source_files_enable_exceptions(
++ documenttest.cpp
++ imagemetainfomodeltest.cpp
++)
++
+ include_directories(
+ ${gwenview_SOURCE_DIR}
+ ${importer_SOURCE_DIR}
More information about the svn-ports-all
mailing list