Mon Nov 15 18:32:26 2010 UTC ()
Better patch-be


(adam)
diff -r1.47 -r1.48 pkgsrc/x11/qt4-libs/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/patch-be
cvs diff -r1.47 -r1.48 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2010/11/15 13:05:45 1.47
+++ pkgsrc/x11/qt4-libs/distinfo 2010/11/15 18:32:26 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.47 2010/11/15 13:05:45 adam Exp $ 1$NetBSD: distinfo,v 1.48 2010/11/15 18:32:26 adam Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341 3SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341
4RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899 4RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899
5Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes 5Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes
6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
7SHA1 (patch-ab) = a2de275815bc71f294c787c124f5596440d3ce03 7SHA1 (patch-ab) = a2de275815bc71f294c787c124f5596440d3ce03
8SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 8SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
9SHA1 (patch-ad) = df3a50533fdb6d71ecb83cb3d6fef9a9195ef3e6 9SHA1 (patch-ad) = df3a50533fdb6d71ecb83cb3d6fef9a9195ef3e6
10SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744 10SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744
11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
12SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89 12SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
@@ -23,16 +23,16 @@ SHA1 (patch-aq) = ec88f8b47d77297cc9a06e @@ -23,16 +23,16 @@ SHA1 (patch-aq) = ec88f8b47d77297cc9a06e
23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a 23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
24SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058 24SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b 26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b 28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
29SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635 29SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
30SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94 30SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
31SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d 31SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
32SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9 32SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
33SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5 33SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
34SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f 34SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
35SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d 35SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
36SHA1 (patch-be) = fa9cd7a9ab77dbad48ef441832f744a574fe3d0f 36SHA1 (patch-be) = e5555a6c08bfb98dd69543cec75771999ee37b13
37SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04 37SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04
38SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 38SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/patch-be (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-be 2010/11/15 13:05:45 1.1
+++ pkgsrc/x11/qt4-libs/patches/patch-be 2010/11/15 18:32:26 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-be,v 1.1 2010/11/15 13:05:45 adam Exp $ 1$NetBSD: patch-be,v 1.2 2010/11/15 18:32:26 adam Exp $
2 2
3--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig 2010-11-06 01:55:19.000000000 +0000 3--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig 2010-11-06 01:55:19.000000000 +0000
4+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri 4+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
5@@ -90,7 +90,7 @@ defineTest(addJavaScriptCoreLib) { 5@@ -88,9 +88,7 @@ defineTest(addJavaScriptCoreLib) {
 6 } else {
 7 # Make sure jscore will be early in the list of libraries to workaround a bug in MinGW
6 # that can't resolve symbols from QtCore if libjscore comes after. 8 # that can't resolve symbols from QtCore if libjscore comes after.
7 QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR 9- QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
8 LIBS += -l$$JAVASCRIPTCORE_TARGET 10 LIBS += -l$$JAVASCRIPTCORE_TARGET
9- POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a 11- POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
10+ POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.la 
11 } 12 }
12  13
13 win32-* { 14 win32-* {