Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/xembed-sni-proxy/, kde-plasma/xembed-sni-proxy/files/
Date: Mon, 22 Oct 2018 20:52:31
Message-Id: 1540239827.1434fbc3845d6d53613591451a997afbbd7d979e.asturm@gentoo
1 commit: 1434fbc3845d6d53613591451a997afbbd7d979e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 22 20:01:26 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 20:23:47 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1434fbc3
7
8 kde-plasma/xembed-sni-proxy: New package (split from plasma-workspace)
9
10 Initial ebuild and patch by Mykyta Holubakha, ported to kde5 and improved
11 patch by me. Optional runtime binary only, no change for revdeps.
12
13 Acked-by: Mykyta Holubakha <hilobakho <AT> gmail.com>
14 Bug: https://bugs.gentoo.org/669314
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16 Package-Manager: Portage-2.3.51, Repoman-2.3.11
17
18 .../files/xembed-sni-proxy-5.14.2-standalone.patch | 59 ++++++++++++++++++++++
19 kde-plasma/xembed-sni-proxy/metadata.xml | 8 +++
20 .../xembed-sni-proxy-5.14.49.9999.ebuild | 42 +++++++++++++++
21 .../xembed-sni-proxy/xembed-sni-proxy-9999.ebuild | 42 +++++++++++++++
22 4 files changed, 151 insertions(+)
23
24 diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch
25 new file mode 100644
26 index 0000000000..ddbf13d55d
27 --- /dev/null
28 +++ b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.2-standalone.patch
29 @@ -0,0 +1,59 @@
30 +From 42008129f1659bc34c454ce14632fd279679f556 Mon Sep 17 00:00:00 2001
31 +From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
32 +Date: Mon, 22 Oct 2018 21:44:33 +0200
33 +Subject: [PATCH] xembed-sni-proxy: Allow standalone build
34 +
35 +---
36 + CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++
37 + 1 file changed, 35 insertions(+)
38 +
39 +diff --git a/CMakeLists.txt b/CMakeLists.txt
40 +index c2f67ac6..30b2c1b5 100644
41 +--- a/CMakeLists.txt
42 ++++ b/CMakeLists.txt
43 +@@ -1,3 +1,34 @@
44 ++project(xembed-sni-proxy)
45 ++
46 ++if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR})
47 ++ set(PROJECT_VERSION "GENTOO_PV")
48 ++ set(PROJECT_VERSION_MAJOR 5)
49 ++
50 ++ cmake_minimum_required(VERSION 3.0)
51 ++
52 ++ set(QT_MIN_VERSION "GENTOO_QT_MINIMAL")
53 ++ set(KF5_MIN_VERSION "GENTOO_KF5_MINIMAL")
54 ++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras)
55 ++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
56 ++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
57 ++
58 ++ include(KDEInstallDirs)
59 ++ include(KDECMakeSettings)
60 ++ include(KDECompilerSettings NO_POLICY_SCOPE)
61 ++ include(FeatureSummary)
62 ++ include(ECMQtDeclareLoggingCategory)
63 ++
64 ++ find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED)
65 ++ find_package(X11 REQUIRED)
66 ++ find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR)
67 ++ set_package_properties(XCB PROPERTIES TYPE REQUIRED)
68 ++
69 ++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
70 ++else()
71 ++ set(PROJECT_VERSION "5.14.1")
72 ++ set(PROJECT_VERSION_MAJOR 5)
73 ++endif()
74 ++
75 + add_definitions(-DQT_NO_CAST_TO_ASCII
76 + -DQT_NO_CAST_FROM_ASCII
77 + -DQT_NO_URL_CAST_FROM_STRING
78 +@@ -64,3 +95,7 @@ target_link_libraries(xembedsniproxy
79 + install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
80 + install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
81 +
82 ++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
83 ++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
84 ++endif()
85 ++
86 +--
87 +2.19.1
88 +
89
90 diff --git a/kde-plasma/xembed-sni-proxy/metadata.xml b/kde-plasma/xembed-sni-proxy/metadata.xml
91 new file mode 100644
92 index 0000000000..2fdbf33d96
93 --- /dev/null
94 +++ b/kde-plasma/xembed-sni-proxy/metadata.xml
95 @@ -0,0 +1,8 @@
96 +<?xml version="1.0" encoding="UTF-8"?>
97 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
98 +<pkgmetadata>
99 + <maintainer type="project">
100 + <email>kde@g.o</email>
101 + <name>Gentoo KDE Project</name>
102 + </maintainer>
103 +</pkgmetadata>
104
105 diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild
106 new file mode 100644
107 index 0000000000..e6084ad779
108 --- /dev/null
109 +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.14.49.9999.ebuild
110 @@ -0,0 +1,42 @@
111 +# Copyright 1999-2018 Gentoo Authors
112 +# Distributed under the terms of the GNU General Public License v2
113 +
114 +EAPI=6
115 +
116 +FRAMEWORKS_MINIMAL="5.50.0"
117 +QT_MINIMAL="5.9.6"
118 +KMNAME="plasma-workspace"
119 +inherit kde5
120 +
121 +DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
122 +HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
123 +
124 +LICENSE="GPL-2"
125 +SLOT="0"
126 +KEYWORDS=""
127 +
128 +DEPEND="
129 + $(add_frameworks_dep kwindowsystem)
130 + $(add_qt_dep qtdbus)
131 + $(add_qt_dep qtgui)
132 + $(add_qt_dep qtx11extras)
133 + x11-libs/libxcb
134 + x11-libs/libXtst
135 + x11-libs/xcb-util-image
136 +"
137 +RDEPEND="${DEPEND}
138 + !<kde-plasma/plasma-workspace-5.14.2:5
139 +"
140 +
141 +S="${S}/${PN}"
142 +
143 +PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
144 +
145 +src_prepare() {
146 + kde5_src_prepare
147 +
148 + sed -e "/set/s/GENTOO_PV/${PV}/" \
149 + -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
150 + -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
151 + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
152 +}
153
154 diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
155 new file mode 100644
156 index 0000000000..e6084ad779
157 --- /dev/null
158 +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild
159 @@ -0,0 +1,42 @@
160 +# Copyright 1999-2018 Gentoo Authors
161 +# Distributed under the terms of the GNU General Public License v2
162 +
163 +EAPI=6
164 +
165 +FRAMEWORKS_MINIMAL="5.50.0"
166 +QT_MINIMAL="5.9.6"
167 +KMNAME="plasma-workspace"
168 +inherit kde5
169 +
170 +DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
171 +HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
172 +
173 +LICENSE="GPL-2"
174 +SLOT="0"
175 +KEYWORDS=""
176 +
177 +DEPEND="
178 + $(add_frameworks_dep kwindowsystem)
179 + $(add_qt_dep qtdbus)
180 + $(add_qt_dep qtgui)
181 + $(add_qt_dep qtx11extras)
182 + x11-libs/libxcb
183 + x11-libs/libXtst
184 + x11-libs/xcb-util-image
185 +"
186 +RDEPEND="${DEPEND}
187 + !<kde-plasma/plasma-workspace-5.14.2:5
188 +"
189 +
190 +S="${S}/${PN}"
191 +
192 +PATCHES=( "${FILESDIR}/${PN}-5.14.2-standalone.patch" )
193 +
194 +src_prepare() {
195 + kde5_src_prepare
196 +
197 + sed -e "/set/s/GENTOO_PV/${PV}/" \
198 + -e "/set/s/GENTOO_QT_MINIMAL/${QT_MINIMAL}/" \
199 + -e "/set/s/GENTOO_KF5_MINIMAL/${FRAMEWORKS_MINIMAL}/" \
200 + -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
201 +}