Author: glen Date: Mon Dec 17 22:36:48 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- qtkdeintegration patches; rel 10
---- Files affected:
SPECS:
qt.spec (1.387 -> 1.388)
---- Diffs:
================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.387 SPECS/qt.spec:1.388
--- SPECS/qt.spec:1.387 Tue Dec 11 17:11:08 2007
+++ SPECS/qt.spec Mon Dec 17 23:36:43 2007
@@ -28,7 +28,7 @@
Summary(pt_BR.UTF-8): Estrutura para rodar aplicações GUI Qt
Name: qt
Version: %{_ver}
-Release: 8
+Release: 10
Epoch: 6
License: QPL v1 or GPL v2
Group: X11/Libraries
@@ -41,6 +41,9 @@
Source5: designer.png
Source6: assistant.png
Source7: linguist.png
+# generated using notes from kdebase-SuSE/qtkdeintegration/README
+Source8: qtkdeintegration_x11.cpp
+Source9: qtkdeintegration_x11_p.h
# qt-copy patches
# http://websvn.kde.org/branches/qt/3.3/qt-copy/patches/
@@ -92,6 +95,7 @@
Patch14: %{name}-x11-qfontdatabase_x11.patch
Patch15: %{name}-uic_colon_fix.patch
Patch16: %{name}-fvisibility.patch
+Patch17: qtkdeintegration.patch
URL: http://www.trolltech.com/products/qt/
%{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0}
BuildRequires: OpenGL-GLU-devel
@@ -735,6 +739,11 @@
#%patch14 -p1
%patch15 -p0
%patch16 -p0
+%patch17 -p0
+
+# copy qt kde integration files
+cp %{SOURCE8} %{SOURCE9} src/kernel
+cp %{SOURCE9} include/private
# change QMAKE_CFLAGS_RELEASE to build
# properly optimized libs
@@ -782,6 +791,9 @@
##################################
DEFAULTOPT=" \
+%if "%{_lib}" != "lib"
+ -DUSE_LIB64_PATHES \
+%endif
-DQT_CLEAN_NAMESPACE \
-verbose \
-prefix %{_prefix} \
@@ -1311,6 +1323,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.388 2007-12-17 22:36:43 glen
+- qtkdeintegration patches; rel 10
+
Revision 1.387 2007-12-11 16:11:08 sls
- __make -j1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt.spec?r1=1.387&r2=1.388&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
