Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv5296
Modified Files:
kdelibs4.info kdelibs4.patch
Log Message:
fix building against new qt, I think--fails with ld codegen error under xcode4
Index: kdelibs4.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/kdelibs4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdelibs4.patch 15 Jun 2011 20:52:03 -0000 1.1
+++ kdelibs4.patch 15 Jun 2011 20:53:06 -0000 1.2
@@ -107,6 +107,18 @@
/* not sure why, but this is causing lockups */
close( d->fd[0] );
close( d->fd[1] );
+diff -Nurd kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp
kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp
+--- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp 2008-05-21
07:06:15.000000000 -0400
++++ kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp 2011-06-15
07:11:00.000000000 -0400
+@@ -83,7 +83,7 @@
+ {
+ public:
+ K3PasswordDialogPrivate()
+- : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
++ : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
+ minimumPasswordLength(0),
maximumPasswordLength(K3PasswordEdit::PassLen - 1),
+ passwordStrengthWarningLevel(1), m_strengthBar(0),
+ reasonablePasswordLength(8)
diff -Nurd kdelibs-4.4.1/kde4-check-sycoca.sh
kdelibs-4.4.1-new/kde4-check-sycoca.sh
--- kdelibs-4.4.1/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-4.4.1-new/kde4-check-sycoca.sh 2010-03-06 12:39:25.000000000
-0500
Index: kdelibs4.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/kdelibs4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdelibs4.info 15 Jun 2011 20:52:03 -0000 1.1
+++ kdelibs4.info 15 Jun 2011 20:53:06 -0000 1.2
@@ -1,7 +1,7 @@
Info4: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.4.1
-Revision: 1
+Revision: 2
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
@@ -22,7 +22,6 @@
avahi-dev,
bzip2-dev,
cmake (>= 2.6.4-1),
- cups-dev,
dbus-dev (>= 1.2.12-1),
enchant1-dev,
expat1,
@@ -45,7 +44,9 @@
openexr-dev,
pcre (>= 7.6-1),
pkgconfig (>= 0.23-1),
- qt4-%type_pkg[kde] (>= 4.6.1-1),
+ phonon-%type_pkg[kde] (>= 4.5.0-1),
+ qt4-base-%type_pkg[kde] (>= 4.7.3-1),
+ qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1),
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
@@ -62,7 +63,7 @@
SourceDirectory: kdelibs-%v
PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
PatchFile: kdelibs4.patch
-PatchFile-MD5: ab46fedfd409d5a87f2d98d1a5fef3ba
+PatchFile-MD5: cf90f01c779ff22c07a27a49239bfefc
CompileScript: <<
#!/bin/sh -ev
@@ -120,8 +121,21 @@
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
pcre-shlibs (>= 7.6-1),
- qt4-%type_pkg[kde]-designer-shlibs (>= 4.6.1-1),
- qt4-%type_pkg[kde]-gui-shlibs (>= 4.6.1-1),
+ qt4-base-%type_pkg[kde]-qtdesigner-shlibs (>= 4.7.3-1),
+
+qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtdeclarative-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qthelp-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtmultimedia-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtopengl-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtscripttools-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtsvg-shlibs (>= 4.7.3-1),
+phonon-%type_pkg[kde]-shlibs (>= 4.5.0-1),
+phonon-%type_pkg[kde]-backend (>= 4.5.0-1),
+qtwebkit-%type_pkg[kde]-shlibs (>= 2.0.0-4),
+
soprano-%type_pkg[kde]-shlibs (>= 2.4.0-1),
strigi-shlibs (>= 0.6.3-1),
xdg-base
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
