rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

allow for bundled harfbuzz,sqlite (el6)

Browse Source
This commit is contained in:
Rex Dieter 2016-01-15 14:36:30 -06:00
parent e13793651a
commit 83771cef8e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qt5-qtbase.spec
View File

@ -164,7 +164,9 @@ BuildRequires: pkgconfig(atspi-2)
BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glesv2)
%global sqlite -system-sqlite
BuildRequires: pkgconfig(sqlite3) >= 3.7 BuildRequires: pkgconfig(sqlite3) >= 3.7
%global harfbuzz -system-harfbuzz
BuildRequires: pkgconfig(harfbuzz) >= 1.0.6 BuildRequires: pkgconfig(harfbuzz) >= 1.0.6
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libpcre) >= 8.30 BuildRequires: pkgconfig(libpcre) >= 8.30
@ -349,7 +351,10 @@ bin/syncqt.pl -version %{version}
# move some bundled libs to ensure they're not accidentally used # move some bundled libs to ensure they're not accidentally used
pushd src/3rdparty pushd src/3rdparty
mkdir UNUSED mkdir UNUSED
mv freetype libjpeg libpng zlib sqlite UNUSED/ mv freetype libjpeg libpng zlib UNUSED/
%if "%{?sqlite}" == "-system-sqlite"
mv sqlite UNUSED/
%endif
%if "%{?xcb}" != "-qt-xcb" %if "%{?xcb}" != "-qt-xcb"
mv xcb UNUSED/ mv xcb UNUSED/
%endif %endif
@ -400,11 +405,11 @@ test -x configure || chmod +x configure
-no-sse2 \ -no-sse2 \
%endif %endif
-no-strip \ -no-strip \
-system-harfbuzz \
-system-libjpeg \ -system-libjpeg \
-system-libpng \ -system-libpng \
-system-sqlite \ %{?harfbuzz} \
%{?pcre} \ %{?pcre} \
%{?sqlite} \
%{?tds} \ %{?tds} \
%{?xcb} \ %{?xcb} \
%{?xkbcommon} \ %{?xkbcommon} \