Browse Source

update: qt4
NEW: qt-assistant-adp


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3369 ec354946-7b23-47d6-9f5a-488ba84defc7

inagaki 14 years ago
parent
commit
67613d5abe
2 changed files with 178 additions and 3 deletions
  1. 162 0
      q/qt-assistant-adp/qt-assistant-adp-vl.spec
  2. 16 3
      q/qt4/qt4-vl.spec

+ 162 - 0
q/qt-assistant-adp/qt-assistant-adp-vl.spec

@@ -0,0 +1,162 @@
+Name:    qt-assistant-adp
+Summary: Compatibility version of Qt Assistant
+Version: 4.6.3
+Release: 3%{?_dist_release}
+
+Group: System Environment/Libraries
+# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
+License: LGPLv2 with exceptions or GPLv3 with exceptions
+URL: http://qt.nokia.com/doc/4.6/qassistantclient.html
+
+Source: ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-%{version}.tar.gz
+# missing header files from Debian (Fathi Boudra)
+Source1: QAssistantClient
+Source2: QtAssistant
+# build fixes from Debian (Fathi Boudra)
+Patch1: 01_build_system.diff
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+BuildRequires: qt4-devel >= 4.7.2
+Requires: qt4 = %{_qt4_version}
+
+%description
+The old version of Qt Assistant, based on Assistant Document Profile (.adp)
+files, and the associated QtAssistantClient library, for compatibility with
+applications providing help in that format.
+
+New applications should use the new version of Qt Assistant introduced in Qt
+4.4, based on the Qt Help Framework also introduced in Qt 4.4, instead.
+
+
+%package devel
+Summary: Development files for the compatibility QAssistantClient
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel = %{_qt4_version}
+
+%description devel
+This package contains the files necessary to build applications using the
+deprecated QAssistantClient class (in the deprecated QtAssistantClient library),
+which is used together with the legacy Assistant Document Profile (.adp) version
+of Qt Assistant.
+
+This class is obsolete. It is provided to keep old source code working. We
+strongly advise against using it in new code. New code should use the Qt Help
+Framework introduced in Qt 4.4 and/or the version of Qt Assistant based on it
+(also introduced in Qt 4.4) instead.
+
+
+%prep
+%setup -q -n qt-assistant-qassistantclient-library-compat-version-%{version}
+%patch1 -p1 -b .build_system
+mkdir include
+cp -p %{SOURCE1} %{SOURCE2} include/
+
+
+%build
+# build assistant_adp
+qmake QT_PRODUCT=OpenSource
+make %{?_smp_mflags}
+
+# build libQtAssistantClient
+cd lib
+qmake CONFIG=create_prl
+make %{?_smp_mflags}
+
+# build assistant_adp translations
+cd ../translations
+lrelease assistant_adp_*.ts
+cd ..
+
+
+%install
+rm -rf %{buildroot}
+
+# install assistant_adp
+make install INSTALL_ROOT=%{buildroot}
+
+# install libQtAssistantClient
+make install INSTALL_ROOT=%{buildroot} -C lib
+
+# install assistant_adp translations
+mkdir -p %{buildroot}%{_qt4_translationdir}
+install -p -m644 translations/assistant_adp_*.qm \
+                 %{buildroot}%{_qt4_translationdir}/
+
+# install assistant.prf mkspec
+install -D -p -m644 features/assistant.prf \
+                    %{buildroot}%{_qt4_datadir}/mkspecs/features/assistant.prf
+
+# install missing headers (thanks to Fathi Boudra from Debian)
+install -p -m644 include/Q* %{buildroot}%{_qt4_headerdir}/QtAssistant/
+
+# nuke dangling reference(s) to the buildroot
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
+
+# let rpm handle binaries conflicts
+mkdir %{buildroot}%{_bindir}
+pushd %{buildroot}%{_qt4_bindir}
+mv assistant_adp ../../../bin/
+ln -s ../../../bin/assistant_adp .
+popd
+
+# _debug target (see bug #196513)
+pushd %{buildroot}%{_qt4_libdir}
+echo "INPUT(-lQtAssistantClient)" >libQtAssistantClient_debug.so
+popd
+
+# Note that we intentionally DO NOT install a .desktop file for assistant_adp
+# because it makes no sense to invoke it without a specific .adp file to open.
+# By default, it views the Qt documentation, for which we already have a menu
+# entry using the current version of the Qt Assistant, and there is no UI for
+# viewing anything different. The .adp file needs to be passed on the command
+# line, which is usually done by the application.
+
+%find_lang assistant_adp --with-qt --without-mo
+
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mv $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig $RPM_BUILD_ROOT%{_libdir}
+
+%clean
+rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files -f assistant_adp.lang
+%defattr(-,root,root,-)
+%doc LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
+%{_bindir}/assistant_adp
+%{_qt4_bindir}/assistant_adp
+%{_qt4_libdir}/libQtAssistantClient.so.4*
+
+%files devel
+%defattr(-,root,root,-)
+%{_qt4_headerdir}/QtAssistant/
+%{_qt4_libdir}/libQtAssistantClient.so
+%{_qt4_libdir}/libQtAssistantClient_debug.so
+%{_qt4_libdir}/libQtAssistantClient.prl
+%{_libdir}/pkgconfig/QtAssistantClient.pc
+%{_qt4_datadir}/mkspecs/features/assistant.prf
+
+
+%changelog
+* Sat Apr 09 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 4.6.3-3
+- Initial build for Vine Linux
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jul 05 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.6.3-1
+- new upstream tarball with only the compat assistant_adp and QAssistantClient
+- build fixes from Debian (Fathi Boudra)
+- use find_lang to package the qm files (#609749)
+
+* Tue Mar 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.6.2-2
+- use versioned BR/Requires to avoid Conflicts
+
+* Sat Mar 13 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.6.2-1
+- first Fedora package

+ 16 - 3
q/qt4/qt4-vl.spec

@@ -35,7 +35,7 @@ Summary: Qt toolkit
 Summary(ja): Qt ツールキット
 Name: qt4
 Version: 4.7.2
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@@ -118,6 +118,8 @@ Patch65: qt-everywhere-opensource-src-4.7.1-qtreeview-kpackagekit-crash.patch
 # adds debug support to webkit/JavaScriptCore
 # UPSTREAM ME
 Patch105: qt-everywhere-opensource-src-4.7.1-webkit_debug_javascriptcore.patch
+# Fix QNetworkConfigurationManager crash due to null private pointer. (QTBUG-17305, rhbz#682656)
+Patch106: http://qt.gitorious.org/qt/qt/commit/4d3b9aa83cf7f6d9f9b88d9936e5980629daac2a.patch
 
 # kde-qt git patches
 Patch202: 0002-This-patch-makes-override-redirect-windows-popup-men.patch
@@ -126,6 +128,10 @@ Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch
 
 # security patches
 Patch300: qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch
+Patch301: qt-ssl-QTBUG-18338.patch
+# http://qt.gitorious.org/+qt-developers/qt/staging/commit/b87528a71b66e786c11804d7b79e408aae612748
+# followup to 301
+Patch302: qt-ssl-QTBUG-18338-2.patch
 
 # Vine Patches
 # use system ca-bundle certs, http://bugzilla.redhat.com/521911
@@ -344,6 +350,7 @@ applications using the Qt toolkit.
 
 # upstream patches
 %patch105 -p1 -b .webkit_debug_javascriptcore
+%patch106 -p1 -b .QNetworkConfigurationManager-null-pointer
 
 # kde-qt branch
 %if 0%{?kde_qt}
@@ -354,6 +361,8 @@ applications using the Qt toolkit.
 
 # security fixes
 %patch300 -p1 -b .CVE-2010-1822-crash-svg-image
+%patch301 -p1 -b .ssl-QTBUG-18338
+%patch302 -p1 -b .ssl-QTBUG-18338-2
 
 # Patches for Vine
 %patch1022 -p0 -b .system_ca_certificates
@@ -615,9 +624,9 @@ cat > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.qt4 << EOF
 %%_qt4_demosdir %%{_qt4_prefix}/demos
 %%_qt4_docdir %%{_docdir}/qt4
 %%_qt4_examples %%{_qt4_prefix}/examples
-%%_qt4_headerdir %%{_includedir}
+%%_qt4_headerdir %%{_qt4_prefix}/include
 %%_qt4_importdir %%{_qt4_prefix}/imports
-%%_qt4_libdir %%{_libdir}
+%%_qt4_libdir %%{_qt4_prefix}/lib
 %%_qt4_plugindir %%{_qt4_prefix}/plugins
 %%_qt4_qmake %%{_qt4_bindir}/qmake
 %%_qt4_sysconfdir %%{_sysconfdir}
@@ -980,6 +989,10 @@ fi
 %endif
 
 %changelog
+* Sat Apr  9 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.2-2
+- added Patch 106, 301 and 302
+- fixed /etc/rpm/macros.qt4
+
 * Sun Mar  6 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.7.2-1
 - new upstream release
 - updated Patch1022