[Pkg-javascript-commits] [pdf.js] 106/109: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Sep 25 03:04:24 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 f883b613144a4b5a07f4091b236a90b406407b4b
Author: David Prévot <david at tilapin.org>
Date: Thu Sep 24 19:01:56 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-No-embedded-PDF.patch | 6 ++---
...0002-Fix-build-versions-in-generated-file.patch | 6 ++---
...move-ShellJS-copy-and-use-the-NPM-version.patch | 2 +-
.../0013-Set-TZ-UTC-before-calls-to-zip.patch | 26 ----------------------
...loud-specific-loading-of-the-pdf-document.patch | 4 ++--
.../0005-adjust-close-button-position.patch | 2 +-
.../ownCloud/0006-open-buttons-removed.patch | 4 ++--
...e-PDF-viewer-working-again-in-public-view.patch | 4 ++--
...ead-of-encode-because-we-need-to-pass-HTM.patch | 4 ++--
.../ownCloud/0009-URL-encode-needed-values.patch | 4 ++--
...010-Build-ownCloud-specific-version-in-oc.patch | 2 +-
.../ownCloud/0011-Drop-attachment-feature.patch | 12 +++++-----
debian/patches/series | 1 -
13 files changed, 25 insertions(+), 52 deletions(-)
diff --git a/debian/patches/0001-No-embedded-PDF.patch b/debian/patches/0001-No-embedded-PDF.patch
index b8e4948..f24c30c 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 b35b68e..4512a29 100644
+index ec944f3..0d61b78 100644
--- a/make.js
+++ b/make.js
-@@ -137,7 +137,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 b35b68e..4512a29 100644
['external/bcmaps/*', GENERIC_DIR + '/web/cmaps/'],
['web/locale', GENERIC_DIR + '/web']
],
-@@ -661,7 +660,6 @@ target.minified = function() {
+@@ -660,7 +659,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 208cb20..54d2816 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 4512a29..ab8376e 100644
+index 0d61b78..790ae24 100644
--- a/make.js
+++ b/make.js
-@@ -493,8 +493,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 4512a29..ab8376e 100644
crlfchecker.checkIfCrlfIsPresent(SRC_FILES);
-@@ -735,14 +734,7 @@ target.buildnumber = function() {
+@@ -734,14 +733,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 2e7d8f0..7ead336 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 ad145eb..07bb5ed 100644
+index 2e885e6..29adad4 100644
--- a/make.js
+++ b/make.js
@@ -20,14 +20,7 @@
diff --git a/debian/patches/0013-Set-TZ-UTC-before-calls-to-zip.patch b/debian/patches/0013-Set-TZ-UTC-before-calls-to-zip.patch
deleted file mode 100644
index 2a8f9ac..0000000
--- a/debian/patches/0013-Set-TZ-UTC-before-calls-to-zip.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Dhole <dhole at openmailbox.org>
-Date: Tue, 21 Jul 2015 16:29:12 +0200
-Subject: Set TZ=UTC before calls to zip
-
-This change allows to make the package build reproducible.
-
-Bug-Debian: https://bugs.debian.org/793127
-Forwarded: https://github.com/mozilla/pdf.js/pull/6402
----
- make.js | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/make.js b/make.js
-index 07bb5ed..f45a693 100644
---- a/make.js
-+++ b/make.js
-@@ -845,6 +845,9 @@ target.firefox = function() {
- sed('-i', /.*PDFJS_SUPPORTED_LOCALES.*\n/, chromeManifest,
- FIREFOX_BUILD_DIR + '/chrome.manifest');
-
-+ // Set timezone to UTC before calling zip to get reproducible results.
-+ process.env.TZ = 'UTC';
-+
- // Create the xpi
- cd(FIREFOX_BUILD_DIR);
- exec('zip -r ' + FIREFOX_EXTENSION_NAME + ' ' +
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 bf2c06c..a9f3fce 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,10 +8,10 @@ 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 cbeda49..356018a 100644
+index 514e0c3..d7972c2 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1486,7 +1486,8 @@ function webViewerInitialized() {
+@@ -1495,7 +1495,8 @@ function webViewerInitialized() {
}
if (file) {
diff --git a/debian/patches/ownCloud/0005-adjust-close-button-position.patch b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
index 01a083b..d134876 100644
--- a/debian/patches/ownCloud/0005-adjust-close-button-position.patch
+++ b/debian/patches/ownCloud/0005-adjust-close-button-position.patch
@@ -8,7 +8,7 @@ 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 04bbc1e..4656312 100644
+index a6e1dc3..da3dae9 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -503,7 +503,7 @@ html[dir='ltr'] #toolbarViewerRight,
diff --git a/debian/patches/ownCloud/0006-open-buttons-removed.patch b/debian/patches/ownCloud/0006-open-buttons-removed.patch
index 2f09d2b..b99403b 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 356018a..4d9b80d 100644
+index d7972c2..46f49a2 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1449,9 +1449,6 @@ function webViewerInitialized() {
+@@ -1458,9 +1458,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 028fca7..8bfc667 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 4d9b80d..b361f9d 100644
+index 46f49a2..a5f7e5a 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1482,9 +1482,13 @@ function webViewerInitialized() {
+@@ -1491,9 +1491,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 a540a60..2d280ec 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 b361f9d..cd429f5 100644
+index a5f7e5a..f9a7f32 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1485,10 +1485,10 @@ function webViewerInitialized() {
+@@ -1494,10 +1494,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 2e67687..50f0d6b 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 cd429f5..b0f8c39 100644
+index f9a7f32..2294548 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1484,11 +1484,11 @@ function webViewerInitialized() {
+@@ -1493,11 +1493,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 bca0415..16b597f 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 ab8376e..ad145eb 100644
+index 790ae24..2e885e6 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 4637092..728088d 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 b0f8c39..3a0db64 100644
+index 2294548..6627fa2 100644
--- a/web/viewer.js
+++ b/web/viewer.js
-@@ -1027,7 +1027,6 @@ var PDFViewerApplication = {
+@@ -1033,7 +1033,6 @@ var PDFViewerApplication = {
thumbsButton.classList.add('toggled');
outlineButton.classList.remove('toggled');
@@ -19,16 +19,16 @@ index b0f8c39..3a0db64 100644
thumbsView.classList.remove('hidden');
outlineView.classList.add('hidden');
attachmentsView.classList.add('hidden');
-@@ -1042,7 +1041,6 @@ var PDFViewerApplication = {
- case 'outline':
+@@ -1051,7 +1050,6 @@ var PDFViewerApplication = {
+ }
thumbsButton.classList.remove('toggled');
outlineButton.classList.add('toggled');
- attachmentsButton.classList.remove('toggled');
thumbsView.classList.add('hidden');
outlineView.classList.remove('hidden');
attachmentsView.classList.add('hidden');
-@@ -1401,11 +1399,6 @@ function webViewerInitialized() {
- PDFViewerApplication.switchSidebarView('outline');
+@@ -1410,11 +1408,6 @@ function webViewerInitialized() {
+ PDFViewerApplication.outline.toggleOutlineTree();
});
- document.getElementById('viewAttachments').addEventListener('click',
diff --git a/debian/patches/series b/debian/patches/series
index d2456eb..900b797 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
0002-Fix-build-versions-in-generated-file.patch
0003-Add-adobe-CMaps.patch
0012-Revert-Remove-ShellJS-copy-and-use-the-NPM-version.patch
-0013-Set-TZ-UTC-before-calls-to-zip.patch
--
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