From 8f10fdf81a4da1a534cb5bf8c9e7f939fe741526 Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Fri, 29 Aug 2003 22:17:57 +0000 Subject: [PATCH] - Fix build on -current (embedded newlines) PR: 56158 Submitted by: Michael Edenfield --- x11-fm/ezfm/files/patch-ad | 68 +++++++++++++++++++++++++++++++++++--- x11-fm/ezfm/files/patch-ag | 16 +++++++++ x11-fm/ezfm/files/patch-ah | 15 +++++++++ 3 files changed, 95 insertions(+), 4 deletions(-) create mode 100644 x11-fm/ezfm/files/patch-ag create mode 100644 x11-fm/ezfm/files/patch-ah diff --git a/x11-fm/ezfm/files/patch-ad b/x11-fm/ezfm/files/patch-ad index 7cb5e651c081..8c834c523fd6 100644 --- a/x11-fm/ezfm/files/patch-ad +++ b/x11-fm/ezfm/files/patch-ad @@ -1,11 +1,71 @@ ---- main.c Mon Jun 29 19:02:41 1998 -+++ /home/andy/tmp/wrk/main.c Thu Jul 30 11:22:42 1998 -@@ -65,7 +65,7 @@ +--- main.c.orig Thu Oct 7 16:06:48 1999 ++++ main.c Fri Aug 29 17:40:40 2003 +@@ -84,41 +84,41 @@ */ static char *fallbackResources = /* initialization file name */ -"ezfm*ezfmrc: ezfmrc:~/.ezfmrc:/etc/ezfmrc:/usr/lib/ezfm/ezfmrc:/usr/local/lib/ezfm/ezfmrc -+"ezfm*ezfmrc: ezfmrc:~/.ezfmrc:/etc/ezfmrc:/usr/X11R6/share/ezfm/ezfmrc:/usr/local/lib/ezfm/ezfmrc ++"ezfm*ezfmrc: ezfmrc:~/.ezfmrc:/etc/ezfmrc:/usr/X11R6/share/ezfm/ezfmrc:/usr/local/lib/ezfm/ezfmrc\n\ " /* fonts used in display items */ +-" +-ezfm*itemMediumFont: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-* +-ezfm*itemSlantFont: -*-helvetica-medium-o-*-*-12-*-*-*-*-*-*-* +-ezfm*itemBoldFont: -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-* +-ezfm*itemBoldSlantFont: -*-helvetica-bold-o-*-*-12-*-*-*-*-*-*-* ++"\ ++ezfm*itemMediumFont: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemSlantFont: -*-helvetica-medium-o-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemBoldFont: -*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*itemBoldSlantFont: -*-helvetica-bold-o-*-*-12-*-*-*-*-*-*-*\n\ " + /* default font for entries/textWidgets (fixed width font)*/ +-" +-ezfm*textFont: -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-* +-ezfm*textBoldFont: -*-lucidatypewriter-bold-r-*-*-14-*-*-*-*-*-*-* ++"\ ++ezfm*textFont: -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-*\n\ ++ezfm*textBoldFont: -*-lucidatypewriter-bold-r-*-*-14-*-*-*-*-*-*-*\n\ + " + /* default font for button labels */ +-" +-ezfm*labelMediumFont: -adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-* +-ezfm*labelBoldFont: -adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-* +-ezfm*labelLargeFont: -adobe-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-* +-ezfm*labelSmallFont: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-* ++"\ ++ezfm*labelMediumFont: -adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*\n\ ++ezfm*labelBoldFont: -adobe-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*\n\ ++ezfm*labelLargeFont: -adobe-helvetica-bold-r-normal-*-*-180-*-*-*-*-*-*\n\ ++ezfm*labelSmallFont: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*\n\ + " + /* background colors */ +-" +-!!! text background for folders +-!*.textBackground: white +- +-!!! background for bubble help +-*bubble.background: yellow +- +-!!! selection background +-*selectionBackground: yellow +- +-!!! +-*HighlightMode: 2 +-ezfm.backingStore: 1 ++"\ ++!!! text background for folders\n\ ++!*.textBackground: white\n\ ++\n\ ++!!! background for bubble help\n\ ++*bubble.background: yellow\n\ ++\n\ ++!!! selection background\n\ ++*selectionBackground: yellow\n\ ++\n\ ++!!!\n\ ++*HighlightMode: 2\n\ ++ezfm.backingStore: 1\n\ + " + ; + diff --git a/x11-fm/ezfm/files/patch-ag b/x11-fm/ezfm/files/patch-ag new file mode 100644 index 000000000000..c750d6555089 --- /dev/null +++ b/x11-fm/ezfm/files/patch-ag @@ -0,0 +1,16 @@ +--- aboutEZFM.h.orig Fri Aug 29 17:42:25 2003 ++++ aboutEZFM.h Fri Aug 29 17:42:55 2003 +@@ -24,9 +24,9 @@ + *************************************************************************/ + + static char *ezfmInfoString = +-" +- Copyright (C) 1998 Maorong Zou +- +- Please report bugs to Maorong Zou ++"\n\ ++ Copyright (C) 1998 Maorong Zou\n\ ++\n\ ++ Please report bugs to Maorong Zou \n\ + "; + diff --git a/x11-fm/ezfm/files/patch-ah b/x11-fm/ezfm/files/patch-ah new file mode 100644 index 000000000000..7da9de250f09 --- /dev/null +++ b/x11-fm/ezfm/files/patch-ah @@ -0,0 +1,15 @@ +--- transparent.c.orig Fri Aug 29 17:47:44 2003 ++++ transparent.c Fri Aug 29 17:48:01 2003 +@@ -417,9 +417,9 @@ + } + /********************************************************************************/ + static char *transparentResource = +-" +-*tileOrigin: 2 0 0 +-*fileIcon.labeledIcon: 3 ++"\n\ ++*tileOrigin: 2 0 0\n\ ++*fileIcon.labeledIcon: 3\n\ + " + ; + /********************************************************************************/