diff options
| -rw-r--r-- | libre/iceape-libre/PKGBUILD | 48 | ||||
| -rw-r--r-- | libre/iceape-libre/mozconfig | 1 |
2 files changed, 25 insertions, 24 deletions
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index aeea756fd..d66ac45e9 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -32,7 +32,7 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" gnuzilla-addons.patch) md5sums=('aedc7546db1fdc50cc9c5f21a7ad6138' '46908aec059166ac48592a8119badf3e' - 'd62c6856f7aa393a86f7a614460a6269' + '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' '94d5cd599ccc4438f192d8daabf98b6a' @@ -46,6 +46,8 @@ build() { export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" export PYTHON="/usr/bin/python2" export DEBIAN_BUILD="comm-release" + export DEBIAN_BRANDING_DIR="debian/branding" + export ICEAPE_ICONS_BRANDING="suite/branding/nightly" mv comm-esr10 "${DEBIAN_BUILD}" mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" @@ -56,27 +58,27 @@ 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 + # Converting svg file to png and replacing seamonkey by iceape icons + rsvg-convert -w 300 -h 280 -o ${ICEAPE_ICONS_BRANDING}/content/about.png ${DEBIAN_BRANDING_DIR}/iceape_logo_plain.svg + rsvg-convert -w 64 -h 64 -o ${ICEAPE_ICONS_BRANDING}/content/icon64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 128 -h 128 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 32 -h 32 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 16 -h 16 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/default48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 48 -h 48 -o ${ICEAPE_ICONS_BRANDING}/icons/gtk/main-window48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + # Creating app-icons Folder for iceape*.png icons + + install -m755 -d "${DEBIAN_BRANDING_DIR}/app-icons" + # 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 + rsvg-convert -w 16 -h 16 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape16.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 32 -h 32 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape32.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 48 -h 48 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape48.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 64 -h 64 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape64.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg + rsvg-convert -w 128 -h 128 -o ${DEBIAN_BRANDING_DIR}/app-icons/iceape128.png ${DEBIAN_BRANDING_DIR}/iceape_icon_plain.svg cp "${srcdir}/mozconfig" .mozconfig make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -94,13 +96,13 @@ package() { install -m755 -d "$pkgdir/usr/share/applications" install -m755 -d "$pkgdir/usr/share/pixmaps" - install -m644 moz-objdir/debian/branding/icons/gtk/iceape.png \ + install -m644 ${ICEAPE_ICONS_BRANDING}/icons/gtk/iceape.png \ "$pkgdir/usr/share/pixmaps/" 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" + install -Dm644 "${DEBIAN_BRANDING_DIR}/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 -Dm644 "${DEBIAN_BRANDING_DIR}/${_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/mozconfig b/libre/iceape-libre/mozconfig index 756968258..5227d77a5 100644 --- a/libre/iceape-libre/mozconfig +++ b/libre/iceape-libre/mozconfig @@ -40,7 +40,6 @@ 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 ac_add_options --with-default-mozilla-five-home=/usr/lib/iceape |