[Pkg-javascript-commits] [pdf.js] 115/119: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Wed May 13 21:27:49 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 c80637b1643deacde6b7d1d25f46a7e4985bd7a6
Author: David Prévot <david at tilapin.org>
Date: Wed May 13 16:01:33 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-No-embedded-PDF.patch | 6 +++---
debian/patches/0002-Fix-build-versions-in-generated-file.patch | 6 +++---
.../0004-fix-ownCloud-specific-loading-of-the-pdf-document.patch | 7 +++----
debian/patches/ownCloud/0005-adjust-close-button-position.patch | 5 ++---
debian/patches/ownCloud/0006-open-buttons-removed.patch | 5 ++---
.../0007-Make-PDF-viewer-working-again-in-public-view.patch | 9 ++++-----
...08-Decode-instead-of-encode-because-we-need-to-pass-HTM.patch | 5 ++---
debian/patches/ownCloud/0009-URL-encode-needed-values.patch | 7 +++----
.../ownCloud/0010-Build-ownCloud-specific-version-in-oc.patch | 5 ++---
debian/patches/ownCloud/0011-Drop-attachment-feature.patch | 9 ++++-----
10 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index 5d45b9a..6cd1183 100644
--- a/debian/patches/0001-No-embedded-PDF.patch
+++ b/debian/patches/0001-No-embedded-PDF.patch
@@ -13,10 +13,10 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/make.js b/make.js
-index ff4c151..e3e3053 100644
+index 0c8380c..8ed0d54 100644
--- a/make.js
+++ b/make.js
-@@ -129,7 +129,6 @@ target.generic = function() {
+@@ -136,7 +136,6 @@ target.generic = function() {
['LICENSE', GENERIC_DIR],
['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
['web/compatibility.js', GENERIC_DIR + '/web'],
@@ -24,7 +24,7 @@ index ff4c151..e3e3053 100644
['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
['web/locale', GENERIC_DIR + '/web']
],
-@@ -642,7 +641,6 @@ target.minified = function() {
+@@ -649,7 +648,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 ecb05c1..0195423 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 e3e3053..c84b0f1 100644
+index 8ed0d54..417f51d 100644
--- a/make.js
+++ b/make.js
-@@ -485,8 +485,7 @@ target.bundle = function(args) {
+@@ -492,8 +492,7 @@ target.bundle = function(args) {
var bundleContent = cat(SRC_FILES),
bundleVersion = VERSION,
@@ -26,7 +26,7 @@ index e3e3053..c84b0f1 100644
crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
-@@ -716,14 +715,7 @@ target.buildnumber = function() {
+@@ -723,14 +722,7 @@ target.buildnumber = function() {
echo();
echo('### Getting extension build number');
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 d722204..62eec6e 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
@@ -3,18 +3,17 @@ Date: Wed, 26 Mar 2014 15:34:25 +0100
Subject: fix ownCloud specific loading of the pdf document
origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f58e37a8ffadfaf4fac893b87987e83efe6963ec
-Gbp: Topic ownCloud
---
web/viewer.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 2071773..fb37dcc 100644
+index 6a6389f..40ea197 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1692,7 +1692,8 @@ function webViewerInitialized() {
+@@ -1658,7 +1658,8 @@ function webViewerInitialized() {
+ }
- //#if !B2G && !CHROME
if (file) {
- PDFViewerApplication.open(file, 0);
+ // owncould customization to load file from files app
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
index 780103c..1089e03 100644
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -3,16 +3,15 @@ Date: Wed, 26 Mar 2014 15:35:18 +0100
Subject: adjust close button position
origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/f7c625773b621bedff4fd9e18fd7c01d34f3b871
-Gbp: Topic ownCloud
---
web/viewer.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/viewer.css b/web/viewer.css
-index 4432b30..0f10891 100644
+index c248633..394eb88 100644
--- a/web/viewer.css
+++ b/web/viewer.css
-@@ -499,7 +499,7 @@ html[dir='ltr'] #toolbarViewerRight,
+@@ -503,7 +503,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 335fb05..c4afad8 100644
--- a/debian/patches/ownCloud/0006-open-buttons-removed.patch
+++ b/debian/patches/ownCloud/0006-open-buttons-removed.patch
@@ -3,16 +3,15 @@ Date: Thu, 27 Mar 2014 12:41:24 +0100
Subject: open buttons removed
origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/71ab97f9b074c6128bff6f1b1690e7f52571f529
-Gbp: Topic ownCloud
---
web/viewer.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index fb37dcc..1da25d5 100644
+index 40ea197..a248b92 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1653,9 +1653,6 @@ function webViewerInitialized() {
+@@ -1621,9 +1621,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 8590bb8..49da3b3 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
@@ -9,19 +9,18 @@ Add support for public URL
origin: vendor,
https://github.com/owncloud/files_pdfviewer/commit/fc53d5709d69a61f1f5481107fa9f1166f406245
https://github.com/owncloud/files_pdfviewer/commit/524db159f67d11fb42d4118173381600ca2de4ab
-Gbp: Topic ownCloud
---
web/viewer.js | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 1da25d5..852673d 100644
+index a248b92..629d3fc 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1688,9 +1688,13 @@ function webViewerInitialized() {
- //#endif
+@@ -1654,9 +1654,13 @@ function webViewerInitialized() {
+ return;
+ }
- //#if !B2G && !CHROME
- if (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/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 3dc9711..a4c29a9 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
@@ -3,16 +3,15 @@ Date: Tue, 17 Jun 2014 23:05:28 +0200
Subject: Decode instead of encode because we need to pass HTML values
origin: vendor, https://github.com/owncloud/files_pdfviewer/commit/9f1fcd2d1a18e5ef8aa1fde24e99e4fc43dfd1bf
-Gbp: Topic ownCloud
---
web/viewer.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 852673d..e4da3a1 100644
+index 629d3fc..f0c819f 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1691,10 +1691,10 @@ function webViewerInitialized() {
+@@ -1657,10 +1657,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 f372811..91690c1 100644
--- a/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
+++ b/debian/patches/ownCloud/0009-URL-encode-needed-values.patch
@@ -16,17 +16,16 @@ Bug-ownCloud: https://github.com/owncloud/files_pdfviewer/issues/11
origin: vendor,
https://github.com/owncloud/files_pdfviewer/commit/ac7560cc0fcb17e18fb48bf32347dd8fb3b96b8c
https://github.com/owncloud/files_pdfviewer/commit/fd0ed34d9c10c14b8bc4c99c1ec6370c738bec7f
-Gbp: Topic ownCloud
---
web/viewer.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index e4da3a1..6711fc9 100644
+index f0c819f..de75134 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1690,11 +1690,11 @@ function webViewerInitialized() {
- //#if !B2G && !CHROME
+@@ -1656,11 +1656,11 @@ function webViewerInitialized() {
+
// owncould customization to load file
if (file && dir !== '') {
- // Logged in
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 2db0e0f..9b93c95 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
@@ -3,16 +3,15 @@ Date: Sun, 27 Jul 2014 15:49:22 -0400
Subject: Build ownCloud-specific version in oc
Forwarded: not-needed
-Gbp: Topic ownCloud
---
make.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.js b/make.js
-index c84b0f1..f10d5df 100644
+index 417f51d..fba367e 100644
--- a/make.js
+++ b/make.js
-@@ -34,7 +34,7 @@ var BUILD_NUMBER,
+@@ -41,7 +41,7 @@ var BUILD_NUMBER,
VERSION;
var ROOT_DIR = __dirname + '/', // absolute path to project's root
diff --git a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
index 85e282c..67e58a6 100644
--- a/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
+++ b/debian/patches/ownCloud/0011-Drop-attachment-feature.patch
@@ -3,16 +3,15 @@ Date: Sun, 27 Jul 2014 18:49:11 -0400
Subject: Drop attachment feature
ownCloud currently seems to choke on it.
-Gbp: Topic ownCloud
---
web/viewer.js | 7 -------
1 file changed, 7 deletions(-)
diff --git a/web/viewer.js b/web/viewer.js
-index 6711fc9..014ef7f 100644
+index de75134..3c1839a 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1215,7 +1215,6 @@ var PDFViewerApplication = {
+@@ -1229,7 +1229,6 @@ var PDFViewerApplication = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -20,7 +19,7 @@ index 6711fc9..014ef7f 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1230,7 +1229,6 @@ var PDFViewerApplication = {
+@@ -1244,7 +1243,6 @@ var PDFViewerApplication = {
case 'outline':
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
@@ -28,7 +27,7 @@ index 6711fc9..014ef7f 100644
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1607,11 +1605,6 @@ function webViewerInitialized() {
+@@ -1575,11 +1573,6 @@ function webViewerInitialized() {
PDFViewerApplication.switchSidebarView('outline');
});
--
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