[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/ - gentoo-commits

From:	Jeroen Roovers <jer@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: x11-libs/fltk/, x11-libs/fltk/files/
Date:	Fri, 15 Nov 2019 22:21:20
Message-Id:	`1573856471.2abc8d0bb878cfa6804571de88b8b0c28e79fb99.jer@gentoo`

1

commit:     2abc8d0bb878cfa6804571de88b8b0c28e79fb99

2

Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

3

AuthorDate: Fri Nov 15 22:20:37 2019 +0000

4

Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>

5

CommitDate: Fri Nov 15 22:21:11 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abc8d0b

7

8

x11-libs/fltk: Maybe fix FLTK_INCLUDE_DIRS in cmake files

9

10

Package-Manager: Portage-2.3.79, Repoman-2.3.18

11

Bug: https://bugs.gentoo.org/show_bug.cgi?id=462776

12

Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

13

14

 x11-libs/fltk/files/fltk-1.3.5-cmake.patch         | 33 ++++++++++++++++++++++

15

 x11-libs/fltk/files/fltk-1.3.5-optim.patch         | 11 ++++++++

16

 .../{fltk-1.3.5-r3.ebuild => fltk-1.3.5-r4.ebuild} |  6 ++--

17

 x11-libs/fltk/fltk-1.3.9999.ebuild                 |  6 ++--

18

 x11-libs/fltk/fltk-1.4.9999.ebuild                 |  6 ++--

19

 5 files changed, 50 insertions(+), 12 deletions(-)

20

21

diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch

22

new file mode 100644

23

index 00000000000..1eac250248d

24

--- /dev/null

25

+++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch

26

@@ -0,0 +1,33 @@

27

+--- a/configure.ac

28

++++ b/configure.ac

29

+@@ -57,6 +57,7 @@

30

+ FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}

31

+ FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0

32

+ FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}

33

++FLTK_VERSION_FULL=${FL_VERSION}

34

+

35

+ AC_SUBST(FL_MAJOR_VERSION)

36

+ AC_SUBST(FL_MINOR_VERSION)

37

+@@ -64,6 +65,7 @@

38

+ AC_SUBST(FL_DSO_VERSION)

39

+ AC_SUBST(FL_ABI_VERSION)

40

+ AC_SUBST(FL_VERSION)

41

++AC_SUBST(FLTK_VERSION_FULL)

42

+

43

+ AC_SUBST(ARCHFLAGS)

44

+ AC_SUBST(OPTIM)

45

+@@ -1576,10 +1578,13 @@

46

+ BINARY_DIR=

47

+ AC_SUBST(BINARY_DIR)

48

+

49

++INCLUDE_DIRS="${includedir}"

50

++AC_SUBST(INCLUDE_DIRS)

51

++

52

+ dnl Write all of the files...

53

+ AC_CONFIG_HEADER(config.h:configh.in)

54

+ AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)

55

+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])

56

++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])

57

+ AC_OUTPUT

58

+

59

+ dnl Make sure the fltk-config script is executable...

60

61

diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch

62

new file mode 100644

63

index 00000000000..4d1512d749d

64

--- /dev/null

65

+++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch

66

@@ -0,0 +1,11 @@

67

+--- a/configure.ac

68

++++ b/configure.ac

69

+@@ -1265,7 +1265,7 @@

70

+ 	if test "x$with_optim" != x; then

71

+ 	    OPTIM="$with_optim $OPTIM"

72

+ 	else

73

+-	    OPTIM="-Os $OPTIM"

74

++	    OPTIM=" $OPTIM"

75

+ 	fi

76

+     fi

77

+

78

79

diff --git a/x11-libs/fltk/fltk-1.3.5-r3.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild

80

similarity index 96%

81

rename from x11-libs/fltk/fltk-1.3.5-r3.ebuild

82

rename to x11-libs/fltk/fltk-1.3.5-r4.ebuild

83

index f7f98303c4b..7af2106929b 100644

84

--- a/x11-libs/fltk/fltk-1.3.5-r3.ebuild

85

+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild

86

@@ -63,6 +63,8 @@ PATCHES=(

87

 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch

88

 	"${FILESDIR}"/${PN}-1.3.3-visibility.patch

89

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

90

+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch

91

+	"${FILESDIR}"/${PN}-1.3.5-optim.patch

92

)

93

94

 src_prepare() {

95

@@ -77,10 +79,6 @@ src_prepare() {

96

 		-e "/^docdir/s:fltk:${PF}/html:" \

97

 		-e "/SILENT:/d" \

98

 		makeinclude.in || die

99

-	sed -e "s/7/${PV}/" \

100

-		< "${FILESDIR}"/FLTKConfig.cmake \

101

-		> CMake/FLTKConfig.cmake || die

102

-	sed -e 's:-Os::g' -i configure.ac || die

103

104

 	# also in Makefile:config.guess config.sub:

105

 	cp misc/config.{guess,sub} . || die

106

107

diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild

108

index 66dbf39fd1a..f8b095c4b45 100644

109

--- a/x11-libs/fltk/fltk-1.3.9999.ebuild

110

+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild

111

@@ -63,6 +63,8 @@ PATCHES=(

112

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

113

 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch

114

 	"${FILESDIR}"/${PN}-1.3.3-visibility.patch

115

+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch

116

+	"${FILESDIR}"/${PN}-1.3.5-optim.patch

117

)

118

119

 pkg_setup() {

120

@@ -87,10 +89,6 @@ src_prepare() {

121

 		-e "/^docdir/s:fltk:${PF}/html:" \

122

 		-e "/SILENT:/d" \

123

 		makeinclude.in || die

124

-	sed -e "s/7/${PV}/" \

125

-		< "${FILESDIR}"/FLTKConfig.cmake \

126

-		> CMake/FLTKConfig.cmake || die

127

-	sed -e 's:-Os::g' -i configure.ac || die

128

129

 	# also in Makefile:config.guess config.sub:

130

 	cp misc/config.{guess,sub} . || die

131

132

diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild

133

index d18d64075f1..7940dc7b3ef 100644

134

--- a/x11-libs/fltk/fltk-1.4.9999.ebuild

135

+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild

136

@@ -67,6 +67,8 @@ PATCHES=(

137

 	"${FILESDIR}"/${PN}-1.3.0-share.patch

138

 	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch

139

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

140

+	"${FILESDIR}"/${PN}-1.3.5-cmake.patch

141

+	"${FILESDIR}"/${PN}-1.3.5-optim.patch

142

)

143

144

 pkg_setup() {

145

@@ -91,10 +93,6 @@ src_prepare() {

146

 		-e "/^docdir/s:fltk:${PF}/html:" \

147

 		-e "/SILENT:/d" \

148

 		makeinclude.in || die

149

-	sed -e "s/7/${PV}/" \

150

-		< "${FILESDIR}"/FLTKConfig.cmake \

151

-		> CMake/FLTKConfig.cmake || die

152

-	sed -e 's:-Os::g' -i configure.ac || die

153

154

 	# also in Makefile:config.guess config.sub:

155

 	cp misc/config.{guess,sub} . || die

1	commit: 2abc8d0bb878cfa6804571de88b8b0c28e79fb99
2	Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3	AuthorDate: Fri Nov 15 22:20:37 2019 +0000
4	Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5	CommitDate: Fri Nov 15 22:21:11 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abc8d0b
7
8	x11-libs/fltk: Maybe fix FLTK_INCLUDE_DIRS in cmake files
9
10	Package-Manager: Portage-2.3.79, Repoman-2.3.18
11	Bug: https://bugs.gentoo.org/show_bug.cgi?id=462776
12	Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14	x11-libs/fltk/files/fltk-1.3.5-cmake.patch \| 33 ++++++++++++++++++++++
15	x11-libs/fltk/files/fltk-1.3.5-optim.patch \| 11 ++++++++
16	.../{fltk-1.3.5-r3.ebuild => fltk-1.3.5-r4.ebuild} \| 6 ++--
17	x11-libs/fltk/fltk-1.3.9999.ebuild \| 6 ++--
18	x11-libs/fltk/fltk-1.4.9999.ebuild \| 6 ++--
19	5 files changed, 50 insertions(+), 12 deletions(-)
20
21	diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
22	new file mode 100644
23	index 00000000000..1eac250248d
24	--- /dev/null
25	+++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
26	@@ -0,0 +1,33 @@
27	+--- a/configure.ac
28	++++ b/configure.ac
29	+@@ -57,6 +57,7 @@
30	+ FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
31	+ FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
32	+ FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
33	++FLTK_VERSION_FULL=${FL_VERSION}
34	+
35	+ AC_SUBST(FL_MAJOR_VERSION)
36	+ AC_SUBST(FL_MINOR_VERSION)
37	+@@ -64,6 +65,7 @@
38	+ AC_SUBST(FL_DSO_VERSION)
39	+ AC_SUBST(FL_ABI_VERSION)
40	+ AC_SUBST(FL_VERSION)
41	++AC_SUBST(FLTK_VERSION_FULL)
42	+
43	+ AC_SUBST(ARCHFLAGS)
44	+ AC_SUBST(OPTIM)
45	+@@ -1576,10 +1578,13 @@
46	+ BINARY_DIR=
47	+ AC_SUBST(BINARY_DIR)
48	+
49	++INCLUDE_DIRS="${includedir}"
50	++AC_SUBST(INCLUDE_DIRS)
51	++
52	+ dnl Write all of the files...
53	+ AC_CONFIG_HEADER(config.h:configh.in)
54	+ AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)
55	+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
56	++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
57	+ AC_OUTPUT
58	+
59	+ dnl Make sure the fltk-config script is executable...
60
61	diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
62	new file mode 100644
63	index 00000000000..4d1512d749d
64	--- /dev/null
65	+++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
66	@@ -0,0 +1,11 @@
67	+--- a/configure.ac
68	++++ b/configure.ac
69	+@@ -1265,7 +1265,7 @@
70	+ if test "x$with_optim" != x; then
71	+ OPTIM="$with_optim $OPTIM"
72	+ else
73	+- OPTIM="-Os $OPTIM"
74	++ OPTIM=" $OPTIM"
75	+ fi
76	+ fi
77	+
78
79	diff --git a/x11-libs/fltk/fltk-1.3.5-r3.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
80	similarity index 96%
81	rename from x11-libs/fltk/fltk-1.3.5-r3.ebuild
82	rename to x11-libs/fltk/fltk-1.3.5-r4.ebuild
83	index f7f98303c4b..7af2106929b 100644
84	--- a/x11-libs/fltk/fltk-1.3.5-r3.ebuild
85	+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
86	@@ -63,6 +63,8 @@ PATCHES=(
87	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
88	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
89	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
90	+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
91	+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
92	)
93
94	src_prepare() {
95	@@ -77,10 +79,6 @@ src_prepare() {
96	-e "/^docdir/s:fltk:${PF}/html:" \
97	-e "/SILENT:/d" \
98	makeinclude.in \|\| die
99	- sed -e "s/7/${PV}/" \
100	- < "${FILESDIR}"/FLTKConfig.cmake \
101	- > CMake/FLTKConfig.cmake \|\| die
102	- sed -e 's:-Os::g' -i configure.ac \|\| die
103
104	# also in Makefile:config.guess config.sub:
105	cp misc/config.{guess,sub} . \|\| die
106
107	diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
108	index 66dbf39fd1a..f8b095c4b45 100644
109	--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
110	+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
111	@@ -63,6 +63,8 @@ PATCHES=(
112	"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
113	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
114	"${FILESDIR}"/${PN}-1.3.3-visibility.patch
115	+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
116	+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
117	)
118
119	pkg_setup() {
120	@@ -87,10 +89,6 @@ src_prepare() {
121	-e "/^docdir/s:fltk:${PF}/html:" \
122	-e "/SILENT:/d" \
123	makeinclude.in \|\| die
124	- sed -e "s/7/${PV}/" \
125	- < "${FILESDIR}"/FLTKConfig.cmake \
126	- > CMake/FLTKConfig.cmake \|\| die
127	- sed -e 's:-Os::g' -i configure.ac \|\| die
128
129	# also in Makefile:config.guess config.sub:
130	cp misc/config.{guess,sub} . \|\| die
131
132	diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
133	index d18d64075f1..7940dc7b3ef 100644
134	--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
135	+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
136	@@ -67,6 +67,8 @@ PATCHES=(
137	"${FILESDIR}"/${PN}-1.3.0-share.patch
138	"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
139	"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
140	+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
141	+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
142	)
143
144	pkg_setup() {
145	@@ -91,10 +93,6 @@ src_prepare() {
146	-e "/^docdir/s:fltk:${PF}/html:" \
147	-e "/SILENT:/d" \
148	makeinclude.in \|\| die
149	- sed -e "s/7/${PV}/" \
150	- < "${FILESDIR}"/FLTKConfig.cmake \
151	- > CMake/FLTKConfig.cmake \|\| die
152	- sed -e 's:-Os::g' -i configure.ac \|\| die
153
154	# also in Makefile:config.guess config.sub:
155	cp misc/config.{guess,sub} . \|\| die

Gentoo Archives: gentoo-commits