[gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/ - gentoo-commits

From:	Andreas Sturmlechner <asturm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/, kde-apps/okular/
Date:	Wed, 12 Sep 2018 17:03:18
Message-Id:	`1536771770.4b320689d35ef7882a004844400070f26557b458.asturm@gentoo`

1

commit:     4b320689d35ef7882a004844400070f26557b458

2

Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

3

AuthorDate: Wed Sep 12 17:02:50 2018 +0000

4

Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>

5

CommitDate: Wed Sep 12 17:02:50 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b320689

7

8

kde-apps/okular: Drop duplicate patch

9

10

Package-Manager: Portage-2.3.49, Repoman-2.3.10

11

12

 kde-apps/okular/files/okular-tests.patch | 112 -------------------------------

13

 kde-apps/okular/okular-18.04.3-r1.ebuild |   2 +-

14

 kde-apps/okular/okular-18.04.3.ebuild    |   2 +-

15

 3 files changed, 2 insertions(+), 114 deletions(-)

16

17

diff --git a/kde-apps/okular/files/okular-tests.patch b/kde-apps/okular/files/okular-tests.patch

18

deleted file mode 100644

19

index 0e2cdaecd4a..00000000000

20

--- a/kde-apps/okular/files/okular-tests.patch

21

+++ /dev/null

22

@@ -1,112 +0,0 @@

23

-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001

24

-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>

25

-Date: Thu, 12 Oct 2017 14:09:09 +0200

26

-Subject: [PATCH] Move tests into existing (auto)tests subdirectories

27

-

28

----

29

- generators/chm/CMakeLists.txt                 | 12 +++---------

30

- generators/chm/autotests/CMakeLists.txt       |  8 ++++++++

31

- generators/chm/autotests/chmgeneratortest.cpp |  2 +-

32

- generators/kimgio/CMakeLists.txt              |  6 +-----

33

- generators/kimgio/tests/CMakeLists.txt        |  5 +++++

34

- generators/kimgio/tests/kimgiotest.cpp        |  2 +-

35

- 6 files changed, 19 insertions(+), 16 deletions(-)

36

- create mode 100644 generators/chm/autotests/CMakeLists.txt

37

- create mode 100644 generators/kimgio/tests/CMakeLists.txt

38

-

39

-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt

40

-index 9d82b9394..b3a33afe4 100644

41

---- a/generators/chm/CMakeLists.txt

42

-+++ b/generators/chm/CMakeLists.txt

43

-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS

44

- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})

45

- target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)

46

-

47

--########### autotests ###############

48

--

49

--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )

50

--ecm_add_test(autotests/chmgeneratortest.cpp

51

--    TEST_NAME "chmgeneratortest"

52

--    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore

53

--)

54

--

55

--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")

56

-+if(BUILD_TESTING)

57

-+   add_subdirectory(autotests)

58

-+endif()

59

-

60

- ########### install files ###############

61

- install( FILES okularChm.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

62

-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt

63

-new file mode 100644

64

-index 000000000..59753ca45

65

---- /dev/null

66

-+++ b/generators/chm/autotests/CMakeLists.txt

67

-@@ -0,0 +1,8 @@

68

-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )

69

-+

70

-+ecm_add_test(chmgeneratortest.cpp

71

-+    TEST_NAME "chmgeneratortest"

72

-+    LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore

73

-+)

74

-+

75

-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")

76

-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp

77

-index 6b0b8efc7..25fd6631a 100644

78

---- a/generators/chm/autotests/chmgeneratortest.cpp

79

-+++ b/generators/chm/autotests/chmgeneratortest.cpp

80

-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()

81

- {

82

-     Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );

83

-     m_document = new Okular::Document( 0 );

84

--    const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");

85

-+    const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");

86

-     QMimeDatabase db;

87

-     const QMimeType mime = db.mimeTypeForFile( testFile );

88

-     QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess );

89

-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt

90

-index b8cac76df..49f893bc1 100644

91

---- a/generators/kimgio/CMakeLists.txt

92

-+++ b/generators/kimgio/CMakeLists.txt

93

-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)

94

- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)

95

-

96

- if(BUILD_TESTING)

97

--    add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )

98

--    set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )

99

--    ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)

100

--    target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")

101

-+   add_subdirectory(tests)

102

- endif()

103

-

104

--

105

- ########### install files ###############

106

- install( FILES okularKimgio.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

107

- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )

108

-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt

109

-new file mode 100644

110

-index 000000000..f31bf3fe8

111

---- /dev/null

112

-+++ b/generators/kimgio/tests/CMakeLists.txt

113

-@@ -0,0 +1,5 @@

114

-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )

115

-+

116

-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )

117

-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)

118

-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")

119

-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp

120

-index b3039a6bb..78608df9d 100644

121

---- a/generators/kimgio/tests/kimgiotest.cpp

122

-+++ b/generators/kimgio/tests/kimgiotest.cpp

123

-@@ -9,7 +9,7 @@

124

-

125

-

126

- #include "../generator_kimgio.h"

127

--#include "../../settings_core.h"

128

-+#include "../../../settings_core.h"

129

-

130

- #include <core/observer.h>

131

- #include <core/page.h>

132

---

133

-2.14.2

134

-

135

136

diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.04.3-r1.ebuild

137

index 8811b8c2a78..f44e22fdae4 100644

138

--- a/kde-apps/okular/okular-18.04.3-r1.ebuild

139

+++ b/kde-apps/okular/okular-18.04.3-r1.ebuild

140

@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}

141

"

142

143

 PATCHES=(

144

-	"${FILESDIR}/${PN}-tests.patch"

145

+	"${FILESDIR}/${PN}-18.08.0-tests.patch"

146

 	"${FILESDIR}/${P}-path-traversal-issue.patch"

147

)

148

149

150

diff --git a/kde-apps/okular/okular-18.04.3.ebuild b/kde-apps/okular/okular-18.04.3.ebuild

151

index da9ded78a2b..2a5d3374704 100644

152

--- a/kde-apps/okular/okular-18.04.3.ebuild

153

+++ b/kde-apps/okular/okular-18.04.3.ebuild

154

@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}

155

)

156

"

157

158

-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )

159

+PATCHES=( "${FILESDIR}/${PN}-18.08.0-tests.patch" )

160

161

 src_prepare() {

162

 	kde5_src_prepare

1	commit: 4b320689d35ef7882a004844400070f26557b458
2	Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3	AuthorDate: Wed Sep 12 17:02:50 2018 +0000
4	Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5	CommitDate: Wed Sep 12 17:02:50 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b320689
7
8	kde-apps/okular: Drop duplicate patch
9
10	Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12	kde-apps/okular/files/okular-tests.patch \| 112 -------------------------------
13	kde-apps/okular/okular-18.04.3-r1.ebuild \| 2 +-
14	kde-apps/okular/okular-18.04.3.ebuild \| 2 +-
15	3 files changed, 2 insertions(+), 114 deletions(-)
16
17	diff --git a/kde-apps/okular/files/okular-tests.patch b/kde-apps/okular/files/okular-tests.patch
18	deleted file mode 100644
19	index 0e2cdaecd4a..00000000000
20	--- a/kde-apps/okular/files/okular-tests.patch
21	+++ /dev/null
22	@@ -1,112 +0,0 @@
23	-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
24	-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
25	-Date: Thu, 12 Oct 2017 14:09:09 +0200
26	-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
27	-
28	----
29	- generators/chm/CMakeLists.txt \| 12 +++---------
30	- generators/chm/autotests/CMakeLists.txt \| 8 ++++++++
31	- generators/chm/autotests/chmgeneratortest.cpp \| 2 +-
32	- generators/kimgio/CMakeLists.txt \| 6 +-----
33	- generators/kimgio/tests/CMakeLists.txt \| 5 +++++
34	- generators/kimgio/tests/kimgiotest.cpp \| 2 +-
35	- 6 files changed, 19 insertions(+), 16 deletions(-)
36	- create mode 100644 generators/chm/autotests/CMakeLists.txt
37	- create mode 100644 generators/kimgio/tests/CMakeLists.txt
38	-
39	-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
40	-index 9d82b9394..b3a33afe4 100644
41	---- a/generators/chm/CMakeLists.txt
42	-+++ b/generators/chm/CMakeLists.txt
43	-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
44	- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
45	- target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
46	-
47	--########### autotests ###############
48	--
49	--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
50	--ecm_add_test(autotests/chmgeneratortest.cpp
51	-- TEST_NAME "chmgeneratortest"
52	-- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
53	--)
54	--
55	--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
56	-+if(BUILD_TESTING)
57	-+ add_subdirectory(autotests)
58	-+endif()
59	-
60	- ########### install files ###############
61	- install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
62	-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
63	-new file mode 100644
64	-index 000000000..59753ca45
65	---- /dev/null
66	-+++ b/generators/chm/autotests/CMakeLists.txt
67	-@@ -0,0 +1,8 @@
68	-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
69	-+
70	-+ecm_add_test(chmgeneratortest.cpp
71	-+ TEST_NAME "chmgeneratortest"
72	-+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
73	-+)
74	-+
75	-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
76	-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
77	-index 6b0b8efc7..25fd6631a 100644
78	---- a/generators/chm/autotests/chmgeneratortest.cpp
79	-+++ b/generators/chm/autotests/chmgeneratortest.cpp
80	-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
81	- {
82	- Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
83	- m_document = new Okular::Document( 0 );
84	-- const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
85	-+ const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
86	- QMimeDatabase db;
87	- const QMimeType mime = db.mimeTypeForFile( testFile );
88	- QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess );
89	-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
90	-index b8cac76df..49f893bc1 100644
91	---- a/generators/kimgio/CMakeLists.txt
92	-+++ b/generators/kimgio/CMakeLists.txt
93	-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
94	- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
95	-
96	- if(BUILD_TESTING)
97	-- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
98	-- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
99	-- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
100	-- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
101	-+ add_subdirectory(tests)
102	- endif()
103	-
104	--
105	- ########### install files ###############
106	- install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
107	- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
108	-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
109	-new file mode 100644
110	-index 000000000..f31bf3fe8
111	---- /dev/null
112	-+++ b/generators/kimgio/tests/CMakeLists.txt
113	-@@ -0,0 +1,5 @@
114	-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
115	-+
116	-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
117	-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
118	-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
119	-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
120	-index b3039a6bb..78608df9d 100644
121	---- a/generators/kimgio/tests/kimgiotest.cpp
122	-+++ b/generators/kimgio/tests/kimgiotest.cpp
123	-@@ -9,7 +9,7 @@
124	-
125	-
126	- #include "../generator_kimgio.h"
127	--#include "../../settings_core.h"
128	-+#include "../../../settings_core.h"
129	-
130	- #include <core/observer.h>
131	- #include <core/page.h>
132	---
133	-2.14.2
134	-
135
136	diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.04.3-r1.ebuild
137	index 8811b8c2a78..f44e22fdae4 100644
138	--- a/kde-apps/okular/okular-18.04.3-r1.ebuild
139	+++ b/kde-apps/okular/okular-18.04.3-r1.ebuild
140	@@ -65,7 +65,7 @@ RDEPEND="${DEPEND}
141	"
142
143	PATCHES=(
144	- "${FILESDIR}/${PN}-tests.patch"
145	+ "${FILESDIR}/${PN}-18.08.0-tests.patch"
146	"${FILESDIR}/${P}-path-traversal-issue.patch"
147	)
148
149
150	diff --git a/kde-apps/okular/okular-18.04.3.ebuild b/kde-apps/okular/okular-18.04.3.ebuild
151	index da9ded78a2b..2a5d3374704 100644
152	--- a/kde-apps/okular/okular-18.04.3.ebuild
153	+++ b/kde-apps/okular/okular-18.04.3.ebuild
154	@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
155	)
156	"
157
158	-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
159	+PATCHES=( "${FILESDIR}/${PN}-18.08.0-tests.patch" )
160
161	src_prepare() {
162	kde5_src_prepare

Gentoo Archives: gentoo-commits