mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
chinese/fqterm: add <unistd.h>, fix -fpermissive on modern compilers
The source tarball has DOS line endings, but only one file was converted. Two of the four patches were created with DOS line endings, so for consistency sake, USE_DOS2UNIX was changed to "yes" and the DOS line endings were removed from existing patches. Approved by: portmgr (bapt, implicit)
This commit is contained in:
parent
b748c845b6
commit
ed1921e7bc
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=329015
@ -19,7 +19,7 @@ USE_QT4= gui network script qt3support imageformats \
|
||||
qmake_build moc_build rcc_build uic_build linguist_build
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
USE_DOS2UNIX= src/ui/popwidget.cpp
|
||||
USE_DOS2UNIX= yes
|
||||
USES= cmake:outsource
|
||||
CMAKE_ARGS= -Wno-dev
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
@ -1,37 +1,37 @@
|
||||
--- CMakeLists.txt.linux.orig 2008-05-19 17:36:29.000000000 +0800
|
||||
+++ CMakeLists.txt.linux 2008-06-21 08:50:58.000000000 +0800
|
||||
@@ -7,6 +7,7 @@
|
||||
endif(FQTERM_USE_STATIC_QT)
|
||||
|
||||
ADD_DEFINITIONS(-Wall)
|
||||
+ADD_DEFINITIONS(-D_OS_FREEBSD_)
|
||||
ADD_DEFINITIONS(-DFQTERM_VERSION_STRING="\\"${FQTERM_VERSION}\\"")
|
||||
|
||||
add_subdirectory(src)
|
||||
endif(FQTERM_USE_STATIC_QT)
|
||||
|
||||
ADD_DEFINITIONS(-Wall)
|
||||
+ADD_DEFINITIONS(-D_OS_FREEBSD_)
|
||||
ADD_DEFINITIONS(-DFQTERM_VERSION_STRING="\\"${FQTERM_VERSION}\\"")
|
||||
|
||||
add_subdirectory(src)
|
||||
@@ -42,6 +43,18 @@
|
||||
${QT_PLUGINS_DIR}/codecs/libqtwcodecs.a
|
||||
jpeg
|
||||
)
|
||||
+else(FQTERM_USE_STATIC_QT)
|
||||
+ set(FQ_QT_SHARED_PLUGINS
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqgif.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqjpeg.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqmng.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqsvg.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqtiff.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqcncodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqjpcodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqkrcodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqtwcodecs.so
|
||||
+ )
|
||||
endif(FQTERM_USE_STATIC_QT)
|
||||
|
||||
target_link_libraries(fqterm.bin
|
||||
${QT_PLUGINS_DIR}/codecs/libqtwcodecs.a
|
||||
jpeg
|
||||
)
|
||||
+else(FQTERM_USE_STATIC_QT)
|
||||
+ set(FQ_QT_SHARED_PLUGINS
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqgif.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqjpeg.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqmng.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqsvg.so
|
||||
+ ${QT_PLUGINS_DIR}/imageformats/libqtiff.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqcncodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqjpcodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqkrcodecs.so
|
||||
+ ${QT_PLUGINS_DIR}/codecs/libqtwcodecs.so
|
||||
+ )
|
||||
endif(FQTERM_USE_STATIC_QT)
|
||||
|
||||
target_link_libraries(fqterm.bin
|
||||
@@ -54,6 +67,7 @@
|
||||
${QT_QTNETWORK_LIBRARIES}
|
||||
${QT_QTSCRIPT_LIBRARIES}
|
||||
${FQ_QT_STATIC_PLUGINS}
|
||||
+ ${FQ_QT_SHARED_PLUGINS}
|
||||
${QT_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
)
|
||||
${QT_QTNETWORK_LIBRARIES}
|
||||
${QT_QTSCRIPT_LIBRARIES}
|
||||
${FQ_QT_STATIC_PLUGINS}
|
||||
+ ${FQ_QT_SHARED_PLUGINS}
|
||||
${QT_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
)
|
||||
|
10
chinese/fqterm/files/patch-src_common_fqterm__trace.h
Normal file
10
chinese/fqterm/files/patch-src_common_fqterm__trace.h
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/common/fqterm_trace.h.orig 2013-10-02 06:06:02.000000000 +0000
|
||||
+++ src/common/fqterm_trace.h
|
||||
@@ -21,6 +21,7 @@
|
||||
#ifndef FQTERM_TRACE_H
|
||||
#define FQTERM_TRACE_H
|
||||
|
||||
+#include <unistd.h>
|
||||
#include <cassert>
|
||||
#include <QtDebug>
|
||||
#include <QFileInfo>
|
11
chinese/fqterm/files/patch-src_fqterm_fqterm__wndmgr.cpp
Normal file
11
chinese/fqterm/files/patch-src_fqterm_fqterm__wndmgr.cpp
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/fqterm/fqterm_wndmgr.cpp.orig 2013-10-02 06:06:59.000000000 +0000
|
||||
+++ src/fqterm/fqterm_wndmgr.cpp
|
||||
@@ -53,7 +53,7 @@ int FQTermWndMgr::addWindow(FQTermWindow
|
||||
|
||||
Q_ASSERT(mw != NULL);
|
||||
termWindows_.append(mw);
|
||||
- Q_ASSERT(qtab != QString::QString());
|
||||
+ Q_ASSERT(qtab != QString());
|
||||
tabCaptions_.append(qtab);
|
||||
icons_.append(icon);
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- src/ui/fqterm_tool_button.h.orig 2008-05-18 08:46:46.000000000 +0800
|
||||
+++ src/ui/fqterm_tool_button.h 2008-06-21 08:52:08.000000000 +0800
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef FQTERM_TOOL_BUTTON_H
|
||||
#define FQTERM_TOOL_BUTTON_H
|
||||
|
||||
-#include <qtoolbutton.h>
|
||||
+#include <QToolButton>
|
||||
|
||||
namespace FQTerm {
|
||||
|
||||
#ifndef FQTERM_TOOL_BUTTON_H
|
||||
#define FQTERM_TOOL_BUTTON_H
|
||||
|
||||
-#include <qtoolbutton.h>
|
||||
+#include <QToolButton>
|
||||
|
||||
namespace FQTerm {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user