mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-08 12:01:56 +00:00
Fix bad transfer url when tries to add extension.
PR: 127946 see also http://www.openoffice.org/issues/show_bug.cgi?id=98781 http://www.openoffice.org/issues/show_bug.cgi?id=82690 http://www.freebsd.org/cgi/query-pr.cgi?pr=127946 Submitted by : many
This commit is contained in:
parent
435576f64a
commit
b8aa0e6121
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=235820
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= openoffice.org
|
||||
PORTVERSION?= 2.4.${SNAPDATE}
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES+= editors java
|
||||
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
|
||||
http://openoffice.lunarshells.com/sources/ \
|
||||
|
@ -1,4 +1,8 @@
|
||||
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
also fixes
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
|
||||
@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
VtableSlot aVtableSlot(
|
||||
getVtableSlot(
|
||||
reinterpret_cast<
|
||||
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
||||
|
24
editors/openoffice.org-2-RC/files/patch-i98781
Normal file
24
editors/openoffice.org-2-RC/files/patch-i98781
Normal file
@ -0,0 +1,24 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= openoffice.org
|
||||
PORTVERSION?= 2.4.${SNAPDATE}
|
||||
PORTREVISION?= 6
|
||||
PORTREVISION?= 7
|
||||
PORTEPOCH?= 1
|
||||
CATEGORIES+= editors java
|
||||
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
|
||||
|
@ -1,4 +1,8 @@
|
||||
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
also fixes
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
|
||||
@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
VtableSlot aVtableSlot(
|
||||
getVtableSlot(
|
||||
reinterpret_cast<
|
||||
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
||||
|
24
editors/openoffice.org-2-devel/files/patch-i98781
Normal file
24
editors/openoffice.org-2-devel/files/patch-i98781
Normal file
@ -0,0 +1,24 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= openoffice.org
|
||||
PORTVERSION?= ${OOOVERSION}
|
||||
PORTREVISION?= 1
|
||||
PORTREVISION?= 2
|
||||
CATEGORIES+= editors java
|
||||
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
|
||||
http://openoffice.lunarshells.com/sources/ \
|
||||
|
@ -1,4 +1,8 @@
|
||||
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
also fixes
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
|
||||
@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
VtableSlot aVtableSlot(
|
||||
getVtableSlot(
|
||||
reinterpret_cast<
|
||||
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
||||
|
24
editors/openoffice.org-2/files/patch-i98781
Normal file
24
editors/openoffice.org-2/files/patch-i98781
Normal file
@ -0,0 +1,24 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME?= openoffice.org
|
||||
PORTVERSION?= 2.4.${SNAPDATE}
|
||||
PORTREVISION?= 6
|
||||
PORTREVISION?= 7
|
||||
PORTEPOCH?= 1
|
||||
CATEGORIES+= editors java
|
||||
MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
|
||||
|
@ -1,4 +1,8 @@
|
||||
Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
also fixes
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 16 Sep 2006 15:46:23 -0000 1.3
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx 8 Jan 2008 16:57:00 -0000
|
||||
@ -117,3 +121,25 @@ Merge from Linux CWS pj87 (#i83022#: Make bridges warning free)
|
||||
VtableSlot aVtableSlot(
|
||||
getVtableSlot(
|
||||
reinterpret_cast<
|
||||
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2008-02-04 22:43:50.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx 2009-06-13 21:41:29.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
||||
|
24
editors/openoffice.org-vcltesttool/files/patch-i98781
Normal file
24
editors/openoffice.org-vcltesttool/files/patch-i98781
Normal file
@ -0,0 +1,24 @@
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=98781
|
||||
http://www.openoffice.org/issues/show_bug.cgi?id=82690
|
||||
http://www.freebsd.org/cgi/query-pr.cgi?pr=127946
|
||||
|
||||
--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:53:52.000000000 +0900
|
||||
+++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 2009-06-14 07:56:37.000000000 +0900
|
||||
@@ -126,7 +126,7 @@
|
||||
};
|
||||
//__________________________________________________________________________________________________
|
||||
RTTI::RTTI() SAL_THROW( () )
|
||||
-#if __FreeBSD_version < 602103
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
: m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
|
||||
#else
|
||||
: m_hApp( dlopen( 0, RTLD_LAZY ) )
|
||||
@@ -165,7 +165,7 @@
|
||||
buf.append( 'E' );
|
||||
|
||||
OString symName( buf.makeStringAndClear() );
|
||||
-#if __FreeBSD_version < 602103 /* #i22253# */
|
||||
+#ifdef FREEBSD /* #i22253# */
|
||||
rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
|
||||
#else
|
||||
rtti = (type_info *)dlsym( m_hApp, symName.getStr() );
|
Loading…
x
Reference in New Issue
Block a user