[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-loadepg/, media-plugins/vdr-loadepg/files/ - gentoo-commits

From:	"Jörg Bornkessel" <hd_brummy@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-loadepg/, media-plugins/vdr-loadepg/files/
Date:	Fri, 28 Feb 2020 13:36:33
Message-Id:	`1582896942.3fe38f8ba494491c1f70565dcc8319748f648af6.hd_brummy@gentoo`

1

commit:     3fe38f8ba494491c1f70565dcc8319748f648af6

2

Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>

3

AuthorDate: Fri Feb 28 13:35:42 2020 +0000

4

Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>

5

CommitDate: Fri Feb 28 13:35:42 2020 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe38f8b

7

8

media-plugins/vdr-loadepg: version bump

9

10

cleanup old

11

this will

12

13

Closes: https://bugs.gentoo.org/710962

14

Package-Manager: Portage-2.3.84, Repoman-2.3.20

15

Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

16

17

 media-plugins/vdr-loadepg/Manifest                 |  2 +-

18

 ...intf.patch => vdr-loadepg-0.2.7_asprintf.patch} | 50 +++++++++++-----------

19

 ...adepg-0.2.5.ebuild => vdr-loadepg-0.2.7.ebuild} |  9 ++--

20

 3 files changed, 32 insertions(+), 29 deletions(-)

21

22

diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest

23

index a2e18cbd32f..c61c0625e53 100644

24

--- a/media-plugins/vdr-loadepg/Manifest

25

+++ b/media-plugins/vdr-loadepg/Manifest

26

@@ -1 +1 @@

27

-DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb

28

+DIST vdr-loadepg-0.2.7.tgz 55847 BLAKE2B 6bd61ef1af71928b57f4ac964b01df7f66de6dcf8dcb804e62725a204decd7b1440e602ceda5fc01806c42383fe51829419dae4a449c74ae5f9335086e68cb5b SHA512 4bd10c6289e6013afe020476844a2b3f446f6c37e8273316987e1591e0da0e79dbfe00a7667ca8a905b868045fcb32931d5b2b8f8cd14097e6f3246c05b5bc66

29

30

diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch

31

similarity index 54%

32

rename from media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch

33

rename to media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch

34

index c650ff61d7c..92a8b76f8e0 100644

35

--- a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch

36

+++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch

37

@@ -3,58 +3,58 @@ https://bugs.gentoo.org/663348

38

 compile fix for  invalid conversion from char to const char*

39

 thx to Michael Brakemeier for point this out

40

41

-Signed-of-by: Joerg Bornkessel <hd_brummy@×××××××.de> (17 Nov 2019)

42

-diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c

43

---- loadepg-0.2.5.orig/loadepg.c	2019-11-17 14:49:27.637235533 +0100

44

-+++ loadepg-0.2.5/loadepg.c	2019-11-17 14:50:23.690235533 +0100

45

-@@ -159,7 +159,7 @@

46

+Signed-off-by: Joerg Bornkessel <hd_brummy@g.o> (29 Feb 2020)

47

+diff -Naur vdr-loadepg-0.2.7.orig/loadepg.c vdr-loadepg-0.2.7/loadepg.c

48

+--- vdr-loadepg-0.2.7.orig/loadepg.c	2020-02-28 14:08:35.713790460 +0100

49

++++ vdr-loadepg-0.2.7/loadepg.c	2020-02-28 14:11:05.457790460 +0100

50

+@@ -162,7 +162,7 @@

51

              (lProviders + nProviders)->SourceId = cSource::FromString(string2);

52

              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);

53

              asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);

54

--            asprintf(&(lProviders + nProviders)->Parm3, '\0');

55

-+            asprintf(&(lProviders + nProviders)->Parm3, "");

56

+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');

57

++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");

58

              nProviders ++;

59

              IsSkyThemesNull = true;

60

}

61

-@@ -169,8 +169,8 @@

62

+@@ -172,8 +172,8 @@

63

              (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;

64

              (lProviders + nProviders)->SourceId = cSource::FromString(string2);

65

              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);

66

--            asprintf(&(lProviders + nProviders)->Parm2, '\0');

67

--            asprintf(&(lProviders + nProviders)->Parm3, '\0');

68

-+            asprintf(&(lProviders + nProviders)->Parm2, "");

69

-+            asprintf(&(lProviders + nProviders)->Parm3, "");

70

+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');

71

+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');

72

++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");

73

++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");

74

              nProviders ++;

75

}

76

            else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)

77

-@@ -179,8 +179,8 @@

78

+@@ -182,8 +182,8 @@

79

              (lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;

80

              (lProviders + nProviders)->SourceId = cSource::FromString(string2);

81

              asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);

82

--            asprintf(&(lProviders + nProviders)->Parm2, '\0');

83

--            asprintf(&(lProviders + nProviders)->Parm3, '\0');

84

-+            asprintf(&(lProviders + nProviders)->Parm2, "");

85

-+            asprintf(&(lProviders + nProviders)->Parm3, "");

86

+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');

87

+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');

88

++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");

89

++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");

90

              nProviders ++;

91

}

92

            else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)

93

-@@ -189,8 +189,8 @@

94

+@@ -192,8 +192,8 @@

95

              (lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;

96

              (lProviders + nProviders)->SourceId = 0;

97

              asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);

98

--            asprintf(&(lProviders + nProviders)->Parm2, '\0');

99

--            asprintf(&(lProviders + nProviders)->Parm3, '\0');

100

-+            asprintf(&(lProviders + nProviders)->Parm2, "");

101

-+            asprintf(&(lProviders + nProviders)->Parm3, "");

102

+-            asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');

103

+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');

104

++            asprintf(&(lProviders + nProviders)->Parm2, (char *) "");

105

++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");

106

              nProviders ++;

107

}

108

            else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)

109

-@@ -200,7 +200,7 @@

110

+@@ -203,7 +203,7 @@

111

              (lProviders + nProviders)->SourceId = 0;

112

              asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);

113

              asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);

114

--            asprintf(&(lProviders + nProviders)->Parm3, '\0');

115

-+            asprintf(&(lProviders + nProviders)->Parm3, "");

116

+-            asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');

117

++            asprintf(&(lProviders + nProviders)->Parm3, (char *) "");

118

              nProviders ++;

119

}

120

}

121

122

diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild

123

similarity index 76%

124

rename from media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild

125

rename to media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild

126

index 813116671ac..ebf8317197a 100644

127

--- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild

128

+++ b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild

129

@@ -1,4 +1,4 @@

130

-# Copyright 1999-2019 Gentoo Authors

131

+# Copyright 1999-2020 Gentoo Authors

132

 # Distributed under the terms of the GNU General Public License v2

133

134

 EAPI=7

135

@@ -12,19 +12,22 @@ SRC_URI="http://lukkinosat.altervista.org/${P}.tgz"

136

 KEYWORDS="~amd64 ~x86"

137

 SLOT="0"

138

 LICENSE="GPL-2"

139

-IUSE=""

140

141

 DEPEND="media-video/vdr"

142

+RDEPEND="${DEPEND}"

143

+

144

+S="${WORKDIR}/${P}"

145

146

 src_prepare() {

147

 	# remove untranslated po files

148

-	rm "${S}/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po"

149

+	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po

150

151

 	vdr-plugin-2_src_prepare

152

153

 	fix_vdr_libsi_include loadepg.h

154

155

 	eapply "${FILESDIR}/${P}_asprintf.patch"

156

+

157

}

158

159

 src_install() {

1	commit: 3fe38f8ba494491c1f70565dcc8319748f648af6
2	Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
3	AuthorDate: Fri Feb 28 13:35:42 2020 +0000
4	Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
5	CommitDate: Fri Feb 28 13:35:42 2020 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fe38f8b
7
8	media-plugins/vdr-loadepg: version bump
9
10	cleanup old
11	this will
12
13	Closes: https://bugs.gentoo.org/710962
14	Package-Manager: Portage-2.3.84, Repoman-2.3.20
15	Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
16
17	media-plugins/vdr-loadepg/Manifest \| 2 +-
18	...intf.patch => vdr-loadepg-0.2.7_asprintf.patch} \| 50 +++++++++++-----------
19	...adepg-0.2.5.ebuild => vdr-loadepg-0.2.7.ebuild} \| 9 ++--
20	3 files changed, 32 insertions(+), 29 deletions(-)
21
22	diff --git a/media-plugins/vdr-loadepg/Manifest b/media-plugins/vdr-loadepg/Manifest
23	index a2e18cbd32f..c61c0625e53 100644
24	--- a/media-plugins/vdr-loadepg/Manifest
25	+++ b/media-plugins/vdr-loadepg/Manifest
26	@@ -1 +1 @@
27	-DIST vdr-loadepg-0.2.5.tgz 54958 BLAKE2B 42fac197ec3708659665d503c91b1db53268b63f3a11eaab17632a445300cf9566d6bfb0a72ab728ae74df09b1af3f5b27f2298287db8702fa035614cd0d6750 SHA512 193fdd3298a547c4a503f0a64553e28611f3920743c3b224fd5bb3f57b88c4345859e3127e0f7e7aa968b32f1a7f1d5ceed6ce29414cbfe700c1f14efe889adb
28	+DIST vdr-loadepg-0.2.7.tgz 55847 BLAKE2B 6bd61ef1af71928b57f4ac964b01df7f66de6dcf8dcb804e62725a204decd7b1440e602ceda5fc01806c42383fe51829419dae4a449c74ae5f9335086e68cb5b SHA512 4bd10c6289e6013afe020476844a2b3f446f6c37e8273316987e1591e0da0e79dbfe00a7667ca8a905b868045fcb32931d5b2b8f8cd14097e6f3246c05b5bc66
29
30	diff --git a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch
31	similarity index 54%
32	rename from media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
33	rename to media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch
34	index c650ff61d7c..92a8b76f8e0 100644
35	--- a/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.5_asprintf.patch
36	+++ b/media-plugins/vdr-loadepg/files/vdr-loadepg-0.2.7_asprintf.patch
37	@@ -3,58 +3,58 @@ https://bugs.gentoo.org/663348
38	compile fix for invalid conversion from char to const char*
39	thx to Michael Brakemeier for point this out
40
41	-Signed-of-by: Joerg Bornkessel <hd_brummy@×××××××.de> (17 Nov 2019)
42	-diff -Naur loadepg-0.2.5.orig/loadepg.c loadepg-0.2.5/loadepg.c
43	---- loadepg-0.2.5.orig/loadepg.c 2019-11-17 14:49:27.637235533 +0100
44	-+++ loadepg-0.2.5/loadepg.c 2019-11-17 14:50:23.690235533 +0100
45	-@@ -159,7 +159,7 @@
46	+Signed-off-by: Joerg Bornkessel <hd_brummy@g.o> (29 Feb 2020)
47	+diff -Naur vdr-loadepg-0.2.7.orig/loadepg.c vdr-loadepg-0.2.7/loadepg.c
48	+--- vdr-loadepg-0.2.7.orig/loadepg.c 2020-02-28 14:08:35.713790460 +0100
49	++++ vdr-loadepg-0.2.7/loadepg.c 2020-02-28 14:11:05.457790460 +0100
50	+@@ -162,7 +162,7 @@
51	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
52	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
53	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
54	-- asprintf(&(lProviders + nProviders)->Parm3, '\0');
55	-+ asprintf(&(lProviders + nProviders)->Parm3, "");
56	+- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
57	++ asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
58	nProviders ++;
59	IsSkyThemesNull = true;
60	}
61	-@@ -169,8 +169,8 @@
62	+@@ -172,8 +172,8 @@
63	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_1;
64	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
65	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
66	-- asprintf(&(lProviders + nProviders)->Parm2, '\0');
67	-- asprintf(&(lProviders + nProviders)->Parm3, '\0');
68	-+ asprintf(&(lProviders + nProviders)->Parm2, "");
69	-+ asprintf(&(lProviders + nProviders)->Parm3, "");
70	+- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
71	+- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
72	++ asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
73	++ asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
74	nProviders ++;
75	}
76	else if(sscanf(Line, "MHW_2=%[^:] :%i :%c :%[^:] :%i ", string1, &int1, &char1, string2, &int2) == 5)
77	-@@ -179,8 +179,8 @@
78	+@@ -182,8 +182,8 @@
79	(lProviders + nProviders)->DataFormat = DATA_FORMAT_MHW_2;
80	(lProviders + nProviders)->SourceId = cSource::FromString(string2);
81	asprintf(&(lProviders + nProviders)->Parm1, "%i:%c:%s:%i", int1, char1, string2, int2);
82	-- asprintf(&(lProviders + nProviders)->Parm2, '\0');
83	-- asprintf(&(lProviders + nProviders)->Parm3, '\0');
84	-+ asprintf(&(lProviders + nProviders)->Parm2, "");
85	-+ asprintf(&(lProviders + nProviders)->Parm3, "");
86	+- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
87	+- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
88	++ asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
89	++ asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
90	nProviders ++;
91	}
92	else if(sscanf(Line, "FILE=%[^:] :%s ", string1, string2) == 2)
93	-@@ -189,8 +189,8 @@
94	+@@ -192,8 +192,8 @@
95	(lProviders + nProviders)->DataFormat = DATA_FORMAT_FILE;
96	(lProviders + nProviders)->SourceId = 0;
97	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
98	-- asprintf(&(lProviders + nProviders)->Parm2, '\0');
99	-- asprintf(&(lProviders + nProviders)->Parm3, '\0');
100	-+ asprintf(&(lProviders + nProviders)->Parm2, "");
101	-+ asprintf(&(lProviders + nProviders)->Parm3, "");
102	+- asprintf(&(lProviders + nProviders)->Parm2, (char *) '\0');
103	+- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
104	++ asprintf(&(lProviders + nProviders)->Parm2, (char *) "");
105	++ asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
106	nProviders ++;
107	}
108	else if(sscanf(Line, "SCRIPT=%[^:] :%[^:] :%s ", string1, string2, string3) == 3)
109	-@@ -200,7 +200,7 @@
110	+@@ -203,7 +203,7 @@
111	(lProviders + nProviders)->SourceId = 0;
112	asprintf(&(lProviders + nProviders)->Parm1, "%s", string2);
113	asprintf(&(lProviders + nProviders)->Parm2, "%s", string3);
114	-- asprintf(&(lProviders + nProviders)->Parm3, '\0');
115	-+ asprintf(&(lProviders + nProviders)->Parm3, "");
116	+- asprintf(&(lProviders + nProviders)->Parm3, (char *) '\0');
117	++ asprintf(&(lProviders + nProviders)->Parm3, (char *) "");
118	nProviders ++;
119	}
120	}
121
122	diff --git a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild
123	similarity index 76%
124	rename from media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
125	rename to media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild
126	index 813116671ac..ebf8317197a 100644
127	--- a/media-plugins/vdr-loadepg/vdr-loadepg-0.2.5.ebuild
128	+++ b/media-plugins/vdr-loadepg/vdr-loadepg-0.2.7.ebuild
129	@@ -1,4 +1,4 @@
130	-# Copyright 1999-2019 Gentoo Authors
131	+# Copyright 1999-2020 Gentoo Authors
132	# Distributed under the terms of the GNU General Public License v2
133
134	EAPI=7
135	@@ -12,19 +12,22 @@ SRC_URI="http://lukkinosat.altervista.org/${P}.tgz"
136	KEYWORDS="~amd64 ~x86"
137	SLOT="0"
138	LICENSE="GPL-2"
139	-IUSE=""
140
141	DEPEND="media-video/vdr"
142	+RDEPEND="${DEPEND}"
143	+
144	+S="${WORKDIR}/${P}"
145
146	src_prepare() {
147	# remove untranslated po files
148	- rm "${S}/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po"
149	+ rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,et_EE,fr_FR,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
150
151	vdr-plugin-2_src_prepare
152
153	fix_vdr_libsi_include loadepg.h
154
155	eapply "${FILESDIR}/${P}_asprintf.patch"
156	+
157	}
158
159	src_install() {

Gentoo Archives: gentoo-commits