diff --git a/x11/kde/bindings3/Makefile b/x11/kde/bindings3/Makefile index 5b3a08b52c0..77954c40cf9 100644 --- a/x11/kde/bindings3/Makefile +++ b/x11/kde/bindings3/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2003/02/02 13:29:57 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2003/02/09 19:18:05 espie Exp $ COMMENT= "X11 toolkit, extra language support" CATEGORIES= x11 x11/kde devel VERSION= 3.1 DISTNAME= kdebindings-${VERSION} -BROKEN= "need to resolve issue with qt3/qt3-mt (libqui)" #LIB_DEPENDS=kdecore.4,DCOP,kdefx,kdesu,kdeui,kio,kscreensaver::x11/kde/libs3 \ kwin::x11/kde/base3 diff --git a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am new file mode 100644 index 00000000000..ff75fe14c9b --- /dev/null +++ b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_am @@ -0,0 +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 + + check_PROGRAMS = testkjsembed + testkjsembed_SOURCES = testkjsembed.cpp diff --git a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in new file mode 100644 index 00000000000..7ab4da48b97 --- /dev/null +++ b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-kjsembed_Makefile_in,v 1.1 2003/02/09 19:18:05 espie Exp $ +--- kjsembed/Makefile.in.orig Sun Feb 9 19:57:48 2003 ++++ kjsembed/Makefile.in Sun Feb 9 19:57:59 2003 +@@ -294,7 +294,7 @@ kjsembedinclude_HEADERS = dialogfactory. + 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 + + check_PROGRAMS = testkjsembed + testkjsembed_SOURCES = testkjsembed.cpp diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am new file mode 100644 index 00000000000..a4481e7c279 --- /dev/null +++ b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_am @@ -0,0 +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 +@@ -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) + + SUBDIRS = qtc + diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in new file mode 100644 index 00000000000..75cf3f32858 --- /dev/null +++ b/x11/kde/bindings3/patches/patch-qtc_clib_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-qtc_clib_Makefile_in,v 1.1 2003/02/09 19:18:05 espie Exp $ +--- qtc/clib/Makefile.in.orig Sun Feb 9 19:58:33 2003 ++++ qtc/clib/Makefile.in Sun Feb 9 19:58:40 2003 +@@ -273,7 +273,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) + + SUBDIRS = qtc + diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am new file mode 100644 index 00000000000..a350bd055e7 --- /dev/null +++ b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_am @@ -0,0 +1,10 @@ +$OpenBSD: patch-qtc_clib_qtc_Makefile_am,v 1.1 2003/02/09 19:18:05 espie Exp $ +--- qtc/clib/qtc/Makefile.am.orig Sun Feb 9 19:58:49 2003 ++++ qtc/clib/qtc/Makefile.am Sun Feb 9 19:58:54 2003 +@@ -41,5 +41,5 @@ 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 + diff --git a/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in new file mode 100644 index 00000000000..bfbeadd0e2a --- /dev/null +++ b/x11/kde/bindings3/patches/patch-qtc_clib_qtc_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-qtc_clib_qtc_Makefile_in,v 1.1 2003/02/09 19:18:05 espie Exp $ +--- qtc/clib/qtc/Makefile.in.orig Sun Feb 9 19:58:49 2003 ++++ qtc/clib/qtc/Makefile.in Sun Feb 9 19:59:11 2003 +@@ -306,7 +306,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 + mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h