[packages/phantomjs/dev] disable q{cn,jp,kr,tw}codecs for now

glen glen at pld-linux.org
Sun Mar 2 15:30:57 CET 2014


commit d9993e21330ee3563409bff080859b18d2101803
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 2 14:30:12 2014 +0000

    disable q{cn,jp,kr,tw}codecs for now

 no-qcodecs.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 phantomjs.spec   |  2 ++
 2 files changed, 46 insertions(+)
---
diff --git a/phantomjs.spec b/phantomjs.spec
index 9fd792f..ee30af5 100644
--- a/phantomjs.spec
+++ b/phantomjs.spec
@@ -15,6 +15,7 @@ Patch5:		0005-unbundle-qt.patch
 Patch6:		0006-unbundle-linenoise.patch
 Patch7:		0007-unbundle-QCommandLine.patch
 Patch8:		0008-unbundle-coffee-script.patch
+Patch9:		no-qcodecs.patch
 URL:		http://phantomjs.org/
 BuildRequires:	QtWebKit-devel
 BuildRequires:	coffee-script
@@ -61,6 +62,7 @@ rm -r src/breakpad
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 qmake-qt4
diff --git a/no-qcodecs.patch b/no-qcodecs.patch
new file mode 100644
index 0000000..d876d9f
--- /dev/null
+++ b/no-qcodecs.patch
@@ -0,0 +1,44 @@
+disable qcncodecs, qjpcodecs, qkrcodecs, qtwcodecs codecs, not sure how to use them from system qt4
+
+--- phantomjs-1.9.7/./src/main.cpp~	2014-03-02 16:26:44.000000000 +0200
++++ phantomjs-1.9.7/./src/main.cpp	2014-03-02 16:27:37.049043803 +0200
+@@ -46,11 +46,6 @@
+ 
+ #if !defined(QT_SHARED) && !defined(QT_DLL)
+ #include <QtPlugin>
+-
+-Q_IMPORT_PLUGIN(qcncodecs)
+-Q_IMPORT_PLUGIN(qjpcodecs)
+-Q_IMPORT_PLUGIN(qkrcodecs)
+-Q_IMPORT_PLUGIN(qtwcodecs)
+ #endif
+ 
+ #ifdef Q_OS_WIN32
+--- phantomjs-1.9.7/./src/phantomjs.pro~	2014-03-02 16:26:44.000000000 +0200
++++ phantomjs-1.9.7/./src/phantomjs.pro	2014-03-02 16:28:02.520192429 +0200
+@@ -58,14 +58,6 @@
+ LIBS += -llinenoise
+ LIBS += -lqcommandline
+ 
+-linux*|mac {
+-    QTPLUGIN += \
+-        qcncodecs \
+-        qjpcodecs \
+-        qkrcodecs \
+-        qtwcodecs
+-}
+-
+ win32: RC_FILE = phantomjs_win.rc
+ os2:   RC_FILE = phantomjs_os2.rc
+ 
+@@ -82,10 +74,6 @@
+     CONFIG(static) {
+         DEFINES += STATIC_BUILD
+         QTPLUGIN += \
+-            qcncodecs \
+-            qjpcodecs \
+-            qkrcodecs \
+-            qtwcodecs \
+             qico
+     }
+ }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phantomjs.git/commitdiff/d9993e21330ee3563409bff080859b18d2101803



More information about the pld-cvs-commit mailing list