This commit is contained in:
espie 2004-02-02 13:04:34 +00:00
parent 309ea54af8
commit 77c33465d6
16 changed files with 150 additions and 215 deletions

View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.9 2003/12/07 20:19:14 espie Exp $
# $OpenBSD: Makefile,v 1.10 2004/02/02 13:04:34 espie Exp $
COMMENT= "X11 toolkit, extra language support"
CATEGORIES= x11 x11/kde devel
VERSION= 3.1.4
VERSION= 3.1.95
DISTNAME= kdebindings-${VERSION}
MODKDE_VERSION= 3.2
LIB_DEPENDS=kdecore.4,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmid,kparts,kscript,kspell,kutils,DCOP::x11/kde/libs3 \
gtk,gdk::x11/gtk+ \
lib/qt3/qui-mt:qt3-mt->=1.1p0:x11/qt3,mt
LIB_DEPENDS=DCOP,kdecore.6,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmid,kparts,kscript,kspell,kutils,kwalletclient::x11/kde/libs3 \
SEPARATE_BUILD=flavored

View File

@ -1,3 +1,3 @@
MD5 (kde/kdebindings-3.1.4.tar.bz2) = 6cb5e1575c764b0babc674930c9e59a9
RMD160 (kde/kdebindings-3.1.4.tar.bz2) = eafa5db5f9fe073d88900be56313f152a06057cc
SHA1 (kde/kdebindings-3.1.4.tar.bz2) = 35645747bea4d4b06b43f7ff765d21eb93df6d45
MD5 (kde/kdebindings-3.1.95.tar.bz2) = ded6c88d87ba1b968551f8dcc7bca84f
RMD160 (kde/kdebindings-3.1.95.tar.bz2) = e4800f3425af8897fb33cb1a39e28c262117b3d9
SHA1 (kde/kdebindings-3.1.95.tar.bz2) = 7c5503e1694c0e24ac5512ff28c659d09473b152

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-kdec_clib_Makefile_am,v 1.1 2004/02/02 13:04:35 espie Exp $
--- kdec/clib/Makefile.am.orig 2004-02-02 13:01:26.000000000 +0100
+++ kdec/clib/Makefile.am 2004-02-02 13:01:40.000000000 +0100
@@ -1,6 +1,6 @@
bin_PROGRAMS = clib
clib_SOURCES = main.c
-clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
+clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET) -lstdc++
SUBDIRS = kdec

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-kdec_clib_Makefile_in,v 1.1 2004/02/02 13:04:35 espie Exp $
--- kdec/clib/Makefile.in.orig 2004-02-02 13:01:27.000000000 +0100
+++ kdec/clib/Makefile.in 2004-02-02 13:01:46.000000000 +0100
@@ -344,7 +344,7 @@ xparts_SUBDIR_included_FALSE = @xparts_S
xparts_SUBDIR_included_TRUE = @xparts_SUBDIR_included_TRUE@
bin_PROGRAMS = clib
clib_SOURCES = main.c
-clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET)
+clib_LDADD = ./kdec/libkdec.la ../../qtc/clib/qtc/libqtc.la $(LIB_KHTML) $(LIB_KSPELL) -lkparts -lkmid $(LIB_KIO) $(LIB_KDEUI) -lkscript $(LIB_QT) -lXext -lX11 $(LIBSOCKET) -lstdc++
SUBDIRS = kdec

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-kjsembed_Makefile_am,v 1.1 2003/02/09 19:18:05 espie Exp $
--- kjsembed/Makefile.am.orig Sun Feb 9 19:57:48 2003
+++ kjsembed/Makefile.am Sun Feb 9 19:57:55 2003
@@ -23,7 +23,7 @@ kjsembedinclude_HEADERS = dialogfactory.
METASOURCES = AUTO
libkjsembed_la_LDFLAGS = -version-info 1:0 -no-undefined \
$(all_libraries) $(KDE_RPATH)
-libkjsembed_la_LIBADD = -lqui $(LIB_KHTML) -lkjs
+libkjsembed_la_LIBADD = -lqui-mt $(LIB_KHTML) -lkjs
$OpenBSD: patch-kjsembed_Makefile_am,v 1.2 2004/02/02 13:04:35 espie Exp $
--- kjsembed/Makefile.am.orig 2004-01-17 13:49:57.000000000 +0100
+++ kjsembed/Makefile.am 2004-02-02 11:56:25.000000000 +0100
@@ -70,7 +70,7 @@ libkjsembed_la_LDFLAGS = -version-info 1
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
- -lqui \
+ -lqui-mt \
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
$(LIB_KFILE) -lkjs $(LIBSOCKET)
check_PROGRAMS = testkjsembed
testkjsembed_SOURCES = testkjsembed.cpp

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-kjsembed_Makefile_in,v 1.3 2003/12/07 20:19:14 espie Exp $
--- kjsembed/Makefile.in.orig 2003-09-03 03:25:51.000000000 +0200
+++ kjsembed/Makefile.in 2003-12-04 23:59:23.000000000 +0100
@@ -332,7 +332,7 @@ kjsembedinclude_HEADERS = dialogfactory.
libkjsembed_la_LDFLAGS = -version-info 1:0 -no-undefined \
$(all_libraries) $(KDE_RPATH)
$OpenBSD: patch-kjsembed_Makefile_in,v 1.4 2004/02/02 13:04:35 espie Exp $
--- kjsembed/Makefile.in.orig 2004-01-18 13:58:26.000000000 +0100
+++ kjsembed/Makefile.in 2004-02-02 11:56:35.000000000 +0100
@@ -418,7 +418,7 @@ libkjsembed_la_LDFLAGS = -version-info 1
-libkjsembed_la_LIBADD = -lqui $(LIB_KHTML) -lkjs
+libkjsembed_la_LIBADD = -lqui-mt $(LIB_KHTML) -lkjs
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
- -lqui \
+ -lqui-mt \
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \
$(LIB_KFILE) -lkjs $(LIBSOCKET)
check_PROGRAMS = testkjsembed
testkjsembed_SOURCES = testkjsembed.cpp

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-qtc_clib_Makefile_am,v 1.1 2003/02/09 19:18:05 espie Exp $
--- qtc/clib/Makefile.am.orig Sun Feb 9 19:58:21 2003
+++ qtc/clib/Makefile.am Sun Feb 9 19:58:28 2003
$OpenBSD: patch-qtc_clib_Makefile_am,v 1.2 2004/02/02 13:04:35 espie Exp $
--- qtc/clib/Makefile.am.orig 2003-08-05 16:54:00.000000000 +0200
+++ qtc/clib/Makefile.am 2004-02-02 12:29:29.000000000 +0100
@@ -5,7 +5,7 @@ SOURCES = qtc/qt_QAccessibleInterface.cp
INTERFACES =
TRANSLATIONS =
KDE_OPTIONS = qtonly
-clib_LDADD = ./qtc/libqtc.la -lqt-mt -lXext -lX11 -lqui $(LIBSOCKET)
+clib_LDADD = ./qtc/libqtc.la -lqt-mt -lXext -lX11 -lqui-mt $(LIBSOCKET)
-clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui $(LIBSOCKET)
+clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui-mt $(LIBSOCKET) -lstdc++
SUBDIRS = qtc

View File

@ -1,12 +1,21 @@
$OpenBSD: patch-qtc_clib_Makefile_in,v 1.3 2003/12/07 20:19:14 espie Exp $
--- qtc/clib/Makefile.in.orig 2003-09-03 03:25:51.000000000 +0200
+++ qtc/clib/Makefile.in 2003-12-04 23:59:23.000000000 +0100
@@ -311,7 +311,7 @@ SOURCES = qtc/qt_QAccessibleInterface.cp
$OpenBSD: patch-qtc_clib_Makefile_in,v 1.4 2004/02/02 13:04:35 espie Exp $
--- qtc/clib/Makefile.in.orig 2004-01-18 13:58:27.000000000 +0100
+++ qtc/clib/Makefile.in 2004-02-02 12:29:40.000000000 +0100
@@ -350,7 +350,7 @@ SOURCES = qtc/qt_QAccessibleInterface.cp
INTERFACES =
TRANSLATIONS =
KDE_OPTIONS = qtonly
-clib_LDADD = ./qtc/libqtc.la -lqt-mt -lXext -lX11 -lqui $(LIBSOCKET)
+clib_LDADD = ./qtc/libqtc.la -lqt-mt -lXext -lX11 -lqui-mt $(LIBSOCKET)
-clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui $(LIBSOCKET)
+clib_LDADD = ./qtc/libqtc.la $(QT_LIBS) -lqui-mt $(LIBSOCKET) -lstdc++
SUBDIRS = qtc
@@ -364,7 +364,7 @@ INCLUDES = $(all_includes)
#>- clib_METASOURCES = AUTO
# the library search path.
-clib_LDFLAGS = $(all_libraries)
+clib_LDFLAGS = $(all_libraries) -pthread
# them while "make clean", use CLEANFILES
DISTCLEANFILES = $(clib_METASOURCES)

View File

@ -1,21 +1,12 @@
$OpenBSD: patch-qtc_clib_qtc_Makefile_in,v 1.3 2003/12/07 20:19:14 espie Exp $
--- qtc/clib/qtc/Makefile.in.orig 2003-09-03 03:25:52.000000000 +0200
+++ qtc/clib/qtc/Makefile.in 2003-12-04 23:59:23.000000000 +0100
@@ -332,7 +332,7 @@ include_HEADERS =
# here you should add all header files, which shouldn´t be installed
noinst_HEADERS =
-libqtc_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
+libqtc_la_LDFLAGS = -pthread $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
# add here the libraries which have to be include
# for building the shared lib
@@ -344,7 +344,7 @@ libqtc_la_LDFLAGS = $(all_libraries) -no
$OpenBSD: patch-qtc_clib_qtc_Makefile_in,v 1.4 2004/02/02 13:04:35 espie Exp $
--- qtc/clib/qtc/Makefile.in.orig 2004-01-18 13:58:27.000000000 +0100
+++ qtc/clib/qtc/Makefile.in 2004-02-02 11:50:13.000000000 +0100
@@ -385,7 +385,7 @@ libqtc_la_LDFLAGS = $(all_libraries) -no
# in here.
# The following line is only a suggestion!
#
-libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui
+libqtc_la_LIBADD = -lqt-mt -lXext -lX11 -lqui-mt
subdir = qtc/clib/qtc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-smoke_qt_generate_pl,v 1.3 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/generate.pl.orig 2003-05-07 07:44:40.000000000 -0400
+++ smoke/qt/generate.pl 2003-11-22 17:19:01.000000000 -0500
@@ -51,6 +51,7 @@ my %excludes = (
'qassistantclient.h' => 1, # Part of assistant lib, not of qt
'qsharedmemory.h' => 1, # "not part of the Qt API" they say
'qwindowsstyle.h' => 1, # Qt windowsstlye, plugin
+ 'qcompactstyle.h' => 1, # Qt windowsstlye, plugin
'qmotifstyle.h' => 1,
'qmotifplusstyle.h' => 1,
'qsgistyle.h' => 1,
@@ -61,7 +62,11 @@ my %excludes = (
# List Qt headers, and exclude the ones listed above
my @headers = ();
-$qtinc=$ENV{"QTDIR"} . "/include";
+if (defined $ENV{'QTINCDIR'}) {
+ $qtinc = $ENV{'QTINCDIR'};
+} else {
+ $qtinc=$ENV{"QTDIR"} . "/include";
+}
opendir (QT, $qtinc) or die "Couldn't find $qtinc";
foreach $filename (readdir(QT)) {
$entry = $qtinc."/".$filename;

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-smoke_qt_generate_pl_in,v 1.1 2004/02/02 13:04:35 espie Exp $
--- smoke/qt/generate.pl.in.orig 2004-02-02 12:34:05.000000000 +0100
+++ smoke/qt/generate.pl.in 2004-02-02 12:34:30.000000000 +0100
@@ -16,7 +16,6 @@ my $finaloutdir = $here;
my $defines = "qtdefines";
my $headerlist = "@srcdir@/header_list";
my $definespath = "$here/$defines";
-my $headerlistpath = "$here/$headerlist";
## Note: outdir and finaloutdir should NOT be the same dir!
@@ -70,7 +69,7 @@ my %excludes = (
# We need a complete list
my %includes;
-open(HEADERS, $headerlistpath) or die "Couldn't open $headerlistpath: $!\n";
+open(HEADERS, $headerlist) or die "Couldn't open $headerlist: $!\n";
map { chomp ; $includes{$_} = 1 } <HEADERS>;
close HEADERS;

View File

@ -1,66 +0,0 @@
$OpenBSD: patch-smoke_qt_x_QFont_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_QFont.cpp.orig 2003-01-04 04:59:24.000000000 -0500
+++ smoke/qt/x_QFont.cpp 2003-11-22 17:19:34.000000000 -0500
@@ -233,25 +233,56 @@ public:
x[0].s_enum = (long)QFont::NoScript;
}
static void x_75(Smoke::Stack x) {
+#if QT_VERSION < 0x030200
x[0].s_enum = (long)QFont::HanX11;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_76(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinBasic;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinBasic;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_77(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_2;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_2;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_78(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_3;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_3;
+#else
+ x[0].s_enum = 0L;
+#endif
+
}
static void x_79(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_4;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_4;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_80(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_14;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_14;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_81(Smoke::Stack x) {
- x[0].s_enum = (long)QFont::LatinExtendedA_15;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long)QFont::LatinExtendedA_15;
+#else
+ x[0].s_enum = 0L;
+#endif
}
static void x_82(Smoke::Stack x) {
x[0].s_enum = (long)QFont::KatakanaHalfWidth;

View File

@ -1,26 +0,0 @@
$OpenBSD: patch-smoke_qt_x_QHBox_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_QHBox.cpp.orig 2003-01-16 05:03:52.000000000 -0500
+++ smoke/qt/x_QHBox.cpp 2003-11-22 17:19:42.000000000 -0500
@@ -143,14 +143,22 @@ public:
x_QHBox* xret = new x_QHBox((bool)x[1].s_bool,(QWidget*)x[2].s_class);
x[0].s_class = (void*)xret;
}
+#if QT_VERSION < 0x030200
x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2) {
+#else
+ x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2, 0) {
+#endif
}
static void x_22(Smoke::Stack x) {
// QHBox(bool)
x_QHBox* xret = new x_QHBox((bool)x[1].s_bool);
x[0].s_class = (void*)xret;
}
+#if QT_VERSION < 0x030200
x_QHBox(bool x1) : QHBox(x1) {
+#else
+ x_QHBox(bool x1) : QHBox(x1, 0, 0) {
+#endif
}
void x_23(Smoke::Stack x) {
// frameChanged()

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-smoke_qt_x_Qt_cpp,v 1.1 2003/12/08 02:14:11 brad Exp $
--- smoke/qt/x_Qt.cpp.orig 2003-03-04 09:33:32.000000000 -0500
+++ smoke/qt/x_Qt.cpp 2003-11-22 17:19:48.000000000 -0500
@@ -155,7 +155,11 @@ public:
x[0].s_enum = (long)Qt::WState_Reserved1;
}
static void x_49(Smoke::Stack x) {
- x[0].s_enum = (long)Qt::WState_Reserved2;
+#if QT_VERSION < 0x030200
+ x[0].s_enum = (long) Qt::WState_Reserved2;
+#else
+ x[0].s_enum = (long) Qt::WState_OwnSizePolicy;
+#endif
}
static void x_50(Smoke::Stack x) {
x[0].s_enum = (long)Qt::WState_CreatedHidden;

View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2003/04/05 14:53:39 espie Exp $
lib/libdcopc.so.1.0
lib/libgtkxparts.so.0.0
lib/libkdec.so.1.0
lib/libkdexparts.so.1.0
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/02/02 13:04:35 espie Exp $
${KDE}/libcustomobjectplugin.so
${KDE}/libcustomqobjectplugin.so
${KDE}/libimagefxplugin.so
${KDE}/libjsconsoleplugin.so
lib/libkdec.so.3.0
lib/libkjsembed.so.1.0
lib/libqtc.so.1.0
lib/libsmokeqt.so.1.0
lib/libxp_notepadpart.so.0.0
lib/libsmokeqt.so.3.1
lib/python2.3/site-packages/pcop.so
DYNLIBDIR(%D/lib)

View File

@ -1,32 +1,56 @@
@comment $OpenBSD: PLIST,v 1.2 2003/04/05 14:53:39 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2004/02/02 13:04:35 espie Exp $
bin/clib
bin/shell_xparthost
bin/xp_notepad
include/dcopc/dcopc.h
include/dcopc/dcopobject.h
include/dcopc/marshal.h
include/dcopc/util.h
include/kjsembed/dialogfactory.h
include/kjsembed/jsconsolepart.h
bin/kjscmd
include/kjsembed/customobject_imp.h
include/kjsembed/jsbinding.h
include/kjsembed/jsbindingplugin.h
include/kjsembed/jsbuiltin.h
include/kjsembed/jsbuiltin_imp.h
include/kjsembed/jsconsolewidget.h
include/kjsembed/jshookloader.h
include/kjsembed/jseventmapper.h
include/kjsembed/jseventutils.h
include/kjsembed/jsfactory.h
include/kjsembed/jsfactory_imp.h
include/kjsembed/jsobjecteventproxy.h
include/kjsembed/jsobjectproxy.h
include/kjsembed/messagelogwidget.h
include/kjsembed/jsobjectproxy_imp.h
include/kjsembed/jsopaqueproxy.h
include/kjsembed/jsopaqueproxy_imp.h
include/kjsembed/jsproxy.h
include/kjsembed/jsproxy_imp.h
include/kjsembed/jssecuritypolicy.h
include/kjsembed/jsvalueproxy.h
include/kjsembed/jsvalueproxy_imp.h
include/kjsembed/kjsembedpart.h
include/kjsembed/kjsembedpart_imp.h
include/kjsembed/slotproxy.h
include/kjsembed/slotutils.h
include/kjsembed/xmlactionclient.h
include/smoke.h
include/xkparts/gtkbrowserextension.h
include/xkparts/gtkpart.h
include/xkparts/xpart.h
include/xkparts/xparthost.h
lib/libdcopc.la
lib/libgtkxparts.la
${KDE}/libcustomobjectplugin.la
${KDE}/libcustomqobjectplugin.la
${KDE}/libimagefxplugin.la
${KDE}/libjsconsoleplugin.la
lib/libkdec.la
lib/libkdexparts.la
lib/libkjsembed.la
lib/libqtc.la
lib/libsmokeqt.la
lib/libxp_notepadpart.la
share/services/xp_notepad.desktop
lib/python2.3/pydcop.py
lib/python2.3/site-packages/pcop.la
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/DCOP/.packlist
share/applications/kde/kjscmd.desktop
share/apps/konqueror/kpartplugins/plugin_jsconsole.rc
share/mimelnk/application/x-javascript.desktop
share/services/customobject_plugin.desktop
share/services/customqobject_plugin.desktop
share/services/imagefx_plugin.desktop
share/servicetypes/binding_type.desktop
%%SHARED%%
@dirrm include/xkparts
@dirrm share/apps/konqueror/kpartplugins
@dirrm share/apps/konqueror
@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/DCOP
@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto
@dirrm libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd
@dirrm lib/python2.3/site-packages
@dirrm lib/python2.3
@dirrm include/kjsembed
@dirrm include/dcopc