summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-firewall/fwbuilder/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-firewall/fwbuilder/files')
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch11
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch11
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch51
-rw-r--r--net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch11
4 files changed, 84 insertions, 0 deletions
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
new file mode 100644
index 000000000000..d9df8429d390
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
@@ -0,0 +1,11 @@
+diff -Naurp fwbuilder-5.0.0.3568.orig//qmake.inc.in fwbuilder-5.0.0.3568//qmake.inc.in
+--- fwbuilder-5.0.0.3568.orig//qmake.inc.in 2011-07-25 19:27:44.000000000 -0400
++++ fwbuilder-5.0.0.3568//qmake.inc.in 2011-08-19 17:00:41.259985388 -0400
+@@ -39,6 +39,7 @@ unix {
+ QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++ QMAKE_LFLAGS = @LDFLAGS@
+
+ !macx {
+
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
new file mode 100644
index 000000000000..7849e2b6da95
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-gcc47.patch
@@ -0,0 +1,11 @@
+--- a/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:02:55.909203733 -0400
++++ b/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-04 15:04:54.079198998 -0400
+@@ -31,7 +31,7 @@
+
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
+-
++#include <unistd.h>
+ #include <string>
+ #include <queue>
+
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
new file mode 100644
index 000000000000..3658c10a3eec
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.1.3592-stdc-format-macros.patch
@@ -0,0 +1,51 @@
+From: Vadim Kurland <vadim@slot.vk.crocodile.org>
+Date: Tue, 14 Feb 2012 04:59:26 +0000 (-0800)
+Subject: fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+X-Git-Url: http://fwbuilder.git.sourceforge.net/git/gitweb.cgi?p=fwbuilder%2Ffwbuilder;a=commitdiff_plain;h=f97a1b50ba51be5fa31cc54dba829a9e77609160;hp=15565ade5dc843e5fefe83568a023c37256c3c3c
+
+fix for SF bug #3468802. Define macro __STDC_FORMAT_MACROS. This still
+needs to be tested on all build machines.
+---
+
+diff --git a/qmake.inc.in b/qmake.inc.in
+index 6bf27e0..3e31fd6 100644
+--- a/qmake.inc.in
++++ b/qmake.inc.in
+@@ -67,6 +67,9 @@ unix {
+
+ CONFIG += warn_on
+
++ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+ }
+ }
+
+diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in
+index b4f15bb..a8114cf 100644
+--- a/src/libfwbuilder/qmake.inc.in
++++ b/src/libfwbuilder/qmake.inc.in
+@@ -34,6 +34,9 @@ unix {
+ QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
+ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
+
++ QMAKE_CXXFLAGS_DEBUG += -D__STDC_FORMAT_MACROS
++ QMAKE_CXXFLAGS_RELEASE += -D__STDC_FORMAT_MACROS
++
+ exec_prefix = @EXEC_PREFIX@
+ DESTDIR =
+
+diff --git a/src/libfwbuilder/src/fwbuilder/uint128.h b/src/libfwbuilder/src/fwbuilder/uint128.h
+index 0a2e7a4..b00ab47 100644
+--- a/src/libfwbuilder/src/fwbuilder/uint128.h
++++ b/src/libfwbuilder/src/fwbuilder/uint128.h
+@@ -36,7 +36,7 @@
+
+ #include <stdio.h>
+
+-#define __STDC_FORMAT_MACROS
++// #define __STDC_FORMAT_MACROS
+ #include <inttypes.h> // for sprintf formats for "long long"
+
+ // convinience macro
+
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch b/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch
new file mode 100644
index 000000000000..c909028467a8
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.1.0.3599-gcc47.patch
@@ -0,0 +1,11 @@
+diff -ruN fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h
+--- fwbuilder-5.1.0.3599.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-03-23 07:10:54.000000000 +0100
++++ fwbuilder-5.1.0.3599/src/libfwbuilder/src/fwbuilder/ThreadTools.h 2012-06-27 02:33:32.122340892 +0200
+@@ -31,6 +31,7 @@
+
+ #include <time.h> //for time_t definition
+ #include <pthread.h>
++#include <unistd.h>
+
+ #include <string>
+ #include <queue>