mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-21 20:38:45 +00:00
Remove unneeded patch.
This commit is contained in:
parent
0be1727ef2
commit
e44e1d3968
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=126992
@ -199,10 +199,6 @@ FAKEDIR= ${WRKDIR}/fake
|
||||
CONFIGURE_ARGS+= --enable-reorder
|
||||
.endif
|
||||
|
||||
.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SMB)
|
||||
USE_GNOME+= gnomevfs2
|
||||
.else
|
||||
|
@ -1,42 +0,0 @@
|
||||
--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Sat Jul 24 23:59:16 2004
|
||||
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
|
||||
@@ -56,6 +56,12 @@
|
||||
#include "nsArray.h"
|
||||
#include "nsDataHashtable.h"
|
||||
|
||||
+#ifdef HAVE_CPP_2BYTE_WCHAR_T
|
||||
+ typedef nsDependentString nsLiteralString;
|
||||
+#else
|
||||
+ typedef NS_ConvertASCIItoUTF16 nsLiteralString;
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* \addtogroup libart_renderer Libart Rendering Engine
|
||||
* @{
|
||||
@@ -112,7 +118,7 @@
|
||||
nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
|
||||
|
||||
public:
|
||||
- static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
|
||||
+ static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
|
||||
};
|
||||
|
||||
/** @} */
|
||||
@@ -120,7 +126,7 @@
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGLibartGlyphMetricsFT implementation:
|
||||
|
||||
-nsDataHashtable<nsStringHashKey,const nsDependentString*>
|
||||
+nsDataHashtable<nsStringHashKey,const nsLiteralString*>
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases;
|
||||
|
||||
|
||||
@@ -406,7 +412,7 @@
|
||||
}
|
||||
else {
|
||||
// try alias if there is one:
|
||||
- const nsDependentString *alias = nsnull;
|
||||
+ const nsLiteralString *alias = nsnull;
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
|
||||
&alias);
|
||||
if (alias) {
|
@ -199,10 +199,6 @@ FAKEDIR= ${WRKDIR}/fake
|
||||
CONFIGURE_ARGS+= --enable-reorder
|
||||
.endif
|
||||
|
||||
.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SMB)
|
||||
USE_GNOME+= gnomevfs2
|
||||
.else
|
||||
|
@ -1,42 +0,0 @@
|
||||
--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Sat Jul 24 23:59:16 2004
|
||||
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
|
||||
@@ -56,6 +56,12 @@
|
||||
#include "nsArray.h"
|
||||
#include "nsDataHashtable.h"
|
||||
|
||||
+#ifdef HAVE_CPP_2BYTE_WCHAR_T
|
||||
+ typedef nsDependentString nsLiteralString;
|
||||
+#else
|
||||
+ typedef NS_ConvertASCIItoUTF16 nsLiteralString;
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* \addtogroup libart_renderer Libart Rendering Engine
|
||||
* @{
|
||||
@@ -112,7 +118,7 @@
|
||||
nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
|
||||
|
||||
public:
|
||||
- static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
|
||||
+ static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
|
||||
};
|
||||
|
||||
/** @} */
|
||||
@@ -120,7 +126,7 @@
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGLibartGlyphMetricsFT implementation:
|
||||
|
||||
-nsDataHashtable<nsStringHashKey,const nsDependentString*>
|
||||
+nsDataHashtable<nsStringHashKey,const nsLiteralString*>
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases;
|
||||
|
||||
|
||||
@@ -406,7 +412,7 @@
|
||||
}
|
||||
else {
|
||||
// try alias if there is one:
|
||||
- const nsDependentString *alias = nsnull;
|
||||
+ const nsLiteralString *alias = nsnull;
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
|
||||
&alias);
|
||||
if (alias) {
|
@ -199,10 +199,6 @@ FAKEDIR= ${WRKDIR}/fake
|
||||
CONFIGURE_ARGS+= --enable-reorder
|
||||
.endif
|
||||
|
||||
.if ${OSVERSION} < 500035 && !defined(WITH_CAIRO_RENDER)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nsSVGLibartGlyphMetricsFT.cpp
|
||||
.endif
|
||||
|
||||
.if defined(WITH_SMB)
|
||||
USE_GNOME+= gnomevfs2
|
||||
.else
|
||||
|
@ -1,42 +0,0 @@
|
||||
--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig Sat Jul 24 23:59:16 2004
|
||||
+++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp Sun Jul 25 00:04:20 2004
|
||||
@@ -56,6 +56,12 @@
|
||||
#include "nsArray.h"
|
||||
#include "nsDataHashtable.h"
|
||||
|
||||
+#ifdef HAVE_CPP_2BYTE_WCHAR_T
|
||||
+ typedef nsDependentString nsLiteralString;
|
||||
+#else
|
||||
+ typedef NS_ConvertASCIItoUTF16 nsLiteralString;
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* \addtogroup libart_renderer Libart Rendering Engine
|
||||
* @{
|
||||
@@ -112,7 +118,7 @@
|
||||
nsCOMPtr<nsISVGGlyphMetricsSource> mSource;
|
||||
|
||||
public:
|
||||
- static nsDataHashtable<nsStringHashKey,const nsDependentString*> sFontAliases;
|
||||
+ static nsDataHashtable<nsStringHashKey,const nsLiteralString*> sFontAliases;
|
||||
};
|
||||
|
||||
/** @} */
|
||||
@@ -120,7 +126,7 @@
|
||||
//----------------------------------------------------------------------
|
||||
// nsSVGLibartGlyphMetricsFT implementation:
|
||||
|
||||
-nsDataHashtable<nsStringHashKey,const nsDependentString*>
|
||||
+nsDataHashtable<nsStringHashKey,const nsLiteralString*>
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases;
|
||||
|
||||
|
||||
@@ -406,7 +412,7 @@
|
||||
}
|
||||
else {
|
||||
// try alias if there is one:
|
||||
- const nsDependentString *alias = nsnull;
|
||||
+ const nsLiteralString *alias = nsnull;
|
||||
nsSVGLibartGlyphMetricsFT::sFontAliases.Get(NS_ConvertUTF8toUCS2(family_name),
|
||||
&alias);
|
||||
if (alias) {
|
Loading…
Reference in New Issue
Block a user