FreeBSD Bugzilla – Attachment 141015 Details for
Bug 187740
x11-toolkits/soqt: Fix build with clang
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
x11-toolkits_soqt.diff
x11-toolkits_soqt.diff (text/x-diff), 1.99 KB, created by
tkato432
on 2014-05-17 19:27:50 UTC
(
hide
)
Description:
x11-toolkits_soqt.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2014-05-17 19:27:50 UTC
Size:
1.99 KB
patch
obsolete
>diff -urN /usr/ports/x11-toolkits/soqt/Makefile x11-toolkits/soqt/Makefile >--- /usr/ports/x11-toolkits/soqt/Makefile 2014-03-16 18:15:20.000000000 +0900 >+++ x11-toolkits/soqt/Makefile 2014-05-18 00:00:00.000000000 +0900 >@@ -12,25 +12,29 @@ > MAINTAINER= ports@FreeBSD.org > COMMENT= Qt4 toolkit library for Coin > >-LIB_DEPENDS= Coin.61:${PORTSDIR}/graphics/Coin >+LICENSE= GPLv2 > >-USE_AUTOTOOLS= libtool >-USES= pathfix gmake >-USE_QT4= corelib opengl moc_build >-CPPFLAGS+= -I${QT_INCDIR} -I${QT_INCDIR}/Qt -I${LOCALBASE}/include >-LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib >+LIB_DEPENDS= libCoin.so:${PORTSDIR}/graphics/Coin > >+USES= gmake libtool pathfix pkgconfig >+USE_QT4= corelib opengl moc_build >+QT_NONSTANDARD= yes >+USE_GL= gl > GNU_CONFIGURE= yes >-CONFIGURE_ENV= QTDIR="${QT_PREFIX}" >- >+CONFIGURE_ENV= QTDIR="${QT_PREFIX}" MOC="${MOC}" > CONFIGURE_ARGS= --with-pthread=yes --with-coin=${LOCALBASE} \ > --with-qt=${QT_LIBDIR} > USE_LDCONFIG= yes > >-MAN1= soqt-config.1 >+CPPFLAGS+= -I${QT_INCDIR}/Qt -I${QT_INCDIR} -I${LOCALBASE}/include >+LDFLAGS+= -L${QT_LIBDIR} -L${LOCALBASE}/lib >+ >+post-patch: >+ @${REINPLACE_CMD} -e \ >+ '/LDFLAGS/s| $$sim_ac_coin_ldflags|| ; \ >+ /CXXFLAGS/s| -fno-for-scope||' ${WRKSRC}/configure > >-NO_STAGE= yes > post-install: >- @${TOUCH} ${PREFIX}/include/Inventor/Qt/engines/.keep_me >+ @${TOUCH} ${STAGEDIR}${PREFIX}/include/Inventor/Qt/engines/.keep_me > > .include <bsd.port.mk> >diff -urN /usr/ports/x11-toolkits/soqt/pkg-plist x11-toolkits/soqt/pkg-plist >--- /usr/ports/x11-toolkits/soqt/pkg-plist 2014-01-23 03:15:57.000000000 +0900 >+++ x11-toolkits/soqt/pkg-plist 2014-05-18 00:00:00.000000000 +0900 >@@ -23,11 +23,11 @@ > include/Inventor/Qt/viewers/SoQtViewer.h > include/Inventor/Qt/widgets/SoQtPopupMenu.h > include/Inventor/Qt/widgets/SoQtThumbWheel.h >-lib/libSoQt.a >-lib/libSoQt.la > lib/libSoQt.so >-lib/libSoQt.so.25 >+lib/libSoQt.so.20 >+lib/libSoQt.so.20.5.0 > libdata/pkgconfig/SoQt.pc >+man/man1/soqt-config.1.gz > share/Coin/conf/soqt-default.cfg > share/aclocal/soqt.m4 > @dirrmtry share/Coin/conf
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 187740
:
141014
| 141015