From ed9ad8303293682bfa2cfd140670fae3b850a761 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 3 Oct 2015 13:34:23 +0200 Subject: [PATCH] - fix gkt+ detection on x32 --- kp5-kde-gtk-config.spec | 2 ++ x32.patch | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 x32.patch diff --git a/kp5-kde-gtk-config.spec b/kp5-kde-gtk-config.spec index b3616e2..d5a94f8 100644 --- a/kp5-kde-gtk-config.spec +++ b/kp5-kde-gtk-config.spec @@ -9,6 +9,7 @@ License: GPL v2+/LGPL v2.1+ Group: X11/Libraries Source0: http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz # Source0-md5: 31f6c449cd683937a4cc5ba2447bbf0d +Patch0: x32.patch URL: http://www.kde.org/ BuildRequires: Qt5Core-devel >= %{qtver} BuildRequires: cmake >= 2.8.12 @@ -38,6 +39,7 @@ GTK2 and GTK3 Configurator for KDE. %prep %setup -q -n %{kpname}-%{version} +%patch0 -p1 %build install -d build diff --git a/x32.patch b/x32.patch new file mode 100644 index 0000000..1a639f7 --- /dev/null +++ b/x32.patch @@ -0,0 +1,24 @@ +--- kde-gtk-config-5.4.0/cmake/modules/FindGTK2.cmake~ 2015-08-20 14:54:48.000000000 +0200 ++++ kde-gtk-config-5.4.0/cmake/modules/FindGTK2.cmake 2015-10-03 13:33:46.387459998 +0200 +@@ -186,8 +186,10 @@ + find_path(${_var} ${_hdr} + PATHS + /usr/local/lib64 ++ /usr/local/libx32 + /usr/local/lib + /usr/lib64 ++ /usr/libx32 + /usr/lib + /opt/gnome/include + /opt/gnome/lib +@@ -307,8 +309,10 @@ + PATHS + /opt/gnome/lib + /opt/gnome/lib64 ++ /opt/gnome/libx32 + /usr/openwin/lib + /usr/openwin/lib64 ++ /usr/openwin/libx32 + /sw/lib + $ENV{GTKMM_BASEPATH}/lib + [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib -- 2.44.0