commit: c8103c107b7a6129e25602c0127466014f4670b4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat May 16 21:48:40 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat May 16 21:52:26 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8103c10
kde-plasma/plasma-desktop: Move headers into SRC_URI tarball Uncluttering ebuild. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...asma-desktop-5.18.5-override-include-dirs.patch | 108 --------------------- .../plasma-desktop/plasma-desktop-5.18.90.ebuild | 39 ++------ .../plasma-desktop-5.19.49.9999.ebuild | 39 ++------ .../plasma-desktop/plasma-desktop-9999.ebuild | 39 ++------ 4 files changed, 21 insertions(+), 204 deletions(-) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch deleted file mode 100644 index ffbf2b6442..0000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.5-override-include-dirs.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 6971b5eac2088d263527b2b4a85bb08b1a2dc792 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Mon, 6 Apr 2020 00:41:07 +0200 -Subject: [PATCH] cmake modules: Allow include dir overrides for various input - drivers - -FindEvdev - evdev-properties.h -FindSynaptics - synaptics-properties.h -FindXorgLibinput - libinput-properties.h -FindXorgServer - xserver-properties.h ---- - cmake/modules/FindEvdev.cmake | 4 ++++ - cmake/modules/FindSynaptics.cmake | 4 ++++ - cmake/modules/FindXorgLibinput.cmake | 4 ++++ - cmake/modules/FindXorgServer.cmake | 4 ++++ - 4 files changed, 16 insertions(+) - -diff --git a/cmake/modules/FindEvdev.cmake b/cmake/modules/FindEvdev.cmake -index 153128a90..c19c31a96 100644 ---- a/cmake/modules/FindEvdev.cmake -+++ b/cmake/modules/FindEvdev.cmake -@@ -31,6 +31,8 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - -+if(NOT Evdev_INCLUDE_DIRS) -+ - find_package(PkgConfig) - pkg_check_modules(PC_EVDEV xorg-evdev>=2.8.99.1) - -@@ -39,6 +41,8 @@ find_path(Evdev_INCLUDE_DIRS - HINTS ${PC_EVDEV_INCLUDE_DIRS} ${PC_EVDEV_INCLUDEDIR} - ) - -+endif() -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(Evdev REQUIRED_VARS Evdev_INCLUDE_DIRS) - -diff --git a/cmake/modules/FindSynaptics.cmake b/cmake/modules/FindSynaptics.cmake -index fb5f9bc3e..eb56965e0 100644 ---- a/cmake/modules/FindSynaptics.cmake -+++ b/cmake/modules/FindSynaptics.cmake -@@ -31,6 +31,8 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - -+if(NOT Synaptics_INCLUDE_DIRS) -+ - find_package(PkgConfig) - pkg_check_modules(PC_SYNAPTICS xorg-synaptics) - -@@ -39,6 +41,8 @@ find_path(Synaptics_INCLUDE_DIRS - HINTS ${PC_SYNAPTICS_INCLUDE_DIRS} ${PC_SYNAPTICS_INCLUDEDIR} - ) - -+endif() -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(Synaptics REQUIRED_VARS Synaptics_INCLUDE_DIRS) - -diff --git a/cmake/modules/FindXorgLibinput.cmake b/cmake/modules/FindXorgLibinput.cmake -index 1550751ae..5b7af5e79 100644 ---- a/cmake/modules/FindXorgLibinput.cmake -+++ b/cmake/modules/FindXorgLibinput.cmake -@@ -31,6 +31,8 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - -+if(NOT XORGLIBINPUT_INCLUDE_DIRS) -+ - find_package(PkgConfig) - pkg_check_modules(PC_XORGLIBINPUT xorg-libinput) - -@@ -39,6 +41,8 @@ find_path(XORGLIBINPUT_INCLUDE_DIRS - HINTS ${PC_XORGLIBINPUT_INCLUDE_DIRS} ${PC_XORGLIBINPUT_INCLUDEDIR} - ) - -+endif() -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(XorgLibinput REQUIRED_VARS XORGLIBINPUT_INCLUDE_DIRS) - -diff --git a/cmake/modules/FindXorgServer.cmake b/cmake/modules/FindXorgServer.cmake -index 5248c6d25..9de16dba0 100644 ---- a/cmake/modules/FindXorgServer.cmake -+++ b/cmake/modules/FindXorgServer.cmake -@@ -31,6 +31,8 @@ - # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - # SUCH DAMAGE. - -+if(NOT XORGSERVER_INCLUDE_DIRS) -+ - find_package(PkgConfig) - pkg_check_modules(PC_XORGSERVER xorg-server) - -@@ -39,6 +41,8 @@ find_path(XORGSERVER_INCLUDE_DIRS - HINTS ${PC_XORGSERVER_INCLUDE_DIRS} ${PC_XORGSERVER_INCLUDEDIR} - ) - -+endif() -+ - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(XORGSERVER REQUIRED_VARS XORGSERVER_INCLUDE_DIRS) - --- -2.26.2 - diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild index 327f1070b2..ede2d1e463 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.90.ebuild @@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="KDE Plasma desktop" - -# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs -# just for 1 header each. touchpad also uses a header from xorg-server. -SHA_EVDEV="425ed601" -SHA_LIBINPUT="e52daf20" -SHA_SYNAPTICS="383355fa" -SHA_XSERVER="d511a301" -XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"; -SRC_URI+=" - ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV} - ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT} - ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS} - ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER} -" +XORGHDRS="${PN}-override-include-dirs-0" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch ) -src_unpack() { - kde.org_src_unpack - mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir" - cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \ - "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev" - cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \ - "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput" - cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \ - "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics" - cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \ - "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver" -} - src_prepare() { ecm_src_prepare @@ -163,10 +138,10 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) - -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include - -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include + -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) ) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild index 953b594be2..518f80a090 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.49.9999.ebuild @@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="KDE Plasma desktop" - -# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs -# just for 1 header each. touchpad also uses a header from xorg-server. -SHA_EVDEV="425ed601" -SHA_LIBINPUT="e52daf20" -SHA_SYNAPTICS="383355fa" -SHA_XSERVER="d511a301" -XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"; -SRC_URI+=" - ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV} - ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT} - ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS} - ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER} -" +XORGHDRS="${PN}-override-include-dirs-0" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch ) -src_unpack() { - kde.org_src_unpack - mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir" - cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \ - "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev" - cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \ - "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput" - cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \ - "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics" - cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \ - "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver" -} - src_prepare() { ecm_src_prepare @@ -163,10 +138,10 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) - -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include - -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include + -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) ) diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index a56f7a6f47..9bef640c13 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -12,20 +12,8 @@ VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="KDE Plasma desktop" - -# Avoid pulling in xf86-input-{evdev,libinput,synaptics} DEPENDs -# just for 1 header each. touchpad also uses a header from xorg-server. -SHA_EVDEV="425ed601" -SHA_LIBINPUT="e52daf20" -SHA_SYNAPTICS="383355fa" -SHA_XSERVER="d511a301" -XORG_URI="https://gitlab.freedesktop.org/xorg/driver/PKG/-/raw"; -SRC_URI+=" - ${XORG_URI/PKG/xf86-input-evdev}/${SHA_EVDEV}/include/evdev-properties.h -> evdev-properties.h-${SHA_EVDEV} - ${XORG_URI/PKG/xf86-input-libinput}/${SHA_LIBINPUT}/include/libinput-properties.h -> libinput-properties.h-${SHA_LIBINPUT} - ${XORG_URI/PKG/xf86-input-synaptics}/${SHA_SYNAPTICS}/include/synaptics-properties.h -> synaptics-properties.h-${SHA_SYNAPTICS} - ${XORG_URI/driver\/PKG/xserver}/${SHA_XSERVER}/include/xserver-properties.h -> xserver-properties.h-${SHA_XSERVER} -" +XORGHDRS="${PN}-override-include-dirs-0" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -135,22 +123,9 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-5.18.5-override-include-dirs.patch" # downstream patch + "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch ) -src_unpack() { - kde.org_src_unpack - mkdir "${WORKDIR}/include" || die "Failed to prepare evdev/libinput dir" - cp "${DISTDIR}"/evdev-properties.h-${SHA_EVDEV} \ - "${WORKDIR}"/include/evdev-properties.h || die "Failed to copy evdev" - cp "${DISTDIR}"/libinput-properties.h-${SHA_LIBINPUT} \ - "${WORKDIR}"/include/libinput-properties.h || die "Failed to copy libinput" - cp "${DISTDIR}"/synaptics-properties.h-${SHA_SYNAPTICS} \ - "${WORKDIR}"/include/synaptics-properties.h || die "Failed to copy synaptics" - cp "${DISTDIR}"/xserver-properties.h-${SHA_XSERVER} \ - "${WORKDIR}"/include/xserver-properties.h || die "Failed to copy xserver" -} - src_prepare() { ecm_src_prepare @@ -163,10 +138,10 @@ src_prepare() { src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) - -DEvdev_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}"/include - -DSynaptics_INCLUDE_DIRS="${WORKDIR}"/include + -DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) )
