2015-02-01 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* qt-gstreamer: new
	* qt4: added patches and removed gstreamer-0.10 dependency
	


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

q/qt-gstreamer/qt-gstreamer-vl.spec

@@ -0,0 +1,144 @@
+Name:           qt-gstreamer
+Version:        1.2.0
+Release:        3%{?_dist_release}
+Summary:        C++ bindings for GStreamer with a Qt-style API
+Summary(ja):    Qt スタイルの API を備えた Gstreamer の C++ バインディング
+
+License:        LGPLv2+
+Group:          System Environment/Libraries
+URL:            http://gstreamer.freedesktop.org/modules/qt-gstreamer.html
+
+Source0:        http://gstreamer.freedesktop.org/src/%{name}/%{name}-%{version}.tar.xz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  automoc4
+BuildRequires:  cmake
+BuildRequires:  libboost-devel
+BuildRequires:  gstreamer1-plugins-base-devel
+BuildRequires:  qt4-devel
+#BuildRequires:  qt5-qtdeclarative-devel
+#BuildRequires:  qt5-qtquick1-devel
+
+%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
+
+%description
+QtGStreamer provides C++ bindings for GStreamer with a Qt-style
+API, plus some helper classes for integrating GStreamer better
+in Qt4 applications.
+
+
+%package devel
+Summary:        Header files and development adocumentation for %{name}
+Summary(ja):    %{name} の開発用ファイル
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libboost-devel
+
+%description devel
+This package contains the header files and development documentation
+for %{name}.
+
+%prep
+%setup -q
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake -DQT_VERSION=4 ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+rm -rf %{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README
+%{_libdir}/gstreamer-1.0/libgstqtvideosink.so
+%{_libdir}/libQtGLib-2.0.so.0
+%{_libdir}/libQtGLib-2.0.so.1*
+%{_libdir}/libQtGStreamer-1.0.so.0
+%{_libdir}/libQtGStreamer-1.0.so.1*
+%{_libdir}/libQtGStreamerUi-1.0.so.0
+%{_libdir}/libQtGStreamerUi-1.0.so.1*
+%{_libdir}/libQtGStreamerUtils-1.0.so.0
+%{_libdir}/libQtGStreamerUtils-1.0.so.1*
+%{_libdir}/qt4/imports/QtGStreamer/
+
+%files devel
+%defattr(-,root,root,-)
+%doc HACKING
+%{_includedir}/QtGStreamer
+%{_libdir}/cmake/QtGStreamer
+%{_libdir}/libQtGLib-2.0.so
+%{_libdir}/libQtGStreamer-1.0.so
+%{_libdir}/libQtGStreamerUi-1.0.so
+%{_libdir}/libQtGStreamerUtils-1.0.so
+%{_libdir}/pkgconfig/QtGLib-2.0.pc
+%{_libdir}/pkgconfig/QtGStreamer-1.0.pc
+%{_libdir}/pkgconfig/QtGStreamerUi-1.0.pc
+%{_libdir}/pkgconfig/QtGStreamerUtils-1.0.pc
+
+
+%changelog
+* Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.2.0-3
+- Initial build for Vine Linux
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jul  9 2014 Alexey Kurov <nucleo@fedoraproject.org> - 1.2.0-1
+- qt-gstreamer-1.2.0
+- switch to gstreamer1
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 0.10.3-3
+- Rebuild for boost 1.55.0
+
+* Fri Nov 15 2013 Alexey Kurov <nucleo@fedoraproject.org> - 0.10.3-2
+- rebuilt for arm switch qreal double
+
+* Wed Oct 16 2013 Alexey Kurov <nucleo@fedoraproject.org> - 0.10.3-1
+- qt-gstreamer-0.10.3
+- BR: qt5-qtbase-devel qt5-qtquick1-devel
+- added qt5-gstreamer and qt5-gstreamer-devel subpackages
+- remove Requires pulled in via automatic pkgconfig deps
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 0.10.2-5
+- Rebuild for boost 1.54.0
+
+* Sun Feb 10 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.10.2-4
+- Rebuild for Boost-1.53.0
+
+* Sat Feb 09 2013 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.10.2-3
+- Rebuild for Boost-1.53.0
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sun Apr 15 2012 Alexey Kurov <nucleo@fedoraproject.org> - 0.10.2-1
+- qt-gstreamer-0.10.2
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Aug 31 2011 Alexey Kurov <nucleo@fedoraproject.org> - 0.10.1-2
+- Fix compilation with glib 2.29 (FTBFS #716209)
+
+* Thu Feb  3 2011 Alexey Kurov <nucleo@fedoraproject.org> - 0.10.1-1
+- Initial RPM release

q/qt4/qt4-vl.spec

@@ -8,7 +8,7 @@ Summary: Qt toolkit
 Summary(ja): Qt ツールキット
 Name: qt4
 Version: 4.8.6
-Release: 2%{?_dist_release}
+Release: 3%{?_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
@@ -26,8 +26,9 @@ Source5: qconfig-multilib.h
 Source20: assistant.desktop.vine
 Source21: designer.desktop.vine
 Source22: linguist.desktop.vine
-Source23: qtdemo.desktop.vine
+Source23: qdbusviewer.desktop.vine
-Source24: qtconfig.desktop.vine
+Source24: qtdemo.desktop.vine
+Source25: qtconfig.desktop.vine
 
 # upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
 Source30: hi128-app-qt4-logo.png
@@ -46,10 +47,17 @@ Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
 # workaround for gdal/grass crashers wrt glib_eventloop null deref's
 Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
 
+# hack out largely useless (to users) warnings about qdbusconnection
+# (often in kde apps), keep an eye on https://git.reviewboard.kde.org/r/103699/
+Patch25: qt-everywhere-opensource-src-4.8.3-qdbusconnection_no_debug.patch
+
 # kde4/multilib QT_PLUGIN_PATH
 Patch28: qt-everywhere-opensource-src-4.8.5-qt_plugin_path.patch
 
 ## upstreamable bits
+# add support for pkgconfig's Requires.private to qmake
+Patch50: qt-everywhere-opensource-src-4.8.4-qmake_pkgconfig_requires_private.patch
+
 # fix invalid inline assembly in qatomic_{i386,x86_64}.h (de)ref implementations
 Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
 
@@ -83,9 +91,6 @@ Patch71: qt-everywhere-opensource-src-4.8.5-QTBUG-21900.patch
 # sql/drivers/tds/qsql_tds.cpp:341:49: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]
 Patch74: qt-everywhere-opensource-src-4.8.5-tds_no_strict_aliasing.patch
 
-# workaround crash on ppc64
-Patch75: qt-ppc64-crash.patch
-
 # add missing method for QBasicAtomicPointer on s390(x)
 Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
 
@@ -101,10 +106,29 @@ Patch81: qt-everywhere-opensource-src-4.8.2--assistant-crash.patch
 # QDir::homePath() should account for an empty HOME environment variable on X11
 Patch82: qt-everywhere-opensource-src-4.8.5-QTBUG-4862.patch
 
+# poll support
+Patch83: qt-4.8-poll.patch
+
+# fix QTBUG-35459 (too low entityCharacterLimit=1024 for CVE-2013-4549)
+Patch84: qt-everywhere-opensource-src-4.8.5-QTBUG-35459.patch
+
+# systemtrayicon plugin support (for appindicators)
+Patch86: qt-everywhere-opensource-src-4.8.6-systemtrayicon.patch
+
+# fixes for LibreOffice from the upstream Qt bug tracker (#1105422):
+Patch87: qt-everywhere-opensource-src-4.8.6-QTBUG-37380.patch
+Patch88: qt-everywhere-opensource-src-4.8.6-QTBUG-34614.patch
+Patch89: qt-everywhere-opensource-src-4.8.6-QTBUG-38585.patch
+
 # upstream patches
 # http://codereview.qt-project.org/#change,22006
 Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
 
+# backported from Qt5 (essentially)
+# http://bugzilla.redhat.com/702493
+# https://bugreports.qt-project.org/browse/QTBUG-5545
+Patch102: qt-everywhere-opensource-src-4.8.5-qgtkstyle_disable_gtk_theme_check.patch
+
 # workaround for MOC issues with Boost headers (#756395)
 # https://bugreports.qt-project.org/browse/QTBUG-22829
 Patch113: qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
@@ -123,10 +147,11 @@ Patch1001: qt-everywhere-opensource-src-4.8.0-system_ca_certificates_vine.patch
 %define odbc -plugin-sql-odbc
 %define psql -plugin-sql-psql
 %define sqlite -plugin-sql-sqlite
-%define tds -no-sql-tds
+%define tds -plugin-sql-tds
 
-%define phonon -phonon
+# don't build with phonon backend now
-%define phonon_backend -phonon-backend
+#define phonon -phonon
+#define phonon_backend -phonon-backend
 %define dbus -dbus-linked
 %define graphicssystem -graphicssystem raster
 # FIXME/TODO: use system webkit for assistant, examples/webkit, demos/browser
@@ -203,6 +228,9 @@ BuildRequires: unixODBC-devel
 BuildRequires: sqlite3-devel
 %endif
 
+%if "%{?tds}" != "-no-sql-tds"
+BuildRequires: freetds-devel
+%endif
 
 Obsoletes: qt4-sqlite < 4.7.3
 Provides:  qt4-sqlite = %{version}-%{release}
@@ -228,6 +256,7 @@ applications, as well as the README files for qt.
 
 %package config
 Summary: Graphical configuration tool for programs using Qt 4 
+Summary(ja): Qt 4 を使用するプログラムのためのグラフィカルな設定ツール
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires(post): alternatives
@@ -284,6 +313,9 @@ Summary: API documentation for Qt4
 Summary(ja): Qt4 の API ドキュメント
 Group: Documentation
 Requires: %{name} = %{version}-%{release}
+# Requires assistant
+Requires: qt4-tools = %{version}-%{release}
+BuildArch: noarch
 
 %description doc
 %{summary}.
@@ -325,6 +357,7 @@ IBase driver for Qt's SQL classes (QSQL)
 
 %package MySQL
 Summary: MySQL drivers for Qt's SQL classes.
+Summary(ja): Qt SQL 用の MySQL ドライバ
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Provides:  qt4-mysql = %{version}-%{release}
@@ -334,6 +367,7 @@ MySQL driver for Qt's SQL classes (QSQL)
 
 %package ODBC
 Summary: ODBC drivers for Qt's SQL classes.
+Summary(ja): Qt SQL 用の ODBC ドライバ
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Provides:  qt4-odbc = %{version}-%{release}
@@ -352,6 +386,7 @@ PostgreSQL driver for Qt's SQL classes (QSQL)
 
 %package tds
 Summary: TDS driver for Qt's SQL classes
+Summary(ja): Qt SQL 用の TDS ドライバ
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Provides: qt-tds = %{version}-%{release}
@@ -397,6 +432,9 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
 %patch4 -p1 -b .uic_multilib
 %patch15 -p1 -b .enable_ft_lcdfilter
 %patch23 -p1 -b .glib_eventloop_nullcheck
+%patch25 -p1 -b .qdbusconnection_no_debug
+%patch28 -p1 -b .qt_plugin_path
+%patch50 -p1 -b .qmake_pkgconfig_requires_private
 ## TODO: still worth carrying?  if so, upstream it.
 %patch53 -p1 -b .qatomic-inline-asm
 ## TODO: upstream me
@@ -411,17 +449,25 @@ popd
 %patch69 -p1 -b .QTBUG-22037
 %patch71 -p1 -b .QTBUG-21900
 %patch74 -p1 -b .tds_no_strict_aliasing
-%patch75 -p1 -b .ppc64-crash
+#patch75 -p1 -b .ppc64-crash
 %patch76 -p1 -b .s390-atomic
 %patch77 -p1 -b .icu_no_spam
 %patch81 -p1 -b .assistant-crash
 %patch82 -p1 -b .QTBUG-4862
+%patch83 -p1 -b .poll
+%patch87 -p1 -b .QTBUG-37380
+%patch88 -p0 -b .QTBUG-34614
+%patch89 -p0 -b .QTBUG-38585
 
 # upstream patches
 %patch100 -p1 -b .QTgaHandler
+%patch102 -p1 -b .qgtkstyle_disable_gtk_theme_check
 %patch113 -p1 -b .QTBUG-22829
 
 # security fixes
+# regression fixes for the security fixes
+%patch84 -p1 -b .QTBUG-35459
+%patch86 -p1 -b .systemtrayicon
 
 # Patches for Vine
 %patch1001 -p1 -b .system_ca_certificates
@@ -466,8 +512,9 @@ done
 sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE20} > assistant.desktop
 sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE21} > designer.desktop
 sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE22} > linguist.desktop
-sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE23} > qtdemo.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE23} > qdbusviewer.desktop
-sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE24} > qtconfig.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE24} > qtdemo.desktop
+sed -e 's:$(QTBIN):%{_qt4_bindir}:g' %{SOURCE25} > qtconfig.desktop
 
 %build
 # build shared, threaded (default) libraries
@@ -574,7 +621,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
     --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
     --vendor="" \
-    assistant.desktop designer.desktop linguist.desktop qtconfig.desktop
+    assistant.desktop designer.desktop linguist.desktop qdbusviewer.desktop qtconfig.desktop
 
 ## pkg-config
 # strip extraneous dirs/libraries 
@@ -645,6 +692,9 @@ for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
     size=$(echo $(basename ${icon}) | cut -d- -f2)
     install -p -m644 -D ${icon} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/linguist4.png
 done
+# qdbusviewer icons
+install -p -m644 -D tools/qdbus/qdbusviewer/images/qdbusviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/qdbusviewer.png
+install -p -m644 -D tools/qdbus/qdbusviewer/images/qdbusviewer-128.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/qdbusviewer.png
 
 # Qt.pc
 cat > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/Qt.pc << EOF
@@ -1008,8 +1058,10 @@ fi
 %{_qt4_translationdir}/linguist_*.qm
 %{_datadir}/applications/assistant.desktop
 %{_datadir}/applications/linguist.desktop
+%{_datadir}/applications/qdbusviewer.desktop
 %{_datadir}/icons/hicolor/*/apps/assistant*
 %{_datadir}/icons/hicolor/*/apps/linguist*
+%{_datadir}/icons/hicolor/*/apps/qdbusviewer*
 %{_qt4_docdir}/qch/linguist.qch
 
 %if 0%{?qvfb}
@@ -1087,6 +1139,15 @@ fi
 %endif
 
 %changelog
+* Sun Feb  1 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.8.6-3
+- updated Source20, 21, 22 and 23
+- added Patch25, 50, 83, 84, 86, 87, 88, 89 and 102 from Fedora
+- dropt Patch75
+- dropt phonon-gstreamer support, built without gstreamer 0.10.x
+- added qdbusviewer.desktops
+- added tds subpackage
+- changed doc subpackage to noarch.rpm
+
 * Mon Jul 14 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 4.8.6-2
 - rebuilt