View difference between Paste ID: 1NVEPcy0 and j5hRSXKK
SHOW: | | - or go back to the newest paste.
1-
--- PKGBUILD.orig	2011-09-21 17:48:52.000000000 +0300
1+
--- PKGBUILD	2011-09-21 17:48:52.000000000 +0300
2-
+++ PKGBUILD	2012-02-21 16:06:12.603615647 +0200
2+
+++ PKGBUILD.curlfix	2012-02-21 16:37:52.796521772 +0200
3
@@ -12,13 +12,14 @@
4
 options=(!strip !zipman !purge)
5
 
6
 if [ "$CARCH" = "i686" ]; then _arch="32"
7
-  md5sums=(6f16a7a724360090dee9de597c6870b3 0c6f49762bc0043394d5e440f2ff1af1)
8
+  md5sums=(6f16a7a724360090dee9de597c6870b3 0c6f49762bc0043394d5e440f2ff1af1 06794f609ae25b75293816f191ebaf2a)
9
 elif [ "$CARCH" = "x86_64" ]; then _arch="64"
10
-  md5sums=(6f16a7a724360090dee9de597c6870b3 5dbf6df8a161325bb7ff28a883f2fb76)
11
+  md5sums=(6f16a7a724360090dee9de597c6870b3 5dbf6df8a161325bb7ff28a883f2fb76 7102bf9898a5ed2f812286ff6f062a7f)
12
 fi
13
 
14
 source=("$pkgname.desktop"
15
-        "http://www.6wunderkinder.com/downloads/${pkgname}-${pkgver}-linux-${_arch}.tgz")
16
+        "http://www.6wunderkinder.com/downloads/${pkgname}-${pkgver}-linux-${_arch}.tgz"
17
+        "http://arm.konnichi.com/2012/01/01/core/os/${CARCH}/curl-7.23.1-2-${CARCH}.pkg.tar.xz")
18
 
19
 package() {
20
   local _srcdir="$srcdir/$_pkgname-$pkgver"
21
@@ -60,11 +61,12 @@
22
   install -m 644 "$_slibdir/rootcert.pem" "$_tlibdir"
23
 
24
   # link system libraries
25
-  for lib in gio libcurl.so.4 libhspell.so.0 libsoup-{gnome-,}2.4.so.1 \
26
+  for lib in gio libhspell.so.0 libsoup-{gnome-,}2.4.so.1 \
27
     libgcrypt.so libg{lib,io,object,module,thread}-2.0.so.0 \
28
     libwebkitgtk-1.0.so.0; do
29
     ln -s "/usr/lib/${lib}" "$_tlibdir"
30
   done
31-
+  # libcurl.so.4 
31+
+
32
   ln -s "/usr/share/webkitgtk-1.0/webinspector" "$_tlibdir"
33
   ln -s "/lib/libgcrypt.so.11" "$_tlibdir"
34
 
35
@@ -75,6 +77,10 @@
36
   ln -s "/usr/lib/libcrypto.so.1.0.0" "$_tlibdir/libcrypto.so.0.9.8"
37
   ln -s "/usr/lib/libssl.so.1.0.0" "$_tlibdir/libssl.so.0.9.8"
38
 
39-
+  # after curl 7.24 stopped working, extract library from curl 7.23
39+
+  # extract library from curl 7.23 as 7.24 stopped working
40
+  tar -x -a -C $_tlibdir --strip 2 -f "$srcdir/curl-7.23.1-2-${CARCH}.pkg.tar.xz" usr/lib/libcurl.so.4.2.0
41-
+  ln -s "$_tlibdir/libcurl.so.4.2.0" "$_tlibdir/libcurl.so.4"
41+
+  ln -s "libcurl.so.4.2.0" "$_tlibdir/libcurl.so.4"
42
+ 
43
   # install 'docs'
44
   mkdir -p "$pkgdir/usr/share/doc/$pkgname"
45
   cd "$_pkgdir/Resources/"