pkgsrc/x11/qt2-libs/patches/patch-ae

111 lines
3.5 KiB
Text
Raw Normal View History

$NetBSD: patch-ae,v 1.9 2003/02/05 23:13:10 dmcmahill Exp $
--- src/Makefile.in.orig Wed Jun 13 04:57:02 2001
+++ src/Makefile.in
@@ -2,7 +2,7 @@
####### Compiler, tools and options
-CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
+CXX = $(SYSCONF_CXX_LIB) $(QT_CXX_MT)
CXXFLAGS= $(SYSCONF_CXXFLAGS_OPENGL) $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS_X11) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) $(QT_CXXFLAGS_OPT)
CC = $(SYSCONF_CC) $(QT_C_MT)
CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) $(QT_CFLAGS_OPT)
@@ -12,9 +12,12 @@ LIBS = $(SUBLIBS) $(SYSCONF_LIBS_OPENGL)
MOC = $(SYSCONF_MOC)
UIC = $(SYSCONF_UIC)
+CFLAGS_NOOPT = $(CFLAGS:-O%=)
+CXXFLAGS_NOOPT = $(CXXFLAGS:-O%=)
+
####### Target
-DESTDIR = ../lib/
+DESTDIR =
VER_MAJ = 2
VER_MIN = 3
update to 2.3.1 Qt 2.3.1 is a bugfix release. It keeps both forward and backward compatibility (source and binary) with Qt 2.3.0 **************************************************************************** * General * **************************************************************************** - correctly reinitialize internal data structures on QApplication destruction to allow the sequential creation of multiple QApplication objects. - Some bugfixes for the new support for Xft (antialiased fonts on X11) correct clipping when drawing with Xft correctly handle family names starting with a number handle case when no Xft font could be loaded correctly report bounding rectangles of strings - Printing on Windows work around a bug in some HP printer drivers correctly map between Qt and Windows page sizes - Improved build on HP/UX, AIX and SCO **************************************************************************** * Library * **************************************************************************** - QAction use unique object names for generated objects - QCanvasView even less flicker - QClipboard on Windows keep clipboard contents even after application exit - QDns: fixed a crash. - QFont correctly report fixed pitch on Windows make inFont work correctly on X11 - QFontDataBase on X11: report correct sizes when monitor resolution != 75 dpi some fixes for asian character sets - QImageIO fixed saving of paletted PNGs - QLineEdit fixed keyboard selection after undo/redo - QListBox fix numRows() and numCols() for empty listboxes - QMovie some performance optimizations - QPainter on X11 fixed clipping problems occuring in some cases in paint events fix drawText when using scaled painters - QPopupMenu on Windows: child widgets now receive mouse events fix placement of menus - QPrintDialog on X11 more tolerant parsing of /etc/printcap - QPrinter on X11 search some more places for embeddable fonts produce smaller postscript when printing grayscale images - QRichText fixed a problem in the HTML parser handle translated painters correctly fixed endless loop occurring rarely when printing long tables - QString fixed toULong for base != 10 - QThread some smaller fixes in QWaitCondition and sleep functions don't lock application mutex for console applications - QToolBar fixed moving of toolbars between main windows Insert toolbuttons with associated popup menus as a submenu in the extension popup - QUrl / QFileDialog delete files with special characters improved processed processing of filenames on different platforms allow digits in protocol names - QUrlOperator some memory leaks are fixed (one of them caused a segmentation fault if FTP was used and the FTP server timed out) - QWidget preserve Widget flags when toggling to and from FullScreen mode. fixed some focus issues with the menubar's Alt-mode (clearFocus() did not always behave as desired). X11 only: fixed mouse move event compression when using QWidget::scroll(). - QWizard correct update of finished and next button - QWorkSpace fixed minimize/maximize behaviour, hide maximize controls when the workspace gets hidden some focus handling fixes - Windows event processing Use mouse position at event generation time rather than processing time. **************************************************************************** * Extensions * **************************************************************************** - OpenGL workaround for some Windows OpenGL drivers - Browser plugins fixed OpenGL handling in plugins **************************************************************************** * Other * **************************************************************************** - Turn off Windows 2000 fading effects on color depths of less than 32 bit - Designer: clear namespace when deleting widgets - fix some memory leaks in the network module - Better support for VNC **************************************************************************** * Changes that might affect runtime behavior * **************************************************************************** - QWheelEvent make accept the default state for QWheelEvent as documented - QPrinter on Windows unknown page sizes now return QPrinter::Custom instead of the wrong QPrinter::A4 **************************************************************************** * Qt/Embedded-specific changes * **************************************************************************** - USB Keyboard support improved. - Printing support improved. - Development support for non-Linux platforms (eg. with QVfb on FreeBSD). - QWSServer/QWSWindow now have a more useable (and documented) API. - Pixmap brush polygon fills are now supported. - Fixed freezing of modal widgets inside manager events. - Bug fixes in masked blit, scrolling, clipped alpha-blended images, focus handling, and QCopChannel::isRegistered(). - iPAQ buttons F1..F4 are now F9..F12 (F4 pops up Comboboxes!) - Support for more mice. - Fixes to compile with GCC 3.0snapshots.
2001-06-17 21:10:37 +02:00
VER_PATCH = 1
@@ -372,25 +375,18 @@ OBJECTS_opengl = opengl/qgl.o \
opengl/qgl_x11.o \
opengl/moc_qgl.o
-
####### Implicit rules
.SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.cxx.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS) `basename $<`
.cc.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-.C.o:
- $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
+ @cd `dirname $@` && $(CXX) -c $(CXXFLAGS_NOOPT) `basename $<`
-.c.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+.cpp.cc:
+ cp -f $< $@
####### Build rules
@@ -398,7 +394,7 @@ OBJECTS_opengl = opengl/qgl.o \
all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
$(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
- $(SYSCONF_LINK_LIB)
+ $(SYSCONF_LINK_LIB) $(SYSCONF_RPATH_X11) $(SYSCONF_RPATH_OPENGL)
moc: $(SRCMOC)
@@ -13114,4 +13110,43 @@ opengl/qgl_x11.o: opengl/qgl_x11.cpp \
tools/qgdict.h \
kernel/qtranslator.h \
tools/qintdict.h
+
+# problem files -- compile with no optimization
+ifeq (${MACHINE_ARCH},alpha)
+
+kernel/moc_qnetworkprotocol.o: kernel/moc_qnetworkprotocol.cc
+kernel/moc_qurloperator.o: kernel/moc_qurloperator.cc
+kernel/moc_qwidget.o: kernel/moc_qwidget.cc
+widgets/moc_qbutton.o: widgets/moc_qbutton.cc
+widgets/moc_qcombobox.o: widgets/moc_qcombobox.cc
+widgets/moc_qdial.o: widgets/moc_qdial.cc
+widgets/moc_qframe.o: widgets/moc_qframe.cc
+widgets/moc_qgroupbox.o: widgets/moc_qgroupbox.cc
+widgets/moc_qheader.o: widgets/moc_qheader.cc
+widgets/moc_qlabel.o: widgets/moc_qlabel.cc
+widgets/moc_qlcdnumber.o: widgets/moc_qlcdnumber.cc
+widgets/moc_qlineedit.o: widgets/moc_qlineedit.cc
+widgets/moc_qlistbox.o: widgets/moc_qlistbox.cc
+widgets/moc_qlistview.o: widgets/moc_qlistview.cc
+widgets/moc_qmainwindow.o: widgets/moc_qmainwindow.cc
+widgets/moc_qmultilineedit.o: widgets/moc_qmultilineedit.cc
+widgets/moc_qprogressbar.o: widgets/moc_qprogressbar.cc
+widgets/moc_qpushbutton.o: widgets/moc_qpushbutton.cc
+widgets/moc_qscrollbar.o: widgets/moc_qscrollbar.cc
+widgets/moc_qscrollview.o: widgets/moc_qscrollview.cc
+widgets/moc_qslider.o: widgets/moc_qslider.cc
+widgets/moc_qspinbox.o: widgets/moc_qspinbox.cc
+widgets/moc_qtabwidget.o: widgets/moc_qtabwidget.cc
+widgets/moc_qtextview.o: widgets/moc_qtextview.cc
+widgets/moc_qtoolbar.o: widgets/moc_qtoolbar.cc
+widgets/moc_qtoolbutton.o: widgets/moc_qtoolbutton.cc
+widgets/moc_qaction.o: widgets/moc_qaction.cc
+dialogs/moc_qfiledialog.o: dialogs/moc_qfiledialog.cc
+dialogs/moc_qmessagebox.o: dialogs/moc_qmessagebox.cc
+dialogs/moc_qprogressdialog.o: dialogs/moc_qprogressdialog.cc
+dialogs/moc_qprintdialog.o: dialogs/moc_qprintdialog.cc
+iconview/moc_qiconview.o: iconview/moc_qiconview.cc
+table/moc_qtable.o: table/moc_qtable.cc
+
+endif