Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory vz-cvs-3.sog:/tmp/cvs-serv3696
Modified Files:
kdeedu4-mac.info kdeedu4-x11.info kdeedu4.patch
Log Message:
update to modern qt4 bdep (NB: maintainer is using extensive
inherited/recursive Depends, which is fragile but I'm not changing that), fix
build with modern QString, disable gpsd because that dependency is having
interface-stability probems.
Index: kdeedu4-mac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeedu4-mac.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kdeedu4-mac.info 19 Aug 2010 23:07:11 -0000 1.11
+++ kdeedu4-mac.info 29 Mar 2012 18:46:37 -0000 1.12
@@ -1,7 +1,7 @@
Info4: <<
Package: kdeedu4-mac
Version: 4.4.1
-Revision: 3
+Revision: 4
Description: KDE4 - Edutainment software
Type: kde (mac)
License: GPL/LGPL
@@ -33,14 +33,14 @@
automoc-%type_pkg[kde] (>= 0.9.89-0),
cfitsio,
cmake (>= 2.6.4-1),
- dbus-dev (>= 1.2.12-1),
+ dbus1.3-dev,
fink (>= 0.29.7-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
eigen2 (>= 2.0.11-1),
- glib2-dev (>= 2.18.4-1),
+ glib2-dev (>= 2.22.0-1),
gmm,
- gpsd (>= 2.35-1),
+# gpsd (>= 3.0-1),
gsl,
kde4-buildenv (>= 4.4.0-1),
kdebase4-%type_pkg[kde]-dev (>= 4.4.1-1),
@@ -51,8 +51,13 @@
libxml2,
libxslt,
ocaml,
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
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),
+ qtassistant-compat-%type_pkg[kde] (>= 4.6.3-1),
+ qtassistant-compat-%type_pkg[kde]-bin (>= 4.6.3-1),
+ qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
r-base,
readline5,
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
@@ -66,7 +71,13 @@
Source: mirror:kde:stable/%v/src/kdeedu-%v.tar.bz2
Source-MD5: ef4bb9307043d807f97d8758a9ac1f8f
PatchFile: kdeedu4.patch
-PatchFile-MD5: c78374a968a3b46310f1f78d05e04ced
+PatchFile-MD5: 84fec942978f9745817dea050bd18c1f
+PatchScript: <<
+ %{default_script}
+
+ # pending gpsd-3.0 availability and patch to support it...
+ perl -pi -e 's/libgps>=2.35/DO_NOT_DETECT_libgps/'
marble/Findlibgps.cmake
+<<
SetMAKEFLAGS: -j1
NoSetMAKEFLAGS: true
@@ -271,7 +282,7 @@
Package: marble4-%type_pkg[kde]
Description: KDE4 - virtual globe and world atlas
Depends: <<
- gpsd-shlibs (>= 2.35-1),
+# gpsd-shlibs (>= 3.0-1),
%N-base (>= %v-%r)
<<
Files: <<
@@ -645,5 +656,12 @@
<<
DescDetail: A collection of fun and educational apps for KDE.
+DescPackaging: <<
+ dmacks: upstream bug-report of chaos in use of gpsd 2.9x (beta
+ leading to 3.0) API, making it difficult to be buildable and
+ runnable as that dependency library evolves. Killing support
+ for it until fink has the stable 3.0 release (then add patch
+ for its support). See: https://bugs.kde.org/269165
+
<<
Index: kdeedu4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeedu4-x11.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- kdeedu4-x11.info 19 Aug 2010 23:07:11 -0000 1.11
+++ kdeedu4-x11.info 29 Mar 2012 18:46:37 -0000 1.12
@@ -1,7 +1,7 @@
Info4: <<
Package: kdeedu4-x11
Version: 4.4.1
-Revision: 3
+Revision: 4
Description: KDE4 - Edutainment software
Type: kde (x11)
License: GPL/LGPL
@@ -34,14 +34,14 @@
boost1.41.cmake,
cfitsio,
cmake (>= 2.6.4-1),
- dbus-dev (>= 1.2.12-1),
+ dbus1.3-dev,
fink (>= 0.29.7-1),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.7-7),
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
eigen2 (>= 2.0.11-1),
- glib2-dev (>= 2.18.4-1),
+ glib2-dev (>= 2.22.0-1),
gmm,
- gpsd (>= 2.35-1),
+# gpsd (>= 3.0-1),
gsl,
kde4-buildenv (>= 4.4.0-1),
kdebase4-%type_pkg[kde]-dev (>= 4.4.1-1),
@@ -52,8 +52,13 @@
libxml2,
libxslt,
ocaml,
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
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),
+ qtassistant-compat-%type_pkg[kde] (>= 4.6.3-1),
+ qtassistant-compat-%type_pkg[kde]-bin (>= 4.6.3-1),
+ qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
r-base,
readline5,
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
@@ -67,7 +72,13 @@
Source: mirror:kde:stable/%v/src/kdeedu-%v.tar.bz2
Source-MD5: ef4bb9307043d807f97d8758a9ac1f8f
PatchFile: kdeedu4.patch
-PatchFile-MD5: c78374a968a3b46310f1f78d05e04ced
+PatchFile-MD5: 84fec942978f9745817dea050bd18c1f
+PatchScript: <<
+ %{default_script}
+
+ # pending gpsd-3.0 availability and patch to support it...
+ perl -pi -e 's/libgps>=2.35/DO_NOT_DETECT_libgps/'
marble/Findlibgps.cmake
+<<
SetMAKEFLAGS: -j1
NoSetMAKEFLAGS: true
@@ -273,7 +284,7 @@
Package: marble4-%type_pkg[kde]
Description: KDE4 - virtual globe and world atlas
Depends: <<
- gpsd-shlibs (>= 2.35-1),
+# gpsd-shlibs (>= 3.0-1),
%N-base (>= %v-%r)
<<
Files: <<
@@ -657,6 +668,12 @@
in dep's publishing). CPATH for X11 fixes build; prepending
misc fink paths makes sure fink-supplied libs correctly mask
x11's ones.
+
+ dmacks: upstream bug-report of chaos in use of gpsd 2.9x (beta
+ leading to 3.0) API, making it difficult to be buildable and
+ runnable as that dependency library evolves. Killing support
+ for it until fink has the stable 3.0 release (then add patch
+ for its support). See: https://bugs.kde.org/269165
<<
<<
Index: kdeedu4.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeedu4.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kdeedu4.patch 9 Mar 2010 13:49:21 -0000 1.4
+++ kdeedu4.patch 29 Mar 2012 18:46:37 -0000 1.5
@@ -60,6 +60,18 @@
+set( GpsdPositionProviderPlugin_LIBS ${libgps_LIBRARIES} ${libgps_LDFLAGS} )
marble_add_plugin( GpsdPositionProviderPlugin ${gpsd_SRCS} )
+diff -Nurd kdeedu-4.4.1/rocs/src/Core/threadScriptExecution.cpp
kdeedu-4.4.1-new/rocs/src/Core/threadScriptExecution.cpp
+--- kdeedu-4.4.1/rocs/src/Core/threadScriptExecution.cpp 2009-12-31
08:28:39.000000000 -0500
++++ kdeedu-4.4.1-new/rocs/src/Core/threadScriptExecution.cpp 2012-03-29
12:25:20.000000000 -0400
+@@ -9,7 +9,7 @@
+
+ ThreadScriptExecution::ThreadScriptExecution(KTextBrowser * debugView):
+ QThread(),
+- _script(0),
++ _script(),
+ _graphDocument(0),
+ _txtDebug(debugView)
+ {
diff -Nurd kdeedu-4.3.98/step/step/CMakeLists.txt
kdeedu-4.3.98-new/step/step/CMakeLists.txt
--- kdeedu-4.3.98/step/step/CMakeLists.txt 2009-03-27 10:46:55.000000000
-0400
+++ kdeedu-4.3.98-new/step/step/CMakeLists.txt 2010-02-01 14:54:16.000000000
-0500
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
