RPM: update gtk3-qt-engine

Signed-off-by: François Andriot <albator78@libertysurf.fr>

redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec

@@ -62,7 +62,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -96,58 +96,45 @@ GTK3 style engine which uses the active TDE style to draw its widgets
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if "%_lib" == "lib64"
-%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g"
-%endif
-
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
 
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if [ -d "/usr/include/atk-1.0" ]; then
+if ! rpm -E %%cmake|grep -q "cd build"; then
-  extra_includes="%{_includedir}/atk-1.0:${extra_includes}"
+  %__mkdir_p build
-fi
+  cd build
-if [ -d "/usr/include/gdk-pixbuf-2.0" ]; then
-  extra_includes="%{_includedir}/gdk-pixbuf-2.0:${extra_includes}"
-fi
-if [ -d "/usr/include/gtk-3.0" ]; then
-  extra_includes="%{_includedir}/gtk-3.0:${extra_includes}"
-fi
-if [ -d "/usr/include/pango-1.0" ]; then
-  extra_includes="%{_includedir}/pango-1.0:${extra_includes}"
 fi
 
-%configure \
+# Warning: GCC visibility causes FTBFS [Bug #1285]
-  --prefix=%{tde_prefix} \
+%cmake \
-  --exec-prefix=%{tde_prefix} \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-  --bindir=%{tde_bindir} \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
-  --datadir=%{tde_datadir} \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
-  --includedir=%{tde_tdeincludedir} \
+  -DCMAKE_SKIP_RPATH=OFF \
-  --docdir=%{tde_tdedocdir} \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
-  --libdir=%{tde_libdir} \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  --disable-debug \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  --enable-new-ldflags \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  --enable-final \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
-  --enable-closure \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
   \
-  --with-extra-includes=${extra_includes}
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-export PATH="%{tde_bindir}:${PATH}"
+%__rm -fr $RPM_BUILD_ROOT
-%__rm -rf %{buildroot}
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
-%__make install DESTDIR=%{buildroot}
 
 
 %clean