aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-07-23 11:51:42 +0800
committermarcus <marcus@FreeBSD.org>2003-07-23 11:51:42 +0800
commit2e701d3064ce9817b38a1219061375be8a9552fc (patch)
tree92624bc4d4cf7500379a26ab3ed04030a517204c
parent4a340a4a12993a84ca851ae772127ce7b8ed8078 (diff)
downloadfreebsd-ports-gnome-2e701d3064ce9817b38a1219061375be8a9552fc.tar.gz
freebsd-ports-gnome-2e701d3064ce9817b38a1219061375be8a9552fc.tar.zst
freebsd-ports-gnome-2e701d3064ce9817b38a1219061375be8a9552fc.zip
Fix some other build problems with GCC 3.3.1. Since these patches affect
headers used by dependents, bump PORTREVISION. Submitted by: Alexander Nedotsukov <bland@mail.ru>
-rw-r--r--devel/orbitcpp/Makefile2
-rw-r--r--devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h26
-rw-r--r--devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h20
-rw-r--r--devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h27
4 files changed, 72 insertions, 3 deletions
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index 62a76eefee7a..6fa3133fb032 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= orbitcpp
PORTVERSION= 1.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
new file mode 100644
index 000000000000..e8038e512f6b
--- /dev/null
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_compound_seq.h
@@ -0,0 +1,26 @@
+--- orbitcpp/orb-cpp/orbitcpp_compound_seq.h.orig Fri May 30 02:10:38 2003
++++ orbitcpp/orb-cpp/orbitcpp_compound_seq.h Wed Jul 23 10:56:18 2003
+@@ -70,6 +70,7 @@
+ typename SeqTraits::c_value_t,
+ typename SeqTraits::c_seq_t>
+ {
++ public:
+ typedef SeqTraits traits_t;
+ typedef typename traits_t::value_t value_t;
+ typedef typename traits_t::c_value_t c_value_t;
+@@ -126,6 +127,7 @@
+ template<typename CPPElem, typename SeqTraits=typename CPPElem::SeqTraits>
+ class CompoundUnboundedSeq: public CompoundSeqBase<CPPElem, SeqTraits>
+ {
++ public:
+ typedef SeqTraits traits_t;
+ typedef typename traits_t::c_value_t c_value_t;
+ typedef typename traits_t::c_seq_t c_seq_t;
+@@ -186,6 +188,7 @@
+ template<typename CPPElem, CORBA::ULong max, typename SeqTraits=typename CPPElem::SeqTraits>
+ class CompoundBoundedSeq: public CompoundSeqBase<CPPElem, SeqTraits>
+ {
++ public:
+ typedef SeqTraits traits_t;
+ typedef typename traits_t::value_t value_t;
+ typedef typename traits_t::c_elem_t c_value_t;
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
index 5b9029d876c7..57dc49bd1e07 100644
--- a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_simple_seq.h
@@ -1,5 +1,5 @@
---- orbitcpp/orb-cpp/orbitcpp_simple_seq.h.orig Wed Jul 23 10:12:57 2003
-+++ orbitcpp/orb-cpp/orbitcpp_simple_seq.h Wed Jul 23 10:15:59 2003
+--- orbitcpp/orb-cpp/orbitcpp_simple_seq.h.orig Fri May 30 02:10:38 2003
++++ orbitcpp/orb-cpp/orbitcpp_simple_seq.h Wed Jul 23 10:56:55 2003
@@ -35,6 +35,7 @@
class SimpleSeqBase: public SequenceBase <typename Traits::value_t,
typename Traits::c_value_t, typename Traits::c_seq_t>
@@ -8,3 +8,19 @@
typedef Traits traits_t;
typedef typename Traits::value_t value_t;
typedef typename traits_t::c_value_t c_value_t;
+@@ -91,6 +92,7 @@
+ template<class Traits>
+ class SimpleUnboundedSeq: public SimpleSeqBase<Traits>
+ {
++ public:
+ typedef SimpleSeqBase<Traits> Super;
+
+ typedef typename Super::size_t size_t;
+@@ -145,6 +147,7 @@
+ template<class Traits, CORBA::ULong max>
+ class SimpleBoundedSeq: public SimpleSeqBase<Traits>
+ {
++ public:
+ typedef SimpleSeqBase<Traits> Super;
+
+ typedef typename Super::size_t size_t;
diff --git a/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
new file mode 100644
index 000000000000..c05da7a2696a
--- /dev/null
+++ b/devel/orbitcpp/files/patch-orbitcpp::orb-cpp::orbitcpp_string_seq.h
@@ -0,0 +1,27 @@
+--- orbitcpp/orb-cpp/orbitcpp_string_seq.h.orig Wed Jul 23 10:57:57 2003
++++ orbitcpp/orb-cpp/orbitcpp_string_seq.h Wed Jul 23 10:58:52 2003
+@@ -35,7 +35,7 @@
+ class StringSeqBase: public SequenceBase <CORBA::String_mgr,
+ CORBA_char*, CORBA_sequence_CORBA_string>
+ {
+- protected:
++ public:
+ typedef CORBA::String_mgr value_t;
+ typedef CORBA_char* c_value_t;
+ typedef CORBA_sequence_CORBA_string c_seq_t;
+@@ -90,6 +90,7 @@
+
+ class StringUnboundedSeq: public StringSeqBase
+ {
++ public:
+ typedef StringSeqBase Super;
+
+ typedef Super::size_t size_t;
+@@ -145,6 +146,7 @@
+ template<CORBA::ULong max>
+ class StringBoundedSeq: public StringSeqBase
+ {
++ public:
+ typedef StringSeqBase Super;
+
+ typedef Super::size_t size_t;