enable printing. Fix some of the ssl stuff, not working yet though.
This commit is contained in:
espie
parent
a90ff81a19
commit
b0aa0711ab
@ -1,24 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.16 2006/10/20 16:52:09 jolan Exp $
|
||||
# $OpenBSD: Makefile,v 1.17 2006/10/21 00:41:08 espie Exp $
|
||||
|
||||
COMMENT= 'stand-alone Qt-based web browser'
|
||||
CATEGORIES=www x11
|
||||
CATEGORIES= www x11
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
MODULES= x11/kde
|
||||
|
||||
DATE= 20060121
|
||||
DISTNAME=konqueror3-embedded-0.2-${DATE}
|
||||
EXTRACT_SUFX=.tar.bz2
|
||||
EXTRACT_ONLY=konqueror3-embedded-0.2-${DATE}.tar.bz2
|
||||
DATE= 20060121
|
||||
DISTNAME= konqueror3-embedded-0.2-${DATE}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
EXTRACT_ONLY= konqueror3-embedded-0.2-${DATE}.tar.bz2
|
||||
|
||||
DIST_SUBDIR= kde
|
||||
DISTFILES=konqueror3-embedded-0.2-${DATE}.tar.bz2 kdelibs-3.5.5.tar.bz2:0
|
||||
DISTFILES= konqueror3-embedded-0.2-${DATE}.tar.bz2 kdelibs-3.5.5.tar.bz2:0
|
||||
|
||||
|
||||
PKGNAME=konqueror-${DATE}
|
||||
HOMEPAGE=http://www.konqueror.org/embedded.html
|
||||
MASTER_SITES= http://www.cirulla.net/kdenox-snapshots/snapshots/
|
||||
MASTER_SITES0= ${MASTER_SITE_KDE:=stable/3.5.5/src/}
|
||||
PKGNAME= konqueror-${DATE}p0
|
||||
HOMEPAGE= http://www.konqueror.org/embedded.html
|
||||
MASTER_SITES= http://www.cirulla.net/kdenox-snapshots/snapshots/
|
||||
MASTER_SITES0= ${MASTER_SITE_KDE:=stable/3.5.5/src/}
|
||||
|
||||
SHARED_LIBS= konqe 0.0
|
||||
USE_GMAKE= Yes
|
||||
@ -34,6 +34,9 @@ CONFIGURE_ARGS+= --enable-sortdir
|
||||
CONFIGURE_ARGS+= --enable-xmlui
|
||||
CONFIGURE_ARGS+= --disable-final
|
||||
CONFIGURE_ARGS+= --without-arts
|
||||
CONFIGURE_ARGS+= --disable-dlopen
|
||||
CONFIGURE_ARGS+= --enable-printing
|
||||
CONFIGURE_ARGS+= --enable-fontsubs
|
||||
|
||||
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
|
||||
LIB_DEPENDS= png.>=2::graphics/png \
|
||||
@ -57,7 +60,7 @@ post-extract:
|
||||
mv ${WRKDIR}/kdelibs-3.5.5/dcop ${WRKSRC}/konq-embed/kdesrc/dcop
|
||||
|
||||
post-build:
|
||||
@sed -e s,%PREFIX%,${TRUEPREFIX}, <${FILESDIR}/konq-e >${WRKDIR}/konq-e
|
||||
@sed -e s,%PREFIX%,${TRUEPREFIX}, <${FILESDIR}/konq-e >${WRKDIST}/konq-e
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/konq-e/share
|
||||
@ -65,7 +68,7 @@ post-install:
|
||||
mv ${PREFIX}/$d ${PREFIX}/lib/konq-e/$d
|
||||
.endfor
|
||||
mv ${PREFIX}/bin/konqueror ${PREFIX}/libexec/konq-e
|
||||
${INSTALL_PROGRAM} ${WRKDIR}/konq-e ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKDIST}/konq-e ${PREFIX}/bin
|
||||
|
||||
CONFIGURE_ENV=KDECONFIG='/bin/sh ${FILESDIR}/kde-config'
|
||||
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-konq-embed_dropin_kssl_kopenssl_cpp,v 1.1 2006/10/21 00:41:09 espie Exp $
|
||||
--- konq-embed/dropin/kssl/kopenssl.cpp.orig Fri Oct 20 20:03:26 2006
|
||||
+++ konq-embed/dropin/kssl/kopenssl.cpp Fri Oct 20 20:04:29 2006
|
||||
@@ -328,7 +328,7 @@ int KOpenSSLProxy::BIO_free(BIO *a) {
|
||||
|
||||
|
||||
int KOpenSSLProxy::PEM_write_bio_X509(BIO *bp, X509 *x) {
|
||||
- return ::PEM_ASN1_write_bio ((int (*)())::i2d_X509, PEM_STRING_X509, bp, (char *)x, NULL, NULL, 0, NULL, NULL);
|
||||
+ return ::PEM_ASN1_write_bio ((int (*)(...))::i2d_X509, PEM_STRING_X509, bp, (char *)x, NULL, NULL, 0, NULL, NULL);
|
||||
}
|
||||
|
||||
|
||||
@@ -338,7 +338,7 @@ ASN1_METHOD *KOpenSSLProxy::X509_asn1_me
|
||||
|
||||
|
||||
int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
|
||||
- return ::ASN1_i2d_fp((int (*)())::i2d_ASN1_HEADER, out, x);
|
||||
+ return ::ASN1_i2d_fp((int (*)(...))::i2d_ASN1_HEADER, out, x);
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
$OpenBSD: patch-konq-embed_kdesrc_khtml_khtmlview_cpp,v 1.1 2006/10/21 00:41:09 espie Exp $
|
||||
--- konq-embed/kdesrc/khtml/khtmlview.cpp.orig Sat Oct 21 00:32:22 2006
|
||||
+++ konq-embed/kdesrc/khtml/khtmlview.cpp Sat Oct 21 01:06:14 2006
|
||||
@@ -71,9 +71,7 @@
|
||||
#include <kimageio.h>
|
||||
#include <klocale.h>
|
||||
#include <knotifyclient.h>
|
||||
-#ifndef ENABLE_PRINTING
|
||||
#include <kprinter.h>
|
||||
-#endif
|
||||
#include <ksimpleconfig.h>
|
||||
#include <kstandarddirs.h>
|
||||
#include <kstdaccel.h>
|
||||
@@ -2706,12 +2704,12 @@ void KHTMLView::print(bool quick)
|
||||
khtml::RenderCanvas *root = static_cast<khtml::RenderCanvas *>(m_part->xmlDocImpl()->renderer());
|
||||
if(!root) return;
|
||||
|
||||
- KPrinter *printer = new KPrinter(true, QPrinter::ScreenResolution);
|
||||
- printer->addDialogPage(new KHTMLPrintSettings());
|
||||
+ KPrinter *printer = new KPrinter();
|
||||
+// printer->addDialogPage(new KHTMLPrintSettings());
|
||||
QString docname = m_part->xmlDocImpl()->URL().prettyURL();
|
||||
if ( !docname.isEmpty() )
|
||||
docname = KStringHandler::csqueeze(docname, 80);
|
||||
- if(quick || printer->setup(this, i18n("Print %1").arg(docname))) {
|
||||
+ if(quick || printer->setup(this)) {
|
||||
viewport()->setCursor( waitCursor ); // only viewport(), no QApplication::, otherwise we get the busy cursor in kdeprint's dialogs
|
||||
// set up KPrinter
|
||||
printer->setFullPage(false);
|
||||
@@ -2728,13 +2726,11 @@ void KHTMLView::print(bool quick)
|
||||
// We ignore margin settings for html and body when printing
|
||||
// and use the default margins from the print-system
|
||||
// (In Qt 3.0.x the default margins are hardcoded in Qt)
|
||||
- m_part->xmlDocImpl()->setPrintStyleSheet( printer->option("app-khtml-printfriendly") == "true" ?
|
||||
+ m_part->xmlDocImpl()->setPrintStyleSheet(
|
||||
"* { background-image: none !important;"
|
||||
" background-color: white !important;"
|
||||
" color: black !important; }"
|
||||
"body { margin: 0px !important; }"
|
||||
- "html { margin: 0px !important; }" :
|
||||
- "body { margin: 0px !important; }"
|
||||
"html { margin: 0px !important; }"
|
||||
);
|
||||
|
||||
@@ -2752,7 +2748,7 @@ void KHTMLView::print(bool quick)
|
||||
|
||||
m_part->xmlDocImpl()->styleSelector()->computeFontSizes(&metrics, 100);
|
||||
m_part->xmlDocImpl()->updateStyleSelector();
|
||||
- root->setPrintImages( printer->option("app-khtml-printimages") == "true");
|
||||
+ root->setPrintImages( true );
|
||||
root->makePageBreakAvoidBlocks();
|
||||
|
||||
root->setNeedsLayoutAndMinMaxRecalc();
|
||||
@@ -2761,12 +2757,12 @@ void KHTMLView::print(bool quick)
|
||||
|
||||
// check sizes ask for action.. (scale or clip)
|
||||
|
||||
- bool printHeader = (printer->option("app-khtml-printheader") == "true");
|
||||
+ bool printHeader = true;
|
||||
|
||||
int headerHeight = 0;
|
||||
QFont headerFont("Sans Serif", 8);
|
||||
|
||||
- QString headerLeft = KGlobal::locale()->formatDate(QDate::currentDate(),true);
|
||||
+ QString headerLeft;
|
||||
QString headerMid = docname;
|
||||
QString headerRight;
|
||||
|
||||
@ -0,0 +1,74 @@
|
||||
$OpenBSD: patch-konq-embed_kdesrc_kssl_kopenssl_cc,v 1.3 2006/10/21 00:41:09 espie Exp $
|
||||
--- konq-embed/kdesrc/kssl/kopenssl.cc.orig Mon Oct 24 00:53:30 2005
|
||||
+++ konq-embed/kdesrc/kssl/kopenssl.cc Sat Oct 21 01:51:17 2006
|
||||
@@ -20,7 +20,6 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
-
|
||||
#ifdef KSSL_HAVE_SSL
|
||||
#include <openssl/opensslv.h>
|
||||
#endif
|
||||
@@ -197,6 +196,8 @@ static int (*K_X509_NAME_add_entry_by_tx
|
||||
static X509_NAME *(*K_X509_NAME_new)() = 0L;
|
||||
static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
|
||||
static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
|
||||
+static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
|
||||
+
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -567,6 +568,7 @@ KConfig *cfg;
|
||||
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
|
||||
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
|
||||
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
|
||||
+ K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
|
||||
#endif
|
||||
|
||||
|
||||
@@ -576,21 +578,31 @@ KConfig *cfg;
|
||||
if (_cryptoLib) {
|
||||
if (x) ((int (*)())x)();
|
||||
x = _cryptoLib->symbol("OpenSSL_add_all_algorithms");
|
||||
+ if (!x)
|
||||
+ x = _cryptoLib->symbol("OPENSSL_add_all_algorithms");
|
||||
if (x) {
|
||||
((void (*)())x)();
|
||||
} else {
|
||||
x = _cryptoLib->symbol("OpenSSL_add_all_algorithms_conf");
|
||||
+ if (!x)
|
||||
+ x = _cryptoLib->symbol("OPENSSL_add_all_algorithms_conf");
|
||||
if (x) {
|
||||
((void (*)())x)();
|
||||
} else {
|
||||
x = _cryptoLib->symbol("OpenSSL_add_all_algorithms_noconf");
|
||||
+ if (!x)
|
||||
+ x = _cryptoLib->symbol("OPENSSL_add_all_algorithms_noconf");
|
||||
if (x)
|
||||
((void (*)())x)();
|
||||
}
|
||||
}
|
||||
x = _cryptoLib->symbol("OpenSSL_add_all_ciphers");
|
||||
+ if (!x)
|
||||
+ x = _cryptoLib->symbol("OPENSSL_add_all_ciphers");
|
||||
if (x) ((void (*)())x)();
|
||||
x = _cryptoLib->symbol("OpenSSL_add_all_digests");
|
||||
+ if (!x)
|
||||
+ x = _cryptoLib->symbol("OPENSSL_add_all_digests");
|
||||
if (x) ((void (*)())x)();
|
||||
}
|
||||
}
|
||||
@@ -1532,6 +1544,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
|
||||
if (K_ASN1_STRING_data) return (K_ASN1_STRING_data)(x);
|
||||
return 0L;
|
||||
}
|
||||
+
|
||||
+#if 0
|
||||
+STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
|
||||
+ if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
|
||||
+ return 0L;
|
||||
+}
|
||||
+#endif
|
||||
|
||||
#endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user