From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1A6271384C1 for ; Mon, 31 Aug 2015 15:22:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C809E0845; Mon, 31 Aug 2015 15:22:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC9CCE0845 for ; Mon, 31 Aug 2015 15:22:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DABFC34074F for ; Mon, 31 Aug 2015 15:22:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3AF9164 for ; Mon, 31 Aug 2015 15:22:46 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1441034542.e304c8b200a1b64e0547febeafa1686ed0834b39.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kde-gtk-config/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch X-VCS-Directories: kde-misc/kde-gtk-config/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: e304c8b200a1b64e0547febeafa1686ed0834b39 X-VCS-Branch: master Date: Mon, 31 Aug 2015 15:22:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 635629db-4838-4c0e-9690-daad3d033e3b X-Archives-Hash: 9aba09d6fa748fe6244c6843cebd2cd2 commit: e304c8b200a1b64e0547febeafa1686ed0834b39 Author: Michael Palimaka gentoo org> AuthorDate: Mon Aug 31 15:21:53 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Mon Aug 31 15:22:22 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e304c8b2 kde-misc/kde-gtk-config: improve kde-base/kdelibs-4.14.11 compatibility patch Gentoo-bug: 559108 Package-Manager: portage-2.2.20.1 .../kde-gtk-config-2.2.1-kdelibs-4.14.11.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch index ca20682..86c8b4c 100644 --- a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch +++ b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch @@ -50,3 +50,30 @@ index 9821cbf..18ee2d5 100644 -- 2.4.6 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -47,6 +47,4 @@ + add_subdirectory(gtkproxies) + add_subdirectory(gtk3proxies) + add_subdirectory(icons) +-find_package(Msgfmt REQUIRED) +-find_package(Gettext REQUIRED) + add_subdirectory( po ) + +--- a/po/CMakeLists.txt ++++ b/po/CMakeLists.txt +@@ -0,0 +1,14 @@ ++# The pofiles macro creates in some versions same name targets ++# which since cmake 2.8 leads to target clashes. ++# Hence force the old policy for all po directories. ++# http://public.kitware.com/Bug/view.php?id=12952 ++cmake_policy(SET CMP0002 OLD) ++ ++find_package(Gettext REQUIRED) ++if (NOT GETTEXT_MSGMERGE_EXECUTABLE) ++MESSAGE(FATAL_ERROR "Please install msgmerge binary") ++endif (NOT GETTEXT_MSGMERGE_EXECUTABLE) ++if (NOT GETTEXT_MSGFMT_EXECUTABLE) ++MESSAGE(FATAL_ERROR "Please install msgmerge binary") ++endif (NOT GETTEXT_MSGFMT_EXECUTABLE) ++