[arch-commits] Commit in arc-gtk-theme/trunk (PKGBUILD change-solid-theme-path.patch)

[Bruno Pagani]

    Date: Wednesday, July 5, 2017 @ 09:52:10
  Author: archange
Revision: 242389

Use upstream patch to move -solid theme in a different namespace

Now both packages can be installed at the same time

Added:
  arc-gtk-theme/trunk/change-solid-theme-path.patch
Modified:
  arc-gtk-theme/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   47 ++++++++++++++++++++++------------------
 change-solid-theme-path.patch |   28 +++++++++++++++++++++++
 2 files changed, 55 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-05 09:42:44 UTC (rev 242388)
+++ PKGBUILD	2017-07-05 09:52:10 UTC (rev 242389)
@@ -8,41 +8,48 @@
 _pkgname=arc-theme
 pkgname=('arc-gtk-theme' 'arc-solid-gtk-theme')
 pkgver=20170302
-pkgrel=3
+pkgrel=4
 arch=('any')
 url="https://github.com/horst3180/${_pkgname}"
 license=('GPL3')
-makedepends=('gtk3')
 optdepends=('arc-icon-theme: recommended icon theme'
             'gtk-engine-murrine: for gtk2 themes'
             'gnome-themes-standard: for gtk2 themes')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/horst3180/${_pkgname}/archive/${pkgver}.tar.gz"
-        "${pkgname}-${pkgver}.tar.gz.sig::https://github.com/horst3180/${_pkgname}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz.asc")
+makedepends=('gtk3')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz"
+        "${pkgname}-${pkgver}.tar.gz.sig::${url}/releases/download/${pkgver}/${_pkgname}-${pkgver}.tar.gz.asc"
+        'change-solid-theme-path.patch')
+sha512sums=('99408a7c4db2bd2d81453e308ae5d9bc9bfda4f11e57191936f985de2937debff76c4d1f37a97ac8f5ad3751401ee8ad02457e4558b9c4aedc2bfeba1736ef03'
+            'SKIP'
+            '5b1ca739206e386cb4bf1f2f0a9524a08f2590972126cc96ef7c2e56ca59e94136cf7f8dc8184cd1c688a488e5e96384d654e279778f93e8f34860f7281afff9')
 validpgpkeys=('A46FD8E741A2A075898462CDC57DFF0D28DAAE97')
-sha512sums=('99408a7c4db2bd2d81453e308ae5d9bc9bfda4f11e57191936f985de2937debff76c4d1f37a97ac8f5ad3751401ee8ad02457e4558b9c4aedc2bfeba1736ef03'
-            'SKIP')
 
+prepare() {
+    cp -a ${_pkgname}-${pkgver}{,-solid}
+    cd ${_pkgname}-${pkgver}-solid
+    patch -p1 -i ../change-solid-theme-path.patch
+}
+
 build() {
-        cd "${_pkgname}-$pkgver"
-        ./autogen.sh --prefix=/usr
+    cd ${_pkgname}-${pkgver}
+    ./autogen.sh --prefix=/usr
+
+    cd ../${_pkgname}-${pkgver}-solid
+    ./autogen.sh --prefix=/usr --disable-transparency
 }
 
 package_arc-gtk-theme() {
-        pkgdesc="A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"
-        replaces=('gtk-theme-arc')
+    pkgdesc="A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"
+    replaces=('gtk-theme-arc')
 
-        cd "${_pkgname}-$pkgver"
-        ./configure --prefix=/usr
-        make DESTDIR="${pkgdir}" install
+    cd ${_pkgname}-${pkgver}
+    make DESTDIR="${pkgdir}" install
 }
 
 package_arc-solid-gtk-theme() {
-        pkgdesc="A flat theme for GTK 3, GTK 2 and Gnome-Shell (without transparency)"
-        conflicts=('arc-gtk-theme' 'gtk-theme-arc')
-        provides=('arc-gtk-theme')
-        replaces=('gtk-theme-arc-solid')
+    pkgdesc="A flat theme for GTK 3, GTK 2 and Gnome-Shell (without transparency)"
+    replaces=('gtk-theme-arc-solid')
 
-        cd "${_pkgname}-$pkgver"
-        ./configure --prefix=/usr --disable-transparency
-        make DESTDIR="${pkgdir}" install
+    cd ${_pkgname}-${pkgver}-solid
+    make DESTDIR="${pkgdir}" install
 }

Added: change-solid-theme-path.patch
===================================================================
--- change-solid-theme-path.patch	                        (rev 0)
+++ change-solid-theme-path.patch	2017-07-05 09:52:10 UTC (rev 242389)
@@ -0,0 +1,28 @@
+From 7b1d4f3fb9635c21abc4221c008cfa9849fe53ff Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping at tingping.se>
+Date: Wed, 10 May 2017 17:38:54 -0400
+Subject: [PATCH] Append solid suffix to non-transparent variant
+
+This allows distributions to easily pacakge both without conflicts.
+This will also help with Flatpak being able to match the host theme.
+---
+ common/Makefile.am | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/common/Makefile.am b/common/Makefile.am
+index 0421c5de1..58f54d840 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -1,6 +1,12 @@
++if !ENABLE_TRANSPARENCY
++themedir        = $(datadir)/themes/Arc-solid
++themedarkerdir  = $(datadir)/themes/Arc-Darker-solid
++themedarkdir    = $(datadir)/themes/Arc-Dark-solid
++else
+ themedir        = $(datadir)/themes/Arc
+ themedarkerdir  = $(datadir)/themes/Arc-Darker
+ themedarkdir    = $(datadir)/themes/Arc-Dark
++endif
+ 
+ ithemedir       = $(DESTDIR)$(themedir)
+ ithemedarkerdir   = $(DESTDIR)$(themedarkerdir)