onkelbeh/EdeVauPub
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

1st export of non-private Ebuilds

Browse Source
This commit is contained in:
Andreas Billmeier
2021-06-20 10:09:01 +02:00
parent 0479f0e293
commit ff477cc6c5
76 changed files with 2289 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
net-firewall/fwbuilder/files/fwbuilder-5.3.7-qtbindir.patch Normal file
View File

@@ -0,0 +1,57 @@
--- a/configure.in 2017-12-04 21:30:44.000000000 +0100
+++ b/configure.in 2017-12-04 21:56:00.277286322 +0100
@@ -45,44 +45,18 @@
#define GENERATION "$GENERATION"
EOF
-dnl try to find QT
-dnl
-AC_ARG_WITH(qtdir,[ --with-qtdir=DIR Specify directory path for QT ])
-
-if test -n "$with_qtdir"; then
- AC_MSG_CHECKING(Using QT in )
- QTDIR="$with_qtdir";
- export QTDIR
- AC_MSG_RESULT($QTDIR)
-fi
-
-# TODO: do we need to add $QTDIR/bin to PATH to find qmake?
-EXTENDED_PATH="/usr/local/bin:$QTDIR/bin/:$PATH"
+EXTENDED_PATH="/usr/local/bin:$PATH"
+PKG_PROG_PKG_CONFIG
-AC_ARG_WITH(qmake, [ --with-qmake=qmake Specify the qmake to be used (debian qmake-qt4) ])
-if test -n "$with_qmake"; then
- AC_PATH_PROG(QMAKE, $with_qmake, ,[$EXTENDED_PATH])
- if test -z "$QMAKE"; then
- AC_MSG_ERROR("Could not find qmake")
- fi
-else
- AC_PATH_PROG(QMAKE, qmake, ,[$EXTENDED_PATH])
- if test -z "$QMAKE"; then
- AC_PATH_PROG(QMAKE, qmake-qt4, ,[$EXTENDED_PATH])
- if test -z "$QMAKE"; then
- AC_MSG_ERROR("Could not find qmake")
- fi
- fi
-fi
-
-AC_MSG_CHECKING(checking version of QT this qmake is part of)
-qmake_version=`$QMAKE -v 2>&1 | awk '/Using Qt version/ { print $4;}'`
-case $qmake_version in
- 4.*) AC_MSG_RESULT( $qmake_version ) ;;
- 5.*) AC_MSG_RESULT( $qmake_version ) ;;
- *) AC_MSG_ERROR( "$qmake_version -- v4.x or v5.x is required") ;;
-esac
+dnl try to find Qt5
+dnl
+PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0], [
+ QT_PATH="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )"
+ AC_PATH_PROGS([QMAKE], [qmake-qt5 qmake], [qmake], [$QT_PATH])
+], [
+ AC_MSG_ERROR([Qt5 not found])
+])
AC_ARG_WITH(templatedir, [ --with-templatedir=DIR Specify directory path for fwbuilder template files ])

52
net-firewall/fwbuilder/files/fwbuilder-6.0.0_beta-gcc-maybe-uninitialized.patch Normal file
View File

@@ -0,0 +1,52 @@
From 1ec3d2315d6c1a8f020763cd7fa019c9b8ed2921 Mon Sep 17 00:00:00 2001
From: Hannes Schweizer <nilathak@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:18:10 +0200
Subject: [PATCH] fix: demote GCC maybe-uninitialized error to warning again
After enabling stricter compile warnings with the following commit
https://github.com/fwbuilder/fwbuilder/commit/302299ec52956c98f2cbf0a6a6056c3ae458925f
it is necessary to add "-Wno-error=maybe-uninitialized" to CXXFLAGS, otherwise the compile fails with gcc-7.3.0/gcc-8.2.0:
../fwbuilder/FWObject.h:64:65: warning: 'nserv' may be used uninitialized in this function [-Wmaybe-uninitialized]
PIXImporter.cpp:968:40: warning: 'obj' may be used uninitialized in this function [-Wmaybe-uninitialized]
linux24Interfaces.cpp:279:21: warning: 'itype' may be used uninitialized in this function [-Wmaybe-uninitialized]
RuleSetDiffDialog.cpp:179:101: warning: 'originalRuleSetModel' may be used uninitialized in this function [-Wmaybe-uninitialized]
RuleSetDiffDialog.cpp:186:99: warning: 'currentRuleSetModel' may be used uninitialized in this function [-Wmaybe-uninitialized]
---
qmake.inc.in | 4 ++--
src/libfwbuilder/qmake.inc.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qmake.inc.in b/qmake.inc.in
index 09748142..c0823e80 100644
--- a/qmake.inc.in
+++ b/qmake.inc.in
@@ -199,8 +199,8 @@ FWB_SIG = $$(FWB_SIG)
if (isEmpty(FWB_SIG)) { FWB_SIG=26932 }
DEFINES += FWB_SIG=$$FWB_SIG
-QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
-QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Wno-error=maybe-uninitialized $$(CXXFLAGS)
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Wno-error=maybe-uninitialized $$(CXXFLAGS)
exists(qmake2.inc) {
include(qmake2.inc)
diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
index 0ec1ad98..4401369c 100644
--- a/src/libfwbuilder/qmake.inc.in
+++ b/src/libfwbuilder/qmake.inc.in
@@ -16,8 +16,8 @@ CPPUNIT_LIBS = @CPPUNIT_LIBS@
CONFIG -= qt
CONFIG += c++14
-QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
-QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror $$(CXXFLAGS)
+QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror -Wno-error=maybe-uninitialized $$(CXXFLAGS)
+QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS -Wall -Wextra -Werror -Wno-error=maybe-uninitialized $$(CXXFLAGS)
unix {
--
2.16.4