icedove-libre: adding patches for test

2 files changed, 23 insertions, 3 deletions

diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
index 0e4a209a6..9beba51a8 100644
--- a/libre-testing/icedove-libre/PKGBUILD
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -29,6 +29,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         makefile.patch
         gcc47.patch
+        rules.patch
         searchplugins-libre.patch)
 md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
          'cb3dba2916bdf2deb72248b0984c4302'
@@ -38,6 +39,7 @@ md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
          '4eecc4fc5aafaf0da651a09eadc90bee'
          '5a6282bb005d596aa4ab1884ac6b0517'
          '66376a8e934013078f0e646e49614937'
+         '2e6a57dc04b4a7255f5f1f3642af23ac'
          '8f6d5be227bb68e1558dd6674cbba446')
 
 build() {
@@ -56,6 +58,7 @@ build() {
   cp "$srcdir/mozconfig" .mozconfig
   patch -Np1 -i "$srcdir/gcc47.patch"
   patch -Np1 -i "$srcdir/makefile.patch"
+  patch -Np1 -i "$srcdir/rules.patch"
 
   # Removing non-free search plugins replacing them with duckduckgo and identi.ca
   patch -Np0 -i "$srcdir/searchplugins-libre.patch"
@@ -71,13 +74,14 @@ package() {
   install -m644 "$srcdir/channel-prefs.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref" # Recommend free addons
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 "$debian/app-icons/$_pkgname${i/x*/}.png" "/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
+      install -Dm644 debian/app-icons/$_pkgname${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/$_pkgname.png"
+      install -Dm644 debian/app-icons/icedovebig.svg \
+          "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
   done
-  install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
 
   rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
   ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
-  ln -sf $_pkgname /usr/lib/$_pkgname/$_pkgname usr/bin/$_pkgname
   rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff
 }
diff --git a/libre-testing/icedove-libre/rules.patch b/libre-testing/icedove-libre/rules.patch
new file mode 100644
index 000000000..ce857ebd3
--- /dev/null
+++ b/libre-testing/icedove-libre/rules.patch
@@ -0,0 +1,16 @@
+--- mozilla-build/config/rules.mk.orig	2012-03-06 13:44:49.000000000 -0200
++++ mozilla-build/config/rules.mk	2012-04-05 22:24:29.473430588 -0300
+@@ -48,11 +48,11 @@
+ endif
+ 
+ ifndef INCLUDED_CONFIG_MK
+-include $(topsrcdir)/config/config.mk
++include /build/src/mozilla-build/config/config.mk
+ endif
+ 
+ ifndef INCLUDED_VERSION_MK
+-include $(topsrcdir)/config/version.mk
++include /build/src/mozilla-build/config/version.mk
+ endif
+ 
+ ifdef SDK_XPIDLSRCS