[openjfx] 03/04: Added a patch to link dynamically against ICU

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 9a9adfd889ea549a71b2309eaf9e441c523fc48d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 5 19:11:24 2015 +0200

    Added a patch to link dynamically against ICU
---
 debian/changelog                            |  1 +
 debian/patches/11-icu-dynamic-linking.patch | 14 ++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8170a0b..183eb43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openjfx (8u60-b27-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Build with qt5-qmake instead of qt4-qmake
     - New build dependency on ruby
+    - Added a patch to link dynamically against ICU
   * Depend on GStreamer 1.0 (Closes: #799280)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Sep 2015 23:40:56 +0200
diff --git a/debian/patches/11-icu-dynamic-linking.patch b/debian/patches/11-icu-dynamic-linking.patch
new file mode 100644
index 0000000..129cf56
--- /dev/null
+++ b/debian/patches/11-icu-dynamic-linking.patch
@@ -0,0 +1,14 @@
+Description: Dynamic linking against ICU
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/modules/web/src/main/native/Source/WebCore/TargetJava.pri
++++ b/modules/web/src/main/native/Source/WebCore/TargetJava.pri
+@@ -231,7 +231,7 @@
+ 
+         # statically link with icu libraries in order to avoid version conflict
+         QMAKE_LFLAGS += `pkg-config --libs-only-L icu-uc`
+-        LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic
++        LIBS += -Wl,-Bdynamic -licui18n -licuuc -licudata -Wl,-Bdynamic
+     }
+     solaris-cc {
+         QMAKE_LFLAGS += -M$$PWD/mapfile-vers
diff --git a/debian/patches/series b/debian/patches/series
index 04828de..37a02ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 08-disable-sse2.patch
 09-fix-conflicting-uchar32-typedef.patch
 10-javadoc-locale.patch
+11-icu-dynamic-linking.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git