- rebase patches, avoiding use of patch fuzz
- omit old qt-copy/kde-qt patches, pending review - omit kde4_plugin patch - ftbfs: qml/libQtMediaServices no longer included
This commit is contained in:
Rex Dieter
parent
3eee5c4831
commit
7ee938e92b
|
|
@ -1,10 +1,11 @@
|
|||
diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp
|
||||
--- qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2009-04-21 18:57:41.000000000 -0500
|
||||
+++ qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp 2009-05-06 13:53:40.258081854 -0500
|
||||
@@ -2061,6 +2061,15 @@ QStringList QCoreApplication::libraryPat
|
||||
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp
|
||||
--- qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp.kde4_plugins 2010-06-29 20:53:15.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/kernel/qcoreapplication.cpp 2010-07-08 08:24:12.714604479 -0500
|
||||
@@ -2262,6 +2262,15 @@ QStringList QCoreApplication::libraryPat
|
||||
if (!app_libpaths->contains(installPathPlugins))
|
||||
app_libpaths->append(installPathPlugins);
|
||||
}
|
||||
|
||||
+
|
||||
+ // hack in support for kde4 plugin paths -- Rex
|
||||
+ QString kde4PathPlugins = QLibraryInfo::location(QLibraryInfo::LibrariesPath) + QLatin1String("/kde4/plugins");
|
||||
+ if (QFile::exists(kde4PathPlugins)) {
|
||||
|
|
@ -13,7 +14,6 @@ diff -up qt-x11-opensource-src-4.5.1/src/corelib/kernel/qcoreapplication.cpp.kde
|
|||
+ if (!app_libpaths->contains(kde4PathPlugins))
|
||||
+ app_libpaths->append(kde4PathPlugins);
|
||||
+ }
|
||||
+
|
||||
#endif
|
||||
|
||||
// If QCoreApplication is not yet instantiated,
|
||||
// make sure we add the application path when we construct the QCoreApplication
|
||||
if (self) self->d_func()->appendApplicationPathToLibraryPaths();
|
||||
|
|
@ -1,16 +1,8 @@
|
|||
diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure
|
||||
--- qt-x11-opensource-src-4.5.1/configure.mysql_config 2009-05-04 09:14:37.105826464 -0500
|
||||
+++ qt-x11-opensource-src-4.5.1/configure 2009-05-04 09:15:26.747077312 -0500
|
||||
@@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th
|
||||
CFG_ACCESSIBILITY=yes
|
||||
fi
|
||||
|
||||
+set -x
|
||||
# auto-detect SQL-modules support
|
||||
for _SQLDR in $CFG_SQL_AVAILABLE; do
|
||||
case $_SQLDR in
|
||||
@@ -4342,8 +4343,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
|
||||
[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
|
||||
diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure
|
||||
--- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500
|
||||
@@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
|
||||
[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config`
|
||||
if [ -x "$CFG_MYSQL_CONFIG" ]; then
|
||||
QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
|
||||
+ $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
|
||||
|
|
@ -1,32 +1,6 @@
|
|||
diff -ur qt-orig/src/phonon/phonon.pro qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro
|
||||
--- qt-orig/src/phonon/phonon.pro 2009-06-20 06:57:57.000000000 +0200
|
||||
+++ qt-x11-opensource-src-4.5.2/src/phonon/phonon.pro 2009-06-25 19:30:00.000000000 +0200
|
||||
@@ -112,4 +112,9 @@
|
||||
DEFINES += QT_NO_DBUS
|
||||
}
|
||||
|
||||
+# install dbus service file
|
||||
+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
|
||||
+sources.path = /usr/share/dbus-1/interfaces
|
||||
+INSTALLS += sources
|
||||
+
|
||||
contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
|
||||
diff -ur qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro
|
||||
--- qt-orig/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-20 06:57:58.000000000 +0200
|
||||
+++ qt-x11-opensource-src-4.5.2/src/plugins/phonon/gstreamer/gstreamer.pro 2009-06-25 19:31:36.000000000 +0200
|
||||
@@ -62,6 +62,8 @@
|
||||
}
|
||||
|
||||
target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
|
||||
-INSTALLS += target
|
||||
+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
|
||||
+services.path = /usr/share/kde4/services/phononbackends
|
||||
+INSTALLS += target services
|
||||
|
||||
include(../../qpluginbase.pri)
|
||||
diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
|
||||
--- qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-20 06:57:54.000000000 +0200
|
||||
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2009-06-25 19:30:00.000000000 +0200
|
||||
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop
|
||||
--- qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop.servicesfile 2010-06-29 20:53:12.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/3rdparty/phonon/gstreamer/gstreamer.desktop 2010-07-08 08:25:50.419855085 -0500
|
||||
@@ -2,7 +2,7 @@
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=PhononBackend
|
||||
|
|
@ -36,3 +10,31 @@ diff -ur qt-orig/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-x11-opensour
|
|||
X-KDE-PhononBackendInfo-InterfaceVersion=1
|
||||
X-KDE-PhononBackendInfo-Version=0.1
|
||||
X-KDE-PhononBackendInfo-Website=http://gstreamer.freedesktop.org/
|
||||
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro
|
||||
--- qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro.servicesfile 2010-06-29 20:53:13.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/phonon/phonon.pro 2010-07-08 08:26:58.307612257 -0500
|
||||
@@ -122,6 +122,11 @@ contains(QT_CONFIG, dbus) {
|
||||
DEFINES += QT_NO_DBUS
|
||||
}
|
||||
|
||||
+# install dbus service file
|
||||
+sources.files = $$PHONON_DIR/org.kde.Phonon.AudioOutput.xml
|
||||
+sources.path = /usr/share/dbus-1/interfaces
|
||||
+INSTALLS += sources
|
||||
+
|
||||
contains(QT_CONFIG, reduce_exports): CONFIG += hide_symbols
|
||||
|
||||
unix:!isEmpty(QT_CFLAGS_PULSEAUDIO) {
|
||||
diff -up qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro
|
||||
--- qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro.servicesfile 2010-06-29 20:53:14.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/plugins/phonon/gstreamer/gstreamer.pro 2010-07-08 08:25:50.387854526 -0500
|
||||
@@ -64,6 +64,8 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstra
|
||||
}
|
||||
|
||||
target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
|
||||
-INSTALLS += target
|
||||
+services.files = $$PHONON_GSTREAMER_DIR/gstreamer.desktop
|
||||
+services.path = /usr/share/kde4/services/phononbackends
|
||||
+INSTALLS += target services
|
||||
|
||||
include(../../qpluginbase.pri)
|
||||
26
qt.spec
26
qt.spec
|
|
@ -8,10 +8,8 @@
|
|||
## WAS https://bugs.webkit.org/show_bug.cgi?id=35154
|
||||
#define no_javascript_jit -no-javascript-jit
|
||||
|
||||
%define _default_patch_fuzz 3
|
||||
|
||||
# enable kde-qt integration/patches
|
||||
%define kde_qt 1
|
||||
#define kde_qt 1
|
||||
|
||||
%define pre beta2
|
||||
|
||||
|
|
@ -19,7 +17,7 @@ Summary: Qt toolkit
|
|||
Name: qt
|
||||
Epoch: 1
|
||||
Version: 4.7.0
|
||||
Release: 0.25.%{pre}%{?dist}
|
||||
Release: 0.26.%{pre}%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
|
@ -44,8 +42,9 @@ Patch4: qt-everywhere-opensource-src-4.7.0-beta1-uic_multilib.patch
|
|||
Patch5: qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch
|
||||
Patch15: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
|
||||
# include kde4 plugin path, http://bugzilla.redhat.com/498809
|
||||
Patch16: qt-x11-opensource-src-4.5.1-kde4_plugins.patch
|
||||
Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
|
||||
# omit for now, (seems?) causes unwelcome side-effects -- Rex
|
||||
Patch16: qt-everywhere-opensource-src-4.7.0-beta2-kde4_plugins.patch
|
||||
Patch19: qt-everywhere-opensource-src-4.7.0-beta2-phonon_servicesfile.patch
|
||||
# use system ca-bundle certs, http://bugzilla.redhat.com/521911
|
||||
Patch22: qt-x11-opensource-src-4.5.3-system_ca_certificates.patch
|
||||
Requires: ca-certificates
|
||||
|
|
@ -58,7 +57,7 @@ Patch23: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
|
|||
Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
||||
# fix invalid assumptions about mysql_config --libs
|
||||
# http://bugzilla.redhat.com/440673
|
||||
Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
|
||||
Patch54: qt-everywhere-opensource-src-4.7.0-beta2-mysql_config.patch
|
||||
# http://bugs.kde.org/show_bug.cgi?id=180051#c22
|
||||
Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
|
||||
# Add s390x as 64bit and s390 as 31bit bigendian platform
|
||||
|
|
@ -416,8 +415,8 @@ Qt libraries used for drawing widgets and OpenGL items.
|
|||
|
||||
%patch5 -p1 -b .bz#437440-as_IN-437440
|
||||
%patch15 -p1 -b .enable_ft_lcdfilter
|
||||
%patch16 -p1 -b .kde4_plugins
|
||||
%patch19 -p1 -b .servicesfile
|
||||
#patch16 -p1 -b .kde4_plugins
|
||||
%patch19 -p1 -b .phonon_servicesfile
|
||||
%patch22 -p1 -b .system_ca_certificates
|
||||
%patch23 -p1 -b .glib_eventloop_nullcheck
|
||||
## TODO: still worth carrying? if so, upstream it.
|
||||
|
|
@ -1072,7 +1071,6 @@ fi
|
|||
%{_qt4_libdir}/libQtDesignerComponents.so.4*
|
||||
%{_qt4_libdir}/libQtGui.so.4*
|
||||
%{_qt4_libdir}/libQtHelp.so.4*
|
||||
%{_qt4_libdir}/libQtMediaServices.so.4*
|
||||
%{_qt4_libdir}/libQtMultimedia.so.4*
|
||||
%{_qt4_libdir}/libQtOpenGL.so.4*
|
||||
%{_qt4_libdir}/libQtScriptTools.so.4*
|
||||
|
|
@ -1086,12 +1084,10 @@ fi
|
|||
%endif
|
||||
%if "%{_qt4_bindir}" != "%{_bindir}"
|
||||
%{_bindir}/assistant*
|
||||
%{_bindir}/qml
|
||||
%{?dbus:%{_bindir}/qdbusviewer}
|
||||
%{_bindir}/qt*config*
|
||||
%endif
|
||||
%{_qt4_bindir}/assistant*
|
||||
%{_qt4_bindir}/qml
|
||||
%{?dbus:%{_qt4_bindir}/qdbusviewer}
|
||||
%{_qt4_bindir}/qt*config*
|
||||
%{_datadir}/applications/*qtconfig.desktop
|
||||
|
|
@ -1099,6 +1095,12 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.7.0-0.26.beta1
|
||||
- rebase patches, avoiding use of patch fuzz
|
||||
- omit old qt-copy/kde-qt patches, pending review
|
||||
- omit kde4_plugin patch
|
||||
- ftbfs: qml/libQtMediaServices no longer included
|
||||
|
||||
* Thu Jul 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.7.0-0.25.beta1
|
||||
- 4.7.0-beta2
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue