From ca4c302285d2870ef29138f9a612e58ddab3e9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 23 Nov 2020 17:54:17 +0700 Subject: [PATCH] numix-themes: build with sassc - fix ftbfs on i686 - remove noarch --- srcpkgs/numix-themes/patches/sassc.patch | 57 ++++++++++++++++++++++++ srcpkgs/numix-themes/template | 21 +++------ 2 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 srcpkgs/numix-themes/patches/sassc.patch diff --git a/srcpkgs/numix-themes/patches/sassc.patch b/srcpkgs/numix-themes/patches/sassc.patch new file mode 100644 index 00000000000..9546e272de4 --- /dev/null +++ b/srcpkgs/numix-themes/patches/sassc.patch @@ -0,0 +1,57 @@ +From b950d9f66cf6f901729025c5e63aa02b4d209d41 Mon Sep 17 00:00:00 2001 +From: KTB +Date: Fri, 15 Nov 2019 08:13:13 -0500 +Subject: [PATCH] Updates Makefile to replace Ruby Sass with SassC + +This commit replaces the use of the Ruby Sass scss command with SassC's sassc command. Due to the more limited functionality of sassc, output directories must be created prior to running the command and only one file may be processed at a time unlike the many-to-many mode functionality of the scss command. +--- + Makefile | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index d2735a91..c580a2a7 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-SASS=scss +-SASSFLAGS=--sourcemap=none ++SASS=sassc ++SASSFLAGS=-M -t expanded + GLIB_COMPILE_RESOURCES=glib-compile-resources + RES_DIR=src/gtk-3.0 + SCSS_DIR=$(RES_DIR)/scss +@@ -14,8 +14,12 @@ UTILS=scripts/utils.sh + all: clean gresource + + css: +- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR):$(DIST_DIR) +- $(SASS) --update $(SASSFLAGS) $(SCSS_DIR320):$(DIST_DIR320) ++ mkdir $(DIST_DIR) ++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk.scss $(DIST_DIR)/gtk.css ++ $(SASS) $(SASSFLAGS) $(SCSS_DIR)/gtk-dark.scss $(DIST_DIR)/gtk-dark.css ++ mkdir $(DIST_DIR320) ++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk.scss $(DIST_DIR320)/gtk.css ++ $(SASS) $(SASSFLAGS) $(SCSS_DIR320)/gtk-dark.scss $(DIST_DIR320)/gtk-dark.css + + gresource: css + $(GLIB_COMPILE_RESOURCES) --sourcedir=$(RES_DIR) $(RES_DIR)/gtk.gresource.xml +From 6ba019fae4b8c90ed721dfe2dad279752f454968 Mon Sep 17 00:00:00 2001 +From: KTB +Date: Fri, 15 Nov 2019 08:19:32 -0500 +Subject: [PATCH] Makes import directive relative in _gnome-terminal.scss + +This commit changes the "widgets/button" import directive to be relative in the gtk-3.20 _gnome-terminal.scss file which is necessary when using SassC. +--- + src/gtk-3.20/scss/apps/_gnome-terminal.scss | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gtk-3.20/scss/apps/_gnome-terminal.scss b/src/gtk-3.20/scss/apps/_gnome-terminal.scss +index fd3af1c5..704faf5d 100644 +--- a/src/gtk-3.20/scss/apps/_gnome-terminal.scss ++++ b/src/gtk-3.20/scss/apps/_gnome-terminal.scss +@@ -1,4 +1,4 @@ +-@import "widgets/button"; ++@import "../widgets/button"; + + /********************** + ! Genome Terminal * diff --git a/srcpkgs/numix-themes/template b/srcpkgs/numix-themes/template index f993b7949a4..0e5b7b436c7 100644 --- a/srcpkgs/numix-themes/template +++ b/srcpkgs/numix-themes/template @@ -1,22 +1,15 @@ +# Template file for 'numix-themes' pkgname=numix-themes version=2.6.7 -revision=1 +revision=2 wrksrc="numix-gtk-theme-${version}" -archs=noarch build_style=gnu-makefile -short_desc="A modern flat theme with a combination of light and dark elements" -maintainer="Jakub Skrzypnik " -license="GPL-3" +hostmakedepends="glib-devel gdk-pixbuf sassc" depends="gtk+3 gtk-engine-murrine" -hostmakedepends="glib-devel gdk-pixbuf-devel ruby-devel" +short_desc="Modern flat theme with a combination of light and dark elements" +maintainer="Jakub Skrzypnik " +license="GPL-3.0-or-later" homepage="https://github.com/numixproject/numix-gtk-theme" distfiles="${homepage}/archive/${version}.tar.gz" checksum=2b997ad3eee0b802d0dd49dd772127fd3c337cca32d8863efd4897928e38879a - -pre_build() { - gem install sass -} - -post_install() { - vlicense LICENSE -} +patch_args=-Np1