diff options
author | Maho Nakata <maho@FreeBSD.org> | 2008-03-07 21:56:45 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2008-03-07 21:56:45 +0000 |
commit | 04c84963bbe2c6b99ff121fc2a685724bd7805fc (patch) | |
tree | 162b18af6b50f6a75356b5e18ae4485170e4e9b5 | |
parent | Add MOVED entries for recentely removed XFree86-4 ports. (diff) |
Mute "paperconf not found error".
Submitted by: jkim
Notes
Notes:
svn path=/head/; revision=208628
-rw-r--r-- | editors/openoffice-3-devel/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice-3/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-2-RC/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-2-devel/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-2/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-3/files/patch-i86558 | 18 | ||||
-rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i86558 | 18 |
9 files changed, 162 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i86558 b/editors/openoffice-3-devel/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice-3/files/patch-i86558 b/editors/openoffice-3/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice-3/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-2-RC/files/patch-i86558 b/editors/openoffice.org-2-RC/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-2-devel/files/patch-i86558 b/editors/openoffice.org-2-devel/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-2/files/patch-i86558 b/editors/openoffice.org-2/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-3-RC/files/patch-i86558 b/editors/openoffice.org-3-RC/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-3-devel/files/patch-i86558 b/editors/openoffice.org-3-devel/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-3/files/patch-i86558 b/editors/openoffice.org-3/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { diff --git a/editors/openoffice.org-vcltesttool/files/patch-i86558 b/editors/openoffice.org-vcltesttool/files/patch-i86558 new file mode 100644 index 000000000000..ff723e835f09 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i86558 @@ -0,0 +1,18 @@ +--- psprint/source/printer/printerinfomanager.cxx.orig 2007-12-12 09:56:19.000000000 -0500 ++++ psprint/source/printer/printerinfomanager.cxx 2008-02-28 17:46:34.000000000 -0500 +@@ -145,12 +145,12 @@ + bool bSuccess = false; + + // try libpaper +- #ifdef SOLARIS ++ #ifdef LINUX + // #i78617# workaround missing paperconf command; on e.g. Linux + // the 2>/dev/null works on the started shell also +- FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); +- #else + FILE* pPipe = popen( "paperconf 2>/dev/null", "r" ); ++ #else ++ FILE* pPipe = popen( "sh -c paperconf 2>/dev/null", "r" ); + #endif + if( pPipe ) + { |