Package: fqterm
Version: 0.9.6.3-1
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd
Hi,
your package FTBFS on GNU/kFreeBSD because it tries to use the
FreeBSD-specific CMakeLists.txt.* file after having failed to match
Linux.
Given this check on FreeBSD is nested in the ELSE() part of the Linux
check, a check on (GNU/)kFreeBSD can't be added as it was done for
GNU(/Hurd), so I've tweaked the MATCHES on Linux as seen in the attached
patch.
It also fixes a few locations where a check on Linux happens while the
idea is rather to check for something Unix/Glibc-ish. You may want to
check for Hurd there too.
Build logs at the usual place:
https://buildd.debian.org/status/package.php?suite=unstable&p=fqterm
Thanks for considering.
Mraw,
KiBi.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,13 +63,13 @@ ELSE(WIN32)
SET(SUB_CMAKELIST "CMakeLists.txt.macos")
ELSE(APPLE)
IF(UNIX)
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD")
SET(SUB_CMAKELIST "CMakeLists.txt.linux")
ELSE(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
SET(SUB_CMAKELIST "CMakeLists.txt.freebsd")
ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD")
ENDIF(UNIX)
ENDIF(APPLE)
ENDIF(WIN32)
--- a/src/fqterm/fqterm_frame.cpp
+++ b/src/fqterm/fqterm_frame.cpp
@@ -22,7 +22,7 @@
#include <unistd.h>
#endif
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
#include <QLocale>
#endif
@@ -353,7 +353,7 @@ void FQTermFrame::loadPref() {
FQTermPref::getInstance()->replyENQ_ = (strTmp != "0");
strTmp = config_->getItemValue("preference", "tray");
if (strTmp.isEmpty()) {
-#if defined(__APPLE__) || defined(__linux__)
+#if defined(__APPLE__) || defined(__linux__) || defined(__GLIBC__)
FQTermPref::getInstance()->openMinimizeToTray_ = false;
#else
FQTermPref::getInstance()->openMinimizeToTray_ = true;
@@ -1836,7 +1836,7 @@ void FQTermFrame::initTranslator() {
if (!langList.contains(lang)) {
lang = QLocale::system().name();
}
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
if (QLocale::system().language() == QLocale::English)
lang = QLocale::system().name();
#endif
