Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kde-gtk-config/, kde-plasma/kde-gtk-config/files/
Date: Tue, 06 Oct 2015 10:58:38
Message-Id: 1444129098.17da4ae478249970aa074219d754d45925cad6a1.kensington@gentoo
1 commit: 17da4ae478249970aa074219d754d45925cad6a1
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Fri Oct 2 22:22:55 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 6 10:58:18 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=17da4ae4
7
8 kde-plasma/kde-gtk-config: Make gtk+3 optional
9
10 gtk3proxies depends on a ui file from gtkproxies, so gtk+2 is kept unconditionally.
11
12 Package-Manager: portage-2.2.20.1
13
14 .../files/kde-gtk-config-5.4.2-gtk3-optional.patch | 19 +++++++++++++++++++
15 kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild | 6 +++++-
16 .../kde-gtk-config/kde-gtk-config-5.4.49.9999.ebuild | 6 +++++-
17 kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild | 6 +++++-
18 kde-plasma/kde-gtk-config/metadata.xml | 3 +++
19 5 files changed, 37 insertions(+), 3 deletions(-)
20
21 diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
22 new file mode 100644
23 index 0000000..e1e8de2
24 --- /dev/null
25 +++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.4.2-gtk3-optional.patch
26 @@ -0,0 +1,19 @@
27 +--- a/CMakeLists.txt 2015-10-02 22:36:55.186480671 +0200
28 ++++ b/CMakeLists.txt 2015-10-02 22:38:40.048169719 +0200
29 +@@ -17,6 +17,7 @@
30 + include(ECMSetupVersion)
31 + include(ECMInstallIcons)
32 + include(ECMMarkAsTest)
33 ++include(ECMOptionalAddSubdirectory)
34 + include(GenerateExportHeader)
35 + include(FeatureSummary)
36 + include(KDEInstallDirs)
37 +@@ -62,7 +63,7 @@
38 + install(FILES kde-gtk-config.desktop DESTINATION ${SERVICES_INSTALL_DIR})
39 +
40 + add_subdirectory(gtkproxies)
41 +-add_subdirectory(gtk3proxies)
42 ++ecm_optional_add_subdirectory(gtk3proxies)
43 + add_subdirectory(icons)
44 + add_subdirectory(tests)
45 +
46
47 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
48 index 6fc2840..fc00913 100644
49 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
50 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.2.ebuild
51 @@ -11,6 +11,7 @@ DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
52 HOMEPAGE="https://projects.kde.org/kde-gtk-config"
53 LICENSE="GPL-3"
54 KEYWORDS="~amd64 ~x86"
55 +IUSE="+gtk3"
56
57 DEPEND="
58 $(add_frameworks_dep karchive)
59 @@ -26,7 +27,7 @@ DEPEND="
60 dev-qt/qtgui:5
61 dev-qt/qtwidgets:5
62 x11-libs/gtk+:2
63 - x11-libs/gtk+:3
64 + gtk3? ( x11-libs/gtk+:3 )
65 "
66 RDEPEND="${DEPEND}
67 $(add_plasma_dep kde-cli-tools)
68 @@ -34,9 +35,12 @@ RDEPEND="${DEPEND}
69 !kde-misc/kde-gtk-config
70 "
71
72 +PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
73 +
74 src_configure() {
75 local mycmakeargs=(
76 -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
77 + -DBUILD_gtk3proxies=$(usex gtk3)
78 )
79
80 kde5_src_configure
81
82 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.49.9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.49.9999.ebuild
83 index 329048d..365514e 100644
84 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.49.9999.ebuild
85 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.4.49.9999.ebuild
86 @@ -11,6 +11,7 @@ DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
87 HOMEPAGE="https://projects.kde.org/kde-gtk-config"
88 LICENSE="GPL-3"
89 KEYWORDS=""
90 +IUSE="+gtk3"
91
92 DEPEND="
93 $(add_frameworks_dep karchive)
94 @@ -26,7 +27,7 @@ DEPEND="
95 dev-qt/qtgui:5
96 dev-qt/qtwidgets:5
97 x11-libs/gtk+:2
98 - x11-libs/gtk+:3
99 + gtk3? ( x11-libs/gtk+:3 )
100 "
101 RDEPEND="${DEPEND}
102 $(add_plasma_dep kde-cli-tools)
103 @@ -34,9 +35,12 @@ RDEPEND="${DEPEND}
104 !kde-misc/kde-gtk-config
105 "
106
107 +PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
108 +
109 src_configure() {
110 local mycmakeargs=(
111 -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
112 + -DBUILD_gtk3proxies=$(usex gtk3)
113 )
114
115 kde5_src_configure
116
117 diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
118 index 329048d..365514e 100644
119 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
120 +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild
121 @@ -11,6 +11,7 @@ DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
122 HOMEPAGE="https://projects.kde.org/kde-gtk-config"
123 LICENSE="GPL-3"
124 KEYWORDS=""
125 +IUSE="+gtk3"
126
127 DEPEND="
128 $(add_frameworks_dep karchive)
129 @@ -26,7 +27,7 @@ DEPEND="
130 dev-qt/qtgui:5
131 dev-qt/qtwidgets:5
132 x11-libs/gtk+:2
133 - x11-libs/gtk+:3
134 + gtk3? ( x11-libs/gtk+:3 )
135 "
136 RDEPEND="${DEPEND}
137 $(add_plasma_dep kde-cli-tools)
138 @@ -34,9 +35,12 @@ RDEPEND="${DEPEND}
139 !kde-misc/kde-gtk-config
140 "
141
142 +PATCHES=( "${FILESDIR}/${PN}-5.4.2-gtk3-optional.patch" )
143 +
144 src_configure() {
145 local mycmakeargs=(
146 -DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
147 + -DBUILD_gtk3proxies=$(usex gtk3)
148 )
149
150 kde5_src_configure
151
152 diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml
153 index a23f444..b277fb6 100644
154 --- a/kde-plasma/kde-gtk-config/metadata.xml
155 +++ b/kde-plasma/kde-gtk-config/metadata.xml
156 @@ -2,4 +2,7 @@
157 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
158 <pkgmetadata>
159 <herd>kde</herd>
160 + <use>
161 + <flag name="gtk3">Add support for gtk+3-based applications.</flag>
162 + </use>
163 </pkgmetadata>
Report Message
Find on MARC Find on Google Groups