iceape-libre-2.7.4-1: fixing and adding lines on PKGBUILD

3 files changed, 38 insertions, 6 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 21afdb6ef..aeea756fd 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -32,8 +32,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         gnuzilla-addons.patch)
 md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138'
          '46908aec059166ac48592a8119badf3e'
-         '3cbbe74f467e6d23f7fde508b30c139f'
-         '0e981f6ce32fbe6407fe18a591bd3b41'
+         'd62c6856f7aa393a86f7a614460a6269'
+         '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          '94d5cd599ccc4438f192d8daabf98b6a'
          'c395d443a8c4c16880c7322bcf174743'
@@ -56,6 +56,28 @@ build() {
   patch -Np1 -i "$srcdir/clrf.patch"
   patch -Np1 -i "$srcdir/gnuzilla-addons.patch"
 
+  install -m755 -d "debian/branding/icons/gtk"
+  install -m755 -d "debian/branding/content"
+  install -m755 -d "debian/branding/app-icons"
+
+  # Converting svg file to png
+  rsvg-convert -w 300 -h 280 -o debian/branding/content/about.png debian/branding/iceape_logo_plain.svg
+  rsvg-convert -w 64 -h 64 -o debian/branding/content/icon64.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 128 -h 128 -o debian/branding/icons/gtk/iceape.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 32 -h 32 -o debian/branding/icons/gtk/default.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 32 -h 32 -o debian/branding/icons/gtk/main-window.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 16 -h 16 -o debian/branding/icons/gtk/default16.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 16 -h 16 -o debian/branding/icons/gtk/main-window16.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 48 -h 48 -o debian/branding/icons/gtk/default48.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 48 -h 48 -o debian/branding/icons/gtk/main-window48.png debian/branding/iceape_icon_plain.svg
+  
+  # Icons for /usr/share/icons/hicolor
+  rsvg-convert -w 16 -h 16 -o debian/branding/app-icons/iceape16.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 32 -h 32 -o debian/branding/app-icons/iceape32.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 48 -h 48 -o debian/branding/app-icons/iceape48.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 64 -h 64 -o debian/branding/app-icons/iceape64.png debian/branding/iceape_icon_plain.svg
+  rsvg-convert -w 128 -h 128 -o debian/branding/app-icons/iceape128.png debian/branding/iceape_icon_plain.svg
+
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
 }
@@ -74,8 +96,11 @@ package() {
   install -m755 -d "$pkgdir/usr/share/pixmaps"
   install -m644 moz-objdir/debian/branding/icons/gtk/iceape.png \
                 "$pkgdir/usr/share/pixmaps/"
-  install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/"
 
-  rm -f "$pkgdir/usr/lib/pkgconfig/"$_pkgname-ns{s,pr}.pc
-  rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
+  for i in 16x16 32x32 48x48 64x64 128x128; do
+      install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
+  done
+  install -Dm644 "debian/app-icons/${_pkgname}_icon_plain.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+
+  install -m644 "$srcdir/$_pkgname.desktop" "$pkgdir/usr/share/applications/"
 }
diff --git a/libre/iceape-libre/iceape.desktop b/libre/iceape-libre/iceape.desktop
index 0c7d63353..0868e5058 100644
--- a/libre/iceape-libre/iceape.desktop
+++ b/libre/iceape-libre/iceape.desktop
@@ -5,7 +5,7 @@ Icon=iceape
 Type=Application
 Terminal=false
 MultipleArgs=false
-Name=Iceape internet suite
+Name=Iceape Internet Suite
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
 StartupNotify=false
 Categories=Application;Network;
diff --git a/libre/iceape-libre/mozconfig b/libre/iceape-libre/mozconfig
index ce4403d3b..756968258 100644
--- a/libre/iceape-libre/mozconfig
+++ b/libre/iceape-libre/mozconfig
@@ -1,7 +1,10 @@
+mk_add_options MOZ_CO_PROJECT=suite
 ac_add_options --enable-application=suite
 
 ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
 
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -33,6 +36,10 @@ ac_add_options --enable-optimize
 
 export MOZILLA_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
+
+# Parabola
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
 
 # Debian