commit b1cfae013e541625622515775be00d143529a8bcc41463c901dd26a9720811ec Author: Stephan Kulow Date: Tue Oct 1 06:13:11 2013 +0000 Accepting request 185865 from KDE:Qt51 UUpdated baselibs.conf to have the correct 32bit packages OBS-URL: https://build.opensuse.org/request/show/185865 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtbase?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..6090d2a --- /dev/null +++ b/_constraints @@ -0,0 +1,11 @@ + + + + + 9 + + + 3500 + + + diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..f2a2160 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,10 @@ +libqt5-qtbase +libQt5Test5 +libQtWidgets5 +libqt5-sql-sqlite +libqt5-sql-unixODBC +libqt5-sql-postgresql +libqt5-sql-mysql +libQt5Gui5 +libQt5Sql5 +libQt5Widgets5 diff --git a/libqt5-libtool-nodate.diff b/libqt5-libtool-nodate.diff new file mode 100644 index 0000000..f08985a --- /dev/null +++ b/libqt5-libtool-nodate.diff @@ -0,0 +1,11 @@ +--- qtbase/qmake/generators/unix/unixmake2.cpp 2012/11/12 14:21:54 1.1 ++++ qtbase/qmake/generators/unix/unixmake2.cpp 2012/11/12 14:22:13 +@@ -1297,7 +1297,7 @@ + QTextStream t(&ft); + t << "# " << lname << " - a libtool library file\n"; + t << "# Generated by qmake/libtool (" QMAKE_VERSION_STR ") (Qt " +- << QT_VERSION_STR << ") on: " << QDateTime::currentDateTime().toString(); ++ << QT_VERSION_STR << ")"; + t << "\n"; + + t << "# The name that we can dlopen(3).\n" diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes new file mode 100644 index 0000000..65792c9 --- /dev/null +++ b/libqt5-qtbase.changes @@ -0,0 +1,87 @@ +------------------------------------------------------------------- +Sat Aug 3 07:14:30 UTC 2013 - tittiatcoke@gmail.com + +- Adjust packaging naming conform Factory standards + +------------------------------------------------------------------- +Sun Jul 7 12:14:37 UTC 2013 - hrvoje.senjan@gmail.com + +- Allow co-existance of Qt5 and Qt4: + * Install headers in %_includedir/qt5 + * Install binaries in %_libdir/qt5/bin, create symlinks with -qt5 + suffixes in %_libdir/qt5/bin and %_bindir +- Spec cleanup: + * Removed checks for obsolete opensuse versions +- Add new macros.qt5, which should be utilized for other Qt5 modules +- Added baselibs.conf + +------------------------------------------------------------------- +Sun Jul 7 07:23:51 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.1 release + +------------------------------------------------------------------- +Tue Jun 18 20:00:00 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.1 RC 1 + +------------------------------------------------------------------- +Mon May 20 20:00:00 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.1 Beta 1 + +------------------------------------------------------------------- +Tue Apr 9 20:00:00 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.1 Alpha 1 + +------------------------------------------------------------------- +Fri Mar 29 11:58:55 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.0.2 RC1 + +------------------------------------------------------------------- +Wed Jan 30 19:00:00 UTC 2013 - stephan.binner@basyskom.com + +- update to Qt 5.0.1 + +------------------------------------------------------------------- +Wed Dec 19 20:40:40 UTC 2012 - stephan.binner@basyskom.com + +- update to Qt 5.0 release + +------------------------------------------------------------------- +Thu Dec 13 10:50:52 UTC 2012 - stephan.binner@basyskom.com + +- update to Qt 5.0 Release Candidate 2 + +------------------------------------------------------------------- +Thu Dec 6 19:54:17 UTC 2012 - stephan.binner@basyskom.com + +- update to Qt 5.0 Release Candidate 1 + +------------------------------------------------------------------- +Thu Nov 15 12:14:39 UTC 2012 - stephan.binner@basyskom.com + +- update to Qt 5.0 Beta 2 + +------------------------------------------------------------------- +Thu Aug 30 11:31:45 UTC 2012 - stephan.binner@basyskom.com + +- update to Qt 5.0 Beta 1 release + +------------------------------------------------------------------- +Thu May 24 15:29:20 UTC 2012 - stephan.binner@basyskom.com + +- update to newer Alpha snapshot / Beta candidate + +------------------------------------------------------------------- +Fri Apr 13 13:22:38 UTC 2012 - stephan.binner@basyskom.com + +- rework package splitting for Qt 5 modularization + +------------------------------------------------------------------- +Thu Apr 5 09:56:15 UTC 2012 - dmueller@suse.com + +- Initial packaging (Qt 5.0 Alpha) + diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec new file mode 100644 index 0000000..37feef3 --- /dev/null +++ b/libqt5-qtbase.spec @@ -0,0 +1,446 @@ +# +# spec file for package libqt5-qtbase +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +Name: libqt5-qtbase +BuildRequires: Mesa-devel +BuildRequires: alsa-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 +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: openssl-devel +BuildRequires: pcre-devel +BuildRequires: pkgconfig +BuildRequires: postgresql-devel +BuildRequires: sqlite3-devel +BuildRequires: unixODBC-devel +BuildRequires: at-spi2-core-devel +%if %suse_version > 1210 +BuildRequires: xcb-util-image-devel +BuildRequires: xcb-util-keysyms-devel +BuildRequires: xcb-util-renderutil-devel +BuildRequires: xcb-util-wm-devel +%endif +BuildRequires: clucene-core-devel +BuildRequires: gstreamer-0_10-plugins-base-devel +BuildRequires: libicu-devel +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 + +%description +Qt is a set of libraries for developing applications. + +This package contains base tools, like string, xml, and network +handling. + +%define libqt5_prefix %{_prefix} +%define libqt5_libdir %{_libdir} +%define libqt5_archdatadir %{_libdir}/qt5 +%define libqt5_bindir %{libqt5_archdatadir}/bin +%define libqt5_datadir %{_datadir}/qt5 +%define libqt5_docdir %{_docdir}/qt5 +%define libqt5_examplesdir %{libqt5_archdatadir}/examples +%define libqt5_includedir %{_includedir}/qt5 +%define libqt5_importdir %{libqt5_archdatadir}/imports +%define libqt5_libexecdir %{libqt5_archdatadir}/libexec +%define libqt5_plugindir %{libqt5_archdatadir}/plugins +%define libqt5_sysconfdir %{_sysconfdir}/xdg +%define libqt5_translationdir %{_datadir}/qt5/translations + +%prep +%setup -q -n qtbase-opensource-src-%{real_version} +%patch2 -p1 +%patch109 -p1 +%patch131 -p1 + +# be sure not to use them +rm -r src/3rdparty/{libjpeg,freetype,libpng,zlib} +#rm -r qtimageformats/src/3rdparty/{libtiff,libmng} + +%package devel +Summary: Qt Development Kit +Group: Development/Libraries/X11 +Requires: %name = %version +Requires: Mesa-devel +Requires: alsa-devel +Requires: cups-devel +Requires: c++_compiler +Requires: dbus-1-devel +Requires: freetype2-devel +Requires: glib2-devel +Requires: libQt5Gui5 = %version +Requires: libQt5Test5 = %version +Requires: libQt5Widgets5 = %version +Requires: libjpeg-devel +Requires: libmng-devel +Requires: libpng-devel +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: xcb-util-image-devel +Requires: xcb-util-keysyms-devel +Requires: xcb-util-renderutil-devel +Requires: xcb-util-wm-devel +%endif +Requires: libicu-devel +Requires: libpulse-devel +Requires: gstreamer-0_10-plugins-base-devel +Requires: libudev-devel +Requires: xorg-x11-devel +Requires: zlib-devel + +%description devel +You need this package, if you want to compile programs with Qt. It +contains the "Qt Crossplatform Development Kit". It does contain +include files and development applications like GUI designers, +translator tools and code generators. + +%package -n libQt5Test5 +Summary: Qt 5 Test Library +Group: Development/Libraries/X11 + +%description -n libQt5Test5 +Qt 5 library for testing. + +%package -n libQt5Widgets5 +Summary: Qt 5 Test Library +Group: Development/Libraries/X11 + +%description -n libQt5Widgets5 +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 + +%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 + +%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 + +%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 + +%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 + +%description -n libQt5Gui5 +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 +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 + +%description private-headers-devel +This package provides private headers of libqt5-qtbase-devel that are normally +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" +%endif +export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF" +export MAKEFLAGS="%{?jobs:-j %jobs}" +%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` +sed -i -e "s/qt_instdate=\$TODAY/qt_instdate=$CHANGES/" configure + +echo yes | ./configure $platform \ + -prefix %{_prefix} \ + -L %{libqt5_libdir} \ + -libdir %{libqt5_libdir} \ + -archdatadir %{libqt5_archdatadir} \ + -bindir %{libqt5_bindir} \ + -datadir %{libqt5_datadir} \ + -docdir %{libqt5_docdir} \ + -examplesdir %{libqt5_examplesdir} \ + -headerdir %{libqt5_includedir} \ + -importdir %{libqt5_importdir} \ + -libexecdir %{libqt5_libexecdir} \ + -plugindir %{libqt5_plugindir} \ + -sysconfdir %{libqt5_sysconfdir} \ + -translationdir %{libqt5_translationdir} \ + -verbose \ + -reduce-relocations \ + -optimized-qmake \ + -accessibility \ + -opensource \ + -no-separate-debug-info \ + -shared \ + -xkb \ + -xrender \ + -xcursor \ + -dbus-linked \ + -xfixes \ + -xrandr \ + -xinerama \ + -sm \ + -no-rpath \ + -system-libjpeg \ + -openssl-linked \ + -system-libpng \ + -cups \ + -nis \ + -system-zlib \ + -iconv \ + -sysconfdir /etc/settings \ + -no-pch \ + -glib \ + -system-sqlite \ + -no-sql-mysql \ + -xsync \ + -xinput \ + -gtkstyle \ + -javascript-jit \ + -xcb \ + -no-eglfs \ + -opengl \ + -release \ +%ifarch %arm + -no-neon \ +%endif + -plugin-sql-sqlite -nomake examples -nomake demos \ + -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} + +%install +make INSTALL_ROOT=$RPM_BUILD_ROOT install +install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/macros.qt5 +# argggh, qmake is such a piece of +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" {} \; +# 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 + +# 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 + mv $i ../../../bin/${i}-qt5 + ln -s ../../../bin/${i}-qt5 . + ln -s ../../../bin/${i}-qt5 $i +done +popd +pushd %{buildroot}%{libqt5_docdir}/global/template/images +chmod -R 644 *.png +popd + +%fdupes %{buildroot}/%{libqt5_includedir} +%fdupes %{buildroot}/%{libqt5_archdatadir}/mkspecs + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%post -n libQt5Gui5 -p /sbin/ldconfig + +%post -n libQt5Sql5 -p /sbin/ldconfig + +%post -n libQt5Test5 -p /sbin/ldconfig + +%post -n libQt5Widgets5 -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%postun -n libQt5Gui5 -p /sbin/ldconfig + +%postun -n libQt5Sql5 -p /sbin/ldconfig + +%postun -n libQt5Test5 -p /sbin/ldconfig + +%postun -n libQt5Widgets5 -p /sbin/ldconfig + +%files +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%dir %{libqt5_libdir}/qt5 +%dir %{libqt5_plugindir} +%{libqt5_libdir}/libQt5Core.so.* +%{libqt5_libdir}/libQt5Concurrent.so.* +%{libqt5_libdir}/libQt5DBus.so.* +%{libqt5_libdir}/libQt5Network.so.* +%{libqt5_libdir}/libQt5Xml.so.* +%{libqt5_plugindir}/bearer + +%files -n libQt5Test5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5Test.so.* + +%files -n libQt5Widgets5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5Widgets.so.* +%{libqt5_libdir}/libQt5PrintSupport.so.* +%{libqt5_libdir}/libQt5OpenGL.so.* +%{libqt5_plugindir}/accessible +%{libqt5_plugindir}/printsupport + +%files -n libQt5Gui5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5Gui.so.* +%{libqt5_plugindir}/generic +%{libqt5_plugindir}/imageformats +%{libqt5_plugindir}/platforminputcontexts +%{libqt5_plugindir}/platforms +%{libqt5_plugindir}/platformthemes + +%files devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%_bindir/* +%libqt5_bindir/* +%dir %libqt5_bindir +%exclude %{libqt5_includedir}/*/5.1.0 +%{libqt5_includedir}/ +%{libqt5_libdir}/cmake +%{libqt5_libdir}/libQt5*.la +%{libqt5_libdir}/libQt5*.prl +%{libqt5_libdir}/libQt5*.so +%{libqt5_libdir}/libQt5*.a +%{libqt5_libdir}/pkgconfig/Qt5*.pc +%{libqt5_archdatadir}/mkspecs +%{libqt5_docdir} +%{_sysconfdir}/rpm/macros.qt5 + +%files private-headers-devel +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_includedir}/*/5.1.0 + +%files -n libQt5Sql5 +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_libdir}/libQt5Sql.so.* +%dir %{libqt5_plugindir}/sqldrivers + +%files -n libqt5-sql-sqlite +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_plugindir}/sqldrivers/libqsqlite*.so + +%files -n libqt5-sql-unixODBC +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_plugindir}/sqldrivers/libqsqlodbc*.so + +%files -n libqt5-sql-postgresql +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_plugindir}/sqldrivers/libqsqlpsql*.so + +%files -n libqt5-sql-mysql +%defattr(-,root,root,755) +%doc *.txt LICENSE.LGPL LICENSE.FDL +%{libqt5_plugindir}/sqldrivers/libqsqlmysql*.so + +%changelog diff --git a/macros.qt5 b/macros.qt5 new file mode 100644 index 0000000..56a098c --- /dev/null +++ b/macros.qt5 @@ -0,0 +1,16 @@ +%_libqt5_prefix %{_prefix} +%_libqt5_libdir %{_libdir} +%_libqt5_archdatadir %{_libqt5_libdir}/qt5 +%_libqt5_bindir %{_libqt5_archdatadir}/bin +%_libqt5_datadir %{_datadir}/qt5 +%_libqt5_docdir %{_docdir}/qt5 +%_libqt5_examplesdir %{_libqt5_archdatadir}/examples +%_libqt5_includedir %{_includedir}/qt5 +%_libqt5_importdir %{_libqt5_archdatadir}/imports +%_libqt5_libexecdir %{_libqt5_archdatadir}/libexec +%_libqt5_plugindir %{_libqt5_archdatadir}/plugins +%_libqt5_sysconfdir %{_sysconfdir}/xdg +%_libqt5_translationdir %{_libqt5_datadir}/qt5/translations + + + diff --git a/qmake-add-usr-include.diff b/qmake-add-usr-include.diff new file mode 100644 index 0000000..7280c5c --- /dev/null +++ b/qmake-add-usr-include.diff @@ -0,0 +1,11 @@ +--- 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 @@ + << varGlue("DEFINES","-D"," -D","") << endl; + t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)" << endl; + t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)" << endl; +- t << "INCPATH = " << "-I" << specdir(); ++ t << "INCPATH = " << "-I/usr/include -I" << specdir(); + if(!project->isActiveConfig("no_include_pwd")) { + QString pwd = escapeFilePath(fileFixify(qmake_getpwd())); + if(pwd.isEmpty()) diff --git a/qt-never-strip.diff b/qt-never-strip.diff new file mode 100644 index 0000000..55a7b93 --- /dev/null +++ b/qt-never-strip.diff @@ -0,0 +1,28 @@ +--- qtbase/configure 2012/05/24 14:10:06 1.1 ++++ qtbase/configure 2012/05/24 14:11:09 +@@ -65,7 +65,6 @@ + + # initialize global variables + QMAKE_SWITCHES= +-QMAKE_VARS= + QMAKE_CONFIG= + QTCONFIG_CONFIG= + QT_CONFIG= +@@ -1199,7 +1198,7 @@ + QMakeVar add QMAKE_CFLAGS -pg + QMakeVar add QMAKE_CXXFLAGS -pg + QMakeVar add QMAKE_LFLAGS -pg +- QMAKE_VARS="$QMAKE_VARS CONFIG+=nostrip" ++ QMakeVar add CONFIG nostrip + else + UNKNOWN_OPT=yes + fi +@@ -2426,6 +2425,8 @@ + esac + fi + ++QMakeVar add CONFIG nostrip ++ + #------------------------------------------------------------------------------- + # tests that don't need qmake (must be run before displaying help) + #------------------------------------------------------------------------------- diff --git a/qtbase-opensource-src-5.1.0.tar.xz b/qtbase-opensource-src-5.1.0.tar.xz new file mode 100644 index 0000000..368285c --- /dev/null +++ b/qtbase-opensource-src-5.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fa8c591adab9d45e4f322edea9a55a517ebf1a006dd481eace0236623adc90a +size 45738944