From 3ef9b6ab98813329ce92651bf6dd6f21ab04e0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 9 Apr 2023 19:17:07 +0200 Subject: RPM: update gtk3-qt-engine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- .../themes/gtk3-tqt-engine/gtk3-tqt-engine.spec | 65 +++++++++------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec b/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec index e4100aaca..9f8329a44 100644 --- a/redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec +++ b/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 - extra_includes="%{_includedir}/atk-1.0:${extra_includes}" -fi -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}" +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build fi -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --docdir=%{tde_tdedocdir} \ - --libdir=%{tde_libdir} \ +# Warning: GCC visibility causes FTBFS [Bug #1285] +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_NO_BUILTIN_CHRPATH=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=OFF \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --disable-gcc-hidden-visibility \ + -DBIN_INSTALL_DIR=%{tde_bindir} \ + -DCONFIG_INSTALL_DIR="%{tde_confdir}" \ + -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ + -DLIB_INSTALL_DIR=%{tde_libdir} \ + -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ \ - --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 -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__rm -fr $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT -C build %clean -- cgit v1.2.1