[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/ - gentoo-commits

From:	Mart Raudsepp <leio@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/
Date:	Thu, 26 Feb 2015 13:25:20
Message-Id:	`1424372441.04737016b2424d5fce9e420f73db5ce749ecba6f.leio@gentoo`

1

commit:     04737016b2424d5fce9e420f73db5ce749ecba6f

2

Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>

3

AuthorDate: Thu Feb 19 19:00:41 2015 +0000

4

Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>

5

CommitDate: Thu Feb 19 19:00:41 2015 +0000

6

URL:        http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=04737016

7

8

gtk+:2 - sync with portage

9

10

---

11

 x11-libs/gtk+/Manifest                             |  2 +-

12

 ...{gtk+-2.24.25-r1.ebuild => gtk+-2.24.26.ebuild} | 26 +++++++++++-----------

13

 2 files changed, 14 insertions(+), 14 deletions(-)

14

15

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest

16

index 5b2910b..311da31 100644

17

--- a/x11-libs/gtk+/Manifest

18

+++ b/x11-libs/gtk+/Manifest

19

@@ -1,2 +1,2 @@

20

-DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3

21

+DIST gtk+-2.24.26.tar.xz 13328708 SHA256 d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d WHIRLPOOL b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244

22

 DIST gtk+-3.14.8.tar.xz 15689624 SHA256 7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240 WHIRLPOOL 115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f

23

24

diff --git a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.26.ebuild

25

similarity index 90%

26

rename from x11-libs/gtk+/gtk+-2.24.25-r1.ebuild

27

rename to x11-libs/gtk+/gtk+-2.24.26.ebuild

28

index fcbae00..2f231e1 100644

29

--- a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild

30

+++ b/x11-libs/gtk+/gtk+-2.24.26.ebuild

31

@@ -1,9 +1,10 @@

32

 # Copyright 1999-2015 Gentoo Foundation

33

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

34

-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild,v 1.2 2015/01/19 10:44:02 jer Exp $

35

+# $Header: $

36

37

 EAPI="5"

38

-GCONF_DEBUG="no"

39

+GCONF_DEBUG="yes"

40

+GNOME2_LA_PUNT="yes"

41

42

 inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal

43

44

@@ -12,12 +13,12 @@ HOMEPAGE="http://www.gtk.org/"

45

46

 LICENSE="LGPL-2+"

47

 SLOT="2"

48

-IUSE="aqua cups debug examples gtk3-only +introspection test vim-syntax xinerama"

49

+IUSE="aqua cups examples gtk3-only +introspection test vim-syntax xinerama"

50

 REQUIRED_USE="

51

 	xinerama? ( !aqua )

52

"

53

54

-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

55

+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

56

57

 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)

58

 COMMON_DEPEND="

59

@@ -103,20 +104,21 @@ set_gtk2_confdir() {

60

61

 src_prepare() {

62

 	# Fix building due to moved definition, upstream bug #704766

63

-	epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch

64

+	# Upstream says it was fixed with a different commit

65

+#	epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch

66

67

-	# Fix tests running when building out of sources, bug #510596

68

+	# Fix tests running when building out of sources, bug #510596, upstream bug #730319

69

 	epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch

70

71

-	# marshalers code was pre-generated with glib-2.31, upstream bug #671763

72

+	# marshalers code was pre-generated with glib-2.31, upstream bug #662109

73

 	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \

74

 		perf/marshalers.c || die

75

76

-	# Stop trying to build unmaintained docs, bug #349754

77

+	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150

78

 	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}

79

 	strip_builddir SUBDIRS faq docs/Makefile.{am,in}

80

81

-	# -O3 and company cause random crashes in applications. Bug #133469

82

+	# -O3 and company cause random crashes in applications, bug #133469

83

 	replace-flags -O3 -O2

84

 	strip-flags

85

86

@@ -141,8 +143,8 @@ src_prepare() {

87

88

 		# Skip tests known to fail

89

 		# https://bugzilla.gnome.org/show_bug.cgi?id=646609

90

-		sed -e '/g_test_add_func.*test_text_access/s:^://:' \

91

-			-i "${S}/gtk/tests/testing.c" || die

92

+#		sed -e '/g_test_add_func.*test_text_access/s:^://:' \

93

+#			-i "${S}/gtk/tests/testing.c" || die

94

95

 		# https://bugzilla.gnome.org/show_bug.cgi?id=617473

96

 		sed -i -e 's:pltcheck.sh:$(NULL):g' \

97

@@ -172,12 +174,10 @@ src_prepare() {

98

 multilib_src_configure() {

99

 	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc

100

101

-	# Passing --disable-debug is not recommended for production use

102

 	ECONF_SOURCE=${S} \

103

 	gnome2_src_configure \

104

 		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \

105

 		$(usex aqua "" --with-xinput) \

106

-		$(usex debug --enable-debug=yes "") \

107

 		$(use_enable cups cups auto) \

108

 		$(multilib_native_use_enable introspection) \

109

 		$(use_enable xinerama) \

1	commit: 04737016b2424d5fce9e420f73db5ce749ecba6f
2	Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3	AuthorDate: Thu Feb 19 19:00:41 2015 +0000
4	Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5	CommitDate: Thu Feb 19 19:00:41 2015 +0000
6	URL: http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=04737016
7
8	gtk+:2 - sync with portage
9
10	---
11	x11-libs/gtk+/Manifest \| 2 +-
12	...{gtk+-2.24.25-r1.ebuild => gtk+-2.24.26.ebuild} \| 26 +++++++++++-----------
13	2 files changed, 14 insertions(+), 14 deletions(-)
14
15	diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
16	index 5b2910b..311da31 100644
17	--- a/x11-libs/gtk+/Manifest
18	+++ b/x11-libs/gtk+/Manifest
19	@@ -1,2 +1,2 @@
20	-DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
21	+DIST gtk+-2.24.26.tar.xz 13328708 SHA256 d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d WHIRLPOOL b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
22	DIST gtk+-3.14.8.tar.xz 15689624 SHA256 7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240 WHIRLPOOL 115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f
23
24	diff --git a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.26.ebuild
25	similarity index 90%
26	rename from x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
27	rename to x11-libs/gtk+/gtk+-2.24.26.ebuild
28	index fcbae00..2f231e1 100644
29	--- a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
30	+++ b/x11-libs/gtk+/gtk+-2.24.26.ebuild
31	@@ -1,9 +1,10 @@
32	# Copyright 1999-2015 Gentoo Foundation
33	# Distributed under the terms of the GNU General Public License v2
34	-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild,v 1.2 2015/01/19 10:44:02 jer Exp $
35	+# $Header: $
36
37	EAPI="5"
38	-GCONF_DEBUG="no"
39	+GCONF_DEBUG="yes"
40	+GNOME2_LA_PUNT="yes"
41
42	inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
43
44	@@ -12,12 +13,12 @@ HOMEPAGE="http://www.gtk.org/"
45
46	LICENSE="LGPL-2+"
47	SLOT="2"
48	-IUSE="aqua cups debug examples gtk3-only +introspection test vim-syntax xinerama"
49	+IUSE="aqua cups examples gtk3-only +introspection test vim-syntax xinerama"
50	REQUIRED_USE="
51	xinerama? ( !aqua )
52	"
53
54	-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
55	+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
56
57	# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
58	COMMON_DEPEND="
59	@@ -103,20 +104,21 @@ set_gtk2_confdir() {
60
61	src_prepare() {
62	# Fix building due to moved definition, upstream bug #704766
63	- epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
64	+ # Upstream says it was fixed with a different commit
65	+# epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
66
67	- # Fix tests running when building out of sources, bug #510596
68	+ # Fix tests running when building out of sources, bug #510596, upstream bug #730319
69	epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
70
71	- # marshalers code was pre-generated with glib-2.31, upstream bug #671763
72	+ # marshalers code was pre-generated with glib-2.31, upstream bug #662109
73	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
74	perf/marshalers.c \|\| die
75
76	- # Stop trying to build unmaintained docs, bug #349754
77	+ # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
78	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
79	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
80
81	- # -O3 and company cause random crashes in applications. Bug #133469
82	+ # -O3 and company cause random crashes in applications, bug #133469
83	replace-flags -O3 -O2
84	strip-flags
85
86	@@ -141,8 +143,8 @@ src_prepare() {
87
88	# Skip tests known to fail
89	# https://bugzilla.gnome.org/show_bug.cgi?id=646609
90	- sed -e '/g_test_add_func.*test_text_access/s:^://:' \
91	- -i "${S}/gtk/tests/testing.c" \|\| die
92	+# sed -e '/g_test_add_func.*test_text_access/s:^://:' \
93	+# -i "${S}/gtk/tests/testing.c" \|\| die
94
95	# https://bugzilla.gnome.org/show_bug.cgi?id=617473
96	sed -i -e 's:pltcheck.sh:$(NULL):g' \
97	@@ -172,12 +174,10 @@ src_prepare() {
98	multilib_src_configure() {
99	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
100
101	- # Passing --disable-debug is not recommended for production use
102	ECONF_SOURCE=${S} \
103	gnome2_src_configure \
104	$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
105	$(usex aqua "" --with-xinput) \
106	- $(usex debug --enable-debug=yes "") \
107	$(use_enable cups cups auto) \
108	$(multilib_native_use_enable introspection) \
109	$(use_enable xinerama) \

Gentoo Archives: gentoo-commits