Author: lmontel
Date: Mon Feb 12 17:16:54 2007
New Revision: 119897
Added:
packages/cooker/qt4/current/SOURCES/qt-x11-opensource-src-4.2.2-pagesize.patch
Modified:
packages/cooker/qt4/current/SPECS/qt4.spec
Log:
Fix compile (Patch from Gb)
Added:
packages/cooker/qt4/current/SOURCES/qt-x11-opensource-src-4.2.2-pagesize.patch
==============================================================================
--- (empty file)
+++
packages/cooker/qt4/current/SOURCES/qt-x11-opensource-src-4.2.2-pagesize.patch
Mon Feb 12 17:16:54 2007
@@ -0,0 +1,19 @@
+--- qt-x11-opensource-src-4.2.2/tools/qvfb/qvfbmmap.cpp.pagesize
2006-11-27 18:26:17.000000000 +0100
++++ qt-x11-opensource-src-4.2.2/tools/qvfb/qvfbmmap.cpp 2007-02-12
10:31:57.000000000 +0100
+@@ -38,6 +38,16 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <math.h>
++#include <unistd.h>
++
++static inline size_t get_page_size(void)
++{
++ static size_t page_size = getpagesize();
++ return page_size;
++}
++
++#undef PAGE_SIZE
++#define PAGE_SIZE get_page_size()
+
+ QMMapViewProtocol::QMMapViewProtocol(int displayid, const QSize &s,
+ int d, QObject *parent)
Modified: packages/cooker/qt4/current/SPECS/qt4.spec
==============================================================================
--- packages/cooker/qt4/current/SPECS/qt4.spec (original)
+++ packages/cooker/qt4/current/SPECS/qt4.spec Mon Feb 12 17:16:54 2007
@@ -59,7 +59,7 @@
Name: %{qtlib}
Version: %{qtversion}
-Release: %mkrel 10
+Release: %mkrel 11
Epoch: 2
Summary: Qt GUI toolkit
Group: Development/KDE and Qt
@@ -76,6 +76,7 @@
Patch1: 0153-qdbuscpp2xml.diff
Patch2: 0142-uic3-wordWrapAttribute.diff
Patch3: qt4-fix-mem-leak.patch
+Patch4: qt-x11-opensource-src-4.2.2-pagesize.patch
BuildRequires: glibc-devel
@@ -756,6 +757,7 @@
%patch1 -p0 -b .fix_qdbus_name
%patch2 -p0 -b .fix_uic3_wordwrap
%patch3 -p1 -b .fix_mem_leak
+%patch4 -p1 -b .fix_pagesize
%build
export QTDIR=`/bin/pwd`