update, improvements

4 files changed, 8 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69c7baee3b68..16c2ec4389f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu May  5 06:07:53 UTC 2016
+# Mon May  9 08:44:55 UTC 2016
 pkgbase = breeze-icons-git
 	pkgdesc = Breeze icon themes for KDE Plasma. (GIT version)
-	pkgver = 5.21.0.r70.g8984eb6
+	pkgver = 5.22.0.rc1.r3.g2c3510f
 	pkgrel = 1
 	url = https://quickgit.kde.org/?p=breeze-icons.git
 	arch = any
@@ -14,9 +14,7 @@ pkgbase = breeze-icons-git
 	provides = breeze-icons
 	conflicts = breeze-icons
 	source = breeze-icons::git://anongit.kde.org/breeze-icons.git
-	source = fix_size_field_errors.patch
 	sha256sums = SKIP
-	sha256sums = b1838cadf6ea1f465265b949e04f27bf0a59a8e2919db57c3225c86bbc0a1966
 
 pkgname = breeze-icons-git
 
diff --git a/.gitignore b/.gitignore
index 65e9d083cd45..cb242805f5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 !PKGBUILD
 !.SRCINFO
 !.gitignore
-!fix_size_field_errors.patch
 
diff --git a/PKGBUILD b/PKGBUILD
index 36dfbe4f3d68..acde0125be2c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=breeze-icons
 pkgname="${_pkgname}-git"
-pkgver=5.21.0.r70.g8984eb6
+pkgver=5.22.0.rc1.r3.g2c3510f
 pkgrel=1
 pkgdesc="Breeze icon themes for KDE Plasma. (GIT version)"
 arch=('any')
@@ -12,10 +12,8 @@ groups=('kf5')
 makedepends=('extra-cmake-modules-git' 'git' 'qt5-base')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git://anongit.kde.org/${_pkgname}.git"
-        "fix_size_field_errors.patch")
-sha256sums=('SKIP'
-            'b1838cadf6ea1f465265b949e04f27bf0a59a8e2919db57c3225c86bbc0a1966')
+source=("${_pkgname}::git://anongit.kde.org/${_pkgname}.git")
+sha256sums=('SKIP')
 
 pkgver(){
     cd ${srcdir}/${_pkgname}
@@ -23,9 +21,9 @@ pkgver(){
 }
 
 prepare() {
-    ### https://git.reviewboard.kde.org/r/127839/
-    patch -Np1 -i ${srcdir}/fix_size_field_errors.patch
-    rm -rf build
+    if [[ -d build ]]; then
+        rm -Rf build
+    fi
     mkdir -p build
 }
 
diff --git a/fix_size_field_errors.patch b/fix_size_field_errors.patch
deleted file mode 100644
index bb83aa84e3d9..000000000000
--- a/fix_size_field_errors.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/breeze-icons/icons-dark/index.theme b/breeze-icons/icons-dark/index.theme
-index 0a0a664..51f900c 100644
---- a/breeze-icons/icons-dark/index.theme
-+++ b/breeze-icons/icons-dark/index.theme
-@@ -87,7 +87,7 @@ KDE-Extensions=.svg
- ########## Directories
- ########## ordered by category and alphabetically
- 
--Directories=actions/12,actions/16,actions/22,actions/24,actions/32,actions/48,apps/16,apps/22,apps/32,apps/48,applets/256,categories/16,categories/22,categories/32,categories/48,devices/16,devices/22,devices/48,devices/64,emblems/8,emblems/16,emblems/22,emotes/22,mimetypes/16,mimetypes/22,mimetypes/32,mimetypes/64,places/16,places/22,places/32,places/64,status/16,status/22,status/24,status/64
-+Directories=actions/12,actions/16,actions/22,actions/24,actions/32,apps/16,apps/22,apps/32,apps/48,applets/256,categories/32,devices/16,devices/22,devices/64,emblems/8,emblems/16,emblems/22,emotes/22,mimetypes/16,mimetypes/22,mimetypes/32,mimetypes/64,places/16,places/22,places/32,places/64,status/16,status/22,status/24,status/64
- 
- ########## Actions
- ########## ordered by size
-diff --git a/breeze-icons/icons/index.theme b/breeze-icons/icons/index.theme
-index 6a0dfb1..b3fcb09 100644
---- a/breeze-icons/icons/index.theme
-+++ b/breeze-icons/icons/index.theme
-@@ -87,7 +87,7 @@ KDE-Extensions=.svg
- ########## Directories
- ########## ordered by category and alphabetically
- 
--Directories=actions/12,actions/16,actions/22,actions/24,actions/32,actions/48,apps/16,apps/22,apps/32,apps/48,applets/256,categories/16,categories/22,categories/32,categories/48,devices/16,devices/22,devices/48,devices/64,emblems/8,emblems/16,emblems/22,emotes/22,mimetypes/16,mimetypes/22,mimetypes/32,mimetypes/64,places/16,places/22,places/32,places/64,status/16,status/22,status/24,status/64
-+Directories=actions/12,actions/16,actions/22,actions/24,actions/32,apps/16,apps/22,apps/32,apps/48,applets/256,categories/32,devices/16,devices/22,devices/64,emblems/8,emblems/16,emblems/22,emotes/22,mimetypes/16,mimetypes/22,mimetypes/32,mimetypes/64,places/16,places/22,places/32,places/64,status/16,status/22,status/24,status/64
- 
- ########## Actions
- ########## ordered by size