1 |
commit: 303281b3bab8645c86f8cda9dee4fa44d34b4b6b |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Dec 27 08:34:13 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 27 10:40:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303281b3 |
7 |
|
8 |
media-gfx/digikam: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/6652 |
11 |
|
12 |
.../digikam/files/digikam-5.5.0-cmake-3.9.patch | 170 --------------------- |
13 |
1 file changed, 170 deletions(-) |
14 |
|
15 |
diff --git a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch |
16 |
deleted file mode 100644 |
17 |
index d87096a6024..00000000000 |
18 |
--- a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch |
19 |
+++ /dev/null |
20 |
@@ -1,170 +0,0 @@ |
21 |
-commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5 |
22 |
-Author: Gilles Caulier <caulier.gilles@×××××.com> |
23 |
-Date: Sat Jul 22 15:46:08 2017 +0200 |
24 |
- |
25 |
- fix broken linking stage under MacOS with macports. |
26 |
- move database models into libdigikamdatabase. |
27 |
- Let's others model in place to be included into libdigikamcore |
28 |
- |
29 |
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt |
30 |
-index 7d055363fb..a431a36d7b 100644 |
31 |
---- a/libs/database/CMakeLists.txt |
32 |
-+++ b/libs/database/CMakeLists.txt |
33 |
-@@ -13,6 +13,18 @@ endif (POLICY CMP0063) |
34 |
- # Boost uses operator names (and, not, ...) |
35 |
- string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") |
36 |
- |
37 |
-+set(libdatabasemodels_SRCS |
38 |
-+ models/imagemodel.cpp |
39 |
-+ models/imagefiltermodel.cpp |
40 |
-+ models/imagefiltermodelpriv.cpp |
41 |
-+ models/imagefiltermodelthreads.cpp |
42 |
-+ models/imagefiltersettings.cpp |
43 |
-+ models/imagelistmodel.cpp |
44 |
-+ models/imagesortsettings.cpp |
45 |
-+ models/imagethumbnailmodel.cpp |
46 |
-+ models/imageversionsmodel.cpp |
47 |
-+) |
48 |
-+ |
49 |
- set(libdatabasecore_SRCS |
50 |
- server/databaseserverstarter.cpp |
51 |
- server/databaseservererror.cpp |
52 |
-@@ -152,10 +164,10 @@ if(ENABLE_DBUS) |
53 |
- include_directories($<TARGET_PROPERTY:Qt5::DBus,INTERFACE_INCLUDE_DIRECTORIES>) |
54 |
- endif() |
55 |
- |
56 |
--add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS}) |
57 |
-+add_library(digikamdatabase_src OBJECT ${digikamdatabase_LIB_SRCS} ${libdatabasemodels_SRCS}) |
58 |
- add_library(digikamdatabasemain_src OBJECT ${libdatabaseutils_SRCS} ${libimgqsort_SRCS}) |
59 |
- add_library(digikamdatabasecore_src OBJECT ${libdatabasecore_SRCS}) |
60 |
--add_library(digikamdatabase SHARED $<TARGET_OBJECTS:digikamdatabase_src> $<TARGET_OBJECTS:digikamdatabasemodels_src>) |
61 |
-+add_library(digikamdatabase $<TARGET_OBJECTS:digikamdatabase_src>) |
62 |
- |
63 |
- generate_export_header(digikamdatabase |
64 |
- BASE_NAME digikam_database |
65 |
-diff --git a/libs/models/imagefiltermodel.cpp b/libs/database/models/imagefiltermodel.cpp |
66 |
-similarity index 100% |
67 |
-rename from libs/models/imagefiltermodel.cpp |
68 |
-rename to libs/database/models/imagefiltermodel.cpp |
69 |
-diff --git a/libs/models/imagefiltermodel.h b/libs/database/models/imagefiltermodel.h |
70 |
-similarity index 100% |
71 |
-rename from libs/models/imagefiltermodel.h |
72 |
-rename to libs/database/models/imagefiltermodel.h |
73 |
-diff --git a/libs/models/imagefiltermodelpriv.cpp b/libs/database/models/imagefiltermodelpriv.cpp |
74 |
-similarity index 100% |
75 |
-rename from libs/models/imagefiltermodelpriv.cpp |
76 |
-rename to libs/database/models/imagefiltermodelpriv.cpp |
77 |
-diff --git a/libs/models/imagefiltermodelpriv.h b/libs/database/models/imagefiltermodelpriv.h |
78 |
-similarity index 100% |
79 |
-rename from libs/models/imagefiltermodelpriv.h |
80 |
-rename to libs/database/models/imagefiltermodelpriv.h |
81 |
-diff --git a/libs/models/imagefiltermodelthreads.cpp b/libs/database/models/imagefiltermodelthreads.cpp |
82 |
-similarity index 100% |
83 |
-rename from libs/models/imagefiltermodelthreads.cpp |
84 |
-rename to libs/database/models/imagefiltermodelthreads.cpp |
85 |
-diff --git a/libs/models/imagefiltermodelthreads.h b/libs/database/models/imagefiltermodelthreads.h |
86 |
-similarity index 100% |
87 |
-rename from libs/models/imagefiltermodelthreads.h |
88 |
-rename to libs/database/models/imagefiltermodelthreads.h |
89 |
-diff --git a/libs/models/imagefiltersettings.cpp b/libs/database/models/imagefiltersettings.cpp |
90 |
-similarity index 100% |
91 |
-rename from libs/models/imagefiltersettings.cpp |
92 |
-rename to libs/database/models/imagefiltersettings.cpp |
93 |
-diff --git a/libs/models/imagefiltersettings.h b/libs/database/models/imagefiltersettings.h |
94 |
-similarity index 100% |
95 |
-rename from libs/models/imagefiltersettings.h |
96 |
-rename to libs/database/models/imagefiltersettings.h |
97 |
-diff --git a/libs/models/imagelistmodel.cpp b/libs/database/models/imagelistmodel.cpp |
98 |
-similarity index 100% |
99 |
-rename from libs/models/imagelistmodel.cpp |
100 |
-rename to libs/database/models/imagelistmodel.cpp |
101 |
-diff --git a/libs/models/imagelistmodel.h b/libs/database/models/imagelistmodel.h |
102 |
-similarity index 100% |
103 |
-rename from libs/models/imagelistmodel.h |
104 |
-rename to libs/database/models/imagelistmodel.h |
105 |
-diff --git a/libs/models/imagemodel.cpp b/libs/database/models/imagemodel.cpp |
106 |
-similarity index 100% |
107 |
-rename from libs/models/imagemodel.cpp |
108 |
-rename to libs/database/models/imagemodel.cpp |
109 |
-diff --git a/libs/models/imagemodel.h b/libs/database/models/imagemodel.h |
110 |
-similarity index 100% |
111 |
-rename from libs/models/imagemodel.h |
112 |
-rename to libs/database/models/imagemodel.h |
113 |
-diff --git a/libs/models/imagesortsettings.cpp b/libs/database/models/imagesortsettings.cpp |
114 |
-similarity index 100% |
115 |
-rename from libs/models/imagesortsettings.cpp |
116 |
-rename to libs/database/models/imagesortsettings.cpp |
117 |
-diff --git a/libs/models/imagesortsettings.h b/libs/database/models/imagesortsettings.h |
118 |
-similarity index 100% |
119 |
-rename from libs/models/imagesortsettings.h |
120 |
-rename to libs/database/models/imagesortsettings.h |
121 |
-diff --git a/libs/models/imagethumbnailmodel.cpp b/libs/database/models/imagethumbnailmodel.cpp |
122 |
-similarity index 100% |
123 |
-rename from libs/models/imagethumbnailmodel.cpp |
124 |
-rename to libs/database/models/imagethumbnailmodel.cpp |
125 |
-diff --git a/libs/models/imagethumbnailmodel.h b/libs/database/models/imagethumbnailmodel.h |
126 |
-similarity index 100% |
127 |
-rename from libs/models/imagethumbnailmodel.h |
128 |
-rename to libs/database/models/imagethumbnailmodel.h |
129 |
-diff --git a/libs/models/imageversionsmodel.cpp b/libs/database/models/imageversionsmodel.cpp |
130 |
-similarity index 100% |
131 |
-rename from libs/models/imageversionsmodel.cpp |
132 |
-rename to libs/database/models/imageversionsmodel.cpp |
133 |
-diff --git a/libs/models/imageversionsmodel.h b/libs/database/models/imageversionsmodel.h |
134 |
-similarity index 100% |
135 |
-rename from libs/models/imageversionsmodel.h |
136 |
-rename to libs/database/models/imageversionsmodel.h |
137 |
-diff --git a/libs/models/CMakeLists.txt b/libs/models/CMakeLists.txt |
138 |
-index cbabfaa9b8..804456b955 100644 |
139 |
---- a/libs/models/CMakeLists.txt |
140 |
-+++ b/libs/models/CMakeLists.txt |
141 |
-@@ -9,18 +9,6 @@ if (POLICY CMP0063) |
142 |
- cmake_policy(SET CMP0063 NEW) |
143 |
- endif (POLICY CMP0063) |
144 |
- |
145 |
--set(libdatabasemodels_SRCS |
146 |
-- imagemodel.cpp |
147 |
-- imagefiltermodel.cpp |
148 |
-- imagefiltermodelpriv.cpp |
149 |
-- imagefiltermodelthreads.cpp |
150 |
-- imagefiltersettings.cpp |
151 |
-- imagelistmodel.cpp |
152 |
-- imagesortsettings.cpp |
153 |
-- imagethumbnailmodel.cpp |
154 |
-- imageversionsmodel.cpp |
155 |
--) |
156 |
-- |
157 |
- set(libalbummodels_SRCS |
158 |
- imagealbummodel.cpp |
159 |
- imagealbumfiltermodel.cpp |
160 |
-@@ -52,5 +40,4 @@ endif() |
161 |
- #for digikam core lib |
162 |
- add_library(digikamgenericmodels_src OBJECT ${libgenericmodels_SRCS}) |
163 |
- |
164 |
--add_library(digikamdatabasemodels_src OBJECT ${libdatabasemodels_SRCS}) |
165 |
--add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS}) |
166 |
-+add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS}) |
167 |
- |
168 |
-From c51043283aa9d2612b88afe0146f0d63c77b08ed Mon Sep 17 00:00:00 2001 |
169 |
-From: Simon Frei <freisim93@×××××.com> |
170 |
-Date: Wed, 2 Aug 2017 12:12:55 +0200 |
171 |
-Subject: cmake: Fix warning: Remove ECMPackageConfigHelpers (unused) |
172 |
- |
173 |
---- |
174 |
- CMakeLists.txt | 1 - |
175 |
- 1 file changed, 1 deletion(-) |
176 |
- |
177 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
178 |
-index 2aaf56b..9a48492 100644 |
179 |
---- a/CMakeLists.txt |
180 |
-+++ b/CMakeLists.txt |
181 |
-@@ -80,7 +80,6 @@ include(ECMAddTests) |
182 |
- include(ECMMarkNonGuiExecutable) |
183 |
- include(ECMGenerateHeaders) |
184 |
- include(ECMGeneratePriFile) |
185 |
--include(ECMPackageConfigHelpers) |
186 |
- include(ECMSetupVersion) |
187 |
- include(ECMInstallIcons) |
188 |
- include(ECMAddAppIcon) |
189 |
--- |
190 |
-cgit v0.11.2 |