---
 testing/numix-themes/APKBUILD                      | 21 ++++----
 .../commits-to-070515-since-2.2.5.patch            | 62 ----------------------
 2 files changed, 9 insertions(+), 74 deletions(-)
 delete mode 100644 testing/numix-themes/commits-to-070515-since-2.2.5.patch

diff --git a/testing/numix-themes/APKBUILD b/testing/numix-themes/APKBUILD
index a5815ba..16d3c94 100644
--- a/testing/numix-themes/APKBUILD
+++ b/testing/numix-themes/APKBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=numix-themes
-pkgver=2.5.1
+_pkgname=numix-gtk-theme
+pkgver=2.6.1
 pkgrel=0
 pkgdesc="A modern flat theme with a combination of light and dark elements, GTK 2 and 3"
 url="http://shimmerproject.org/project/Numix/"
@@ -9,11 +10,9 @@ license="GPLv3"
 makedepends="$depends_dev"
 subpackages="$pkgname-gtk2 $pkgname-gtk3 $pkgname-metacity $pkgname-xfwm4 $pkgname-xfce4-notifyd:_notify
 		$pkgname-openbox:_openbox"
-source="numix-$pkgver.tar.gz::https://github.com/shimmerproject/Numix/archive/v$pkgver.tar.gz
-	commits-to-070515-since-2.2.5.patch
-	"
+source="numix-$pkgver.tar.gz::https://github.com/numixproject/$_pkgname/archive/$pkgver.tar.gz"
 
-_builddir="$srcdir"/Numix-$pkgver
+_builddir="$srcdir"/$_pkgname-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
@@ -36,6 +35,7 @@ package() {
 	cd "$_builddir"
 	mkdir -p "$pkgdir"/usr/share/themes/Numix
 	cp -pr * "$pkgdir"/usr/share/themes/Numix
+	rm -f "$pkgdir"/usr/share/themes/Numix/Makefile
 }
 
 _mv() {
@@ -57,15 +57,12 @@ gtk2() {
 	depends="gtk-murrine-engine"
 }
 
-gtk3() { _mv "Numix GTK3 themes" gtk3.0 gtk-3.0; }
+gtk3() { _mv "Numix GTK3 themes" gtk3.0 gtk-3.*; }
 metacity() { _mv "Numix Metacity themes" metacity metacity-1; }
 xfwm4() { _mv "Numix Xfce4 themes" xfwm4 xfwm4; }
 _notify() { _mv "Numix Xfce4-notifyd themes" xfce4-notifyd xfce-notify-4.0; }
 _openbox() { _mv "Numix openbox themes" openbox openbox-3; }
 
-md5sums="4468cb3f2fe0d01e823df7c310778787  numix-2.5.1.tar.gz
-274751ea1ef473c6233d045c403b3f19  commits-to-070515-since-2.2.5.patch"
-sha256sums="64b0c34c49633879c8b0b9b685da7b927501ab6db265db15fed04705c04f935b  numix-2.5.1.tar.gz
-30bc14240299ef02e01c237dbe037fda5a835f4825a811b636df5671cc0c01bf  commits-to-070515-since-2.2.5.patch"
-sha512sums="69741cc87bfa4aa54567014c1f4edf4c67cf76c2db5f15158a6473357ec557f8486c7961874c28dfdf6ae41c2253bf469d5d6301d9b235135a020068aecaa513  numix-2.5.1.tar.gz
-f5edca62767cb94f70c3d71a78b63bc5d399e3686eaadb9282e44dde6c6b81c52e94266b25f9e156e1c980f9f7cb01f6c670c0f5a4fe38605a1528e7bb7c716f  commits-to-070515-since-2.2.5.patch"
+md5sums="499e2e8e9d7d1d81403ebf8f65c8ced6  numix-2.6.1.tar.gz"
+sha256sums="7d81fb0fe7a50f933ae8016154a6da8ea4f6c12d988f735db277424af344a5bf  numix-2.6.1.tar.gz"
+sha512sums="ebdbf20049b84141b10bafa93685f844b59ae629d19ede0eef44afafa18357cb54d66cb830a67bf09ab251b04dbf21193e7bc5ea19124061d7fd8dbf4538a745  numix-2.6.1.tar.gz"
diff --git a/testing/numix-themes/commits-to-070515-since-2.2.5.patch b/testing/numix-themes/commits-to-070515-since-2.2.5.patch
deleted file mode 100644
index ba9e8e8..0000000
--- a/testing/numix-themes/commits-to-070515-since-2.2.5.patch
@@ -1,62 +0,0 @@
-diff -urp Numix-2.5.1/gtk-2.0/gtkrc Numix/gtk-2.0/gtkrc
---- Numix-2.5.1/gtk-2.0/gtkrc	2015-01-20 11:12:18.000000000 +0000
-+++ Numix/gtk-2.0/gtkrc	2015-06-08 22:07:01.651081310 +0000
-@@ -494,6 +494,7 @@ widget "*gimmie*" style "bold-panel-item
- # XFCE Styles
- 
- style "workspace-switcher" = "murrine-panel" {
-+	bg[ACTIVE] = @selected_bg_color
- 	bg[SELECTED] = @selected_bg_color
- }
- 
-@@ -575,7 +576,7 @@ style "xfsm-logout-button" {
- 	}
- }
- 
--widget "*WnckPager*" style "workspace-switcher"
-+widget "*Pager*" style "workspace-switcher"
- 
- widget "*Xfce*Panel*" style "murrine-panel"
- class "*Xfce*Panel*" style "murrine-panel"
-diff -urp Numix-2.5.1/gtk-3.0/apps/lightdm-gtk-greeter.css Numix/gtk-3.0/apps/lightdm-gtk-greeter.css
---- Numix-2.5.1/gtk-3.0/apps/lightdm-gtk-greeter.css	2015-01-20 11:12:18.000000000 +0000
-+++ Numix/gtk-3.0/apps/lightdm-gtk-greeter.css	2015-06-08 22:07:01.655081309 +0000
-@@ -1,3 +1,10 @@
-+/***********
-+ * general *
-+ ***********/
-+#screen.lightdm-gtk-greeter {
-+    background: transparent;
-+}
-+
- /*********
-  * panel *
-  *********/
-@@ -28,7 +35,9 @@
- }
- 
- #panel_window .menubar > .menuitem *:hover {
--    color: white;
-+    background-color: @theme_selected_bg_color;
-+    background-image: none;
-+    color: @theme_selected_fg_color;
- }
- 
- #panel_window .menubar > .menuitem:insensitive {
-@@ -180,6 +189,7 @@
- /******************************
-  * default and focused button *
-  ******************************/
-+#login_window #login_button,
- #login_window .button.default,
- #shutdown_dialog .button.default,
- #restart_dialog .button.default,
-@@ -246,5 +256,7 @@
-  * password warning *
-  ********************/
- #greeter_infobar {
-+    background-color: @warning_bg_color;
-+    color: @warning_fg_color;
-     font: bold;
- }
-
-- 
2.9.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---