3 files changed, 100 insertions, 13 deletions
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
index 998e57d04..d904e4d2e 100644
--- a/libre-testing/icedove-libre/PKGBUILD
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -10,7 +10,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
 _pkgname=$_debname
 pkgname=$_debname-libre
-pkgver=$_debver.$_debrel
+pkgver=$_debver
 pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
@@ -25,17 +25,13 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc"
         mozconfig
         channel-prefs.js
-        vendor.js
-        makefile.patch
-        gcc47.patch)
+        vendor.js)
 md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
          'cb3dba2916bdf2deb72248b0984c4302'
          '57e21e997a75d85fcc0dcfe30b83f1ee'
          'fda2ff093ddbddf7f4cc3a1ed3bf9dcd'
          '476ec205162340fb0679f522c9d31c3b'
-         '4eecc4fc5aafaf0da651a09eadc90bee'
-         '5a6282bb005d596aa4ab1884ac6b0517'
-         '66376a8e934013078f0e646e49614937')
+         '4eecc4fc5aafaf0da651a09eadc90bee')
 
 build() {
   export QUILT_PATCHES=debian/patches
@@ -51,8 +47,6 @@ build() {
   quilt push -a
 
   cp "$srcdir/mozconfig" .mozconfig
-  patch -Np1 -i "$srcdir/makefile.patch"
-  patch -Np1 -i "$srcdir/gcc47.patch"
   rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -65,10 +59,10 @@ package() {
   install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref"
   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"
-#  done
-#  install -Dm644 "$debian/app-icons/$_pkgname_icon.svg" "/usr/share/icons/hicolor/scalable/apps/$_pkgname.svg"
+  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"
+  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"
diff --git a/libre-testing/icedove-libre/PKGBUILD.bk b/libre-testing/icedove-libre/PKGBUILD.bk
new file mode 100644
index 000000000..998e57d04
--- /dev/null
+++ b/libre-testing/icedove-libre/PKGBUILD.bk
@@ -0,0 +1,77 @@
+# Maintainer : Márcio Silva <coadde@adinet.com.uy>
+# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+
+# We're getting this from Debian Sid
+_debname=icedove
+_debver=10.0.3
+_debrel=3
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=$_debname
+pkgname=$_debname-libre
+pkgver=$_debver.$_debrel
+pkgrel=1
+pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
+arch=('i586' 'i686' 'x86_64' 'mips64el')
+license=('GPL2' 'MPL' 'LGPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+optdepends=('libcanberra: for sound support')
+url="http://packages.debian.org/source/sid/$_pkgname"
+install=$_pkgname.install
+source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
+        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+        "$_debrepo/`debfile $_debname`_$_debver-$_debrel.dsc"
+        mozconfig
+        channel-prefs.js
+        vendor.js
+        makefile.patch
+        gcc47.patch)
+md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
+         'cb3dba2916bdf2deb72248b0984c4302'
+         '57e21e997a75d85fcc0dcfe30b83f1ee'
+         'fda2ff093ddbddf7f4cc3a1ed3bf9dcd'
+         '476ec205162340fb0679f522c9d31c3b'
+         '4eecc4fc5aafaf0da651a09eadc90bee'
+         '5a6282bb005d596aa4ab1884ac6b0517'
+         '66376a8e934013078f0e646e49614937')
+
+build() {
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+
+  mv comm-esr10 "$srcdir/mozilla-build"
+  mv debian "$srcdir/mozilla-build"
+
+  cd "$srcdir/mozilla-build"
+  quilt push -a
+
+  cp "$srcdir/mozconfig" .mozconfig
+  patch -Np1 -i "$srcdir/makefile.patch"
+  patch -Np1 -i "$srcdir/gcc47.patch"
+  rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml
+
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+  cd "$srcdir/mozilla-build"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -m644 "$srcdir/vendor.js" "$pkgdir/usr/lib/$_pkgname/defaults/pref"
+  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"
+#  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"
+  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