Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv12138/main/finkinfo/libs
Modified Files:
qt4.info
Added Files:
qtassistant-compat-mac.info qtassistant-compat-x11.info
qtassistant-compat.patch
Log Message:
replace missing QtAssistant in Qt 4.7.x (note, some packages may still need
patching to find it)
--- NEW FILE: qtassistant-compat.patch ---
diff -Nurd
qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/headers/QAssistantClient
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/headers/QAssistantClient
---
qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/headers/QAssistantClient
1969-12-31 19:00:00.000000000 -0500
+++
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/headers/QAssistantClient
2011-07-19 12:45:50.000000000 -0400
@@ -0,0 +1 @@
+#include "qassistantclient.h"
diff -Nurd
qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/headers/QtAssistant
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/headers/QtAssistant
---
qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/headers/QtAssistant
1969-12-31 19:00:00.000000000 -0500
+++
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/headers/QtAssistant
2011-07-19 12:45:50.000000000 -0400
@@ -0,0 +1,5 @@
+#ifndef QT_QTASSISTANT_MODULE_H
+#define QT_QTASSISTANT_MODULE_H
+#include <QtNetwork/QtNetwork>
+#include "qassistantclient.h"
+#endif
diff -Nurd
qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/lib.pro
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/lib.pro
--- qt-assistant-qassistantclient-library-compat-version-4.6.3/lib/lib.pro
2010-06-18 05:01:10.000000000 -0400
+++
qt-assistant-qassistantclient-library-compat-version-4.6.3-patched/lib/lib.pro
2011-07-19 12:46:04.000000000 -0400
@@ -16,8 +16,8 @@
qassistantclient_global.h
SOURCES = qassistantclient.cpp
-DESTDIR = ../../../../lib
-DLLDESTDIR = ../../../../bin
+DESTDIR = ../lib
+DLLDESTDIR = ../bin
unix {
QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB
Index: qt4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qt4.info 19 May 2011 01:58:51 -0000 1.2
+++ qt4.info 20 Jul 2011 19:12:14 -0000 1.3
@@ -1,7 +1,7 @@
Info4: <<
Package: qt4-%type_pkg[qt]
Version: 4.7.3
-Revision: 3
+Revision: 4
Description: OBSOLETE: use qt4-base-%type_pkg[qt]
Type: qt (x11 mac)
License: LGPL
@@ -12,6 +12,8 @@
fink-obsolete-packages,
phonon-%type_pkg[qt] (>= 4.5.0-1),
qt4-base-%type_pkg[qt] (>= 4.7.3-1),
+ qtassistant-compat-%type_pkg[qt] (>= 4.6.3-1),
+ qtassistant-compat-%type_pkg[qt]-bin (>= 4.6.3-1),
qtwebkit-%type_pkg[qt] (>= 2.0.0-4)
<<
GCC: 4.0
@@ -57,6 +59,7 @@
qt4-base-%type_pkg[qt]-qtsvg-shlibs (>= 4.7.3-1),
phonon-%type_pkg[qt]-shlibs (>= 4.5.0-1),
phonon-%type_pkg[qt]-backend (>= 4.5.0-1),
+ qtassistant-compat-%type_pkg[qt]-shlibs (>= 4.6.3-1),
qtwebkit-%type_pkg[qt]-shlibs (>= 2.0.0-4)
<<
Files: share/doc/installed-packages/%N-gui-shlibs
--- NEW FILE: qtassistant-compat-mac.info ---
Info4: <<
Package: qtassistant-compat-mac
Version: 4.6.3
Revision: 1
Description: QtAssistant compatibility library
Type: qt (mac)
License: GPL/LGPL
Maintainer: Benjamin Reed <qtassistant-com...@fink.raccoonfink.com>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
cmake (>= 2.8.2-1),
fink (>= 0.30.0-1),
kde4-buildenv (>= 4.6.0-1),
qt4-base-%type_pkg[qt] (>= 4.7.3-1),
(%type_pkg[qt] = x11) x11-dev,
system-openssl-dev
<<
Replaces: qt4-%type_pkg[qt] (<< 4.7.3-1)
BuildDependsOnly: true
GCC: 4.0
Source:
ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-%v.tar.gz
Source-MD5: a20148e0488d5c12ab35ccc107dcc64d
SourceDirectory: qt-assistant-qassistantclient-library-compat-version-%v
PatchFile: qtassistant-compat.patch
PatchFile-MD5: 9b58a133395c8803a224233dee92b259
UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
. %p/sbin/kde4-buildenv.sh
pushd lib
%p/lib/qt4-%type_pkg[qt]/bin/qmake
make
popd
%p/lib/qt4-%type_pkg[qt]/bin/qmake
make
<<
InstallScript: <<
#!/bin/sh -ev
install -d -m 755 %i/lib/qt4-%type_pkg[qt]/{bin,include/QtAssistant,lib}
cp lib/*.h lib/headers/* %i/lib/qt4-%type_pkg[qt]/include/QtAssistant/
mv lib/QtAssistant.framework %i/lib/qt4-%type_pkg[qt]/lib/
install_name_tool -id
%p/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant
%i/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant
install_name_tool -id
%p/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant_debug
%i/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant_debug
install -d -m 755
%i/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/Headers
rsync -avr %i/lib/qt4-%type_pkg[qt]/include/QtAssistant/
%i/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/Headers/
ln -sf Versions/4/Headers
%i/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/
mv Assistant_adp.app %i/lib/qt4-%type_pkg[qt]/bin/
<<
DocFiles: LICENSE* LGPL*
SplitOff: <<
Package: %N-shlibs
Description: Shared libs for QtAssistant
Depends: <<
qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1)
<<
Replaces: <<
qt4-%type_pkg[qt]-core-shlibs (<< 4.7.3-1),
qt4-%type_pkg[qt]-gui-shlibs (<< 4.7.3-1)
<<
DocFiles: LICENSE* LGPL*
Files: <<
lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/Current
lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant
lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant_debug
<<
Shlibs: <<
%p/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant
4.7.0 %n (>= 4.6.3-1)
%p/lib/qt4-%type_pkg[qt]/lib/QtAssistant.framework/Versions/4/QtAssistant_debug
4.7.0 %n (>= 4.6.3-1)
<<
<<
SplitOff2: <<
Package: %N-bin
Description: QtAssistant compatibility app
Depends: <<
qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[qt] (<< 4.7.3-1)
DocFiles: LICENSE* LGPL*
Files: lib/qt4-%type_pkg[qt]/bin
<<
DescDetail: This is a version of QtAssistant that is provided for compatibility
with Qt3.
<<
--- NEW FILE: qtassistant-compat-x11.info ---
Info4: <<
Package: qtassistant-compat-x11
Version: 4.6.3
Revision: 1
Description: QtAssistant compatibility library
Type: qt (x11)
License: GPL/LGPL
Maintainer: Benjamin Reed <qtassistant-com...@fink.raccoonfink.com>
Depends: %N-shlibs (= %v-%r)
BuildDepends: <<
cmake (>= 2.8.2-1),
fink (>= 0.30.0-1),
kde4-buildenv (>= 4.6.0-1),
qt4-base-%type_pkg[qt] (>= 4.7.3-1),
(%type_pkg[qt] = x11) x11-dev,
system-openssl-dev
<<
Replaces: qt4-%type_pkg[qt] (<< 4.7.3-1)
BuildDependsOnly: true
GCC: 4.0
Source:
ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-%v.tar.gz
Source-MD5: a20148e0488d5c12ab35ccc107dcc64d
SourceDirectory: qt-assistant-qassistantclient-library-compat-version-%v
PatchFile: qtassistant-compat.patch
PatchFile-MD5: 9b58a133395c8803a224233dee92b259
UseMaxBuildJobs: true
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[qt]"
. %p/sbin/kde4-buildenv.sh
pushd lib
%p/lib/qt4-%type_pkg[qt]/bin/qmake
make
popd
%p/lib/qt4-%type_pkg[qt]/bin/qmake
make
<<
InstallScript: <<
#!/bin/sh -ev
install -d -m 755 %i/lib/qt4-%type_pkg[qt]/{bin,include/QtAssistant,lib}
cp lib/*.h lib/headers/* %i/lib/qt4-%type_pkg[qt]/include/QtAssistant/
mv lib/libQtAssistant*.dylib %I/lib/qt4-%type_pkg[qt]/lib/
install_name_tool -id
%p/lib/qt4-%type_pkg[qt]/lib/libQtAssistantClient.4.dylib
%i/lib/qt4-%type_pkg[qt]/lib/libQtAssistantClient.4.dylib
mv assistant_adp %i/lib/qt4-%type_pkg[qt]/bin/
<<
DocFiles: LICENSE* LGPL*
SplitOff: <<
Package: %N-shlibs
Description: Shared libs for QtAssistant
Depends: <<
qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1)
<<
Replaces: <<
qt4-%type_pkg[qt]-core-shlibs (<< 4.7.3-1),
qt4-%type_pkg[qt]-gui-shlibs (<< 4.7.3-1)
<<
DocFiles: LICENSE* LGPL*
Files: lib/qt4-%type_pkg[qt]/lib/libQtAssistantClient.4*.dylib
Shlibs: %p/lib/qt4-%type_pkg[qt]/lib/libQtAssistantClient.4.dylib 4.7.0
%n (>= 4.6.3-1)
<<
SplitOff2: <<
Package: %N-bin
Description: QtAssistant compatibility app
Depends: <<
qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1)
<<
Replaces: qt4-%type_pkg[qt] (<< 4.7.3-1)
DocFiles: LICENSE* LGPL*
Files: lib/qt4-%type_pkg[qt]/bin
<<
DescDetail: This is a version of QtAssistant that is provided for compatibility
with Qt3.
<<
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
