[SCM] qtwebkit-examples packaging branch, master, updated. debian/5.7.1-20161021-2-8-gf3e98ba

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebkit-examples.git;a=commitdiff;h=767ebc3

The following commit has been merged in the master branch:
commit 767ebc3b7057914143b1c59b17ddcb4042d4c46e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jan 4 21:19:29 2017 +0300

    Use packaged jQuery properly (packaged_jquery.diff).
---
 debian/changelog                    |  1 +
 debian/patches/packaged_jquery.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cc1f785..4f464f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtwebkit-examples-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
   * Migrate to an automatic dbgsym package.
   * Drop unused pkg-kde-tools build-dependency.
   * Update debian/copyright.
+  * Use packaged jQuery properly (packaged_jquery.diff).
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 04 Jan 2017 20:06:01 +0300
 
diff --git a/debian/patches/packaged_jquery.diff b/debian/patches/packaged_jquery.diff
new file mode 100644
index 0000000..9a8667e
--- /dev/null
+++ b/debian/patches/packaged_jquery.diff
@@ -0,0 +1,26 @@
+Description: update to use packaged jQuery
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2017-01-04
+
+--- a/examples/webkitwidgets/fancybrowser/fancybrowser.pro
++++ b/examples/webkitwidgets/fancybrowser/fancybrowser.pro
+@@ -2,7 +2,6 @@
+ HEADERS =   mainwindow.h
+ SOURCES =   main.cpp \
+             mainwindow.cpp
+-RESOURCES = jquery.qrc
+ 
+ # install
+ target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/fancybrowser
+--- a/examples/webkitwidgets/fancybrowser/mainwindow.cpp
++++ b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
+@@ -50,7 +50,7 @@
+     progress = 0;
+ 
+     QFile file;
+-    file.setFileName(":/jquery.min.js");
++    file.setFileName("/usr/share/javascript/jquery/jquery.min.js");
+     file.open(QIODevice::ReadOnly);
+     jQuery = file.readAll();
+     jQuery.append("
var qt = { 'jQuery': jQuery.noConflict(true) };");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..51a2f1e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+packaged_jquery.diff

-- 
qtwebkit-examples packaging