FreeBSD Bugzilla – Attachment 153399 Details for
Bug 190929
split lrelease/lupdate out of devel/qt4-linguist
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
initial patch to splitout tools
patch-splitout-qt4-linguisttools-v3 (text/plain), 6.50 KB, created by
Tobias Berner
on 2015-02-23 21:58:55 UTC
(
hide
)
Description:
initial patch to splitout tools
Filename:
MIME Type:
Creator:
Tobias Berner
Created:
2015-02-23 21:58:55 UTC
Size:
6.50 KB
patch
obsolete
>Index: QT/Mk/bsd.qt.mk >=================================================================== >--- QT/Mk/bsd.qt.mk (Revision 10599) >+++ QT/Mk/bsd.qt.mk (Arbeitskopie) >@@ -285,7 +285,7 @@ > Qt_Post_Include= bsd.qt.mk > > _USE_QT_ALL= assistant clucene dbus declarative designer gui help \ >- imageformats linguist multimedia network opengl pixeltool \ >+ imageformats linguist linguisttools multimedia network opengl pixeltool \ > qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \ > sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 svg testlib webkit \ > xml xmlpatterns >@@ -296,7 +296,7 @@ > phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ > qtestlib qvfb rcc uic uic3 xmlpatterns-tool > >-_USE_QT5_ONLY= buildtools concurrent core graphicaleffects linguisttools \ >+_USE_QT5_ONLY= buildtools concurrent core graphicaleffects \ > paths printsupport qdbus qdoc qev qml quick \ > quickcontrols serialport uitools widgets x11extras > >Index: QT/devel/qt4-linguist/Makefile >=================================================================== >--- QT/devel/qt4-linguist/Makefile (Revision 10599) >+++ QT/devel/qt4-linguist/Makefile (Arbeitskopie) >@@ -1,8 +1,9 @@ > # Created by: lofi@FreeBSD.org >-# $FreeBSD$ >+# $FreeBSD: head/devel/qt4-linguist/Makefile 367888 2014-09-10 20:50:31Z gerald $ > > PORTNAME= linguist > DISTVERSION= ${QT4_VERSION} >+PORTREVISION= 1 > CATEGORIES= devel > PKGNAMEPREFIX= qt4- > >@@ -10,7 +11,7 @@ > COMMENT= Qt 4 localization tools > > USE_QT4= qmake_build designer_build moc_build rcc_build uic_build \ >- assistant_run gui network xml >+ assistant_run gui linguisttools_run network xml > QT_DIST= yes > > HAS_CONFIGURE= yes >Index: QT/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro >=================================================================== >--- QT/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro (Revision 0) >+++ QT/devel/qt4-linguist/files/patch-tools_linguist_linguist.pro (Arbeitskopie) >@@ -0,0 +1,10 @@ >+--- tools/linguist/linguist.pro.orig 2015-02-23 21:20:45 UTC >++++ tools/linguist/linguist.pro >+@@ -1,6 +1,2 @@ >+ TEMPLATE = subdirs >+-SUBDIRS = \ >+- lrelease \ >+- lupdate \ >+- lconvert >+-!no-png:!contains(QT_CONFIG, no-gui):SUBDIRS += linguist >++SUBDIRS = linguist >Index: QT/devel/qt4-linguist/pkg-plist >=================================================================== >--- QT/devel/qt4-linguist/pkg-plist (Revision 10599) >+++ QT/devel/qt4-linguist/pkg-plist (Arbeitskopie) >@@ -1,11 +1,5 @@ >-%%QT_BINDIR%%/lconvert >-%%DEBUG%%%%QT_BINDIR%%/lconvert.debug > %%QT_BINDIR%%/linguist-qt4 > %%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug >-%%QT_BINDIR%%/lrelease-qt4 >-%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug >-%%QT_BINDIR%%/lupdate-qt4 >-%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug > share/pixmaps/linguist-qt4.png > %%QT_DATADIR%%/phrasebooks/danish.qph > %%QT_DATADIR%%/phrasebooks/dutch.qph >Index: QT/devel/qt4-linguisttools/Makefile >=================================================================== >--- QT/devel/qt4-linguisttools/Makefile (Revision 0) >+++ QT/devel/qt4-linguisttools/Makefile (Arbeitskopie) >@@ -0,0 +1,51 @@ >+# $FreeBSD: head/devel/qt4-linguist/Makefile 367888 2014-09-10 20:50:31Z gerald $ >+ >+PORTNAME= linguisttools >+DISTVERSION= ${QT4_VERSION} >+PORTREVISION= 1 >+CATEGORIES= devel >+PKGNAMEPREFIX= qt4- >+ >+MAINTAINER= kde@FreeBSD.org >+COMMENT= Qt 4 localization tools >+ >+USE_QT4= qmake_build moc_build rcc_build uic_build xml >+QT_DIST= yes >+ >+HAS_CONFIGURE= yes >+ >+ALL_TARGET= first >+CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH >+MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ >+ PATH=${WRKSRC}/bin:$$PATH >+ >+DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \ >+ src/activeqt src/dbus src/multimedia src/network src/opengl \ >+ src/openvg src/phonon src/qt3support src/s60installs \ >+ src/s60main src/script src/scripttools src/sql src/svg \ >+ src/testlib src/tools src/winmain src/xmlpatterns \ >+ src/3rdparty/clucene src/3rdparty/freetype \ >+ src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \ >+ src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit >+.for dne in ${DO_NOT_EXTRACT} >+EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}' >+.endfor >+ >+BUILD_WRKSRC= ${WRKSRC}/tools/linguist >+INSTALL_WRKSRC= ${BUILD_WRKSRC} >+ >+pre-configure: >+ ${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1${_QT_BINSUFX}|g' \ >+ ${BUILD_WRKSRC}/linguist.pro ${BUILD_WRKSRC}/linguist/linguist.pro \ >+ ${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro >+ ${MKDIR} ${WRKSRC}/mkspecs >+ ${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake >+ ${LN} -sf ${MOC} ${WRKSRC}/bin/moc >+ ${LN} -sf ${UIC} ${WRKSRC}/bin/uic >+ ${LN} -sf ${RCC} ${WRKSRC}/bin/rcc >+ >+post-patch: >+ @${REINPLACE_CMD} -e '/SUBDIRS.*linguist/ d' \ >+ ${WRKSRC}/tools/linguist/linguist.pro >+ >+.include <bsd.port.mk> >Index: QT/devel/qt4-linguisttools/files/patch-tools__linguist__lrelease__main.cpp >=================================================================== >--- QT/devel/qt4-linguisttools/files/patch-tools__linguist__lrelease__main.cpp (Revision 0) >+++ QT/devel/qt4-linguisttools/files/patch-tools__linguist__lrelease__main.cpp (Arbeitskopie) >@@ -0,0 +1,10 @@ >+--- tools/linguist/lrelease/main.cpp.orig 2014-04-10 18:37:13 UTC >++++ tools/linguist/lrelease/main.cpp >+@@ -47,6 +47,7 @@ >+ #ifndef QT_BOOTSTRAPPED >+ #include <QtCore/QCoreApplication> >+ #include <QtCore/QTranslator> >++#include <QtCore/QLibraryInfo> >+ #endif >+ #include <QtCore/QDebug> >+ #include <QtCore/QDir> >Index: QT/devel/qt4-linguisttools/files/patch-tools_linguist_lrelease_lrelease.pro >=================================================================== >--- QT/devel/qt4-linguisttools/files/patch-tools_linguist_lrelease_lrelease.pro (Revision 0) >+++ QT/devel/qt4-linguisttools/files/patch-tools_linguist_lrelease_lrelease.pro (Arbeitskopie) >@@ -0,0 +1,11 @@ >+--- tools/linguist/lrelease/lrelease.pro.orig 2015-02-23 21:14:17 UTC >++++ tools/linguist/lrelease/lrelease.pro >+@@ -2,6 +2,8 @@ TEMPLATE = app >+ TARGET = lrelease >+ DESTDIR = ../../../bin >+ >++QT -= gui >++ >+ DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII >+ SOURCES += main.cpp >+ >Index: QT/devel/qt4-linguisttools/pkg-plist >=================================================================== >--- QT/devel/qt4-linguisttools/pkg-plist (Revision 0) >+++ QT/devel/qt4-linguisttools/pkg-plist (Arbeitskopie) >@@ -0,0 +1,6 @@ >+%%QT_BINDIR%%/lconvert >+%%DEBUG%%%%QT_BINDIR%%/lconvert.debug >+%%QT_BINDIR%%/lrelease-qt4 >+%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug >+%%QT_BINDIR%%/lupdate-qt4 >+%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug
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 190929
: 153399