rpms/qt/F-11 qt-x11-opensource-src-4.5.1-kde4_plugins.patch, NONE, 1.1 qt-x11-opensource-src-4.5.1-mysql_config.patch, NONE, 1.1 qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch, 1.1, 1.2 qt.spec, 1.266, 1.267

Rex Dieter rdieter at fedoraproject.org
Fri May 8 20:31:15 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24607

Modified Files:
	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-kde4_plugins.patch 
	qt-x11-opensource-src-4.5.1-mysql_config.patch 
Log Message:
sync w/devel for latest goodness


qt-x11-opensource-src-4.5.1-kde4_plugins.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-kde4_plugins.patch ---
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
                 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)) {
+            // Make sure we convert from backslashes to slashes.
+            // kde4PathPlugins = QDir(kde4PathPlugins).canonicalPath();
+            if (!app_libpaths->contains(kde4PathPlugins))
+                app_libpaths->append(kde4PathPlugins);
+        }
+
         // If QCoreApplication is not yet instantiated,
         // make sure we add the application path when we construct the QCoreApplication
         if (self) self->d_func()->appendApplicationPathToLibraryPaths();

qt-x11-opensource-src-4.5.1-mysql_config.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-mysql_config.patch ---
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`
                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
+                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
+                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
+                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
+                    QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r"
+                    QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient"
+                    else
                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
+                    fi
 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
                 fi

qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch:

Index: qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	24 Apr 2009 17:17:51 -0000	1.1
+++ qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch	8 May 2009 20:31:14 -0000	1.2
@@ -6,16 +6,7 @@ diff -up qt-x11-opensource-src-4.5.1/src
  #endif
  
 -#if defined(FT_LCD_FILTER_H) && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
-+#if defined(FT_LCD_FILTER_H) // && defined(FT_CONFIG_OPTION_SUBPIXEL_RENDERING)
++#if defined(FT_LCD_FILTER_H)
  #define QT_USE_FREETYPE_LCDFILTER
  #endif
  
-@@ -1051,7 +1051,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loa
-             Q_ASSERT(antialias);
-             uchar *convoluted = new uchar[bitmap.rows*bitmap.pitch];
-             bool useLegacyLcdFilter = false;
--#if defined(FC_LCD_FILTER) && defined(FT_LCD_FILTER_H)
-+#if defined(FT_LCD_FILTER_H) // && defined(FC_LCD_FILTER)
-             useLegacyLcdFilter = (lcdFilterType == FT_LCD_FILTER_LEGACY);
- #endif
-             uchar *buffer = bitmap.buffer;


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-11/qt.spec,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -p -r1.266 -r1.267
--- qt.spec	8 May 2009 11:54:10 -0000	1.266
+++ qt.spec	8 May 2009 20:31:15 -0000	1.267
@@ -12,7 +12,7 @@ Epoch:   1
 Name:    qt4
 %endif
 Version: 4.5.1
-Release: 4%{?dist}
+Release: 10%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -42,6 +42,8 @@ Patch13: qt-x11-opensource-src-4.5.0-gcc
 # qt fails to build on ia64: http://bugzilla.redhat.com/492174
 Patch14: qt-x11-opensource-src-4.5.0-ia64_boilerplate.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 
 
 ## upstreamable bits
 # http://bugzilla.redhat.com/485677
@@ -51,6 +53,9 @@ Patch52: qt-4.5-sparc64.patch
 # should fix the reference counting in qt_toX11Pixmap and thus the Kolourpaint
 # crash with Qt 4.5
 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
 
 ## qt-copy patches
 %define qt_copy 20090424
@@ -59,9 +64,6 @@ Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
 %{?qt_copy:Provides: qt4-copy = %{qt_copy}}
 
-Source11: qt4.sh
-Source12: qt4.csh
-
 Source20: assistant.desktop
 Source21: designer.desktop
 Source22: linguist.desktop
@@ -187,6 +189,30 @@ Qt is a software toolkit for developing 
 This package contains base tools, like string, xml, and network
 handling.
 
+
+%package demos
+Summary: Demonstration applications for %{name}
+Group:   Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+%description demos
+%{summary}.
+
+%package doc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-assistant
+%if "%{name}" != "qt4"
+Obsoletes: qt4-doc < %{version}-%{release}
+Provides:  qt4-doc = %{version}-%{release}
+%endif
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description doc
+%{summary}.  Includes:
+Qt Assistant
+
 %package devel
 Summary: Development files for the Qt toolkit
 Group: Development/Libraries
@@ -212,9 +238,13 @@ Provides:  WebKit-qt-devel = 1.0.0-1
 #Requires: dbus-devel
 Obsoletes: qt4-designer < %{version}-%{release}
 Provides:  qt4-designer = %{version}-%{release}
+# as long as libQtUiTools.a is included
+Provides:  %{name}-static = %{version}-%{release}
 %if "%{name}" != "qt4"
 Obsoletes: qt4-devel < %{version}-%{release}
 Provides:  qt4-devel = %{version}-%{release}
+%{?_isa:Provides: qt4-devel%{?_isa} = %{version}-%{release}}
+Provides:  qt4-static = %{version}-%{release}
 %endif
 
 %description devel
@@ -222,19 +252,30 @@ This package contains the files necessar
 applications using the Qt toolkit.  Includes:
 Qt Linguist
 
-%package doc
-Summary: API documentation, demos and example programs for %{name}
+
+%package examples
+Summary: Programming examples for %{name}
 Group: Documentation
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: %{name}-assistant
+
+%description examples
+%{summary}.
+
+
+%package mysql
+Summary: MySQL driver for Qt's SQL classes
+Group: System Environment/Libraries
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-MySQL < %{version}-%{release}
+Provides:  qt4-MySQL = %{version}-%{release}
 %if "%{name}" != "qt4"
-Obsoletes: qt4-doc < %{version}-%{release}
-Provides:  qt4-doc = %{version}-%{release}
+Obsoletes: qt4-mysql < %{version}-%{release}
+Provides:  qt4-mysql = %{version}-%{release}
 %endif
 
-%description doc
-%{summary}.  Includes:
-Qt Assistant, Qt Demo
+%description mysql 
+%{summary}.
+
 
 %package odbc 
 Summary: ODBC driver for Qt's SQL classes
@@ -250,19 +291,6 @@ Provides:  qt4-odbc = %{version}-%{relea
 %description odbc 
 %{summary}.
 
-%package mysql 
-Summary: MySQL driver for Qt's SQL classes
-Group: System Environment/Libraries
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Obsoletes: qt4-MySQL < %{version}-%{release}
-Provides:  qt4-MySQL = %{version}-%{release}
-%if "%{name}" != "qt4"
-Obsoletes: qt4-mysql < %{version}-%{release}
-Provides:  qt4-mysql = %{version}-%{release}
-%endif
-
-%description mysql 
-%{summary}.
 
 %package postgresql 
 Summary: PostgreSQL driver for Qt's SQL classes
@@ -278,6 +306,7 @@ Provides:  qt4-postgresql = %{version}-%
 %description postgresql 
 %{summary}.
 
+
 %package x11
 Summary: Qt GUI-related libraries
 Group: System Environment/Libraries
@@ -299,7 +328,7 @@ Provides:  qt4-x11 = %{version}-%{releas
 %endif
 
 %description x11
-Qt libraries which are used for drawing widgets and OpenGL items.
+Qt libraries used for drawing widgets and OpenGL items.
 
 
 %prep
@@ -320,10 +349,11 @@ test -x apply_patches && ./apply_patches
 %patch13 -p1 -b .gcc_hack
 %patch14 -p1 -b .ia64_boilerplate
 %patch15 -p1 -b .enable_ft_lcdfilter
-%patch16 -p1 -b .pa-in
+%patch16 -p1 -b .kde4_plugins
 %patch51 -p1 -b .qdoc3
 %patch52 -p1 -b .sparc64
 %patch53 -p1 -b .qatomic-inline-asm
+%patch54 -p1 -b .mysql_config
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -460,7 +490,8 @@ done
 # nuke dangling reference(s) to %buildroot
 sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{_qt4_libdir}/*.prl
 
-%if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
+%if 0
+#if "%{_qt4_docdir}" != "%{_qt4_prefix}/doc"
 # -doc make symbolic link to _qt4_docdir
 rm -rf %{buildroot}%{_qt4_prefix}/doc
 ln -s  ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
@@ -513,17 +544,6 @@ rm -f %{buildroot}%{_qt4_libdir}/lib*.la
 %endif
 %endif
 
-# qt4.(sh|csh), currently unused
-%if 0
-install -p -m644 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh
-install -p -m644 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh
-sed -i \
-  -e "s|@@QT4DIR@@|%{_qt4_prefix}|" \
-  -e "s|@@QT4DOCDIR@@|%{_qt4_docdir}|" \
-  %{buildroot}/etc/profile.d/qt4.*
-%endif
-
-
 %if "%{_qt4_libdir}" != "%{_libdir}"
   mkdir -p %{buildroot}/etc/ld.so.conf.d
   echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf
@@ -629,7 +649,6 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %files
 %defattr(-,root,root,-)
 %doc README* LGPL_EXCEPTION.txt LICENSE.LGPL LICENSE.GPL3
-#config /etc/profile.d/qt4.*
 %if "%{_qt4_libdir}" != "%{_libdir}"
 /etc/ld.so.conf.d/*
 %dir %{_qt4_libdir}
@@ -669,35 +688,14 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_qt4_plugindir}/sqldrivers/libqsqlite*
 %{_qt4_translationdir}/
 
-%files x11 
+%files demos
 %defattr(-,root,root,-)
-%{_sysconfdir}/rpm/macros.*
-%if 0%{?phonon:1}
-#{_qt4_libdir}/libphonon.so.4*
-%endif
-%{_qt4_libdir}/libQt3Support.so.*
-%{_qt4_libdir}/libQtAssistantClient.so.*
-%{_qt4_libdir}/libQtCLucene.so.*
-%{_qt4_libdir}/libQtDesigner.so.*
-%{_qt4_libdir}/libQtDesignerComponents.so.*
-%{_qt4_libdir}/libQtGui.so.*
-%{_qt4_libdir}/libQtHelp.so.*
-%{_qt4_libdir}/libQtOpenGL.so.*
-%{_qt4_libdir}/libQtScriptTools.so.*
-%{_qt4_libdir}/libQtSvg.so.*
-%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
-%{_qt4_plugindir}/*
-%exclude %{_qt4_plugindir}/sqldrivers
+%{_qt4_bindir}/qt*demo*
 %if "%{_qt4_bindir}" != "%{_bindir}"
-%{_bindir}/assistant*
-%{?dbus:%{_bindir}/qdbusviewer}
-%{_bindir}/qt*config*
+%{_bindir}/qt*demo*
 %endif
-%{_qt4_bindir}/assistant*
-%{?dbus:%{_qt4_bindir}/qdbusviewer}
-%{_qt4_bindir}/qt*config*
-%{_datadir}/applications/*qtconfig*.desktop
-%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
+%{_datadir}/applications/*qtdemo*.desktop
+%{_qt4_demosdir}/
 
 %files devel
 %defattr(-,root,root,-)
@@ -755,8 +753,7 @@ gtk-update-icon-cache -q %{_datadir}/ico
 #{_qt4_libdir}/libphonon.so
 %endif
 %{_qt4_libdir}/libQt*.so
-# remaining static lib: libQtUiTools.a 
-%{_qt4_libdir}/libQt*.a
+%{_qt4_libdir}/libQtUiTools*.a
 %{_qt4_libdir}/libQt*.prl
 %{_libdir}/pkgconfig/*.pc
 # Qt designer
@@ -773,17 +770,19 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_qt4_docdir}/html
 %{_qt4_docdir}/qch/
 %{_qt4_docdir}/src/
-%{_qt4_prefix}/doc
-%{_qt4_demosdir}/
-%{_qt4_examplesdir}/
+#{_qt4_prefix}/doc
 # Qt Assistant (bin moved to -x11)
 %{_datadir}/applications/*assistant*.desktop
-# Qt Demo
-%{_qt4_bindir}/qt*demo*
-%if "%{_qt4_bindir}" != "%{_bindir}"
-%{_bindir}/qt*demo*
+
+%files examples
+%defattr(-,root,root,-)
+%{_qt4_examplesdir}/
+
+%if "%{?mysql}" == "-plugin-sql-mysql"
+%files mysql
+%defattr(-,root,root,-)
+%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
 %endif
-%{_datadir}/applications/*qtdemo*.desktop
 
 %if "%{?odbc}" == "-plugin-sql-odbc"
 %files odbc 
@@ -797,22 +796,65 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_qt4_plugindir}/sqldrivers/libqsqlpsql*
 %endif
 
-%if "%{?mysql}" == "-plugin-sql-mysql"
-%files mysql 
+%files x11 
 %defattr(-,root,root,-)
-%{_qt4_plugindir}/sqldrivers/libqsqlmysql*
+%{_sysconfdir}/rpm/macros.*
+%if 0%{?phonon:1}
+#{_qt4_libdir}/libphonon.so.4*
+%endif
+%{_qt4_libdir}/libQt3Support.so.*
+%{_qt4_libdir}/libQtAssistantClient.so.*
+%{_qt4_libdir}/libQtCLucene.so.*
+%{_qt4_libdir}/libQtDesigner.so.*
+%{_qt4_libdir}/libQtDesignerComponents.so.*
+%{_qt4_libdir}/libQtGui.so.*
+%{_qt4_libdir}/libQtHelp.so.*
+%{_qt4_libdir}/libQtOpenGL.so.*
+%{_qt4_libdir}/libQtScriptTools.so.*
+%{_qt4_libdir}/libQtSvg.so.*
+%{?webkit:%{_qt4_libdir}/libQtWebKit.so.*}
+%{_qt4_plugindir}/*
+%exclude %{_qt4_plugindir}/sqldrivers
+%if "%{_qt4_bindir}" != "%{_bindir}"
+%{_bindir}/assistant*
+%{?dbus:%{_bindir}/qdbusviewer}
+%{_bindir}/qt*config*
 %endif
+%{_qt4_bindir}/assistant*
+%{?dbus:%{_qt4_bindir}/qdbusviewer}
+%{_qt4_bindir}/qt*config*
+%{_datadir}/applications/*qtconfig*.desktop
+%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
 
 %changelog
-* Fri May 08 2009 Than Ngo <than at redhat.com> - 4.5.1-4
-- drop qt-x11-opensource-src-4.5.0-pa-in.patch
+* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-10
+- improved kde4_plugins patch, skip expensive/unneeded canonicalPath
+
+* Wed May 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-9
+- include kde4 plugin path by default (#498809)
 
-* Thu May 07 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-3.1
-- look for pa-in instead of pa in fontconfig (#497984)
+* Mon May 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-8
+- fix invalid assumptions about mysql_config --libs (bug #440673)
+- fix %%files breakage from 4.5.1-5
+
+* Wed Apr 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-7
+- -devel: Provides: qt4-devel%%{?_isa} ...
+
+* Mon Apr 27 2009 Than Ngo <than at redhat.com> - 4.5.1-6
+- drop useless hunk of qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
+
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-5
+- -devel: Provides: *-static for libQtUiTools.a
+
+* Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-4
+- qt-doc noarch
+- qt-demos, qt-examples (split from -doc)
+- (cosmetic) re-order subpkgs in alphabetical order
+- drop unused profile.d bits
 
 * Fri Apr 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-3
-- enable FT_LCD_FILTER
+- enable FT_LCD_FILTER (uses freetype subpixel filters if available at runtime)
 
 * Fri Apr 24 2009 Than Ngo <than at redhat.com> - 4.5.1-2
 - apply upstream patch to fix the svg rendering regression

More information about the scm-commits mailing list