Date: Tue, 3 Jul 2001 20:14:16 -0700 (PDT) From: John Merryweather Cooper <jmcoopr@webmail.bmi.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/28684: Patches needed for qt-designer to build after qt-2.3.1 update Message-ID: <200107040314.f643EGD47029@johncoop.MSHOME>
next in thread | raw e-mail | index | archive | help
>Number: 28684 >Category: ports >Synopsis: Patches needed for qt-designer to build after qt-2.3.1 update >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 03 20:20:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: John Merryweather Cooper >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD johncoop.MSHOME 4.3-STABLE FreeBSD 4.3-STABLE #24: Mon Jul 2 19:44:15 PDT 2001 jmcoopr@johncoop.MSHOME:/usr/obj/usr/src/sys/JOHNCOOP i386 >Description: After installing qt-2.3.1, qt-designer will no longer build. >How-To-Repeat: Just try build it . . . :) >Fix: The following replacements for /usr/ports/devel/qt-designer/files are: patch-Makefile: --- Makefile Tue Jul 3 18:55:11 2001 +++ Makefile.new Tue Jul 3 18:59:31 2001 @@ -25,11 +25,11 @@ -rm -f bin/moc cp src/moc/moc bin/moc -sub-tools: sub-src FORCE +sub-tools: FORCE cd tools; $(MAKE) symlinks: .buildopts - @cd include; rm -f q*.h; for i in $(QTDIR)/src/*/q*.h $(QTDIR)/extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h + @cd include; rm -f q*.h; for i in ../src/*/q*.h ../extensions/*/src/q*.h; do ln -s $$i .; done; rm -f q*_p.h sub-src: src-moc src-mt .buildopts FORCE cd src; $(MAKE) patch-aa: --- configs/freebsd-g++-shared Tue Jul 3 19:24:24 2001 +++ configs/freebsd-g++-shared.new Tue Jul 3 19:24:17 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 @@ -57,16 +57,14 @@ # - 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_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 +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 -O2 -SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 +SYSCONF_CXXFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O +SYSCONF_CFLAGS = -DQT_PREFIX=\"${PREFIX}\" -pipe -fno-exceptions -O # 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) fix things. YMMV. jmc >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200107040314.f643EGD47029>