Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv9628/main/finkinfo/libs
Modified Files:
qt4-base-mac.info qt4-base-x11.info qt4-base.patch
Log Message:
fix for "Resources" symlink, and build issue when qt4 is not already installed
Index: qt4-base.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qt4-base.patch 17 May 2011 15:00:27 -0000 1.1
+++ qt4-base.patch 8 Jul 2011 02:45:18 -0000 1.2
@@ -1,7 +1,6 @@
-diff --git a/mkspecs/common/mac-g++.conf b/mkspecs/common/mac-g++.conf
-index a10035a..e31c726 100644
---- a/mkspecs/common/mac-g++.conf
-+++ b/mkspecs/common/mac-g++.conf
+diff -Nurd qt-kde-qt-mac/mkspecs/common/mac-g++.conf
qt-kde-qt-mac-new/mkspecs/common/mac-g++.conf
+--- qt-kde-qt-mac/mkspecs/common/mac-g++.conf 2011-05-11 18:56:17.000000000
-0400
++++ qt-kde-qt-mac-new/mkspecs/common/mac-g++.conf 2011-07-07
14:45:06.000000000 -0400
@@ -5,7 +5,7 @@
include(mac.conf)
@@ -11,7 +10,7 @@
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -W
QMAKE_CFLAGS_WARN_OFF += -w
-@@ -52,7 +52,7 @@ QMAKE_LINK = $$QMAKE_CXX
+@@ -52,7 +52,7 @@
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
@@ -20,11 +19,10 @@
QMAKE_LFLAGS_RELEASE +=
QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
QMAKE_LFLAGS_DEBUG +=
-diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
-index ad1f163..ab1de5c 100644
---- a/mkspecs/darwin-g++/qmake.conf
-+++ b/mkspecs/darwin-g++/qmake.conf
-@@ -15,7 +15,7 @@ QMAKE_LEX = flex
+diff -Nurd qt-kde-qt-mac/mkspecs/darwin-g++/qmake.conf
qt-kde-qt-mac-new/mkspecs/darwin-g++/qmake.conf
+--- qt-kde-qt-mac/mkspecs/darwin-g++/qmake.conf 2011-05-11
18:56:17.000000000 -0400
++++ qt-kde-qt-mac-new/mkspecs/darwin-g++/qmake.conf 2011-07-07
14:45:06.000000000 -0400
+@@ -15,7 +15,7 @@
QMAKE_LEXFLAGS =
QMAKE_YACC = yacc
QMAKE_YACCFLAGS = -d
@@ -33,7 +31,7 @@
QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall -W
QMAKE_CFLAGS_WARN_OFF = -w
-@@ -55,8 +55,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+@@ -55,8 +55,7 @@
QMAKE_LINK = c++
QMAKE_LINK_SHLIB = c++
@@ -43,7 +41,7 @@
QMAKE_LFLAGS_RELEASE =
QMAKE_LFLAGS_DEBUG =
QMAKE_LFLAGS_APP = -prebind
-@@ -69,7 +68,6 @@ QMAKE_LFLAGS_VERSION =
-current_version$${LITERAL_WHITESPACE}
+@@ -69,7 +68,6 @@
QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE}
QMAKE_LFLAGS_RPATH =
@@ -51,3 +49,49 @@
QMAKE_FIX_RPATH = install_name_tool -id
QMAKE_LIBS_DYNLOAD =
+diff -Nurd qt-kde-qt-mac/tools/assistant/tools/assistant/assistant.pro
qt-kde-qt-mac-new/tools/assistant/tools/assistant/assistant.pro
+--- qt-kde-qt-mac/tools/assistant/tools/assistant/assistant.pro
2010-12-27 15:21:54.000000000 -0500
++++ qt-kde-qt-mac-new/tools/assistant/tools/assistant/assistant.pro
2011-07-07 14:44:15.000000000 -0400
+@@ -13,6 +13,11 @@
+ INSTALLS += target
+ DEPENDPATH += ../shared
+
++# work around lack of indirect symbols in 10.4
++qclucene = QtCLucene$${QT_LIBINFIX}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
+ # ## Work around a qmake issue when statically linking to
+ # ## not-yet-installed plugins
+ QMAKE_LIBDIR += $$QT_BUILD_TREE/plugins/sqldrivers
+diff -Nurd
qt-kde-qt-mac/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
qt-kde-qt-mac-new/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
+---
qt-kde-qt-mac/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
2010-12-27 15:11:11.000000000 -0500
++++
qt-kde-qt-mac-new/tools/assistant/tools/qcollectiongenerator/qcollectiongenerator.pro
2011-07-07 14:44:24.000000000 -0400
+@@ -8,6 +8,12 @@
+ help \
+ console
+ CONFIG -= app_bundle
++
++# work around lack of indirect symbols in 10.4
++qclucene = QtCLucene$${QT_LIBINFIX}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
+ target.path = $$[QT_INSTALL_BINS]
+ INSTALLS += target
+ SOURCES += ../shared/helpgenerator.cpp \
+diff -Nurd
qt-kde-qt-mac/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
qt-kde-qt-mac-new/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
+--- qt-kde-qt-mac/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
2010-12-27 15:08:46.000000000 -0500
++++ qt-kde-qt-mac-new/tools/assistant/tools/qhelpgenerator/qhelpgenerator.pro
2011-07-07 14:44:46.000000000 -0400
+@@ -5,6 +5,11 @@
+ CONFIG -= app_bundle
+ QT += network
+
++# work around lack of indirect symbols in 10.4
++qclucene = QtCLucene$${QT_LIBINFIX}
++linux-lsb-g++:LIBS_PRIVATE += --lsb-shared-libs=$$qclucene
++LIBS_PRIVATE += -l$$qclucene
++
+ target.path=$$[QT_INSTALL_BINS]
+ INSTALLS += target
+
Index: qt4-base-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base-mac.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qt4-base-mac.info 18 May 2011 02:23:42 -0000 1.2
+++ qt4-base-mac.info 8 Jul 2011 02:45:18 -0000 1.3
@@ -1,7 +1,7 @@
Info4: <<
Package: qt4-base-mac
Version: 4.7.3
-Revision: 1
+Revision: 2
Description: Cross-Platform framework (%type_pkg[qt])
Type: qt (mac)
License: LGPL
@@ -32,7 +32,7 @@
%N-linguist (>= %v-%r)
<<
BuildDepends: <<
- cups-dev,
+ system-cups-dev,
dbus1.3-dev (>= 1.2.24-1),
expat1,
fink (>= 0.30.0-1),
@@ -70,7 +70,7 @@
perl -pi -e 's,CFG_MAC_XARCH=auto,CFG_MAC_XARCH=no,g' configure
<<
PatchFile: qt4-base.patch
-PatchFile-MD5: d17c9da8c060e0093fa7e865c2d617d3
+PatchFile-MD5: ac6ba07393f4e001076db6f64ddd2d70
NoSetLDFLAGS: true
UseMaxBuildJobs: true
@@ -362,16 +362,17 @@
libtiff-shlibs (>= 1.0-1)
<<
Replaces: <<
- qt4-%type_pkg[qt] (<< 4.7.3-1),
+ qt4-%type_pkg[qt] (<< 4.7.3-2),
qt4-%type_pkg[qt]-core-shlibs (<< 4.7.3-1),
qt4-%type_pkg[qt]-gui-shlibs (<< 4.7.3-1)
<<
Files: <<
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/QtGui
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/QtGui_debug
+ lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Resources
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Versions/4/QtGui
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Versions/4/QtGui_debug
-
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Versions/4/Resources/qt_menu.nib
+ lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Versions/4/Resources
lib/qt4-%type_pkg[qt]/lib/QtGui.framework/Versions/Current
lib/qt4-%type_pkg[qt]/plugins/accessible/libqtaccessiblewidgets*
lib/qt4-%type_pkg[qt]/plugins/graphicssystems/libqtrace*
Index: qt4-base-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/qt4-base-x11.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qt4-base-x11.info 18 May 2011 02:23:42 -0000 1.3
+++ qt4-base-x11.info 8 Jul 2011 02:45:18 -0000 1.4
@@ -1,7 +1,7 @@
Info4: <<
Package: qt4-base-x11
Version: 4.7.3
-Revision: 1
+Revision: 2
Description: Cross-Platform framework (%type_pkg[qt])
Type: qt (x11)
License: LGPL
@@ -32,7 +32,7 @@
%N-linguist (>= %v-%r)
<<
BuildDepends: <<
- cups-dev,
+ system-cups-dev,
dbus1.3-dev (>= 1.2.24-1),
expat1,
fink (>= 0.30.0-1),
@@ -74,7 +74,7 @@
perl -pi -e 's,CFG_MAC_XARCH=auto,CFG_MAC_XARCH=no,g' configure
<<
PatchFile: qt4-base.patch
-PatchFile-MD5: d17c9da8c060e0093fa7e865c2d617d3
+PatchFile-MD5: ac6ba07393f4e001076db6f64ddd2d70
NoSetLDFLAGS: true
UseMaxBuildJobs: true
@@ -336,7 +336,7 @@
libtiff-shlibs (>= 1.0-1)
<<
Replaces: <<
- qt4-%type_pkg[qt] (<< 4.7.3-1),
+ qt4-%type_pkg[qt] (<< 4.7.3-2),
qt4-%type_pkg[qt]-core-shlibs (<< 4.7.3-1),
qt4-%type_pkg[qt]-gui-shlibs (<< 4.7.3-1)
<<
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
