rpm/libqt5-qtbase
SHA256
1
0
Fork 0
forked from pool/libqt5-qtbase
Code Pull Requests Activity

Accepting request 227073 from KDE:Qt5

Browse Source 
Build examples

OBS-URL: https://build.opensuse.org/request/show/227073
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=15
This commit is contained in:
Tomáš Chvátal 2014-03-23 21:32:44 +00:00 committed by Git OBS Bridge
parent 255ccfd247
commit 5c03a3ccf3
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libqt5-qtbase.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Mar 20 22:58:47 UTC 2014 - hrvoje.senjan@gmail.com
- Added use-freetype-default.patch: allow using lcd-default filter
regardless of how freetype2 library has been built (w/ & w/o subpixel)
- Build examples (added examples subpackage)
- Make sure that Qt5Gui devel package requires libdrm-devel, as it
references it's includes in CMake config
-------------------------------------------------------------------
Sat Mar 1 14:26:50 UTC 2014 - hrvoje.senjan@gmail.com

19
libqt5-qtbase.spec
View File

@ -44,6 +44,8 @@ Patch3: qtbase-qatomic-ppc.patch
Patch109: libqt5-libtool-nodate.diff
# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path
Patch131: qmake-add-usr-include.diff
# PATCH-FIX-UPSTREAM use-freetype-default.patch -- allow using lcd-default filter regardless of how freetype2 library has been built (w/ & w/o subpixel)
Patch132: use-freetype-default.patch
BuildRequires: alsa-devel
BuildRequires: cups-devel
BuildRequires: fdupes
@ -121,6 +123,7 @@ handling.
%patch3 -p1
%patch109 -p1
%patch131 -p1
%patch132 -p1
# be sure not to use them
rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib}
@ -449,6 +452,7 @@ Requires: pkgconfig(glesv2)
Requires: pkgconfig(gl)
%endif
Requires: pkgconfig(egl)
Requires: pkgconfig(libdrm)
%description -n libQt5Gui-devel
Qt 5 libraries which are depending on X11 - development files.
@ -574,6 +578,14 @@ Requires: libQt5PlatformSupport-devel-static = %{version}
%description -n libQt5PlatformSupport-private-headers-devel
Qt 5 PlatformSupport Library - Non-ABI stable development files.
%package examples
Summary: Qt5 base examples
Group: Development/Libraries/X11
Recommends: libqt5-qtbase-devel
%description examples
Examples for libqt5-qtbase modules.
%build
export QMAKESPEC=$PWD/mkspecs/linux-g++
%ifarch ppc64
@ -664,7 +676,7 @@ echo yes | ./configure $platform \
%ifarch %arm aarch64
-no-neon \
%endif
-plugin-sql-sqlite -nomake examples -nomake tests \
-plugin-sql-sqlite -nomake tests \
-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \
-plugin-sql-odbc \
-plugin-sql-mysql -I/usr/include/mysql/ -I/usr/include -v
@ -1062,4 +1074,9 @@ popd
%doc *.txt LICENSE.*
%{libqt5_includedir}/QtWidgets/%{so_version}/
%files examples
%defattr(-,root,root,755)
%doc *.txt LICENSE.*
%{libqt5_examplesdir}/
%changelog

13
use-freetype-default.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 05bd014..a3d8edf 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -69,7 +69,7 @@
#include FT_CONFIG_OPTIONS_H
#endif
-#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
+#if defined(FT_LCD_FILTER_H)
#define QT_USE_FREETYPE_LCDFILTER
#endif