aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/qt30/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/qt30/files')
-rw-r--r--x11-toolkits/qt30/files/manpages338
-rw-r--r--x11-toolkits/qt30/files/objprelink.patch20
-rw-r--r--x11-toolkits/qt30/files/patch-aa62
-rw-r--r--x11-toolkits/qt30/files/patch-af31
-rw-r--r--x11-toolkits/qt30/files/patch-ag52
-rw-r--r--x11-toolkits/qt30/files/patch-ah31
-rw-r--r--x11-toolkits/qt30/files/patch-designer::mainwindow.cpp32
7 files changed, 0 insertions, 566 deletions
diff --git a/x11-toolkits/qt30/files/manpages b/x11-toolkits/qt30/files/manpages
deleted file mode 100644
index f215941c455b..000000000000
--- a/x11-toolkits/qt30/files/manpages
+++ /dev/null
@@ -1,338 +0,0 @@
-MAN3= \
-qaccel.3qt \
-qaction.3qt \
-qactiongroup.3qt \
-qapplication.3qt \
-qarray.3qt \
-qasciicache.3qt \
-qasciicacheiterator.3qt \
-qasciidict.3qt \
-qasciidictiterator.3qt \
-qasyncio.3qt \
-qbitarray.3qt \
-qbitmap.3qt \
-qbitval.3qt \
-qboxlayout.3qt \
-qbrush.3qt \
-qbuffer.3qt \
-qbutton.3qt \
-qbuttongroup.3qt \
-qbytearray.3qt \
-qcache.3qt \
-qcacheiterator.3qt \
-qcanvas.3qt \
-qcanvasellipse.3qt \
-qcanvasitem.3qt \
-qcanvasline.3qt \
-qcanvaspixmap.3qt \
-qcanvaspixmaparray.3qt \
-qcanvaspolygon.3qt \
-qcanvaspolygonalitem.3qt \
-qcanvasrectangle.3qt \
-qcanvassprite.3qt \
-qcanvastext.3qt \
-qcanvasview.3qt \
-qcdestyle.3qt \
-qchar.3qt \
-qcharref.3qt \
-qcheckbox.3qt \
-qchecklistitem.3qt \
-qchildevent.3qt \
-qclipboard.3qt \
-qcloseevent.3qt \
-qcollection.3qt \
-qcolor.3qt \
-qcolordialog.3qt \
-qcolordrag.3qt \
-qcolorgroup.3qt \
-qcombobox.3qt \
-qcommonstyle.3qt \
-qconststring.3qt \
-qcopchannel.3qt \
-qcstring.3qt \
-qcursor.3qt \
-qcustomevent.3qt \
-qcustommenuitem.3qt \
-qdatapump.3qt \
-qdatasink.3qt \
-qdatasource.3qt \
-qdatastream.3qt \
-qdate.3qt \
-qdatetime.3qt \
-qdial.3qt \
-qdialog.3qt \
-qdict.3qt \
-qdictiterator.3qt \
-qdir.3qt \
-qdns.3qt \
-qdomattr.3qt \
-qdomcdatasection.3qt \
-qdomcharacterdata.3qt \
-qdomcomment.3qt \
-qdomdocument.3qt \
-qdomdocumentfragment.3qt \
-qdomdocumenttype.3qt \
-qdomelement.3qt \
-qdomentity.3qt \
-qdomentityreference.3qt \
-qdomimplementation.3qt \
-qdomnamednodemap.3qt \
-qdomnode.3qt \
-qdomnodelist.3qt \
-qdomnotation.3qt \
-qdomprocessinginstruction.3qt \
-qdomtext.3qt \
-qdoublevalidator.3qt \
-qdragenterevent.3qt \
-qdragleaveevent.3qt \
-qdragmoveevent.3qt \
-qdragobject.3qt \
-qdropevent.3qt \
-qdropsite.3qt \
-qeucjpcodec.3qt \
-qeuckrcodec.3qt \
-qevent.3qt \
-qfile.3qt \
-qfiledialog.3qt \
-qfileiconprovider.3qt \
-qfileinfo.3qt \
-qfilepreview.3qt \
-qfocusdata.3qt \
-qfocusevent.3qt \
-qfont.3qt \
-qfontdatabase.3qt \
-qfontdialog.3qt \
-qfontinfo.3qt \
-qfontmetrics.3qt \
-qframe.3qt \
-qftp.3qt \
-qgarray.3qt \
-qgbkcodec.3qt \
-qgcache.3qt \
-qgcacheiterator.3qt \
-qgdict.3qt \
-qgdictiterator.3qt \
-qgl.3qt \
-qglayoutiterator.3qt \
-qglcontext.3qt \
-qglformat.3qt \
-qglist.3qt \
-qglistiterator.3qt \
-qglwidget.3qt \
-qgrid.3qt \
-qgridlayout.3qt \
-qgroupbox.3qt \
-qguardedptr.3qt \
-qgvector.3qt \
-qhbox.3qt \
-qhboxlayout.3qt \
-qhbuttongroup.3qt \
-qheader.3qt \
-qhgroupbox.3qt \
-qhideevent.3qt \
-qhostaddress.3qt \
-qicondrag.3qt \
-qicondragitem.3qt \
-qiconset.3qt \
-qiconview.3qt \
-qiconviewitem.3qt \
-qimage.3qt \
-qimageconsumer.3qt \
-qimagedecoder.3qt \
-qimagedrag.3qt \
-qimageformat.3qt \
-qimageformattype.3qt \
-qimageio.3qt \
-qinputdialog.3qt \
-qintcache.3qt \
-qintcacheiterator.3qt \
-qintdict.3qt \
-qintdictiterator.3qt \
-qinterlacestyle.3qt \
-qintvalidator.3qt \
-qiodevice.3qt \
-qiodevicesource.3qt \
-qjiscodec.3qt \
-qjpunicodeconv.3qt \
-qkeyevent.3qt \
-qlabel.3qt \
-qlayout.3qt \
-qlayoutitem.3qt \
-qlayoutiterator.3qt \
-qlcdnumber.3qt \
-qlineedit.3qt \
-qlist.3qt \
-qlistbox.3qt \
-qlistboxitem.3qt \
-qlistboxpixmap.3qt \
-qlistboxtext.3qt \
-qlistiterator.3qt \
-qlistview.3qt \
-qlistviewitem.3qt \
-qlistviewitemiterator.3qt \
-qlnode.3qt \
-qlocalfs.3qt \
-qmainwindow.3qt \
-qmap.3qt \
-qmapconstiterator.3qt \
-qmapiterator.3qt \
-qmenubar.3qt \
-qmenudata.3qt \
-qmessagebox.3qt \
-qmetaobject.3qt \
-qmetaproperty.3qt \
-qmimesource.3qt \
-qmimesourcefactory.3qt \
-qmotifplusstyle.3qt \
-qmotifstyle.3qt \
-qmouseevent.3qt \
-qmoveevent.3qt \
-qmovie.3qt \
-qmultilineedit.3qt \
-qmutex.3qt \
-qnetworkoperation.3qt \
-qnetworkprotocol.3qt \
-qnpinstance.3qt \
-qnplugin.3qt \
-qnpstream.3qt \
-qnpwidget.3qt \
-qobject.3qt \
-qpaintdevice.3qt \
-qpaintdevicemetrics.3qt \
-qpainter.3qt \
-qpaintevent.3qt \
-qpalette.3qt \
-qpen.3qt \
-qpicture.3qt \
-qpixmap.3qt \
-qpixmapcache.3qt \
-qplatinumstyle.3qt \
-qpngimagepacker.3qt \
-qpoint.3qt \
-qpointarray.3qt \
-qpopupmenu.3qt \
-qprinter.3qt \
-qprogressbar.3qt \
-qprogressdialog.3qt \
-qptrdict.3qt \
-qptrdictiterator.3qt \
-qpushbutton.3qt \
-qqueue.3qt \
-qradiobutton.3qt \
-qrangecontrol.3qt \
-qrect.3qt \
-qregexp.3qt \
-qregion.3qt \
-qresizeevent.3qt \
-qscreencursor.3qt \
-qscrollbar.3qt \
-qscrollview.3qt \
-qsemaphore.3qt \
-qsemimodal.3qt \
-qserversocket.3qt \
-qsessionmanager.3qt \
-qsgistyle.3qt \
-qshared.3qt \
-qshowevent.3qt \
-qsignal.3qt \
-qsignalmapper.3qt \
-qsimplerichtext.3qt \
-qsize.3qt \
-qsizegrip.3qt \
-qsizepolicy.3qt \
-qsjiscodec.3qt \
-qslider.3qt \
-qsocket.3qt \
-qsocketdevice.3qt \
-qsocketnotifier.3qt \
-qsortedlist.3qt \
-qsound.3qt \
-qspaceritem.3qt \
-qspinbox.3qt \
-qsplitter.3qt \
-qstack.3qt \
-qstatusbar.3qt \
-qstoreddrag.3qt \
-qstrilist.3qt \
-qstring.3qt \
-qstringlist.3qt \
-qstrlist.3qt \
-qstrlistiterator.3qt \
-qstyle.3qt \
-qstylesheet.3qt \
-qstylesheetitem.3qt \
-qt.3qt \
-qtab.3qt \
-qtabbar.3qt \
-qtabdialog.3qt \
-qtable.3qt \
-qtableitem.3qt \
-qtableselection.3qt \
-qtableview.3qt \
-qtabwidget.3qt \
-qtextbrowser.3qt \
-qtextcodec.3qt \
-qtextdecoder.3qt \
-qtextdrag.3qt \
-qtextencoder.3qt \
-qtextistream.3qt \
-qtextostream.3qt \
-qtextstream.3qt \
-qtextview.3qt \
-qthread.3qt \
-qtime.3qt \
-qtimer.3qt \
-qtimerevent.3qt \
-qtoolbar.3qt \
-qtoolbutton.3qt \
-qtooltip.3qt \
-qtooltipgroup.3qt \
-qtranslator.3qt \
-qtranslatormessage.3qt \
-qtsciicodec.3qt \
-quridrag.3qt \
-qurl.3qt \
-qurloperator.3qt \
-qvalidator.3qt \
-qvaluelist.3qt \
-qvaluelistconstiterator.3qt \
-qvaluelistiterator.3qt \
-qvaluestack.3qt \
-qvariant.3qt \
-qvbox.3qt \
-qvboxlayout.3qt \
-qvbuttongroup.3qt \
-qvector.3qt \
-qvgroupbox.3qt \
-qwaitcondition.3qt \
-qwhatsthis.3qt \
-qwheelevent.3qt \
-qwidget.3qt \
-qwidgetitem.3qt \
-qwidgetstack.3qt \
-qwindowsstyle.3qt \
-qwizard.3qt \
-qwmatrix.3qt \
-qworkspace.3qt \
-qwsdecoration.3qt \
-qwskeyboardhandler.3qt \
-qwsmousehandler.3qt \
-qwsserver.3qt \
-qwswindow.3qt \
-qxmlattributes.3qt \
-qxmlcontenthandler.3qt \
-qxmldeclhandler.3qt \
-qxmldefaulthandler.3qt \
-qxmldtdhandler.3qt \
-qxmlentityresolver.3qt \
-qxmlerrorhandler.3qt \
-qxmlinputsource.3qt \
-qxmllexicalhandler.3qt \
-qxmllocator.3qt \
-qxmlnamespacesupport.3qt \
-qxmlparseexception.3qt \
-qxmlreader.3qt \
-qxmlsimplereader.3qt \
-qxtapplication.3qt \
-qxtwidget.3qt \
-
diff --git a/x11-toolkits/qt30/files/objprelink.patch b/x11-toolkits/qt30/files/objprelink.patch
deleted file mode 100644
index d6681cb74790..000000000000
--- a/x11-toolkits/qt30/files/objprelink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configs/freebsd-g++-shared Fri Jan 4 21:39:23 2002
-+++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:23 2002
-@@ -32,7 +32,7 @@
- SYSCONF_LIBS_YACC =
-
- # Linking applications
--SYSCONF_LINK = g++
-+SYSCONF_LINK = objprelink $(OBJECTS) $(OBJMOC) && g++
- SYSCONF_LFLAGS =
- SYSCONF_LIBS =
-
-@@ -58,7 +58,7 @@
- #
- SYSCONF_LINK_SHLIB = g++
- SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
--SYSCONF_LINK_LIB_SHARED = \
-+SYSCONF_LINK_LIB_SHARED = objprelink $(OBJECTS) $(OBJMOC) && \
- $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
- $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
- $(OBJECTS) $(OBJMOC) $(LIBS) && \
diff --git a/x11-toolkits/qt30/files/patch-aa b/x11-toolkits/qt30/files/patch-aa
deleted file mode 100644
index bc5939bc401f..000000000000
--- a/x11-toolkits/qt30/files/patch-aa
+++ /dev/null
@@ -1,62 +0,0 @@
---- configs/freebsd-g++-shared Fri Jan 4 21:35:53 2002
-+++ configs/freebsd-g++-shared.new Fri Jan 4 21:37:33 2002
-@@ -6,7 +6,7 @@
-
- # Compiling with support libraries
- SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
--SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
- SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-
- # Compiling YACC output
-@@ -23,7 +23,7 @@
- SYSCONF_LIBS_X11 = -lXext -lX11 -lm
- # Qt, Qt+OpenGL
- SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
--SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
- SYSCONF_LIBS_QT_OPENGL =
- # OpenGL
- SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -46,7 +46,7 @@
- SYSCONF_LIBS_THREAD =
-
- # Meta-object compiler
--SYSCONF_MOC = $(QTDIR)/bin/moc
-+SYSCONF_MOC = $(QTDIR)/bin/moc2
-
- # UI compiler
- SYSCONF_UIC = $(QTDIR)/bin/uic
-@@ -57,16 +57,15 @@
- # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
- #
- SYSCONF_LINK_SHLIB = g++
--SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
--SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
-+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-+SYSCONF_LINK_LIB_SHARED = \
-+ $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
- $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
- $(OBJECTS) $(OBJMOC) $(LIBS) && \
- mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
- cd $(DESTDIR) && \
-- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+ rm -f lib$(TARGET).so;\
-+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
-
- # Linking static libraries
- # - Build the $(TARGET) library, eg. lib$(TARGET).a
-@@ -77,8 +76,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
--SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
-+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2
-+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O2
- # Default link type (static linking is still be used where required)
- SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
- SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt30/files/patch-af b/x11-toolkits/qt30/files/patch-af
deleted file mode 100644
index 552e44010c15..000000000000
--- a/x11-toolkits/qt30/files/patch-af
+++ /dev/null
@@ -1,31 +0,0 @@
---- configs/freebsd-g++-static.orig Wed Oct 4 12:55:09 2000
-+++ configs/freebsd-g++-static Sat Nov 18 20:02:46 2000
-@@ -23,7 +23,7 @@
- SYSCONF_LIBS_X11 = -lXext -lX11 -lm
- # Qt, Qt+OpenGL
- SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
--SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX)
- SYSCONF_LIBS_QT_OPENGL =
- # OpenGL
- SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -46,7 +46,7 @@
- SYSCONF_LIBS_THREAD =
-
- # Meta-object compiler
--SYSCONF_MOC = $(QTDIR)/bin/moc
-+SYSCONF_MOC = $(QTDIR)/bin/moc2
-
- # UI compiler
- SYSCONF_UIC = $(QTDIR)/bin/uic
-@@ -77,8 +77,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
--SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
-+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
-+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -O -fno-exceptions
- SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
- SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
- # Compiling library source
diff --git a/x11-toolkits/qt30/files/patch-ag b/x11-toolkits/qt30/files/patch-ag
deleted file mode 100644
index ba5e83f30d70..000000000000
--- a/x11-toolkits/qt30/files/patch-ag
+++ /dev/null
@@ -1,52 +0,0 @@
---- configs/freebsd-g++-shared-debug.orig Thu Jun 21 09:27:41 2001
-+++ configs/freebsd-g++-shared-debug Thu Jun 21 09:31:12 2001
-@@ -6,7 +6,7 @@
-
- # Compiling with support libraries
- SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
--SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
-+SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include $(SYSCONF_CXXFLAGS_THREAD)
- SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
-
- # Compiling YACC output
-@@ -23,7 +23,7 @@
- SYSCONF_LIBS_X11 = -lXext -lX11 -lm
- # Qt, Qt+OpenGL
- SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
--SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX) $(SYSCONF_LFLAGS_THREAD)
- SYSCONF_LIBS_QT_OPENGL =
- # OpenGL
- SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -46,7 +46,7 @@
- SYSCONF_LIBS_THREAD =
-
- # Meta-object compiler
--SYSCONF_MOC = $(QTDIR)/bin/moc
-+SYSCONF_MOC = $(QTDIR)/bin/moc2
-
- # UI compiler
- SYSCONF_UIC = $(QTDIR)/bin/uic
-@@ -60,1 +60,1 @@
--SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
-+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ)
-@@ -65,6 +65,4 @@
- cd $(DESTDIR) && \
-- rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
-- ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
-+ rm -f lib$(TARGET).so;\
-+ ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so
-
-@@ -77,8 +75,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -fno-exceptions -g
--SYSCONF_CFLAGS = -pipe -fno-exceptions -g
-+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
-+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
- # Default link type (static linking is still be used where required)
- SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
- SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
diff --git a/x11-toolkits/qt30/files/patch-ah b/x11-toolkits/qt30/files/patch-ah
deleted file mode 100644
index 790190fef52f..000000000000
--- a/x11-toolkits/qt30/files/patch-ah
+++ /dev/null
@@ -1,31 +0,0 @@
---- configs/freebsd-g++-static-debug.orig Thu Jun 21 09:32:21 2001
-+++ configs/freebsd-g++-static-debug Thu Jun 21 09:33:08 2001
-@@ -23,7 +23,7 @@
- SYSCONF_LIBS_X11 = -lXext -lX11 -lm
- # Qt, Qt+OpenGL
- SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
--SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
-+SYSCONF_LIBS_QT = -lqt2$(QT_THREAD_SUFFIX)
- SYSCONF_LIBS_QT_OPENGL =
- # OpenGL
- SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
-@@ -46,7 +46,7 @@
- SYSCONF_LIBS_THREAD =
-
- # Meta-object compiler
--SYSCONF_MOC = $(QTDIR)/bin/moc
-+SYSCONF_MOC = $(QTDIR)/bin/moc2
-
- # UI compiler
- SYSCONF_UIC = $(QTDIR)/bin/uic
-@@ -77,8 +77,8 @@
- SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
- $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
- # Compiling application source
--SYSCONF_CXXFLAGS = -pipe -fno-exceptions -g
--SYSCONF_CFLAGS = -pipe -fno-exceptions -g
-+SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
-+SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -g
- SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
- SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
- # Compiling library source
diff --git a/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp b/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp
deleted file mode 100644
index eddf54f011d9..000000000000
--- a/x11-toolkits/qt30/files/patch-designer::mainwindow.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
---- tools/designer/designer/mainwindow.cpp 2000/11/18 17:50:58 1.1
-+++ tools/designer/designer/mainwindow.cpp 2000/11/18 17:53:21
-@@ -125,7 +125,7 @@
- : QMainWindow( 0, "mainwindow", WType_TopLevel | WDestructiveClose ),
- #endif
- grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
-- docPath( "$QTDIR/doc/html" ), client( asClient )
-+ docPath( QT_PREFIX "/share/doc/qt2/html" ), client( asClient )
- {
- self = this;
- setIcon( PixmapChooser::loadPixmap( "logo" ) );
-@@ -3144,7 +3144,7 @@
- QMessageBox::information( this, tr( "Create Template" ), tr( "Couldn't create the template" ) );
- return;
- }
-- fn.prepend( QString( getenv( "QTDIR" ) ) + "/tools/designer/templates/" );
-+ fn.prepend( QT_PREFIX "/share/qt2/designer/templates/" );
- fn.append( ".ui" );
- QFile f( fn );
- if ( !f.open( IO_WriteOnly ) ) {
-@@ -3236,9 +3236,9 @@
-
- void MainWindow::openHelpForDialog( const QString &dia )
- {
-- QString manualdir = QString( getenv( "QTDIR" ) ) + "/tools/designer/manual/book1.html";
-+ QString manualdir = QT_PREFIX "/share/qt2/designer/manual/book1.html";
- if ( !QFile::exists( manualdir ) )
-- manualdir = QString( getenv( "QTDIR" ) ) + "/doc/html/designer/book1.html";
-+ manualdir = QT_PREFIX "/share/doc/qt2/html/designer/book1.html";
- QFile file( manualdir );
- if ( !file.open( IO_ReadOnly ) )
- return;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:40:31 +0000