From 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 27 Apr 2012 00:01:30 +0000 Subject: Fri Apr 27 00:01:30 UTC 2012 --- libre-testing/icedove-libre/PKGBUILD | 14 ++++++---- .../icedove-libre/searchplugins-libre.patch | 30 ++++++++++------------ 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'libre-testing') diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD index 4d5ee4bb9..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,7 +39,8 @@ md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc' '4eecc4fc5aafaf0da651a09eadc90bee' '5a6282bb005d596aa4ab1884ac6b0517' '66376a8e934013078f0e646e49614937' - '836528f4b4907a3ffb3f3a3c46e2c442') + '2e6a57dc04b4a7255f5f1f3642af23ac' + '8f6d5be227bb68e1558dd6674cbba446') build() { export QUILT_PATCHES=debian/patches @@ -56,9 +58,10 @@ 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 -Np1 -i "$srcdir/searchplugins-libre.patch" + patch -Np0 -i "$srcdir/searchplugins-libre.patch" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } @@ -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/searchplugins-libre.patch b/libre-testing/icedove-libre/searchplugins-libre.patch index 9de805e96..19c1ea5ab 100644 --- a/libre-testing/icedove-libre/searchplugins-libre.patch +++ b/libre-testing/icedove-libre/searchplugins-libre.patch @@ -1,5 +1,5 @@ ---- mozilla-build.orig/mail/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300 +--- mail.orig/locales/en-US/searchplugins/list.txt 2012-03-27 15:56:00.000000000 -0300 ++++ mail/locales/en-US/searchplugins/list.txt 2012-04-13 05:43:25.227475353 -0300 @@ -1,8 +1,5 @@ -amazondotcom -aol-web-search @@ -12,7 +12,7 @@ +identica-people-search wikipedia -yahoo ---- mozilla-build.orig/mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/amazondotcom.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,11 +0,0 @@ - @@ -26,7 +26,7 @@ - -http://www.amazon.com/ - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/aol-web-search.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,10 +0,0 @@ - @@ -39,9 +39,9 @@ - - - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/bing.xml 2012-03-27 15:56:00.000000000 -0300 -+++ /dev/null 2012-04-12 23:52:53.981159155 -0300 -@@ -1,21 +0,0 @@ +--- mail/locales/en-US/searchplugins/bing.xml 2012-03-06 13:44:50.000000000 -0200 ++++ /dev/null 2012-04-25 14:16:16.847855589 -0300 +@@ -1,17 +0,0 @@ - - Bing - Bing. Search by Microsoft. @@ -53,17 +53,13 @@ - - - -- -- - - - -- -- - - http://www.bing.com/search - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/google.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,14 +0,0 @@ - @@ -80,7 +76,7 @@ - -http://www.google.com - ---- comm-release.orig/mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/twitter.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,10 +0,0 @@ - @@ -93,7 +89,7 @@ -http://search.twitter.com/ - - ---- mozilla-build.orig/mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300 +--- mail/locales/en-US/searchplugins/yahoo.xml 2012-03-27 15:56:00.000000000 -0300 +++ /dev/null 2012-04-12 23:52:53.981159155 -0300 @@ -1,13 +0,0 @@ - @@ -110,7 +106,7 @@ -http://search.yahoo.com/ - --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300 ++++ mail/locales/en-US/searchplugins/duckduckgo-ssl.xml 2012-04-09 14:43:56.000000000 -0300 @@ -0,0 +1,11 @@ + +DuckDuckGo RU SSL @@ -124,7 +120,7 @@ + + --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300 ++++ mail/locales/en-US/searchplugins/identica-notice-search.xml 2012-04-13 05:15:55.000000000 -0300 @@ -0,0 +1,7 @@ + +Identi.ca Notice Search @@ -134,7 +130,7 @@ + + --- /dev/null 2012-04-12 23:52:53.981159155 -0300 -+++ mozilla-build/mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300 ++++ mail/locales/en-US/searchplugins/identica-people-search.xml 2012-04-13 05:15:53.000000000 -0300 @@ -0,0 +1,7 @@ + +Identi.ca People Search -- cgit v1.2.3-54-g00ecf