Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv27660
Modified Files:
kdebase4-workspace.info kdebase4-workspace.patch
Log Message:
fix the hell out of the build: unbreak for modern qt4 and switch to its deps,
upstream fixes to allow switching to libpng15, solve two-year-old bug that
blocks building on a machine where x11 is running
Index: kdebase4-workspace.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/kdebase4-workspace.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kdebase4-workspace.info 21 Aug 2010 22:35:10 -0000 1.3
+++ kdebase4-workspace.info 2 Apr 2012 04:39:44 -0000 1.4
@@ -1,7 +1,7 @@
Info3: <<
Package: kdebase4-workspace-%type_pkg[kde]
Version: 4.4.1
-Revision: 3
+Revision: 4
Description: KDE4 - base applications and tools
Type: kde (x11)
License: GPL/LGPL
@@ -13,7 +13,7 @@
kdelibs4-%type_pkg[kde] (>= 4.4.1-1),
kdepimlibs4-%type_pkg[kde] (>= 4.4.1-1),
libknotificationitem1-%type_pkg[kde] (>= 4.3.4-1),
- pyqt4-py26
+ pyqt4-py27
<<
BuildDepends: <<
akonadi-%type_pkg[kde]-dev,
@@ -25,15 +25,15 @@
cmake (>= 2.6.4-1),
cups-dev,
cyrus-sasl2-dev,
- dbus-dev (>= 1.2.12-1),
+ dbus1.3-dev,
expat1,
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),
gettext-tools,
giflib,
- glib2-dev (>= 2.18.4-1),
- gpsd-dev,
+ glib2-dev (>= 2.22.0-1),
+# gpsd-dev (>= 3.0-1),
kde4-buildenv (>= 4.4.0-1),
kdelibs4-%type_pkg[kde]-dev (>= 4.4.1-1),
kdepimlibs4-%type_pkg[kde]-dev (>= 4.4.1-1),
@@ -42,20 +42,24 @@
libjasper.1,
libjpeg8,
libknotificationitem1-%type_pkg[kde]-dev (>= 4.3.4-1),
- libpng3,
+ libpng15,
libtiff,
- libusb,
+ libusb1,
(%type_pkg[kde] = x11) libxklavier16,
libxml2,
libxslt,
openexr-dev,
openldap24-dev,
- pcre,
+ libpcre1,
+ phonon-%type_pkg[kde] (>= 4.5.0-1),
pkgconfig (>= 0.23-1),
- python26,
- pyqt4-py26,
+ python27,
+ pyqt4-py27,
qca2-%type_pkg[kde] (>= 2.0.2-1),
- qt4-%type_pkg[kde] (>= 4.6.1-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),
strigi-dev (>= 0.6.3-1),
strigi-gui-%type_pkg[kde]-dev (>= 0.7.2-1),
(-%type_pkg[kde] = x11) x11-dev,
@@ -67,9 +71,17 @@
Source: mirror:kde:stable/%v/src/kdebase-workspace-%v.tar.bz2
Source-MD5: c5a5826ce0e8b0faa760971850b29111
SourceDirectory: kdebase-workspace-%v
-PatchScript: sed -e 's,@FINKPREFIX@,%p,g; s,@FINKTYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
+PatchScript: <<
+ sed -e 's,@FINKPREFIX@,%p,g; s,@FINKTYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
+
+ # not yet in fink, provides consistent build if they were to be
+ perl -pi -e 's/qzion>=0.4.0 qedje>=0.4.0/DO_NOT_DETECT_qzio
DO_NOT_DETECT_qedje/' cmake/modules/FindQEdje.cmake
+
+ # pending gpsd-3.0 availability and patch to support it...
+ perl -pi -e 's/NAMES gps/NAMES DO_NOT_DETECT_gps/'
plasma/generic/dataengines/geolocation/cmake/modules/Findlibgps.cmake
+<<
PatchFile: kdebase4-workspace.patch
-PatchFile-MD5: 488d62ad09d85d3fc1caa39123ce31fe
+PatchFile-MD5: 0c9ff599a789600fb859fc2a1518cf53
CompileScript: <<
#!/bin/sh -ev
@@ -77,13 +89,13 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
- export PYTHONPATH=%p/lib/qt4-x11/lib/python2.6/site-packages
+ export PYTHONPATH=%p/lib/qt4-x11/lib/python2.7/site-packages
mkdir -p build
pushd build
cmake $KDE4_CMAKE_ARGS \
- -DPYTHON_EXECUTABLE:FILEPATH=%p/bin/python2.6 \
-
-DPYTHON_LIBRARY:FILEPATH=%p/lib/python2.6/config/libpython2.6.dylib \
+ -DPYTHON_EXECUTABLE:FILEPATH=%p/bin/python2.7 \
+
-DPYTHON_LIBRARY:FILEPATH=%p/lib/python2.7/config/libpython2.7.dylib \
..
make VERBOSE=1
popd
@@ -104,12 +116,12 @@
Package: %N-shlibs
Description: KDE4 - base shared libraries
Depends: <<
- glib2-shlibs (>= 2.18.4-1),
- gpsd-shlibs,
+ glib2-shlibs (>= 2.22.0-1),
+# gpsd-shlibs (>= 3.0-1),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.4.1-1),
kdepimlibs4-%type_pkg[kde]-shlibs (>= 4.4.1-1),
libknotificationitem1-%type_pkg[kde]-shlibs (>= 4.3.4-1),
- libusb-shlibs,
+ libusb1-shlibs,
(%type_pkg[kde] = x11) libxklavier16-shlibs,
qca2-%type_pkg[kde]-shlibs (>= 2.0.2-1),
strigi-gui-%type_pkg[kde]-shlibs (>= 0.7.2-1),
@@ -223,8 +235,27 @@
DescDetail: Base tools for the K Desktop Environment.
DescPackaging: <<
- Recent gpsd now claim interface level 4, so need to test as
- >=3 not ==3.
+# Recent gpsd now claim interface level 4, so need to test as
+# >=3 not ==3.
+ 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). Similar to: https://bugs.kde.org/269165
+
+ Fix battery.h signals for qt4.7 using upstream patch. See:
+
https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/79f776733d418c5e15f2cb59314c7ef475650476
+
+ Fix qpnggio.cpp for libpng15 using upstream patches. See:
+
https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/7e6027ac159750cff0d5fb1f065417a47a32d8ae
+
https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/0323d1c21d7b24fba71137112cd3712cbf669dad
+
+ dmacks: hardcode expected available X flags instead of
+ introspecting because running "X -help" when X is already
+ running tends to hang. See:
+ http://thread.gmane.org/gmane.os.macosx.fink.user/30500
+ http://thread.gmane.org/gmane.os.macosx.fink.user/31263
+ http://paste.lisp.org/display/113499
<<
<<
Index: kdebase4-workspace.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/kdebase4-workspace.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdebase4-workspace.patch 14 Aug 2010 03:17:05 -0000 1.2
+++ kdebase4-workspace.patch 2 Apr 2012 04:39:44 -0000 1.3
@@ -87,6 +87,35 @@
#ifndef HAVE_XKLAVIER
static const QString findX11Dir();
+diff -Nurd kdebase-workspace-4.4.1/kdm/kfrontend/genkdmconf.c
kdebase-workspace-4.4.1-new/kdm/kfrontend/genkdmconf.c
+--- kdebase-workspace-4.4.1/kdm/kfrontend/genkdmconf.c 2009-10-26
05:14:48.000000000 -0400
++++ kdebase-workspace-4.4.1-new/kdm/kfrontend/genkdmconf.c 2012-04-02
00:03:06.000000000 -0400
+@@ -1586,16 +1586,25 @@
+ if (!(sa = splitArgs( ce->value )))
+ return;
+ ASPrintf( &svr, "%s -help 2>&1", sa->str );
++ /*
++ // running "X" may hang if already running, so
++ // hardcode likely results instead of instrospecting
+ if (!(fp = popen( svr, "r" )))
+ return;
+ buf[fread( buf, 1, sizeof(buf) - 1, fp )] = 0;
+ pclose( fp );
+ if (strstr( buf, "\n-br " ))
++ */
++ // mentioned in Xserver manpage back at least to 10.4's x11
+ addStr( &sa, "-br" );
++ /*
+ if (strstr( buf, "\n-novtswitch " ))
++ // not available as of 10.6 x11
+ addStr( &sa, "-novtswitch" );
+ if (strstr( buf, "\n-quiet " ))
++ // not available as of 10.6 x11
+ addStr( &sa, "-quiet" );
++ */
+ ce->value = joinArgs( sa );
+ ce->written = True;
+ }
diff -Nurd kdebase-workspace-4.4.1/ksmserver/server.cpp
kdebase-workspace-4.4.1-new/ksmserver/server.cpp
--- kdebase-workspace-4.4.1/ksmserver/server.cpp 2009-07-28
15:44:41.000000000 -0400
+++ kdebase-workspace-4.4.1-new/ksmserver/server.cpp 2010-03-05
14:53:30.000000000 -0500
@@ -108,6 +137,111 @@
fName += '_'+display.toLocal8Bit();
::unlink(fName.data());
+diff -Nurd kdebase-workspace-4.4.1/ksplash/ksplashx/qpngio.cpp
kdebase-workspace-4.4.1-new/ksplash/ksplashx/qpngio.cpp
+--- kdebase-workspace-4.4.1/ksplash/ksplashx/qpngio.cpp 2009-08-28
12:01:29.000000000 -0400
++++ kdebase-workspace-4.4.1-new/ksplash/ksplashx/qpngio.cpp 2012-04-01
15:10:02.000000000 -0400
+@@ -112,12 +112,16 @@
+ png_uint_32 height;
+ int bit_depth;
+ int color_type;
+- png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+- 0, 0, 0);
++ png_bytep trans_alpha = 0;
++ png_color_16p trans_color_p = 0;
++ int num_trans;
++ png_colorp palette = 0;
++ int num_palette;
++ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
0, 0, 0);
+
+ if ( color_type == PNG_COLOR_TYPE_GRAY ) {
+ // Black & White or 8-bit grayscale
+- if ( bit_depth == 1 && info_ptr->channels == 1 ) {
++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
+ png_set_invert_mono( png_ptr );
+ png_read_update_info( png_ptr, info_ptr );
+ if (!image.create( width, height, 1, 2, QImage::BigEndian ))
+@@ -150,54 +154,45 @@
+ int c = i*255/(ncols-1);
+ image.setColor( i, qRgba(c,c,c,0xff) );
+ }
+- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-#if PNG_LIBPNG_VER < 10400
+- const int g = info_ptr->trans_values.gray;
+-#else
+- const int g = info_ptr->trans_color.gray;
+-#endif
++ if (png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans,
&trans_color_p) && trans_color_p) {
++ const int g = trans_color_p->gray;
+ if (g < ncols) {
+- image.setAlphaBuffer(true);
+- image.setColor(g, image.color(g) & RGB_MASK);
++ image.setColor(g, 0);
+ }
+ }
+ }
+ } else if ( color_type == PNG_COLOR_TYPE_PALETTE
+- && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
+- && info_ptr->num_palette <= 256 )
++ && png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)
++ && num_palette <= 256 )
+ {
+ // 1-bit and 8-bit color
+ if ( bit_depth != 1 )
+ png_set_packing( png_ptr );
+ png_read_update_info( png_ptr, info_ptr );
+- png_get_IHDR(png_ptr, info_ptr,
+- &width, &height, &bit_depth, &color_type, 0, 0, 0);
+- if (!image.create(width, height, bit_depth, info_ptr->num_palette,
++ png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,
&color_type, 0, 0, 0);
++ if (!image.create(width, height, bit_depth, num_palette,
+ QImage::BigEndian))
+ return;
+ int i = 0;
+- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
++ png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette);
++ if (png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans,
&trans_color_p) && trans_alpha) {
+ image.setAlphaBuffer( true );
+- while ( i < info_ptr->num_trans ) {
++ while ( i < num_trans ) {
+ image.setColor(i, qRgba(
+- info_ptr->palette[i].red,
+- info_ptr->palette[i].green,
+- info_ptr->palette[i].blue,
+-#if PNG_LIBPNG_VER < 10400
+- info_ptr->trans[i]
+-#else
+- info_ptr->trans_alpha[i]
+-#endif
++ palette[i].red,
++ palette[i].green,
++ palette[i].blue,
++ trans_alpha[i]
+ )
+ );
+ i++;
+ }
+ }
+- while ( i < info_ptr->num_palette ) {
++ while ( i < num_palette ) {
+ image.setColor(i, qRgba(
+- info_ptr->palette[i].red,
+- info_ptr->palette[i].green,
+- info_ptr->palette[i].blue,
++ palette[i].red,
++ palette[i].green,
++ palette[i].blue,
+ 0xff
+ )
+ );
+@@ -280,7 +275,7 @@
+ return QImage();
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+ return QImage();
+ }
diff -Nurd kdebase-workspace-4.4.1/ksplash/ksplashx/qpoint.h
kdebase-workspace-4.4.1-new/ksplash/ksplashx/qpoint.h
--- kdebase-workspace-4.4.1/ksplash/ksplashx/qpoint.h 2008-01-04
18:55:38.000000000 -0500
+++ kdebase-workspace-4.4.1-new/ksplash/ksplashx/qpoint.h 2010-03-05
14:53:30.000000000 -0500
@@ -1474,7 +1608,44 @@
+if(NOT WIN32 AND NOT APPLE)
add_subdirectory(system-monitor)
add_subdirectory(systemtray)
- endif(NOT WIN32)
+-endif(NOT WIN32)
++endif(NOT WIN32 AND NOT APPLE)
+diff -Nurd kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.cpp
kdebase-workspace-4.4.1-new/plasma/generic/applets/battery/battery.cpp
+--- kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.cpp
2010-02-04 04:28:44.000000000 -0500
++++ kdebase-workspace-4.4.1-new/plasma/generic/applets/battery/battery.cpp
2012-04-01 17:16:04.000000000 -0400
+@@ -80,7 +80,7 @@
+ m_hours(0),
+ m_theme(0),
+ m_availableProfiles(QStringList()),
+- m_currentProfile(0),
++ m_currentProfile(),
+ m_numOfBattery(0),
+ m_acAdapterPlugged(false),
+ m_remainingMSecs(0),
+diff -Nurd kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.h
kdebase-workspace-4.4.1-new/plasma/generic/applets/battery/battery.h
+--- kdebase-workspace-4.4.1/plasma/generic/applets/battery/battery.h
2010-01-19 18:19:14.000000000 -0500
++++ kdebase-workspace-4.4.1-new/plasma/generic/applets/battery/battery.h
2012-04-01 14:33:11.000000000 -0400
+@@ -42,7 +42,7 @@
+ class Battery : public Plasma::PopupApplet
+ {
+ Q_OBJECT
+- Q_PROPERTY(qreal labelAlpha READ labelAlpha WRITE setLabelAlpha NOTIFY
labelAlphaChanged)
++ Q_PROPERTY(qreal labelAlpha READ labelAlpha WRITE setLabelAlpha)
+ Q_PROPERTY(qreal acAlpha READ acAlpha WRITE setAcAlpha)
+
+ public:
+diff -Nurd
kdebase-workspace-4.4.1/plasma/generic/applets/digital-clock/clock.cpp
kdebase-workspace-4.4.1-new/plasma/generic/applets/digital-clock/clock.cpp
+--- kdebase-workspace-4.4.1/plasma/generic/applets/digital-clock/clock.cpp
2010-02-26 13:31:57.000000000 -0500
++++ kdebase-workspace-4.4.1-new/plasma/generic/applets/digital-clock/clock.cpp
2012-04-01 15:43:31.000000000 -0400
+@@ -54,7 +54,7 @@
+ m_showSeconds(false),
+ m_showTimezone(false),
+ m_dateTimezoneBesides(false),
+- m_dateString(0),
++ m_dateString(),
+ m_layout(0)
+ {
+ KGlobal::locale()->insertCatalog("libplasmaclock");
diff -Nurd
kdebase-workspace-4.4.1/plasma/generic/dataengines/geolocation/CMakeLists.txt
kdebase-workspace-4.4.1-new/plasma/generic/dataengines/geolocation/CMakeLists.txt
---
kdebase-workspace-4.4.1/plasma/generic/dataengines/geolocation/CMakeLists.txt
2009-09-16 07:40:54.000000000 -0400
+++
kdebase-workspace-4.4.1-new/plasma/generic/dataengines/geolocation/CMakeLists.txt
2010-03-05 14:53:30.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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
