packages: qt4/qt4.spec, qt4/qt4-glib.patch (NEW), qt4/qt4-pl-update.patch (...

[qboosh]

Author: qboosh                       Date: Wed Apr  4 14:30:43 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added glib patch to fix build with glib 2.32
- removed outdated pl-update patch
- proper description for QtScriptTools* packages

---- Files affected:
packages/qt4:
   qt4.spec (1.307 -> 1.308) , qt4-glib.patch (NONE -> 1.1)  (NEW), qt4-pl-update.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.307 packages/qt4/qt4.spec:1.308
--- packages/qt4/qt4.spec:1.307	Wed Mar 28 18:33:20 2012
+++ packages/qt4/qt4.spec	Wed Apr  4 16:30:37 2012
@@ -2,7 +2,6 @@
 #
 # TODO:
 #	- figure out why it tries to link with system qt (fix and drop BuildConflicts Qt)
-#	- better descriptions (QtScript=QtScriptTools???)
 #	- more cleanups
 #	- check if translations are available
 #	- check Qt ui tool
@@ -80,7 +79,7 @@
 Patch5:		%{name}-support-cflags-with-commas.patch
 Patch6:		%{name}-build-lib-static.patch
 Patch7:		%{name}-x11_fonts.patch
-Patch8:		%{name}-pl-update.patch
+Patch8:		%{name}-glib.patch
 Patch9:		%{name}-ibase.patch
 Patch10:	%{name}-git.patch
 Patch11:	qt-x11-opensource-src-4.5.1-enable_ft_lcdfilter.patch
@@ -714,24 +713,24 @@
 statyczna.
 
 %package -n QtScriptTools
-Summary:	Qt classes for scripting applications
-Summary(pl.UTF-8):	Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach
+Summary:	QtScriptTools - additional components for applications that use QtScript
+Summary(pl.UTF-8):	QtScriptTools - dodatkowe komponenty dla aplikacji wykorzystujących QtScript
 Group:		X11/Development/Libraries
 Requires:	QtCore = %{version}-%{release}
 Requires:	QtGui = %{version}-%{release}
 Requires:	QtScript = %{version}-%{release}
 
 %description -n QtScriptTools
-The QtScriptTools module provides Qt classes to handle scripts inside
-applications.
+The QtScriptTools module provides additional components for
+applications that use QtScript.
 
 %description -n QtScriptTools -l pl.UTF-8
-Ten moduł dostarcza klasy Qt obsługujące języki skryptowe wewnątrz
-aplikacji.
+Moduł QtScriptTools dostarcza dodatkowe komponenty dla aplikacji
+wykorzystujących QtScript.
 
 %package -n QtScriptTools-devel
-Summary:	Qt classes for scripting applications - development files
-Summary(pl.UTF-8):	Klasy Qt do obsługi skryptów wewnątrz aplikacji - pliki programistyczne
+Summary:	Development files for QtScriptTools components
+Summary(pl.UTF-8):	Pliki programistyczne komponentów QtScriptTools
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{version}-%{release}
 Requires:	QtGui-devel = %{version}-%{release}
@@ -739,24 +738,24 @@
 Requires:	QtScriptTools = %{version}-%{release}
 
 %description -n QtScriptTools-devel
-Qt classes for scripting applications - development files.
+Development files for QtScriptTools components.
 
 %description -n QtScriptTools-devel -l pl.UTF-8
-Klasy Qt do obsługi skryptów wewnątrz aplikacji - pliki
-programistyczne.
+Pliki programistyczne komponentów QtScriptTools.
 
 %package -n QtScriptTools-static
-Summary:	Qt classes for scripting applications - static library
-Summary(pl.UTF-8):	Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach - biblioteka statyczna
+Summary:	QtScriptTools components - static library
+Summary(pl.UTF-8):	Komponenty QtScriptTools - biblioteka statyczna
 Group:		X11/Development/Libraries
 Requires:	QtScriptTools-devel = %{version}-%{release}
 
 %description -n QtScriptTools-static
-Qt classes for scripting applications - static library.
+Static version of QtScriptTools library, providing additional
+components for applications that use QtScript.
 
 %description -n QtScriptTools-static -l pl.UTF-8
-Klasy Qt pozwalające dodać obsługę skryptów w aplikacjach - biblioteka
-statyczna.
+Statyczna biblioteka QtScriptTools, dostarczająca dodatkowe komponenty
+dla aplikacji wykorzystujących QtScript.
 
 %package -n QtSql
 Summary:	Qt classes for database integration using SQL
@@ -1401,7 +1400,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-#%patch8 -p1
+%patch8 -p1
 %patch9 -p1
 #%patch10 -p1
 %patch11 -p1
@@ -2410,6 +2409,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.308  2012/04/04 14:30:37  qboosh
+- added glib patch to fix build with glib 2.32
+- removed outdated pl-update patch
+- proper description for QtScriptTools* packages
+
 Revision 1.307  2012/03/28 16:33:20  arekm
 - up to 4.8.1
 

================================================================
Index: packages/qt4/qt4-glib.patch
diff -u /dev/null packages/qt4/qt4-glib.patch:1.1
--- /dev/null	Wed Apr  4 16:30:43 2012
+++ packages/qt4/qt4-glib.patch	Wed Apr  4 16:30:37 2012
@@ -0,0 +1,11 @@
+--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig	2012-03-14 15:01:26.000000000 +0100
++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h	2012-04-03 16:35:00.433473703 +0200
+@@ -52,7 +52,7 @@
+ typedef struct _GHashTable GHashTable;
+ typedef struct _GInputStream GInputStream;
+ typedef struct _GList GList;
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GPatternSpec GPatternSpec;
+ typedef struct _GPollableOutputStream GPollableOutputStream;
+ typedef struct _GSocketClient GSocketClient;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/qt4/qt4.spec?r1=1.307&r2=1.308