aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/kdelibs3/Makefile3
-rw-r--r--x11/kdelibs3/files/patch-kdecore-kidna.cpp58
-rw-r--r--x11/kdelibs3/files/patch-khtml-khtml_part.cpp11
-rw-r--r--x11/kdelibs4/Makefile3
-rw-r--r--x11/kdelibs4/files/patch-kdecore-kidna.cpp58
-rw-r--r--x11/kdelibs4/files/patch-khtml-khtml_part.cpp11
6 files changed, 144 insertions, 0 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 1f670be369a8..f996c1cd6231 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -23,6 +24,7 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
artsc.0:${PORTSDIR}/audio/arts \
cups.2:${PORTSDIR}/print/cups-base \
fam.0:${PORTSDIR}/devel/fam \
+ idn:${PORTSDIR}/devel/libidn \
jasper:${PORTSDIR}/graphics/jasper \
tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
@@ -61,6 +63,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
pre-configure:
${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
+ ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdecore/kidna.cpp
post-configure:
${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
diff --git a/x11/kdelibs3/files/patch-kdecore-kidna.cpp b/x11/kdelibs3/files/patch-kdecore-kidna.cpp
new file mode 100644
index 000000000000..821a171977e8
--- /dev/null
+++ b/x11/kdelibs3/files/patch-kdecore-kidna.cpp
@@ -0,0 +1,58 @@
+Index: kdecore/kidna.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kdecore/kidna.cpp,v
+retrieving revision 1.9.4.1
+diff -u -5 -p -d -r1.9.4.1 kidna.cpp
+--- kdecore/kidna.cpp 4 Feb 2004 11:43:34 -0000 1.9.4.1
++++ kdecore/kidna.cpp 13 Mar 2004 20:24:13 -0000
+@@ -21,16 +21,16 @@
+
+ #include "kidna.h"
+
+ #include <kdebug.h>
+
+-#include "ltdl.h"
++#include <dlfcn.h>
+ #include <stdlib.h>
+
+ #define IDNA_SUCCESS 0
+
+-static lt_dlhandle KIDNA_lib; // = 0
++void *KIDNA_lib; // = 0
+ static bool KIDNA_lib_load_failed; // = false
+
+ typedef int (*KIDNA_utf8_to_ace_t)(const char *, char **, int);
+ typedef int (*KIDNA_utf8ace_to_utf8_t)(const char *, char **, int);
+
+@@ -38,27 +38,27 @@ static KIDNA_utf8_to_ace_t KIDNA_utf8_to
+ static KIDNA_utf8ace_to_utf8_t KIDNA_utf8ace_to_utf8; // = 0
+
+ static void KIDNA_load_lib()
+ {
+ KIDNA_lib_load_failed = true; // Unless proven otherwise
+- KIDNA_lib = lt_dlopen("/usr/local/lib/libidn.la");
++ KIDNA_lib = dlopen("%%LOCALBASE%%/lib/libidn.so", RTLD_LAZY);
+ if (!KIDNA_lib)
+ {
+- KIDNA_lib = lt_dlopen("/usr/lib/libidn.la");
++ KIDNA_lib = dlopen("/usr/lib/libidn.so", RTLD_LAZY);
+ }
+
+ if (!KIDNA_lib)
+ return; // Error
+
+- KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) lt_dlsym(KIDNA_lib, "idna_to_ascii_8z");
++ KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) dlsym(KIDNA_lib, "idna_to_ascii_8z");
+ if (!KIDNA_utf8_to_ace)
+ {
+ kdWarning() << "Symbol idna_utf8_to_ace not found." << endl;
+ return; // Error
+ }
+
+- KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) lt_dlsym(KIDNA_lib, "idna_to_unicode_8z8z");
++ KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) dlsym(KIDNA_lib, "idna_to_unicode_8z8z");
+ if (!KIDNA_utf8ace_to_utf8)
+ {
+ kdWarning() << "Symbol idna_utf8ace_to_utf8 not found." << endl;
+ return; // Error
+ }
diff --git a/x11/kdelibs3/files/patch-khtml-khtml_part.cpp b/x11/kdelibs3/files/patch-khtml-khtml_part.cpp
new file mode 100644
index 000000000000..be59d645ab9a
--- /dev/null
+++ b/x11/kdelibs3/files/patch-khtml-khtml_part.cpp
@@ -0,0 +1,11 @@
+--- khtml/khtml_part.cpp.orig Mon Mar 1 09:25:09 2004
++++ khtml/khtml_part.cpp Sat Mar 13 20:48:58 2004
+@@ -5395,7 +5395,7 @@
+ pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
+ }
+
+- KURLDrag* urlDrag = new KURLDrag( u, 0 );
++ KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
+ if ( !d->m_referrer.isEmpty() )
+ urlDrag->metaData()["referrer"] = d->m_referrer;
+
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 1f670be369a8..f996c1cd6231 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -23,6 +24,7 @@ LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
artsc.0:${PORTSDIR}/audio/arts \
cups.2:${PORTSDIR}/print/cups-base \
fam.0:${PORTSDIR}/devel/fam \
+ idn:${PORTSDIR}/devel/libidn \
jasper:${PORTSDIR}/graphics/jasper \
tiff.4:${PORTSDIR}/graphics/tiff \
xml2.5:${PORTSDIR}/textproc/libxml2 \
@@ -61,6 +63,7 @@ LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
pre-configure:
${REINPLACE_CMD} "s, kspell,,g" ${WRKSRC}/doc/Makefile.in
+ ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdecore/kidna.cpp
post-configure:
${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
diff --git a/x11/kdelibs4/files/patch-kdecore-kidna.cpp b/x11/kdelibs4/files/patch-kdecore-kidna.cpp
new file mode 100644
index 000000000000..821a171977e8
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kdecore-kidna.cpp
@@ -0,0 +1,58 @@
+Index: kdecore/kidna.cpp
+===================================================================
+RCS file: /home/kde/kdelibs/kdecore/kidna.cpp,v
+retrieving revision 1.9.4.1
+diff -u -5 -p -d -r1.9.4.1 kidna.cpp
+--- kdecore/kidna.cpp 4 Feb 2004 11:43:34 -0000 1.9.4.1
++++ kdecore/kidna.cpp 13 Mar 2004 20:24:13 -0000
+@@ -21,16 +21,16 @@
+
+ #include "kidna.h"
+
+ #include <kdebug.h>
+
+-#include "ltdl.h"
++#include <dlfcn.h>
+ #include <stdlib.h>
+
+ #define IDNA_SUCCESS 0
+
+-static lt_dlhandle KIDNA_lib; // = 0
++void *KIDNA_lib; // = 0
+ static bool KIDNA_lib_load_failed; // = false
+
+ typedef int (*KIDNA_utf8_to_ace_t)(const char *, char **, int);
+ typedef int (*KIDNA_utf8ace_to_utf8_t)(const char *, char **, int);
+
+@@ -38,27 +38,27 @@ static KIDNA_utf8_to_ace_t KIDNA_utf8_to
+ static KIDNA_utf8ace_to_utf8_t KIDNA_utf8ace_to_utf8; // = 0
+
+ static void KIDNA_load_lib()
+ {
+ KIDNA_lib_load_failed = true; // Unless proven otherwise
+- KIDNA_lib = lt_dlopen("/usr/local/lib/libidn.la");
++ KIDNA_lib = dlopen("%%LOCALBASE%%/lib/libidn.so", RTLD_LAZY);
+ if (!KIDNA_lib)
+ {
+- KIDNA_lib = lt_dlopen("/usr/lib/libidn.la");
++ KIDNA_lib = dlopen("/usr/lib/libidn.so", RTLD_LAZY);
+ }
+
+ if (!KIDNA_lib)
+ return; // Error
+
+- KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) lt_dlsym(KIDNA_lib, "idna_to_ascii_8z");
++ KIDNA_utf8_to_ace = (KIDNA_utf8_to_ace_t) dlsym(KIDNA_lib, "idna_to_ascii_8z");
+ if (!KIDNA_utf8_to_ace)
+ {
+ kdWarning() << "Symbol idna_utf8_to_ace not found." << endl;
+ return; // Error
+ }
+
+- KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) lt_dlsym(KIDNA_lib, "idna_to_unicode_8z8z");
++ KIDNA_utf8ace_to_utf8 = (KIDNA_utf8ace_to_utf8_t) dlsym(KIDNA_lib, "idna_to_unicode_8z8z");
+ if (!KIDNA_utf8ace_to_utf8)
+ {
+ kdWarning() << "Symbol idna_utf8ace_to_utf8 not found." << endl;
+ return; // Error
+ }
diff --git a/x11/kdelibs4/files/patch-khtml-khtml_part.cpp b/x11/kdelibs4/files/patch-khtml-khtml_part.cpp
new file mode 100644
index 000000000000..be59d645ab9a
--- /dev/null
+++ b/x11/kdelibs4/files/patch-khtml-khtml_part.cpp
@@ -0,0 +1,11 @@
+--- khtml/khtml_part.cpp.orig Mon Mar 1 09:25:09 2004
++++ khtml/khtml_part.cpp Sat Mar 13 20:48:58 2004
+@@ -5395,7 +5395,7 @@
+ pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium);
+ }
+
+- KURLDrag* urlDrag = new KURLDrag( u, 0 );
++ KURLDrag* urlDrag = new KURLDrag( u, img ? 0 : d->m_view->viewport() );
+ if ( !d->m_referrer.isEmpty() )
+ urlDrag->metaData()["referrer"] = d->m_referrer;
+
generated by cgit (git 2.34.1) at 2024-12-23 02:22:44 +0800