diff options
| author | adam <adam@pkgsrc.org> | 2010-11-15 18:32:26 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-11-15 18:32:26 +0000 |
| commit | 5398798a19dae02234ea056077bc0d1dcca7c066 (patch) | |
| tree | 692f879fd030266c2015b4787fd26961c4d6de97 /x11/qt4-libs | |
| parent | 87420650a06bd7c13c01e384241b3bf06e4346c0 (diff) | |
| download | pkgsrc-5398798a19dae02234ea056077bc0d1dcca7c066.tar.gz | |
Better patch-be
Diffstat (limited to 'x11/qt4-libs')
| -rw-r--r-- | x11/qt4-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt4-libs/patches/patch-be | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo index 116bd75e7ff..2af9c50e365 100644 --- a/x11/qt4-libs/distinfo +++ b/x11/qt4-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.47 2010/11/15 13:05:45 adam Exp $ +$NetBSD: distinfo,v 1.48 2010/11/15 18:32:26 adam Exp $ SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341 RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899 @@ -33,6 +33,6 @@ SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5 SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d -SHA1 (patch-be) = fa9cd7a9ab77dbad48ef441832f744a574fe3d0f +SHA1 (patch-be) = e5555a6c08bfb98dd69543cec75771999ee37b13 SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04 SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 diff --git a/x11/qt4-libs/patches/patch-be b/x11/qt4-libs/patches/patch-be index 5030680ca58..ac9601499de 100644 --- a/x11/qt4-libs/patches/patch-be +++ b/x11/qt4-libs/patches/patch-be @@ -1,13 +1,14 @@ -$NetBSD: patch-be,v 1.1 2010/11/15 13:05:45 adam Exp $ +$NetBSD: patch-be,v 1.2 2010/11/15 18:32:26 adam Exp $ --- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig 2010-11-06 01:55:19.000000000 +0000 +++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri -@@ -90,7 +90,7 @@ defineTest(addJavaScriptCoreLib) { +@@ -88,9 +88,7 @@ defineTest(addJavaScriptCoreLib) { + } else { + # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW # that can't resolve symbols from QtCore if libjscore comes after. - QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR +- QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR LIBS += -l$$JAVASCRIPTCORE_TARGET - POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a -+ POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.la } win32-* { |