update to 1.13

3 files changed, 19 insertions, 166 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d284e8821de0..b274523d0952 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,67 +1,12 @@
 pkgbase = oomox-git
 	pkgdesc = Themix: GUI for generating different color variations of Arc, Materia, Oomox themes (GTK2, GTK3, Cinnamon, GNOME, MATE, Openbox, Xfwm), ArchDroid, Gnome-Colors, Numix, Papirus, Suru++ icons, and terminal palettes. Have a hack for HiDPI in GTK2.
-	pkgver = 1.12.6
+	pkgver = 1.13
 	pkgrel = 1
 	url = https://github.com/themix-project/oomox
 	arch = x86_64
 	arch = i686
 	license = GPL3
-	makedepends = git
-	depends = gtk3
-	depends = python-gobject
-	depends = glib2
-	depends = gdk-pixbuf2
-	depends = gtk-engine-murrine
-	depends = gtk-engines
-	depends = gnome-themes-extra
-	depends = sassc
-	depends = librsvg
-	depends = sed
-	depends = findutils
-	depends = grep
-	depends = bc
-	depends = zip
-	depends = polkit
-	depends = imagemagick
-	depends = parallel
-	depends = optipng
-	depends = python-pillow
-	depends = python-pystache
-	depends = python-yaml
-	depends = resvg
-	optdepends = xorg-xrdb: for the `xresources` theme
-	optdepends = breeze-icons: more fallback icons
-	optdepends = gksu: for applying Spotify theme from GUI without polkit
-	optdepends = colorz: additional image analyzer for "Import colors from image" plugin
-	optdepends = python-colorthief: additional image analyzer for "Import colors from image" plugin
-	optdepends = python-haishoku: additional image analyzer for "Import colors from image" plugin
-	options = !strip
-	source = git+https://github.com/themix-project/oomox.git#branch=master
-	source = git+https://github.com/themix-project/oomox-gtk-theme.git#branch=master
-	source = git+https://github.com/nana-4/materia-theme.git#branch=master
-	source = git+https://github.com/NicoHood/arc-theme.git#branch=master
-	source = git+https://github.com/themix-project/archdroid-icon-theme.git#branch=master
-	source = git+https://github.com/themix-project/gnome-colors-icon-theme.git#branch=master
-	source = git+https://github.com/themix-project/oomoxify.git#branch=master
-	source = git+https://github.com/themix-project/themix-plugin-base16.git#branch=master
-	source = git+https://github.com/numixproject/numix-icon-theme.git#branch=master
-	source = git+https://github.com/numixproject/numix-folders.git#branch=master
-	source = git+https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git#branch=master
-	source = git+https://github.com/gusbemacbe/suru-plus.git#branch=master
-	source = git+https://github.com/gusbemacbe/suru-plus-aspromauros.git#branch=master
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	depends = themix-full-git
 
 pkgname = oomox-git
 
diff --git a/CHANGELOG b/CHANGELOG
index 340ec91b9925..364435ebe033 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1550,3 +1550,14 @@ Sun Mar 15 14:24:43 2020 +0100
      2019-12-27 ac14b2ac actionless chore(plugins: themes: oomox): update submodule (entry borders revamp)
      2019-12-26 c1adfb54 actionless chore(plugins: theme: oomox): update submodule (more separators fixed + popovers)
      2019-12-26 1384adfa actionless chore(plugins: theme: oomox): update submodule (nemo statusbar improvements)
+
+
+Tue Mar 17 21:03:04 2020 +0100
+-------------------------------------------------
+1.13            Release 1.13
+    
+    * Split Arch Linux packaging
+    * Other notable changes:
+     2020-03-16 e85ab41e actionless fix(theme_file: save_colorscheme): don't save errors
+     2020-03-16 1af8308f actionless feat(preview): load preview parts for still available plugins if other plugins are not installed
+     2020-03-16 f1fe6c9d actionless feat(colors_list, main: open_theme): show error when there are no enough of needed plugins installed
diff --git a/PKGBUILD b/PKGBUILD
index 5d6d9cc9b744..1432e1a3126b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Yauhen Kirylau <yawghen AT gmail.com>
+# Maintainer: Yauhen Kirylau <actionless DOT loveless PLUS aur AT gmail MF com>
 # Upstream URL: https://github.com/themix-project/oomox
 
 pkgname=oomox-git
-pkgver=1.12.6
+pkgver=1.13
 pkgrel=1
 pkgdesc="Themix: GUI for generating different color variations
 of Arc, Materia, Oomox themes
@@ -14,118 +14,15 @@ arch=('x86_64' 'i686')
 url="https://github.com/themix-project/oomox"
 license=('GPL3')
 source=(
-	"git+https://github.com/themix-project/oomox.git#branch=master"
-	"git+https://github.com/themix-project/oomox-gtk-theme.git#branch=master"
-	"git+https://github.com/nana-4/materia-theme.git#branch=master"
-	"git+https://github.com/NicoHood/arc-theme.git#branch=master"
-	"git+https://github.com/themix-project/archdroid-icon-theme.git#branch=master"
-	"git+https://github.com/themix-project/gnome-colors-icon-theme.git#branch=master"
-	"git+https://github.com/themix-project/oomoxify.git#branch=master"
-	"git+https://github.com/themix-project/themix-plugin-base16.git#branch=master"
-	"git+https://github.com/numixproject/numix-icon-theme.git#branch=master"
-	"git+https://github.com/numixproject/numix-folders.git#branch=master"
-	"git+https://github.com/PapirusDevelopmentTeam/papirus-icon-theme.git#branch=master"
-	"git+https://github.com/gusbemacbe/suru-plus.git#branch=master"
-	"git+https://github.com/gusbemacbe/suru-plus-aspromauros.git#branch=master"
 )
-md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+md5sums=(
+)
 depends=(
-	'gtk3'
-	'python-gobject'
-	'glib2'  # oomox, materia, arc
-	'gdk-pixbuf2'  # oomox, materia, arc
-	'gtk-engine-murrine'  # oomox, materia, arc
-	'gtk-engines'  # oomox, materia, arc
-	'gnome-themes-extra'  # materia
-	'sassc'  # oomox, materia, arc
-	'librsvg'  # oomox, gnome-colors
-	'sed'  # oomox, materia, arc, gnome-colors, archdroid
-	'findutils'  # oomox, materia, arc, gnome-colors, arch-droid
-	'grep'  # oomoxify, oomox, materia, arc, gnome-colors
-	'bc'  # oomoxify, oomox, materia, arc, gnome-colors
-	'zip'  # oomoxify
-	'polkit'  # oomoxify
-	'imagemagick'  # gnome-colors
-	'parallel'  # materia
-	'optipng'  # materia, arc
-	'python-pillow'  # import_pil
-	'python-pystache'  #  base16_format
-	'python-yaml'  #  base16_format
-
-	'resvg'  # materia, arc
-	##or
-	#'inkscape'  # materia, arc
+	'themix-full-git'
 )
 makedepends=(
-	'git'
 )
 optdepends=(
-	'xorg-xrdb: for the `xresources` theme'
-	'breeze-icons: more fallback icons'
-	'gksu: for applying Spotify theme from GUI without polkit'
-	'colorz: additional image analyzer for "Import colors from image" plugin'
-	'python-colorthief: additional image analyzer for "Import colors from image" plugin'
-	'python-haishoku: additional image analyzer for "Import colors from image" plugin'
 )
-options=(
-	'!strip'
-)
-
-pkgver() {
-	cd "${srcdir}/oomox"
-	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare(){
-	cd "${srcdir}/oomox"
-
-	# remove submodule if building package update without flushing the dir:
-	git submodule deinit --all --force || true
-	git config --get-regexp submodule \
-		| cut -d' ' -f1 \
-		| xargs --no-run-if-empty -n1 git config --unset \
-		|| true
-	old_paths=(
-		"$srcdir"/oomox/plugins/import_base16/base16-data
-	)
-	for path in "${old_paths[@]}" ; do
-		rm -fr "${path}"
-	done
-
-	# use already downloaded by makepkg git repos as submodules of the main:
-	git submodule init
-	git config submodule.theme_oomox.url $srcdir/oomox-gtk-theme
-	git config submodule.materia-theme.url $srcdir/materia-theme
-	git config submodule.arc-theme.url $srcdir/arc-theme
-	git config submodule.archdroid-icon-theme.url $srcdir/archdroid-icon-theme
-	git config submodule.gnome-colors-icon-theme.url $srcdir/gnome-colors-icon-theme
-	git config submodule.oomoxify.url $srcdir/oomoxify
-	git config submodule.plugin_base16.url $srcdir/themix-plugin-base16
-	git config submodule.numix-folders.url $srcdir/numix-folders
-	git config submodule.numix-icon-theme.url $srcdir/numix-icon-theme
-	git config submodule.papirus-icon-theme.url $srcdir/papirus-icon-theme
-	git config submodule.suru-plus.url $srcdir/suru-plus
-	git config submodule.suru-plus-aspromauros.url $srcdir/suru-plus-aspromauros
-	git submodule update
-}
-
-package() {
-	_oomox_dir=/opt/oomox
-	_oomox_gui_dir=${_oomox_dir}/oomox_gui
 
-	cd "${srcdir}/oomox"
-	make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" install
-	python -O -m compileall ${pkgdir}${_oomox_gui_dir} -d ${_oomox_gui_dir}
-}
+# vim: ft=PKGBUILD