diff --git a/packaging/arch/PKGBUILD_gui b/packaging/arch/PKGBUILD_gui index fec02805a..2c5af0cc5 100644 --- a/packaging/arch/PKGBUILD_gui +++ b/packaging/arch/PKGBUILD_gui @@ -2,11 +2,11 @@ # Upstream URL: https://github.com/themix-project/oomox pkgname=themix-gui-git -pkgver=1.12.6 -pkgrel=1 +pkgver=1.12.6.r7.g7bd6e2fd +pkgrel=2 pkgdesc="Plugin-based theme designer GUI for environments (like GTK2, GTK3, Cinnamon, GNOME, MATE, Openbox, Xfwm), - icons, and terminal palettes." + icons and terminal palettes." arch=('x86_64' 'i686') url="https://github.com/themix-project/oomox" license=('GPL3') @@ -25,6 +25,7 @@ makedepends=( ) optdepends=( 'themix-icons-gnome-colors: Icons Style plugin' + 'themix-theme-materia: Theme Style plugin' 'themix-theme-oomox: Theme Style plugin' 'xorg-xrdb: for the `xresources` theme' ) diff --git a/packaging/arch/PKGBUILD_icons_gnome_colors b/packaging/arch/PKGBUILD_icons_gnome_colors index 56bda60e7..5e5bfdc78 100644 --- a/packaging/arch/PKGBUILD_icons_gnome_colors +++ b/packaging/arch/PKGBUILD_icons_gnome_colors @@ -4,8 +4,8 @@ _pkgname=themix-icons-gnome-colors _reponame=gnome-colors-icon-theme pkgname="${_pkgname}-git" -pkgver=5.5.5 -pkgrel=1 +pkgver=5.5.5.r0.gcd8b05a +pkgrel=2 pkgdesc="Gnome-Colors icons plugin for Themix GUI designer" arch=('x86_64' 'i686') url="https://github.com/themix-project/gnome-colors-icon-theme" @@ -19,12 +19,12 @@ md5sums=( "SKIP" ) depends=( - '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 - 'imagemagick' # gnome-colors + 'librsvg' + 'sed' + 'findutils' + 'grep' + 'bc' + 'imagemagick' ) makedepends=( 'git' @@ -58,7 +58,7 @@ package() { cp -r "${srcdir}/${_reponame}" "${pkg_tmp_dir}/plugins/${_plugin_name}${_plugin_subpath}" cd "$pkg_tmp_dir" - make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" install_icons_gnomecolors + make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" "install_${_plugin_name}" rm -fr "$pkg_tmp_dir" python -O -m compileall "${pkgdir}${_oomox_dir}/plugins/${_plugin_name}" -d "${_oomox_dir}/plugins/${_plugin_name}" diff --git a/packaging/arch/PKGBUILD_theme_materia b/packaging/arch/PKGBUILD_theme_materia new file mode 100644 index 000000000..21deb1910 --- /dev/null +++ b/packaging/arch/PKGBUILD_theme_materia @@ -0,0 +1,78 @@ +# Maintainer: Yauhen Kirylau +# Upstream URL: https://github.com/nana-4/materia-theme/ + +_pkgname=themix-theme-materia +_reponame=materia-theme +pkgname="${_pkgname}-git" +pkgver=v20191017.r149.gb6ccc2a9 +pkgrel=1 +pkgdesc="Materia theme plugin + (GTK2, GTK3, Cinnamon, GNOME, Metacity, Unity, Xfwm) for Themix GUI designer. + Have a hack for HiDPI in GTK2." +arch=('x86_64' 'i686') +url="https://github.com/themix-project/oomox-gtk-theme" +license=('GPL3') +source=( + "git+https://github.com/themix-project/oomox.git#branch=master" + "${_reponame}::git+https://github.com/nana-4/materia-theme.git#branch=master" +) +md5sums=( + "SKIP" + "SKIP" +) +depends=( + 'gtk3' + 'glib2' + 'gdk-pixbuf2' + 'gtk-engine-murrine' + 'gtk-engines' + 'gnome-themes-extra' + 'sassc' + 'sed' + 'findutils' + 'grep' + 'bc' + 'parallel' + 'optipng' + + 'resvg' + ## or + #'inkscape' +) +makedepends=( + 'git' + 'python' +) +optdepends=( + 'themix-gui: GUI' +) +options=( + '!strip' +) +provides=($_pkgname) +conflicts=($_pkgname) + +pkgver() { + cd "${srcdir}/${_reponame}" + git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +package() { + _oomox_dir=/opt/oomox + _plugin_name=theme_materia + _plugin_subpath="/${_reponame}" + + pkg_tmp_dir="${pkgdir}/_tmp" + rm -fr "$pkg_tmp_dir" + cp -r "${srcdir}/oomox" "$pkg_tmp_dir" + rm -rf "${pkg_tmp_dir}/plugins/${_plugin_name}${_plugin_subpath}" + cp -r "${srcdir}/${_reponame}" "${pkg_tmp_dir}/plugins/${_plugin_name}${_plugin_subpath}" + + cd "$pkg_tmp_dir" + make DESTDIR="${pkgdir}" APPDIR="${_oomox_dir}" PREFIX="/usr" "install_${_plugin_name}" + rm -fr "$pkg_tmp_dir" + + python -O -m compileall "${pkgdir}${_oomox_dir}/plugins/${_plugin_name}" -d "${_oomox_dir}/plugins/${_plugin_name}" +} + +# vim: ft=PKGBUILD diff --git a/plugins/theme_oomox b/plugins/theme_oomox index 20658006a..e59062b5d 160000 --- a/plugins/theme_oomox +++ b/plugins/theme_oomox @@ -1 +1 @@ -Subproject commit 20658006ae92dda887bfdbcfbce5dc5ef70d91ad +Subproject commit e59062b5d3f7da5faadd83a93798f8db1a727167