pool/libqt5-qtbase
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 202036 from KDE:Qt51

Browse Source 
Update to 5.1.1, resubmitted due to factory-repo-checker bug

OBS-URL: https://build.opensuse.org/request/show/202036
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=2
This commit is contained in:
Tomáš Chvátal 2013-10-04 11:52:02 +00:00 committed by Git OBS Bridge
parent b1cfae013e
commit 74e0517d5b
5 changed files with 113 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libqt5-qtbase.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Thu Sep 12 19:58:38 UTC 2013 - hrvoje.senjan@gmail.com
- Added missing pkgconfig(xkbcommon) BuildRequires
- Drop checks for older openSUSE versions
- Enable GL ES and kms only on arm for now
-------------------------------------------------------------------
Thu Sep 5 15:09:28 UTC 2013 - duwe@suse.com
- enable support for opengl es2 and kms
-------------------------------------------------------------------
Thu Aug 29 16:38:30 UTC 2013 - hrvoje.senjan@gmail.com
- Update to version 5.1.1:
* Bugfix release, please see
http://blog.qt.digia.com/blog/2013/08/28/qt-5-1-1-released/
http://qt.gitorious.org/qt/qtbase/blobs/release/dist/changes-5.1.1
and http://qt-project.org/wiki/Qt511KnownIssues for known issues
- Small spec cleanup
- Explicitly activate desktop openGL, and only BuildRequire
pkgconfig(gl) so whole Mesa stack isn't pulled
-------------------------------------------------------------------
Sat Aug 3 07:14:30 UTC 2013 - tittiatcoke@gmail.com

154
libqt5-qtbase.spec
View File

@ -16,15 +16,12 @@
#
Name: libqt5-qtbase
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
BuildRequires: at-spi2-core-devel
BuildRequires: cups-devel
BuildRequires: dbus-1-devel
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
BuildRequires: libmysqlclient-devel
@ -36,13 +33,37 @@ BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: sqlite3-devel
BuildRequires: unixODBC-devel
BuildRequires: at-spi2-core-devel
%if %suse_version > 1210
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gl)
%ifarch %arm
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(glesv2)
%endif
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(xkbcommon) >= 0.2.0
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xcb-util-renderutil-devel
BuildRequires: xcb-util-wm-devel
%endif
Version: 5.1.1
Release: 0
License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
Summary: C++ Program Library, Core Components
Url: http://qt.digia.com
Group: System/Libraries
%define base_name libqt5
%define real_version 5.1.1
%define tar_version qtbase-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source2: macros.qt5
Source3: baselibs.conf
# PATCH-FIX-UPSTREAM qt-never-strip.diff -- for creating debug packages
Patch2: qt-never-strip.diff
# PATCH-FIX-UPSTREAM libqt5-libtool-nodate.diff -- for ommiting date/time on build
Patch109: libqt5-libtool-nodate.diff
# PATCH-FIX-UPSTREAM qmake-add-usr-include.diff -- explicitly include /usr/include path
Patch131: qmake-add-usr-include.diff
BuildRequires: clucene-core-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: libicu-devel
@ -50,21 +71,6 @@ BuildRequires: libpulse-devel
BuildRequires: libudev-devel
BuildRequires: xorg-x11-devel
BuildRequires: xz
Url: http://qt.digia.com
Summary: C++ Program Library, Core Components
License: GPL-3.0 or SUSE-LGPL-2.1-with-digia-exception-1.1
Group: System/Libraries
Version: 5.1.0
Release: 0
%define base_name libqt5
%define real_version 5.1.0
%define tar_version qtbase-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source2: macros.qt5
Source3: baselibs.conf
Patch2: qt-never-strip.diff
Patch109: libqt5-libtool-nodate.diff
Patch131: qmake-add-usr-include.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -101,37 +107,40 @@ rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib}
%package devel
Summary: Qt Development Kit
Group: Development/Libraries/X11
Requires: %name = %version
Requires: Mesa-devel
Requires: %{name} = %{version}
Requires: alsa-devel
Requires: cups-devel
Requires: at-spi2-core-devel
Requires: c++_compiler
Requires: dbus-1-devel
Requires: cups-devel
Requires: freetype2-devel
Requires: glib2-devel
Requires: libQt5Gui5 = %version
Requires: libQt5Test5 = %version
Requires: libQt5Widgets5 = %version
Requires: libQt5Gui5 = %{version}
Requires: libQt5Test5 = %{version}
Requires: libQt5Widgets5 = %{version}
Requires: libjpeg-devel
Requires: libmng-devel
Requires: libpng-devel
Requires: libqt5-sql-sqlite >= %version
Requires: libqt5-sql-sqlite >= %{version}
Requires: libtiff-devel
Requires: make
Requires: openssl-devel
Requires: pcre-devel
Requires: pkgconfig
Requires: sqlite3-devel
Requires: at-spi2-core-devel
%if %suse_version > 1210
Requires: pkgconfig(dbus-1)
Requires: pkgconfig(gl)
%ifarch %arm
Requires: pkgconfig(gbm)
Requires: pkgconfig(glesv2)
%endif
Requires: pkgconfig(glib-2.0)
Requires: pkgconfig(xkbcommon) >= 0.2.0
Requires: xcb-util-image-devel
Requires: xcb-util-keysyms-devel
Requires: xcb-util-renderutil-devel
Requires: xcb-util-wm-devel
%endif
Requires: gstreamer-0_10-plugins-base-devel
Requires: libicu-devel
Requires: libpulse-devel
Requires: gstreamer-0_10-plugins-base-devel
Requires: libudev-devel
Requires: xorg-x11-devel
Requires: zlib-devel
@ -159,49 +168,45 @@ Qt 5 library to display widgets.
%package -n libqt5-sql-sqlite
Summary: Qt 5 sqlite plugin
Group: Development/Libraries/C and C++
Requires: libQt5Sql5 = %version
Provides: libqt5_sql_backend = %version
Requires: libQt5Sql5 = %{version}
Provides: libqt5_sql_backend = %{version}
%description -n libqt5-sql-sqlite
Qt 5 sqlite plugin to be able to use database functionality with Qt
applications without the need to setup a SQL server.
%package -n libqt5-sql-unixODBC
Summary: Qt 5 unixODBC plugin
Group: Development/Libraries/C and C++
Requires: libQt5Sql5 = %version
Provides: libqt5_sql_backend = %version
Requires: libQt5Sql5 = %{version}
Provides: libqt5_sql_backend = %{version}
%description -n libqt5-sql-unixODBC
Qt unixODBC plugin to support databases via unixODBC within Qt
applications.
%package -n libqt5-sql-postgresql
Summary: Qt 5 PostgreSQL plugin
Group: Development/Libraries/C and C++
Requires: libQt5Sql5 = %version
Provides: libqt5_sql_backend = %version
Requires: libQt5Sql5 = %{version}
Provides: libqt5_sql_backend = %{version}
%description -n libqt5-sql-postgresql
Qt SQL plugin to support PostgreSQL servers in Qt applications.
%package -n libqt5-sql-mysql
Summary: Qt 5 MySQL support
Group: Development/Libraries/C and C++
Requires: libQt5Sql5 = %version
Provides: libqt5_sql_backend = %version
Requires: libQt5Sql5 = %{version}
Provides: libqt5_sql_backend = %{version}
%description -n libqt5-sql-mysql
A plugin to support MySQL server in Qt applications.
%package -n libQt5Gui5
Summary: Qt 5 GUI related libraries
Group: Development/Libraries/C and C++
Recommends: libqt5-qtimageformats = %version
Recommends: libqt5-qtimageformats = %{version}
%description -n libQt5Gui5
Qt 5 libraries which are depending on X11.
@ -209,18 +214,17 @@ Qt 5 libraries which are depending on X11.
%package -n libQt5Sql5
Summary: Qt 5 SQL related libraries
Group: Development/Libraries/C and C++
Recommends: libqt5_sql_backend = %version
Recommends: libqt5_sql_backend = %{version}
Suggests: libqt5-sql-sqlite
%description -n libQt5Sql5
Qt 5 libraries which are used for connection with an SQL server. You
will need also a plugin package for a supported SQL server.
%package private-headers-devel
Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++
Requires: libqt5-qtbase-devel = %version
Requires: libqt5-qtbase-devel = %{version}
%description private-headers-devel
This package provides private headers of libqt5-qtbase-devel that are normally
@ -228,22 +232,21 @@ not used by application development and that do not have any ABI or
API guarantees. The packages that build against these have to require
the exact Qt version.
%build
export QMAKESPEC=$PWD/mkspecs/linux-g++
%ifarch ppc64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
export MAKEFLAGS="%{?jobs:-j %jobs}"
export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
export MAKEFLAGS="%{?_smp_mflags}"
%ifarch sparc64
platform="-platform linux-g++-64"
%else
platform=""
%endif
# Record mtime of changes file instead of build time
CHANGES=`stat --format="%y" %SOURCE1|cut --characters=1-10`
CHANGES=`stat --format="%y" %{SOURCE1}|cut --characters=1-10`
sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure
echo yes | ./configure $platform \
@ -295,31 +298,38 @@ echo yes | ./configure $platform \
-javascript-jit \
-xcb \
-no-eglfs \
-opengl \
-opengl desktop \
%ifarch %arm
-eglfs -kms \
-opengl es2 \
%else
-no-eglfs \
-opengl desktop \
%endif
-release \
%ifarch %arm
-no-neon \
%endif
-plugin-sql-sqlite -nomake examples -nomake demos \
-plugin-sql-sqlite -nomake examples \
-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
make %{?jobs:-j %jobs}
make %{?_smp_mflags}
%install
make INSTALL_ROOT=$RPM_BUILD_ROOT install
make INSTALL_ROOT=%{buildroot} install
install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5
# argggh, qmake is such a piece of <censored>
find $RPM_BUILD_ROOT/%{libqt5_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \;
find $RPM_BUILD_ROOT/%{libqt5_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
find $RPM_BUILD_ROOT/%{libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \;
find %{buildroot}/%{libqt5_libdir} -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \;
find %{buildroot}/%{libqt5_libdir} -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
find %{buildroot}/%{libqt5_libdir} -type f -name '*la' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \;
# insanity ...
find $RPM_BUILD_ROOT/%{libqt5_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=%libqt5_bindir/moc," -e "s,uic_location=.*,uic_location=%libqt5_bindir/uic," {} \;
find $RPM_BUILD_ROOT/%{libqt5_libdir}/ -name 'lib*.a' -exec chmod -x -- {} \;
mkdir -p $RPM_BUILD_ROOT/%{libqt5_plugindir}/sqldrivers
find %{buildroot}/%{libqt5_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=%libqt5_bindir/moc," -e "s,uic_location=.*,uic_location=%libqt5_bindir/uic," {} \;
find %{buildroot}/%{libqt5_libdir}/ -name 'lib*.a' -exec chmod -x -- {} \;
mkdir -p %{buildroot}/%{libqt5_plugindir}/sqldrivers
# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir
# put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir
mkdir %{buildroot}%{_bindir}
pushd %{buildroot}%{libqt5_bindir}
for i in * ; do
@ -336,7 +346,7 @@ popd
%fdupes %{buildroot}/%{libqt5_archdatadir}/mkspecs
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
%post -p /sbin/ldconfig
@ -397,10 +407,10 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,755)
%doc *.txt LICENSE.LGPL LICENSE.FDL
%_bindir/*
%{_bindir}/*
%libqt5_bindir/*
%dir %libqt5_bindir
%exclude %{libqt5_includedir}/*/5.1.0
%exclude %{libqt5_includedir}/*/5.1.1
%{libqt5_includedir}/
%{libqt5_libdir}/cmake
%{libqt5_libdir}/libQt5*.la
@ -415,7 +425,7 @@ rm -rf $RPM_BUILD_ROOT
%files private-headers-devel
%defattr(-,root,root,755)
%doc *.txt LICENSE.LGPL LICENSE.FDL
%{libqt5_includedir}/*/5.1.0
%{libqt5_includedir}/*/5.1.1
%files -n libQt5Sql5
%defattr(-,root,root,755)

8
qmake-add-usr-include.diff
View File

@ -1,10 +1,10 @@
--- qtbase/qmake/generators/unix/unixmake2.cpp 2012/08/30 12:10:34 1.1
+++ qtbase/qmake/generators/unix/unixmake2.cpp 2012/08/30 12:10:41
@@ -126,7 +126,7 @@
@@ -128,7 +128,7 @@
<< varGlue("DEFINES","-D"," -D","") << endl;
t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)" << endl;
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)" << endl;
- t << "INCPATH = " << "-I" << specdir();
t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
- t << "INCPATH = -I" << specdir();
+ t << "INCPATH = " << "-I/usr/include -I" << specdir();
if(!project->isActiveConfig("no_include_pwd")) {
QString pwd = escapeFilePath(fileFixify(qmake_getpwd()));

3
qtbase-opensource-src-5.1.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a
size 45738944

3
qtbase-opensource-src-5.1.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4620e0b1aff6d2b6f4d8066e6f8258e012a8b5507af7c03b661029a1ffa75c9
size 46156472