Ticket #21323: kdelibs4.patch

File kdelibs4.patch, 4.8 KB (added by jeremy.laine@…, 15 years ago)

Add patches and update Portfile

  • dports/kde/kdelibs4/Portfile 

    diff --git a/dports/kde/kdelibs4/Portfile b/dports/kde/kdelibs4/Portfile
index ef6aeff..dffac9e 100644
    a b PortGroup kde4 1.0 
    66
    77name                kdelibs4
    88version             4.3.1
     9revision            1
    910categories          kde kde4
    1011maintainers         nomaintainer
    1112description         KDE4 core libraries
    … … checksums md5 df6b6d261d46508c7b0abcdd983ffae2 \ 
    1920                    sha1    511532852caca9302c643fded4013ef1f57d5433 \
    2021                    rmd160  25c8d6225813a677d4f1e1006f18b0d5c14f9003
    2122
     23patchfiles          dont-use-fdatasync.patch \
     24                    dont-use-carbon-keyboard.patch \
     25                    nameser-compat.patch
     26patch.dir           ${workpath}/${distname}
     27patch.pre_args      -p1
     28
    2229depends_build-append port:flex port:gmake
    2330
    2431depends_lib-append  \

  • new file dports/kde/kdelibs4/files/dont-use-carbon-keyboard.patch 

    diff --git a/dports/kde/kdelibs4/files/dont-use-carbon-keyboard.patch b/dports/kde/kdelibs4/files/dont-use-carbon-keyboard.patch
new file mode 100644
index 0000000..d9ca292
    - +  
     1Index: kdelibs-4.3.1/kdeui/util/kkeyserver_mac.cpp
     2===================================================================
     3--- kdelibs-4.3.1.orig/kdeui/util/kkeyserver_mac.cpp    2008-05-21 13:08:51.000000000 +0200
     4+++ kdelibs-4.3.1/kdeui/util/kkeyserver_mac.cpp 2009-10-06 07:44:24.000000000 +0200
     5@@ -68,6 +68,7 @@
     6     static KeyboardLayoutRef lastLayout = NULL;
     7     
     8     void updateScancodes() {
     9+#ifdef Q_OS_MAC32
     10         KeyboardLayoutRef layout;
     11         if (KLGetCurrentKeyboardLayout(&layout) != noErr) {
     12             kWarning() << "Error retrieving current layout";
     13@@ -93,6 +94,9 @@
     14                 }
     15             }
     16         }
     17+#else
     18+#warning port me to Mac64
     19+#endif
     20     }
     21     
     22 #define SCANCODE(name, value) { Qt::Key_ ## name, value }   

  • new file dports/kde/kdelibs4/files/dont-use-fdatasync.patch 

    diff --git a/dports/kde/kdelibs4/files/dont-use-fdatasync.patch b/dports/kde/kdelibs4/files/dont-use-fdatasync.patch
new file mode 100644
index 0000000..9d023a9
    - +  
     1Index: kdelibs-4.3.1/ConfigureChecks.cmake
     2===================================================================
     3--- kdelibs-4.3.1.orig/ConfigureChecks.cmake    2009-06-09 18:09:30.000000000 +0200
     4+++ kdelibs-4.3.1/ConfigureChecks.cmake 2009-10-06 07:15:33.000000000 +0200
     5@@ -105,7 +105,9 @@
     6 check_function_exists(backtrace        HAVE_BACKTRACE)                # kdecore, kio
     7 check_function_exists(getpagesize      HAVE_GETPAGESIZE)              # khtml
     8 check_function_exists(getpeereid       HAVE_GETPEEREID)               # kdesu
     9+if(NOT APPLE)
     10 check_function_exists(fdatasync        HAVE_FDATASYNC)                # kdecore
     11+endif(NOT APPLE)
     12 check_function_exists(mmap             HAVE_MMAP)                     # kdecore, khtml
     13 
     14 if(NOT WIN32)

  • new file dports/kde/kdelibs4/files/nameser-compat.patch 

    diff --git a/dports/kde/kdelibs4/files/nameser-compat.patch b/dports/kde/kdelibs4/files/nameser-compat.patch
new file mode 100644
index 0000000..259d84f
    - +  
     1Index: kdelibs-4.3.1/kio/misc/kpac/discovery.cpp
     2===================================================================
     3--- kdelibs-4.3.1.orig/kio/misc/kpac/discovery.cpp      2009-10-06 08:41:03.000000000 +0200
     4+++ kdelibs-4.3.1/kio/misc/kpac/discovery.cpp   2009-10-06 08:41:19.000000000 +0200
     5@@ -30,6 +30,9 @@
     6 #include <netinet/in.h>
     7 #endif
     8 #include <arpa/nameser.h>
     9+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
     10+#include <arpa/nameser_compat.h>
     11+#endif
     12 #ifdef HAVE_ARPA_NAMESER8_COMPAT_H
     13 #include <arpa/nameser8_compat.h>
     14 #endif
     15Index: kdelibs-4.3.1/ConfigureChecks.cmake
     16===================================================================
     17--- kdelibs-4.3.1.orig/ConfigureChecks.cmake    2009-10-06 08:41:17.000000000 +0200
     18+++ kdelibs-4.3.1/ConfigureChecks.cmake 2009-10-06 08:41:19.000000000 +0200
     19@@ -80,6 +80,7 @@
     20 check_include_files(crtdbg.h      HAVE_CRTDBG_H)                       # kjs
     21 check_include_files(langinfo.h    HAVE_LANGINFO_H)                     # kdecore
     22 
     23+check_include_files(arpa/nameser_compat.h  HAVE_ARPA_NAMESER_COMPAT_H)  # kio
     24 check_include_files(arpa/nameser8_compat.h HAVE_ARPA_NAMESER8_COMPAT_H) # kio
     25 
     26 macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST)                                                   # kdecore
     27Index: kdelibs-4.3.1/config.h.cmake
     28===================================================================
     29--- kdelibs-4.3.1.orig/config.h.cmake   2009-04-15 12:26:51.000000000 +0200
     30+++ kdelibs-4.3.1/config.h.cmake        2009-10-06 08:59:22.000000000 +0200
     31@@ -72,6 +72,7 @@
     32 #cmakedefine HAVE_SYS_MMAN_H 1
     33 #cmakedefine HAVE_SYS_UCRED_H 1
     34 #cmakedefine HAVE_UNISTD_H 1
     35+#cmakedefine HAVE_ARPA_NAMESER_COMPAT_H
     36 #cmakedefine HAVE_ARPA_NAMESER8_COMPAT_H
     37 #cmakedefine HAVE_LANGINFO_H 1
     38