[gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/files/, media-gfx/photoqt/
commit: 465064e149846c57787480f2cd8d6bc30b8d4965
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 24 21:19:50 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 24 22:25:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465064e1
media-gfx/photoqt: Less invasive patch
Closes: https://bugs.gentoo.org/676194
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../photoqt/files/photoqt-1.7.1-exiv2-0.27.patch | 447 +
media-gfx/photoqt/photoqt-1.7.1-r1.ebuild | 5 +-
2 files changed, 8 insertions(+), 444 deletions(-)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
index d2b264e0175..48734ce7059 100644
--- a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
@@ -1,448 +1,9 @@
-From 66b2c16c0dec865db9c3d1720385625d22fbf021 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Sat, 19 Jan 2019 23:17:32 +0100
-Subject: [PATCH 1/4] Simplify CMakeLists.txt using FeatureSummary
-
- CMakeLists.txt | 192 +++--
- 1 file changed, 75 insertions(+), 117 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9af47a75..1ffe7ff3 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,6 +52,8 @@ include(CMake/ListFilesResources.cmake)
- OPTIONS THAT CAN BE SET BY THE USER
- #
-
-+include(FeatureSummary)
-+
- option(RAW "Use libraw library" ON)
- option(EXIV2 "Use exiv2 library" ON)
- option(GM "Use graphicsmagick library" ON)
-@@ -65,35 +67,37 @@ option(TESTING "Enable some tests" OFF)
- FIND REQUIRED PACKAGES
-
-
-+find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
-+
- if(WIN32)
--find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools
WinExtras REQUIRED)
--elseif(NOT WIN32)
--find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
--endif(WIN32)
-+find_package(Qt5WinExtras REQUIRED)
-+endif()
-
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake"
${CMAKE_MODULE_PATH})
-+
-+find_package(LibArchive REQUIRED)
-+
- if(GM)
--find_package(Magick)
--endif(GM)
-+find_package(Magick REQUIRED)
-+endif()
- if(EXIV2)
--find_package(Exiv2)
--endif(EXIV2)
-+find_package(Exiv2 REQUIRED)
-+endif()
- if(RAW)
--find_package(LibRaw)
--endif(RAW)
-+find_package(LibRaw REQUIRED)
-+endif()
- if(FREEIMAGE)
--find_package(FreeImage)
--endif(FREEIMAGE)
--find_package(LibArchive)
-+find_package(FreeImage REQUIRED)
-+endif()
-
- find_package(ECM REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_MODULE_PATH}")
- if(POPPLER)
--find_package(Poppler COMPONENTS Qt5)
--endif(POPPLER)
-+find_package(Poppler COMPONENTS Qt5 REQUIRED)
-+endif()
- if(DEVIL)
--find_package(DevIL)
--endif(DEVIL)
-+find_package(DevIL REQUIRED)
-+endif()
-
-
- TRANSLATIONS AND RESOURCES
-@@ -137,14 +141,14 @@ add_definitions(-DSIMPLECRYPTKEY="${CRYPTKEY}")
- Add the executeable
- #
-
-+add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
-+target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core
Qt5::Xml)
-+
- # on windows we add application icons
- if(WIN32)
--add_executable(${PROJECT_NAME} WIN32 ${photoqt_SOURCES} ${photoqt_QML}
${RESOURCES} windowsicons.rc)
--target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg
Qt5::Core Qt5::Xml Qt5::WinExtras)
--elseif(NOT WIN32)
--add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML}
${RESOURCES})
--target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg
Qt5::Core Qt5::Xml)
--endif(WIN32)
-+add_executable(${PROJECT_NAME} WIN32 windowsicons.rc)
-+target_link_libraries(${PROJECT_NAME} Qt5::WinExtras)
-+endif()
-
-
-
-@@ -171,7 +175,7 @@ if(TESTING)
- # And inform the user
- message("** TESTING ENABLED")
-
--endif(TESTING)
-+endif()
-
-
- ##
-@@ -186,112 +190,65 @@ composeDesktopFile()
- CUSTOM OPTIONS
-
-
--if(NOT ${LibArchive_FOUND})
--message(FATAL_ERROR "** Unable to locate LibArchive... is it installed?")
--elseif(${LibArchive_FOUND})
--include_directories(${LibArchive_INCLUDE_DIRS})
--target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
--message("** Found LibArchive " ${LibArchive_VERSION})
--endif(NOT ${LibArchive_FOUND})
-+include_directories(${LibArchive_INCLUDE_DIRS})
-+target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
-
- if(POPPLER)
--if(NOT ${Poppler_FOUND})
--
[gentoo-commits] repo/gentoo:master commit in: media-gfx/photoqt/files/, media-gfx/photoqt/
commit: 6ce6689cb898b2a4c283f9e7c3cde5147e011ca6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 20 17:40:15 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 20 18:54:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce6689c
media-gfx/photoqt: Fix detection and build with exiv2-0.27
Pending upstream review:
https://gitlab.com/luspi/photoqt/merge_requests/8
Closes: https://bugs.gentoo.org/675714
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../photoqt/files/photoqt-1.7.1-exiv2-0.27.patch | 541 +
media-gfx/photoqt/photoqt-1.7.1-r1.ebuild | 66 +++
2 files changed, 607 insertions(+)
diff --git a/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
new file mode 100644
index 000..d2b264e0175
--- /dev/null
+++ b/media-gfx/photoqt/files/photoqt-1.7.1-exiv2-0.27.patch
@@ -0,0 +1,541 @@
+From 66b2c16c0dec865db9c3d1720385625d22fbf021 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sat, 19 Jan 2019 23:17:32 +0100
+Subject: [PATCH 1/4] Simplify CMakeLists.txt using FeatureSummary
+
+---
+ CMakeLists.txt | 192 +++--
+ 1 file changed, 75 insertions(+), 117 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9af47a75..1ffe7ff3 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -52,6 +52,8 @@ include(CMake/ListFilesResources.cmake)
+ OPTIONS THAT CAN BE SET BY THE USER
+ #
+
++include(FeatureSummary)
++
+ option(RAW "Use libraw library" ON)
+ option(EXIV2 "Use exiv2 library" ON)
+ option(GM "Use graphicsmagick library" ON)
+@@ -65,35 +67,37 @@ option(TESTING "Enable some tests" OFF)
+ FIND REQUIRED PACKAGES
+
+
++find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
++
+ if(WIN32)
+-find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools
WinExtras REQUIRED)
+-elseif(NOT WIN32)
+-find_package(Qt5 COMPONENTS Core Quick Svg Sql Xml LinguistTools REQUIRED)
+-endif(WIN32)
++find_package(Qt5WinExtras REQUIRED)
++endif()
+
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake"
${CMAKE_MODULE_PATH})
++
++find_package(LibArchive REQUIRED)
++
+ if(GM)
+-find_package(Magick)
+-endif(GM)
++find_package(Magick REQUIRED)
++endif()
+ if(EXIV2)
+-find_package(Exiv2)
+-endif(EXIV2)
++find_package(Exiv2 REQUIRED)
++endif()
+ if(RAW)
+-find_package(LibRaw)
+-endif(RAW)
++find_package(LibRaw REQUIRED)
++endif()
+ if(FREEIMAGE)
+-find_package(FreeImage)
+-endif(FREEIMAGE)
+-find_package(LibArchive)
++find_package(FreeImage REQUIRED)
++endif()
+
+ find_package(ECM REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_MODULE_PATH}")
+ if(POPPLER)
+-find_package(Poppler COMPONENTS Qt5)
+-endif(POPPLER)
++find_package(Poppler COMPONENTS Qt5 REQUIRED)
++endif()
+ if(DEVIL)
+-find_package(DevIL)
+-endif(DEVIL)
++find_package(DevIL REQUIRED)
++endif()
+
+
+ TRANSLATIONS AND RESOURCES
+@@ -137,14 +141,14 @@ add_definitions(-DSIMPLECRYPTKEY="${CRYPTKEY}")
+ Add the executeable
+ #
+
++add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML} ${RESOURCES})
++target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Core
Qt5::Xml)
++
+ # on windows we add application icons
+ if(WIN32)
+-add_executable(${PROJECT_NAME} WIN32 ${photoqt_SOURCES} ${photoqt_QML}
${RESOURCES} windowsicons.rc)
+-target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg
Qt5::Core Qt5::Xml Qt5::WinExtras)
+-elseif(NOT WIN32)
+-add_executable(${PROJECT_NAME} ${photoqt_SOURCES} ${photoqt_QML}
${RESOURCES})
+-target_link_libraries(${PROJECT_NAME} Qt5::Quick Qt5::Sql Qt5::Svg
Qt5::Core Qt5::Xml)
+-endif(WIN32)
++add_executable(${PROJECT_NAME} WIN32 windowsicons.rc)
++target_link_libraries(${PROJECT_NAME} Qt5::WinExtras)
++endif()
+
+
+
+@@ -171,7 +175,7 @@ if(TESTING)
+ # And inform the user
+ message("** TESTING ENABLED")
+
+-endif(TESTING)
++endif()
+
+
+ ##
+@@ -186,112 +190,65 @@ composeDesktopFile()
+ CUSTOM OPTIONS
+
+
+-if(NOT ${LibArchive_FOUND})
+-message(FATAL_ERROR "** Unable to locate LibArchive... is it installed?")
+-elseif(${LibArchive_FOUND})
+-include_directories(${LibArchive_INCLUDE_DIRS})
+-target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
+-message("** Found LibArchive " ${LibArchive_VERSION})
+-endif(NOT ${LibArchive_FOUND})
++include_directories(${LibArchive_INCLUDE_DIRS})
++target_link_libraries(${PROJECT_NAME} ${LibArchive_LIBRARIES})
+
+
