components/gnome/evince/patches/evince-05-remove-newline.patch
author Rich Burridge <rich.burridge@oracle.com>
Mon, 25 Jan 2016 14:14:00 -0800
changeset 5327 e8b0f6b16632
permissions -rw-r--r--
PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland 22271989 Move evince and dependencies from Desktop to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5327
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     1
Patch taken from the Desktop consolidation.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     2
See BugDB CR #15768012
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     3
SUNBT7132463-SOLARIS_11U1 [evince] garbled character is pasted when copy&paste t
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     4
for more details.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     5
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     6
This patch will be sent upstream if the problem still exists in the latest
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     7
version of evince.
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     8
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
     9
diff -urN evince-2.30.3/backend/pdf/ev-poppler.cc ../SUNWgnome-pdf-viewer-2.30.3.hacked/evince-2.30.3/backend/pdf/ev-poppler.cc
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    10
--- evince-2.30.3/backend/pdf/ev-poppler.cc	2010-06-24 09:19:28.000000000 +0100
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    11
+++ ../SUNWgnome-pdf-viewer-2.30.3.hacked/evince-2.30.3/backend/pdf/ev-poppler.cc	2012-02-27 20:58:49.148832384 +0000
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    12
@@ -1990,6 +1990,8 @@
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    13
 					(PopplerSelectionStyle)style,
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    14
 					&r);
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    15
 
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    16
+	if (retval[strlen(retval)-1] == '\n')
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    17
+	  	retval[strlen(retval)-1] = '\0';
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    18
 	return retval;
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    19
 }
e8b0f6b16632 PSARC 2016/025 Move evince, poppler, poppler-data and libspectre to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset
    20