[openjfx] 04/04: Simplified the ICU linker patch

[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 3db62ea6c4807fc6ebc54bbd50d01021f0633211
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 6 10:44:39 2015 +0200

    Simplified the ICU linker patch
---
 debian/patches/11-icu-dynamic-linking.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/patches/11-icu-dynamic-linking.patch b/debian/patches/11-icu-dynamic-linking.patch
index 129cf56..34780a2 100644
--- a/debian/patches/11-icu-dynamic-linking.patch
+++ b/debian/patches/11-icu-dynamic-linking.patch
@@ -3,12 +3,15 @@ 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 @@
+@@ -229,9 +229,9 @@
+         # just for build debug: force verboce output from linker 
+         QMAKE_LFLAGS +=  -Wl,--verbose
  
-         # statically link with icu libraries in order to avoid version conflict
+-        # statically link with icu libraries in order to avoid version conflict
++        # link with icu libraries
          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
++        LIBS += -licui18n -licuuc -licudata
      }
      solaris-cc {
          QMAKE_LFLAGS += -M$$PWD/mapfile-vers

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