---- gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp.orig 2005-11-16 00:20:01.000000000 +0100
-+++ gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2006-02-26 17:59:49.285101500 +0100
-@@ -39,6 +39,7 @@
- #include <QWidget>
- #include <QPoint>
-
-+#include <assert.h>
- #include "componentevent.h"
-
- AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent()
---- gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.orig 2005-11-16 00:20:01.000000000 +0100
-+++ gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2006-02-26 17:28:33.311860500 +0100
-@@ -137,7 +137,7 @@
- eventQueue = new EventQueue();
- repaintThread = new QtRepaintThread();
- if (Configuration.INIT_LOAD_LIBRARY)
-- System.loadLibrary("qtpeer");
-+ System.loadLibrary("-gnu-java-awt-peer-qt");
-
- String theme = null;
- try
---- gcc-4.1.0-20060223/libjava/classpath/configure.ac.orig 2005-12-01 21:09:06.000000000 +0100
-+++ gcc-4.1.0-20060223/libjava/classpath/configure.ac 2006-02-26 17:59:25.255599750 +0100
-@@ -372,6 +372,9 @@
- if test "x${COMPILE_QT_PEER}" = xyes; then
- PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no")
- if test "x$HAVE_QT4" = "xyes"; then
-+ AC_ARG_WITH([qt4dir],
-+ [AS_HELP_STRING([--with-qt4dir=DIR],[Qt4 installation directory.])],
-+ [QT4DIR=$withval])
- dnl Check needed because in some cases the QtGui includedir
- dnl doesn't contain the subsystem dir.
- QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui)
-@@ -381,18 +384,13 @@
+--- trunk/libjava/classpath/configure.ac 2006-07-02 15:32:04.000000000 +0200
++++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200
+@@ -502,7 +502,8 @@
AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
AC_MSG_WARN([QWidget not found])))
- AC_CHECK_PROG(MOC, [moc], [moc])
++ QT4DIR=`$PKG_CONFIG --variable=prefix QtGui`
+ AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
-+ QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++ -I/usr/include/qt4/Qt"
+ AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
fi
if test "x$HAVE_QT4" = "xno"; then
- AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config])
- case "$host_os" in
- darwin*)
-- AC_ARG_WITH([qt4dir],
-- [AS_HELP_STRING([--with-qt4dir=DIR],
-- [Qt4 installation directory used for OS-X.
-- For other systems use pkg-config.])],
-- [QT4DIR=$withval]
-- )
- if test x"$QT4DIR" = x ; then
- AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given])
- fi
+--- trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2007-06-04 01:18:43.000000000 +0200
++++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2008-03-06 16:32:36.000000000 +0100
+@@ -1,8 +1,7 @@
+ # Qt AWT backend for Classpath
+ #
+
+-## GCJ LOCAL: don't install this library
+-noinst_LTLIBRARIES = libqtpeer.la
++nativeexeclib_LTLIBRARIES = libqtpeer.la
+
+ AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
+ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+--- trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2007-08-04 12:53:49.000000000 +0200
++++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2008-03-06 15:24:38.000000000 +0100
+@@ -64,7 +64,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/include/config.h
+ CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
++nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
+ libqtpeer_la_LIBADD =
+ am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \
+ mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \
+@@ -357,7 +358,7 @@
+ target_vendor = @target_vendor@
+ toolexeclibdir = @toolexeclibdir@
+ vm_classes = @vm_classes@
+-noinst_LTLIBRARIES = libqtpeer.la
++nativeexeclib_LTLIBRARIES = libqtpeer.la
+ AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
+ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+ AM_CXXFLAGS = @QT_CFLAGS@ \
+@@ -475,7 +476,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES)
+- $(CXXLINK) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -686,7 +687,18 @@
+
+ install-data-am:
+
+-install-exec-am:
++install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
++ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
++ else :; fi; \
++ done
++
++install-exec-am: install-nativeexeclibLTLIBRARIES
+
+ install-info: install-info-am
+
+@@ -720,6 +732,7 @@
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
++ install-nativeexeclibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
projects / packages / gcc.git / blobdiff