cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to a ways more recent snapshot, that uses QT3.

Browse Source 
Hack at it to compile without kdelibs installed.

Quite a few nits to fix, including some bad issue with https...

discussed with brad@
This commit is contained in:
espie 2006-10-20 16:07:24 +00:00
parent 903c3060a9
commit 601c270142
11 changed files with 242 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
www/konqueror-embedded/Makefile
View File

@ -1,40 +1,46 @@
# $OpenBSD: Makefile,v 1.14 2006/08/04 00:10:42 espie Exp $
# $OpenBSD: Makefile,v 1.15 2006/10/20 16:07:24 espie Exp $
COMMENT='stand-alone Qt-based web browser'
COMMENT= 'stand-alone Qt-based web browser'
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
DIST_SUBDIR= kde
DISTFILES=konqueror3-embedded-0.2-${DATE}.tar.bz2 kdelibs-3.5.5.tar.bz2:0
MODULES= x11/qt2
DATE= 20030705
DISTNAME=konqueror-embedded-snapshot-${DATE}
PKGNAME=konqueror-${DATE}
HOMEPAGE=http://www.konqueror.org/embedded.html
MASTER_SITES= http://devel-home.kde.org/~hausmann/snapshots/
MAINTAINER= Brad Smith <brad@openbsd.org>
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
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.57
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-threading
AUTOCONF_VERSION= 2.59
MODKDE_VERSION= 3.5.3
CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --enable-add-ons=kplaintext
CONFIGURE_ARGS+= --enable-ftp
CONFIGURE_ARGS+= --enable-mitshm
CONFIGURE_ARGS+= --enable-readwrite
CONFIGURE_ARGS+= --enable-sortdir
CONFIGURE_ARGS+= --enable-xmlui
CONFIGURE_ARGS+= --disable-dlopen
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --disable-final
CONFIGURE_ARGS+= --without-arts
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
LIB_DEPENDS= png.>=2::graphics/png \
jpeg.>=62::graphics/jpeg \
pcreposix,pcre::devel/pcre
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
USE_LIBTOOL= Yes
KONQ= ${PREFIX}/lib/konq-e
@ -45,37 +51,29 @@ FLAVOR?=
CONFIGURE_ARGS+=-with-gui=kiosk
.endif
# .orig file in the distfile
post-extract:
@rm -f konq-embed/kdesrc/khtml/xml/dom_docimpl.cpp.orig
rm ${WRKSRC}/konq-embed/kdesrc/khtml/*.orig
cd ${WRKDIR} && bzip2 -c -d ${FULLDISTDIR}/kdelibs-3.5.5.tar.bz2|tar xf - kdelibs-3.5.5/dcop
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
post-install:
${INSTALL_DATA_DIR} ${KONQ}/share/apps/khtml/css \
${KONQ}/share/apps/kplaintextpart \
${KONQ}/share/apps/kssl/caroot \
${KONQ}/share/apps/konq-embed/actions \
${KONQ}/pics ${KONQ}/apps/Applications \
${KONQ}/share/config ${KONQ}/share/services
@mv -f ${PREFIX}/bin/konqueror ${PREFIX}/libexec/konq-e
.for i in apps/Applications/konqueror.desktop pics/konqueror.png \
share/apps/khtml/css/html4.css share/apps/kplaintextpart/kplaintextpart.rc \
share/apps/kssl/caroot/ca-bundle.crt share/config/charsets \
share/config/khtmlrc share/services/kplaintextpart.desktop \
share/apps/konq-embed/konqe.rc
@mv -f ${PREFIX}/$i ${KONQ}/$i
${INSTALL_DATA_DIR} ${PREFIX}/lib/konq-e/share
.for d in share/apps share/config share/services apps pics
mv ${PREFIX}/$d ${PREFIX}/lib/konq-e/$d
.endfor
@mv -f ${PREFIX}/share/apps/konq-embed/actions/* \
${KONQ}/share/apps/konq-embed/actions
${INSTALL_SCRIPT} ${WRKDIR}/konq-e ${PREFIX}/bin
mv ${PREFIX}/bin/konqueror ${PREFIX}/libexec/konq-e
${INSTALL_PROGRAM} ${WRKDIR}/konq-e ${PREFIX}/bin
CONFIGURE_ENV=KDECONFIG='/bin/sh ${FILESDIR}/kde-config'
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= ICE SM X11 Xext c m stdc++ z
WANTLIB= ICE SM X11 Xext c m pthread stdc++ z
.include <bsd.port.mk>

12
www/konqueror-embedded/distinfo
View File

@ -1,4 +1,8 @@
MD5 (konqueror-embedded-snapshot-20030705.tar.gz) = 30dc3e109124e8532c7c0ed6ad3ec6fb
RMD160 (konqueror-embedded-snapshot-20030705.tar.gz) = 36b64e19a8a166dbc3cfa43af6f5cbe9e7e90718
SHA1 (konqueror-embedded-snapshot-20030705.tar.gz) = dc4b5409510c434ca223e3ac6c1c6a0d2d9be6e2
SIZE (konqueror-embedded-snapshot-20030705.tar.gz) = 2340035
MD5 (kde/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117
MD5 (kde/konqueror3-embedded-0.2-20060121.tar.bz2) = d493a81dbc5a4aa6007869cd651d39cf
RMD160 (kde/kdelibs-3.5.5.tar.bz2) = 8e389869f9a53445754c76a0f7535ef2fffc6d03
RMD160 (kde/konqueror3-embedded-0.2-20060121.tar.bz2) = 4679e03f858bd2087938ecc83f85665416ffabd4
SHA1 (kde/kdelibs-3.5.5.tar.bz2) = 7961818e41e22cce7c58219c4eb63ed5fbb94307
SHA1 (kde/konqueror3-embedded-0.2-20060121.tar.bz2) = fbbdc0745316afc5b12fbb83b35903734114f3ea
SIZE (kde/kdelibs-3.5.5.tar.bz2) = 15486690
SIZE (kde/konqueror3-embedded-0.2-20060121.tar.bz2) = 2822097

19
www/konqueror-embedded/files/kde-config Executable file
View File

@ -0,0 +1,19 @@
#! /bin/sh
# $OpenBSD: kde-config,v 1.1 2006/10/20 16:07:24 espie Exp $
KONQ=/usr/local
case $1 in
--prefix)
echo ${KONQ};;
--install)
shift
case $1 in
html)
echo ${KONQ}/share/doc/HTML;;
esac;;
--lib-suffix)
echo "";;
--version)
echo "Qt: 3.3.5"
echo "KDE: 3.5.5"
echo "kde-config: 1.0";;
esac

13
www/konqueror-embedded/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-Makefile_in,v 1.1 2006/10/20 16:07:24 espie Exp $
--- Makefile.in.orig Sat Jan 21 12:50:23 2006
+++ Makefile.in Fri Oct 20 02:31:07 2006
@@ -403,7 +403,8 @@ xdg_menudir = @xdg_menudir@
AUTOMAKE_OPTIONS = foreign 1.4
EXTRA_DIST = admin configure.in.in
MAINTAINERCLEANFILES = configure.files subdirs
-SUBDIRS = $(TOPSUBDIRS)
+SUBDIRS = konq-embed/kdesrc/dcop/dcopidl konq-embed/kdesrc/dcop/dcopidl2cpp \
+ $(TOPSUBDIRS)
#>- all: config.h
#>+ 1
all: docs-am config.h

21
www/konqueror-embedded/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2006/10/20 16:07:24 espie Exp $
--- acinclude.m4.orig Sat Jan 21 12:49:38 2006
+++ acinclude.m4 Fri Oct 20 11:08:32 2006
@@ -572,8 +572,6 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_SET_DEFAULT_BINDIRS
kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
- KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
- KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
if test "$build_arts" '!=' "no"; then
KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
@@ -4938,7 +4936,7 @@ AC_DEFUN([KDE_SET_PREFIX],
fi
kde_libs_prefix=`$KDECONFIG --prefix`
- if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
+ if test -z "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix.

65
www/konqueror-embedded/patches/patch-configure_in
View File

@ -1,11 +1,54 @@
$OpenBSD: patch-configure_in,v 1.3 2003/07/16 17:00:07 brad Exp $
--- configure.in.orig Fri Jul 4 18:13:10 2003
+++ configure.in Sat Jul 5 15:12:19 2003
@@ -565,6 +565,7 @@ AC_CHECK_FUNC(getaddrinfo,
{
struct addrinfo hint, *res;
int err;
+ memset(&hint, 0, sizeof hint);
hint.ai_family = AF_UNSPEC;
hint.ai_protocol = 0;
hint.ai_socktype = SOCK_STREAM;
$OpenBSD: patch-configure_in,v 1.4 2006/10/20 16:07:24 espie Exp $
--- configure.in.orig Sat Jan 21 12:49:40 2006
+++ configure.in Fri Oct 20 10:58:38 2006
@@ -76,12 +76,12 @@ AC_CHECK_HEADERS(sys/time.h sys/param.h
# XXX compiling the needed tools would be great, but it is quite a difficult
# thing to do when cross compiling.
#
-# DCOPIDL2CPP="compiled"
-# DCOPIDL="compiled"
+DCOPIDL2CPP="compiled"
+DCOPIDL="compiled"
#
-# AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl')
-# AC_SUBST(DCOPIDL2CPP,
-# '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp')
+AC_SUBST(DCOPIDL, '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl/dcopidl')
+AC_SUBST(DCOPIDL2CPP,
+ '$(top_builddir)/konq-embed/kdesrc/dcop/dcopidl2cpp/dcopidl2cpp')
dnl Checks for typedefs, structures, and compiler characteristics.
AC_LANG_CPLUSPLUS
@@ -198,11 +198,12 @@ else
AC_DEFINE_UNQUOTED(ENABLE_JAVASCRIPT, 1, [Defined if JavaScript support is enabled])
if test "x$javascript_mode" = "xstatic"; then
- LIB_KJSHTML="\$(top_builddir)/konq-embed/kdesrc/khtml/ecma/libkjs_html_i.la"
- LIB_KJSHTML="$LIB_KJSHTML \$(top_builddir)/konq-embed/kdesrc/kjs/libkjs.la"
- LIB_KJSHTML="$LIB_KJSHTML \$(LIBPCRE)"
+ LIB_KJSHTML_DEPENDS="\$(top_builddir)/konq-embed/kdesrc/khtml/ecma/libkjs_html_i.la"
+ LIB_KJSHTML_DEPENDS="$LIB_KJSHTML_DEPENDS \$(top_builddir)/konq-embed/kdesrc/kjs/libkjs.la"
+ LIB_KJSHTML="$LIB_KJSHTML_DEPENDS \$(LIBPCRE)"
else
LIB_KJSHTML=""
+ LIB_KJSHTML_DEPENDS=""
LIB_KHTML="\$(top_builddir)/konq-embed/kdesrc/khtml/libkhtml.la"
AC_DEFINE_UNQUOTED(DLOPEN_JAVASCRIPT, 1, [Defined if JavaScript should be dynamically opened at run-time])
fi
@@ -211,6 +212,7 @@ fi
AC_SUBST(KJS_SUBDIR)
AC_SUBST(ECMA_SUBDIR)
AC_SUBST(LIB_KJSHTML)
+AC_SUBST(LIB_KJSHTML_DEPENDS)
AC_SUBST(LIB_KHTML)
AC_ARG_ENABLE(kjsmemdebug,[ --enable-kjsmemdebug Enable KJS memory debugging],
@@ -1040,6 +1042,8 @@ AC_CONFIG_FILES([ konq-embed/dropin/kpar
AC_CONFIG_FILES([ konq-embed/dropin/kssl/Makefile ])
AC_CONFIG_FILES([ konq-embed/ipkg/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/Makefile ])
+AC_CONFIG_FILES([ konq-embed/kdesrc/dcop/dcopidl/Makefile ])
+AC_CONFIG_FILES([ konq-embed/kdesrc/dcop/dcopidl2cpp/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/interfaces/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/interfaces/kio/Makefile ])
AC_CONFIG_FILES([ konq-embed/kdesrc/kdecore/Makefile ])

12
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_dcop_dcopidl2cpp_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-konq-embed_kdesrc_dcop_dcopidl2cpp_Makefile_in,v 1.1 2006/10/20 16:07:24 espie Exp $
--- konq-embed/kdesrc/dcop/dcopidl2cpp/Makefile.in.orig Fri Oct 20 02:48:07 2006
+++ konq-embed/kdesrc/dcop/dcopidl2cpp/Makefile.in Fri Oct 20 02:48:12 2006
@@ -22,7 +22,7 @@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+top_builddir = ../../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644

12
www/konqueror-embedded/patches/patch-konq-embed_kdesrc_dcop_dcopidl_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-konq-embed_kdesrc_dcop_dcopidl_Makefile_in,v 1.1 2006/10/20 16:07:24 espie Exp $
--- konq-embed/kdesrc/dcop/dcopidl/Makefile.in.orig Fri Oct 20 02:47:55 2006
+++ konq-embed/kdesrc/dcop/dcopidl/Makefile.in Fri Oct 20 02:48:01 2006
@@ -22,7 +22,7 @@ VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+top_builddir = ../../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644

12
www/konqueror-embedded/patches/patch-konq-embed_src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-konq-embed_src_Makefile_in,v 1.1 2006/10/20 16:07:24 espie Exp $
--- konq-embed/src/Makefile.in.orig Fri Oct 20 10:54:22 2006
+++ konq-embed/src/Makefile.in Fri Oct 20 10:58:39 2006
@@ -472,7 +472,7 @@ konqueror_LDADD = $(LIB_ADDONS) \
konqueror_LDFLAGS = $(KONQ_SSL_LDFLAGS) $(all_libraries) -export-dynamic
#>- konqueror_METASOURCES = AUTO
-konqueror_DEPENDENCIES = $(LIB_KJSHTML) $(LIB_KHTML) $(LIB_ADDONS)
+konqueror_DEPENDENCIES = $(LIB_KJSHTML_DEPENDS) $(LIB_KHTML) $(LIB_ADDONS)
BUILT_SOURCES = init.inc
icon_DATA = konqueror.png
icondir = $(kde_icondir)

20
www/konqueror-embedded/patches/patch-konq-embed_src_mainwindow_x11_cc Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-konq-embed_src_mainwindow_x11_cc,v 1.1 2006/10/20 16:07:24 espie Exp $
--- konq-embed/src/mainwindow_x11.cc.orig Thu Oct 19 18:24:21 2006
+++ konq-embed/src/mainwindow_x11.cc Thu Oct 19 18:26:00 2006
@@ -36,6 +36,7 @@
#include <qtoolbutton.h>
#include <qlabel.h>
#include <qlayout.h>
+#include <qregexp.h>
#include <klocale.h>
#include <kstdaction.h>
@@ -278,7 +279,7 @@ void MainWindowX11::initGUI()
{
QAction *act = (QAction*) child( name, "QAction" );
if ( act )
- list->insert( act );
+ list->add( act );
}
break;
}

55
www/konqueror-embedded/pkg/PLIST
View File

@ -1,8 +1,28 @@
@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:49:49 espie Exp $
apps/
apps/Applications/
@comment $OpenBSD: PLIST,v 1.7 2006/10/20 16:07:24 espie Exp $
@comment bin/dcopidl
@comment bin/dcopidl2cpp
bin/konq-e
lib/kde2/
@comment include/kjs/
@comment include/kjs/completion.h
@comment include/kjs/function.h
@comment include/kjs/global.h
@comment include/kjs/identifier.h
@comment include/kjs/interpreter.h
@comment include/kjs/list.h
@comment include/kjs/lookup.h
@comment include/kjs/object.h
@comment include/kjs/operations.h
@comment include/kjs/property_map.h
@comment include/kjs/reference.h
@comment include/kjs/reference_list.h
@comment include/kjs/scope_chain.h
@comment include/kjs/simple_number.h
@comment include/kjs/types.h
@comment include/kjs/ustring.h
@comment include/kjs/value.h
@comment include/kresolver.h
@comment include/ksocketaddress.h
${KDE}/
lib/konq-e/
lib/konq-e/apps/
lib/konq-e/apps/Applications/
@ -14,6 +34,7 @@ lib/konq-e/share/apps/
lib/konq-e/share/apps/khtml/
lib/konq-e/share/apps/khtml/css/
lib/konq-e/share/apps/khtml/css/html4.css
lib/konq-e/share/apps/khtml/css/quirks.css
lib/konq-e/share/apps/konq-embed/
lib/konq-e/share/apps/konq-embed/actions/
lib/konq-e/share/apps/konq-embed/actions/2rightarrow.png
@ -47,22 +68,20 @@ lib/konq-e/share/apps/konq-embed/konqe.rc
lib/konq-e/share/apps/kplaintextpart/
lib/konq-e/share/apps/kplaintextpart/kplaintextpart.rc
lib/konq-e/share/apps/kssl/
lib/konq-e/share/apps/kssl/caroot/
lib/konq-e/share/apps/kssl/caroot/ca-bundle.crt
lib/konq-e/share/apps/kssl/ca-bundle.crt
lib/konq-e/share/config/
lib/konq-e/share/config/charsets
lib/konq-e/share/config/khtmlrc
lib/konq-e/share/config/ksslcalist
lib/konq-e/share/services/
lib/konq-e/share/services/kplaintextpart.desktop
lib/libkonqe.a
lib/libkonqe.la
@lib lib/libkonqe.so.${LIBkonqe_VERSION}
libexec/konq-e
pics/
share/apps/
share/apps/khtml/
share/apps/khtml/css/
share/apps/konq-embed/
share/apps/konq-embed/actions/
share/apps/kplaintextpart/
share/apps/kssl/
share/apps/kssl/caroot/
share/config/
share/services/
share/doc/HTML/
share/doc/HTML/en/
share/doc/HTML/en/konqueror-embedded-apidocs/
share/doc/HTML/en/konqueror-embedded-apidocs/konq-embed/
share/doc/HTML/en/konqueror-embedded-apidocs/konq-embed/kdesrc/
share/doc/HTML/en/konqueror-embedded-apidocs/konq-embed/kdesrc/kjs/
share/doc/HTML/en/konqueror-embedded-apidocs/konq-embed/kdesrc/kjs/html/