Author: ranger
Date: Thu Sep 24 02:31:07 2009
New Revision: 1618
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1618&repname=user%3a+ranger>
Log:
various kde4 fixes
Added:
trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4.patch
trunk/experimental/common/main/finkinfo/kde/kdewebdev4.patch
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-x11.info
trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-x11.info
trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-x11.info
trunk/experimental/10.4/main/finkinfo/kde/kdeedu4.patch
trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-x11.info
trunk/experimental/10.4/main/finkinfo/kde/kdeutils4.patch
trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-x11.info
trunk/experimental/common/main/finkinfo/kde/kdeadmin4.info.in
trunk/experimental/common/main/finkinfo/kde/kdeartwork4.info.in
trunk/experimental/common/main/finkinfo/kde/kdeedu4.info.in
trunk/experimental/common/main/finkinfo/kde/kdeedu4.patch
trunk/experimental/common/main/finkinfo/kde/kdeutils4.info.in
trunk/experimental/common/main/finkinfo/kde/kdeutils4.patch
trunk/experimental/common/main/finkinfo/kde/kdewebdev4.info.in
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-mac.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-mac.info Thu Sep 24
02:31:07 2009
@@ -120,13 +120,6 @@
opt/kde4/%type_pkg[kde]/share/applications/kde4/ksystemlog*
opt/kde4/%type_pkg[kde]/share/apps/ksystemlog
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/ksystemlog
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/scalable/apps/ksystemlog*
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-x11.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeadmin4-x11.info Thu Sep 24
02:31:07 2009
@@ -120,13 +120,6 @@
opt/kde4/%type_pkg[kde]/share/applications/kde4/ksystemlog*
opt/kde4/%type_pkg[kde]/share/apps/ksystemlog
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/ksystemlog
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/scalable/apps/ksystemlog*
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-mac.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-mac.info Thu Sep 24
02:31:07 2009
@@ -87,7 +87,7 @@
Package: %N-icon-themes
Description: KDE4 - extra icon themes
Depends: %N-base (>= %v-%r)
- Files: opt/kde4/%type_pkg[kde]/share/icons/kdeclassic
+ Files: opt/kde4/%type_pkg[kde]/share/icons
<<
SplitOff5: <<
Package: %N-sounds
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-x11.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeartwork4-x11.info Thu Sep 24
02:31:07 2009
@@ -87,7 +87,7 @@
Package: %N-icon-themes
Description: KDE4 - extra icon themes
Depends: %N-base (>= %v-%r)
- Files: opt/kde4/%type_pkg[kde]/share/icons/kdeclassic
+ Files: opt/kde4/%type_pkg[kde]/share/icons
<<
SplitOff5: <<
Package: %N-sounds
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-mac.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-mac.info Thu Sep 24
02:31:07 2009
@@ -59,7 +59,7 @@
Source: mirror:kde:stable/%v/src/kdeedu-%v.tar.bz2
Source-MD5: f283c3727e3507e548e43b84a28def7d
PatchFile: kdeedu4.patch
-PatchFile-MD5: 9634d8b365acda0821936fbdf7052447
+PatchFile-MD5: 795f3c432ece5c0796e881c8ee995301
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-x11.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeedu4-x11.info Thu Sep 24
02:31:07 2009
@@ -59,7 +59,7 @@
Source: mirror:kde:stable/%v/src/kdeedu-%v.tar.bz2
Source-MD5: f283c3727e3507e548e43b84a28def7d
PatchFile: kdeedu4.patch
-PatchFile-MD5: 9634d8b365acda0821936fbdf7052447
+PatchFile-MD5: 795f3c432ece5c0796e881c8ee995301
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeedu4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeedu4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeedu4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeedu4.patch Thu Sep 24 02:31:07
2009
@@ -1,6 +1,34 @@
-diff -Nurd kdeedu-4.2.1/parley/src/practiceold/practicedialog.cpp
kdeedu-4.2.1-new/parley/src/practiceold/practicedialog.cpp
---- kdeedu-4.2.1/parley/src/practiceold/practicedialog.cpp 2008-10-09
05:47:15.000000000 -0400
-+++ kdeedu-4.2.1-new/parley/src/practiceold/practicedialog.cpp 2009-03-11
09:33:19.000000000 -0400
+diff -Nurd kdeedu-4.3.1/kstars/kstars/skycomponents/deepstarcomponent.cpp
kdeedu-4.3.1-new/kstars/kstars/skycomponents/deepstarcomponent.cpp
+--- kdeedu-4.3.1/kstars/kstars/skycomponents/deepstarcomponent.cpp
2009-08-03 18:38:17.000000000 -0400
++++ kdeedu-4.3.1-new/kstars/kstars/skycomponents/deepstarcomponent.cpp
2009-09-23 20:28:19.000000000 -0400
+@@ -52,6 +52,10 @@
+ #include <sys/endian.h>
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
+ #else
+ #include <byteswap.h>
+ #endif
+diff -Nurd kdeedu-4.3.1/kstars/kstars/skycomponents/starcomponent.cpp
kdeedu-4.3.1-new/kstars/kstars/skycomponents/starcomponent.cpp
+--- kdeedu-4.3.1/kstars/kstars/skycomponents/starcomponent.cpp 2009-08-03
18:38:17.000000000 -0400
++++ kdeedu-4.3.1-new/kstars/kstars/skycomponents/starcomponent.cpp
2009-09-23 20:28:19.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/endian.h>
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
+ #else
+ #include <byteswap.h>
+ #endif
+diff -Nurd kdeedu-4.3.1/parley/src/practiceold/practicedialog.cpp
kdeedu-4.3.1-new/parley/src/practiceold/practicedialog.cpp
+--- kdeedu-4.3.1/parley/src/practiceold/practicedialog.cpp 2009-05-14
13:26:40.000000000 -0400
++++ kdeedu-4.3.1-new/parley/src/practiceold/practicedialog.cpp 2009-09-23
20:18:58.000000000 -0400
@@ -34,7 +34,6 @@
#include <Phonon/MediaObject>
#include <Phonon/Path>
@@ -9,9 +37,9 @@
#include <QTextEdit>
#include <QRadioButton>
#include <QCloseEvent>
-diff -Nurd kdeedu-4.2.1/parley/src/practiceold/showsolutiondialog.cpp
kdeedu-4.2.1-new/parley/src/practiceold/showsolutiondialog.cpp
---- kdeedu-4.2.1/parley/src/practiceold/showsolutiondialog.cpp 2008-07-21
20:03:55.000000000 -0400
-+++ kdeedu-4.2.1-new/parley/src/practiceold/showsolutiondialog.cpp
2009-03-11 09:33:19.000000000 -0400
+diff -Nurd kdeedu-4.3.1/parley/src/practiceold/showsolutiondialog.cpp
kdeedu-4.3.1-new/parley/src/practiceold/showsolutiondialog.cpp
+--- kdeedu-4.3.1/parley/src/practiceold/showsolutiondialog.cpp 2008-07-21
20:03:55.000000000 -0400
++++ kdeedu-4.3.1-new/parley/src/practiceold/showsolutiondialog.cpp
2009-09-23 20:18:58.000000000 -0400
@@ -20,7 +20,6 @@
#include <Phonon/MediaObject>
#include <Phonon/Path>
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-mac.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-mac.info Thu Sep 24
02:31:07 2009
@@ -46,7 +46,7 @@
Source: mirror:kde:stable/%v/src/kdeutils-%v.tar.bz2
Source-MD5: 69491ba185ba8ecb2dd4860d7048a88a
PatchFile: kdeutils4.patch
-PatchFile-MD5: 6f12a4c78db1c3b32e0b577f2fe1e6a5
+PatchFile-MD5: 2e679d1fe33c92f5a353b7a6c4ee590a
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-x11.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeutils4-x11.info Thu Sep 24
02:31:07 2009
@@ -48,7 +48,7 @@
Source: mirror:kde:stable/%v/src/kdeutils-%v.tar.bz2
Source-MD5: 69491ba185ba8ecb2dd4860d7048a88a
PatchFile: kdeutils4.patch
-PatchFile-MD5: 6f12a4c78db1c3b32e0b577f2fe1e6a5
+PatchFile-MD5: 2e679d1fe33c92f5a353b7a6c4ee590a
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeutils4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeutils4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeutils4.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeutils4.patch Thu Sep 24
02:31:07 2009
@@ -32,22 +32,3 @@
# --- show log ---
macro_display_feature_log()
-diff -Nurd kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt
kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt
---- kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt 2008-10-22
19:03:27.000000000 -0400
-+++ kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt 2009-04-06
10:18:22.000000000 -0400
-@@ -4,11 +4,12 @@
- ${CMAKE_CURRENT_BINARY_DIR}/../..
- )
-
--if(WIN32)
-+# this should be fixed to detect it :P
-+if(WIN32 OR APPLE)
- set (LIBZIP_COMPILED_WITH_32BIT_OFF_T OFF CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
--else(WIN32)
-+else(WIN32 OR APPLE)
- set (LIBZIP_COMPILED_WITH_32BIT_OFF_T ON CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
--endif(WIN32)
-+endif(WIN32 OR APPLE)
-
- if (LIBZIP_COMPILED_WITH_32BIT_OFF_T)
-
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-mac.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-mac.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-mac.info Thu Sep 24
02:31:07 2009
@@ -42,6 +42,8 @@
Source: mirror:kde:stable/%v/src/kdewebdev-%v.tar.bz2
Source-MD5: 22b8e5055f93ef07dc8233f003109d3f
+PatchFile: kdewebdev4.patch
+PatchFile-MD5: 07ced1828f9aa79f0ef340034277eab1
CompileScript: <<
#!/bin/sh -ev
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-x11.info&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-x11.info (original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4-x11.info Thu Sep 24
02:31:07 2009
@@ -42,6 +42,8 @@
Source: mirror:kde:stable/%v/src/kdewebdev-%v.tar.bz2
Source-MD5: 22b8e5055f93ef07dc8233f003109d3f
+PatchFile: kdewebdev4.patch
+PatchFile-MD5: 07ced1828f9aa79f0ef340034277eab1
CompileScript: <<
#!/bin/sh -ev
Added: trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4.patch (added)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdewebdev4.patch Thu Sep 24
02:31:07 2009
@@ -1,0 +1,12 @@
+diff -Nurd kdewebdev-4.3.1/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
kdewebdev-4.3.1-new/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
+--- kdewebdev-4.3.1/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
2009-08-27 04:17:52.000000000 -0400
++++ kdewebdev-4.3.1-new/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
2009-09-23 09:33:15.000000000 -0400
+@@ -43,6 +43,8 @@
+ #endif
+ #endif
+
++#include <pthread.h>
++
+ #define DEBUG_BUFFER_SIZE 500
+
+ static char inputBuffer[DEBUG_BUFFER_SIZE];
Modified: trunk/experimental/common/main/finkinfo/kde/kdeadmin4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeadmin4.info.in&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeadmin4.info.in (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeadmin4.info.in Thu Sep 24
02:31:07 2009
@@ -131,13 +131,6 @@
opt/kde4/%type_pkg[kde]/share/applications/kde4/ksystemlog*
opt/kde4/%type_pkg[kde]/share/apps/ksystemlog
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/ksystemlog
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/apps/ksystemlog*
-
opt/kde4/%type_pkg[kde]/share/icons/hicolor/scalable/apps/ksystemlog*
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
Modified: trunk/experimental/common/main/finkinfo/kde/kdeartwork4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeartwork4.info.in&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeartwork4.info.in (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeartwork4.info.in Thu Sep 24
02:31:07 2009
@@ -110,7 +110,7 @@
Description: KDE4 - extra icon themes
Depends: %N-base (>= %v-%r)
Files: <<
- opt/kde4/%type_pkg[kde]/share/icons/kdeclassic
+ opt/kde4/%type_pkg[kde]/share/icons
<<
<<
SplitOff5: <<
Modified: trunk/experimental/common/main/finkinfo/kde/kdeedu4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeedu4.info.in&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeedu4.info.in (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeedu4.info.in Thu Sep 24
02:31:07 2009
@@ -19,7 +19,7 @@
Source: mirror:kde:stable/%v/src/kdeedu-%v.tar.bz2
Source-MD5: f283c3727e3507e548e43b84a28def7d
PatchFile: kdeedu4.patch
-PatchFile-MD5: 9634d8b365acda0821936fbdf7052447
+PatchFile-MD5: 795f3c432ece5c0796e881c8ee995301
Depends: <<
blinken4-%type_pkg[kde] (>= %v-%r),
Modified: trunk/experimental/common/main/finkinfo/kde/kdeedu4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeedu4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeedu4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeedu4.patch Thu Sep 24
02:31:07 2009
@@ -1,6 +1,34 @@
-diff -Nurd kdeedu-4.2.1/parley/src/practiceold/practicedialog.cpp
kdeedu-4.2.1-new/parley/src/practiceold/practicedialog.cpp
---- kdeedu-4.2.1/parley/src/practiceold/practicedialog.cpp 2008-10-09
05:47:15.000000000 -0400
-+++ kdeedu-4.2.1-new/parley/src/practiceold/practicedialog.cpp 2009-03-11
09:33:19.000000000 -0400
+diff -Nurd kdeedu-4.3.1/kstars/kstars/skycomponents/deepstarcomponent.cpp
kdeedu-4.3.1-new/kstars/kstars/skycomponents/deepstarcomponent.cpp
+--- kdeedu-4.3.1/kstars/kstars/skycomponents/deepstarcomponent.cpp
2009-08-03 18:38:17.000000000 -0400
++++ kdeedu-4.3.1-new/kstars/kstars/skycomponents/deepstarcomponent.cpp
2009-09-23 20:28:19.000000000 -0400
+@@ -52,6 +52,10 @@
+ #include <sys/endian.h>
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
+ #else
+ #include <byteswap.h>
+ #endif
+diff -Nurd kdeedu-4.3.1/kstars/kstars/skycomponents/starcomponent.cpp
kdeedu-4.3.1-new/kstars/kstars/skycomponents/starcomponent.cpp
+--- kdeedu-4.3.1/kstars/kstars/skycomponents/starcomponent.cpp 2009-08-03
18:38:17.000000000 -0400
++++ kdeedu-4.3.1-new/kstars/kstars/skycomponents/starcomponent.cpp
2009-09-23 20:28:19.000000000 -0400
+@@ -42,6 +42,10 @@
+ #include <sys/endian.h>
+ #define bswap_16(x) bswap16(x)
+ #define bswap_32(x) bswap32(x)
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define bswap_16(x) OSSwapInt16(x)
++#define bswap_32(x) OSSwapInt32(x)
+ #else
+ #include <byteswap.h>
+ #endif
+diff -Nurd kdeedu-4.3.1/parley/src/practiceold/practicedialog.cpp
kdeedu-4.3.1-new/parley/src/practiceold/practicedialog.cpp
+--- kdeedu-4.3.1/parley/src/practiceold/practicedialog.cpp 2009-05-14
13:26:40.000000000 -0400
++++ kdeedu-4.3.1-new/parley/src/practiceold/practicedialog.cpp 2009-09-23
20:18:58.000000000 -0400
@@ -34,7 +34,6 @@
#include <Phonon/MediaObject>
#include <Phonon/Path>
@@ -9,9 +37,9 @@
#include <QTextEdit>
#include <QRadioButton>
#include <QCloseEvent>
-diff -Nurd kdeedu-4.2.1/parley/src/practiceold/showsolutiondialog.cpp
kdeedu-4.2.1-new/parley/src/practiceold/showsolutiondialog.cpp
---- kdeedu-4.2.1/parley/src/practiceold/showsolutiondialog.cpp 2008-07-21
20:03:55.000000000 -0400
-+++ kdeedu-4.2.1-new/parley/src/practiceold/showsolutiondialog.cpp
2009-03-11 09:33:19.000000000 -0400
+diff -Nurd kdeedu-4.3.1/parley/src/practiceold/showsolutiondialog.cpp
kdeedu-4.3.1-new/parley/src/practiceold/showsolutiondialog.cpp
+--- kdeedu-4.3.1/parley/src/practiceold/showsolutiondialog.cpp 2008-07-21
20:03:55.000000000 -0400
++++ kdeedu-4.3.1-new/parley/src/practiceold/showsolutiondialog.cpp
2009-09-23 20:18:58.000000000 -0400
@@ -20,7 +20,6 @@
#include <Phonon/MediaObject>
#include <Phonon/Path>
Modified: trunk/experimental/common/main/finkinfo/kde/kdeutils4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeutils4.info.in&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeutils4.info.in (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeutils4.info.in Thu Sep 24
02:31:07 2009
@@ -18,7 +18,7 @@
Source: mirror:kde:stable/%v/src/kdeutils-%v.tar.bz2
Source-MD5: 69491ba185ba8ecb2dd4860d7048a88a
PatchFile: kdeutils4.patch
-PatchFile-MD5: 6f12a4c78db1c3b32e0b577f2fe1e6a5
+PatchFile-MD5: 2e679d1fe33c92f5a353b7a6c4ee590a
Depends: <<
ark4-%type_pkg[kde] (>= %v-%r),
Modified: trunk/experimental/common/main/finkinfo/kde/kdeutils4.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeutils4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeutils4.patch (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeutils4.patch Thu Sep 24
02:31:07 2009
@@ -32,22 +32,3 @@
# --- show log ---
macro_display_feature_log()
-diff -Nurd kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt
kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt
---- kdeutils-4.2.2/ark/plugins/libzipplugin/CMakeLists.txt 2008-10-22
19:03:27.000000000 -0400
-+++ kdeutils-4.2.2-new/ark/plugins/libzipplugin/CMakeLists.txt 2009-04-06
10:18:22.000000000 -0400
-@@ -4,11 +4,12 @@
- ${CMAKE_CURRENT_BINARY_DIR}/../..
- )
-
--if(WIN32)
-+# this should be fixed to detect it :P
-+if(WIN32 OR APPLE)
- set (LIBZIP_COMPILED_WITH_32BIT_OFF_T OFF CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
--else(WIN32)
-+else(WIN32 OR APPLE)
- set (LIBZIP_COMPILED_WITH_32BIT_OFF_T ON CACHE BOOL "Whether the system
libzip library is compiled with 32bits off_t" )
--endif(WIN32)
-+endif(WIN32 OR APPLE)
-
- if (LIBZIP_COMPILED_WITH_32BIT_OFF_T)
-
Modified: trunk/experimental/common/main/finkinfo/kde/kdewebdev4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdewebdev4.info.in&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdewebdev4.info.in (original)
+++ trunk/experimental/common/main/finkinfo/kde/kdewebdev4.info.in Thu Sep 24
02:31:07 2009
@@ -17,6 +17,8 @@
Source: mirror:kde:stable/%v/src/kdewebdev-%v.tar.bz2
Source-MD5: 22b8e5055f93ef07dc8233f003109d3f
+PatchFile: kdewebdev4.patch
+PatchFile-MD5: 07ced1828f9aa79f0ef340034277eab1
Depends: <<
kfilereplace4-%type_pkg[kde] (>= %v-%r),
Added: trunk/experimental/common/main/finkinfo/kde/kdewebdev4.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/main/finkinfo/kde/kdewebdev4.patch&rev=1618&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdewebdev4.patch (added)
+++ trunk/experimental/common/main/finkinfo/kde/kdewebdev4.patch Thu Sep 24
02:31:07 2009
@@ -1,0 +1,12 @@
+diff -Nurd kdewebdev-4.3.1/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
kdewebdev-4.3.1-new/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
+--- kdewebdev-4.3.1/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
2009-08-27 04:17:52.000000000 -0400
++++ kdewebdev-4.3.1-new/kxsldbg/kxsldbgpart/libqtnotfier/xsldbgthread.cpp
2009-09-23 09:33:15.000000000 -0400
+@@ -43,6 +43,8 @@
+ #endif
+ #endif
+
++#include <pthread.h>
++
+ #define DEBUG_BUFFER_SIZE 500
+
+ static char inputBuffer[DEBUG_BUFFER_SIZE];
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
