From 66a4c20eabe6ab59cece660c1405131d843c82f7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 20 Aug 2017 15:19:05 +0200 Subject: [PATCH] oxygen-icons5: conflicts with oxygen-icons No need to rename, just conflicts with oxygen-icons. Also, someday we'll get rid of oxygen-icons (and all KDE 4). --- srcpkgs/oxygen-icons5/template | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/srcpkgs/oxygen-icons5/template b/srcpkgs/oxygen-icons5/template index 0f54698c4eb..da1b02f89e7 100644 --- a/srcpkgs/oxygen-icons5/template +++ b/srcpkgs/oxygen-icons5/template @@ -1,9 +1,10 @@ # Template file for 'oxygen-icons5' pkgname=oxygen-icons5 version=5.36.0 -revision=2 +revision=3 noarch=yes build_style=cmake +conflicts="oxygen-icons>=0" configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools" makedepends="qt5-devel" @@ -13,14 +14,3 @@ license="LGPL-2" homepage="https://projects.kde.org/projects/frameworks/oxygen-icons5" distfiles="http://download.kde.org/stable/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=2fb5414909ee0b8ace97dec6ef1d056c6962ba992336e8c972319c1d1ef25910 - -post_extract() { - # To prevent any conflict with 'oxygen-icons' package. - sed -i -e "s/oxygen/oxygen5/g" CMakeLists.txt - sed -i -e "s/Oxygen/Oxygen5/g" index.theme - - # Name[fr]=Oxygène - sed -i -e "s/Oxygène/Oxygène5/g" index.theme - - # TODO: sed other languages in index.theme -}