[meego-commits] 5011: Changes to Trunk:Testing/qt

[Kaitlin Rupert]

Hi,
I have made the following changes to qt in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Kaitlin Rupert

[This message was auto-generated]

---

Request #5011:

  submit:   devel:nokia:trunk/qt(r2) -> Trunk:Testing/qt


Message:
    Fix BMC #17 - create a netbook specific package that adds the GTK style. Fix BMC #3183 - this patch has been pushed upstream, but is needed to fix the bindTexture() call in 4.7 pre-release

State:   new          2010-06-29T06:03:08 krupert
Comment: None



changes files:
--------------
--- qt.changes
+++ qt.changes
@@ -1,2 +1,4 @@
-* Mon Jun 28 2010 Li Peng <peng.li at intel.com> - 4.7.0
-- Remove dependency on libXinerama
+* Mon Jun 28 2010 Kaitlin Rupert <kaitlin.rupert at intel.com> - 4.7.0
+- Fix BMC #17 - create a netbook specific package that adds the GTK style
+- Fix BMC #3183 - this patch has been pushed upstream, but is needed to fix
+  the bindTexture() call in 4.7 pre-release

new:
----
  Trolltech-netbook.conf
  fix_bind_texture.patch

spec files:
-----------
--- qt.spec
+++ qt.spec
@@ -26,6 +26,9 @@
 %define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
 Source5: qconfig-multilib.h
 
+#Netbook specific settings
+Source6: Trolltech-netbook.conf
+
 # make PulseAudio the default device in Phonon
 Patch17: qt-x11-opensource-src-4.5.2-pulseaudio.patch
 Patch19: qt-x11-opensource-src-4.5.1-phonon.patch
@@ -40,6 +43,7 @@
 Patch100: invpremul.patch
 Patch101: qt-texture-enable-fix.patch
 Patch102: qt-x11-opensource-src-4.7.0-qtdebug-syslog.patch
+Patch103: fix_bind_texture.patch
 
 # security patches
 
@@ -129,9 +133,9 @@
 ## but, "xorg-x11-devel: missing dep on libGL/libGLU"
 # For ARM, we default to libegl-devel and libgles2-devel
 %ifarch %{arm}
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel  libegl-devel libgles2-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel  libegl-devel libgles2-devel
 %else
-%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel  libGL-devel libGLU-devel
+%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel  libGL-devel libGLU-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -345,6 +349,17 @@
 %description x11
 Qt libraries used for drawing widgets and OpenGL items.
 
+%package netbook
+Summary: Qt Netbook GUI Style Settings
+Group: System/Desktop
+Provides: qt4-netbook = %{version}-%{release}
+Provides: %{name}-netbook = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: qt4-netbook < %{version}-%{release}
+Provides:  qt4-netbook = %{version}-%{release}
+
+%description netbook
+Netbook specific configuration options and style settings
 
 %prep
 %setup -q -n qt-everywhere-opensource-src-4.7.0-tp
@@ -365,6 +380,7 @@
 %patch100 -p1 -b .premul
 %patch101 -p1 -b .qt-texture-enable-fix
 %patch102 -p1 -b .qtdebug-syslog
+%patch103 -p1 -b .fix_bind_texture
 
 %build
 # drop -fexceptions from $RPM_OPT_FLAGS
@@ -450,6 +466,7 @@
   -xinput \
   -xcursor \
   -xfixes \
+  -xinerama \
   -xshape \
   -xrandr \
   -xrender \
@@ -512,7 +529,7 @@
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/*.prl
 done
 # riskier
-for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
+for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc 
   sed -i -e "s|$RPM_BUILD_DIR||g" %{buildroot}%{_qt4_libdir}/pkgconfig/*.pc
@@ -589,8 +606,9 @@
   echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf
 %endif
 
-# Trolltech.conf
+# Trolltech.conf and Trolltech-netbook.conf
 install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
+install -p -m644 -D %{SOURCE6} %{buildroot}%{_qt4_sysconfdir}/Trolltech-netbook.conf
 
 # qt4-logo (generic) icons
 install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
@@ -720,6 +738,10 @@
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 fi
 
+%post netbook
+# Replace Trolltech.conf with Trolltech-netbook.conf
+mv %{_qt4_sysconfdir}/Trolltech-netbook.conf %{_qt4_sysconfdir}/Trolltech.conf
+
 #if "%{?phonon_backend}" == "-phonon-backend"
 %if 0%{?phonon_backend_packaged}
 %post -n phonon-backend-gstreamer
@@ -962,4 +984,8 @@
 %{_datadir}/applications/*qtconfig.desktop
 %{_datadir}/icons/hicolor/*/apps/qt4-logo.*
 
+%files netbook
+%defattr(-,root,root,-)
+%config %{_qt4_sysconfdir}/Trolltech-netbook.conf
+%config %{_qt4_sysconfdir}/Trolltech.conf
 

other changes:
--------------

++++++ Trolltech-netbook.conf (new)
--- Trolltech-netbook.conf
+++ Trolltech-netbook.conf
+[Qt]
+font="Sans Serif,10,-1,5,50,0,0,0,0,0"
+
+style=GTK+

++++++ fix_bind_texture.patch (new)
--- fix_bind_texture.patch
+++ fix_bind_texture.patch
+Patch from upstream bug: http://bugreports.qt.nokia.com/browse/QTBUG-11158
+
+As this patch will get merged into Qt 4.7 upstream, this patch will be dropped
+after subsequent version updates.
+
+
+diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
+index f0b06ef..f941cdc 100644
+--- a/src/opengl/qgl_x11.cpp
++++ b/src/opengl/qgl_x11.cpp
+@@ -1765,6 +1765,9 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con
+     glXBindTexImageEXT(x11Info.display(), (GLXPixmap)pixmapData->gl_surface, GLX_FRONT_LEFT_EXT, 0);
+ 
+     glBindTexture(GL_TEXTURE_2D, textureId);
++    GLuint filtering = options & QGLContext::LinearFilteringBindOption ? GL_LINEAR : GL_NEAREST;
++    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filtering);
++    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filtering);
+ 
+     if (!((hasAlpha && RGBAConfigInverted) || (!hasAlpha && RGBConfigInverted)))
+         options &= ~QGLContext::InvertedYBindOption;