libre/iceweasel-theme-gnome{,-tweak}: update from iceweasel-theme-adwaita - Freedom issue #998 -> https://labs.parabola.nu/issues/998

2 files changed, 44 insertions, 9 deletions

diff --git a/libre/iceweasel-theme-gnome-tweak/PKGBUILD b/libre/iceweasel-theme-gnome-tweak/PKGBUILD
new file mode 100644
index 000000000..bc357fa1d
--- /dev/null
+++ b/libre/iceweasel-theme-gnome-tweak/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 167666 2016-03-20 02:09:47Z muflone $
+# Maintainer (Arch): Muflone http://www.muflone.com/contacts/english/
+# Contributor (Arch): Diego Principe <cdprincipe@at@gmail@dot@com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Daniel Milewski <niitotantei@riseup.net>
+# Contributor: Isaac David <isacdaavid () isacdaavid!info>
+
+pkgname=iceweasel-theme-gnome-tweak
+_pkgname=firefox-gnome
+pkgver=45.1
+pkgrel=2
+pkgdesc='Iceweasel extension for customizing the GNOME 3 theme, built from sources'
+url="https://addons.mozilla.org/en-us/firefox/addon/gnome-theme-tweak/"
+arch=('any')
+license=('MPL')
+depends=("iceweasel-theme-gnome")
+makedepends=('python2')
+replaces=('firefox-theme-adwaita' 'iceweasel-theme-adwaita' 'firefox-theme-gnome-tweak')
+conflicts=('firefox-theme-adwaita' 'iceweasel-theme-adwaita' 'firefox-theme-gnome-tweak')
+source=("${_pkgname}-${pkgver}.tar.gz"::"https://github.com/gnome-integration-team/${_pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('aa7f13d6d00e3801360b646ac4f704b96601f14741ec9a3765a89b6d41e3c1f3')
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  python2 make-xpi.py --force-rebuild extension
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  # Prepare destination folder
+  install -m 755 -d "${pkgdir}/usr/lib/iceweasel/browser/extensions"
+  # Install extension
+  _emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' extension/install.rdf.in)
+  install -m 644 "gnome-firefox-extension.xpi" "${pkgdir}/usr/lib/iceweasel/browser/extensions/${_emid}.xpi"
+}
diff --git a/libre/iceweasel-theme-adwaita/PKGBUILD b/libre/iceweasel-theme-gnome/PKGBUILD
index a68d66cce..2c013b2ff 100644
--- a/libre/iceweasel-theme-adwaita/PKGBUILD
+++ b/libre/iceweasel-theme-gnome/PKGBUILD
@@ -4,35 +4,34 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
+# Contributor: Isaac David <isacdaavid () isacdaavid!info>
 
-pkgname=iceweasel-theme-adwaita
+pkgname=iceweasel-theme-gnome
 _pkgname=firefox-gnome
 pkgver=45.1
-pkgrel=1.1
-pkgdesc="Adwaita theme for Iceweasel (Matches the default GNOME Shell theme)"
+pkgrel=2
+pkgdesc='GNOME 3 theme for Iceweasel (Previously known as "Adwaita"), without nonfree firefox dependency'
 url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/"
 arch=('any')
 license=('MPL')
 depends=("iceweasel")
 makedepends=('python2')
-replaces=('firefox-theme-adwaita')
+replaces=('firefox-theme-gnome')
+conflicts=('firefox-theme-gnome' 'iceweasel-theme-adwaita')
+optdepends=('iceweasel-theme-gnome-tweak: GNOME theme customization')
 source=("${_pkgname}-${pkgver}.tar.gz"::"https://github.com/gnome-integration-team/${_pkgname}/archive/${pkgver}.tar.gz")
 sha256sums=('aa7f13d6d00e3801360b646ac4f704b96601f14741ec9a3765a89b6d41e3c1f3')
 
 build() {
   cd "${_pkgname}-${pkgver}"
-  python2 make-xpi.py --force-rebuild all
+  python2 make-xpi.py --force-rebuild theme
 }
 
 package() {
   cd "${_pkgname}-${pkgver}"
   # Prepare destination folder
   install -m 755 -d "${pkgdir}/usr/lib/iceweasel/browser/extensions"
-  # Install extension
-  _emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' extension/install.rdf.in)
-  install -m 644 "gnome-firefox-extension.xpi" "${pkgdir}/usr/lib/iceweasel/browser/extensions/${_emid}.xpi"
   # Install theme
   _emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' theme/install.rdf.in)
   install -m 644 "gnome-firefox-theme.xpi" "${pkgdir}/usr/lib/iceweasel/browser/extensions/${_emid}.xpi"
 }
-