[Pkg-javascript-commits] [pdf.js] 171/174: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Thu Nov 19 18:45:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 4e0e75a007ee99d956a8a7ab0c3c8f0dff545e87
Author: David Prévot <david at tilapin.org>
Date: Thu Nov 19 12:40:28 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-No-embedded-PDF.patch | 4 ++--
debian/patches/0002-Fix-build-versions-in-generated-file.patch | 6 +++---
.../0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch | 2 +-
.../0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch | 6 +++---
debian/patches/ownCloud/0005-adjust-close-button-position.patch | 4 ++--
debian/patches/ownCloud/0006-open-buttons-removed.patch | 4 ++--
.../0007-Make-PDF-viewer-working-again-in-public-view.patch | 4 ++--
...008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch | 4 ++--
debian/patches/ownCloud/0009-URL-encode-needed-values.patch | 4 ++--
.../ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch | 2 +-
debian/patches/ownCloud/0011-Drop-attachment-feature.patch | 8 ++++----
11 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index f24c30c..00fe3ef 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/make.js b/make.js
-index ec944f3..0d61b78 100644
+index 0525499..860efd0 100644
--- a/make.js
+++ b/make.js
@@ -136,7 +136,6 @@ target.generic = function() {
@@ -24,7 +24,7 @@ index ec944f3..0d61b78 100644
['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
['web/locale', GENERIC_DIR + '/web']
],
-@@ -660,7 +659,6 @@ target.minified = function() {
+@@ -663,7 +662,6 @@ target.minified = function() {
defines: defines,
copy: [
[COMMON_WEB_FILES, MINIFIED_DIR + '/web'],
diff --git a/debian/patches/0002-Fix-build-versions-in-generated-file.patch b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
index 54d2816..2f5f51a 100644
--- a/debian/patches/0002-Fix-build-versions-in-generated-file.patch
+++ b/debian/patches/0002-Fix-build-versions-in-generated-file.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/make.js b/make.js
-index 0d61b78..790ae24 100644
+index 860efd0..505445c 100644
--- a/make.js
+++ b/make.js
-@@ -492,8 +492,7 @@ target.bundle = function(args) {
+@@ -495,8 +495,7 @@ target.bundle = function(args) {
var bundleContent = cat(SRC_FILES),
bundleVersion = VERSION,
@@ -26,7 +26,7 @@ index 0d61b78..790ae24 100644
crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
-@@ -734,14 +733,7 @@ target.buildnumber = function() {
+@@ -737,14 +736,7 @@ target.buildnumber = function() {
echo();
echo('### Getting extension build number');
diff --git a/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch b/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
index 7ead336..01220dd 100644
--- a/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
+++ b/debian/patches/0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
@@ -2558,7 +2558,7 @@ index 0000000..f0cd236
+ return writePermission;
+}
diff --git a/make.js b/make.js
-index 2e885e6..29adad4 100644
+index 4545fff..44e1138 100644
--- a/make.js
+++ b/make.js
@@ -20,14 +20,7 @@
diff --git a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
index a9f3fce..02bc215 100644
--- a/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
+++ b/debian/patches/ownCloud/0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch
@@ -8,14 +8,14 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f58e37a8ffadf
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 514e0c3..d7972c2 100644
+index 2f1fe59..fc4f9e7 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1495,7 +1495,8 @@ function webViewerInitialized() {
+@@ -1598,7 +1598,8 @@ function webViewerInitialized() {
}
if (file) {
-- PDFViewerApplication.open(file, 0);
+- PDFViewerApplication.open(file);
+ // owncould customization to load file from files app
+ PDFViewerApplication.open(OC.linkTo('files', 'ajax/download.php')+"?files="+encodeURIComponent(window.file)+"&dir="+encodeURIComponent(window.dir), 1.0);
}
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
index d134876..2e11273 100644
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f7c625773b621
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/viewer.css b/web/viewer.css
-index a6e1dc3..da3dae9 100644
+index b012631..b3a1e64 100644
--- a/web/viewer.css
+++ b/web/viewer.css
-@@ -503,7 +503,7 @@ html[dir='ltr'] #toolbarViewerRight,
+@@ -509,7 +509,7 @@ html[dir='ltr'] #toolbarViewerRight,
html[dir='rtl'] #toolbarViewerLeft {
position: absolute;
top: 0;
diff --git a/debian/patches/ownCloud/0006-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
index b99403b..d684f1e 100644
--- a/debian/patches/ownCloud/0006-open-buttons-removed.patch
+++ b/debian/patches/ownCloud/0006-open-buttons-removed.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/71ab97f9b074c
1 file changed, 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index d7972c2..46f49a2 100644
+index fc4f9e7..61b9bc5 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1458,9 +1458,6 @@ function webViewerInitialized() {
+@@ -1561,9 +1561,6 @@ function webViewerInitialized() {
document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
diff --git a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
index 8bfc667..5944975 100644
--- a/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
+++ b/debian/patches/ownCloud/0007-Make-PDF-viewer-working-again-in-public-view.patch
@@ -14,10 +14,10 @@ origin: vendor,
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 46f49a2..a5f7e5a 100644
+index 61b9bc5..770655f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1491,9 +1491,13 @@ function webViewerInitialized() {
+@@ -1594,9 +1594,13 @@ function webViewerInitialized() {
return;
}
diff --git a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
index 2d280ec..0c3782f 100644
--- a/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
+++ b/debian/patches/ownCloud/0008-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch
@@ -8,10 +8,10 @@ origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/9f1fcd2d1a18e
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index a5f7e5a..f9a7f32 100644
+index 770655f..43717ff 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1494,10 +1494,10 @@ function webViewerInitialized() {
+@@ -1597,10 +1597,10 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
// Logged in
diff --git a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
index 50f0d6b..230195a 100644
--- a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
+++ b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
@@ -21,10 +21,10 @@ origin: vendor,
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index f9a7f32..2294548 100644
+index 43717ff..b1fa87a 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1493,11 +1493,11 @@ function webViewerInitialized() {
+@@ -1596,11 +1596,11 @@ function webViewerInitialized() {
// owncould customization to load file
if (file && dir !== '') {
diff --git a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
index 16b597f..33b6ff0 100644
--- a/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
+++ b/debian/patches/ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.js b/make.js
-index 790ae24..2e885e6 100644
+index 505445c..4545fff 100644
--- a/make.js
+++ b/make.js
@@ -41,7 +41,7 @@ var BUILD_NUMBER,
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index 728088d..9c96a69 100644
--- a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
+++ b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
@@ -8,10 +8,10 @@ ownCloud currently seems to choke on it.
1 file changed, 7 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 2294548..6627fa2 100644
+index b1fa87a..50b4b63 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1033,7 +1033,6 @@ var PDFViewerApplication = {
+@@ -1136,7 +1136,6 @@ var PDFViewerApplication = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -19,7 +19,7 @@ index 2294548..6627fa2 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1051,7 +1050,6 @@ var PDFViewerApplication = {
+@@ -1154,7 +1153,6 @@ var PDFViewerApplication = {
}
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
@@ -27,7 +27,7 @@ index 2294548..6627fa2 100644
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1410,11 +1408,6 @@ function webViewerInitialized() {
+@@ -1513,11 +1511,6 @@ function webViewerInitialized() {
PDFViewerApplication.outline.toggleOutlineTree();
});
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list