diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/iceweasel/libre.patch | 33 |
2 files changed, 5 insertions, 39 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 05591afd7..cca289c90 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -27,13 +27,13 @@ _pkgname=firefox pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils ffmpeg gtk2 gtk3 hicolor-icon-theme hunspell icu=56.1 libevent libvpx=1.5.0 libxt mime-types mozilla-common nss sqlite startup-notification ttf-font) -makedepends=(autoconf2.13 diffutils gconf imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) +makedepends=(autoconf2.13 diffutils gconf imake inetutils libidl2 libpulse librsvg-stable libxslt mesa mozilla-searchplugins pkg-config python2 quilt unzip yasm zip) options=(!emptydirs !makeflags debug) if $_pgo; then makedepends+=(xorg-server-xvfb) @@ -62,7 +62,7 @@ sha256sums=('96f8b5ccae9864d7a4eece3735378a148481090f76ebfe6524dc433cec229351' 'd0cc42cbc0718d92c118de2a20db0b48c5b5584ad9e8a8a1e7569c5ca25aa67d' 'SKIP' 'abc617c170b0c4d549d1995d018285e16e9a30adf5e9c116d8b4d0070758070f' - 'e392d975bab18a0351278d8b6777d00afe9382dd285491a1301c23b14e8a235b' + '0b47b95cfa4a56a1292be7107c9a59e4575bac8bc1e1fb7e1359755069919751' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' @@ -149,9 +149,8 @@ package() { brandingdir=moz-objdir/$_brandingdir icondir="$pkgdir/usr/share/icons/hicolor" for i in 16 22 24 32 48 64 128 192 256 384; do - convert -background none "$_brandingdir/${pkgname}_icon.svg" \ - -resize ${i}x${i}^ -gravity center -extent ${i}x${i} \ - "$brandingdir/default$i.png" + rsvg-convert -w $i -h $i "$_brandingdir/${pkgname}_icon.svg" \ + -o "$brandingdir/default$i.png" install -Dm644 "$brandingdir/default$i.png" \ "$icondir/${i}x${i}/apps/$pkgname.png" done diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index b6ce9f4fe..72827c29b 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -237,39 +237,6 @@ index 076ca38..1826961 100644 + <DT><A HREF="https://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff --git a/debian/branding/Makefile.in b/debian/branding/Makefile.in -index b395c62..fd4768c 100644 ---- a/debian/branding/Makefile.in -+++ b/debian/branding/Makefile.in -@@ -32,9 +32,9 @@ default48.png: SIZE=48 - GARBAGE += document_icon.png default64.png - - mozicon128.png default16.png default32.png default48.png default64.png: $(srcdir)/iceweasel_icon.svg -- rsvg-convert -w $(SIZE) -h $(SIZE) -o $@ $< -+ convert -background none $< -resize $(SIZE)x$(SIZE)^ -gravity center -extent $(SIZE)x$(SIZE) $@ - - iceweasel_logo.png: $(srcdir)/iceweasel_logo.svg -- rsvg-convert -w 256 -a -o $@ $< -+ convert -background none $< -resize 256x256^ -gravity center -extent 256x256 $@ - - GARBAGE += iceweasel_logo.png -diff --git a/debian/branding/content/Makefile.in b/debian/branding/content/Makefile.in -index 6c13eac..bb4cf4a 100644 ---- a/debian/branding/content/Makefile.in -+++ b/debian/branding/content/Makefile.in -@@ -23,10 +23,10 @@ about.png: %.png: ../iceweasel_logo.png %-base.png - convert - -define png:exclude-chunk=time +set date:create +set date:modify $@ - - about-logo.png: ../iceweasel_icon.svg -- rsvg-convert -w 210 -h 210 -o $@ $< -+ convert -background none $< -resize 210x210^ -gravity center -extent 210x210 $@ - - about-logo@2x.png: ../iceweasel_icon.svg -- rsvg-convert -w 420 -h 420 -o $@ $< -+ convert -background none $< -resize 420x420^ -gravity center -extent 420x420 $@ - - about-wordmark.svg: wordmark.xsl ../iceweasel_logo.svg - xsltproc -o $@ $^ diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd index ba304a3..4274e50 100644 --- a/devtools/client/locales/en-US/connection-screen.dtd |